diff options
| -rw-r--r-- | src/game/ObjectGridLoader.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp index d69499d8014..b819182a50d 100644 --- a/src/game/ObjectGridLoader.cpp +++ b/src/game/ObjectGridLoader.cpp @@ -279,10 +279,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(); + } } } |