From ffac60879bb2b5539b775b34ddcbd9251736b0a7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 28 Apr 2024 16:09:43 +0200 Subject: Core/Creatures: moved combat pulse into heartbeat handling and implemented CREATURE_STATIC_FLAG_2_FORCE_PARTY_MEMBERS_INTO_COMBAT (#29946) (cherry picked from commit 11f32a2427caf7064947b03f3256e06d27fe6327) --- src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp | 2 -- src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp | 3 --- 2 files changed, 5 deletions(-) (limited to 'src/server/scripts/Outland') diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index d4e04e9b8c5..309b538fce4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -248,14 +248,12 @@ struct IllidariCouncilBossAI : public BossAI void Reset() override { - me->SetCombatPulseDelay(0); events.Reset(); DoCastSelf(SPELL_BALANCE_OF_POWER, true); } void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); if (Creature* illidari = instance->GetCreature(DATA_ILLIDARI_COUNCIL)) DoZoneInCombat(illidari); 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 049ecbb80bb..5af82e20198 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -332,7 +332,6 @@ struct boss_essence_of_suffering : public BossAI void JustEngagedWith(Unit* /*who*/) override { - me->SetCombatPulseDelay(5); me->setActive(true); events.ScheduleEvent(EVENT_SOUL_DRAIN, 20s); @@ -401,7 +400,6 @@ struct boss_essence_of_desire : public BossAI events.ScheduleEvent(EVENT_RUNE_SHIELD, 16s); events.ScheduleEvent(EVENT_DEADEN, 31s); - me->SetCombatPulseDelay(5); me->setActive(true); Talk(DESI_SAY_FREED); } @@ -507,7 +505,6 @@ struct boss_essence_of_anger : public BossAI events.ScheduleEvent(EVENT_SPITE, 20s); events.ScheduleEvent(EVENT_FREED_2, Seconds(1), Minutes(3)); - me->SetCombatPulseDelay(5); me->setActive(true); } -- cgit v1.2.3