From 6b8329f6af801dae065a15322f07b95e83ed34fc Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 22 Aug 2018 22:21:47 +0200 Subject: Core/Creature: Some adjustments to Creature::CallForHelp. Now works even if the Creature hasn't selected a victim yet. (cherry picked from commit 79f0e55dcbe4a978363b4216188dd45e77512d1c) --- src/server/game/Entities/Creature/Creature.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') 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 worker(this, u_do); Cell::VisitGridObjects(this, worker, radius); } -- cgit v1.2.3