stujones11
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PlayerSAO::setHP - Don't call on_hpchange callbacks if HP hasn't changed

master
ANAND 2019-04-27 17:23:36 +05:30 committed by sfan5
parent ad8d68c06a
commit c4578aefe7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/content_sao.cpp
View File

@ -1340,11 +1340,13 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
hp = rangelim(hp, 0, m_prop.hp_max);
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);
if (hp_change == 0)
return;
if (oldhp != hp) {
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);
if (hp_change == 0)
return;
hp = rangelim(oldhp + hp_change, 0, m_prop.hp_max);
hp = rangelim(oldhp + hp_change, 0, m_prop.hp_max);
}
if (hp < oldhp && !g_settings->getBool("enable_damage"))
return;