diff options
author | megamage <none@none> | 2009-01-18 10:55:16 -0600 |
---|---|---|
committer | megamage <none@none> | 2009-01-18 10:55:16 -0600 |
commit | f4991543db423f246fb806f0af462d0a610f6b95 (patch) | |
tree | 2b0201d0bdff98a582db13caff8d9cd25c07fc7d | |
parent | 1f3e051d22e4c482e83b4dd4051bf1690e7be5ed (diff) |
*Fix a crash bug. Do not use 880.
--HG--
branch : trunk
-rw-r--r-- | src/game/Unit.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 6d2eb1ec4cc..ef2570ddc9a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4662,13 +4662,6 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) Aur->SetStackAmount(0); Aur->_RemoveAura(); - delete Aur; - - if(caster_channeled) - RemoveAurasAtChanneledTarget (AurSpellInfo); - - if(statue) - statue->UnSummon(); if(mode != AURA_REMOVE_BY_STACK) { @@ -4684,6 +4677,14 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) } } + delete Aur; + + if(caster_channeled) + RemoveAurasAtChanneledTarget (AurSpellInfo); + + if(statue) + statue->UnSummon(); + // only way correctly remove all auras from list if( m_Auras.empty() ) i = m_Auras.end(); |