*First remove object from world then unregister it. This may fix some crashes.

--HG--
branch : trunk

1 files changed, 1 insertions, 2 deletions

diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index afa9b6eb1c5..b2bc134a2c0 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -85,10 +85,9 @@ void Pet::RemoveFromWorld()
     ///- Remove the pet from the accessor
     if(IsInWorld())
     {
-        ///- Remove the pet from the accessor
-        ObjectAccessor::Instance().RemoveObject(this);
         ///- Don't call the function for Creature, normal mobs + totems go in a different storage
         Unit::RemoveFromWorld();
+        ObjectAccessor::Instance().RemoveObject(this);
     }
 }