ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp
View file

@ -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())