From 1020d1995f310185944e83b18539092856b3c19a Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 23 Aug 2018 12:37:44 +0200 Subject: [PATCH] Core/Creature: Fall back to combat list if calling for help without threat list --- src/server/game/Entities/Creature/Creature.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 5be755928e..eaceb0036c 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2340,6 +2340,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);