From dd3eb38378732ff5f80dacb91f68ccd113a37f92 Mon Sep 17 00:00:00 2001 From: "Riley S." Date: Thu, 28 Nov 2024 12:34:15 -0500 Subject: [PATCH] fix(Scripts/ZulAman): Hex Lord Malacrass' Drain Power Timer (#20754) * Initial Fix for #20751 * Tighten timings * Condense Code * Move `ScheduleHealthCheckEvent` into `Reset()` --- .../scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 6d281274d..47e684075 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -236,6 +236,12 @@ struct boss_hexlord_malacrass : public BossAI _currentClass = CLASS_NONE; _classAbilityTimer = 10000ms; SpawnAdds(); + ScheduleHealthCheckEvent(80, [&] { + ScheduleTimedEvent(0s, [&] { + DoCastSelf(SPELL_DRAIN_POWER, true); + Talk(SAY_DRAIN_POWER); + }, 30s, 30s); + }); } void SpawnAdds() @@ -257,10 +263,6 @@ struct boss_hexlord_malacrass : public BossAI add->SetInCombatWithZone(); }); - ScheduleTimedEvent(60s, [&]{ - DoCastSelf(SPELL_DRAIN_POWER, true); - Talk(SAY_DRAIN_POWER); - }, 40s, 55s); ScheduleTimedEvent(30s, [&]{ DoCastSelf(SPELL_SPIRIT_BOLTS); scheduler.Schedule(10s, [this](TaskContext)