*Merge.

--HG--
branch : trunk

1 files changed, 10 insertions, 4 deletions

diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index 0da3749ca2b..3ac8b688e8b 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -41,15 +41,21 @@ DynamicObject::DynamicObject() : WorldObject()
 void DynamicObject::AddToWorld()
 {
     ///- Register the dynamicObject for guid lookup
-    if(!IsInWorld()) ObjectAccessor::Instance().AddObject(this);
-    WorldObject::AddToWorld();
+    if(!IsInWorld())
+    {
+        ObjectAccessor::Instance().AddObject(this);
+        WorldObject::AddToWorld();
+    }
 }
 
 void DynamicObject::RemoveFromWorld()
 {
     ///- Remove the dynamicObject from the accessor
-    if(IsInWorld()) ObjectAccessor::Instance().RemoveObject(this);
-    WorldObject::RemoveFromWorld();
+    if(IsInWorld())
+    {
+        ObjectAccessor::Instance().RemoveObject(this);
+        WorldObject::RemoveFromWorld();
+    }
 }
 
 bool DynamicObject::Create( uint32 guidlow, Unit *caster, uint32 spellId, uint32 effIndex, float x, float y, float z, int32 duration, float radius )