diff options
| author | QAston <none@none> | 2010-01-24 13:08:25 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2010-01-24 13:08:25 +0100 |
| commit | d1a40eb6888c325b3f01ac8a90f1dbac7ed56ea0 (patch) | |
| tree | d73e698cb5ce789e70382a150aa57298c8c06b02 /src/game/SpellEffects.cpp | |
| parent | 79accd730ecbf396b856ee42e25f2c23e51dceed (diff) | |
*Do not keep area aura targets in combat with aura owner
*Add some safety checks to area aura target map update.
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellEffects.cpp')
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
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) |