aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-03-01 20:12:46 +0100
committertreeston <treeston.mmoc@gmail.com>2016-03-01 20:12:46 +0100
commit89e2afb8f9f3766c6ca0e780371f5421c79064b1 (patch)
tree27d160c4846b1db24d165795fc54c27f74b00e76 /src
parentecd9dec384750cc9c3e7bb31f7d2ea42642fb6ca (diff)
Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 5d62b740947..9562f8424c1 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -578,7 +578,8 @@ void Creature::Update(uint32 diff)
IsAIEnabled = true;
if (!IsInEvadeMode() && LastCharmerGUID)
if (Unit* charmer = ObjectAccessor::GetUnit(*this, LastCharmerGUID))
- i_AI->AttackStart(charmer);
+ if (CanStartAttack(charmer, true))
+ i_AI->AttackStart(charmer);
LastCharmerGUID.Clear();
}