Fixes issue #214 : infinite loop in Maiden of Grief script

--HG--
branch : trunk

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_maiden_of_grief.cpp

@@ -63,12 +63,7 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
         AchievTimer = 0;
 
         if (pInstance)
-        {
             pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, NOT_STARTED);
-            if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR)))
-                if (pDoor->GetGoState() == GO_STATE_READY)
-                    EnterEvadeMode();
-        }
     }
 
     void EnterCombat(Unit* who)
@@ -76,8 +71,17 @@ struct TRINITY_DLL_DECL boss_maiden_of_griefAI : public ScriptedAI
         DoScriptText(SAY_AGGRO, m_creature);
 
         if (pInstance)
+        {
+            if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_MAIDEN_DOOR)))
+                if (pDoor->GetGoState() == GO_STATE_READY)
+                {
+                    EnterEvadeMode();
+                    return;
+                }
+
             pInstance->SetData(DATA_MAIDEN_OF_GRIEF_EVENT, IN_PROGRESS);
         }
+    }
 
     void UpdateAI(const uint32 diff)
     {

src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp

@@ -114,10 +114,14 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
 
         if (pInstance)
         {
-            pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
             if (GameObject *pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)))
                 if (pDoor->GetGoState() == GO_STATE_READY)
+                {
                     EnterEvadeMode();
+                    return;
+                }
+
+            pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
         }
     }