diff options
author | Subv <s.v.h21@hotmail.com> | 2012-04-11 17:41:36 -0500 |
---|---|---|
committer | Subv <s.v.h21@hotmail.com> | 2012-04-11 17:41:36 -0500 |
commit | 397ee8ceb549cbfa5de949cd882ddc99cf3ea7c0 (patch) | |
tree | 5779aa4edbd7c1cb548a588d27e3c5a8dc6c27f6 | |
parent | 54039b917c496e31d2579f3c2748c122946c6992 (diff) |
Core/Spells: Execute spell procs after the healing effects of a spell
Closes #216
Signed-off-by: Subv <s.v.h21@hotmail.com>
-rwxr-xr-x | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 36d7328f37e..af3f53e2369 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2442,13 +2442,13 @@ void Spell::DoAllEffectOnTarget(TargetInfo* target) else procEx |= PROC_EX_NORMAL_HIT; - // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge) - if (canEffectTrigger && missInfo != SPELL_MISS_REFLECT) - caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, addhealth, m_attackType, m_spellInfo, m_triggeredByAuraSpell); - int32 gain = caster->HealBySpell(unitTarget, m_spellInfo, addhealth, crit); unitTarget->getHostileRefManager().threatAssist(caster, float(gain) * 0.5f, m_spellInfo); m_healing = gain; + + // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge) + if (canEffectTrigger && missInfo != SPELL_MISS_REFLECT) + caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, addhealth, m_attackType, m_spellInfo, m_triggeredByAuraSpell); } // Do damage and triggers else if (m_damage > 0) |