File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed
src/server/scripts/Outland/BlackTemple Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -234,6 +234,7 @@ struct boss_illidan_stormrage : public BossAI
234
234
scheduler.CancelAll ();
235
235
if (me->HasAura (SPELL_DEMON_FORM))
236
236
DoAction (ACTION_ILLIDAN_DEMON_TRANSFORM_BACK);
237
+ me->m_Events .CancelEventGroup (GROUP_DEMON_FORM);
237
238
DoAction (ACTION_SHADOW_PRISON);
238
239
});
239
240
}
@@ -340,14 +341,13 @@ struct boss_illidan_stormrage : public BossAI
340
341
DoResetThreatList ();
341
342
DoCastSelf (SPELL_DEMON_TRANSFORM_1, true );
342
343
343
- me->m_Events .AddEventAtOffset ([&] {
344
- Talk (SAY_ILLIDAN_MORPH);
345
- }, 2630ms);
344
+ Talk (SAY_ILLIDAN_MORPH, 2630ms);
345
+
346
346
me->m_Events .AddEventAtOffset ([&] {
347
347
// me->SetControlled(false, UNIT_STATE_ROOT);
348
348
me->SetReactState (REACT_AGGRESSIVE);
349
349
ScheduleAbilities (PHASE_DEMON);
350
- }, 12230ms);
350
+ }, 12230ms, GROUP_DEMON_FORM );
351
351
}
352
352
break ;
353
353
case ACTION_ILLIDAN_DEMON_TRANSFORM_BACK:
@@ -558,7 +558,8 @@ struct boss_illidan_stormrage : public BossAI
558
558
}, 24s);
559
559
560
560
ScheduleTimedEvent (60s, [&] {
561
- DoAction (ACTION_ILLIDAN_DEMON_TRANSFORM);
561
+ if (!_inCutscene)
562
+ DoAction (ACTION_ILLIDAN_DEMON_TRANSFORM);
562
563
}, 60s);
563
564
}
564
565
break ;
You can’t perform that action at this time.
0 commit comments