*Do not allow to add/remove obj to/from world more than once.

--HG--
branch : trunk

1 files changed, 1 insertions, 2 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index ac6881a4356..4e400c509c8 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11268,9 +11268,8 @@ void Unit::RemoveFromWorld()
         RemoveCharmAuras();
         RemoveBindSightAuras();
         RemoveNotOwnSingleTargetAuras();
+        WorldObject::RemoveFromWorld();
     }
-
-    WorldObject::RemoveFromWorld();
 }
 
 void Unit::CleanupsBeforeDelete()