From 6708cb50d7999030a47b491d0951eb78bd622250 Mon Sep 17 00:00:00 2001
From: Insider <insider42rus@yandex.ru>
Date: Fri, 13 Nov 2009 16:06:35 +0700
Subject: [PATCH] [patch 213] Fixed a crash with Object::GetUInt64Value

---
 src/game/Unit.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index aa619b5aef3..312593b9a12 100644
--- 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();