From f46ac4a46c8f9605f2ab3d4a3c123a4f85d708ba Mon Sep 17 00:00:00 2001
From: Gacko <gacko28@gmx.de>
Date: Sat, 12 Jan 2013 13:34:39 +0100
Subject: [PATCH] Core/Script: Pyroguard emberseer

Cleanup while working on #4586
---
 .../BlackrockSpire/boss_pyroguard_emberseer.cpp           | 8 +++-----
 .../BlackrockSpire/instance_blackrock_spire.cpp           | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
index 047ad3f709..da38fe9f54 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp
@@ -66,7 +66,6 @@ public:
         {
             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 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            instance->SetBossState(DATA_PYROGAURD_EMBERSEER,DONE);
             OpenDoors(true);
             _JustDied();
         }
@@ -102,7 +100,6 @@ public:
         void UpdateAI(uint32 const diff)
         {
             if (!UpdateVictim())
-
                 return;
 
             events.Update(diff);
@@ -115,11 +112,11 @@ public:
                 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 @@ public:
                         break;
                 }
             }
+
             DoMeleeAttackIfReady();
         }
     };
diff --git a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
index 72a5712181..06ba0036ef 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp
@@ -215,7 +215,8 @@ public:
             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;