diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
| commit | f506ee3077a5a8c86d3a02ab06c1c3e91b7d8d7e (patch) | |
| tree | f0844a12facac7cd7a94c47cbab56d2bb55962a4 /src/server/game/AI/CreatureAI.cpp | |
| parent | fa0aaa5fa4ed93992e54cce411944e41d1fd831d (diff) | |
| parent | eefdceea71135c6b281d181233da04159e63b179 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/game/AI/CreatureAI.cpp')
| -rw-r--r-- | src/server/game/AI/CreatureAI.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index a494507919a..cbb79b47958 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -225,8 +225,9 @@ bool CreatureAI::_EnterEvadeMode() if (!me->IsAlive()) return false; - // dont remove vehicle auras, passengers arent supposed to drop off the vehicle - me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE); + // don't remove vehicle auras, passengers aren't supposed to drop off the vehicle + // don't remove clone caster on evade (to be verified) + me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE, SPELL_AURA_CLONE_CASTER); // sometimes bosses stuck in combat? me->DeleteThreatList(); |