*Fix the bug that ~Unit makes crash.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index b726e78c69e..1fed4717db6 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11095,6 +11095,8 @@ void Unit::CleanupsBeforeDelete()
 {
     if(m_uint32Values)                                      // only for fully created object
     {
+        UnpossessSelf(false);
+        RemoveAllFromVision();
         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();
@@ -11104,8 +11106,6 @@ void Unit::CleanupsBeforeDelete()
         RemoveAllAuras();
         RemoveAllGameObjects();
         RemoveAllDynObjects();
-        UnpossessSelf(false);
-        RemoveAllFromVision();
         GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
     }
     RemoveFromWorld();