From eb894f39e8e05cfe2f266107da4410d19558ff80 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 28 Mar 2009 16:04:37 -0600
Subject: *First remove object from world then unregister it. This may fix some
 crashes.

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

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

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 4e5fca4e9d6..49ec6854e9d 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -185,8 +185,8 @@ void Creature::RemoveFromWorld()
     {
         if(m_formationID)
             formation_mgr.DestroyGroup(m_formationID, GetGUID());
-        ObjectAccessor::Instance().RemoveObject(this);
         Unit::RemoveFromWorld();
+        ObjectAccessor::Instance().RemoveObject(this);
     }
 }
 
-- 
cgit v1.2.3