*Only let creatures in combat enterevademode when stopping grid.

--HG-- branch : trunk
2009-04-13 17:11:23 -05:00
parent 30efb6ff7f
commit ce9f023a96
1 changed files with 6 additions and 3 deletions
@@ -278,13 +278,16 @@ 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()->RemoveAllDynObjects();
+        if(iter->getSource()->isInCombat())
        {
            iter->getSource()->CombatStop();
            iter->getSource()->DeleteThreatList();
-        iter->getSource()->RemoveAllDynObjects();
            iter->getSource()->AI()->EnterEvadeMode();
        }
    }
+}

 void
 ObjectGridCleaner::Stop(GridType &grid)