From cb29e42e3a2d7e7bf7d6008881129f6052fb184e Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Dec 2024 00:40:08 +0100 Subject: Core/Scripts: Added SpellEffectInfo argument to CalcDamage and CalcHealing spell script hooks (cherry picked from commit 884662a75a901af6f61cab9efc171d052e8042f4) # Conflicts: # src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp # src/server/scripts/Spells/spell_azerite.cpp # src/server/scripts/Spells/spell_evoker.cpp # src/server/scripts/Spells/spell_priest.cpp # src/server/scripts/Spells/spell_rogue.cpp # src/server/scripts/Spells/spell_warlock.cpp --- src/server/game/Spells/SpellEffects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Spells/SpellEffects.cpp') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7278e30d21d..392393d9d9d 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2867,7 +2867,7 @@ void Spell::EffectWeaponDmg() weaponDamage = std::max(weaponDamage, 0); // Add melee damage bonuses (also check for negative) - weaponDamage = unitCaster->MeleeDamageBonusDone(unitTarget, weaponDamage, m_attackType, SPELL_DIRECT_DAMAGE, m_spellInfo, mechanic, m_spellSchoolMask, this); + weaponDamage = unitCaster->MeleeDamageBonusDone(unitTarget, weaponDamage, m_attackType, SPELL_DIRECT_DAMAGE, m_spellInfo, effectInfo, mechanic, m_spellSchoolMask, this); m_damage += unitTarget->MeleeDamageBonusTaken(unitCaster, weaponDamage, m_attackType, SPELL_DIRECT_DAMAGE, m_spellInfo); } -- cgit v1.2.3