aboutsummaryrefslogtreecommitdiff
path: root/src/server/player_sao.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/player_sao.h')
-rw-r--r--src/server/player_sao.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/server/player_sao.h b/src/server/player_sao.h
index 8e2d8803f..96d8f7189 100644
--- a/src/server/player_sao.h
+++ b/src/server/player_sao.h
@@ -109,10 +109,14 @@ public:
Interaction interface
*/
- u16 punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher,
- float time_from_last_punch);
+ u32 punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher,
+ float time_from_last_punch, u16 initial_wear = 0);
void rightClick(ServerActiveObject *clicker);
- void setHP(s32 hp, const PlayerHPChangeReason &reason);
+ void setHP(s32 hp, const PlayerHPChangeReason &reason) override
+ {
+ return setHP(hp, reason, false);
+ }
+ void setHP(s32 hp, const PlayerHPChangeReason &reason, bool from_client);
void setHPRaw(u16 hp) { m_hp = hp; }
u16 getBreath() const { return m_breath; }
void setBreath(const u16 breath, bool send = true);