Cleanup/Core: Remove whitespace and tabs

--HG--
branch : trunk

64 files changed, 261 insertions, 261 deletions

diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index 42b63c9e322..493614bc963 100644
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
@@ -86,7 +86,7 @@ void RealmList::UpdateRealms(bool init)
     {
         do
         {
-            uint32 realmId = result->GetUInt32(0); 
+            uint32 realmId = result->GetUInt32(0);
             const std::string& name = result->GetString(1);
             const std::string& address = result->GetString(2);
             uint32 port = result->GetUInt32(3);
@@ -96,7 +96,7 @@ void RealmList::UpdateRealms(bool init)
             uint8 allowedSecurityLevel = result->GetUInt8(7);
             float pop = result->GetFloat(8);
             uint32 build = result->GetUInt32(9);
-                        
+
             UpdateRealm(realmId, name, address, port, icon, color, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build);
 
             if (init)
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index da8dcafe67d..8b8d3cf35a0 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -611,7 +611,7 @@ bool AuthSocket::_HandleLogonProof()
         ///- Update the sessionkey, last_ip, last login time and reset number of failed logins in the account table for this account
         // No SQL injection (escaped user name) and IP address as received by socket
         const char* K_hex = K.AsHexStr();
-        
+
         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SET_LOGONPROOF);
         stmt->setString(0, K_hex);
         stmt->setString(1, socket().get_remote_address().c_str());
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp
index 09b5ddc8fe4..8064d7a4289 100644
--- a/src/server/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
@@ -615,7 +615,7 @@ uint32 ArenaTeam::GetAverageMMR(Group *group) const
         matchmakerrating += itr->matchmaker_rating;
         ++player_divider;
     }
-    
+
     //- x/0 = crash
     if (player_divider == 0)
         player_divider = 1;
@@ -645,7 +645,7 @@ int32 ArenaTeam::GetRatingMod(uint32 own_rating, uint32 enemy_rating, bool won,
     // calculate the rating modification
     // simulation on how it works. Not much info on how it really works
     float mod;
-    
+
     if (won && !calculating_mmr)
     {
         if (own_rating < 1000)
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 43419f7b392..bbc4c5c4f76 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -132,7 +132,7 @@ ChatCommand * ChatHandler::getCommandTable()
     static ChatCommand characterCommandTable[] =
     {
         { "customize",      SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterCustomizeCommand,     "", NULL },
-        { "changefaction",  SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterChangeFactionCommand, "", NULL }, 
+        { "changefaction",  SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterChangeFactionCommand, "", NULL },
         { "changerace",     SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterChangeRaceCommand,    "", NULL },
         { "deleted",        SEC_GAMEMASTER,     true,  NULL,                                              "", characterDeletedCommandTable},
         { "erase",          SEC_CONSOLE,        true,  &ChatHandler::HandleCharacterEraseCommand,         "", NULL },
@@ -663,7 +663,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
 
-    static ChatCommand ticketResponseCommandTable[] = 
+    static ChatCommand ticketResponseCommandTable[] =
     {
         { "append",         SEC_MODERATOR,      false, &ChatHandler::HandleGMTicketResponseAppendCommand,   "", NULL },
         { "appendln",       SEC_MODERATOR,      false, &ChatHandler::HandleGMTicketResponseAppendLnCommand, "", NULL },
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index d0882941f1e..9cdc602b071 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -814,7 +814,7 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposalList *proposals)
         sLog.outDebug("LFGMgr::CheckCompatibility: (%s): Size wrong - Not compatibles", strGuids.c_str());
         return false;
     }
-   
+
     // No previous check have been done, do it now
     uint8 numPlayers = 0;
     uint8 numLfgGroups = 0;
@@ -1244,7 +1244,7 @@ void LFGMgr::SetCompatibles(std::string key, bool compatibles)
 /// Get the compatible dungeons between two groups from cache
 /// </summary>
 /// <param name="std::string">list of guids concatenated by |</param>
-/// <returns>LfgAnswer, 
+/// <returns>LfgAnswer,
 LfgAnswer LFGMgr::GetCompatibles(std::string key)
 {
     LfgAnswer answer = LFG_ANSWER_PENDING;
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 4535e9853ad..4b09b6f38d9 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -144,7 +144,7 @@ m_PlayerDamageReq(0), m_lootMoney(0), m_lootRecipient(0), m_deathTimer(0), m_res
 m_respawnDelay(300), m_corpseDelay(60), m_respawnradius(0.0f), m_reactState(REACT_AGGRESSIVE),
 m_defaultMovementType(IDLE_MOTION_TYPE), m_DBTableGuid(0), m_equipmentId(0), m_AlreadyCallAssistance(false),
 m_AlreadySearchedAssistance(false), m_regenHealth(true), m_AI_locked(false), m_isDeadByDefault(false),
-m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_creatureData(NULL), 
+m_meleeDamageSchoolMask(SPELL_SCHOOL_MASK_NORMAL), m_creatureInfo(NULL), m_creatureData(NULL),
 m_formation(NULL)
 {
     m_regenTimer = CREATURE_REGEN_INTERVAL;
diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp
index 20d3806cc18..367f7c35064 100644
--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@@ -25,8 +25,8 @@
 #include "TemporarySummon.h"
 
 TempSummon::TempSummon(SummonPropertiesEntry const *properties, Unit *owner) :
-Creature(), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN), 
-m_timer(0), m_lifetime(0) 
+Creature(), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),
+m_timer(0), m_lifetime(0)
 {
     m_summonerGUID = owner ? owner->GetGUID() : 0;
     m_unitTypeMask |= UNIT_MASK_SUMMON;
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index f4721981979..d0de42351b0 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -1215,7 +1215,7 @@ void MovementInfo::OutDebug()
     }
 }
 
-WorldObject::WorldObject(): WorldLocation(), 
+WorldObject::WorldObject(): WorldLocation(),
 m_isWorldObject(false), m_name(""), m_isActive(false), m_zoneScript(NULL),
 m_transport(NULL), m_currMap(NULL), m_InstanceId(0),
 m_phaseMask(PHASEMASK_NORMAL), m_notifyflags(0), m_executed_notifies(0)
@@ -1436,7 +1436,7 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
     return distsq < maxdist * maxdist;
 }
 
-void Position::RelocateOffset(const Position & offset) 
+void Position::RelocateOffset(const Position & offset)
 {
     m_positionX = GetPositionX() + (offset.GetPositionX() * cos(GetOrientation()) + offset.GetPositionY() * sin(GetOrientation() + M_PI));
     m_positionY = GetPositionY() + (offset.GetPositionY() * cos(GetOrientation()) + offset.GetPositionX() * sin(GetOrientation()));
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index e5b38265e26..cf7c9da778f 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -43,8 +43,8 @@ char const* petTypeSuffix[MAX_PET_TYPE] =
 #define PET_XP_FACTOR 0.05f
 
 Pet::Pet(Player *owner, PetType type) : Guardian(NULL, owner),
-m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0), 
-m_removed(false), m_owner(owner), m_happinessTimer(7500), m_petType(type), 
+m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0),
+m_removed(false), m_owner(owner), m_happinessTimer(7500), m_petType(type),
 m_duration(0), m_auraRaidUpdateMask(0), m_loading(false), m_declinedname(NULL)
 {
     m_unitTypeMask |= UNIT_MASK_PET;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 34719457084..11c58b19cad 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -384,7 +384,7 @@ void TradeData::SetAccepted(bool state, bool crosssend /*= false*/)
 
 UpdateMask Player::updateVisualBits;
 
-// we can disable this warning for this since it only 
+// we can disable this warning for this since it only
 // causes undefined behavior when passed to the base class constructor
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
@@ -2503,7 +2503,7 @@ void Player::SetGameMaster(bool on)
             SetPhaseMask(phases.front()->GetMiscValue(), false);
         else
             SetPhaseMask(PHASEMASK_NORMAL, false);
-            
+
 
         m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON;
         setFactionForRace(getRace());
@@ -19615,7 +19615,7 @@ inline bool Player::_StoreOrEquipNewItem(uint32 vendorslot, uint32 item, uint8 c
 {
     ItemPosCountVec vDest;
     uint16 uiDest;
-    uint8 msg = bStore ? 
+    uint8 msg = bStore ?
         CanStoreNewItem(bag, slot, vDest, item, pProto->BuyCount * count) :
         CanEquipNewItem(slot, uiDest, item, false);
     if (msg != EQUIP_ERR_OK)
@@ -21556,7 +21556,7 @@ void Player::AutoUnequipOffhandIfNeed(bool force /*= false*/)
         SQLTransaction trans = CharacterDatabase.BeginTransaction();
         offItem->DeleteFromInventoryDB(trans);                   // deletes item from character's inventory
         offItem->SaveToDB(trans);                                // recursive and not have transaction guard into self, item not in inventory and can be save standalone
-        
+
         std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM);
         MailDraft(subject, "There were problems with equipping one or several items").AddItem(offItem).SendMailTo(trans, this, MailSender(this, MAIL_STATIONERY_GM), MAIL_CHECK_MASK_COPIED);
 
@@ -23834,7 +23834,7 @@ void Player::UpdateSpecCount(uint8 count)
         trans->PAppend("DELETE FROM character_action WHERE spec<>'%u' AND guid='%u'",m_activeSpec, GetGUIDLow());
         m_activeSpec = 0;
     }
-    
+
     CharacterDatabase.CommitTransaction(trans);
 
     SetSpecsCount(count);
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index c1b8d75dcb8..5cddadf6359 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2251,7 +2251,7 @@ class Player : public Unit, public GridObject<Player>
         void RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also = false);
 
         // Dungeon Finder
-        bool isLfgDungeonDone(const uint32 entry) { return m_LookingForGroup.donerandomDungeons.find(entry) != m_LookingForGroup.donerandomDungeons.end(); }  
+        bool isLfgDungeonDone(const uint32 entry) { return m_LookingForGroup.donerandomDungeons.find(entry) != m_LookingForGroup.donerandomDungeons.end(); }
         LfgDungeonSet *GetLfgDungeons() { return &m_LookingForGroup.applyDungeons; }
         LfgDungeonSet *GetLfgDungeonsDone() { return &m_LookingForGroup.donerandomDungeons; }
         void SetLfgDungeonDone(const uint32 entry) { m_LookingForGroup.donerandomDungeons.insert(entry); }
diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp
index 0de9be51480..aaeddb9677e 100644
--- a/src/server/game/Entities/Unit/StatSystem.cpp
+++ b/src/server/game/Entities/Unit/StatSystem.cpp
@@ -27,7 +27,7 @@
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
 
-inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount) 
+inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
 {
     // If amount is negative, change sign and value of apply.
     if (amount < 0)
@@ -37,7 +37,7 @@ inline bool _ModifyUInt32(bool apply, uint32& baseValue, int32& amount)
     }
     if (apply)
         baseValue += amount;
-    else 
+    else
     {
         // Make sure we do not get uint32 overflow.
         if (amount > int32(baseValue))
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 6c8a57b5768..bdc87b4a44d 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -93,14 +93,14 @@ static bool isAlwaysTriggeredAura[TOTAL_AURAS];
 // Prepare lists
 static bool procPrepared = InitTriggerAuraData();
 
-// we can disable this warning for this since it only 
+// we can disable this warning for this since it only
 // causes undefined behavior when passed to the base class constructor
 #ifdef _MSC_VER
 #pragma warning(disable:4355)
 #endif
 Unit::Unit(): WorldObject(),
-m_movedPlayer(NULL), IsAIEnabled(false), NeedChangeAI(false), 
-m_ControlledByPlayer(false), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0), 
+m_movedPlayer(NULL), IsAIEnabled(false), NeedChangeAI(false),
+m_ControlledByPlayer(false), i_AI(NULL), i_disabledAI(NULL), m_procDeep(0),
 m_removedAurasCount(0),  m_vehicle(NULL), i_motionMaster(this), m_vehicleKit(NULL),
 m_ThreatManager(this), m_unitTypeMask(UNIT_MASK_NONE), m_HostileRefManager(this)
 {
@@ -6494,7 +6494,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     break;
                 }
                 // Priest T10 Healer 2P Bonus
-                case 70770: 
+                case 70770:
                     // Flash Heal
                     if (procSpell->SpellFamilyFlags[0] & 0x800)
                     {
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index a59243d0ae6..0128c110278 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -124,7 +124,7 @@ std::string GetScriptCommandName(ScriptCommands command)
         case SCRIPT_COMMAND_MODEL: res = "SCRIPT_COMMAND_MODEL"; break;
         case SCRIPT_COMMAND_CLOSE_GOSSIP: res = "SCRIPT_COMMAND_CLOSE_GOSSIP"; break;
         case SCRIPT_COMMAND_PLAYMOVIE: res = "SCRIPT_COMMAND_PLAYMOVIE"; break;
-        default: 
+        default:
         {
             char sz[32];
             sprintf(sz, "Unknown command: %u", command);
@@ -6996,7 +6996,7 @@ void ObjectMgr::LoadReputationSpilloverTemplate()
 void ObjectMgr::LoadPointsOfInterest()
 {
     mPointsOfInterest.clear();                              // need for reload case
-    
+
     uint32 count = 0;
 
     //                                                0      1  2  3      4     5     6
@@ -7048,7 +7048,7 @@ void ObjectMgr::LoadPointsOfInterest()
 void ObjectMgr::LoadQuestPOI()
 {
     mQuestPOIMap.clear();                              // need for reload case
-    
+
     uint32 count = 0;
 
     // 0 1 2 3
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 10865250d74..5f56899564b 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -845,7 +845,7 @@ class ObjectMgr
         void DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid);
 
         time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance)
-        { 
+        {
             ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_CreatureRespawnTimesMtx, 0);
             return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)];
         }
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index cbbde131421..2718ecc1c18 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -35,7 +35,7 @@ class GridInfo
 {
 public:
     GridInfo()
-        : i_timer(0), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)), 
+        : i_timer(0), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)),
           i_unloadActiveLockCount(0), i_unloadExplicitLock(false), i_unloadReferenceLock(false) {}
     GridInfo(time_t expiry, bool unload = true )
         : i_timer(expiry), vis_Update(0, irand(0,DEFAULT_VISIBILITY_NOTIFY_PERIOD)),
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 903d53ed1c2..5eccf0666a4 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -99,7 +99,7 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy)
                 sLog.outError("Map file '%s' is from an incompatible clientversion. Please recreate using the mapextractor.",tmp);
             else
                 ret = true;
-        }                
+        }
     }
     delete [] tmp;
     fclose(pf);                                         //close file before return
@@ -1181,7 +1181,7 @@ bool GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 /*size*/)
 {
     map_heightHeader header;
     fseek(in, offset, SEEK_SET);
-    
+
     if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_HEIGHT_MAGIC))
         return false;
 
@@ -1227,7 +1227,7 @@ bool  GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 /*size*/)
 {
     map_liquidHeader header;
     fseek(in, offset, SEEK_SET);
-    
+
     if (fread(&header, sizeof(header), 1, in) != 1 || header.fourcc != uint32(MAP_LIQUID_MAGIC))
         return false;
 
@@ -2812,7 +2812,7 @@ inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, const ScriptInfo* s
     {
         pUnit = dynamic_cast<Unit*>(obj);
         if (!pUnit)
-            sLog.outError("%s %s object could not be casted to unit.", 
+            sLog.outError("%s %s object could not be casted to unit.",
                 scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
     }
     return pUnit;
@@ -2852,7 +2852,7 @@ inline WorldObject* Map::_GetScriptWorldObject(Object* obj, bool isSource, const
 {
     WorldObject* pWorldObject = NULL;
     if (!obj)
-        sLog.outError("%s %s object is NULL.", 
+        sLog.outError("%s %s object is NULL.",
             scriptInfo->GetDebugInfo().c_str(), isSource ? "source" : "target");
     else
     {
@@ -3086,7 +3086,7 @@ void Map::ScriptsProcess()
                     // Validate field number.
                     if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
                         sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
-                            step.script->GetDebugInfo().c_str(), step.script->datalong, 
+                            step.script->GetDebugInfo().c_str(), step.script->datalong,
                             cSource->GetValuesCount(), cSource->GetTypeId(), cSource->GetEntry(), cSource->GetGUIDLow());
                     else
                         cSource->SetUInt32Value(step.script->datalong, step.script->datalong2);
@@ -3109,7 +3109,7 @@ void Map::ScriptsProcess()
                     // Validate field number.
                     if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
                         sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
-                            step.script->GetDebugInfo().c_str(), step.script->datalong, 
+                            step.script->GetDebugInfo().c_str(), step.script->datalong,
                             source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
                     else
                         cSource->SetFlag(step.script->datalong, step.script->datalong2);
@@ -3123,7 +3123,7 @@ void Map::ScriptsProcess()
                     // Validate field number.
                     if (step.script->datalong <= OBJECT_FIELD_ENTRY || step.script->datalong >= cSource->GetValuesCount())
                         sLog.outError("%s wrong field %u (max count: %u) in object (TypeId: %u, Entry: %u, GUID: %u) specified, skipping.",
-                            step.script->GetDebugInfo().c_str(), step.script->datalong, 
+                            step.script->GetDebugInfo().c_str(), step.script->datalong,
                             source->GetValuesCount(), source->GetTypeId(), source->GetEntry(), source->GetGUIDLow());
                     else
                         cSource->RemoveFlag(step.script->datalong, step.script->datalong2);
@@ -3251,7 +3251,7 @@ void Map::ScriptsProcess()
                     }
                     worldObject = dynamic_cast<WorldObject*>(source);
                 }
-                else 
+                else
                 {
                     pTarget = source->ToPlayer();
                     if (pTarget)
@@ -3267,7 +3267,7 @@ void Map::ScriptsProcess()
                     else
                     {
                         sLog.outError("%s neither source nor target is player (source: TypeId: %u, Entry: %u, GUID: %u; target: TypeId: %u, Entry: %u, GUID: %u), skipping.",
-                            step.script->GetDebugInfo().c_str(), 
+                            step.script->GetDebugInfo().c_str(),
                             source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, source ? source->GetGUIDLow() : 0,
                             target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, target ? target->GetGUIDLow() : 0);
                         break;
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index fbeeb06019a..f52d03b95c2 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -212,7 +212,7 @@ BattlegroundMap* MapInstanced::CreateBattleground(uint32 InstanceId, Battlegroun
     PvPDifficultyEntry const* bracketEntry = GetBattlegroundBracketByLevel(bg->GetMapId(),bg->GetMinLevel());
 
     uint8 spawnMode;
-    
+
     if (bracketEntry)
         spawnMode = bracketEntry->difficulty;
     else
diff --git a/src/server/game/Reputation/ReputationMgr.h b/src/server/game/Reputation/ReputationMgr.h
index f65dfc591ec..572a01996d0 100644
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -102,8 +102,8 @@ class ReputationMgr
         ReputationRank GetBaseRank(FactionEntry const* factionEntry) const;
         uint32 GetReputationRankStrIndex(FactionEntry const* factionEntry)
         {
-			return ReputationRankStrIndex[GetRank(factionEntry)];
-		};
+            return ReputationRankStrIndex[GetRank(factionEntry)];
+        };
 
         ReputationRank const* GetForcedRankIfAny(FactionTemplateEntry const* factionTemplateEntry) const
         {
diff --git a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp
index 9c3c395cfd2..c9ddc6b6ffb 100644
--- a/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AuctionHouseHandler.cpp
@@ -361,7 +361,7 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
         SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK);
 
         auction->DeleteFromDB(trans);
-        
+
         uint32 item_template = auction->item_template;
         sAuctionMgr.RemoveAItem(auction->item_guidlow);
         auctionHouse->RemoveAuction(auction, item_template);
@@ -438,7 +438,7 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
     SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, AUCTION_OK);
 
     // Now remove the auction
-    
+
     pl->SaveInventoryAndGoldToDB(trans);
     auction->DeleteFromDB(trans);
     CharacterDatabase.CommitTransaction(trans);
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
index 73ea818092a..4c76cc077d8 100644
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -1387,7 +1387,7 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-    
+
     if (GetSecurity() == SEC_PLAYER)
     {
         uint32 raceMaskDisabled = sWorld.getIntConfig(CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK);
diff --git a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
index 153d9e37010..a0392c9fe75 100644
--- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
@@ -38,7 +38,7 @@
 #include "Guild.h"
 #include "ScriptMgr.h"
 
-enum StableResultCode    
+enum StableResultCode
 {
     STABLE_ERR_MONEY        = 0x01,                         // "you don't have enough money"
     STABLE_ERR_STABLE       = 0x06,                         // currently used in most fail cases
@@ -554,7 +554,7 @@ void WorldSession::SendStablePetCallback(QueryResult result, uint64 guid)
         data << uint8(1);                                   // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show)
         ++num;
     }
-    
+
     if (result)
     {
         do
@@ -618,7 +618,7 @@ void WorldSession::HandleStablePet(WorldPacket & recv_data)
 
     m_stablePetCallback = CharacterDatabase.AsyncPQuery("SELECT owner,slot,id FROM character_pet WHERE owner = '%u'  AND slot >= '%u' AND slot <= '%u' ORDER BY slot ",
         _player->GetGUIDLow(),PET_SAVE_FIRST_STABLE_SLOT,PET_SAVE_LAST_STABLE_SLOT);
-    
+
 }
 
 void WorldSession::HandleStablePetCallback(QueryResult result)
@@ -797,7 +797,7 @@ void WorldSession::HandleStableSwapPet(WorldPacket & recv_data)
     }
 
     // find swapped pet slot in stable
-    m_stableSwapCallback.SetParam(pet_number);        
+    m_stableSwapCallback.SetParam(pet_number);
     m_stableSwapCallback.SetFutureResult(
             CharacterDatabase.PQuery("SELECT slot,entry FROM character_pet WHERE owner = '%u' AND id = '%u'",
                 _player->GetGUIDLow(), pet_number)
diff --git a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
index 353670ba78a..cee3f417598 100644
--- a/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/PetHandler.cpp
@@ -415,7 +415,7 @@ bool WorldSession::CheckStableMaster(uint64 guid)
     if (guid == GetPlayer()->GetGUID())
     {
         if (!GetPlayer()->isGameMaster() && !GetPlayer()->HasAuraType(SPELL_AURA_OPEN_STABLE))
-        {    
+        {
             sLog.outStaticDebug("Player (GUID:%u) attempt open stable in cheating way.", GUID_LOPART(guid));
             return false;
         }
diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
index 9df76001940..f8e9342b49d 100644
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -60,7 +60,7 @@ void WorldSession::SendNameQueryOpcode(Player *p)
 
 void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
 {
-    ACE_Future<QueryResult> lFutureResult = 
+    ACE_Future<QueryResult> lFutureResult =
         CharacterDatabase.AsyncPQuery(
             !sWorld.getBoolConfig(CONFIG_DECLINED_NAMES_USED) ?
         //   ------- Query Without Declined Names --------
diff --git a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
index 75e1e98da4d..4d530731bf6 100644
--- a/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TicketHandler.cpp
@@ -233,7 +233,7 @@ void WorldSession::HandleGMSurveySubmit(WorldPacket& recv_data)
     ss << nextSurveyID << ", ";
     ss << mainSurvey << ", ";
 
-    // sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10, 
+    // sub_survey1, r1, comment1, sub_survey2, r2, comment2, sub_survey3, r3, comment3, sub_survey4, r4, comment4, sub_survey5, r5, comment5, sub_survey6, r6, comment6, sub_survey7, r7, comment7, sub_survey8, r8, comment8, sub_survey9, r9, comment9, sub_survey10, r10, comment10,
 
     for (uint8 i = 0; i < 10; i++)
     {
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp
index 67d7c609bbb..f1642641143 100644
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -968,11 +968,11 @@ void WorldSession::ProcessQueryCallbacks()
         ACE_Time_Value timeout = ACE_Time_Value::zero;
         if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1)
            break;
- 
+
         lResult.get(result);
         SendNameQueryOpcodeFromDBCallBack(result);
     }
-    
+
     //! HandleCharEnumOpcode
     if (m_charEnumCallback.ready())
     {
@@ -1007,7 +1007,7 @@ void WorldSession::ProcessQueryCallbacks()
         HandleChangePlayerNameOpcodeCallBack(result, param);
         m_charRenameCallback.FreeResult();
     }
-    
+
     //- HandleCharAddIgnoreOpcode
     if (m_addIgnoreCallback.ready())
     {
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 74b3a65fae8..dab19620832 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -818,7 +818,7 @@ class WorldSession
     private:
         void ProcessQueryCallbacks();
 
-        ACE_Future_Set<QueryResult> m_nameQueryCallbacks;    
+        ACE_Future_Set<QueryResult> m_nameQueryCallbacks;
         QueryResultFuture m_charEnumCallback;
         QueryResultFuture m_addIgnoreCallback;
         QueryResultFuture m_stablePetCallback;
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9636ec581e8..a85442949f6 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -376,7 +376,7 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
 AuraEffect::AuraEffect(Aura * base, uint8 effIndex, int32 *baseAmount, Unit * caster):
 m_base(base), m_spellProto(base->GetSpellProto()), m_effIndex(effIndex),
 m_baseAmount(baseAmount ? *baseAmount : m_spellProto->EffectBasePoints[m_effIndex]),
-m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false), 
+m_canBeRecalculated(true), m_spellmod(NULL), m_isPeriodic(false),
 m_periodicTimer(0), m_tickNumber(0)
 {
     CalculatePeriodic(caster, true);
@@ -2928,7 +2928,7 @@ void AuraEffect::HandlePhase(AuraApplication const * aurApp, uint8 mode, bool ap
             else
                 target->SetPhaseMask(PHASEMASK_NORMAL, false);
         }
-        
+
         if (apply)
             target->ToPlayer()->GetSession()->SendSetPhaseShift(GetMiscValue());
         else
@@ -4095,7 +4095,7 @@ void AuraEffect::HandleModPossessPet(AuraApplication const * aurApp, uint8 mode,
 
         if (!pet->IsWithinDistInMap(caster, pet->GetMap()->GetVisibilityDistance()))
             pet->Remove(PET_SAVE_NOT_IN_SLOT, true);
-        else 
+        else
         {
             // Reinitialize the pet bar and make the pet come back to the owner
             caster->ToPlayer()->PetSpellInitialize();
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index dbf9966ae51..177b4bc858e 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4165,7 +4165,7 @@ void Spell::SendLogExecute()
         data << uint32(m_spellInfo->Effect[i]);             // spell effect
 
         data.append(*m_effectExecuteData[i]);
-        
+
         delete m_effectExecuteData[i];
         m_effectExecuteData[i] = NULL;
     }
diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp
index 49d10d8ada8..221b2de4cca 100644
--- a/src/server/game/Spells/SpellScript.cpp
+++ b/src/server/game/Spells/SpellScript.cpp
@@ -280,7 +280,7 @@ Item * SpellScript::GetCastItem()
     return m_spell->m_CastItem;
 }
 
-void SpellScript::CreateItem(uint32 effIndex, uint32 itemId) 
+void SpellScript::CreateItem(uint32 effIndex, uint32 itemId)
 {
     m_spell->DoCreateItem(effIndex, itemId);
 }
diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp
index 293f171a3e6..63023bb7cfe 100644
--- a/src/server/game/Tickets/TicketMgr.cpp
+++ b/src/server/game/Tickets/TicketMgr.cpp
@@ -158,7 +158,7 @@ void TicketMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
     ss << (ticket.completed ? 1 : 0) << ", ";
     ss << uint32(ticket.escalated) << ", ";
     ss << (ticket.viewed ? 1 : 0) << ");";
-    
+
     SQLTransaction trans = CharacterDatabase.BeginTransaction();
     trans->Append(ss.str().c_str());
     CharacterDatabase.CommitTransaction(trans);
diff --git a/src/server/game/Tickets/TicketMgr.h b/src/server/game/Tickets/TicketMgr.h
index 44a20f07da7..8c60dbe3bf0 100644
--- a/src/server/game/Tickets/TicketMgr.h
+++ b/src/server/game/Tickets/TicketMgr.h
@@ -47,9 +47,9 @@ enum GMTicketResponse
 };
 
 // from Blizzard LUA:
-// GMTICKET_ASSIGNEDTOGM_STATUS_NOT_ASSIGNED = 0;	-- ticket is not currently assigned to a gm
-// GMTICKET_ASSIGNEDTOGM_STATUS_ASSIGNED = 1;		-- ticket is assigned to a normal gm
-// GMTICKET_ASSIGNEDTOGM_STATUS_ESCALATED = 2;		-- ticket is in the escalation queue
+// GMTICKET_ASSIGNEDTOGM_STATUS_NOT_ASSIGNED = 0;    -- ticket is not currently assigned to a gm
+// GMTICKET_ASSIGNEDTOGM_STATUS_ASSIGNED = 1;        -- ticket is assigned to a normal gm
+// GMTICKET_ASSIGNEDTOGM_STATUS_ESCALATED = 2;        -- ticket is in the escalation queue
 // 3 is a custom value and should never actually be sent
 enum GMTicketEscalationStatus
 {
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 4ac350acdd5..1b6f8cc9fe2 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -707,7 +707,7 @@ void World::LoadConfigSettings(bool reload)
 
     m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED] = sConfig.GetIntDefault("CharacterCreating.Disabled", 0);
     m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_RACEMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.RaceMask", 0);
-    m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_CLASSMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.ClassMask", 0); 
+    m_int_configs[CONFIG_CHARACTER_CREATING_DISABLED_CLASSMASK] = sConfig.GetIntDefault("CharacterCreating.Disabled.ClassMask", 0);
 
     m_int_configs[CONFIG_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("CharactersPerRealm", 10);
     if (m_int_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_int_configs[CONFIG_CHARACTERS_PER_REALM] > 10)
@@ -1233,7 +1233,7 @@ void World::SetInitialWorldSettings()
 
     ///- Initialize config settings
     LoadConfigSettings();
-    
+
     ///- Initialize Allowed Security Level
     LoadDBAllowedSecurityLevel();
 
@@ -1248,7 +1248,7 @@ void World::SetInitialWorldSettings()
         || !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f)
         || !MapManager::ExistMapAndVMap(1,-2917.58f,-257.98f)
         || (m_int_configs[CONFIG_EXPANSION] && (
-            !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) || 
+            !MapManager::ExistMapAndVMap(530,10349.6f,-6357.29f) ||
             !MapManager::ExistMapAndVMap(530,-3961.64f,-13931.2f))))
     {
         sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map/*.vmtree/*.vmtile files in appropriate directories or correct the DataDir value in the worldserver.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 0afd99d0c5f..bb9a1c015c9 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -216,7 +216,7 @@ class boss_jeklik : public CreatureScript
                     DoMeleeAttackIfReady();
                 }
             }
-        };        
+        };
 
         CreatureAI* GetAI(Creature* creature) const
         {
@@ -289,7 +289,7 @@ class mob_batrider : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-        };        
+        };
 
         CreatureAI* GetAI(Creature* creature) const
         {
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index b4aab45f310..b94a41beb66 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -167,7 +167,7 @@ class boss_jindo : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-        };        
+        };
 
         CreatureAI* GetAI(Creature* creature) const
         {
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index 083df57f385..d7de1912a81 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -411,7 +411,7 @@ class mob_zealot_lorkhan : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-        };        
+        };
 
         CreatureAI* GetAI(Creature* creature) const
         {
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index 3dfe5056891..2c076c5cd07 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -192,7 +192,7 @@ class boss_venoxis : public CreatureScript
                     }
                     DoMeleeAttackIfReady();
             }
-        };        
+        };
 
         CreatureAI* GetAI(Creature* creature) const
         {
diff --git a/src/server/scripts/Examples/example_spell.cpp b/src/server/scripts/Examples/example_spell.cpp
index 0b43b272cb9..42126c953c3 100644
--- a/src/server/scripts/Examples/example_spell.cpp
+++ b/src/server/scripts/Examples/example_spell.cpp
@@ -229,7 +229,7 @@ class spell_ex_66244 : public SpellScriptLoader
                 */
             }
 
-            // function registering 
+            // function registering
             void Register()
             {
                 OnEffectApply += AuraEffectApplyFn(spell_ex_66244AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index 94137ed29c5..63d961fce55 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -275,7 +275,7 @@ public:
                             me->GetMotionMaster()->MovePoint(m_pPointData->uiLocId, m_pPointData->fX, m_pPointData->fY, m_pPointData->fZ);
                         me->GetMotionMaster()->Clear(false);
                         me->GetMotionMaster()->MoveIdle();
-    
+
                         break;
 
                     default:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index 6e52f36b64d..a520c03d1c6 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -68,14 +68,14 @@ enum BossSpells
     SPELL_EMERGE_ANUBARAK   = 65982,
     SPELL_SUMMON_BEATLES    = 66339,
     SPELL_SUMMON_BURROWER   = 66332,
-    
+
     // Burrow
     SPELL_CHURNING_GROUND   = 66969,
 
     // Scarab
     SPELL_DETERMINATION     = 66092,
     SPELL_ACID_MANDIBLE     = 65774, //Passive - Triggered
-    
+
     // Burrower
     SPELL_SPIDER_FRENZY     = 66128,
     SPELL_EXPOSE_WEAKNESS   = 67720, //Passive - Triggered
@@ -136,7 +136,7 @@ public:
         }
 
         InstanceScript* m_pInstance;
-    
+
         SummonList Summons;
         std::list<uint64> m_vBurrowGUID;
         uint64 m_aSphereGUID[6];
@@ -157,7 +157,7 @@ public:
         uint64 m_uiTargetGUID;
         uint8  m_uiScarabSummoned;
 
-        void Reset() 
+        void Reset()
         {
             m_uiFreezeSlashTimer = 15*IN_MILLISECONDS;
             m_uiPenetratingColdTimer = 20*IN_MILLISECONDS;
@@ -214,7 +214,7 @@ public:
         {
             Summons.DespawnAll();
             DoScriptText(SAY_DEATH,me);
-            if (m_pInstance) 
+            if (m_pInstance)
                 m_pInstance->SetData(TYPE_ANUBARAK, DONE);
         }
 
@@ -236,7 +236,7 @@ public:
             Summons.Summon(pSummoned);
         }
 
-        void SummonedCreatureDespawn(Creature* pSummoned) 
+        void SummonedCreatureDespawn(Creature* pSummoned)
         {
             switch(pSummoned->GetEntry())
             {
@@ -318,10 +318,10 @@ public:
                         // Just to make sure it won't happen again in this phase
                         m_uiPursuingSpikeTimer = 90*IN_MILLISECONDS;
                     } else m_uiPursuingSpikeTimer -= uiDiff;
-                
+
                     if (m_uiSummonScarabTimer <= uiDiff)
                     {
-                        /* WORKAROUND 
+                        /* WORKAROUND
                          * - The correct implementation is more likely the comment below but it needs spell knowledge
                          */
                         std::list<uint64>::iterator i = m_vBurrowGUID.begin();
@@ -347,7 +347,7 @@ public:
                         m_uiSubmergeTimer = 80*IN_MILLISECONDS;
                     } else m_uiSubmergeTimer -= uiDiff;
                     break;
-                case 3: 
+                case 3:
                     m_uiStage = 0;
                     DoCast(SPELL_SPIKE_TELE);
                     Summons.DespawnEntry(NPC_SPIKE);
@@ -384,7 +384,7 @@ public:
                 } else m_uiSummonFrostSphereTimer -= uiDiff;
             }
 
-            if (HealthBelowPct(30) && m_uiStage == 0 && !m_bReachedPhase3) 
+            if (HealthBelowPct(30) && m_uiStage == 0 && !m_bReachedPhase3)
             {
                 m_bReachedPhase3 = true;
                 DoCastAOE(SPELL_LEECHING_SWARM);
@@ -530,15 +530,15 @@ public:
                     DoCast(me,SPELL_EMERGE_EFFECT);
                     me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                     me->CombatStart(me->SelectNearestTarget());
-                } 
-                else 
+                }
+                else
                 {
                     if (!me->HasAura(SPELL_PERMAFROST))
                     {
                         DoCast(me,SPELL_SUBMERGE_EFFECT);
                         me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_OOC_NOT_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE);
                         me->CombatStop();
-                    }   
+                    }
                 }
                 m_uiSubmergeTimer = 20*IN_MILLISECONDS;
             } else m_uiSubmergeTimer -= uiDiff;
@@ -611,7 +611,7 @@ public:
             }
         }
 
-        void UpdateAI(const uint32 uiDiff) 
+        void UpdateAI(const uint32 uiDiff)
         {
             if (m_uiPermafrostTimer)
             {
@@ -688,7 +688,7 @@ public:
 
             if (m_uiIncreaseSpeedTimer)
             {
-                if (m_uiIncreaseSpeedTimer <= uiDiff) 
+                if (m_uiIncreaseSpeedTimer <= uiDiff)
                 {
                     switch (m_uiSpeed)
                     {
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index fa3aad195f2..8041a6eeb9b 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -97,7 +97,7 @@ public:
             vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_ROGUE : NPC_ALLIANCE_ROGUE);
             vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARLOCK : NPC_ALLIANCE_WARLOCK);
             vOtherEntries.push_back(playerTeam == ALLIANCE ? NPC_HORDE_WARRIOR : NPC_ALLIANCE_WARRIOR);
-        
+
             uint8 healersSubtracted = 2;
             if (m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || m_pInstance->instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
                 healersSubtracted = 1;
@@ -176,8 +176,8 @@ public:
         {
             switch(uiType)
             {
-                case 0: 
-                    SummonChampions((Team)uiData); 
+                case 0:
+                    SummonChampions((Team)uiData);
                     break;
                 case 1:
                     for (std::list<uint64>::iterator i = Summons.begin(); i != Summons.end(); ++i)
@@ -192,7 +192,7 @@ public:
                 case 2:
                     switch(uiData)
                     {
-                        case FAIL: 
+                        case FAIL:
                             m_uiChampionsFailed++;
                             if (m_uiChampionsFailed + m_uiChampionsKilled >= Summons.size())
                             {
@@ -209,7 +209,7 @@ public:
                                 m_uiChampionsKilled = 0;
                                 m_bInProgress = true;
                                 Summons.DoZoneInCombat();
-                                m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS); 
+                                m_pInstance->SetData(TYPE_CRUSADERS, IN_PROGRESS);
                             }
                             break;
                         case DONE:
@@ -234,7 +234,7 @@ public:
 
 struct boss_faction_championsAI : public ScriptedAI
 {
-    boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature) 
+    boss_faction_championsAI(Creature* pCreature, uint32 aitype) : ScriptedAI(pCreature)
     {
         m_pInstance = (InstanceScript *) pCreature->GetInstanceScript();
         mAIType = aitype;
@@ -256,7 +256,7 @@ struct boss_faction_championsAI : public ScriptedAI
 
     void JustReachedHome()
     {
-        if (m_pInstance) 
+        if (m_pInstance)
             if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                 pChampionController->AI()->SetData(2, FAIL);
         me->ForcedDespawn();
@@ -312,7 +312,7 @@ struct boss_faction_championsAI : public ScriptedAI
     void JustDied(Unit* /*killer*/)
     {
         if (mAIType != AI_PET)
-            if (m_pInstance) 
+            if (m_pInstance)
                 if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                     pChampionController->AI()->SetData(2, DONE);
     }
@@ -321,7 +321,7 @@ struct boss_faction_championsAI : public ScriptedAI
     {
         DoCast(me, SPELL_ANTI_AOE, true);
         me->SetInCombatWithZone();
-        if (m_pInstance) 
+        if (m_pInstance)
             if (Creature* pChampionController = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_CHAMPIONS_CONTROLLER)))
                 pChampionController->AI()->SetData(2, IN_PROGRESS);
     }
@@ -344,7 +344,7 @@ struct boss_faction_championsAI : public ScriptedAI
                     if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_VARIAN)))
                         DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative
                 }
-                else 
+                else
                     if (Creature* pTemp = me->FindNearestCreature(NPC_GARROSH, 300.f))
                         DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0,3), pTemp); // + cause we are on negative
 
@@ -357,7 +357,7 @@ struct boss_faction_championsAI : public ScriptedAI
     {
         std::list<Creature *> lst = DoFindFriendlyMissingBuff(40.0f, spell);
         std::list<Creature *>::const_iterator itr = lst.begin();
-        if (lst.empty()) 
+        if (lst.empty())
             return NULL;
         advance(itr, rand()%lst.size());
         return (*itr);
@@ -462,7 +462,7 @@ public:
     struct mob_toc_druidAI : public boss_faction_championsAI
     {
         mob_toc_druidAI(Creature* pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {}
-    
+
         uint32 m_uiNatureGraspTimer;
         uint32 m_uiTranquilityTimer;
         uint32 m_uiBarkskinTimer;
@@ -558,7 +558,7 @@ public:
     struct mob_toc_shamanAI : public boss_faction_championsAI
     {
         mob_toc_shamanAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {}
-    
+
         uint32 m_uiHeroismOrBloodlustTimer;
         uint32 m_uiHexTimer;
         uint32 m_uiCommonTimer;
@@ -580,11 +580,11 @@ public:
             {
                 if (me->getFaction()) //Am i alliance?
                 {
-                    if (!me->HasAura(AURA_EXHAUSTION)) 
+                    if (!me->HasAura(AURA_EXHAUSTION))
                         DoCastAOE(SPELL_HEROISM);
                 }
-                else 
-                    if (!me->HasAura(AURA_SATED)) 
+                else
+                    if (!me->HasAura(AURA_SATED))
                         DoCastAOE(SPELL_BLOODLUST);
                 m_uiHeroismOrBloodlustTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS);
             } else m_uiHeroismOrBloodlustTimer -= uiDiff;
@@ -758,7 +758,7 @@ public:
     struct mob_toc_priestAI : public boss_faction_championsAI
     {
         mob_toc_priestAI(Creature *pCreature) : boss_faction_championsAI(pCreature, AI_HEALER) {}
-    
+
         uint32 m_uiPsychicScreamTimer;
         uint32 m_uiCommonTimer;
 
@@ -1097,7 +1097,7 @@ public:
                 }
                 m_uiBlinkTimer = urand(7*IN_MILLISECONDS,25*IN_MILLISECONDS);
             } else m_uiBlinkTimer -= uiDiff;
-        
+
             if (m_uiIceBlockTimer <= uiDiff)
             {
                 if (HealthBelowPct(20))
@@ -1198,7 +1198,7 @@ public:
                     DoCast(SPELL_DISENGAGE);
                 m_uiDisengageTimer = urand(12*IN_MILLISECONDS,20*IN_MILLISECONDS);
             } else m_uiDisengageTimer -= uiDiff;
-        
+
             if (m_uiDeterrenceTimer <= uiDiff)
             {
                 if (HealthBelowPct(20))
@@ -1229,7 +1229,7 @@ public:
             {
                 m_uiSummonPetTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else m_uiSummonPetTimer -= uiDiff;
-        
+
             if (m_uiCommonTimer <= uiDiff)
             {
                 switch(urand(0,3))
@@ -1441,7 +1441,7 @@ public:
                 DoCastVictim(SPELL_CHARGE);
                 m_uiChargeTimer = urand(3*IN_MILLISECONDS,25*IN_MILLISECONDS);
             } else m_uiChargeTimer -= uiDiff;
-        
+
             if (m_uiRetaliationTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_RETALIATION);
@@ -1528,7 +1528,7 @@ public:
                     DoCast(me,SPELL_ICEBOUND_FORTITUDE);
                 m_uiIceboundFortitudeTimer = urand(5*IN_MILLISECONDS,90*IN_MILLISECONDS);
             } else m_uiIceboundFortitudeTimer -= uiDiff;
-        
+
             if (m_uiChainsOfIceTimer <= uiDiff)
             {
                 if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
@@ -1548,7 +1548,7 @@ public:
                     DoCast(pTarget,SPELL_STRANGULATE);
                 m_uiStrangulateTimer = urand(10*IN_MILLISECONDS,90*IN_MILLISECONDS);
             } else m_uiStrangulateTimer -= uiDiff;
-        
+
             if (m_uiFrostStrikeTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_FROST_STRIKE);
@@ -1560,14 +1560,14 @@ public:
                 DoCastVictim(SPELL_ICY_TOUCH);
                 m_uiIcyTouchTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS);
             } else m_uiIcyTouchTimer -= uiDiff;
-        
+
             if (m_uiDeathGripTimer <= uiDiff)
             {
                 if (me->IsInRange(me->getVictim(), 10.0f, 30.0f, false))
-                    DoCastVictim(SPELL_DEATH_GRIP); 
+                    DoCastVictim(SPELL_DEATH_GRIP);
                 m_uiDeathGripTimer = urand(5*IN_MILLISECONDS,15*IN_MILLISECONDS);
             } else m_uiDeathGripTimer -= uiDiff;
-        
+
             boss_faction_championsAI::UpdateAI(uiDiff);
         }
     };
@@ -1630,7 +1630,7 @@ public:
                     DoCastAOE(SPELL_FAN_OF_KNIVES);
                 m_uiFanOfKnivesTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
             } else m_uiFanOfKnivesTimer -= uiDiff;
-        
+
             if (m_uiHemorrhageTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_HEMORRHAGE);
@@ -1727,8 +1727,8 @@ public:
         {
             Summons.Summon(pSummoned);
         }
-    
-        void SummonedCreatureDespawn(Creature* /*pSummoned*/) 
+
+        void SummonedCreatureDespawn(Creature* /*pSummoned*/)
         {
             --m_uiTotemCount;
         }
@@ -1765,11 +1765,11 @@ public:
             {
                 if (me->getFaction()) //Am i alliance?
                 {
-                    if (!me->HasAura(AURA_EXHAUSTION)) 
+                    if (!me->HasAura(AURA_EXHAUSTION))
                         DoCastAOE(SPELL_HEROISM);
                 }
-                else 
-                    if (!me->HasAura(AURA_SATED)) 
+                else
+                    if (!me->HasAura(AURA_SATED))
                         DoCastAOE(SPELL_BLOODLUST);
                 m_uiHeroismOrBloodlustTimer = urand(25*IN_MILLISECONDS,60*IN_MILLISECONDS);
             } else m_uiHeroismOrBloodlustTimer -= uiDiff;
@@ -1867,7 +1867,7 @@ public:
                     DoCast(pTarget,SPELL_REPENTANCE);
                 m_uiRepeteanceTimer = 60*IN_MILLISECONDS;
             } else m_uiRepeteanceTimer -= uiDiff;
-            
+
             if (m_uiCrusaderStrikeTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_CRUSADER_STRIKE);
@@ -1898,7 +1898,7 @@ public:
                 DoCastVictim(SPELL_JUDGEMENT_OF_COMMAND);
                 m_uiJudgementOfCommandTimer = urand(8*IN_MILLISECONDS,15*IN_MILLISECONDS);
             } else m_uiJudgementOfCommandTimer -= uiDiff;
-            
+
             boss_faction_championsAI::UpdateAI(uiDiff);
         }
     };
@@ -1944,7 +1944,7 @@ public:
                 DoCastVictim(SPELL_DEVOUR_MAGIC);
                 m_uiDevourMagicTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else m_uiDevourMagicTimer -= uiDiff;
-        
+
             if (m_uiSpellLockTimer <= uiDiff)
             {
                 DoCastVictim(SPELL_SPELL_LOCK);
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 02c590a6a54..697ad960e12 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -115,7 +115,7 @@ public:
         uint32 m_uiSummonNetherPortalTimer;
         uint32 m_uiSummonInfernalEruptionTimer;
 
-        void Reset() 
+        void Reset()
         {
             if (m_pInstance)
                 m_pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED);
@@ -341,7 +341,7 @@ public:
             {
                 if (m_CountMax && m_CountMax == m_Count)
                     me->ForcedDespawn();
-                else 
+                else
                 {
                     DoCast(SPELL_INFERNAL_ERUPTION);
                     ++m_Count;
@@ -403,7 +403,7 @@ public:
                     DoCast(pTarget,SPELL_FEL_STREAK);
                 m_uiFelStreakTimer = 30*IN_MILLISECONDS;
             } else m_uiFelStreakTimer -= uiDiff;
-        
+
             DoMeleeAttackIfReady();
         }
     };
@@ -441,7 +441,7 @@ public:
             me->SetReactState(REACT_PASSIVE);
             m_Timer = 10*IN_MILLISECONDS;
             m_Count = 0;
-            if (!IsHeroic()) 
+            if (!IsHeroic())
             {
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED);
                 m_CountMax = 1;
@@ -466,14 +466,14 @@ public:
             {
                 if (m_CountMax && m_CountMax == m_Count)
                     me->ForcedDespawn();
-                else 
+                else
                 {
                     DoCast(SPELL_NETHER_PORTAL);
                     ++m_Count;
                 }
                 m_Timer = 15*IN_MILLISECONDS;
             } else m_Timer -= uiDiff;
-        
+
             if (!UpdateVictim())
                 return;
         }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index a1d58c5eb88..f47cbb65997 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -15,7 +15,7 @@
  */
 /* ScriptData
 SDName: northrend_beasts
-SD%Complete: 90% 
+SD%Complete: 90%
 SDComment: based on /dev/rsa
 SDCategory:
 EndScriptData */
@@ -131,16 +131,16 @@ public:
         uint32 m_uiSummonTimer;
         uint32 m_uiSummonCount;
 
-        void Reset() 
+        void Reset()
         {
             m_uiImpaleTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS);
             m_uiStaggeringStompTimer = 15*IN_MILLISECONDS;
             m_uiSummonTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);;
 
-            if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL || 
+            if (getDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL ||
                 getDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC)
                 m_uiSummonCount = 5;
-            else 
+            else
                 m_uiSummonCount = 4;
 
             Summons.DespawnAll();
@@ -180,7 +180,7 @@ public:
             Summons.Summon(pSummoned);
         }
 
-        void SummonedCreatureDespawn(Creature* pSummoned) 
+        void SummonedCreatureDespawn(Creature* pSummoned)
         {
             switch(pSummoned->GetEntry())
             {
@@ -216,7 +216,7 @@ public:
                 }
                 m_uiSummonTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             } else m_uiSummonTimer -= uiDiff;
-        
+
             DoMeleeAttackIfReady();
         }
     };
@@ -332,7 +332,7 @@ public:
                 m_uiFireBombTimer = 20000;
             }
             else m_uiFireBombTimer -= uiDiff;
-            
+
             if (m_uiBatterTimer < uiDiff)
             {
                 if (Unit *pTarget = Unit::GetPlayer(*me,m_uiTargetGUID))
@@ -340,7 +340,7 @@ public:
                 m_uiBatterTimer = 10000;
             }
             else m_uiBatterTimer -= uiDiff;
-        
+
             if (m_uiHeadCrackTimer < uiDiff)
             {
                 if (Unit *pTarget = Unit::GetPlayer(*me,m_uiTargetGUID))
@@ -348,7 +348,7 @@ public:
                 m_uiHeadCrackTimer = 35000;
             }
             else m_uiHeadCrackTimer -= uiDiff;
-        
+
             DoMeleeAttackIfReady();
         }
     };
@@ -404,7 +404,7 @@ struct boss_jormungarAI : public ScriptedAI
             {
                 if (!pSister->isAlive())
                     m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_DONE);
-                else 
+                else
                     m_pInstance->SetData(TYPE_NORTHREND_BEASTS, SNAKES_SPECIAL);
             }
         }
@@ -447,8 +447,8 @@ struct boss_jormungarAI : public ScriptedAI
             DoScriptText(SAY_BERSERK,me);
             switch (m_uiStage)
             {
-                case 0: break;    
-                case 4: 
+                case 0: break;
+                case 4:
                     m_uiStage = 5;
                     m_uiSubmergeTimer = 5*IN_MILLISECONDS;
                 default:
@@ -456,7 +456,7 @@ struct boss_jormungarAI : public ScriptedAI
             }
         }
 
-        switch (m_uiStage) 
+        switch (m_uiStage)
         {
             case 0: // Mobile
                 if (m_uiBiteTimer <= uiDiff)
@@ -693,7 +693,7 @@ public:
         uint8  m_uiStage;
         Unit*  pTarget;
 
-        void Reset() 
+        void Reset()
         {
             m_uiFerociousButtTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
             m_uiArticBreathTimer = urand(25*IN_MILLISECONDS,40*IN_MILLISECONDS);
@@ -727,7 +727,7 @@ public:
                     {
                         // Middle of the room
                         m_uiStage = 1;
-                    } 
+                    }
                     else
                     {
                         // Landed from Hop backwards (start trample)
@@ -783,7 +783,7 @@ public:
             if (!UpdateVictim())
                 return;
 
-            switch (m_uiStage) 
+            switch (m_uiStage)
             {
                 case 0:
                     if (m_uiFerociousButtTimer <= uiDiff)
@@ -798,13 +798,13 @@ public:
                             DoCast(pTarget,SPELL_ARCTIC_BREATH);
                         m_uiArticBreathTimer = urand(25*IN_MILLISECONDS,40*IN_MILLISECONDS);
                     } else m_uiArticBreathTimer -= uiDiff;
-                
+
                     if (m_uiWhirlTimer <= uiDiff)
                     {
                         DoCastAOE(SPELL_WHIRL);
                         m_uiWhirlTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
                     } else m_uiWhirlTimer -= uiDiff;
-                
+
                     if (m_uiMassiveCrashTimer <= uiDiff)
                     {
                         me->GetMotionMaster()->MoveJump(ToCCommonLoc[1].GetPositionX(),ToCCommonLoc[1].GetPositionY(),ToCCommonLoc[1].GetPositionZ(),10.0f,20.0f); // 1: Middle of the room
@@ -850,13 +850,13 @@ public:
                         } else m_uiStage = 6;
                     } else m_uiTrampleTimer -= uiDiff;
                     break;
-                case 4: 
+                case 4:
                     DoScriptText(SAY_TRAMPLE_START,me);
                     me->GetMotionMaster()->MoveCharge(m_fTrampleTargetX,m_fTrampleTargetY,m_fTrampleTargetZ+2, 42, 1);
                     me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
                     m_uiStage = 5;
                     break;
-                case 5: 
+                case 5:
                     if (m_bMovementFinish)
                     {
                         if (m_uiTrampleTimer <= uiDiff) DoCastAOE(SPELL_TRAMPLE);
@@ -869,14 +869,14 @@ public:
                         Map::PlayerList const &lPlayers = me->GetMap()->GetPlayers();
                         for (Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
                         {
-                            if (Unit* pPlayer = itr->getSource()) 
-                                if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f)) 
+                            if (Unit* pPlayer = itr->getSource())
+                                if (pPlayer->isAlive() && pPlayer->IsWithinDistInMap(me, 6.0f))
                                 {
                                     DoCastAOE(SPELL_TRAMPLE);
                                     m_uiTrampleTimer = IN_MILLISECONDS;
                                     break;
                                 }
-                        } 
+                        }
                     } else m_uiTrampleTimer -= uiDiff;
                     break;
                 case 6:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 55c730d8f3b..0d374621389 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -162,7 +162,7 @@ struct boss_twin_baseAI : public ScriptedAI
 
     void JustReachedHome()
     {
-        if (m_pInstance) 
+        if (m_pInstance)
         {
             m_pInstance->SetData(TYPE_VALKIRIES, FAIL);
             m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, me->GetMaxHealth());
@@ -210,7 +210,7 @@ struct boss_twin_baseAI : public ScriptedAI
         Summons.Summon(pSummoned);
     }
 
-    void SummonedCreatureDespawn(Creature* pSummoned) 
+    void SummonedCreatureDespawn(Creature* pSummoned)
     {
         switch(pSummoned->GetEntry())
         {
@@ -282,7 +282,7 @@ struct boss_twin_baseAI : public ScriptedAI
     void JustDied(Unit* /*pKiller*/)
     {
         DoScriptText(SAY_DEATH,me);
-        if (m_pInstance) 
+        if (m_pInstance)
         {
             m_pInstance->SetData(DATA_HEALTH_TWIN_SHARED, 0);
             if (Creature* pSister = GetSister())
@@ -299,7 +299,7 @@ struct boss_twin_baseAI : public ScriptedAI
     }
 
     // Called when sister pointer needed
-    Creature* GetSister() 
+    Creature* GetSister()
     {
         return Unit::GetCreature((*me),m_pInstance->GetData64(m_uiSisterNpcId));
     }
@@ -337,7 +337,7 @@ struct boss_twin_baseAI : public ScriptedAI
 
     void UpdateAI(const uint32 uiDiff)
     {
-        if (!m_pInstance || !UpdateVictim()) 
+        if (!m_pInstance || !UpdateVictim())
             return;
 
         if (m_pInstance->GetData(DATA_HEALTH_TWIN_SHARED) != 0)
@@ -397,7 +397,7 @@ struct boss_twin_baseAI : public ScriptedAI
             {
                 SummonColorballs(12);
                 m_uiWaveCount = 0;
-            } 
+            }
             else
             {
                 SummonColorballs(2);
@@ -434,7 +434,7 @@ public:
     struct boss_fjolaAI : public boss_twin_baseAI
     {
         boss_fjolaAI(Creature* pCreature) : boss_twin_baseAI(pCreature) {}
-        
+
         void Reset() {
             boss_twin_baseAI::Reset();
             SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1);
@@ -551,7 +551,7 @@ public:
 
 struct mob_unleashed_ballAI : public ScriptedAI
 {
-    mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature) 
+    mob_unleashed_ballAI(Creature *pCreature) : ScriptedAI(pCreature)
     {
         m_pInstance = (InstanceScript*)pCreature->GetInstanceScript();
     }
@@ -577,7 +577,7 @@ struct mob_unleashed_ballAI : public ScriptedAI
         me->SetReactState(REACT_PASSIVE);
         me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
         me->SetFlying(true);
-        SetCombatMovement(false); 
+        SetCombatMovement(false);
         MoveToNextPoint();
         m_uiRangeCheckTimer = IN_MILLISECONDS;
     }
@@ -591,7 +591,7 @@ struct mob_unleashed_ballAI : public ScriptedAI
             case 0:
                 if (urand(0,3) == 0)
                     MoveToNextPoint();
-                else 
+                else
                     me->DisappearAndDie();
                 break;
         }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 66f139debb5..39c0212fb65 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -97,7 +97,7 @@ public:
             m_uiMainGateDoorGUID = 0;
             m_uiEastPortcullisGUID = 0;
             m_uiWebDoorGUID = 0;
-        
+
             m_uiNorthrendBeasts = NOT_STARTED;
 
             m_uiEventTimer = 1000;
@@ -185,19 +185,19 @@ public:
             {
                 case GO_CRUSADERS_CACHE_10:
                     if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL)
-                        m_uiCrusadersCacheGUID = pGO->GetGUID(); 
+                        m_uiCrusadersCacheGUID = pGO->GetGUID();
                     break;
                 case GO_CRUSADERS_CACHE_25:
                     if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL)
-                        m_uiCrusadersCacheGUID = pGO->GetGUID(); 
+                        m_uiCrusadersCacheGUID = pGO->GetGUID();
                     break;
                 case GO_CRUSADERS_CACHE_10_H:
                     if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC)
-                        m_uiCrusadersCacheGUID = pGO->GetGUID(); 
+                        m_uiCrusadersCacheGUID = pGO->GetGUID();
                     break;
                 case GO_CRUSADERS_CACHE_25_H:
                     if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC)
-                        m_uiCrusadersCacheGUID = pGO->GetGUID(); 
+                        m_uiCrusadersCacheGUID = pGO->GetGUID();
                     break;
                 case GO_ARGENT_COLISEUM_FLOOR: m_uiFloorGUID = pGO->GetGUID(); break;
                 case GO_MAIN_GATE_DOOR:   m_uiMainGateDoorGUID = pGO->GetGUID(); break;
@@ -223,7 +223,7 @@ public:
                 case TYPE_JARAXXUS:
                     if (uiData == DONE) m_uiEvent = 2000;
                     break;
-                case TYPE_CRUSADERS: 
+                case TYPE_CRUSADERS:
                     switch (uiData)
                     {
                         case IN_PROGRESS: m_uiResilienceWillFixItTimer = 0; break;
@@ -242,7 +242,7 @@ public:
                             break;
                     }
                     break;
-                case TYPE_VALKIRIES: 
+                case TYPE_VALKIRIES:
                     switch (uiData)
                     {
                         case FAIL:
@@ -303,8 +303,8 @@ public:
                 case TYPE_COUNTER:   m_uiTrialCounter = uiData; uiData = DONE; break;
                 case TYPE_EVENT:     m_uiEvent = uiData; uiData = NOT_STARTED; break;
                 case TYPE_EVENT_TIMER:      m_uiEventTimer = uiData; uiData = NOT_STARTED; break;
-                case TYPE_NORTHREND_BEASTS: 
-                    m_uiNorthrendBeasts = uiData; 
+                case TYPE_NORTHREND_BEASTS:
+                    m_uiNorthrendBeasts = uiData;
                     switch (uiData)
                     {
                         case GORMOK_DONE:
@@ -314,7 +314,7 @@ public:
                             break;
                         case SNAKES_IN_PROGRESS: m_uiNotOneButTwoJormungarsTimer = 0; break;
                         case SNAKES_SPECIAL: m_uiNotOneButTwoJormungarsTimer = 10*IN_MILLISECONDS; break;
-                        case SNAKES_DONE: 
+                        case SNAKES_DONE:
                             if (m_uiNotOneButTwoJormungarsTimer > 0)
                                 DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, SPELL_WORMS_KILLED_IN_10_SECONDS);
                             m_uiEvent = 300;
@@ -363,9 +363,9 @@ public:
             {
                 sLog.outBasic("[ToCr] m_auiEncounter[uiType %u] %u = uiData %u;",uiType,m_auiEncounter[uiType],uiData);
                 if (uiData == FAIL)
-                { 
-                    if (IsRaidWiped()) 
-                    { 
+                {
+                    if (IsRaidWiped())
+                    {
                         --m_uiTrialCounter;
                         m_bNeedSave = true;
                         m_uiEvent = (uiType == TYPE_BEASTS? 666 : 0);
@@ -425,8 +425,8 @@ public:
                 case TYPE_EVENT:     return m_uiEvent;
                 case TYPE_NORTHREND_BEASTS:    return m_uiNorthrendBeasts;
                 case TYPE_EVENT_TIMER:  return m_uiEventTimer;
-                case TYPE_EVENT_NPC: 
-                    switch (m_uiEvent) 
+                case TYPE_EVENT_NPC:
+                    switch (m_uiEvent)
                     {
                         case 110:
                         case 140:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index e31083824a6..a9c2b4be8d7 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -97,7 +97,7 @@ enum
 class npc_announcer_toc10 : public CreatureScript
 {
     public:
-    
+
         npc_announcer_toc10() : CreatureScript("npc_announcer_toc10") { }
 
         struct npc_announcer_toc10AI : public ScriptedAI
@@ -126,10 +126,10 @@ class npc_announcer_toc10 : public CreatureScript
             InstanceScript* m_pInstance;
             m_pInstance = (InstanceScript*)pCreature->GetInstanceScript();
             if (!m_pInstance) return false;
-            
+
             char const* _message = "We are ready!";
 
-            if (!pPlayer->getAttackers().empty() || m_pInstance->IsEncounterInProgress() || m_pInstance->GetData(TYPE_EVENT)) 
+            if (!pPlayer->getAttackers().empty() || m_pInstance->IsEncounterInProgress() || m_pInstance->GetData(TYPE_EVENT))
                 return true;
 
             uint8 i;
@@ -174,7 +174,7 @@ class npc_announcer_toc10 : public CreatureScript
                     }
                     else
                     {
-                        if (m_pInstance->GetData(TYPE_JARAXXUS) != DONE) 
+                        if (m_pInstance->GetData(TYPE_JARAXXUS) != DONE)
                         {
                             m_pInstance->SetData(TYPE_EVENT,1010);
                             m_pInstance->SetData(TYPE_JARAXXUS,NOT_STARTED);
@@ -230,7 +230,7 @@ class npc_announcer_toc10 : public CreatureScript
 class boss_lich_king_toc : public CreatureScript
 {
     public:
-    
+
         boss_lich_king_toc() : CreatureScript("boss_lich_king_toc") { }
 
         struct boss_lich_king_tocAI : public ScriptedAI
@@ -304,7 +304,7 @@ class boss_lich_king_toc : public CreatureScript
                             m_uiUpdateTimer = 3000;
                             m_pInstance->SetData(TYPE_EVENT,5060);
                             break;
-                        case 5060: 
+                        case 5060:
                             DoScriptText(SAY_STAGE_4_05,me);
                             me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
                             m_uiUpdateTimer = 2500;
@@ -342,7 +342,7 @@ class boss_lich_king_toc : public CreatureScript
 class npc_fizzlebang_toc : public CreatureScript
 {
     public:
-    
+
         npc_fizzlebang_toc() : CreatureScript("npc_fizzlebang_toc") { }
 
         struct npc_fizzlebang_tocAI : public ScriptedAI
@@ -394,7 +394,7 @@ class npc_fizzlebang_toc : public CreatureScript
                         break;
                 }
             }
-            
+
             void JustSummoned(Creature* pSummoned)
             {
                 Summons.Summon(pSummoned);
@@ -467,17 +467,17 @@ class npc_fizzlebang_toc : public CreatureScript
                             m_uiUpdateTimer = 5000;
                             break;
                         case 1142:
-                            if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) 
+                            if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS)))
                                 pTemp->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID());
-                            if (Creature* pTrigger = Unit::GetCreature(*me,m_uiTriggerGUID)) 
+                            if (Creature* pTrigger = Unit::GetCreature(*me,m_uiTriggerGUID))
                                 pTrigger->ForcedDespawn();
-                            if (Creature* pPortal = Unit::GetCreature(*me,m_uiPortalGUID)) 
+                            if (Creature* pPortal = Unit::GetCreature(*me,m_uiPortalGUID))
                                 pPortal->ForcedDespawn();
                             m_pInstance->SetData(TYPE_EVENT, 1144);
                             m_uiUpdateTimer = 10000;
                             break;
                         case 1144:
-                            if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS))) 
+                            if (Creature* pTemp = Unit::GetCreature(*me,m_pInstance->GetData64(NPC_JARAXXUS)))
                                 DoScriptText(SAY_STAGE_1_05,pTemp);
                             m_pInstance->SetData(TYPE_EVENT, 1150);
                             m_uiUpdateTimer = 5000;
@@ -509,7 +509,7 @@ class npc_fizzlebang_toc : public CreatureScript
 class npc_tirion_toc : public CreatureScript
 {
     public:
-    
+
         npc_tirion_toc() : CreatureScript("npc_tirion_toc") { }
 
         struct npc_tirion_tocAI : public ScriptedAI
@@ -752,7 +752,7 @@ class npc_tirion_toc : public CreatureScript
                                 me->SetReactState(REACT_PASSIVE);
                             }
                             me->SummonCreature(NPC_DARKBANE, ToCCommonLoc[4].GetPositionX(), ToCCommonLoc[4].GetPositionY(), ToCCommonLoc[4].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
-                            if (Creature* pTemp = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_DARKBANE))) 
+                            if (Creature* pTemp = Unit::GetCreature((*me),m_pInstance->GetData64(NPC_DARKBANE)))
                             {
                                 pTemp->GetMotionMaster()->MovePoint(0, ToCCommonLoc[7].GetPositionX(), ToCCommonLoc[7].GetPositionY(), ToCCommonLoc[7].GetPositionZ());
                                 pTemp->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
@@ -823,7 +823,7 @@ class npc_tirion_toc : public CreatureScript
 class npc_garrosh_toc : public CreatureScript
 {
     public:
-    
+
         npc_garrosh_toc() : CreatureScript("npc_garrosh_toc") { }
 
         struct npc_garrosh_tocAI : public ScriptedAI
@@ -901,7 +901,7 @@ class npc_garrosh_toc : public CreatureScript
 class npc_varian_toc : public CreatureScript
 {
     public:
-    
+
         npc_varian_toc() : CreatureScript("npc_varian_toc") { }
 
         struct npc_varian_tocAI : public ScriptedAI
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 9adbda74918..3a0a43773cb 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -14,10 +14,10 @@ enum
     TYPE_LICH_KING              = 4,
     TYPE_ANUBARAK               = 5,
     MAX_ENCOUNTERS              = 6,
-    
+
     TYPE_COUNTER                = 8,
     TYPE_EVENT                  = 9,
-    
+
     TYPE_EVENT_TIMER            = 101,
     TYPE_EVENT_NPC              = 102,
     TYPE_NORTHREND_BEASTS       = 103,
@@ -45,7 +45,7 @@ const Position ToCCommonLoc[]=
     {563.833008f, 187.244995f, 394.5f, 0},      //  2 Backdoor
     {577.347839f, 195.338888f, 395.14f, 0},     //  3 - Right
     {550.955933f, 195.338888f, 395.14f, 0},     //  4 - Left
-    {563.833008f, 195.244995f, 394.585561f, 0}, //  5 - Center    
+    {563.833008f, 195.244995f, 394.585561f, 0}, //  5 - Center
     {573.5f, 180.5f, 395.14f, 0},               //  6 Move 0 Right
     {553.5f, 180.5f, 395.14f, 0},               //  7 Move 0 Left
     {585.5f, 170.0f, 395.14f, 0},               //  8 Move 1 Right
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index d273d1ad453..20ee4dda01b 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -34,8 +34,8 @@ private:
     uint32 _despawnTime;
 
 public:
-    spell_generic_quest_update_entry_SpellScript(uint32 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) : 
-        SpellScript(), _spellEffect(spellEffect), _effIndex(effIndex), _originalEntry(originalEntry), 
+    spell_generic_quest_update_entry_SpellScript(uint32 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) :
+        SpellScript(), _spellEffect(spellEffect), _effIndex(effIndex), _originalEntry(originalEntry),
         _newEntry(newEntry), _shouldAttack(shouldAttack), _despawnTime(despawnTime) { }
 
     void HandleDummy(SpellEffIndex /*effIndex*/)
diff --git a/src/server/scripts/World/chat_log.cpp b/src/server/scripts/World/chat_log.cpp
index 330cf63adff..0a686ddf4bb 100644
--- a/src/server/scripts/World/chat_log.cpp
+++ b/src/server/scripts/World/chat_log.cpp
@@ -54,7 +54,7 @@ public:
                 break;
         }
     }
-    
+
     void OnChat(Player *player, uint32 /*type*/, uint32 /*lang*/, std::string msg, Player *receiver)
     {
         if (sWorld.getBoolConfig(CONFIG_CHATLOG_WHISPER))
diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h
index 73f0498d755..db90e258530 100644
--- a/src/server/shared/DataStores/DBCStore.h
+++ b/src/server/shared/DataStores/DBCStore.h
@@ -50,7 +50,7 @@ struct SqlDbc
         DBCFileLoader::GetFormatRecordSize(fmt, &indexPos);
         if (indexPos >= 0)
         {
-			uint32 uindexPos = uint32(indexPos);
+            uint32 uindexPos = uint32(indexPos);
             for (uint32 x = 0; x < formatString->size(); ++x)
             {
                 // Count only fields present in sql
diff --git a/src/server/shared/Database/DatabaseWorkerPool.h b/src/server/shared/Database/DatabaseWorkerPool.h
index f7e899eae0c..cd7974a3397 100644
--- a/src/server/shared/Database/DatabaseWorkerPool.h
+++ b/src/server/shared/Database/DatabaseWorkerPool.h
@@ -66,7 +66,7 @@ class DatabaseWorkerPool
 
         bool Open(const std::string& infoString, uint8 num_threads, MySQLThreadBundle mask)
         {
-            //- Only created bundled connection if configured            
+            //- Only created bundled connection if configured
             m_bundle_conn = NULL;
             if (mask != MYSQL_BUNDLE_NONE)
             {
@@ -96,13 +96,13 @@ class DatabaseWorkerPool
             sLog.outSQLDriver("Closing down %u connections on this DatabaseWorkerPool", (uint32)m_connections.value());
             /// Shuts down worker threads for this connection pool.
             m_queue->queue()->deactivate();
-    
+
             for (uint8 i = 0; i < m_async_connections.size(); i++)
             {
                 m_async_connections[i]->m_worker->wait();
                 --m_connections;
             }
-    
+
             if (m_bundleMask != MYSQL_BUNDLE_NONE)
             {
                 delete m_bundle_conn;
@@ -242,7 +242,7 @@ class DatabaseWorkerPool
             Enqueue(task);
             return res;     //! Fool compiler, has no use yet
         }
-        
+
         SQLTransaction BeginTransaction()
         {
             return SQLTransaction(new Transaction);
@@ -286,7 +286,7 @@ class DatabaseWorkerPool
             delete[] buf;
         }
 
-        MySQLThreadBundle GetBundleMask() { return m_bundleMask; } 
+        MySQLThreadBundle GetBundleMask() { return m_bundleMask; }
 
         PreparedQueryResult Query(PreparedStatement* stmt)
         {
@@ -305,7 +305,7 @@ class DatabaseWorkerPool
                 return 0;
             return (mysql_real_escape_string(GetConnection()->GetHandle(), to, from, length));
         }
-    
+
         void Enqueue(SQLOperation* op)
         {
             m_queue->enqueue(op);
@@ -334,7 +334,7 @@ class DatabaseWorkerPool
         ConnectionMap                   m_sync_connections;  //! Holds a mysql connection+thread per mapUpdate thread and unbundled runnnables.
         ACE_Thread_Mutex                m_connectionMap_mtx; //! For thread safe access to the synchroneous connection map
         T*                              m_bundle_conn;       //! Bundled connection (see Database.ThreadBundleMask config)
-        AtomicUInt                      m_connections;       //! Counter of MySQL connections; 
+        AtomicUInt                      m_connections;       //! Counter of MySQL connections;
         std::string                     m_infoString;        //! Infostring that is passed on to child connections.
         MySQLThreadBundle               m_bundleMask;        //! Our configured bundle mask (see enum)
 };
diff --git a/src/server/shared/Database/Implementation/LoginDatabase.cpp b/src/server/shared/Database/Implementation/LoginDatabase.cpp
index 1f6c5ec126b..7cf7e30b0f6 100644
--- a/src/server/shared/Database/Implementation/LoginDatabase.cpp
+++ b/src/server/shared/Database/Implementation/LoginDatabase.cpp
@@ -22,7 +22,7 @@ bool LoginDatabaseConnection::Open(const std::string& infoString)
 {
     if (!MySQLConnection::Open(infoString))
         return false;
-    
+
     m_stmts.resize(MAX_LOGINDATABASE_STATEMENTS);
 
     /*
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 51cf3ada1c8..cf47eb1374d 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -198,7 +198,7 @@ bool MySQLConnection::Execute(PreparedStatement* stmt)
         ASSERT(m_mStmt);            // Can only be null if preparation failed, server side error or bad query
         m_mStmt->m_stmt = stmt;     // Cross reference them for debug output
         stmt->m_stmt = m_mStmt;     // TODO: Cleaner way
-        
+
         stmt->BindParameters();
 
         MYSQL_STMT* msql_STMT = m_mStmt->GetSTMT();
diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h
index 534c6043a47..ad95789102b 100644
--- a/src/server/shared/Database/PreparedStatement.h
+++ b/src/server/shared/Database/PreparedStatement.h
@@ -117,7 +117,7 @@ class MySQLPreparedStatement
         void setInt64(const uint8 index, const int64 value);
         void setDouble(const uint8 index, const double value);
         void setString(const uint8 index, const char* value);
-    
+
     protected:
         MYSQL_STMT* GetSTMT() { return m_Mstmt; }
         MYSQL_BIND* GetBind() { return m_bind; }
diff --git a/src/server/shared/Database/QueryResult.cpp b/src/server/shared/Database/QueryResult.cpp
index 88f8206a3bf..93c685e0447 100644
--- a/src/server/shared/Database/QueryResult.cpp
+++ b/src/server/shared/Database/QueryResult.cpp
@@ -129,7 +129,7 @@ void ResultBind::BindResult(uint32& num_rows)
         sLog.outSQLDriver("%s:mysql_stmt_store_result, cannot bind result from MySQL server. Error: %s", __FUNCTION__, mysql_stmt_error(m_stmt));
         return;
     }
-        
+
     //- This is where we prepare the buffer based on metadata
     uint32 i = 0;
     MYSQL_FIELD* field;
@@ -147,17 +147,17 @@ void ResultBind::BindResult(uint32& num_rows)
         m_rBind[i].is_null = &m_isNull[i];
         m_rBind[i].error = NULL;
         m_rBind[i].is_unsigned = field->flags & UNSIGNED_FLAG;
-    
+
         ++i;
     }
-        
+
     //- This is where we bind the bind the buffer to the statement
     if (mysql_stmt_bind_result(m_stmt, m_rBind))
     {
         sLog.outSQLDriver("%s:mysql_stmt_bind_result, cannot bind result from MySQL server. Error: %s", __FUNCTION__, mysql_stmt_error(m_stmt));
         return;
     }
-    
+
     num_rows = mysql_stmt_num_rows(m_stmt);
 }
 
@@ -181,7 +181,7 @@ void ResultBind::CleanUp()
 uint8 PreparedResultSet::GetUInt8(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<uint8*>(rbind->m_rBind[index].buffer);
 }
@@ -189,7 +189,7 @@ uint8 PreparedResultSet::GetUInt8(uint32 index)
 int8 PreparedResultSet::GetInt8(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<int8*>(rbind->m_rBind[index].buffer);
 }
@@ -197,7 +197,7 @@ int8 PreparedResultSet::GetInt8(uint32 index)
 uint16 PreparedResultSet::GetUInt16(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<uint16*>(rbind->m_rBind[index].buffer);
 }
@@ -205,7 +205,7 @@ uint16 PreparedResultSet::GetUInt16(uint32 index)
 int16 PreparedResultSet::GetInt16(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<int16*>(rbind->m_rBind[index].buffer);
 }
@@ -213,7 +213,7 @@ int16 PreparedResultSet::GetInt16(uint32 index)
 uint32 PreparedResultSet::GetUInt32(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<uint32*>(rbind->m_rBind[index].buffer);
 }
@@ -221,7 +221,7 @@ uint32 PreparedResultSet::GetUInt32(uint32 index)
 int32 PreparedResultSet::GetInt32(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<int32*>(rbind->m_rBind[index].buffer);
 }
@@ -229,7 +229,7 @@ int32 PreparedResultSet::GetInt32(uint32 index)
 float PreparedResultSet::GetFloat(uint32 index)
 {
     if (!CheckFieldIndex(index))
-        return 0;            
+        return 0;
 
     return *reinterpret_cast<float*>(rbind->m_rBind[index].buffer);
 }
@@ -248,7 +248,7 @@ bool PreparedResultSet::NextRow()
         return false;
 
     int retval = mysql_stmt_fetch( rbind->m_stmt );
-                
+
     if (!retval || retval == MYSQL_DATA_TRUNCATED)
         retval = true;
 
diff --git a/src/server/shared/Database/QueryResult.h b/src/server/shared/Database/QueryResult.h
index a8fdde894ff..7a503869cb1 100755
--- a/src/server/shared/Database/QueryResult.h
+++ b/src/server/shared/Database/QueryResult.h
@@ -165,7 +165,7 @@ class ResultBind
                     return 64;
 
                 case MYSQL_TYPE_GEOMETRY:
-                /* 
+                /*
                 Following types are not sent over the wire:
                 MYSQL_TYPE_ENUM:
                 MYSQL_TYPE_SET:
@@ -212,10 +212,10 @@ class PreparedResultSet
 
     private:
         bool CheckFieldIndex(uint32 index)  const
-        {   
+        {
             if (!rbind->IsValidIndex(index))
                 return false;
-        
+
             if (rbind->m_isNull[index])
                 return false;
 
diff --git a/src/server/shared/Database/Transaction.h b/src/server/shared/Database/Transaction.h
index cd749b0c2d7..8d824c297d4 100644
--- a/src/server/shared/Database/Transaction.h
+++ b/src/server/shared/Database/Transaction.h
@@ -55,7 +55,7 @@ class Transaction
         void Append(PreparedStatement* statement);
         void Append(const char* sql);
         void PAppend(const char* sql, ...);
-    
+
         size_t GetSize() { return m_queries.size(); }
 
     protected:
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index fe24701dd3b..8022e257413 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -32,7 +32,7 @@ extern LoginDatabaseWorkerPool LoginDatabase;
 Log::Log() :
     raLogfile(NULL), logfile(NULL), gmLogfile(NULL), charLogfile(NULL),
     dberLogfile(NULL), chatLogfile(NULL), arenaLogFile(NULL), sqlLogFile(NULL),
-    m_gmlog_per_account(false), m_enableLogDBLater(false), 
+    m_gmlog_per_account(false), m_enableLogDBLater(false),
     m_enableLogDB(false), m_colored(false)
 {
     Initialize();
diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h
index fede8ab10fb..7fe3bc400b5 100644
--- a/src/server/shared/Threading/Callback.h
+++ b/src/server/shared/Threading/Callback.h
@@ -34,42 +34,42 @@ class QueryCallback
 {
     public:
         QueryCallback() {}
-        
+
         void SetFutureResult(QueryResultFuture value)
         {
             result = value;
         }
-        
+
         QueryResultFuture GetFutureResult()
         {
-            return result;    
+            return result;
         }
-        
+
         int IsReady()
         {
             return result.ready();
         }
-        
+
         void GetResult(QueryResult& res)
         {
             result.get(res);
         }
-        
+
         void FreeResult()
         {
             result.cancel();
         }
-        
+
         void SetParam(ParamType value)
         {
             param = value;
         }
-        
+
         ParamType GetParam()
         {
             return param;
         }
-        
+
     private:
         QueryResultFuture result;
         ParamType param;
@@ -80,32 +80,32 @@ class QueryCallback_2
 {
     public:
         QueryCallback_2() {}
-        
+
         void SetFutureResult(QueryResultFuture value)
         {
             result = value;
         }
-        
+
         QueryResultFuture GetFutureResult()
         {
-            return result;    
+            return result;
         }
-        
+
         int IsReady()
         {
             return result.ready();
         }
-        
+
         void GetResult(QueryResult& res)
         {
             result.get(res);
         }
-        
+
         void FreeResult()
         {
             result.cancel();
         }
-        
+
         void SetFirstParam(ParamType1 value)
         {
             param_1 = value;
@@ -115,7 +115,7 @@ class QueryCallback_2
         {
             param_2 = value;
         }
-        
+
         ParamType1 GetFirstParam()
         {
             return param_1;
@@ -125,7 +125,7 @@ class QueryCallback_2
         {
             return param_2;
         }
-        
+
     private:
         QueryResultFuture result;
         ParamType1 param_1;
diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp
index 1f5f3ad8d3f..f9f9c1450d4 100644
--- a/src/server/worldserver/Master.cpp
+++ b/src/server/worldserver/Master.cpp
@@ -470,7 +470,7 @@ bool Master::_StartDB()
         return false;
     }
 
-    mask = sConfig.GetIntDefault("WorldDatabase.ThreadBundleMask", MYSQL_BUNDLE_ALL);    
+    mask = sConfig.GetIntDefault("WorldDatabase.ThreadBundleMask", MYSQL_BUNDLE_ALL);
 
     ///- Initialise the world database
     if (!WorldDatabase.Open(dbstring, num_threads, MySQLThreadBundle(mask)))
@@ -519,7 +519,7 @@ bool Master::_StartDB()
         return false;
     }
 
-    mask = sConfig.GetIntDefault("LoginDatabase.ThreadBundleMask", MYSQL_BUNDLE_ALL);    
+    mask = sConfig.GetIntDefault("LoginDatabase.ThreadBundleMask", MYSQL_BUNDLE_ALL);
 
     ///- Initialise the login database
     if (!LoginDatabase.Open(dbstring, num_threads, MySQLThreadBundle(mask)))
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index 51d3ccb8698..5daf5820c3f 100644
--- a/src/tools/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
@@ -256,11 +256,11 @@ class adt_MHDR
     uint32 pad;
     uint32 offsMCIN;           // MCIN
     uint32 offsTex;               // MTEX
-    uint32 offsModels;           // MMDX    
-    uint32 offsModelsIds;       // MMID    
-    uint32 offsMapObejcts;       // MWMO    
-    uint32 offsMapObejctsIds;  // MWID        
-    uint32 offsDoodsDef;       // MDDF    
+    uint32 offsModels;           // MMDX
+    uint32 offsModelsIds;       // MMID
+    uint32 offsMapObejcts;       // MWMO
+    uint32 offsMapObejctsIds;  // MWID
+    uint32 offsDoodsDef;       // MDDF
     uint32 offsObjectsDef;     // MODF
     uint32 offsMFBO;           // MFBO
     uint32 offsMH2O;           // MH2O
diff --git a/src/tools/map_extractor/mpq_libmpq04.h b/src/tools/map_extractor/mpq_libmpq04.h
index 22d586a4a3f..1f3b259bbfc 100644
--- a/src/tools/map_extractor/mpq_libmpq04.h
+++ b/src/tools/map_extractor/mpq_libmpq04.h
@@ -30,7 +30,7 @@ public:
         libmpq__file_unpacked_size(mpq_a, filenum, &size);
 
         char *buffer = new char[size];
-        
+
         libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
 
         char seps[] = "\n";
diff --git a/src/tools/vmap3_extractor/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index b8ca49c2fc8..f32f09badde 100644
--- a/src/tools/vmap3_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
@@ -27,7 +27,7 @@ public:
         libmpq__file_unpacked_size(mpq_a, filenum, &size);
 
         char *buffer = new char[size];
-        
+
         libmpq__file_read(mpq_a, filenum, (unsigned char*)buffer, size, &transferred);
 
         char seps[] = "\n";
diff --git a/src/tools/vmap3_extractor/vec3d.h b/src/tools/vmap3_extractor/vec3d.h
index 16f815c423d..06a5b730f16 100644
--- a/src/tools/vmap3_extractor/vec3d.h
+++ b/src/tools/vmap3_extractor/vec3d.h
@@ -106,7 +106,7 @@ public:
         in >> v.x >> v.y >> v.z;
         return in;
     }
-    
+
     friend std::ostream& operator<<(std::ostream& out, const Vec3D& v)
     {
         out << v.x << " " << v.y << " " << v.z;