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

--HG-- branch : trunk
2009-03-28 16:04:37 -06:00
parent 3c624f7c63
commit eb894f39e8
5 changed files with 15 additions and 12 deletions
@@ -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);
    }
 }