diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-20 17:48:18 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-20 17:48:18 +0200 |
| commit | 34cd8e808eb7ae2915a970213a37eb2c615fd7fe (patch) | |
| tree | 4c1e374a7b70a92d2ec504241d143eae0fd95d1b /src/server/game/Grids/ObjectGridLoader.cpp | |
| parent | 9727cc49ef05af37c19a10b59c3650fd4cf5cad1 (diff) | |
| parent | d74b8f0a1a4c72506d5a287334b6e7ae663da8ac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Grids/ObjectGridLoader.cpp')
| -rw-r--r-- | src/server/game/Grids/ObjectGridLoader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 50a54cd7263..9293f9e9b84 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -218,8 +218,7 @@ void ObjectGridStoper::Visit(CreatureMapType &m) { iter->GetSource()->CombatStop(); iter->GetSource()->DeleteThreatList(); - if (iter->GetSource()->IsAIEnabled) - iter->GetSource()->AI()->EnterEvadeMode(); + iter->GetSource()->AI()->EnterEvadeMode(); } } } |