From 56fcd8ba1dc33e00ff6f98704764dcdebd838fd3 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Mon, 15 Jan 2018 15:42:41 +0100
Subject: Core/Threat: Fix a potential crash that would occur in specific edge
 cases of AI being a bit naughty.

(cherry picked from commit 1847555c8c9e630d4d5f1328f25c875f408be949)
---
 src/server/game/Combat/CombatManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/game/Combat/CombatManager.cpp')

diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp
index f2186d7fa8a..7630e3c1d2d 100644
--- a/src/server/game/Combat/CombatManager.cpp
+++ b/src/server/game/Combat/CombatManager.cpp
@@ -201,7 +201,7 @@ bool CombatManager::SetInCombatWith(Unit* who)
         NotifyAICombat(_owner, who);
     if (needOtherAI)
         NotifyAICombat(who, _owner);
-    return true;
+    return IsInCombatWith(who);
 }
 
 bool CombatManager::IsInCombatWith(ObjectGuid const& guid) const
-- 
cgit v1.2.3