diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-12-21 00:40:08 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-12-21 17:41:47 +0100 |
| commit | cb29e42e3a2d7e7bf7d6008881129f6052fb184e (patch) | |
| tree | 4e52626b622d178368e26456d3f50906f279d401 /src/server/game/Spells/SpellEffects.cpp | |
| parent | 4011a0df2b9c79eec570aebb17e14187cda37af5 (diff) | |
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
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |