From a5da806cc6ccd71918e89f0b66ecc15a3ed6be93 Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 19 Apr 2012 23:30:40 +0200 Subject: Scripts/Ulduar: Fixed some WIP code for Algalon --- .../scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 4465fc08792..ab2d8126fd2 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -360,7 +360,8 @@ class boss_algalon_the_observer : public CreatureScript case EVENT_DESPAWN_ALGALON: events.Reset(); events.SetPhase(PHASE_ROLE_PLAY); - events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1); + if (me->isInCombat()) + events.ScheduleEvent(EVENT_ASCEND_TO_THE_HEAVENS, 1); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_1, 5000); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_2, 17000); events.ScheduleEvent(EVENT_DESPAWN_ALGALON_3, 26000); @@ -731,9 +732,6 @@ class npc_living_constellation : public CreatureScript void DoAction(int32 const action) { - if (action != ACTION_ACTIVATE_STAR) - return; - switch (action) { case ACTION_ACTIVATE_STAR: -- cgit v1.2.3