*[8261] Skip not in world targets in same way as not existed targets (note: this is a hack and needs better sollution) Author: VladimirMangos.

--HG--
branch : trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 3656e5096f3..8002a5cf078 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -12198,7 +12198,6 @@ void Unit::RemoveFromWorld()
         ExitVehicle();
         UnsummonAllTotems();
         RemoveAllControlled();
-        GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
 
         if(m_NotifyListPos >= 0)
         {
@@ -12231,6 +12230,7 @@ void Unit::CleanupsBeforeDelete()
     getHostilRefManager().setOnlineOfflineState(false);
     RemoveAllGameObjects();
     RemoveAllDynObjects();
+    GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
 
     if(IsInWorld())
         RemoveFromWorld();