From 581ae2719d1639d063a812901ff4b0983169cde7 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 25 Mar 2009 15:54:23 -0600
Subject: *Do not allow to add/remove obj to/from world more than once.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/game/Unit.cpp')

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()
-- 
cgit v1.2.3