From d0f0ceaf6672d737b071b7dbc37fa3f3e964125b Mon Sep 17 00:00:00 2001 From: ANAND Date: Sat, 27 Apr 2019 16:15:20 +0530 Subject: [PATCH] Range-limit value passed to PlayerSAO::set{HP|Breath} (#8264) --- src/content_sao.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/content_sao.cpp b/src/content_sao.cpp index f0d7fbf5d..7acf03684 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1334,6 +1334,8 @@ void PlayerSAO::setHP(s32 hp, const PlayerHPChangeReason &reason) { 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); if (hp_change == 0) return; @@ -1355,7 +1357,7 @@ void PlayerSAO::setBreath(const u16 breath, bool send) if (m_player && breath != m_breath) m_player->setDirty(true); - m_breath = MYMIN(breath, m_prop.breath_max); + m_breath = rangelim(breath, 0, m_prop.breath_max); if (send) m_env->getGameDef()->SendPlayerBreath(this); -- 2.25.1