Core: Fix warnings

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp

@@ -82,7 +82,7 @@ public:
         {
             if (instance)
             {
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC|UNIT_FLAG_NOT_SELECTABLE);
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NOT_SELECTABLE);
 
                 // Apply auras on spawn and reset
                 // DoCast(me, SPELL_FIRE_SHIELD_TRIGGER); // Need to find this in old DBC if possible
@@ -111,9 +111,7 @@ public:
         void SetData(uint32 type, uint32 data)
         {
             if (instance && type == 1 && data == 1)
-            {
                 events.ScheduleEvent(EVENT_PLAYER_CHECK, 5000);
-            }
 
             if (instance && type == 1 && data == 2)
             {

src/server/scripts/EasternKingdoms/BlackrockSpire/boss_rend_blackhand.cpp

@@ -55,7 +55,7 @@ enum Adds
     NPC_CHROMATIC_DRAGONSPAWN       = 10447,
     NPC_BLACKHAND_DRAGON_HANDLER    = 10742
 };
-
+/*
 struct Wave
 {
     uint32 entry;
@@ -105,7 +105,7 @@ static Wave Wave6[]= // 27 sec
     { 10442, 210.8935f, -423.913f,  111.0125f, 5.969026f  },
     { 10442, 212.2642f, -430.7648f, 110.9807f, 5.934119f  }
 };
-
+*/
 enum Events
 {
     EVENT_WHIRLWIND                 = 1,

src/server/scripts/EasternKingdoms/BlackrockSpire/instance_blackrock_spire.cpp

@@ -448,22 +448,21 @@ public:
 
         void Dragonspireroomcheck()
         {
-            Creature* mob = 0;
-            GameObject* rune = 0;
+            Creature* mob = NULL;
+            GameObject* rune = NULL;
 
             for (uint8 i = 0; i < 7; ++i)
             {
                 bool _mobAlive = false;
-
-                if (rune = instance->GetGameObject(go_roomrunes[i]))
+                rune = instance->GetGameObject(go_roomrunes[i]);
+                if (rune && rune->GetGoState() == GO_STATE_ACTIVE)
                 {
-                    if (rune->GetGoState() == GO_STATE_ACTIVE)
-                        for (uint8 ii = 0; ii < 5; ++ii)
-                        {
-                            if (mob = instance->GetCreature(runecreaturelist[i] [ii]))
-                                if (mob->IsAlive())
-                                    _mobAlive = true;
-                        }
+                    for (uint8 ii = 0; ii < 5; ++ii)
+                    {
+                        mob = instance->GetCreature(runecreaturelist[i][ii]);
+                        if (mob && mob->IsAlive())
+                            _mobAlive = true;
+                    }
                 }
 
                 if (!_mobAlive && rune->GetGoState() == GO_STATE_ACTIVE)
@@ -582,7 +581,6 @@ public:
     {
         return new instance_blackrock_spireMapScript(map);
     }
-
 };
 
 /*#####
@@ -599,13 +597,14 @@ public:
         if (player && player->IsAlive())
         {
             if (InstanceScript* instance = player->GetInstanceScript())
+            {
                 instance->SetData(AREATRIGGER, AREATRIGGER_DRAGONSPIRE_HALL);
-                    return true;
+                return true;
+            }
         }
-        else
-            return false;
-    }
 
+        return false;
+    }
 };
 
 /*#####
@@ -621,15 +620,19 @@ public:
     {
         if (player && player->IsAlive())
         {
-            if (InstanceScript* instance = player->GetInstanceScript())
-                if (Creature* rend = player->FindNearestCreature(NPC_REND_BLACKHAND, 50.0f))
-                    rend->AI()->SetData(AREATRIGGER, AREATRIGGER_BLACKROCK_STADIUM);
-                        return true;
-        }
-        else
-            return false;
-    }
+            InstanceScript* instance = player->GetInstanceScript();
+            if (!instance)
+                return false;
 
+            if (Creature* rend = player->FindNearestCreature(NPC_REND_BLACKHAND, 50.0f))
+            {
+                rend->AI()->SetData(AREATRIGGER, AREATRIGGER_BLACKROCK_STADIUM);
+                return true;
+            }
+        }
+
+        return false;
+    }
 };
 
 void AddSC_instance_blackrock_spire()

src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp

@@ -156,11 +156,6 @@ public:
             Reset();
         }
 
-        void SetData(uint32 type, uint32 data)
-        {
-
-        }
-
         void BeginEvent(Player* target)
         {
             _EnterCombat();