*Merge.

--HG--
branch : trunk

src/game/DynamicObject.cpp

@@ -113,12 +113,15 @@ void DynamicObject::Update(uint32 p_time)
     else
         deleteThis = true;
 
-    if(m_updateTimer < p_time)
+    if(m_effIndex < 4)
     {
-        Trinity::DynamicObjectUpdater notifier(*this,caster);
-        VisitNearbyObject(GetRadius(), notifier);
-        m_updateTimer = 500; // is this official-like?
-    }else m_updateTimer -= p_time;
+        if(m_updateTimer < p_time)
+        {
+            Trinity::DynamicObjectUpdater notifier(*this,caster);
+            VisitNearbyObject(GetRadius(), notifier);
+            m_updateTimer = 500; // is this official-like?
+        }else m_updateTimer -= p_time;
+    }
 
     if(deleteThis)
     {