BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

PlayerSAO: Run on_player_hpchange raw change values (#10478)

Browse Source 
The callback is only run when a change in HP is to be expected.
Following cases will not trigger the callback:
 * Dead player damaged further
 * Healing full-health player
 * Change of 0 HP
This commit is contained in:
SmallJoker 2020-11-12 19:15:41 +01:00 committed by GitHub
parent be8d1d2d99
commit adffef2b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/player_sao.cpp
View File

@ -458,20 +458,25 @@ u16 PlayerSAO::punch(v3f dir,
void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason) void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
{ {
s32 oldhp = m_hp; if (hp == (s32)m_hp)
return; // Nothing to do
hp = rangelim(hp, 0, m_prop.hp_max); if (m_hp <= 0 && hp < (s32)m_hp)
return; // Cannot take more damage
if (oldhp != hp) { {
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason); s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - m_hp, reason);
if (hp_change == 0) if (hp_change == 0)
return; return;
hp = rangelim(oldhp + hp_change, 0, m_prop.hp_max); hp = m_hp + hp_change;
} }
s32 oldhp = m_hp;
hp = rangelim(hp, 0, m_prop.hp_max);
if (hp < oldhp && isImmortal()) if (hp < oldhp && isImmortal())
return; return; // Do not allow immortal players to be damaged
m_hp = hp; m_hp = hp;