diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 4139aa517bb..95d207f230b 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2487,10 +2487,15 @@ void Creature::CallAssistance() void Creature::CallForHelp(float radius) { - if (radius <= 0.0f || !GetVictim() || IsPet() || IsCharmed()) + if (radius <= 0.0f || !IsEngaged() || IsPet() || IsCharmed()) return; - Trinity::CallOfHelpCreatureInRangeDo u_do(this, GetVictim(), radius); + Unit* target = GetThreatManager().GetCurrentVictim(); + if (!target) + target = GetThreatManager().GetAnyTarget(); + ASSERT(target, "Creature %u (%s) is engaged without threat list", GetEntry(), GetName().c_str()); + + Trinity::CallOfHelpCreatureInRangeDo u_do(this, target, radius); Trinity::CreatureWorker<Trinity::CallOfHelpCreatureInRangeDo> worker(this, u_do); Cell::VisitGridObjects(this, worker, radius); } |