From 86e3737d1158d99f181454564046e2b634238cd7 Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Mon, 13 Oct 2014 22:37:44 +0200
Subject: Core/Movement: Fix evade issue

Fix evade issue happening when an evading creature assists another one, causing it to stay in evading state forever.
Fix #4943
---
 src/server/game/Entities/Creature/Creature.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 9f28305e3cf..b8fd0195038 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1876,6 +1876,9 @@ void Creature::CallForHelp(float radius)
 
 bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const
 {
+    if (IsInEvadeMode())
+        return false;
+
     // is it true?
     if (!HasReactState(REACT_AGGRESSIVE))
         return false;
-- 
cgit v1.2.3