Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creature: Some adjustments to Creature::CallForHelp. Now works even if the Creature hasn't selected a victim yet.

Browse Source 
(cherry picked from commit 79f0e55dcb)
This commit is contained in:
Treeston
2018-08-22 22:21:47 +02:00
committed by Shauren
parent fff5a32a13
commit 6b8329f6af
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -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);
}