Halls of Lighting, Sjonnir the Ironshaper: Fix blink exploiting & fix compile

--HG--
branch : trunk

3 files changed, 9 insertions, 2 deletions

diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
index 2108ebae55b..c4250d7e1c9 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/boss_sjonnir.cpp
@@ -38,7 +38,7 @@ enum Yells
 
 #define EMOTE_GENERIC_FRENZY                               -1000002
 
-enum Creatures
+enum SjonnirCreatures
 {
     CREATURE_FORGED_IRON_TROGG                             = 27979,
     CREATURE_MALFORMED_OOZE                                = 27981,
@@ -113,7 +113,12 @@ struct TRINITY_DLL_DECL boss_sjonnirAI : public ScriptedAI
         uiEncounterTimer = 0;
 
         if (pInstance)
+        {
             pInstance->SetData(DATA_SJONNIR_EVENT, IN_PROGRESS);
+            if (GameObject pDoor = pInstance->instance->GetGameObject(pInstance->GetData64(DATA_SJONNIR_DOOR)) &&
+                pDoor->GetGoState() == GO_STATE_READY)
+                EnterEvadeMode();
+        }
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
index 06436997793..ba5a20e2f73 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.h
@@ -19,7 +19,8 @@ enum Data64
     DATA_GO_KADDRAK,
     DATA_GO_MARNAK,
     DATA_GO_ABEDNEUM,
-    DATA_GO_SKY_FLOOR
+    DATA_GO_SKY_FLOOR,
+    DATA_SJONNIR_DOOR
 };
 enum Creatures
 {
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
index 59ab96410a6..41c7fadf631 100644
--- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
+++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/instance_halls_of_stone.cpp
@@ -186,6 +186,7 @@ struct TRINITY_DLL_DECL instance_halls_of_stone : public ScriptedInstance
             case DATA_GO_ABEDNEUM:                     return uiAbedneumGo;
             case DATA_GO_MARNAK:                       return uiMarnakGo;
             case DATA_GO_SKY_FLOOR:                    return uiTribunalSkyFloor;
+            case DATA_SJONNIR_DOOR:                    return uiSjonnirDoor;
         }
 
         return 0;