Merge

--HG--
branch : trunk

1 files changed, 6 insertions, 2 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index fdf54cb018a..1204c508695 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3885,6 +3885,7 @@ void Unit::RemoveOwnedAura(AuraMap::iterator &i, AuraRemoveMode removeMode)
         ++m_auraUpdateIterator;
 
     m_ownedAuras.erase(i);
+    m_removedAuras.push_back(aura);
 
     // Unregister single target aura
     if (aura->IsSingleTarget())
@@ -12960,7 +12961,7 @@ void Unit::RemoveFromWorld()
     }
 }
 
-void Unit::CleanupsBeforeDelete()
+void Unit::CleanupsBeforeDelete(bool finalCleanup)
 {
     if (IsInWorld())
         RemoveFromWorld();
@@ -12970,7 +12971,10 @@ void Unit::CleanupsBeforeDelete()
     //A unit may be in removelist and not in world, but it is still in grid
     //and may have some references during delete
     RemoveAllAuras();
-    m_cleanupDone = true;
+
+    if (finalCleanup)
+        m_cleanupDone = true;
+
     InterruptNonMeleeSpells(true);
     m_Events.KillAllEvents(false);                      // non-delatable (currently casted spells) will not deleted now but it will deleted at call in Map::RemoveAllObjectsInRemoveList
     CombatStop();