diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index 429e06bdd5..8b9ed9405f 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -349,14 +349,14 @@ struct boss_ascendant_council_controller final : public BossAI if (Creature* arion = instance->GetCreature(DATA_ARION)) { - arion->SetInCombatWithZone(); + DoZoneInCombat(arion); if (IsHeroic()) arion->AI()->DoAction(ACTION_SCHEDULE_HEROIC_ABILITY); } if (Creature* terrastra = instance->GetCreature(DATA_TERRASTRA)) { - terrastra->SetInCombatWithZone(); + DoZoneInCombat(terrastra); if (IsHeroic()) terrastra->AI()->DoAction(ACTION_SCHEDULE_HEROIC_ABILITY); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index 5e1ef469b3..618bf196dc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -167,7 +167,7 @@ public: events.SetPhase(PHASE_ONE); me->SetImmuneToPC(false); me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON); - me->SetInCombatWithZone(); + DoZoneInCombat(); EntryCheckPredicate pred(NPC_ANTAGONIST); summons.DoAction(ACTION_ANTAGONIST_HOSTILE, pred); @@ -215,7 +215,7 @@ public: void SummonSister(uint32 entry) { if (Creature* sister = me->SummonCreature(entry, me->GetPosition(), TEMPSUMMON_DEAD_DESPAWN)) - sister->SetInCombatWithZone(); + DoZoneInCombat(sister); } void UpdateAI(uint32 diff) override @@ -359,7 +359,7 @@ public: { me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON); DoCastAOE(SPELL_MOLE_MACHINE_EMERGE, true); - me->SetInCombatWithZone(); + DoZoneInCombat(); } void IsSummonedBy(Unit* /*summoner*/) override @@ -400,7 +400,7 @@ public: case ACTION_ANTAGONIST_HOSTILE: me->SetImmuneToPC(false); me->SetFaction(FACTION_GOBLIN_DARK_IRON_BAR_PATRON); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; default: break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index f1ffc95dd6..63d62631da 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -456,7 +456,7 @@ public: if (id == 1) { - me->SetInCombatWithZone(); + DoZoneInCombat(); if (me->GetVictim()) AttackStart(me->GetVictim()); } @@ -575,7 +575,7 @@ public: if ((*itr) && !(*itr)->IsAlive()) { (*itr)->Respawn(); - (*itr)->SetInCombatWithZone(); + DoZoneInCombat(*itr); (*itr)->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); (*itr)->SetReactState(REACT_AGGRESSIVE); (*itr)->SetStandState(UNIT_STAND_STATE_STAND); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp index 126b354542..137e83fd40 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp @@ -244,9 +244,9 @@ public: switch (eventId) { case EVENT_RAZOR_SPAWN: - for (uint8 i = urand(2, 5); i > 0 ; --i) + for (uint8 i = urand(2, 5); i > 0; --i) if (Creature* summon = instance->SummonCreature(Entry[urand(0, 4)], SummonPosition[urand(0, 7)])) - summon->SetInCombatWithZone(); + summon->AI()->DoZoneInCombat(); _events.ScheduleEvent(EVENT_RAZOR_SPAWN, urand(12, 17) * IN_MILLISECONDS); break; case EVENT_RAZOR_PHASE_TWO: diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp index 1d97641fb7..2ccca734d5 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp @@ -432,7 +432,7 @@ class npc_foe_reaper_5000_molten_slag : public CreatureScript case EVENT_MOLTEN_SHIELD: DoCastSelf(SPELL_MOLTEN_SHIELD, true); me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; case EVENT_FIXATE_PLAYER: DoCastAOE(SPELL_FIXATE_TARGETING, true); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index e6283e7c2c..019f11a1a4 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -358,7 +358,7 @@ class npc_shard_of_torment : public CreatureScript me->DespawnOrUnsummon(); DoCast(SPELL_TORMENT_COSMETIC_1); _events.ScheduleEvent(EVENT_SHARD_SPAWN_EFFECT, 5000); - me->SetInCombatWithZone(); + DoZoneInCombat(); } else me->DespawnOrUnsummon(); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp b/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp index 4245ac8a6d..02a3a8a492 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_lord_rhyolith.cpp @@ -345,7 +345,8 @@ struct boss_lord_rhyolith : public BossAI summon->m_Events.AddEventAtOffset([summon]() { summon->SetReactState(REACT_AGGRESSIVE); - summon->SetInCombatWithZone(); + if (CreatureAI* ai = summon->AI()) + ai->DoZoneInCombat(summon); if (summon->GetEntry() == NPC_SPARK_OF_RHYOLITH) summon->CastSpell(nullptr, SPELL_IMMOLATION_2); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp index a63b86ba83..81612a7ca9 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp @@ -310,7 +310,7 @@ public: void Reset() override { me->SetReactState(REACT_PASSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); events.Reset(); events.ScheduleEvent(EVENT_ORB_ADD_VISUAL, Seconds(1)); events.ScheduleEvent(EVENT_ORB_SET_AGGRESSIVE, Seconds(2)); @@ -410,7 +410,7 @@ public: { case ACTION_IMAGES_SET_AGGRESSIVE: me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) AttackStart(target); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index e4e0d872e2..c88542294f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -124,7 +124,7 @@ public: return; Talk(TEXT_AGGRO); - me->SetInCombatWithZone(); + DoZoneInCombat(); instance->SetBossState(DATA_JEDOGA_SHADOWSEEKER, IN_PROGRESS); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index b04a8c52ce..2ba1f8e80b 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -230,7 +230,7 @@ class npc_legion_flame : public CreatureScript void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - me->SetInCombatWithZone(); + DoZoneInCombat(); DoCast(SPELL_LEGION_FLAME_EFFECT); } @@ -324,7 +324,7 @@ class npc_fel_infernal : public CreatureScript DoCast(target, SPELL_FEL_STREAK_VISUAL); context.Repeat(Seconds(15)); }); - me->SetInCombatWithZone(); + DoZoneInCombat(); } void UpdateAI(uint32 diff) override @@ -427,7 +427,7 @@ class npc_mistress_of_pain : public CreatureScript _events.ScheduleEvent(EVENT_SPINNING_STRIKE, 30*IN_MILLISECONDS); if (IsHeroic()) _events.ScheduleEvent(EVENT_MISTRESS_KISS, 15*IN_MILLISECONDS); - me->SetInCombatWithZone(); + DoZoneInCombat(); } void JustDied(Unit* /*killer*/) override diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 8082e4c0c2..9b90211794 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -207,7 +207,7 @@ class boss_gormok : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(false); me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; default: break; @@ -332,7 +332,7 @@ class npc_snobold_vassal : public CreatureScript void Reset() override { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - me->SetInCombatWithZone(); + DoZoneInCombat(); _events.ScheduleEvent(EVENT_CHECK_MOUNT, Seconds(1)); _events.ScheduleEvent(EVENT_FIRE_BOMB, Seconds(5), Seconds(30)); } @@ -566,7 +566,7 @@ struct boss_jormungarAI : public BossAI void JustEngagedWith(Unit* who) override { BossAI::JustEngagedWith(who); - me->SetInCombatWithZone(); + DoZoneInCombat(); instance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_IN_PROGRESS); } @@ -617,7 +617,7 @@ struct boss_jormungarAI : public BossAI acidmaw->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); acidmaw->SetImmuneToPC(false); acidmaw->SetReactState(REACT_AGGRESSIVE); - acidmaw->SetInCombatWithZone(); + DoZoneInCombat(acidmaw); acidmaw->CastSpell(acidmaw, SPELL_EMERGE); acidmaw->CastSpell(acidmaw, SPELL_GROUND_VISUAL_1, true); } @@ -646,7 +646,7 @@ struct boss_jormungarAI : public BossAI DoCast(me, SPELL_SUBMERGE); DoCast(me, SPELL_GROUND_VISUAL_0, true); me->RemoveAurasDueToSpell(SPELL_EMERGE); - me->SetInCombatWithZone(); + DoZoneInCombat(); events.SetPhase(PHASE_SUBMERGED); events.ScheduleEvent(EVENT_EMERGE, 5*IN_MILLISECONDS, 0, PHASE_SUBMERGED); me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); @@ -775,7 +775,7 @@ class boss_dreadscale : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(false); me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; default: break; @@ -947,7 +947,7 @@ class boss_icehowl : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); me->SetImmuneToPC(false); me->SetReactState(REACT_AGGRESSIVE); - me->SetInCombatWithZone(); + DoZoneInCombat(); break; default: break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 3ec2a4eefc..7f14513521 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -256,7 +256,7 @@ class npc_announcer_toc10 : public CreatureScript jaraxxus->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); jaraxxus->SetImmuneToPC(false); jaraxxus->SetReactState(REACT_DEFENSIVE); - jaraxxus->SetInCombatWithZone(); + DoZoneInCombat(jaraxxus); } else { @@ -446,7 +446,7 @@ class npc_fizzlebang_toc : public CreatureScript jaraxxus->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); jaraxxus->SetImmuneToPC(false); jaraxxus->SetReactState(REACT_AGGRESSIVE); - jaraxxus->SetInCombatWithZone(); + DoZoneInCombat(jaraxxus); } } @@ -655,7 +655,7 @@ class npc_tirion_toc : public CreatureScript break; case 155: // keep the raid in combat for the whole encounter, pauses included - me->SetInCombatWithZone(); + DoZoneInCombat(); _updateTimer = 5*IN_MILLISECONDS; _instance->SetData(TYPE_EVENT, 160); break; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 5ebd145801..0a89249d0f 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -466,7 +466,7 @@ public: alexstraszaBunny->GetNearPoint2D(nullptr, pos.m_positionX, pos.m_positionY, 30.0f, alexstraszaBunny->GetAngle(me)); me->GetMotionMaster()->MoveLand(POINT_LAND_P_ONE, pos); me->SetImmuneToAll(false); - me->SetInCombatWithZone(); + DoZoneInCombat(); events.ScheduleEvent(EVENT_LAND_START_ENCOUNTER, 7*IN_MILLISECONDS, 1, PHASE_NOT_STARTED); } break; @@ -1159,7 +1159,7 @@ public: if (unit->GetTypeId() == TYPEID_UNIT) { unit->CastSpell(unit, SPELL_TELEPORT_VISUAL_ONLY); - unit->ToCreature()->SetInCombatWithZone(); + DoZoneInCombat(unit->ToCreature()); } else if (unit->GetTypeId() == TYPEID_PLAYER) me->SetDisableGravity(true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index f156279573..090b59dbf5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -258,7 +258,7 @@ class boss_auriaya : public CreatureScript Defender->Respawn(); if (defenderLives) Defender->SetAuraStack(SPELL_FERAL_ESSENCE, Defender, defenderLives); - Defender->SetInCombatWithZone(); + DoZoneInCombat(Defender); if (!Defender->IsInCombat()) Defender->AI()->AttackStart(me->GetVictim()); events.CancelEvent(EVENT_RESPAWN_DEFENDER); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 306e6c2e92..4115146085 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -463,7 +463,7 @@ class boss_voice_of_yogg_saron : public CreatureScript { // TODO: MoveInLineOfSight doesn't work for such a big distance if (who->GetTypeId() == TYPEID_PLAYER && !who->ToPlayer()->IsGameMaster() && me->GetDistance2d(who) < 99.0f && !me->IsInCombat()) - me->SetInCombatWithZone(); + DoZoneInCombat(); } void EnterEvadeMode(EvadeReason why) override @@ -623,7 +623,7 @@ class boss_voice_of_yogg_saron : public CreatureScript events.SetPhase(PHASE_TWO); me->SummonCreature(NPC_YOGG_SARON, YoggSaronSpawnPos); if (Creature* brain = instance->GetCreature(DATA_BRAIN_OF_YOGG_SARON)) - brain->SetInCombatWithZone(); + DoZoneInCombat(brain); events.ScheduleEvent(EVENT_SUMMON_CORRUPTOR_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); events.ScheduleEvent(EVENT_SUMMON_CONSTRICTOR_TENTACLE, 7s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); events.ScheduleEvent(EVENT_SUMMON_CRUSHER_TENTACLE, 5s, EVENT_GROUP_SUMMON_TENTACLES, PHASE_TWO); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 78ac7e6708..86b2d91c9e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -323,7 +323,7 @@ class spell_dark_slash : public SpellScript void Register() override { - OnHit.Register(spell_dark_slash::CalculateDamage); + OnHit.Register(&spell_dark_slash::CalculateDamage); } };