From 67125caeb0de1bb4f71efe83cc42ba27c3a91723 Mon Sep 17 00:00:00 2001 From: Tereneckla <50233983+Tereneckla@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:54:44 +0000 Subject: [PATCH] fix(Core/Player): Food healing does not increased by sitting down (#15959) --- src/server/game/Entities/Player/Player.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ef3831d34..e70baf13b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -1986,6 +1986,11 @@ void Player::RegenerateHealth() { addvalue = OCTRegenHPPerSpirit() * HealthIncreaseRate; + if (!IsStandState()) + { + addvalue *= 1.5f; + } + AuraEffectList const& mModHealthRegenPct = GetAuraEffectsByType(SPELL_AURA_MOD_HEALTH_REGEN_PERCENT); for (AuraEffectList::const_iterator i = mModHealthRegenPct.begin(); i != mModHealthRegenPct.end(); ++i) { @@ -1997,10 +2002,9 @@ void Player::RegenerateHealth() addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_REGEN) * 2 * IN_MILLISECONDS / (5 * IN_MILLISECONDS); } else if (HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT)) + { ApplyPct(addvalue, GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT)); - - if (!IsStandState()) - addvalue *= 1.5f; + } } // always regeneration bonus (including combat)