Scripts: prevent some runtime errors

2 files changed, 2 insertions, 36 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index 9b250cc169a..d7624cd600f 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -270,7 +270,7 @@ public:
              return true;
         }
 
-        void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) OVERRIDE
+        void ProcessEvent(WorldObject* /*obj*/, uint32 eventId) OVERRIDE
         {
             switch (eventId)
             {
@@ -313,102 +313,71 @@ public:
             {
                 case DATA_HIGHLORD_OMOKK:
                     return HighlordOmokk;
-                    break;
                 case DATA_SHADOW_HUNTER_VOSHGAJIN:
                     return ShadowHunterVoshgajin;
-                    break;
                 case DATA_WARMASTER_VOONE:
                     return WarMasterVoone;
-                    break;
                 case DATA_MOTHER_SMOLDERWEB:
                     return MotherSmolderweb;
-                    break;
                 case DATA_UROK_DOOMHOWL:
                     return UrokDoomhowl;
-                    break;
                 case DATA_QUARTERMASTER_ZIGRIS:
                     return QuartermasterZigris;
-                    break;
                 case DATA_GIZRUL_THE_SLAVENER:
                     return GizrultheSlavener;
-                    break;
                 case DATA_HALYCON:
                     return Halycon;
-                    break;
                 case DATA_OVERLORD_WYRMTHALAK:
                     return OverlordWyrmthalak;
-                    break;
                 case DATA_PYROGAURD_EMBERSEER:
                     return PyroguardEmberseer;
-                    break;
                 case DATA_WARCHIEF_REND_BLACKHAND:
                     return WarchiefRendBlackhand;
-                    break;
                 case DATA_GYTH:
                     return Gyth;
-                    break;
                 case DATA_THE_BEAST:
                     return TheBeast;
-                    break;
                 case DATA_GENERAL_DRAKKISATH:
                     return GeneralDrakkisath;
-                    break;
                 case GO_EMBERSEER_IN:
                     return go_emberseerin;
-                    break;
                 case GO_DOORS:
                     return go_doors;
-                    break;
                 case GO_EMBERSEER_OUT:
                     return go_emberseerout;
-                    break;
                 case GO_HALL_RUNE_1:
                     return go_roomrunes[0];
-                    break;
                 case GO_HALL_RUNE_2:
                     return go_roomrunes[1];
-                    break;
                 case GO_HALL_RUNE_3:
                     return go_roomrunes[2];
-                    break;
                 case GO_HALL_RUNE_4:
                     return go_roomrunes[3];
-                    break;
                 case GO_HALL_RUNE_5:
                     return go_roomrunes[4];
-                    break;
                 case GO_HALL_RUNE_6:
                     return go_roomrunes[5];
-                    break;
                 case GO_HALL_RUNE_7:
                     return go_roomrunes[6];
-                    break;
                 case GO_EMBERSEER_RUNE_1:
                     return go_emberseerrunes[0];
-                    break;
                 case GO_EMBERSEER_RUNE_2:
                     return go_emberseerrunes[1];
-                    break;
                 case GO_EMBERSEER_RUNE_3:
                     return go_emberseerrunes[2];
-                    break;
                 case GO_EMBERSEER_RUNE_4:
                     return go_emberseerrunes[3];
-                    break;
                 case GO_EMBERSEER_RUNE_5:
                     return go_emberseerrunes[4];
-                    break;
                 case GO_EMBERSEER_RUNE_6:
                     return go_emberseerrunes[5];
-                    break;
                 case GO_EMBERSEER_RUNE_7:
                     return go_emberseerrunes[6];
-                    break;
                 case GO_PORTCULLIS_ACTIVE:
                     return go_portcullis_active;
-                    break;
                 case GO_PORTCULLIS_TOBOSSROOMS:
                     return go_portcullis_tobossrooms;
+                default:
                     break;
             }
             return 0;
@@ -577,8 +546,6 @@ public:
 
         protected:
             EventMap Events;
-            uint32 encounter[EncounterCount];
-            std::string m_strInstData;
             uint64 HighlordOmokk;
             uint64 ShadowHunterVoshgajin;
             uint64 WarMasterVoone;
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index f3a788918f2..4e0c79509fc 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -264,7 +264,6 @@ public:
                             if (Unit* player = me->SelectNearestPlayer(60.0f))
                             {
                                 me->SetInFront(player);
-                                me->SendMovementFlagUpdate();
                                 Talk(SAY_SUCCESS);
                                 if (GameObject* portcullis1 = me->FindNearestGameObject(GO_PORTCULLIS_ACTIVE, 65.0f))
                                     portcullis1->SetGoState(GO_STATE_ACTIVE);