Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: Added SpellEffectInfo argument to CalcDamage and CalcHealing spell script hooks

Browse Source 
(cherry picked from commit 884662a75a)

# 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
This commit is contained in:
Shauren
2024-12-21 00:40:08 +01:00
committed by Ovahlord
parent 4011a0df2b
commit cb29e42e3a
16 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Spells/SpellEffects.cpp
View File

@@ -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);
}