From 3b67e57e0e2730e7ad9bcbcbd1cc86739d21ffd1 Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Tue, 1 Mar 2016 20:12:46 +0100
Subject: [PATCH] Core/Creature: Prevent friendly vehicles from trying to
 attack their rider after dismounting.

(cherry picked from commit 89e2afb8f9f3766c6ca0e780371f5421c79064b1)
---
 src/server/game/Entities/Creature/Creature.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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();
             }