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

--HG-- branch : trunk
2009-03-25 15:54:23 -06:00
parent 435570903a
commit 581ae2719d
6 changed files with 48 additions and 23 deletions
@@ -177,19 +177,24 @@ Creature::~Creature()
 void Creature::AddToWorld()
 {
    ///- Register the creature for guid lookup
-    if(!IsInWorld()) ObjectAccessor::Instance().AddObject(this);
-    Unit::AddToWorld();
-    SearchFormation();
+    if(!IsInWorld())
+    {
+        ObjectAccessor::Instance().AddObject(this);
+        Unit::AddToWorld();
+        SearchFormation();
+    }
 }

 void Creature::RemoveFromWorld()
 {
-    if(m_formationID)
-        formation_mgr.DestroyGroup(m_formationID, GetGUID());
-
    ///- Remove the creature from the accessor
-    if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
-    Unit::RemoveFromWorld();
+    if(IsInWorld())
+    {
+        if(m_formationID)
+            formation_mgr.DestroyGroup(m_formationID, GetGUID());
+        ObjectAccessor::Instance().RemoveObject(this);
+        Unit::RemoveFromWorld();
+    }
 }

 void Creature::SearchFormation()