aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Combat/CombatManager.cpp
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-01-15 15:42:41 +0100
committerTreeston <treeston.mmoc@gmail.com>2018-01-15 15:42:41 +0100
commit1847555c8c9e630d4d5f1328f25c875f408be949 (patch)
treea37cfa4abf527fd3c5a35bf514ee9f2e03027d51 /src/server/game/Combat/CombatManager.cpp
parent50a84f0b2bb537380ad501d180b242d0fe6ff46b (diff)
Core/Threat: Fix a potential crash that would occur in specific edge cases of AI being a bit naughty.
Diffstat (limited to 'src/server/game/Combat/CombatManager.cpp')
-rw-r--r--src/server/game/Combat/CombatManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Combat/CombatManager.cpp b/src/server/game/Combat/CombatManager.cpp
index 68ed37dd03f..2f5a4fa87b9 100644
--- a/src/server/game/Combat/CombatManager.cpp
+++ b/src/server/game/Combat/CombatManager.cpp
@@ -202,7 +202,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