From 5069deb318e6fa107dcd6baa0a3e3579123509ba Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 9 Jul 2019 16:03:47 +0200 Subject: [PATCH] Core/Spells: correct diminishing formular for Holy Word Sanctuary * improved codestyle for Healing Rain diminishing handling --- src/server/scripts/Spells/spell_priest.cpp | 2 +- src/server/scripts/Spells/spell_shaman.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index f385487859..37b169d733 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -1266,7 +1266,7 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript void HandleHeal(SpellEffIndex /*effIndex*/) { if (GetHitHeal() && _targets > 6) - SetHitHeal(GetHitHeal() / _targets); + SetHitHeal((GetHitHeal() * 6) / _targets); } void FilterTargets(std::list& unitList) diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 5694b3de37..30e7e22fad 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -1635,9 +1635,8 @@ class spell_sha_healing_rain_triggered : public SpellScript void HandleHeal(SpellEffIndex /*effIndex*/) { - if (uint32 heal = GetHitHeal()) - if (_targets > 6) - SetHitHeal((heal * 6) / _targets); + if (GetHitHeal()() && _targets > 6) + SetHitHeal((GetHitHeal() * 6) / _targets); } void Register() override