diff options
| author | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-02-10 19:50:36 +0100 |
|---|---|---|
| committer | Elias Fleckenstein <eliasfleckenstein@web.de> | 2021-02-10 19:50:36 +0100 |
| commit | 1fbbb768252f872dfa961d3a73460d996164d527 (patch) | |
| tree | e9faf93dbd894b253ac3d1f0895b7468e8fee50d /src/server/player_sao.cpp | |
| parent | 74f5f033e04c0d8694815fedb795838d4926cbc9 (diff) | |
| parent | 9736b9cea5f841bb0e9bb2c9c05c3b2560327064 (diff) | |
| download | dragonfireclient-1fbbb768252f872dfa961d3a73460d996164d527.tar.xz | |
Merge branch 'master' of https://github.com/minetest/minetest
Diffstat (limited to 'src/server/player_sao.cpp')
| -rw-r--r-- | src/server/player_sao.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp index 232c6a01d..110d2010d 100644 --- a/src/server/player_sao.cpp +++ b/src/server/player_sao.cpp @@ -148,7 +148,7 @@ std::string PlayerSAO::getClientInitializationData(u16 protocol_version) void PlayerSAO::getStaticData(std::string * result) const { - FATAL_ERROR("Obsolete function"); + FATAL_ERROR("This function shall not be called for PlayerSAO"); } void PlayerSAO::step(float dtime, bool send_recommended) @@ -456,6 +456,11 @@ u16 PlayerSAO::punch(v3f dir, return hitparams.wear; } +void PlayerSAO::rightClick(ServerActiveObject *clicker) +{ + m_env->getScriptIface()->on_rightclickplayer(this, clicker); +} + void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason) { if (hp == (s32)m_hp) |
