*Only let creatures in combat enterevademode when stopping grid.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-13 17:11:23 -05:00
parent 30efb6ff7f
commit ce9f023a96
+6 -3
View File
@@ -279,10 +279,13 @@ ObjectGridStoper::Visit(CreatureMapType &m)
// stop any fights at grid de-activation and remove dynobjects created at cast by creatures // 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) for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
{ {
iter->getSource()->CombatStop();
iter->getSource()->DeleteThreatList();
iter->getSource()->RemoveAllDynObjects(); iter->getSource()->RemoveAllDynObjects();
iter->getSource()->AI()->EnterEvadeMode(); if(iter->getSource()->isInCombat())
{
iter->getSource()->CombatStop();
iter->getSource()->DeleteThreatList();
iter->getSource()->AI()->EnterEvadeMode();
}
} }
} }