diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-03-01 20:12:46 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-04-08 22:48:06 +0200 |
| commit | 3b67e57e0e2730e7ad9bcbcbd1cc86739d21ffd1 (patch) | |
| tree | 1d0e82d574a6437f566d38926b6114ad0759bc87 /src | |
| parent | bedd2f4236044cc1c88d77a059a00108a07645fc (diff) | |
Core/Creature: Prevent friendly vehicles from trying to attack their rider after dismounting.
(cherry picked from commit 89e2afb8f9f3766c6ca0e780371f5421c79064b1)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 3 |
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 ce14e61d8e6..477a5fd3a49 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -582,7 +582,8 @@ void Creature::Update(uint32 diff) IsAIEnabled = true; if (!IsInEvadeMode() && !LastCharmerGUID.IsEmpty()) if (Unit* charmer = ObjectAccessor::GetUnit(*this, LastCharmerGUID)) - i_AI->AttackStart(charmer); + if (CanStartAttack(charmer, true)) + i_AI->AttackStart(charmer); LastCharmerGUID.Clear(); } |