[patch 213] Fixed a crash with Object::GetUInt64Value

insider42 · Nov 13, 2009 · 6708cb5 · 6708cb5
1 parent f8514c3
commit 6708cb5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
@@ -11931,6 +11931,8 @@ void Unit::RemoveFromWorld()
     {
         RemoveNotOwnSingleTargetAuras();
         RemoveGuardians();
+        RemoveAllGameObjects();
+        RemoveAllDynObjects();
     }
 
     Object::RemoveFromWorld();
@@ -11947,8 +11949,6 @@ void Unit::CleanupsBeforeDelete()
         DeleteThreatList();
         getHostileRefManager().setOnlineOfflineState(false);
         RemoveAllAuras(AURA_REMOVE_BY_DELETE);
-        RemoveAllGameObjects();
-        RemoveAllDynObjects();
         GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
     }
     WorldObject::CleanupsBeforeDelete();