MoNTE48
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Range-limit value passed to PlayerSAO::set{HP|Breath} (#8264)

master
ANAND 2019-04-27 16:15:20 +05:30 committed by SmallJoker
parent 695d9edcd4
commit d0f0ceaf66
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/content_sao.cpp
View File

@ -1334,6 +1334,8 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason)
{ {
s32 oldhp = m_hp; s32 oldhp = m_hp;
hp = rangelim(hp, 0, m_prop.hp_max);
s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason); s32 hp_change = m_env->getScriptIface()->on_player_hpchange(this, hp - oldhp, reason);
if (hp_change == 0) if (hp_change == 0)
return; return;
@ -1355,7 +1357,7 @@ void PlayerSAO::setBreath(const u16 breath, bool send)
if (m_player && breath != m_breath) if (m_player && breath != m_breath)
m_player->setDirty(true); m_player->setDirty(true);
m_breath = MYMIN(breath, m_prop.breath_max); m_breath = rangelim(breath, 0, m_prop.breath_max);
if (send) if (send)
m_env->getGameDef()->SendPlayerBreath(this); m_env->getGameDef()->SendPlayerBreath(this);