*Merge.

--HG--
branch : trunk

1 files changed, 10 insertions, 4 deletions

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index bfd3b3ae1db..f75122d888f 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -81,15 +81,21 @@ GameObject::~GameObject()
 void GameObject::AddToWorld()
 {
     ///- Register the gameobject for guid lookup
-    if(!IsInWorld()) ObjectAccessor::Instance().AddObject(this);
-    WorldObject::AddToWorld();
+    if(!IsInWorld())
+    {
+        ObjectAccessor::Instance().AddObject(this);
+        WorldObject::AddToWorld();
+    }
 }
 
 void GameObject::RemoveFromWorld()
 {
     ///- Remove the gameobject from the accessor
-    if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
-    WorldObject::RemoveFromWorld();
+    if(IsInWorld())
+    {
+        ObjectAccessor::Instance().RemoveObject(this);
+        WorldObject::RemoveFromWorld();
+    }
 }
 
 bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, uint32 go_state, uint32 ArtKit)