aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorccrs <ccrs@users.noreply.github.com>2017-12-11 21:00:04 +0100
committerccrs <ccrs@users.noreply.github.com>2017-12-11 21:00:04 +0100
commit0db5516a1a8edcb0bcac86bc1ba5354abe267097 (patch)
tree3a95702ee05d7e6d6ab830e1a7ce6842e48a6d8f /src/server/scripts
parent94f425c6d5e99a9f5b110fffc2ec72ceb6a6d5a5 (diff)
Core/AI: reorder methods in ScriptedEscortAI
plus ninja rename
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp4
-rw-r--r--src/server/scripts/Northrend/zone_borean_tundra.cpp2
-rw-r--r--src/server/scripts/Northrend/zone_howling_fjord.cpp2
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 1aa96375a41..d4fb3b01a68 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 4b32348ab54..3e7c03becb8 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -1753,7 +1753,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 e2df8f6ca96..7ba024d78c0 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);