Scripted: Some cleanups + ninja changes

45 files changed, 163 insertions, 162 deletions

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
index becf30e1210..9735011ba81 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp
@@ -56,7 +56,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_stolen_soulAI (creature);
+        return new npc_stolen_soulAI(creature);
     }
 
     struct npc_stolen_soulAI : public ScriptedAI
@@ -158,7 +158,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_exarch_maladaarAI (creature);
+        return new boss_exarch_maladaarAI(creature);
     }
 
     struct boss_exarch_maladaarAI : public ScriptedAI
@@ -309,7 +309,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_avatar_of_martyredAI (creature);
+        return new npc_avatar_of_martyredAI(creature);
     }
 
     struct npc_avatar_of_martyredAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
index 86eb9e33a7e..9f7a27ecdef 100644
--- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
+++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -55,7 +55,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_shirrak_the_dead_watcherAI (creature);
+        return new boss_shirrak_the_dead_watcherAI(creature);
     }
 
     struct boss_shirrak_the_dead_watcherAI : public ScriptedAI
@@ -167,7 +167,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_focus_fireAI (creature);
+        return new npc_focus_fireAI(creature);
     }
 
     struct npc_focus_fireAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
index ee315d1d42b..6c0d653f213 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp
@@ -73,7 +73,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_nexusprince_shaffarAI (creature);
+        return new boss_nexusprince_shaffarAI(creature);
     }
 
     struct boss_nexusprince_shaffarAI : public ScriptedAI
@@ -234,7 +234,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ethereal_beaconAI (creature);
+        return new npc_ethereal_beaconAI(creature);
     }
 
     struct npc_ethereal_beaconAI : public ScriptedAI
@@ -326,7 +326,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ethereal_apprenticeAI (creature);
+        return new npc_ethereal_apprenticeAI(creature);
     }
 
     struct npc_ethereal_apprenticeAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
index aa24e964df9..3a845842934 100644
--- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp
@@ -47,7 +47,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_pandemoniusAI (creature);
+        return new boss_pandemoniusAI(creature);
     }
 
     struct boss_pandemoniusAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
index 3ba2fd9d19a..7a486876b3f 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp
@@ -58,7 +58,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_darkweaver_sythAI (creature);
+        return new boss_darkweaver_sythAI(creature);
     }
 
     struct boss_darkweaver_sythAI : public ScriptedAI
@@ -247,7 +247,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_syth_fireAI (creature);
+        return new npc_syth_fireAI(creature);
     }
 };
 
@@ -258,7 +258,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_syth_arcaneAI (creature);
+        return new npc_syth_arcaneAI(creature);
     }
 
     struct npc_syth_arcaneAI : public ScriptedAI
@@ -312,7 +312,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_syth_frostAI (creature);
+        return new npc_syth_frostAI(creature);
     }
 
     struct npc_syth_frostAI : public ScriptedAI
@@ -367,7 +367,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_syth_shadowAI (creature);
+        return new npc_syth_shadowAI(creature);
     }
 
     struct npc_syth_shadowAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
index 9333f19d41a..4123da48ba6 100644
--- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
+++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp
@@ -55,7 +55,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_talon_king_ikissAI (creature);
+        return new boss_talon_king_ikissAI(creature);
     }
 
     struct boss_talon_king_ikissAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
index 33a6c42bae7..3d4e7290238 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -62,7 +62,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_spirit_of_olumAI (creature);
+        return new npc_spirit_of_olumAI(creature);
     }
 };
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index d55ca24914a..7a11044476a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -64,7 +64,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_gurtogg_bloodboilAI (creature);
+        return new boss_gurtogg_bloodboilAI(creature);
     }
 
     struct boss_gurtogg_bloodboilAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 07c6e665e98..2fdfe72a6f9 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -466,7 +466,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new flame_of_azzinothAI (creature);
+        return new flame_of_azzinothAI(creature);
     }
 };
 
@@ -1129,7 +1129,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_illidan_stormrageAI (creature);
+        return new boss_illidan_stormrageAI(creature);
     }
 };
 
@@ -1350,7 +1350,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_maievAI (creature);
+        return new boss_maievAI(creature);
     }
 };
 
@@ -2055,7 +2055,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new cage_trap_triggerAI (creature);
+        return new cage_trap_triggerAI(creature);
     }
 };
 
@@ -2129,7 +2129,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new shadow_demonAI (creature);
+        return new shadow_demonAI(creature);
     }
 };
 
@@ -2151,7 +2151,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new blade_of_azzinothAI (creature);
+        return new blade_of_azzinothAI(creature);
     }
 };
 
@@ -2236,7 +2236,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_parasitic_shadowfiendAI (creature);
+        return new npc_parasitic_shadowfiendAI(creature);
     }
 };
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 0bf6685bcf4..b9172be49da 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -84,7 +84,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_shahrazAI (creature);
+        return new boss_shahrazAI(creature);
     }
 
     struct boss_shahrazAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index e43b80d375d..22ea1b70c21 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -106,7 +106,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_enslaved_soulAI (creature);
+        return new npc_enslaved_soulAI(creature);
     }
 
     struct npc_enslaved_soulAI : public ScriptedAI
@@ -134,7 +134,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_reliquary_of_soulsAI (creature);
+        return new boss_reliquary_of_soulsAI(creature);
     }
 
     struct boss_reliquary_of_soulsAI : public ScriptedAI
@@ -390,7 +390,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_essence_of_sufferingAI (creature);
+        return new boss_essence_of_sufferingAI(creature);
     }
 
     struct boss_essence_of_sufferingAI : public ScriptedAI
@@ -515,7 +515,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_essence_of_desireAI (creature);
+        return new boss_essence_of_desireAI(creature);
     }
 
     struct boss_essence_of_desireAI : public ScriptedAI
@@ -618,7 +618,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_essence_of_angerAI (creature);
+        return new boss_essence_of_angerAI(creature);
     }
 
     struct boss_essence_of_angerAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index cb95f4e12e0..1b15a3596c3 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -65,7 +65,7 @@ enum Spells
     SPELL_WINDFURY                   = 38229,
     // Ashtongue Rogue
     SPELL_DEBILITATING_POISON        = 41978,
-    SPELL_EVISCERATE                 = 41177,
+    SPELL_EVISCERATE                 = 41177
 };
 
 enum Creatures
@@ -127,7 +127,7 @@ enum Events
     EVENT_WINDFURY                   = 20,
     // Ashtongue Rogue
     EVENT_DEBILITATING_POISON        = 21,
-    EVENT_EVISCERATE                 = 22,
+    EVENT_EVISCERATE                 = 22
 };
 
 struct Location
@@ -135,9 +135,9 @@ struct Location
     float x, y, z;
 };
 
-static Location ShadeWP= { 512.4877f, 400.7993f, 112.7837f };
+static Location ShadeWP = { 512.4877f, 400.7993f, 112.7837f };
 
-static Location AkamaWP[]=
+static Location AkamaWP[] =
 {
     { 517.4877f, 400.7993f, 112.7837f },
     { 468.4435f, 401.1062f, 118.5379f }
@@ -160,7 +160,7 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             if (!HasKilledAkamaAndReseting)
             {
@@ -185,15 +185,15 @@ public:
             HasKilledAkamaAndReseting = false;
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             if (instance)
                 instance->SetData(DATA_SHADEOFAKAMAEVENT, DONE);
         }
 
-        void EnterCombat(Unit* /*who*/) {}
+        void EnterCombat(Unit* /*who*/) OVERRIDE {}
 
-        void AttackStart(Unit* who)
+        void AttackStart(Unit* who) OVERRIDE
         {
             if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))
             {
@@ -205,7 +205,7 @@ public:
                 ScriptedAI::AttackStart(who);
         }
 
-        void SetData(uint32 data, uint32 value)
+        void SetData(uint32 data, uint32 value) OVERRIDE
         {
             if (data == SETDATA_DATA && value == SETDATA_CHANNELER_DIED)
                 me->RemoveAuraFromStack(SPELL_SHADE_SOUL_CHANNEL_2);
@@ -213,7 +213,7 @@ public:
             UpdateSpeed();
         }
 
-        void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
+        void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE
         {
             if (spell->Id == SPELL_AKAMA_SOUL_CHANNEL)
             {
@@ -243,7 +243,7 @@ public:
                 me->AddUnitState(UNIT_STATE_ROOT);
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             if (HasKilledAkamaAndReseting)
                 return;
@@ -396,9 +396,9 @@ public:
             bool HasKilledAkamaAndReseting;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_shade_of_akamaAI (creature);
+        return new boss_shade_of_akamaAI(creature);
     }
 };
 
@@ -418,7 +418,7 @@ public:
             instance = creature->GetInstanceScript();
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             me->setFaction(FACTION_FRIENDLY);
             me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
@@ -429,7 +429,7 @@ public:
             ShadeHasDied  = false;
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             if (Creature* Shade = Unit::GetCreature((*me), ShadeGUID))
                 if (Shade->IsAlive())
@@ -438,7 +438,7 @@ public:
             me->GetMotionMaster()->MoveIdle();
         }
 
-        void SpellHit(Unit* /*caster*/, SpellInfo const* spell)
+        void SpellHit(Unit* /*caster*/, SpellInfo const* spell) OVERRIDE
         {
             if (!StartCombat)
             {
@@ -454,13 +454,13 @@ public:
             }
         }
 
-        void EnterCombat(Unit* /*who*/)
+        void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 2000);
             events.ScheduleEvent(EVENT_DESTRUCTIVE_POISON, 5000);
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             if (StartChannel)
             {
@@ -521,10 +521,11 @@ public:
                         break;
                 }
             }
+
             DoMeleeAttackIfReady();
         }
 
-        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action)
+        void sGossipSelect(Player* player, uint32 /*sender*/, uint32 action) OVERRIDE
         {
             if (action == 0)
             {
@@ -545,9 +546,9 @@ public:
 
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_akamaAI (creature);
+        return new npc_akamaAI(creature);
     }
 };
 
@@ -567,7 +568,7 @@ public:
             instance = creature->GetInstanceScript();
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
@@ -577,16 +578,16 @@ public:
             events.ScheduleEvent(EVENT_GET_SHADE_GUID, 1000);
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             if (Creature* Shade = (Unit::GetCreature((*me), ShadeGUID)))
                 Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED);
         }
 
-        void EnterCombat(Unit* /*who*/) {}
-        void AttackStart(Unit* /*who*/) {}
+        void EnterCombat(Unit* /*who*/) OVERRIDE {}
+        void AttackStart(Unit* /*who*/) OVERRIDE {}
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             events.Update(diff);
 
@@ -623,7 +624,7 @@ public:
             uint64 ShadeGUID;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
         return new npc_ashtongue_channelerAI(creature);
     }
@@ -645,7 +646,7 @@ public:
             instance = creature->GetInstanceScript();
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             Summons.DespawnAll();
 
@@ -656,12 +657,12 @@ public:
                 leftSide   = true;
         }
 
-        void JustSummoned(Creature* summon)
+        void JustSummoned(Creature* summon) OVERRIDE
         {
             Summons.Summon(summon);
         }
 
-        void SetData(uint32 data, uint32 value)
+        void SetData(uint32 data, uint32 value) OVERRIDE
         {
             if (data == SETDATA_DATA)
             {
@@ -694,7 +695,7 @@ public:
             }
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             if (doSpawning)
             {
@@ -731,7 +732,7 @@ public:
             bool doSpawning;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
         return new npc_creature_generator_akamaAI(creature);
     }
@@ -759,7 +760,7 @@ public:
             }
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             if (!startedBanishing)
             {
@@ -778,29 +779,29 @@ public:
             switchToCombat = false;
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             if (Creature* Shade = (Unit::GetCreature((*me), shadeGUID)))
                 Shade->AI()->SetData(SETDATA_DATA, SETDATA_CHANNELER_DIED);
             me->DespawnOrUnsummon(5000);
         }
 
-        void IsSummonedBy(Unit* /*summoner*/)
+        void IsSummonedBy(Unit* /*summoner*/) OVERRIDE
         {
             if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid)))
                 CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me);
         }
 
-        void EnterCombat(Unit* /*who*/) {}
+        void EnterCombat(Unit* /*who*/) OVERRIDE {}
 
-        void AttackStart(Unit* who)
+        void AttackStart(Unit* who) OVERRIDE
         {
             if (!switchToCombat)
                 return;
             ScriptedAI::AttackStart(who);
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             events.Update(diff);
 
@@ -859,9 +860,9 @@ public:
             bool switchToCombat;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ashtongue_sorcererAI (creature);
+        return new npc_ashtongue_sorcererAI(creature);
     }
 };
 
@@ -883,32 +884,32 @@ public:
                 akamaGUID = instance->GetData64(DATA_AKAMA_SHADE);
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             if (Unit* target = me->GetCreature(*me, akamaGUID))
                 AttackStart(target);
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             me->DespawnOrUnsummon(5000);
         }
 
-        void IsSummonedBy(Unit* /*summoner*/)
+        void IsSummonedBy(Unit* /*summoner*/) OVERRIDE
         {
             if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid)))
                 CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me);
         }
 
-        void EnterCombat(Unit* /*who*/)
+        void EnterCombat(Unit* /*who*/) OVERRIDE
         {
             events.ScheduleEvent(EVENT_HEROIC_STRIKE, 5000);
-            events.ScheduleEvent(EVENT_SHIELD_BASH, urand (10000, 16000));
-            events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand (10000, 16000));
-            events.ScheduleEvent(EVENT_WINDFURY, urand (8000, 12000));
+            events.ScheduleEvent(EVENT_SHIELD_BASH, urand(10000, 16000));
+            events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand(10000, 16000));
+            events.ScheduleEvent(EVENT_WINDFURY, urand(8000, 12000));
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             events.Update(diff);
 
@@ -918,7 +919,7 @@ public:
                 {
                     case EVENT_DEBILITATING_STRIKE:
                         DoCastVictim(SPELL_DEBILITATING_STRIKE);
-                        events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand (8000, 16000));
+                        events.ScheduleEvent(EVENT_DEBILITATING_STRIKE, urand(8000, 16000));
                         break;
                     case EVENT_HEROIC_STRIKE:
                         DoCast(me, SPELL_HEROIC_STRIKE);
@@ -926,11 +927,11 @@ public:
                         break;
                     case EVENT_SHIELD_BASH:
                         DoCastVictim(SPELL_SHIELD_BASH);
-                        events.ScheduleEvent(EVENT_SHIELD_BASH, urand (8000, 16000));
+                        events.ScheduleEvent(EVENT_SHIELD_BASH, urand(8000, 16000));
                         break;
                     case EVENT_WINDFURY:
                         DoCastVictim(SPELL_WINDFURY);
-                        events.ScheduleEvent(EVENT_WINDFURY, urand (6000 , 8000));
+                        events.ScheduleEvent(EVENT_WINDFURY, urand(6000 , 8000));
                         break;
                     default:
                         break;
@@ -946,9 +947,9 @@ public:
             uint64 summonerGuid;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ashtongue_defenderAI (creature);
+        return new npc_ashtongue_defenderAI(creature);
     }
 };
 
@@ -970,30 +971,30 @@ public:
                 akamaGUID = instance->GetData64(DATA_AKAMA_SHADE);
         }
 
-        void Reset()
+        void Reset() OVERRIDE
         {
             if (Unit* target = me->GetCreature(*me, akamaGUID))
                 AttackStart(target);
         }
 
-        void JustDied(Unit* /*killer*/)
+        void JustDied(Unit* /*killer*/) OVERRIDE
         {
             me->DespawnOrUnsummon(5000);
         }
 
-        void IsSummonedBy(Unit* /*summoner*/)
+        void IsSummonedBy(Unit* /*summoner*/) OVERRIDE
         {
             if (Creature* summoner = (Unit::GetCreature((*me), summonerGuid)))
                 CAST_AI(npc_creature_generator_akama::npc_creature_generator_akamaAI, summoner->AI())->JustSummoned(me);
         }
 
-        void EnterCombat(Unit* /*who*/)
+        void EnterCombat(Unit* /*who*/) OVERRIDE
         {
-            events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand (500, 2000));
-            events.ScheduleEvent(SPELL_EVISCERATE, urand (2000, 5000));
+            events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand(500, 2000));
+            events.ScheduleEvent(SPELL_EVISCERATE, urand(2000, 5000));
         }
 
-        void UpdateAI(uint32 diff)
+        void UpdateAI(uint32 diff) OVERRIDE
         {
             events.Update(diff);
 
@@ -1003,7 +1004,7 @@ public:
                 {
                     case EVENT_DEBILITATING_POISON:
                         DoCastVictim(SPELL_DEBILITATING_POISON);
-                        events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand (14000, 18000));
+                        events.ScheduleEvent(EVENT_DEBILITATING_POISON, urand(14000, 18000));
                         break;
                     case EVENT_EVISCERATE:
                         DoCastVictim(SPELL_EVISCERATE);
@@ -1023,9 +1024,9 @@ public:
             uint64 summonerGuid;
     };
 
-    CreatureAI* GetAI(Creature* creature) const
+    CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_ashtongue_rogueAI (creature);
+        return new npc_ashtongue_rogueAI(creature);
     }
 };
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
index 806d11a3906..fbc3e387e8e 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp
@@ -65,7 +65,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new molten_flameAI (creature);
+        return new molten_flameAI(creature);
     }
 
     struct molten_flameAI : public NullCreatureAI
@@ -90,7 +90,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_supremusAI (creature);
+        return new boss_supremusAI(creature);
     }
 
     struct boss_supremusAI : public ScriptedAI
@@ -269,7 +269,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_volcanoAI (creature);
+        return new npc_volcanoAI(creature);
     }
 
     struct npc_volcanoAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index dc212e69d87..a861980ae42 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -217,7 +217,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_teron_gorefiendAI (creature);
+        return new boss_teron_gorefiendAI(creature);
     }
 
     struct boss_teron_gorefiendAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index e70acb40556..532c66bb14a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -78,7 +78,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_najentusAI (creature);
+        return new boss_najentusAI(creature);
     }
 
     struct boss_najentusAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index 8b135316704..3d7a143d59e 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -218,7 +218,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_illidari_councilAI (creature);
+        return new npc_illidari_councilAI(creature);
     }
 
     struct npc_illidari_councilAI : public ScriptedAI
@@ -477,7 +477,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_gathios_the_shattererAI (creature);
+        return new boss_gathios_the_shattererAI(creature);
     }
 
     struct boss_gathios_the_shattererAI : public boss_illidari_councilAI
@@ -609,7 +609,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_high_nethermancer_zerevorAI (creature);
+        return new boss_high_nethermancer_zerevorAI(creature);
     }
 
     struct boss_high_nethermancer_zerevorAI : public boss_illidari_councilAI
@@ -713,7 +713,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_lady_malandeAI (creature);
+        return new boss_lady_malandeAI(creature);
     }
 
     struct boss_lady_malandeAI : public boss_illidari_councilAI
@@ -791,7 +791,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_veras_darkshadowAI (creature);
+        return new boss_veras_darkshadowAI(creature);
     }
 
     struct boss_veras_darkshadowAI : public boss_illidari_councilAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 545dbed7975..a27677f60f5 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -104,7 +104,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_fathomlord_karathressAI (creature);
+        return new boss_fathomlord_karathressAI(creature);
     }
 
     struct boss_fathomlord_karathressAI : public ScriptedAI
@@ -312,7 +312,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_fathomguard_sharkkisAI (creature);
+        return new boss_fathomguard_sharkkisAI(creature);
     }
 
     struct boss_fathomguard_sharkkisAI : public ScriptedAI
@@ -459,7 +459,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_fathomguard_tidalvessAI (creature);
+        return new boss_fathomguard_tidalvessAI(creature);
     }
 
     struct boss_fathomguard_tidalvessAI : public ScriptedAI
@@ -582,7 +582,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_fathomguard_caribdisAI (creature);
+        return new boss_fathomguard_caribdisAI(creature);
     }
 
     struct boss_fathomguard_caribdisAI : public ScriptedAI
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 c96c0e0f269..db270c943e5 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
@@ -86,7 +86,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_hydross_the_unstableAI (creature);
+        return new boss_hydross_the_unstableAI(creature);
     }
 
     struct boss_hydross_the_unstableAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 978a8fe6356..4499cb98475 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -140,12 +140,12 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_lady_vashjAI (creature);
+        return new boss_lady_vashjAI(creature);
     }
 
     struct boss_lady_vashjAI : public ScriptedAI
     {
-        boss_lady_vashjAI (Creature* creature) : ScriptedAI(creature)
+        boss_lady_vashjAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             Intro = false;
@@ -551,7 +551,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_enchanted_elementalAI (creature);
+        return new npc_enchanted_elementalAI(creature);
     }
 
     struct npc_enchanted_elementalAI : public ScriptedAI
@@ -646,7 +646,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_tainted_elementalAI (creature);
+        return new npc_tainted_elementalAI(creature);
     }
 
     struct npc_tainted_elementalAI : public ScriptedAI
@@ -715,7 +715,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_toxic_sporebatAI (creature);
+        return new npc_toxic_sporebatAI(creature);
     }
 
     struct npc_toxic_sporebatAI : public ScriptedAI
@@ -814,7 +814,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_shield_generator_channelAI (creature);
+        return new npc_shield_generator_channelAI(creature);
     }
 
     struct npc_shield_generator_channelAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index b477d020d6a..a87ad44ef1c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -76,7 +76,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_inner_demonAI (creature);
+        return new npc_inner_demonAI(creature);
     }
 
     struct npc_inner_demonAI : public ScriptedAI
@@ -181,7 +181,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_leotheras_the_blindAI (creature);
+        return new boss_leotheras_the_blindAI(creature);
     }
 
     struct boss_leotheras_the_blindAI : public ScriptedAI
@@ -604,7 +604,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_leotheras_the_blind_demonformAI (creature);
+        return new boss_leotheras_the_blind_demonformAI(creature);
     }
 
     struct boss_leotheras_the_blind_demonformAI : public ScriptedAI
@@ -677,7 +677,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_greyheart_spellbinderAI (creature);
+        return new npc_greyheart_spellbinderAI(creature);
     }
 
     struct npc_greyheart_spellbinderAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index e3a7c379414..cd56005b3f6 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -81,7 +81,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_the_lurker_belowAI (creature);
+        return new boss_the_lurker_belowAI(creature);
     }
 
     struct boss_the_lurker_belowAI : public ScriptedAI
@@ -373,7 +373,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_coilfang_ambusherAI (creature);
+        return new npc_coilfang_ambusherAI(creature);
     }
 
     struct npc_coilfang_ambusherAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index b0c6305abf1..e0469dbfbfb 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -91,7 +91,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_morogrim_tidewalkerAI (creature);
+        return new boss_morogrim_tidewalkerAI(creature);
     }
 
     struct boss_morogrim_tidewalkerAI : public ScriptedAI
@@ -294,7 +294,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_water_globuleAI (creature);
+        return new npc_water_globuleAI(creature);
     }
 
     struct npc_water_globuleAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
index ce28180bb78..57cca36b854 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp
@@ -54,7 +54,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_thespiaAI (creature);
+        return new boss_thespiaAI(creature);
     }
 
     struct boss_thespiaAI : public ScriptedAI
@@ -154,7 +154,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_coilfang_waterelementalAI (creature);
+        return new npc_coilfang_waterelementalAI(creature);
     }
 
     struct npc_coilfang_waterelementalAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
index 8662b2c93ec..fa2fac2b0cb 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp
@@ -63,7 +63,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_mekgineer_steamriggerAI (creature);
+        return new boss_mekgineer_steamriggerAI(creature);
     }
 
     struct boss_mekgineer_steamriggerAI : public ScriptedAI
@@ -203,7 +203,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_steamrigger_mechanicAI (creature);
+        return new npc_steamrigger_mechanicAI(creature);
     }
 
     struct npc_steamrigger_mechanicAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
index ee3e9a69c65..4314b43e0e8 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -51,7 +51,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_naga_distillerAI (creature);
+        return new npc_naga_distillerAI(creature);
     }
 
     struct npc_naga_distillerAI : public ScriptedAI
@@ -109,7 +109,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_warlord_kalithreshAI (creature);
+        return new boss_warlord_kalithreshAI(creature);
     }
 
     struct boss_warlord_kalithreshAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
index 9377ea9197f..0db48d83ebb 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp
@@ -43,7 +43,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_hungarfenAI (creature);
+        return new boss_hungarfenAI(creature);
     }
 
     struct boss_hungarfenAI : public ScriptedAI
@@ -111,7 +111,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_underbog_mushroomAI (creature);
+        return new npc_underbog_mushroomAI(creature);
     }
 
     struct npc_underbog_mushroomAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
index c76e677d206..c22dedd269e 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp
@@ -49,7 +49,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_the_black_stalkerAI (creature);
+        return new boss_the_black_stalkerAI(creature);
     }
 
     struct boss_the_black_stalkerAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 9144411fcc6..31f854803bc 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -62,7 +62,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_gruulAI (creature);
+        return new boss_gruulAI(creature);
     }
 
     struct boss_gruulAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 6fa6b9b2e20..d216c0b02ee 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -112,7 +112,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_high_king_maulgarAI (creature);
+        return new boss_high_king_maulgarAI(creature);
     }
 
     struct boss_high_king_maulgarAI : public ScriptedAI
@@ -311,7 +311,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_olm_the_summonerAI (creature);
+        return new boss_olm_the_summonerAI(creature);
     }
 
     struct boss_olm_the_summonerAI : public ScriptedAI
@@ -439,7 +439,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_kiggler_the_crazedAI (creature);
+        return new boss_kiggler_the_crazedAI(creature);
     }
 
     struct boss_kiggler_the_crazedAI : public ScriptedAI
@@ -560,7 +560,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_blindeye_the_seerAI (creature);
+        return new boss_blindeye_the_seerAI(creature);
     }
 
     struct boss_blindeye_the_seerAI : public ScriptedAI
@@ -670,7 +670,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new boss_krosh_firehandAI (creature);
+        return new boss_krosh_firehandAI(creature);
     }
 
     struct boss_krosh_firehandAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index 3381524f17e..e60f76b6389 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -392,7 +392,7 @@ class npc_lesser_shadow_fissure : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new npc_lesser_shadow_fissureAI (creature);
+            return new npc_lesser_shadow_fissureAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
index 0387fca0e18..c8fd429bb33 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
@@ -423,7 +423,7 @@ class boss_warbringer_omrogg : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_warbringer_omroggAI (creature);
+            return new boss_warbringer_omroggAI(creature);
         }
 };
 void AddSC_boss_warbringer_omrogg()
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 5a070017986..597cccda102 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -419,7 +419,7 @@ class boss_high_astromancer_solarian : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_high_astromancer_solarianAI (creature);
+            return new boss_high_astromancer_solarianAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
index d4a38cc3566..a2c6ba399a3 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp
@@ -117,7 +117,7 @@ class boss_gatewatcher_gyrokill : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_gatewatcher_gyrokillAI (creature);
+            return new boss_gatewatcher_gyrokillAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
index 30194bb20d9..1bcdcd48fce 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -160,7 +160,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_pathaleon_the_calculatorAI (creature);
+            return new boss_pathaleon_the_calculatorAI(creature);
         }
 };
 
@@ -232,7 +232,7 @@ class npc_nether_wraith : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new npc_nether_wraithAI (creature);
+            return new npc_nether_wraithAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index ea20626281c..c7765eb24ad 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -275,7 +275,7 @@ class boss_harbinger_skyriss : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_harbinger_skyrissAI (creature);
+            return new boss_harbinger_skyrissAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
index d3fe23353e7..36a17996f94 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp
@@ -73,7 +73,7 @@ class npc_warp_splinter_treant : public CreatureScript
         }
         struct npc_warp_splinter_treantAI  : public ScriptedAI
         {
-            npc_warp_splinter_treantAI (Creature* creature) : ScriptedAI(creature)
+            npc_warp_splinter_treantAI(Creature* creature) : ScriptedAI(creature)
             {
                 WarpGuid = 0;
             }
diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
index 943838ae85d..82849691fcd 100644
--- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp
@@ -171,7 +171,7 @@ class boss_doomlord_kazzak : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_doomlordkazzakAI (creature);
+            return new boss_doomlordkazzakAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp
index ccce7450923..295d86bbce3 100644
--- a/src/server/scripts/Outland/boss_doomwalker.cpp
+++ b/src/server/scripts/Outland/boss_doomwalker.cpp
@@ -161,7 +161,7 @@ class boss_doomwalker : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const OVERRIDE
         {
-            return new boss_doomwalkerAI (creature);
+            return new boss_doomwalkerAI(creature);
         }
 };
 
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index 1321b1457f1..6273731f292 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -62,7 +62,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_bladespire_ogreAI (creature);
+        return new npc_bladespire_ogreAI(creature);
     }
 
     struct npc_bladespire_ogreAI : public ScriptedAI
@@ -114,7 +114,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_nether_drakeAI (creature);
+        return new npc_nether_drakeAI(creature);
     }
 
     struct npc_nether_drakeAI : public ScriptedAI
@@ -279,7 +279,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_daranelleAI (creature);
+        return new npc_daranelleAI(creature);
     }
 
     struct npc_daranelleAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
index 3f1266701db..fc7f4d2ae00 100644
--- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
+++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp
@@ -63,7 +63,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_aeranasAI (creature);
+        return new npc_aeranasAI(creature);
     }
 
     struct npc_aeranasAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 4269c69cfe0..1d5e1b8b6a5 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -323,7 +323,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_creditmarker_visit_with_ancestorsAI (creature);
+        return new npc_creditmarker_visit_with_ancestorsAI(creature);
     }
 
     struct npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp
index 553817f01d8..7c419243c20 100644
--- a/src/server/scripts/Outland/zone_netherstorm.cpp
+++ b/src/server/scripts/Outland/zone_netherstorm.cpp
@@ -76,7 +76,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_manaforge_control_consoleAI (creature);
+        return new npc_manaforge_control_consoleAI(creature);
     }
 
     struct npc_manaforge_control_consoleAI : public ScriptedAI
@@ -741,7 +741,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_phase_hunterAI (creature);
+        return new npc_phase_hunterAI(creature);
     }
 
     struct npc_phase_hunterAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp
index a391ec03228..f40ede82196 100644
--- a/src/server/scripts/Outland/zone_shattrath_city.cpp
+++ b/src/server/scripts/Outland/zone_shattrath_city.cpp
@@ -81,7 +81,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_raliq_the_drunkAI (creature);
+        return new npc_raliq_the_drunkAI(creature);
     }
 
     struct npc_raliq_the_drunkAI : public ScriptedAI
@@ -157,7 +157,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_salsalabimAI (creature);
+        return new npc_salsalabimAI(creature);
     }
 
     struct npc_salsalabimAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 34763d8946c..2cf82cce4d1 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -63,7 +63,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_unkor_the_ruthlessAI (creature);
+        return new npc_unkor_the_ruthlessAI(creature);
     }
 
     struct npc_unkor_the_ruthlessAI : public ScriptedAI
@@ -170,7 +170,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_infested_root_walkerAI (creature);
+        return new npc_infested_root_walkerAI(creature);
     }
 
     struct npc_infested_root_walkerAI : public ScriptedAI
@@ -257,7 +257,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_rotting_forest_ragerAI (creature);
+        return new npc_rotting_forest_ragerAI(creature);
     }
 
     struct npc_rotting_forest_ragerAI : public ScriptedAI
@@ -300,7 +300,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_netherweb_victimAI (creature);
+        return new npc_netherweb_victimAI(creature);
     }
 
     struct npc_netherweb_victimAI : public ScriptedAI
@@ -390,7 +390,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_floonAI (creature);
+        return new npc_floonAI(creature);
     }
 
     struct npc_floonAI : public ScriptedAI
diff --git a/src/server/scripts/Outland/zone_zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp
index 8bacc778f4b..be938582d9c 100644
--- a/src/server/scripts/Outland/zone_zangarmarsh.cpp
+++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp
@@ -209,7 +209,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const OVERRIDE
     {
-        return new npc_cooshcooshAI (creature);
+        return new npc_cooshcooshAI(creature);
     }
 
     bool OnGossipHello(Player* player, Creature* creature) OVERRIDE