*Merge.

--HG--
branch : trunk

src/game/ObjectGridLoader.cpp

@@ -311,10 +311,13 @@ ObjectGridStoper::Visit(CreatureMapType &m)
     // stop any fights at grid de-activation and remove dynobjects created at cast by creatures
     for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
     {
-        iter->getSource()->CombatStop();
-        iter->getSource()->DeleteThreatList();
         iter->getSource()->RemoveAllDynObjects();
-        iter->getSource()->AI()->EnterEvadeMode();
+        if(iter->getSource()->isInCombat())
+        {
+            iter->getSource()->CombatStop();
+            iter->getSource()->DeleteThreatList();
+            iter->getSource()->AI()->EnterEvadeMode();
+        }
     }
 }