aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeston <treeston.mmoc@gmail.com>2018-08-23 12:37:44 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-22 23:21:01 +0200
commit6a91fe3fbe28e3bf36ab6107b9c6cbb842f65262 (patch)
tree05abb6c6aa0a2280ef2224f5ac6ffbafb8a39c90 /src
parentf6ceb4bf0c5f95c043e90708e9369f7199a4201b (diff)
Core/Creature: Fall back to combat list if calling for help without threat list
(cherry picked from commit 0e4a49b0a4c86eb4a2d0d128e24bc8aaabb47e31)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 95d207f230b..b0b6ca9b270 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -2493,6 +2493,8 @@ void Creature::CallForHelp(float radius)
Unit* target = GetThreatManager().GetCurrentVictim();
if (!target)
target = GetThreatManager().GetAnyTarget();
+ if (!target)
+ target = GetCombatManager().GetAnyTarget();
ASSERT(target, "Creature %u (%s) is engaged without threat list", GetEntry(), GetName().c_str());
Trinity::CallOfHelpCreatureInRangeDo u_do(this, target, radius);