From d6b292221eb1a3e06a7dfc71bd3f1430051cf70c Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Thu, 9 Apr 2026 05:49:25 -0300 Subject: [PATCH] fix(Scripts/Arcatraz): prevent Harbinger Skyriss encounter reset (#25402) Co-authored-by: Claude Opus 4.6 --- src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index d4c067fa4..5ba771359 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -385,11 +385,11 @@ public: void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if (attacker && attacker->GetCharmerOrOwnerOrOwnGUID().IsPlayer() && damage > 0 && !me->isActiveObject()) + if (attacker && attacker->GetCharmerOrOwnerOrOwnGUID().IsPlayer() && damage > 0 && instance->GetBossState(DATA_WARDEN_MELLICHAR) != IN_PROGRESS) { me->setActive(true); me->InterruptNonMeleeSpells(false); - me->SetImmuneToAll(true); + me->SetImmuneToAll(true, true); events.ScheduleEvent(EVENT_WARDEN_INTRO1, 1500ms); events.ScheduleEvent(EVENT_WARDEN_CHECK_PLAYERS, 1s); instance->SetBossState(DATA_WARDEN_MELLICHAR, IN_PROGRESS);