luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 09:25:37 +02:00
Code Activity

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

Browse Source
This commit is contained in:
Wuzzy
2021-10-31 22:33:33 +00:00
committed by GitHub
parent 38ba813c55
commit 6910c8d920
18 changed files with 229 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/player_sao.cpp
View File

@@ -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();