diff options
Diffstat (limited to 'src/server/scripts/Outland')
8 files changed, 13 insertions, 13 deletions
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 540cbee00e4..31bfb9c919d 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1379,7 +1379,7 @@ struct npc_parasitic_shadowfiend : public ScriptedAI _scheduler.Schedule(Seconds(2), [this](TaskContext /*context*/) { me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); }); } @@ -1394,7 +1394,7 @@ struct npc_parasitic_shadowfiend : public ScriptedAI _scheduler.Schedule(Seconds(2), [this](TaskContext /*context*/) { me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); }); } @@ -1497,7 +1497,7 @@ struct npc_flame_of_azzinoth : public ScriptedAI { case EVENT_ENGAGE: me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); _events.ScheduleEvent(EVENT_FLAME_CHARGE, Seconds(5)); break; case EVENT_FLAME_CHARGE: diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 211a22024ee..fbe05f264b2 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -632,7 +632,7 @@ struct npc_enslaved_soul : public ScriptedAI _scheduler.Schedule(Seconds(3), [this](TaskContext /*context*/) { me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); }); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index f6ff50c5dc1..6410f8786b8 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -232,7 +232,7 @@ struct npc_doom_blossom : public NullCreatureAI DoCast(SPELL_SUMMON_BLOSSOM_MOVE_TARGET); _scheduler.CancelAll(); - me->SetInCombatWithZone(); + DoZoneInCombat(); _scheduler.Schedule(Seconds(12), [this](TaskContext shadowBolt) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index bf8040bd287..ffcd188c82c 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -390,7 +390,7 @@ public: if (summon->GetEntry() == NPC_AHUNE) return; - summon->SetInCombatWithZone(); + DoZoneInCombat(summon); _summons.Summon(summon); } @@ -469,7 +469,7 @@ public: if (TempSummon* ahune = me->SummonCreature(NPC_AHUNE, SummonPositions[0], TEMPSUMMON_DEAD_DESPAWN)) { ahune->SummonCreature(NPC_FROZEN_CORE, SummonPositions[1], TEMPSUMMON_CORPSE_DESPAWN); - ahune->SetInCombatWithZone(); + DoZoneInCombat(ahune); DoCast(ahune, SPELL_RESURFACE); } break; @@ -670,7 +670,7 @@ public: if (Creature* ahuneBunny = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AHUNE_BUNNY))) { ahuneBunny->AI()->DoAction(ACTION_START_EVENT); - ahuneBunny->SetInCombatWithZone(); + ahuneBunny->AI()->DoZoneInCombat(); } if (Creature* luma = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_LUMA_SKYMOTHER))) luma->CastSpell(player, SPELL_SUMMONING_RHYME_AURA, true); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 2b37ea8531d..eb471ad95eb 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -103,7 +103,7 @@ class boss_broggok : public CreatureScript switch (action) { case ACTION_PREPARE_BROGGOK: - me->SetInCombatWithZone(); + DoZoneInCombat(); break; case ACTION_ACTIVATE_BROGGOK: me->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 73e756e5d91..2a8647154c0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -287,7 +287,7 @@ class instance_blood_furnace : public InstanceMapScript { prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); prisoner->SetImmuneToAll(false); - prisoner->SetInCombatWithZone(); + prisoner->AI()->DoZoneInCombat(); } } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 3ea1ea2e629..485bb682ef2 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -250,7 +250,7 @@ class boss_magtheridon : public CreatureScript case EVENT_RELEASED: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(false); - me->SetInCombatWithZone(); + DoZoneInCombat(); instance->SetData(DATA_MANTICRON_CUBE, ACTION_ENABLE); events.ScheduleEvent(EVENT_CLEAVE, Seconds(10)); events.ScheduleEvent(EVENT_BLAST_NOVA, Seconds(60)); @@ -354,7 +354,7 @@ class npc_hellfire_channeler : public CreatureScript if (Creature* magtheridon = _instance->GetCreature(DATA_MAGTHERIDON)) magtheridon->AI()->JustSummoned(summon); - summon->SetInCombatWithZone(); + DoZoneInCombat(summon); } void EnterEvadeMode(EvadeReason /*why*/) override diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index eb550e2d874..383ec54a2d1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -123,7 +123,7 @@ class instance_magtheridons_lair : public InstanceMapScript for (ObjectGuid warderGuid : warderGUIDS) if (Creature* warder = instance->GetCreature(warderGuid)) if (warder->IsAlive()) - warder->SetInCombatWithZone(); + warder->AI()->DoZoneInCombat(); break; default: break; |