From 3fd0fa1e6433cbce675e9ed2628a0f4836ff0351 Mon Sep 17 00:00:00 2001
From: Gultask <100873791+Gultask@users.noreply.github.com>
Date: Wed, 7 Jan 2026 12:08:04 -0300
Subject: [PATCH] fix(Scripts/HallsOfLightning): Remove early handling for
 General Bjarngrim causing event cancellation (#24335)

---
 .../HallsOfLightning/boss_bjarngrim.cpp       | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
index 0e352c459..cd8c36c9e 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
@@ -110,7 +110,7 @@ enum Yells
 
 struct boss_bjarngrim : public npc_escortAI
 {
-    boss_bjarngrim(Creature* creature) : npc_escortAI(creature), summons(creature)
+    boss_bjarngrim(Creature* creature) : npc_escortAI(creature), summons(creature), m_uiStance(STANCE_BATTLE)
     {
         m_pInstance = creature->GetInstanceScript();
         InitializeWaypoints();
@@ -301,18 +301,19 @@ struct boss_bjarngrim : public npc_escortAI
     {
         events.Update(diff);
 
-        if (uint32 eventId = events.ExecuteEvent())
-        {
-            if (eventId == EVENT_CHARGE_UP)
-            {
-                me->CastSpell(me, SPELL_CHARGE_UP, true);
-                me->CastSpell(me, SPELL_TEMPORARY_ELECTRICAL_CHARGE, true);
-                return;
-            }
-        }
-
         if (!me->IsInCombat())
+        {
+            // Handle charge-up only when out of combat
+            if (uint32 eventId = events.ExecuteEvent())
+            {
+                if (eventId == EVENT_CHARGE_UP)
+                {
+                    DoCastSelf(SPELL_CHARGE_UP, true);
+                    DoCastSelf(SPELL_TEMPORARY_ELECTRICAL_CHARGE, true);
+                }
+            }
             return;
+        }
 
         // Return since we have no target
         if (!UpdateVictim())