Core/Script: Pyroguard emberseer

Cleanup while working on #4586
TrinityCore · Jan 12, 2013 · f46ac4a · f46ac4a
1 parent d8b2954
commit f46ac4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -66,7 +66,6 @@ class boss_pyroguard_emberseer : public CreatureScript
         {
             if (instance->GetBossState(DATA_PYROGAURD_EMBERSEER) == IN_PROGRESS)
                 OpenDoors(false);
-            instance->SetBossState(DATA_PYROGAURD_EMBERSEER,NOT_STARTED);
             // respawn any dead Blackhand Incarcerators
             DoCast(me, SPELL_ENCAGED_EMBERSEER);
             //DoCast(me, SPELL_FIRE_SHIELD_TRIGGER);
@@ -83,7 +82,6 @@ class boss_pyroguard_emberseer : public CreatureScript
 
         void JustDied(Unit* /*killer*/)
         {
-            instance->SetBossState(DATA_PYROGAURD_EMBERSEER,DONE);
             OpenDoors(true);
             _JustDied();
         }
@@ -102,7 +100,6 @@ class boss_pyroguard_emberseer : public CreatureScript
         void UpdateAI(uint32 const diff)
         {
             if (!UpdateVictim())
-
                 return;
 
             events.Update(diff);
@@ -115,11 +112,11 @@ class boss_pyroguard_emberseer : public CreatureScript
                 switch (eventId)
                 {
                     case EVENT_FIRENOVA:
-                        DoCast(me->getVictim(), SPELL_FIRENOVA);
+                        DoCastVictim(SPELL_FIRENOVA);
                         events.ScheduleEvent(EVENT_FIRENOVA, 6 * IN_MILLISECONDS);
                         break;
                     case EVENT_FLAMEBUFFET:
-                        DoCast(me->getVictim(), SPELL_FLAMEBUFFET);
+                        DoCastVictim(SPELL_FLAMEBUFFET);
                         events.ScheduleEvent(EVENT_FLAMEBUFFET, 14 * IN_MILLISECONDS);
                         break;
                     case EVENT_PYROBLAST:
@@ -129,6 +126,7 @@ class boss_pyroguard_emberseer : public CreatureScript
                         break;
                 }
             }
+
             DoMeleeAttackIfReady();
         }
     };

diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -215,7 +215,8 @@ class instance_blackrock_spire : public InstanceMapScript
             switch (eventId)
             {
                 case EVENT_PYROGUARD_EMBERSEER:
-                    SetBossState(DATA_PYROGAURD_EMBERSEER,IN_PROGRESS);
+                    if (GetBossState(DATA_PYROGAURD_EMBERSEER) == NOT_STARTED)
+                        SetBossState(DATA_PYROGAURD_EMBERSEER, IN_PROGRESS);
                     break;
                 default:
                     break;