Fix number of tool uses being off by 1..32767 (#11110)

[dragonfireclient.git] / src / server / player_sao.cpp

diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp
index 690823bb78b4880ca0bed9ea75885dfe4731ba50..83e17f8308ebfbed967bc7102cc8fb25835e1a1a 100644 (file)
--- a/src/server/player_sao.cpp
+++ b/src/server/player_sao.cpp
@@ -409,10 +409,11 @@ void PlayerSAO::setLookPitchAndSend(const float pitch)
        m_env->getGameDef()->SendMovePlayer(m_peer_id);
 }
 
-u16 PlayerSAO::punch(v3f dir,
+u32 PlayerSAO::punch(v3f dir,
        const ToolCapabilities *toolcap,
        ServerActiveObject *puncher,
-       float time_from_last_punch)
+       float time_from_last_punch,
+       u16 initial_wear)
 {
        if (!toolcap)
                return 0;
@@ -430,7 +431,7 @@ u16 PlayerSAO::punch(v3f dir,
 
        s32 old_hp = getHP();
        HitParams hitparams = getHitParams(m_armor_groups, toolcap,
-                       time_from_last_punch);
+                       time_from_last_punch, initial_wear);
 
        PlayerSAO *playersao = m_player->getPlayerSAO();