diff options
| author | ccrs <ccrs@users.noreply.github.com> | 2017-12-11 21:00:04 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-02-25 18:50:55 +0100 |
| commit | 82b7f47d53d67fa9610d0bde5cf7d4995a43d468 (patch) | |
| tree | 047cd7d22d5c5034afd02fb2045f236e93dba31d /src/server/scripts | |
| parent | b77c9d7a8ccb73f4406b69caff40e356e9636295 (diff) | |
Core/AI: reorder methods in ScriptedEscortAI
plus ninja rename
(cherry picked from commit 0db5516a1a8edcb0bcac86bc1ba5354abe267097)
Diffstat (limited to 'src/server/scripts')
3 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 8fa32166e6d..cbcb5e81713 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -1188,7 +1188,7 @@ public: if (IsEvent || IsOverrun) { - ENSURE_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); + ENSURE_AI(hyjal_trashAI, me->AI())->SetActiveAttacker(false); EscortAI::UpdateAI(diff); } @@ -1309,7 +1309,7 @@ public: if (IsEvent || IsOverrun) { - ENSURE_AI(hyjal_trashAI, me->AI())->SetCanAttack(false); + ENSURE_AI(hyjal_trashAI, me->AI())->SetActiveAttacker(false); EscortAI::UpdateAI(diff); } 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); |