Skip to content

Commit d4f9b6b

Browse files
authored
fix(Scripts/BlackTemple): Prevent Illidan transformation during cutscene (azerothcore#20271)
* fix(Scripts/BlackTemple): Prevent Illidan transformation during cutscene * Update boss_illidan.cpp
1 parent 1c1a281 commit d4f9b6b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/server/scripts/Outland/BlackTemple/boss_illidan.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ struct boss_illidan_stormrage : public BossAI
234234
scheduler.CancelAll();
235235
if (me->HasAura(SPELL_DEMON_FORM))
236236
DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM_BACK);
237+
me->m_Events.CancelEventGroup(GROUP_DEMON_FORM);
237238
DoAction(ACTION_SHADOW_PRISON);
238239
});
239240
}
@@ -340,14 +341,13 @@ struct boss_illidan_stormrage : public BossAI
340341
DoResetThreatList();
341342
DoCastSelf(SPELL_DEMON_TRANSFORM_1, true);
342343

343-
me->m_Events.AddEventAtOffset([&] {
344-
Talk(SAY_ILLIDAN_MORPH);
345-
}, 2630ms);
344+
Talk(SAY_ILLIDAN_MORPH, 2630ms);
345+
346346
me->m_Events.AddEventAtOffset([&] {
347347
// me->SetControlled(false, UNIT_STATE_ROOT);
348348
me->SetReactState(REACT_AGGRESSIVE);
349349
ScheduleAbilities(PHASE_DEMON);
350-
}, 12230ms);
350+
}, 12230ms, GROUP_DEMON_FORM);
351351
}
352352
break;
353353
case ACTION_ILLIDAN_DEMON_TRANSFORM_BACK:
@@ -558,7 +558,8 @@ struct boss_illidan_stormrage : public BossAI
558558
}, 24s);
559559

560560
ScheduleTimedEvent(60s, [&] {
561-
DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM);
561+
if (!_inCutscene)
562+
DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM);
562563
}, 60s);
563564
}
564565
break;

0 commit comments

Comments
 (0)