From 892e54c79cfe4282818701561fbdd118232c85de Mon Sep 17 00:00:00 2001
From: Blaymoira <none@none>
Date: Sat, 7 Mar 2009 09:04:27 +0100
Subject: [PATCH] *Fix a typo - by Anubisss

--HG--
branch : trunk
---
 .../the_mechanar/boss_nethermancer_sepethrea.cpp            | 6 +++---
 .../zone/tempest_keep/the_mechanar/instance_mechanar.cpp    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
index 93b653a344..4fecea7036 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
@@ -201,9 +201,6 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!UpdateVictim())
-            return;
-
          //Check_Timer
         if(Check_Timer < diff)
         {
@@ -219,6 +216,9 @@ struct TRINITY_DLL_DECL mob_ragin_flamesAI : public ScriptedAI
             Check_Timer = 1000;
         }else Check_Timer -= diff;
 
+        if (!UpdateVictim())
+            return;
+
         if (!onlyonce)
         {
             if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
index d2c62b8923..05866eb27f 100644
--- a/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
+++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/instance_mechanar.cpp
@@ -46,7 +46,8 @@ struct TRINITY_DLL_DECL instance_mechanar : public ScriptedInstance
     bool IsEncounterInProgress() const
     {
         for(uint8 i = 0; i < ENCOUNTERS; ++i)
-            if(Encounters[i]) return true;
+            if(Encounters[i] == IN_PROGRESS)
+                return true;
 
         return false;
     }