Merge branch 'master' of github.com:TrinityCore/TrinityCore

8 files changed, 169 insertions, 169 deletions

diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp
index 54c60da9909..48308545cc3 100644
--- a/src/server/scripts/World/areatrigger_scripts.cpp
+++ b/src/server/scripts/World/areatrigger_scripts.cpp
@@ -266,7 +266,7 @@ class AreaTrigger_at_scent_larkorwi : public AreaTriggerScript
         {
             if (!player->isDead() && player->GetQuestStatus(QUEST_SCENT_OF_LARKORWI) == QUEST_STATUS_INCOMPLETE)
             {
-                if (!player->FindNearestCreature(NPC_LARKORWI_MATE,15))
+                if (!player->FindNearestCreature(NPC_LARKORWI_MATE, 15))
                     player->SummonCreature(NPC_LARKORWI_MATE, player->GetPositionX()+5, player->GetPositionY(), player->GetPositionZ(), 3.3f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 100000);
             }
 
@@ -307,13 +307,13 @@ class AreaTrigger_at_last_rites : public AreaTriggerScript
             {
                 case 5332:
                 case 5338:
-                    pPosition = WorldLocation(571,3733.68f,3563.25f,290.812f,3.665192f);
+                    pPosition = WorldLocation(571, 3733.68f, 3563.25f, 290.812f, 3.665192f);
                     break;
                 case 5334:
-                    pPosition = WorldLocation(571,3802.38f,3585.95f,49.5765f,0.0f);
+                    pPosition = WorldLocation(571, 3802.38f, 3585.95f, 49.5765f, 0.0f);
                     break;
                 case 5340:
-                    pPosition = WorldLocation(571,3687.91f,3577.28f,473.342f,0.0f);
+                    pPosition = WorldLocation(571, 3687.91f, 3577.28f, 473.342f, 0.0f);
                     break;
                 default:
                     return false;
diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp
index 2c39bb1b707..fc0c8f058af 100644
--- a/src/server/scripts/World/go_scripts.cpp
+++ b/src/server/scripts/World/go_scripts.cpp
@@ -19,7 +19,7 @@
 /* ScriptData
 SDName: GO_Scripts
 SD%Complete: 100
-SDComment: Quest support: 4285,4287,4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089,12843,12982, 2936. Soulwell
+SDComment: Quest support: 4285, 4287, 4288(crystal pylons), 4296, 6481, 10990, 10991, 10992, Field_Repair_Bot->Teaches spell 22704. Barov_journal->Teaches spell 26089, 12843, 12982, 2936. Soulwell
 SDCategory: Game Objects
 EndScriptData */
 
@@ -67,7 +67,7 @@ public:
 
     bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/)
     {
-        pPlayer->CastSpell(pPlayer,SPELL_SUMMON_GHOST_SABER,true);
+        pPlayer->CastSpell(pPlayer, SPELL_SUMMON_GHOST_SABER, true);
         return false;
     }
 };
@@ -148,7 +148,7 @@ public:
     {
         if (pPlayer->HasSkill(SKILL_TAILORING) && pPlayer->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !pPlayer->HasSpell(26086))
         {
-            pPlayer->CastSpell(pPlayer,26095,false);
+            pPlayer->CastSpell(pPlayer, 26095, false);
         }
         return true;
     }
@@ -167,7 +167,7 @@ public:
     {
         if (pPlayer->HasSkill(SKILL_ENGINERING) && pPlayer->GetBaseSkillValue(SKILL_ENGINERING) >= 300 && !pPlayer->HasSpell(22704))
         {
-            pPlayer->CastSpell(pPlayer,22864,false);
+            pPlayer->CastSpell(pPlayer, 22864, false);
         }
         return true;
     }
@@ -213,7 +213,7 @@ public:
     bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/)
     {
         if (pPlayer->GetQuestRewardStatus(7761))
-            pPlayer->CastSpell(pPlayer,23460,true);
+            pPlayer->CastSpell(pPlayer, 23460, true);
 
         return true;
     }
@@ -232,7 +232,7 @@ public:
     {
         if (pPlayer->HasSkill(SKILL_ALCHEMY) && pPlayer->GetSkillValue(SKILL_ALCHEMY) >= 300 && !pPlayer->HasSpell(24266))
         {
-            pPlayer->CastSpell(pPlayer,24267,false);
+            pPlayer->CastSpell(pPlayer, 24267, false);
         }
         return true;
     }
@@ -254,7 +254,7 @@ public:
             return true;
 
         if (pPlayer->GetQuestStatus(4296) == QUEST_STATUS_INCOMPLETE)
-            pPlayer->CastSpell(pPlayer,15065,false);
+            pPlayer->CastSpell(pPlayer, 15065, false);
 
         return true;
     }
@@ -272,7 +272,7 @@ public:
     bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/)
     {
         if (pPlayer->GetQuestStatus(10111) == QUEST_STATUS_INCOMPLETE)
-         pPlayer->CastSpell(pPlayer,33382,true);
+         pPlayer->CastSpell(pPlayer, 33382, true);
 
         return true;
     }
@@ -473,10 +473,10 @@ public:
     bool OnGossipHello(Player *pPlayer, GameObject * /*pGO*/)
     {
         //implicitTarget=48 not implemented as of writing this code, and manual summon may be just ok for our purpose
-        //pPlayer->CastSpell(pPlayer,SPELL_SUMMON_RIZZLE,false);
+        //pPlayer->CastSpell(pPlayer, SPELL_SUMMON_RIZZLE, false);
 
         if (Creature* pCreature = pPlayer->SummonCreature(NPC_RIZZLE, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0))
-            pCreature->CastSpell(pPlayer,SPELL_BLACKJACK,false);
+            pCreature->CastSpell(pPlayer, SPELL_BLACKJACK, false);
 
         return false;
     }
@@ -569,12 +569,12 @@ public:
         switch(uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF:
-                pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_BEAST,false);
+                pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_BEAST, false);
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
                 pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
                 break;
             case GOSSIP_ACTION_INFO_DEF + 1:
-                pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_BEAST,false);
+                pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_BEAST, false);
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_FEL_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
                 pPlayer->SEND_GOSSIP_MENU(GOSSIP_FEL_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
                 break;
@@ -628,12 +628,12 @@ public:
         switch(uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF:
-                pPlayer->CastSpell(pPlayer,SPELL_CREATE_1_FLASK_OF_SORCERER,false);
+                pPlayer->CastSpell(pPlayer, SPELL_CREATE_1_FLASK_OF_SORCERER, false);
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
                 pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
                 break;
             case GOSSIP_ACTION_INFO_DEF + 1:
-                pPlayer->CastSpell(pPlayer,SPELL_CREATE_5_FLASK_OF_SORCERER,false);
+                pPlayer->CastSpell(pPlayer, SPELL_CREATE_5_FLASK_OF_SORCERER, false);
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_BASHIR_CRYSTALFORGE_ITEM_RETURN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
                 pPlayer->SEND_GOSSIP_MENU(GOSSIP_BASHIR_CRYSTALFORGE_ITEM_TEXT_RETURN, pGO->GetGUID());
                 break;
@@ -681,21 +681,21 @@ public:
                 if (pPlayer->HasItemCount(ITEM_WHITE_PUNCH_CARD, 1))
                 {
                     pPlayer->DestroyItemCount(ITEM_WHITE_PUNCH_CARD, 1, true);
-                    pPlayer->CastSpell(pPlayer,SPELL_YELLOW_PUNCH_CARD,true);
+                    pPlayer->CastSpell(pPlayer, SPELL_YELLOW_PUNCH_CARD, true);
                 }
                 break;
             case MATRIX_PUNCHOGRAPH_3005_B:
                 if (pPlayer->HasItemCount(ITEM_YELLOW_PUNCH_CARD, 1))
                 {
                     pPlayer->DestroyItemCount(ITEM_YELLOW_PUNCH_CARD, 1, true);
-                    pPlayer->CastSpell(pPlayer,SPELL_BLUE_PUNCH_CARD,true);
+                    pPlayer->CastSpell(pPlayer, SPELL_BLUE_PUNCH_CARD, true);
                 }
                 break;
             case MATRIX_PUNCHOGRAPH_3005_C:
                 if (pPlayer->HasItemCount(ITEM_BLUE_PUNCH_CARD, 1))
                 {
                     pPlayer->DestroyItemCount(ITEM_BLUE_PUNCH_CARD, 1, true);
-                    pPlayer->CastSpell(pPlayer,SPELL_RED_PUNCH_CARD,true);
+                    pPlayer->CastSpell(pPlayer, SPELL_RED_PUNCH_CARD, true);
                 }
                 break;
             case MATRIX_PUNCHOGRAPH_3005_D:
@@ -856,16 +856,16 @@ public:
         switch(pPrisoner->GetEntry())
         {
             case NPC_EBON_BLADE_PRISONER_HUMAN:
-                pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_H,true);
+                pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_H, true);
                 break;
             case NPC_EBON_BLADE_PRISONER_NE:
-                pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_NE,true);
+                pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_NE, true);
                 break;
             case NPC_EBON_BLADE_PRISONER_TROLL:
-                pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_TROLL,true);
+                pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_TROLL, true);
                 break;
             case NPC_EBON_BLADE_PRISONER_ORC:
-                pPlayer->CastSpell(pPlayer,SPELL_SUMMON_BLADE_KNIGHT_ORC,true);
+                pPlayer->CastSpell(pPlayer, SPELL_SUMMON_BLADE_KNIGHT_ORC, true);
                 break;
         }
         return true;
@@ -912,10 +912,10 @@ public:
 
     bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/)
     {
-        if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY,1))
+        if (pPlayer->HasItemCount(ITEM_CUERGOS_KEY, 1))
             return false;
 
-        pPlayer->CastSpell(pPlayer,SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB,true);
+        pPlayer->CastSpell(pPlayer, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true);
 
         return true;
     }
@@ -1009,7 +1009,7 @@ public:
         if (qInfo)
         {
             //TODO: prisoner should help player for a short period of time
-            pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0);
+            pPlayer->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0);
             pPrisoner->DisappearAndDie();
         }
         return true;
@@ -1036,12 +1036,12 @@ public:
     {
         if (pPlayer->GetQuestStatus(QUEST_OH_NOES_THE_TADPOLES) == QUEST_STATUS_INCOMPLETE)
         {
-            Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE,1.0f);
+            Creature *pTadpole = pGO->FindNearestCreature(NPC_WINTERFIN_TADPOLE, 1.0f);
             if (pTadpole)
             {
                 pGO->UseDoorOrButton();
                 pTadpole->DisappearAndDie();
-                pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE,0);
+                pPlayer->KilledMonsterCredit(NPC_WINTERFIN_TADPOLE, 0);
                 //FIX: Summon minion tadpole
             }
         }
@@ -1072,14 +1072,14 @@ public:
         if ((pPlayer->GetTeamId() == TEAM_ALLIANCE && pPlayer->GetQuestStatus(QUEST_ALLIANCE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE) ||
             (pPlayer->GetTeamId() == TEAM_HORDE && pPlayer->GetQuestStatus(QUEST_HORDE_YOU_VE_REALLY_DONE_IT_THIS_TIME_KUL) == QUEST_STATUS_INCOMPLETE))
         {
-            Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT,1.0f);
+            Creature *pPrisoner = pGO->FindNearestCreature(NPC_CAPTIVE_ASPIRANT, 1.0f);
             if (!pPrisoner)
-                pPrisoner = pGO->FindNearestCreature(NPC_KUL,1.0f);
+                pPrisoner = pGO->FindNearestCreature(NPC_KUL, 1.0f);
             if (pPrisoner)
             {
                 pGO->UseDoorOrButton();
                 pPrisoner->DisappearAndDie();
-                pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(),0);
+                pPlayer->KilledMonsterCredit(pPrisoner->GetEntry(), 0);
             }
         }
         return true;
@@ -1133,11 +1133,11 @@ public:
             Creature* pTarget = GetClosestCreatureWithEntry(pPlayer, NPC_OUTHOUSE_BUNNY, 3.0f);
             if (pTarget)
             {
-                pTarget->AI()->SetData(1,pPlayer->getGender());
+                pTarget->AI()->SetData(1, pPlayer->getGender());
                 pGO->CastSpell(pTarget, SPELL_INDISPOSED_III);
             }
             pGO->CastSpell(pPlayer, SPELL_INDISPOSED);
-            if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER,1))
+            if (pPlayer->HasItemCount(ITEM_ANDERHOLS_SLIDER_CIDER, 1))
                 pGO->CastSpell(pPlayer, SPELL_CREATE_AMBERSEEDS);
             return true;
         }
@@ -1168,8 +1168,8 @@ public:
     bool OnGossipHello(Player *pPlayer, GameObject *pGO)
     {
         pPlayer->SendLoot(pGO->GetGUID(), LOOT_CORPSE);
-        pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX()+1,pGO->GetPositionY(),pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
-        pGO->SummonCreature(NPC_HIVE_AMBUSHER,pGO->GetPositionX(),pGO->GetPositionY()+1,pGO->GetPositionZ(),pGO->GetAngle(pPlayer),TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
+        pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX()+1, pGO->GetPositionY(), pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
+        pGO->SummonCreature(NPC_HIVE_AMBUSHER, pGO->GetPositionX(), pGO->GetPositionY()+1, pGO->GetPositionZ(), pGO->GetAngle(pPlayer), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000);
         return true;
     }
 };
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp
index f3f7bd27720..0bf4b966471 100644
--- a/src/server/scripts/World/guards.cpp
+++ b/src/server/scripts/World/guards.cpp
@@ -64,7 +64,7 @@ public:
         void EnterCombat(Unit* who)
         {
             if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
-                DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1,SAY_GUARD_SIL_AGGRO2,SAY_GUARD_SIL_AGGRO3), me, who);
+                DoScriptText(RAND(SAY_GUARD_SIL_AGGRO1, SAY_GUARD_SIL_AGGRO2, SAY_GUARD_SIL_AGGRO3), me, who);
             if (SpellEntry const* spell = me->reachWithSpellAttack(who))
                 DoCast(who, spell->Id);
         }
@@ -124,7 +124,7 @@ public:
                         info = SelectSpell(me->getVictim(), 0, 0, SELECT_TARGET_ANY_ENEMY, 0, 0, 0, 0, SELECT_EFFECT_DONTCARE);
 
                     //20% chance to replace our white hit with a spell
-                    if (info && urand(0,99) < 20 && !globalCooldown)
+                    if (info && urand(0, 99) < 20 && !globalCooldown)
                     {
                         //Cast the spell
                         if (healing)
@@ -171,9 +171,9 @@ public:
 
                         //Cast spell
                         if (healing)
-                            DoCast(me,info->Id);
+                            DoCast(me, info->Id);
                         else
-                            DoCast(me->getVictim(),info->Id);
+                            DoCast(me->getVictim(), info->Id);
 
                         //Set our global cooldown
                         globalCooldown = GENERIC_CREATURE_COOLDOWN;
@@ -268,10 +268,10 @@ public:
             {
                 if (exileTimer <= diff)
                 {
-                    if (Unit* temp = Unit::GetUnit(*me,playerGUID))
+                    if (Unit* temp = Unit::GetUnit(*me, playerGUID))
                     {
-                        temp->CastSpell(temp,SPELL_EXILE,true);
-                        temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true);
+                        temp->CastSpell(temp, SPELL_EXILE, true);
+                        temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true);
                     }
                     playerGUID = 0;
                     exileTimer = 8500;
@@ -333,10 +333,10 @@ public:
             {
                 if (exileTimer <= diff)
                 {
-                    if (Unit* temp = Unit::GetUnit(*me,playerGUID))
+                    if (Unit* temp = Unit::GetUnit(*me, playerGUID))
                     {
-                        temp->CastSpell(temp,SPELL_EXILE,true);
-                        temp->CastSpell(temp,SPELL_BANISH_TELEPORT,true);
+                        temp->CastSpell(temp, SPELL_EXILE, true);
+                        temp->CastSpell(temp, SPELL_BANISH_TELEPORT, true);
                     }
                     playerGUID = 0;
                     exileTimer = 8500;
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp
index 4129fe0e3fa..4b15cc79dd9 100644
--- a/src/server/scripts/World/item_scripts.cpp
+++ b/src/server/scripts/World/item_scripts.cpp
@@ -26,7 +26,7 @@ EndScriptData */
 /* ContentData
 item_draenei_fishing_net(i23654)    Hacklike implements chance to spawn item or creature
 item_nether_wraith_beacon(i31742)   Summons creatures for quest Becoming a Spellfire Tailor (q10832)
-item_flying_machine(i34060,i34061)  Engineering crafted flying machines
+item_flying_machine(i34060, i34061)  Engineering crafted flying machines
 item_gor_dreks_ointment(i30175)     Protecting Our Own(q10488)
 item_only_for_flight                Items which should only useable while flying
 EndContentData */
@@ -75,7 +75,7 @@ public:
             return false;
 
         // error
-        pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL);
+        pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
         return true;
     }
 };
@@ -95,7 +95,7 @@ public:
     {
         if (pPlayer->GetQuestStatus(9452) == QUEST_STATUS_INCOMPLETE)
         {
-            if (urand(0,99) < 35)
+            if (urand(0, 99) < 35)
             {
                 Creature *Murloc = pPlayer->SummonCreature(17102, pPlayer->GetPositionX(), pPlayer->GetPositionY()+20, pPlayer->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
                 if (Murloc)
@@ -156,7 +156,7 @@ public:
             targets.getUnitTarget()->GetEntry() == 20748 && !targets.getUnitTarget()->HasAura(32578))
             return false;
 
-        pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,pItem,NULL);
+        pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, pItem, NULL);
         return true;
     }
 };
@@ -172,11 +172,11 @@ public:
 
     bool OnUse(Player *pPlayer, Item *pItem, SpellCastTargets const & /*targets*/)
     {
-        if (pPlayer->FindNearestCreature(26248,15) || pPlayer->FindNearestCreature(26249,15))
+        if (pPlayer->FindNearestCreature(26248, 15) || pPlayer->FindNearestCreature(26249, 15))
             return false;
         else
         {
-            pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE,pItem,NULL);
+            pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
             return true;
         }
     }
@@ -376,19 +376,19 @@ public:
             return false;
 
         Creature* pMammoth;
-        pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF,5.0f);
+        pMammoth = pPlayer->FindNearestCreature(NPC_TRAPPED_MAMMOTH_CALF, 5.0f);
         if (!pMammoth)
             return false;
 
         GameObject* pTrap;
         for (uint8 i = 0; i < MammothTrapsNum; ++i)
         {
-            pTrap = pPlayer->FindNearestGameObject(MammothTraps[i],11.0f);
+            pTrap = pPlayer->FindNearestGameObject(MammothTraps[i], 11.0f);
             if (pTrap)
             {
                 pMammoth->AI()->DoAction(1);
                 pTrap->SetGoState(GO_STATE_READY);
-                pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF,0);
+                pPlayer->KilledMonsterCredit(NPC_TRAPPED_MAMMOTH_CALF, 0);
                 return true;
             }
         }
@@ -418,7 +418,7 @@ public:
             } else
                 pPlayer->SendEquipError(EQUIP_ERR_OUT_OF_RANGE, pItem, NULL);
         } else
-            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW ,pItem, NULL);
+            pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW , pItem, NULL);
         return true;
     }
 };
diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
index 626067bb602..1c146b85aee 100644
--- a/src/server/scripts/World/mob_generic_creature.cpp
+++ b/src/server/scripts/World/mob_generic_creature.cpp
@@ -143,8 +143,8 @@ public:
                             IsSelfRooted = true;
 
                         //Cast spell
-                        if (Healing) DoCastSpell(me,info);
-                        else DoCastSpell(me->getVictim(),info);
+                        if (Healing) DoCastSpell(me, info);
+                        else DoCastSpell(me->getVictim(), info);
 
                         //Set our global cooldown
                         GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp
index 798ca9a86e4..1ca5fb54234 100644
--- a/src/server/scripts/World/npc_professions.cpp
+++ b/src/server/scripts/World/npc_professions.cpp
@@ -236,7 +236,7 @@ bool EquippedOk(Player* pPlayer, uint32 spellId)
                 if (pItem->GetTemplate()->RequiredSpell == reqSpell)
             {
                 //player has item equipped that require specialty. Not allow to unlearn, player has to unequip first
-                sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.",reqSpell,pItem->GetTemplate()->ItemId);
+                sLog->outDebug(LOG_FILTER_TSCR, "TSCR: player attempt to unlearn spell %u, but item %u is equipped.", reqSpell, pItem->GetTemplate()->ItemId);
                 return false;
             }
         }
@@ -499,17 +499,17 @@ public:
             switch(eCreature)
             {
                 case 22427:                                     //Zarevhi
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRANSMUTE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 19052:                                     //Lorokeem
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELIXIR, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 17909:                                     //Lauranna Thar'well
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_POTION, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_ALCHEMY_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
@@ -645,7 +645,7 @@ public:
                                                                 //unknown textID (TALK_MUST_UNLEARN_WEAPON)
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                 }
-                else if (EquippedOk(pPlayer,S_UNLEARN_WEAPON))
+                else if (EquippedOk(pPlayer, S_UNLEARN_WEAPON))
                 {
                     if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer)))
                     {
@@ -659,12 +659,12 @@ public:
                 }
                 else
                 {
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                     pPlayer->CLOSE_GOSSIP_MENU();
                 }
                 break;
             case GOSSIP_ACTION_INFO_DEF + 4:
-                if (EquippedOk(pPlayer,S_UNLEARN_ARMOR))
+                if (EquippedOk(pPlayer, S_UNLEARN_ARMOR))
                 {
                     if (pPlayer->HasEnoughMoney(DoLowUnlearnCost(pPlayer)))
                     {
@@ -675,7 +675,7 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
                 //Learn Hammer/Axe/Sword
@@ -693,7 +693,7 @@ public:
                 break;
                 //Unlearn Hammer/Axe/Sword
             case GOSSIP_ACTION_INFO_DEF + 8:
-                if (EquippedOk(pPlayer,S_UNLEARN_HAMMER))
+                if (EquippedOk(pPlayer, S_UNLEARN_HAMMER))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -703,11 +703,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 9:
-                if (EquippedOk(pPlayer,S_UNLEARN_AXE))
+                if (EquippedOk(pPlayer, S_UNLEARN_AXE))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -717,11 +717,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 10:
-                if (EquippedOk(pPlayer,S_UNLEARN_SWORD))
+                if (EquippedOk(pPlayer, S_UNLEARN_SWORD))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -731,7 +731,7 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
         }
@@ -774,23 +774,23 @@ public:
                 case 11178:                                     //Borgosh Corebender
                 case 5164:                                      //Grumnus Steelshaper
                 case 11177:                                     //Okothos Ironrager
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SMITH_SPEC, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_ARMORORWEAPON, DoLowUnlearnCost(pPlayer), false);
                                                                 //unknown textID (TALK_UNLEARN_AXEORWEAPON)
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
 
                 case 11191:
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_HAMMER, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID (TALK_HAMMER_UNLEARN)
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 11192:
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction,       BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_AXE, GOSSIP_SENDER_CHECK, uiAction,       BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID (TALK_AXE_UNLEARN)
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 11193:
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction,     BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SWORD, GOSSIP_SENDER_CHECK, uiAction,     BOX_UNLEARN_WEAPON_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID (TALK_SWORD_UNLEARN)
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
@@ -1003,7 +1003,7 @@ public:
                 break;
                 //Unlearn Leather
             case GOSSIP_ACTION_INFO_DEF + 1:
-                if (EquippedOk(pPlayer,S_UNLEARN_DRAGON))
+                if (EquippedOk(pPlayer, S_UNLEARN_DRAGON))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -1013,11 +1013,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 2:
-                if (EquippedOk(pPlayer,S_UNLEARN_ELEMENTAL))
+                if (EquippedOk(pPlayer, S_UNLEARN_ELEMENTAL))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -1027,11 +1027,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 3:
-                if (EquippedOk(pPlayer,S_UNLEARN_TRIBAL))
+                if (EquippedOk(pPlayer, S_UNLEARN_TRIBAL))
                 {
                     if (pPlayer->HasEnoughMoney(DoMedUnlearnCost(pPlayer)))
                     {
@@ -1041,7 +1041,7 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
         }
@@ -1056,19 +1056,19 @@ public:
             {
                 case 7866:                                      //Peter Galen
                 case 7867:                                      //Thorkaf Dragoneye
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_DRAGON, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 7868:                                      //Sarah Tanner
                 case 7869:                                      //Brumn Winterhoof
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_ELEMENTAL, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 7870:                                      //Caryssia Moonhunter
                 case 7871:                                      //Se'Jib
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_TRIBAL, GOSSIP_SENDER_CHECK, uiAction,    BOX_UNLEARN_LEATHER_SPEC, DoMedUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
@@ -1188,7 +1188,7 @@ public:
                 break;
                 //Unlearn Tailor
             case GOSSIP_ACTION_INFO_DEF + 4:
-                if (EquippedOk(pPlayer,S_UNLEARN_SPELLFIRE))
+                if (EquippedOk(pPlayer, S_UNLEARN_SPELLFIRE))
                 {
                     if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
                     {
@@ -1198,11 +1198,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 5:
-                if (EquippedOk(pPlayer,S_UNLEARN_MOONCLOTH))
+                if (EquippedOk(pPlayer, S_UNLEARN_MOONCLOTH))
                 {
                     if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
                     {
@@ -1212,11 +1212,11 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
             case GOSSIP_ACTION_INFO_DEF + 6:
-                if (EquippedOk(pPlayer,S_UNLEARN_SHADOWEAVE))
+                if (EquippedOk(pPlayer, S_UNLEARN_SHADOWEAVE))
                 {
                     if (pPlayer->HasEnoughMoney(DoHighUnlearnCost(pPlayer)))
                     {
@@ -1226,7 +1226,7 @@ public:
                     } else
                         pPlayer->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, 0, 0);
                 } else
-                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,NULL,NULL);
+                    pPlayer->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW, NULL, NULL);
                 pPlayer->CLOSE_GOSSIP_MENU();
                 break;
         }
@@ -1266,17 +1266,17 @@ public:
             switch(eCreature)
             {
                 case 22213:                                     //Gidge Spellweaver
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SPELLFIRE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 22208:                                     //Nasmara Moonsong
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_MOONCLOTH, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
                 case 22212:                                     //Andrion Darkspinner
-                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction,BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer),false);
+                    pPlayer->ADD_GOSSIP_ITEM_EXTENDED(0, GOSSIP_UNLEARN_SHADOWEAVE, GOSSIP_SENDER_CHECK, uiAction, BOX_UNLEARN_TAILOR_SPEC, DoHighUnlearnCost(pPlayer), false);
                                                                 //unknown textID ()
                     pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
                     break;
diff --git a/src/server/scripts/World/npc_taxi.cpp b/src/server/scripts/World/npc_taxi.cpp
index 677f2307643..e5b4a140bb6 100644
--- a/src/server/scripts/World/npc_taxi.cpp
+++ b/src/server/scripts/World/npc_taxi.cpp
@@ -71,11 +71,11 @@ public:
         switch(pCreature->GetEntry())
         {
         case 17435: // Azuremyst Isle - Susurrus
-            if (pPlayer->HasItemCount(23843,1,true))
+            if (pPlayer->HasItemCount(23843, 1, true))
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SUSURRUS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
             break;
         case 20903: // Netherstorm - Protectorate Nether Drake
-            if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778,1))
+            if (pPlayer->GetQuestStatus(10438) == QUEST_STATUS_INCOMPLETE && pPlayer->HasItemCount(29778, 1))
                 pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_NETHER_DRAKE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
             break;
         case 18725: // Old Hillsbrad Foothills - Brazen
@@ -165,7 +165,7 @@ public:
             break;
         case 23704: // Dustwallow Marsh - Cassa Crimsonwing
             if (pPlayer->GetQuestStatus(11142) == QUEST_STATUS_INCOMPLETE)
-                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+25);
+                pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_CRIMSONWING, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+25);
             break;
         case 26602:
             if (pCreature->isTaxi())
@@ -194,14 +194,14 @@ public:
         case GOSSIP_ACTION_INFO_DEF:
             //spellId is correct, however it gives flight a somewhat funny effect //TaxiPath 506.
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,32474,true);
+            pPlayer->CastSpell(pPlayer, 32474, true);
             break;
         case GOSSIP_ACTION_INFO_DEF + 1:
             pPlayer->CLOSE_GOSSIP_MENU();
             pPlayer->ActivateTaxiPathTo(627);                  //TaxiPath 627 (possibly 627+628(152->153->154->155))
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            if (!pPlayer->HasItemCount(25853,1)) {
+            if (!pPlayer->HasItemCount(25853, 1)) {
                 pPlayer->SEND_GOSSIP_MENU(9780, pCreature->GetGUID());
             } else {
                 pPlayer->CLOSE_GOSSIP_MENU();
@@ -210,59 +210,59 @@ public:
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,53335,true);               //TaxiPath 1041 (Stormwind Harbor)
+            pPlayer->CastSpell(pPlayer, 53335, true);               //TaxiPath 1041 (Stormwind Harbor)
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,33768,true);               //TaxiPath 585 (Gateways Murket and Shaadraz)
+            pPlayer->CastSpell(pPlayer, 33768, true);               //TaxiPath 585 (Gateways Murket and Shaadraz)
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,35069,true);               //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
+            pPlayer->CastSpell(pPlayer, 35069, true);               //TaxiPath 612 (Taxi - Hellfire Peninsula - Expedition Point to Shatter Point)
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,33899,true);               //TaxiPath 589 (Aerial Assault Flight (Alliance))
+            pPlayer->CastSpell(pPlayer, 33899, true);               //TaxiPath 589 (Aerial Assault Flight (Alliance))
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,35065,true);               //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
+            pPlayer->CastSpell(pPlayer, 35065, true);               //TaxiPath 607 (Taxi - Hellfire Peninsula - Shatter Point to Beach Head)
             break;
         case GOSSIP_ACTION_INFO_DEF + 8:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,33659,true);               //TaxiPath 584 (Gateways Murket and Shaadraz)
+            pPlayer->CastSpell(pPlayer, 33659, true);               //TaxiPath 584 (Gateways Murket and Shaadraz)
             break;
         case GOSSIP_ACTION_INFO_DEF + 9:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,33825,true);               //TaxiPath 587 (Aerial Assault Flight (Horde))
+            pPlayer->CastSpell(pPlayer, 33825, true);               //TaxiPath 587 (Aerial Assault Flight (Horde))
             break;
         case GOSSIP_ACTION_INFO_DEF + 10:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,34578,true);               //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
+            pPlayer->CastSpell(pPlayer, 34578, true);               //TaxiPath 604 (Taxi - Reaver's Fall to Spinebreaker Ridge)
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,41278,true);               //TaxiPath 706
+            pPlayer->CastSpell(pPlayer, 41278, true);               //TaxiPath 706
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,45071,true);               //TaxiPath 779
+            pPlayer->CastSpell(pPlayer, 45071, true);               //TaxiPath 779
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,45113,true);               //TaxiPath 784
+            pPlayer->CastSpell(pPlayer, 45113, true);               //TaxiPath 784
             break;
         case GOSSIP_ACTION_INFO_DEF + 14:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,45353,true);               //TaxiPath 788
+            pPlayer->CastSpell(pPlayer, 45353, true);               //TaxiPath 788
             break;
         case GOSSIP_ACTION_INFO_DEF + 15:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,34905,true);               //TaxiPath 606
+            pPlayer->CastSpell(pPlayer, 34905, true);               //TaxiPath 606
             break;
         case GOSSIP_ACTION_INFO_DEF + 16:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,41279,true);               //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
+            pPlayer->CastSpell(pPlayer, 41279, true);               //TaxiPath 705 (Taxi - Skettis to Skyguard Outpost)
             break;
         case GOSSIP_ACTION_INFO_DEF + 17:
             pPlayer->CLOSE_GOSSIP_MENU();
@@ -290,7 +290,7 @@ public:
             break;
         case GOSSIP_ACTION_INFO_DEF + 23:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,43074,true);               //TaxiPath 736
+            pPlayer->CastSpell(pPlayer, 43074, true);               //TaxiPath 736
             break;
         case GOSSIP_ACTION_INFO_DEF + 24:
             pPlayer->CLOSE_GOSSIP_MENU();
@@ -299,7 +299,7 @@ public:
             break;
         case GOSSIP_ACTION_INFO_DEF + 25:
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,42295,true);
+            pPlayer->CastSpell(pPlayer, 42295, true);
             break;
         case GOSSIP_ACTION_INFO_DEF + 26:
             pPlayer->GetSession()->SendTaxiMenu(pCreature);
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index 0cc5545e9c8..cdc91f010f2 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -421,13 +421,13 @@ public:
             DoCast(me, SPELL_BRAZIER, true);
             DoCast(me, SPELL_FIERY_AURA, false);
             float x, y, z;
-            me->GetPosition(x,y,z);
-            me->Relocate(x,y,z + 0.94f);
+            me->GetPosition(x, y, z);
+            me->Relocate(x, y, z + 0.94f);
             me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
             me->HandleEmoteCommand(EMOTE_ONESHOT_DANCE);
             WorldPacket data;                       //send update position to client
             me->BuildHeartBeatMsg(&data);
-            me->SendMessageToSet(&data,true);
+            me->SendMessageToSet(&data, true);
         }
 
         void UpdateAI(const uint32 diff)
@@ -447,14 +447,14 @@ public:
 
         void ReceiveEmote(Player* pPlayer, uint32 emote)
         {
-            if (me->IsWithinLOS(pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer,30.0f))
+            if (me->IsWithinLOS(pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ()) && me->IsWithinDistInMap(pPlayer, 30.0f))
             {
                 me->SetInFront(pPlayer);
                 active = false;
 
                 WorldPacket data;
                 me->BuildHeartBeatMsg(&data);
-                me->SendMessageToSet(&data,true);
+                me->SendMessageToSet(&data, true);
                 switch(emote)
                 {
                     case TEXTEMOTE_KISS:    me->HandleEmoteCommand(EMOTE_ONESHOT_SHY); break;
@@ -755,7 +755,7 @@ public:
                 //stand up
                 me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_STAND);
 
-                DoScriptText(RAND(SAY_DOC1,SAY_DOC2,SAY_DOC3), me);
+                DoScriptText(RAND(SAY_DOC1, SAY_DOC2, SAY_DOC3), me);
 
                 uint32 mobId = me->GetEntry();
                 me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
@@ -878,7 +878,7 @@ enum eGarments
     ENTRY_KORJA             = 12430,
     ENTRY_DG_KEL            = 12428,
 
-    //used by 12429,12423,12427,12430,12428, but signed for 12429
+    //used by 12429, 12423, 12427, 12430, 12428, but signed for 12429
     SAY_COMMON_HEALED       = -1000164,
     SAY_DG_KEL_THANKS       = -1000165,
     SAY_DG_KEL_GOODBYE      = -1000166,
@@ -945,14 +945,14 @@ public:
                             {
                                 if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    DoScriptText(SAY_SHAYA_THANKS,me,pCaster);
+                                    DoScriptText(SAY_SHAYA_THANKS, me, pCaster);
                                     bCanRun = true;
                                 }
                                 else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     caster = pCaster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    DoScriptText(SAY_COMMON_HEALED,me,pCaster);
+                                    DoScriptText(SAY_COMMON_HEALED, me, pCaster);
                                     bIsHealed = true;
                                 }
                             }
@@ -962,14 +962,14 @@ public:
                             {
                                 if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    DoScriptText(SAY_ROBERTS_THANKS,me,pCaster);
+                                    DoScriptText(SAY_ROBERTS_THANKS, me, pCaster);
                                     bCanRun = true;
                                 }
                                 else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     caster = pCaster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    DoScriptText(SAY_COMMON_HEALED,me,pCaster);
+                                    DoScriptText(SAY_COMMON_HEALED, me, pCaster);
                                     bIsHealed = true;
                                 }
                             }
@@ -979,14 +979,14 @@ public:
                             {
                                 if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    DoScriptText(SAY_DOLF_THANKS,me,pCaster);
+                                    DoScriptText(SAY_DOLF_THANKS, me, pCaster);
                                     bCanRun = true;
                                 }
                                 else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     caster = pCaster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    DoScriptText(SAY_COMMON_HEALED,me,pCaster);
+                                    DoScriptText(SAY_COMMON_HEALED, me, pCaster);
                                     bIsHealed = true;
                                 }
                             }
@@ -996,14 +996,14 @@ public:
                             {
                                 if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    DoScriptText(SAY_KORJA_THANKS,me,pCaster);
+                                    DoScriptText(SAY_KORJA_THANKS, me, pCaster);
                                     bCanRun = true;
                                 }
                                 else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     caster = pCaster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    DoScriptText(SAY_COMMON_HEALED,me,pCaster);
+                                    DoScriptText(SAY_COMMON_HEALED, me, pCaster);
                                     bIsHealed = true;
                                 }
                             }
@@ -1013,14 +1013,14 @@ public:
                             {
                                 if (bIsHealed && !bCanRun && Spell->Id == SPELL_FORTITUDE_R1)
                                 {
-                                    DoScriptText(SAY_DG_KEL_THANKS,me,pCaster);
+                                    DoScriptText(SAY_DG_KEL_THANKS, me, pCaster);
                                     bCanRun = true;
                                 }
                                 else if (!bIsHealed && Spell->Id == SPELL_LESSER_HEAL_R2)
                                 {
                                     caster = pCaster->GetGUID();
                                     me->SetStandState(UNIT_STAND_STATE_STAND);
-                                    DoScriptText(SAY_COMMON_HEALED,me,pCaster);
+                                    DoScriptText(SAY_COMMON_HEALED, me, pCaster);
                                     bIsHealed = true;
                                 }
                             }
@@ -1029,7 +1029,7 @@ public:
 
                     //give quest credit, not expect any special quest objectives
                     if (bCanRun)
-                        CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(),me->GetGUID());
+                        CAST_PLR(pCaster)->TalkedToCreature(me->GetEntry(), me->GetGUID());
                 }
             }
         }
@@ -1044,18 +1044,18 @@ public:
             {
                 if (RunAwayTimer <= diff)
                 {
-                    if (Unit *pUnit = Unit::GetUnit(*me,caster))
+                    if (Unit *pUnit = Unit::GetUnit(*me, caster))
                     {
                         switch(me->GetEntry())
                         {
-                            case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE,me,pUnit); break;
-                            case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE,me,pUnit); break;
-                            case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE,me,pUnit); break;
-                            case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE,me,pUnit); break;
-                            case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE,me,pUnit); break;
+                            case ENTRY_SHAYA: DoScriptText(SAY_SHAYA_GOODBYE, me, pUnit); break;
+                            case ENTRY_ROBERTS: DoScriptText(SAY_ROBERTS_GOODBYE, me, pUnit); break;
+                            case ENTRY_DOLF: DoScriptText(SAY_DOLF_GOODBYE, me, pUnit); break;
+                            case ENTRY_KORJA: DoScriptText(SAY_KORJA_GOODBYE, me, pUnit); break;
+                            case ENTRY_DG_KEL: DoScriptText(SAY_DG_KEL_GOODBYE, me, pUnit); break;
                         }
 
-                        Start(false,true,true);
+                        Start(false, true, true);
                     }
                     else
                         EnterEvadeMode();                       //something went wrong
@@ -1141,7 +1141,7 @@ public:
         if (pCreature->isQuestGiver())
             pPlayer->PrepareQuestMenu(pCreature->GetGUID());
 
-        if (pPlayer->HasItemCount(ITEM_KT_SIGNET,1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) ||
+        if (pPlayer->HasItemCount(ITEM_KT_SIGNET, 1) && (!pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_A) ||
             !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_H) || !pPlayer->GetQuestRewardStatus(QUEST_MAGICAL_KINGDOM_N)))
             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TELEPORT_TO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
 
@@ -1155,7 +1155,7 @@ public:
         if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
         {
             pPlayer->CLOSE_GOSSIP_MENU();
-            pPlayer->CastSpell(pPlayer,SPELL_TELEPORT_DALARAN,false);
+            pPlayer->CastSpell(pPlayer, SPELL_TELEPORT_DALARAN, false);
         }
         return true;
     }
@@ -1283,7 +1283,7 @@ public:
         if (pPlayer->GetSpecsCount() == 1 && pCreature->isCanTrainingAndResetTalentsOf(pPlayer) && pPlayer->getLevel() >= sWorld->getIntConfig(CONFIG_MIN_DUALSPEC_LEVEL))
             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_TRAINER, GOSSIP_HELLO_ROGUE3, GOSSIP_SENDER_MAIN, GOSSIP_OPTION_LEARNDUALSPEC);
 
-        if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126,1) && !pPlayer->GetQuestRewardStatus(6681))
+        if (pPlayer->getClass() == CLASS_ROGUE && pPlayer->getLevel() >= 24 && !pPlayer->HasItemCount(17126, 1) && !pPlayer->GetQuestRewardStatus(6681))
         {
             pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_ROGUE2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
             pPlayer->SEND_GOSSIP_MENU(5996, pCreature->GetGUID());
@@ -1300,7 +1300,7 @@ public:
         {
             case GOSSIP_ACTION_INFO_DEF+1:
                 pPlayer->CLOSE_GOSSIP_MENU();
-                pPlayer->CastSpell(pPlayer,21100,false);
+                pPlayer->CastSpell(pPlayer, 21100, false);
                 break;
             case GOSSIP_ACTION_TRAIN:
                 pPlayer->SEND_TRAINERLIST(pCreature->GetGUID());
@@ -1324,8 +1324,8 @@ public:
 
                         // Cast spells that teach dual spec
                         // Both are also ImplicitTarget self and must be cast by player
-                        pPlayer->CastSpell(pPlayer,63680,true,NULL,NULL,pPlayer->GetGUID());
-                        pPlayer->CastSpell(pPlayer,63624,true,NULL,NULL,pPlayer->GetGUID());
+                        pPlayer->CastSpell(pPlayer, 63680, true, NULL, NULL, pPlayer->GetGUID());
+                        pPlayer->CastSpell(pPlayer, 63624, true, NULL, NULL, pPlayer->GetGUID());
 
                         // Should show another Gossip text with "Congratulations..."
                         pPlayer->PlayerTalkClass->CloseGossip();
@@ -1454,42 +1454,42 @@ public:
                 break;
             case GOSSIP_SENDER_MAIN+1:
                 pCreature->CastSpell(pPlayer, SPELL_DMG, false);
-                pPlayer->AddSpellCooldown(SPELL_DMG,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_DMG, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+2:
                 pCreature->CastSpell(pPlayer, SPELL_RES, false);
-                pPlayer->AddSpellCooldown(SPELL_RES,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_RES, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+3:
                 pCreature->CastSpell(pPlayer, SPELL_ARM, false);
-                pPlayer->AddSpellCooldown(SPELL_ARM,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_ARM, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+4:
                 pCreature->CastSpell(pPlayer, SPELL_SPI, false);
-                pPlayer->AddSpellCooldown(SPELL_SPI,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_SPI, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+5:
                 pCreature->CastSpell(pPlayer, SPELL_INT, false);
-                pPlayer->AddSpellCooldown(SPELL_INT,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_INT, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+6:
                 pCreature->CastSpell(pPlayer, SPELL_STM, false);
-                pPlayer->AddSpellCooldown(SPELL_STM,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_STM, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+7:
                 pCreature->CastSpell(pPlayer, SPELL_STR, false);
-                pPlayer->AddSpellCooldown(SPELL_STR,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_STR, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
             case GOSSIP_SENDER_MAIN+8:
                 pCreature->CastSpell(pPlayer, SPELL_AGI, false);
-                pPlayer->AddSpellCooldown(SPELL_AGI,0,time(NULL) + 7200);
+                pPlayer->AddSpellCooldown(SPELL_AGI, 0, time(NULL) + 7200);
                 SendAction(pPlayer, pCreature, uiAction);
                 break;
         }
@@ -1625,7 +1625,7 @@ public:
             {
                 me->CastSpell(me, 26218, false);
                 pPlayer->CastSpell(pPlayer, 26218, false);
-                switch (urand(0,2))
+                switch (urand(0, 2))
                 {
                     case 0: me->CastSpell(pPlayer, 26207, false); break;
                     case 1: me->CastSpell(pPlayer, 26206, false); break;
@@ -1724,10 +1724,10 @@ public:
             {
                 if (IsViper) //Viper
                 {
-                    if (urand(0,2) == 0) //33% chance to cast
+                    if (urand(0, 2) == 0) //33% chance to cast
                     {
                         uint32 spell;
-                        if (urand(0,1) == 0)
+                        if (urand(0, 1) == 0)
                             spell = SPELL_MIND_NUMBING_POISON;
                         else
                             spell = SPELL_CRIPPLING_POISON;
@@ -1739,7 +1739,7 @@ public:
                 }
                 else //Venomous Snake
                 {
-                    if (urand(0,2) == 0) //33% chance to cast
+                    if (urand(0, 2) == 0) //33% chance to cast
                         DoCast(me->getVictim(), SPELL_DEADLY_POISON);
                     SpellTimer = VENOMOUS_SNAKE_TIMER + (rand() %5)*100;
                 }
@@ -1779,7 +1779,7 @@ public:
             victimGUID = 0;
             hearts = 15000;
             if (Unit* own = me->GetOwner())
-                me->GetMotionMaster()->MoveFollow(own,0,0);
+                me->GetMotionMaster()->MoveFollow(own, 0, 0);
         }
         void EnterCombat(Unit * /*who*/){}
         void UpdateAI(const uint32 diff)
@@ -1817,17 +1817,17 @@ public:
                         break;
                     case 7:whisp.append(SAY_RANDOM_MOJO7);break;
                 }
-                me->MonsterWhisper(whisp.c_str(),pPlayer->GetGUID());
+                me->MonsterWhisper(whisp.c_str(), pPlayer->GetGUID());
                 if (victimGUID)
                 {
                     Player* victim = Unit::GetPlayer(*me, victimGUID);
                     if (victim)
                         victim->RemoveAura(43906);//remove polymorph frog thing
                 }
-                me->AddAura(43906,pPlayer);//add polymorph frog thing
+                me->AddAura(43906, pPlayer);//add polymorph frog thing
                 victimGUID = pPlayer->GetGUID();
                 DoCast(me, 20372, true);//tag.hearts
-                me->GetMotionMaster()->MoveFollow(pPlayer,0,0);
+                me->GetMotionMaster()->MoveFollow(pPlayer, 0, 0);
                 hearts = 15000;
             }
         }
@@ -1910,9 +1910,9 @@ public:
             Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check);
             me->VisitNearbyObject(30, searcher);
             for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter)
-                if ((*iter)->GetAura(49206,owner->GetGUID()))
+                if ((*iter)->GetAura(49206, owner->GetGUID()))
                 {
-                    me->Attack((*iter),false);
+                    me->Attack((*iter), false);
                     break;
                 }
         }
@@ -2022,7 +2022,7 @@ public:
 
         void Reset()
         {
-            me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate
+            me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate
             me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_KNOCK_BACK, true);//imune to knock aways like blast wave
 
             uiResetTimer = 5000;
@@ -2055,7 +2055,7 @@ public:
                 return;
 
             if (!me->HasUnitState(UNIT_STAT_STUNNED))
-                me->SetControlled(true,UNIT_STAT_STUNNED);//disable rotate
+                me->SetControlled(true, UNIT_STAT_STUNNED);//disable rotate
 
             if (uiEntry != NPC_ADVANCED_TARGET_DUMMY && uiEntry != NPC_TARGET_DUMMY)
             {
@@ -2107,7 +2107,7 @@ public:
                 {
                     if (pOwner->HasAura(GLYPH_OF_SHADOWFIEND))
                         if (damage >= me->GetHealth())
-                            pOwner->CastSpell(pOwner,GLYPH_OF_SHADOWFIEND_MANA,true);
+                            pOwner->CastSpell(pOwner, GLYPH_OF_SHADOWFIEND_MANA, true);
                 }
         }
 
@@ -2169,7 +2169,7 @@ public:
     bool OnGossipSelect(Player* pPlayer, Creature* /*pCreature*/, uint32 /*uiSender*/, uint32 uiAction)
     {
         pPlayer->PlayerTalkClass->ClearMenus();
-        bool roll = urand(0,1);
+        bool roll = urand(0, 1);
 
         switch(uiAction)
         {