Core/Script: Code style and remove unused core.

Signed-off-by: Gyx <2359980687@qq.com>

7 files changed, 230 insertions, 88 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 11d47ac29b1..89e0073c5cd 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -543,8 +543,13 @@ public:
                 {
                     switch (urand(0, 1))
                     {
-                        case 0: DoCast(unit, SPELL_BLESS_SPELLWARD);  break;
-                        case 1: DoCast(unit, SPELL_BLESS_PROTECTION); break;
+                        case 0:
+                            DoCast(unit, SPELL_BLESS_SPELLWARD);
+                            break;
+
+                        case 1:
+                            DoCast(unit, SPELL_BLESS_PROTECTION);
+                            break;
                     }
                 }
                 BlessingTimer = 60000;
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 677a47c3a65..49bce6d82c0 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -164,28 +164,75 @@ public:
         {
             switch (go->GetEntry())
             {
-            case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
-                if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break;
-            case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
-                if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break;
-            case 185478: ShadeOfAkamaDoor = go->GetGUID();break;
-            case 185480: CommonDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break;
-            case 186153: TeronDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break;
-            case 185892: GuurtogDoor = go->GetGUID();
-                if (m_auiEncounter[4] == DONE)HandleGameObject(0, true, go);break;
-            case 185479: TempleDoor = go->GetGUID();
-                if (m_auiEncounter[5] == DONE)HandleGameObject(0, true, go);break;
-            case 185482: MotherDoor = go->GetGUID();
-                if (m_auiEncounter[6] == DONE)HandleGameObject(0, true, go);break;
-            case 185481: CouncilDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break;
-            case 186152: SimpleDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break;
-            case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit
-            case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit
-            case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit
+            case 185483:
+                NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
+                if (m_auiEncounter[0] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185882:
+                MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
+                if (m_auiEncounter[1] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185478:
+                ShadeOfAkamaDoor = go->GetGUID();
+                break;
+
+            case 185480:
+                CommonDoor = go->GetGUID();
+                if (m_auiEncounter[3] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 186153:
+                TeronDoor = go->GetGUID();
+                if (m_auiEncounter[3] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185892:
+                GuurtogDoor = go->GetGUID();
+                if (m_auiEncounter[4] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185479:
+                TempleDoor = go->GetGUID();
+                if (m_auiEncounter[5] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185482:
+                MotherDoor = go->GetGUID();
+                if (m_auiEncounter[6] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185481:
+                CouncilDoor = go->GetGUID();
+                if (m_auiEncounter[7] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 186152:
+                SimpleDoor = go->GetGUID();
+                if (m_auiEncounter[7] == DONE)
+                    HandleGameObject(0, true, go);
+                break;
+
+            case 185905:
+                IllidanGate = go->GetGUID(); // Gate leading to Temple Summit
+                break;
+
+            case 186261:
+                IllidanDoor[0] = go->GetGUID(); // Right door at Temple Summit
+                break;
+
+            case 186262:
+                IllidanDoor[1] = go->GetGUID(); // Left door at Temple Summit
+                break;
             }
         }
 
@@ -221,63 +268,65 @@ public:
             {
             case DATA_HIGHWARLORDNAJENTUSEVENT:
                 if (data == DONE)
-                {
                     HandleGameObject(NajentusGate, true);
-                }
-                m_auiEncounter[0] = data;break;
+                m_auiEncounter[0] = data;
+                break;
             case DATA_SUPREMUSEVENT:
                 if (data == DONE)
-                {
                     HandleGameObject(NajentusGate, true);
-                }
-                m_auiEncounter[1] = data; break;
+                m_auiEncounter[1] = data;
+                break;
             case DATA_SHADEOFAKAMAEVENT:
                 if (data == IN_PROGRESS)
-                {
                     HandleGameObject(ShadeOfAkamaDoor, false);
-                } else HandleGameObject(ShadeOfAkamaDoor, true);
-                m_auiEncounter[2] = data; break;
+                else
+                    HandleGameObject(ShadeOfAkamaDoor, true);
+                m_auiEncounter[2] = data;
+                break;
             case DATA_TERONGOREFIENDEVENT:
                 if (data == IN_PROGRESS)
                 {
                     HandleGameObject(TeronDoor, false);
                     HandleGameObject(CommonDoor, false);
-                }else
+                }
+                else
                 {
                     HandleGameObject(TeronDoor, true);
                     HandleGameObject(CommonDoor, true);
                 }
-                m_auiEncounter[3] = data; break;
+                m_auiEncounter[3] = data;
+                break;
             case DATA_GURTOGGBLOODBOILEVENT:
                 if (data == DONE)
-                {
                     HandleGameObject(GuurtogDoor, true);
-                }
-                m_auiEncounter[4] = data; break;
+                m_auiEncounter[4] = data;
+                break;
             case DATA_RELIQUARYOFSOULSEVENT:
                 if (data == DONE)
-                {
                     HandleGameObject(TempleDoor, true);
-                }
-                m_auiEncounter[5] = data;         break;
+                m_auiEncounter[5] = data;
+                break;
             case DATA_MOTHERSHAHRAZEVENT:
                 if (data == DONE)
-                {
                     HandleGameObject(MotherDoor, true);
-                }
-                m_auiEncounter[6] = data; break;
+                m_auiEncounter[6] = data;
+                break;
             case DATA_ILLIDARICOUNCILEVENT:
                 if (data == IN_PROGRESS)
                 {
                     HandleGameObject(CouncilDoor, false);
                     HandleGameObject(SimpleDoor, false);
-                }else
+                }
+                else
                 {
                     HandleGameObject(CouncilDoor, true);
                     HandleGameObject(SimpleDoor, true);
                 }
-                m_auiEncounter[7] = data; break;
-            case DATA_ILLIDANSTORMRAGEEVENT:      m_auiEncounter[8] = data;         break;
+                m_auiEncounter[7] = data;
+                break;
+            case DATA_ILLIDANSTORMRAGEEVENT:
+                m_auiEncounter[8] = data;
+                break;
             }
 
             if (data == DONE)
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 11b3d147540..4f679da6d98 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -177,13 +177,9 @@ public:
         void KilledUnit(Unit* /*victim*/)
         {
             if (CorruptedForm)
-            {
                 DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me);
-            }
             else
-            {
                 DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me);
-            }
         }
 
         void JustSummoned(Creature* summoned)
@@ -242,12 +238,29 @@ public:
 
                         switch (MarkOfCorruption_Count)
                         {
-                            case 0: mark_spell = SPELL_MARK_OF_CORRUPTION1; break;
-                            case 1: mark_spell = SPELL_MARK_OF_CORRUPTION2; break;
-                            case 2: mark_spell = SPELL_MARK_OF_CORRUPTION3; break;
-                            case 3: mark_spell = SPELL_MARK_OF_CORRUPTION4; break;
-                            case 4: mark_spell = SPELL_MARK_OF_CORRUPTION5; break;
-                            case 5: mark_spell = SPELL_MARK_OF_CORRUPTION6; break;
+                            case 0:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION1;
+                                break;
+
+                            case 1:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION2;
+                                break;
+
+                            case 2:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION3;
+                                break;
+
+                            case 3:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION4;
+                                break;
+
+                            case 4:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION5;
+                                break;
+
+                            case 5:
+                                mark_spell = SPELL_MARK_OF_CORRUPTION6;
+                                break;
                         }
 
                         DoCast(me->getVictim(), mark_spell);
@@ -309,12 +322,29 @@ public:
 
                         switch (MarkOfHydross_Count)
                         {
-                            case 0:  mark_spell = SPELL_MARK_OF_HYDROSS1; break;
-                            case 1:  mark_spell = SPELL_MARK_OF_HYDROSS2; break;
-                            case 2:  mark_spell = SPELL_MARK_OF_HYDROSS3; break;
-                            case 3:  mark_spell = SPELL_MARK_OF_HYDROSS4; break;
-                            case 4:  mark_spell = SPELL_MARK_OF_HYDROSS5; break;
-                            case 5:  mark_spell = SPELL_MARK_OF_HYDROSS6; break;
+                            case 0:
+                                mark_spell = SPELL_MARK_OF_HYDROSS1;
+                                break;
+
+                            case 1:
+                                mark_spell = SPELL_MARK_OF_HYDROSS2;
+                                break;
+
+                            case 2:
+                                mark_spell = SPELL_MARK_OF_HYDROSS3;
+                                break;
+
+                            case 3:
+                                mark_spell = SPELL_MARK_OF_HYDROSS4;
+                                break;
+
+                            case 4:
+                                mark_spell = SPELL_MARK_OF_HYDROSS5;
+                                break;
+
+                            case 5:
+                                mark_spell = SPELL_MARK_OF_HYDROSS6;
+                                break;
                         }
 
                         DoCast(me->getVictim(), mark_spell);
@@ -375,7 +405,6 @@ public:
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_hydross_the_unstable()
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 895ea71f139..ff116d880be 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -130,8 +130,13 @@ public:
                 {
                     switch (urand(0, 1))
                     {
-                        case 0: target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break;
-                        case 1: target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break;
+                        case 0:
+                            target->CastSpell(target, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID());
+                            break;
+
+                        case 1:
+                            target->CastSpell(target, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID());
+                            break;
                     }
                 }
             }
diff --git a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
index 5ea64250689..3514732b53a 100644
--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -137,12 +137,18 @@ public:
             switch (type)
             {
                 case DATA_MAULGAREVENT:
-                    if (data == DONE) HandleGameObject(MaulgarDoor, true);
-                    m_auiEncounter[0] = data; break;
+                    if (data == DONE)
+                        HandleGameObject(MaulgarDoor, true);
+                    m_auiEncounter[0] = data;
+                    break;
+
                 case DATA_GRUULEVENT:
-                    if (data == IN_PROGRESS) HandleGameObject(GruulDoor, false);
-                    else HandleGameObject(GruulDoor, true);
-                    m_auiEncounter[1] = data; break;
+                    if (data == IN_PROGRESS)
+                        HandleGameObject(GruulDoor, false);
+                    else
+                        HandleGameObject(GruulDoor, true);
+                    m_auiEncounter[1] = data;
+                    break;
             }
 
             if (data == DONE)
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 3b907f1d000..ffe96fb7bd1 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -103,15 +103,41 @@ class instance_arcatraz : public InstanceMapScript
             {
                 switch (go->GetEntry())
                 {
-                case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA: Containment_Core_Security_Field_AlphaGUID = go->GetGUID(); break;
-                case CONTAINMENT_CORE_SECURITY_FIELD_BETA:  Containment_Core_Security_Field_BetaGUID =  go->GetGUID(); break;
-                case POD_ALPHA:                             Pod_AlphaGUID = go->GetGUID();                             break;
-                case POD_GAMMA:                             Pod_GammaGUID = go->GetGUID();                             break;
-                case POD_BETA:                              Pod_BetaGUID =  go->GetGUID();                             break;
-                case POD_DELTA:                             Pod_DeltaGUID = go->GetGUID();                             break;
-                case POD_OMEGA:                             Pod_OmegaGUID = go->GetGUID();                             break;
-                case SEAL_SPHERE:                           GoSphereGUID = go->GetGUID();                              break;
-                //case WARDENS_SHIELD:                        Wardens_ShieldGUID = go->GetGUID();                        break;
+                case CONTAINMENT_CORE_SECURITY_FIELD_ALPHA:
+                    Containment_Core_Security_Field_AlphaGUID = go->GetGUID();
+                    break;
+
+                case CONTAINMENT_CORE_SECURITY_FIELD_BETA:
+                    Containment_Core_Security_Field_BetaGUID = go->GetGUID();
+                    break;
+
+                case POD_ALPHA:
+                    Pod_AlphaGUID = go->GetGUID();
+                    break;
+
+                case POD_GAMMA:
+                    Pod_GammaGUID = go->GetGUID();
+                    break;
+
+                case POD_BETA:
+                    Pod_BetaGUID = go->GetGUID();
+                    break;
+
+                case POD_DELTA:
+                    Pod_DeltaGUID = go->GetGUID();
+                    break;
+
+                case POD_OMEGA:
+                    Pod_OmegaGUID = go->GetGUID();
+                    break;
+
+                case SEAL_SPHERE:
+                    GoSphereGUID = go->GetGUID();
+                    break;
+
+                /*case WARDENS_SHIELD:
+                    Wardens_ShieldGUID = go->GetGUID();
+                    break;*/
                 }
             }
 
diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/blades_edge_mountains.cpp
index beab023b679..e9537546c92 100644
--- a/src/server/scripts/Outland/blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/blades_edge_mountains.cpp
@@ -790,20 +790,42 @@ class npc_simon_bunny : public CreatureScript
                         {
                             switch (go->GetGOInfo()->displayId)
                             {
-                                case GO_BLUE_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_BLUE] = go->GetEntry(); break;
-                                case GO_RED_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_RED] = go->GetEntry(); break;
-                                case GO_GREEN_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_GREEN] = go->GetEntry(); break;
-                                case GO_YELLOW_CLUSTER_DISPLAY_LARGE: clusterIds[SIMON_YELLOW] = go->GetEntry(); break;
+                                case GO_BLUE_CLUSTER_DISPLAY_LARGE:
+                                    clusterIds[SIMON_BLUE] = go->GetEntry();
+                                    break;
+
+                                case GO_RED_CLUSTER_DISPLAY_LARGE:
+                                    clusterIds[SIMON_RED] = go->GetEntry();
+                                    break;
+
+                                case GO_GREEN_CLUSTER_DISPLAY_LARGE:
+                                    clusterIds[SIMON_GREEN] = go->GetEntry();
+                                    break;
+
+                                case GO_YELLOW_CLUSTER_DISPLAY_LARGE:
+                                    clusterIds[SIMON_YELLOW] = go->GetEntry();
+                                    break;
                             }
                         }
                         else
                         {
                             switch (go->GetGOInfo()->displayId)
                             {
-                                case GO_BLUE_CLUSTER_DISPLAY: clusterIds[SIMON_BLUE] = go->GetEntry(); break;
-                                case GO_RED_CLUSTER_DISPLAY: clusterIds[SIMON_RED] = go->GetEntry(); break;
-                                case GO_GREEN_CLUSTER_DISPLAY: clusterIds[SIMON_GREEN] = go->GetEntry(); break;
-                                case GO_YELLOW_CLUSTER_DISPLAY: clusterIds[SIMON_YELLOW] = go->GetEntry(); break;
+                                case GO_BLUE_CLUSTER_DISPLAY:
+                                    clusterIds[SIMON_BLUE] = go->GetEntry();
+                                    break;
+
+                                case GO_RED_CLUSTER_DISPLAY:
+                                    clusterIds[SIMON_RED] = go->GetEntry();
+                                    break;
+
+                                case GO_GREEN_CLUSTER_DISPLAY:
+                                    clusterIds[SIMON_GREEN] = go->GetEntry();
+                                    break;
+
+                                case GO_YELLOW_CLUSTER_DISPLAY:
+                                    clusterIds[SIMON_YELLOW] = go->GetEntry();
+                                    break;
                             }
                         }
                     }