forked from Mirrorlandia_minetest/minetest
PlayerSAO: Run on_player_hpchange raw change values (#10478)
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:
@ -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;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user