diff options
| author | Wuzzy <wuzzy2@mail.ru> | 2021-10-31 22:33:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 22:33:33 +0000 |
| commit | 6910c8d920acedb3f1df1ac03a5cdf14f5fb6081 (patch) | |
| tree | ae01925fc35e2301a87ec53897f96b1f56c955fb /src/server/player_sao.cpp | |
| parent | 38ba813c55489595cd78ab2f952be2e954083cfa (diff) | |
| download | minetest-6910c8d920acedb3f1df1ac03a5cdf14f5fb6081.tar.xz | |
Fix number of tool uses being off by 1..32767 (#11110)
Diffstat (limited to 'src/server/player_sao.cpp')
| -rw-r--r-- | src/server/player_sao.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/player_sao.cpp b/src/server/player_sao.cpp index 690823bb7..83e17f830 100644 --- 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(); |