From d1a40eb6888c325b3f01ac8a90f1dbac7ed56ea0 Mon Sep 17 00:00:00 2001 From: QAston Date: Sun, 24 Jan 2010 13:08:25 +0100 Subject: *Do not keep area aura targets in combat with aura owner *Add some safety checks to area aura target map update. --HG-- branch : trunk --- src/game/SpellEffects.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/game/SpellEffects.cpp') diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 81ff8116c00..796d007ba64 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -2601,8 +2601,7 @@ void Spell::EffectApplyAura(uint32 i) if (!m_spellAura) return; assert (unitTarget == m_spellAura->GetOwner()); - if (!m_spellAura->IsRemoved()) - m_spellAura->ApplyEffectForTargets(i); + m_spellAura->_ApplyEffectForTargets(i); } void Spell::EffectApplyAreaAura(uint32 i) @@ -2610,8 +2609,7 @@ void Spell::EffectApplyAreaAura(uint32 i) if (!m_spellAura) return; assert (unitTarget == m_spellAura->GetOwner()); - if (!m_spellAura->IsRemoved()) - m_spellAura->ApplyEffectForTargets(i); + m_spellAura->_ApplyEffectForTargets(i); } void Spell::EffectUnlearnSpecialization( uint32 i ) @@ -3140,10 +3138,10 @@ void Spell::EffectPersistentAA(uint32 i) assert(false); return; } + m_spellAura->_RegisterForTargets(); } assert(m_spellAura->GetDynobjOwner()); - if (!m_spellAura->IsRemoved()) - m_spellAura->ApplyEffectForTargets(i); + m_spellAura->_ApplyEffectForTargets(i); } void Spell::EffectEnergize(uint32 i) -- cgit v1.2.3