From 82b7f47d53d67fa9610d0bde5cf7d4995a43d468 Mon Sep 17 00:00:00 2001 From: ccrs Date: Mon, 11 Dec 2017 21:00:04 +0100 Subject: Core/AI: reorder methods in ScriptedEscortAI plus ninja rename (cherry picked from commit 0db5516a1a8edcb0bcac86bc1ba5354abe267097) --- src/server/scripts/Northrend/zone_borean_tundra.cpp | 2 +- src/server/scripts/Northrend/zone_howling_fjord.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index dd160545a7c..0be916f8aba 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1750,7 +1750,7 @@ public: void UpdateEscortAI(uint32 /*diff*/) override { - if (GetAttack() && UpdateVictim()) + if (IsActiveAttacker() && UpdateVictim()) { if (Bonker_agro == 0) { diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 83ef9f8e355..ccc2ffdc63c 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -130,7 +130,7 @@ public: } else PotTimer -= diff; } - if (GetAttack() && UpdateVictim()) + if (IsActiveAttacker() && UpdateVictim()) DoMeleeAttackIfReady(); EscortAI::UpdateAI(diff); -- cgit v1.2.3