From 4df8b23c5fc63598d15f07a5e4ddc85f0b755050 Mon Sep 17 00:00:00 2001 From: Skjalf <47818697+Nyeriah@users.noreply.github.com> Date: Mon, 31 Jan 2022 00:56:40 -0300 Subject: [PATCH] =?UTF-8?q?fix(Core/Scripting):=20Fix=20healing=20reductio?= =?UTF-8?q?n=20abilities=20not=20applying=20cor=E2=80=A6=20(#10435)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Scripting/ScriptDefines/GlobalScript.cpp | 6 +++--- src/server/game/Scripting/ScriptMgr.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 0d0c6c863..e67d8d8c4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11979,8 +11979,8 @@ uint32 Unit::SpellHealingBonusTaken(Unit* caster, SpellInfo const* spellProto, u { float TakenTotalMod = 1.0f; float minval = 0.0f; - // Healing taken percent + // Healing taken percent if (!sScriptMgr->OnSpellHealingBonusTakenNegativeModifiers(this, caster, spellProto, minval)) { minval = float(GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT)); diff --git a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp index 1bf44059f..def8e1a04 100644 --- a/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/GlobalScript.cpp @@ -143,13 +143,13 @@ bool ScriptMgr::OnSpellHealingBonusTakenNegativeModifiers(Unit const* target, Un { auto ret = IsValidBoolScript([&](GlobalScript* script) { - return !script->OnSpellHealingBonusTakenNegativeModifiers(target, caster, spellInfo, val); + return script->OnSpellHealingBonusTakenNegativeModifiers(target, caster, spellInfo, val); }); if (ret && *ret) { - return false; + return true; } - return true; + return false; } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index fab527d52..5125d19df 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1530,7 +1530,7 @@ public: virtual bool OnIsAffectedBySpellModCheck(SpellInfo const* /*affectSpell*/, SpellInfo const* /*checkSpell*/, SpellModifier const* /*mod*/) { return true; }; // Called when checking for spell negative healing modifiers - virtual bool OnSpellHealingBonusTakenNegativeModifiers(Unit const* /*target*/, Unit const* /*caster*/, SpellInfo const* /*spellInfo*/, float& /*val*/) { return true; }; + virtual bool OnSpellHealingBonusTakenNegativeModifiers(Unit const* /*target*/, Unit const* /*caster*/, SpellInfo const* /*spellInfo*/, float& /*val*/) { return false; }; }; class BGScript : public ScriptObject