From 995fb23bc11e5dff3f21e1afa977934b76482d1b Mon Sep 17 00:00:00 2001 From: Robingad Date: Sun, 28 Feb 2021 19:42:36 +0200 Subject: Core/Scripts: Add SpellInfo argument to ScriptMgr::ModifySpellDamageTaken (#26141) --- src/server/game/Scripting/ScriptMgr.cpp | 6 +++--- src/server/game/Scripting/ScriptMgr.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d6ada60914e..de42459a367 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -2193,10 +2193,10 @@ void ScriptMgr::ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage) FOREACH_SCRIPT(PlayerScript)->ModifyMeleeDamage(target, attacker, damage); } -void ScriptMgr::ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage) +void ScriptMgr::ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage, SpellInfo const* spellInfo) { - FOREACH_SCRIPT(UnitScript)->ModifySpellDamageTaken(target, attacker, damage); - FOREACH_SCRIPT(PlayerScript)->ModifySpellDamageTaken(target, attacker, damage); + FOREACH_SCRIPT(UnitScript)->ModifySpellDamageTaken(target, attacker, damage, spellInfo); + FOREACH_SCRIPT(PlayerScript)->ModifySpellDamageTaken(target, attacker, damage, spellInfo); } // Conversation diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index f781d74a8fb..49389fa1bcc 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -409,7 +409,7 @@ class TC_GAME_API UnitScript : public ScriptObject virtual void ModifyMeleeDamage(Unit* /*target*/, Unit* /*attacker*/, uint32& /*damage*/) { } // Called when Spell Damage is being Dealt - virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/) { } + virtual void ModifySpellDamageTaken(Unit* /*target*/, Unit* /*attacker*/, int32& /*damage*/, SpellInfo const* /*spellInfo*/) { } }; class TC_GAME_API CreatureScript : public UnitScript @@ -1127,7 +1127,7 @@ class TC_GAME_API ScriptMgr void OnDamage(Unit* attacker, Unit* victim, uint32& damage); void ModifyPeriodicDamageAurasTick(Unit* target, Unit* attacker, uint32& damage); void ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage); - void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage); + void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage, SpellInfo const* spellInfo); public: /* AreaTriggerEntityScript */ -- cgit v1.2.3