sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/HallsOfLightning): Remove early handling for General Bjarngrim causing event cancellation (#24335)

Browse Source
This commit is contained in:
Gultask
2026-01-07 12:08:04 -03:00
committed by GitHub
parent d8b4f93bc6
commit 3fd0fa1e64
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
+12 -11
View File
@@ -110,7 +110,7 @@ enum Yells
struct boss_bjarngrim : public npc_escortAI 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(); m_pInstance = creature->GetInstanceScript();
InitializeWaypoints(); InitializeWaypoints();
@@ -301,18 +301,19 @@ struct boss_bjarngrim : public npc_escortAI
{ {
events.Update(diff); 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()) 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;
}
// Return since we have no target // Return since we have no target
if (!UpdateVictim()) if (!UpdateVictim())