From c6dc7f8f23823198c1796e6d20031ab07fc017e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20LOUBI=C3=88RE?= <aloubier@student.42.fr>
Date: Sat, 18 Jul 2026 19:03:52 +0200
Subject: [PATCH] fix(Core/Scripts): Prevents Crystalline Frayer from staying
 in combat (#26561)

---
 src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index 51ead3e43..b0dbd4ae8 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -207,6 +207,7 @@ struct npc_crystalline_frayer : public ScriptedAI
     {
         _allowDeath = false;
         _inSeedPod = false;
+        me->SetIsCombatDisallowed(false);
         _scheduler.CancelAll();
 
         me->RemoveAllAuras();
@@ -256,6 +257,7 @@ struct npc_crystalline_frayer : public ScriptedAI
     void EnterSeedPod()
     {
         _inSeedPod = true;
+        me->SetIsCombatDisallowed(true);
         _scheduler.CancelGroup(GROUP_COMBAT);
 
         me->AttackStop();
@@ -283,6 +285,7 @@ struct npc_crystalline_frayer : public ScriptedAI
     void LeaveSeedPod()
     {
         _inSeedPod = false;
+        me->SetIsCombatDisallowed(false);
 
         Talk(SAY_EMOTE);