286 files changed, 99 insertions, 29664 deletions

diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp
index b3c9a76e720..d4c4c4aecce 100644
--- a/src/game/AccountMgr.cpp
+++ b/src/game/AccountMgr.cpp
@@ -17,53 +17,40 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Database/DatabaseEnv.h"
 #include "Policies/SingletonImp.h"
-
 #include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "Util.h"
 #include "Auth/Sha1.h"
-
 extern DatabaseType loginDatabase;
-
 INSTANTIATE_SINGLETON_1(AccountMgr);
-
 AccountMgr::AccountMgr()
 {}
-
 AccountMgr::~AccountMgr()
 {}
-
 AccountOpResult AccountMgr::CreateAccount(std::string username, std::string password)
 {
     if(utf8length(username) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;                           // username's too long
-
     normalizeString(username);
     normalizeString(password);
-
     if(GetId(username))
     {
         return AOR_NAME_ALREDY_EXIST;                       // username does already exist
     }
-
     if(!loginDatabase.PExecute("INSERT INTO account(username,sha_pass_hash,joindate) VALUES('%s','%s',NOW())", username.c_str(), CalculateShaPassHash(username, password).c_str()))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
     loginDatabase.Execute("INSERT INTO realmcharacters (realmid, acctid, numchars) SELECT realmlist.id, account.id, 0 FROM realmlist,account LEFT JOIN realmcharacters ON acctid=account.id WHERE acctid IS NULL");
-
     return AOR_OK;                                          // everything's fine
 }
-
 AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d'", accid);
     if(!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
-
     result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE account='%d'",accid);
     if (result)
     {
@@ -72,7 +59,6 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
             Field *fields = result->Fetch();
             uint32 guidlo = fields[0].GetUInt32();
             uint64 guid = MAKE_NEW_GUID(guidlo, 0, HIGHGUID_PLAYER);
-
             // kick if player currently
             if(Player* p = ObjectAccessor::GetObjectInWorld(guid, (Player*)NULL))
             {
@@ -80,76 +66,54 @@ AccountOpResult AccountMgr::DeleteAccount(uint32 accid)
                 s->KickPlayer();                            // mark session to remove at next session list update
                 s->LogoutPlayer(false);                     // logout player without waiting next session list update
             }
-
             Player::DeleteFromDB(guid, accid, false);       // no need to update realm characters
         } while (result->NextRow());
-
         delete result;
     }
-
     // table realm specific but common for all characters of account for realm
     CharacterDatabase.PExecute("DELETE FROM character_tutorial WHERE account = '%u'",accid);
-
     loginDatabase.BeginTransaction();
-
     bool res =
         loginDatabase.PExecute("DELETE FROM account WHERE id='%d'", accid) &&
         loginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid='%d'", accid);
-
     loginDatabase.CommitTransaction();
-
     if(!res)
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error;
-
     return AOR_OK;
 }
-
 AccountOpResult AccountMgr::ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d'", accid);
     if(!result)
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
     delete result;
-
     if(utf8length(new_uname) > MAX_ACCOUNT_STR)
         return AOR_NAME_TOO_LONG;
-
     if(utf8length(new_passwd) > MAX_ACCOUNT_STR)
         return AOR_PASS_TOO_LONG;
-
     normalizeString(new_uname);
     normalizeString(new_passwd);
-
     std::string safe_new_uname = new_uname;
     loginDatabase.escape_string(safe_new_uname);
-
     if(!loginDatabase.PExecute("UPDATE account SET v='0',s='0',username='%s',sha_pass_hash='%s' WHERE id='%d'", safe_new_uname.c_str(),
                 CalculateShaPassHash(new_uname, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
-
     return AOR_OK;
 }
-
 AccountOpResult AccountMgr::ChangePassword(uint32 accid, std::string new_passwd)
 {
     std::string username;
-
     if(!GetName(accid, username))
         return AOR_NAME_NOT_EXIST;                          // account doesn't exist
-
     if (utf8length(new_passwd) > MAX_ACCOUNT_STR)
         return AOR_PASS_TOO_LONG;
-
     normalizeString(new_passwd);
-
     // also reset s and v to force update at next realmd login
     if(!loginDatabase.PExecute("UPDATE account SET v='0', s='0', sha_pass_hash='%s' WHERE id='%d'",
                 CalculateShaPassHash(username, new_passwd).c_str(), accid))
         return AOR_DB_INTERNAL_ERROR;                       // unexpected error
-
     return AOR_OK;
 }
-
 uint32 AccountMgr::GetId(std::string username)
 {
     loginDatabase.escape_string(username);
@@ -163,7 +127,6 @@ uint32 AccountMgr::GetId(std::string username)
         return id;
     }
 }
-
 uint32 AccountMgr::GetSecurity(uint32 acc_id)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT gmlevel FROM account WHERE id = '%u'", acc_id);
@@ -173,10 +136,8 @@ uint32 AccountMgr::GetSecurity(uint32 acc_id)
         delete result;
         return sec;
     }
-
     return 0;
 }
-
 bool AccountMgr::GetName(uint32 acc_id, std::string &name)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT username FROM account WHERE id = '%u'", acc_id);
@@ -186,41 +147,31 @@ bool AccountMgr::GetName(uint32 acc_id, std::string &name)
         delete result;
         return true;
     }
-
     return false;
 }
-
 bool AccountMgr::CheckPassword(uint32 accid, std::string passwd)
 {
     std::string username;
     if(!GetName(accid, username))
         return false;
-
     normalizeString(passwd);
-
     QueryResult *result = loginDatabase.PQuery("SELECT 1 FROM account WHERE id='%d' AND sha_pass_hash='%s'", accid, CalculateShaPassHash(username, passwd).c_str());
     if (result)
     {
         delete result;
         return true;
     }
-
     return false;
 }
-
 bool AccountMgr::normalizeString(std::string& utf8str)
 {
     wchar_t wstr_buf[MAX_ACCOUNT_STR+1];
-
     size_t wstr_len = MAX_ACCOUNT_STR;
     if(!Utf8toWStr(utf8str,wstr_buf,wstr_len))
         return false;
-
     std::transform( &wstr_buf[0], wstr_buf+wstr_len, &wstr_buf[0], wcharToUpperOnlyLatin );
-
     return WStrToUtf8(wstr_buf,wstr_len,utf8str);
 }
-
 std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
 {
     Sha1Hash sha;
@@ -229,10 +180,8 @@ std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& pas
     sha.UpdateData(":");
     sha.UpdateData(password);
     sha.Finalize();
-
     std::string encoded;
     hexEncodeByteArray(sha.GetDigest(), sha.GetLength(), encoded);
-
     return encoded;
 }
 
diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h
index c14110036a0..c35b9a37575 100644
--- a/src/game/AccountMgr.h
+++ b/src/game/AccountMgr.h
@@ -17,15 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _ACCMGR_H
 #define _ACCMGR_H
-
 #include <string>
-
 #include "Common.h"
 #include "Policies/Singleton.h"
-
 enum AccountOpResult
 {
     AOR_OK,
@@ -35,29 +31,23 @@ enum AccountOpResult
     AOR_NAME_NOT_EXIST,
     AOR_DB_INTERNAL_ERROR
 };
-
 #define MAX_ACCOUNT_STR 16
-
 class AccountMgr
 {
     public:
         AccountMgr();
         ~AccountMgr();
-
         AccountOpResult CreateAccount(std::string username, std::string password);
         AccountOpResult DeleteAccount(uint32 accid);
         AccountOpResult ChangeUsername(uint32 accid, std::string new_uname, std::string new_passwd);
         AccountOpResult ChangePassword(uint32 accid, std::string new_passwd);
         bool CheckPassword(uint32 accid, std::string passwd);
-
         uint32 GetId(std::string username);
         uint32 GetSecurity(uint32 acc_id);
         bool GetName(uint32 acc_id, std::string &name);
         std::string CalculateShaPassHash(std::string& name, std::string& password);
-
         static bool normalizeString(std::string& utf8str);
 };
-
 #define accmgr Trinity::Singleton<AccountMgr>::Instance()
 #endif
 
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index c9b98c3ddef..50daa5c565f 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "DBCEnums.h"
 #include "ObjectMgr.h"
@@ -23,7 +22,6 @@
 #include "WorldPacket.h"
 #include "Database/DatabaseEnv.h"
 #include "Policies/SingletonImp.h"
-
 #include "AchievementMgr.h"
 #include "ArenaTeam.h"
 #include "CellImpl.h"
@@ -34,14 +32,11 @@
 #include "Player.h"
 #include "ProgressBar.h"
 #include "SpellMgr.h"
-
 #include "MapManager.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 
-
 INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
-
 namespace MaNGOS
 {
     class AchievementChatBuilder
@@ -52,7 +47,6 @@ namespace MaNGOS
             void operator()(WorldPacket& data, int32 loc_idx)
             {
                 char const* text = objmgr.GetMangosString(i_textId,loc_idx);
-
                 data << uint8(i_msgtype);
                 data << uint32(LANG_UNIVERSAL);
                 data << uint64(i_player.GetGUID());
@@ -63,7 +57,6 @@ namespace MaNGOS
                 data << uint8(0);
                 data << uint32(i_achievementId);
             }
-
         private:
             Player const& i_player;
             ChatMsg i_msgtype;
@@ -72,7 +65,6 @@ namespace MaNGOS
     };
 }                                                           // namespace MaNGOS
 
-
 bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria)
 {
     if(dataType >= MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE)
@@ -80,7 +72,6 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria)
         sLog.outErrorDb( "Table `achievement_criteria_data` for criteria (Entry: %u) have wrong data type (%u), ignore.", criteria->ID,dataType);
         return false;
     }
-
     switch(criteria->requiredType)
     {
         case ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE:
@@ -98,7 +89,6 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria)
             sLog.outErrorDb( "Table `achievement_criteria_data` have data for not supported criteria type (Entry: %u Type: %u), ignore.", criteria->ID, criteria->requiredType);
             return false;
     }
-
     switch(dataType)
     {
         case ACHIEVEMENT_CRITERIA_DATA_TYPE_NONE:
@@ -245,7 +235,6 @@ bool AchievementCriteriaData::IsValid(AchievementCriteriaEntry const* criteria)
     }
     return false;
 }
-
 bool AchievementCriteriaData::Meets(Player const* source, Unit const* target, uint32 miscvalue1 /*= 0*/) const
 {
     switch(dataType)
@@ -317,25 +306,20 @@ bool AchievementCriteriaData::Meets(Player const* source, Unit const* target, ui
     }
     return false;
 }
-
 bool AchievementCriteriaDataSet::Meets(Player const* source, Unit const* target, uint32 miscvalue /*= 0*/) const
 {
     for(Storage::const_iterator itr = storage.begin(); itr != storage.end(); ++itr)
         if(!itr->Meets(source,target,miscvalue))
             return false;
-
     return true;
 }
-
 AchievementMgr::AchievementMgr(Player *player)
 {
     m_player = player;
 }
-
 AchievementMgr::~AchievementMgr()
 {
 }
-
 void AchievementMgr::Reset()
 {
     for(CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin(); iter!=m_completedAchievements.end(); ++iter)
@@ -344,43 +328,34 @@ void AchievementMgr::Reset()
         data << uint32(iter->first);
         m_player->SendDirectMessage(&data);
     }
-
     for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
     {
         WorldPacket data(SMSG_CRITERIA_DELETED,4);
         data << uint32(iter->first);
         m_player->SendDirectMessage(&data);
     }
-
     m_completedAchievements.clear();
     m_criteriaProgress.clear();
     DeleteFromDB(m_player->GetGUIDLow());
-
     // re-fill data
     CheckAllAchievementCriteria();
 }
-
 void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1, uint32 miscvalue2)
 {
     if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0)
         sLog.outDetail("AchievementMgr::ResetAchievementCriteria(%u, %u, %u)", type, miscvalue1, miscvalue2);
-
     if (!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER)
         return;
-
     AchievementCriteriaEntryList const& achievementCriteriaList = achievementmgr.GetAchievementCriteriaByType(type);
     for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i)
     {
         AchievementCriteriaEntry const *achievementCriteria = (*i);
-
         AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
         if (!achievement)
             continue;
-
         // don't update already completed criteria
         if (IsCompletedCriteria(achievementCriteria,achievement))
             continue;
-
         switch (type)
         {
             case ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE:     // have total statistic also not expected to be reset
@@ -399,7 +374,6 @@ void AchievementMgr::ResetAchievementCriteria(AchievementCriteriaTypes type, uin
         }
     }
 }
-
 void AchievementMgr::DeleteFromDB(uint32 lowguid)
 {
     CharacterDatabase.BeginTransaction ();
@@ -407,7 +381,6 @@ void AchievementMgr::DeleteFromDB(uint32 lowguid)
     CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE guid = %u",lowguid);
     CharacterDatabase.CommitTransaction ();
 }
-
 void AchievementMgr::SaveToDB()
 {
     if(!m_completedAchievements.empty())
@@ -419,7 +392,6 @@ void AchievementMgr::SaveToDB()
         {
             if(!iter->second.changed)
                 continue;
-
             /// first new/changed record prefix
             if(!need_execute)
             {
@@ -433,25 +405,20 @@ void AchievementMgr::SaveToDB()
                 ssdel << ", ";
                 ssins << ", ";
             }
-
             // new/changed record data
             ssdel << iter->first;
             ssins << "("<<GetPlayer()->GetGUIDLow() << ", " << iter->first << ", " << uint64(iter->second.date) << ")";
-
             /// mark as saved in db
             iter->second.changed = false;
         }
-
         if(need_execute)
             ssdel << ")";
-
         if(need_execute)
         {
             CharacterDatabase.Execute( ssdel.str().c_str() );
             CharacterDatabase.Execute( ssins.str().c_str() );
         }
     }
-
     if(!m_criteriaProgress.empty())
     {
         /// prepare deleting and insert
@@ -463,7 +430,6 @@ void AchievementMgr::SaveToDB()
         {
             if(!iter->second.changed)
                 continue;
-
             // deleted data (including 0 progress state)
             {
                 /// first new/changed record prefix (for any counter value)
@@ -475,11 +441,9 @@ void AchievementMgr::SaveToDB()
                 /// next new/changed record prefix
                 else
                     ssdel << ", ";
-
                 // new/changed record data
                 ssdel << iter->first;
             }
-
             // store data only for real progress
             if(iter->second.counter != 0)
             {
@@ -492,18 +456,14 @@ void AchievementMgr::SaveToDB()
                 /// next new/changed record prefix
                 else
                     ssins << ", ";
-
                 // new/changed record data
                 ssins << "(" << GetPlayer()->GetGUIDLow() << ", " << iter->first << ", " << iter->second.counter << ", " << iter->second.date << ")";
             }
-
             /// mark as updated in db
             iter->second.changed = false;
         }
-
         if(need_execute_del)                                // DELETE ... IN (.... _)_
             ssdel << ")";
-
         if(need_execute_del || need_execute_ins)
         {
             if(need_execute_del)
@@ -513,7 +473,6 @@ void AchievementMgr::SaveToDB()
         }
     }
 }
-
 void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult)
 {
     if(achievementResult)
@@ -521,30 +480,24 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
         do
         {
             Field *fields = achievementResult->Fetch();
-
             uint32 achievement_id = fields[0].GetUInt32();
-
             // don't must happen: cleanup at server startup in achievementmgr.LoadCompletedAchievements()
             if(!sAchievementStore.LookupEntry(achievement_id))
                 continue;
-
             CompletedAchievementData& ca = m_completedAchievements[achievement_id];
             ca.date = time_t(fields[1].GetUInt64());
             ca.changed = false;
         } while(achievementResult->NextRow());
         delete achievementResult;
     }
-
     if(criteriaResult)
     {
         do
         {
             Field *fields = criteriaResult->Fetch();
-
             uint32 id      = fields[0].GetUInt32();
             uint32 counter = fields[1].GetUInt32();
             time_t date    = time_t(fields[2].GetUInt64());
-
             AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(id);
             if (!criteria)
             {
@@ -553,10 +506,8 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
                 CharacterDatabase.PExecute("DELETE FROM character_achievement_progress WHERE criteria = %u",id);
                 continue;
             }
-
             if (criteria->timeLimit && time_t(date + criteria->timeLimit) < time(NULL))
                 continue;
-
             CriteriaProgress& progress = m_criteriaProgress[id];
             progress.counter = counter;
             progress.date    = date;
@@ -564,26 +515,21 @@ void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *cri
         } while(criteriaResult->NextRow());
         delete criteriaResult;
     }
-
 }
-
 void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
 {
     if(GetPlayer()->GetSession()->PlayerLoading())
         return;
-
     #ifdef TRINITY_DEBUG
     if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0)
         sLog.outDebug("AchievementMgr::SendAchievementEarned(%u)", achievement->ID);
     #endif
-
     if(Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId()))
     {
         MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_GUILD_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID);
         MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> say_do(say_builder);
         guild->BroadcastWorker(say_do,GetPlayer());
     }
-
     if(achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_KILL|ACHIEVEMENT_FLAG_REALM_FIRST_REACH))
     {
         // broadcast realm first reached
@@ -597,11 +543,9 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
     else
     {
         CellPair p = MaNGOS::ComputeCellPair(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY());
-
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
         cell.SetNoCreate();
-
         MaNGOS::AchievementChatBuilder say_builder(*GetPlayer(), CHAT_MSG_ACHIEVEMENT, LANG_ACHIEVEMENT_EARNED,achievement->ID);
         MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> say_do(say_builder);
         MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::AchievementChatBuilder> > say_worker(GetPlayer(),sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY),say_do);
@@ -609,7 +553,6 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY));
     }
-
     WorldPacket data(SMSG_ACHIEVEMENT_EARNED, 8+4+8);
     data.append(GetPlayer()->GetPackGUID());
     data << uint32(achievement->ID);
@@ -617,15 +560,12 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement)
     data << uint32(0);
     GetPlayer()->SendMessageToSetInRange(&data, sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY), true);
 }
-
 void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progress)
 {
     WorldPacket data(SMSG_CRITERIA_UPDATE, 8+4+8);
     data << uint32(id);
-
     // the counter is packed like a packed Guid
     data.appendPackGUID(progress->counter);
-
     data.append(GetPlayer()->GetPackGUID());
     data << uint32(0);
     data << uint32(secsToTimeBitFields(progress->date));
@@ -633,7 +573,6 @@ void AchievementMgr::SendCriteriaUpdate(uint32 id, CriteriaProgress const* progr
     data << uint32(0);  // timer 2
     GetPlayer()->SendDirectMessage(&data);
 }
-
 /**
  * called at player login. The player might have fulfilled some achievements when the achievement system wasn't working yet
  */
@@ -643,7 +582,6 @@ void AchievementMgr::CheckAllAchievementCriteria()
     for(uint32 i=0; i<ACHIEVEMENT_CRITERIA_TYPE_TOTAL; ++i)
         UpdateAchievementCriteria(AchievementCriteriaTypes(i));
 }
-
 static const uint32 achievIdByArenaSlot[MAX_ARENA_SLOT] = { 1057, 1107, 1108 };
 static const uint32 achievIdForDangeon[][4] =
 {
@@ -655,7 +593,6 @@ static const uint32 achievIdForDangeon[][4] =
     { 2219,      false,     false,  true  },
     { 0,         false,     false,  false }
 };
-
 /**
  * this function will be called whenever the user might have done a criteria relevant action
  */
@@ -663,30 +600,23 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
 {
     if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0)
         sLog.outDetail("AchievementMgr::UpdateAchievementCriteria(%u, %u, %u, %u)", type, miscvalue1, miscvalue2, time);
-
     if (!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER)
         return;
-
     AchievementCriteriaEntryList const& achievementCriteriaList = achievementmgr.GetAchievementCriteriaByType(type);
     for(AchievementCriteriaEntryList::const_iterator i = achievementCriteriaList.begin(); i!=achievementCriteriaList.end(); ++i)
     {
         AchievementCriteriaEntry const *achievementCriteria = (*i);
-
         if (achievementCriteria->groupFlag & ACHIEVEMENT_CRITERIA_GROUP_NOT_IN_GROUP && GetPlayer()->GetGroup())
             continue;
-
         AchievementEntry const *achievement = sAchievementStore.LookupEntry(achievementCriteria->referredAchievement);
         if (!achievement)
             continue;
-
         if ((achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_HORDE    && GetPlayer()->GetTeam() != HORDE) ||
             (achievement->factionFlag == ACHIEVEMENT_FACTION_FLAG_ALLIANCE && GetPlayer()->GetTeam() != ALLIANCE))
             continue;
-
         // don't update already completed criteria
         if (IsCompletedCriteria(achievementCriteria,achievement))
             continue;
-
         switch (type)
         {
             // std. case: increment at 1
@@ -729,9 +659,7 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_HIGHEST);
                 break;
-
             // specialized cases
-
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
             {
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
@@ -739,7 +667,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if (achievementCriteria->win_bg.bgMapID != GetPlayer()->GetMapId())
                     continue;
-
                 if (achievementCriteria->win_bg.additionalRequirement1_type)
                 {
                     // those requirements couldn't be found in the dbc
@@ -753,7 +680,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     BattleGround* bg = GetPlayer()->GetBattleGround();
                     if (!bg)
                         continue;
-
                     switch(achievementCriteria->referredAchievement)
                     {
                         case 161:                           // AB, Overcome a 500 resource disadvantage
@@ -776,7 +702,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                             continue;                       // not implemented
                     }
                 }
-
                 SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -787,12 +712,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if(achievementCriteria->kill_creature.creatureID != miscvalue1)
                     continue;
-
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria);
                 if(!data || !data->Meets(GetPlayer(),unit))
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, miscvalue2, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -831,7 +754,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // speedup for non-login case
                 if(miscvalue1 && miscvalue1 != achievementCriteria->complete_quests_in_zone.zoneID)
                     continue;
-
                 uint32 counter =0;
                 for(QuestStatusMap::const_iterator itr = GetPlayer()->getQuestStatusMap().begin(); itr!=GetPlayer()->getQuestStatusMap().end(); itr++)
                 {
@@ -872,13 +794,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                         BattleGround* bg = GetPlayer()->GetBattleGround();
                         if(!bg || !bg->isArena() || ArenaTeam::GetSlotByType(bg->GetArenaType()) != j)
                             notfit = true;
-
                         break;
                     }
                 }
                 if(notfit)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -887,11 +807,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
                 if(!miscvalue1)
                     continue;
-
                 Map const* map = GetPlayer()->IsInWorld() ? GetPlayer()->GetMap() : MapManager::Instance().FindMap(GetPlayer()->GetMapId(), GetPlayer()->GetInstanceId());
                 if(!map || !map->IsDungeon())
                     continue;
-
                 // search case
                 bool found = false;
                 for(int j = 0; achievIdForDangeon[j][0]; ++j)
@@ -916,20 +834,17 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                             if(!achievIdForDangeon[j][3])
                                 break;                      // for
                         }
-
                         found = true;
                         break;                              // for
                     }
                 }
                 if(!found)
                     continue;
-
                 //FIXME: work only for instances where max==min for players
                 if(((InstanceMap*)map)->GetMaxPlayers() != achievementCriteria->death_in_dungeon.manLimit)
                     continue;
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
-
             }
             case ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE:
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
@@ -943,11 +858,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
                 if(!miscvalue1)
                     continue;
-
                 // if team check required: must kill by opposition faction
                 if(achievement->ID==318 && miscvalue2==GetPlayer()->GetTeam())
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING:
@@ -955,12 +868,10 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
                 if(!miscvalue1)
                     continue;
-
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria);
                 if(!data || !data->Meets(GetPlayer(),unit))
                     continue;
-
                 // miscvalue1 is the ingame fallheight*100 as stored in dbc
                 SetCriteriaProgress(achievementCriteria, miscvalue1);
                 break;
@@ -987,7 +898,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     if(!GetPlayer()->GetQuestRewardStatus(achievementCriteria->complete_quest.questID))
                         continue;
                 }
-
                 // exist many achievements with this criteria, use at this moment hardcoded check to skil simple case
                 switch(achievement->ID)
                 {
@@ -1008,7 +918,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                         break;
                 }
 
-
                 SetCriteriaProgress(achievementCriteria, 1);
                 break;
             }
@@ -1023,22 +932,18 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             {
                 if (!miscvalue1 || miscvalue1 != achievementCriteria->cast_spell.spellID)
                     continue;
-
                 // those requirements couldn't be found in the dbc
                 AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria);
                 if(!data)
                     continue;
-
                 if(!data->Meets(GetPlayer(),unit))
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             }
             case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL:
                 if(miscvalue1 && miscvalue1!=achievementCriteria->learn_spell.spellID)
                     continue;
-
                 if(GetPlayer()->HasSpell(achievementCriteria->learn_spell.spellID))
                     SetCriteriaProgress(achievementCriteria, 1);
                 break;
@@ -1050,7 +955,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if (miscvalue1 != achievementCriteria->loot_type.lootType)
                     continue;
-
                 // zone specific
                 if(achievementCriteria->loot_type.lootTypeCount==1)
                 {
@@ -1059,7 +963,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     if(!data || !data->Meets(GetPlayer(),unit))
                         continue;
                 }
-
                 SetCriteriaProgress(achievementCriteria, miscvalue2, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -1073,7 +976,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // miscvalue1 contains the personal rating
                 if (!miscvalue1)                            // no update at login
                     continue;
-
                 // additional requirements
                 if(achievementCriteria->win_rated_arena.flag==ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE)
                 {
@@ -1086,7 +988,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                         continue;
                     }
                 }
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM:
@@ -1110,28 +1011,23 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 WorldMapOverlayEntry const* worldOverlayEntry = sWorldMapOverlayStore.LookupEntry(achievementCriteria->explore_area.areaReference);
                 if(!worldOverlayEntry)
                     break;
-
                 bool matchFound = false;
                 for (int j = 0; j < MAX_WORLD_MAP_OVERLAY_AREA_IDX; ++j)
                 {
                     uint32 area_id = worldOverlayEntry->areatableID[j];
                     if(!area_id)                            // array have 0 only in empty tail
                         break;
-
                     int32 exploreFlag = GetAreaFlagByAreaID(area_id);
                     if(exploreFlag < 0)
                         continue;
-
                     uint32 playerIndexOffset = uint32(exploreFlag) / 32;
                     uint32 mask = 1<< (uint32(exploreFlag) % 32);
-
                     if(GetPlayer()->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + playerIndexOffset) & mask)
                     {
                         matchFound = true;
                         break;
                     }
                 }
-
                 if(matchFound)
                     SetCriteriaProgress(achievementCriteria, 1);
                 break;
@@ -1144,7 +1040,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // skip faction check only at loading
                 if (miscvalue1 && miscvalue1 != achievementCriteria->gain_reputation.factionID)
                     continue;
-
                 int32 reputation = GetPlayer()->GetReputationMgr().GetReputation(achievementCriteria->gain_reputation.factionID);
                 if (reputation > 0)
                     SetCriteriaProgress(achievementCriteria, reputation);
@@ -1173,11 +1068,9 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 if(miscvalue2 != achievementCriteria->roll_greed_on_loot.rollValue)
                     continue;
                 ItemPrototype const *pProto = objmgr.GetItemPrototype( miscvalue1 );
-
                 uint32 requiredItemLevel = 0;
                 if (achievementCriteria->ID == 2412 || achievementCriteria->ID == 2358)
                     requiredItemLevel = 185;
-
                 if(!pProto || pProto->ItemLevel <requiredItemLevel)
                     continue;
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
@@ -1197,7 +1090,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     if(!data || !data->Meets(GetPlayer(),unit))
                         continue;
                 }
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -1206,17 +1098,14 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             {
                 if (!miscvalue1)
                     continue;
-
                 if (achievementCriteria->healing_done.flag == ACHIEVEMENT_CRITERIA_CONDITION_MAP)
                 {
                     if(GetPlayer()->GetMapId() != achievementCriteria->healing_done.mapid)
                         continue;
-
                     // map specific case (BG in fact) expected player targeted damage/heal
                     if(!unit || unit->GetTypeId()!=TYPEID_PLAYER)
                         continue;
                 }
-
                 SetCriteriaProgress(achievementCriteria, miscvalue1, PROGRESS_ACCUMULATE);
                 break;
             }
@@ -1226,7 +1115,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if (miscvalue1 != achievementCriteria->equip_item.itemID)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT:
@@ -1235,7 +1123,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if (miscvalue1 != achievementCriteria->use_gameobject.goEntry)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT:
@@ -1243,14 +1130,12 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                     continue;
                 if (miscvalue1 != achievementCriteria->fish_in_gameobject.goEntry)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS:
             {
                 if (miscvalue1 && miscvalue1 != achievementCriteria->learn_skillline_spell.skillLine)
                     continue;
-
                 uint32 spellCount = 0;
                 for (PlayerSpellMap::const_iterator spellIter = GetPlayer()->GetSpellMap().begin();
                     spellIter != GetPlayer()->GetSpellMap().end();
@@ -1270,18 +1155,15 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
                 // AchievementMgr::UpdateAchievementCriteria might also be called on login - skip in this case
                 if (!miscvalue1)
                     continue;
-
                 if (achievementCriteria->win_duel.duelCount)
                 {
                     // those requirements couldn't be found in the dbc
                     AchievementCriteriaDataSet const* data = achievementmgr.GetCriteriaDataSet(achievementCriteria);
                     if (!data)
                         continue;
-
                     if (!data->Meets(GetPlayer(),unit))
                         continue;
                 }
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION:
@@ -1297,7 +1179,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             {
                 if (miscvalue1 && miscvalue1 != achievementCriteria->learn_skill_line.skillLine)
                     continue;
-
                 uint32 spellCount = 0;
                 for (PlayerSpellMap::const_iterator spellIter = GetPlayer()->GetSpellMap().begin();
                     spellIter != GetPlayer()->GetSpellMap().end();
@@ -1317,13 +1198,11 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             case ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS:
                 if (!miscvalue1 || miscvalue1 != achievementCriteria->hk_class.classID)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_HK_RACE:
                 if (!miscvalue1 || miscvalue1 != achievementCriteria->hk_race.raceID)
                     continue;
-
                 SetCriteriaProgress(achievementCriteria, 1, PROGRESS_ACCUMULATE);
                 break;
             case ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED:
@@ -1364,7 +1243,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
         }
         if(IsCompletedCriteria(achievementCriteria,achievement))
             CompletedCriteriaFor(achievement);
-
         // check again the completeness for SUMM and REQ COUNT achievements,
         // as they don't depend on the completed criteria but on the sum of the progress of each individual criteria
         if (achievement->flags & ACHIEVEMENT_FLAG_SUMM)
@@ -1372,7 +1250,6 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
             if (IsCompletedAchievement(achievement))
                 CompletedAchievement(achievement);
         }
-
         if(AchievementEntryList const* achRefList = achievementmgr.GetAchievementByReferencedId(achievement->ID))
         {
             for(AchievementEntryList::const_iterator itr = achRefList->begin(); itr != achRefList->end(); ++itr)
@@ -1381,29 +1258,23 @@ void AchievementMgr::UpdateAchievementCriteria(AchievementCriteriaTypes type, ui
         }
     }
 }
-
 static const uint32 achievIdByClass[MAX_CLASSES] = { 0, 459, 465 , 462, 458, 464, 461, 467, 460, 463, 0, 466 };
 static const uint32 achievIdByRace[MAX_RACES]    = { 0, 1408, 1410, 1407, 1409, 1413, 1411, 1404, 1412, 0, 1405, 1406 };
-
 bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement)
 {
     // counter can never complete
     if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER)
         return false;
-
     if(achievement->flags & (ACHIEVEMENT_FLAG_REALM_FIRST_REACH | ACHIEVEMENT_FLAG_REALM_FIRST_KILL))
     {
         // someone on this realm has already completed that achievement
         if(achievementmgr.IsRealmCompleted(achievement))
             return false;
     }
-
     CriteriaProgressMap::const_iterator itr = m_criteriaProgress.find(achievementCriteria->ID);
     if(itr == m_criteriaProgress.end())
         return false;
-
     CriteriaProgress const* progress = &itr->second;
-
     switch(achievementCriteria->requiredType)
     {
         case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
@@ -1416,12 +1287,10 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
             for(int i = 1; i < MAX_CLASSES; ++i)
                 if(achievIdByClass[i] == achievement->ID && i != GetPlayer()->getClass())
                     return false;
-
             // skip wrong race achievements
             for(int i = 1; i < MAX_RACES; ++i)
                 if(achievIdByRace[i] == achievement->ID && i != GetPlayer()->getRace())
                     return false;
-
             // appropriate class/race or not class/race specific
             return progress->counter >= achievementCriteria->reach_level.level;
         }
@@ -1530,36 +1399,29 @@ bool AchievementMgr::IsCompletedCriteria(AchievementCriteriaEntry const* achieve
     }
     return false;
 }
-
 void AchievementMgr::CompletedCriteriaFor(AchievementEntry const* achievement)
 {
     // counter can never complete
     if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER)
         return;
-
     // already completed and stored
     if (m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end())
         return;
-
     if (IsCompletedAchievement(achievement))
         CompletedAchievement(achievement);
 }
-
 bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
 {
     // counter can never complete
     if(entry->flags & ACHIEVEMENT_FLAG_COUNTER)
         return false;
-
     // for achievement with referenced achievement criterias get from referenced and counter from self
     uint32 achievmentForTestId = entry->refAchievement ? entry->refAchievement : entry->ID;
     uint32 achievmentForTestCount = entry->count;
-
     AchievementCriteriaEntryList const* cList = achievementmgr.GetAchievementCriteriaByAchievement(achievmentForTestId);
     if(!cList)
         return false;
     uint32 count = 0;
-
     // For SUMM achievements, we have to count the progress of each criteria of the achievement.
     // Oddly, the target count is NOT countained in the achievement, but in each individual criteria
     if (entry->flags & ACHIEVEMENT_FLAG_SUMM)
@@ -1567,62 +1429,48 @@ bool AchievementMgr::IsCompletedAchievement(AchievementEntry const* entry)
         for(AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr)
         {
             AchievementCriteriaEntry const* criteria = *itr;
-
             CriteriaProgressMap::const_iterator itrProgress = m_criteriaProgress.find(criteria->ID);
             if(itrProgress == m_criteriaProgress.end())
                 continue;
-
             CriteriaProgress const* progress = &itrProgress->second;
             count += progress->counter;
-
             // for counters, field4 contains the main count requirement
             if (count >= criteria->raw.count)
                 return true;
         }
         return false;
     }
-
     // Default case - need complete all or
     bool completed_all = true;
     for(AchievementCriteriaEntryList::const_iterator itr = cList->begin(); itr != cList->end(); ++itr)
     {
         AchievementCriteriaEntry const* criteria = *itr;
-
         bool completed = IsCompletedCriteria(criteria,entry);
-
         // found an uncompleted criteria, but DONT return false yet - there might be a completed criteria with ACHIEVEMENT_CRITERIA_COMPLETE_FLAG_ALL
         if(completed)
             ++count;
         else
             completed_all = false;
-
         // completed as have req. count of completed criterias
         if(achievmentForTestCount > 0 && achievmentForTestCount <= count)
            return true;
     }
-
     // all criterias completed requirement
     if(completed_all && achievmentForTestCount==0)
         return true;
-
     return false;
 }
-
 void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry, uint32 changeValue, ProgressType ptype)
 {
     if((sLog.getLogFilter() & LOG_FILTER_ACHIEVEMENT_UPDATES)==0)
         sLog.outDetail("AchievementMgr::SetCriteriaProgress(%u, %u) for (GUID:%u)", entry->ID, changeValue, m_player->GetGUIDLow());
-
     CriteriaProgress *progress = NULL;
-
     CriteriaProgressMap::iterator iter = m_criteriaProgress.find(entry->ID);
-
     if(iter == m_criteriaProgress.end())
     {
         // not create record for 0 counter
         if(changeValue == 0)
             return;
-
         progress = &m_criteriaProgress[entry->ID];
         progress->counter = changeValue;
         progress->date = time(NULL);
@@ -1630,7 +1478,6 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
     else
     {
         progress = &iter->second;
-
         uint32 newValue = 0;
         switch(ptype)
         {
@@ -1648,81 +1495,62 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
                 newValue = progress->counter < changeValue ? changeValue : progress->counter;
                 break;
         }
-
         // not update (not mark as changed) if counter will have same value
         if(progress->counter == newValue)
             return;
-
         progress->counter = newValue;
     }
-
     progress->changed = true;
-
     if(entry->timeLimit)
     {
         time_t now = time(NULL);
         if(time_t(progress->date + entry->timeLimit) < now)
             progress->counter = 1;
-
         // also it seems illogical, the timeframe will be extended at every criteria update
         progress->date = now;
     }
     SendCriteriaUpdate(entry->ID,progress);
 }
-
 void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
 {
     sLog.outDetail("AchievementMgr::CompletedAchievement(%u)", achievement->ID);
-
     if(!sWorld.getConfig(CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS) && m_player->GetSession()->GetSecurity() > SEC_PLAYER)
         return;
-    
     if(achievement->flags & ACHIEVEMENT_FLAG_COUNTER || m_completedAchievements.find(achievement->ID)!=m_completedAchievements.end())
         return;
-
     SendAchievementEarned(achievement);
     CompletedAchievementData& ca =  m_completedAchievements[achievement->ID];
     ca.date = time(NULL);
     ca.changed = true;
-
     // don't insert for ACHIEVEMENT_FLAG_REALM_FIRST_KILL since otherwise only the first group member would reach that achievement
     // TODO: where do set this instead?
     if(!(achievement->flags & ACHIEVEMENT_FLAG_REALM_FIRST_KILL))
         achievementmgr.SetRealmCompleted(achievement);
-
     UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT);
-
     // reward items and titles if any
     AchievementReward const* reward = achievementmgr.GetAchievementReward(achievement);
-
     // no rewards
     if(!reward)
         return;
-
     // titles
     if(uint32 titleId = reward->titleId[GetPlayer()->GetTeam() == HORDE ? 0 : 1])
     {
         if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
             GetPlayer()->SetTitle(titleEntry);
     }
-
     // mail
     if(reward->sender)
     {
         Item* item = reward->itemId ? Item::CreateItem(reward->itemId,1,GetPlayer ()) : NULL;
-
         MailItemsInfo mi;
         if(item)
         {
             // save new item before send
             item->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
-
             // item
             mi.AddItem(item->GetGUIDLow(), item->GetEntry(), item);
         }
-
         int loc_idx = GetPlayer()->GetSession()->GetSessionDbLocaleIndex();
-
         // subject and text
         std::string subject = reward->subject;
         std::string text = reward->text;
@@ -1736,36 +1564,28 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
                     text = loc->text[loc_idx];
             }
         }
-
         uint32 itemTextId = objmgr.CreateItemText( text );
-
         WorldSession::SendMailTo(GetPlayer(), MAIL_CREATURE, MAIL_STATIONERY_NORMAL, reward->sender, GetPlayer()->GetGUIDLow(), subject, itemTextId , &mi, 0, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 void AchievementMgr::SendAllAchievementData()
 {
     uint32 size = 18 + m_completedAchievements.size()*8 + m_criteriaProgress.size() * 36;
-
     bool send = false;
-
     WorldPacket data(SMSG_ALL_ACHIEVEMENT_DATA);
     if( size < 0x8000 )
         data.resize( size );
     else
         data.resize( 0x7fff );
         // More than this causes client trouble
-    
     CompletedAchievementMap::const_iterator iter = m_completedAchievements.begin();
     CriteriaProgressMap::const_iterator iter2 = m_criteriaProgress.begin();
-
     bool cAchievements = false;
     bool cProgress = false;
     while( !cAchievements || !cProgress )
     {
         data.clear();
         send = false;
-        
         if( !cAchievements )
         {
             for(; iter != m_completedAchievements.end() && !send; ++iter)
@@ -1774,11 +1594,9 @@ void AchievementMgr::SendAllAchievementData()
                 data << uint32(secsToTimeBitFields(iter->second.date));
                 send = data.size() > 0x7f00;
             }
-
             if( iter == m_completedAchievements.end() )
                 cAchievements = true;
         }
-
         data << int32(-1);
         for(; iter2 != m_criteriaProgress.end() && !send; ++iter2)
         {
@@ -1791,15 +1609,12 @@ void AchievementMgr::SendAllAchievementData()
             data << uint32(0);
             send = data.size() > 0x7f00;
         }
-        
         if( iter2 == m_criteriaProgress.end() )
             cProgress = true;
-
         data << int32(-1);
         GetPlayer()->GetSession()->SendPacket(&data);
     }
 }
-
 void AchievementMgr::SendRespondInspectAchievements(Player* player)
 {
     // since we don't know the exact size of the packed GUIDs this is just an approximation
@@ -1808,7 +1623,6 @@ void AchievementMgr::SendRespondInspectAchievements(Player* player)
     BuildAllDataPacket(&data);
     player->GetSession()->SendPacket(&data);
 }
-
 /**
  * used by SMSG_RESPOND_INSPECT_ACHIEVEMENT
  */
@@ -1820,7 +1634,6 @@ void AchievementMgr::BuildAllDataPacket(WorldPacket *data)
         *data << uint32(secsToTimeBitFields(iter->second.date));
     }
     *data << int32(-1);
-
     for(CriteriaProgressMap::const_iterator iter = m_criteriaProgress.begin(); iter!=m_criteriaProgress.end(); ++iter)
     {
         *data << uint32(iter->first);
@@ -1831,91 +1644,72 @@ void AchievementMgr::BuildAllDataPacket(WorldPacket *data)
         *data << uint32(0);
         *data << uint32(0);
     }
-
     *data << int32(-1);
 }
-
 //==========================================================
 AchievementCriteriaEntryList const& AchievementGlobalMgr::GetAchievementCriteriaByType(AchievementCriteriaTypes type)
 {
     return m_AchievementCriteriasByType[type];
 }
-
 void AchievementGlobalMgr::LoadAchievementCriteriaList()
 {
     if(sAchievementCriteriaStore.GetNumRows()==0)
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 achievement criteria.");
         return;
     }
-
     barGoLink bar( sAchievementCriteriaStore.GetNumRows() );
     for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId)
     {
         bar.step();
-
         AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId);
         if(!criteria)
             continue;
-
         m_AchievementCriteriasByType[criteria->requiredType].push_back(criteria);
         m_AchievementCriteriaListByAchievement[criteria->referredAchievement].push_back(criteria);
     }
-
     sLog.outString();
     sLog.outString(">> Loaded %lu achievement criteria.",(unsigned long)m_AchievementCriteriasByType->size());
 }
-
 void AchievementGlobalMgr::LoadAchievementReferenceList()
 {
     if(sAchievementStore.GetNumRows()==0)
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 achievement references.");
         return;
     }
-
     uint32 count = 0;
     barGoLink bar( sAchievementStore.GetNumRows() );
     for (uint32 entryId = 0; entryId < sAchievementStore.GetNumRows(); ++entryId)
     {
         bar.step();
-
         AchievementEntry const* achievement = sAchievementStore.LookupEntry(entryId);
         if(!achievement || !achievement->refAchievement)
             continue;
-
         m_AchievementListByReferencedId[achievement->refAchievement].push_back(achievement);
         ++count;
     }
-
     sLog.outString();
     sLog.outString(">> Loaded %u achievement references.",count);
 }
-
 void AchievementGlobalMgr::LoadAchievementCriteriaData()
 {
     m_criteriaDataMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT criteria_id, type, value1, value2 FROM achievement_criteria_data");
-
     if(!result)
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 additional achievement criteria data. DB table `achievement_criteria_data` is empty.");
         return;
     }
-
     uint32 count = 0;
     uint32 disabled_count = 0;
     barGoLink bar(result->GetRowCount());
@@ -1924,45 +1718,34 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData()
         bar.step();
         Field *fields = result->Fetch();
         uint32 criteria_id = fields[0].GetUInt32();
-
         AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(criteria_id);
-
         if (!criteria)
         {
             sLog.outErrorDb( "Table `achievement_criteria_data` have data for not existed criteria (Entry: %u), ignore.", criteria_id);
             continue;
         }
-
         AchievementCriteriaData data(fields[1].GetUInt32(),fields[2].GetUInt32(),fields[3].GetUInt32());
-
         if (!data.IsValid(criteria))
         {
             continue;
         }
-
         // this will allocate empty data set storage
         AchievementCriteriaDataSet& dataSet = m_criteriaDataMap[criteria_id];
-
         if (data.dataType == ACHIEVEMENT_CRITERIA_DATA_TYPE_DISABLED)
             ++disabled_count;
-
         // add real data only for not NONE data types
         if (data.dataType != ACHIEVEMENT_CRITERIA_DATA_TYPE_NONE)
             dataSet.Add(data);
-
         // counting data by and data types
         ++count;
     } while(result->NextRow());
-
     delete result;
-
     // post loading checks
     for (uint32 entryId = 0; entryId < sAchievementCriteriaStore.GetNumRows(); ++entryId)
     {
         AchievementCriteriaEntry const* criteria = sAchievementCriteriaStore.LookupEntry(entryId);
         if(!criteria)
             continue;
-
         switch(criteria->requiredType)
         {
             case ACHIEVEMENT_CRITERIA_TYPE_WIN_BG:
@@ -1976,7 +1759,6 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData()
                 AchievementEntry const* achievement = sAchievementStore.LookupEntry(criteria->referredAchievement);
                 if(!achievement)
                     continue;
-
                 // exist many achievements with this criteria, use at this moment hardcoded check to skil simple case
                 switch(achievement->ID)
                 {
@@ -2016,35 +1798,28 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData()
             default:                                        // type not use DB data, ignore
                 continue;
         }
-
         if(!GetCriteriaDataSet(criteria))
             sLog.outErrorDb( "Table `achievement_criteria_data` not have expected data for criteria (Entry: %u Type: %u) for achievement %u.", criteria->ID, criteria->requiredType, criteria->referredAchievement);
     }
-
     sLog.outString();
     sLog.outString(">> Loaded %u additional achievement criteria data (%u disabled).",count,disabled_count);
 }
-
 void AchievementGlobalMgr::LoadCompletedAchievements()
 {
     QueryResult *result = CharacterDatabase.Query("SELECT achievement FROM character_achievement GROUP BY achievement");
-
     if(!result)
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 realm completed achievements . DB table `character_achievement` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
     do
     {
         bar.step();
         Field *fields = result->Fetch();
-
         uint32 achievement_id = fields[0].GetUInt32();
         if(!sAchievementStore.LookupEntry(achievement_id))
         {
@@ -2053,41 +1828,30 @@ void AchievementGlobalMgr::LoadCompletedAchievements()
             CharacterDatabase.PExecute("DELETE FROM character_achievement WHERE achievement = %u",achievement_id);
             continue;
         }
-
         m_allCompletedAchievements.insert(achievement_id);
     } while(result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %lu realm completed achievements.",(unsigned long)m_allCompletedAchievements.size());
 }
-
 void AchievementGlobalMgr::LoadRewards()
 {
     m_achievementRewards.clear();                           // need for reload case
-
     //                                                0      1        2        3     4       5        6
     QueryResult *result = WorldDatabase.Query("SELECT entry, title_A, title_H, item, sender, subject, text FROM achievement_reward");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 achievement rewards. DB table `achievement_reward` is empty.");
         return;
     }
-
     uint32 count = 0;
     barGoLink bar(result->GetRowCount());
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
         uint32 entry = fields[0].GetUInt32();
         if (!sAchievementStore.LookupEntry(entry))
@@ -2095,7 +1859,6 @@ void AchievementGlobalMgr::LoadRewards()
             sLog.outErrorDb( "Table `achievement_reward` has wrong achievement (Entry: %u), ignore", entry);
             continue;
         }
-
         AchievementReward reward;
         reward.titleId[0] = fields[1].GetUInt32();
         reward.titleId[1] = fields[2].GetUInt32();
@@ -2103,17 +1866,14 @@ void AchievementGlobalMgr::LoadRewards()
         reward.sender     = fields[4].GetUInt32();
         reward.subject    = fields[5].GetCppString();
         reward.text       = fields[6].GetCppString();
-
         if ((reward.titleId[0]==0)!=(reward.titleId[1]==0))
             sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) has title (A: %u H: %u) only for one from teams.", entry, reward.titleId[0], reward.titleId[1]);
-
         // must be title or mail at least
         if (!reward.titleId[0] && !reward.titleId[1] && !reward.sender)
         {
             sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have title or item reward data, ignore.", entry);
             continue;
         }
-
         if (reward.titleId[0])
         {
             CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(reward.titleId[0]);
@@ -2123,7 +1883,6 @@ void AchievementGlobalMgr::LoadRewards()
                 reward.titleId[0] = 0;
             }
         }
-
         if (reward.titleId[1])
         {
             CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(reward.titleId[1]);
@@ -2133,7 +1892,6 @@ void AchievementGlobalMgr::LoadRewards()
                 reward.titleId[1] = 0;
             }
         }
-
         //check mail data before item for report including wrong item case
         if (reward.sender)
         {
@@ -2147,14 +1905,11 @@ void AchievementGlobalMgr::LoadRewards()
         {
             if (reward.itemId)
                 sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have item reward, item will not rewarded", entry);
-
             if (!reward.subject.empty())
                 sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have mail subject.", entry);
-
             if (!reward.text.empty())
                 sLog.outErrorDb( "Table `achievement_reward` (Entry: %u) not have sender data but have mail text.", entry);
         }
-
         if (reward.itemId)
         {
             if (!objmgr.GetItemPrototype(reward.itemId))
@@ -2163,52 +1918,37 @@ void AchievementGlobalMgr::LoadRewards()
                 reward.itemId = 0;
             }
         }
-
         m_achievementRewards[entry] = reward;
         ++count;
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u achievement rewards", count );
 }
-
 void AchievementGlobalMgr::LoadRewardLocales()
 {
     m_achievementRewardLocales.clear();                       // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,subject_loc1,text_loc1,subject_loc2,text_loc2,subject_loc3,text_loc3,subject_loc4,text_loc4,subject_loc5,text_loc5,subject_loc6,text_loc6,subject_loc7,text_loc7,subject_loc8,text_loc8 FROM locales_achievement_reward");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 achievement reward locale strings. DB table `locales_achievement_reward` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         if(m_achievementRewards.find(entry)==m_achievementRewards.end())
         {
             sLog.outErrorDb( "Table `locales_achievement_reward` (Entry: %u) has locale strings for not existed achievement reward .", entry);
             continue;
         }
-
         AchievementRewardLocale& data = m_achievementRewardLocales[entry];
-
         for(int i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[1+2*(i-1)].GetCppString();
@@ -2219,7 +1959,6 @@ void AchievementGlobalMgr::LoadRewardLocales()
                 {
                     if(data.subject.size() <= size_t(idx))
                         data.subject.resize(idx+1);
-
                     data.subject[idx] = str;
                 }
             }
@@ -2231,16 +1970,13 @@ void AchievementGlobalMgr::LoadRewardLocales()
                 {
                     if(data.text.size() <= size_t(idx))
                         data.text.resize(idx+1);
-
                     data.text[idx] = str;
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
 
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu achievement reward locale strings", (unsigned long)m_achievementRewardLocales.size() );
 }
diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h
index 5020539bb5c..2a2f02e243f 100644
--- a/src/game/AchievementMgr.h
+++ b/src/game/AchievementMgr.h
@@ -17,29 +17,23 @@
  */
 #ifndef __MANGOS_ACHIEVEMENTMGR_H
 #define __MANGOS_ACHIEVEMENTMGR_H
-
 #include <map>
 #include <string>
-
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
-
 typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
 typedef std::list<AchievementEntry const*>         AchievementEntryList;
-
 typedef std::map<uint32,AchievementCriteriaEntryList> AchievementCriteriaListByAchievement;
 typedef std::map<uint32,AchievementEntryList>         AchievementListByReferencedId;
-
 struct CriteriaProgress
 {
     uint32 counter;
     time_t date;
     bool changed;
 };
-
 enum AchievementCriteriaDataType
 {                                                           // value1         value2        comment
     ACHIEVEMENT_CRITERIA_DATA_TYPE_NONE                = 0, // 0              0
@@ -61,12 +55,9 @@ enum AchievementCriteriaDataType
     ACHIEVEMENT_CRITERIA_DATA_TYPE_HOLIDAY             = 16,// holiday_id     0             event in holiday time
     ACHIEVEMENT_CRITERIA_DATA_TYPE_BG_LOSS_TEAM_SCORE  = 17,// min_score      max_score     player's team win bg and opposition team have team score in range
 };
-
 #define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE               18 // maximum value in AchievementCriteriaDataType enum
-
 class Player;
 class Unit;
-
 struct AchievementCriteriaData
 {
     AchievementCriteriaDataType dataType;
@@ -160,23 +151,19 @@ struct AchievementCriteriaData
             uint32 value2;
         } raw;
     };
-
     AchievementCriteriaData() : dataType(ACHIEVEMENT_CRITERIA_DATA_TYPE_NONE)
     {
         raw.value1 = 0;
         raw.value2 = 0;
     }
-
     AchievementCriteriaData(uint32 _dataType, uint32 _value1, uint32 _value2) : dataType(AchievementCriteriaDataType(_dataType))
     {
         raw.value1 = _value1;
         raw.value2 = _value2;
     }
-
     bool IsValid(AchievementCriteriaEntry const* criteria);
     bool Meets(Player const* source, Unit const* target, uint32 miscvalue1 = 0) const;
 };
-
 struct AchievementCriteriaDataSet
 {
         typedef std::vector<AchievementCriteriaData> Storage;
@@ -186,9 +173,7 @@ struct AchievementCriteriaDataSet
         Storage storage;
 };
 
-
 typedef std::map<uint32,AchievementCriteriaDataSet> AchievementCriteriaDataMap;
-
 struct AchievementReward
 {
     uint32 titleId[2];
@@ -197,37 +182,29 @@ struct AchievementReward
     std::string subject;
     std::string text;
 };
-
 typedef std::map<uint32,AchievementReward> AchievementRewards;
-
 struct AchievementRewardLocale
 {
     std::vector<std::string> subject;
     std::vector<std::string> text;
 };
-
 typedef std::map<uint32,AchievementRewardLocale> AchievementRewardLocales;
 
-
 struct CompletedAchievementData
 {
     time_t date;
     bool changed;
 };
-
 typedef UNORDERED_MAP<uint32, CriteriaProgress> CriteriaProgressMap;
 typedef UNORDERED_MAP<uint32, CompletedAchievementData> CompletedAchievementMap;
-
 class Unit;
 class Player;
 class WorldPacket;
-
 class AchievementMgr
 {
     public:
         AchievementMgr(Player* pl);
         ~AchievementMgr();
-
         void Reset();
         static void DeleteFromDB(uint32 lowguid);
         void LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult);
@@ -239,7 +216,6 @@ class AchievementMgr
         void SendAllAchievementData();
         void SendRespondInspectAchievements(Player* player);
         Player* GetPlayer() { return m_player;}
-
     private:
         enum ProgressType { PROGRESS_SET, PROGRESS_ACCUMULATE, PROGRESS_HIGHEST };
         void SendAchievementEarned(AchievementEntry const* achievement);
@@ -250,12 +226,10 @@ class AchievementMgr
         bool IsCompletedAchievement(AchievementEntry const* entry);
         void CompleteAchievementsWithRefs(AchievementEntry const* entry);
         void BuildAllDataPacket(WorldPacket *data);
-
         Player* m_player;
         CriteriaProgressMap m_criteriaProgress;
         CompletedAchievementMap m_completedAchievements;
 };
-
 class AchievementGlobalMgr
 {
     public:
@@ -265,41 +239,34 @@ class AchievementGlobalMgr
             AchievementCriteriaListByAchievement::const_iterator itr = m_AchievementCriteriaListByAchievement.find(id);
             return itr != m_AchievementCriteriaListByAchievement.end() ? &itr->second : NULL;
         }
-
         AchievementEntryList const* GetAchievementByReferencedId(uint32 id) const
         {
             AchievementListByReferencedId::const_iterator itr = m_AchievementListByReferencedId.find(id);
             return itr != m_AchievementListByReferencedId.end() ? &itr->second : NULL;
         }
-
         AchievementReward const* GetAchievementReward(AchievementEntry const* achievement) const
         {
             AchievementRewards::const_iterator iter = m_achievementRewards.find(achievement->ID);
             return iter!=m_achievementRewards.end() ? &iter->second : NULL;
         }
-
         AchievementRewardLocale const* GetAchievementRewardLocale(AchievementEntry const* achievement) const
         {
             AchievementRewardLocales::const_iterator iter = m_achievementRewardLocales.find(achievement->ID);
             return iter!=m_achievementRewardLocales.end() ? &iter->second : NULL;
         }
-
         AchievementCriteriaDataSet const* GetCriteriaDataSet(AchievementCriteriaEntry const *achievementCriteria)
         {
             AchievementCriteriaDataMap::const_iterator iter = m_criteriaDataMap.find(achievementCriteria->ID);
             return iter!=m_criteriaDataMap.end() ? &iter->second : NULL;
         }
-
         bool IsRealmCompleted(AchievementEntry const* achievement) const
         {
             return m_allCompletedAchievements.find(achievement->ID) != m_allCompletedAchievements.end();
         }
-
         void SetRealmCompleted(AchievementEntry const* achievement)
         {
             m_allCompletedAchievements.insert(achievement->ID);
         }
-
         void LoadAchievementCriteriaList();
         void LoadAchievementCriteriaData();
         void LoadAchievementReferenceList();
@@ -308,21 +275,16 @@ class AchievementGlobalMgr
         void LoadRewardLocales();
     private:
         AchievementCriteriaDataMap m_criteriaDataMap;
-
         // store achievement criterias by type to speed up lookup
         AchievementCriteriaEntryList m_AchievementCriteriasByType[ACHIEVEMENT_CRITERIA_TYPE_TOTAL];
         // store achievement criterias by achievement to speed up lookup
         AchievementCriteriaListByAchievement m_AchievementCriteriaListByAchievement;
         // store achievements by referenced achievement id to speed up lookup
         AchievementListByReferencedId m_AchievementListByReferencedId;
-
         typedef std::set<uint32> AllCompletedAchievements;
         AllCompletedAchievements m_allCompletedAchievements;
-
         AchievementRewards m_achievementRewards;
         AchievementRewardLocales m_achievementRewardLocales;
 };
-
 #define achievementmgr Trinity::Singleton<AchievementGlobalMgr>::Instance()
-
 #endif
diff --git a/src/game/AnimalRandomMovementGenerator.h b/src/game/AnimalRandomMovementGenerator.h
index 9c64edcaa44..4767eff91ad 100644
--- a/src/game/AnimalRandomMovementGenerator.h
+++ b/src/game/AnimalRandomMovementGenerator.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_ANIMAL_RANDOMMOVEMENTGENERATOR_H
 #define TRINITY_ANIMAL_RANDOMMOVEMENTGENERATOR_H
-
 /** AnimalRandomMovementGenerator follows the research on
  *  quantifying scale-dependant effects of animal movement
  *  with simple per-location models (R.H. Gardner, R.V. O'Neil,
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index 22d121c38c1..c00c22b7b48 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -15,13 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
-
 #include "ArenaTeam.h"
 #include "World.h"
-
 void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot)
 {
     int32 memberRating = int32(personal_rating) + mod;
@@ -30,7 +27,6 @@ void ArenaTeamMember::ModifyPersonalRating(Player* plr, int32 mod, uint32 slot)
         plr->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (slot*6) + 5, personal_rating);
     //sLog.outArena("Modify personal rating for player %s: personal rating %u, mod %d, rating %d", plr->GetName(), personal_rating, mod, rating);
 }
-
 ArenaTeam::ArenaTeam()
 {
     m_TeamId              = 0;
@@ -52,29 +48,22 @@ ArenaTeam::ArenaTeam()
     m_stats.wins_week     = 0;
     m_stats.wins_season   = 0;
 }
-
 ArenaTeam::~ArenaTeam()
 {
 }
-
 bool ArenaTeam::Create(uint64 captainGuid, uint32 type, std::string ArenaTeamName)
 {
     if(!objmgr.GetPlayer(captainGuid))                      // player not exist
         return false;
     if(objmgr.GetArenaTeamByName(ArenaTeamName))            // arena team with this name already exist
         return false;
-
     sLog.outDebug("GUILD: creating arena team %s to leader: %u", ArenaTeamName.c_str(), GUID_LOPART(captainGuid));
-
     m_CaptainGuid = captainGuid;
     m_Name = ArenaTeamName;
     m_Type = type;
-
     m_TeamId = objmgr.GenerateArenaTeamId();
-
     // ArenaTeamName already assigned to ArenaTeam::name, use it to encode string for DB
     CharacterDatabase.escape_string(ArenaTeamName);
-
     CharacterDatabase.BeginTransaction();
     // CharacterDatabase.PExecute("DELETE FROM arena_team WHERE arenateamid='%u'", m_TeamId); - MAX(arenateam)+1 not exist
     CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid='%u'", m_TeamId);
@@ -83,23 +72,18 @@ bool ArenaTeam::Create(uint64 captainGuid, uint32 type, std::string ArenaTeamNam
         m_TeamId, ArenaTeamName.c_str(), GUID_LOPART(m_CaptainGuid), m_Type, m_BackgroundColor, m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor);
     CharacterDatabase.PExecute("INSERT INTO arena_team_stats (arenateamid, rating, games, wins, played, wins2, rank) VALUES "
         "('%u', '%u', '%u', '%u', '%u', '%u', '%u')", m_TeamId, m_stats.rating, m_stats.games_week, m_stats.wins_week, m_stats.games_season, m_stats.wins_season, m_stats.rank);
-
     CharacterDatabase.CommitTransaction();
-
     AddMember(m_CaptainGuid);
     sLog.outArena("New ArenaTeam created [Id: %u] [Type: %u] [Captain GUID: %u]", GetId(), GetType(), GetCaptain());
     return true;
 }
-
 bool ArenaTeam::AddMember(const uint64& PlayerGuid)
 {
     std::string plName;
     uint8 plClass;
-
     // arena team is full (can't have more than type * 2 players!)
     if(GetMembersSize() >= GetType() * 2)
         return false;
-
     Player *pl = objmgr.GetPlayer(PlayerGuid);
     if(pl)
     {
@@ -108,7 +92,6 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
             sLog.outError("Arena::AddMember() : player already in this sized team");
             return false;
         }
-
         plClass = (uint8)pl->getClass();
         plName = pl->GetName();
     }
@@ -118,11 +101,9 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
         QueryResult *result = CharacterDatabase.PQuery("SELECT name, class FROM characters WHERE guid='%u'", GUID_LOPART(PlayerGuid));
         if(!result)
             return false;
-
         plName = (*result)[0].GetCppString();
         plClass = (*result)[1].GetUInt8();
         delete result;
-
         // check if player already in arenateam of that size
         if(Player::GetArenaTeamIdFromDB(PlayerGuid, GetType()) != 0)
         {
@@ -130,11 +111,9 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
             return false;
         }
     }
-
     // remove all player signs from another petitions
     // this will be prevent attempt joining player to many arenateams and corrupt arena team data integrity
     Player::RemovePetitionsAndSigns(PlayerGuid, GetType());
-
     ArenaTeamMember newmember;
     newmember.name              = plName;
     newmember.guid              = PlayerGuid;
@@ -155,15 +134,12 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
         newmember.personal_rating = 1500;
     }
     m_members.push_back(newmember);
-
     CharacterDatabase.PExecute("INSERT INTO arena_team_member (arenateamid, guid, personal_rating) VALUES ('%u', '%u', '%u')", m_TeamId, GUID_LOPART(newmember.guid), newmember.personal_rating );
-
     if(pl)
     {
         pl->SetInArenaTeam(m_TeamId, GetSlot());
         pl->SetArenaTeamIdInvited(0);
         pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot()*6) + 5, newmember.personal_rating );
-
         // hide promote/remove buttons
         if(m_CaptainGuid != PlayerGuid)
             pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * 6) + 1, 1);
@@ -171,16 +147,12 @@ bool ArenaTeam::AddMember(const uint64& PlayerGuid)
     }
     return true;
 }
-
 bool ArenaTeam::LoadArenaTeamFromDB(uint32 ArenaTeamId)
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT arenateamid,name,captainguid,type,BackgroundColor,EmblemStyle,EmblemColor,BorderStyle,BorderColor FROM arena_team WHERE arenateamid = '%u'", ArenaTeamId);
-
     if(!result)
         return false;
-
     Field *fields = result->Fetch();
-
     m_TeamId = fields[0].GetUInt32();
     m_Name = fields[1].GetCppString();
     m_CaptainGuid  = MAKE_NEW_GUID(fields[2].GetUInt32(), 0, HIGHGUID_PLAYER);
@@ -190,13 +162,10 @@ bool ArenaTeam::LoadArenaTeamFromDB(uint32 ArenaTeamId)
     m_EmblemColor = fields[6].GetUInt32();
     m_BorderStyle = fields[7].GetUInt32();
     m_BorderColor = fields[8].GetUInt32();
-
     delete result;
-
     // only load here, so additional checks can be made
     LoadStatsFromDB(ArenaTeamId);
     LoadMembersFromDB(ArenaTeamId);
-
     if(Empty())
     {
         // arena team is empty, delete from db
@@ -207,30 +176,23 @@ bool ArenaTeam::LoadArenaTeamFromDB(uint32 ArenaTeamId)
         CharacterDatabase.CommitTransaction();
         return false;
     }
-
     return true;
 }
-
 void ArenaTeam::LoadStatsFromDB(uint32 ArenaTeamId)
 {
     //                                                     0      1     2    3      4     5
     QueryResult *result = CharacterDatabase.PQuery("SELECT rating,games,wins,played,wins2,rank FROM arena_team_stats WHERE arenateamid = '%u'", ArenaTeamId);
-
     if(!result)
         return;
-
     Field *fields = result->Fetch();
-
     m_stats.rating        = fields[0].GetUInt32();
     m_stats.games_week    = fields[1].GetUInt32();
     m_stats.wins_week     = fields[2].GetUInt32();
     m_stats.games_season  = fields[3].GetUInt32();
     m_stats.wins_season   = fields[4].GetUInt32();
     m_stats.rank          = fields[5].GetUInt32();
-
     delete result;
 }
-
 void ArenaTeam::LoadMembersFromDB(uint32 ArenaTeamId)
 {
     //                                                           0                1           2         3             4        5        6    7
@@ -240,7 +202,6 @@ void ArenaTeam::LoadMembersFromDB(uint32 ArenaTeamId)
                                                    "WHERE member.arenateamid = '%u'", ArenaTeamId);
     if(!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
@@ -257,20 +218,16 @@ void ArenaTeam::LoadMembersFromDB(uint32 ArenaTeamId)
     }while( result->NextRow() );
     delete result;
 }
-
 void ArenaTeam::SetCaptain(const uint64& guid)
 {
     // disable remove/promote buttons
     Player *oldcaptain = objmgr.GetPlayer(GetCaptain());
     if(oldcaptain)
         oldcaptain->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 + (GetSlot() * 6), 1);
-
     // set new captain
     m_CaptainGuid = guid;
-
     // update database
     CharacterDatabase.PExecute("UPDATE arena_team SET captainguid = '%u' WHERE arenateamid = '%u'", GUID_LOPART(guid), m_TeamId);
-
     // enable remove/promote buttons
     Player *newcaptain = objmgr.GetPlayer(guid);
     if(newcaptain)
@@ -279,7 +236,6 @@ void ArenaTeam::SetCaptain(const uint64& guid)
         sLog.outArena("Player: %s [GUID: %u] promoted player: %s [GUID: %u] to leader of arena team [Id: %u] [Type: %u].", oldcaptain->GetName(), oldcaptain->GetGUIDLow(), newcaptain->GetName(), newcaptain->GetGUID(), GetId(), GetType());
     }
 }
-
 void ArenaTeam::DelMember(uint64 guid)
 {
     for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -290,9 +246,7 @@ void ArenaTeam::DelMember(uint64 guid)
             break;
         }
     }
-
     Player *player = objmgr.GetPlayer(guid);
-
     if(player)
     {
         player->SetInArenaTeam(0, GetSlot());
@@ -306,23 +260,19 @@ void ArenaTeam::DelMember(uint64 guid)
     }
     CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid = '%u' AND guid = '%u'", GetId(), GUID_LOPART(guid));
 }
-
 void ArenaTeam::Disband(WorldSession *session)
 {
     // event
     WorldPacket data;
     session->BuildArenaTeamEventPacket(&data, ERR_ARENA_TEAM_DISBANDED_S, 2, session->GetPlayerName(), GetName(), "");
     BroadcastPacket(&data);
-
     while (!m_members.empty())
     {
         // Removing from members is done in DelMember.
         DelMember(m_members.front().guid);
     }
-
     if(Player *player = session->GetPlayer())
         sLog.outArena("Player: %s [GUID: %u] disbanded arena team type: %u [Id: %u].", player->GetName(), player->GetGUIDLow(), GetType(), GetId());
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM arena_team WHERE arenateamid = '%u'", m_TeamId);
     CharacterDatabase.PExecute("DELETE FROM arena_team_member WHERE arenateamid = '%u'", m_TeamId); //< this should be alredy done by calling DelMember(memberGuids[j]); for each member
@@ -330,23 +280,18 @@ void ArenaTeam::Disband(WorldSession *session)
     CharacterDatabase.CommitTransaction();
     objmgr.RemoveArenaTeam(m_TeamId);
 }
-
 void ArenaTeam::Roster(WorldSession *session)
 {
     Player *pl = NULL;
-
     uint8 unk308 = 0;
-
     WorldPacket data(SMSG_ARENA_TEAM_ROSTER, 100);
     data << uint32(GetId());                                // team id
     data << uint8(unk308);                                  // 308 unknown value but affect packet structure
     data << uint32(GetMembersSize());                       // members count
     data << uint32(GetType());                              // arena team type?
-
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
         pl = objmgr.GetPlayer(itr->guid);
-
         data << uint64(itr->guid);                          // guid
         data << uint8((pl ? 1 : 0));                        // online flag
         data << itr->name;                                  // member name
@@ -364,11 +309,9 @@ void ArenaTeam::Roster(WorldSession *session)
             data << float(0.0);                             // 308 unk
         }
     }
-
     session->SendPacket(&data);
     sLog.outDebug("WORLD: Sent SMSG_ARENA_TEAM_ROSTER");
 }
-
 void ArenaTeam::Query(WorldSession *session)
 {
     WorldPacket data(SMSG_ARENA_TEAM_QUERY_RESPONSE, 4*7+GetName().size()+1);
@@ -383,7 +326,6 @@ void ArenaTeam::Query(WorldSession *session)
     session->SendPacket(&data);
     sLog.outDebug("WORLD: Sent SMSG_ARENA_TEAM_QUERY_RESPONSE");
 }
-
 void ArenaTeam::Stats(WorldSession *session)
 {
     WorldPacket data(SMSG_ARENA_TEAM_STATS, 4*7);
@@ -396,7 +338,6 @@ void ArenaTeam::Stats(WorldSession *session)
     data << uint32(m_stats.rank);                           // rank
     session->SendPacket(&data);
 }
-
 void ArenaTeam::NotifyStatsChanged()
 {
     // this is called after a rated match ended
@@ -408,13 +349,11 @@ void ArenaTeam::NotifyStatsChanged()
             Stats(plr->GetSession());
     }
 }
-
 void ArenaTeam::InspectStats(WorldSession *session, uint64 guid)
 {
     ArenaTeamMember* member = GetMember(guid);
     if(!member)
         return;
-
     WorldPacket data(MSG_INSPECT_ARENA_TEAMS, 8+1+4*6);
     data << uint64(guid);                                   // player guid
     data << uint8(GetSlot());                               // slot (0...2)
@@ -426,7 +365,6 @@ void ArenaTeam::InspectStats(WorldSession *session, uint64 guid)
     data << uint32(member->personal_rating);                // personal rating
     session->SendPacket(&data);
 }
-
 void ArenaTeam::SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor)
 {
     m_BackgroundColor = backgroundColor;
@@ -434,10 +372,8 @@ void ArenaTeam::SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emb
     m_EmblemColor = emblemColor;
     m_BorderStyle = borderStyle;
     m_BorderColor = borderColor;
-
     CharacterDatabase.PExecute("UPDATE arena_team SET BackgroundColor='%u', EmblemStyle='%u', EmblemColor='%u', BorderStyle='%u', BorderColor='%u' WHERE arenateamid='%u'", m_BackgroundColor, m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_TeamId);
 }
-
 void ArenaTeam::SetStats(uint32 stat_type, uint32 value)
 {
     switch(stat_type)
@@ -471,7 +407,6 @@ void ArenaTeam::SetStats(uint32 stat_type, uint32 value)
             break;
     }
 }
-
 void ArenaTeam::BroadcastPacket(WorldPacket *packet)
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -481,7 +416,6 @@ void ArenaTeam::BroadcastPacket(WorldPacket *packet)
             player->GetSession()->SendPacket(packet);
     }
 }
-
 uint8 ArenaTeam::GetSlotByType( uint32 type )
 {
     switch(type)
@@ -495,56 +429,45 @@ uint8 ArenaTeam::GetSlotByType( uint32 type )
     sLog.outError("FATAL: Unknown arena team type %u for some arena team", type);
     return 0xFF;
 }
-
 bool ArenaTeam::HaveMember( const uint64& guid ) const
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
         if(itr->guid == guid)
             return true;
-
     return false;
 }
-
 uint32 ArenaTeam::GetPoints(uint32 MemberRating)
 {
     // returns how many points would be awarded with this team type with this rating
     float points;
-
     uint32 rating = MemberRating + 150 < m_stats.rating ? MemberRating : m_stats.rating;
-
     if(rating<=1500)
         // points = (float)1500 * 0.22f + 14.0f;
         points = 344.0f; // 3.1 change - teams with rating below 1500 get arena points for 1500 rating
     else
         points = 1511.26f / (1.0f + 1639.28f * exp(-0.00412f * (float)rating));
-
     // type penalties for <5v5 teams
     if(m_Type == ARENA_TEAM_2v2)
         points *= 0.76f;
     else if(m_Type == ARENA_TEAM_3v3)
         points *= 0.88f;
-
     return (uint32) points;
 }
-
 float ArenaTeam::GetChanceAgainst(uint32 own_rating, uint32 enemy_rating)
 {
     // returns the chance to win against a team with the given rating, used in the rating adjustment calculation
     // ELO system
-
     if (sWorld.getConfig(CONFIG_ARENA_SEASON_ID) >= 6)
         if (enemy_rating < 1300)
             enemy_rating = 1300;
     return 1.0f/(1.0f+exp(log(10.0f)*(float)((float)enemy_rating - (float)own_rating)/400.0f));
 }
-
 void ArenaTeam::FinishGame(int32 mod)
 {
     if (int32(m_stats.rating) + mod < 0)
         m_stats.rating = 0;
     else
         m_stats.rating += mod;
-
     m_stats.games_week += 1;
     m_stats.games_season += 1;
     // update team's rank
@@ -556,7 +479,6 @@ void ArenaTeam::FinishGame(int32 mod)
             ++m_stats.rank;
     }
 }
-
 int32 ArenaTeam::WonAgainst(uint32 againstRating)
 {
     // called when the team has won
@@ -568,11 +490,9 @@ int32 ArenaTeam::WonAgainst(uint32 againstRating)
     FinishGame(mod);
     m_stats.wins_week += 1;
     m_stats.wins_season += 1;
-
     // return the rating change, used to display it on the results screen
     return mod;
 }
-
 int32 ArenaTeam::LostAgainst(uint32 againstRating)
 {
     // called when the team has lost
@@ -582,11 +502,9 @@ int32 ArenaTeam::LostAgainst(uint32 againstRating)
     int32 mod = (int32)ceil(32.0f * (0.0f - chance));
     // modify the team stats accordingly
     FinishGame(mod);
-
     // return the rating change, used to display it on the results screen
     return mod;
 }
-
 void ArenaTeam::MemberLost(Player * plr, uint32 againstRating)
 {
     // called for each participant of a match after losing
@@ -608,7 +526,6 @@ void ArenaTeam::MemberLost(Player * plr, uint32 againstRating)
         }
     }
 }
-
 void ArenaTeam::OfflineMemberLost(uint64 guid, uint32 againstRating)
 {
     // called for offline player after ending rated arena match!
@@ -630,7 +547,6 @@ void ArenaTeam::OfflineMemberLost(uint64 guid, uint32 againstRating)
         }
     }
 }
-
 void ArenaTeam::MemberWon(Player * plr, uint32 againstRating)
 {
     // called for each participant after winning a match
@@ -654,7 +570,6 @@ void ArenaTeam::MemberWon(Player * plr, uint32 againstRating)
         }
     }
 }
-
 void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints)
 {
     // called after a match has ended and the stats are already modified
@@ -671,7 +586,6 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints)
         if (itr->games_week >= min_plays)
             points_to_add = GetPoints(itr->personal_rating);
         // OBSOLETE : CharacterDatabase.PExecute("UPDATE arena_team_member SET points_to_add = '%u' WHERE arenateamid = '%u' AND guid = '%u'", points_to_add, m_TeamId, itr->guid);
-
         std::map<uint32, uint32>::iterator plr_itr = PlayerPoints.find(GUID_LOPART(itr->guid));
         if (plr_itr != PlayerPoints.end())
         {
@@ -683,7 +597,6 @@ void ArenaTeam::UpdateArenaPointsHelper(std::map<uint32, uint32>& PlayerPoints)
             PlayerPoints[GUID_LOPART(itr->guid)] = points_to_add;
     }
 }
-
 void ArenaTeam::SaveToDB()
 {
     // save team and member stats to db
@@ -696,7 +609,6 @@ void ArenaTeam::SaveToDB()
     }
     CharacterDatabase.CommitTransaction();
 }
-
 void ArenaTeam::FinishWeek()
 {
     m_stats.games_week = 0;                                   // played this week
@@ -707,7 +619,6 @@ void ArenaTeam::FinishWeek()
         itr->wins_week = 0;
     }
 }
-
 bool ArenaTeam::IsFighting() const
 {
     for (MemberList::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -720,7 +631,6 @@ bool ArenaTeam::IsFighting() const
     }
     return false;
 }
-
 /*
 arenateam fields (id from 2.3.3 client):
 1414 - arena team id 2v2
diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h
index dbeac2f09f0..fe7a4d04ea5 100644
--- a/src/game/ArenaTeam.h
+++ b/src/game/ArenaTeam.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_ARENATEAM_H
 #define TRINITYCORE_ARENATEAM_H
-
 enum ArenaTeamCommandTypes
 {
     ERR_ARENA_TEAM_CREATE_S                 = 0x00,
@@ -29,7 +27,6 @@ enum ArenaTeamCommandTypes
     ERR_ARENA_TEAM_QUIT_S                   = 0x03,
     ERR_ARENA_TEAM_FOUNDER_S                = 0x0C          // need check, probably wrong...
 };
-
 enum ArenaTeamCommandErrors
 {
     //ARENA_TEAM_PLAYER_NO_MORE_IN_ARENA_TEAM = 0x00,
@@ -49,7 +46,6 @@ enum ArenaTeamCommandErrors
     ERR_ARENA_TEAM_PLAYER_TO_LOW            = 0x15,
     ERR_ARENA_TEAM_FULL                     = 0x16
 };
-
 enum ArenaTeamEvents
 {
     ERR_ARENA_TEAM_JOIN_SS                  = 3,            // player name + arena team name
@@ -59,7 +55,6 @@ enum ArenaTeamEvents
     ERR_ARENA_TEAM_LEADER_CHANGED_SSS       = 7,            // old captain + new captain + arena team name
     ERR_ARENA_TEAM_DISBANDED_S              = 8             // captain name + arena team name
 };
-
 /*
 need info how to send these ones:
 ERR_ARENA_TEAM_YOU_JOIN_S - client show it automatically when accept invite
@@ -67,7 +62,6 @@ ERR_ARENA_TEAM_TARGET_TOO_LOW_S
 ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S
 ERR_ARENA_TEAM_LEVEL_TOO_LOW_I
 */
-
 enum ArenaTeamStatTypes
 {
     STAT_TYPE_RATING        = 0,
@@ -77,14 +71,12 @@ enum ArenaTeamStatTypes
     STAT_TYPE_WINS_SEASON   = 4,
     STAT_TYPE_RANK          = 5
 };
-
 enum ArenaTeamTypes
 {
     ARENA_TEAM_2v2      = 2,
     ARENA_TEAM_3v3      = 3,
     ARENA_TEAM_5v5      = 5
 };
-
 struct ArenaTeamMember
 {
     uint64 guid;
@@ -95,10 +87,8 @@ struct ArenaTeamMember
     uint32 games_season;
     uint32 wins_season;
     uint32 personal_rating;
-
     void ModifyPersonalRating(Player* plr, int32 mod, uint32 slot);
 };
-
 struct ArenaTeamStats
 {
     uint32 rating;
@@ -108,20 +98,15 @@ struct ArenaTeamStats
     uint32 wins_season;
     uint32 rank;
 };
-
 #define MAX_ARENA_SLOT 3                                    // 0..2 slots
-
 class ArenaTeam
 {
     public:
         ArenaTeam();
         ~ArenaTeam();
-
         bool Create(uint64 captainGuid, uint32 type, std::string ArenaTeamName);
         void Disband(WorldSession *session);
-
         typedef std::list<ArenaTeamMember> MemberList;
-
         uint32 GetId() const              { return m_TeamId; }
         uint32 GetType() const            { return m_Type; }
         uint8  GetSlot() const            { return GetSlotByType(GetType()); }
@@ -131,61 +116,46 @@ class ArenaTeam
         const ArenaTeamStats& GetStats() const { return m_stats; }
         void SetStats(uint32 stat_type, uint32 value);
         uint32 GetRating() const          { return m_stats.rating; }
-
         uint32 GetEmblemStyle() const     { return m_EmblemStyle; }
         uint32 GetEmblemColor() const     { return m_EmblemColor; }
         uint32 GetBorderStyle() const     { return m_BorderStyle; }
         uint32 GetBorderColor() const     { return m_BorderColor; }
         uint32 GetBackgroundColor() const { return m_BackgroundColor; }
-
         void SetCaptain(const uint64& guid);
         bool AddMember(const uint64& PlayerGuid);
-
         // Shouldn't be const uint64& ed, because than can reference guid from members on Disband
         // and this method removes given record from list. So invalid reference can happen.
         void DelMember(uint64 guid);
-
         void SetEmblem(uint32 backgroundColor, uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor);
-
         size_t GetMembersSize() const         { return m_members.size(); }
         bool   Empty() const                  { return m_members.empty(); }
         MemberList::iterator m_membersBegin() { return m_members.begin(); }
         MemberList::iterator m_membersEnd()   { return m_members.end(); }
         bool HaveMember(const uint64& guid) const;
-
         ArenaTeamMember* GetMember(const uint64& guid)
         {
             for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
                 if(itr->guid == guid)
                     return &(*itr);
-
             return NULL;
         }
-
         ArenaTeamMember* GetMember(const std::string& name)
         {
             for (MemberList::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
                 if(itr->name == name)
                     return &(*itr);
-
             return NULL;
         }
-
         bool IsFighting() const;
-
         bool LoadArenaTeamFromDB(uint32 ArenaTeamId);
         void LoadMembersFromDB(uint32 ArenaTeamId);
         void LoadStatsFromDB(uint32 ArenaTeamId);
-
         void SaveToDB();
-
         void BroadcastPacket(WorldPacket *packet);
-
         void Roster(WorldSession *session);
         void Query(WorldSession *session);
         void Stats(WorldSession *session);
         void InspectStats(WorldSession *session, uint64 guid);
-
         uint32 GetPoints(uint32 MemberRating);
         float GetChanceAgainst(uint32 own_rating, uint32 enemy_rating);
         int32 WonAgainst(uint32 againstRating);
@@ -193,27 +163,20 @@ class ArenaTeam
         int32 LostAgainst(uint32 againstRating);
         void MemberLost(Player * plr, uint32 againstRating);
         void OfflineMemberLost(uint64 guid, uint32 againstRating);
-
         void UpdateArenaPointsHelper(std::map<uint32, uint32> & PlayerPoints);
-
         void NotifyStatsChanged();
-
         void FinishWeek();
         void FinishGame(int32 mod);
-
     protected:
-
         uint32 m_TeamId;
         uint32 m_Type;
         std::string m_Name;
         uint64 m_CaptainGuid;
-
         uint32 m_BackgroundColor; // ARGB format
         uint32 m_EmblemStyle;     // icon id
         uint32 m_EmblemColor;     // ARGB format
         uint32 m_BorderStyle;     // border image id
         uint32 m_BorderColor;     // ARGB format
-
         MemberList m_members;
         ArenaTeamStats m_stats;
 };
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp
index c7ecf5b1d80..b5ecab3d424 100644
--- a/src/game/ArenaTeamHandler.cpp
+++ b/src/game/ArenaTeamHandler.cpp
@@ -17,26 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
-
 #include "ArenaTeam.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "SocialMgr.h"
-
 void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("MSG_INSPECT_ARENA_TEAMS");
-
     uint64 guid;
     recv_data >> guid;
     sLog.outDebug("Inspect Arena stats (GUID: %u TypeId: %u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)));
-
     if(Player *plr = objmgr.GetPlayer(guid))
     {
         for (uint8 i = 0; i < MAX_ARENA_SLOT; ++i)
@@ -49,160 +44,123 @@ void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)
         }
     }
 }
-
 void WorldSession::HandleArenaTeamQueryOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug( "WORLD: Received CMSG_ARENA_TEAM_QUERY" );
-
     uint32 ArenaTeamId;
     recv_data >> ArenaTeamId;
-
     ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!arenateam)                                          // arena team not found
         return;
-
     arenateam->Query(this);
     arenateam->Stats(this);
 }
-
 void WorldSession::HandleArenaTeamRosterOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug( "WORLD: Received CMSG_ARENA_TEAM_ROSTER" );
-
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
-
     ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!arenateam)
         return;
-
     arenateam->Roster(this);
 }
-
 void WorldSession::HandleArenaTeamInviteOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_INVITE");
-
     uint32 ArenaTeamId;                                     // arena team id
     std::string Invitedname;
-
     Player * player = NULL;
-
     recv_data >> ArenaTeamId >> Invitedname;
-
     if(!Invitedname.empty())
     {
         if(!normalizePlayerName(Invitedname))
             return;
-
         player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
     }
-
     if(!player)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", Invitedname, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S);
         return;
     }
-
     if(player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", player->GetName(), ERR_ARENA_TEAM_PLAYER_TO_LOW);
         return;
     }
-
     ArenaTeam *arenateam = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!arenateam)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PLAYER_NOT_IN_TEAM);
         return;
     }
-
     // OK result but not send invite
     if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
         return;
-
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", "", ERR_ARENA_TEAM_NOT_ALLIED);
         return;
     }
-
     if(player->GetArenaTeamId(arenateam->GetSlot()))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S);
         return;
     }
-
     if(player->GetArenaTeamIdInvited())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S);
         return;
     }
-
     if(arenateam->GetMembersSize() >= arenateam->GetType() * 2)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,arenateam->GetName(),"",ERR_ARENA_TEAM_FULL);
         return;
     }
-
     sLog.outDebug("Player %s Invited %s to Join his ArenaTeam", GetPlayer()->GetName(), Invitedname.c_str());
-
     player->SetArenaTeamIdInvited(arenateam->GetId());
-
     WorldPacket data(SMSG_ARENA_TEAM_INVITE, (8+10));
     data << GetPlayer()->GetName();
     data << arenateam->GetName();
     player->GetSession()->SendPacket(&data);
-
     sLog.outDebug("WORLD: Sent SMSG_ARENA_TEAM_INVITE");
 }
-
 void WorldSession::HandleArenaTeamAcceptOpcode(WorldPacket & /*recv_data*/)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_ACCEPT");                // empty opcode
-
     ArenaTeam *at = objmgr.GetArenaTeamById(_player->GetArenaTeamIdInvited());
     if(!at)
         return;
-
     if(_player->GetArenaTeamId(at->GetSlot()))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ALREADY_IN_ARENA_TEAM);   // already in arena team that size
         return;
     }
-
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && _player->GetTeam() != objmgr.GetPlayerTeamByGUID(at->GetCaptain()))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_NOT_ALLIED);// not let enemies sign petition
         return;
     }
-
     if(!at->AddMember(_player->GetGUID()))
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S,"","",ERR_ARENA_TEAM_INTERNAL);// arena team not found
         return;
     }
-
     // event
     WorldPacket data;
     BuildArenaTeamEventPacket(&data, ERR_ARENA_TEAM_JOIN_SS, 2, _player->GetName(), at->GetName(), "");
     at->BroadcastPacket(&data);
 }
-
 void WorldSession::HandleArenaTeamDeclineOpcode(WorldPacket & /*recv_data*/)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_DECLINE");               // empty opcode
-
     _player->SetArenaTeamIdInvited(0);                      // no more invited
 }
-
 void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_LEAVE");
-
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
-
     ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!at)
         return;
@@ -219,124 +177,94 @@ void WorldSession::HandleArenaTeamLeaveOpcode(WorldPacket & recv_data)
         delete at;
         return;
     }
-
     at->DelMember(_player->GetGUID());
-
     // event
     WorldPacket data;
     BuildArenaTeamEventPacket(&data, ERR_ARENA_TEAM_LEAVE_SS, 2, _player->GetName(), at->GetName(), "");
     at->BroadcastPacket(&data);
-
     //send you are no longer member of team
     SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, at->GetName(), "", 0);
 }
-
 void WorldSession::HandleArenaTeamDisbandOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_DISBAND");
-
     uint32 ArenaTeamId;                                     // arena team id
     recv_data >> ArenaTeamId;
-
     ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!at)
         return;
-
     if(at->GetCaptain() != _player->GetGUID())
         return;
-
     if (at->IsFighting())
         return;
-
     at->Disband(this);
     delete at;
 }
-
 void WorldSession::HandleArenaTeamRemoveOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_REMOVE");
-
     uint32 ArenaTeamId;
     std::string name;
-
     recv_data >> ArenaTeamId;
     recv_data >> name;
-
     ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!at)                                                 // arena team not found
         return;
-
     if(at->GetCaptain() != _player->GetGUID())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS);
         return;
     }
-
     if(!normalizePlayerName(name))
         return;
-
     ArenaTeamMember* member = at->GetMember(name);
     if(!member)                                             // member not found
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S);
         return;
     }
-
     if(at->GetCaptain() == member->guid)
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_QUIT_S, "", "", ERR_ARENA_TEAM_LEADER_LEAVE_S);
         return;
     }
-
     at->DelMember(member->guid);
-
     // event
     WorldPacket data;
     BuildArenaTeamEventPacket(&data, ERR_ARENA_TEAM_REMOVE_SSS, 3, name, at->GetName(), _player->GetName());
     at->BroadcastPacket(&data);
 }
-
 void WorldSession::HandleArenaTeamLeaderOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_ARENA_TEAM_LEADER");
-
     uint32 ArenaTeamId;
     std::string name;
-
     recv_data >> ArenaTeamId;
     recv_data >> name;
-
     ArenaTeam *at = objmgr.GetArenaTeamById(ArenaTeamId);
     if(!at)                                                 // arena team not found
         return;
-
     if(at->GetCaptain() != _player->GetGUID())
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", "", ERR_ARENA_TEAM_PERMISSIONS);
         return;
     }
-
     if(!normalizePlayerName(name))
         return;
-
     ArenaTeamMember* member = at->GetMember(name);
     if(!member)                                             // member not found
     {
         SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", name, ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S);
         return;
     }
-
     if(at->GetCaptain() == member->guid)                    // target player already captain
         return;
-
     at->SetCaptain(member->guid);
-
     // event
     WorldPacket data;
     BuildArenaTeamEventPacket(&data, ERR_ARENA_TEAM_LEADER_CHANGED_SSS, 3, _player->GetName(), name, at->GetName());
     at->BroadcastPacket(&data);
 }
-
 void WorldSession::SendArenaTeamCommandResult(uint32 team_action, const std::string& team, const std::string& player, uint32 error_id)
 {
     WorldPacket data(SMSG_ARENA_TEAM_COMMAND_RESULT, 4+team.length()+1+player.length()+1+4);
@@ -346,7 +274,6 @@ void WorldSession::SendArenaTeamCommandResult(uint32 team_action, const std::str
     data << error_id;
     SendPacket(&data);
 }
-
 void WorldSession::BuildArenaTeamEventPacket(WorldPacket *data, uint8 eventid, uint8 str_count, const std::string& str1, const std::string& str2, const std::string& str3)
 {
     data->Initialize(SMSG_ARENA_TEAM_EVENT, 1+1+1);
@@ -371,7 +298,6 @@ void WorldSession::BuildArenaTeamEventPacket(WorldPacket *data, uint8 eventid, u
             return;
     }
 }
-
 void WorldSession::SendNotInArenaTeamPacket(uint8 type)
 {
     WorldPacket data(SMSG_ARENA_ERROR, 4+1);                // 886 - You are not in a %uv%u arena team
@@ -381,15 +307,12 @@ void WorldSession::SendNotInArenaTeamPacket(uint8 type)
         data << uint8(type);                                // team type (2=2v2,3=3v3,5=5v5), can be used for custom types...
     SendPacket(&data);
 }
-
 /*
 +ERR_ARENA_NO_TEAM_II "You are not in a %dv%d arena team"
-
 +ERR_ARENA_TEAM_CREATE_S "%s created.  To disband, use /teamdisband [2v2, 3v3, 5v5]."
 +ERR_ARENA_TEAM_INVITE_SS "You have invited %s to join %s"
 +ERR_ARENA_TEAM_QUIT_S "You are no longer a member of %s"
 ERR_ARENA_TEAM_FOUNDER_S "Congratulations, you are a founding member of %s!  To leave, use /teamquit [2v2, 3v3, 5v5]."
-
 +ERR_ARENA_TEAM_INTERNAL "Internal arena team error"
 +ERR_ALREADY_IN_ARENA_TEAM "You are already in an arena team of that size"
 +ERR_ALREADY_IN_ARENA_TEAM_S "%s is already in an arena team of that size"
@@ -403,23 +326,15 @@ ERR_ARENA_TEAM_FOUNDER_S "Congratulations, you are a founding member of %s!  To
 +ERR_ARENA_TEAM_PLAYER_NOT_IN_TEAM_SS "%s is not in %s"
 +ERR_ARENA_TEAM_PLAYER_NOT_FOUND_S "\"%s\" not found"
 +ERR_ARENA_TEAM_NOT_ALLIED "You cannot invite players from the opposing alliance"
-
 +ERR_ARENA_TEAM_JOIN_SS "%s has joined %s"
 +ERR_ARENA_TEAM_YOU_JOIN_S "You have joined %s.  To leave, use /teamquit [2v2, 3v3, 5v5]."
-
 +ERR_ARENA_TEAM_LEAVE_SS "%s has left %s"
-
 +ERR_ARENA_TEAM_LEADER_IS_SS "%s is the captain of %s"
 +ERR_ARENA_TEAM_LEADER_CHANGED_SSS "%s has made %s the new captain of %s"
-
 +ERR_ARENA_TEAM_REMOVE_SSS "%s has been kicked out of %s by %s"
-
 +ERR_ARENA_TEAM_DISBANDED_S "%s has disbanded %s"
-
 ERR_ARENA_TEAM_TARGET_TOO_LOW_S "%s is not high enough level to join your team"
-
 ERR_ARENA_TEAM_TOO_MANY_MEMBERS_S "%s is full"
-
 ERR_ARENA_TEAM_LEVEL_TOO_LOW_I "You must be level %d to form an arena team"
 */
 
diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp
index cef09af8252..4722aace318 100644
--- a/src/game/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot.cpp
@@ -2,10 +2,8 @@
 #include "AuctionHouseMgr.h"
 #include "AuctionHouseBot.h"
 #include <vector>
-
 #include "Policies/SingletonImp.h"
 INSTANTIATE_SINGLETON_1(AuctionHouseBot);
-
 using namespace std;
 vector<uint32> npcItems;
 vector<uint32> lootItems;
@@ -29,22 +27,18 @@ AuctionHouseBot::AuctionHouseBot()
     debug_Out_Filters = false;
     AHBSeller = false;
     AHBBuyer = false;
-
     //Begin Filters
-
     Vendor_Items = false;
     Loot_Items = false;
     Other_Items = false;
     Vendor_TGs = false;
     Loot_TGs = false;
     Other_TGs = false;
-
     No_Bind = false;
     Bind_When_Picked_Up = false;
     Bind_When_Equipped = false;
     Bind_When_Use = false;
     Bind_Quest_Item = false;
-
     DisableBeta_PTR_Unused = false;
     DisablePermEnchant = false;
 #if CLIENT_VER > 300
@@ -57,7 +51,6 @@ AuctionHouseBot::AuctionHouseBot()
     DisableKeys = false;
     DisableDuration = false;
     DisableBOP_Or_Quest_NoReqLevel = false;
-
     DisableWarriorItems = false;
     DisablePaladinItems = false;
     DisableHunterItems = false;
@@ -69,7 +62,6 @@ AuctionHouseBot::AuctionHouseBot()
     DisableWarlockItems = false;
     DisableUnusedClassItems = false;
     DisableDruidItems = false;
-
     DisableItemsBelowLevel = 0;
     DisableItemsAboveLevel = 0;
     DisableTGsBelowLevel = 0;
@@ -86,22 +78,17 @@ AuctionHouseBot::AuctionHouseBot()
     DisableItemsAboveReqSkillRank = 0;
     DisableTGsBelowReqSkillRank = 0;
     DisableTGsAboveReqSkillRank = 0;
-
     //End Filters
-
     _lastrun_a = time(NULL);
     _lastrun_h = time(NULL);
     _lastrun_n = time(NULL);
-
     AllianceConfig = AHBConfig(2);
     HordeConfig = AHBConfig(6);
     NeutralConfig = AHBConfig(7);
 }
-
 AuctionHouseBot::~AuctionHouseBot()
 {
 }
-
 void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
 {
     if (!AHBSeller)
@@ -109,16 +96,13 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
         if (debug_Out) sLog.outError("AHSeller: Disabled");
         return;
     }
-
     uint32 minItems = config->GetMinItems();
     uint32 maxItems = config->GetMaxItems();
-
     if (maxItems == 0)
     {
         //if (debug_Out) sLog.outString("AHSeller: Auctions disabled");
         return;
     }
-
     AuctionHouseEntry const* ahEntry = auctionmgr.GetAuctionHouseEntry(config->GetAHFID());
     if (!ahEntry)
     {
@@ -129,31 +113,24 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
     {
         return;
     }
-
     uint32 auctions = auctionHouse->Getcount();
-
     if (auctions >= minItems)
     {
         //if (debug_Out) sLog.outString("AHSeller: Auctions above minimum");
         return;
     }
-
     if (auctions >= maxItems)
     {
         //if (debug_Out) sLog.outString("AHSeller: Auctions at or above maximum");
         return;
     }
-
     uint32 items = 0;
     if ((maxItems - auctions) >= ItemsPerCycle)
         items = ItemsPerCycle;
     else
         items = (maxItems - auctions);
-
     if (debug_Out) sLog.outString("AHSeller: Adding %u Auctions", items);
-
     uint32 AuctioneerGUID = 0;
-
     switch (config->GetAHID())
     {
     case 2:
@@ -170,9 +147,7 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
         AuctioneerGUID = 23442; //default to neutral 7
         break;
     }
-
     if (debug_Out) sLog.outString("AHSeller: Current Auctineer GUID is %u", AuctioneerGUID);
-
     uint32 greyTGcount = config->GetPercents(AHB_GREY_TG);
     uint32 whiteTGcount = config->GetPercents(AHB_WHITE_TG);
     uint32 greenTGcount = config->GetPercents(AHB_GREEN_TG);
@@ -191,7 +166,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
         + purpleTGcount + orangeTGcount + yellowTGcount
         + whiteIcount + greenIcount + blueIcount + purpleIcount
         + orangeIcount + yellowIcount;
-
     uint32 greyTGoods = config->GetItemCounts(AHB_GREY_TG);
     uint32 whiteTGoods = config->GetItemCounts(AHB_WHITE_TG);
     uint32 greenTGoods = config->GetItemCounts(AHB_GREEN_TG);
@@ -199,7 +173,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
     uint32 purpleTGoods = config->GetItemCounts(AHB_PURPLE_TG);
     uint32 orangeTGoods = config->GetItemCounts(AHB_ORANGE_TG);
     uint32 yellowTGoods = config->GetItemCounts(AHB_YELLOW_TG);
-
     uint32 greyItems = config->GetItemCounts(AHB_GREY_I);
     uint32 whiteItems = config->GetItemCounts(AHB_WHITE_I);
     uint32 greenItems = config->GetItemCounts(AHB_GREEN_I);
@@ -208,7 +181,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
     uint32 orangeItems = config->GetItemCounts(AHB_ORANGE_I);
     uint32 yellowItems = config->GetItemCounts(AHB_YELLOW_I);
     if (debug_Out) sLog.outString("AHSeller: %u items", items);
-
     // only insert a few at a time, so as not to peg the processor
     for (uint32 cnt = 1;cnt <= items;cnt++)
     {
@@ -327,20 +299,17 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
                     break;
                 }
             }
-
             if (itemID == 0)
             {
                 if (debug_Out) sLog.outError("AHSeller: Item::CreateItem() - ItemID is 0");
                 continue;
             }
-
             ItemPrototype const* prototype = objmgr.GetItemPrototype(itemID);
             if (prototype == NULL)
             {
                 if (debug_Out) sLog.outError("AHSeller: Huh?!?! prototype == NULL");
                 continue;
             }
-
             Item* item = Item::CreateItem(itemID, 1, AHBplayer);
             if (item == NULL)
             {
@@ -348,15 +317,12 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
                 break;
             }
             item->AddToUpdateQueueOf(AHBplayer);
-
             uint32 randomPropertyId = Item::GenerateItemRandomPropertyId(itemID);
             if (randomPropertyId != 0)
                 item->SetItemRandomProperties(randomPropertyId);
-
             uint64 buyoutPrice = 0;
             uint64 bidPrice = 0;
             uint32 stackCount = 1;
-
             switch (SellMethod)
             {
             case 0:
@@ -366,7 +332,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
                 buyoutPrice  = prototype->BuyPrice;
                 break;
             }
-
             if ((prototype->Quality >= 0) && (prototype->Quality <= AHB_MAX_QUALITY))
             {
                 if (config->GetMaxStack(prototype->Quality) > 1 && item->GetMaxStackCount() > 1)
@@ -387,7 +352,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
                 item->RemoveFromUpdateQueueOf(AHBplayer);
                 continue;
             }
-
             uint32 etime = urand(1,3);
             switch(etime)
             {
@@ -405,9 +369,7 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
                 break;
             }
             item->SetCount(stackCount);
-
             uint32 dep = auctionmgr.GetAuctionDeposit(ahEntry, etime, item);
-
             AuctionEntry* auctionEntry = new AuctionEntry;
             auctionEntry->Id = objmgr.GenerateAuctionID();
             auctionEntry->auctioneer = AuctioneerGUID;
@@ -426,7 +388,6 @@ void AuctionHouseBot::addNewAuctions(Player *AHBplayer, AHBConfig *config)
             auctionmgr.AddAItem(item);
             auctionHouse->AddAuction(auctionEntry);
             auctionEntry->SaveToDB();
-
             switch(itemColor)
             {
             case 0:
@@ -484,32 +445,26 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
         if (debug_Out) sLog.outError("AHBuyer: Disabled");
         return;
     }
-    
     QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE itemowner<>%u AND buyguid<>%u", AHBplayerGUID, AHBplayerGUID);
-
     if (!result)
     {
         delete result;
         return;
     }
-
     if (result->GetRowCount() == 0)
     {
         delete result;
         return;
     }
-
     // Fetches content of selected AH
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(config->GetAHFID());
     vector<uint32> possibleBids;
-
     do
     {
         uint32 tmpdata = result->Fetch()->GetUInt32();
         possibleBids.push_back(tmpdata);
     }while (result->NextRow());
     delete result;
-
     for (uint32 count = 1;count <= config->GetBidsPerInterval();++count)
     {
         // Do we have anything to bid? If not, stop here.
@@ -519,23 +474,18 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
             count = config->GetBidsPerInterval();
             continue;
         }
-
         // Choose random auction from possible auctions
         uint32 vectorPos = urand(0, possibleBids.size() - 1);
         vector<uint32>::iterator iter = possibleBids.begin();
         advance(iter, vectorPos);
-
         // from auctionhousehandler.cpp, creates auction pointer & player pointer
         AuctionEntry* auction = auctionHouse->GetAuction(*iter);
-
         // Erase the auction from the vector to prevent bidding on item in next iteration.
         possibleBids.erase(iter);
-
         if (!auction)
         {
             continue;
         }
-
         // get exact item information
         Item *pItem = auctionmgr.GetAItem(auction->item_guidlow);
         if (!pItem)
@@ -543,21 +493,17 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
             if (debug_Out) sLog.outError("AHBuyer: Item %u doesn't exist, perhaps bought already?", auction->item_guidlow);
             continue;
         }
-
         // get item prototype
         ItemPrototype const* prototype = objmgr.GetItemPrototype(auction->item_template);
-
         // check which price we have to use, startbid or if it is bidded already
         uint32 currentprice;
         if (auction->bid)
             currentprice = auction->bid;
         else
             currentprice = auction->startbid;
-
         // Prepare portion from maximum bid
         double bidrate = static_cast<double>(urand(1, 100)) / 100;
         long double bidMax = 0;
-
         // check that bid has acceptable value and take bid based on vendorprice, stacksize and quality
         switch (BuyMethod)
         {
@@ -592,7 +538,6 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
                 break;
             }
         }
-
         // check some special items, and do recalculating to their prices
         switch (prototype->Class)
         {
@@ -603,22 +548,18 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
         default:
             break;
         }
-
         if (bidMax == 0)
         {
             // quality check failed to get bidmax, let's get out of here
             continue;
         }
-
         // Calculate our bid
         long double bidvalue = currentprice + ((bidMax - currentprice) * bidrate);
         // Convert to uint32
         uint32 bidprice = static_cast<uint32>(bidvalue);
-
         // Check our bid is high enough to be valid. If not, correct it to minimum.
         if ((currentprice + auction->GetAuctionOutBid()) > bidprice)
             bidprice = currentprice + auction->GetAuctionOutBid();
-
         if (debug_Out)
         {
             sLog.outString("-------------------------------------------------");
@@ -648,11 +589,9 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
             sLog.outString("AHBuyer: Ammo Type: %u", prototype->AmmoType);
             sLog.outString("-------------------------------------------------");
         }
-
         // Check whether we do normal bid, or buyout
         if ((bidprice < auction->buyout) || (auction->buyout == 0))
         {
-
             if (auction->bidder > 0)
             {
                 if (auction->bidder == AHBplayer->GetGUIDLow())
@@ -666,10 +605,8 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
                     //pl->ModifyMoney(-int32(price));
                 }
            }
-
             auction->bidder = AHBplayer->GetGUIDLow();
             auction->bid = bidprice;
-
             // Saving auction into database
             CharacterDatabase.PExecute("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id);
         }
@@ -682,7 +619,6 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
             }
             auction->bidder = AHBplayer->GetGUIDLow();
             auction->bid = auction->buyout;
-
             // Send mails to buyer & seller
             auctionmgr.SendAuctionSalePendingMail(auction);
             auctionmgr.SendAuctionSuccessfulMail(auction);
@@ -694,18 +630,15 @@ void AuctionHouseBot::addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *con
         }
     }
 }
-
 void AuctionHouseBot::Update()
 {
     time_t _newrun = time(NULL);
     if ((!AHBSeller) && (!AHBBuyer))
         return;
-
     WorldSession _session(AHBplayerAccount, NULL, SEC_PLAYER, true, 0, LOCALE_enUS);
     Player _AHBplayer(&_session);
     _AHBplayer.MinimalLoadFromDB(NULL, AHBplayerGUID);
     ObjectAccessor::Instance().AddObject(&_AHBplayer);
-
     // Only for testing, this can likely be removed, once I know it's working as expected.
     /*
     AuctionHouseObject* auctionHouse1 = auctionmgr.GetAuctionsMap(55);
@@ -719,7 +652,6 @@ void AuctionHouseBot::Update()
         return;
     }
     */
-
     // Add New Bids
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
     {
@@ -731,7 +663,6 @@ void AuctionHouseBot::Update()
             addNewAuctionBuyerBotBid(&_AHBplayer, &AllianceConfig, &_session);
             _lastrun_a = _newrun;
         }
-
         addNewAuctions(&_AHBplayer, &HordeConfig);
         if (((_newrun - _lastrun_h) >= (HordeConfig.GetBiddingInterval() * MINUTE)) && (HordeConfig.GetBidsPerInterval() > 0))
         {
@@ -741,7 +672,6 @@ void AuctionHouseBot::Update()
             _lastrun_h = _newrun;
         }
     }
-
     addNewAuctions(&_AHBplayer, &NeutralConfig);
     if (((_newrun - _lastrun_n) >= (NeutralConfig.GetBiddingInterval() * MINUTE)) && (NeutralConfig.GetBidsPerInterval() > 0))
     {
@@ -752,37 +682,30 @@ void AuctionHouseBot::Update()
     }
     ObjectAccessor::Instance().RemoveObject(&_AHBplayer);
 }
-
 void AuctionHouseBot::Initialize()
 {
     debug_Out = sConfig.GetBoolDefault("AuctionHouseBot.DEBUG", false);
     debug_Out_Filters = sConfig.GetBoolDefault("AuctionHouseBot.DEBUG_FILTERS", false);
-
     AHBSeller = sConfig.GetBoolDefault("AuctionHouseBot.EnableSeller", false);
     AHBBuyer = sConfig.GetBoolDefault("AuctionHouseBot.EnableBuyer", false);
     SellMethod = sConfig.GetBoolDefault("AuctionHouseBot.UseBuyPriceForSeller", false);
     BuyMethod = sConfig.GetBoolDefault("AuctionHouseBot.UseBuyPriceForBuyer", false);
-
     AHBplayerAccount = sConfig.GetIntDefault("AuctionHouseBot.Account", 0);
     AHBplayerGUID = sConfig.GetIntDefault("AuctionHouseBot.GUID", 0);
     ItemsPerCycle = sConfig.GetIntDefault("AuctionHouseBot.ItemsPerCycle", 200);
 
-
     //Begin Filters
-
     Vendor_Items = sConfig.GetBoolDefault("AuctionHouseBot.VendorItems", false);
     Loot_Items = sConfig.GetBoolDefault("AuctionHouseBot.LootItems", true);
     Other_Items = sConfig.GetBoolDefault("AuctionHouseBot.OtherItems", false);
     Vendor_TGs = sConfig.GetBoolDefault("AuctionHouseBot.VendorTradeGoods", false);
     Loot_TGs = sConfig.GetBoolDefault("AuctionHouseBot.LootTradeGoods", true);
     Other_TGs = sConfig.GetBoolDefault("AuctionHouseBot.OtherTradeGoods", false);
-
     No_Bind = sConfig.GetBoolDefault("AuctionHouseBot.No_Bind", true);
     Bind_When_Picked_Up = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Picked_Up", false);
     Bind_When_Equipped = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Equipped", true);
     Bind_When_Use = sConfig.GetBoolDefault("AuctionHouseBot.Bind_When_Use", true);
     Bind_Quest_Item = sConfig.GetBoolDefault("AuctionHouseBot.Bind_Quest_Item", false);
-
     DisableBeta_PTR_Unused = sConfig.GetBoolDefault("AuctionHouseBot.DisableBeta_PTR_Unused", false);
     DisablePermEnchant = sConfig.GetBoolDefault("AuctionHouseBot.DisablePermEnchant", false);
 #if CLIENT_VER > 300
@@ -795,7 +718,6 @@ void AuctionHouseBot::Initialize()
     DisableKeys = sConfig.GetBoolDefault("AuctionHouseBot.DisableKeys", false);
     DisableDuration = sConfig.GetBoolDefault("AuctionHouseBot.DisableDuration", false);
     DisableBOP_Or_Quest_NoReqLevel = sConfig.GetBoolDefault("AuctionHouseBot.DisableBOP_Or_Quest_NoReqLevel", false);
-
     DisableWarriorItems = sConfig.GetBoolDefault("AuctionHouseBot.DisableWarriorItems", false);
     DisablePaladinItems = sConfig.GetBoolDefault("AuctionHouseBot.DisablePaladinItems", false);
     DisableHunterItems = sConfig.GetBoolDefault("AuctionHouseBot.DisableHunterItems", false);
@@ -807,7 +729,6 @@ void AuctionHouseBot::Initialize()
     DisableWarlockItems = sConfig.GetBoolDefault("AuctionHouseBot.DisableWarlockItems", false);
     DisableUnusedClassItems = sConfig.GetBoolDefault("AuctionHouseBot.DisableUnusedClassItems", false);
     DisableDruidItems = sConfig.GetBoolDefault("AuctionHouseBot.DisableDruidItems", false);
-
     DisableItemsBelowLevel = sConfig.GetIntDefault("AuctionHouseBot.DisableItemsBelowLevel", 0);
     DisableItemsAboveLevel = sConfig.GetIntDefault("AuctionHouseBot.DisableItemsAboveLevel", 0);
     DisableTGsBelowLevel = sConfig.GetIntDefault("AuctionHouseBot.DisableTGsBelowLevel", 0);
@@ -824,7 +745,6 @@ void AuctionHouseBot::Initialize()
     DisableItemsAboveReqSkillRank = sConfig.GetIntDefault("AuctionHouseBot.DisableItemsAboveReqSkillRank", 0);
     DisableTGsBelowReqSkillRank = sConfig.GetIntDefault("AuctionHouseBot.DisableTGsBelowReqSkillRank", 0);
     DisableTGsAboveReqSkillRank = sConfig.GetIntDefault("AuctionHouseBot.DisableTGsAboveReqSkillRank", 0);
-
     //End Filters
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
     {
@@ -832,7 +752,6 @@ void AuctionHouseBot::Initialize()
         LoadValues(&HordeConfig);
     }
     LoadValues(&NeutralConfig);
-
     if (AHBSeller)
     {
         QueryResult* results = (QueryResult*) NULL;
@@ -844,16 +763,13 @@ void AuctionHouseBot::Initialize()
             {
                 Field* fields = results->Fetch();
                 npcItems.push_back(fields[0].GetUInt32());
-
             } while (results->NextRow());
-
             delete results;
         }
         else
         {
             if (debug_Out) sLog.outString("AuctionHouseBot: \"%s\" failed", npcQuery);
         }
-
         char lootQuery[] = "SELECT item FROM creature_loot_template UNION "
             "SELECT item FROM disenchant_loot_template UNION "
             "SELECT item FROM fishing_loot_template UNION "
@@ -865,7 +781,6 @@ void AuctionHouseBot::Initialize()
             "SELECT item FROM pickpocketing_loot_template UNION "
             "SELECT item FROM prospecting_loot_template UNION "
             "SELECT item FROM skinning_loot_template";
-
         results = WorldDatabase.PQuery(lootQuery);
         if (results != NULL)
         {
@@ -873,23 +788,18 @@ void AuctionHouseBot::Initialize()
             {
                 Field* fields = results->Fetch();
                 lootItems.push_back(fields[0].GetUInt32());
-
             } while (results->NextRow());
-
             delete results;
         }
         else
         {
             if (debug_Out) sLog.outString("AuctionHouseBot: \"%s\" failed", lootQuery);
         }
-
         for (uint32 itemID = 0; itemID < sItemStorage.MaxEntry; itemID++)
         {
             ItemPrototype const* prototype = objmgr.GetItemPrototype(itemID);
-
             if (prototype == NULL)
                 continue;
-
             switch (prototype->Bonding)
             {
             case NO_BIND:
@@ -916,7 +826,6 @@ void AuctionHouseBot::Initialize()
                 continue;
                 break;
             }
-
             switch (SellMethod)
             {
             case 0:
@@ -928,71 +837,56 @@ void AuctionHouseBot::Initialize()
                     continue;
                 break;
             }
-
             if ((prototype->Quality < 0) || (prototype->Quality > 6))
                 continue;
-
             if ((Vendor_Items == 0) && !(prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isVendorItem = false;
-
                 for (unsigned int i = 0; (i < npcItems.size()) && (!isVendorItem); i++)
                 {
                     if (itemID == npcItems[i])
                         isVendorItem = true;
                 }
-
                 if (isVendorItem)
                     continue;
             }
-
             if ((Vendor_TGs == 0) && (prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isVendorTG = false;
-
                 for (unsigned int i = 0; (i < npcItems.size()) && (!isVendorTG); i++)
                 {
                     if (itemID == npcItems[i])
                         isVendorTG = true;
                 }
-
                 if (isVendorTG)
                     continue;
             }
-
             if ((Loot_Items == 0) && !(prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isLootItem = false;
-
                 for (unsigned int i = 0; (i < lootItems.size()) && (!isLootItem); i++)
                 {
                     if (itemID == lootItems[i])
                         isLootItem = true;
                 }
-
                 if (isLootItem)
                     continue;
             }
-
             if ((Loot_TGs == 0) && (prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isLootTG = false;
-
                 for (unsigned int i = 0; (i < lootItems.size()) && (!isLootTG); i++)
                 {
                     if (itemID == lootItems[i])
                         isLootTG = true;
                 }
-
                 if (isLootTG)
                     continue;
             }
-
             if ((Other_Items == 0) && !(prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isVendorItem = false;
                 bool isLootItem = false;
-
                 for (unsigned int i = 0; (i < npcItems.size()) && (!isVendorItem); i++)
                 {
                     if (itemID == npcItems[i])
@@ -1006,12 +900,10 @@ void AuctionHouseBot::Initialize()
                 if ((!isLootItem) && (!isVendorItem))
                     continue;
             }
-
             if ((Other_TGs == 0) && (prototype->Class == ITEM_CLASS_TRADE_GOODS))
             {
                 bool isVendorTG = false;
                 bool isLootTG = false;
-
                 for (unsigned int i = 0; (i < npcItems.size()) && (!isVendorTG); i++)
                 {
                     if (itemID == npcItems[i])
@@ -1025,7 +917,6 @@ void AuctionHouseBot::Initialize()
                 if ((!isLootTG) && (!isVendorTG))
                     continue;
             }
-
              //TODO:Make list of items and create a vector
             // Disable PTR/Beta/Unused items
             if ((DisableBeta_PTR_Unused) && ((prototype->ItemId == 21878) || (prototype->ItemId == 27774) || (prototype->ItemId == 27811) || (prototype->ItemId == 28117) || (prototype->ItemId == 28112)))
@@ -1033,14 +924,12 @@ void AuctionHouseBot::Initialize()
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (PTR/Beta/Unused Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable permanent enchants items
             if ((DisablePermEnchant) && (prototype->Class == ITEM_CLASS_PERMANENT))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Permanent Enchant Item)", prototype->ItemId);
                 continue;
             }
-
 #if CLIENT_VER > 300
             // Disable conjured items
             if ((DisableConjured) && (prototype->IsConjuredConsumable()))
@@ -1049,245 +938,210 @@ void AuctionHouseBot::Initialize()
                 continue;
             }
 #endif
-
             // Disable gems
             if ((DisableGems) && (prototype->Class == ITEM_CLASS_GEM))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Gem)", prototype->ItemId);
                 continue;
             }
-
             // Disable money
             if ((DisableMoney) && (prototype->Class == ITEM_CLASS_MONEY))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Money)", prototype->ItemId);
                 continue;
             }
-
             // Disable moneyloot
             if ((DisableMoneyLoot) && (prototype->MinMoneyLoot > 0))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (MoneyLoot)", prototype->ItemId);
                 continue;
             }
-
             // Disable lootable items
             if ((DisableLootable) && (prototype->Flags & 4))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Lootable Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable Keys
             if ((DisableKeys) && (prototype->Class == ITEM_CLASS_KEY))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Quest Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items with duration
             if ((DisableDuration) && (prototype->Duration > 0))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Has a Duration)", prototype->ItemId);
                 continue;
             }
-
             // Disable items which are BOP or Quest Items and have a required level lower than the item level
             if ((DisableBOP_Or_Quest_NoReqLevel) && ((prototype->Bonding == BIND_WHEN_PICKED_UP || prototype->Bonding == BIND_QUEST_ITEM) && (prototype->RequiredLevel < prototype->ItemLevel)))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (BOP or BQI and Required Level is less than Item Level)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Warrior
             if ((DisableWarriorItems) && (prototype->AllowableClass == 1))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Warrior Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Paladin
             if ((DisablePaladinItems) && (prototype->AllowableClass == 2))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Paladin Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Hunter
             if ((DisableHunterItems) && (prototype->AllowableClass == 4))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Hunter Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Rogue
             if ((DisableRogueItems) && (prototype->AllowableClass == 8))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Rogue Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Priest
             if ((DisablePriestItems) && (prototype->AllowableClass == 16))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Priest Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for DK
             if ((DisableDKItems) && (prototype->AllowableClass == 32))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (DK Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Shaman
             if ((DisableShamanItems) && (prototype->AllowableClass == 64))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Shaman Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Mage
             if ((DisableMageItems) && (prototype->AllowableClass == 128))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Mage Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Warlock
             if ((DisableWarlockItems) && (prototype->AllowableClass == 256))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Warlock Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Unused Class
             if ((DisableUnusedClassItems) && (prototype->AllowableClass == 512))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Unused Item)", prototype->ItemId);
                 continue;
             }
-
             // Disable items specifically for Druid
             if ((DisableDruidItems) && (prototype->AllowableClass == 1024))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Druid Item)", prototype->ItemId);
                 continue;
             }
-
              // Disable Items below level X
             if ((DisableItemsBelowLevel) && (prototype->Class != ITEM_CLASS_TRADE_GOODS) && (prototype->ItemLevel < DisableItemsBelowLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Item Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Items above level X
             if ((DisableItemsAboveLevel) && (prototype->Class != ITEM_CLASS_TRADE_GOODS) && (prototype->ItemLevel > DisableItemsAboveLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Item Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
            // Disable Trade Goods below level X
             if ((DisableTGsBelowLevel) && (prototype->Class == ITEM_CLASS_TRADE_GOODS) && (prototype->ItemLevel < DisableTGsBelowLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Trade Good %u disabled (Trade Good Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
            // Disable Trade Goods above level X
             if ((DisableTGsAboveLevel) && (prototype->Class == ITEM_CLASS_TRADE_GOODS) && (prototype->ItemLevel > DisableTGsAboveLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Trade Good %u disabled (Trade Good Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Items below GUID X
             if ((DisableItemsBelowGUID) && (prototype->Class != ITEM_CLASS_TRADE_GOODS) && (prototype->ItemId < DisableItemsBelowGUID))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Item Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Items above GUID X
             if ((DisableItemsAboveGUID) && (prototype->Class != ITEM_CLASS_TRADE_GOODS) && (prototype->ItemId > DisableItemsAboveGUID))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Item Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Trade Goods below GUID X
             if ((DisableTGsBelowGUID) && (prototype->Class == ITEM_CLASS_TRADE_GOODS) && (prototype->ItemId < DisableTGsBelowGUID))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Trade Good Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Trade Goods above GUID X
             if ((DisableTGsAboveGUID) && (prototype->Class == ITEM_CLASS_TRADE_GOODS) && (prototype->ItemId > DisableTGsAboveGUID))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (Trade Good Level = %u)", prototype->ItemId, prototype->ItemLevel);
                 continue;
             }
-
             // Disable Items for level lower than X
             if ((DisableItemsBelowReqLevel) && (prototype->RequiredLevel < DisableItemsBelowReqLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredLevel = %u)", prototype->ItemId, prototype->RequiredLevel);
                 continue;
             }
-
             // Disable Items for level higher than X
             if ((DisableItemsAboveReqLevel) && (prototype->RequiredLevel > DisableItemsAboveReqLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredLevel = %u)", prototype->ItemId, prototype->RequiredLevel);
                 continue;
             }
-
             // Disable Trade Goods for level lower than X
             if ((DisableTGsBelowReqLevel) && (prototype->RequiredLevel < DisableTGsBelowReqLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Trade Good %u disabled (RequiredLevel = %u)", prototype->ItemId, prototype->RequiredLevel);
                 continue;
             }
-
             // Disable Trade Goods for level higher than X
             if ((DisableTGsAboveReqLevel) && (prototype->RequiredLevel > DisableTGsAboveReqLevel))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Trade Good %u disabled (RequiredLevel = %u)", prototype->ItemId, prototype->RequiredLevel);
                 continue;
             }
-
             // Disable Items that require skill lower than X
             if ((DisableItemsBelowReqSkillRank) && (prototype->RequiredSkillRank < DisableItemsBelowReqSkillRank))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredSkillRank = %u)", prototype->ItemId, prototype->RequiredSkillRank);
                 continue;
             }
-
             // Disable Items that require skill higher than X
             if ((DisableItemsAboveReqSkillRank) && (prototype->RequiredSkillRank > DisableItemsAboveReqSkillRank))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredSkillRank = %u)", prototype->ItemId, prototype->RequiredSkillRank);
                 continue;
             }
-
             // Disable Trade Goods that require skill lower than X
             if ((DisableTGsBelowReqSkillRank) && (prototype->RequiredSkillRank < DisableTGsBelowReqSkillRank))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredSkillRank = %u)", prototype->ItemId, prototype->RequiredSkillRank);
                 continue;
             }
-
             // Disable Trade Goods that require skill higher than X
             if ((DisableTGsAboveReqSkillRank) && (prototype->RequiredSkillRank > DisableTGsAboveReqSkillRank))
             {
                 if (debug_Out_Filters) sLog.outString("AuctionHouseBot: Item %u disabled (RequiredSkillRank = %u)", prototype->ItemId, prototype->RequiredSkillRank);
                 continue;
             }
-
             switch (prototype->Quality)
             {
             case AHB_GREY:
@@ -1296,42 +1150,36 @@ void AuctionHouseBot::Initialize()
                 else
                     greyItemsBin.push_back(itemID);
                 break;
-
             case AHB_WHITE:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     whiteTradeGoodsBin.push_back(itemID);
                 else
                     whiteItemsBin.push_back(itemID);
                 break;
-
             case AHB_GREEN:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     greenTradeGoodsBin.push_back(itemID);
                 else
                     greenItemsBin.push_back(itemID);
                 break;
-
             case AHB_BLUE:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     blueTradeGoodsBin.push_back(itemID);
                 else
                     blueItemsBin.push_back(itemID);
                 break;
-
             case AHB_PURPLE:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     purpleTradeGoodsBin.push_back(itemID);
                 else
                     purpleItemsBin.push_back(itemID);
                 break;
-
             case AHB_ORANGE:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     orangeTradeGoodsBin.push_back(itemID);
                 else
                     orangeItemsBin.push_back(itemID);
                 break;
-
             case AHB_YELLOW:
                 if (prototype->Class == ITEM_CLASS_TRADE_GOODS)
                     yellowTradeGoodsBin.push_back(itemID);
@@ -1340,7 +1188,6 @@ void AuctionHouseBot::Initialize()
                 break;
             }
         }
-
         if ((greyTradeGoodsBin.size() == 0) &&
             (whiteTradeGoodsBin.size() == 0) &&
             (greenTradeGoodsBin.size() == 0) &&
@@ -1359,7 +1206,6 @@ void AuctionHouseBot::Initialize()
             sLog.outError("AuctionHouseBot: No items");
             AHBSeller = 0;
         }
-
         sLog.outString("AuctionHouseBot:");
         sLog.outString("loaded %u grey trade goods", greyTradeGoodsBin.size());
         sLog.outString("loaded %u white trade goods", whiteTradeGoodsBin.size());
@@ -1379,11 +1225,9 @@ void AuctionHouseBot::Initialize()
     sLog.outString("AuctionHouseBot by Paradox (original by ChrisK) has been loaded.");
     sLog.outString("AuctionHouseBot now includes AHBuyer by Kerbe and Paradox");
 }
-
 void AuctionHouseBot::IncrementItemCounts(AuctionEntry* ah)
 {
     // from auctionhousehandler.cpp, creates auction pointer & player pointer
-
     // get exact item information
     Item *pItem = auctionmgr.GetAItem(ah->item_guidlow);
     if (!pItem)
@@ -1391,12 +1235,9 @@ void AuctionHouseBot::IncrementItemCounts(AuctionEntry* ah)
         if (debug_Out) sLog.outError("AHBot: Item %u doesn't exist, perhaps bought already?", ah->item_guidlow);
         return;
     }
-
     // get item prototype
     ItemPrototype const* prototype = objmgr.GetItemPrototype(ah->item_template);
-
     AHBConfig *config;
-
     FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(ah->GetHouseFaction());
     if (!u_entry)
     {
@@ -1418,17 +1259,13 @@ void AuctionHouseBot::IncrementItemCounts(AuctionEntry* ah)
         if (debug_Out) sLog.outError("AHBot: %u returned as House Faction. Neutral", ah->GetHouseFaction());
         config = &NeutralConfig;
     }
-
     config->IncItemCounts(prototype->Class, prototype->Quality);
 }
-
 void AuctionHouseBot::DecrementItemCounts(AuctionEntry* ah, uint32 item_template)
 {
     // get item prototype
     ItemPrototype const* prototype = objmgr.GetItemPrototype(item_template);
-
     AHBConfig *config;
-
     FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(ah->GetHouseFaction());
     if (!u_entry)
     {
@@ -1450,10 +1287,8 @@ void AuctionHouseBot::DecrementItemCounts(AuctionEntry* ah, uint32 item_template
         if (debug_Out) sLog.outError("AHBot: %u returned as House Faction. Neutral", ah->GetHouseFaction());
         config = &NeutralConfig;
     }
-
     config->DecItemCounts(prototype->Class, prototype->Quality);
 }
-
 void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char* args)
 {
     AHBConfig *config;
@@ -1501,15 +1336,12 @@ void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char*
     case 0:     //ahexpire
         {
             AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(config->GetAHFID());
-
             AuctionHouseObject::AuctionEntryMap::iterator itr;
             itr = auctionHouse->GetAuctionsBegin();
-
             while (itr != auctionHouse->GetAuctionsEnd())
             {
                 if (itr->second->owner == AHBplayerGUID)
                     itr->second->expire_time = sWorld.GetGameTime();
-
                 ++itr;
             }
         }
@@ -1564,7 +1396,6 @@ void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char*
             uint32 purplei = (uint32) strtoul(param12, NULL, 0);
             uint32 orangei = (uint32) strtoul(param13, NULL, 0);
             uint32 yellowi = (uint32) strtoul(param14, NULL, 0);
-
             CharacterDatabase.BeginTransaction();
             CharacterDatabase.PExecute("UPDATE auctionhousebot SET percentgreytradegoods = '%u' WHERE auctionhouse = '%u'", greytg, ahMapID);
             CharacterDatabase.PExecute("UPDATE auctionhousebot SET percentwhitetradegoods = '%u' WHERE auctionhouse = '%u'", whitetg, ahMapID);
@@ -1652,7 +1483,6 @@ void AuctionHouseBot::Commands(uint32 command, uint32 ahMapID, uint32 col, char*
         break;
     }
 }
-
 void AuctionHouseBot::LoadValues(AHBConfig *config)
 {
     if (debug_Out) sLog.outString("Start Settings for %s Auctionhouses:", CharacterDatabase.PQuery("SELECT name FROM auctionhousebot WHERE auctionhouse = %u",config->GetAHID())->Fetch()->GetString());
@@ -1771,10 +1601,8 @@ void AuctionHouseBot::LoadValues(AHBConfig *config)
         }
         AuctionHouseEntry const* ahEntry = auctionmgr.GetAuctionHouseEntry(config->GetAHFID());
         AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(config->GetAHFID());
-
         config->ResetItemCounts();
         uint32 auctions = auctionHouse->Getcount();
-        
         if (auctions)
         {
             for (AuctionHouseObject::AuctionEntryMap::const_iterator itr = auctionHouse->GetAuctionsBegin();itr != auctionHouse->GetAuctionsEnd();++itr)
diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h
index d135af5c479..9e04dde87cf 100644
--- a/src/game/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot.h
@@ -1,10 +1,8 @@
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
-
 #include "World.h"
 #include "Config/ConfigEnv.h"
 #include "ItemPrototype.h"
-
 #define AHB_GREY        0
 #define AHB_WHITE       1
 #define AHB_GREEN       2
@@ -27,7 +25,6 @@
 #define AHB_PURPLE_I    11
 #define AHB_ORANGE_I    12
 #define AHB_YELLOW_I    13
-
 class AHBConfig
 {
 private:
@@ -84,7 +81,6 @@ private:
     uint32 minBidPriceYellow;
     uint32 maxBidPriceYellow;
     uint32 maxStackYellow;
-
     uint32 buyerPriceGrey;
     uint32 buyerPriceWhite;
     uint32 buyerPriceGreen;
@@ -94,7 +90,6 @@ private:
     uint32 buyerPriceYellow;
     uint32 buyerBiddingInterval;
     uint32 buyerBidsPerInterval;
-
     uint32 greytgp;
     uint32 whitetgp;
     uint32 greentgp;
@@ -109,7 +104,6 @@ private:
     uint32 purpleip;
     uint32 orangeip;
     uint32 yellowip;
-
     uint32 greyTGoods;
     uint32 whiteTGoods;
     uint32 greenTGoods;
@@ -117,7 +111,6 @@ private:
     uint32 purpleTGoods;
     uint32 orangeTGoods;
     uint32 yellowTGoods;
-
     uint32 greyItems;
     uint32 whiteItems;
     uint32 greenItems;
@@ -125,7 +118,6 @@ private:
     uint32 purpleItems;
     uint32 orangeItems;
     uint32 yellowItems;
-
 public:
     AHBConfig(uint32 ahid)
     {
@@ -182,7 +174,6 @@ public:
     void SetPercentages(uint32 greytg, uint32 whitetg, uint32 greentg, uint32 bluetg, uint32 purpletg, uint32 orangetg, uint32 yellowtg, uint32 greyi, uint32 whitei, uint32 greeni, uint32 bluei, uint32 purplei, uint32 orangei, uint32 yellowi)
     {
         uint32 totalPercent = greytg + whitetg + greentg + bluetg + purpletg + orangetg + yellowtg + greyi + whitei + greeni + bluei + purplei + orangei + yellowi;
-
         if (totalPercent == 0)
         {
             maxItems = 0;
@@ -892,7 +883,6 @@ public:
             break;
         }
     }
-
     void DecItemCounts(uint32 Class, uint32 Quality)
     {
         switch(Class)
@@ -905,7 +895,6 @@ public:
             break;
         }
     }
-
     void DecItemCounts(uint32 color)
     {
         switch(color)
@@ -956,7 +945,6 @@ public:
             break;
         }
     }
- 
     void IncItemCounts(uint32 Class, uint32 Quality)
     {
         switch(Class)
@@ -969,7 +957,6 @@ public:
             break;
         }
     }
-
     void IncItemCounts(uint32 color)
     {
         switch(color)
@@ -1020,7 +1007,6 @@ public:
             break;
         }
     }
-
     void ResetItemCounts()
     {
         greyTGoods = 0;
@@ -1030,7 +1016,6 @@ public:
         purpleTGoods = 0;
         orangeTGoods = 0;
         yellowTGoods = 0;
-
         greyItems = 0;
         whiteItems = 0;
         greenItems = 0;
@@ -1039,7 +1024,6 @@ public:
         orangeItems = 0;
         yellowItems = 0;
     }
-
     uint32 TotalItemCounts()
     {
         return(
@@ -1050,7 +1034,6 @@ public:
         purpleTGoods +
         orangeTGoods +
         yellowTGoods +
-
         greyItems +
         whiteItems +
         greenItems +
@@ -1059,7 +1042,6 @@ public:
         orangeItems +
         yellowItems);
     }
-
     uint32 GetItemCounts(uint32 color)
     {
         switch(color)
@@ -1126,34 +1108,27 @@ public:
 class AuctionHouseBot
 {
 private:
-
     bool debug_Out;
     bool debug_Out_Filters;
-
     bool AHBSeller;
     bool AHBBuyer;
     bool BuyMethod;
     bool SellMethod;
-
     uint32 AHBplayerAccount;
     uint32 AHBplayerGUID;
     uint32 ItemsPerCycle;
-
     //Begin Filters
-
     bool Vendor_Items;
     bool Loot_Items;
     bool Other_Items;
     bool Vendor_TGs;
     bool Loot_TGs;
     bool Other_TGs;
-
     bool No_Bind;
     bool Bind_When_Picked_Up;
     bool Bind_When_Equipped;
     bool Bind_When_Use;
     bool Bind_Quest_Item;
-
     bool DisableBeta_PTR_Unused;
     bool DisablePermEnchant;
 #if CLIENT_VER > 300
@@ -1166,7 +1141,6 @@ private:
     bool DisableKeys;
     bool DisableDuration;
     bool DisableBOP_Or_Quest_NoReqLevel;
-
     bool DisableWarriorItems;
     bool DisablePaladinItems;
     bool DisableHunterItems;
@@ -1178,7 +1152,6 @@ private:
     bool DisableWarlockItems;
     bool DisableUnusedClassItems;
     bool DisableDruidItems;
-
     uint32 DisableItemsBelowLevel;
     uint32 DisableItemsAboveLevel;
     uint32 DisableTGsBelowLevel;
@@ -1195,21 +1168,16 @@ private:
     uint32 DisableItemsAboveReqSkillRank;
     uint32 DisableTGsBelowReqSkillRank;
     uint32 DisableTGsAboveReqSkillRank;
-
     //End Filters
-
     AHBConfig AllianceConfig;
     AHBConfig HordeConfig;
     AHBConfig NeutralConfig;
-
     time_t _lastrun_a;
     time_t _lastrun_h;
     time_t _lastrun_n;
-
     inline uint32 minValue(uint32 a, uint32 b) { return a <= b ? a : b; };
     void addNewAuctions(Player *AHBplayer, AHBConfig *config);
     void addNewAuctionBuyerBotBid(Player *AHBplayer, AHBConfig *config, WorldSession *session);
-
 public:
     AuctionHouseBot();
     ~AuctionHouseBot();
@@ -1221,7 +1189,5 @@ public:
     void Commands(uint32, uint32, uint32, char*);
     uint32 GetAHBplayerGUID() { return AHBplayerGUID; };
 };
-
 #define auctionbot Trinity::Singleton<AuctionHouseBot>::Instance()
-
 #endif
diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp
index 52790526dd7..13df6c3a6a4 100644
--- a/src/game/AuctionHouseHandler.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-
 #include "AuctionHouseBot.h"
 #include "AuctionHouseMgr.h"
 #include "Log.h"
@@ -31,43 +29,35 @@
 #include "UpdateMask.h"
 #include "Util.h"
 
-
 //please DO NOT use iterator++, because it is slower than ++iterator!!!
 //post-incrementation is always slower than pre-incrementation !
-
 //void called when player click on auctioneer npc
 void WorldSession::HandleAuctionHelloOpcode(WorldPacket & recv_data)
 {
     uint64 guid;                                            //NPC guid
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER);
     if (!unit)
     {
         sLog.outDebug("WORLD: HandleAuctionHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     SendAuctionHello(guid, unit);
 }
-
 //this void causes that auction window is opened
 void WorldSession::SendAuctionHello(uint64 guid, Creature* unit)
 {
     AuctionHouseEntry const* ahEntry = AuctionHouseMgr::GetAuctionHouseEntry(unit->getFaction());
     if (!ahEntry)
         return;
-
     WorldPacket data(MSG_AUCTION_HELLO, 12);
     data << (uint64) guid;
     data << (uint32) ahEntry->houseId;
     SendPacket(&data);
 }
-
 //call this method when player bids, creates, or deletes auction
 void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError)
 {
@@ -79,7 +69,6 @@ void WorldSession::SendAuctionCommandResult(uint32 auctionId, uint32 Action, uin
         data << bidError;                                   //when bid, then send 0, once...
     SendPacket(&data);
 }
-
 //this function sends notification, if bidder is online
 void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auctionId, uint64 bidder, uint32 bidSum, uint32 diff, uint32 item_template)
 {
@@ -93,7 +82,6 @@ void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auction
     data << uint32(0);
     SendPacket(&data);
 }
-
 //this void causes on client to display: "Your auction sold"
 void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
 {
@@ -107,53 +95,42 @@ void WorldSession::SendAuctionOwnerNotification(AuctionEntry* auction)
     data << (uint32) 0;                                     //unk
     SendPacket(&data);
 }
-
 //this function sends mail to old bidder
 void WorldSession::SendAuctionOutbiddedMail(AuctionEntry *auction, uint32 newPrice)
 {
     uint64 oldBidder_guid = MAKE_NEW_GUID(auction->bidder,0, HIGHGUID_PLAYER);
     Player *oldBidder = objmgr.GetPlayer(oldBidder_guid);
-
     uint32 oldBidder_accId = 0;
     if (!oldBidder)
         oldBidder_accId = objmgr.GetPlayerAccountIdByGUID(oldBidder_guid);
-
     // old bidder exist
     if (oldBidder || oldBidder_accId)
     {
         std::ostringstream msgAuctionOutbiddedSubject;
         msgAuctionOutbiddedSubject << auction->item_template << ":0:" << AUCTION_OUTBIDDED;
-
         if (oldBidder && !_player)
             oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, auctionbot.GetAHBplayerGUID(), newPrice, auction->GetAuctionOutBid(), auction->item_template);
-
         if (oldBidder && _player)
             oldBidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, _player->GetGUID(), newPrice, auction->GetAuctionOutBid(), auction->item_template);
-
         WorldSession::SendMailTo(oldBidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), auction->bidder, msgAuctionOutbiddedSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 //this function sends mail, when auction is cancelled to old bidder
 void WorldSession::SendAuctionCancelledToBidderMail(AuctionEntry* auction)
 {
     uint64 bidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER);
     Player *bidder = objmgr.GetPlayer(bidder_guid);
-
     uint32 bidder_accId = 0;
     if (!bidder)
         bidder_accId = objmgr.GetPlayerAccountIdByGUID(bidder_guid);
-
     // bidder exist
     if (bidder || bidder_accId)
     {
         std::ostringstream msgAuctionCancelledSubject;
         msgAuctionCancelledSubject << auction->item_template << ":0:" << AUCTION_CANCELLED_TO_BIDDER;
-
         WorldSession::SendMailTo(bidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), auction->bidder, msgAuctionCancelledSubject.str(), 0, NULL, auction->bid, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 //this void creates new auction and adds auction to some auctionhouse
 void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
 {
@@ -162,31 +139,24 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
     recv_data >> auctioneer >> item;
     recv_data >> bid >> buyout >> etime;
     Player *pl = GetPlayer();
-
     if (!item || !bid || !etime)
         return;                                             //check for cheaters
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionSellItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)));
         return;
     }
-
     AuctionHouseEntry const* auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(pCreature->getFaction());
     if (!auctionHouseEntry)
     {
         sLog.outDebug("WORLD: HandleAuctionSellItem - Unit (GUID: %u) has wrong faction.", uint32(GUID_LOPART(auctioneer)));
         return;
     }
-
     sLog.outDebug("WORLD: HandleAuctionSellItem - ETIME: %u", etime);
-
     // client send time in minutes, convert to common used sec time
     etime *= MINUTE;
-
     sLog.outDebug("WORLD: HandleAuctionSellItem - ETIME: %u", etime);
-
     // client understand only 3 auction time
     switch(etime)
     {
@@ -197,11 +167,9 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         default:
             return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     Item *it = pl->GetItemByGuid(item);
     //do not allow to sell already auctioned items
     if (auctionmgr.GetAItem(GUID_LOPART(item)))
@@ -216,21 +184,17 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_ITEM_NOT_FOUND);
         return;
     }
-
     if (!it->CanBeTraded())
     {
         SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
         return;
     }
-
     if (it->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || it->GetUInt32Value(ITEM_FIELD_DURATION))
     {
         SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_INTERNAL_ERROR);
         return;
     }
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     //we have to take deposit :
     uint32 deposit = auctionmgr.GetAuctionDeposit(auctionHouseEntry, etime, it);
     if (pl->GetMoney() < deposit)
@@ -238,17 +202,13 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
         SendAuctionCommandResult(0, AUCTION_SELL_ITEM, AUCTION_NOT_ENOUGHT_MONEY);
         return;
     }
-
     if (GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
     {
         sLog.outCommand(GetAccountId(),"GM %s (Account: %u) create auction: %s (Entry: %u Count: %u)",
             GetPlayerName(),GetAccountId(),it->GetProto()->Name1,it->GetEntry(),it->GetCount());
     }
-
     pl->ModifyMoney(-int32(deposit));
-
     uint32 auction_time = uint32(etime * sWorld.getRate(RATE_AUCTION_TIME));
-
     AuctionEntry *AH = new AuctionEntry;
     AH->Id = objmgr.GenerateAuctionID();
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
@@ -265,23 +225,18 @@ void WorldSession::HandleAuctionSellItem(WorldPacket & recv_data)
     AH->expire_time = time(NULL) + auction_time;
     AH->deposit = deposit;
     AH->auctionHouseEntry = auctionHouseEntry;
-
     sLog.outDetail("selling item %u to auctioneer %u with initial bid %u with buyout %u and with time %u (in sec) in auctionhouse %u", GUID_LOPART(item), AH->auctioneer, bid, buyout, auction_time, AH->GetHouseId());
     auctionmgr.AddAItem(it);
     auctionHouse->AddAuction(AH);
-
     pl->MoveItemFromInventory(it->GetBagSlot(), it->GetSlot(), true);
-
     CharacterDatabase.BeginTransaction();
     it->DeleteFromInventoryDB();
     it->SaveToDB();                                         // recursive and not have transaction guard into self, not in inventiory and can be save standalone
     AH->SaveToDB();
     pl->SaveInventoryAndGoldToDB();
     CharacterDatabase.CommitTransaction();
-
     SendAuctionCommandResult(AH->Id, AUCTION_SELL_ITEM, AUCTION_OK);
 }
-
 //this function is called when client bids or buys out auction
 void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
 {
@@ -290,33 +245,26 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
     uint32 price;
     recv_data >> auctioneer;
     recv_data >> auctionId >> price;
-
     if (!auctionId || !price)
         return;                                             //check for cheaters
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionPlaceBid - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
     Player *pl = GetPlayer();
-
     if (!auction || auction->owner == pl->GetGUIDLow())
     {
         //you cannot bid your own auction:
         SendAuctionCommandResult(0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR);
         return;
     }
-
     // impossible have online own another character (use this for speedup check in case online owner)
     Player* auction_owner = objmgr.GetPlayer(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER));
     if (!auction_owner && objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER)) == pl->GetSession()->GetAccountId())
@@ -325,11 +273,9 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
         SendAuctionCommandResult(0, AUCTION_PLACE_BID, CANNOT_BID_YOUR_AUCTION_ERROR);
         return;
     }
-
     // cheating
     if (price <= auction->bid)
         return;
-
     // price too low for next bid if not buyout
     if ((price < auction->buyout || auction->buyout == 0) &&
         price < auction->bid + auction->GetAuctionOutBid())
@@ -337,14 +283,12 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
         //auction has already higher bid, client tests it!
         return;
     }
-
     if (price > pl->GetMoney())
     {
         //you don't have enought money!, client tests!
         //SendAuctionCommandResult(auction->auctionId, AUCTION_PLACE_BID, ???);
         return;
     }
-
     if ((price < auction->buyout) || (auction->buyout == 0))
     {
         if (auction->bidder > 0)
@@ -367,10 +311,8 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
         auction->bidder = pl->GetGUIDLow();
         auction->bid = price;
         GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID, price);
-
         // after this update we should save player's money ...
         CharacterDatabase.PExecute("UPDATE auctionhouse SET buyguid = '%u',lastbid = '%u' WHERE id = '%u'", auction->bidder, auction->bid, auction->Id);
-
         SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK, 0);
     }
     else
@@ -391,11 +333,9 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
         auction->bidder = pl->GetGUIDLow();
         auction->bid = auction->buyout;
         GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_AUCTION_BID, auction->buyout);
-
         auctionmgr.SendAuctionSalePendingMail(auction);
         auctionmgr.SendAuctionSuccessfulMail(auction);
         auctionmgr.SendAuctionWonMail(auction);
-
         SendAuctionCommandResult(auction->Id, AUCTION_PLACE_BID, AUCTION_OK);
         auction->DeleteFromDB();
         uint32 item_template = auction->item_template;
@@ -406,7 +346,6 @@ void WorldSession::HandleAuctionPlaceBid(WorldPacket & recv_data)
     pl->SaveInventoryAndGoldToDB();
     CharacterDatabase.CommitTransaction();
 }
-
 //this void is called when auction_owner cancels his auction
 void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
 {
@@ -415,23 +354,18 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
     recv_data >> auctioneer;
     recv_data >> auctionId;
     //sLog.outDebug("Cancel AUCTION AuctionID: %u", auctionId);
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(auctioneer,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionRemoveItem - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(auctioneer)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     AuctionEntry *auction = auctionHouse->GetAuction(auctionId);
     Player *pl = GetPlayer();
-
     if (auction && auction->owner == pl->GetGUIDLow())
     {
         Item *pItem = auctionmgr.GetAItem(auction->item_guidlow);
@@ -449,10 +383,8 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
             // Return the item by mail
             std::ostringstream msgAuctionCanceledOwner;
             msgAuctionCanceledOwner << auction->item_template << ":0:" << AUCTION_CANCELED;
-
             MailItemsInfo mi;
             mi.AddItem(auction->item_guidlow, auction->item_template, pItem);
-
             // item will deleted or added to received mail list
             WorldSession::SendMailTo(pl, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), pl->GetGUIDLow(), msgAuctionCanceledOwner.str(), 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
         }
@@ -470,7 +402,6 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
         sLog.outError("CHEATER : %u, he tried to cancel auction (id: %u) of another player, or auction is NULL", pl->GetGUIDLow(), auctionId);
         return;
     }
-
     //inform player, that auction is removed
     SendAuctionCommandResult(auction->Id, AUCTION_CANCEL, AUCTION_OK);
     // Now remove the auction
@@ -482,14 +413,12 @@ void WorldSession::HandleAuctionRemoveItem(WorldPacket & recv_data)
     auctionmgr.RemoveAItem(auction->item_guidlow);
     auctionHouse->RemoveAuction(auction, item_template);
 }
-
 //called when player lists his bids
 void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
 {
     uint64 guid;                                            //NPC guid
     uint32 listfrom;                                        //page of auctions
     uint32 outbiddedCount;                                  //count of outbidded auctions
-
     recv_data >> guid;
     recv_data >> listfrom;                                  // not used in fact (this list not have page control in client)
     recv_data >> outbiddedCount;
@@ -498,20 +427,16 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
         sLog.outError("Client sent bad opcode!!! with count: %u and size : %lu (must be: %u)", outbiddedCount, (unsigned long)recv_data.size(),(16 + outbiddedCount * 4));
         outbiddedCount = 0;
     }
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionListBidderItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     WorldPacket data(SMSG_AUCTION_BIDDER_LIST_RESULT, (4+4+4));
     Player *pl = GetPlayer();
     data << (uint32) 0;                                     //add 0 as count
@@ -529,49 +454,39 @@ void WorldSession::HandleAuctionListBidderItems(WorldPacket & recv_data)
             ++count;
         }
     }
-
     auctionHouse->BuildListBidderItems(data,pl,count,totalcount);
     data.put<uint32>(0, count);                           // add count to placeholder
     data << totalcount;
     data << (uint32)300;                                    //unk 2.3.0
     SendPacket(&data);
 }
-
 //this void sends player info about his auctions
 void WorldSession::HandleAuctionListOwnerItems(WorldPacket & recv_data)
 {
     uint32 listfrom;
     uint64 guid;
-
     recv_data >> guid;
     recv_data >> listfrom;                                  // not used in fact (this list not have page control in client)
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionListOwnerItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     WorldPacket data(SMSG_AUCTION_OWNER_LIST_RESULT, (4+4+4));
     data << (uint32) 0;                                     // amount place holder
-
     uint32 count = 0;
     uint32 totalcount = 0;
-
     auctionHouse->BuildListOwnerItems(data,_player,count,totalcount);
     data.put<uint32>(0, count);
     data << (uint32) totalcount;
     data << (uint32) 0;
     SendPacket(&data);
 }
-
 //this void is called when player clicks on search button
 void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
 {
@@ -579,61 +494,47 @@ void WorldSession::HandleAuctionListItems(WorldPacket & recv_data)
     uint8 levelmin, levelmax, usable;
     uint32 listfrom, auctionSlotID, auctionMainCategory, auctionSubCategory, quality;
     uint64 guid;
-
     recv_data >> guid;
     recv_data >> listfrom;                                  // start, used for page control listing by 50 elements
     recv_data >> searchedname;
-
     recv_data >> levelmin >> levelmax;
     recv_data >> auctionSlotID >> auctionMainCategory >> auctionSubCategory;
     recv_data >> quality >> usable;
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_AUCTIONEER);
     if (!pCreature)
     {
         sLog.outDebug("WORLD: HandleAuctionListItems - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
         return;
     }
-
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     AuctionHouseObject* auctionHouse = auctionmgr.GetAuctionsMap(pCreature->getFaction());
-
     //sLog.outDebug("Auctionhouse search (GUID: %u TypeId: %u)", , list from: %u, searchedname: %s, levelmin: %u, levelmax: %u, auctionSlotID: %u, auctionMainCategory: %u, auctionSubCategory: %u, quality: %u, usable: %u",
     //  GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)), listfrom, searchedname.c_str(), levelmin, levelmax, auctionSlotID, auctionMainCategory, auctionSubCategory, quality, usable);
-
     WorldPacket data(SMSG_AUCTION_LIST_RESULT, (4+4+4));
     uint32 count = 0;
     uint32 totalcount = 0;
     data << (uint32) 0;
-
     // converting string that we try to find to lower case
     std::wstring wsearchedname;
     if (!Utf8toWStr(searchedname,wsearchedname))
         return;
-
     wstrToLower(wsearchedname);
-
     auctionHouse->BuildListAuctionItems(data,_player,
         wsearchedname, listfrom, levelmin, levelmax, usable,
         auctionSlotID, auctionMainCategory, auctionSubCategory, quality,
         count,totalcount);
-
     data.put<uint32>(0, count);
     data << (uint32) totalcount;
     data << (uint32) 300;                                   // unk 2.3.0 const?
     SendPacket(&data);
 }
-
 void WorldSession::HandleAuctionListPendingSales(WorldPacket & recv_data)
 {
     sLog.outDebug("CMSG_AUCTION_LIST_PENDING_SALES");
     recv_data.hexlike();
-
     uint32 count = 0;
-
     WorldPacket data(SMSG_AUCTION_LIST_PENDING_SALES, 4);
     data << uint32(count);                                  // count
     /*for (uint32 i = 0; i < count; ++i)
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index ffc0c55d9d3..2f7ba808fb3 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "Player.h"
@@ -26,7 +25,6 @@
 #include "Database/SQLStorage.h"
 #include "Policies/SingletonImp.h"
 #include "DBCStores.h"
-
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
@@ -35,26 +33,20 @@
 #include "ProgressBar.h"
 #include <vector>
 
-
 INSTANTIATE_SINGLETON_1(AuctionHouseMgr);
-
 using namespace std;
-
 AuctionHouseMgr::AuctionHouseMgr()
 {
 }
-
 AuctionHouseMgr::~AuctionHouseMgr()
 {
     for (ItemMap::const_iterator itr = mAitems.begin(); itr != mAitems.end(); ++itr)
         delete itr->second;
 }
-
 AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap(uint32 factionTemplateId)
 {
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
         return &mNeutralAuctions;
-
     // team have linked auction houses
     FactionTemplateEntry const* u_entry = sFactionTemplateStore.LookupEntry(factionTemplateId);
     if (!u_entry)
@@ -66,18 +58,15 @@ AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap(uint32 factionTemplateId)
     else
         return &mNeutralAuctions;
 }
-
 uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem)
 {
     uint32 MSV = pItem->GetProto()->SellPrice;
     int32 deposit;
     uint32 timeHr = (((time / 60) / 60) / 12);
-
     if (MSV > 0)
         deposit = (int32)floor((double)MSV * (((double)(entry->depositPercent * 3) / 100.0f * (double)sWorld.getRate(RATE_AUCTION_DEPOSIT) * (double)pItem->GetCount()))) * timeHr;
     else
         deposit = 0;
-
     sLog.outDebug("SellPrice:\t\t%u", MSV);
     sLog.outDebug("Deposit Percent:\t%f", ((double)entry->depositPercent / 100.0f));
     sLog.outDebug("Auction Time1:\t\t%u", time);
@@ -95,14 +84,12 @@ uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32
         return 0;
     }
 }
-
 //does not clear ram
 void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
 {
     Item *pItem = GetAItem(auction->item_guidlow);
     if (!pItem)
         return;
-
     uint32 bidder_accId = 0;
     uint32 bidder_security = 0;
     uint64 bidder_guid = MAKE_NEW_GUID(auction->bidder, 0, HIGHGUID_PLAYER);
@@ -121,7 +108,6 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
         {
             bidder_accId = objmgr.GetPlayerAccountIdByGUID(bidder_guid);
             bidder_security = accmgr.GetSecurity(bidder_accId);
-
             if (bidder_security > SEC_PLAYER) // not do redundant DB requests
             {
                 if (!objmgr.GetPlayerNameByGUID(bidder_guid,bidder_name))
@@ -133,44 +119,34 @@ void AuctionHouseMgr::SendAuctionWonMail(AuctionEntry *auction)
             std::string owner_name;
             if (!objmgr.GetPlayerNameByGUID(auction->owner,owner_name))
                 owner_name = objmgr.GetTrinityStringForDBCLocale(LANG_UNKNOWN);
-
             uint32 owner_accid = objmgr.GetPlayerAccountIdByGUID(auction->owner);
-
             sLog.outCommand(bidder_accId,"GM %s (Account: %u) won item in auction: %s (Entry: %u Count: %u) and pay money: %u. Original owner %s (Account: %u)",
                 bidder_name.c_str(),bidder_accId,pItem->GetProto()->Name1,pItem->GetEntry(),pItem->GetCount(),auction->bid,owner_name.c_str(),owner_accid);
         }
     }
-
     // receiver exist
     if (bidder || bidder_accId)
     {
         std::ostringstream msgAuctionWonSubject;
         msgAuctionWonSubject << auction->item_template << ":0:" << AUCTION_WON;
-
         std::ostringstream msgAuctionWonBody;
         msgAuctionWonBody.width(16);
         msgAuctionWonBody << std::right << std::hex << auction->owner;
         msgAuctionWonBody << std::dec << ":" << auction->bid << ":" << auction->buyout;
         sLog.outDebug("AuctionWon body string : %s", msgAuctionWonBody.str().c_str());
-
         //prepare mail data... :
         uint32 itemTextId = objmgr.CreateItemText(msgAuctionWonBody.str());
-
         // set owner to bidder (to prevent delete item with sender char deleting)
         // owner in `data` will set at mail receive and item extracting
         CharacterDatabase.PExecute("UPDATE item_instance SET owner_guid = '%u' WHERE guid='%u'",auction->bidder,pItem->GetGUIDLow());
         CharacterDatabase.CommitTransaction();
-
         MailItemsInfo mi;
         mi.AddItem(auction->item_guidlow, auction->item_template, pItem);
-
         if (bidder)
             bidder->GetSession()->SendAuctionBidderNotification(auction->GetHouseId(), auction->Id, bidder_guid, 0, 0, auction->item_template);
-
         WorldSession::SendMailTo(bidder, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), auction->bidder, msgAuctionWonSubject.str(), itemTextId, &mi, 0, 0, MAIL_CHECK_MASK_AUCTION);
     }
 }
-
 void AuctionHouseMgr::SendAuctionSalePendingMail(AuctionEntry * auction)
 {
     uint64 owner_guid = MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER);
@@ -181,26 +157,19 @@ void AuctionHouseMgr::SendAuctionSalePendingMail(AuctionEntry * auction)
     {
         std::ostringstream msgAuctionSalePendingSubject;
         msgAuctionSalePendingSubject << auction->item_template << ":0:" << AUCTION_SALE_PENDING;
-
         std::ostringstream msgAuctionSalePendingBody;
         uint32 auctionCut = auction->GetAuctionCut();
-
         time_t distrTime = time(NULL) + sWorld.getConfig(CONFIG_MAIL_DELIVERY_DELAY);
-
         msgAuctionSalePendingBody.width(16);
         msgAuctionSalePendingBody << std::right << std::hex << auction->bidder;
         msgAuctionSalePendingBody << std::dec << ":" << auction->bid << ":" << auction->buyout;
         msgAuctionSalePendingBody << ":" << auction->deposit << ":" << auctionCut << ":0:";
         msgAuctionSalePendingBody << secsToTimeBitFields(distrTime);
-
         sLog.outDebug("AuctionSalePending body string : %s", msgAuctionSalePendingBody.str().c_str());
-
         uint32 itemTextId = objmgr.CreateItemText(msgAuctionSalePendingBody.str());
-
         WorldSession::SendMailTo(owner, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), auction->owner, msgAuctionSalePendingSubject.str(), itemTextId, NULL, 0, 0, MAIL_CHECK_MASK_AUCTION);
     }
 }
-
 //call this method to send mail to auction owner, when auction is successful, it does not clear ram
 void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
 {
@@ -212,21 +181,15 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
     {
         std::ostringstream msgAuctionSuccessfulSubject;
         msgAuctionSuccessfulSubject << auction->item_template << ":0:" << AUCTION_SUCCESSFUL;
-
         std::ostringstream auctionSuccessfulBody;
         uint32 auctionCut = auction->GetAuctionCut();
-
         auctionSuccessfulBody.width(16);
         auctionSuccessfulBody << std::right << std::hex << auction->bidder;
         auctionSuccessfulBody << std::dec << ":" << auction->bid << ":" << auction->buyout;
         auctionSuccessfulBody << ":" << auction->deposit << ":" << auctionCut;
-
         sLog.outDebug("AuctionSuccessful body string : %s", auctionSuccessfulBody.str().c_str());
-
         uint32 itemTextId = objmgr.CreateItemText(auctionSuccessfulBody.str());
-
         uint32 profit = auction->bid + auction->deposit - auctionCut;
-
         //FIXME: what do if owner offline
         if (owner && owner->GetGUIDLow() != auctionbot.GetAHBplayerGUID())
         {
@@ -237,14 +200,12 @@ void AuctionHouseMgr::SendAuctionSuccessfulMail(AuctionEntry * auction)
         WorldSession::SendMailTo(owner, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), auction->owner, msgAuctionSuccessfulSubject.str(), itemTextId, NULL, profit, 0, MAIL_CHECK_MASK_AUCTION, sWorld.getConfig(CONFIG_MAIL_DELIVERY_DELAY));
     }
 }
-
 //does not clear ram
 void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
 { //return an item in auction to its owner by mail
     Item *pItem = GetAItem(auction->item_guidlow);
     if (!pItem)
         return;
-
     uint64 owner_guid = MAKE_NEW_GUID(auction->owner, 0, HIGHGUID_PLAYER);
     Player *owner = objmgr.GetPlayer(owner_guid);
     uint32 owner_accId = objmgr.GetPlayerAccountIdByGUID(owner_guid);
@@ -253,22 +214,17 @@ void AuctionHouseMgr::SendAuctionExpiredMail(AuctionEntry * auction)
     {
         std::ostringstream subject;
         subject << auction->item_template << ":0:" << AUCTION_EXPIRED;
-
         if (owner && owner->GetGUIDLow() != auctionbot.GetAHBplayerGUID())
             owner->GetSession()->SendAuctionOwnerNotification(auction);
-
         MailItemsInfo mi;
         mi.AddItem(auction->item_guidlow, auction->item_template, pItem);
-
         WorldSession::SendMailTo(owner, MAIL_AUCTION, MAIL_STATIONERY_AUCTION, auction->GetHouseId(), GUID_LOPART(owner_guid), subject.str(), 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 void AuctionHouseMgr::LoadAuctionItems()
 {
     // data needs to be at first place for Item::LoadFromDB
     QueryResult *result = CharacterDatabase.Query("SELECT data,itemguid,item_template FROM auctionhouse JOIN item_instance ON itemguid = guid");
-
     if (!result)
     {
         barGoLink bar(1);
@@ -277,45 +233,34 @@ void AuctionHouseMgr::LoadAuctionItems()
         sLog.outString(">> Loaded 0 auction items");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     uint32 count = 0;
-
     Field *fields;
     do
     {
         bar.step();
-
         fields = result->Fetch();
         uint32 item_guid        = fields[1].GetUInt32();
         uint32 item_template    = fields[2].GetUInt32();
-
         ItemPrototype const *proto = objmgr.GetItemPrototype(item_template);
-
         if (!proto)
         {
             sLog.outError("AuctionHouseMgr::LoadAuctionItems: Unknown item (GUID: %u id: #%u) in auction, skipped.", item_guid,item_template);
             continue;
         }
-
         Item *item = NewItemOrBag(proto);
-
         if (!item->LoadFromDB(item_guid,0, result))
         {
             delete item;
             continue;
         }
         AddAItem(item);
-
         ++count;
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u auction items", count);
 }
-
 void AuctionHouseMgr::LoadAuctions()
 {
     QueryResult *result = CharacterDatabase.Query("SELECT COUNT(*) FROM auctionhouse");
@@ -327,11 +272,9 @@ void AuctionHouseMgr::LoadAuctions()
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
-
     Field *fields = result->Fetch();
     uint32 AuctionCount=fields[0].GetUInt32();
     delete result;
-
     if (!AuctionCount)
     {
         barGoLink bar(1);
@@ -340,7 +283,6 @@ void AuctionHouseMgr::LoadAuctions()
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
-
     result = CharacterDatabase.Query("SELECT id,auctioneerguid,itemguid,item_template,itemowner,buyoutprice,time,buyguid,lastbid,startbid,deposit FROM auctionhouse");
     if (!result)
     {
@@ -350,17 +292,12 @@ void AuctionHouseMgr::LoadAuctions()
         sLog.outString(">> Loaded 0 auctions. DB table `auctionhouse` is empty.");
         return;
     }
-
     barGoLink bar(AuctionCount);
-
     AuctionEntry *aItem;
-
     do
     {
         fields = result->Fetch();
-
         bar.step();
-
         aItem = new AuctionEntry;
         aItem->Id = fields[0].GetUInt32();
         aItem->auctioneer = fields[1].GetUInt32();
@@ -373,7 +310,6 @@ void AuctionHouseMgr::LoadAuctions()
         aItem->bid = fields[8].GetUInt32();
         aItem->startbid = fields[9].GetUInt32();
         aItem->deposit = fields[10].GetUInt32();
-
         CreatureData const* auctioneerData = objmgr.GetCreatureData(aItem->auctioneer);
         if (!auctioneerData)
         {
@@ -382,7 +318,6 @@ void AuctionHouseMgr::LoadAuctions()
             delete aItem;
             continue;
         }
-
         CreatureInfo const* auctioneerInfo = objmgr.GetCreatureTemplate(auctioneerData->id);
         if (!auctioneerInfo)
         {
@@ -391,7 +326,6 @@ void AuctionHouseMgr::LoadAuctions()
             delete aItem;
             continue;
         }
-
         aItem->auctionHouseEntry = AuctionHouseMgr::GetAuctionHouseEntry(auctioneerInfo->faction_A);
         if (!aItem->auctionHouseEntry)
         {
@@ -401,7 +335,6 @@ void AuctionHouseMgr::LoadAuctions()
             delete aItem;
             continue;
         }
-
         // check if sold item exists for guid
         // and item_template in fact (GetAItem will fail if problematic in result check in AuctionHouseMgr::LoadAuctionItems)
         if (!GetAItem(aItem->item_guidlow))
@@ -411,44 +344,35 @@ void AuctionHouseMgr::LoadAuctions()
             delete aItem;
             continue;
         }
-
         GetAuctionsMap(auctioneerInfo->faction_A)->AddAuction(aItem);
-
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u auctions", AuctionCount);
 }
-
 void AuctionHouseMgr::AddAItem(Item* it)
 {
     ASSERT(it);
     ASSERT(mAitems.find(it->GetGUIDLow()) == mAitems.end());
     mAitems[it->GetGUIDLow()] = it;
 }
-
 bool AuctionHouseMgr::RemoveAItem(uint32 id)
 {
     ItemMap::iterator i = mAitems.find(id);
     if (i == mAitems.end())
         return false;
-
     mAitems.erase(i);
     return true;
 }
-
 void AuctionHouseMgr::Update()
 {
     mHordeAuctions.Update();
     mAllianceAuctions.Update();
     mNeutralAuctions.Update();
 }
-
 AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(uint32 factionTemplateId)
 {
     uint32 houseid = 7; // goblin auction house
-
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
     {
         //FIXME: found way for proper auctionhouse selection by another way
@@ -481,7 +405,6 @@ AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(uint32 factionTem
             }
         }
     }
-
     return sAuctionHouseStore.LookupEntry(houseid);
 }
     void AuctionHouseObject::AddAuction(AuctionEntry *ah)
@@ -490,57 +413,45 @@ AuctionHouseEntry const* AuctionHouseMgr::GetAuctionHouseEntry(uint32 factionTem
         AuctionsMap[ah->Id] = ah;
         auctionbot.IncrementItemCounts(ah);
     }
-
     bool AuctionHouseObject::RemoveAuction(AuctionEntry *auction, uint32 item_template)
     {
         auctionbot.DecrementItemCounts(auction, item_template);
         return AuctionsMap.erase(auction->Id) ? true : false;
     }
-
 void AuctionHouseObject::Update()
 {
     time_t curTime = sWorld.GetGameTime();
     ///- Handle expired auctions
-
     // If storage is empty, no need to update. next == NULL in this case.
     if (AuctionsMap.empty())
         return;
-
     QueryResult* result = CharacterDatabase.PQuery("SELECT id FROM auctionhouse WHERE time <= %u ORDER BY TIME ASC", (uint32)curTime+60);
-
     if (!result)
     {
         delete result;
         return;
     }
-
     if (result->GetRowCount() == 0)
     {
         delete result;
         return;
     }
-
     vector<uint32> expiredAuctions;
-
     do
     {
         uint32 tmpdata = result->Fetch()->GetUInt32();
         expiredAuctions.push_back(tmpdata);
     } while (result->NextRow());
     delete result;
-
     vector<uint32>::iterator iter = expiredAuctions.begin();
     while (!expiredAuctions.empty())
     {
         // from auctionhousehandler.cpp, creates auction pointer & player pointer
         AuctionEntry* auction = GetAuction(*iter);
-
         // Erase the auction from the vector.
         expiredAuctions.erase(iter);
-
         if (!auction)
             continue;
-
         ///- Either cancel the auction if there was no bidder
         if (auction->bidder == 0)
             auctionmgr.SendAuctionExpiredMail(auction);
@@ -553,7 +464,6 @@ void AuctionHouseObject::Update()
             auctionmgr.SendAuctionSuccessfulMail(auction);
             auctionmgr.SendAuctionWonMail(auction);
         }
-
         ///- In any case clear the auction
         auction->DeleteFromDB();
         uint32 item_template = auction->item_template;
@@ -561,7 +471,6 @@ void AuctionHouseObject::Update()
         RemoveAuction(auction, item_template);
     }
 }
-
 void AuctionHouseObject::BuildListBidderItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount)
 {
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr)
@@ -571,12 +480,10 @@ void AuctionHouseObject::BuildListBidderItems(WorldPacket& data, Player* player,
         {
             if (itr->second->BuildAuctionInfo(data))
                 ++count;
-
             ++totalcount;
         }
     }
 }
-
 void AuctionHouseObject::BuildListOwnerItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount)
 {
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr)
@@ -586,50 +493,38 @@ void AuctionHouseObject::BuildListOwnerItems(WorldPacket& data, Player* player,
         {
             if (Aentry->BuildAuctionInfo(data))
                 ++count;
-
             ++totalcount;
         }
     }
 }
-
 void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player,
     std::wstring const& wsearchedname, uint32 listfrom, uint32 levelmin, uint32 levelmax, uint32 usable,
     uint32 inventoryType, uint32 itemClass, uint32 itemSubClass, uint32 quality,
     uint32& count, uint32& totalcount)
 {
     int loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
-
     for (AuctionEntryMap::const_iterator itr = AuctionsMap.begin();itr != AuctionsMap.end();++itr)
     {
         AuctionEntry *Aentry = itr->second;
         Item *item = auctionmgr.GetAItem(Aentry->item_guidlow);
         if (!item)
             continue;
-
         ItemPrototype const *proto = item->GetProto();
-
         if (itemClass != 0xffffffff && proto->Class != itemClass)
             continue;
-
         if (itemSubClass != 0xffffffff && proto->SubClass != itemSubClass)
             continue;
-
         if (inventoryType != 0xffffffff && proto->InventoryType != inventoryType)
             continue;
-
         if (quality != 0xffffffff && proto->Quality != quality)
             continue;
-
         if (levelmin != 0x00 && (proto->RequiredLevel < levelmin || (levelmax != 0x00 && proto->RequiredLevel > levelmax)))
             continue;
-
         if (usable != 0x00 && player->CanUseItem(item) != EQUIP_ERR_OK)
             continue;
-
         std::string name = proto->Name1;
         if (name.empty())
             continue;
-
         // local name
         if (loc_idx >= 0)
         {
@@ -640,10 +535,8 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
                     name = il->Name[loc_idx];
             }
         }
-
         if (!wsearchedname.empty() && !Utf8FitTo(name, wsearchedname))
             continue;
-
         if (count < 50 && totalcount >= listfrom)
         {
             ++count;
@@ -652,7 +545,6 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
         ++totalcount;
     }
 }
-
 //this function inserts to WorldPacket auction's data
 bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
 {
@@ -664,14 +556,12 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
     }
     data << uint32(Id);
     data << uint32(pItem->GetEntry());
-
     for (uint8 i = 0; i < MAX_INSPECTED_ENCHANTMENT_SLOT; ++i)
     {
         data << uint32(pItem->GetEnchantmentId(EnchantmentSlot(i)));
         data << uint32(pItem->GetEnchantmentDuration(EnchantmentSlot(i)));
         data << uint32(pItem->GetEnchantmentCharges(EnchantmentSlot(i)));
     }
-
     data << uint32(pItem->GetItemRandomPropertyId());       //random item property id
     data << uint32(pItem->GetItemSuffixFactor());           //SuffixFactor
     data << uint32(pItem->GetCount());                      //item->count
@@ -687,7 +577,6 @@ bool AuctionEntry::BuildAuctionInfo(WorldPacket & data) const
     data << uint32(bid);                                    //current bid
     return true;
 }
-
 uint32 AuctionEntry::GetAuctionCut() const
 {
     int32 cut = int32(((double)auctionHouseEntry->cutPercent / 100.0f) * (double)sWorld.getRate(RATE_AUCTION_CUT)) * bid;
@@ -696,7 +585,6 @@ uint32 AuctionEntry::GetAuctionCut() const
     else
         return 0;
 }
-
 /// the sum of outbid is (1% from current bid)*5, if bid is very small, it is 1c
 uint32 AuctionEntry::GetAuctionOutBid() const
 {
@@ -705,13 +593,11 @@ uint32 AuctionEntry::GetAuctionOutBid() const
         outbid = 1;
     return outbid;
 }
-
 void AuctionEntry::DeleteFromDB() const
 {
     //No SQL injection (Id is integer)
     CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE id = '%u'",Id);
 }
-
 void AuctionEntry::SaveToDB() const
 {
     //No SQL injection (no strings)
diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
index 0e3ead4f608..5d62e16ab85 100644
--- a/src/game/AuctionHouseMgr.h
+++ b/src/game/AuctionHouseMgr.h
@@ -17,22 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
-
 #include "Policies/Singleton.h"
-
 #include "SharedDefines.h"
-
 #include "AuctionHouseBot.h"
-
 class Item;
 class Player;
 class WorldPacket;
-
 #define MIN_AUCTION_TIME (12*HOUR)
-
 enum AuctionError
 {
     AUCTION_OK = 0,
@@ -41,14 +34,12 @@ enum AuctionError
     AUCTION_ITEM_NOT_FOUND = 4,
     CANNOT_BID_YOUR_AUCTION_ERROR = 10
 };
-
 enum AuctionAction
 {
     AUCTION_SELL_ITEM = 0,
     AUCTION_CANCEL = 1,
     AUCTION_PLACE_BID = 2
 };
-
 struct AuctionEntry
 {
     uint32 Id;
@@ -63,7 +54,6 @@ struct AuctionEntry
     uint32 bidder;
     uint32 deposit;                                         //deposit can be calculated only when creating auction
     AuctionHouseEntry const* auctionHouseEntry;             // in AuctionHouse.dbc
-
     // helpers
     uint32 GetHouseId() const { return auctionHouseEntry->houseId; }
     uint32 GetHouseFaction() const { return auctionHouseEntry->faction; }
@@ -73,7 +63,6 @@ struct AuctionEntry
     void DeleteFromDB() const;
     void SaveToDB() const;
 };
-
 //this class is used as auctionhouse instance
 class AuctionHouseObject
 {
@@ -85,51 +74,37 @@ class AuctionHouseObject
         for (AuctionEntryMap::iterator itr = AuctionsMap.begin(); itr != AuctionsMap.end(); ++itr)
             delete itr->second;
     }
-
     typedef std::map<uint32, AuctionEntry*> AuctionEntryMap;
-
     uint32 Getcount() { return AuctionsMap.size(); }
-
     AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();}
     AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();}
-
     AuctionEntry* GetAuction(uint32 id) const
     {
         AuctionEntryMap::const_iterator itr = AuctionsMap.find(id);
         return itr != AuctionsMap.end() ? itr->second : NULL;
     }
-
     void AddAuction(AuctionEntry *ah);
-
     bool RemoveAuction(AuctionEntry *auction, uint32 item_template);
-
     void Update();
-
     void BuildListBidderItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount);
     void BuildListOwnerItems(WorldPacket& data, Player* player, uint32& count, uint32& totalcount);
     void BuildListAuctionItems(WorldPacket& data, Player* player,
         std::wstring const& searchedname, uint32 listfrom, uint32 levelmin, uint32 levelmax, uint32 usable,
         uint32 inventoryType, uint32 itemClass, uint32 itemSubClass, uint32 quality,
         uint32& count, uint32& totalcount);
-
   private:
     AuctionEntryMap AuctionsMap;
-
     // storage for "next" auction item for next Update()
     AuctionEntryMap::const_iterator next;
 };
-
 class AuctionHouseMgr
 {
   public:
     AuctionHouseMgr();
     ~AuctionHouseMgr();
-
     typedef UNORDERED_MAP<uint32, Item*> ItemMap;
-
     AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId);
     AuctionHouseObject* GetBidsMap(uint32 factionTemplateId);
-
     Item* GetAItem(uint32 id)
     {
         ItemMap::const_iterator itr = mAitems.find(id);
@@ -139,7 +114,6 @@ class AuctionHouseMgr
         }
         return NULL;
     }
-
     //auction messages
     void SendAuctionWonMail(AuctionEntry * auction);
     void SendAuctionSalePendingMail(AuctionEntry * auction);
@@ -147,25 +121,18 @@ class AuctionHouseMgr
     void SendAuctionExpiredMail(AuctionEntry * auction);
     static uint32 GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item *pItem);
     static AuctionHouseEntry const* GetAuctionHouseEntry(uint32 factionTemplateId);
-
   public:
     //load first auction items, because of check if item exists, when loading
     void LoadAuctionItems();
     void LoadAuctions();
-
     void AddAItem(Item* it);
     bool RemoveAItem(uint32 id);
-
     void Update();
-
   private:
     AuctionHouseObject mHordeAuctions;
     AuctionHouseObject mAllianceAuctions;
     AuctionHouseObject mNeutralAuctions;
-
     ItemMap mAitems;
 };
-
 #define auctionmgr Trinity::Singleton<AuctionHouseMgr>::Instance()
-
 #endif
diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp
index 2d58b63c0a9..5b406c2eb08 100644
--- a/src/game/Bag.cpp
+++ b/src/game/Bag.cpp
@@ -17,25 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
-
 #include "Bag.h"
 #include "Log.h"
 #include "UpdateData.h"
-
 Bag::Bag( ): Item()
 {
     m_objectType |= TYPEMASK_CONTAINER;
     m_objectTypeId = TYPEID_CONTAINER;
-
     m_valuesCount = CONTAINER_END;
-
     memset(m_bagslot, 0, sizeof(Item *) * MAX_BAG_SIZE);
 }
-
 Bag::~Bag()
 {
     for(uint8 i = 0; i < MAX_BAG_SIZE; ++i)
@@ -51,68 +45,52 @@ Bag::~Bag()
             delete m_bagslot[i];
         }
 }
-
 void Bag::AddToWorld()
 {
     Item::AddToWorld();
-
     for(uint32 i = 0;  i < GetBagSize(); ++i)
         if(m_bagslot[i])
             m_bagslot[i]->AddToWorld();
 }
-
 void Bag::RemoveFromWorld()
 {
     for(uint32 i = 0; i < GetBagSize(); ++i)
         if(m_bagslot[i])
             m_bagslot[i]->RemoveFromWorld();
-
     Item::RemoveFromWorld();
 }
-
 bool Bag::Create(uint32 guidlow, uint32 itemid, Player const* owner)
 {
     ItemPrototype const * itemProto = objmgr.GetItemPrototype(itemid);
-
     if(!itemProto || itemProto->ContainerSlots > MAX_BAG_SIZE)
         return false;
-
     Object::_Create( guidlow, 0, HIGHGUID_CONTAINER );
-
     SetEntry(itemid);
     SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f);
-
     SetUInt64Value(ITEM_FIELD_OWNER, owner ? owner->GetGUID() : 0);
     SetUInt64Value(ITEM_FIELD_CONTAINED, owner ? owner->GetGUID() : 0);
-
     SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_FLAGS, itemProto->Flags);
     SetUInt32Value(ITEM_FIELD_STACK_COUNT, 1);
-
     // Setting the number of Slots the Container has
     SetUInt32Value(CONTAINER_FIELD_NUM_SLOTS, itemProto->ContainerSlots);
-
     // Cleaning 20 slots
     for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
     {
         SetUInt64Value(CONTAINER_FIELD_SLOT_1 + (i*2), 0);
         m_bagslot[i] = NULL;
     }
-
     return true;
 }
-
 void Bag::SaveToDB()
 {
     Item::SaveToDB();
 }
-
 bool Bag::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
 {
     if(!Item::LoadFromDB(guid, owner_guid, result))
         return false;
-
     // cleanup bag content related item value fields (its will be filled correctly from `character_inventory`)
     for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
     {
@@ -123,44 +101,34 @@ bool Bag::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
             m_bagslot[i] = NULL;
         }
     }
-
     return true;
 }
-
 void Bag::DeleteFromDB()
 {
     for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
         if (m_bagslot[i])
             m_bagslot[i]->DeleteFromDB();
-
     Item::DeleteFromDB();
 }
-
 uint32 Bag::GetFreeSlots() const
 {
     uint32 slots = 0;
     for (uint32 i=0; i < GetBagSize(); ++i)
         if (!m_bagslot[i])
             ++slots;
-
     return slots;
 }
-
 void Bag::RemoveItem( uint8 slot, bool /*update*/ )
 {
     assert(slot < MAX_BAG_SIZE);
-
     if (m_bagslot[slot])
         m_bagslot[slot]->SetContainer(NULL);
-
     m_bagslot[slot] = NULL;
     SetUInt64Value( CONTAINER_FIELD_SLOT_1 + (slot * 2), 0 );
 }
-
 void Bag::StoreItem( uint8 slot, Item *pItem, bool /*update*/ )
 {
     assert(slot < MAX_BAG_SIZE);
-
     if( pItem )
     {
         m_bagslot[slot] = pItem;
@@ -171,26 +139,21 @@ void Bag::StoreItem( uint8 slot, Item *pItem, bool /*update*/ )
         pItem->SetSlot(slot);
     }
 }
-
 void Bag::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const
 {
     Item::BuildCreateUpdateBlockForPlayer( data, target );
-
     for (uint32 i = 0; i < GetBagSize(); ++i)
         if(m_bagslot[i])
             m_bagslot[i]->BuildCreateUpdateBlockForPlayer( data, target );
 }
-
 // If the bag is empty returns true
 bool Bag::IsEmpty() const
 {
     for(uint32 i = 0; i < GetBagSize(); ++i)
         if (m_bagslot[i])
             return false;
-
     return true;
 }
-
 uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const
 {
     Item *pItem;
@@ -201,7 +164,6 @@ uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const
         if( pItem && pItem != eItem && pItem->GetEntry() == item )
             count += pItem->GetCount();
     }
-
     if(eItem && eItem->GetProto()->GemProperties)
     {
         for(uint32 i=0; i < GetBagSize(); ++i)
@@ -211,25 +173,20 @@ uint32 Bag::GetItemCount( uint32 item, Item* eItem ) const
                 count += pItem->GetGemCountWithID(item);
         }
     }
-
     return count;
 }
-
 uint8 Bag::GetSlotByItemGUID(uint64 guid) const
 {
     for(uint32 i = 0; i < GetBagSize(); ++i)
         if(m_bagslot[i] != 0)
             if(m_bagslot[i]->GetGUID() == guid)
                 return i;
-
     return NULL_SLOT;
 }
-
 Item* Bag::GetItemByPos( uint8 slot ) const
 {
     if( slot < GetBagSize() )
         return m_bagslot[slot];
-
     return NULL;
 }
 
diff --git a/src/game/Bag.h b/src/game/Bag.h
index 3ae786512ce..649c2e21a27 100644
--- a/src/game/Bag.h
+++ b/src/game/Bag.h
@@ -17,40 +17,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_BAG_H
 #define TRINITY_BAG_H
-
 // Maximum 36 Slots ( (CONTAINER_END - CONTAINER_FIELD_SLOT_1)/2
 #define MAX_BAG_SIZE 36                                     // 2.0.12
-
 #include "Item.h"
 #include "ItemPrototype.h"
-
 class Bag : public Item
 {
     public:
-
         Bag();
         ~Bag();
-
         void AddToWorld();
         void RemoveFromWorld();
-
         bool Create(uint32 guidlow, uint32 itemid, Player const* owner);
-
         void Clear();
         void StoreItem( uint8 slot, Item *pItem, bool update );
         void RemoveItem( uint8 slot, bool update );
-
         Item* GetItemByPos( uint8 slot ) const;
         uint32 GetItemCount( uint32 item, Item* eItem = NULL ) const;
-
         uint8 GetSlotByItemGUID(uint64 guid) const;
         bool IsEmpty() const;
         uint32 GetFreeSlots() const;
         uint32 GetBagSize() const { return GetUInt32Value(CONTAINER_FIELD_NUM_SLOTS); }
-
         // DB operations
         // overwrite virtual Item::SaveToDB
         void SaveToDB();
@@ -58,15 +47,11 @@ class Bag : public Item
         bool LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result = NULL);
         // overwrite virtual Item::DeleteFromDB
         void DeleteFromDB();
-
         void BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) const;
-
     protected:
-
         // Bag Storage space
         Item* m_bagslot[MAX_BAG_SIZE];
 };
-
 inline Item* NewItemOrBag(ItemPrototype const * proto)
 {
     return (proto->InventoryType == INVTYPE_BAG) ? new Bag : new Item;
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 3eb699472d8..92c82f620f5 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
-
 #include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
@@ -36,7 +34,6 @@
 #include "SpellAuras.h"
 #include "Util.h"
 
-
 namespace MaNGOS
 {
     class BattleGroundChatBuilder
@@ -47,17 +44,14 @@ namespace MaNGOS
             void operator()(WorldPacket& data, int32 loc_idx)
             {
                 char const* text = objmgr.GetMangosString(i_textId,loc_idx);
-
                 if (i_args)
                 {
                     // we need copy va_list before use or original va_list will corrupted
                     va_list ap;
                     va_copy(ap,*i_args);
-
                     char str [2048];
                     vsnprintf(str,2048,text, ap );
                     va_end(ap);
-
                     do_helper(data,&str[0]);
                 }
                 else
@@ -67,7 +61,6 @@ namespace MaNGOS
             void do_helper(WorldPacket& data, char const* text)
             {
                 uint64 target_guid = i_source  ? i_source ->GetGUID() : 0;
-
                 data << uint8(i_msgtype);
                 data << uint32(LANG_UNIVERSAL);
                 data << uint64(target_guid);                // there 0 for BG messages
@@ -77,13 +70,11 @@ namespace MaNGOS
                 data << text;
                 data << uint8(i_source ? i_source->chatTag() : uint8(0));
             }
-
             ChatMsg i_msgtype;
             int32 i_textId;
             Player const* i_source;
             va_list* i_args;
     };
-
     class BattleGround2ChatBuilder
     {
         public:
@@ -94,12 +85,9 @@ namespace MaNGOS
                 char const* text = objmgr.GetMangosString(i_textId,loc_idx);
                 char const* arg1str = i_arg1 ? objmgr.GetMangosString(i_arg1,loc_idx) : "";
                 char const* arg2str = i_arg2 ? objmgr.GetMangosString(i_arg2,loc_idx) : "";
-
                 char str [2048];
                 snprintf(str,2048,text, arg1str, arg2str );
-
                 uint64 target_guid = i_source  ? i_source ->GetGUID() : 0;
-
                 data << uint8(i_msgtype);
                 data << uint32(LANG_UNIVERSAL);
                 data << uint64(target_guid);                // there 0 for BG messages
@@ -110,7 +98,6 @@ namespace MaNGOS
                 data << uint8(i_source ? i_source->chatTag() : uint8(0));
             }
         private:
-
             ChatMsg i_msgtype;
             int32 i_textId;
             Player const* i_source;
@@ -118,7 +105,6 @@ namespace MaNGOS
             int32 i_arg2;
     };
 }                                                           // namespace MaNGOS
-
 template<class Do>
 void BattleGround::BroadcastWorker(Do& _do)
 {
@@ -126,7 +112,6 @@ void BattleGround::BroadcastWorker(Do& _do)
         if (Player *plr = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)))
             _do(plr);
 }
-
 BattleGround::BattleGround()
 {
     m_TypeID            = BattleGroundTypeId(0);
@@ -150,46 +135,32 @@ BattleGround::BattleGround()
     m_LevelMax          = 0;
     m_InBGFreeSlotQueue = false;
     m_SetDeleteThis     = false;
-
     m_MaxPlayersPerTeam = 0;
     m_MaxPlayers        = 0;
     m_MinPlayersPerTeam = 0;
     m_MinPlayers        = 0;
-
     m_MapId             = 0;
-
     m_TeamStartLocX[BG_TEAM_ALLIANCE]   = 0;
     m_TeamStartLocX[BG_TEAM_HORDE]      = 0;
-
     m_TeamStartLocY[BG_TEAM_ALLIANCE]   = 0;
     m_TeamStartLocY[BG_TEAM_HORDE]      = 0;
-
     m_TeamStartLocZ[BG_TEAM_ALLIANCE]   = 0;
     m_TeamStartLocZ[BG_TEAM_HORDE]      = 0;
-
     m_TeamStartLocO[BG_TEAM_ALLIANCE]   = 0;
     m_TeamStartLocO[BG_TEAM_HORDE]      = 0;
-
     m_ArenaTeamIds[BG_TEAM_ALLIANCE]   = 0;
     m_ArenaTeamIds[BG_TEAM_HORDE]      = 0;
-
     m_ArenaTeamRatingChanges[BG_TEAM_ALLIANCE]   = 0;
     m_ArenaTeamRatingChanges[BG_TEAM_HORDE]      = 0;
-
     m_BgRaids[BG_TEAM_ALLIANCE]         = NULL;
     m_BgRaids[BG_TEAM_HORDE]            = NULL;
-
     m_PlayersCount[BG_TEAM_ALLIANCE]    = 0;
     m_PlayersCount[BG_TEAM_HORDE]       = 0;
-
     m_TeamScores[BG_TEAM_ALLIANCE]      = 0;
     m_TeamScores[BG_TEAM_HORDE]         = 0;
-
     m_PrematureCountDown = false;
     m_PrematureCountDown = 0;
-
     m_HonorMode = BG_NORMAL;
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_2M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_30S;
@@ -200,7 +171,6 @@ BattleGround::BattleGround()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
 }
-
 BattleGround::~BattleGround()
 {
     // remove objects and creatures
@@ -208,11 +178,9 @@ BattleGround::~BattleGround()
     int size = m_BgCreatures.size();
     for(int i = 0; i < size; ++i)
         DelCreature(i);
-
     size = m_BgObjects.size();
     for(int i = 0; i < size; ++i)
         DelObject(i);
-
     if (GetInstanceID())                                    // not spam by useless queries in case BG templates
     {
         // delete creature and go respawn times
@@ -222,7 +190,6 @@ BattleGround::~BattleGround()
         CharacterDatabase.PExecute("DELETE FROM instance WHERE id = '%u'",GetInstanceID());
         // remove from battlegrounds
     }
-
     sBattleGroundMgr.RemoveBattleGround(GetInstanceID(), GetTypeID());
     // unload map
     if (Map * map = MapManager::Instance().FindMap(GetMapId(), GetInstanceID()))
@@ -230,11 +197,9 @@ BattleGround::~BattleGround()
             ((BattleGroundMap*)map)->SetUnload();
     // remove from bg free slot queue
     this->RemoveFromBGFreeSlotQueue();
-
     for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
         delete itr->second;
 }
-
 void BattleGround::Update(uint32 diff)
 {
     if (!GetPlayersSize())
@@ -253,7 +218,6 @@ void BattleGround::Update(uint32 diff)
             m_SetDeleteThis = true;
         return;
     }
-
     // remove offline players from bg after 5 minutes
     if (!m_OfflineQueue.empty())
     {
@@ -268,11 +232,9 @@ void BattleGround::Update(uint32 diff)
             }
         }
     }
-
     /*********************************************************/
     /***        BATTLEGROUND RESSURECTION SYSTEM           ***/
     /*********************************************************/
-
     //this should be handled by spell system
     m_LastResurrectTime += diff;
     if (m_LastResurrectTime >= RESURRECTION_INTERVAL)
@@ -287,7 +249,6 @@ void BattleGround::Update(uint32 diff)
                     Player *plr = objmgr.GetPlayer(*itr2);
                     if (!plr)
                         continue;
-
                     if (!sh && plr->IsInWorld())
                     {
                         sh = plr->GetMap()->GetCreature(itr->first);
@@ -296,14 +257,12 @@ void BattleGround::Update(uint32 diff)
                             // Spirit Heal, effect 117
                             sh->CastSpell(sh, SPELL_SPIRIT_HEAL, true);
                     }
-
                     // Resurrection visual
                     plr->CastSpell(plr, SPELL_RESURRECTION_VISUAL, true);
                     m_ResurrectQueue.push_back(*itr2);
                 }
                 (itr->second).clear();
             }
-
             m_ReviveQueue.clear();
             m_LastResurrectTime = 0;
         }
@@ -325,11 +284,9 @@ void BattleGround::Update(uint32 diff)
         }
         m_ResurrectQueue.clear();
     }
-
     /*********************************************************/
     /***           BATTLEGROUND BALLANCE SYSTEM            ***/
     /*********************************************************/
-
     // if less then minimum players are in on one side, then start premature finish timer
     if (GetStatus() == STATUS_IN_PROGRESS && !isArena() && sBattleGroundMgr.GetPrematureFinishTime() && (GetPlayersCountByTeam(ALLIANCE) < GetMinPlayersPerTeam() || GetPlayersCountByTeam(HORDE) < GetMinPlayersPerTeam()))
     {
@@ -346,7 +303,6 @@ void BattleGround::Update(uint32 diff)
                 winner = ALLIANCE;
             else if (GetPlayersCountByTeam(HORDE) >= GetMinPlayersPerTeam())
                 winner = HORDE;
-
             EndBattleGround(winner);
             m_PrematureCountDown = false;
         }
@@ -370,26 +326,21 @@ void BattleGround::Update(uint32 diff)
     }
     else if (m_PrematureCountDown)
         m_PrematureCountDown = false;
-
     /*********************************************************/
     /***           BATTLEGROUND STARTING SYSTEM            ***/
     /*********************************************************/
-
     if (GetStatus() == STATUS_WAIT_JOIN && GetPlayersSize())
     {
         ModifyStartDelayTime(diff);
-
         if (!(m_Events & BG_STARTING_EVENT_1))
         {
             m_Events |= BG_STARTING_EVENT_1;
-
             // setup here, only when at least one player has ported to the map
             if (!SetupBattleGround())
             {
                 EndNow();
                 return;
             }
-
             StartingEventCloseDoors();
             SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FIRST]);
             //first start warning - 2 or 1 minute
@@ -411,18 +362,14 @@ void BattleGround::Update(uint32 diff)
         else if (GetStartDelayTime() <= 0 && !(m_Events & BG_STARTING_EVENT_4))
         {
             m_Events |= BG_STARTING_EVENT_4;
-
             StartingEventOpenDoors();
-
             SendMessageToAll(m_StartMessageIds[BG_STARTING_EVENT_FOURTH], CHAT_MSG_BG_SYSTEM_NEUTRAL);
             SetStatus(STATUS_IN_PROGRESS);
             SetStartDelayTime(m_StartDelayTimes[BG_STARTING_EVENT_FOURTH]);
-
             //remove preparation
             if (isArena())
             {
                 //TODO : add arena sound PlaySoundToAll(SOUND_ARENA_START);
-
                 for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
                     if (Player *plr = objmgr.GetPlayer(itr->first))
                     {
@@ -443,14 +390,11 @@ void BattleGround::Update(uint32 diff)
                                 ++iter;
                         }
                     }
-
                 CheckArenaWinConditions();
             }
             else
             {
-
                 PlaySoundToAll(SOUND_BG_START);
-
                 for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
                     if (Player* plr = objmgr.GetPlayer(itr->first))
                         plr->RemoveAurasDueToSpell(SPELL_PREPARATION);
@@ -462,11 +406,9 @@ void BattleGround::Update(uint32 diff)
             }
         }
     }
-
     /*********************************************************/
     /***           BATTLEGROUND ENDING SYSTEM              ***/
     /*********************************************************/
-
     if (GetStatus() == STATUS_WAIT_LEAVE)
     {
         // remove all players from battleground after 2 minutes
@@ -485,11 +427,9 @@ void BattleGround::Update(uint32 diff)
             }
         }
     }
-
     //update start time
     m_StartTime += diff;
 }
-
 void BattleGround::SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, float O)
 {
     BattleGroundTeamId idx = GetTeamIndexByTeamId(TeamID);
@@ -498,7 +438,6 @@ void BattleGround::SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, flo
     m_TeamStartLocZ[idx] = Z;
     m_TeamStartLocO[idx] = O;
 }
-
 void BattleGround::SendPacketToAll(WorldPacket *packet)
 {
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
@@ -510,54 +449,43 @@ void BattleGround::SendPacketToAll(WorldPacket *packet)
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
     }
 }
-
 void BattleGround::SendPacketToTeam(uint32 TeamID, WorldPacket *packet, Player *sender, bool self)
 {
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
-
         if (!plr)
         {
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         if (!self && sender == plr)
             continue;
-
         uint32 team = itr->second.Team;
         if(!team) team = plr->GetTeam();
-
         if (team == TeamID)
             plr->GetSession()->SendPacket(packet);
     }
 }
-
 void BattleGround::PlaySoundToAll(uint32 SoundID)
 {
     WorldPacket data;
     sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
     SendPacketToAll(&data);
 }
-
 void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID)
 {
     WorldPacket data;
-
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
-
         if (!plr)
         {
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         uint32 team = itr->second.Team;
         if(!team) team = plr->GetTeam();
-
         if (team == TeamID)
         {
             sBattleGroundMgr.BuildPlaySoundPacket(&data, SoundID);
@@ -565,27 +493,22 @@ void BattleGround::PlaySoundToTeam(uint32 SoundID, uint32 TeamID)
         }
     }
 }
-
 void BattleGround::CastSpellOnTeam(uint32 SpellID, uint32 TeamID)
 {
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
-
         if (!plr)
         {
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         uint32 team = itr->second.Team;
         if(!team) team = plr->GetTeam();
-
         if (team == TeamID)
             plr->CastSpell(plr, SpellID, true);
     }
 }
-
 void BattleGround::YellToAll(Creature* creature, const char* text, uint32 language)
 {
     for(std::map<uint64, BattleGroundPlayer>::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
@@ -602,102 +525,81 @@ void BattleGround::YellToAll(Creature* creature, const char* text, uint32 langua
     }
 }
 
-
 void BattleGround::RewardHonorToTeam(uint32 Honor, uint32 TeamID)
 {
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
-
         if (!plr)
         {
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         uint32 team = itr->second.Team;
         if(!team) team = plr->GetTeam();
-
         if (team == TeamID)
             UpdatePlayerScore(plr, SCORE_BONUS_HONOR, Honor);
     }
 }
-
 void BattleGround::RewardReputationToTeam(uint32 faction_id, uint32 Reputation, uint32 TeamID)
 {
     FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id);
-
     if (!factionEntry)
         return;
-
     for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
-
         if (!plr)
         {
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         uint32 team = itr->second.Team;
         if(!team) team = plr->GetTeam();
-
         if (team == TeamID)
             plr->GetReputationMgr().ModifyReputation(factionEntry, Reputation);
     }
 }
-
 void BattleGround::UpdateWorldState(uint32 Field, uint32 Value)
 {
     WorldPacket data;
     sBattleGroundMgr.BuildUpdateWorldStatePacket(&data, Field, Value);
     SendPacketToAll(&data);
 }
-
 void BattleGround::UpdateWorldStateForPlayer(uint32 Field, uint32 Value, Player *Source)
 {
     WorldPacket data;
     sBattleGroundMgr.BuildUpdateWorldStatePacket(&data, Field, Value);
     Source->GetSession()->SendPacket(&data);
 }
-
 void BattleGround::EndBattleGround(uint32 winner)
 {
     this->RemoveFromBGFreeSlotQueue();
-
     ArenaTeam * winner_arena_team = NULL;
     ArenaTeam * loser_arena_team = NULL;
     uint32 loser_rating = 0;
     uint32 winner_rating = 0;
     WorldPacket data;
     int32 winmsg_id = 0;
-
     if (winner == ALLIANCE)
     {
         winmsg_id = isBattleGround() ? LANG_BG_A_WINS : LANG_ARENA_GOLD_WINS;
-
         PlaySoundToAll(SOUND_ALLIANCE_WINS);                // alliance wins sound
-
         SetWinner(WINNER_ALLIANCE);
     }
     else if (winner == HORDE)
     {
         winmsg_id = isBattleGround() ? LANG_BG_H_WINS : LANG_ARENA_GREEN_WINS;
-
         PlaySoundToAll(SOUND_HORDE_WINS);                   // horde wins sound
-
         SetWinner(WINNER_HORDE);
     }
     else
     {
         SetWinner(3);
     }
-
     SetStatus(STATUS_WAIT_LEAVE);
     //we must set it this way, because end time is sent in packet!
     m_EndTime = TIME_TO_AUTOREMOVE;
-
     // arena rating calculation
     if (isArena() && isRated())
     {
@@ -720,12 +622,10 @@ void BattleGround::EndBattleGround(uint32 winner)
             SetArenaTeamRatingChangeForTeam(HORDE, 0);
         }
     }
-
     for(BattleGroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
     {
         Player *plr = objmgr.GetPlayer(itr->first);
         uint32 team = itr->second.Team;
-
         if (!plr)
         {
             //if rated arena match - make member lost!
@@ -739,11 +639,9 @@ void BattleGround::EndBattleGround(uint32 winner)
             sLog.outError("BattleGround: Player (GUID: %u) not found!", GUID_LOPART(itr->first));
             continue;
         }
-
         // should remove spirit of redemption
         if(plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
             plr->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
-
         if (!plr->isAlive())
         {
             plr->ResurrectPlayer(1.0f);
@@ -754,10 +652,8 @@ void BattleGround::EndBattleGround(uint32 winner)
             plr->CombatStop();
             plr->getHostilRefManager().deleteReferences();
         }
-
         //this line is obsolete - team is set ALWAYS
         //if(!team) team = plr->GetTeam();
-
         // per player calculation
         if (isArena() && isRated() && winner_arena_team && loser_arena_team && winner_arena_team != loser_arena_team)
         {
@@ -767,18 +663,15 @@ void BattleGround::EndBattleGround(uint32 winner)
                 ArenaTeamMember* member = winner_arena_team->GetMember(plr->GetGUID());
                 if (member)
                     plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, member->personal_rating);
-
                 winner_arena_team->MemberWon(plr,loser_rating);
             }
             else
             {
                 loser_arena_team->MemberLost(plr,winner_rating);
-
                 // Arena lost => reset the win_rated_arena having the "no_loose" condition
                 plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA, ACHIEVEMENT_CRITERIA_CONDITION_NO_LOOSE);
             }
         }
-
         if (team == winner)
         {
             RewardMark(plr,ITEM_WINNER_COUNT);
@@ -787,20 +680,15 @@ void BattleGround::EndBattleGround(uint32 winner)
         }
         else if(winner)
             RewardMark(plr,ITEM_LOSER_COUNT);
-
         plr->CombatStopWithPets(true);
-
         BlockMovement(plr);
-
         sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
         plr->GetSession()->SendPacket(&data);
-
         BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
         sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, TIME_TO_AUTOREMOVE, GetStartTime(), GetArenaType());
         plr->GetSession()->SendPacket(&data);
         plr->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND, 1);
     }
-
     if (isArena() && isRated() && winner_arena_team && loser_arena_team && winner_arena_team != loser_arena_team)
     {
         // update arena points only after increasing the player's match count!
@@ -814,17 +702,14 @@ void BattleGround::EndBattleGround(uint32 winner)
         winner_arena_team->NotifyStatsChanged();
         loser_arena_team->NotifyStatsChanged();
     }
-
     if (winmsg_id)
         SendMessageToAll(winmsg_id, CHAT_MSG_BG_SYSTEM_NEUTRAL);
 }
-
 uint32 BattleGround::GetBonusHonorFromKill(uint32 kills) const
 {
     //variable kills means how many honorable kills you scored (so we need kills * honor_for_one_kill)
     return MaNGOS::Honor::hk_honor_at_level(GetMaxLevel(), kills);
 }
-
 uint32 BattleGround::GetBattlemasterEntry() const
 {
     switch(GetTypeID())
@@ -837,7 +722,6 @@ uint32 BattleGround::GetBattlemasterEntry() const
         default:              return 0;
     }
 }
-
 void BattleGround::RewardMark(Player *plr,uint32 count)
 {
     BattleGroundMarks mark;
@@ -858,75 +742,60 @@ void BattleGround::RewardMark(Player *plr,uint32 count)
         default:
             return;
     }
-
     //if (IsSpell)
     //    RewardSpellCast(plr,mark);
     //else
         RewardItem(plr,mark,count);
 }
-
 void BattleGround::RewardSpellCast(Player *plr, uint32 spell_id)
 {
     // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
     if (plr->HasAura(SPELL_AURA_PLAYER_INACTIVE))
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
     if(!spellInfo)
     {
         sLog.outError("Battleground reward casting spell %u not exist.",spell_id);
         return;
     }
-
     plr->CastSpell(plr, spellInfo, true);
 }
-
 void BattleGround::RewardItem(Player *plr, uint32 item_id, uint32 count)
 {
     // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
     if (plr->HasAura(SPELL_AURA_PLAYER_INACTIVE))
         return;
-
     ItemPosCountVec dest;
     uint32 no_space_count = 0;
     uint8 msg = plr->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item_id, count, &no_space_count );
-
     if( msg == EQUIP_ERR_ITEM_NOT_FOUND)
     {
         sLog.outErrorDb("Battleground reward item (Entry %u) not exist in `item_template`.",item_id);
         return;
     }
-
     if( msg != EQUIP_ERR_OK )                               // convert to possible store amount
         count -= no_space_count;
-
     if( count != 0 && !dest.empty())                        // can add some
         if (Item* item = plr->StoreNewItem( dest, item_id, true, 0))
             plr->SendNewItem(item,count,true,false);
-
     if (no_space_count > 0)
         SendRewardMarkByMail(plr,item_id,no_space_count);
 }
-
 void BattleGround::SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count)
 {
     uint32 bmEntry = GetBattlemasterEntry();
     if (!bmEntry)
         return;
-
     ItemPrototype const* markProto = objmgr.GetItemPrototype(mark);
     if (!markProto)
         return;
-
     if (Item* markItem = Item::CreateItem(mark,count,plr))
     {
         // save new item before send
         markItem->SaveToDB();                               // save for prevent lost at next mail load, if send fail then item will deleted
-
         // item
         MailItemsInfo mi;
         mi.AddItem(markItem->GetGUIDLow(), markItem->GetEntry(), markItem);
-
         // subject: item name
         std::string subject = markProto->Name1;
         int loc_idx = plr->GetSession()->GetSessionDbLocaleIndex();
@@ -934,17 +803,14 @@ void BattleGround::SendRewardMarkByMail(Player *plr,uint32 mark, uint32 count)
             if (ItemLocale const *il = objmgr.GetItemLocale(markProto->ItemId))
                 if (il->Name.size() > size_t(loc_idx) && !il->Name[loc_idx].empty())
                     subject = il->Name[loc_idx];
-
         // text
         std::string textFormat = plr->GetSession()->GetTrinityString(LANG_BG_MARK_BY_MAIL);
         char textBuf[300];
         snprintf(textBuf,300,textFormat.c_str(),GetName(),GetName());
         uint32 itemTextId = objmgr.CreateItemText( textBuf );
-
         WorldSession::SendMailTo(plr, MAIL_CREATURE, MAIL_STATIONERY_NORMAL, bmEntry, plr->GetGUIDLow(), subject, itemTextId , &mi, 0, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 void BattleGround::RewardQuestComplete(Player *plr)
 {
     uint32 quest;
@@ -965,15 +831,12 @@ void BattleGround::RewardQuestComplete(Player *plr)
         default:
             return;
     }
-
     RewardSpellCast(plr, quest);
 }
-
 void BattleGround::BlockMovement(Player *plr)
 {
     plr->SetClientControl(plr, 0);                          // movement disabled NOTE: the effect will be automatically removed by client when the player is teleported from the battleground, so no need to send with uint8(1) in RemovePlayerAtLeave()
 }
-
 void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPacket)
 {
     uint32 team = GetPlayerTeam(guid);
@@ -987,30 +850,23 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
         // check if the player was a participant of the match, or only entered through gm command (goname)
         participant = true;
     }
-
     BattleGroundScoreMap::iterator itr2 = m_PlayerScores.find(guid);
     if (itr2 != m_PlayerScores.end())
     {
         delete itr2->second;                                // delete player's score
         m_PlayerScores.erase(itr2);
     }
-
     RemovePlayerFromResurrectQueue(guid);
-
     Player *plr = objmgr.GetPlayer(guid);
-
     // should remove spirit of redemption
     if(plr && plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
         plr->RemoveAurasByType(SPELL_AURA_MOD_SHAPESHIFT);
-
     if(plr && !plr->isAlive())                              // resurrect on exit
     {
         plr->ResurrectPlayer(1.0f);
         plr->SpawnCorpseBones();
     }
-
     RemovePlayer(plr, guid);                                // BG subclass specific code
-
     if(participant) // if the player was a match participant, remove auras, calc rating, update queue
     {
         BattleGroundTypeId bgTypeId = GetTypeID();
@@ -1018,19 +874,15 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
         if (plr)
         {
             plr->ClearAfkReports();
-
             if(!team) team = plr->GetTeam();
-
             // if arena, remove the specific arena auras
             if (isArena())
             {
                 plr->RemoveArenaAuras(true);                // removes debuffs / dots etc., we don't want the player to die after porting out
                 bgTypeId=BATTLEGROUND_AA;                   // set the bg type to all arenas (it will be used for queue refreshing)
-
                 // unsummon current and summon old pet if there was one and there isn't a current pet
                 plr->RemovePet(NULL, PET_SAVE_NOT_IN_SLOT);
                 plr->ResummonPetTemporaryUnSummonedIfAny();
-
                 if (isRated() && GetStatus() == STATUS_IN_PROGRESS)
                 {
                     //left a rated match while the encounter was in progress, consider as loser
@@ -1046,7 +898,6 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
                 sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_NONE, 0, 0, 0);
                 plr->GetSession()->SendPacket(&data);
             }
-
             // this call is important, because player, when joins to battleground, this method is not called, so it must be called when leaving bg
             plr->RemoveBattleGroundQueueId(bgQueueTypeId);
         }
@@ -1062,7 +913,6 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
                     players_arena_team->OfflineMemberLost(guid, others_arena_team->GetRating());
             }
         }
-
         // remove from raid group if player is member
         if (Group *group = GetBgRaid(team))
         {
@@ -1085,23 +935,18 @@ void BattleGround::RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPac
         sBattleGroundMgr.BuildPlayerLeftBattleGroundPacket(&data, guid);
         SendPacketToTeam(team, &data, plr, false);
     }
-
     if (plr)
     {
         // Do next only if found in battleground
         plr->SetBattleGroundId(0, BATTLEGROUND_TYPE_NONE);  // We're not in BG.
         // reset destination bg team
         plr->SetBGTeam(0);
-
         if (Transport)
             plr->TeleportToBGEntryPoint();
-
         sLog.outDetail("BATTLEGROUND: Removed player %s from BattleGround.", plr->GetName());
     }
-
     //battleground object will be deleted next BattleGround::Update() call
 }
-
 // this method is called when no players remains in battleground
 void BattleGround::Reset()
 {
@@ -1113,32 +958,24 @@ void BattleGround::Reset()
     SetLastResurrectTime(0);
     SetArenaType(0);
     SetRated(false);
-
     m_Events = 0;
-
     if (m_InvitedAlliance > 0 || m_InvitedHorde > 0)
         sLog.outError("BattleGround system: bad counter, m_InvitedAlliance: %d, m_InvitedHorde: %d", m_InvitedAlliance, m_InvitedHorde);
-
     m_InvitedAlliance = 0;
     m_InvitedHorde = 0;
     m_InBGFreeSlotQueue = false;
-
     m_Players.clear();
-
     for(BattleGroundScoreMap::const_iterator itr = m_PlayerScores.begin(); itr != m_PlayerScores.end(); ++itr)
         delete itr->second;
     m_PlayerScores.clear();
-
     ResetBGSubclass();
 }
-
 void BattleGround::StartBattleGround()
 {
     SetStartTime(0);
     SetLastResurrectTime(0);
     // add BG to free slot queue
     AddToBGFreeSlotQueue();
-
     // add bg to update list
     // This must be done here, because we need to have already invited some players when first BG::Update() method is executed
     // and it doesn't matter if we call StartBattleGround() more times, because m_BattleGrounds is a map and instance id never changes
@@ -1146,31 +983,23 @@ void BattleGround::StartBattleGround()
     if(m_IsRated)
         sLog.outArena("Arena match type: %u for Team1Id: %u - Team2Id: %u started.", m_ArenaType, m_ArenaTeamIds[BG_TEAM_ALLIANCE], m_ArenaTeamIds[BG_TEAM_HORDE]);
 }
-
 void BattleGround::AddPlayer(Player *plr)
 {
     // remove afk from player
     if (plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK))
         plr->ToggleAFK();
-
     // score struct must be created in inherited class
-
     uint64 guid = plr->GetGUID();
     uint32 team = plr->GetBGTeam();
-
     BattleGroundPlayer bp;
     bp.OfflineRemoveTime = 0;
     bp.Team = team;
-
     // Add to list/maps
     m_Players[guid] = bp;
-
     UpdatePlayersCountByTeam(team, false);                  // +1 player
-
     WorldPacket data;
     sBattleGroundMgr.BuildPlayerJoinedBattleGroundPacket(&data, plr);
     SendPacketToTeam(team, &data, plr, false);
-
     // add arena specific auras
     if (isArena())
     {
@@ -1191,14 +1020,11 @@ void BattleGround::AddPlayer(Player *plr)
             else
                 plr->CastSpell(plr, SPELL_ALLIANCE_GREEN_FLAG,true);
         }
-
         plr->DestroyConjuredItems(true);
         plr->UnsummonPetTemporaryIfAny();
-
         if(GetStatus() == STATUS_WAIT_JOIN)                 // not started yet
         {
             plr->CastSpell(plr, SPELL_ARENA_PREPARATION, true);
-
             plr->SetHealth(plr->GetMaxHealth());
             plr->SetPower(POWER_MANA, plr->GetMaxPower(POWER_MANA));
         }
@@ -1208,18 +1034,14 @@ void BattleGround::AddPlayer(Player *plr)
         if(GetStatus() == STATUS_WAIT_JOIN)                 // not started yet
             plr->CastSpell(plr, SPELL_PREPARATION, true);   // reduces all mana cost of spells.
     }
-
     plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
     plr->GetAchievementMgr().ResetAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, ACHIEVEMENT_CRITERIA_CONDITION_MAP, GetMapId());
-
     // setup BG group membership
     PlayerAddedToBGCheckIfBGIsRunning(plr);
     AddOrSetPlayerToCorrectBgGroup(plr, guid, team);
-
     // Log
     sLog.outDetail("BATTLEGROUND: Player %s joined the battle.", plr->GetName());
 }
-
 /* this method adds player to his team's bg group, or sets his correct group if player is already in bg group */
 void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid, uint32 team)
 {
@@ -1246,7 +1068,6 @@ void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid,
         }
     }
 }
-
 // This method should be called when player logs into running battleground
 void BattleGround::EventPlayerLoggedIn(Player* player, uint64 plr_guid)
 {
@@ -1264,7 +1085,6 @@ void BattleGround::EventPlayerLoggedIn(Player* player, uint64 plr_guid)
     // if battleground is starting, then add preparation aura
     // we don't have to do that, because preparation aura isn't removed when player logs out
 }
-
 // This method should be called when player logs out from running battleground
 void BattleGround::EventPlayerLoggedOut(Player* player)
 {
@@ -1283,7 +1103,6 @@ void BattleGround::EventPlayerLoggedOut(Player* player)
         }
     }
 }
-
 /* This method should be called only once ... it adds pointer to queue */
 void BattleGround::AddToBGFreeSlotQueue()
 {
@@ -1294,7 +1113,6 @@ void BattleGround::AddToBGFreeSlotQueue()
         m_InBGFreeSlotQueue = true;
     }
 }
-
 /* This method removes this battleground from free queue - it must be called when deleting battleground - not used now*/
 void BattleGround::RemoveFromBGFreeSlotQueue()
 {
@@ -1310,7 +1128,6 @@ void BattleGround::RemoveFromBGFreeSlotQueue()
         }
     }
 }
-
 // get the number of free slots for team
 // returns the number how many players can join battleground to MaxPlayersPerTeam
 uint32 BattleGround::GetFreeSlotsForTeam(uint32 Team) const
@@ -1342,7 +1159,6 @@ uint32 BattleGround::GetFreeSlotsForTeam(uint32 Team) const
         // allow join more ppl if the other side has more players
         else if(otherTeam > GetInvitedCount(Team))
             diff = otherTeam - GetInvitedCount(Team);
-
         // difference based on max players per team (don't allow inviting more)
         uint32 diff2 = (GetInvitedCount(Team) < GetMaxPlayersPerTeam()) ? GetMaxPlayersPerTeam() - GetInvitedCount(Team) : 0;
         // difference based on players who already entered
@@ -1357,9 +1173,7 @@ uint32 BattleGround::GetFreeSlotsForTeam(uint32 Team) const
         // or other side has less than minPlayersPerTeam
         else if (GetInvitedCount(Team) <= GetMinPlayersPerTeam())
             diff3 = GetMinPlayersPerTeam() - GetInvitedCount(Team) + 1;
-
         // return the minimum of the 3 differences
-
         // min of diff and diff 2
         diff = diff < diff2 ? diff : diff2;
         // min of diff, diff2 and diff3
@@ -1367,20 +1181,16 @@ uint32 BattleGround::GetFreeSlotsForTeam(uint32 Team) const
     }
     return 0;
 }
-
 bool BattleGround::HasFreeSlots() const
 {
     return GetPlayersSize() < GetMaxPlayers();
 }
-
 void BattleGround::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
 {
     //this procedure is called from virtual function implemented in bg subclass
     BattleGroundScoreMap::const_iterator itr = m_PlayerScores.find(Source->GetGUID());
-
     if(itr == m_PlayerScores.end())                         // player not found...
         return;
-
     switch(type)
     {
         case SCORE_KILLING_BLOWS:                           // Killing blows
@@ -1413,18 +1223,14 @@ void BattleGround::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
             break;
     }
 }
-
 void BattleGround::AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid)
 {
     m_ReviveQueue[npc_guid].push_back(player_guid);
-
     Player *plr = objmgr.GetPlayer(player_guid);
     if (!plr)
         return;
-
     plr->CastSpell(plr, SPELL_WAITING_FOR_RESURRECT, true);
 }
-
 void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid)
 {
     for(std::map<uint64, std::vector<uint64> >::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr)
@@ -1434,25 +1240,20 @@ void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid)
             if (*itr2 == player_guid)
             {
                 (itr->second).erase(itr2);
-
                 Player *plr = objmgr.GetPlayer(player_guid);
                 if (!plr)
                     return;
-
                 plr->RemoveAurasDueToSpell(SPELL_WAITING_FOR_RESURRECT);
-
                 return;
             }
         }
     }
 }
-
 bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime)
 {
     Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceID());
     if (!map)
         return false;
-
     // must be created this way, adding to godatamap would add it to the base map of the instance
     // and when loading it (in go::LoadFromDB()), a new guid would be assigned to the object, and a new object would be created
     // so we must create it specific for this instance
@@ -1467,11 +1268,9 @@ bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float
     }
 /*
     uint32 guid = go->GetGUIDLow();
-
     // without this, UseButtonOrDoor caused the crash, since it tried to get go info from godata
     // iirc that was changed, so adding to go data map is no longer required if that was the only function using godata from GameObject without checking if it existed
     GameObjectData& data = objmgr.NewGOData(guid);
-
     data.id             = entry;
     data.mapid          = GetMapId();
     data.posX           = x;
@@ -1492,7 +1291,6 @@ bool BattleGround::AddObject(uint32 type, uint32 entry, float x, float y, float
     m_BgObjects[type] = go->GetGUID();
     return true;
 }
-
 //some doors aren't despawned so we cannot handle their closing in gameobject::update()
 //it would be nice to correctly implement GO_ACTIVATED state and open/close doors in gameobject code
 void BattleGround::DoorClose(uint32 type)
@@ -1513,7 +1311,6 @@ void BattleGround::DoorClose(uint32 type)
         sLog.outError("BattleGround: Door object not found (cannot close doors)");
     }
 }
-
 void BattleGround::DoorOpen(uint32 type)
 {
     GameObject *obj = HashMapHolder<GameObject>::Find(m_BgObjects[type]);
@@ -1528,7 +1325,6 @@ void BattleGround::DoorOpen(uint32 type)
         sLog.outError("BattleGround: Door object not found! - doors will be closed.");
     }
 }
-
 GameObject* BattleGround::GetBGObject(uint32 type)
 {
     GameObject *obj = HashMapHolder<GameObject>::Find(m_BgObjects[type]);
@@ -1536,7 +1332,6 @@ GameObject* BattleGround::GetBGObject(uint32 type)
         sLog.outError("couldn't get gameobject %i",type);
     return obj;
 }
-
 Creature* BattleGround::GetBGCreature(uint32 type)
 {
     Creature *creature = HashMapHolder<Creature>::Find(m_BgCreatures[type]);
@@ -1544,7 +1339,6 @@ Creature* BattleGround::GetBGCreature(uint32 type)
         sLog.outError("couldn't get creature %i",type);
     return creature;
 }
-
 void BattleGround::SpawnBGObject(uint32 type, uint32 respawntime)
 {
     Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceID());
@@ -1573,13 +1367,11 @@ void BattleGround::SpawnBGObject(uint32 type, uint32 respawntime)
         }
     }
 }
-
 Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, float x, float y, float z, float o, uint32 respawntime)
 {
     Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceID());
     if (!map)
         return NULL;
-
     Creature* pCreature = new Creature;
     if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, 0, teamval, x, y, z, o))
     {
@@ -1587,14 +1379,10 @@ Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, f
         delete pCreature;
         return NULL;
     }
-
     pCreature->SetHomePosition(x, y, z, o);
-
     //pCreature->SetDungeonDifficulty(0);
-
     map->Add(pCreature);
     m_BgCreatures[type] = pCreature->GetGUID();
-
     return  pCreature;
 }
 /*
@@ -1603,7 +1391,6 @@ void BattleGround::SpawnBGCreature(uint32 type, uint32 respawntime)
     Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceId());
     if (!map)
         return false;
-
     if (respawntime == 0)
     {
         Creature *obj = HashMapHolder<Creature>::Find(m_BgCreatures[type]);
@@ -1631,7 +1418,6 @@ bool BattleGround::DelCreature(uint32 type)
 {
     if (!m_BgCreatures[type])
         return true;
-
     Creature *cr = HashMapHolder<Creature>::Find(m_BgCreatures[type]);
     if (!cr)
     {
@@ -1642,12 +1428,10 @@ bool BattleGround::DelCreature(uint32 type)
     m_BgCreatures[type] = 0;
     return true;
 }
-
 bool BattleGround::DelObject(uint32 type)
 {
     if (!m_BgObjects[type])
         return true;
-
     GameObject *obj = HashMapHolder<GameObject>::Find(m_BgObjects[type]);
     if (!obj)
     {
@@ -1659,16 +1443,13 @@ bool BattleGround::DelObject(uint32 type)
     m_BgObjects[type] = 0;
     return true;
 }
-
 bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float o, uint32 team)
 {
     uint32 entry = 0;
-
     if (team == ALLIANCE)
         entry = BG_CREATURE_ENTRY_A_SPIRITGUIDE;
     else
         entry = BG_CREATURE_ENTRY_H_SPIRITGUIDE;
-
     Creature* pCreature = AddCreature(entry,type,team,x,y,z,o);
     if (!pCreature)
     {
@@ -1676,14 +1457,11 @@ bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float
         EndNow();
         return false;
     }
-
     pCreature->setDeathState(DEAD);
-
     pCreature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pCreature->GetGUID());
     // aura
     //TODO: Fix display here
     //pCreature->SetVisibleAura(0, SPELL_SPIRIT_HEAL_CHANNEL);
-
     //pCreature->SetUInt32Value(UNIT_FIELD_AURAFLAGS, 0x00000009);
     //pCreature->SetUInt32Value(UNIT_FIELD_AURALEVELS, 0x0000003C);
     //pCreature->SetUInt32Value(UNIT_FIELD_AURAAPPLICATIONS, 0x000000FF);
@@ -1691,52 +1469,42 @@ bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float
     pCreature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SPIRIT_HEAL_CHANNEL);
     // correct cast speed
     pCreature->SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
-
     //pCreature->CastSpell(pCreature, SPELL_SPIRIT_HEAL_CHANNEL, true);
-
     return true;
 }
-
 void BattleGround::SendMessageToAll(int32 entry, ChatMsg type, Player const* source)
 {
     MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source);
     MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
     BroadcastWorker(bg_do);
 }
-
 void BattleGround::PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...)
 {
     va_list ap;
     va_start(ap, source);
-
     MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source, &ap);
     MaNGOS::LocalizedPacketDo<MaNGOS::BattleGroundChatBuilder> bg_do(bg_builder);
     BroadcastWorker(bg_do);
-
     va_end(ap);
 }
-
 void BattleGround::SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 arg1, int32 arg2)
 {
     MaNGOS::BattleGround2ChatBuilder bg_builder(type, entry, source, arg1, arg2);
     MaNGOS::LocalizedPacketDo<MaNGOS::BattleGround2ChatBuilder> bg_do(bg_builder);
     BroadcastWorker(bg_do);
 }
-
 void BattleGround::EndNow()
 {
     RemoveFromBGFreeSlotQueue();
     SetStatus(STATUS_WAIT_LEAVE);
     SetEndTime(0);
 }
-
 //to be removed
 const char *BattleGround::GetTrinityString(int32 entry)
 {
     // FIXME: now we have different DBC locales and need localized message for each target client
     return objmgr.GetTrinityStringForDBCLocale(entry);
 }
-
 /*
 important notice:
 buffs aren't spawned/despawned when players captures anything
@@ -1747,7 +1515,6 @@ void BattleGround::HandleTriggerBuff(uint64 const& go_guid)
     GameObject *obj = HashMapHolder<GameObject>::Find(go_guid);
     if (!obj || obj->GetGoType() != GAMEOBJECT_TYPE_TRAP || !obj->isSpawned())
         return;
-
     //change buff type, when buff is used:
     int32 index = m_BgObjects.size() - 1;
     while (index >= 0 && m_BgObjects[index] != go_guid)
@@ -1757,7 +1524,6 @@ void BattleGround::HandleTriggerBuff(uint64 const& go_guid)
         sLog.outError("BattleGround (Type: %u) has buff gameobject (Guid: %u Entry: %u Type:%u) but it hasn't that object in its internal data",GetTypeID(),GUID_LOPART(go_guid),obj->GetEntry(),obj->GetGoType());
         return;
     }
-
     //randomly select new buff
     uint8 buff = urand(0, 2);
     uint32 entry = obj->GetEntry();
@@ -1773,40 +1539,31 @@ void BattleGround::HandleTriggerBuff(uint64 const& go_guid)
                 index += buff;
             }
     }
-
     SpawnBGObject(index, BUFF_RESPAWN_TIME);
 }
-
 void BattleGround::HandleKillPlayer( Player *player, Player *killer )
 {
     //keep in mind that for arena this will have to be changed a bit
-
     // add +1 deaths
     UpdatePlayerScore(player, SCORE_DEATHS, 1);
-
     // add +1 kills to group and +1 killing_blows to killer
     if (killer)
     {
         UpdatePlayerScore(killer, SCORE_HONORABLE_KILLS, 1);
         UpdatePlayerScore(killer, SCORE_KILLING_BLOWS, 1);
-
         for(BattleGroundPlayerMap::const_iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
         {
             Player *plr = objmgr.GetPlayer(itr->first);
-
             if (!plr || plr == killer)
                 continue;
-
             if (plr->GetTeam() == killer->GetTeam() && plr->IsAtGroupRewardDistance(player))
                 UpdatePlayerScore(plr, SCORE_HONORABLE_KILLS, 1);
         }
     }
-
     // to be able to remove insignia -- ONLY IN BattleGrounds
     if (!isArena())
         player->SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE );
 }
-
 // return the player's team based on battlegroundplayer info
 // used in same faction arena matches mainly
 uint32 BattleGround::GetPlayerTeam(uint64 guid)
@@ -1816,12 +1573,10 @@ uint32 BattleGround::GetPlayerTeam(uint64 guid)
         return itr->second.Team;
     return 0;
 }
-
 uint32 BattleGround::GetOtherTeam(uint32 teamId)
 {
     return (teamId) ? ((teamId == ALLIANCE) ? HORDE : ALLIANCE) : 0;
 }
-
 bool BattleGround::IsPlayerInBattleGround(uint64 guid)
 {
     BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
@@ -1829,24 +1584,18 @@ bool BattleGround::IsPlayerInBattleGround(uint64 guid)
         return true;
     return false;
 }
-
 void BattleGround::PlayerAddedToBGCheckIfBGIsRunning(Player* plr)
 {
     if (GetStatus() != STATUS_WAIT_LEAVE)
         return;
-
     WorldPacket data;
     BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(GetTypeID(), GetArenaType());
-
     BlockMovement(plr);
-
     sBattleGroundMgr.BuildPvpLogDataPacket(&data, this);
     plr->GetSession()->SendPacket(&data);
-
     sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, this, plr->GetBattleGroundQueueIndex(bgQueueTypeId), STATUS_IN_PROGRESS, GetEndTime(), GetStartTime(), GetArenaType());
     plr->GetSession()->SendPacket(&data);
 }
-
 uint32 BattleGround::GetAlivePlayersCountByTeam(uint32 Team) const
 {
     int count = 0;
@@ -1861,7 +1610,6 @@ uint32 BattleGround::GetAlivePlayersCountByTeam(uint32 Team) const
     }
     return count;
 }
-
 void BattleGround::SetHoliday(bool is_holiday)
 {
     if(is_holiday)
@@ -1869,7 +1617,6 @@ void BattleGround::SetHoliday(bool is_holiday)
     else
         m_HonorMode = BG_NORMAL;
 }
-
 int32 BattleGround::GetObjectType(uint64 guid)
 {
     for(uint32 i = 0; i < m_BgObjects.size(); ++i)
@@ -1878,11 +1625,9 @@ int32 BattleGround::GetObjectType(uint64 guid)
     sLog.outError("BattleGround: cheating? a player used a gameobject which isnt supposed to be a usable object!");
     return -1;
 }
-
 void BattleGround::HandleKillUnit(Creature *creature, Player *killer)
 {
 }
-
 void BattleGround::CheckArenaWinConditions()
 {
     if (!GetAlivePlayersCountByTeam(ALLIANCE) && GetPlayersCountByTeam(HORDE))
@@ -1890,7 +1635,6 @@ void BattleGround::CheckArenaWinConditions()
     else if (GetPlayersCountByTeam(ALLIANCE) && !GetAlivePlayersCountByTeam(HORDE))
         EndBattleGround(ALLIANCE);
 }
-
 void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
 {
     Group* &old_raid = TeamID == ALLIANCE ? m_BgRaids[BG_TEAM_ALLIANCE] : m_BgRaids[BG_TEAM_HORDE];
@@ -1898,12 +1642,10 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
     if(bg_raid) bg_raid->SetBattlegroundGroup(this);
     old_raid = bg_raid;
 }
-
 WorldSafeLocsEntry const* BattleGround::GetClosestGraveYard( Player* player )
 {
     return objmgr.GetClosestGraveYard( player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam() );
 }
-
 bool BattleGround::IsTeamScoreInRange(uint32 team, uint32 minScore, uint32 maxScore) const
 {
     BattleGroundTeamId team_idx = GetTeamIndexByTeamId(team);
diff --git a/src/game/BattleGround.h b/src/game/BattleGround.h
index 007f7a642dd..cb19fd92525 100644
--- a/src/game/BattleGround.h
+++ b/src/game/BattleGround.h
@@ -17,21 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __BATTLEGROUND_H
 #define __BATTLEGROUND_H
-
 #include "Common.h"
 #include "SharedDefines.h"
-
 class Creature;
 class GameObject;
 class Group;
 class Player;
 class WorldPacket;
-
 struct WorldSafeLocsEntry;
-
 enum BattleGroundSounds
 {
     SOUND_HORDE_WINS                = 8454,
@@ -39,7 +34,6 @@ enum BattleGroundSounds
     SOUND_BG_START                  = 3439,
     SOUND_BG_START_L70ETC           = 11803,
 };
-
 enum BattleGroundQuests
 {
     SPELL_WS_QUEST_REWARD           = 43483,
@@ -50,7 +44,6 @@ enum BattleGroundQuests
     SPELL_AB_QUEST_REWARD_4_BASES   = 24061,
     SPELL_AB_QUEST_REWARD_5_BASES   = 24064
 };
-
 enum BattleGroundMarks
 {
     SPELL_WS_MARK_LOSER             = 24950,
@@ -64,19 +57,16 @@ enum BattleGroundMarks
     ITEM_AB_MARK_OF_HONOR           = 20559,
     ITEM_EY_MARK_OF_HONOR           = 29024
 };
-
 enum BattleGroundMarksCount
 {
     ITEM_WINNER_COUNT               = 3,
     ITEM_LOSER_COUNT                = 1
 };
-
 enum BattleGroundCreatures
 {
     BG_CREATURE_ENTRY_A_SPIRITGUIDE      = 13116,           // alliance
     BG_CREATURE_ENTRY_H_SPIRITGUIDE      = 13117,           // horde
 };
-
 enum BattleGroundSpells
 {
     SPELL_WAITING_FOR_RESURRECT     = 2584,                 // Waiting to Resurrect
@@ -93,7 +83,6 @@ enum BattleGroundSpells
     SPELL_RECENTLY_DROPPED_FLAG     = 42792,                // Recently Dropped Flag
     SPELL_AURA_PLAYER_INACTIVE      = 43681                 // Inactive
 };
-
 enum BattleGroundTimeIntervals
 {
     RESURRECTION_INTERVAL           = 30000,                // ms
@@ -106,7 +95,6 @@ enum BattleGroundTimeIntervals
     RESPAWN_IMMEDIATELY             = 0,                    // secs
     BUFF_RESPAWN_TIME               = 180,                  // secs
 };
-
 enum BattleGroundStartTimeIntervals
 {
     BG_START_DELAY_2M               = 120000,               // ms (2 minutes)
@@ -115,16 +103,13 @@ enum BattleGroundStartTimeIntervals
     BG_START_DELAY_15S              = 15000,                // ms (15 seconds) Used only in arena
     BG_START_DELAY_NONE             = 0,                    // ms
 };
-
 enum BattleGroundBuffObjects
 {
     BG_OBJECTID_SPEEDBUFF_ENTRY     = 179871,
     BG_OBJECTID_REGENBUFF_ENTRY     = 179904,
     BG_OBJECTID_BERSERKERBUFF_ENTRY = 179905
 };
-
 const uint32 Buff_Entries[3] = { BG_OBJECTID_SPEEDBUFF_ENTRY, BG_OBJECTID_REGENBUFF_ENTRY, BG_OBJECTID_BERSERKERBUFF_ENTRY };
-
 enum BattleGroundStatus
 {
     STATUS_NONE         = 0,                                // first status, should mean bg is not instance
@@ -133,22 +118,18 @@ enum BattleGroundStatus
     STATUS_IN_PROGRESS  = 3,                                // means bg is running
     STATUS_WAIT_LEAVE   = 4                                 // means some faction has won BG and it is ending
 };
-
 struct BattleGroundPlayer
 {
     time_t  OfflineRemoveTime;                              // for tracking and removing offline players from queue after 5 minutes
     uint32  Team;                                           // Player's team
 };
-
 struct BattleGroundObjectInfo
 {
     BattleGroundObjectInfo() : object(NULL), timer(0), spellid(0) {}
-
     GameObject  *object;
     int32       timer;
     uint32      spellid;
 };
-
 // handle the queue types and bg types separately to enable joining queue for different sized arenas at the same time
 enum BattleGroundQueueTypeId
 {
@@ -163,7 +144,6 @@ enum BattleGroundQueueTypeId
     BATTLEGROUND_QUEUE_5v5      = 8
 };
 #define MAX_BATTLEGROUND_QUEUE_TYPES 9
-
 enum BGQueueIdBasedOnLevel                        // queue_id for level ranges
 {
     QUEUE_ID_MAX_LEVEL_19   = 0,
@@ -176,7 +156,6 @@ enum BGQueueIdBasedOnLevel                        // queue_id for level ranges
     QUEUE_ID_MAX_LEVEL_80   = 7
 };
 #define MAX_BATTLEGROUND_QUEUES 8
-
 enum ScoreType
 {
     SCORE_KILLING_BLOWS         = 1,
@@ -202,34 +181,29 @@ enum ScoreType
     SCORE_SECONDARY_OBJECTIVES  = 17
     // TODO : implement them
 };
-
 enum ArenaType
 {
     ARENA_TYPE_2v2          = 2,
     ARENA_TYPE_3v3          = 3,
     ARENA_TYPE_5v5          = 5
 };
-
 enum BattleGroundType
 {
     TYPE_BATTLEGROUND     = 3,
     TYPE_ARENA            = 4
 };
-
 enum BattleGroundWinner
 {
     WINNER_HORDE            = 0,
     WINNER_ALLIANCE         = 1,
     WINNER_NONE             = 2
 };
-
 enum BattleGroundTeamId
 {
     BG_TEAM_ALLIANCE        = 0,
     BG_TEAM_HORDE           = 1
 };
 #define BG_TEAMS_COUNT  2
-
 enum BattleGroundStartingEvents
 {
     BG_STARTING_EVENT_NONE  = 0x00,
@@ -238,7 +212,6 @@ enum BattleGroundStartingEvents
     BG_STARTING_EVENT_3     = 0x04,
     BG_STARTING_EVENT_4     = 0x08
 };
-
 enum BattleGroundStartingEventsIds
 {
     BG_STARTING_EVENT_FIRST     = 0,
@@ -247,7 +220,6 @@ enum BattleGroundStartingEventsIds
     BG_STARTING_EVENT_FOURTH    = 3
 };
 #define BG_STARTING_EVENT_COUNT 4
-
 enum BattleGroundJoinError
 {
     BG_JOIN_ERR_OK = 0,
@@ -261,7 +233,6 @@ enum BattleGroundJoinError
     BG_JOIN_ERR_ALL_QUEUES_USED = 8,
     BG_JOIN_ERR_GROUP_NOT_ENOUGH = 9
 };
-
 class BattleGroundScore
 {
     public:
@@ -269,7 +240,6 @@ class BattleGroundScore
             BonusHonor(0), DamageDone(0), HealingDone(0)
         {}
         virtual ~BattleGroundScore() {}                     //virtual destructor is used when deleting score from scores map
-
         uint32 KillingBlows;
         uint32 Deaths;
         uint32 HonorableKills;
@@ -277,14 +247,12 @@ class BattleGroundScore
         uint32 DamageDone;
         uint32 HealingDone;
 };
-
 enum BGHonorMode
 {
     BG_NORMAL = 0,
     BG_HOLIDAY,
     BG_HONOR_MODE_NUM
 };
-
 /*
 This class is used to:
 1. Add player to battleground
@@ -295,7 +263,6 @@ This class is used to:
 class BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         /* Construction */
         BattleGround();
@@ -312,11 +279,9 @@ class BattleGround
         virtual void ResetBGSubclass()                      // must be implemented in BG subclass
         {
         }
-
         /* achievement req. */
         virtual bool IsAllNodesConrolledByTeam(uint32 /*team*/) const { return false; }
         bool IsTeamScoreInRange(uint32 team, uint32 minScore, uint32 maxScore) const;
-
         /* Battleground */
         // Get methods:
         char const* GetName() const         { return m_Name; }
@@ -330,19 +295,15 @@ class BattleGround
         uint32 GetLastResurrectTime() const { return m_LastResurrectTime; }
         uint32 GetMaxPlayers() const        { return m_MaxPlayers; }
         uint32 GetMinPlayers() const        { return m_MinPlayers; }
-
         uint32 GetMinLevel() const          { return m_LevelMin; }
         uint32 GetMaxLevel() const          { return m_LevelMax; }
-
         uint32 GetMaxPlayersPerTeam() const { return m_MaxPlayersPerTeam; }
         uint32 GetMinPlayersPerTeam() const { return m_MinPlayersPerTeam; }
-
         int32 GetStartDelayTime() const     { return m_StartDelayTime; }
         uint8 GetArenaType() const          { return m_ArenaType; }
         uint8 GetWinner() const             { return m_Winner; }
         uint32 GetBattlemasterEntry() const;
         uint32 GetBonusHonorFromKill(uint32 kills) const;
-
         // Set methods:
         void SetName(char const* Name)      { m_Name = Name; }
         void SetTypeID(BattleGroundTypeId TypeID) { m_TypeID = TypeID; }
@@ -366,16 +327,12 @@ class BattleGround
         void SetArenaType(uint8 type)       { m_ArenaType = type; }
         void SetArenaorBGType(bool _isArena) { m_IsArena = _isArena; }
         void SetWinner(uint8 winner)        { m_Winner = winner; }
-
         void ModifyStartDelayTime(int diff) { m_StartDelayTime -= diff; }
         void SetStartDelayTime(int Time)    { m_StartDelayTime = Time; }
-
         void SetMaxPlayersPerTeam(uint32 MaxPlayers) { m_MaxPlayersPerTeam = MaxPlayers; }
         void SetMinPlayersPerTeam(uint32 MinPlayers) { m_MinPlayersPerTeam = MinPlayers; }
-
         void AddToBGFreeSlotQueue();                        //this queue will be useful when more battlegrounds instances will be available
         void RemoveFromBGFreeSlotQueue();                   //this method could delete whole BG instance, if another free is available
-
         void DecreaseInvitedCount(uint32 team)      { (team == ALLIANCE) ? --m_InvitedAlliance : --m_InvitedHorde; }
         void IncreaseInvitedCount(uint32 team)      { (team == ALLIANCE) ? ++m_InvitedAlliance : ++m_InvitedHorde; }
         uint32 GetInvitedCount(uint32 team) const
@@ -387,33 +344,25 @@ class BattleGround
         }
         bool HasFreeSlots() const;
         uint32 GetFreeSlotsForTeam(uint32 Team) const;
-
         bool isArena() const        { return m_IsArena; }
         bool isBattleGround() const { return !m_IsArena; }
         bool isRated() const        { return m_IsRated; }
-
         typedef std::map<uint64, BattleGroundPlayer> BattleGroundPlayerMap;
         BattleGroundPlayerMap const& GetPlayers() const { return m_Players; }
         uint32 GetPlayersSize() const { return m_Players.size(); }
-
         typedef std::map<uint64, BattleGroundScore*> BattleGroundScoreMap;
         BattleGroundScoreMap::const_iterator GetPlayerScoresBegin() const { return m_PlayerScores.begin(); }
         BattleGroundScoreMap::const_iterator GetPlayerScoresEnd() const { return m_PlayerScores.end(); }
         uint32 GetPlayerScoresSize() const { return m_PlayerScores.size(); }
-
         uint32 GetReviveQueueSize() const { return m_ReviveQueue.size(); }
-
         void AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid);
         void RemovePlayerFromResurrectQueue(uint64 player_guid);
-
         void StartBattleGround();
-
         GameObject* GetBGObject(uint32 type);
         Creature* GetBGCreature(uint32 type);
         /* Location */
         void SetMapId(uint32 MapID) { m_MapId = MapID; }
         uint32 GetMapId() const { return m_MapId; }
-
         void SetTeamStartLoc(uint32 TeamID, float X, float Y, float Z, float O);
         void GetTeamStartLoc(uint32 TeamID, float &X, float &Y, float &Z, float &O) const
         {
@@ -423,17 +372,14 @@ class BattleGround
             Z = m_TeamStartLocZ[idx];
             O = m_TeamStartLocO[idx];
         }
-
         /* Packet Transfer */
         // method that should fill worldpacket with actual world states (not yet implemented for all battlegrounds!)
         virtual void FillInitialWorldStates(WorldPacket& /*data*/) {}
         void SendPacketToTeam(uint32 TeamID, WorldPacket *packet, Player *sender = NULL, bool self = true);
         void SendPacketToAll(WorldPacket *packet);
         void YellToAll(Creature* creature, const char* text, uint32 language);
-
         template<class Do>
         void BroadcastWorker(Do& _do);
-
         void PlaySoundToTeam(uint32 SoundID, uint32 TeamID);
         void PlaySoundToAll(uint32 SoundID);
         void CastSpellOnTeam(uint32 SpellID, uint32 TeamID);
@@ -448,19 +394,14 @@ class BattleGround
         void UpdateWorldStateForPlayer(uint32 Field, uint32 Value, Player *Source);
         void EndBattleGround(uint32 winner);
         void BlockMovement(Player *plr);
-
         void SendMessageToAll(int32 entry, ChatMsg type, Player const* source = NULL);
         void PSendMessageToAll(int32 entry, ChatMsg type, Player const* source, ...  );
-
         // specialized version with 2 string id args
         void SendMessage2ToAll(int32 entry, ChatMsg type, Player const* source, int32 strId1 = 0, int32 strId2 = 0);
-
         /* Raid Group */
         Group *GetBgRaid(uint32 TeamID) const { return TeamID == ALLIANCE ? m_BgRaids[BG_TEAM_ALLIANCE] : m_BgRaids[BG_TEAM_HORDE]; }
         void SetBgRaid(uint32 TeamID, Group *bg_raid);
-
         virtual void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
         static BattleGroundTeamId GetTeamIndexByTeamId(uint32 Team) { return Team == ALLIANCE ? BG_TEAM_ALLIANCE : BG_TEAM_HORDE; }
         uint32 GetPlayersCountByTeam(uint32 Team) const { return m_PlayersCount[GetTeamIndexByTeamId(Team)]; }
         uint32 GetAlivePlayersCountByTeam(uint32 Team) const;   // used in arenas to correctly handle death in spirit of redemption / last stand etc. (killer = killed) cases
@@ -471,41 +412,32 @@ class BattleGround
             else
                 ++m_PlayersCount[GetTeamIndexByTeamId(Team)];
         }
-
         // used for rated arena battles
         void SetArenaTeamIdForTeam(uint32 Team, uint32 ArenaTeamId) { m_ArenaTeamIds[GetTeamIndexByTeamId(Team)] = ArenaTeamId; }
         uint32 GetArenaTeamIdForTeam(uint32 Team) const             { return m_ArenaTeamIds[GetTeamIndexByTeamId(Team)]; }
         void SetArenaTeamRatingChangeForTeam(uint32 Team, int32 RatingChange) { m_ArenaTeamRatingChanges[GetTeamIndexByTeamId(Team)] = RatingChange; }
         int32 GetArenaTeamRatingChangeForTeam(uint32 Team) const    { return m_ArenaTeamRatingChanges[GetTeamIndexByTeamId(Team)]; }
         void CheckArenaWinConditions();
-
         /* Triggers handle */
         // must be implemented in BG subclass
         virtual void HandleAreaTrigger(Player* /*Source*/, uint32 /*Trigger*/) {}
         // must be implemented in BG subclass if need AND call base class generic code
         virtual void HandleKillPlayer(Player *player, Player *killer);
         virtual void HandleKillUnit(Creature* /*unit*/, Player* /*killer*/);
-
         /* Battleground events */
         virtual void EventPlayerDroppedFlag(Player* /*player*/) {}
         virtual void EventPlayerClickedOnFlag(Player* /*player*/, GameObject* /*target_obj*/) {}
         virtual void EventPlayerCapturedFlag(Player* /*player*/) {}
         void EventPlayerLoggedIn(Player* player, uint64 plr_guid);
         void EventPlayerLoggedOut(Player* player);
-
         /* Death related */
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-
         virtual void AddPlayer(Player *plr);                // must be implemented in BG subclass
-
         void AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid, uint32 team);
-
         virtual void RemovePlayerAtLeave(uint64 guid, bool Transport, bool SendPacket);
                                                             // can be extended in in BG subclass
-
         void HandleTriggerBuff(uint64 const& go_guid);
         void SetHoliday(bool is_holiday);
-
         // TODO: make this protected:
         typedef std::vector<uint64> BGObjects;
         typedef std::vector<uint64> BGCreatures;
@@ -519,40 +451,30 @@ class BattleGround
         bool DelObject(uint32 type);
         bool AddSpiritGuide(uint32 type, float x, float y, float z, float o, uint32 team);
         int32 GetObjectType(uint64 guid);
-
         void DoorOpen(uint32 type);
         void DoorClose(uint32 type);
         //to be removed
         const char *GetTrinityString(int32 entry);
-
         virtual bool HandlePlayerUnderMap(Player * /*plr*/) { return false; }
-
         // since arenas can be AvA or Hvh, we have to get the "temporary" team of a player
         uint32 GetPlayerTeam(uint64 guid);
         uint32 GetOtherTeam(uint32 teamId);
         bool IsPlayerInBattleGround(uint64 guid);
-
         void SetDeleteThis() {m_SetDeleteThis = true;}
-
         /* virtual score-array - get's used in bg-subclasses */
         int32 m_TeamScores[BG_TEAMS_COUNT];
-
     protected:
         //this method is called, when BG cannot spawn its own spirit guide, or something is wrong, It correctly ends BattleGround
         void EndNow();
         void PlayerAddedToBGCheckIfBGIsRunning(Player* plr);
-
         /* Scorekeeping */
-                                                            
         BattleGroundScoreMap m_PlayerScores;                // Player scores
         // must be implemented in BG subclass
         virtual void RemovePlayer(Player * /*player*/, uint64 /*guid*/) {}
-
         /* Player lists, those need to be accessible by inherited classes */
         BattleGroundPlayerMap  m_Players;
                                                             // Spirit Guide guid + Player list GUIDS
         std::map<uint64, std::vector<uint64> >  m_ReviveQueue;
-
         /*
         these are important variables used for starting messages
         */
@@ -560,9 +482,7 @@ class BattleGround
         BattleGroundStartTimeIntervals  m_StartDelayTimes[BG_STARTING_EVENT_COUNT];
         //this must be filled in constructors!
         uint32 m_StartMessageIds[BG_STARTING_EVENT_COUNT];
-
         bool   m_BuffChange;
-
         BGHonorMode m_HonorMode;
     private:
         /* Battleground */
@@ -584,28 +504,21 @@ class BattleGround
         bool   m_PrematureCountDown;
         uint32 m_PrematureCountDownTimer;
         char const *m_Name;
-
         /* Player lists */
         std::vector<uint64> m_ResurrectQueue;               // Player GUID
         std::deque<uint64> m_OfflineQueue;                  // Player GUID
-
         /* Invited counters are useful for player invitation to BG - do not allow, if BG is started to one faction to have 2 more players than another faction */
         /* Invited counters will be changed only when removing already invited player from queue, removing player from battleground and inviting player to BG */
         /* Invited players counters*/
         uint32 m_InvitedAlliance;
         uint32 m_InvitedHorde;
-
         /* Raid Group */
         Group *m_BgRaids[BG_TEAMS_COUNT];                                // 0 - alliance, 1 - horde
-
         /* Players count by team */
         uint32 m_PlayersCount[BG_TEAMS_COUNT];
-
         /* Arena team ids by team */
         uint32 m_ArenaTeamIds[BG_TEAMS_COUNT];
-
         int32 m_ArenaTeamRatingChanges[BG_TEAMS_COUNT];
-
         /* Limits */
         uint32 m_LevelMin;
         uint32 m_LevelMax;
@@ -613,7 +526,6 @@ class BattleGround
         uint32 m_MaxPlayers;
         uint32 m_MinPlayersPerTeam;
         uint32 m_MinPlayers;
-
         /* Start location */
         uint32 m_MapId;
         float m_TeamStartLocX[BG_TEAMS_COUNT];
diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp
index 6133508ece1..4122325cd66 100644
--- a/src/game/BattleGroundAA.cpp
+++ b/src/game/BattleGroundAA.cpp
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
 #include "Language.h"
 #include "Player.h"
-
 BattleGroundAA::BattleGroundAA()
 {
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -36,47 +33,36 @@ BattleGroundAA::BattleGroundAA()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundAA::~BattleGroundAA()
 {
-
 }
-
 void BattleGroundAA::Update(uint32 diff)
 {
     BattleGround::Update(diff);
 }
-
 void BattleGroundAA::StartingEventCloseDoors()
 {
 }
-
 void BattleGroundAA::StartingEventOpenDoors()
 {
 }
-
 void BattleGroundAA::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundAAScore* sc = new BattleGroundAAScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundAA::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
 {
 }
-
 void BattleGroundAA::HandleKillPlayer(Player* player, Player* killer)
 {
     BattleGround::HandleKillPlayer(player, killer);
 }
-
 void BattleGroundAA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
 {
 }
-
 bool BattleGroundAA::SetupBattleGround()
 {
     return true;
diff --git a/src/game/BattleGroundAA.h b/src/game/BattleGroundAA.h
index 06793ea38e0..241a1ba73c1 100644
--- a/src/game/BattleGroundAA.h
+++ b/src/game/BattleGroundAA.h
@@ -19,9 +19,7 @@
  */
 #ifndef __BATTLEGROUNDAA_H
 #define __BATTLEGROUNDAA_H
-
 class BattleGround;
-
 class BattleGroundAAScore : public BattleGroundScore
 {
     public:
@@ -29,21 +27,17 @@ class BattleGroundAAScore : public BattleGroundScore
         virtual ~BattleGroundAAScore() {};
         //TODO fix me
 };
-
 class BattleGroundAA : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundAA();
         ~BattleGroundAA();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index 6609c3400be..16eda4b9e94 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "World.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
@@ -29,42 +28,34 @@
 #include "Object.h"
 #include "Player.h"
 #include "Util.h"
-
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
     330, // normal honor
     200  // holiday
 };
-
 uint32 BG_AB_ReputationScoreTicks[BG_HONOR_MODE_NUM] = {
     200, // normal honor
     150  // holiday
 };
-
 BattleGroundAB::BattleGroundAB()
 {
     m_BuffChange = true;
     m_BgObjects.resize(BG_AB_OBJECT_MAX);
     m_BgCreatures.resize(BG_AB_ALL_NODES_COUNT);
-
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_AB_START_TWO_MINUTES;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AB_START_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AB_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AB_HAS_BEGUN;
 }
-
 BattleGroundAB::~BattleGroundAB()
 {
 }
-
 void BattleGroundAB::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
         int team_points[BG_TEAMS_COUNT] = { 0, 0 };
-
         for (int node = 0; node < BG_AB_DYNAMIC_NODES_COUNT; ++node)
         {
             // 3 sec delay to spawn new banner instead previous despawned one
@@ -78,7 +69,6 @@ void BattleGroundAB::Update(uint32 diff)
                     _CreateBanner(node, m_BannerTimers[node].type, m_BannerTimers[node].teamIndex, false);
                 }
             }
-
             // 1-minute to occupy a node from contested state
             if (m_NodeTimers[node])
             {
@@ -98,7 +88,6 @@ void BattleGroundAB::Update(uint32 diff)
                     _SendNodeUpdate(node);
                     _NodeOccupied(node,(teamIndex == 0) ? ALLIANCE:HORDE);
                     // Message to chatlog
-
                     if (teamIndex == 0)
                     {
                         // FIXME: team and node names not localized
@@ -113,12 +102,10 @@ void BattleGroundAB::Update(uint32 diff)
                     }
                 }
             }
-
             for (int team = 0; team < BG_TEAMS_COUNT; ++team)
                 if (m_Nodes[node] == team + BG_AB_NODE_TYPE_OCCUPIED)
                     ++team_points[team];
         }
-
         // Accumulate points
         for (int team = 0; team < BG_TEAMS_COUNT; ++team)
         {
@@ -151,7 +138,6 @@ void BattleGroundAB::Update(uint32 diff)
                     PlaySoundToAll(BG_AB_SOUND_NEAR_VICTORY);
                     m_IsInformedNearVictory = true;
                 }
-
                 if (m_TeamScores[team] > BG_AB_MAX_TEAM_SCORE)
                     m_TeamScores[team] = BG_AB_MAX_TEAM_SCORE;
                 if (team == BG_TEAM_ALLIANCE)
@@ -165,7 +151,6 @@ void BattleGroundAB::Update(uint32 diff)
                     m_TeamScores500Disadvantage[otherTeam] = true;
             }
         }
-
         // Test win condition
         if (m_TeamScores[BG_TEAM_ALLIANCE] >= BG_AB_MAX_TEAM_SCORE)
             EndBattleGround(ALLIANCE);
@@ -173,7 +158,6 @@ void BattleGroundAB::Update(uint32 diff)
             EndBattleGround(HORDE);
     }
 }
-
 void BattleGroundAB::StartingEventCloseDoors()
 {
     // despawn banners, auras and buffs
@@ -181,18 +165,15 @@ void BattleGroundAB::StartingEventCloseDoors()
         SpawnBGObject(obj, RESPAWN_ONE_DAY);
     for (int i = 0; i < BG_AB_DYNAMIC_NODES_COUNT * 3; ++i)
         SpawnBGObject(BG_AB_OBJECT_SPEEDBUFF_STABLES + i, RESPAWN_ONE_DAY);
-
     // Starting doors
     DoorClose(BG_AB_OBJECT_GATE_A);
     DoorClose(BG_AB_OBJECT_GATE_H);
     SpawnBGObject(BG_AB_OBJECT_GATE_A, RESPAWN_IMMEDIATELY);
     SpawnBGObject(BG_AB_OBJECT_GATE_H, RESPAWN_IMMEDIATELY);
-
     // Starting base spirit guides
     _NodeOccupied(BG_AB_SPIRIT_ALIANCE,ALLIANCE);
     _NodeOccupied(BG_AB_SPIRIT_HORDE,HORDE);
 }
-
 void BattleGroundAB::StartingEventOpenDoors()
 {
     // spawn neutral banners
@@ -207,26 +188,20 @@ void BattleGroundAB::StartingEventOpenDoors()
     DoorOpen(BG_AB_OBJECT_GATE_A);
     DoorOpen(BG_AB_OBJECT_GATE_H);
 }
-
 void BattleGroundAB::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in the constructor
     BattleGroundABScore* sc = new BattleGroundABScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundAB::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
 {
-
 }
-
 void BattleGroundAB::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     switch(Trigger)
     {
         case 3948:                                          // Arathi Basin Alliance Exit.
@@ -255,7 +230,6 @@ void BattleGroundAB::HandleAreaTrigger(Player *Source, uint32 Trigger)
             break;
     }
 }
-
 /*  type: 0-neutral, 1-contested, 3-occupied
     teamIndex: 0-ally, 1-horde                        */
 void BattleGroundAB::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay)
@@ -268,30 +242,24 @@ void BattleGroundAB::_CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool
         m_BannerTimers[node].teamIndex = teamIndex;
         return;
     }
-
     uint8 obj = node*8 + type + teamIndex;
-
     SpawnBGObject(obj, RESPAWN_IMMEDIATELY);
-
     // handle aura with banner
     if (!type)
         return;
     obj = node * 8 + ((type == BG_AB_NODE_TYPE_OCCUPIED) ? (5 + teamIndex) : 7);
     SpawnBGObject(obj, RESPAWN_IMMEDIATELY);
 }
-
 void BattleGroundAB::_DelBanner(uint8 node, uint8 type, uint8 teamIndex)
 {
     uint8 obj = node*8 + type + teamIndex;
     SpawnBGObject(obj, RESPAWN_ONE_DAY);
-
     // handle aura with banner
     if (!type)
         return;
     obj = node * 8 + ((type == BG_AB_NODE_TYPE_OCCUPIED) ? (5 + teamIndex) : 7);
     SpawnBGObject(obj, RESPAWN_ONE_DAY);
 }
-
 int32 BattleGroundAB::_GetNodeNameId(uint8 node)
 {
     switch (node)
@@ -306,20 +274,16 @@ int32 BattleGroundAB::_GetNodeNameId(uint8 node)
     }
     return 0;
 }
-
 void BattleGroundAB::FillInitialWorldStates(WorldPacket& data)
 {
     const uint8 plusArray[] = {0, 2, 3, 0, 1};
-
     // Node icons
     for (uint8 node = 0; node < BG_AB_DYNAMIC_NODES_COUNT; ++node)
         data << uint32(BG_AB_OP_NODEICONS[node]) << uint32((m_Nodes[node]==0)?1:0);
-
     // Node occupied states
     for (uint8 node = 0; node < BG_AB_DYNAMIC_NODES_COUNT; ++node)
         for (uint8 i = 1; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
             data << uint32(BG_AB_OP_NODESTATES[node] + plusArray[i]) << uint32((m_Nodes[node]==i)?1:0);
-
     // How many bases each team owns
     uint8 ally = 0, horde = 0;
     for (uint8 node = 0; node < BG_AB_DYNAMIC_NODES_COUNT; ++node)
@@ -327,32 +291,25 @@ void BattleGroundAB::FillInitialWorldStates(WorldPacket& data)
             ++ally;
         else if (m_Nodes[node] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
             ++horde;
-
     data << uint32(BG_AB_OP_OCCUPIED_BASES_ALLY)  << uint32(ally);
     data << uint32(BG_AB_OP_OCCUPIED_BASES_HORDE) << uint32(horde);
-
     // Team scores
     data << uint32(BG_AB_OP_RESOURCES_MAX)      << uint32(BG_AB_MAX_TEAM_SCORE);
     data << uint32(BG_AB_OP_RESOURCES_WARNING)  << uint32(BG_AB_WARNING_NEAR_VICTORY_SCORE);
     data << uint32(BG_AB_OP_RESOURCES_ALLY)     << uint32(m_TeamScores[BG_TEAM_ALLIANCE]);
     data << uint32(BG_AB_OP_RESOURCES_HORDE)    << uint32(m_TeamScores[BG_TEAM_HORDE]);
-
     // other unknown
     data << uint32(0x745) << uint32(0x2);           // 37 1861 unk
 }
-
 void BattleGroundAB::_SendNodeUpdate(uint8 node)
 {
     // Send node owner state update to refresh map icons on client
     const uint8 plusArray[] = {0, 2, 3, 0, 1};
-
     if (m_prevNodes[node])
         UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_prevNodes[node]], 0);
     else
         UpdateWorldState(BG_AB_OP_NODEICONS[node], 0);
-
     UpdateWorldState(BG_AB_OP_NODESTATES[node] + plusArray[m_Nodes[node]], 1);
-
     // How many bases each team owns
     uint8 ally = 0, horde = 0;
     for (uint8 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
@@ -360,17 +317,14 @@ void BattleGroundAB::_SendNodeUpdate(uint8 node)
             ++ally;
         else if (m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED)
             ++horde;
-
     UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_ALLY, ally);
     UpdateWorldState(BG_AB_OP_OCCUPIED_BASES_HORDE, horde);
 }
-
 void BattleGroundAB::_NodeOccupied(uint8 node,Team team)
 {
    if (!AddSpiritGuide(node, BG_AB_SpiritGuidePos[node][0], BG_AB_SpiritGuidePos[node][1], BG_AB_SpiritGuidePos[node][2], BG_AB_SpiritGuidePos[node][3], team))
         sLog.outError("Failed to spawn spirit guide! point: %u, team: %u,", node, team);
 //   SpawnBGCreature(node,RESPAWN_IMMEDIATELY);
-
     uint8 capturedNodes = 0;
     for (uint8 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
     {
@@ -382,12 +336,10 @@ void BattleGroundAB::_NodeOccupied(uint8 node,Team team)
     if (capturedNodes >= 4)
         CastSpellOnTeam(SPELL_AB_QUEST_REWARD_4_BASES, team);
 }
-
 void BattleGroundAB::_NodeDeOccupied(uint8 node)
 {
     if (node >= BG_AB_DYNAMIC_NODES_COUNT)
         return;
-
     // Those who are waiting to resurrect at this node are taken to the closest own node's graveyard
     std::vector<uint64> ghost_list = m_ReviveQueue[m_BgCreatures[node]];
     if (!ghost_list.empty())
@@ -398,27 +350,21 @@ void BattleGroundAB::_NodeDeOccupied(uint8 node)
             Player* plr = objmgr.GetPlayer(*itr);
             if (!plr)
                 continue;
-
             if (!ClosestGrave)                              // cache
                 ClosestGrave = GetClosestGraveYard(plr);
-
             if (ClosestGrave)
                 plr->TeleportTo(GetMapId(), ClosestGrave->x, ClosestGrave->y, ClosestGrave->z, plr->GetOrientation());
         }
     }
-
     if (m_BgCreatures[node])
         DelCreature(node);
-
     // buff object isn't despawned
 }
-
 /* Invoked if a player used a banner as a gameobject */
 void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*target_obj*/)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     uint8 node = BG_AB_NODE_STABLES;
     GameObject* obj=HashMapHolder<GameObject>::Find(m_BgObjects[node*8+7]);
     while ( (node < BG_AB_DYNAMIC_NODES_COUNT) && ((!obj) || (!source->IsWithinDistInMap(obj,10))))
@@ -426,19 +372,15 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
         ++node;
         obj=HashMapHolder<GameObject>::Find(m_BgObjects[node*8+BG_AB_OBJECT_AURA_CONTESTED]);
     }
-
     if (node == BG_AB_DYNAMIC_NODES_COUNT)
     {
         // this means our player isn't close to any of banners - maybe cheater ??
         return;
     }
-
     BattleGroundTeamId teamIndex = GetTeamIndexByTeamId(source->GetTeam());
-
     // Check if player really could use this banner, not cheated
     if (!(m_Nodes[node] == 0 || teamIndex == m_Nodes[node]%2))
         return;
-
     source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
     uint32 sound = 0;
     // If node is neutral, change to contested
@@ -453,13 +395,11 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
         _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
         _SendNodeUpdate(node);
         m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
         // FIXME: team and node names not localized
         if (teamIndex == 0)
             SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node), LANG_BG_AB_ALLY);
         else
             SendMessage2ToAll(LANG_BG_AB_NODE_CLAIMED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node), LANG_BG_AB_HORDE);
-
         sound = BG_AB_SOUND_NODE_CLAIMED;
     }
     // If node is contested
@@ -477,7 +417,6 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
             _CreateBanner(node, BG_AB_NODE_TYPE_CONTESTED, teamIndex, true);
             _SendNodeUpdate(node);
             m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
             // FIXME: node names not localized
             if (teamIndex == BG_TEAM_ALLIANCE)
                 SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
@@ -497,7 +436,6 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
             _SendNodeUpdate(node);
             m_NodeTimers[node] = 0;
             _NodeOccupied(node,(teamIndex == BG_TEAM_ALLIANCE) ? ALLIANCE:HORDE);
-
             // FIXME: node names not localized
             if (teamIndex == BG_TEAM_ALLIANCE)
                 SendMessage2ToAll(LANG_BG_AB_NODE_DEFENDED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
@@ -519,16 +457,13 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
         _SendNodeUpdate(node);
         _NodeDeOccupied(node);
         m_NodeTimers[node] = BG_AB_FLAG_CAPTURING_TIME;
-
         // FIXME: node names not localized
         if (teamIndex == BG_TEAM_ALLIANCE)
             SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_ALLIANCE, source, _GetNodeNameId(node));
         else
             SendMessage2ToAll(LANG_BG_AB_NODE_ASSAULTED,CHAT_MSG_BG_SYSTEM_HORDE, source, _GetNodeNameId(node));
-
         sound = (teamIndex == BG_TEAM_ALLIANCE) ? BG_AB_SOUND_NODE_ASSAULTED_ALLIANCE : BG_AB_SOUND_NODE_ASSAULTED_HORDE;
     }
-
     // If node is occupied again, send "X has taken the Y" msg.
     if (m_Nodes[node] >= BG_AB_NODE_TYPE_OCCUPIED)
     {
@@ -540,7 +475,6 @@ void BattleGroundAB::EventPlayerClickedOnFlag(Player *source, GameObject* /*targ
     }
     PlaySoundToAll(sound);
 }
-
 bool BattleGroundAB::SetupBattleGround()
 {
     for (int i = 0 ; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
@@ -575,15 +509,12 @@ bool BattleGroundAB::SetupBattleGround()
             )
             sLog.outErrorDb("BatteGroundAB: Failed to spawn buff object!");
     }
-
     return true;
 }
-
 void BattleGroundAB::Reset()
 {
     //call parent's class reset
     BattleGround::Reset();
-
     m_TeamScores[BG_TEAM_ALLIANCE]          = 0;
     m_TeamScores[BG_TEAM_HORDE]             = 0;
     m_lastTick[BG_TEAM_ALLIANCE]            = 0;
@@ -598,7 +529,6 @@ void BattleGroundAB::Reset()
     m_ReputationTics = (isBGWeekend) ? BG_AB_ABBGWeekendReputationTicks : BG_AB_NotABBGWeekendReputationTicks;
     m_TeamScores500Disadvantage[BG_TEAM_ALLIANCE] = false;
     m_TeamScores500Disadvantage[BG_TEAM_HORDE]    = false;
-
     for (uint8 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
     {
         m_Nodes[i] = 0;
@@ -606,12 +536,10 @@ void BattleGroundAB::Reset()
         m_NodeTimers[i] = 0;
         m_BannerTimers[i].timer = 0;
     }
-
     for (uint8 i = 0; i < BG_AB_ALL_NODES_COUNT; ++i)
         if (m_BgCreatures[i])
             DelCreature(i);
 }
-
 void BattleGroundAB::EndBattleGround(uint32 winner)
 {
     //win reward
@@ -622,27 +550,22 @@ void BattleGroundAB::EndBattleGround(uint32 winner)
     //complete map_end rewards (even if no team wins)
     RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
     RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
-
     BattleGround::EndBattleGround(winner);
 }
-
 WorldSafeLocsEntry const* BattleGroundAB::GetClosestGraveYard(Player* player)
 {
     BattleGroundTeamId teamIndex = GetTeamIndexByTeamId(player->GetTeam());
-
     // Is there any occupied node for this team?
     std::vector<uint8> nodes;
     for (uint8 i = 0; i < BG_AB_DYNAMIC_NODES_COUNT; ++i)
         if (m_Nodes[i] == teamIndex + 3)
             nodes.push_back(i);
-
     WorldSafeLocsEntry const* good_entry = NULL;
     // If so, select the closest node to place ghost on
     if (!nodes.empty())
     {
         float plr_x = player->GetPositionX();
         float plr_y = player->GetPositionY();
-
         float mindist = 999999.0f;
         for (uint8 i = 0; i < nodes.size(); ++i)
         {
@@ -661,16 +584,13 @@ WorldSafeLocsEntry const* BattleGroundAB::GetClosestGraveYard(Player* player)
     // If not, place ghost on starting location
     if (!good_entry)
         good_entry = sWorldSafeLocsStore.LookupEntry( BG_AB_GraveyardIds[teamIndex+5] );
-
     return good_entry;
 }
-
 void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
 {
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if( itr == m_PlayerScores.end() )                         // player not found...
         return;
-
     switch(type)
     {
         case SCORE_BASES_ASSAULTED:
@@ -684,7 +604,6 @@ void BattleGroundAB::UpdatePlayerScore(Player *Source, uint32 type, uint32 value
             break;
     }
 }
-
 bool BattleGroundAB::IsAllNodesConrolledByTeam(uint32 team) const
 {
     uint32 count = 0;
@@ -692,6 +611,5 @@ bool BattleGroundAB::IsAllNodesConrolledByTeam(uint32 team) const
         if ((team == ALLIANCE && m_Nodes[i] == BG_AB_NODE_STATUS_ALLY_OCCUPIED) ||
             (team == HORDE    && m_Nodes[i] == BG_AB_NODE_STATUS_HORDE_OCCUPIED))
             ++count;
-
     return count == BG_AB_DYNAMIC_NODES_COUNT;
 }
diff --git a/src/game/BattleGroundAB.h b/src/game/BattleGroundAB.h
index ef151ad187b..7da1c517528 100644
--- a/src/game/BattleGroundAB.h
+++ b/src/game/BattleGroundAB.h
@@ -19,9 +19,7 @@
  */
 #ifndef __BATTLEGROUNDAB_H
 #define __BATTLEGROUNDAB_H
-
 class BattleGround;
-
 enum BG_AB_WorldStates
 {
     BG_AB_OP_OCCUPIED_BASES_HORDE       = 1778,
@@ -41,7 +39,6 @@ enum BG_AB_WorldStates
     BG_AB_OP_FARM_STATE_HORDE           = 1773,             //Farm state (HORDE)
     BG_AB_OP_FARM_STATE_CON_ALI         = 1774,             //Farm state (CON ALIENCE)
     BG_AB_OP_FARM_STATE_CON_HOR         = 1775,             //Farm state (CON HORDE)
-
     BG_AB_OP_BLACKSMITH_ICON            = 1846,             //Blacksmith map icon (NONE)
     BG_AB_OP_BLACKSMITH_STATE_ALIENCE   = 1782,             //Blacksmith map state (ALIENCE)
     BG_AB_OP_BLACKSMITH_STATE_HORDE     = 1783,             //Blacksmith map state (HORDE)
@@ -59,11 +56,8 @@ enum BG_AB_WorldStates
     BG_AB_OP_GOLDMINE_STATE_CON_HOR     = 1790,             //Gold Mine map state (CON HORDE)
 */
 };
-
 const uint32 BG_AB_OP_NODESTATES[5] =    {1767, 1782, 1772, 1792, 1787};
-
 const uint32 BG_AB_OP_NODEICONS[5]  =    {1842, 1846, 1845, 1844, 1843};
-
 /* Note: code uses that these IDs follow each other */
 enum BG_AB_NodeObjectId
 {
@@ -73,7 +67,6 @@ enum BG_AB_NodeObjectId
     BG_AB_OBJECTID_NODE_BANNER_3    = 180090,       // Lumber mill banner
     BG_AB_OBJECTID_NODE_BANNER_4    = 180091        // Gold mine banner
 };
-
 enum BG_AB_ObjectType
 {
     // for all 5 node points 8*5=40 objects
@@ -106,7 +99,6 @@ enum BG_AB_ObjectType
     BG_AB_OBJECT_BERSERKBUFF_GOLD_MINE   = 56,
     BG_AB_OBJECT_MAX                     = 57,
 };
-
 /* Object id templates from DB */
 enum BG_AB_ObjectTypes
 {
@@ -114,26 +106,21 @@ enum BG_AB_ObjectTypes
     BG_AB_OBJECTID_BANNER_CONT_A        = 180059,
     BG_AB_OBJECTID_BANNER_H             = 180060,
     BG_AB_OBJECTID_BANNER_CONT_H        = 180061,
-
     BG_AB_OBJECTID_AURA_A               = 180100,
     BG_AB_OBJECTID_AURA_H               = 180101,
     BG_AB_OBJECTID_AURA_C               = 180102,
-
     BG_AB_OBJECTID_GATE_A               = 180255,
     BG_AB_OBJECTID_GATE_H               = 180256
 };
-
 enum BG_AB_Timers
 {
     BG_AB_FLAG_CAPTURING_TIME           = 60000,
 };
-
 enum BG_AB_Score
 {
     BG_AB_WARNING_NEAR_VICTORY_SCORE    = 1800,
     BG_AB_MAX_TEAM_SCORE                = 2000
 };
-
 /* do NOT change the order, else wrong behaviour */
 enum BG_AB_BattleGroundNodes
 {
@@ -142,15 +129,11 @@ enum BG_AB_BattleGroundNodes
     BG_AB_NODE_FARM             = 2,
     BG_AB_NODE_LUMBER_MILL      = 3,
     BG_AB_NODE_GOLD_MINE        = 4,
-
     BG_AB_DYNAMIC_NODES_COUNT   = 5,                        // dynamic nodes that can be captured
-
     BG_AB_SPIRIT_ALIANCE        = 5,
     BG_AB_SPIRIT_HORDE          = 6,
-
     BG_AB_ALL_NODES_COUNT       = 7,                        // all nodes (dynamic and static)
 };
-
 enum BG_AB_NodeStatus
 {
     BG_AB_NODE_TYPE_NEUTRAL             = 0,
@@ -161,7 +144,6 @@ enum BG_AB_NodeStatus
     BG_AB_NODE_STATUS_ALLY_OCCUPIED     = 3,
     BG_AB_NODE_STATUS_HORDE_OCCUPIED    = 4
 };
-
 enum BG_AB_Sounds
 {
     BG_AB_SOUND_NODE_CLAIMED            = 8192,
@@ -171,12 +153,10 @@ enum BG_AB_Sounds
     BG_AB_SOUND_NODE_ASSAULTED_HORDE    = 8174,
     BG_AB_SOUND_NEAR_VICTORY            = 8456
 };
-
 #define BG_AB_NotABBGWeekendHonorTicks      330
 #define BG_AB_ABBGWeekendHonorTicks         200
 #define BG_AB_NotABBGWeekendReputationTicks 200
 #define BG_AB_ABBGWeekendReputationTicks    150
-
 // x, y, z, o
 const float BG_AB_NodePositions[BG_AB_DYNAMIC_NODES_COUNT][4] = {
     {1166.785f, 1200.132f, -56.70859f, 0.9075713f},         // stables
@@ -185,20 +165,16 @@ const float BG_AB_NodePositions[BG_AB_DYNAMIC_NODES_COUNT][4] = {
     {856.1419f, 1148.902f, 11.18469f, -2.303835f},          // lumber mill
     {1146.923f, 848.1782f, -110.917f, -0.7330382f}          // gold mine
 };
-
 // x, y, z, o, rot0, rot1, rot2, rot3
 const float BG_AB_DoorPositions[2][8] = {
     {1284.597f, 1281.167f, -15.97792f, 0.7068594f, 0.012957f, -0.060288f, 0.344959f, 0.93659f},
     {708.0903f, 708.4479f, -17.8342f, -2.391099f, 0.050291f, 0.015127f, 0.929217f, -0.365784f}
 };
-
 // Tick intervals and given points: case 0,1,2,3,4,5 captured nodes
 const uint32 BG_AB_TickIntervals[6] = {0, 12000, 9000, 6000, 3000, 1000};
 const uint32 BG_AB_TickPoints[6] = {0, 10, 10, 10, 10, 30};
-
 // WorldSafeLocs ids for 5 nodes, and for ally, and horde starting location
 const uint32 BG_AB_GraveyardIds[BG_AB_ALL_NODES_COUNT] = {895, 894, 893, 897, 896, 898, 899};
-
 // x, y, z, o
 const float BG_AB_BuffPositions[BG_AB_DYNAMIC_NODES_COUNT][4] = {
     {1185.71f, 1185.24f, -56.36f, 2.56f},                   // stables
@@ -207,7 +183,6 @@ const float BG_AB_BuffPositions[BG_AB_DYNAMIC_NODES_COUNT][4] = {
     {807.46f, 1189.16f, 11.92f, 5.44f},                     // lumber mill
     {1146.62f, 816.94f, -98.49f, 6.14f}                     // gold mine
 };
-
 // x, y, z, o
 const float BG_AB_SpiritGuidePos[BG_AB_ALL_NODES_COUNT][4] = {
     {1200.03f, 1171.09f, -56.47f, 5.15f},                   // stables
@@ -218,14 +193,12 @@ const float BG_AB_SpiritGuidePos[BG_AB_ALL_NODES_COUNT][4] = {
     {1354.05f, 1275.48f, -11.30f, 4.77f},                   // alliance starting base
     {714.61f, 646.15f, -10.87f, 4.34f}                      // horde starting base
 };
-
 struct BG_AB_BannerTimer
 {
     uint32      timer;
     uint8       type;
     uint8       teamIndex;
 };
-
 class BattleGroundABScore : public BattleGroundScore
 {
     public:
@@ -234,15 +207,12 @@ class BattleGroundABScore : public BattleGroundScore
         uint32 BasesAssaulted;
         uint32 BasesDefended;
 };
-
 class BattleGroundAB : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundAB();
         ~BattleGroundAB();
-
         void Update(uint32 diff);
         void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
@@ -253,15 +223,11 @@ class BattleGroundAB : public BattleGround
         virtual void Reset();
         void EndBattleGround(uint32 winner);
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-
         /* Scorekeeping */
         virtual void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
         virtual void FillInitialWorldStates(WorldPacket& data);
-
         /* Nodes occupying */
         virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj);
-
         /* achievement req. */
         bool IsAllNodesConrolledByTeam(uint32 team) const;  // overwrited
         bool IsTeamScores500Disadvantage(uint32 team) const { return m_TeamScores500Disadvantage[GetTeamIndexByTeamId(team)]; }
@@ -270,14 +236,11 @@ class BattleGroundAB : public BattleGround
         void _CreateBanner(uint8 node, uint8 type, uint8 teamIndex, bool delay);
         void _DelBanner(uint8 node, uint8 type, uint8 teamIndex);
         void _SendNodeUpdate(uint8 node);
-
         /* Creature spawning/despawning */
         // TODO: working, scripted peons spawning
         void _NodeOccupied(uint8 node,Team team);
         void _NodeDeOccupied(uint8 node);
-
         int32 _GetNodeNameId(uint8 node);
-
         /* Nodes info:
             0: neutral
             1: ally contested
diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp
index 42d15a6ce84..4db2f4b3df2 100644
--- a/src/game/BattleGroundAV.cpp
+++ b/src/game/BattleGroundAV.cpp
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
-
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
 #include "Formulas.h"
@@ -28,36 +26,29 @@
 #include "Language.h"
 #include "Player.h"
 #include "SpellAuras.h"
-
 BattleGroundAV::BattleGroundAV()
 {
     m_BgObjects.resize(BG_AV_OBJECT_MAX);
     m_BgCreatures.resize(AV_CPLACE_MAX+AV_STATICCPLACE_MAX);
-
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_AV_START_TWO_MINUTES;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_AV_START_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_AV_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_AV_HAS_BEGUN;
 }
-
 BattleGroundAV::~BattleGroundAV()
 {
 }
-
 const uint16 BattleGroundAV::GetBonusHonor(uint8 kills) //TODO: move this function to Battleground.cpp (needs to find a way to get m_MaxLevel)
 {
     return Trinity::Honor::hk_honor_at_level(m_MaxLevel, kills);
 }
-
 void BattleGroundAV::HandleKillPlayer(Player *player, Player *killer)
 {
     if(GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     BattleGround::HandleKillPlayer(player, killer);
     UpdateScore(player->GetTeam(),-1);
 }
-
 void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer)
 {
     sLog.outDebug("bg_av HandleKillUnit %i",unit->GetEntry());
@@ -95,7 +86,6 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer)
         Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
         if(creature)
             YellToAll(creature,GetTrinityString(LANG_BG_AV_A_CAPTAIN_DEAD),LANG_UNIVERSAL);
-
     }
     else if ( entry == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0] )
     {
@@ -120,7 +110,6 @@ void BattleGroundAV::HandleKillUnit(Creature *unit, Player *killer)
     else if ( entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_N_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_A_4][0] || entry == BG_AV_CreatureInfo[AV_NPC_S_MINE_H_4][0])
         ChangeMineOwner(AV_SOUTH_MINE,killer->GetTeam());
 }
-
 void BattleGroundAV::HandleQuestComplete(uint32 questid, Player *player)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
@@ -224,13 +213,11 @@ void BattleGroundAV::HandleQuestComplete(uint32 questid, Player *player)
     }
 }
 
-
 void BattleGroundAV::UpdateScore(uint16 team, int16 points )
 { //note: to remove reinforcementpoints points must be negative, for adding reinforcements points must be positive
     assert( team == ALLIANCE || team == HORDE);
     uint8 teamindex = GetTeamIndexByTeamId(team); //0=ally 1=horde
     m_Team_Scores[teamindex] += points;
-
     UpdateWorldState(((teamindex==BG_TEAM_HORDE)?AV_Horde_Score:AV_Alliance_Score), m_Team_Scores[teamindex]);
     if( points < 0)
     {
@@ -247,7 +234,6 @@ void BattleGroundAV::UpdateScore(uint16 team, int16 points )
         }
     }
 }
-
 Creature* BattleGroundAV::AddAVCreature(uint16 cinfoid, uint16 type )
 {
     uint32 level;
@@ -271,7 +257,6 @@ Creature* BattleGroundAV::AddAVCreature(uint16 cinfoid, uint16 type )
         return NULL;
     if(creature->GetEntry() == BG_AV_CreatureInfo[AV_NPC_A_CAPTAIN][0] || creature->GetEntry() == BG_AV_CreatureInfo[AV_NPC_H_CAPTAIN][0])
         creature->SetRespawnDelay(RESPAWN_ONE_DAY); // TODO: look if this can be done by database + also add this for the wingcommanders
-
     if((isStatic && cinfoid>=10 && cinfoid<=14) || (!isStatic && ((cinfoid >= AV_NPC_A_GRAVEDEFENSE0 && cinfoid<=AV_NPC_A_GRAVEDEFENSE3) ||
         (cinfoid>=AV_NPC_H_GRAVEDEFENSE0 && cinfoid<=AV_NPC_H_GRAVEDEFENSE3))))
     {
@@ -289,17 +274,14 @@ Creature* BattleGroundAV::AddAVCreature(uint16 cinfoid, uint16 type )
         //TODO: find a way to add a motionmaster without killing the creature (i
         //just copied this code from a gm-command
     }
-
     if(level != 0)
         level += m_MaxLevel-60; //maybe we can do this more generic for custom level-range.. actually it's blizzlike
     creature->SetLevel(level);
     return creature;
 }
-
 void BattleGroundAV::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     if(GetStatus() == STATUS_IN_PROGRESS)
     {
         for(uint8 i=0; i<=1;i++)//0=alliance, 1=horde
@@ -335,7 +317,6 @@ void BattleGroundAV::Update(uint32 diff)
             {
                 if( m_Mine_Timer <= 0)
                     UpdateScore(m_Mine_Owner[mine],1);
-
                 if(m_Mine_Reclaim_Timer[mine] > diff)
                     m_Mine_Reclaim_Timer[mine] -= diff;
                 else{ //we don't need to set this timer to 0 cause this codepart wont get called when this thing is 0
@@ -345,7 +326,6 @@ void BattleGroundAV::Update(uint32 diff)
         }
         if( m_Mine_Timer <= 0)
             m_Mine_Timer=AV_MINE_TICK_TIMER; //this is at the end, cause we need to update both mines
-
         //looks for all timers of the nodes and destroy the building (for graveyards the building wont get destroyed, it goes just to the other team
         for(BG_AV_Nodes i = BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i)
             if(m_Nodes[i].State == POINT_ASSAULTED) //maybe remove this
@@ -357,13 +337,11 @@ void BattleGroundAV::Update(uint32 diff)
             }
     }
 }
-
 void BattleGroundAV::StartingEventCloseDoors()
 {
     DoorClose(BG_AV_OBJECT_DOOR_A);
     DoorClose(BG_AV_OBJECT_DOOR_H);
 }
-
 void BattleGroundAV::StartingEventOpenDoors()
 {
     sLog.outDebug("BG_AV: start spawning mine stuff");
@@ -373,14 +351,11 @@ void BattleGroundAV::StartingEventOpenDoors()
         SpawnBGObject(i,RESPAWN_IMMEDIATELY);
     for(uint8 mine = AV_NORTH_MINE; mine <= AV_SOUTH_MINE; mine++) //mine population
         ChangeMineOwner(mine, AV_NEUTRAL_TEAM,true);
-
     UpdateWorldState(AV_SHOW_H_SCORE, 1);
     UpdateWorldState(AV_SHOW_A_SCORE, 1);
-
     DoorOpen(BG_AV_OBJECT_DOOR_H);
     DoorOpen(BG_AV_OBJECT_DOOR_A);
 }
-
 void BattleGroundAV::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
@@ -389,9 +364,7 @@ void BattleGroundAV::AddPlayer(Player *plr)
     m_PlayerScores[plr->GetGUID()] = sc;
     if(m_MaxLevel==0)
         m_MaxLevel=(plr->getLevel()%10 == 0)? plr->getLevel() : (plr->getLevel()-(plr->getLevel()%10))+10; //TODO: just look at the code \^_^/ --but queue-info should provide this information..
-
 }
-
 void BattleGroundAV::EndBattleGround(uint32 winner)
 {
     //calculate bonuskills for both teams:
@@ -414,7 +387,6 @@ void BattleGroundAV::EndBattleGround(uint32 winner)
                 }
             }
     }
-
     for(int i=0; i<=1; i++) //0=ally 1=horde
     {
         if(m_CaptainAlive[i])
@@ -427,11 +399,9 @@ void BattleGroundAV::EndBattleGround(uint32 winner)
         if(kills[i] != 0)
             RewardHonorToTeam(GetBonusHonor(kills[i]),(i == 0)?ALLIANCE:HORDE);
     }
-
     //TODO add enterevademode for all attacking creatures
     BattleGround::EndBattleGround(winner);
 }
-
 void BattleGroundAV::RemovePlayer(Player* plr,uint64 /*guid*/)
 {
    if(!plr)
@@ -445,13 +415,11 @@ void BattleGroundAV::RemovePlayer(Player* plr,uint64 /*guid*/)
     plr->RemoveAurasDueToSpell(AV_BUFF_H_CAPTAIN);
 }
 
-
 void BattleGroundAV::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     uint32 SpellId = 0;
     switch(Trigger)
     {
@@ -481,18 +449,14 @@ void BattleGroundAV::HandleAreaTrigger(Player *Source, uint32 Trigger)
 //            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
             break;
     }
-
     if (SpellId)
         Source->CastSpell(Source, SpellId, true);
 }
-
 void BattleGroundAV::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
 {
-
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if(itr == m_PlayerScores.end())                         // player not found...
         return;
-
     switch(type)
     {
         case SCORE_GRAVEYARDS_ASSAULTED:
@@ -522,19 +486,14 @@ void BattleGroundAV::UpdatePlayerScore(Player* Source, uint32 type, uint32 value
     }
 }
 
-
-
 void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
 {
-
     uint32 object = GetObjectThroughNode(node);
     sLog.outDebug("bg_av: player destroyed point node %i object %i",node,object);
-
     //despawn banner
     SpawnBGObject(object, RESPAWN_ONE_DAY);
     DestroyNode(node);
     UpdateNodeWorldState(node);
-
     uint32 owner = m_Nodes[node].Owner;
     if( IsTower(node) )
     {
@@ -547,11 +506,9 @@ void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
         //spawn destroyed aura
         for(uint8 i=0; i<=9; i++)
             SpawnBGObject(BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH + i + (tmp * 10),RESPAWN_IMMEDIATELY);
-
         UpdateScore((owner == ALLIANCE) ? HORDE : ALLIANCE, (-1)*BG_AV_RES_TOWER);
         RewardReputationToTeam((owner == ALLIANCE)?730:729,BG_AV_REP_TOWER,owner);
         RewardHonorToTeam(GetBonusHonor(BG_AV_KILL_TOWER),owner);
-
         SpawnBGObject(BG_AV_OBJECT_TAURA_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp),RESPAWN_ONE_DAY);
         SpawnBGObject(BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH+GetTeamIndexByTeamId(owner)+(2*tmp),RESPAWN_ONE_DAY);
     }
@@ -579,12 +536,10 @@ void BattleGroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node)
         sprintf(buf, GetTrinityString(LANG_BG_AV_TOWER_TAKEN) , GetNodeName(node),( owner == ALLIANCE ) ? GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE)  );
     else
         sprintf(buf, GetTrinityString(LANG_BG_AV_GRAVE_TAKEN) , GetNodeName(node),( owner == ALLIANCE ) ? GetTrinityString(LANG_BG_AV_ALLY) :GetTrinityString(LANG_BG_AV_HORDE)  );
-
     Creature* creature = GetBGCreature(AV_CPLACE_HERALD);
     if(creature)
         YellToAll(creature,buf,LANG_UNIVERSAL);
 }
-
 void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial)
 { //mine=0 northmine mine=1 southmin
 //changing the owner results in setting respawntim to infinite for current creatures, spawning new mine owners creatures and changing the chest-objects so that the current owning team can use them
@@ -593,12 +548,10 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial)
         team = AV_NEUTRAL_TEAM;
     else
         PlaySoundToAll((team==ALLIANCE)?AV_SOUND_ALLIANCE_GOOD:AV_SOUND_HORDE_GOOD);
-
     if(m_Mine_Owner[mine] == team && !initial)
         return;
     m_Mine_PrevOwner[mine] = m_Mine_Owner[mine];
     m_Mine_Owner[mine] = team;
-
     if(!initial)
     {
         sLog.outDebug("bg_av depopulating mine %i (0=north,1=south)",mine);
@@ -611,7 +564,6 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial)
                 DelCreature(i); //TODO here also
     }
     SendMineWorldStates(mine);
-
     sLog.outDebug("bg_av populating mine %i (0=north,1=south)",mine);
     uint16 miner;
     //also neutral team exists.. after a big time, the neutral team tries to conquer the mine
@@ -674,7 +626,6 @@ void BattleGroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial)
     }
     return;
 }
-
 bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId,uint32 team)
 {
     if(GOId == BG_AV_OBJECTID_MINE_N)
@@ -683,12 +634,10 @@ bool BattleGroundAV::PlayerCanDoMineQuest(int32 GOId,uint32 team)
          return (m_Mine_Owner[AV_SOUTH_MINE]==team);
     return true; //cause it's no mine'object it is ok if this is true
 }
-
 void BattleGroundAV::PopulateNode(BG_AV_Nodes node)
 {
     uint32 owner = m_Nodes[node].Owner;
     assert(owner);
-
     uint32 c_place = AV_CPLACE_DEFENSE_STORM_AID + ( 4 * node );
     uint32 creatureid;
     if(IsTower(node))
@@ -709,7 +658,6 @@ void BattleGroundAV::PopulateNode(BG_AV_Nodes node)
             DelCreature(node);
         if( !AddSpiritGuide(node, BG_AV_CreaturePos[node][0], BG_AV_CreaturePos[node][1], BG_AV_CreaturePos[node][2], BG_AV_CreaturePos[node][3], owner))
             sLog.outError("AV: couldn't spawn spiritguide at node %i",node);
-
     }
     for(uint8 i=0; i<4; i++)
     {
@@ -727,7 +675,6 @@ void BattleGroundAV::DePopulateNode(BG_AV_Nodes node)
         DelCreature(node);
 }
 
-
 const BG_AV_Nodes BattleGroundAV::GetNodeThroughObject(uint32 object)
 {
     sLog.outDebug("bg_AV getnodethroughobject %i",object);
@@ -749,7 +696,6 @@ const BG_AV_Nodes BattleGroundAV::GetNodeThroughObject(uint32 object)
     assert(false);
     return BG_AV_Nodes(0);
 }
-
 const uint32 BattleGroundAV::GetObjectThroughNode(BG_AV_Nodes node)
 { //this function is the counterpart to GetNodeThroughObject()
     sLog.outDebug("bg_AV GetObjectThroughNode %i",node);
@@ -786,9 +732,7 @@ const uint32 BattleGroundAV::GetObjectThroughNode(BG_AV_Nodes node)
     return 0;
 }
 
-
 //called when using banner
-
 void BattleGroundAV::EventPlayerClickedOnFlag(Player *source, GameObject* target_obj)
 {
     if(GetStatus() != STATUS_IN_PROGRESS)
@@ -816,15 +760,12 @@ void BattleGroundAV::EventPlayerClickedOnFlag(Player *source, GameObject* target
             break;
     }
 }
-
 void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
 {
     assert(GetStatus() == STATUS_IN_PROGRESS);
     BG_AV_Nodes node = GetNodeThroughObject(object);
-
     uint32 owner = m_Nodes[node].Owner; //maybe should name it prevowner
     uint32 team = player->GetTeam();
-
     if(owner == player->GetTeam() || m_Nodes[node].State != POINT_ASSAULTED)
         return;
     if(m_Nodes[node].TotalOwner == AV_NEUTRAL_TEAM)
@@ -840,13 +781,11 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
         return;
     }
 
-
    //spawn new go :)
     if(m_Nodes[node].Owner == ALLIANCE)
         SpawnBGObject(object+22, RESPAWN_IMMEDIATELY); //spawn horde banner
     else
         SpawnBGObject(object-22, RESPAWN_IMMEDIATELY); //spawn alliance banner
-
     if(!IsTower(node))
     {
         SpawnBGObject(BG_AV_OBJECT_AURA_N_FIRSTAID_STATION+3*node,RESPAWN_ONE_DAY);
@@ -854,11 +793,9 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
     }
         // despawn old go
     SpawnBGObject(object, RESPAWN_ONE_DAY);
-
     DefendNode(node,team);
     PopulateNode(node);
     UpdateNodeWorldState(node);
-
     if(IsTower(node))
     {
         //spawn big flag+aura on top of tower
@@ -888,11 +825,9 @@ void BattleGroundAV::EventPlayerDefendsPoint(Player* player, uint32 object)
     else
         PlaySoundToAll((team==ALLIANCE)?AV_SOUND_ALLIANCE_GOOD:AV_SOUND_HORDE_GOOD);
 }
-
 void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
 {
     assert(GetStatus() == STATUS_IN_PROGRESS);
-
     BG_AV_Nodes node = GetNodeThroughObject(object);
     uint32 owner = m_Nodes[node].Owner; //maybe name it prevowner
     uint32 team  = player->GetTeam();
@@ -900,7 +835,6 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
     if(owner == team || team == m_Nodes[node].TotalOwner)
         return; //surely a gm used this object
 
-
     if(node == BG_AV_NODES_SNOWFALL_GRAVE) //snowfall is a bit special in capping + it gets eyecandy stuff
     {
         if(object == BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE) //initial capping
@@ -938,7 +872,6 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
             SpawnBGObject(spawn+i,RESPAWN_IMMEDIATELY);
         }
     }
-
     //if snowfall gots capped it can be handled like all other graveyards
     if( m_Nodes[node].TotalOwner != AV_NEUTRAL_TEAM)
     {
@@ -980,11 +913,9 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
         }
         DePopulateNode(node);
     }
-
     SpawnBGObject(object, RESPAWN_ONE_DAY); //delete old banner
     AssaultNode(node,team);
     UpdateNodeWorldState(node);
-
     //send a nice message to all :)
     char buf[256];
     sprintf(buf, ( IsTower(node) ) ? GetTrinityString(LANG_BG_AV_TOWER_ASSAULTED) : GetTrinityString(LANG_BG_AV_GRAVE_ASSAULTED), GetNodeName(node),  ( team == ALLIANCE ) ?  GetTrinityString(LANG_BG_AV_ALLY) : GetTrinityString(LANG_BG_AV_HORDE ));
@@ -995,7 +926,6 @@ void BattleGroundAV::EventPlayerAssaultsPoint(Player* player, uint32 object)
     UpdatePlayerScore(player, ( IsTower(node) ) ? SCORE_TOWERS_ASSAULTED : SCORE_GRAVEYARDS_ASSAULTED, 1);
     PlaySoundToAll((team==ALLIANCE)?AV_SOUND_ALLIANCE_ASSAULTS:AV_SOUND_HORDE_ASSAULTS);
 }
-
 void BattleGroundAV::FillInitialWorldStates(WorldPacket& data)
 {
     bool stateok;
@@ -1009,7 +939,6 @@ void BattleGroundAV::FillInitialWorldStates(WorldPacket& data)
             data << uint32(BG_AV_NodeWorldStates[i][GetWorldStateType(j,HORDE)]) << uint32((m_Nodes[i].Owner == HORDE && stateok)?1:0);
         }
     }
-
     //towers
     for (uint8 i = BG_AV_NODES_DUNBALDAR_SOUTH; i <= BG_AV_NODES_MAX; i++)
         for (uint8 j =1; j <= 3; j+=2)
@@ -1034,7 +963,6 @@ void BattleGroundAV::FillInitialWorldStates(WorldPacket& data)
     SendMineWorldStates(AV_NORTH_MINE);
     SendMineWorldStates(AV_SOUTH_MINE);
 }
-
 const uint8 BattleGroundAV::GetWorldStateType(uint8 state, uint16 team) //this is used for node worldstates and returns values which fit good into the worldstatesarray
 {
     //neutral stuff cant get handled (currently its only snowfall)
@@ -1057,7 +985,6 @@ const uint8 BattleGroundAV::GetWorldStateType(uint8 state, uint16 team) //this i
     sLog.outError("BG_AV: should update a strange worldstate state:%i team:%i",state,team);
     return 5; //this will crash the game, but i want to know if something is wrong here
 }
-
 void BattleGroundAV::UpdateNodeWorldState(BG_AV_Nodes node)
 {
     UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].State,m_Nodes[node].Owner)],1);
@@ -1066,14 +993,12 @@ void BattleGroundAV::UpdateNodeWorldState(BG_AV_Nodes node)
     else
         UpdateWorldState(BG_AV_NodeWorldStates[node][GetWorldStateType(m_Nodes[node].PrevState,m_Nodes[node].PrevOwner)],0);
 }
-
 void BattleGroundAV::SendMineWorldStates(uint32 mine)
 {
     assert(mine == AV_NORTH_MINE || mine==AV_SOUTH_MINE);
 // currently i'm sure, that this works (:
 //    assert(m_Mine_PrevOwner[mine] == ALLIANCE || m_Mine_PrevOwner[mine] == HORDE || m_Mine_PrevOwner[mine] == AV_NEUTRAL_TEAM);
 //    assert(m_Mine_Owner[mine] == ALLIANCE || m_Mine_Owner[mine] == HORDE || m_Mine_Owner[mine] == AV_NEUTRAL_TEAM);
-
     uint8 owner,prevowner,mine2; //those variables are needed to access the right worldstate in the BG_AV_MineWorldStates array
     mine2 = (mine==AV_NORTH_MINE)?0:1;
     if(m_Mine_PrevOwner[mine] == ALLIANCE)
@@ -1088,13 +1013,11 @@ void BattleGroundAV::SendMineWorldStates(uint32 mine)
         owner = 2;
     else
         owner = 1;
-
     UpdateWorldState(BG_AV_MineWorldStates[mine2][owner],1);
     if( prevowner != owner)
         UpdateWorldState(BG_AV_MineWorldStates[mine2][prevowner],0);
 }
 
-
 WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player* player)
 {
     WorldSafeLocsEntry const* good_entry = NULL;
@@ -1120,11 +1043,9 @@ WorldSafeLocsEntry const* BattleGroundAV::GetClosestGraveYard(Player* player)
     // If not, place ghost on starting location
     if( !good_entry )
         good_entry = sWorldSafeLocsStore.LookupEntry( BG_AV_GraveyardIds[GetTeamIndexByTeamId(player->GetTeam())+7] );
-
     return good_entry;
 }
 
-
 bool BattleGroundAV::SetupBattleGround()
 {
     // Create starting objects
@@ -1137,7 +1058,6 @@ bool BattleGroundAV::SetupBattleGround()
         sLog.outErrorDb("BatteGroundAV: Failed to spawn some object BattleGround not created!1");
         return false;
     }
-
     //spawn node-objects
     for (uint8 i = BG_AV_NODES_FIRSTAID_STATION ; i < BG_AV_NODES_MAX; ++i)
     {
@@ -1232,7 +1152,6 @@ bool BattleGroundAV::SetupBattleGround()
             return false;
         }
     }
-
     if(!AddObject(BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE, BG_AV_OBJECTID_BANNER_SNOWFALL_N ,BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][0],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][1],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][2],BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3],0,0,sin(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), cos(BG_AV_ObjectPos[BG_AV_NODES_SNOWFALL_GRAVE][3]/2), RESPAWN_ONE_DAY))
     {
         sLog.outError("BatteGroundAV: Failed to spawn some object BattleGround not created!8");
@@ -1249,7 +1168,6 @@ bool BattleGroundAV::SetupBattleGround()
             return false;
         }
     }
-
     uint16 i;
     sLog.outDebug("Alterac Valley: entering state STATUS_WAIT_JOIN ...");
     // Initial Nodes
@@ -1280,7 +1198,6 @@ bool BattleGroundAV::SetupBattleGround()
     for(i = BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE; i <= BG_AV_OBJECT_DOOR_A; i++)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
     SpawnBGObject(BG_AV_OBJECT_AURA_N_SNOWFALL_GRAVE,RESPAWN_IMMEDIATELY);
-
     //creatures
     sLog.outDebug("BG_AV start poputlating nodes");
     for(BG_AV_Nodes i= BG_AV_NODES_FIRSTAID_STATION; i < BG_AV_NODES_MAX; ++i )
@@ -1303,7 +1220,6 @@ bool BattleGroundAV::SetupBattleGround()
     AddAVCreature(AV_NPC_HERALD,AV_CPLACE_HERALD);
     return true;
 }
-
 const char* BattleGroundAV::GetNodeName(BG_AV_Nodes node)
 {
     switch (node)
@@ -1331,7 +1247,6 @@ const char* BattleGroundAV::GetNodeName(BG_AV_Nodes node)
             }
     }
 }
-
 void BattleGroundAV::AssaultNode(BG_AV_Nodes node, uint16 team)
 {
     if (m_Nodes[node].TotalOwner == team)
@@ -1361,18 +1276,15 @@ void BattleGroundAV::AssaultNode(BG_AV_Nodes node, uint16 team)
     m_Nodes[node].PrevState  = m_Nodes[node].State;
     m_Nodes[node].State      = POINT_ASSAULTED;
 }
-
 void BattleGroundAV::DestroyNode(BG_AV_Nodes node)
 {
     assert(m_Nodes[node].State == POINT_ASSAULTED);
-
     m_Nodes[node].TotalOwner = m_Nodes[node].Owner;
     m_Nodes[node].PrevOwner  = m_Nodes[node].Owner;
     m_Nodes[node].PrevState  = m_Nodes[node].State;
     m_Nodes[node].State      = (m_Nodes[node].Tower)? POINT_DESTROYED : POINT_CONTROLED;
     m_Nodes[node].Timer      = 0;
 }
-
 void BattleGroundAV::InitNode(BG_AV_Nodes node, uint16 team, bool tower)
 {
     m_Nodes[node].TotalOwner = team;
@@ -1384,7 +1296,6 @@ void BattleGroundAV::InitNode(BG_AV_Nodes node, uint16 team, bool tower)
     m_Nodes[node].Timer      = 0;
     m_Nodes[node].Tower      = tower;
 }
-
 void BattleGroundAV::DefendNode(BG_AV_Nodes node, uint16 team)
 {
     assert(m_Nodes[node].TotalOwner == team);
@@ -1396,7 +1307,6 @@ void BattleGroundAV::DefendNode(BG_AV_Nodes node, uint16 team)
     m_Nodes[node].State      = POINT_CONTROLED;
     m_Nodes[node].Timer      = 0;
 }
-
 void BattleGroundAV::ResetBGSubclass()
 {
     m_MaxLevel=0;
@@ -1420,12 +1330,9 @@ void BattleGroundAV::ResetBGSubclass()
     for(BG_AV_Nodes i = BG_AV_NODES_ICEBLOOD_TOWER; i <= BG_AV_NODES_FROSTWOLF_WTOWER; ++i) //horde towers
         InitNode(i,HORDE,true);
     InitNode(BG_AV_NODES_SNOWFALL_GRAVE,AV_NEUTRAL_TEAM,false); //give snowfall neutral owner
-
     m_Mine_Timer=AV_MINE_TICK_TIMER;
     for(uint16 i = 0; i < AV_CPLACE_MAX+AV_STATICCPLACE_MAX; i++)
         if(m_BgCreatures[i])
             DelCreature(i);
-
 }
 
-
diff --git a/src/game/BattleGroundAV.h b/src/game/BattleGroundAV.h
index 306c513ae95..7e5bd367b70 100644
--- a/src/game/BattleGroundAV.h
+++ b/src/game/BattleGroundAV.h
@@ -17,44 +17,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __BATTLEGROUNDAV_H
 #define __BATTLEGROUNDAV_H
-
 class BattleGround;
-
 #define LANG_BG_AV_A_CAPTAIN_BUFF       "Begone. Uncouth scum! The Alliance shall prevail in Alterac Valley!"
 #define LANG_BG_AV_H_CAPTAIN_BUFF       "Now is the time to attack! For the Horde!"
 #define LANG_BG_AV_S_MINE_BOSS_CLAIMS   "Snivvle is here! Snivvle claims the Coldtooth Mine!"
-
 #define BG_AV_CAPTIME                    240000  //4:00
 #define BG_AV_SNOWFALL_FIRSTCAP          300000  //5:00 but i also have seen 4:05
-
 #define BG_AV_SCORE_INITIAL_POINTS       600
 #define SEND_MSG_NEAR_LOSE               120
-
 #define BG_AV_KILL_BOSS                 4
 #define BG_AV_REP_BOSS                  350
-
 #define BG_AV_KILL_CAPTAIN              3
 #define BG_AV_REP_CAPTAIN               125
 #define BG_AV_RES_CAPTAIN               100
-
 #define BG_AV_KILL_TOWER                3
 #define BG_AV_REP_TOWER                 12
 #define BG_AV_RES_TOWER                 75
-
 #define BG_AV_GET_COMMANDER            1 //for a safely returned wingcommander
 //bonushonor at the end
 #define BG_AV_KILL_SURVIVING_TOWER      2
 #define BG_AV_REP_SURVIVING_TOWER       12
-
 #define BG_AV_KILL_SURVIVING_CAPTAIN    2
 #define BG_AV_REP_SURVIVING_CAPTAIN     125
-
 enum BG_AV_Sounds
 { //TODO: get out if there comes a sound when neutral team captures mine
-
 /*
 8212:
     alliance grave assault
@@ -62,7 +50,6 @@ enum BG_AV_Sounds
     drek "mlanzenabschaum! In meiner Burg?! Toetet sie all" - nicht immer der sound
 8333:
     galv "sterbt fuer euch ist kein platz hier"
-
 8332:
     bal "Verschwinde, dreckiger Abschaum! Die Allianz wird im Alteractal "
 8174:
@@ -85,21 +72,16 @@ horde:
     mine capture
     horde wins
     */
-
     AV_SOUND_NEAR_VICTORY                   = 8456, //not confirmed yet
-
     AV_SOUND_ALLIANCE_ASSAULTS              = 8212, //tower,grave + enemy boss if someone tries to attack him
     AV_SOUND_HORDE_ASSAULTS                 = 8174,
     AV_SOUND_ALLIANCE_GOOD                  = 8173, //if something good happens for the team:  wins(maybe only through killing the boss), captures mine or grave, destroys tower and defends grave
     AV_SOUND_HORDE_GOOD                     = 8213,
     AV_SOUND_BOTH_TOWER_DEFEND              = 8192,
-
     AV_SOUND_ALLIANCE_CAPTAIN               = 8232, //gets called when someone attacks them and at the beginning after 3min+rand(x)*10sec (maybe buff)
     AV_SOUND_HORDE_CAPTAIN                  = 8333,
 
-
 };
-
 enum BG_AV_OTHER_VALUES
 {
     AV_STATICCPLACE_MAX        = 123,
@@ -118,25 +100,21 @@ enum BG_AV_ObjectIds
     BG_AV_OBJECTID_BANNER_H             = 178943, // can only be used by alliance
     BG_AV_OBJECTID_BANNER_CONT_A        = 178940, // can only be used by horde
     BG_AV_OBJECTID_BANNER_CONT_H        = 179435, // can only be used by alliance
-
     BG_AV_OBJECTID_BANNER_A_B           = 178365,
     BG_AV_OBJECTID_BANNER_H_B           = 178364,
     BG_AV_OBJECTID_BANNER_CONT_A_B      = 179286,
     BG_AV_OBJECTID_BANNER_CONT_H_B      = 179287,
     BG_AV_OBJECTID_BANNER_SNOWFALL_N    = 180418,
-
     //snowfall eyecandy banner:
     BG_AV_OBJECTID_SNOWFALL_CANDY_A     = 179044,
     BG_AV_OBJECTID_SNOWFALL_CANDY_PA    = 179424,
     BG_AV_OBJECTID_SNOWFALL_CANDY_H     = 179064,
     BG_AV_OBJECTID_SNOWFALL_CANDY_PH    = 179425,
-
     //banners on top of towers:
     BG_AV_OBJECTID_TOWER_BANNER_A  = 178927, //[PH] Alliance A1 Tower Banner BIG
     BG_AV_OBJECTID_TOWER_BANNER_H  = 178955, //[PH] Horde H1 Tower Banner BIG
     BG_AV_OBJECTID_TOWER_BANNER_PA = 179446, //[PH] Alliance H1 Tower Pre-Banner BIG
     BG_AV_OBJECTID_TOWER_BANNER_PH = 179436, //[PH] Horde A1 Tower Pre-Banner BIG
-
     //Auras
     BG_AV_OBJECTID_AURA_A               = 180421,
     BG_AV_OBJECTID_AURA_H               = 180422,
@@ -144,18 +122,14 @@ enum BG_AV_ObjectIds
     BG_AV_OBJECTID_AURA_A_S             = 180100,
     BG_AV_OBJECTID_AURA_H_S             = 180101,
     BG_AV_OBJECTID_AURA_N_S             = 180102,
-
     BG_AV_OBJECTID_GATE_A               = 180424,
     BG_AV_OBJECTID_GATE_H               = 180424,
-
     //mine supplies
     BG_AV_OBJECTID_MINE_N        = 178785,
     BG_AV_OBJECTID_MINE_S       = 178784,
-
     BG_AV_OBJECTID_FIRE                 = 179065,
     BG_AV_OBJECTID_SMOKE                 = 179066
 };
-
 enum BG_AV_Nodes
 {
     BG_AV_NODES_FIRSTAID_STATION        = 0,
@@ -173,10 +147,8 @@ enum BG_AV_Nodes
     BG_AV_NODES_TOWER_POINT             = 12,
     BG_AV_NODES_FROSTWOLF_ETOWER        = 13,
     BG_AV_NODES_FROSTWOLF_WTOWER        = 14,
-
     BG_AV_NODES_MAX                     = 15
 };
-
 enum BG_AV_ObjectTypes
 {
     BG_AV_OBJECT_FLAG_A_FIRSTAID_STATION    = 0,
@@ -190,7 +162,6 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_FLAG_A_DUNBALDAR_NORTH     = 8,
     BG_AV_OBJECT_FLAG_A_ICEWING_BUNKER      = 9,
     BG_AV_OBJECT_FLAG_A_STONEHEART_BUNKER   = 10,
-
     BG_AV_OBJECT_FLAG_C_A_FIRSTAID_STATION    = 11,
     BG_AV_OBJECT_FLAG_C_A_STORMPIKE_GRAVE     = 12,
     BG_AV_OBJECT_FLAG_C_A_STONEHEART_GRAVE    = 13,
@@ -202,7 +173,6 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_FLAG_C_A_TOWER_POINT         = 19,
     BG_AV_OBJECT_FLAG_C_A_FROSTWOLF_ETOWER    = 20,
     BG_AV_OBJECT_FLAG_C_A_FROSTWOLF_WTOWER    = 21,
-
     BG_AV_OBJECT_FLAG_C_H_FIRSTAID_STATION    = 22,
     BG_AV_OBJECT_FLAG_C_H_STORMPIKE_GRAVE     = 23,
     BG_AV_OBJECT_FLAG_C_H_STONEHEART_GRAVE    = 24,
@@ -214,7 +184,6 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_FLAG_C_H_DUNBALDAR_NORTH     = 30,
     BG_AV_OBJECT_FLAG_C_H_ICEWING_BUNKER      = 31,
     BG_AV_OBJECT_FLAG_C_H_STONEHEART_BUNKER   = 32,
-
     BG_AV_OBJECT_FLAG_H_FIRSTAID_STATION    = 33,
     BG_AV_OBJECT_FLAG_H_STORMPIKE_GRAVE     = 34,
     BG_AV_OBJECT_FLAG_H_STONEHEART_GRAVE    = 35,
@@ -226,9 +195,7 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_FLAG_H_TOWER_POINT         = 41,
     BG_AV_OBJECT_FLAG_H_FROSTWOLF_ETOWER    = 42,
     BG_AV_OBJECT_FLAG_H_FROSTWOLF_WTOWER    = 43,
-
     BG_AV_OBJECT_FLAG_N_SNOWFALL_GRAVE      = 44,
-
     BG_AV_OBJECT_DOOR_H                     = 45,
     BG_AV_OBJECT_DOOR_A                     = 46,
 //auras for graveyards (3auras per graveyard neutral,alliance,horde)
@@ -253,7 +220,6 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_AURA_N_FROSTWOLF_HUT       = 65,
     BG_AV_OBJECT_AURA_A_FROSTWOLF_HUT       = 66,
     BG_AV_OBJECT_AURA_H_FROSTWOLF_HUT       = 67,
-
     //big flags on top of towers 2 flags on each (contested,(alliance | horde)) + 2 auras
     BG_AV_OBJECT_TFLAG_A_DUNBALDAR_SOUTH     = 67,
     BG_AV_OBJECT_TFLAG_H_DUNBALDAR_SOUTH     = 68,
@@ -287,7 +253,6 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_TAURA_H_FROSTWOLF_ETOWER    = 96,
     BG_AV_OBJECT_TAURA_A_FROSTWOLF_WTOWER    = 97,
     BG_AV_OBJECT_TAURA_H_FROSTWOLF_WTOWER    = 98,
-
     BG_AV_OBJECT_BURN_DUNBALDAR_SOUTH        = 99,
     BG_AV_OBJECT_BURN_DUNBALDAR_NORTH        = 109,
     BG_AV_OBJECT_BURN_ICEWING_BUNKER         = 119,
@@ -306,12 +271,9 @@ enum BG_AV_ObjectTypes
     BG_AV_OBJECT_MINE_SUPPLY_N_MAX           = 224,
     BG_AV_OBJECT_MINE_SUPPLY_S_MIN           = 225,
     BG_AV_OBJECT_MINE_SUPPLY_S_MAX           = 236,
-
     BG_AV_OBJECT_MAX                          = 237
 };
 
-
-
 enum BG_AV_OBJECTS
 {
     AV_OPLACE_FIRSTAID_STATION          = 0,
@@ -337,7 +299,6 @@ enum BG_AV_OBJECTS
     AV_OPLACE_BIGBANNER_TOWER_POINT             = 20,
     AV_OPLACE_BIGBANNER_FROSTWOLF_ETOWER        = 21,
     AV_OPLACE_BIGBANNER_FROSTWOLF_WTOWER        = 22,
-
     AV_OPLACE_BURN_DUNBALDAR_SOUTH         = 23,
     AV_OPLACE_BURN_DUNBALDAR_NORTH         = 33,
     AV_OPLACE_BURN_ICEWING_BUNKER          = 43,
@@ -356,7 +317,6 @@ enum BG_AV_OBJECTS
     AV_OPLACE_MINE_SUPPLY_N_MAX           = 136,
     AV_OPLACE_MINE_SUPPLY_S_MIN           = 137,
     AV_OPLACE_MINE_SUPPLY_S_MAX           = 148,
-
     AV_OPLACE_MAX                         = 149
 };
 const float BG_AV_ObjectPos[AV_OPLACE_MAX][4] = {
@@ -473,7 +433,6 @@ const float BG_AV_ObjectPos[AV_OPLACE_MAX][4] = {
     {-1295.55f,-263.865f,105.033f,0.925024f},
     {-1294.71f,-281.466f,107.664f,-1.50098f},
     {-1289.69f,-259.521f,107.612f,-2.19912f},
-
     //the two buildings of the captains
     //alliance
     {-64.4987f,-289.33f,33.4616f,-2.82743f},
@@ -497,7 +456,6 @@ const float BG_AV_ObjectPos[AV_OPLACE_MAX][4] = {
     {-568.04f,-188.707f,81.55f,0},
     {-501.775f,-151.581f,81.2027f,0},
     {-509.975f,-191.652f,83.2978f,0},
-
 //snowfall eyecandy
     {-191.153f,-129.868f,78.5595f,-1.25664f },
     {-201.282f,-134.319f,78.6753f,-0.942478f },
@@ -529,13 +487,11 @@ const float BG_AV_ObjectPos[AV_OPLACE_MAX][4] = {
     {-947.642f,-208.807f,77.0101f,1.36136f},
     {-951.394f,-193.695f,67.634f,0.802851f}
 };
-
 const float BG_AV_DoorPositons[2][4] = {
     {780.487f, -493.024f, 99.9553f, 3.0976f},   //alliance
     {-1375.193f, -538.981f, 55.2824f, 0.72178f} //horde
 };
 
-
 //creaturestuff starts here
 //is related to BG_AV_CreaturePos
 enum BG_AV_CreaturePlace
@@ -557,7 +513,6 @@ enum BG_AV_CreaturePlace
     AV_CPLACE_DEFENSE_FROSTWOLF      = 25,
     AV_CPLACE_DEFENSE_ICE_GRAVE      = 29,
     AV_CPLACE_DEFENSE_FROST_HUT      = 33,
-
     AV_CPLACE_DEFENSE_DUN_S          = 37,
     AV_CPLACE_DEFENSE_DUN_N          = 41,
     AV_CPLACE_DEFENSE_ICEWING        = 45,
@@ -566,7 +521,6 @@ enum BG_AV_CreaturePlace
     AV_CPLACE_DEFENSE_TOWERPOINT     = 57,
     AV_CPLACE_DEFENSE_FROST_E        = 61,
     AV_CPLACE_DEFENSE_FROST_t        = 65,
-
     AV_CPLACE_A_MARSHAL_SOUTH       = 69,
     AV_CPLACE_A_MARSHAL_NORTH       = 70,
     AV_CPLACE_A_MARSHAL_ICE         = 71,
@@ -596,13 +550,10 @@ enum BG_AV_CreaturePlace
     AV_CPLACE_MINE_S_S_MAX      = 299,
     //boss
     AV_CPLACE_MINE_S_3          = 300,
-
     //herald
     AV_CPLACE_HERALD          = 301,
-
     AV_CPLACE_MAX = 302
 };
-
 //x, y, z, o
 const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
     //spiritguides
@@ -692,7 +643,6 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
     {-1302.41f,-259.256f,114.065f,1.67602f},
     {-1287.97f,-262.087f,114.165f,6.18264f},
     {-1291.59f,-271.166f,114.151f,5.28257f},
-
     //alliance marshall
     {721.104f,-7.64155f,50.7046f,3.45575f},// south
     {723.058f,-14.1548f,50.7046f,3.40339f},// north
@@ -703,7 +653,6 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
     {-1370.96f,-223.532f,98.4266f,4.93012f},
     {-1378.37f,-228.614f,99.3546f,5.38565f},
     {-1358.02f,-228.998f,98.868f,3.87768f},
-
  //irondeep mine
  //Irondeep Trogg
     {971.671f,-442.657f,57.6951f,3.1765f},
@@ -939,13 +888,10 @@ const float BG_AV_CreaturePos[AV_CPLACE_MAX][4] = {
     {-848.902f,-92.931f,68.6325f,3.33350},
     //herald
     {-48.459f,-288.802f,55.47f,1.0}
-
 };
 
-
 enum BG_AV_CreatureIds
 {
-
     AV_NPC_A_GRAVEDEFENSE0 = 0,     // stormpike Defender
     AV_NPC_A_GRAVEDEFENSE1 = 1,     // seasoned defender
     AV_NPC_A_GRAVEDEFENSE2 = 2,     // veteran defender
@@ -953,7 +899,6 @@ enum BG_AV_CreatureIds
     AV_NPC_A_TOWERDEFENSE  = 4,     // stormpike bowman
     AV_NPC_A_CAPTAIN       = 5,     // balinda
     AV_NPC_A_BOSS          = 6,     // vanndar
-
     AV_NPC_H_GRAVEDEFENSE0 = 7,     // frostwolf guardian
     AV_NPC_H_GRAVEDEFENSE1 = 8,     // seasoned guardian
     AV_NPC_H_GRAVEDEFENSE2 = 9,     // veteran guardian
@@ -961,7 +906,6 @@ enum BG_AV_CreatureIds
     AV_NPC_H_TOWERDEFENSE  = 11,    // frostwolf bowman
     AV_NPC_H_CAPTAIN       = 12,    // galvangar
     AV_NPC_H_BOSS          = 13,    // drek thar
-
     AV_NPC_A_MARSHAL_SOUTH = 14,
     AV_NPC_MARSHAL_NORTH   = 15,
     AV_NPC_A_MARSHAL_ICE   = 16,
@@ -997,9 +941,7 @@ enum BG_AV_CreatureIds
     AV_NPC_S_MINE_H_4      = 46,
     AV_NPC_HERALD          = 47,
     AV_NPC_INFO_MAX        = 48
-
 };
-
 //entry, team, minlevel, maxlevel
 //TODO this array should be removed, the only needed things are the entrys (for spawning(?) and handlekillunit)
 const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX][4] = {
@@ -1021,46 +963,37 @@ const uint32 BG_AV_CreatureInfo[AV_NPC_INFO_MAX][4] = {
     { 14762, 1534, 60, 60 }, //Dun Baldar North Marshal
     { 14764, 1534, 60, 60 }, //Icewing Marshal
     { 14765, 1534, 60, 60 }, //Stonehearth Marshal
-
     { 14773, 1214, 60, 60 }, //Iceblood Warmaster
     { 14776, 1214, 60, 60 }, //Tower Point Warmaster
     { 14772, 1214, 60, 60 }, //East Frostwolf Warmaster
     { 14777, 1214, 60, 60 }, //West Frostwolf Warmaster
-
     { 10987, 59, 52, 53 }, //Irondeep Trogg
     { 11600, 59, 53, 54 }, //Irondeep Shaman
     { 11602, 59, 54, 55 }, //Irondeep Skullthumper
     { 11657, 59, 58, 58 }, //Morloch
-
     {13396,469,52,53}, //irondeep alliance TODO: get the right ids
     {13080,469,53,54},
     {13098,469,54,55},
     {13078,469,58,58},
-
     {13397,67,52,53}, //irondeep horde
     {13099,67,53,54},
     {13081,67,54,55},
     {13079,67,58,58},
-
     { 11603, 59, 52, 53 }, //south mine neutral
     { 11604, 59, 53, 54 },
     { 11605, 59, 54, 55 },
     { 11677, 59, 58, 58 },
     { 10982, 59, 52, 53 }, //vermin
-
     {13317,469,52,53}, //alliance
     {13096,469,54,55}, //explorer
     {13087,469,54,55}, //invader
     {13086,469,58,58},
-
     {13316,67,52,53}, //horde
     {13097,67,54,55}, //surveypr
     {13089,67,54,55}, //guard
     {13088,67,58,58},
     {14848,67,58,58} //Herald
-
 };
-
 //x,y,z,o,static_creature_info-id
 const float BG_AV_StaticCreaturePos[AV_STATICCPLACE_MAX][5] = { //static creatures
     {-1235.31f,-340.777f,60.5088f,3.31613f,0 },//2225 - Zora Guthrek
@@ -1186,9 +1119,7 @@ const float BG_AV_StaticCreaturePos[AV_STATICCPLACE_MAX][5] = { //static creatur
     {773.651f,-497.482f,99.0408f,2.11185f,46 },//14284 - Stormpike Battleguard
     {949.1f,-506.913f,95.4237f,3.31613f,46 },//14284 - Stormpike Battleguard
     {-1370.9f,-219.793f,98.4258f,5.04381f,47}, //drek thar
-
 };
-
 const uint32 BG_AV_StaticCreatureInfo[51][4] = {
     { 2225, 1215, 55, 55 }, //Zora Guthrek
     { 3343, 1215, 55, 55 }, //Grelkor
@@ -1242,7 +1173,6 @@ const uint32 BG_AV_StaticCreatureInfo[51][4] = {
     { 11947, 1214, 61, 61 }, //Captain Galvangar
     { 11949, 1216, 61, 61 } //Captain Balinda Stonehearth
 };
-
 enum BG_AV_Graveyards
 {
     AV_GRAVE_STORM_AID         = 751,
@@ -1256,8 +1186,6 @@ enum BG_AV_Graveyards
     AV_GRAVE_MAIN_HORDE        = 610
 };
 
-
-
 const uint32 BG_AV_GraveyardIds[9]= {
   AV_GRAVE_STORM_AID,
   AV_GRAVE_STORM_GRAVE,
@@ -1269,7 +1197,6 @@ const uint32 BG_AV_GraveyardIds[9]= {
   AV_GRAVE_MAIN_ALLIANCE,
   AV_GRAVE_MAIN_HORDE
 };
-
 enum BG_AV_BUFF
 { //TODO add all other buffs here
     AV_BUFF_ARMOR = 21163,
@@ -1283,19 +1210,15 @@ enum BG_AV_States
     POINT_DESTROYED            =  2,
     POINT_CONTROLED            =  3
 };
-
 enum BG_AV_WorldStates
 {
     AV_Alliance_Score               = 3127,
     AV_Horde_Score                  = 3128,
     AV_SHOW_H_SCORE                 = 3133,
     AV_SHOW_A_SCORE                 = 3134,
-
 /*
     //the comments behind the state shows which icon overlaps the other.. but is, until now, unused and maybe not a good solution (but give few performance (: )
-
 // Graves
-
     // Alliance
     //Stormpike first aid station
     AV_AID_A_C                      = 1325,
@@ -1338,7 +1261,6 @@ enum BG_AV_WorldStates
     AV_FROSTWOLFHUT_H_C             = 1330,
     AV_FROSTWOLFHUT_H_A             = 1332, //over ac
 
-
 //Towers
     //Alliance
     //Dunbaldar South Bunker
@@ -1374,38 +1296,30 @@ enum BG_AV_WorldStates
     AV_FROSTWOLFE_CONTROLLED        = 1383,
     AV_FROSTWOLFE_DESTROYED         = 1366,
     AV_FROSTWOLFE_ASSAULTED         = 1388,
-
 //mines
-
     AV_N_MINE_N              = 1360,
     AV_N_MINE_A              = 1358,
     AV_N_MINE_H              = 1359,
-
     AV_S_MINE_N                     = 1357,
     AV_S_MINE_A                     = 1355,
     AV_S_MINE_H                     = 1356,
-
 //towers assaulted by own team (unused)
     AV_STONEH_UNUSED                = 1377,
     AV_ICEWING_UNUSED               = 1376,
     AV_DUNS_UNUSED                  = 1375,
     AV_DUNN_UNUSED                  = 1374,
-
     AV_ICEBLOOD_UNUSED              = 1395,
     AV_TOWERPOINT_UNUSED            = 1394,
     AV_FROSTWOLFE_UNUSED            = 1393,
     AV_FROSTWOLFW_UNUSED            = 1392
 */
-
 };
-
 //alliance_control neutral_control horde_control
 const uint32 BG_AV_MineWorldStates[2][3] = {
     {1358, 1360,1359},
     {1355, 1357,1356}
 };
 
-
 //alliance_control alliance_assault h_control h_assault
 const uint32 BG_AV_NodeWorldStates[16][4] = {
     //Stormpike first aid station
@@ -1439,7 +1353,6 @@ const uint32 BG_AV_NodeWorldStates[16][4] = {
     //Frostwolf West
     {1365,1387,1382,1392},
 };
-
 enum BG_AV_QuestIds
 {
     AV_QUEST_A_SCRAPS1      = 7223,
@@ -1465,7 +1378,6 @@ enum BG_AV_QuestIds
     AV_QUEST_A_RIDER_TAME   = 7027,
     AV_QUEST_H_RIDER_TAME   = 7001
 };
-
 struct BG_AV_NodeInfo
 {
     uint16       TotalOwner;
@@ -1476,9 +1388,7 @@ struct BG_AV_NodeInfo
     int          Timer;
     bool         Tower;
 };
-
 inline BG_AV_Nodes &operator++(BG_AV_Nodes &i){ return i = BG_AV_Nodes(i + 1); }
-
 class BattleGroundAVScore : public BattleGroundScore
 {
     public:
@@ -1492,30 +1402,24 @@ class BattleGroundAVScore : public BattleGroundScore
         uint32 LeadersKilled;
         uint32 SecondaryObjectives;
 };
-
 class BattleGroundAV : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundAV();
         ~BattleGroundAV();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr,uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
         virtual void ResetBGSubclass();
-
         /*general stuff*/
         void UpdateScore(uint16 team, int16 points);
        void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
         /*handlestuff*/ //these are functions which get called from extern
         virtual void EventPlayerClickedOnFlag(Player *source, GameObject* target_obj);
         void HandleKillPlayer(Player* player, Player *killer);
@@ -1523,62 +1427,47 @@ class BattleGroundAV : public BattleGround
         void HandleQuestComplete(uint32 questid, Player *player);
         bool PlayerCanDoMineQuest(int32 GOId,uint32 team);
 
-
         void EndBattleGround(uint32 winner);
-
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-
     private:
         /* Nodes occupying */
         void EventPlayerAssaultsPoint(Player* player, uint32 object);
         void EventPlayerDefendsPoint(Player* player, uint32 object);
         void EventPlayerDestroyedPoint(BG_AV_Nodes node);
-
         void AssaultNode(BG_AV_Nodes node,uint16 team);
         void DestroyNode(BG_AV_Nodes node);
         void InitNode(BG_AV_Nodes node, uint16 team, bool tower);
         void DefendNode(BG_AV_Nodes node, uint16 team);
-
         void PopulateNode(BG_AV_Nodes node);
         void DePopulateNode(BG_AV_Nodes node);
-
         const BG_AV_Nodes GetNodeThroughObject(uint32 object);
         const uint32 GetObjectThroughNode(BG_AV_Nodes node);
         const char* GetNodeName(BG_AV_Nodes node);
         const bool IsTower(BG_AV_Nodes node) {   return m_Nodes[node].Tower; }
 
-
         /*mine*/
         void ChangeMineOwner(uint8 mine, uint32 team, bool initial=false);
-
         /*worldstates*/
         void FillInitialWorldStates(WorldPacket& data);
         const uint8 GetWorldStateType(uint8 state, uint16 team);
         void SendMineWorldStates(uint32 mine);
         void UpdateNodeWorldState(BG_AV_Nodes node);
-
         /*general */
         Creature* AddAVCreature(uint16 cinfoid, uint16 type);
         const uint16 GetBonusHonor(uint8 kills); //TODO remove this when mangos handles this right
-
         /*variables */
         int32 m_Team_Scores[2];
         uint32 m_Team_QuestStatus[2][9]; //[x][y] x=team y=questcounter
-
         BG_AV_NodeInfo m_Nodes[BG_AV_NODES_MAX];
-
         uint32 m_Mine_Owner[2];
         uint32 m_Mine_PrevOwner[2]; //only for worldstates needed
         int32 m_Mine_Timer; //ticks for both teams
         uint32 m_Mine_Reclaim_Timer[2];
         uint32 m_CaptainBuffTimer[2];
         bool m_CaptainAlive[2];
-
         uint8 m_MaxLevel; //TODO remove this when battleground-getmaxlevel() returns something usefull
         bool m_IsInformedNearVictory[2];
 
-
 };
-
 #endif
 
diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp
index 05475328b01..e79d2b606ff 100644
--- a/src/game/BattleGroundBE.cpp
+++ b/src/game/BattleGroundBE.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
 #include "Language.h"
@@ -25,11 +24,9 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "WorldPacket.h"
-
 BattleGroundBE::BattleGroundBE()
 {
     m_BgObjects.resize(BG_BE_OBJECT_MAX);
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -40,94 +37,72 @@ BattleGroundBE::BattleGroundBE()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundBE::~BattleGroundBE()
 {
-
 }
-
 void BattleGroundBE::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     /*if (GetStatus() == STATUS_IN_PROGRESS)
     {
         // update something
     }*/
 }
-
 void BattleGroundBE::StartingEventCloseDoors()
 {
     for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_4; ++i)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
-
     for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; ++i)
         SpawnBGObject(i, RESPAWN_ONE_DAY);
 }
-
 void BattleGroundBE::StartingEventOpenDoors()
 {
     for(uint32 i = BG_BE_OBJECT_DOOR_1; i <= BG_BE_OBJECT_DOOR_2; ++i)
         DoorOpen(i);
-
     for(uint32 i = BG_BE_OBJECT_BUFF_1; i <= BG_BE_OBJECT_BUFF_2; ++i)
         SpawnBGObject(i, 60);
 }
-
 void BattleGroundBE::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundBEScore* sc = new BattleGroundBEScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
-
     UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
 }
-
 void BattleGroundBE::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
 {
     if (GetStatus() == STATUS_WAIT_LEAVE)
         return;
-
     UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 void BattleGroundBE::HandleKillPlayer(Player *player, Player *killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     if (!killer)
     {
         sLog.outError("Killer player not found");
         return;
     }
-
     BattleGround::HandleKillPlayer(player,killer);
-
     UpdateWorldState(0x9f1, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0x9f0, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 bool BattleGroundBE::HandlePlayerUnderMap(Player *player)
 {
     player->TeleportTo(GetMapId(),6238.930176,262.963470,0.889519,player->GetOrientation(),false);
     return true;
 }
-
 void BattleGroundBE::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     //uint32 SpellId = 0;
     //uint64 buff_guid = 0;
     switch(Trigger)
@@ -143,24 +118,20 @@ void BattleGroundBE::HandleAreaTrigger(Player *Source, uint32 Trigger)
             Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
             break;
     }
-
     //if (buff_guid)
     //    HandleTriggerBuff(buff_guid,Source);
 }
-
 void BattleGroundBE::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(0x9f1) << uint32(GetAlivePlayersCountByTeam(ALLIANCE));           // 7
     data << uint32(0x9f0) << uint32(GetAlivePlayersCountByTeam(HORDE));           // 8
     data << uint32(0x9f3) << uint32(1);           // 9
 }
-
 void BattleGroundBE::Reset()
 {
     //call parent's class reset
     BattleGround::Reset();
 }
-
 bool BattleGroundBE::SetupBattleGround()
 {
     // gates
@@ -175,22 +146,16 @@ bool BattleGroundBE::SetupBattleGround()
         sLog.outErrorDb("BatteGroundBE: Failed to spawn some object!");
         return false;
     }
-
     return true;
 }
-
 void BattleGroundBE::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
 {
-
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if(itr == m_PlayerScores.end())                         // player not found...
         return;
-
     //there is nothing special in this score
     BattleGround::UpdatePlayerScore(Source,type,value);
-
 }
-
 /*
 21:45:46 id:231310 [S2C] SMSG_INIT_WORLD_STATES (706 = 0x02C2) len: 86
 0000: 32 02 00 00 76 0e 00 00 00 00 00 00 09 00 f3 09  |  2...v...........
@@ -199,7 +164,6 @@ void BattleGroundBE::UpdatePlayerScore(Player* Source, uint32 type, uint32 value
 0030: 00 00 00 00 00 00 d7 08 00 00 00 00 00 00 d6 08  |  ................
 0040: 00 00 00 00 00 00 d5 08 00 00 00 00 00 00 d3 08  |  ................
 0050: 00 00 00 00 00 00                                |  ......
-
 spell 32724 - Gold Team
 spell 32725 - Green Team
 35774 Gold Team
diff --git a/src/game/BattleGroundBE.h b/src/game/BattleGroundBE.h
index e75e332f44f..b3996498e53 100644
--- a/src/game/BattleGroundBE.h
+++ b/src/game/BattleGroundBE.h
@@ -19,9 +19,7 @@
  */
 #ifndef __BATTLEGROUNDBE_H
 #define __BATTLEGROUNDBE_H
-
 class BattleGround;
-
 enum BattleGroundBEObjectTypes
 {
     BG_BE_OBJECT_DOOR_1         = 0,
@@ -32,7 +30,6 @@ enum BattleGroundBEObjectTypes
     BG_BE_OBJECT_BUFF_2         = 5,
     BG_BE_OBJECT_MAX            = 6
 };
-
 enum BattleGroundBEObjects
 {
     BG_BE_OBJECT_TYPE_DOOR_1    = 183971,
@@ -42,28 +39,23 @@ enum BattleGroundBEObjects
     BG_BE_OBJECT_TYPE_BUFF_1    = 184663,
     BG_BE_OBJECT_TYPE_BUFF_2    = 184664
 };
-
 class BattleGroundBEScore : public BattleGroundScore
 {
     public:
         BattleGroundBEScore() {};
         virtual ~BattleGroundBEScore() {};
 };
-
 class BattleGroundBE : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundBE();
         ~BattleGroundBE();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
@@ -71,7 +63,6 @@ class BattleGroundBE : public BattleGround
         virtual void FillInitialWorldStates(WorldPacket &d);
         void HandleKillPlayer(Player* player, Player *killer);
         bool HandlePlayerUnderMap(Player * plr);
-
         /* Scorekeeping */
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
 };
diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp
index 0be870be175..e133bc740b0 100644
--- a/src/game/BattleGroundDS.cpp
+++ b/src/game/BattleGroundDS.cpp
@@ -15,15 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
 #include "Language.h"
 #include "Player.h"
-
 BattleGroundDS::BattleGroundDS()
 {
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -34,47 +31,36 @@ BattleGroundDS::BattleGroundDS()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundDS::~BattleGroundDS()
 {
-
 }
-
 void BattleGroundDS::Update(uint32 diff)
 {
     BattleGround::Update(diff);
 }
-
 void BattleGroundDS::StartingEventCloseDoors()
 {
 }
-
 void BattleGroundDS::StartingEventOpenDoors()
 {
 }
-
 void BattleGroundDS::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundDSScore* sc = new BattleGroundDSScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundDS::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
 {
 }
-
 void BattleGroundDS::HandleKillPlayer(Player* player, Player* killer)
 {
     BattleGround::HandleKillPlayer(player, killer);
 }
-
 void BattleGroundDS::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
 {
 }
-
 bool BattleGroundDS::SetupBattleGround()
 {
     return true;
diff --git a/src/game/BattleGroundDS.h b/src/game/BattleGroundDS.h
index 44a6cfbd33a..8b310a67da0 100644
--- a/src/game/BattleGroundDS.h
+++ b/src/game/BattleGroundDS.h
@@ -17,9 +17,7 @@
  */
 #ifndef __BATTLEGROUNDDS_H
 #define __BATTLEGROUNDDS_H
-
 class BattleGround;
-
 class BattleGroundDSScore : public BattleGroundScore
 {
     public:
@@ -27,21 +25,17 @@ class BattleGroundDSScore : public BattleGroundScore
         virtual ~BattleGroundDSScore() {};
         //TODO fix me
 };
-
 class BattleGroundDS : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundDS();
         ~BattleGroundDS();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
index 0c7ea66388b..5678eeec494 100644
--- a/src/game/BattleGroundEY.cpp
+++ b/src/game/BattleGroundEY.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
@@ -29,13 +28,11 @@
 #include "Object.h"
 #include "Player.h"
 #include "Util.h"
-
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_EY_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
     330, // normal honor
     200  // holiday
 };
-
 BattleGroundEY::BattleGroundEY()
 {
     m_BuffChange = true;
@@ -45,21 +42,17 @@ BattleGroundEY::BattleGroundEY()
     m_Points_Trigger[BLOOD_ELF] = TR_BLOOD_ELF_BUFF;
     m_Points_Trigger[DRAENEI_RUINS] = TR_DRAENEI_RUINS_BUFF;
     m_Points_Trigger[MAGE_TOWER] = TR_MAGE_TOWER_BUFF;
-
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_EY_START_TWO_MINUTES;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_EY_START_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_EY_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_EY_HAS_BEGUN;
 }
-
 BattleGroundEY::~BattleGroundEY()
 {
 }
-
 void BattleGroundEY::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
         m_PointAddingTimer -= diff;
@@ -71,11 +64,9 @@ void BattleGroundEY::Update(uint32 diff)
             if (m_TeamPointsCount[BG_TEAM_HORDE] > 0)
                 AddPoints(HORDE, BG_EY_TickPoints[m_TeamPointsCount[BG_TEAM_HORDE] - 1]);
         }
-
         if (m_FlagState == BG_EY_FLAG_STATE_WAIT_RESPAWN || m_FlagState == BG_EY_FLAG_STATE_ON_GROUND)
         {
             m_FlagsTimer -= diff;
-
             if (m_FlagsTimer < 0)
             {
                 m_FlagsTimer = 0;
@@ -85,7 +76,6 @@ void BattleGroundEY::Update(uint32 diff)
                     RespawnFlagAfterDrop();
             }
         }
-
         m_TowerCapCheckTimer -= diff;
         if (m_TowerCapCheckTimer <= 0)
         {
@@ -101,21 +91,17 @@ void BattleGroundEY::Update(uint32 diff)
         }
     }
 }
-
 void BattleGroundEY::StartingEventCloseDoors()
 {
     SpawnBGObject(BG_EY_OBJECT_DOOR_A, RESPAWN_IMMEDIATELY);
     SpawnBGObject(BG_EY_OBJECT_DOOR_H, RESPAWN_IMMEDIATELY);
-
     for(uint32 i = BG_EY_OBJECT_A_BANNER_FEL_REALVER_CENTER; i < BG_EY_OBJECT_MAX; ++i)
         SpawnBGObject(i, RESPAWN_ONE_DAY);
 }
-
 void BattleGroundEY::StartingEventOpenDoors()
 {
     SpawnBGObject(BG_EY_OBJECT_DOOR_A, RESPAWN_ONE_DAY);
     SpawnBGObject(BG_EY_OBJECT_DOOR_H, RESPAWN_ONE_DAY);
-
     for(uint32 i = BG_EY_OBJECT_N_BANNER_FEL_REALVER_CENTER; i <= BG_EY_OBJECT_FLAG_NETHERSTORM; ++i)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
     for(uint32 i = 0; i < EY_POINTS_MAX; ++i)
@@ -125,7 +111,6 @@ void BattleGroundEY::StartingEventOpenDoors()
         SpawnBGObject(BG_EY_OBJECT_SPEEDBUFF_FEL_REALVER + buff + i * 3, RESPAWN_IMMEDIATELY);
     }
 }
-
 void BattleGroundEY::AddPoints(uint32 Team, uint32 Points)
 {
     BattleGroundTeamId team_index = GetTeamIndexByTeamId(Team);
@@ -138,7 +123,6 @@ void BattleGroundEY::AddPoints(uint32 Team, uint32 Points)
     }
     UpdateTeamScore(Team);
 }
-
 void BattleGroundEY::CheckSomeoneJoinedPoint()
 {
     GameObject *obj = NULL;
@@ -175,7 +159,6 @@ void BattleGroundEY::CheckSomeoneJoinedPoint()
         }
     }
 }
-
 void BattleGroundEY::CheckSomeoneLeftPoint()
 {
     //reset current point counts
@@ -217,7 +200,6 @@ void BattleGroundEY::CheckSomeoneLeftPoint()
         }
     }
 }
-
 void BattleGroundEY::UpdatePointStatuses()
 {
     for(uint8 point = 0; point < EY_POINTS_MAX; ++point)
@@ -226,14 +208,12 @@ void BattleGroundEY::UpdatePointStatuses()
             continue;
         //count new point bar status:
         m_PointBarStatus[point] += (m_CurrentPointPlayersCount[2 * point] - m_CurrentPointPlayersCount[2 * point + 1] < BG_EY_POINT_MAX_CAPTURERS_COUNT) ? m_CurrentPointPlayersCount[2 * point] - m_CurrentPointPlayersCount[2 * point + 1] : BG_EY_POINT_MAX_CAPTURERS_COUNT;
-
         if (m_PointBarStatus[point] > BG_EY_PROGRESS_BAR_ALI_CONTROLLED)
             //point is fully alliance's
             m_PointBarStatus[point] = BG_EY_PROGRESS_BAR_ALI_CONTROLLED;
         if (m_PointBarStatus[point] < BG_EY_PROGRESS_BAR_HORDE_CONTROLLED)
             //point is fully horde's
             m_PointBarStatus[point] = BG_EY_PROGRESS_BAR_HORDE_CONTROLLED;
-
         uint32 pointOwnerTeamId = 0;
         //find which team should own this point
         if (m_PointBarStatus[point] <= BG_EY_PROGRESS_BAR_NEUTRAL_LOW)
@@ -242,7 +222,6 @@ void BattleGroundEY::UpdatePointStatuses()
             pointOwnerTeamId = ALLIANCE;
         else
             pointOwnerTeamId = EY_POINT_NO_OWNER;
-
         for (uint8 i = 0; i < m_PlayersNearPoint[point].size(); ++i)
         {
             Player *plr = objmgr.GetPlayer(m_PlayersNearPoint[point][i]);
@@ -255,7 +234,6 @@ void BattleGroundEY::UpdatePointStatuses()
                     //point was uncontrolled and player is from team which captured point
                     if (m_PointState[point] == EY_POINT_STATE_UNCONTROLLED && plr->GetTeam() == pointOwnerTeamId)
                         this->EventTeamCapturedPoint(plr, point);
-
                     //point was under control and player isn't from team which controlled it
                     if (m_PointState[point] == EY_POINT_UNDER_CONTROL && plr->GetTeam() != m_PointOwnedByTeam[point])
                         this->EventTeamLostPoint(plr, point);
@@ -264,7 +242,6 @@ void BattleGroundEY::UpdatePointStatuses()
         }
     }
 }
-
 void BattleGroundEY::UpdateTeamScore(uint32 Team)
 {
     uint32 score = GetTeamScore(Team);
@@ -278,19 +255,16 @@ void BattleGroundEY::UpdateTeamScore(uint32 Team)
         PlaySoundToAll(BG_EY_SOUND_NEAR_VICTORY);
         m_IsInformedNearVictory = true;
     }*/
-
     if (score >= BG_EY_MAX_TEAM_SCORE)
     {
         score = BG_EY_MAX_TEAM_SCORE;
         EndBattleGround(Team);
     }
-
     if (Team == ALLIANCE)
         UpdateWorldState(EY_ALLIANCE_RESOURCES, score);
     else
         UpdateWorldState(EY_HORDE_RESOURCES, score);
 }
-
 void BattleGroundEY::EndBattleGround(uint32 winner)
 {
     //win reward
@@ -301,10 +275,8 @@ void BattleGroundEY::EndBattleGround(uint32 winner)
     //complete map reward
     RewardHonorToTeam(GetBonusHonorFromKill(1), ALLIANCE);
     RewardHonorToTeam(GetBonusHonorFromKill(1), HORDE);
-
     BattleGround::EndBattleGround(winner);
 }
-
 void BattleGroundEY::UpdatePointsCount(uint32 Team)
 {
     if (Team == ALLIANCE)
@@ -312,7 +284,6 @@ void BattleGroundEY::UpdatePointsCount(uint32 Team)
     else
         UpdateWorldState(EY_HORDE_BASE, m_TeamPointsCount[BG_TEAM_HORDE]);
 }
-
 void BattleGroundEY::UpdatePointsIcons(uint32 Team, uint32 Point)
 {
     //we MUST firstly send 0, after that we can send 1!!!
@@ -333,18 +304,14 @@ void BattleGroundEY::UpdatePointsIcons(uint32 Team, uint32 Point)
         UpdateWorldState(m_PointsIconStruct[Point].WorldStateControlIndex, 1);
     }
 }
-
 void BattleGroundEY::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map
     BattleGroundEYScore* sc = new BattleGroundEYScore;
-
     m_PlayersNearPoint[EY_POINTS_MAX].push_back(plr->GetGUID());
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundEY::RemovePlayer(Player *plr, uint64 guid)
 {
     // sometimes flag aura not removed :(
@@ -368,15 +335,12 @@ void BattleGroundEY::RemovePlayer(Player *plr, uint64 guid)
         }
     }
 }
-
 void BattleGroundEY::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     if(!Source->isAlive())                                  //hack code, must be removed later
         return;
-
     switch(Trigger)
     {
         case TR_BLOOD_ELF_POINT:
@@ -416,7 +380,6 @@ void BattleGroundEY::HandleAreaTrigger(Player *Source, uint32 Trigger)
             break;
     }
 }
-
 bool BattleGroundEY::SetupBattleGround()
 {
         // doors
@@ -477,7 +440,6 @@ bool BattleGroundEY::SetupBattleGround()
         sLog.outErrorDb("BatteGroundEY: Failed to spawn some object BattleGround not created!");
         return false;
     }
-
     //buffs
     for (int i = 0; i < EY_POINTS_MAX; ++i)
     {
@@ -493,7 +455,6 @@ bool BattleGroundEY::SetupBattleGround()
             )
             sLog.outError("BattleGroundEY: Cannot spawn buff");
     }
-
     WorldSafeLocsEntry const *sg = NULL;
     sg = sWorldSafeLocsStore.LookupEntry(EY_GRAVEYARD_MAIN_ALLIANCE);
     if (!sg || !AddSpiritGuide(EY_SPIRIT_MAIN_ALLIANCE, sg->x, sg->y, sg->z, 3.124139f, ALLIANCE))
@@ -501,22 +462,18 @@ bool BattleGroundEY::SetupBattleGround()
         sLog.outErrorDb("BatteGroundEY: Failed to spawn spirit guide! BattleGround not created!");
         return false;
     }
-
     sg = sWorldSafeLocsStore.LookupEntry(EY_GRAVEYARD_MAIN_HORDE);
     if (!sg || !AddSpiritGuide(EY_SPIRIT_MAIN_HORDE, sg->x, sg->y, sg->z, 3.193953f, HORDE))
     {
         sLog.outErrorDb("BatteGroundEY: Failed to spawn spirit guide! BattleGround not created!");
         return false;
     }
-
     return true;
 }
-
 void BattleGroundEY::Reset()
 {
     //call parent's class reset
     BattleGround::Reset();
-
     m_TeamScores[BG_TEAM_ALLIANCE] = 0;
     m_TeamScores[BG_TEAM_HORDE] = 0;
     m_TeamPointsCount[BG_TEAM_ALLIANCE] = 0;
@@ -531,7 +488,6 @@ void BattleGroundEY::Reset()
     m_TowerCapCheckTimer = 0;
     bool isBGWeekend = sBattleGroundMgr.IsBGWeekend(GetTypeID());
     m_HonorTics = (isBGWeekend) ? BG_EY_EYWeekendHonorTicks : BG_EY_NotEYWeekendHonorTicks;
-
     for(uint8 i = 0; i < EY_POINTS_MAX; ++i)
     {
         m_PointOwnedByTeam[i] = EY_POINT_NO_OWNER;
@@ -543,47 +499,37 @@ void BattleGroundEY::Reset()
     m_PlayersNearPoint[EY_PLAYERS_OUT_OF_POINTS].clear();
     m_PlayersNearPoint[EY_PLAYERS_OUT_OF_POINTS].reserve(30);
 }
-
 void BattleGroundEY::RespawnFlag(bool send_message)
 {
     if (m_FlagCapturedBgObjectType > 0)
         SpawnBGObject(m_FlagCapturedBgObjectType, RESPAWN_ONE_DAY);
-
     m_FlagCapturedBgObjectType = 0;
     m_FlagState = BG_EY_FLAG_STATE_ON_BASE;
     SpawnBGObject(BG_EY_OBJECT_FLAG_NETHERSTORM, RESPAWN_IMMEDIATELY);
-
     if (send_message)
     {
         SendMessageToAll(LANG_BG_EY_RESETED_FLAG, CHAT_MSG_BG_SYSTEM_NEUTRAL);
         PlaySoundToAll(BG_EY_SOUND_FLAG_RESET);             // flags respawned sound...
     }
-
     UpdateWorldState(NETHERSTORM_FLAG, 1);
 }
-
 void BattleGroundEY::RespawnFlagAfterDrop()
 {
     RespawnFlag(true);
-
     GameObject *obj = HashMapHolder<GameObject>::Find(GetDroppedFlagGUID());
     if (obj)
         obj->Delete();
     else
         sLog.outError("BattleGroundEY: Unknown dropped flag guid: %u",GUID_LOPART(GetDroppedFlagGUID()));
-
     SetDroppedFlagGUID(0);
 }
-
 void BattleGroundEY::HandleKillPlayer(Player *player, Player *killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     BattleGround::HandleKillPlayer(player, killer);
     EventPlayerDroppedFlag(player);
 }
-
 void BattleGroundEY::EventPlayerDroppedFlag(Player *Source)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
@@ -597,13 +543,10 @@ void BattleGroundEY::EventPlayerDroppedFlag(Player *Source)
         }
         return;
     }
-
     if (!IsFlagPickedup())
         return;
-
     if (GetFlagPickerGUID() != Source->GetGUID())
         return;
-
     SetFlagPicker(0);
     Source->RemoveAurasDueToSpell(BG_EY_NETHERSTORM_FLAG_SPELL);
     m_FlagState = BG_EY_FLAG_STATE_ON_GROUND;
@@ -613,18 +556,15 @@ void BattleGroundEY::EventPlayerDroppedFlag(Player *Source)
     //this does not work correctly :( (it should remove flag carrier name)
     UpdateWorldState(NETHERSTORM_FLAG_STATE_HORDE, BG_EY_FLAG_STATE_WAIT_RESPAWN);
     UpdateWorldState(NETHERSTORM_FLAG_STATE_ALLIANCE, BG_EY_FLAG_STATE_WAIT_RESPAWN);
-
     if (Source->GetTeam() == ALLIANCE)
         SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL);
     else
         SendMessageToAll(LANG_BG_EY_DROPPED_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL);
 }
-
 void BattleGroundEY::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj)
 {
     if (GetStatus() != STATUS_IN_PROGRESS || IsFlagPickedup() || !Source->IsWithinDistInMap(target_obj, 10))
         return;
-
     if (Source->GetTeam() == ALLIANCE)
     {
         UpdateWorldState(NETHERSTORM_FLAG_STATE_ALLIANCE, BG_EY_FLAG_STATE_ON_PLAYER);
@@ -635,34 +575,27 @@ void BattleGroundEY::EventPlayerClickedOnFlag(Player *Source, GameObject* target
         UpdateWorldState(NETHERSTORM_FLAG_STATE_HORDE, BG_EY_FLAG_STATE_ON_PLAYER);
         PlaySoundToAll(BG_EY_SOUND_FLAG_PICKED_UP_HORDE);
     }
-
     if (m_FlagState == BG_EY_FLAG_STATE_ON_BASE)
         UpdateWorldState(NETHERSTORM_FLAG, 0);
     m_FlagState = BG_EY_FLAG_STATE_ON_PLAYER;
-
     SpawnBGObject(BG_EY_OBJECT_FLAG_NETHERSTORM, RESPAWN_ONE_DAY);
     SetFlagPicker(Source->GetGUID());
     //get flag aura on player
     Source->CastSpell(Source, BG_EY_NETHERSTORM_FLAG_SPELL, true);
     Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-
     if (Source->GetTeam() == ALLIANCE)
         PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_ALLIANCE, NULL, Source->GetName());
     else
         PSendMessageToAll(LANG_BG_EY_HAS_TAKEN_FLAG, CHAT_MSG_BG_SYSTEM_HORDE, NULL, Source->GetName());
 }
-
 void BattleGroundEY::EventTeamLostPoint(Player *Source, uint32 Point)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     //Natural point
     uint32 Team = m_PointOwnedByTeam[Point];
-
     if (!Team)
         return;
-
     if (Team == ALLIANCE)
     {
         m_TeamPointsCount[BG_TEAM_ALLIANCE]--;
@@ -677,36 +610,27 @@ void BattleGroundEY::EventTeamLostPoint(Player *Source, uint32 Point)
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeHorde + 1, RESPAWN_ONE_DAY);
         SpawnBGObject(m_LoosingPointTypes[Point].DespawnObjectTypeHorde + 2, RESPAWN_ONE_DAY);
     }
-
     SpawnBGObject(m_LoosingPointTypes[Point].SpawnNeutralObjectType, RESPAWN_IMMEDIATELY);
     SpawnBGObject(m_LoosingPointTypes[Point].SpawnNeutralObjectType + 1, RESPAWN_IMMEDIATELY);
     SpawnBGObject(m_LoosingPointTypes[Point].SpawnNeutralObjectType + 2, RESPAWN_IMMEDIATELY);
-
     //buff isn't despawned
-
     m_PointOwnedByTeam[Point] = EY_POINT_NO_OWNER;
     m_PointState[Point] = EY_POINT_NO_OWNER;
-
     if (Team == ALLIANCE)
         SendMessageToAll(m_LoosingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
     else
         SendMessageToAll(m_LoosingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
     UpdatePointsIcons(Team, Point);
     UpdatePointsCount(Team);
 }
-
 void BattleGroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     uint32 Team = Source->GetTeam();
-
     SpawnBGObject(m_CapturingPointTypes[Point].DespawnNeutralObjectType, RESPAWN_ONE_DAY);
     SpawnBGObject(m_CapturingPointTypes[Point].DespawnNeutralObjectType + 1, RESPAWN_ONE_DAY);
     SpawnBGObject(m_CapturingPointTypes[Point].DespawnNeutralObjectType + 2, RESPAWN_ONE_DAY);
-
     if (Team == ALLIANCE)
     {
         m_TeamPointsCount[BG_TEAM_ALLIANCE]++;
@@ -721,53 +645,39 @@ void BattleGroundEY::EventTeamCapturedPoint(Player *Source, uint32 Point)
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeHorde + 1, RESPAWN_IMMEDIATELY);
         SpawnBGObject(m_CapturingPointTypes[Point].SpawnObjectTypeHorde + 2, RESPAWN_IMMEDIATELY);
     }
-
     //buff isn't respawned
-
     m_PointOwnedByTeam[Point] = Team;
     m_PointState[Point] = EY_POINT_UNDER_CONTROL;
-
     if (Team == ALLIANCE)
         SendMessageToAll(m_CapturingPointTypes[Point].MessageIdAlliance,CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
     else
         SendMessageToAll(m_CapturingPointTypes[Point].MessageIdHorde,CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
     if (m_BgCreatures[Point])
         DelCreature(Point);
-
     WorldSafeLocsEntry const *sg = NULL;
     sg = sWorldSafeLocsStore.LookupEntry(m_CapturingPointTypes[Point].GraveYardId);
     if (!sg || !AddSpiritGuide(Point, sg->x, sg->y, sg->z, 3.124139f, Team))
         sLog.outError("BatteGroundEY: Failed to spawn spirit guide! point: %u, team: %u, graveyard_id: %u",
             Point, Team, m_CapturingPointTypes[Point].GraveYardId);
-
 //    SpawnBGCreature(Point,RESPAWN_IMMEDIATELY);
-
     UpdatePointsIcons(Team, Point);
     UpdatePointsCount(Team);
 }
-
 void BattleGroundEY::EventPlayerCapturedFlag(Player *Source, uint32 BgObjectType)
 {
     if (GetStatus() != STATUS_IN_PROGRESS || GetFlagPickerGUID() != Source->GetGUID())
         return;
-
     SetFlagPicker(0);
     m_FlagState = BG_EY_FLAG_STATE_WAIT_RESPAWN;
     Source->RemoveAurasDueToSpell(BG_EY_NETHERSTORM_FLAG_SPELL);
-
     Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
-
     if (Source->GetTeam() == ALLIANCE)
         PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_ALLIANCE);
     else
         PlaySoundToAll(BG_EY_SOUND_FLAG_CAPTURED_HORDE);
-
     SpawnBGObject(BgObjectType, RESPAWN_IMMEDIATELY);
-
     m_FlagsTimer = BG_EY_FLAG_RESPAWN_TIME;
     m_FlagCapturedBgObjectType = BgObjectType;
-
     uint8 team_id = 0;
     if (Source->GetTeam() == ALLIANCE)
     {
@@ -779,19 +689,15 @@ void BattleGroundEY::EventPlayerCapturedFlag(Player *Source, uint32 BgObjectType
         team_id = BG_TEAM_HORDE;
         SendMessageToAll(LANG_BG_EY_CAPTURED_FLAG_H, CHAT_MSG_BG_SYSTEM_HORDE, Source);
     }
-
     if (m_TeamPointsCount[team_id] > 0)
         AddPoints(Source->GetTeam(), BG_EY_FlagPoints[m_TeamPointsCount[team_id] - 1]);
-
     UpdatePlayerScore(Source, SCORE_FLAG_CAPTURES, 1);
 }
-
 void BattleGroundEY::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
 {
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if(itr == m_PlayerScores.end())                         // player not found
         return;
-
     switch(type)
     {
         case SCORE_FLAG_CAPTURES:                           // flags captured
@@ -802,7 +708,6 @@ void BattleGroundEY::UpdatePlayerScore(Player *Source, uint32 type, uint32 value
             break;
     }
 }
-
 void BattleGroundEY::FillInitialWorldStates(WorldPacket& data)
 {
     data << uint32(EY_HORDE_BASE) << uint32(m_TeamPointsCount[BG_TEAM_HORDE]);
@@ -815,33 +720,19 @@ void BattleGroundEY::FillInitialWorldStates(WorldPacket& data)
     data << uint32(0xab1) << uint32(0x0);
     data << uint32(0xab0) << uint32(0x0);
     data << uint32(0xaaf) << uint32(0x0);
-
     data << uint32(DRAENEI_RUINS_HORDE_CONTROL)     << uint32(m_PointOwnedByTeam[DRAENEI_RUINS] == HORDE && m_PointState[DRAENEI_RUINS] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(DRAENEI_RUINS_ALLIANCE_CONTROL)  << uint32(m_PointOwnedByTeam[DRAENEI_RUINS] == ALLIANCE && m_PointState[DRAENEI_RUINS] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(DRAENEI_RUINS_UNCONTROL)         << uint32(m_PointState[DRAENEI_RUINS] != EY_POINT_UNDER_CONTROL);
-
     data << uint32(MAGE_TOWER_ALLIANCE_CONTROL)     << uint32(m_PointOwnedByTeam[MAGE_TOWER] == ALLIANCE && m_PointState[MAGE_TOWER] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(MAGE_TOWER_HORDE_CONTROL)        << uint32(m_PointOwnedByTeam[MAGE_TOWER] == HORDE && m_PointState[MAGE_TOWER] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(MAGE_TOWER_UNCONTROL)            << uint32(m_PointState[MAGE_TOWER] != EY_POINT_UNDER_CONTROL);
-
     data << uint32(FEL_REAVER_HORDE_CONTROL)        << uint32(m_PointOwnedByTeam[FEL_REALVER] == HORDE && m_PointState[FEL_REALVER] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(FEL_REAVER_ALLIANCE_CONTROL)     << uint32(m_PointOwnedByTeam[FEL_REALVER] == ALLIANCE && m_PointState[FEL_REALVER] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(FEL_REAVER_UNCONTROL)            << uint32(m_PointState[FEL_REALVER] != EY_POINT_UNDER_CONTROL);
-
     data << uint32(BLOOD_ELF_HORDE_CONTROL)         << uint32(m_PointOwnedByTeam[BLOOD_ELF] == HORDE && m_PointState[BLOOD_ELF] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(BLOOD_ELF_ALLIANCE_CONTROL)      << uint32(m_PointOwnedByTeam[BLOOD_ELF] == ALLIANCE && m_PointState[BLOOD_ELF] == EY_POINT_UNDER_CONTROL);
-
     data << uint32(BLOOD_ELF_UNCONTROL)             << uint32(m_PointState[BLOOD_ELF] != EY_POINT_UNDER_CONTROL);
-
     data << uint32(NETHERSTORM_FLAG)                << uint32(m_FlagState == BG_EY_FLAG_STATE_ON_BASE);
-
     data << uint32(0xad2) << uint32(0x1);
     data << uint32(0xad1) << uint32(0x1);
     data << uint32(0xabe) << uint32(GetTeamScore(HORDE));
@@ -852,39 +743,31 @@ void BattleGroundEY::FillInitialWorldStates(WorldPacket& data)
     data << uint32(0xa9e) << uint32(0x0);
     data << uint32(0xc0d) << uint32(0x17b);
 }
-
 WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player)
 {
     uint32 g_id = 0;
-
     switch(player->GetTeam())
     {
         case ALLIANCE: g_id = EY_GRAVEYARD_MAIN_ALLIANCE; break;
         case HORDE:    g_id = EY_GRAVEYARD_MAIN_HORDE;    break;
         default:       return NULL;
     }
-
     float distance, nearestDistance;
-
     WorldSafeLocsEntry const* entry = NULL;
     WorldSafeLocsEntry const* nearestEntry = NULL;
     entry = sWorldSafeLocsStore.LookupEntry(g_id);
     nearestEntry = entry;
-
     if (!entry)
     {
         sLog.outError("BattleGroundEY: Not found the main team graveyard. Graveyard system isn't working!");
         return NULL;
     }
-
     float plr_x = player->GetPositionX();
     float plr_y = player->GetPositionY();
     float plr_z = player->GetPositionZ();
 
-
     distance = (entry->x - plr_x)*(entry->x - plr_x) + (entry->y - plr_y)*(entry->y - plr_y) + (entry->z - plr_z)*(entry->z - plr_z);
     nearestDistance = distance;
-
     for(uint8 i = 0; i < EY_POINTS_MAX; ++i)
     {
         if (m_PointOwnedByTeam[i]==player->GetTeam() && m_PointState[i]==EY_POINT_UNDER_CONTROL)
@@ -903,16 +786,13 @@ WorldSafeLocsEntry const *BattleGroundEY::GetClosestGraveYard(Player* player)
             }
         }
     }
-
     return nearestEntry;
 }
-
 bool BattleGroundEY::IsAllNodesConrolledByTeam(uint32 team) const
 {
     uint32 count = 0;
     for(int i = 0; i < EY_POINTS_MAX; ++i)
         if (m_PointOwnedByTeam[i] == team && m_PointState[i] == EY_POINT_UNDER_CONTROL)
             ++count;
-
     return count == EY_POINTS_MAX;
 }
diff --git a/src/game/BattleGroundEY.h b/src/game/BattleGroundEY.h
index 3385a06bfb0..086c4d79fbd 100644
--- a/src/game/BattleGroundEY.h
+++ b/src/game/BattleGroundEY.h
@@ -17,17 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H
-
 #include "Language.h"
-
 class BattleGround;
-
 #define BG_EY_FLAG_RESPAWN_TIME         (10*IN_MILISECONDS) //10 seconds
 #define BG_EY_FPOINTS_TICK_TIME         (2*IN_MILISECONDS)  //2 seconds
-
 enum BG_EY_WorldStates
 {
     EY_ALLIANCE_RESOURCES           = 2749,
@@ -54,7 +49,6 @@ enum BG_EY_WorldStates
     NETHERSTORM_FLAG_STATE_ALLIANCE = 2769,
     NETHERSTORM_FLAG_STATE_HORDE    = 2770
 };
-
 enum BG_EY_ProgressBarConsts
 {
     BG_EY_POINT_MAX_CAPTURERS_COUNT     = 5,
@@ -68,7 +62,6 @@ enum BG_EY_ProgressBarConsts
     BG_EY_PROGRESS_BAR_NEUTRAL_HIGH     = 70,
     BG_EY_PROGRESS_BAR_ALI_CONTROLLED   = 100
 };
-
 enum BG_EY_Sounds
 {
     //strange ids, but sure about them
@@ -78,13 +71,11 @@ enum BG_EY_Sounds
     BG_EY_SOUND_FLAG_CAPTURED_ALLIANCE  = 8173,
     BG_EY_SOUND_FLAG_RESET              = 8192
 };
-
 enum BG_EY_Spells
 {
     BG_EY_NETHERSTORM_FLAG_SPELL        = 34976,
     BG_EY_PLAYER_DROPPED_FLAG_SPELL     = 34991
 };
-
 enum EYBattleGroundObjectEntry
 {
     BG_OBJECT_A_DOOR_EY_ENTRY           = 184719,           //Alliance door
@@ -100,7 +91,6 @@ enum EYBattleGroundObjectEntry
     BG_OBJECT_HU_TOWER_CAP_EY_ENTRY     = 184082,           //Human Tower Cap Pt
     BG_OBJECT_DR_TOWER_CAP_EY_ENTRY     = 184083            //Draenei Tower Cap Pt
 };
-
 enum EYBattleGroundPointsTrigger
 {
     TR_BLOOD_ELF_POINT        = 4476,
@@ -112,7 +102,6 @@ enum EYBattleGroundPointsTrigger
     TR_MAGE_TOWER_BUFF        = 4570,
     TR_DRAENEI_RUINS_BUFF     = 4571
 };
-
 enum EYBattleGroundGaveyards
 {
     EY_GRAVEYARD_MAIN_ALLIANCE     = 1103,
@@ -122,18 +111,15 @@ enum EYBattleGroundGaveyards
     EY_GRAVEYARD_DRAENEI_RUINS     = 1107,
     EY_GRAVEYARD_MAGE_TOWER        = 1108
 };
-
 enum EYBattleGroundPoints
 {
     FEL_REALVER     = 0,
     BLOOD_ELF       = 1,
     DRAENEI_RUINS   = 2,
     MAGE_TOWER      = 3,
-
     EY_PLAYERS_OUT_OF_POINTS  = 4,
     EY_POINTS_MAX             = 4
 };
-
 enum EYBattleGroundCreaturesTypes
 {
     EY_SPIRIT_FEL_REALVER      = 0,
@@ -142,10 +128,8 @@ enum EYBattleGroundCreaturesTypes
     EY_SPIRIT_MAGE_TOWER       = 3,
     EY_SPIRIT_MAIN_ALLIANCE    = 4,
     EY_SPIRIT_MAIN_HORDE       = 5,
-
     BG_EY_CREATURES_MAX        = 6
 };
-
 enum EYBattleGroundObjectTypes
 {
     BG_EY_OBJECT_DOOR_A                         = 0,
@@ -210,16 +194,13 @@ enum EYBattleGroundObjectTypes
     BG_EY_OBJECT_BERSERKBUFF_MAGE_TOWER         = 58,
     BG_EY_OBJECT_MAX                            = 59
 };
-
 #define BG_EY_NotEYWeekendHonorTicks    330
 #define BG_EY_EYWeekendHonorTicks       200
-
 enum BG_EY_Score
 {
     BG_EY_WARNING_NEAR_VICTORY_SCORE    = 1800,
     BG_EY_MAX_TEAM_SCORE                = 2000
 };
-
 enum BG_EY_FlagState
 {
     BG_EY_FLAG_STATE_ON_BASE      = 0,
@@ -227,14 +208,12 @@ enum BG_EY_FlagState
     BG_EY_FLAG_STATE_ON_PLAYER    = 2,
     BG_EY_FLAG_STATE_ON_GROUND    = 3
 };
-
 enum EYBattleGroundPointState
 {
     EY_POINT_NO_OWNER           = 0,
     EY_POINT_STATE_UNCONTROLLED = 0,
     EY_POINT_UNDER_CONTROL      = 3
 };
-
 struct BattleGroundEYPointIconsStruct
 {
     BattleGroundEYPointIconsStruct(uint32 _WorldStateControlIndex, uint32 _WorldStateAllianceControlledIndex, uint32 _WorldStateHordeControlledIndex)
@@ -243,7 +222,6 @@ struct BattleGroundEYPointIconsStruct
     uint32 WorldStateAllianceControlledIndex;
     uint32 WorldStateHordeControlledIndex;
 };
-
 struct BattleGroundEYLoosingPointStruct
 {
     BattleGroundEYLoosingPointStruct(uint32 _SpawnNeutralObjectType, uint32 _DespawnObjectTypeAlliance, uint32 _MessageIdAlliance, uint32 _DespawnObjectTypeHorde, uint32 _MessageIdHorde)
@@ -251,14 +229,12 @@ struct BattleGroundEYLoosingPointStruct
         DespawnObjectTypeAlliance(_DespawnObjectTypeAlliance), MessageIdAlliance(_MessageIdAlliance),
         DespawnObjectTypeHorde(_DespawnObjectTypeHorde), MessageIdHorde(_MessageIdHorde)
     {}
-
     uint32 SpawnNeutralObjectType;
     uint32 DespawnObjectTypeAlliance;
     uint32 MessageIdAlliance;
     uint32 DespawnObjectTypeHorde;
     uint32 MessageIdHorde;
 };
-
 struct BattleGroundEYCapturingPointStruct
 {
     BattleGroundEYCapturingPointStruct(uint32 _DespawnNeutralObjectType, uint32 _SpawnObjectTypeAlliance, uint32 _MessageIdAlliance, uint32 _SpawnObjectTypeHorde, uint32 _MessageIdHorde, uint32 _GraveYardId)
@@ -267,7 +243,6 @@ struct BattleGroundEYCapturingPointStruct
         SpawnObjectTypeHorde(_SpawnObjectTypeHorde), MessageIdHorde(_MessageIdHorde),
         GraveYardId(_GraveYardId)
     {}
-
     uint32 DespawnNeutralObjectType;
     uint32 SpawnObjectTypeAlliance;
     uint32 MessageIdAlliance;
@@ -275,10 +250,8 @@ struct BattleGroundEYCapturingPointStruct
     uint32 MessageIdHorde;
     uint32 GraveYardId;
 };
-
 const uint8  BG_EY_TickPoints[EY_POINTS_MAX] = {1, 2, 5, 10};
 const uint32 BG_EY_FlagPoints[EY_POINTS_MAX] = {75, 85, 100, 500};
-
 //constant arrays:
 const BattleGroundEYPointIconsStruct m_PointsIconStruct[EY_POINTS_MAX] =
 {
@@ -301,7 +274,6 @@ const BattleGroundEYCapturingPointStruct m_CapturingPointTypes[EY_POINTS_MAX] =
     BattleGroundEYCapturingPointStruct(BG_EY_OBJECT_N_BANNER_DRAENEI_RUINS_CENTER, BG_EY_OBJECT_A_BANNER_DRAENEI_RUINS_CENTER, LANG_BG_EY_HAS_TAKEN_A_D_RUINS, BG_EY_OBJECT_H_BANNER_DRAENEI_RUINS_CENTER, LANG_BG_EY_HAS_TAKEN_H_D_RUINS, EY_GRAVEYARD_DRAENEI_RUINS),
     BattleGroundEYCapturingPointStruct(BG_EY_OBJECT_N_BANNER_MAGE_TOWER_CENTER, BG_EY_OBJECT_A_BANNER_MAGE_TOWER_CENTER, LANG_BG_EY_HAS_TAKEN_A_M_TOWER, BG_EY_OBJECT_H_BANNER_MAGE_TOWER_CENTER, LANG_BG_EY_HAS_TAKEN_H_M_TOWER, EY_GRAVEYARD_MAGE_TOWER)
 };
-
 class BattleGroundEYScore : public BattleGroundScore
 {
     public:
@@ -309,21 +281,17 @@ class BattleGroundEYScore : public BattleGroundScore
         virtual ~BattleGroundEYScore() {};
         uint32 FlagCaptures;
 };
-
 class BattleGroundEY : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundEY();
         ~BattleGroundEY();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         /* BG Flags */
         uint64 GetFlagPickerGUID() const    { return m_FlagKeeper; }
         void SetFlagPicker(uint64 guid)     { m_FlagKeeper = guid; }
@@ -331,7 +299,6 @@ class BattleGroundEY : public BattleGround
         uint8 GetFlagState() const          { return m_FlagState; }
         void RespawnFlag(bool send_message);
         void RespawnFlagAfterDrop();
-
         void RemovePlayer(Player *plr,uint64 guid);
         void HandleBuffUse(uint64 const& buff_guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
@@ -345,11 +312,9 @@ class BattleGroundEY : public BattleGround
         virtual void FillInitialWorldStates(WorldPacket& data);
         void SetDroppedFlagGUID(uint64 guid)       { m_DroppedFlagGUID = guid;}
         uint64 GetDroppedFlagGUID() const          { return m_DroppedFlagGUID;}
-
         /* Battleground Events */
         virtual void EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj);
         virtual void EventPlayerDroppedFlag(Player *Source);
-
         /* achievement req. */
         bool IsAllNodesConrolledByTeam(uint32 team) const;
     private:
@@ -358,38 +323,30 @@ class BattleGroundEY : public BattleGround
         void EventTeamLostPoint(Player *Source, uint32 Point);
         void UpdatePointsCount(uint32 Team);
         void UpdatePointsIcons(uint32 Team, uint32 Point);
-
         /* Point status updating procedures */
         void CheckSomeoneLeftPoint();
         void CheckSomeoneJoinedPoint();
         void UpdatePointStatuses();
-
         /* Scorekeeping */
         uint32 GetTeamScore(uint32 Team) const { return m_TeamScores[GetTeamIndexByTeamId(Team)]; }
         void AddPoints(uint32 Team, uint32 Points);
-
         void RemovePoint(uint32 TeamID, uint32 Points = 1) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] -= Points; }
         void SetTeamPoint(uint32 TeamID, uint32 Points = 0) { m_TeamScores[GetTeamIndexByTeamId(TeamID)] = Points; }
-
         uint32 m_HonorScoreTics[2];
         uint32 m_TeamPointsCount[2];
-
         uint32 m_Points_Trigger[EY_POINTS_MAX];
-
         uint64 m_FlagKeeper;                                // keepers guid
         uint64 m_DroppedFlagGUID;
         uint32 m_FlagCapturedBgObjectType;                  // type that should be despawned when flag is captured
         uint8 m_FlagState;                                  // for checking flag state
         int32 m_FlagsTimer;
         int32 m_TowerCapCheckTimer;
-
         uint32 m_PointOwnedByTeam[EY_POINTS_MAX];
         uint8 m_PointState[EY_POINTS_MAX];
         int32 m_PointBarStatus[EY_POINTS_MAX];
         typedef std::vector<uint64> PlayersNearPointType;
         PlayersNearPointType m_PlayersNearPoint[EY_POINTS_MAX + 1];
         uint8 m_CurrentPointPlayersCount[2*EY_POINTS_MAX];
-
         int32 m_PointAddingTimer;
         uint32 m_HonorTics;
 };
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 3e7c453e300..1e685ec1f3a 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
@@ -34,42 +32,33 @@
 #include "Player.h"
 #include "Object.h"
 #include "Opcodes.h"
-
 void WorldSession::HandleBattlemasterHelloOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
     sLog.outDebug( "WORLD: Recvd CMSG_BATTLEMASTER_HELLO Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)));
-
     Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
     if (!unit)
         return;
-
     if(!unit->isBattleMaster())                             // it's not battlemaster
         return;
-
     // Stop the npc if moving
     unit->StopMoving();
-
     BattleGroundTypeId bgTypeId = sBattleGroundMgr.GetBattleMasterBG(unit->GetEntry());
-
     if (!_player->GetBGAccessByLevel(bgTypeId))
     {
                                                             // temp, must be gossip message...
         SendNotification(LANG_YOUR_BG_LEVEL_REQ_ERROR);
         return;
     }
-
     SendBattlegGroundList(guid, bgTypeId);
 }
-
 void WorldSession::SendBattlegGroundList( uint64 guid, BattleGroundTypeId bgTypeId )
 {
     WorldPacket data;
     sBattleGroundMgr.BuildBattleGroundListPacket(&data, guid, _player, bgTypeId, 0);
     SendPacket( &data );
 }
-
 void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
@@ -78,40 +67,31 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
     uint8 joinAsGroup;
     bool isPremade = false;
     Group * grp;
-
     recv_data >> guid;                                      // battlemaster guid
     recv_data >> bgTypeId_;                                 // battleground type id (DBC id)
     recv_data >> instanceId;                                // instance id, 0 if First Available selected
     recv_data >> joinAsGroup;                               // join as group
-
     if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
     {
         sLog.outError("Battleground: invalid bgtype (%u) received. possible cheater? player guid %u",bgTypeId_,_player->GetGUIDLow());
         return;
     }
-
     BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
-
     sLog.outDebug( "WORLD: Recvd CMSG_BATTLEMASTER_JOIN Message from (GUID: %u TypeId:%u)", GUID_LOPART(guid), GuidHigh2TypeId(GUID_HIPART(guid)));
-
     // can do this, since it's battleground, not arena
     BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, 0);
-
     // ignore if player is already in BG
     if (_player->InBattleGround())
         return;
-
     // get bg instance or bg template if instance not found
     BattleGround *bg = NULL;
     if (instanceId)
         bg = sBattleGroundMgr.GetBattleGroundThroughClientInstance(instanceId, bgTypeId);
-
     if (!bg && !(bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId)))
     {
         sLog.outError("Battleground: no available bg / template found");
         return;
     }
-
     // check queueing conditions
     if (!joinAsGroup)
     {
@@ -146,7 +126,6 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
         }
     }
     // if we're here, then the conditions to join a bg are met. We can proceed in joining.
-
     // _player->GetGroup() was already checked, grp is already initialized
     GroupQueueInfo * ginfo = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].AddGroup(_player, bgTypeId, 0, false, isPremade, 0);
     uint32 avgTime = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].GetAverageQueueWaitTime(ginfo, _player->GetBattleGroundQueueIdFromLevel(bgTypeId));
@@ -157,9 +136,7 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
         {
             Player *member = itr->getSource();
             if(!member) continue;   // this should never happen
-
             uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);           // add to queue
-
             WorldPacket data;
                                                             // send status packet (in queue)
             sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->ArenaType);
@@ -175,12 +152,10 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
     {
         // already checked if queueSlot is valid, now just get it
         uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
-
         WorldPacket data;
                                                             // send status packet (in queue)
         sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, ginfo->ArenaType);
         SendPacket(&data);
-
         sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].AddPlayer(_player, ginfo);
         sLog.outDebug("Battleground: player joined queue for bg queue type %u bg type %u: GUID %u, NAME %s",bgQueueTypeId,bgTypeId,_player->GetGUIDLow(), _player->GetName());
     }
@@ -188,31 +163,25 @@ void WorldSession::HandleBattlemasterJoinOpcode( WorldPacket & recv_data )
     if (!ginfo->IsInvitedToBGInstanceGUID)
         sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].AnnounceWorld(ginfo, _player->GetGUID(), true);
 }
-
 void WorldSession::HandleBattleGroundPlayerPositionsOpcode( WorldPacket & /*recv_data*/ )
 {
                                                             // empty opcode
     sLog.outDebug("WORLD: Recvd MSG_BATTLEGROUND_PLAYER_POSITIONS Message");
-
     BattleGround *bg = _player->GetBattleGround();
     if(!bg)                                                 // can't be received if player not in battleground
         return;
-
     switch( bg->GetTypeID() )
     {
         case BATTLEGROUND_WS:
             {
                 uint32 count1 = 0;                                  //always constant zero?
                 uint32 count2 = 0;                                  //count of next fields
-
                 Player *ali_plr = objmgr.GetPlayer(((BattleGroundWS*)bg)->GetAllianceFlagPickerGUID());
                 if (ali_plr)
                     ++count2;
-
                 Player *horde_plr = objmgr.GetPlayer(((BattleGroundWS*)bg)->GetHordeFlagPickerGUID());
                 if (horde_plr)
                     ++count2;
-
                 WorldPacket data(MSG_BATTLEGROUND_PLAYER_POSITIONS, (4+4+16*count1+16*count2));
                 data << count1;                                     // alliance flag holders count - obsolete, now always 0
                 /*for(uint8 i = 0; i < count1; ++i)
@@ -234,7 +203,6 @@ void WorldSession::HandleBattleGroundPlayerPositionsOpcode( WorldPacket & /*recv
                     data << (float)horde_plr->GetPositionX();
                     data << (float)horde_plr->GetPositionY();
                 }
-
                 SendPacket(&data);
             }
             break;
@@ -256,57 +224,44 @@ void WorldSession::HandleBattleGroundPlayerPositionsOpcode( WorldPacket & /*recv
             break;
     }
 }
-
 void WorldSession::HandlePVPLogDataOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Recvd MSG_PVP_LOG_DATA Message");
-
     BattleGround *bg = _player->GetBattleGround();
     if (!bg)
         return;
-
     WorldPacket data;
     sBattleGroundMgr.BuildPvpLogDataPacket(&data, bg);
     SendPacket(&data);
-
     sLog.outDebug( "WORLD: Sent MSG_PVP_LOG_DATA Message");
 }
-
 void WorldSession::HandleBattlefieldListOpcode( WorldPacket &recv_data )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_BATTLEFIELD_LIST Message");
-
     uint32 bgTypeId;
     recv_data >> bgTypeId;                                  // id from DBC
-
     uint8 fromWhere;
     recv_data >> fromWhere;                                 // 0 - battlemaster, 1 - UI
-
     BattlemasterListEntry const* bl = sBattlemasterListStore.LookupEntry(bgTypeId);
     if (!bl)
     {
         sLog.outError("Battleground: invalid bgtype received.");
         return;
     }
-
     WorldPacket data;
     sBattleGroundMgr.BuildBattleGroundListPacket(&data, 0, _player, BattleGroundTypeId(bgTypeId), fromWhere);
     SendPacket( &data );
 }
-
 void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_BATTLEFIELD_PORT Message");
-
     uint8 type;                                             // arenatype if arena
     uint8 unk2;                                             // unk, can be 0x0 (may be if was invited?) and 0x1
     uint32 instanceId;
     uint32 bgTypeId_;                                       // type id from dbc
     uint16 unk;                                             // 0x1F90 constant?
     uint8 action;                                           // enter battle 0x1, leave queue 0x0
-
     recv_data >> type >> unk2 >> bgTypeId_ >> unk >> action;
-
     if (!sBattlemasterListStore.LookupEntry(bgTypeId_))
     {
         sLog.outError("Battleground: invalid bgtype (%u) received.", bgTypeId_);
@@ -327,12 +282,10 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
                 // if the player is not in queue, continue or no group information - this should never happen
                 if (itrPlayerStatus == qpMap.end() || !itrPlayerStatus->second.GroupInfo)
                     continue;
-
                 BattleGround * bg = NULL;
                 // get possibly needed data from groupinfo
                 uint8 arenatype = itrPlayerStatus->second.GroupInfo->ArenaType;
                 uint8 status = 0;
-
                 if (!itrPlayerStatus->second.GroupInfo->IsInvitedToBGInstanceGUID)
                 {
                     // not invited to bg, get template
@@ -345,11 +298,9 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
                     bg = sBattleGroundMgr.GetBattleGround(itrPlayerStatus->second.GroupInfo->IsInvitedToBGInstanceGUID, bgTypeId);
                     status = STATUS_WAIT_JOIN;
                 }
-
                 // if bg not found, then continue, don't invite if already in the instance
                 if (!bg || (_player->InBattleGround() && _player->GetBattleGround() && _player->GetBattleGround()->GetInstanceID() == bg->GetInstanceID()))
                     continue;
-
                 // re - invite player with proper data
                 WorldPacket data;
                 sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, i, status, INVITE_ACCEPT_WAIT_TIME, 0, arenatype);
@@ -358,7 +309,6 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         }
         return;
     }
-
     //get GroupQueueInfo from BattleGroundQueue
     BattleGroundTypeId bgTypeId = BattleGroundTypeId(bgTypeId_);
     BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, type);
@@ -369,7 +319,6 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         sLog.outError("Battleground: itrplayerstatus not found.");
         return;
     }
-
     instanceId = itrPlayerStatus->second.GroupInfo->IsInvitedToBGInstanceGUID;
     // if action == 1, then instanceId is required
     if (!instanceId && action == 1)
@@ -377,9 +326,7 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         sLog.outError("Battleground: instance not found.");
         return;
     }
-
     BattleGround *bg = sBattleGroundMgr.GetBattleGround(instanceId, bgTypeId);
-
     // bg template might and must be used in case of leaving queue, when instance is not created yet
     if (!bg && action == 0)
         bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
@@ -388,7 +335,6 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         sLog.outError("Battleground: bg_template not found for type id %u.", bgTypeId);
         return;
     }
-
     if (_player->InBattleGroundQueue())
     {
         //we must use temporary variables, because GroupQueueInfo pointer can be deleted in BattleGroundQueue::RemovePlayer() function!
@@ -397,7 +343,6 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         uint32 isRated = itrPlayerStatus->second.GroupInfo->IsRated;
         uint32 rating = itrPlayerStatus->second.GroupInfo->ArenaTeamRating;
         uint32 opponentsRating = itrPlayerStatus->second.GroupInfo->OpponentsTeamRating;
-
         //some checks if player isn't cheating - it is not exactly cheating, but we cannot allow it
         if (action == 1 && arenaType == 0)
         {
@@ -425,9 +370,7 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
             case 1:                                         // port to battleground
                 if (!_player->IsInvitedForBattleGroundQueueType(bgQueueTypeId))
                     return;                                 // cheating?
-
                 _player->SetBattleGroundEntryPoint();
-
                 // resurrect the player
                 if (!_player->isAlive())
                 {
@@ -439,9 +382,7 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
                 {
                     _player->GetMotionMaster()->MovementExpired();
                     _player->CleanupAfterTaxiFlight();
-
                 }
-
                 sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_IN_PROGRESS, 0, bg->GetStartTime(), bg->GetArenaType());
                 _player->GetSession()->SendPacket(&data);
                 // remove battleground queue status from BGmgr
@@ -450,7 +391,6 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
                 // also this is required to prevent stuck at old battleground after SetBattleGroundId set to new
                 if (BattleGround *currentBg = _player->GetBattleGround())
                     currentBg->RemovePlayerAtLeave(_player->GetGUID(), false, true);
-
                 // set the destination instance id
                 _player->SetBattleGroundId(bg->GetInstanceID(), bgTypeId);
                 // set the destination team
@@ -491,34 +431,26 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
         }
     }
 }
-
 void WorldSession::HandleLeaveBattlefieldOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_LEAVE_BATTLEFIELD Message");
-
     //uint8 unk1, unk2;
     //uint32 bgTypeId;                                        // id from DBC
     //uint16 unk3;
-
     //recv_data >> unk1 >> unk2 >> bgTypeId >> unk3; - no used currently
-
     //if(bgTypeId >= MAX_BATTLEGROUND_TYPES)                  // cheating? but not important in this case
     //    return;
-
     // not allow leave battleground in combat
     if (_player->isInCombat())
         if (BattleGround* bg = _player->GetBattleGround())
             if (bg->GetStatus() != STATUS_WAIT_LEAVE)
                 return;
-
     _player->LeaveBattleground();
 }
-
 void WorldSession::HandleBattlefieldStatusOpcode( WorldPacket & /*recv_data*/ )
 {
     // empty opcode
     sLog.outDebug( "WORLD: Battleground status" );
-
     WorldPacket data;
     // we must update all queues here
     BattleGround *bg = NULL;
@@ -571,76 +503,56 @@ void WorldSession::HandleBattlefieldStatusOpcode( WorldPacket & /*recv_data*/ )
         }
     }
 }
-
 void WorldSession::HandleAreaSpiritHealerQueryOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_AREA_SPIRIT_HEALER_QUERY");
-
     BattleGround *bg = _player->GetBattleGround();
     if (!bg)
         return;
-
     uint64 guid;
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
     if (!unit)
         return;
-
     if(!unit->isSpiritService())                            // it's not spirit service
         return;
-
     sBattleGroundMgr.SendAreaSpiritHealerQueryOpcode(_player, bg, guid);
 }
-
 void WorldSession::HandleAreaSpiritHealerQueueOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE");
-
     BattleGround *bg = _player->GetBattleGround();
     if (!bg)
         return;
-
     uint64 guid;
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
     if (!unit)
         return;
-
     if(!unit->isSpiritService())                            // it's not spirit service
         return;
-
     bg->AddPlayerToResurrectQueue(guid, _player->GetGUID());
 }
-
 void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_BATTLEMASTER_JOIN_ARENA");
     //recv_data.hexlike();
-
     uint64 guid;                                            // arena Battlemaster guid
     uint8 arenaslot;                                        // 2v2, 3v3 or 5v5
     uint8 asGroup;                                          // asGroup
     uint8 isRated;                                          // isRated
     Group * grp;
-
     recv_data >> guid >> arenaslot >> asGroup >> isRated;
-
     // ignore if we already in BG or BG queue
     if (_player->InBattleGround())
         return;
-
     Creature *unit = GetPlayer()->GetMap()->GetCreature(guid);
     if (!unit)
         return;
-
     if(!unit->isBattleMaster())                             // it's not battle master
         return;
-
     uint8 arenatype = 0;
     uint32 arenaRating = 0;
-
     switch(arenaslot)
     {
         case 0:
@@ -656,7 +568,6 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
             sLog.outError("Unknown arena slot %u at HandleBattlemasterJoinArena()", arenaslot);
             return;
     }
-
     //check existance
     BattleGround* bg = NULL;
     if (!(bg = sBattleGroundMgr.GetBattleGroundTemplate(BATTLEGROUND_AA)))
@@ -664,10 +575,8 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
         sLog.outError("Battleground: template bg (all arenas) not found");
         return;
     }
-
     BattleGroundTypeId bgTypeId = bg->GetTypeID();
     BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, arenatype);
-
     // check queueing conditions
     if (!asGroup)
     {
@@ -692,9 +601,7 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
             return;
         }
     }
-
     uint32 ateamId = 0;
-
     if (isRated)
     {
         ateamId = _player->GetArenaTeamId(arenaslot);
@@ -713,19 +620,15 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
         for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player *member = itr->getSource();
-
             // calc avg personal rating
             avg_pers_rating += member->GetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (arenaslot*6) + 5);
         }
-
         if (arenatype)
             avg_pers_rating /= arenatype;
-
         // if avg personal rating is more than 150 points below the teams rating, the team will be queued against an opponent matching or similar to the average personal rating
         if (avg_pers_rating + 150 < arenaRating)
             arenaRating = avg_pers_rating;
     }
-
     GroupQueueInfo * ginfo = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].AddGroup(_player, bgTypeId, arenatype, isRated, false, arenaRating, ateamId);
     uint32 avgTime = sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].GetAverageQueueWaitTime(ginfo, _player->GetBattleGroundQueueIdFromLevel(bgTypeId));
     if (asGroup)
@@ -738,14 +641,11 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
         }
         else
             bg->SetRated(false);
-            
         for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player *member = itr->getSource();
             if(!member) continue;
-
             uint32 queueSlot = member->AddBattleGroundQueueId(bgQueueTypeId);// add to queue
-
             WorldPacket data;
             // send status packet (in queue)
             sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype);
@@ -762,7 +662,6 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
     else
     {
         uint32 queueSlot = _player->AddBattleGroundQueueId(bgQueueTypeId);
-
         WorldPacket data;
         // send status packet (in queue)
         sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_QUEUE, avgTime, 0, arenatype);
@@ -772,24 +671,19 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
     }
     sBattleGroundMgr.m_BattleGroundQueues[bgQueueTypeId].Update(bgTypeId, _player->GetBattleGroundQueueIdFromLevel(bgTypeId), arenatype, isRated, arenaRating);
 }
-
 void WorldSession::HandleReportPvPAFK( WorldPacket & recv_data )
 {
     uint64 playerGuid;
     recv_data >> playerGuid;
     Player *reportedPlayer = objmgr.GetPlayer(playerGuid);
-
     if (!reportedPlayer)
     {
         sLog.outDebug("WorldSession::HandleReportPvPAFK: player not found");
         return;
     }
-
     sLog.outDebug("WorldSession::HandleReportPvPAFK: %s reported %s", _player->GetName(), reportedPlayer->GetName());
-
     reportedPlayer->ReportedAfkBy(_player);
 }
-
 void WorldSession::SendBattleGroundOrArenaJoinError(uint8 err)
 {
     WorldPacket data;
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index f2143de5bdc..99339a835a6 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "Policies/SingletonImp.h"
-
 #include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundAV.h"
@@ -45,13 +43,10 @@
 #include "GameEventMgr.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
-
 INSTANTIATE_SINGLETON_1( BattleGroundMgr );
-
 /*********************************************************/
 /***            BATTLEGROUND QUEUE SYSTEM              ***/
 /*********************************************************/
-
 BattleGroundQueue::BattleGroundQueue()
 {
     for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
@@ -65,7 +60,6 @@ BattleGroundQueue::BattleGroundQueue()
         }
     }
 }
-
 BattleGroundQueue::~BattleGroundQueue()
 {
     m_QueuedPlayers.clear();
@@ -79,18 +73,15 @@ BattleGroundQueue::~BattleGroundQueue()
         }
     }
 }
-
 /*********************************************************/
 /***      BATTLEGROUND QUEUE SELECTION POOLS           ***/
 /*********************************************************/
-
 // selection pool initialization, used to clean up from prev selection
 void BattleGroundQueue::SelectionPool::Init()
 {
     SelectedGroups.clear();
     PlayerCount = 0;
 }
-
 // remove group info from selection pool
 // returns true when we need to try to add new group to selection pool
 // returns false when selection pool is ok or when we kicked smaller group than we need to kick
@@ -123,7 +114,6 @@ bool BattleGroundQueue::SelectionPool::KickGroup(uint32 size)
     }
     return true;
 }
-
 // add group to selection pool
 // used when building selection pools
 // returns true if we can invite more players, or when we added group to selection pool
@@ -142,16 +132,13 @@ bool BattleGroundQueue::SelectionPool::AddGroup(GroupQueueInfo *ginfo, uint32 de
         return true;
     return false;
 }
-
 /*********************************************************/
 /***               BATTLEGROUND QUEUES                 ***/
 /*********************************************************/
-
 // add group to bg queue with the given leader and bg specifications
 GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, BattleGroundTypeId BgTypeId, uint8 ArenaType, bool isRated, bool isPremade, uint32 arenaRating, uint32 arenateamid)
 {
     BGQueueIdBasedOnLevel queue_id = leader->GetBattleGroundQueueIdFromLevel(BgTypeId);
-
     // create new ginfo
     // cannot use the method like in addplayer, because that could modify an in-queue group's stats
     // (e.g. leader leaving queue then joining as individual again)
@@ -166,9 +153,7 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, BattleGroundTypeId
     ginfo->Team                      = leader->GetTeam();
     ginfo->ArenaTeamRating           = arenaRating;
     ginfo->OpponentsTeamRating       = 0;
-
     ginfo->Players.clear();
-
     //compute index (if group is premade or joined a rated match) to queues
     uint32 index = 0;
     if (!isRated && !isPremade)
@@ -176,13 +161,10 @@ GroupQueueInfo * BattleGroundQueue::AddGroup(Player *leader, BattleGroundTypeId
     if (ginfo->Team == HORDE)
         index++;
     sLog.outDebug("Adding Group to BattleGroundQueue bgTypeId : %u, queue_id : %u, index : %u", BgTypeId, queue_id, index);
-
     m_QueuedGroups[queue_id][index].push_back(ginfo);
-
     // return ginfo, because it is needed to add players to this group info
     return ginfo;
 }
-
 //add player to playermap
 void BattleGroundQueue::AddPlayer(Player *plr, GroupQueueInfo *ginfo)
 {
@@ -190,11 +172,9 @@ void BattleGroundQueue::AddPlayer(Player *plr, GroupQueueInfo *ginfo)
     PlayerQueueInfo& info = m_QueuedPlayers[plr->GetGUID()];
     info.LastOnlineTime             = getMSTime();
     info.GroupInfo                  = ginfo;
-
     // add the pinfo to ginfo's list
     ginfo->Players[plr->GetGUID()]  = &info;
 }
-
 void BattleGroundQueue::PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BGQueueIdBasedOnLevel queue_id)
 {
     uint32 timeInQueue = getMSTimeDiff(ginfo->JoinTime, getMSTime());
@@ -209,7 +189,6 @@ void BattleGroundQueue::PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* g
         if (ginfo->IsRated)
             team_index = BG_TEAM_HORDE;                     //for rated arenas use BG_TEAM_HORDE
     }
-
     //store pointer to arrayindex of player that was added first
     uint32* lastPlayerAddedPointer = &(m_WaitTimeLastPlayer[team_index][queue_id]);
     //remove his time from sum
@@ -222,7 +201,6 @@ void BattleGroundQueue::PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* g
     (*lastPlayerAddedPointer)++;
     (*lastPlayerAddedPointer) %= COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME;
 }
-
 uint32 BattleGroundQueue::GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BGQueueIdBasedOnLevel queue_id)
 {
     uint8 team_index = BG_TEAM_ALLIANCE;                    //default set to BG_TEAM_ALLIANCE - or non rated arenas!
@@ -243,15 +221,12 @@ uint32 BattleGroundQueue::GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BGQueue
         //if there aren't enough values return 0 - not available
         return 0;
 }
-
 //remove player from queue and from group info, if group info is empty then remove it too
 void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCount)
 {
     //Player *plr = objmgr.GetPlayer(guid);
-
     int32 queue_id = -1;                                     // signed for proper for-loop finish
     QueuedPlayersMap::iterator itr;
-
     //remove player from map, if he's there
     itr = m_QueuedPlayers.find(guid);
     if (itr == m_QueuedPlayers.end())
@@ -259,14 +234,12 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
         sLog.outError("BattleGroundQueue: couldn't find player to remove GUID: %u", GUID_LOPART(guid));
         return;
     }
-
     GroupQueueInfo* group = itr->second.GroupInfo;
     GroupsQueueType::iterator group_itr, group_itr_tmp;
     // mostly people with the highest levels are in battlegrounds, thats why
     // we count from MAX_BATTLEGROUND_QUEUES - 1 to 0
     // variable index removes useless searching in other team's queue
     uint32 index = (group->Team == HORDE) ? BG_TEAM_HORDE : BG_TEAM_ALLIANCE;
-
     for (int32 queue_id_tmp = MAX_BATTLEGROUND_QUEUES - 1; queue_id_tmp >= 0 && queue_id == -1; --queue_id_tmp)
     {
         //we must check premade and normal team's queue - because when players from premade are joining bg,
@@ -293,17 +266,14 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
         return;
     }
     sLog.outDebug("BattleGroundQueue: Removing player GUID %u, from queue_id %u", GUID_LOPART(guid), (uint32)queue_id);
-
     // ALL variables are correctly set
     // We can ignore leveling up in queue - it should not cause crash
     // remove player from group
     // if only one player there, remove group
-
     // remove player queue info from group queue info
     std::map<uint64, PlayerQueueInfo*>::iterator pitr = group->Players.find(guid);
     if (pitr != group->Players.end())
         group->Players.erase(pitr);
-
     // if invited to bg, and should decrease invited count, then do it
     if (decreaseInvitedCount && group->IsInvitedToBGInstanceGUID)
     {
@@ -311,14 +281,11 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
         if (bg)
             bg->DecreaseInvitedCount(group->Team);
     }
-
     // remove player queue info
     m_QueuedPlayers.erase(itr);
-
     //if we left BG queue(not porting) OR if arena team left queue for rated match
     if ((decreaseInvitedCount && !group->ArenaType) || (group->ArenaType && group->IsRated && group->Players.empty()))
         AnnounceWorld(group, guid, false);
-
     //if player leaves queue and he is invited to rated arena match, then he have to loose
     if (group->IsInvitedToBGInstanceGUID && group->IsRated && decreaseInvitedCount)
     {
@@ -334,7 +301,6 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
             at->SaveToDB();
         }
     }
-
     // remove group queue info if needed
     if (group->Players.empty())
     {
@@ -363,7 +329,6 @@ void BattleGroundQueue::RemovePlayer(const uint64& guid, bool decreaseInvitedCou
         RemovePlayer(group->Players.begin()->first, decreaseInvitedCount);
     }
 }
-
 //Announce world message
 void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playerGUID, bool isAddedToQueue)
 {
@@ -374,7 +339,6 @@ void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playe
             BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(ginfo->BgTypeId);
             if (!bg)
                 return;
-
             char const* bgName = bg->GetName();
             if (isAddedToQueue)
             {
@@ -406,7 +370,6 @@ void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playe
             BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(ginfo->BgTypeId);
             if (!bg || !plr)
                 return;
-
             BGQueueIdBasedOnLevel queue_id = plr->GetBattleGroundQueueIdFromLevel(bg->GetTypeID());
             char const* bgName = bg->GetName();
             uint32 MinPlayers = bg->GetMinPlayersPerTeam();
@@ -421,7 +384,6 @@ void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playe
             for(itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].begin(); itr != m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].end(); ++itr)
                 if (!(*itr)->IsInvitedToBGInstanceGUID)
                     qHorde += (*itr)->Players.size();
-
             // Show queue status to player only (when joining queue)
             if (sWorld.getConfig(CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY))
             {
@@ -437,13 +399,11 @@ void BattleGroundQueue::AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playe
         }
     }
 }
-
 bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * bg, uint32 side)
 {
     // set side if needed
     if (side)
         ginfo->Team = side;
-
     if (!ginfo->IsInvitedToBGInstanceGUID)
     {
         // not yet invited
@@ -452,13 +412,10 @@ bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * b
         BattleGroundTypeId bgTypeId = bg->GetTypeID();
         BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bgTypeId, bg->GetArenaType());
         BGQueueIdBasedOnLevel queue_id = bg->GetQueueId();
-
         // set ArenaTeamId for rated matches
         if (bg->isArena() && bg->isRated())
             bg->SetArenaTeamIdForTeam(ginfo->Team, ginfo->ArenaTeamId);
-
         ginfo->RemoveInviteTime = getMSTime() + INVITE_ACCEPT_WAIT_TIME;
-
         // loop through the players
         for(std::map<uint64,PlayerQueueInfo*>::iterator itr = ginfo->Players.begin(); itr != ginfo->Players.end(); ++itr)
         {
@@ -467,39 +424,29 @@ bool BattleGroundQueue::InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * b
             // if offline, skip him, this should not happen - player is removed from queue when he logs out
             if (!plr)
                 continue;
-
             // invite the player
             PlayerInvitedToBGUpdateAverageWaitTime(ginfo, queue_id);
             //sBattleGroundMgr.InvitePlayer(plr, bg, ginfo->Team);
-
             // set invited player counters
             bg->IncreaseInvitedCount(ginfo->Team);
-
             plr->SetInviteForBattleGroundQueueType(bgQueueTypeId, ginfo->IsInvitedToBGInstanceGUID);
-
             // create remind invite events
             BGQueueInviteEvent* inviteEvent = new BGQueueInviteEvent(plr->GetGUID(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, ginfo->RemoveInviteTime);
             plr->m_Events.AddEvent(inviteEvent, plr->m_Events.CalculateTime(INVITATION_REMIND_TIME));
             // create automatic remove events
             BGQueueRemoveEvent* removeEvent = new BGQueueRemoveEvent(plr->GetGUID(), ginfo->IsInvitedToBGInstanceGUID, bgTypeId, bgQueueTypeId, ginfo->RemoveInviteTime);
             plr->m_Events.AddEvent(removeEvent, plr->m_Events.CalculateTime(INVITE_ACCEPT_WAIT_TIME));
-
             WorldPacket data;
-
             uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
-
             sLog.outDebug("Battleground: invited plr %s (%u) to BG instance %u queueindex %u bgtype %u, I can't help it if they don't press the enter battle button.",plr->GetName(),plr->GetGUIDLow(),bg->GetInstanceID(),queueSlot,bg->GetTypeID());
-
             // send status packet
             sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_WAIT_JOIN, INVITE_ACCEPT_WAIT_TIME, 0, ginfo->ArenaType);
             plr->GetSession()->SendPacket(&data);
         }
         return true;
     }
-
     return false;
 }
-
 /*
 This function is inviting players to already running battlegrounds
 Invitation type is based on config file
@@ -509,7 +456,6 @@ void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BGQueueIdBasedOnLevel
 {
     int32 hordeFree = bg->GetFreeSlotsForTeam(HORDE);
     int32 aliFree   = bg->GetFreeSlotsForTeam(ALLIANCE);
-
     //iterator for iterating through bg queue
     GroupsQueueType::const_iterator Ali_itr = m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].begin();
     //count of groups in queue - used to stop cycles
@@ -524,11 +470,9 @@ void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BGQueueIdBasedOnLevel
     uint32 hordeIndex = 0;
     for (; hordeIndex < hordeCount && m_SelectionPools[BG_TEAM_HORDE].AddGroup((*Horde_itr), hordeFree); hordeIndex++)
         ++Horde_itr;
-
     //if ofc like BG queue invitation is set in config, then we are happy
     if (sWorld.getConfig(CONFIG_BATTLEGROUND_INVITATION_TYPE) == 0)
         return;
-
     /*
     if we reached this code, then we have to solve NP - complete problem called Subset sum problem
     So one solution is to check all possible invitation subgroups, or we can use these conditions:
@@ -536,7 +480,6 @@ void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BGQueueIdBasedOnLevel
         that we will invite now whole queue, because only 1 change has been made to queues from the last BattleGroundQueue::Update call
     2. Other thing we should consider is group order in queue
     */
-
     // At first we need to compare free space in bg and our selection pool
     int32 diffAli   = aliFree   - int32(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount());
     int32 diffHorde = hordeFree - int32(m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount());
@@ -579,7 +522,6 @@ void BattleGroundQueue::FillPlayersToBG(BattleGround* bg, BGQueueIdBasedOnLevel
         diffHorde = hordeFree - int32(m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount());
     }
 }
-
 // this method checks if premade versus premade battleground is possible
 // then after 30 mins (default) in queue it moves premade group to normal queue
 // it tries to invite as much players as it can - to MaxPlayersPerTeam, because premade groups have more than MinPlayersPerTeam players
@@ -597,7 +539,6 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32
         for( horde_group = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].begin(); horde_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end(); ++horde_group)
             if (!(*horde_group)->IsInvitedToBGInstanceGUID)
                 break;
-
         if (ali_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].end() && horde_group != m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].end())
         {
             m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*ali_group), MaxPlayersPerTeam);
@@ -639,7 +580,6 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32
     //selection pools are not set
     return false;
 }
-
 // this method tries to create battleground or arena with MinPlayersPerTeam against MinPlayersPerTeam
 bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BGQueueIdBasedOnLevel queue_id, uint32 minPlayers, uint32 maxPlayers)
 {
@@ -682,7 +622,6 @@ bool BattleGroundQueue::CheckNormalMatch(BattleGround* bg_template, BGQueueIdBas
     //return true if there are enough players in selection pools - enable to work .debug bg command correctly
     return m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() >= minPlayers && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount() >= minPlayers;
 }
-
 // this method will check if we can invite players to same faction skirmish match
 bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_id, uint32 minPlayersPerTeam)
 {
@@ -719,7 +658,6 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_
     }
     if (m_SelectionPools[otherTeam].GetPlayerCount() != minPlayersPerTeam)
         return false;
-
     //here we have correct 2 selections and we need to change one teams team and move selection pool teams to other team's queue
     for(GroupsQueueType::iterator itr = m_SelectionPools[otherTeam].SelectedGroups.begin(); itr != m_SelectionPools[otherTeam].SelectedGroups.end(); ++itr)
     {
@@ -741,7 +679,6 @@ bool BattleGroundQueue::CheckSkirmishForSameFaction(BGQueueIdBasedOnLevel queue_
     }
     return true;
 }
-
 /*
 this method is called when group is inserted, or player / group is removed from BG Queue - there is only one player's status changed, so we don't use while(true) cycles to invite whole queue
 it must be called after fully adding the members of a group to ensure group joining
@@ -755,7 +692,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
         m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_ALLIANCE].empty() &&
         m_QueuedGroups[queue_id][BG_QUEUE_NORMAL_HORDE].empty() )
         return;
-
     //battleground with free slot for player should be always in the beggining of the queue
     // maybe it would be better to create bgfreeslotqueue for each queue_id_based_on_level
     BGFreeSlotQueueType::iterator itr, next;
@@ -769,20 +705,16 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
         {
             BattleGround* bg = *itr; //we have to store battleground pointer here, because when battleground is full, it is removed from free queue (not yet implemented!!)
             // and iterator is invalid
-
             // clear selection pools
             m_SelectionPools[BG_TEAM_ALLIANCE].Init();
             m_SelectionPools[BG_TEAM_HORDE].Init();
-
             // call a function that does the job for us
             FillPlayersToBG(bg, queue_id);
-
             // now everything is set, invite players
             for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE].SelectedGroups.end(); ++citr)
                 InviteGroupToBG((*citr), bg, (*citr)->Team);
             for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_HORDE].SelectedGroups.end(); ++citr)
                 InviteGroupToBG((*citr), bg, (*citr)->Team);
-
             if (!bg->HasFreeSlots())
             {
                 // remove BG from BGFreeSlotQueue
@@ -790,9 +722,7 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
             }
         }
     }
-
     // finished iterating through the bgs with free slots, maybe we need to create a new bg
-
     BattleGround * bg_template = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
     if (!bg_template)
     {
@@ -833,10 +763,8 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
             }*/
         }
     }
-
     m_SelectionPools[BG_TEAM_ALLIANCE].Init();
     m_SelectionPools[BG_TEAM_HORDE].Init();
-
     if (bg_template->isBattleGround())
     {
         //check if there is premade against premade match
@@ -860,7 +788,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
             m_SelectionPools[BG_TEAM_HORDE].Init();
         }
     }
-
     // now check if there are in queues enough players to start new game of (normal battleground, or non-rated arena)
     if (!isRated)
     {
@@ -875,7 +802,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
                 sLog.outError("BattleGroundQueue::Update - Cannot create battleground: %u", bgTypeId);
                 return;
             }
-
             // invite those selection pools
             for(uint32 i = 0; i < BG_TEAMS_COUNT; i++)
                 for(GroupsQueueType::const_iterator citr = m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.begin(); citr != m_SelectionPools[BG_TEAM_ALLIANCE + i].SelectedGroups.end(); ++citr)
@@ -911,7 +837,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
             else if (!front1 && !front2)
                 return; //queues are empty
         }
-
         //set rating range
         uint32 arenaMinRating = (arenaRating <= sBattleGroundMgr.GetMaxRatingDifference()) ? 0 : arenaRating - sBattleGroundMgr.GetMaxRatingDifference();
         uint32 arenaMaxRating = arenaRating + sBattleGroundMgr.GetMaxRatingDifference();
@@ -920,13 +845,9 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
         // the discard time is current_time - time_to_discard, teams that joined after that, will have their ratings taken into account
         // else leave the discard time on 0, this way all ratings will be discarded
         uint32 discardTime = getMSTime() - sBattleGroundMgr.GetRatingDiscardTimer();
-
         // we need to find 2 teams which will play next game
-
         GroupsQueueType::iterator itr_team[BG_TEAMS_COUNT];
-
         //optimalization : --- we dont need to use selection_pools - each update we select max 2 groups
-
         for(uint32 i = BG_QUEUE_PREMADE_ALLIANCE; i < BG_QUEUE_NORMAL_ALLIANCE; i++)
         {
             // take the group that joined first
@@ -979,7 +900,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
                 }
             }
         }
-
         //if we have 2 teams, then start new arena and invite players!
         if (m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount() && m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount())
         {
@@ -989,7 +909,6 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
                 sLog.outError("BattlegroundQueue::Update couldn't create arena instance for rated arena match!");
                 return;
             }
-
             (*(itr_team[BG_TEAM_ALLIANCE]))->OpponentsTeamRating = (*(itr_team[BG_TEAM_HORDE]))->ArenaTeamRating;
             sLog.outDebug("setting oposite teamrating for team %u to %u", (*(itr_team[BG_TEAM_ALLIANCE]))->ArenaTeamId, (*(itr_team[BG_TEAM_ALLIANCE]))->OpponentsTeamRating);
             (*(itr_team[BG_TEAM_HORDE]))->OpponentsTeamRating = (*(itr_team[BG_TEAM_ALLIANCE]))->ArenaTeamRating;
@@ -1009,33 +928,26 @@ void BattleGroundQueue::Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLeve
                 m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_ALLIANCE].erase(itr_team[BG_TEAM_HORDE]);
                 itr_team[BG_TEAM_HORDE] = m_QueuedGroups[queue_id][BG_QUEUE_PREMADE_HORDE].begin();
             }
-
             InviteGroupToBG(*(itr_team[BG_TEAM_ALLIANCE]), arena, ALLIANCE);
             InviteGroupToBG(*(itr_team[BG_TEAM_HORDE]), arena, HORDE);
-
             sLog.outDebug("Starting rated arena match!");
-
             arena->StartBattleGround();
         }
     }
 }
-
 /*********************************************************/
 /***            BATTLEGROUND QUEUE EVENTS              ***/
 /*********************************************************/
-
 bool BGQueueInviteEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
 {
     Player* plr = objmgr.GetPlayer( m_PlayerGuid );
     // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
     if (!plr)
         return true;
-
     BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
     //if battleground ended and its instance deleted - do nothing
     if (!bg)
         return true;
-
     BattleGroundQueueTypeId bgQueueTypeId = BattleGroundMgr::BGQueueTypeId(bg->GetTypeID(), bg->GetArenaType());
     uint32 queueSlot = plr->GetBattleGroundQueueIndex(bgQueueTypeId);
     if( queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES )        // player is in queue or in battleground
@@ -1054,12 +966,10 @@ bool BGQueueInviteEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
     }
     return true;                                            //event will be deleted
 }
-
 void BGQueueInviteEvent::Abort(uint64 /*e_time*/)
 {
     //do nothing
 }
-
 /*
     this event has many possibilities when it is executed:
     1. player is in battleground ( he clicked enter on invitation window )
@@ -1075,11 +985,9 @@ bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
     if (!plr)
         // player logged off (we should do nothing, he is correctly removed from queue in another procedure)
         return true;
-
     BattleGround* bg = sBattleGroundMgr.GetBattleGround(m_BgInstanceGUID, m_BgTypeId);
     //battleground can be deleted already when we are removing queue info
     //bg pointer can be NULL! so use it carefully!
-
     uint32 queueSlot = plr->GetBattleGroundQueueIndex(m_BgQueueTypeId);
     if( queueSlot < PLAYER_MAX_BATTLEGROUND_QUEUES )        // player is in queue, or in Battleground
     {
@@ -1091,32 +999,26 @@ bool BGQueueRemoveEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
             && qMapItr->second.GroupInfo->RemoveInviteTime == m_RemoveTime )
         {
             sLog.outDebug("Battleground: removing player %u from bg queue for instance %u because of not pressing enter battle in time.",plr->GetGUIDLow(),m_BgInstanceGUID);
-
             plr->RemoveBattleGroundQueueId(m_BgQueueTypeId);
             sBattleGroundMgr.m_BattleGroundQueues[m_BgQueueTypeId].RemovePlayer(m_PlayerGuid, true);
             //update queues if battleground isn't ended
             if (bg)
                 sBattleGroundMgr.ScheduleQueueUpdate(m_BgQueueTypeId, m_BgTypeId, bg->GetQueueId());
-
             WorldPacket data;
             sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_NONE, 0, 0, 0);
             plr->GetSession()->SendPacket(&data);
         }
     }
-
     //event will be deleted
     return true;
 }
-
 void BGQueueRemoveEvent::Abort(uint64 /*e_time*/)
 {
     //do nothing
 }
-
 /*********************************************************/
 /***            BATTLEGROUND MANAGER                   ***/
 /*********************************************************/
-
 BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTesting(false)
 {
     for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++)
@@ -1124,12 +1026,10 @@ BattleGroundMgr::BattleGroundMgr() : m_AutoDistributionTimeChecker(0), m_ArenaTe
     m_NextRatingDiscardUpdate = sWorld.getConfig(CONFIG_ARENA_RATING_DISCARD_TIMER);
     m_Testing=false;
 }
-
 BattleGroundMgr::~BattleGroundMgr()
 {
     DeleteAllBattleGrounds();
 }
-
 void BattleGroundMgr::DeleteAllBattleGrounds()
 {
     for(uint32 i = BATTLEGROUND_TYPE_NONE; i < MAX_BATTLEGROUND_TYPE_ID; i++)
@@ -1143,7 +1043,6 @@ void BattleGroundMgr::DeleteAllBattleGrounds()
             delete bg;
         }
     }
-
     // destroy template battlegrounds that listed only in queues (other already terminated)
     for(uint32 bgTypeId = 0; bgTypeId < MAX_BATTLEGROUND_TYPE_ID; ++bgTypeId)
     {
@@ -1152,7 +1051,6 @@ void BattleGroundMgr::DeleteAllBattleGrounds()
             delete BGFreeSlotQueue[bgTypeId].front();
     }
 }
-
 // used to update running battlegrounds, and delete finished ones
 void BattleGroundMgr::Update(uint32 diff)
 {
@@ -1180,7 +1078,6 @@ void BattleGroundMgr::Update(uint32 diff)
             }
         }
     }
-
     // update scheduled queues
     if (!m_QueueUpdateScheduler.empty())
     {
@@ -1198,7 +1095,6 @@ void BattleGroundMgr::Update(uint32 diff)
             m_BattleGroundQueues[bgQueueTypeId].Update(bgTypeId, queue_id);
         }
     }
-
     // if rating difference counts, maybe force-update queues
     if (sWorld.getConfig(CONFIG_ARENA_MAX_RATING_DIFFERENCE) && sWorld.getConfig(CONFIG_ARENA_RATING_DISCARD_TIMER))
     {
@@ -1234,11 +1130,9 @@ void BattleGroundMgr::Update(uint32 diff)
             m_AutoDistributionTimeChecker -= diff;
     }
 }
-
 void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGround *bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, uint8 arenatype)
 {
     // we can be in 3 queues in same time...
-
     if (StatusID == 0 || !bg)
     {
         data->Initialize(SMSG_BATTLEFIELD_STATUS, 4*3);
@@ -1246,7 +1140,6 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro
         *data << uint64(0);
         return;
     }
-
     data->Initialize(SMSG_BATTLEFIELD_STATUS, (4+1+1+4+2+4+1+4+4+4));
     *data << uint32(QueueSlot);                             // queue id (0...2) - player can be in 3 queues in time
     // uint64 in client
@@ -1295,15 +1188,12 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro
             *data << uint8(0);
             break;
     }
-
     if (bg->isArena() && (StatusID == STATUS_WAIT_QUEUE))
         *data << uint32(BATTLEGROUND_AA);                   // all arenas   I don't think so.
     else
     *data << uint32(bg->GetTypeID());                   // BG id from DBC
-
     *data << uint16(0x1F90);                                // unk value 8080
     *data << uint32(bg->GetInstanceID());                   // instance id
-
     *data << uint8(bg->isArena());                          // minimap-icon 0=faction 1=arena
 */
     *data << uint32(StatusID);                              // status
@@ -1328,14 +1218,12 @@ void BattleGroundMgr::BuildBattleGroundStatusPacket(WorldPacket *data, BattleGro
             break;
     }
 }
-
 void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
 {
     uint8 type = (bg->isArena() ? 1 : 0);
                                                             // last check on 3.0.3
     data->Initialize(MSG_PVP_LOG_DATA, (1+1+4+40*bg->GetPlayerScoresSize()));
     *data << uint8(type);                                   // type (battleground=0/arena=1)
-
     if(type)                                                // arena
     {
         // it seems this must be according to BG_WINNER_A/H and _NOT_ BG_TEAM_A/H
@@ -1356,7 +1244,6 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
                 *data << (uint8)0;
         }
     }
-
     if (bg->GetStatus() != STATUS_WAIT_LEAVE)
     {
         *data << uint8(0);                                  // bg not ended
@@ -1366,9 +1253,7 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
         *data << uint8(1);                                  // bg ended
         *data << uint8(bg->GetWinner());                    // who win
     }
-
     *data << (int32)(bg->GetPlayerScoresSize());
-
     for(BattleGround::BattleGroundScoreMap::const_iterator itr = bg->GetPlayerScoresBegin(); itr != bg->GetPlayerScoresEnd(); ++itr)
     {
         *data << (uint64)itr->first;
@@ -1432,7 +1317,6 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
         }
     }
 }
-
 void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket *data, BattleGroundTypeId bgTypeId)
 {
     /*bgTypeId is:
@@ -1447,32 +1331,27 @@ void BattleGroundMgr::BuildGroupJoinedBattlegroundPacket(WorldPacket *data, Batt
     data->Initialize(SMSG_GROUP_JOINED_BATTLEGROUND, 4);
     *data << uint32(bgTypeId);
 }
-
 void BattleGroundMgr::BuildUpdateWorldStatePacket(WorldPacket *data, uint32 field, uint32 value)
 {
     data->Initialize(SMSG_UPDATE_WORLD_STATE, 4+4);
     *data << uint32(field);
     *data << uint32(value);
 }
-
 void BattleGroundMgr::BuildPlaySoundPacket(WorldPacket *data, uint32 soundid)
 {
     data->Initialize(SMSG_PLAY_SOUND, 4);
     *data << uint32(soundid);
 }
-
 void BattleGroundMgr::BuildPlayerLeftBattleGroundPacket(WorldPacket *data, const uint64& guid)
 {
     data->Initialize(SMSG_BATTLEGROUND_PLAYER_LEFT, 8);
     *data << uint64(guid);
 }
-
 void BattleGroundMgr::BuildPlayerJoinedBattleGroundPacket(WorldPacket *data, Player *plr)
 {
     data->Initialize(SMSG_BATTLEGROUND_PLAYER_JOINED, 8);
     *data << uint64(plr->GetGUID());
 }
-
 BattleGround * BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId)
 {
     //cause at HandleBattleGroundJoinOpcode the clients sends the instanceid he gets from
@@ -1480,10 +1359,8 @@ BattleGround * BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 inst
     BattleGround* bg = GetBattleGroundTemplate(bgTypeId);
     if (!bg)
         return NULL;
-
     if (bg->isArena())
         return GetBattleGround(instanceId, bgTypeId);
-
     for(BattleGroundSet::iterator itr = m_BattleGrounds[bgTypeId].begin(); itr != m_BattleGrounds[bgTypeId].end(); ++itr)
     {
         if (itr->second->GetClientInstanceID() == instanceId)
@@ -1491,7 +1368,6 @@ BattleGround * BattleGroundMgr::GetBattleGroundThroughClientInstance(uint32 inst
     }
     return NULL;
 }
-
 BattleGround * BattleGroundMgr::GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId)
 {
     if (!InstanceID)
@@ -1511,18 +1387,15 @@ BattleGround * BattleGroundMgr::GetBattleGround(uint32 InstanceID, BattleGroundT
     itr = m_BattleGrounds[bgTypeId].find(InstanceID);
     return ( (itr != m_BattleGrounds[bgTypeId].end()) ? itr->second : NULL );
 }
-
 BattleGround * BattleGroundMgr::GetBattleGroundTemplate(BattleGroundTypeId bgTypeId)
 {
     //map is sorted and we can be sure that lowest instance id has only BG template
     return m_BattleGrounds[bgTypeId].empty() ? NULL : m_BattleGrounds[bgTypeId].begin()->second;
 }
-
 uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id)
 {
     if (IsArenaType(bgTypeId))
         return 0;                                           //arenas don't have client-instanceids
-
     // we create here an instanceid, which is just for
     // displaying this to the client and without any other use..
     // the client-instanceIds are unique for each battleground-type
@@ -1539,7 +1412,6 @@ uint32 BattleGroundMgr::CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeI
     m_ClientBattleGroundIds[bgTypeId][queue_id].insert(lastId + 1);
     return lastId + 1;
 }
-
 // create a new battleground that will really be used to play
 BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id, uint8 arenaType, bool isRated)
 {
@@ -1550,7 +1422,6 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
         sLog.outError("BattleGround: CreateNewBattleGround - bg template not found for %u", bgTypeId);
         return NULL;
     }
-
     //for arenas there is random map used
     if (bg_template->isArena())
     {
@@ -1564,7 +1435,6 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
             return NULL;
         }
     }
-
     BattleGround *bg = NULL;
     // create a copy of the BG template
     switch(bgTypeId)
@@ -1606,23 +1476,18 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
             //error, but it is handled few lines above
             return 0;
     }
-
     // generate a new instance id
     bg->SetInstanceID(MapManager::Instance().GenerateInstanceId()); // set instance id
     bg->SetClientInstanceID(CreateClientVisibleInstanceId(bgTypeId, queue_id));
-
     // reset the new bg (set status to status_wait_queue from status_none)
     bg->Reset();
-
     // start the joining of the bg
     bg->SetStatus(STATUS_WAIT_JOIN);
     bg->SetQueueId(queue_id);
     bg->SetArenaType(arenaType);
     bg->SetRated(isRated);
-
     return bg;
 }
-
 // used to create the BG templates
 uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO)
 {
@@ -1643,7 +1508,6 @@ uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsA
         case BATTLEGROUND_RV: bg = new BattleGroundRV; break;
         default:bg = new BattleGround;   break;             // placeholder for non implemented BG
     }
-
     bg->SetMapId(MapID);
     bg->SetTypeID(bgTypeId);
     bg->SetInstanceID(0);
@@ -1656,14 +1520,11 @@ uint32 BattleGroundMgr::CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsA
     bg->SetTeamStartLoc(ALLIANCE, Team1StartLocX, Team1StartLocY, Team1StartLocZ, Team1StartLocO);
     bg->SetTeamStartLoc(HORDE,    Team2StartLocX, Team2StartLocY, Team2StartLocZ, Team2StartLocO);
     bg->SetLevelRange(LevelMin, LevelMax);
-
     // add bg to update list
     AddBattleGround(bg->GetInstanceID(), bg->GetTypeID(), bg);
-
     // return some not-null value, bgTypeId is good enough for me
     return bgTypeId;
 }
-
 void BattleGroundMgr::CreateInitialBattleGrounds()
 {
     float AStartLoc[4];
@@ -1672,32 +1533,23 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
     BattlemasterListEntry const *bl;
     WorldSafeLocsEntry const *start;
     bool IsArena;
-
     uint32 count = 0;
-
     //                                                0   1                 2                 3      4      5                6              7             8
     QueryResult *result = WorldDatabase.Query("SELECT id, MinPlayersPerTeam,MaxPlayersPerTeam,MinLvl,MaxLvl,AllianceStartLoc,AllianceStartO,HordeStartLoc,HordeStartO FROM battleground_template");
-
     if (!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 battlegrounds. DB table `battleground_template` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 bgTypeID_ = fields[0].GetUInt32();
-
         // can be overwrite by values from DB
         bl = sBattlemasterListStore.LookupEntry(bgTypeID_);
         if (!bl)
@@ -1705,9 +1557,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
             sLog.outError("Battleground ID %u not found in BattlemasterList.dbc. Battleground not created.", bgTypeID_);
             continue;
         }
-
         BattleGroundTypeId bgTypeID = BattleGroundTypeId(bgTypeID_);
-
         IsArena = (bl->type == TYPE_ARENA);
         MinPlayersPerTeam = fields[1].GetUInt32();
         MaxPlayersPerTeam = fields[2].GetUInt32();
@@ -1724,9 +1574,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
             MinLvl = bl->minlvl;
             MaxLvl = bl->maxlvl;
         }
-
         start1 = fields[5].GetUInt32();
-
         start = sWorldSafeLocsStore.LookupEntry(start1);
         if (start)
         {
@@ -1747,9 +1595,7 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
             sLog.outErrorDb("Table `battleground_template` for id %u have non-existed WorldSafeLocs.dbc id %u in field `AllianceStartLoc`. BG not created.", bgTypeID, start1);
             continue;
         }
-
         start2 = fields[7].GetUInt32();
-
         start = sWorldSafeLocsStore.LookupEntry(start2);
         if (start)
         {
@@ -1770,20 +1616,15 @@ void BattleGroundMgr::CreateInitialBattleGrounds()
             sLog.outErrorDb("Table `battleground_template` for id %u have non-existed WorldSafeLocs.dbc id %u in field `HordeStartLoc`. BG not created.", bgTypeID, start2);
             continue;
         }
-
         //sLog.outDetail("Creating battleground %s, %u-%u", bl->name[sWorld.GetDBClang()], MinLvl, MaxLvl);
         if (!CreateBattleGround(bgTypeID, IsArena, MinPlayersPerTeam, MaxPlayersPerTeam, MinLvl, MaxLvl, bl->name[sWorld.GetDefaultDbcLocale()], bl->mapid[0], AStartLoc[0], AStartLoc[1], AStartLoc[2], AStartLoc[3], HStartLoc[0], HStartLoc[1], HStartLoc[2], HStartLoc[3]))
             continue;
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u battlegrounds", count );
 }
-
 void BattleGroundMgr::InitAutomaticArenaPointDistribution()
 {
     if (sWorld.getConfig(CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS))
@@ -1804,22 +1645,17 @@ void BattleGroundMgr::InitAutomaticArenaPointDistribution()
         sLog.outDebug("Automatic Arena Point Distribution initialized.");
     }
 }
-
 void BattleGroundMgr::DistributeArenaPoints()
 {
     // used to distribute arena points based on last week's stats
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_START);
-
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_START);
-
     //temporary structure for storing maximum points to add values for all players
     std::map<uint32, uint32> PlayerPoints;
-
     //at first update all points for all team members
     for(ObjectMgr::ArenaTeamMap::iterator team_itr = objmgr.GetArenaTeamMapBegin(); team_itr != objmgr.GetArenaTeamMapEnd(); ++team_itr)
         if (ArenaTeam * at = team_itr->second)
             at->UpdateArenaPointsHelper(PlayerPoints);
-
     //cycle that gives points to all players
     for (std::map<uint32, uint32>::iterator plr_itr = PlayerPoints.begin(); plr_itr != PlayerPoints.end(); ++plr_itr)
     {
@@ -1837,11 +1673,8 @@ void BattleGroundMgr::DistributeArenaPoints()
             std::min(int32(plr_itr->second),int32(sWorld.getConfig(CONFIG_MAX_ARENA_POINTS))));
         }
     }
-
     PlayerPoints.clear();
-
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_ONLINE_END);
-
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_START);
     for(ObjectMgr::ArenaTeamMap::iterator titr = objmgr.GetArenaTeamMapBegin(); titr != objmgr.GetArenaTeamMapEnd(); ++titr)
     {
@@ -1852,20 +1685,15 @@ void BattleGroundMgr::DistributeArenaPoints()
             at->NotifyStatsChanged();                      // notify the players of the changes
         }
     }
-
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_TEAM_END);
-
     sWorld.SendWorldText(LANG_DIST_ARENA_POINTS_END);
 }
-
 void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint64& guid, Player* plr, BattleGroundTypeId bgTypeId, uint8 fromWhere)
 {
     if (!plr)
         return;
-
     uint32 PlayerLevel = 10;
     PlayerLevel = plr->getLevel();
-
     data->Initialize(SMSG_BATTLEFIELD_LIST);
     *data << uint64(guid);                                  // battlemaster guid
     *data << uint8(fromWhere);                              // from where you joined
@@ -1878,11 +1706,9 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint6
     else                                                    // battleground
     {
         *data << uint8(0x00);                               // unk, different for each bg type
-
         size_t count_pos = data->wpos();
         uint32 count = 0;
         *data << uint32(0x00);                              // number of bg instances
-
         uint32 queue_id = plr->GetBattleGroundQueueIdFromLevel(bgTypeId);
         for(std::set<uint32>::iterator itr = m_ClientBattleGroundIds[bgTypeId][queue_id].begin(); itr != m_ClientBattleGroundIds[bgTypeId][queue_id].end();++itr)
         {
@@ -1892,7 +1718,6 @@ void BattleGroundMgr::BuildBattleGroundListPacket(WorldPacket *data, const uint6
         data->put<uint32>( count_pos , count);
     }
 }
-
 void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGroundTypeId bgTypeId)
 {
     BattleGround *bg = GetBattleGround(instanceId, bgTypeId);
@@ -1904,7 +1729,6 @@ void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGr
         if (team==0)
             team = pl->GetTeam();
         bg->GetTeamStartLoc(team, x, y, z, O);
-
         sLog.outDetail("BATTLEGROUND: Sending %s to map %u, X %f, Y %f, Z %f, O %f", pl->GetName(), mapid, x, y, z, O);
         pl->TeleportTo(mapid, x, y, z, O);
     }
@@ -1913,7 +1737,6 @@ void BattleGroundMgr::SendToBattleGround(Player *pl, uint32 instanceId, BattleGr
         sLog.outError("player %u trying to port to non-existent bg instance %u",pl->GetGUIDLow(), instanceId);
     }
 }
-
 void BattleGroundMgr::SendAreaSpiritHealerQueryOpcode(Player *pl, BattleGround *bg, const uint64& guid)
 {
     WorldPacket data(SMSG_AREA_SPIRIT_HEALER_TIME, 12);
@@ -1923,7 +1746,6 @@ void BattleGroundMgr::SendAreaSpiritHealerQueryOpcode(Player *pl, BattleGround *
     data << guid << time_;
     pl->GetSession()->SendPacket(&data);
 }
-
 bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
 {
     return ( bgTypeId == BATTLEGROUND_AA ||
@@ -1931,7 +1753,6 @@ bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
         bgTypeId == BATTLEGROUND_NA ||
         bgTypeId == BATTLEGROUND_RL );
 }
-
 BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, uint8 arenaType)
 {
     switch(bgTypeId)
@@ -1967,7 +1788,6 @@ BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgType
             return BATTLEGROUND_QUEUE_NONE;
     }
 }
-
 BattleGroundTypeId BattleGroundMgr::BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId)
 {
     switch(bgQueueTypeId)
@@ -1990,7 +1810,6 @@ BattleGroundTypeId BattleGroundMgr::BGTemplateId(BattleGroundQueueTypeId bgQueue
             return BattleGroundTypeId(0);                   // used for unknown template (it existed and do nothing)
     }
 }
-
 uint8 BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId bgQueueTypeId)
 {
     switch(bgQueueTypeId)
@@ -2005,7 +1824,6 @@ uint8 BattleGroundMgr::BGArenaType(BattleGroundQueueTypeId bgQueueTypeId)
             return 0;
     }
 }
-
 void BattleGroundMgr::ToggleTesting()
 {
     m_Testing = !m_Testing;
@@ -2014,7 +1832,6 @@ void BattleGroundMgr::ToggleTesting()
     else
         sWorld.SendWorldText(LANG_DEBUG_BG_OFF);
 }
-
 void BattleGroundMgr::ToggleArenaTesting()
 {
     m_ArenaTesting = !m_ArenaTesting;
@@ -2023,7 +1840,6 @@ void BattleGroundMgr::ToggleArenaTesting()
     else
         sWorld.SendWorldText(LANG_DEBUG_ARENA_OFF);
 }
-
 void BattleGroundMgr::SetHolidayWeekends(uint32 mask)
 {
     for(uint32 bgtype = 1; bgtype < MAX_BATTLEGROUND_TYPE_ID; ++bgtype)
@@ -2034,7 +1850,6 @@ void BattleGroundMgr::SetHolidayWeekends(uint32 mask)
         }
     }
 }
-
 void BattleGroundMgr::ScheduleQueueUpdate(BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id)
 {
     //This method must be atomic, TODO add mutex
@@ -2052,7 +1867,6 @@ void BattleGroundMgr::ScheduleQueueUpdate(BattleGroundQueueTypeId bgQueueTypeId,
     if (!found)
         m_QueueUpdateScheduler.push_back(schedule_id);
 }
-
 uint32 BattleGroundMgr::GetMaxRatingDifference() const
 {
     // this is for stupid people who can't use brain and set max rating difference to 0
@@ -2061,44 +1875,33 @@ uint32 BattleGroundMgr::GetMaxRatingDifference() const
         diff = 5000;
     return diff;
 }
-
 uint32 BattleGroundMgr::GetRatingDiscardTimer() const
 {
     return sWorld.getConfig(CONFIG_ARENA_RATING_DISCARD_TIMER);
 }
-
 uint32 BattleGroundMgr::GetPrematureFinishTime() const
 {
     return sWorld.getConfig(CONFIG_BATTLEGROUND_PREMATURE_FINISH_TIMER);
 }
-
 void BattleGroundMgr::LoadBattleMastersEntry()
 {
     mBattleMastersMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query( "SELECT entry,bg_template FROM battlemaster_entry" );
-
     uint32 count = 0;
-
     if (!result)
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded 0 battlemaster entries - table is empty!" );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 entry = fields[0].GetUInt32();
         uint32 bgTypeId  = fields[1].GetUInt32();
         if (!sBattlemasterListStore.LookupEntry(bgTypeId))
@@ -2106,13 +1909,9 @@ void BattleGroundMgr::LoadBattleMastersEntry()
             sLog.outErrorDb("Table `battlemaster_entry` contain entry %u for not existed battleground type %u, ignored.",entry,bgTypeId);
             continue;
         }
-
         mBattleMastersMap[entry] = BattleGroundTypeId(bgTypeId);
-
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u battlemaster entries", count );
 }
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index 9100142ebd0..2de067d3639 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -17,32 +17,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __BATTLEGROUNDMGR_H
 #define __BATTLEGROUNDMGR_H
-
 #include "Common.h"
 #include "Policies/Singleton.h"
-
 #include "BattleGround.h"
-
 typedef std::map<uint32, BattleGround*> BattleGroundSet;
-
 //this container can't be deque, because deque doesn't like removing the last element - if you remove it, it invalidates next iterator and crash appears
 typedef std::list<BattleGround*> BGFreeSlotQueueType;
-
 typedef UNORDERED_MAP<uint32, BattleGroundTypeId> BattleMastersMap;
-
 #define BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY 86400     // seconds in a day
 #define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10
-
 struct GroupQueueInfo;                                      // type predefinition
 struct PlayerQueueInfo                                      // stores information for players in queue
 {
     uint32  LastOnlineTime;                                 // for tracking and removing offline players from queue after 5 minutes
     GroupQueueInfo * GroupInfo;                             // pointer to the associated groupqueueinfo
 };
-
 struct GroupQueueInfo                                       // stores information about the group in queue (also used when joined as solo!)
 {
     std::map<uint64, PlayerQueueInfo*> Players;             // player queue info map
@@ -57,7 +48,6 @@ struct GroupQueueInfo                                       // stores informatio
     uint32  ArenaTeamRating;                                // if rated match, inited to the rating of the team
     uint32  OpponentsTeamRating;                            // for rated arena matches
 };
-
 enum BattleGroundQueueGroupTypes
 {
     BG_QUEUE_PREMADE_ALLIANCE   = 0,
@@ -66,16 +56,13 @@ enum BattleGroundQueueGroupTypes
     BG_QUEUE_NORMAL_HORDE       = 3
 };
 #define BG_QUEUE_GROUP_TYPES_COUNT 4
-
 class BattleGround;
 class BattleGroundQueue
 {
     public:
         BattleGroundQueue();
         ~BattleGroundQueue();
-
         void Update(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id, uint8 arenaType = 0, bool isRated = false, uint32 minRating = 0);
-
         void FillPlayersToBG(BattleGround* bg, BGQueueIdBasedOnLevel queue_id);
         bool CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam);
         bool CheckNormalMatch(BattleGround* bg_template, BGQueueIdBasedOnLevel queue_id, uint32 minPlayers, uint32 maxPlayers);
@@ -85,16 +72,12 @@ class BattleGroundQueue
         void RemovePlayer(const uint64& guid, bool decreaseInvitedCount);
         void PlayerInvitedToBGUpdateAverageWaitTime(GroupQueueInfo* ginfo, BGQueueIdBasedOnLevel queue_id);
         uint32 GetAverageQueueWaitTime(GroupQueueInfo* ginfo, BGQueueIdBasedOnLevel queue_id);
-
         void DecreaseGroupLength(uint32 queueId, uint32 AsGroup);
         void AnnounceWorld(GroupQueueInfo *ginfo, const uint64& playerGUID, bool isAddedToQueue);
-
         typedef std::map<uint64, PlayerQueueInfo> QueuedPlayersMap;
         QueuedPlayersMap m_QueuedPlayers;
-
         //we need constant add to begin and constant remove / add from the end, therefore deque suits our problem well
         typedef std::list<GroupQueueInfo*> GroupsQueueType;
-
         /*
         This two dimensional array is used to store All queued groups
         First dimension specifies the bgTypeId
@@ -105,7 +88,6 @@ class BattleGroundQueue
              BG_QUEUE_NORMAL_HORDE      is used for normal (or small) horde groups or non-rated arena matches
         */
         GroupsQueueType m_QueuedGroups[MAX_BATTLEGROUND_QUEUES][BG_QUEUE_GROUP_TYPES_COUNT];
-
         // class to select and invite groups to bg
         class SelectionPool
         {
@@ -119,18 +101,14 @@ class BattleGroundQueue
         private:
             uint32 PlayerCount;
         };
-
         //one selection pool for horde, other one for alliance
         SelectionPool m_SelectionPools[BG_TEAMS_COUNT];
-
     private:
-
         bool InviteGroupToBG(GroupQueueInfo * ginfo, BattleGround * bg, uint32 side);
         uint32 m_WaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_QUEUES][COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME];
         uint32 m_WaitTimeLastPlayer[BG_TEAMS_COUNT][MAX_BATTLEGROUND_QUEUES];
         uint32 m_SumOfWaitTimes[BG_TEAMS_COUNT][MAX_BATTLEGROUND_QUEUES];
 };
-
 /*
     This class is used to invite player to BG again, when minute lasts from his first invitation
     it is capable to solve all possibilities
@@ -143,7 +121,6 @@ class BGQueueInviteEvent : public BasicEvent
           {
           };
         virtual ~BGQueueInviteEvent() {};
-
         virtual bool Execute(uint64 e_time, uint32 p_time);
         virtual void Abort(uint64 e_time);
     private:
@@ -152,7 +129,6 @@ class BGQueueInviteEvent : public BasicEvent
         BattleGroundTypeId m_BgTypeId;
         uint32 m_RemoveTime;
 };
-
 /*
     This class is used to remove player from BG queue after 1 minute 20 seconds from first invitation
     We must store removeInvite time in case player left queue and joined and is invited again
@@ -164,9 +140,7 @@ class BGQueueRemoveEvent : public BasicEvent
         BGQueueRemoveEvent(const uint64& pl_guid, uint32 bgInstanceGUID, BattleGroundTypeId BgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 removeTime)
             : m_PlayerGuid(pl_guid), m_BgInstanceGUID(bgInstanceGUID), m_RemoveTime(removeTime), m_BgTypeId(BgTypeId), m_BgQueueTypeId(bgQueueTypeId)
         {}
-
         virtual ~BGQueueRemoveEvent() {}
-
         virtual bool Execute(uint64 e_time, uint32 p_time);
         virtual void Abort(uint64 e_time);
     private:
@@ -176,7 +150,6 @@ class BGQueueRemoveEvent : public BasicEvent
         BattleGroundTypeId m_BgTypeId;
         BattleGroundQueueTypeId m_BgQueueTypeId;
 };
-
 class BattleGroundMgr
 {
     public:
@@ -184,7 +157,6 @@ class BattleGroundMgr
         BattleGroundMgr();
         ~BattleGroundMgr();
         void Update(uint32 diff);
-
         /* Packet Building */
         void BuildPlayerJoinedBattleGroundPacket(WorldPacket *data, Player *plr);
         void BuildPlayerLeftBattleGroundPacket(WorldPacket *data, const uint64& guid);
@@ -195,41 +167,30 @@ class BattleGroundMgr
         void BuildBattleGroundStatusPacket(WorldPacket *data, BattleGround *bg, uint8 QueueSlot, uint8 StatusID, uint32 Time1, uint32 Time2, uint8 arenatype);
         void BuildPlaySoundPacket(WorldPacket *data, uint32 soundid);
         void SendAreaSpiritHealerQueryOpcode(Player *pl, BattleGround *bg, const uint64& guid);
-
         /* Battlegrounds */
         BattleGround* GetBattleGroundThroughClientInstance(uint32 instanceId, BattleGroundTypeId bgTypeId);
         BattleGround* GetBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId); //there must be uint32 because MAX_BATTLEGROUND_TYPE_ID means unknown
-
         BattleGround* GetBattleGroundTemplate(BattleGroundTypeId bgTypeId);
         BattleGround* CreateNewBattleGround(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id, uint8 arenaType, bool isRated);
-
         uint32 CreateBattleGround(BattleGroundTypeId bgTypeId, bool IsArena, uint32 MinPlayersPerTeam, uint32 MaxPlayersPerTeam, uint32 LevelMin, uint32 LevelMax, char* BattleGroundName, uint32 MapID, float Team1StartLocX, float Team1StartLocY, float Team1StartLocZ, float Team1StartLocO, float Team2StartLocX, float Team2StartLocY, float Team2StartLocZ, float Team2StartLocO);
-
         void AddBattleGround(uint32 InstanceID, BattleGroundTypeId bgTypeId, BattleGround* BG) { m_BattleGrounds[bgTypeId][InstanceID] = BG; };
         void RemoveBattleGround(uint32 instanceID, BattleGroundTypeId bgTypeId) { m_BattleGrounds[bgTypeId].erase(instanceID); }
         uint32 CreateClientVisibleInstanceId(BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id);
-
         void CreateInitialBattleGrounds();
         void DeleteAllBattleGrounds();
-
         void SendToBattleGround(Player *pl, uint32 InstanceID, BattleGroundTypeId bgTypeId);
-
         /* Battleground queues */
         //these queues are instantiated when creating BattlegroundMrg
         BattleGroundQueue m_BattleGroundQueues[MAX_BATTLEGROUND_QUEUE_TYPES]; // public, because we need to access them in BG handler code
-
         BGFreeSlotQueueType BGFreeSlotQueue[MAX_BATTLEGROUND_TYPE_ID];
-
         void ScheduleQueueUpdate(BattleGroundQueueTypeId bgQueueTypeId, BattleGroundTypeId bgTypeId, BGQueueIdBasedOnLevel queue_id);
         uint32 GetMaxRatingDifference() const;
         uint32 GetRatingDiscardTimer()  const;
         uint32 GetPrematureFinishTime() const;
-
         void InitAutomaticArenaPointDistribution();
         void DistributeArenaPoints();
         void ToggleArenaTesting();
         void ToggleTesting();
-
         void SetHolidayWeekends(uint32 mask);
         void LoadBattleMastersEntry();
         BattleGroundTypeId GetBattleMasterBG(uint32 entry) const
@@ -239,20 +200,16 @@ class BattleGroundMgr
                 return itr->second;
             return BATTLEGROUND_WS;
         }
-
         bool isArenaTesting() const { return m_ArenaTesting; }
         bool isTesting() const { return m_Testing; }
-
         static bool IsArenaType(BattleGroundTypeId bgTypeId);
         static bool IsBattleGroundType(BattleGroundTypeId bgTypeId) { return !BattleGroundMgr::IsArenaType(bgTypeId); }
         static BattleGroundQueueTypeId BGQueueTypeId(BattleGroundTypeId bgTypeId, uint8 arenaType);
         static BattleGroundTypeId BGTemplateId(BattleGroundQueueTypeId bgQueueTypeId);
         static uint8 BGArenaType(BattleGroundQueueTypeId bgQueueTypeId);
-
         static bool IsBGWeekend(BattleGroundTypeId bgTypeId);
     private:
         BattleMastersMap    mBattleMastersMap;
-
         /* Battlegrounds */
         BattleGroundSet m_BattleGrounds[MAX_BATTLEGROUND_TYPE_ID];
         std::vector<uint32>m_QueueUpdateScheduler;
@@ -263,7 +220,6 @@ class BattleGroundMgr
         bool   m_ArenaTesting;
         bool   m_Testing;
 };
-
 #define sBattleGroundMgr Trinity::Singleton<BattleGroundMgr>::Instance()
 #endif
 
diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp
index 92e71c1c283..b9f85117f1a 100644
--- a/src/game/BattleGroundNA.cpp
+++ b/src/game/BattleGroundNA.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
 #include "Language.h"
@@ -25,11 +24,9 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "WorldPacket.h"
-
 BattleGroundNA::BattleGroundNA()
 {
     m_BgObjects.resize(BG_NA_OBJECT_MAX);
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -40,90 +37,69 @@ BattleGroundNA::BattleGroundNA()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundNA::~BattleGroundNA()
 {
-
 }
-
 void BattleGroundNA::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     /*if (GetStatus() == STATUS_IN_PROGRESS)
     {
         // update something
     }*/
 }
-
 void BattleGroundNA::StartingEventCloseDoors()
 {
     for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_4; ++i)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
 }
-
 void BattleGroundNA::StartingEventOpenDoors()
 {
     for(uint32 i = BG_NA_OBJECT_DOOR_1; i <= BG_NA_OBJECT_DOOR_2; ++i)
         DoorOpen(i);
-
     for(uint32 i = BG_NA_OBJECT_BUFF_1; i <= BG_NA_OBJECT_BUFF_2; ++i)
         SpawnBGObject(i, 60);
 }
-
 void BattleGroundNA::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundNAScore* sc = new BattleGroundNAScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
-
     UpdateWorldState(0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xa10, GetAlivePlayersCountByTeam(HORDE));
 }
-
 void BattleGroundNA::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
 {
     if (GetStatus() == STATUS_WAIT_LEAVE)
         return;
-
     UpdateWorldState(0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xa10, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 void BattleGroundNA::HandleKillPlayer(Player *player, Player *killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     if (!killer)
     {
         sLog.outError("BattleGroundNA: Killer player not found");
         return;
     }
-
     BattleGround::HandleKillPlayer(player,killer);
-
     UpdateWorldState(0xa0f, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xa10, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 bool BattleGroundNA::HandlePlayerUnderMap(Player *player)
 {
     player->TeleportTo(GetMapId(),4055.504395,2919.660645,13.611241,player->GetOrientation(),false);
     return true;
 }
-
 void BattleGroundNA::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     //uint32 SpellId = 0;
     //uint64 buff_guid = 0;
     switch(Trigger)
@@ -136,24 +112,20 @@ void BattleGroundNA::HandleAreaTrigger(Player *Source, uint32 Trigger)
             Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
             break;
     }
-
     //if (buff_guid)
     //    HandleTriggerBuff(buff_guid,Source);
 }
-
 void BattleGroundNA::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(0xa0f) << uint32(GetAlivePlayersCountByTeam(ALLIANCE));           // 7
     data << uint32(0xa10) << uint32(GetAlivePlayersCountByTeam(HORDE));           // 8
     data << uint32(0xa11) << uint32(1);           // 9
 }
-
 void BattleGroundNA::Reset()
 {
     //call parent's class reset
     BattleGround::Reset();
 }
-
 bool BattleGroundNA::SetupBattleGround()
 {
     // gates
@@ -168,10 +140,8 @@ bool BattleGroundNA::SetupBattleGround()
         sLog.outErrorDb("BatteGroundNA: Failed to spawn some object!");
         return false;
     }
-
     return true;
 }
-
 /*
 20:12:14 id:036668 [S2C] SMSG_INIT_WORLD_STATES (706 = 0x02C2) len: 86
 0000: 2f 02 00 00 72 0e 00 00 00 00 00 00 09 00 11 0a  |  /...r...........
diff --git a/src/game/BattleGroundNA.h b/src/game/BattleGroundNA.h
index 56e2cf373c4..00d2e554d7e 100644
--- a/src/game/BattleGroundNA.h
+++ b/src/game/BattleGroundNA.h
@@ -19,9 +19,7 @@
  */
 #ifndef __BATTLEGROUNDNA_H
 #define __BATTLEGROUNDNA_H
-
 class BattleGround;
-
 enum BattleGroundNAObjectTypes
 {
     BG_NA_OBJECT_DOOR_1         = 0,
@@ -32,7 +30,6 @@ enum BattleGroundNAObjectTypes
     BG_NA_OBJECT_BUFF_2         = 5,
     BG_NA_OBJECT_MAX            = 6
 };
-
 enum BattleGroundNAObjects
 {
     BG_NA_OBJECT_TYPE_DOOR_1    = 183978,
@@ -42,7 +39,6 @@ enum BattleGroundNAObjects
     BG_NA_OBJECT_TYPE_BUFF_1    = 184663,
     BG_NA_OBJECT_TYPE_BUFF_2    = 184664
 };
-
 class BattleGroundNAScore : public BattleGroundScore
 {
     public:
@@ -50,21 +46,17 @@ class BattleGroundNAScore : public BattleGroundScore
         virtual ~BattleGroundNAScore() {};
         //TODO fix me
 };
-
 class BattleGroundNA : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundNA();
         ~BattleGroundNA();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp
index b9f9943bbf2..c4ca4b1b66f 100644
--- a/src/game/BattleGroundRL.cpp
+++ b/src/game/BattleGroundRL.cpp
@@ -18,7 +18,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
 #include "Language.h"
@@ -26,11 +25,9 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "WorldPacket.h"
-
 BattleGroundRL::BattleGroundRL()
 {
     m_BgObjects.resize(BG_RL_OBJECT_MAX);
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -41,91 +38,70 @@ BattleGroundRL::BattleGroundRL()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundRL::~BattleGroundRL()
 {
-
 }
-
 void BattleGroundRL::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     /*if (GetStatus() == STATUS_IN_PROGRESS)
     {
         // update something
     }*/
 }
-
 void BattleGroundRL::StartingEventCloseDoors()
 {
     for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; ++i)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
 }
-
 void BattleGroundRL::StartingEventOpenDoors()
 {
     for(uint32 i = BG_RL_OBJECT_DOOR_1; i <= BG_RL_OBJECT_DOOR_2; ++i)
         DoorOpen(i);
-
     for(uint32 i = BG_RL_OBJECT_BUFF_1; i <= BG_RL_OBJECT_BUFF_2; ++i)
         SpawnBGObject(i, 60);
 }
-
 void BattleGroundRL::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundRLScore* sc = new BattleGroundRLScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
-
     UpdateWorldState(0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xbb9, GetAlivePlayersCountByTeam(HORDE));
 }
-
 void BattleGroundRL::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
 {
     if (GetStatus() == STATUS_WAIT_LEAVE)
         return;
-
     UpdateWorldState(0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xbb9, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 void BattleGroundRL::HandleKillPlayer(Player *player, Player *killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     if (!killer)
     {
         sLog.outError("Killer player not found");
         return;
     }
-
     BattleGround::HandleKillPlayer(player,killer);
-
     UpdateWorldState(0xbb8, GetAlivePlayersCountByTeam(ALLIANCE));
     UpdateWorldState(0xbb9, GetAlivePlayersCountByTeam(HORDE));
-
     CheckArenaWinConditions();
 }
-
 bool BattleGroundRL::HandlePlayerUnderMap(Player *player)
 {
     player->TeleportTo(GetMapId(),1285.810547,1667.896851,39.957642,player->GetOrientation(),false);
     return true;
 }
-
 void BattleGroundRL::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     //uint32 SpellId = 0;
     //uint64 buff_guid = 0;
     switch(Trigger)
@@ -138,24 +114,20 @@ void BattleGroundRL::HandleAreaTrigger(Player *Source, uint32 Trigger)
             Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
             break;
     }
-
     //if (buff_guid)
     //    HandleTriggerBuff(buff_guid,Source);
 }
-
 void BattleGroundRL::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(0xbb8) << uint32(GetAlivePlayersCountByTeam(ALLIANCE));           // 7
     data << uint32(0xbb9) << uint32(GetAlivePlayersCountByTeam(HORDE));           // 8
     data << uint32(0xbba) << uint32(1);           // 9
 }
-
 void BattleGroundRL::Reset()
 {
     //call parent's reset
     BattleGround::Reset();
 }
-
 bool BattleGroundRL::SetupBattleGround()
 {
     // gates
@@ -168,10 +140,8 @@ bool BattleGroundRL::SetupBattleGround()
         sLog.outErrorDb("BatteGroundRL: Failed to spawn some object!");
         return false;
     }
-
     return true;
 }
-
 /*
 Packet S->C, id 600, SMSG_INIT_WORLD_STATES (706), len 86
 0000: 3C 02 00 00 80 0F 00 00 00 00 00 00 09 00 BA 0B | <...............
diff --git a/src/game/BattleGroundRL.h b/src/game/BattleGroundRL.h
index 772c9dd0879..7fb7ef60c2d 100644
--- a/src/game/BattleGroundRL.h
+++ b/src/game/BattleGroundRL.h
@@ -19,9 +19,7 @@
  */
 #ifndef __BATTLEGROUNDRL_H
 #define __BATTLEGROUNDRL_H
-
 class BattleGround;
-
 enum BattleGroundRLObjectTypes
 {
     BG_RL_OBJECT_DOOR_1         = 0,
@@ -30,7 +28,6 @@ enum BattleGroundRLObjectTypes
     BG_RL_OBJECT_BUFF_2         = 3,
     BG_RL_OBJECT_MAX            = 4
 };
-
 enum BattleGroundRLObjects
 {
     BG_RL_OBJECT_TYPE_DOOR_1    = 185918,
@@ -38,7 +35,6 @@ enum BattleGroundRLObjects
     BG_RL_OBJECT_TYPE_BUFF_1    = 184663,
     BG_RL_OBJECT_TYPE_BUFF_2    = 184664
 };
-
 class BattleGroundRLScore : public BattleGroundScore
 {
     public:
@@ -46,23 +42,19 @@ class BattleGroundRLScore : public BattleGroundScore
         virtual ~BattleGroundRLScore() {};
         //TODO fix me
 };
-
 class BattleGroundRL : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundRL();
         ~BattleGroundRL();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void Reset();
         virtual void FillInitialWorldStates(WorldPacket &d);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp
index 54070961018..a0fc8377eaf 100644
--- a/src/game/BattleGroundRV.cpp
+++ b/src/game/BattleGroundRV.cpp
@@ -15,15 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "Language.h"
 #include "Player.h"
-
 BattleGroundRV::BattleGroundRV()
 {
-
     m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
     m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
     m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -34,47 +31,36 @@ BattleGroundRV::BattleGroundRV()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_ARENA_FIFTEEN_SECONDS;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
-
 BattleGroundRV::~BattleGroundRV()
 {
-
 }
-
 void BattleGroundRV::Update(uint32 diff)
 {
     BattleGround::Update(diff);
 }
-
 void BattleGroundRV::StartingEventCloseDoors()
 {
 }
-
 void BattleGroundRV::StartingEventOpenDoors()
 {
 }
-
 void BattleGroundRV::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundRVScore* sc = new BattleGroundRVScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundRV::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
 {
 }
-
 void BattleGroundRV::HandleKillPlayer(Player* player, Player* killer)
 {
     BattleGround::HandleKillPlayer(player, killer);
 }
-
 void BattleGroundRV::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
 {
 }
-
 bool BattleGroundRV::SetupBattleGround()
 {
     return true;
diff --git a/src/game/BattleGroundRV.h b/src/game/BattleGroundRV.h
index e3e94baf101..4cfa8940bc3 100644
--- a/src/game/BattleGroundRV.h
+++ b/src/game/BattleGroundRV.h
@@ -17,9 +17,7 @@
  */
 #ifndef __BATTLEGROUNDRV_H
 #define __BATTLEGROUNDRV_H
-
 class BattleGround;
-
 class BattleGroundRVScore : public BattleGroundScore
 {
     public:
@@ -27,21 +25,17 @@ class BattleGroundRVScore : public BattleGroundScore
         virtual ~BattleGroundRVScore() {};
         //TODO fix me
 };
-
 class BattleGroundRV : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundRV();
         ~BattleGroundRV();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         bool SetupBattleGround();
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp
index acf16ad3af0..ce5688b7706 100644
--- a/src/game/BattleGroundSA.cpp
+++ b/src/game/BattleGroundSA.cpp
@@ -15,12 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
 #include "Language.h"
 #include "Player.h"
-
 BattleGroundSA::BattleGroundSA()
 {
     //TODO FIX ME!
@@ -29,52 +27,39 @@ BattleGroundSA::BattleGroundSA()
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
 }
-
 BattleGroundSA::~BattleGroundSA()
 {
-
 }
-
 void BattleGroundSA::Update(uint32 diff)
 {
     BattleGround::Update(diff);
 }
-
 void BattleGroundSA::StartingEventCloseDoors()
 {
 }
-
 void BattleGroundSA::StartingEventOpenDoors()
 {
 }
-
 void BattleGroundSA::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundSAScore* sc = new BattleGroundSAScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundSA::RemovePlayer(Player* /*plr*/,uint64 /*guid*/)
 {
-
 }
-
 void BattleGroundSA::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
 }
-
 void BattleGroundSA::UpdatePlayerScore(Player* Source, uint32 type, uint32 value)
 {
-
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if(itr == m_PlayerScores.end())                         // player not found...
         return;
-
     BattleGround::UpdatePlayerScore(Source,type,value);
 }
diff --git a/src/game/BattleGroundSA.h b/src/game/BattleGroundSA.h
index 3ba23d02656..81b87b6e3e7 100644
--- a/src/game/BattleGroundSA.h
+++ b/src/game/BattleGroundSA.h
@@ -15,40 +15,31 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __BATTLEGROUNDSA_H
 #define __BATTLEGROUNDSA_H
-
 class BattleGround;
-
 class BattleGroundSAScore : public BattleGroundScore
 {
     public:
         BattleGroundSAScore() {};
         virtual ~BattleGroundSAScore() {};
 };
-
 class BattleGroundSA : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         BattleGroundSA();
         ~BattleGroundSA();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         void RemovePlayer(Player *plr,uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         //bool SetupBattleGround();
-
         /* Scorekeeping */
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
-
     private:
 };
 #endif
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
index ec19308e71f..5edae297872 100644
--- a/src/game/BattleGroundWS.cpp
+++ b/src/game/BattleGroundWS.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
 #include "Creature.h"
@@ -29,7 +28,6 @@
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"
-
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
 {
@@ -38,42 +36,34 @@ enum BG_WSG_Rewards
     BG_WSG_MAP_COMPLETE,
     BG_WSG_REWARD_NUM
 };
-
 uint32 BG_WSG_Honor[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = {
     {20,40,40}, // normal honor
     {60,40,80}  // holiday
 };
-
 uint32 BG_WSG_Reputation[BG_HONOR_MODE_NUM][BG_WSG_REWARD_NUM] = {
     {0,35,0}, // normal honor
     {0,45,0}  // holiday
 };
-
 BattleGroundWS::BattleGroundWS()
 {
     m_BgObjects.resize(BG_WS_OBJECT_MAX);
     m_BgCreatures.resize(BG_CREATURES_MAX_WS);
-
     m_StartMessageIds[BG_STARTING_EVENT_FIRST]  = LANG_BG_WS_START_TWO_MINUTES;
     m_StartMessageIds[BG_STARTING_EVENT_SECOND] = LANG_BG_WS_START_ONE_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_THIRD]  = LANG_BG_WS_START_HALF_MINUTE;
     m_StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_BG_WS_HAS_BEGUN;
 }
-
 BattleGroundWS::~BattleGroundWS()
 {
 }
-
 void BattleGroundWS::Update(uint32 diff)
 {
     BattleGround::Update(diff);
-
     if (GetStatus() == STATUS_IN_PROGRESS)
     {
         if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
         {
             m_FlagsTimer[BG_TEAM_ALLIANCE] -= diff;
-
             if (m_FlagsTimer[BG_TEAM_ALLIANCE] < 0)
             {
                 m_FlagsTimer[BG_TEAM_ALLIANCE] = 0;
@@ -83,7 +73,6 @@ void BattleGroundWS::Update(uint32 diff)
         if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
         {
             m_FlagsDropTimer[BG_TEAM_ALLIANCE] -= diff;
-
             if (m_FlagsDropTimer[BG_TEAM_ALLIANCE] < 0)
             {
                 m_FlagsDropTimer[BG_TEAM_ALLIANCE] = 0;
@@ -94,7 +83,6 @@ void BattleGroundWS::Update(uint32 diff)
         if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_WAIT_RESPAWN)
         {
             m_FlagsTimer[BG_TEAM_HORDE] -= diff;
-
             if (m_FlagsTimer[BG_TEAM_HORDE] < 0)
             {
                 m_FlagsTimer[BG_TEAM_HORDE] = 0;
@@ -104,7 +92,6 @@ void BattleGroundWS::Update(uint32 diff)
         if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
         {
             m_FlagsDropTimer[BG_TEAM_HORDE] -= diff;
-
             if (m_FlagsDropTimer[BG_TEAM_HORDE] < 0)
             {
                 m_FlagsDropTimer[BG_TEAM_HORDE] = 0;
@@ -145,7 +132,6 @@ void BattleGroundWS::Update(uint32 diff)
         }
     }
 }
-
 void BattleGroundWS::StartingEventCloseDoors()
 {
     for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_H_4; ++i)
@@ -156,32 +142,26 @@ void BattleGroundWS::StartingEventCloseDoors()
     for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; ++i)
         SpawnBGObject(i, RESPAWN_ONE_DAY);
 }
-
 void BattleGroundWS::StartingEventOpenDoors()
 {
     for(uint32 i = BG_WS_OBJECT_DOOR_A_1; i <= BG_WS_OBJECT_DOOR_A_4; ++i)
         DoorOpen(i);
     for(uint32 i = BG_WS_OBJECT_DOOR_H_1; i <= BG_WS_OBJECT_DOOR_H_2; ++i)
         DoorOpen(i);
-
     SpawnBGObject(BG_WS_OBJECT_DOOR_A_5, RESPAWN_ONE_DAY);
     SpawnBGObject(BG_WS_OBJECT_DOOR_A_6, RESPAWN_ONE_DAY);
     SpawnBGObject(BG_WS_OBJECT_DOOR_H_3, RESPAWN_ONE_DAY);
     SpawnBGObject(BG_WS_OBJECT_DOOR_H_4, RESPAWN_ONE_DAY);
-
     for(uint32 i = BG_WS_OBJECT_A_FLAG; i <= BG_WS_OBJECT_BERSERKBUFF_2; ++i)
         SpawnBGObject(i, RESPAWN_IMMEDIATELY);
 }
-
 void BattleGroundWS::AddPlayer(Player *plr)
 {
     BattleGround::AddPlayer(plr);
     //create score and add it to map, default values are set in constructor
     BattleGroundWGScore* sc = new BattleGroundWGScore;
-
     m_PlayerScores[plr->GetGUID()] = sc;
 }
-
 void BattleGroundWS::RespawnFlag(uint32 Team, bool captured)
 {
     if (Team == ALLIANCE)
@@ -194,7 +174,6 @@ void BattleGroundWS::RespawnFlag(uint32 Team, bool captured)
         sLog.outDebug("Respawn Horde flag");
         m_FlagState[BG_TEAM_HORDE] = BG_WS_FLAG_STATE_ON_BASE;
     }
-
     if (captured)
     {
         //when map_update will be allowed for battlegrounds this code will be useless
@@ -205,12 +184,10 @@ void BattleGroundWS::RespawnFlag(uint32 Team, bool captured)
     }
     m_BothFlagsKept = false;
 }
-
 void BattleGroundWS::RespawnFlagAfterDrop(uint32 team)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     RespawnFlag(team,false);
     if (team == ALLIANCE)
     {
@@ -222,26 +199,20 @@ void BattleGroundWS::RespawnFlagAfterDrop(uint32 team)
         SpawnBGObject(BG_WS_OBJECT_H_FLAG, RESPAWN_IMMEDIATELY);
         SendMessageToAll(LANG_BG_WS_HORDE_FLAG_RESPAWNED, CHAT_MSG_BG_SYSTEM_NEUTRAL);
     }
-
     PlaySoundToAll(BG_WS_SOUND_FLAGS_RESPAWNED);
-
     GameObject *obj = HashMapHolder<GameObject>::Find(GetDroppedFlagGUID(team));
     if (obj)
         obj->Delete();
     else
         sLog.outError("unknown droped flag bg, guid: %u",GUID_LOPART(GetDroppedFlagGUID(team)));
-
     SetDroppedFlagGUID(0,team);
     m_BothFlagsKept = false;
 }
-
 void BattleGroundWS::EventPlayerCapturedFlag(Player *Source)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     uint32 winner = 0;
-
     Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
     if (Source->GetTeam() == ALLIANCE)
     {
@@ -281,33 +252,26 @@ void BattleGroundWS::EventPlayerCapturedFlag(Player *Source)
     }
     //for flag capture is reward 2 honorable kills
     RewardHonorToTeam(GetBonusHonorFromKill(2), Source->GetTeam());
-
     SpawnBGObject(BG_WS_OBJECT_H_FLAG, BG_WS_FLAG_RESPAWN_TIME);
     SpawnBGObject(BG_WS_OBJECT_A_FLAG, BG_WS_FLAG_RESPAWN_TIME);
-
     if (Source->GetTeam() == ALLIANCE)
         SendMessageToAll(LANG_BG_WS_CAPTURED_HF, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
     else
         SendMessageToAll(LANG_BG_WS_CAPTURED_AF, CHAT_MSG_BG_SYSTEM_HORDE, Source);
-
     UpdateFlagState(Source->GetTeam(), 1);                  // flag state none
     UpdateTeamScore(Source->GetTeam());
     // only flag capture should be updated
     UpdatePlayerScore(Source, SCORE_FLAG_CAPTURES, 1);      // +1 flag captures
-
     if (GetTeamScore(ALLIANCE) == BG_WS_MAX_TEAM_SCORE)
         winner = ALLIANCE;
-
     if (GetTeamScore(HORDE) == BG_WS_MAX_TEAM_SCORE)
         winner = HORDE;
-
     if (winner)
     {
         UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, 0);
         UpdateWorldState(BG_WS_FLAG_UNK_HORDE, 0);
         UpdateWorldState(BG_WS_FLAG_STATE_ALLIANCE, 1);
         UpdateWorldState(BG_WS_FLAG_STATE_HORDE, 1);
-
         RewardHonorToTeam(BG_WSG_Honor[m_HonorMode][BG_WSG_WIN], winner);
         EndBattleGround(winner);
     }
@@ -316,7 +280,6 @@ void BattleGroundWS::EventPlayerCapturedFlag(Player *Source)
         m_FlagsTimer[GetTeamIndexByTeamId(Source->GetTeam()) ? 0 : 1] = BG_WS_FLAG_RESPAWN_TIME;
     }
 }
-
 void BattleGroundWS::EventPlayerDroppedFlag(Player *Source)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
@@ -345,9 +308,7 @@ void BattleGroundWS::EventPlayerDroppedFlag(Player *Source)
         }
         return;
     }
-
     bool set = false;
-
     if (Source->GetTeam() == ALLIANCE)
     {
         if (!IsHordeFlagPickedup())
@@ -382,12 +343,10 @@ void BattleGroundWS::EventPlayerDroppedFlag(Player *Source)
             set = true;
         }
     }
-
     if (set)
     {
         Source->CastSpell(Source, SPELL_RECENTLY_DROPPED_FLAG, true);
         UpdateFlagState(Source->GetTeam(), 1);
-
         if (Source->GetTeam() == ALLIANCE)
         {
             SendMessageToAll(LANG_BG_WS_DROPPED_HF, CHAT_MSG_BG_SYSTEM_HORDE, Source);
@@ -398,19 +357,15 @@ void BattleGroundWS::EventPlayerDroppedFlag(Player *Source)
             SendMessageToAll(LANG_BG_WS_DROPPED_AF, CHAT_MSG_BG_SYSTEM_ALLIANCE, Source);
             UpdateWorldState(BG_WS_FLAG_UNK_ALLIANCE, uint32(-1));
         }
-
         m_FlagsDropTimer[GetTeamIndexByTeamId(Source->GetTeam()) ? 0 : 1] = BG_WS_FLAG_DROP_TIME;
     }
 }
-
 void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     int32 message_id = 0;
     ChatMsg type;
-
     //alliance flag picked up from base
     if(Source->GetTeam() == HORDE && this->GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_BASE
         && this->m_BgObjects[BG_WS_OBJECT_A_FLAG] == target_obj->GetGUID())
@@ -428,7 +383,6 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target
         if(m_FlagState[1] == BG_WS_FLAG_STATE_ON_PLAYER)
           m_BothFlagsKept = true;
     }
-
     //horde flag picked up from base
     if (Source->GetTeam() == ALLIANCE && this->GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_BASE
         && this->m_BgObjects[BG_WS_OBJECT_H_FLAG] == target_obj->GetGUID())
@@ -446,7 +400,6 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target
         if(m_FlagState[0] == BG_WS_FLAG_STATE_ON_PLAYER)
           m_BothFlagsKept = true;
     }
-
     //Alliance flag on ground(not in base) (returned or picked up again from ground!)
     if (GetFlagState(ALLIANCE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10))
     {
@@ -480,7 +433,6 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target
         //called in HandleGameObjectUseOpcode:
         //target_obj->Delete();
     }
-
     //Horde flag on ground(not in base) (returned or picked up again)
     if (GetFlagState(HORDE) == BG_WS_FLAG_STATE_ON_GROUND && Source->IsWithinDistInMap(target_obj, 10))
     {
@@ -514,14 +466,11 @@ void BattleGroundWS::EventPlayerClickedOnFlag(Player *Source, GameObject* target
         //called in HandleGameObjectUseOpcode:
         //target_obj->Delete();
     }
-
     if (!message_id)
         return;
-
     SendMessageToAll(message_id, type, Source);
     Source->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
 }
-
 void BattleGroundWS::RemovePlayer(Player *plr, uint64 guid)
 {
     // sometimes flag aura not removed :(
@@ -548,7 +497,6 @@ void BattleGroundWS::RemovePlayer(Player *plr, uint64 guid)
             this->EventPlayerDroppedFlag(plr);
     }
 }
-
 void BattleGroundWS::UpdateFlagState(uint32 team, uint32 value)
 {
     if (team == ALLIANCE)
@@ -556,7 +504,6 @@ void BattleGroundWS::UpdateFlagState(uint32 team, uint32 value)
     else
         UpdateWorldState(BG_WS_FLAG_STATE_HORDE, value);
 }
-
 void BattleGroundWS::UpdateTeamScore(uint32 team)
 {
     if (team == ALLIANCE)
@@ -564,13 +511,11 @@ void BattleGroundWS::UpdateTeamScore(uint32 team)
     else
         UpdateWorldState(BG_WS_FLAG_CAPTURES_HORDE, GetTeamScore(team));
 }
-
 void BattleGroundWS::HandleAreaTrigger(Player *Source, uint32 Trigger)
 {
     // this is wrong way to implement these things. On official it done by gameobject spell cast.
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     //uint32 SpellId = 0;
     //uint64 buff_guid = 0;
     switch(Trigger)
@@ -613,11 +558,9 @@ void BattleGroundWS::HandleAreaTrigger(Player *Source, uint32 Trigger)
             Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
             break;
     }
-
     //if (buff_guid)
     //    HandleTriggerBuff(buff_guid,Source);
 }
-
 bool BattleGroundWS::SetupBattleGround()
 {
     // flags
@@ -647,31 +590,25 @@ bool BattleGroundWS::SetupBattleGround()
         sLog.outErrorDb("BatteGroundWS: Failed to spawn some object BattleGround not created!");
         return false;
     }
-
     WorldSafeLocsEntry const *sg = sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_ALLIANCE);
     if (!sg || !AddSpiritGuide(WS_SPIRIT_MAIN_ALLIANCE, sg->x, sg->y, sg->z, 3.124139f, ALLIANCE))
     {
         sLog.outErrorDb("BatteGroundWS: Failed to spawn Alliance spirit guide! BattleGround not created!");
         return false;
     }
-
     sg = sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_MAIN_HORDE);
     if (!sg || !AddSpiritGuide(WS_SPIRIT_MAIN_HORDE, sg->x, sg->y, sg->z, 3.193953f, HORDE))
     {
         sLog.outErrorDb("BatteGroundWS: Failed to spawn Horde spirit guide! BattleGround not created!");
         return false;
     }
-
     sLog.outDebug("BatteGroundWS: BG objects and spirit guides spawned");
-
     return true;
 }
-
 void BattleGroundWS::Reset()
 {
     //call parent's class reset
     BattleGround::Reset();
-
     m_FlagKeepers[BG_TEAM_ALLIANCE]     = 0;
     m_FlagKeepers[BG_TEAM_HORDE]        = 0;
     m_DroppedFlagGUID[BG_TEAM_ALLIANCE] = 0;
@@ -684,7 +621,6 @@ void BattleGroundWS::Reset()
     m_ReputationCapture = (isBGWeekend) ? 45 : 35;
     m_HonorWinKills = (isBGWeekend) ? 3 : 1;
     m_HonorEndKills = (isBGWeekend) ? 4 : 2;
-
     /* Spirit nodes is static at this BG and then not required deleting at BG reset.
     if (m_BgCreatures[WS_SPIRIT_MAIN_ALLIANCE])
         DelCreature(WS_SPIRIT_MAIN_ALLIANCE);
@@ -692,7 +628,6 @@ void BattleGroundWS::Reset()
         DelCreature(WS_SPIRIT_MAIN_HORDE);
     */
 }
-
 void BattleGroundWS::EndBattleGround(uint32 winner)
 {
     //win reward
@@ -703,27 +638,20 @@ void BattleGroundWS::EndBattleGround(uint32 winner)
     //complete map_end rewards (even if no team wins)
     RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), ALLIANCE);
     RewardHonorToTeam(GetBonusHonorFromKill(m_HonorEndKills), HORDE);
-
     BattleGround::EndBattleGround(winner);
 }
-
 void BattleGroundWS::HandleKillPlayer(Player *player, Player *killer)
 {
     if (GetStatus() != STATUS_IN_PROGRESS)
         return;
-
     EventPlayerDroppedFlag(player);
-
     BattleGround::HandleKillPlayer(player, killer);
 }
-
 void BattleGroundWS::UpdatePlayerScore(Player *Source, uint32 type, uint32 value)
 {
-
     BattleGroundScoreMap::iterator itr = m_PlayerScores.find(Source->GetGUID());
     if(itr == m_PlayerScores.end())                         // player not found
         return;
-
     switch(type)
     {
         case SCORE_FLAG_CAPTURES:                           // flags captured
@@ -737,7 +665,6 @@ void BattleGroundWS::UpdatePlayerScore(Player *Source, uint32 type, uint32 value
             break;
     }
 }
-
 WorldSafeLocsEntry const* BattleGroundWS::GetClosestGraveYard(Player* player)
 {
     //if status in progress, it returns main graveyards with spiritguides
@@ -760,37 +687,30 @@ WorldSafeLocsEntry const* BattleGroundWS::GetClosestGraveYard(Player* player)
             return sWorldSafeLocsStore.LookupEntry(WS_GRAVEYARD_FLAGROOM_HORDE);
     }
 }
-
 void BattleGroundWS::FillInitialWorldStates(WorldPacket& data)
 {
     data << uint32(BG_WS_FLAG_CAPTURES_ALLIANCE) << uint32(GetTeamScore(ALLIANCE));
     data << uint32(BG_WS_FLAG_CAPTURES_HORDE) << uint32(GetTeamScore(HORDE));
-
     if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_GROUND)
         data << uint32(BG_WS_FLAG_UNK_ALLIANCE) << uint32(-1);
     else if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
         data << uint32(BG_WS_FLAG_UNK_ALLIANCE) << uint32(1);
     else
         data << uint32(BG_WS_FLAG_UNK_ALLIANCE) << uint32(0);
-
     if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_GROUND)
         data << uint32(BG_WS_FLAG_UNK_HORDE) << uint32(-1);
     else if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
         data << uint32(BG_WS_FLAG_UNK_HORDE) << uint32(1);
     else
         data << uint32(BG_WS_FLAG_UNK_HORDE) << uint32(0);
-
     data << uint32(BG_WS_FLAG_CAPTURES_MAX) << uint32(BG_WS_MAX_TEAM_SCORE);
-
     if (m_FlagState[BG_TEAM_HORDE] == BG_WS_FLAG_STATE_ON_PLAYER)
         data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(2);
     else
         data << uint32(BG_WS_FLAG_STATE_ALLIANCE) << uint32(1);
-
     if (m_FlagState[BG_TEAM_ALLIANCE] == BG_WS_FLAG_STATE_ON_PLAYER)
         data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(2);
     else
         data << uint32(BG_WS_FLAG_STATE_HORDE) << uint32(1);
-
 }
 
diff --git a/src/game/BattleGroundWS.h b/src/game/BattleGroundWS.h
index 16631afecdc..0b616af24b1 100644
--- a/src/game/BattleGroundWS.h
+++ b/src/game/BattleGroundWS.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __BATTLEGROUNDWS_H
 #define __BATTLEGROUNDWS_H
-
 #include "BattleGround.h"
-
 enum BG_WS_TimerOrScore
 {
     BG_WS_MAX_TEAM_SCORE    = 3,
@@ -31,7 +28,6 @@ enum BG_WS_TimerOrScore
     BG_WS_SPELL_FORCE_TIME  = 600000,
     BG_WS_SPELL_BRUTAL_TIME = 900000
 };
-
 enum BG_WS_Sound
 {
     BG_WS_SOUND_FLAG_CAPTURED_ALLIANCE  = 8173,
@@ -42,7 +38,6 @@ enum BG_WS_Sound
     BG_WS_SOUND_ALLIANCE_FLAG_PICKED_UP = 8174,
     BG_WS_SOUND_FLAGS_RESPAWNED         = 8232
 };
-
 enum BG_WS_SpellId
 {
     BG_WS_SPELL_WARSONG_FLAG            = 23333,
@@ -52,7 +47,6 @@ enum BG_WS_SpellId
     BG_WS_SPELL_FOCUSED_ASSAULT         = 46392,
     BG_WS_SPELL_BRUTAL_ASSAULT          = 46393
 };
-
 enum BG_WS_WorldStates
 {
     BG_WS_FLAG_UNK_ALLIANCE       = 1545,
@@ -64,7 +58,6 @@ enum BG_WS_WorldStates
     BG_WS_FLAG_STATE_HORDE        = 2338,
     BG_WS_FLAG_STATE_ALLIANCE     = 2339
 };
-
 enum BG_WS_ObjectTypes
 {
     BG_WS_OBJECT_DOOR_A_1       = 0,
@@ -87,7 +80,6 @@ enum BG_WS_ObjectTypes
     BG_WS_OBJECT_BERSERKBUFF_2  = 17,
     BG_WS_OBJECT_MAX            = 18
 };
-
 enum BG_WS_ObjectEntry
 {
     BG_OBJECT_DOOR_A_1_WS_ENTRY          = 179918,
@@ -105,7 +97,6 @@ enum BG_WS_ObjectEntry
     BG_OBJECT_A_FLAG_GROUND_WS_ENTRY     = 179785,
     BG_OBJECT_H_FLAG_GROUND_WS_ENTRY     = 179786
 };
-
 enum BG_WS_FlagState
 {
     BG_WS_FLAG_STATE_ON_BASE      = 0,
@@ -113,7 +104,6 @@ enum BG_WS_FlagState
     BG_WS_FLAG_STATE_ON_PLAYER    = 2,
     BG_WS_FLAG_STATE_ON_GROUND    = 3
 };
-
 enum BG_WS_Graveyards
 {
     WS_GRAVEYARD_FLAGROOM_ALLIANCE = 769,
@@ -121,21 +111,17 @@ enum BG_WS_Graveyards
     WS_GRAVEYARD_MAIN_ALLIANCE     = 771,
     WS_GRAVEYARD_MAIN_HORDE        = 772
 };
-
 enum BG_WS_CreatureTypes
 {
     WS_SPIRIT_MAIN_ALLIANCE   = 0,
     WS_SPIRIT_MAIN_HORDE      = 1,
-
     BG_CREATURES_MAX_WS       = 2
 };
-
 enum BG_WS_CarrierDebuffs
 {
     WS_SPELL_FOCUSED_ASSAULT   = 46392,
     WS_SPELL_BRUTAL_ASSAULT    = 46393
 };
-
 class BattleGroundWGScore : public BattleGroundScore
 {
     public:
@@ -144,22 +130,18 @@ class BattleGroundWGScore : public BattleGroundScore
         uint32 FlagCaptures;
         uint32 FlagReturns;
 };
-
 class BattleGroundWS : public BattleGround
 {
     friend class BattleGroundMgr;
-
     public:
         /* Construction */
         BattleGroundWS();
         ~BattleGroundWS();
         void Update(uint32 diff);
-
         /* inherited from BattlegroundClass */
         virtual void AddPlayer(Player *plr);
         virtual void StartingEventCloseDoors();
         virtual void StartingEventOpenDoors();
-
         /* BG Flags */
         uint64 GetAllianceFlagPickerGUID() const    { return m_FlagKeepers[BG_TEAM_ALLIANCE]; }
         uint64 GetHordeFlagPickerGUID() const       { return m_FlagKeepers[BG_TEAM_HORDE]; }
@@ -174,12 +156,10 @@ class BattleGroundWS : public BattleGround
         void RemoveTimedAura(uint32 aura);
         bool IsBrutalTimerDone;
         bool IsForceTimerDone;
-
         /* Battleground Events */
         virtual void EventPlayerDroppedFlag(Player *Source);
         virtual void EventPlayerClickedOnFlag(Player *Source, GameObject* target_obj);
         virtual void EventPlayerCapturedFlag(Player *Source);
-
         void RemovePlayer(Player *plr, uint64 guid);
         void HandleAreaTrigger(Player *Source, uint32 Trigger);
         void HandleKillPlayer(Player *player, Player *killer);
@@ -187,14 +167,12 @@ class BattleGroundWS : public BattleGround
         virtual void Reset();
         void EndBattleGround(uint32 winner);
         virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
-
         void UpdateFlagState(uint32 team, uint32 value);
         void UpdateTeamScore(uint32 team);
         void UpdatePlayerScore(Player *Source, uint32 type, uint32 value);
         void SetDroppedFlagGUID(uint64 guid, uint32 TeamID)  { m_DroppedFlagGUID[GetTeamIndexByTeamId(TeamID)] = guid;}
         uint64 GetDroppedFlagGUID(uint32 TeamID)             { return m_DroppedFlagGUID[GetTeamIndexByTeamId(TeamID)];}
         virtual void FillInitialWorldStates(WorldPacket& data);
-
         /* Scorekeeping */
         uint32 GetTeamScore(uint32 TeamID) const            { return m_TeamScores[GetTeamIndexByTeamId(TeamID)]; }
         void AddPoint(uint32 TeamID, uint32 Points = 1)     { m_TeamScores[GetTeamIndexByTeamId(TeamID)] += Points; }
@@ -206,7 +184,6 @@ class BattleGroundWS : public BattleGround
         uint8 m_FlagState[2];                               // for checking flag state
         int32 m_FlagsTimer[2];
         int32 m_FlagsDropTimer[2];
-
         uint32 m_ReputationCapture;
         uint32 m_HonorWinKills;
         uint32 m_HonorEndKills;
diff --git a/src/game/Calendar.h b/src/game/Calendar.h
index 7a86afa7db7..41f75c7aa28 100644
--- a/src/game/Calendar.h
+++ b/src/game/Calendar.h
@@ -15,12 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_CALENDAR_H
 #define MANGOS_CALENDAR_H
-
 class Calendar
 {
-
 };
 #endif
diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp
index 93d3b7eae26..747f2e9f309 100644
--- a/src/game/CalendarHandler.cpp
+++ b/src/game/CalendarHandler.cpp
@@ -15,36 +15,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-
 #include "InstanceSaveMgr.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "Player.h"
-
 void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_GET_CALENDAR");     // empty
-
     time_t cur_time = time(NULL);
-
     WorldPacket data(SMSG_CALENDAR_SEND_CALENDAR,4+4*0+4+4*0+4+4);
-
     // TODO: calendar invite event output
     data << (uint32) 0;                                     //invite node count
     // TODO: calendar event output
     data << (uint32) 0;                                     //event count
-
     data << (uint32) 0;                                     //wtf??
     data << (uint32) secsToTimeBitFields(cur_time);         // current time
-
     uint32 counter = 0;
     size_t p_counter = data.wpos();
     data << uint32(counter);                                // instance save count
-
     for(int i = 0; i < TOTAL_DIFFICULTIES; ++i)
     {
         for (Player::BoundInstancesMap::const_iterator itr = _player->m_boundInstances[i].begin(); itr != _player->m_boundInstances[i].end(); ++itr)
@@ -61,7 +52,6 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data)
         }
     }
     data.put<uint32>(p_counter,counter);
-
     data << (uint32) 1135753200;                            //wtf?? (28.12.2005 12:00)
     data << (uint32) 0;                                     //  unk counter 4
     data << (uint32) 0;                                     // unk counter 5
@@ -69,14 +59,12 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data)
     //data.hexlike();
     SendPacket(&data);
 }
-
 void WorldSession::HandleCalendarGetEvent(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_GET_EVENT");
     recv_data.hexlike();
     recv_data.read_skip<uint64>();                          // unk
 }
-
 void WorldSession::HandleCalendarGuildFilter(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_GUILD_FILTER");
@@ -85,24 +73,20 @@ void WorldSession::HandleCalendarGuildFilter(WorldPacket &recv_data)
     recv_data.read_skip<uint32>();                          // unk2
     recv_data.read_skip<uint32>();                          // unk3
 }
-
 void WorldSession::HandleCalendarArenaTeam(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_ARENA_TEAM");
     recv_data.hexlike();
     recv_data.read_skip<uint32>();                          // unk
 }
-
 void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_ADD_EVENT");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //std::string unk1, unk2;
     //recv_data >> (std::string)unk1;
     //recv_data >> (std::string)unk2;
-
     //uint8   unk3, unk4;
     //uint32  unk5, unk6, unk7, unk8, unk9, count = 0;
     //recv_data >> (uint8)unk3;
@@ -128,13 +112,11 @@ void WorldSession::HandleCalendarAddEvent(WorldPacket &recv_data)
     //    }
     //}
 }
-
 void WorldSession::HandleCalendarUpdateEvent(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_UPDATE_EVENT");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> std::string
@@ -147,110 +129,88 @@ void WorldSession::HandleCalendarUpdateEvent(WorldPacket &recv_data)
     //recv_data >> uint32
     //recv_data >> uint32
 }
-
 void WorldSession::HandleCalendarRemoveEvent(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_REMOVE_EVENT");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint32
-
 }
-
 void WorldSession::HandleCalendarCopyEvent(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_COPY_EVENT");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint32
-
 }
-
 void WorldSession::HandleCalendarEventInvite(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_INVITE");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> std::string
     //recv_data >> uint8
     //recv_data >> uint8
-
 }
-
 void WorldSession::HandleCalendarEventRsvp(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_RSVP");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint32
-
 }
-
 void WorldSession::HandleCalendarEventRemoveInvite(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_REMOVE_INVITE");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data.readPackGUID(guid)
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint64
 }
-
 void WorldSession::HandleCalendarEventStatus(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_STATUS");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data.readPackGUID(guid)
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint32
 }
-
 void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_EVENT_MODERATOR_STATUS");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data.readPackGUID(guid)
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint32
 }
-
 void WorldSession::HandleCalendarComplain(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_COMPLAIN");
     recv_data.hexlike();
     recv_data.rpos(recv_data.wpos());                       // set to end to avoid warnings spam
-
     //recv_data >> uint64
     //recv_data >> uint64
     //recv_data >> uint64
 }
-
 void WorldSession::HandleCalendarGetNumPending(WorldPacket & /*recv_data*/)
 {
     sLog.outDebug("WORLD: CMSG_CALENDAR_GET_NUM_PENDING");  // empty
-
     WorldPacket data(SMSG_CALENDAR_SEND_NUM_PENDING, 4);
     data << uint32(0);                                      // 0 - no pending invites, 1 - some pending invites
     SendPacket(&data);
diff --git a/src/game/Cell.h b/src/game/Cell.h
index 9baf4104080..7145df0aacc 100644
--- a/src/game/Cell.h
+++ b/src/game/Cell.h
@@ -17,20 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CELL_H
 #define TRINITY_CELL_H
-
 #include <cmath>
-
 #include "GameSystem/TypeContainer.h"
 #include "GameSystem/TypeContainerVisitor.h"
-
 #include "GridDefines.h"
-
 class Map;
 class WorldObject;
-
 enum District
 {
     UPPER_DISTRICT = 1,
@@ -44,15 +38,12 @@ enum District
     LOWER_RIGHT_DISTRICT = (LOWER_DISTRICT | RIGHT_DISTRICT),
     ALL_DISTRICT = (UPPER_DISTRICT | LOWER_DISTRICT | LEFT_DISTRICT | RIGHT_DISTRICT | CENTER_DISTRICT)
 };
-
 template<class T> struct CellLock;
-
 struct TRINITY_DLL_DECL CellArea
 {
     CellArea() : right_offset(0), left_offset(0), upper_offset(0), lower_offset(0) {}
     CellArea(int right, int left, int upper, int lower) : right_offset(right), left_offset(left), upper_offset(upper), lower_offset(lower) {}
     bool operator!() const { return !right_offset && !left_offset && !upper_offset && !lower_offset; }
- 
     void ResizeBorders(CellPair& begin_cell, CellPair& end_cell) const
     {
         begin_cell << left_offset;
@@ -60,20 +51,17 @@ struct TRINITY_DLL_DECL CellArea
         end_cell >> right_offset;
         end_cell += upper_offset;
     }
- 
     int right_offset;
     int left_offset;
     int upper_offset;
     int lower_offset;
 };
- 
 
 struct TRINITY_DLL_DECL Cell
 {
     Cell() { data.All = 0; }
     Cell(const Cell &cell) { data.All = cell.data.All; }
     explicit Cell(CellPair const& p);
-
     void operator|=(Cell &cell)
     {
         data.Part.reserved = 0;
@@ -81,14 +69,12 @@ struct TRINITY_DLL_DECL Cell
         uint32 x, y, old_x, old_y;
         Compute(x, y);
         cell.Compute(old_x, old_y);
-
         if( std::abs(int(x-old_x)) > 1 || std::abs(int(y-old_y)) > 1)
         {
             data.Part.reserved = ALL_DISTRICT;
             cell.data.Part.reserved = ALL_DISTRICT;
             return;
         }
-
         if( x < old_x )
         {
             data.Part.reserved |= LEFT_DISTRICT;
@@ -110,45 +96,38 @@ struct TRINITY_DLL_DECL Cell
             cell.data.Part.reserved |= UPPER_DISTRICT;
         }
     }
-
     void Compute(uint32 &x, uint32 &y) const
     {
         x = data.Part.grid_x*MAX_NUMBER_OF_CELLS + data.Part.cell_x;
         y = data.Part.grid_y*MAX_NUMBER_OF_CELLS + data.Part.cell_y;
     }
-
     bool DiffCell(const Cell &cell) const
     {
         return( data.Part.cell_x != cell.data.Part.cell_x ||
             data.Part.cell_y != cell.data.Part.cell_y );
     }
-
     bool DiffGrid(const Cell &cell) const
     {
         return( data.Part.grid_x != cell.data.Part.grid_x ||
             data.Part.grid_y != cell.data.Part.grid_y );
     }
-
     uint32 CellX() const { return data.Part.cell_x; }
     uint32 CellY() const { return data.Part.cell_y; }
     uint32 GridX() const { return data.Part.grid_x; }
     uint32 GridY() const { return data.Part.grid_y; }
     bool NoCreate() const { return data.Part.nocreate; }
     void SetNoCreate() { data.Part.nocreate = 1; }
-
     CellPair cellPair() const
     {
         return CellPair(
             data.Part.grid_x*MAX_NUMBER_OF_CELLS+data.Part.cell_x,
             data.Part.grid_y*MAX_NUMBER_OF_CELLS+data.Part.cell_y);
     }
-
     Cell& operator=(const Cell &cell)
     {
         this->data.All = cell.data.All;
         return *this;
     }
-
     bool operator==(const Cell &cell) const { return (data.All == cell.data.All); }
     bool operator!=(const Cell &cell) const { return !operator==(cell); }
     union
@@ -164,17 +143,13 @@ struct TRINITY_DLL_DECL Cell
         } Part;
         uint32 All;
     } data;
-
     template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &) const;
     template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject &obj, float radius) const;
     template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &visitor, Map &, float radius, float x_off, float y_off) const;
- 
     static CellArea CalculateCellArea(const WorldObject &obj, float radius);
- 
 private:
     template<class LOCK_TYPE, class T, class CONTAINER> void VisitCircle(const CellLock<LOCK_TYPE> &, TypeContainerVisitor<T, CONTAINER> &, Map &, const CellPair& , const CellPair& ) const;
 };
-
 template<class T>
 struct TRINITY_DLL_DECL CellLock
 {
diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h
index ff2b0343c69..659ffd48eb6 100644
--- a/src/game/CellImpl.h
+++ b/src/game/CellImpl.h
@@ -17,16 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CELLIMPL_H
 #define TRINITY_CELLIMPL_H
-
 #include <cmath>
-
 #include "Cell.h"
 #include "Map.h"
 #include "Object.h"
-
 inline Cell::Cell(CellPair const& p)
 {
     data.Part.grid_x = p.x_coord / MAX_NUMBER_OF_CELLS;
@@ -36,7 +32,6 @@ inline Cell::Cell(CellPair const& p)
     data.Part.nocreate = 0;
     data.Part.reserved = 0;
 }
-
 template<class LOCK_TYPE,class T, class CONTAINER>
 inline void
 Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m) const
@@ -44,19 +39,16 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     const CellPair &standing_cell = l.i_cellPair;
     if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
         return;
-
     uint16 district = (District)this->data.Part.reserved;
     if(district == CENTER_DISTRICT)
     {
         m.Visit(l, visitor);
         return;
     }
-
     // set up the cell range based on the district
     // the overloaded operators handle range checking
     CellPair begin_cell = standing_cell;
     CellPair end_cell = standing_cell;
-
     switch( district )
     {
         case ALL_DISTRICT:
@@ -117,7 +109,6 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
             break;
         }
     }
-
     // loop the cell range
     for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++)
     {
@@ -131,7 +122,6 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         }
     }
 }
-
 template<class LOCK_TYPE,class T, class CONTAINER>
 inline void
 Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, float radius, float x_off, float y_off) const
@@ -139,9 +129,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     const CellPair &standing_cell = l.i_cellPair;
     if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
         return;
-
     int left = 0, right = 0, upper = 0, lower = 0;
-
     // Origin = (CENTER_GRID_CELL_OFFSET, CENTER_GRID_CELL_OFFSET)
     if(CENTER_GRID_CELL_OFFSET - x_off < radius)
         ++right;
@@ -151,21 +139,17 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         ++upper;
     if(CENTER_GRID_CELL_OFFSET + y_off < radius)
         ++lower;
-
     if(!left && !right && !upper && !lower)
     {
         m.Visit(l, visitor);
         return;
     }
-
     CellPair begin_cell = standing_cell;
     CellPair end_cell = standing_cell;
-
     begin_cell << left; //note: need change << if left > 1
     begin_cell -= lower;
     end_cell >> right;
     end_cell += upper;
-
     // loop the cell range
     for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++)
     {
@@ -179,20 +163,16 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         }
     }
 }
-
 inline int CellHelper(const float radius)
 {
     if(radius < 1.0f)
         return 0;
- 
     return (int)ceilf(radius/SIZE_OF_GRID_CELL);
 }
- 
 inline CellArea Cell::CalculateCellArea(const WorldObject &obj, float radius)
 {
     if(radius <= 0.0f)
         return CellArea();
- 
     //we should increase search radius by object's radius, otherwise
     //we could have problems with huge creatures, which won't attack nearest players etc
     radius += obj.GetObjectSize();
@@ -200,23 +180,18 @@ inline CellArea Cell::CalculateCellArea(const WorldObject &obj, float radius)
     //TODO: add more correct/generic method for this task
     const float x_offset = (obj.GetPositionX() - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
     const float y_offset = (obj.GetPositionY() - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
- 
     const float x_val = floor(x_offset + CENTER_GRID_CELL_ID + 0.5f);
     const float y_val = floor(y_offset + CENTER_GRID_CELL_ID + 0.5f);
- 
     const float x_off = (x_offset - x_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
     const float y_off = (y_offset - y_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
- 
     const float tmp_diff = radius - CENTER_GRID_CELL_OFFSET;
     //lets calculate upper/lower/right/left corners for cell search
     int right = CellHelper(tmp_diff + x_off);
     int left = CellHelper(tmp_diff - x_off);
     int upper = CellHelper(tmp_diff + y_off);
     int lower = CellHelper(tmp_diff - y_off);
- 
     return CellArea(right, left, upper, lower);
 }
- 
 template<class LOCK_TYPE, class T, class CONTAINER>
 inline void
 Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const WorldObject &obj, float radius) const
@@ -224,7 +199,6 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     const CellPair &standing_cell = l.i_cellPair;
     if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
         return;
- 
     //no jokes here... Actually placing ASSERT() here was good idea, but
     //we had some problems with DynamicObjects, which pass radius = 0.0f (DB issue?)
     //maybe it is better to just return when radius <= 0.0f?
@@ -236,7 +210,6 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
     //lets limit the upper value for search radius
     if(radius > 333.0f)
         radius = 333.0f;
- 
     //lets calculate object coord offsets from cell borders.
     CellArea area = Cell::CalculateCellArea(obj, radius);
     //if radius fits inside standing cell
@@ -245,10 +218,8 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         m.Visit(l, visitor);
         return;
     }
- 
     CellPair begin_cell = standing_cell;
     CellPair end_cell = standing_cell;
- 
     area.ResizeBorders(begin_cell, end_cell);
     //visit all cells, found in CalculateCellArea()
     //if radius is known to reach cell area more than 4x4 then we should call optimized VisitCircle
@@ -259,11 +230,9 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         VisitCircle(l, visitor, m, begin_cell, end_cell);
         return;
     }
- 
     //ALWAYS visit standing cell first!!! Since we deal with small radiuses
     //it is very essential to call visitor for standing cell firstly...
     m.Visit(l, visitor);
- 
     // loop the cell range
     for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++)
     {
@@ -281,7 +250,6 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi
         }
     }
 }
- 
 template<class LOCK_TYPE, class T, class CONTAINER>
 inline void
 Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &visitor, Map &m, const CellPair& begin_cell, const CellPair& end_cell) const
@@ -291,7 +259,6 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE
     //lets calculate x_start/x_end coords for central strip...
     const uint32 x_start = begin_cell.x_coord + x_shift;
     const uint32 x_end = end_cell.x_coord - x_shift;
- 
     //visit central strip with constant width...
     for(uint32 x = x_start; x <= x_end; ++x)
     {
@@ -304,12 +271,10 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE
             m.Visit(lock, visitor);
         }
     }
- 
     //if x_shift == 0 then we have too small cell area, which were already
     //visited at previous step, so just return from procedure...
     if(x_shift == 0)
         return;
- 
     uint32 y_start = end_cell.y_coord;
     uint32 y_end = begin_cell.y_coord;
     //now we are visiting borders of an octagon...
@@ -327,7 +292,6 @@ Cell::VisitCircle(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINE
             r_zone_left.data.Part.nocreate = l->data.Part.nocreate;
             CellLock<LOCK_TYPE> lock_left(r_zone_left, cell_pair_left);
             m.Visit(lock_left, visitor);
- 
             //right trapezoid cell visit
             CellPair cell_pair_right(x_end + step, y);
             Cell r_zone_right(cell_pair_right);
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index 72e35a6e777..5ff403b9484 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Channel.h"
 #include "ObjectMgr.h"
 #include "SocialMgr.h"
 #include "World.h"
-
 Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
  : m_name(name), m_announce(true), m_moderate(false), m_channelId(channel_id), m_ownerGUID(0), m_password(""), m_flags(0)
 {
@@ -33,20 +31,16 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
     {
         channel_id = ch->ChannelID;                         // built-in channel
         m_announce = false;                                 // no join/leave announces
-
         m_flags |= CHANNEL_FLAG_GENERAL;                    // for all built-in channels
-
         if(ch->flags & CHANNEL_DBC_FLAG_TRADE)              // for trade channel
             m_flags |= CHANNEL_FLAG_TRADE;
-
         if(ch->flags & CHANNEL_DBC_FLAG_CITY_ONLY2)         // for city only channels
             m_flags |= CHANNEL_FLAG_CITY;
-
         if(ch->flags & CHANNEL_DBC_FLAG_LFG)                // for LFG channel
             m_flags |= CHANNEL_FLAG_LFG;
         else                                                // for all other channels
             m_flags |= CHANNEL_FLAG_NOT_LFG;
-        m_IsSaved = false;  
+        m_IsSaved = false;
     }
     else                                                    // it's custom channel
     {
@@ -62,9 +56,7 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
             m_moderate = fields[3].GetBool();
             m_password  = fields[4].GetString();
             const char* db_BannedList = fields[5].GetString();
-            
             m_IsSaved = true;
-
             if(db_BannedList)
             {
                 Tokens tokens = StrSplit(db_BannedList, " ");
@@ -87,11 +79,10 @@ Channel::Channel(const std::string& name, uint32 channel_id, uint32 Team)
             {
                 sLog.outDebug("New Channel(%s) saved", name.c_str());
                 m_IsSaved = true;
-            }            
+            }
         }
     }
 }
-
 void Channel::Join(uint64 p, const char *pass)
 {
     WorldPacket data;
@@ -104,23 +95,19 @@ void Channel::Join(uint64 p, const char *pass)
         }
         return;
     }
-
     if(IsBanned(p))
     {
         MakeBanned(&data);
         SendToOne(&data, p);
         return;
     }
-
     if(m_password.length() > 0 && strcmp(pass, m_password.c_str()))
     {
         MakeWrongPassword(&data);
         SendToOne(&data, p);
         return;
     }
-
     Player *plr = objmgr.GetPlayer(p);
-
     if(plr)
     {
         if(HasFlag(CHANNEL_FLAG_LFG) &&
@@ -131,36 +118,28 @@ void Channel::Join(uint64 p, const char *pass)
             SendToOne(&data, p);
             return;
         }
-
         if(plr->GetGuildId() && (GetFlags() == 0x38))
             return;
-
         plr->JoinedChannel(this);
     }
-
     if(m_announce && (!plr || plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL) ))
     {
         MakeJoined(&data, p);
         SendToAll(&data);
     }
-
     data.clear();
-
     PlayerInfo pinfo;
     pinfo.player = p;
     pinfo.flags = MEMBER_FLAG_NONE;
     players[p] = pinfo;
-
     MakeYouJoined(&data);
     SendToOne(&data, p);
-
     JoinNotify(p);
-
     // if no owner first logged will become
     if(!IsConstant() && !m_ownerGUID)
     {
         SetOwner(p, (players.size() > 1 ? true : false));
-        players[p].SetModerator(true);        
+        players[p].SetModerator(true);
     }
     /*
     else if(!IsConstant() && m_ownerGUID && plr && m_ownerGUID == plr->GetGUID() ))
@@ -169,7 +148,6 @@ void Channel::Join(uint64 p, const char *pass)
         players[p].SetModerator(true);
     }*/
 }
-
 void Channel::Leave(uint64 p, bool send)
 {
     if(!IsOn(p))
@@ -184,7 +162,6 @@ void Channel::Leave(uint64 p, bool send)
     else
     {
         Player *plr = objmgr.GetPlayer(p);
-
         if(send)
         {
             WorldPacket data;
@@ -194,9 +171,7 @@ void Channel::Leave(uint64 p, bool send)
                 plr->LeftChannel(this);
             data.clear();
         }
-
         bool changeowner = players[p].IsOwner();
-
         players.erase(p);
         if(m_announce && (!plr || plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || !sWorld.getConfig(CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL) ))
         {
@@ -204,9 +179,7 @@ void Channel::Leave(uint64 p, bool send)
             MakeLeft(&data, p);
             SendToAll(&data);
         }
-
         LeaveNotify(p);
-
         if(changeowner)
         {
             uint64 newowner = !players.empty() ? players.begin()->second.player : 0;
@@ -215,14 +188,12 @@ void Channel::Leave(uint64 p, bool send)
         }
     }
 }
-
 void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
 {
     AccountTypes sec = SEC_PLAYER;
     Player *gplr = objmgr.GetPlayer(good);
     if(gplr)
         sec = gplr->GetSession()->GetSecurity();
-
     if(!IsOn(good))
     {
         WorldPacket data;
@@ -253,9 +224,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
         else
         {
             bool changeowner = (m_ownerGUID == bad->GetGUID());
-
             WorldPacket data;
-
             if(ban && !IsBanned(bad->GetGUID()))
             {
                 banned.insert(bad->GetGUID());
@@ -274,17 +243,14 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
                     if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
                     {
                         sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str());
-                    }    
+                    }
                 }
-
             }
             else
                 MakePlayerKicked(&data, bad->GetGUID(), good);
-
             SendToAll(&data);
             players.erase(bad->GetGUID());
             bad->LeftChannel(this);
-
             if(changeowner)
             {
                 uint64 newowner = !players.empty() ? good : false;
@@ -294,14 +260,12 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
         }
     }
 }
-
 void Channel::UnBan(uint64 good, const char *badname)
 {
     uint32 sec = 0;
     Player *gplr = objmgr.GetPlayer(good);
     if(gplr)
         sec = gplr->GetSession()->GetSecurity();
-
     if(!IsOn(good))
     {
         WorldPacket data;
@@ -326,7 +290,6 @@ void Channel::UnBan(uint64 good, const char *badname)
         else
         {
             banned.erase(bad->GetGUID());
-
             WorldPacket data;
             MakePlayerUnbanned(&data, bad->GetGUID(), good);
             SendToAll(&data);
@@ -344,19 +307,17 @@ void Channel::UnBan(uint64 good, const char *badname)
                 if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
                 {
                     sLog.outDebug("Channel(%s) BannedList saved", m_name.c_str());
-                }    
+                }
             }
         }
     }
 }
-
 void Channel::Password(uint64 p, const char *pass)
 {
     uint32 sec = 0;
     Player *plr = objmgr.GetPlayer(p);
     if(plr)
         sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -372,7 +333,6 @@ void Channel::Password(uint64 p, const char *pass)
     else
     {
         m_password = pass;
-
         WorldPacket data;
         MakePasswordChanged(&data, p);
         SendToAll(&data);
@@ -383,19 +343,16 @@ void Channel::Password(uint64 p, const char *pass)
             if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
             {
                 sLog.outDebug("Channel(%s) password saved", m_name.c_str());
-            }    
+            }
         }
     }
 }
-
 void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
 {
     Player *plr = objmgr.GetPlayer(p);
     if (!plr)
         return;
-
     uint32 sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -418,11 +375,9 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
             SendToOne(&data, p);
             return;
         }
-
         PlayerInfo inf = players[newp->GetGUID()];
         if(p == m_ownerGUID && newp->GetGUID() == m_ownerGUID && mod)
             return;
-
         if(!IsOn(newp->GetGUID()))
         {
             WorldPacket data;
@@ -430,7 +385,6 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
             SendToOne(&data, p);
             return;
         }
-
         // allow make moderator from another team only if both is GMs
         // at this moment this only way to show channel post for GM from another team
         if( (plr->GetSession()->GetSecurity() < SEC_GAMEMASTER || newp->GetSession()->GetSecurity() < SEC_GAMEMASTER) &&
@@ -441,7 +395,6 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
             SendToOne(&data, p);
             return;
         }
-
         if(m_ownerGUID == newp->GetGUID() && m_ownerGUID != p)
         {
             WorldPacket data;
@@ -449,22 +402,18 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
             SendToOne(&data, p);
             return;
         }
-
         if(mod)
             SetModerator(newp->GetGUID(), set);
         else
             SetMute(newp->GetGUID(), set);
     }
 }
-
 void Channel::SetOwner(uint64 p, const char *newname)
 {
     Player *plr = objmgr.GetPlayer(p);
     if (!plr)
         return;
-
     uint32 sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -472,7 +421,6 @@ void Channel::SetOwner(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     if(sec < SEC_GAMEMASTER && p != m_ownerGUID)
     {
         WorldPacket data;
@@ -480,7 +428,6 @@ void Channel::SetOwner(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     Player *newp = objmgr.GetPlayer(newname);
     if(newp == NULL || !IsOn(newp->GetGUID()))
     {
@@ -489,7 +436,6 @@ void Channel::SetOwner(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     if(newp->GetTeam() != plr->GetTeam() && !sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
     {
         WorldPacket data;
@@ -497,11 +443,9 @@ void Channel::SetOwner(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     players[newp->GetGUID()].SetModerator(true);
     SetOwner(newp->GetGUID());
 }
-
 void Channel::SendWhoOwner(uint64 p)
 {
     if(!IsOn(p))
@@ -517,11 +461,9 @@ void Channel::SendWhoOwner(uint64 p)
         SendToOne(&data, p);
     }
 }
-
 void Channel::List(Player* player)
 {
     uint64 p = player->GetGUID();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -534,17 +476,13 @@ void Channel::List(Player* player)
         data << uint8(1);                                   // channel type?
         data << GetName();                                  // channel name
         data << uint8(GetFlags());                          // channel flags?
-
         size_t pos = data.wpos();
         data << uint32(0);                                  // size of list, placeholder
-
         uint32 gmLevelInWhoList = sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST);
-
         uint32 count  = 0;
         for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
         {
             Player *plr = objmgr.GetPlayer(i->first);
-
             // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
             // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
             if (plr && (player->GetSession()->GetSecurity() > SEC_PLAYER || plr->GetSession()->GetSecurity() <= gmLevelInWhoList) &&
@@ -555,20 +493,16 @@ void Channel::List(Player* player)
                 ++count;
             }
         }
-
         data.put<uint32>(pos,count);
-
         SendToOne(&data, p);
     }
 }
-
 void Channel::Announce(uint64 p)
 {
     uint32 sec = 0;
     Player *plr = objmgr.GetPlayer(p);
     if(plr)
         sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -584,7 +518,6 @@ void Channel::Announce(uint64 p)
     else
     {
         m_announce = !m_announce;
-
         WorldPacket data;
         if(m_announce)
             MakeAnnouncementsOn(&data, p);
@@ -598,19 +531,16 @@ void Channel::Announce(uint64 p)
             if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
             {
                 sLog.outDebug("Channel(%s) announce saved", m_name.c_str());
-            }    
+            }
         }
-
     }
 }
-
 void Channel::Moderate(uint64 p)
 {
     uint32 sec = 0;
     Player *plr = objmgr.GetPlayer(p);
     if(plr)
         sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -626,7 +556,6 @@ void Channel::Moderate(uint64 p)
     else
     {
         m_moderate = !m_moderate;
-
         WorldPacket data;
         if(m_moderate)
             MakeModerationOn(&data, p);
@@ -640,23 +569,20 @@ void Channel::Moderate(uint64 p)
             if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
             {
                 sLog.outDebug("Channel(%s) moderate saved", m_name.c_str());
-            }    
+            }
         }
     }
 }
-
 void Channel::Say(uint64 p, const char *what, uint32 lang)
 {
     if(!what)
         return;
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
         lang = LANG_UNIVERSAL;
-
     uint32 sec = 0;
     Player *plr = objmgr.GetPlayer(p);
     if(plr)
         sec = plr->GetSession()->GetSecurity();
-
     if(!IsOn(p))
     {
         WorldPacket data;
@@ -678,7 +604,6 @@ void Channel::Say(uint64 p, const char *what, uint32 lang)
     else
     {
         uint32 messageLength = strlen(what) + 1;
-
         WorldPacket data(SMSG_MESSAGECHAT, 1+4+8+4+m_name.size()+1+8+4+messageLength+1);
         data << (uint8)CHAT_MSG_CHANNEL;
         data << (uint32)lang;
@@ -689,11 +614,9 @@ void Channel::Say(uint64 p, const char *what, uint32 lang)
         data << messageLength;
         data << what;
         data << uint8(plr ? plr->chatTag() : 0);
-
         SendToAll(&data, !players[p].IsModerator() ? p : false);
     }
 }
-
 void Channel::Invite(uint64 p, const char *newname)
 {
     if(!IsOn(p))
@@ -703,7 +626,6 @@ void Channel::Invite(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     Player *newp = objmgr.GetPlayer(newname);
     if(!newp)
     {
@@ -712,11 +634,9 @@ void Channel::Invite(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     Player *plr = objmgr.GetPlayer(p);
     if (!plr)
         return;
-
     if (newp->GetTeam() != plr->GetTeam() && !sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
     {
         WorldPacket data;
@@ -724,7 +644,6 @@ void Channel::Invite(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     if(IsOn(newp->GetGUID()))
     {
         WorldPacket data;
@@ -732,7 +651,6 @@ void Channel::Invite(uint64 p, const char *newname)
         SendToOne(&data, p);
         return;
     }
-
     WorldPacket data;
     if(!newp->GetSocial()->HasIgnore(GUID_LOPART(p)))
     {
@@ -743,7 +661,6 @@ void Channel::Invite(uint64 p, const char *newname)
     MakePlayerInvited(&data, newp->GetName());
     SendToOne(&data, p);
 }
-
 void Channel::SetOwner(uint64 guid, bool exclaim)
 {
     if(m_ownerGUID)
@@ -753,18 +670,15 @@ void Channel::SetOwner(uint64 guid, bool exclaim)
         if(p_itr != players.end())
             p_itr->second.SetOwner(false);
     }
-
     m_ownerGUID = guid;
     if(m_ownerGUID)
     {
         uint8 oldFlag = GetPlayerFlags(m_ownerGUID);
         players[m_ownerGUID].SetModerator(true);
         players[m_ownerGUID].SetOwner(true);
-
         WorldPacket data;
         MakeModeChange(&data, m_ownerGUID, oldFlag);
         SendToAll(&data);
-
         if(exclaim)
         {
             MakeOwnerChanged(&data, m_ownerGUID);
@@ -777,12 +691,10 @@ void Channel::SetOwner(uint64 guid, bool exclaim)
             if(CharacterDatabase.PExecute( ss.str( ).c_str( ) ))
             {
                 sLog.outDebug("Channel(%s) owner saved", m_name.c_str());
-            }   
+            }
         }*/
-
     }
 }
-
 void Channel::SendToAll(WorldPacket *data, uint64 p)
 {
     for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
@@ -795,7 +707,6 @@ void Channel::SendToAll(WorldPacket *data, uint64 p)
         }
     }
 }
-
 void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
 {
     for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
@@ -808,24 +719,18 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
         }
     }
 }
-
 void Channel::SendToOne(WorldPacket *data, uint64 who)
 {
     Player *plr = objmgr.GetPlayer(who);
     if(plr)
         plr->GetSession()->SendPacket(data);
 }
-
 void Channel::Voice(uint64 /*guid1*/, uint64 /*guid2*/)
 {
-
 }
-
 void Channel::DeVoice(uint64 /*guid1*/, uint64 /*guid2*/)
 {
-
 }
-
 // done
 void Channel::MakeNotifyPacket(WorldPacket *data, uint8 notify_type)
 {
@@ -833,21 +738,18 @@ void Channel::MakeNotifyPacket(WorldPacket *data, uint8 notify_type)
     *data << uint8(notify_type);
     *data << m_name;
 }
-
 // done 0x00
 void Channel::MakeJoined(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_JOINED_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x01
 void Channel::MakeLeft(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_LEFT_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x02
 void Channel::MakeYouJoined(WorldPacket *data)
 {
@@ -856,7 +758,6 @@ void Channel::MakeYouJoined(WorldPacket *data)
     *data << uint32(GetChannelId());
     *data << uint32(0);
 }
-
 // done 0x03
 void Channel::MakeYouLeft(WorldPacket *data)
 {
@@ -864,64 +765,53 @@ void Channel::MakeYouLeft(WorldPacket *data)
     *data << uint32(GetChannelId());
     *data << uint8(0);                                      // can be 0x00 and 0x01
 }
-
 // done 0x04
 void Channel::MakeWrongPassword(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_WRONG_PASSWORD_NOTICE);
 }
-
 // done 0x05
 void Channel::MakeNotMember(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MEMBER_NOTICE);
 }
-
 // done 0x06
 void Channel::MakeNotModerator(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MODERATOR_NOTICE);
 }
-
 // done 0x07
 void Channel::MakePasswordChanged(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_PASSWORD_CHANGED_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x08
 void Channel::MakeOwnerChanged(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_OWNER_CHANGED_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x09
 void Channel::MakePlayerNotFound(WorldPacket *data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_NOT_FOUND_NOTICE);
     *data << name;
 }
-
 // done 0x0A
 void Channel::MakeNotOwner(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_OWNER_NOTICE);
 }
-
 // done 0x0B
 void Channel::MakeChannelOwner(WorldPacket *data)
 {
     std::string name = "";
-
     if(!objmgr.GetPlayerNameByGUID(m_ownerGUID, name) || name.empty())
         name = "PLAYER_NOT_FOUND";
-
     MakeNotifyPacket(data, CHAT_CHANNEL_OWNER_NOTICE);
     *data << ((IsConstant() || !m_ownerGUID) ? "Nobody" : name);
 }
-
 // done 0x0C
 void Channel::MakeModeChange(WorldPacket *data, uint64 guid, uint8 oldflags)
 {
@@ -930,41 +820,35 @@ void Channel::MakeModeChange(WorldPacket *data, uint64 guid, uint8 oldflags)
     *data << uint8(oldflags);
     *data << uint8(GetPlayerFlags(guid));
 }
-
 // done 0x0D
 void Channel::MakeAnnouncementsOn(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_ANNOUNCEMENTS_ON_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x0E
 void Channel::MakeAnnouncementsOff(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_ANNOUNCEMENTS_OFF_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x0F
 void Channel::MakeModerationOn(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_MODERATION_ON_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x10
 void Channel::MakeModerationOff(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_MODERATION_OFF_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x11
 void Channel::MakeMuted(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_MUTED_NOTICE);
 }
-
 // done 0x12
 void Channel::MakePlayerKicked(WorldPacket *data, uint64 bad, uint64 good)
 {
@@ -972,13 +856,11 @@ void Channel::MakePlayerKicked(WorldPacket *data, uint64 bad, uint64 good)
     *data << uint64(bad);
     *data << uint64(good);
 }
-
 // done 0x13
 void Channel::MakeBanned(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_BANNED_NOTICE);
 }
-
 // done 0x14
 void Channel::MakePlayerBanned(WorldPacket *data, uint64 bad, uint64 good)
 {
@@ -986,7 +868,6 @@ void Channel::MakePlayerBanned(WorldPacket *data, uint64 bad, uint64 good)
     *data << uint64(bad);
     *data << uint64(good);
 }
-
 // done 0x15
 void Channel::MakePlayerUnbanned(WorldPacket *data, uint64 bad, uint64 good)
 {
@@ -994,107 +875,90 @@ void Channel::MakePlayerUnbanned(WorldPacket *data, uint64 bad, uint64 good)
     *data << uint64(bad);
     *data << uint64(good);
 }
-
 // done 0x16
 void Channel::MakePlayerNotBanned(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_NOT_BANNED_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x17
 void Channel::MakePlayerAlreadyMember(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_ALREADY_MEMBER_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x18
 void Channel::MakeInvite(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_INVITE_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x19
 void Channel::MakeInviteWrongFaction(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_INVITE_WRONG_FACTION_NOTICE);
 }
-
 // done 0x1A
 void Channel::MakeWrongFaction(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_WRONG_FACTION_NOTICE);
 }
-
 // done 0x1B
 void Channel::MakeInvalidName(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_INVALID_NAME_NOTICE);
 }
-
 // done 0x1C
 void Channel::MakeNotModerated(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_MODERATED_NOTICE);
 }
-
 // done 0x1D
 void Channel::MakePlayerInvited(WorldPacket *data, const std::string& name)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_INVITED_NOTICE);
     *data << name;
 }
-
 // done 0x1E
 void Channel::MakePlayerInviteBanned(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_PLAYER_INVITE_BANNED_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x1F
 void Channel::MakeThrottled(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_THROTTLED_NOTICE);
 }
-
 // done 0x20
 void Channel::MakeNotInArea(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_IN_AREA_NOTICE);
 }
-
 // done 0x21
 void Channel::MakeNotInLfg(WorldPacket *data)
 {
     MakeNotifyPacket(data, CHAT_NOT_IN_LFG_NOTICE);
 }
-
 // done 0x22
 void Channel::MakeVoiceOn(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_VOICE_ON_NOTICE);
     *data << uint64(guid);
 }
-
 // done 0x23
 void Channel::MakeVoiceOff(WorldPacket *data, uint64 guid)
 {
     MakeNotifyPacket(data, CHAT_VOICE_OFF_NOTICE);
     *data << uint64(guid);
 }
-
 void Channel::JoinNotify(uint64 guid)
 {
     WorldPacket data;
-
     if(IsConstant())
         data.Initialize(SMSG_USERLIST_ADD, 8+1+1+4+GetName().size()+1);
     else
         data.Initialize(SMSG_USERLIST_UPDATE, 8+1+1+4+GetName().size()+1);
-
     data << uint64(guid);
     data << uint8(GetPlayerFlags(guid));
     data << uint8(GetFlags());
@@ -1102,7 +966,6 @@ void Channel::JoinNotify(uint64 guid)
     data << GetName();
     SendToAll(&data);
 }
-
 void Channel::LeaveNotify(uint64 guid)
 {
     WorldPacket data(SMSG_USERLIST_REMOVE, 8+1+4+GetName().size()+1);
diff --git a/src/game/Channel.h b/src/game/Channel.h
index 69a1e2f66f6..b97acd52360 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -17,20 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _CHANNEL_H
 #define _CHANNEL_H
-
 #include <list>
 #include <map>
 #include <string>
-
 #include "Common.h"
-
 #include "Opcodes.h"
 #include "Player.h"
 #include "WorldPacket.h"
-
 enum ChatNotify
 {
     CHAT_JOINED_NOTICE                = 0x00,           //+ "%s joined channel.";
@@ -72,7 +67,6 @@ enum ChatNotify
     CHAT_VOICE_ON_NOTICE              = 0x22,           //+ "[%s] Channel voice enabled by %s.";
     CHAT_VOICE_OFF_NOTICE             = 0x23,           //+ "[%s] Channel voice disabled by %s.";
 };
-
 enum ChannelFlags
 {
     CHANNEL_FLAG_NONE       = 0x00,
@@ -90,7 +84,6 @@ enum ChannelFlags
     // GuildRecruitment         0x38 = 0x20 | 0x10 | 0x08
     // LookingForGroup          0x50 = 0x40 | 0x10
 };
-
 enum ChannelDBCFlags
 {
     CHANNEL_DBC_FLAG_NONE       = 0x00000,
@@ -104,7 +97,6 @@ enum ChannelDBCFlags
     CHANNEL_DBC_FLAG_GUILD_REQ  = 0x20000,              // GuildRecruitment
     CHANNEL_DBC_FLAG_LFG        = 0x40000               // LookingForGroup
 };
-
 enum ChannelMemberFlags
 {
     MEMBER_FLAG_NONE        = 0x00,
@@ -117,14 +109,12 @@ enum ChannelMemberFlags
     // 0x40
     // 0x80
 };
-
 class Channel
 {
     struct PlayerInfo
     {
         uint64 player;
         uint8 flags;
-
         bool HasFlag(uint8 flag) { return flags & flag; }
         void SetFlag(uint8 flag) { if(!HasFlag(flag)) flags |= flag; }
         bool IsOwner() { return flags & MEMBER_FLAG_OWNER; }
@@ -146,7 +136,6 @@ class Channel
             else flags &= ~MEMBER_FLAG_MUTED;
         }
     };
-
     typedef     std::map<uint64, PlayerInfo> PlayerList;
     PlayerList  players;
     typedef     std::set<uint64> BannedList;
@@ -159,7 +148,6 @@ class Channel
     uint32      m_channelId;
     uint64      m_ownerGUID;
     bool        m_IsSaved;
-
     private:
         // initial packet data (notify type and channel name)
         void MakeNotifyPacket(WorldPacket *data, uint8 notify_type);
@@ -200,49 +188,40 @@ class Channel
         void MakeNotInLfg(WorldPacket *data);                                   //? 0x21
         void MakeVoiceOn(WorldPacket *data, uint64 guid);                       //+ 0x22
         void MakeVoiceOff(WorldPacket *data, uint64 guid);                      //+ 0x23
-
         void SendToAll(WorldPacket *data, uint64 p = 0);
         void SendToAllButOne(WorldPacket *data, uint64 who);
         void SendToOne(WorldPacket *data, uint64 who);
-
         bool IsOn(uint64 who) const { return players.find(who) != players.end(); }
         bool IsBanned(uint64 guid) const { return banned.find(guid) != banned.end(); }
-
         uint8 GetPlayerFlags(uint64 p) const
         {
             PlayerList::const_iterator p_itr = players.find(p);
             if(p_itr == players.end())
                 return 0;
-
             return p_itr->second.flags;
         }
-
         void SetModerator(uint64 p, bool set)
         {
             if(players[p].IsModerator() != set)
             {
                 uint8 oldFlag = GetPlayerFlags(p);
                 players[p].SetModerator(set);
-
                 WorldPacket data;
                 MakeModeChange(&data, p, oldFlag);
                 SendToAll(&data);
             }
         }
-
         void SetMute(uint64 p, bool set)
         {
             if(players[p].IsMuted() != set)
             {
                 uint8 oldFlag = GetPlayerFlags(p);
                 players[p].SetMuted(set);
-
                 WorldPacket data;
                 MakeModeChange(&data, p, oldFlag);
                 SendToAll(&data);
             }
         }
-
     public:
         uint32 m_Team;
         Channel(const std::string& name, uint32 channel_id, uint32 Team = 0);
@@ -257,7 +236,6 @@ class Channel
         uint32 GetNumPlayers() const { return players.size(); }
         uint8 GetFlags() const { return m_flags; }
         bool HasFlag(uint8 flag) { return m_flags & flag; }
-
         void Join(uint64 p, const char *pass);
         void Leave(uint64 p, bool send = true);
         void KickOrBan(uint64 good, const char *badname, bool ban);
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index abf73e0e274..d50c579cd9b 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -18,26 +18,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 #include "Policies/SingletonImp.h"
-
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
-
 void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
-
     uint32 channel_id;
     uint8 unknown1, unknown2;
     std::string channelname, pass;
-
     recvPacket >> channel_id >> unknown1 >> unknown2;
     recvPacket >> channelname;
-
     if(channelname.empty())
         return;
-
     recvPacket >> pass;
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
     {
@@ -46,20 +39,16 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
             chn->Join(_player->GetGUID(), pass.c_str());
     }
 }
-
 void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
-
     uint32 unk;
     std::string channelname;
     recvPacket >> unk;                                      // channel id?
     recvPacket >> channelname;
-
     if(channelname.empty())
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
     {
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
@@ -67,50 +56,40 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
         cMgr->LeftChannel(channelname);
     }
 }
-
 void WorldSession::HandleChannelList(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname;
     recvPacket >> channelname;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->List(_player);
 }
-
 void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, pass;
     recvPacket >> channelname;
-
     recvPacket >> pass;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Password(_player->GetGUID(), pass.c_str());
 }
-
 void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, newp;
     recvPacket >> channelname;
-
     recvPacket >> newp;
-
     if(!normalizePlayerName(newp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->SetOwner(_player->GetGUID(), newp.c_str());
 }
-
 void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -121,144 +100,110 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->SendWhoOwner(_player->GetGUID());
 }
-
 void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->SetModerator(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->UnsetModerator(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->SetMute(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
-
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->UnsetMute(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Invite(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Kick(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Ban(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
     //recvPacket.hexlike();
-
     std::string channelname, otp;
     recvPacket >> channelname;
-
     recvPacket >> otp;
-
     if(!normalizePlayerName(otp))
         return;
-
     if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->UnBan(_player->GetGUID(), otp.c_str());
 }
-
 void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -269,7 +214,6 @@ void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Announce(_player->GetGUID());
 }
-
 void WorldSession::HandleChannelModerate(WorldPacket& recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -280,7 +224,6 @@ void WorldSession::HandleChannelModerate(WorldPacket& recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->Moderate(_player->GetGUID());
 }
-
 void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -291,7 +234,6 @@ void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
         if(Channel *chn = cMgr->GetChannel(channelname, _player))
             chn->List(_player);
 }
-
 void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
@@ -310,7 +252,6 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
         }
     }
 }
-
 void WorldSession::HandleSetChannelWatch(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
index 09d172155cc..8994d84b23f 100644
--- a/src/game/ChannelMgr.cpp
+++ b/src/game/ChannelMgr.cpp
@@ -15,35 +15,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "ChannelMgr.h"
 #include "Policies/SingletonImp.h"
 #include "World.h"
-
 INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
 INSTANTIATE_SINGLETON_1( HordeChannelMgr );
-
 ChannelMgr* channelMgr(uint32 team)
 {
     if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
         return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();        // cross-faction
-
     if(team == ALLIANCE)
         return &MaNGOS::Singleton<AllianceChannelMgr>::Instance();
     if(team == HORDE)
         return &MaNGOS::Singleton<HordeChannelMgr>::Instance();
-
     return NULL;
 }
-
 ChannelMgr::~ChannelMgr()
 {
     for(ChannelMap::iterator itr = channels.begin();itr!=channels.end(); ++itr)
         delete itr->second;
-
     channels.clear();
 }
-
 Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id)
 {
     if (channels.find(name) == channels.end())
@@ -51,14 +43,11 @@ Channel *ChannelMgr::GetJoinChannel(std::string name, uint32 channel_id)
         Channel *nchan = new Channel(name,channel_id, team);
         channels[name] = nchan;
     }
-
     return channels[name];
 }
-
 Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt)
 {
     ChannelMap::const_iterator i = channels.find(name);
-
     if(i == channels.end())
     {
         if(pkt)
@@ -67,29 +56,23 @@ Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt)
             MakeNotOnPacket(&data,name);
             p->GetSession()->SendPacket(&data);
         }
-
         return NULL;
     }
     else
         return i->second;
 }
-
 void ChannelMgr::LeftChannel(std::string name)
 {
     ChannelMap::const_iterator i = channels.find(name);
-
     if(i == channels.end())
         return;
-
     Channel* channel = i->second;
-
     if(channel->GetNumPlayers() == 0 && !channel->IsConstant())
     {
         channels.erase(name);
         delete channel;
     }
 }
-
 void ChannelMgr::MakeNotOnPacket(WorldPacket *data, std::string name)
 {
     data->Initialize(SMSG_CHANNEL_NOTIFY, (1+10));  // we guess size
diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h
index f65a8520648..5bf07d609b9 100644
--- a/src/game/ChannelMgr.h
+++ b/src/game/ChannelMgr.h
@@ -19,19 +19,14 @@
  */
 #ifndef MANGOSSERVER_CHANNELMGR_H
 #define MANGOSSERVER_CHANNELMGR_H
-
 #include "Common.h"
 #include "Channel.h"
 #include "Policies/Singleton.h"
-
 #include <map>
 #include <string>
-
 #include "Policies/Singleton.h"
-
 #include "Channel.h"
 #include "World.h"
-
 class ChannelMgr
 {
     public:
@@ -39,7 +34,6 @@ class ChannelMgr
         typedef std::map<std::string,Channel *> ChannelMap;
         ChannelMgr() {team = 0;}
         ~ChannelMgr();
-
         Channel *GetJoinChannel(std::string name, uint32 channel_id);
         Channel *GetChannel(std::string name, Player *p, bool pkt = true);
         void LeftChannel(std::string name);
@@ -47,11 +41,8 @@ class ChannelMgr
         ChannelMap channels;
         void MakeNotOnPacket(WorldPacket *data, std::string name);
 };
-
 class AllianceChannelMgr : public ChannelMgr {};
 class HordeChannelMgr    : public ChannelMgr {};
-
 ChannelMgr* channelMgr(uint32 team);
-
 #endif
 
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index e1e6eae86a3..e348d3b6f55 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
@@ -28,7 +27,6 @@
 #include "Auth/md5.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/DatabaseImpl.h"
-
 #include "ArenaTeam.h"
 #include "Chat.h"
 #include "Group.h"
@@ -43,7 +41,6 @@
 #include "UpdateMask.h"
 #include "Util.h"
 #include "ScriptCalls.h"
-
 class LoginQueryHolder : public SqlQueryHolder
 {
     private:
@@ -56,13 +53,10 @@ class LoginQueryHolder : public SqlQueryHolder
         uint32 GetAccountId() const { return m_accountId; }
         bool Initialize();
 };
-
 bool LoginQueryHolder::Initialize()
 {
     SetSize(MAX_PLAYER_LOGIN_QUERY);
-
     bool res = true;
-
     // NOTE: all fields in `characters` must be read to prevent lost character data at next save in case wrong DB structure.
     // !!! NOTE: including unused `zone`,`online`
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADFROM,            "SELECT guid, account, data, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty, arena_pending_points, instance_id, speccount, activespec FROM characters WHERE guid = '%u'", GUID_LOPART(m_guid));
@@ -92,10 +86,8 @@ bool LoginQueryHolder::Initialize()
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADGLYPHS,          "SELECT spec, glyph1, glyph2, glyph3, glyph4, glyph5, glyph6 FROM character_glyphs WHERE guid='%u'", GUID_LOPART(m_guid));
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADTALENTS,         "SELECT spell, spec FROM character_talent WHERE guid='%u'", GUID_LOPART(m_guid));
     res &= SetPQuery(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA,     "SELECT type, time, data FROM character_account_data WHERE guid='%u'", GUID_LOPART(m_guid));
-
     return res;
 }
-
 // don't call WorldSession directly
 // it may get deleted before the query callbacks get executed
 // instead pass an account id to this handler
@@ -124,15 +116,11 @@ class CharacterHandler
             session->HandlePlayerLogin((LoginQueryHolder*)holder);
         }
 } chrHandler;
-
 void WorldSession::HandleCharEnum(QueryResult * result)
 {
     WorldPacket data(SMSG_CHAR_ENUM, 100);                  // we guess size
-
     uint8 num = 0;
-
     data << num;
-
     if( result )
     {
         do
@@ -143,15 +131,11 @@ void WorldSession::HandleCharEnum(QueryResult * result)
                 ++num;
         }
         while( result->NextRow() );
-
         delete result;
     }
-
     data.put<uint8>(0, num);
-
     SendPacket( &data );
 }
-
 void WorldSession::HandleCharEnumOpcode( WorldPacket & /*recv_data*/ )
 {
     /// get all the data necessary for loading all characters (along with their pets) on the account
@@ -181,32 +165,25 @@ void WorldSession::HandleCharEnumOpcode( WorldPacket & /*recv_data*/ )
         "WHERE characters.account = '%u' ORDER BY characters.guid",
         PET_SAVE_AS_CURRENT,GetAccountId());
 }
-
 void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
 {
     std::string name;
     uint8 race_,class_;
-
     recv_data >> name;
-
     recv_data >> race_;
     recv_data >> class_;
-
     WorldPacket data(SMSG_CHAR_CREATE, 1);                  // returned with diff.values in all cases
-
     if(GetSecurity() == SEC_PLAYER)
     {
         if(uint32 mask = sWorld.getConfig(CONFIG_CHARACTERS_CREATING_DISABLED))
         {
             bool disabled = false;
-
             uint32 team = Player::TeamForRace(race_);
             switch(team)
             {
                 case ALLIANCE: disabled = mask & (1<<0); break;
                 case HORDE:    disabled = mask & (1<<1); break;
             }
-
             if(disabled)
             {
                 data << (uint8)CHAR_CREATE_DISABLED;
@@ -215,10 +192,8 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             }
         }
     }
-
     ChrClassesEntry const* classEntry = sChrClassesStore.LookupEntry(class_);
     ChrRacesEntry const* raceEntry = sChrRacesStore.LookupEntry(race_);
-
     if( !classEntry || !raceEntry )
     {
         data << (uint8)CHAR_CREATE_FAILED;
@@ -226,7 +201,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         sLog.outError("Class: %u or Race %u not found in DBC (Wrong DBC files?) or Cheater?", class_, race_);
         return;
     }
-
     // prevent character creating Expansion race without Expansion account
     if (raceEntry->addon > Expansion())
     {
@@ -235,7 +209,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     // prevent character creating Expansion class without Expansion account
     if (classEntry->addon > Expansion())
     {
@@ -244,7 +217,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     // prevent character creating with invalid name
     if (!normalizePlayerName(name))
     {
@@ -253,7 +225,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         sLog.outError("Account:[%d] but tried to Create character with empty [name] ",GetAccountId());
         return;
     }
-
     // check name limitations
     uint8 res = ObjectMgr::CheckPlayerName(name,true);
     if (res != CHAR_NAME_SUCCESS)
@@ -262,28 +233,24 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     if (GetSecurity() == SEC_PLAYER && objmgr.IsReservedName(name))
     {
         data << (uint8)CHAR_NAME_RESERVED;
         SendPacket( &data );
         return;
     }
-
     if (objmgr.GetPlayerGUIDByName(name))
     {
         data << (uint8)CHAR_CREATE_NAME_IN_USE;
         SendPacket( &data );
         return;
     }
-
     QueryResult *resultacct = loginDatabase.PQuery("SELECT SUM(numchars) FROM realmcharacters WHERE acctid = '%d'", GetAccountId());
     if (resultacct)
     {
         Field *fields=resultacct->Fetch();
         uint32 acctcharcount = fields[0].GetUInt32();
         delete resultacct;
-
         if (acctcharcount >= sWorld.getConfig(CONFIG_CHARACTERS_PER_ACCOUNT))
         {
             data << (uint8)CHAR_CREATE_ACCOUNT_LIMIT;
@@ -291,7 +258,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(guid) FROM characters WHERE account = '%d'", GetAccountId());
     uint8 charcount = 0;
     if ( result )
@@ -299,7 +265,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         Field *fields=result->Fetch();
         charcount = fields[0].GetUInt8();
         delete result;
-
         if (charcount >= sWorld.getConfig(CONFIG_CHARACTERS_PER_REALM))
         {
             data << (uint8)CHAR_CREATE_SERVER_LIMIT;
@@ -307,7 +272,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     // speedup check for heroic class disabled case
     uint32 heroic_free_slots = sWorld.getConfig(CONFIG_HEROIC_CHARACTERS_PER_REALM);
     if(heroic_free_slots==0 && GetSecurity()==SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
@@ -316,7 +280,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     // speedup check for heroic class disabled case
     uint32 req_level_for_heroic = sWorld.getConfig(CONFIG_MIN_LEVEL_FOR_HEROIC_CHARACTER_CREATING);
     if(GetSecurity()==SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && req_level_for_heroic > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
@@ -325,15 +288,11 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     bool AllowTwoSideAccounts = !sWorld.IsPvPRealm() || sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_ACCOUNTS) || GetSecurity() > SEC_PLAYER;
     uint32 skipCinematics = sWorld.getConfig(CONFIG_SKIP_CINEMATICS);
-
     bool have_same_race = false;
-
     // if 0 then allowed creating without any characters
     bool have_req_level_for_heroic = (req_level_for_heroic==0);
-
     if(!AllowTwoSideAccounts || skipCinematics == 1 || class_ == CLASS_DEATH_KNIGHT)
     {
         QueryResult *result2 = CharacterDatabase.PQuery("SELECT level,race,class FROM characters WHERE account = '%u' %s",
@@ -341,10 +300,8 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
         if(result2)
         {
             uint32 team_= Player::TeamForRace(race_);
-
             Field* field = result2->Fetch();
             uint8 acc_race  = field[1].GetUInt32();
-
             if(GetSecurity()==SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
             {
                 uint8 acc_class = field[2].GetUInt32();
@@ -352,7 +309,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                 {
                     if(heroic_free_slots > 0)
                         --heroic_free_slots;
-
                     if(heroic_free_slots==0)
                     {
                         data << (uint8)CHAR_CREATE_UNIQUE_CLASS_LIMIT;
@@ -360,7 +316,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                         return;
                     }
                 }
-
                 if(!have_req_level_for_heroic)
                 {
                     uint32 acc_level = field[0].GetUInt32();
@@ -368,7 +323,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                         have_req_level_for_heroic = true;
                 }
             }
-
             // need to check team only for first character
             // TODO: what to if account already has characters of both races?
             if (!AllowTwoSideAccounts)
@@ -376,7 +330,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                 uint32 acc_team=0;
                 if(acc_race > 0)
                     acc_team = Player::TeamForRace(acc_race);
-
                 if(acc_team != team_)
                 {
                     data << (uint8)CHAR_CREATE_PVP_TEAMS_VIOLATION;
@@ -385,20 +338,16 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                     return;
                 }
             }
-
             // search same race for cinematic or same class if need
             // TODO: check if cinematic already shown? (already logged in?; cinematic field)
             while ((skipCinematics == 1 && !have_same_race) || class_ == CLASS_DEATH_KNIGHT)
             {
                 if(!result2->NextRow())
                     break;
-
                 field = result2->Fetch();
                 acc_race = field[1].GetUInt32();
-
                 if(!have_same_race)
                     have_same_race = race_ == acc_race;
-
                 if(GetSecurity()==SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT)
                 {
                     uint8 acc_class = field[2].GetUInt32();
@@ -406,7 +355,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                     {
                         if(heroic_free_slots > 0)
                             --heroic_free_slots;
-
                         if(heroic_free_slots==0)
                         {
                             data << (uint8)CHAR_CREATE_UNIQUE_CLASS_LIMIT;
@@ -414,7 +362,6 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
                             return;
                         }
                     }
-
                     if(!have_req_level_for_heroic)
                     {
                         uint32 acc_level = field[0].GetUInt32();
@@ -426,14 +373,12 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
             delete result2;
         }
     }
-
     if(GetSecurity()==SEC_PLAYER && class_ == CLASS_DEATH_KNIGHT && !have_req_level_for_heroic)
     {
         data << (uint8)CHAR_CREATE_LEVEL_REQUIREMENT;
         SendPacket( &data );
         return;
     }
-
     // extract other data required for player creating
     uint8 gender, skin, face, hairStyle, hairColor, facialHair, outfitId;
     recv_data >> gender;
@@ -443,58 +388,44 @@ void WorldSession::HandleCharCreateOpcode( WorldPacket & recv_data )
     recv_data >> hairColor;
     recv_data >> facialHair;
     recv_data >> outfitId;
-    
     if(recv_data.rpos() < recv_data.wpos())
     {
         uint8 unk;
         recv_data >> unk;
         sLog.outDebug("Character creation %s (account %u) has unhandled tail data: [%u]", name.c_str(), GetAccountId(), unk);
     }
-
     Player * pNewChar = new Player(this);
     if(!pNewChar->Create( objmgr.GenerateLowGuid(HIGHGUID_PLAYER), name, race_, class_, gender, skin, face, hairStyle, hairColor, facialHair, outfitId ))
     {
         // Player not create (race/class problem?)
         delete pNewChar;
-
         data << (uint8)CHAR_CREATE_ERROR;
         SendPacket( &data );
-
         return;
     }
-
     if ((have_same_race && skipCinematics == 1) || skipCinematics == 2)
         pNewChar->setCinematic(1);                          // not show intro
-
     // Player created, save it now
     pNewChar->SaveToDB();
     charcount+=1;
-
     loginDatabase.PExecute("DELETE FROM realmcharacters WHERE acctid= '%d' AND realmid = '%d'", GetAccountId(), realmID);
     loginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)",  charcount, GetAccountId(), realmID);
-
     delete pNewChar;                                        // created only to call SaveToDB()
-
     data << (uint8)CHAR_CREATE_SUCCESS;
     SendPacket( &data );
-
     std::string IP_str = GetRemoteAddress();
     sLog.outDetail("Account: %d (IP: %s) Create Character:[%s]",GetAccountId(),IP_str.c_str(),name.c_str());
     sLog.outChar("Account: %d (IP: %s) Create Character:[%s]",GetAccountId(),IP_str.c_str(),name.c_str());
 }
-
 void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     // can't delete loaded character
     if(objmgr.GetPlayer(guid))
         return;
-
     uint32 accountId = 0;
     std::string name;
-
     // is guild leader
     if(objmgr.GetGuildByLeader(guid))
     {
@@ -503,7 +434,6 @@ void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     // is arena team captain
     if(objmgr.GetArenaTeamByCaptain(guid))
     {
@@ -512,7 +442,6 @@ void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT account,name FROM characters WHERE guid='%u'", GUID_LOPART(guid));
     if(result)
     {
@@ -521,28 +450,22 @@ void WorldSession::HandleCharDeleteOpcode( WorldPacket & recv_data )
         name = fields[1].GetCppString();
         delete result;
     }
-
     // prevent deleting other players' characters using cheating tools
     if(accountId != GetAccountId())
         return;
-
     std::string IP_str = GetRemoteAddress();
     sLog.outDetail("Account: %d (IP: %s) Delete Character:[%s] (guid: %u)",GetAccountId(),IP_str.c_str(),name.c_str(),GUID_LOPART(guid));
     sLog.outChar("Account: %d (IP: %s) Delete Character:[%s] (guid: %u)",GetAccountId(),IP_str.c_str(),name.c_str(),GUID_LOPART(guid));
-
     if(sLog.IsOutCharDump())                                // optimize GetPlayerDump call
     {
         std::string dump = PlayerDumpWriter().GetDump(GUID_LOPART(guid));
         sLog.outCharDump(dump.c_str(),GetAccountId(),GUID_LOPART(guid),name.c_str());
     }
-
     Player::DeleteFromDB(guid, GetAccountId());
-
     WorldPacket data(SMSG_CHAR_DELETE, 1);
     data << (uint8)CHAR_DELETE_SUCCESS;
     SendPacket( &data );
 }
-
 void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
 {
     if(PlayerLoading() || GetPlayer() != NULL)
@@ -550,14 +473,10 @@ void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
         sLog.outError("Player tryes to login again, AccountId = %d",GetAccountId());
         return;
     }
-
     m_playerLoading = true;
     uint64 playerGuid = 0;
-
     DEBUG_LOG( "WORLD: Recvd Player Logon Message" );
-
     recv_data >> playerGuid;
-
     LoginQueryHolder *holder = new LoginQueryHolder(GetAccountId(), playerGuid);
     if(!holder->Initialize())
     {
@@ -565,18 +484,14 @@ void WorldSession::HandlePlayerLoginOpcode( WorldPacket & recv_data )
         m_playerLoading = false;
         return;
     }
-
     CharacterDatabase.DelayQueryHolder(&chrHandler, &CharacterHandler::HandlePlayerLoginCallback, holder);
 }
-
 void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
 {
     uint64 playerGuid = holder->GetGuid();
-
     Player* pCurrChar = new Player(this);
      // for send server info and strings (config)
     ChatHandler chH = ChatHandler(pCurrChar);
-
     // "GetAccountId()==db stored account id" checked in LoadFromDB (prevent login not own character using cheating tools)
     if(!pCurrChar->LoadFromDB(GUID_LOPART(playerGuid), holder))
     {
@@ -586,13 +501,9 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
         m_playerLoading = false;
         return;
     }
-
     pCurrChar->GetMotionMaster()->Initialize();
-
     SetPlayer(pCurrChar);
-
     pCurrChar->SendDungeonDifficulty(false);
-
     WorldPacket data( SMSG_LOGIN_VERIFY_WORLD, 20 );
     data << pCurrChar->GetMapId();
     data << pCurrChar->GetPositionX();
@@ -600,25 +511,20 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
     data << pCurrChar->GetPositionZ();
     data << pCurrChar->GetOrientation();
     SendPacket(&data);
-
     // load player specific part before send times
     LoadAccountData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACCOUNTDATA),PER_CHARACTER_CACHE_MASK);
     SendAccountDataTimes();
-
     data.Initialize(SMSG_FEATURE_SYSTEM_STATUS, 2);         // added in 2.2.0
     data << uint8(2);                                       // unknown value
     data << uint8(0);                                       // enable(1)/disable(0) voice chat interface in client
     SendPacket(&data);
-
     // Send MOTD
     {
         data.Initialize(SMSG_MOTD, 50);                     // new in 2.0.1
         data << (uint32)0;
-
         uint32 linecount=0;
         std::string str_motd = sWorld.GetMotd();
         std::string::size_type pos, nextpos;
-
         pos = 0;
         while ( (nextpos= str_motd.find('@',pos)) != std::string::npos )
         {
@@ -629,33 +535,25 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             }
             pos = nextpos+1;
         }
-
         if (pos<str_motd.length())
         {
             data << str_motd.substr(pos);
             ++linecount;
         }
-
         data.put(0, linecount);
-
         SendPacket( &data );
         DEBUG_LOG( "WORLD: Sent motd (SMSG_MOTD)" );
-
         // send server info
         if(sWorld.getConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
             chH.PSendSysMessage(_FULLVERSION);
-
         DEBUG_LOG( "WORLD: Sent server info" );
     }
-
     data.Initialize(SMSG_LEARNED_DANCE_MOVES, 4+4);
     data << uint32(0);
     data << uint32(0);
     SendPacket(&data);
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT guildid,rank FROM guild_member WHERE guid = '%u'",pCurrChar->GetGUIDLow());
     QueryResult *resultGuild = holder->GetResult(PLAYER_LOGIN_QUERY_LOADGUILD);
-
     if(resultGuild)
     {
         Field *fields = resultGuild->Fetch();
@@ -668,7 +566,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
         pCurrChar->SetInGuild(0);
         pCurrChar->SetRank(0);
     }
-
     if(pCurrChar->GetGuildId() != 0)
     {
         Guild* guild = objmgr.GetGuildById(pCurrChar->GetGuildId());
@@ -680,7 +577,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             data << guild->GetMOTD();
             SendPacket(&data);
             DEBUG_LOG( "WORLD: Sent guild-motd (SMSG_GUILD_EVENT)" );
-
             data.Initialize(SMSG_GUILD_EVENT, (5+10));      // we guess size
             data<<(uint8)GE_SIGNED_ON;
             data<<(uint8)1;
@@ -688,7 +584,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             data<<pCurrChar->GetGUID();
             guild->BroadcastPacket(&data);
             DEBUG_LOG( "WORLD: Sent guild-signed-on (SMSG_GUILD_EVENT)" );
-
             // Increment online members of the guild
             guild->IncOnlineMemberCount();
         }
@@ -699,30 +594,24 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
             pCurrChar->SetInGuild(0);
         }
     }
-
     if(!pCurrChar->isAlive())
         pCurrChar->SendCorpseReclaimDelay(true);
-
     pCurrChar->SendInitialPacketsBeforeAddToMap();
-
     //Show cinematic at the first time that player login
     if( !pCurrChar->getCinematic() )
     {
         pCurrChar->setCinematic(1);
-
         if(ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(pCurrChar->getClass()))
         {
             if (cEntry->CinematicSequence)
                 pCurrChar->SendCinematicStart(cEntry->CinematicSequence);
             else if (ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(pCurrChar->getRace()))
                 pCurrChar->SendCinematicStart(rEntry->CinematicSequence);
-
             // send new char string if not empty
             if (!sWorld.GetNewCharString().empty())
                 chH.PSendSysMessage(sWorld.GetNewCharString().c_str());
         }
     }
-
     if (!pCurrChar->GetMap()->Add(pCurrChar))
     {
         AreaTrigger const* at = objmgr.GetGoBackTrigger(pCurrChar->GetMapId());
@@ -731,29 +620,22 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
         else
             pCurrChar->TeleportTo(pCurrChar->m_homebindMapId, pCurrChar->m_homebindX, pCurrChar->m_homebindY, pCurrChar->m_homebindZ, pCurrChar->GetOrientation());
     }
-
     ObjectAccessor::Instance().AddObject(pCurrChar);
     //sLog.outDebug("Player %s added to Map.",pCurrChar->GetName());
-
     pCurrChar->SendInitialPacketsAfterAddToMap();
-
     CharacterDatabase.PExecute("UPDATE characters SET online = 1 WHERE guid = '%u'", pCurrChar->GetGUIDLow());
     loginDatabase.PExecute("UPDATE account SET online = 1 WHERE id = '%u'", GetAccountId());
     pCurrChar->SetInGameTime( getMSTime() );
-
     // announce group about member online (must be after add to player list to receive announce to self)
     if(Group *group = pCurrChar->GetGroup())
     {
         //pCurrChar->groupInfo.group->SendInit(this); // useless
         group->SendUpdate();
     }
-
     // friend status
     sSocialMgr.SendFriendStatus(pCurrChar, FRIEND_ONLINE, pCurrChar->GetGUIDLow(), true);
-
     // Place character in world (and load zone) before some object loading
     pCurrChar->LoadCorpse();
-
     // setting Ghost+speed if dead
     if (pCurrChar->m_deathState != ALIVE)
     {
@@ -761,78 +643,57 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
         if(pCurrChar->getRace() == RACE_NIGHTELF)
             pCurrChar->CastSpell(pCurrChar, SPELL_ID_NE_GHOST, true, 0);// auras SPELL_AURA_INCREASE_SPEED(+speed in wisp form), SPELL_AURA_INCREASE_SWIM_SPEED(+swim speed in wisp form), SPELL_AURA_TRANSFORM (to wisp form)
         pCurrChar->CastSpell(pCurrChar, SPELL_ID_GHOST, true, 0);     // auras SPELL_AURA_GHOST, SPELL_AURA_INCREASE_SPEED(why?), SPELL_AURA_INCREASE_SWIM_SPEED(why?)
-
         pCurrChar->SetMovement(MOVE_WATER_WALK);
     }
-
     pCurrChar->ContinueTaxiFlight();
-
     // reset for all pets before pet loading
     if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
         Pet::resetTalentsForAllPetsOf(pCurrChar);
-
     // Load pet if any (if player not alive and in taxi flight or another then pet will remember as temporary unsummoned)
     pCurrChar->LoadPet();
-
     // Set FFA PvP for non GM in non-rest mode
     if(sWorld.IsFFAPvPRealm() && !pCurrChar->isGameMaster() && !pCurrChar->HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_RESTING) )
         pCurrChar->SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
-
     if(pCurrChar->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP))
         pCurrChar->SetContestedPvP();
-
     // Apply at_login requests
     if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
     {
         pCurrChar->resetSpells();
         SendNotification(LANG_RESET_SPELLS);
     }
-
     if(pCurrChar->HasAtLoginFlag(AT_LOGIN_RESET_TALENTS))
     {
         pCurrChar->resetTalents(true);
         pCurrChar->SendTalentsInfoData(false);              // original talents send already in to SendInitialPacketsBeforeAddToMap, resend reset state
         SendNotification(LANG_RESET_TALENTS);
     }
-
     // show time before shutdown if shutdown planned.
     if(sWorld.IsShutdowning())
         sWorld.ShutdownMsg(true,pCurrChar);
-
     if(sWorld.getConfig(CONFIG_ALL_TAXI_PATHS))
         pCurrChar->SetTaxiCheater(true);
-
     if(pCurrChar->isGameMaster())
         SendNotification(LANG_GM_ON);
-
     std::string IP_str = GetRemoteAddress();
     sLog.outChar("Account: %d (IP: %s) Login Character:[%s] (guid:%u)",
         GetAccountId(),IP_str.c_str(),pCurrChar->GetName() ,pCurrChar->GetGUIDLow());
-
     if(!pCurrChar->IsStandState() && !pCurrChar->hasUnitState(UNIT_STAT_STUNNED))
         pCurrChar->SetStandState(UNIT_STAND_STATE_STAND);
-
     m_playerLoading = false;
-
     //Hook for OnLogin Event
     Script->OnLogin(pCurrChar);
-
     delete holder;
 }
-
 void WorldSession::HandleSetFactionAtWar( WorldPacket & recv_data )
 {
     DEBUG_LOG( "WORLD: Received CMSG_SET_FACTION_ATWAR" );
-
     uint32 repListID;
     uint8  flag;
-
     recv_data >> repListID;
     recv_data >> flag;
-
     GetPlayer()->GetReputationMgr().SetAtWar(repListID,flag);
 }
-
 //I think this function is never used :/ I dunno, but i guess this opcode not exists
 void WorldSession::HandleSetFactionCheat( WorldPacket & /*recv_data*/ )
 {
@@ -840,12 +701,9 @@ void WorldSession::HandleSetFactionCheat( WorldPacket & /*recv_data*/ )
     /*
         uint32 FactionID;
         uint32 Standing;
-
         recv_data >> FactionID;
         recv_data >> Standing;
-
         std::list<struct Factions>::iterator itr;
-
         for(itr = GetPlayer()->factions.begin(); itr != GetPlayer()->factions.end(); ++itr)
         {
             if(itr->ReputationListID == FactionID)
@@ -858,19 +716,15 @@ void WorldSession::HandleSetFactionCheat( WorldPacket & /*recv_data*/ )
     */
     GetPlayer()->GetReputationMgr().SendStates();
 }
-
 void WorldSession::HandleMeetingStoneInfo( WorldPacket & /*recv_data*/ )
 {
     DEBUG_LOG( "WORLD: Received CMSG_MEETING_STONE_INFO" );
-
     SendLfgUpdate(0, 0, 0);
 }
-
 void WorldSession::HandleTutorialFlag( WorldPacket & recv_data )
 {
     uint32 iFlag;
     recv_data >> iFlag;
-
     uint32 wInt = (iFlag / 32);
     if (wInt >= 8)
     {
@@ -878,26 +732,21 @@ void WorldSession::HandleTutorialFlag( WorldPacket & recv_data )
         return;
     }
     uint32 rInt = (iFlag % 32);
-
     uint32 tutflag = GetTutorialInt( wInt );
     tutflag |= (1 << rInt);
     SetTutorialInt( wInt, tutflag );
-
     //sLog.outDebug("Received Tutorial Flag Set {%u}.", iFlag);
 }
-
 void WorldSession::HandleTutorialClear( WorldPacket & /*recv_data*/ )
 {
     for (int i = 0; i < 8; ++i)
         SetTutorialInt( i, 0xFFFFFFFF );
 }
-
 void WorldSession::HandleTutorialReset( WorldPacket & /*recv_data*/ )
 {
     for (int i = 0; i < 8; ++i)
         SetTutorialInt( i, 0x00000000 );
 }
-
 void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_WATCHED_FACTION");
@@ -905,37 +754,30 @@ void WorldSession::HandleSetWatchedFactionOpcode(WorldPacket & recv_data)
     recv_data >> fact;
     GetPlayer()->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, fact);
 }
-
 void WorldSession::HandleSetFactionInactiveOpcode(WorldPacket & recv_data)
 {
     DEBUG_LOG("WORLD: Received CMSG_SET_FACTION_INACTIVE");
     uint32 replistid;
     uint8 inactive;
     recv_data >> replistid >> inactive;
-
     _player->GetReputationMgr().SetInactive(replistid, inactive);
 }
-
 void WorldSession::HandleShowingHelmOpcode( WorldPacket & /*recv_data*/ )
 {
     DEBUG_LOG("CMSG_SHOWING_HELM for %s", _player->GetName());
     _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM);
 }
-
 void WorldSession::HandleShowingCloakOpcode( WorldPacket & /*recv_data*/ )
 {
     DEBUG_LOG("CMSG_SHOWING_CLOAK for %s", _player->GetName());
     _player->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_CLOAK);
 }
-
 void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
 {
     uint64 guid;
     std::string newname;
-
     recv_data >> guid;
     recv_data >> newname;
-
     // prevent character rename to invalid name
     if (!normalizePlayerName(newname))
     {
@@ -944,7 +786,6 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     uint8 res = ObjectMgr::CheckPlayerName(newname,true);
     if (res != CHAR_NAME_SUCCESS)
     {
@@ -953,7 +794,6 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     // check name limitations
     if (GetSecurity() == SEC_PLAYER && objmgr.IsReservedName(newname))
     {
@@ -962,10 +802,8 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     std::string escaped_newname = newname;
     CharacterDatabase.escape_string(escaped_newname);
-
     // make sure that the character belongs to the current account, that rename at login is enabled
     // and that there is no character with the desired new name
     CharacterDatabase.AsyncPQuery(&WorldSession::HandleChangePlayerNameOpcodeCallBack,
@@ -974,7 +812,6 @@ void WorldSession::HandleCharRenameOpcode(WorldPacket& recv_data)
         GUID_LOPART(guid), GetAccountId(), AT_LOGIN_RENAME, AT_LOGIN_RENAME, escaped_newname.c_str()
     );
 }
-
 void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uint32 accountId, std::string newname)
 {
     WorldSession * session = sWorld.FindSession(accountId);
@@ -983,7 +820,6 @@ void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uin
         if(result) delete result;
         return;
     }
-
     if (!result)
     {
         WorldPacket data(SMSG_CHAR_RENAME, 1);
@@ -991,31 +827,23 @@ void WorldSession::HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uin
         session->SendPacket( &data );
         return;
     }
-
     uint32 guidLow = result->Fetch()[0].GetUInt32();
     uint64 guid = MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER);
     std::string oldname = result->Fetch()[1].GetCppString();
-
     delete result;
-
     CharacterDatabase.PExecute("UPDATE characters set name = '%s', at_login = at_login & ~ %u WHERE guid ='%u'", newname.c_str(), uint32(AT_LOGIN_RENAME), guidLow);
     CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid ='%u'", guidLow);
-
     sLog.outChar("Account: %d (IP: %s) Character:[%s] (guid:%u) Changed name to: %s", session->GetAccountId(), session->GetRemoteAddress().c_str(), oldname.c_str(), guidLow, newname.c_str());
-
     WorldPacket data(SMSG_CHAR_RENAME, 1+8+(newname.size()+1));
     data << uint8(RESPONSE_SUCCESS);
     data << uint64(guid);
     data << newname;
     session->SendPacket(&data);
 }
-
 void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
 {
     uint64 guid;
-
     recv_data >> guid;
-
     // not accept declined names for unsupported languages
     std::string name;
     if(!objmgr.GetPlayerNameByGUID(guid, name))
@@ -1026,7 +854,6 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
         SendPacket(&data);
         return;
     }
-
     std::wstring wname;
     if(!Utf8toWStr(name, wname))
     {
@@ -1036,7 +863,6 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
         SendPacket(&data);
         return;
     }
-
     if(!isCyrillicCharacter(wname[0]))                      // name already stored as only single alphabet using
     {
         WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
@@ -1045,12 +871,9 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
         SendPacket(&data);
         return;
     }
-
     std::string name2;
     DeclinedName declinedname;
-
     recv_data >> name2;
-
     if(name2 != name)                                       // character have different name
     {
         WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
@@ -1059,7 +882,6 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
         SendPacket(&data);
         return;
     }
-
     for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
     {
         recv_data >> declinedname.name[i];
@@ -1072,7 +894,6 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
             return;
         }
     }
-
     if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname, 0), declinedname))
     {
         WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
@@ -1081,41 +902,30 @@ void WorldSession::HandleSetPlayerDeclinedNames(WorldPacket& recv_data)
         SendPacket(&data);
         return;
     }
-
     for(int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         CharacterDatabase.escape_string(declinedname.name[i]);
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'", GUID_LOPART(guid));
     CharacterDatabase.PExecute("INSERT INTO character_declinedname (guid, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%s','%s','%s','%s','%s')",
         GUID_LOPART(guid), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
     CharacterDatabase.CommitTransaction();
-
     WorldPacket data(SMSG_SET_PLAYER_DECLINED_NAMES_RESULT, 4+8);
     data << uint32(0);                                      // OK
     data << uint64(guid);
     SendPacket(&data);
 }
-
 void WorldSession::HandleAlterAppearance( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_ALTER_APPEARANCE");
-
     uint32 Hair, Color, FacialHair;
     recv_data >> Hair >> Color >> FacialHair;
-
     BarberShopStyleEntry const* bs_hair = sBarberShopStyleStore.LookupEntry(Hair);
-
     if(!bs_hair || bs_hair->type != 0 || bs_hair->race != _player->getRace() || bs_hair->gender != _player->getGender())
         return;
-
     BarberShopStyleEntry const* bs_facialHair = sBarberShopStyleStore.LookupEntry(FacialHair);
-
     if(!bs_facialHair || bs_facialHair->type != 2 || bs_facialHair->race != _player->getRace() || bs_facialHair->gender != _player->getGender())
         return;
-
     uint32 Cost = _player->GetBarberShopCost(bs_hair->hair_id, Color, bs_facialHair->hair_id);
-
     // 0 - ok
     // 1,3 - not enough money
     // 2 - you have to seat on barber chair
@@ -1132,30 +942,23 @@ void WorldSession::HandleAlterAppearance( WorldPacket & recv_data )
         data << uint32(0);                                  // ok
         SendPacket(&data);
     }
-
     _player->ModifyMoney(-int32(Cost));                     // it isn't free
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_AT_BARBER, Cost);
-
     _player->SetByteValue(PLAYER_BYTES, 2, uint8(bs_hair->hair_id));
     _player->SetByteValue(PLAYER_BYTES, 3, uint8(Color));
     _player->SetByteValue(PLAYER_BYTES_2, 0, uint8(bs_facialHair->hair_id));
-
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP, 1);
-
     _player->SetStandState(0);                              // stand up
 }
-
 void WorldSession::HandleRemoveGlyph( WorldPacket & recv_data )
 {
     uint32 slot;
     recv_data >> slot;
-
     if(slot >= MAX_GLYPH_SLOT_INDEX)
     {
         sLog.outDebug("Client sent wrong glyph slot number in opcode CMSG_REMOVE_GLYPH %u", slot);
         return;
     }
-
     if(uint32 glyph = _player->GetGlyph(slot))
     {
         if(GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
@@ -1166,18 +969,14 @@ void WorldSession::HandleRemoveGlyph( WorldPacket & recv_data )
         }
     }
 }
-
 void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
 {
     uint64 guid;
     std::string newname;
-
     recv_data >> guid;
     recv_data >> newname;
-
     uint8 gender, skin, face, hairStyle, hairColor, facialHair;
     recv_data >> gender >> skin >> hairColor >> hairStyle >> facialHair >> face;
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT at_login FROM characters WHERE guid ='%u'", GUID_LOPART(guid));
     if (!result)
     {
@@ -1186,11 +985,9 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     Field *fields = result->Fetch();
     uint32 at_loginFlags = fields[0].GetUInt32();
     delete result;
-
     if (!(at_loginFlags & AT_LOGIN_CUSTOMIZE))
     {
         WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1);
@@ -1198,7 +995,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     // prevent character rename to invalid name
     if (!normalizePlayerName(newname))
     {
@@ -1207,7 +1003,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     uint8 res = ObjectMgr::CheckPlayerName(newname,true);
     if (res != CHAR_NAME_SUCCESS)
     {
@@ -1216,7 +1011,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     // check name limitations
     if (GetSecurity() == SEC_PLAYER && objmgr.IsReservedName(newname))
     {
@@ -1225,7 +1019,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
         SendPacket( &data );
         return;
     }
-
     // character with this name already exist
     if (uint64 newguid = objmgr.GetPlayerGUIDByName(newname))
     {
@@ -1237,7 +1030,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
             return;
         }
     }
-
     CharacterDatabase.escape_string(newname);
     if(QueryResult *result = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid ='%u'", GUID_LOPART(guid)))
     {
@@ -1248,7 +1040,6 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
     Player::Customize(guid, gender, skin, face, hairStyle, hairColor, facialHair);
     CharacterDatabase.PExecute("UPDATE characters set name = '%s', at_login = at_login & ~ %u WHERE guid ='%u'", newname.c_str(), uint32(AT_LOGIN_CUSTOMIZE), GUID_LOPART(guid));
     CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid ='%u'", GUID_LOPART(guid));
-
     WorldPacket data(SMSG_CHAR_CUSTOMIZE, 1+8+(newname.size()+1)+6);
     data << uint8(RESPONSE_SUCCESS);
     data << uint64(guid);
@@ -1261,90 +1052,66 @@ void WorldSession::HandleCharCustomize(WorldPacket& recv_data)
     data << uint8(facialHair);
     SendPacket(&data);
 }
-
 void WorldSession::HandleEquipmentSetSave(WorldPacket &recv_data)
 {
     sLog.outDebug("CMSG_EQUIPMENT_SET_SAVE");
-
     uint64 setGuid;
     if(!recv_data.readPackGUID(setGuid))
         return;
-
     uint32 index;
     recv_data >> index;
     if(index >= MAX_EQUIPMENT_SET_INDEX)                    // client set slots amount
         return;
-
     std::string name;
     recv_data >> name;
-
     std::string iconName;
     recv_data >> iconName;
-
     EquipmentSet eqSet;
-
     eqSet.Guid      = setGuid;
     eqSet.Name      = name;
     eqSet.IconName  = iconName;
     eqSet.state     = EQUIPMENT_SET_NEW;
-
     for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         uint64 itemGuid;
         if(!recv_data.readPackGUID(itemGuid))
             return;
-
         Item *item = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-
         if(!item && itemGuid)                               // cheating check 1
             return;
-
         if(item && item->GetGUID() != itemGuid)             // cheating check 2
             return;
-
         eqSet.Items[i] = GUID_LOPART(itemGuid);
     }
-
     _player->SetEquipmentSet(index, eqSet);
 }
-
 void WorldSession::HandleEquipmentSetDelete(WorldPacket &recv_data)
 {
     sLog.outDebug("CMSG_EQUIPMENT_SET_DELETE");
-
     uint64 setGuid;
     if(!recv_data.readPackGUID(setGuid))
         return;
-
     _player->DeleteEquipmentSet(setGuid);
 }
-
 void WorldSession::HandleEquipmentSetUse(WorldPacket &recv_data)
 {
     sLog.outDebug("CMSG_EQUIPMENT_SET_USE");
     recv_data.hexlike();
-
     for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         uint64 itemGuid;
         if(!recv_data.readPackGUID(itemGuid))
             return;
-
         uint8 srcbag, srcslot;
         recv_data >> srcbag >> srcslot;
-
         sLog.outDebug("Item " UI64FMTD ": srcbag %u, srcslot %u", itemGuid, srcbag, srcslot);
-
         Item *item = _player->GetItemByGuid(itemGuid);
-
         uint16 dstpos = i | (INVENTORY_SLOT_BAG_0 << 8);
-
         if(!item)
         {
             Item *uItem = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
             if(!uItem)
                 continue;
-
             ItemPosCountVec sDest;
             uint8 msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, sDest, uItem, false );
             if(msg == EQUIP_ERR_OK)
@@ -1354,61 +1121,48 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket &recv_data)
             }
             else
                 _player->SendEquipError(msg, uItem, NULL);
-
             continue;
         }
-
         if(item->GetPos() == dstpos)
             continue;
-
         _player->SwapItem(item->GetPos(), dstpos);
     }
-
     WorldPacket data(SMSG_EQUIPMENT_SET_USE_RESULT, 1);
     data << uint8(0);                                       // 4 - equipment swap failed - inventory is full
     SendPacket(&data);
 }
-
 void WorldSession::HandleOnPVPKill(Player *killed)
 {
     Script->OnPVPKill(GetPlayer(), killed);
 }
-
 bool WorldSession::HandleOnPlayerChat(const char *text)
 {
     return Script->OnPlayerChat(GetPlayer(), text);
 }
-
 uint32 WorldSession::HandleOnGetXP(uint32 amount)
 {
     return Script->OnGetXP(GetPlayer(), amount);
 }
-
 int32 WorldSession::HandleOnGetMoney(int32 amount)
 {
     return Script->OnGetMoney(GetPlayer(), amount);
 }
-
 void WorldSession::HandleOnAreaChange(AreaTableEntry const *pArea)
 {
     Script->OnAreaChange(GetPlayer(), pArea);
 }
-
 bool WorldSession::HandleOnItemClick(Item *pItem)
 {
     return Script->OnItemClick(GetPlayer(), pItem);
 }
-
 bool WorldSession::HandleOnItemOpen(Item *pItem)
 {
     return Script->OnItemOpen(GetPlayer(), pItem);
 }
-
 bool WorldSession::HandleOnGoClick(GameObject *pGameObject)
 {
     return Script->OnGoClick(GetPlayer(), pGameObject);
 }
-
 void WorldSession::HandleOnCreatureKill(Creature *pCreature)
 {
     Script->OnCreatureKill(GetPlayer(), pCreature);
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index 32233aae5a9..bb8d71e4a3c 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
-
 #include "AccountMgr.h"
 #include "CellImpl.h"
 #include "Chat.h"
@@ -36,7 +34,6 @@
 #include "UpdateMask.h"
 #include "SpellMgr.h"
 #include "ScriptCalls.h"
-
 // Supported shift-links (client generated and server side)
 // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r
 //                                                                        - client, item icon shift click, not used in server currently
@@ -59,9 +56,7 @@
 // |color|Htaxinode:id|h[name]|h|r
 // |color|Htele:id|h[name]|h|r
 // |color|Htrade:spell_id,cur_value,max_value,unk3int,unk3str|h[name]|h|r - client, spellbook profession icon shift-click
-
 bool ChatHandler::load_command_table = true;
-
 ChatCommand * ChatHandler::getCommandTable()
 {
     static ChatCommand accountSetCommandTable[] =
@@ -71,7 +66,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "password",       SEC_CONSOLE,        true,  &ChatHandler::HandleAccountSetPasswordCommand,  "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand accountCommandTable[] =
     {
         { "addon",          SEC_PLAYER,         false, &ChatHandler::HandleAccountAddonCommand,        "", NULL },
@@ -84,7 +78,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_PLAYER,         false, &ChatHandler::HandleAccountCommand,             "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand banCommandTable[] =
     {
         { "account",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanAccountCommand,          "", NULL },
@@ -92,7 +85,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "ip",             SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanIPCommand,               "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand baninfoCommandTable[] =
     {
         { "account",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanInfoAccountCommand,      "", NULL },
@@ -100,7 +92,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "ip",             SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanInfoIPCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand banlistCommandTable[] =
     {
         { "account",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanListAccountCommand,      "", NULL },
@@ -108,7 +99,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "ip",             SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleBanListIPCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand castCommandTable[] =
     {
         { "back",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleCastBackCommand,            "", NULL },
@@ -118,7 +108,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_ADMINISTRATOR,  false, &ChatHandler::HandleCastCommand,                "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand characterCommandTable[] =
     {
         { "customize",      SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterCustomizeCommand,  "", NULL },
@@ -128,7 +117,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "reputation",     SEC_GAMEMASTER,     true,  &ChatHandler::HandleCharacterReputationCommand, "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand debugPlayCommandTable[] =
     {
         { "cinematic",      SEC_MODERATOR,      false, &ChatHandler::HandleDebugPlayCinematicCommand,       "", NULL },
@@ -136,7 +124,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "sound",          SEC_MODERATOR,      false, &ChatHandler::HandleDebugPlaySoundCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
-
     static ChatCommand debugSendCommandTable[] =
     {
         { "buyerror",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendBuyErrorCommand,        "", NULL },
@@ -153,7 +140,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "spellfail",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSendSpellFailCommand,       "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
-
     static ChatCommand debugCommandTable[] =
     {
         { "setbit",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugSet32Bit,                   "", NULL },
@@ -179,7 +165,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "itemexpire",     SEC_ADMINISTRATOR,  false, &ChatHandler::HandleDebugItemExpireCommand,          "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
-
     static ChatCommand eventCommandTable[] =
     {
         { "activelist",     SEC_GAMEMASTER,     true,  &ChatHandler::HandleEventActiveListCommand,     "", NULL },
@@ -188,7 +173,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_GAMEMASTER,     true,  &ChatHandler::HandleEventInfoCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand gmCommandTable[] =
     {
         { "chat",           SEC_MODERATOR,      false, &ChatHandler::HandleGMChatCommand,              "", NULL },
@@ -199,7 +183,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_MODERATOR,      false, &ChatHandler::HandleGMCommand,                  "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand goCommandTable[] =
     {
         { "creature",       SEC_MODERATOR,      false, &ChatHandler::HandleGoCreatureCommand,          "", NULL },
@@ -212,12 +195,9 @@ ChatCommand * ChatHandler::getCommandTable()
         { "xy",             SEC_MODERATOR,      false, &ChatHandler::HandleGoXYCommand,                "", NULL },
         { "xyz",            SEC_MODERATOR,      false, &ChatHandler::HandleGoXYZCommand,               "", NULL },
         { "",               SEC_MODERATOR,      false, &ChatHandler::HandleGoXYZCommand,               "", NULL },
-
         { "ticket",         SEC_MODERATOR,      false, &ChatHandler::HandleGoTicketCommand,            "", NULL },
-
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand gobjectCommandTable[] =
     {
         { "activate",       SEC_GAMEMASTER,     false, &ChatHandler::HandleActivateObjectCommand,      "", NULL },
@@ -232,7 +212,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "turn",           SEC_GAMEMASTER,     false, &ChatHandler::HandleGameObjectTurnCommand,      "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand groupCommandTable[] =
     {
         { "leader",         SEC_ADMINISTRATOR,     false,  &ChatHandler::HandleGroupLeaderCommand,         "", NULL },
@@ -240,7 +219,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "remove",         SEC_ADMINISTRATOR,     false,  &ChatHandler::HandleGroupRemoveCommand,         "", NULL },
         { NULL,             0,                     false, NULL,                                           "", NULL }
     };
-
     static ChatCommand guildCommandTable[] =
     {
         { "create",         SEC_GAMEMASTER,     true,  &ChatHandler::HandleGuildCreateCommand,         "", NULL },
@@ -250,7 +228,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "rank",           SEC_GAMEMASTER,     true,  &ChatHandler::HandleGuildRankCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand honorCommandTable[] =
     {
         { "add",            SEC_GAMEMASTER,     false, &ChatHandler::HandleHonorAddCommand,            "", NULL },
@@ -258,7 +235,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "update",         SEC_GAMEMASTER,     false, &ChatHandler::HandleHonorUpdateCommand,         "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand instanceCommandTable[] =
     {
         { "listbinds",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleInstanceListBindsCommand,   "", NULL },
@@ -267,7 +243,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "savedata",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleInstanceSaveDataCommand,    "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand learnCommandTable[] =
     {
         { "all",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLearnAllCommand,            "", NULL },
@@ -283,7 +258,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_ADMINISTRATOR,  false, &ChatHandler::HandleLearnCommand,               "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand listCommandTable[] =
     {
         { "creature",       SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleListCreatureCommand,        "", NULL },
@@ -292,7 +266,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "auras",          SEC_ADMINISTRATOR,  false, &ChatHandler::HandleListAurasCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand lookupPlayerCommandTable[] =
     {
         { "ip",             SEC_GAMEMASTER,     true,  &ChatHandler::HandleLookupPlayerIpCommand,       "", NULL },
@@ -300,7 +273,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "email",          SEC_GAMEMASTER,     true,  &ChatHandler::HandleLookupPlayerEmailCommand,    "", NULL },
         { NULL,             0,                  false, NULL,                                            "", NULL }
     };
-
     static ChatCommand lookupCommandTable[] =
     {
         { "area",           SEC_MODERATOR,      true,  &ChatHandler::HandleLookupAreaCommand,          "", NULL },
@@ -319,7 +291,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "map",            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleLookupMapCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand modifyCommandTable[] =
     {
         { "hp",             SEC_MODERATOR,      false, &ChatHandler::HandleModifyHPCommand,            "", NULL },
@@ -350,7 +321,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "gender",         SEC_GAMEMASTER,     false, &ChatHandler::HandleModifyGenderCommand,        "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand npcCommandTable[] =
     {
         { "add",            SEC_GAMEMASTER,     false, &ChatHandler::HandleNpcAddCommand,              "", NULL },
@@ -382,16 +352,13 @@ ChatCommand * ChatHandler::getCommandTable()
         { "setdeathstate",  SEC_GAMEMASTER,     false, &ChatHandler::HandleNpcSetDeathStateCommand,    "", NULL },
         { "addformation",   SEC_MODERATOR,      false, &ChatHandler::HandleNpcAddFormationCommand,     "", NULL },
         { "setlink",        SEC_MODERATOR,      false, &ChatHandler::HandleNpcSetLinkCommand,          "", NULL },
-
         //{ TODO: fix or remove this commands
         { "addweapon",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleNpcAddWeaponCommand,        "", NULL },
         { "name",           SEC_GAMEMASTER,     false, &ChatHandler::HandleNpcNameCommand,             "", NULL },
         { "subname",        SEC_GAMEMASTER,     false, &ChatHandler::HandleNpcSubNameCommand,          "", NULL },
         //}
-
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand petCommandTable[] =
     {
         { "create",         SEC_GAMEMASTER,     false, &ChatHandler::HandleCreatePetCommand,           "", NULL },
@@ -400,14 +367,12 @@ ChatCommand * ChatHandler::getCommandTable()
         { "tp",             SEC_GAMEMASTER,     false, &ChatHandler::HandlePetTpCommand,               "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand pdumpCommandTable[] =
     {
         { "load",           SEC_ADMINISTRATOR,  true,  &ChatHandler::HandlePDumpLoadCommand,           "", NULL },
         { "write",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandlePDumpWriteCommand,          "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand questCommandTable[] =
     {
         { "add",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleQuestAdd,                   "", NULL },
@@ -415,7 +380,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "remove",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleQuestRemove,                "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand reloadCommandTable[] =
     {
         { "all",            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllCommand,           "", NULL },
@@ -429,9 +393,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "all_quest",      SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllQuestCommand,      "", NULL },
         { "all_scripts",    SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllScriptsCommand,    "", NULL },
         { "all_spell",      SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadAllSpellCommand,      "", NULL },
-
         { "config",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleReloadConfigCommand,        "", NULL },
-
         { "access_requirement",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAccessRequirementCommand,       "", NULL },
         { "achievement_criteria_data",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAchievementCriteriaDataCommand, "", NULL },
         { "achievement_reward",          SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAchievementRewardCommand,       "", NULL },
@@ -507,10 +469,8 @@ ChatCommand * ChatHandler::getCommandTable()
         { "auctions",                    SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadAuctionsCommand,                "", NULL },
         { "waypoint_scripts",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadWpScriptsCommand,               "", NULL },
         { "gm_tickets",                  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleGMTicketReloadCommand,                "", NULL },
-
         { NULL,                          0,                 false, NULL,                                                     "", NULL }
     };
-
     static ChatCommand resetCommandTable[] =
     {
         { "achievements",   SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleResetAchievementsCommand,   "", NULL },
@@ -522,7 +482,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "all",            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleResetAllCommand,            "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand sendCommandTable[] =
     {
         { "items",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleSendItemsCommand,           "", NULL },
@@ -531,35 +490,30 @@ ChatCommand * ChatHandler::getCommandTable()
         { "money",          SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleSendMoneyCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverIdleRestartCommandTable[] =
     {
         { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerIdleRestartCommand,   "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverIdleShutdownCommandTable[] =
     {
         { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerIdleShutDownCommand,  "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverRestartCommandTable[] =
     {
         { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerRestartCommand,       "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverShutdownCommandTable[] =
     {
         { "cancel",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCancelCommand,"", NULL },
         { ""   ,            SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerShutDownCommand,      "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverSetCommandTable[] =
     {
         { "difftime",       SEC_CONSOLE,        true,  &ChatHandler::HandleServerSetDiffTimeCommand,   "", NULL },
@@ -569,7 +523,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "closed",         SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleServerSetClosedCommand,     "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand serverCommandTable[] =
     {
         { "corpses",        SEC_GAMEMASTER,     true,  &ChatHandler::HandleServerCorpsesCommand,       "", NULL },
@@ -584,7 +537,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "set",            SEC_ADMINISTRATOR,  true,  NULL,                                           "", serverSetCommandTable },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand teleCommandTable[] =
     {
         { "add",            SEC_ADMINISTRATOR,  false, &ChatHandler::HandleTeleAddCommand,             "", NULL },
@@ -594,7 +546,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "",               SEC_MODERATOR,      false, &ChatHandler::HandleTeleCommand,                "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand unbanCommandTable[] =
     {
         { "account",        SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleUnBanAccountCommand,      "", NULL },
@@ -602,7 +553,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "ip",             SEC_ADMINISTRATOR,  true,  &ChatHandler::HandleUnBanIPCommand,           "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand wpCommandTable[] =
     {
         { "show",           SEC_GAMEMASTER,     false, &ChatHandler::HandleWpShowCommand,              "", NULL },
@@ -613,7 +563,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "unload",         SEC_GAMEMASTER,     false, &ChatHandler::HandleWpUnLoadPathCommand,        "", NULL },
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     static ChatCommand ticketCommandTable[] =
     {
         { "list",           SEC_MODERATOR,      false, &ChatHandler::HandleGMTicketListCommand,             "", NULL },
@@ -628,7 +577,6 @@ ChatCommand * ChatHandler::getCommandTable()
         { "comment",        SEC_MODERATOR,      false, &ChatHandler::HandleGMTicketCommentCommand,          "", NULL },
         { NULL,             0,                  false, NULL,                                                "", NULL }
     };
-
     static ChatCommand commandTable[] =
     {
         { "account",        SEC_PLAYER,         true,  NULL,                                           "", accountCommandTable  },
@@ -654,12 +602,10 @@ ChatCommand * ChatHandler::getCommandTable()
         { "reset",          SEC_ADMINISTRATOR,  true,  NULL,                                           "", resetCommandTable    },
         { "instance",       SEC_ADMINISTRATOR,  true,  NULL,                                           "", instanceCommandTable },
         { "server",         SEC_ADMINISTRATOR,  true,  NULL,                                           "", serverCommandTable   },
-
         { "pet",            SEC_GAMEMASTER,     false, NULL,                                           "", petCommandTable },
         { "loadpath",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleReloadAllPaths,             "", NULL },
         { "ahbotoptions",   SEC_GAMEMASTER,     true,  &ChatHandler::HandleAHBotOptionsCommand,        "", NULL },
         { "ticket",         SEC_MODERATOR,      false,  NULL,                                          "", ticketCommandTable },
-
         { "aura",           SEC_ADMINISTRATOR,  false, &ChatHandler::HandleAuraCommand,                "", NULL },
         { "unaura",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleUnAuraCommand,              "", NULL },
         { "nameannounce",   SEC_MODERATOR,      false, &ChatHandler::HandleNameAnnounceCommand,        "", NULL },
@@ -720,24 +666,19 @@ ChatCommand * ChatHandler::getCommandTable()
         { "flusharenapoints",SEC_ADMINISTRATOR, false, &ChatHandler::HandleFlushArenaPointsCommand,    "", NULL },
         { "repairitems",    SEC_GAMEMASTER,     true,  &ChatHandler::HandleRepairitemsCommand,         "", NULL },
         { "waterwalk",      SEC_GAMEMASTER,     false, &ChatHandler::HandleWaterwalkCommand,           "", NULL },
-
         { "freeze",         SEC_ADMINISTRATOR,  false, &ChatHandler::HandleFreezeCommand,              "", NULL },
         { "unfreeze",       SEC_ADMINISTRATOR,  false, &ChatHandler::HandleUnFreezeCommand,            "", NULL },
         { "listfreeze",     SEC_ADMINISTRATOR,  false, &ChatHandler::HandleListFreezeCommand,          "", NULL },
-
         { "possess",        SEC_ADMINISTRATOR,  false, &ChatHandler::HandlePossessCommand,             "", NULL },
         { "unpossess",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleUnPossessCommand,           "", NULL },
         { "bindsight",      SEC_ADMINISTRATOR,  false, &ChatHandler::HandleBindSightCommand,           "", NULL },
         { "unbindsight",    SEC_ADMINISTRATOR,  false, &ChatHandler::HandleUnbindSightCommand,         "", NULL },
         { "playall",        SEC_ADMINISTRATOR,  false, &ChatHandler::HandlePlayAllCommand,             "", NULL },
-
         { NULL,             0,                  false, NULL,                                           "", NULL }
     };
-
     if (load_command_table)
     {
         load_command_table = false;
-
         QueryResult *result = WorldDatabase.Query("SELECT name,security,help FROM command");
         if (result)
         {
@@ -745,77 +686,61 @@ ChatCommand * ChatHandler::getCommandTable()
             {
                 Field *fields = result->Fetch();
                 std::string name = fields[0].GetCppString();
-
                 SetDataForCommandInTable(commandTable, name.c_str(), fields[1].GetUInt16(), fields[2].GetCppString(), name);
-
             } while(result->NextRow());
             delete result;
         }
     }
-
     return commandTable;
 }
-
 const char *ChatHandler::GetTrinityString(int32 entry) const
 {
     return m_session->GetTrinityString(entry);
 }
-
 bool ChatHandler::isAvailable(ChatCommand const& cmd) const
 {
     // check security level only for simple  command (without child commands)
     return m_session->GetSecurity() >= cmd.SecurityLevel;
 }
-
 bool ChatHandler::HasLowerSecurity(Player* target, uint64 guid, bool strong)
 {
     WorldSession* target_session = NULL;
     uint32 target_account = 0;
-
     if (target)
         target_session = target->GetSession();
     else if (guid)
         target_account = objmgr.GetPlayerAccountIdByGUID(guid);
-
     if (!target_session && !target_account)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return true;
     }
-
     return HasLowerSecurityAccount(target_session,target_account,strong);
 }
-
 bool ChatHandler::HasLowerSecurityAccount(WorldSession* target, uint32 target_account, bool strong)
 {
     uint32 target_sec;
-
     // allow everything from console and RA console
     if (!m_session)
         return false;
-
     // ignore only for non-players for non strong checks (when allow apply command at least to same sec level)
     if (m_session->GetSecurity() > SEC_PLAYER && !strong && !sWorld.getConfig(CONFIG_GM_LOWER_SECURITY))
         return false;
-
     if (target)
         target_sec = target->GetSecurity();
     else if (target_account)
         target_sec = accmgr.GetSecurity(target_account);
     else
         return true;                                        // caller must report error for (target==NULL && target_account==0)
-
     if (m_session->GetSecurity() < target_sec || (strong && m_session->GetSecurity() <= target_sec))
     {
         SendSysMessage(LANG_YOURS_SECURITY_IS_LOW);
         SetSentErrorMessage(true);
         return true;
     }
-
     return false;
 }
-
 bool ChatHandler::hasStringAbbr(const char* name, const char* part)
 {
     // non "" command
@@ -824,7 +749,6 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part)
         // "" part from non-"" command
         if (!*part)
             return false;
-
         for (;;)
         {
             if (!*part)
@@ -837,54 +761,42 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part)
         }
     }
     // allow with any for ""
-
     return true;
 }
-
 void ChatHandler::SendSysMessage(const char *str)
 {
     WorldPacket data;
-
     // need copy to prevent corruption by strtok call in LineFromMessage original string
     char* buf = strdup(str);
     char* pos = buf;
-
     while(char* line = LineFromMessage(pos))
     {
         FillSystemMessageData(&data, line);
         m_session->SendPacket(&data);
     }
-
     free(buf);
 }
-
 void ChatHandler::SendGlobalSysMessage(const char *str)
 {
     // Chat output
     WorldPacket data;
-
     // need copy to prevent corruption by strtok call in LineFromMessage original string
     char* buf = strdup(str);
     char* pos = buf;
-
     while(char* line = LineFromMessage(pos))
     {
         FillSystemMessageData(&data, line);
         sWorld.SendGlobalMessage(&data);
     }
-
     free(buf);
 }
-
 void ChatHandler::SendGlobalGMSysMessage(const char *str)
 {
     // Chat output
     WorldPacket data;
-
     // need copy to prevent corruption by strtok call in LineFromMessage original string
     char* buf = strdup(str);
     char* pos = buf;
-
     while(char* line = LineFromMessage(pos))
     {
         FillSystemMessageData(&data, line);
@@ -892,12 +804,10 @@ void ChatHandler::SendGlobalGMSysMessage(const char *str)
      }
     free(buf);
 }
-
 void ChatHandler::SendSysMessage(int32 entry)
 {
     SendSysMessage(GetTrinityString(entry));
 }
-
 void ChatHandler::PSendSysMessage(int32 entry, ...)
 {
     const char *format = GetTrinityString(entry);
@@ -908,7 +818,6 @@ void ChatHandler::PSendSysMessage(int32 entry, ...)
     va_end(ap);
     SendSysMessage(str);
 }
-
 void ChatHandler::PSendSysMessage(const char *format, ...)
 {
     va_list ap;
@@ -918,25 +827,20 @@ void ChatHandler::PSendSysMessage(const char *format, ...)
     va_end(ap);
     SendSysMessage(str);
 }
-
 bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, const std::string& fullcmd)
 {
     char const* oldtext = text;
     std::string cmd = "";
-
     while (*text != ' ' && *text != '\0')
     {
         cmd += *text;
         ++text;
     }
-
     while (*text == ' ') ++text;
-
     for (uint32 i = 0; table[i].Name != NULL; ++i)
     {
         if (!hasStringAbbr(table[i].Name, cmd.c_str()))
             continue;
-
         // select subcommand from child commands list
         if (table[i].ChildCommands != NULL)
         {
@@ -946,17 +850,13 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co
                     SendSysMessage(LANG_NO_SUBCMD);
                 else
                     SendSysMessage(LANG_CMD_SYNTAX);
-
                 ShowHelpForCommand(table[i].ChildCommands,text);
             }
-
             return true;
         }
-
         // must be available and have handler
         if (!table[i].Handler || !isAvailable(table[i]))
             continue;
-
         SetSentErrorMessage(false);
         // table[i].Name == "" is special case: send original command to handler
         if ((this->*(table[i].Handler))(strlen(table[i].Name)!=0 ? text : oldtext))
@@ -982,31 +882,24 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, co
             else
                 SendSysMessage(LANG_CMD_SYNTAX);
         }
-
         return true;
     }
-
     return false;
 }
-
 bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text, uint32 security, std::string const& help, std::string const& fullcommand)
 {
     std::string cmd = "";
-
     while (*text != ' ' && *text != '\0')
     {
         cmd += *text;
         ++text;
     }
-
     while (*text == ' ') ++text;
-
     for (uint32 i = 0; table[i].Name != NULL; i++)
     {
         // for data fill use full explicit command names
         if (table[i].Name != cmd)
             continue;
-
         // select subcommand from child commands list (including "")
         if (table[i].ChildCommands != NULL)
         {
@@ -1014,7 +907,6 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text,
                 return true;
             else if (*text)
                 return false;
-
             // fail with "" subcommands, then use normal level up command instead
         }
         // expected subcommand by full name DB content
@@ -1023,15 +915,12 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text,
             sLog.outErrorDb("Table `command` have unexpected subcommand '%s' in command '%s', skip.",text,fullcommand.c_str());
             return false;
         }
-
         if (table[i].SecurityLevel != security)
             sLog.outDetail("Table `command` overwrite for command '%s' default security (%u) by %u",fullcommand.c_str(),table[i].SecurityLevel,security);
-
         table[i].SecurityLevel = security;
         table[i].Help          = help;
         return true;
     }
-
     // in case "" command let process by caller
     if (!cmd.empty())
     {
@@ -1040,40 +929,31 @@ bool ChatHandler::SetDataForCommandInTable(ChatCommand *table, const char* text,
         else
             sLog.outErrorDb("Table `command` have not existed subcommand '%s' in command '%s', skip.",cmd.c_str(),fullcommand.c_str());
     }
-
     return false;
 }
-
 int ChatHandler::ParseCommands(const char* text)
 {
     ASSERT(text);
     ASSERT(*text);
-
     std::string fullcmd = text;
-
     if (m_session && !m_session->HandleOnPlayerChat(text))
         return 0;
-
     /// chat case (.command or !command format)
     if (m_session)
     {
         if (text[0] != '!' && text[0] != '.')
             return 0;
     }
-
     /// ignore single . and ! in line
     if (strlen(text) < 2)
         return 0;
     // original `text` can't be used. It content destroyed in command code processing.
-
     /// ignore messages staring from many dots.
     if ((text[0] == '.' && text[1] == '.') || (text[0] == '!' && text[1] == '!'))
         return 0;
-
     /// skip first . or ! (in console allowed use command with . and ! and without its)
     if (text[0] == '!' || text[0] == '.')
         ++text;
-
     if (!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
     {
         if (m_session && m_session->GetSecurity() == SEC_PLAYER)
@@ -1082,11 +962,9 @@ int ChatHandler::ParseCommands(const char* text)
     }
     return 1;
 }
-
 bool ChatHandler::isValidChatMessage(const char* message)
 {
 /*
-
 valid examples:
 |cffa335ee|Hitem:812:0:0:0:0:0:0:0:70|h[Glowing Brightwood Staff]|h|r
 |cff808080|Hquest:2278:47|h[The Platinum Discs]|h|r
@@ -1096,34 +974,26 @@ valid examples:
 |cffffd000|Henchant:3919|h[Engineering: Rough Dynamite]|h|r
 |cffffff00|Hachievement:546:0000000000000001:0:0:0:-1:0:0:0:0|h[Safe Deposit]|h|r
 |cff66bbff|Hglyph:21:762|h[Glyph of Bladestorm]|h|r
-
 | will be escaped to ||
 */
-
     if (strlen(message) > 255)
         return false;
-
     const char validSequence[6] = "cHhhr";
     const char* validSequenceIterator = validSequence;
-
     // more simple checks
     if (sWorld.getConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY) < 3)
     {
         const std::string validCommands = "cHhr|";
-
         while(*message)
         {
             // find next pipe command
             message = strchr(message, '|');
-
             if (!message)
                 return true;
-
             ++message;
             char commandChar = *message;
             if (validCommands.find(commandChar) == std::string::npos)
                 return false;
-
             ++message;
             // validate sequence
             if (sWorld.getConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY) == 2)
@@ -1141,17 +1011,13 @@ valid examples:
         }
         return true;
     }
-
     std::istringstream reader(message);
     char buffer[256];
-
     uint32 color;
-
     ItemPrototype const* linkedItem;
     Quest const* linkedQuest;
     SpellEntry const *linkedSpell;
     AchievementEntry const* linkedAchievement;
-
     while(!reader.eof())
     {
         if (validSequence == validSequenceIterator)
@@ -1160,7 +1026,6 @@ valid examples:
             linkedQuest = NULL;
             linkedSpell = NULL;
             linkedAchievement = NULL;
-
             reader.ignore(255, '|');
         }
         else if (reader.get() != '|')
@@ -1170,7 +1035,6 @@ valid examples:
 #endif
             return false;
         }
-
         // pipe has always to be followed by at least one char
         if (reader.peek() == '\0')
         {
@@ -1179,14 +1043,11 @@ valid examples:
 #endif
             return false;
         }
-
         // no further pipe commands
         if (reader.eof())
             break;
-
         char commandChar;
         reader >> commandChar;
-
         // | in normal messages is escaped by ||
         if (commandChar != '|')
         {
@@ -1213,7 +1074,6 @@ valid examples:
 #endif
             return false;
         }
-
         switch (commandChar)
         {
             case 'c':
@@ -1230,7 +1090,6 @@ valid examples:
 #endif
                         return false;
                     }
-
                     color <<= 4;
                     // check for hex char
                     if (c >= '0' && c <='9')
@@ -1252,12 +1111,10 @@ valid examples:
             case 'H':
                 // read chars up to colon  = link type
                 reader.getline(buffer, 256, ':');
-
                 if (strcmp(buffer, "item") == 0)
                 {
                     // read item entry
                     reader.getline(buffer, 256, ':');
-
                     linkedItem= objmgr.GetItemPrototype(atoi(buffer));
                     if (!linkedItem)
                     {
@@ -1266,7 +1123,6 @@ valid examples:
 #endif
                         return false;
                     }
-
                     if (color != ItemQualityColors[linkedItem->Quality])
                     {
 #ifdef MANGOS_DEBUG
@@ -1275,9 +1131,7 @@ valid examples:
 #endif
                         return false;
                     }
-
                     char c = reader.peek();
-
                     // ignore enchants etc.
                     while((c >='0' && c <='9') || c==':')
                     {
@@ -1298,9 +1152,7 @@ valid examples:
                         questid += c-'0';
                         c = reader.peek();
                     }
-
                     linkedQuest = objmgr.GetQuestTemplate(questid);
-
                     if (!linkedQuest)
                     {
 #ifdef MANOGS_DEBUG
@@ -1320,13 +1172,11 @@ valid examples:
                 {
                     if (color != CHAT_LINK_COLOR_TRADE)
                         return false;
-
                     // read spell entry
                     reader.getline(buffer, 256, ':');
                     linkedSpell = sSpellStore.LookupEntry(atoi(buffer));
                     if (!linkedSpell)
                         return false;
-
                     char c = reader.peek();
                     // base64 encoded stuff
                     while(c !='|' && c!='\0')
@@ -1340,17 +1190,14 @@ valid examples:
                     // talent links are always supposed to be blue
                     if (color != CHAT_LINK_COLOR_TALENT)
                         return false;
-
                     // read talent entry
                     reader.getline(buffer, 256, ':');
                     TalentEntry const *talentInfo = sTalentStore.LookupEntry(atoi(buffer));
                     if (!talentInfo)
                         return false;
-
                     linkedSpell = sSpellStore.LookupEntry(talentInfo->RankID[0]);
                     if (!linkedSpell)
                         return false;
-
                     char c = reader.peek();
                     // skillpoints? whatever, drop it
                     while(c !='|' && c!='\0')
@@ -1363,7 +1210,6 @@ valid examples:
                 {
                     if (color != CHAT_LINK_COLOR_SPELL)
                         return false;
-
                     uint32 spellid = 0;
                     // read spell entry
                     char c = reader.peek();
@@ -1382,7 +1228,6 @@ valid examples:
                 {
                     if (color != CHAT_LINK_COLOR_ENCHANT)
                         return false;
-
                     uint32 spellid = 0;
                     // read spell entry
                     char c = reader.peek();
@@ -1404,10 +1249,8 @@ valid examples:
                     reader.getline(buffer, 256, ':');
                     uint32 achievementId = atoi(buffer);
                     linkedAchievement = sAchievementStore.LookupEntry(achievementId);
-
                     if (!linkedAchievement)
                         return false;
-
                     char c = reader.peek();
                     // skip progress
                     while(c !='|' && c!='\0')
@@ -1420,7 +1263,6 @@ valid examples:
                 {
                     if (color != CHAT_LINK_COLOR_GLYPH)
                         return false;
-
                     // first id is slot, drop it
                     reader.getline(buffer, 256, ':');
                     uint32 glyphId = 0;
@@ -1435,9 +1277,7 @@ valid examples:
                     GlyphPropertiesEntry const* glyph = sGlyphPropertiesStore.LookupEntry(glyphId);
                     if (!glyph)
                         return false;
-
                     linkedSpell = sSpellStore.LookupEntry(glyph->SpellId);
-
                     if (!linkedSpell)
                         return false;
                 }
@@ -1462,7 +1302,6 @@ valid examples:
                         return false;
                     }
                     reader.getline(buffer, 256, ']');
-
                     // verify the link name
                     if (linkedSpell)
                     {
@@ -1475,20 +1314,16 @@ valid examples:
                             {
                                 return false;
                             }
-
                             SkillLineAbilityEntry const *skillInfo = bounds.first->second;
-
                             if (!skillInfo)
                             {
                                 return false;
                             }
-
                             SkillLineEntry const *skillLine = sSkillLineStore.LookupEntry(skillInfo->skillId);
                             if (!skillLine)
                             {
                                 return false;
                             }
-
                             for (uint8 i=0; i<MAX_LOCALE; ++i)
                             {
                                 uint32 skillLineNameLength = strlen(skillLine->name[i]);
@@ -1518,7 +1353,6 @@ valid examples:
                         if (linkedQuest->GetTitle() != buffer)
                         {
                             QuestLocale const *ql = objmgr.GetQuestLocale(linkedQuest->GetQuestId());
-
                             if (!ql)
                             {
 #ifdef MANOGS_DEBUG
@@ -1526,7 +1360,6 @@ valid examples:
 #endif
                                 return false;
                             }
-
                             bool foundName = false;
                             for (uint8 i=0; i<ql->Title.size(); i++)
                             {
@@ -1550,7 +1383,6 @@ valid examples:
                         if (strcmp(linkedItem->Name1, buffer) != 0)
                         {
                             ItemLocale const *il = objmgr.GetItemLocale(linkedItem->ItemId);
-
                             if (!il)
                             {
 #ifdef MANGOS_DEBUG
@@ -1558,7 +1390,6 @@ valid examples:
 #endif
                                 return false;
                             }
-
                             bool foundName = false;
                             for (uint8 i=0; i<il->Name.size(); ++i)
                             {
@@ -1608,7 +1439,6 @@ valid examples:
                 return false;
         }
     }
-
     // check if every opened sequence was also closed properly
 #ifdef MANGOS_DEBUG
     if (validSequence != validSequenceIterator)
@@ -1616,7 +1446,6 @@ valid examples:
 #endif
     return validSequence == validSequenceIterator;
 }
-
 bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd, char const* subcmd)
 {
     std::string list;
@@ -1625,25 +1454,19 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd, ch
         // must be available (ignore handler existence for show command with possibe avalable subcomands
         if (!isAvailable(table[i]))
             continue;
-
         /// for empty subcmd show all available
         if (*subcmd && !hasStringAbbr(table[i].Name, subcmd))
             continue;
-
         if (m_session)
             list += "\n    ";
         else
             list += "\n\r    ";
-
         list += table[i].Name;
-
         if (table[i].ChildCommands)
             list += " ...";
     }
-
     if (list.empty())
         return false;
-
     if (table==getCommandTable())
     {
         SendSysMessage(LANG_AVIABLE_CMD);
@@ -1651,10 +1474,8 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd, ch
     }
     else
         PSendSysMessage(LANG_SUBCMDS_LIST,cmd,list.c_str());
-
     return true;
 }
-
 bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
 {
     if (*cmd)
@@ -1664,26 +1485,20 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
             // must be available (ignore handler existence for show command with possibe avalable subcomands
             if (!isAvailable(table[i]))
                 continue;
-
             if (!hasStringAbbr(table[i].Name, cmd))
                 continue;
-
             // have subcommand
             char const* subcmd = (*cmd) ? strtok(NULL, " ") : "";
-
             if (table[i].ChildCommands && subcmd && *subcmd)
             {
                 if (ShowHelpForCommand(table[i].ChildCommands, subcmd))
                     return true;
             }
-
             if (!table[i].Help.empty())
                 SendSysMessage(table[i].Help.c_str());
-
             if (table[i].ChildCommands)
                 if (ShowHelpForSubCommands(table[i].ChildCommands,table[i].Name,subcmd ? subcmd : ""))
                     return true;
-
             return !table[i].Help.empty();
         }
     }
@@ -1694,36 +1509,28 @@ bool ChatHandler::ShowHelpForCommand(ChatCommand *table, const char* cmd)
             // must be available (ignore handler existence for show command with possibe avalable subcomands
             if (!isAvailable(table[i]))
                 continue;
-
             if (strlen(table[i].Name))
                 continue;
-
             if (!table[i].Help.empty())
                 SendSysMessage(table[i].Help.c_str());
-
             if (table[i].ChildCommands)
                 if (ShowHelpForSubCommands(table[i].ChildCommands,"",""))
                     return true;
-
             return !table[i].Help.empty();
         }
     }
-
     return ShowHelpForSubCommands(table,"",cmd);
 }
-
 //Note: target_guid used only in CHAT_MSG_WHISPER_INFORM mode (in this case channelName ignored)
 void ChatHandler::FillMessageData(WorldPacket *data, WorldSession* session, uint8 type, uint32 language, const char *channelName, uint64 target_guid, const char *message, Unit *speaker)
 {
     uint32 messageLength = (message ? strlen(message) : 0) + 1;
-
     data->Initialize(SMSG_MESSAGECHAT, 100);                // guess size
     *data << uint8(type);
     if ((type != CHAT_MSG_CHANNEL && type != CHAT_MSG_WHISPER) || language == LANG_ADDON)
         *data << uint32(language);
     else
         *data << uint32(LANG_UNIVERSAL);
-
     switch(type)
     {
         case CHAT_MSG_SAY:
@@ -1773,16 +1580,13 @@ void ChatHandler::FillMessageData(WorldPacket *data, WorldSession* session, uint
                 target_guid = 0;                            // only for CHAT_MSG_WHISPER_INFORM used original value target_guid
             break;
     }
-
     *data << uint64(target_guid);                           // there 0 for BG messages
     *data << uint32(0);                                     // can be chat msg group or something
-
     if (type == CHAT_MSG_CHANNEL)
     {
         ASSERT(channelName);
         *data << channelName;
     }
-
     *data << uint64(target_guid);
     *data << uint32(messageLength);
     *data << message;
@@ -1791,153 +1595,116 @@ void ChatHandler::FillMessageData(WorldPacket *data, WorldSession* session, uint
     else
         *data << uint8(0);
 }
-
 Player * ChatHandler::getSelectedPlayer()
 {
     if (!m_session)
         return NULL;
-
     uint64 guid  = m_session->GetPlayer()->GetSelection();
-
     if (guid == 0)
         return m_session->GetPlayer();
-
     return objmgr.GetPlayer(guid);
 }
-
 Unit* ChatHandler::getSelectedUnit()
 {
     if (!m_session)
         return NULL;
-
     uint64 guid = m_session->GetPlayer()->GetSelection();
-
     if (guid == 0)
         return m_session->GetPlayer();
-
     return ObjectAccessor::GetUnit(*m_session->GetPlayer(),guid);
 }
-
 WorldObject *ChatHandler::getSelectedObject()
 {
     if (!m_session)
         return NULL;
-
     uint64 guid = m_session->GetPlayer()->GetSelection();
-
     if (guid == 0)
         return GetNearbyGameObject();
-
     return ObjectAccessor::GetUnit(*m_session->GetPlayer(),guid);
 }
-
 Creature* ChatHandler::getSelectedCreature()
 {
     if (!m_session)
         return NULL;
-
     return ObjectAccessor::GetCreatureOrPetOrVehicle(*m_session->GetPlayer(),m_session->GetPlayer()->GetSelection());
 }
-
 char* ChatHandler::extractKeyFromLink(char* text, char const* linkType, char** something1)
 {
     // skip empty
     if (!text)
         return NULL;
-
     // skip spaces
     while(*text==' '||*text=='\t'||*text=='\b')
         ++text;
-
     if (!*text)
         return NULL;
-
     // return non link case
     if (text[0]!='|')
         return strtok(text, " ");
-
     // [name] Shift-click form |color|linkType:key|h[name]|h|r
     // or
     // [name] Shift-click form |color|linkType:key:something1:...:somethingN|h[name]|h|r
-
     char* check = strtok(text, "|");                        // skip color
     if (!check)
         return NULL;                                        // end of data
-
     char* cLinkType = strtok(NULL, ":");                    // linktype
     if (!cLinkType)
         return NULL;                                        // end of data
-
     if (strcmp(cLinkType,linkType) != 0)
     {
         strtok(NULL, " ");                                  // skip link tail (to allow continue strtok(NULL,s) use after retturn from function
         SendSysMessage(LANG_WRONG_LINK_TYPE);
         return NULL;
     }
-
     char* cKeys = strtok(NULL, "|");                        // extract keys and values
     char* cKeysTail = strtok(NULL, "");
-
     char* cKey = strtok(cKeys, ":|");                       // extract key
     if (something1)
         *something1 = strtok(NULL, ":|");                   // extract something
-
     strtok(cKeysTail, "]");                                 // restart scan tail and skip name with possible spaces
     strtok(NULL, " ");                                      // skip link tail (to allow continue strtok(NULL,s) use after return from function
     return cKey;
 }
-
 char* ChatHandler::extractKeyFromLink(char* text, char const* const* linkTypes, int* found_idx, char** something1)
 {
     // skip empty
     if (!text)
         return NULL;
-
     // skip spaces
     while(*text==' '||*text=='\t'||*text=='\b')
         ++text;
-
     if (!*text)
         return NULL;
-
     // return non link case
     if (text[0]!='|')
         return strtok(text, " ");
-
     // [name] Shift-click form |color|linkType:key|h[name]|h|r
     // or
     // [name] Shift-click form |color|linkType:key:something1:...:somethingN|h[name]|h|r
     // or
     // [name] Shift-click form |linkType:key|h[name]|h|r
-
     char* tail;
-
     if (text[1]=='c')
     {
         char* check = strtok(text, "|");                    // skip color
         if (!check)
             return NULL;                                    // end of data
-
         tail = strtok(NULL, "");                            // tail
     }
     else
         tail = text+1;                                      // skip first |
-
     char* cLinkType = strtok(tail, ":");                    // linktype
     if (!cLinkType)
         return NULL;                                        // end of data
-
     for (int i = 0; linkTypes[i]; ++i)
     {
         if (strcmp(cLinkType,linkTypes[i]) == 0)
         {
             char* cKeys = strtok(NULL, "|");                // extract keys and values
             char* cKeysTail = strtok(NULL, "");
-
             char* cKey = strtok(cKeys, ":|");               // extract key
             if (something1)
                 *something1 = strtok(NULL, ":|");           // extract something
-
             strtok(cKeysTail, "]");                         // restart scan tail and skip name with possible spaces
             strtok(NULL, " ");                              // skip link tail (to allow continue strtok(NULL,s) use after return from function
             if (found_idx)
@@ -1945,12 +1712,10 @@ char* ChatHandler::extractKeyFromLink(char* text, char const* const* linkTypes,
             return cKey;
         }
     }
-
     strtok(NULL, " ");                                      // skip link tail (to allow continue strtok(NULL,s) use after return from function
     SendSysMessage(LANG_WRONG_LINK_TYPE);
     return NULL;
 }
-
 char const *fmtstring(char const *format, ...)
 {
     va_list        argptr;
@@ -1960,34 +1725,25 @@ char const *fmtstring(char const *format, ...)
     static int        index = 0;
     char    *buf;
     int len;
-
     va_start(argptr, format);
     vsnprintf(temp_buffer,MAX_FMT_STRING, format, argptr);
     va_end(argptr);
-
     len = strlen(temp_buffer);
-
     if (len >= MAX_FMT_STRING)
         return "ERROR";
-
     if (len + index >= MAX_FMT_STRING-1)
     {
         index = 0;
     }
-
     buf = &string[index];
     memcpy(buf, temp_buffer, len+1);
-
     index += len + 1;
-
     return buf;
 }
-
 GameObject* ChatHandler::GetNearbyGameObject()
 {
     if (!m_session)
         return NULL;
-
     Player* pl = m_session->GetPlayer();
     GameObject* obj = NULL;
     Trinity::NearestGameObjectCheck check(*pl);
@@ -1995,34 +1751,26 @@ GameObject* ChatHandler::GetNearbyGameObject()
     pl->VisitNearbyGridObject(999, searcher);
     return obj;
 }
-
 GameObject* ChatHandler::GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry)
 {
     if (!m_session)
         return NULL;
-
     Player* pl = m_session->GetPlayer();
-
     GameObject* obj = pl->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid, entry, HIGHGUID_GAMEOBJECT));
-
     if (!obj && objmgr.GetGOData(lowguid))                   // guid is DB guid of object
     {
         // search near player then
         CellPair p(Trinity::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
-
         MaNGOS::GameObjectWithDbGUIDCheck go_check(*pl,lowguid);
         MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(pl,obj,go_check);
-
         TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, object_checker, *pl->GetMap());
     }
-
     return obj;
 }
-
 enum SpellLinkType
 {
     SPELL_LINK_SPELL   = 0,
@@ -2031,7 +1779,6 @@ enum SpellLinkType
     SPELL_LINK_TRADE   = 3,
     SPELL_LINK_GLYPH   = 4
 };
-
 static char const* const spellKeys[] =
 {
     "Hspell",                                               // normal spell
@@ -2041,7 +1788,6 @@ static char const* const spellKeys[] =
     "Hglyph",                                               // glyph
     0
 };
-
 uint32 ChatHandler::extractSpellIdFromLink(char* text)
 {
     // number or [name] Shift-click form |color|Henchant:recipe_spell_id|h[prof_name: recipe_name]|h|r
@@ -2054,9 +1800,7 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text)
     char* idS = extractKeyFromLink(text,spellKeys,&type,&param1_str);
     if (!idS)
         return 0;
-
     uint32 id = (uint32)atol(idS);
-
     switch(type)
     {
         case SPELL_LINK_SPELL:
@@ -2067,14 +1811,11 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text)
             TalentEntry const* talentEntry = sTalentStore.LookupEntry(id);
             if (!talentEntry)
                 return 0;
-
             int32 rank = param1_str ? (uint32)atol(param1_str) : 0;
             if (rank >= MAX_TALENT_RANK)
                 return 0;
-
             if (rank < 0)
                 rank = 0;
-
             return talentEntry->RankID[rank];
         }
         case SPELL_LINK_ENCHANT:
@@ -2083,41 +1824,33 @@ uint32 ChatHandler::extractSpellIdFromLink(char* text)
         case SPELL_LINK_GLYPH:
         {
             uint32 glyph_prop_id = param1_str ? (uint32)atol(param1_str) : 0;
-
             GlyphPropertiesEntry const* glyphPropEntry = sGlyphPropertiesStore.LookupEntry(glyph_prop_id);
             if (!glyphPropEntry)
                 return 0;
-
             return glyphPropEntry->SpellId;
         }
     }
-
     // unknown type?
     return 0;
 }
-
 GameTele const* ChatHandler::extractGameTeleFromLink(char* text)
 {
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
     char* cId = extractKeyFromLink(text,"Htele");
     if (!cId)
         return false;
-
     // id case (explicit or from shift link)
     if (cId[0] >= '0' || cId[0] >= '9')
         if (uint32 id = atoi(cId))
             return objmgr.GetGameTele(id);
-
     return objmgr.GetGameTele(cId);
 }
-
 enum GuidLinkType
 {
     SPELL_LINK_PLAYER     = 0,                              // must be first for selection in not link case
     SPELL_LINK_CREATURE   = 1,
     SPELL_LINK_GAMEOBJECT = 2
 };
-
 static char const* const guidKeys[] =
 {
     "Hplayer",
@@ -2125,18 +1858,15 @@ static char const* const guidKeys[] =
     "Hgameobject",
     0
 };
-
 uint64 ChatHandler::extractGuidFromLink(char* text)
 {
     int type = 0;
-
     // |color|Hcreature:creature_guid|h[name]|h|r
     // |color|Hgameobject:go_guid|h[name]|h|r
     // |color|Hplayer:name|h[name]|h|r
     char* idS = extractKeyFromLink(text,guidKeys,&type);
     if (!idS)
         return 0;
-
     switch(type)
     {
         case SPELL_LINK_PLAYER:
@@ -2144,19 +1874,15 @@ uint64 ChatHandler::extractGuidFromLink(char* text)
             std::string name = idS;
             if (!normalizePlayerName(name))
                 return 0;
-
             if (Player* player = objmgr.GetPlayer(name.c_str()))
                 return player->GetGUID();
-
             if (uint64 guid = objmgr.GetPlayerGUIDByName(name))
                 return guid;
-
             return 0;
         }
         case SPELL_LINK_CREATURE:
         {
             uint32 lowguid = (uint32)atol(idS);
-
             if (CreatureData const* data = objmgr.GetCreatureData(lowguid))
                 return MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_UNIT);
             else
@@ -2165,32 +1891,26 @@ uint64 ChatHandler::extractGuidFromLink(char* text)
         case SPELL_LINK_GAMEOBJECT:
         {
             uint32 lowguid = (uint32)atol(idS);
-
             if (GameObjectData const* data = objmgr.GetGOData(lowguid))
                 return MAKE_NEW_GUID(lowguid,data->id,HIGHGUID_GAMEOBJECT);
             else
                 return 0;
         }
     }
-
     // unknown type?
     return 0;
 }
-
 std::string ChatHandler::extractPlayerNameFromLink(char* text)
 {
     // |color|Hplayer:name|h[name]|h|r
     char* name_str = extractKeyFromLink(text,"Hplayer");
     if (!name_str)
         return "";
-
     std::string name = name_str;
     if (!normalizePlayerName(name))
         return "";
-
     return name;
 }
-
 bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* player_guid /*=NULL*/,std::string* player_name /*= NULL*/)
 {
     if (args && *args)
@@ -2202,20 +1922,15 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* playe
             SetSentErrorMessage(true);
             return false;
         }
-
         Player* pl = objmgr.GetPlayer(name.c_str());
-
         // if allowed player pointer
         if (player)
             *player = pl;
-
         // if need guid value from DB (in name case for check player existence)
         uint64 guid = !pl && (player_guid || player_name) ? objmgr.GetPlayerGUIDByName(name) : 0;
-
         // if allowed player guid (if no then only online players allowed)
         if (player_guid)
             *player_guid = pl ? pl->GetGUID() : guid;
-
         if (player_name)
             *player_name = pl || guid ? name : "";
     }
@@ -2228,11 +1943,9 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* playe
         // if allowed player guid (if no then only online players allowed)
         if (player_guid)
             *player_guid = pl ? pl->GetGUID() : 0;
-
         if (player_name)
             *player_name = pl ? pl->GetName() : "";
     }
-
     // some from req. data must be provided (note: name is empty if player not exist)
     if ((!player || !*player) && (!player_guid || !*player_guid) && (!player_name || player_name->empty()))
     {
@@ -2240,33 +1953,26 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* playe
         SetSentErrorMessage(true);
         return false;
     }
-
     return true;
 }
-
 void ChatHandler::extractOptFirstArg(char* args, char** arg1, char** arg2)
 {
     char* p1 = strtok(args, " ");
     char* p2 = strtok(NULL, " ");
-
     if (!p2)
     {
         p2 = p1;
         p1 = NULL;
     }
-
     if (arg1)
         *arg1 = p1;
-
     if (arg2)
         *arg2 = p2;
 }
-
 char* ChatHandler::extractQuotedArg(char* args)
 {
     if (!*args)
         return NULL;
-
     if (*args=='"')
         return strtok(args+1, "\"");
     else
@@ -2277,55 +1983,45 @@ char* ChatHandler::extractQuotedArg(char* args)
         return strtok(NULL, "\"");
     }
 }
-
 bool ChatHandler::needReportToTarget(Player* chr) const
 {
     Player* pl = m_session->GetPlayer();
     return pl != chr && pl->IsVisibleGloballyFor(chr);
 }
-
 LocaleConstant ChatHandler::GetSessionDbcLocale() const
 {
     return m_session->GetSessionDbcLocale();
 }
-
 int ChatHandler::GetSessionDbLocaleIndex() const
 {
     return m_session->GetSessionDbLocaleIndex();
 }
-
 const char *CliHandler::GetMangosString(int32 entry) const
 {
     return objmgr.GetTrinityStringForDBCLocale(entry);
 }
-
 bool CliHandler::isAvailable(ChatCommand const& cmd) const
 {
     // skip non-console commands in console case
     return cmd.AllowConsole;
 }
-
 void CliHandler::SendSysMessage(const char *str)
 {
     m_print(str);
     m_print("\r\n");
 }
-
 std::string CliHandler::GetNameLink() const
 {
     return GetTrinityString(LANG_CONSOLE_COMMAND);
 }
-
 bool CliHandler::needReportToTarget(Player* /*chr*/) const
 {
     return true;
 }
-
 bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, Group* &group, uint64 &guid, bool offline)
 {
     plr  = NULL;
     guid = 0;
-
     if (cname)
     {
         std::string name = cname;
@@ -2337,13 +2033,11 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G
                 SetSentErrorMessage(true);
                 return false;
             }
-
             plr = objmgr.GetPlayer(name.c_str());
             if (offline)
                 guid = objmgr.GetPlayerGUIDByName(name.c_str());
         }
     }
-
     if (plr)
     {
         group = plr->GetGroup();
@@ -2356,21 +2050,17 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G
             plr = getSelectedPlayer();
         else
             plr = m_session->GetPlayer();
-
         if (!guid || !offline)
             guid  = plr->GetGUID();
         group = plr->GetGroup();
     }
-
     return true;
 }
-
 LocaleConstant CliHandler::GetSessionDbcLocale() const
 {
     return sWorld.GetDefaultDbcLocale();
 }
-
 int CliHandler::GetSessionDbLocaleIndex() const
 {
     return objmgr.GetDBCLocaleIndex();
-}
\ No newline at end of file
+}
diff --git a/src/game/Chat.h b/src/game/Chat.h
index 1518cb6d45e..35e39ad8b08 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -17,19 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
-
 #include "SharedDefines.h"
-
 class ChatHandler;
 class WorldSession;
 class Creature;
 class Player;
 class Unit;
 struct GameTele;
-
 class ChatCommand
 {
     public:
@@ -40,66 +36,50 @@ class ChatCommand
         std::string        Help;
         ChatCommand *      ChildCommands;
 };
-
 class TRINITY_DLL_SPEC ChatHandler
 {
     public:
         explicit ChatHandler(WorldSession* session) : m_session(session) {}
         explicit ChatHandler(Player* player) : m_session(player->GetSession()) {}
          ~ChatHandler() {}
-
         static void FillMessageData( WorldPacket *data, WorldSession* session, uint8 type, uint32 language, const char *channelName, uint64 target_guid, const char *message, Unit *speaker);
-
         void FillMessageData( WorldPacket *data, uint8 type, uint32 language, uint64 target_guid, const char* message)
         {
             FillMessageData( data, m_session, type, language, NULL, target_guid, message, NULL);
         }
-
         void FillSystemMessageData( WorldPacket *data, const char* message )
         {
             FillMessageData( data, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, 0, message );
         }
-
         static char* LineFromMessage(char*& pos) { char* start = strtok(pos,"\n"); pos = NULL; return start; }
-
         // function with different implementation for chat/console
         virtual const char *GetMangosString(int32 entry) const;
         virtual void SendSysMessage(  const char *str);
-
         void SendSysMessage(          int32     entry);
         void PSendSysMessage(         const char *format, ...) ATTR_PRINTF(2,3);
         void PSendSysMessage(         int32     entry, ...  );
         std::string PGetParseString(int32 entry, ...);
-
         int ParseCommands(const char* text);
-
         static ChatCommand* getCommandTable();
-
         bool isValidChatMessage(const char* msg);
         void SendGlobalSysMessage(const char *str);
     protected:
         explicit ChatHandler() : m_session(NULL) {}      // for CLI subclass
-
         bool hasStringAbbr(const char* name, const char* part);
-
         // function with different implementation for chat/console
         virtual bool isAvailable(ChatCommand const& cmd) const;
         virtual std::string GetNameLink() const { return GetNameLink(m_session->GetPlayer()); }
         virtual bool needReportToTarget(Player* chr) const;
         virtual LocaleConstant GetSessionDbcLocale() const;
         virtual int GetSessionDbLocaleIndex() const;
-
         bool HasLowerSecurity(Player* target, uint64 guid, bool strong = false);
         bool HasLowerSecurityAccount(WorldSession* target, uint32 account, bool strong = false);
 
-      
         void SendGlobalGMSysMessage(const char *str);
-
         static bool SetDataForCommandInTable(ChatCommand *table, const char* text, uint32 security, std::string const& help, std::string const& fullcommand );
         bool ExecuteCommandInTable(ChatCommand *table, const char* text, const std::string& fullcommand);
         bool ShowHelpForCommand(ChatCommand *table, const char* cmd);
         bool ShowHelpForSubCommands(ChatCommand *table, char const* cmd, char const* subcmd);
-
         bool HandleAccountCommand(const char* args);
         bool HandleAccountAddonCommand(const char* args);
         bool HandleAccountCreateCommand(const char* args);
@@ -110,13 +90,11 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleAccountSetAddonCommand(const char* args);
         bool HandleAccountSetGmLevelCommand(const char* args);
         bool HandleAccountSetPasswordCommand(const char* args);
-
         bool HandleAHBotOptionsCommand(const char * args);
         bool HandleNameAnnounceCommand(const char* args);
         bool HandleGMNameAnnounceCommand(const char* args);
         bool HandleGMAnnounceCommand(const char* args);
         bool HandleGMNotifyCommand(const char* args);
-
         bool HandleBanAccountCommand(const char* args);
         bool HandleBanCharacterCommand(const char* args);
         bool HandleBanIPCommand(const char* args);
@@ -126,19 +104,16 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleBanListAccountCommand(const char* args);
         bool HandleBanListCharacterCommand(const char* args);
         bool HandleBanListIPCommand(const char* args);
-
         bool HandleCastCommand(const char *args);
         bool HandleCastBackCommand(const char *args);
         bool HandleCastDistCommand(const char *args);
         bool HandleCastSelfCommand(const char *args);
         bool HandleCastTargetCommand(const char *args);
-
         bool HandleCharacterCustomizeCommand(const char * args);
         bool HandleCharacterDeleteCommand(const char* args);
         bool HandleCharacterLevelCommand(const char* args);
         bool HandleCharacterRenameCommand(const char * args);
         bool HandleCharacterReputationCommand(const char* args);
-
         bool HandleDebugAnimCommand(const char* args);
         bool HandleDebugArenaCommand(const char * args);
         bool HandleDebugBattlegroundCommand(const char * args);
@@ -156,7 +131,6 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleDebugSpellCheckCommand(const char* args);
         bool HandleDebugUpdateCommand(const char* args);
         bool HandleDebugUpdateWorldStateCommand(const char* args);
-
         bool HandleDebugSet32Bit(const char* args);
         bool HandleDebugThreatList(const char * args);
         bool HandleDebugHostilRefList(const char * args);
@@ -164,11 +138,9 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleUnPossessCommand(const char* args);
         bool HandleBindSightCommand(const char* args);
         bool HandleUnbindSightCommand(const char* args);
-
         bool HandleDebugPlayCinematicCommand(const char* args);
         bool HandleDebugPlayMovieCommand(const char* args);
         bool HandleDebugPlaySoundCommand(const char* args);
-
         bool HandleDebugSendBuyErrorCommand(const char* args);
         bool HandleDebugSendChannelNotifyCommand(const char* args);
         bool HandleDebugSendChatMsgCommand(const char* args);
@@ -181,12 +153,10 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleDebugSendSellErrorCommand(const char* args);
         bool HandleDebugSendSetPhaseShiftCommand(const char * args);
         bool HandleDebugSendSpellFailCommand(const char* args);
-
         bool HandleEventActiveListCommand(const char* args);
         bool HandleEventStartCommand(const char* args);
         bool HandleEventStopCommand(const char* args);
         bool HandleEventInfoCommand(const char* args);
-
         bool HandleGameObjectAddCommand(const char* args);
         bool HandleGameObjectDeleteCommand(const char* args);
         bool HandleGameObjectMoveCommand(const char* args);
@@ -195,14 +165,12 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleGameObjectStateCommand(const char* args);
         bool HandleGameObjectTargetCommand(const char* args);
         bool HandleGameObjectTurnCommand(const char* args);
-
         bool HandleGMCommand(const char* args);
         bool HandleGMChatCommand(const char* args);
         bool HandleGMFlyCommand(const char* args);
         bool HandleGMListFullCommand(const char* args);
         bool HandleGMListIngameCommand(const char* args);
         bool HandleGMVisibleCommand(const char* args);
-
         bool HandleGoCommand(const char* args);
         bool HandleGoCreatureCommand(const char* args);
         bool HandleGoGraveyardCommand(const char* args);
@@ -213,24 +181,19 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleGoXYCommand(const char* args);
         bool HandleGoXYZCommand(const char* args);
         bool HandleGoZoneXYCommand(const char* args);
-
         bool HandleGoTicketCommand(const char* args);
-
         bool HandleGuildCreateCommand(const char* args);
         bool HandleGuildInviteCommand(const char* args);
         bool HandleGuildUninviteCommand(const char* args);
         bool HandleGuildRankCommand(const char* args);
         bool HandleGuildDeleteCommand(const char* args);
-
         bool HandleHonorAddCommand(const char* args);
         bool HandleHonorAddKillCommand(const char* args);
         bool HandleHonorUpdateCommand(const char* args);
-
         bool HandleInstanceListBindsCommand(const char* args);
         bool HandleInstanceUnbindCommand(const char* args);
         bool HandleInstanceStatsCommand(const char* args);
         bool HandleInstanceSaveDataCommand(const char * args);
-
         bool HandleLearnCommand(const char* args);
         bool HandleLearnAllCommand(const char* args);
         bool HandleLearnAllGMCommand(const char* args);
@@ -242,12 +205,10 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleLearnAllMyPetTalentsCommand(const char* args);
         bool HandleLearnAllMySpellsCommand(const char* args);
         bool HandleLearnAllMyTalentsCommand(const char* args);
-
         bool HandleListAurasCommand(const char * args);
         bool HandleListCreatureCommand(const char* args);
         bool HandleListItemCommand(const char* args);
         bool HandleListObjectCommand(const char* args);
-
         bool HandleLookupAreaCommand(const char* args);
         bool HandleLookupCreatureCommand(const char* args);
         bool HandleLookupEventCommand(const char* args);
@@ -264,7 +225,6 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleLookupTaxiNodeCommand(const char * args);
         bool HandleLookupTeleCommand(const char * args);
         bool HandleLookupMapCommand(const char* args);
-
         bool HandleModifyKnownTitlesCommand(const char* args);
         bool HandleModifyHPCommand(const char* args);
         bool HandleModifyManaCommand(const char* args);
@@ -288,7 +248,6 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleModifyArenaCommand(const char* args);
         bool HandleModifyPhaseCommand(const char* args);
         bool HandleModifyGenderCommand(const char* args);
-
         //-----------------------Npc Commands-----------------------
         bool HandleNpcAddCommand(const char* args);
         bool HandleNpcAddMoveCommand(const char* args);
@@ -318,20 +277,16 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleNpcYellCommand(const char* args);
         bool HandleNpcAddFormationCommand(const char* args);
         bool HandleNpcSetLinkCommand(const char* args);
-
         //TODO: NpcCommands that needs to be fixed :
         bool HandleNpcAddWeaponCommand(const char* args);
         bool HandleNpcNameCommand(const char* args);
         bool HandleNpcSubNameCommand(const char* args);
         //----------------------------------------------------------
-
         bool HandlePDumpLoadCommand(const char *args);
         bool HandlePDumpWriteCommand(const char *args);
-
         bool HandleQuestAdd(const char * args);
         bool HandleQuestRemove(const char * args);
         bool HandleQuestComplete(const char * args);
-
         bool HandleReloadAllCommand(const char* args);
         bool HandleReloadAllAchievementCommand(const char* args);
         bool HandleReloadAllAreaCommand(const char* args);
@@ -343,9 +298,7 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleReloadAllEventAICommand(const char* args);
         bool HandleReloadAllSpellCommand(const char* args);
         bool HandleReloadAllLocalesCommand(const char* args);
-
         bool HandleReloadConfigCommand(const char* args);
-
         bool HandleReloadAccessRequirementCommand(const char* args);
         bool HandleReloadAchievementCriteriaDataCommand(const char* args);
         bool HandleReloadAchievementRewardCommand(const char* args);
@@ -420,7 +373,6 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleReloadSpellDisabledCommand(const char* args);
         bool HandleReloadAuctionsCommand(const char* args);
         bool HandleReloadWpScriptsCommand(const char* args);
-
         bool HandleResetAchievementsCommand(const char * args);
         bool HandleResetAllCommand(const char * args);
         bool HandleResetHonorCommand(const char * args);
@@ -428,12 +380,10 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleResetSpellsCommand(const char * args);
         bool HandleResetStatsCommand(const char * args);
         bool HandleResetTalentsCommand(const char * args);
-
         bool HandleSendItemsCommand(const char* args);
         bool HandleSendMailCommand(const char* args);
         bool HandleSendMessageCommand(const char * args);
         bool HandleSendMoneyCommand(const char* args);
-
         bool HandleServerCorpsesCommand(const char* args);
         bool HandleServerExitCommand(const char* args);
         bool HandleServerIdleRestartCommand(const char* args);
@@ -447,20 +397,16 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleServerShutDownCommand(const char* args);
         bool HandleServerShutDownCancelCommand(const char* args);
         bool HandleServerSetClosedCommand(const char* args);
-
         bool HandleServerSetLogFileLevelCommand(const char* args);
         bool HandleServerSetDiffTimeCommand(const char* args);
-
         bool HandleTeleCommand(const char * args);
         bool HandleTeleAddCommand(const char * args);
         bool HandleTeleDelCommand(const char * args);
         bool HandleTeleGroupCommand(const char* args);
         bool HandleTeleNameCommand(const char* args);
-
         bool HandleUnBanAccountCommand(const char* args);
         bool HandleUnBanCharacterCommand(const char* args);
         bool HandleUnBanIPCommand(const char* args);
-
         bool HandleWpAddCommand(const char* args);
         bool HandleWpLoadPathCommand(const char* args);
         bool HandleWpUnLoadPathCommand(const char* args);
@@ -468,13 +414,11 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleWpEventCommand(const char* args);
         bool HandleWpShowCommand(const char* args);
         bool HandleReloadAllPaths(const char *args);
-
         bool HandleHelpCommand(const char* args);
         bool HandleCommandsCommand(const char* args);
         bool HandleStartCommand(const char* args);
         bool HandleDismountCommand(const char* args);
         bool HandleSaveCommand(const char* args);
-
         bool HandleNamegoCommand(const char* args);
         bool HandleGonameCommand(const char* args);
         bool HandleGroupgoCommand(const char* args);
@@ -485,9 +429,7 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleTaxiCheatCommand(const char* args);
         bool HandleWhispersCommand(const char* args);
         bool HandleModifyDrunkCommand(const char* args);
-
         bool HandleLoadScriptsCommand(const char* args);
-
         bool HandleGUIDCommand(const char* args);
         bool HandleItemMoveCommand(const char* args);
         bool HandleDeMorphCommand(const char* args);
@@ -498,7 +440,6 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleFreezeCommand(const char *args);
         bool HandleUnFreezeCommand(const char *args);
         bool HandleListFreezeCommand(const char* args);
-
         bool HandleCooldownCommand(const char* args);
         bool HandleUnLearnCommand(const char* args);
         bool HandleGetDistanceCommand(const char* args);
@@ -525,15 +466,12 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandlePetUnlearnCommand(const char* args);
         bool HandlePetLearnCommand(const char* args);
         bool HandleCreatePetCommand(const char* args);
-
         bool HandleGroupLeaderCommand(const char* args);
         bool HandleGroupDisbandCommand(const char* args);
         bool HandleGroupRemoveCommand(const char* args);
-
         bool HandleBankCommand(const char* args);
         bool HandleChangeWeather(const char* args);
         bool HandleKickPlayerCommand(const char * args);
-
         // GM ticket command handlers
         bool HandleGMTicketListCommand(const char* args);
         bool HandleGMTicketListOnlineCommand(const char* args);
@@ -546,44 +484,33 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleGMTicketCommentCommand(const char* args);
         bool HandleGMTicketDeleteByIdCommand(const char* args);
         bool HandleGMTicketReloadCommand(const char*);
-
         bool HandleMaxSkillCommand(const char* args);
         bool HandleSetSkillCommand(const char* args);
         bool HandleRespawnCommand(const char* args);
         bool HandleComeToMeCommand(const char *args);
         bool HandleCombatStopCommand(const char *args);
-
         /*bool HandleCharDeleteCommand(const char *args);
         bool HandleSendMessageCommand(const char * args);*/
-
         bool HandleFlushArenaPointsCommand(const char *args);
         bool HandlePlayAllCommand(const char* args);
         bool HandleRepairitemsCommand(const char* args);
-
         bool HandleTempGameObjectCommand(const char* args);
         bool HandleTempAddSpwCommand(const char* args);
-
         //! Development Commands
-
         /*bool HandleQuestAdd(const char * args);
         bool HandleQuestRemove(const char * args);
         bool HandleQuestComplete(const char * args);*/
-
         //bool HandleSet32Bit(const char* args);
         bool HandleSaveAllCommand(const char* args);
-
         Player*   getSelectedPlayer();
         Creature* getSelectedCreature();
         Unit*     getSelectedUnit();
         WorldObject* getSelectedObject();
-
         char*     extractKeyFromLink(char* text, char const* linkType, char** something1 = NULL);
         char*     extractKeyFromLink(char* text, char const* const* linkTypes, int* found_idx, char** something1 = NULL);
-
         // if args have single value then it return in arg2 and arg1 == NULL
         void      extractOptFirstArg(char* args, char** arg1, char** arg2);
         char*     extractQuotedArg(char* args);
-
         uint32    extractSpellIdFromLink(char* text);
         uint64    extractGuidFromLink(char* text);
         GameTele const* extractGameTeleFromLink(char* text);
@@ -591,13 +518,10 @@ class TRINITY_DLL_SPEC ChatHandler
         std::string extractPlayerNameFromLink(char* text);
         // select by arg (name/link) or in-game selection online/offline player
         bool extractPlayerTarget(char* args, Player** player, uint64* player_guid = NULL, std::string* player_name = NULL);
-
         std::string playerLink(std::string const& name) const { return m_session ? "|cffffffff|Hplayer:"+name+"|h["+name+"]|h|r" : name; }
         std::string GetNameLink(Player* chr) const { return playerLink(chr->GetName()); }
-
         GameObject* GetNearbyGameObject();
         GameObject* GetObjectGlobalyWithGuidOrNearWithDbGuid(uint32 lowguid,uint32 entry);
-
         // Utility methods for commands
         bool LookupPlayerSearchCommand(QueryResult* result, int32 limit);
         bool HandleBanListHelper(QueryResult* result);
@@ -606,22 +530,18 @@ class TRINITY_DLL_SPEC ChatHandler
         bool HandleUnBanHelper(BanMode mode,char const* args);
         void HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel);
         void HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id);
-
         void SetSentErrorMessage(bool val){ sentErrorMessage = val;};
     private:
         WorldSession * m_session;                           // != NULL for chat command call and NULL for CLI command
-
         // common global flag
         static bool load_command_table;
         bool sentErrorMessage;
 };
-
 class CliHandler : public ChatHandler
 {
     public:
         typedef void Print(char const*);
         explicit CliHandler(Print* zprint) : m_print(zprint) {}
-
         // overwrite functions
         const char *GetTrinityString(int32 entry) const;
         bool isAvailable(ChatCommand const& cmd) const;
@@ -630,12 +550,9 @@ class CliHandler : public ChatHandler
         bool needReportToTarget(Player* chr) const;
         LocaleConstant GetSessionDbcLocale() const;
         int GetSessionDbLocaleIndex() const;
-
     private:
         Print* m_print;
 };
-
 char const *fmtstring( char const *format, ... );
-
 #endif
 
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index e5aaab05c9d..11b57618d21 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
@@ -25,7 +24,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
-
 #include "CellImpl.h"
 #include "Chat.h"
 #include "ChannelMgr.h"
@@ -39,7 +37,6 @@
 #include "ScriptCalls.h"
 #include "SpellAuras.h"
 #include "Util.h"
-
 bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg, uint32 lang)
 {
     if (lang != LANG_ADDON)
@@ -47,7 +44,6 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg
         // strip invisible characters for non-addon messages
         if(sWorld.getConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
             stripLineInvisibleChars(msg);
-
         if (sWorld.getConfig(CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY) && GetSecurity() < SEC_MODERATOR
                 && !ChatHandler(this).isValidChatMessage(msg.c_str()))
         {
@@ -58,26 +54,20 @@ bool WorldSession::processChatmessageFurtherAfterSecurityChecks(std::string& msg
             return false;
         }
     }
-
     return true;
 }
-
 void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
 {
     uint32 type;
     uint32 lang;
-
     recv_data >> type;
     recv_data >> lang;
-
     if(type >= MAX_CHAT_MSG_TYPE)
     {
         sLog.outError("CHAT: Wrong message type received: %u", type);
         return;
     }
-
     //sLog.outDebug("CHAT: packet received. type %u, lang %u", type, lang );
-
     // prevent talking at unknown language (cheating)
     LanguageDesc const* langDesc = GetLanguageDescByID(lang);
     if(!langDesc)
@@ -104,24 +94,20 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     if(lang == LANG_ADDON)
     {
         if(sWorld.getConfig(CONFIG_CHATLOG_ADDON))
         {
             std::string msg = "";
             recv_data >> msg;
-
             if(msg.empty())
             {
                 sLog.outDebug("Player %s send empty addon msg", GetPlayer()->GetName());
                 return;
             }
-
             sLog.outChat("[ADDON] Player %s sends: %s",
                 GetPlayer()->GetName(), msg.c_str());
         }
-
         // Disabled addon channel?
         if(!sWorld.getConfig(CONFIG_ADDON_CHANNEL))
             return;
@@ -157,33 +143,27 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                         break;
                 }
             }
-
             // but overwrite it by SPELL_AURA_MOD_LANGUAGE auras (only single case used)
             Unit::AuraEffectList const& ModLangAuras = _player->GetAurasByType(SPELL_AURA_MOD_LANGUAGE);
             if(!ModLangAuras.empty())
                 lang = ModLangAuras.front()->GetMiscValue();
         }
-
         if (!_player->CanSpeak())
         {
             std::string timeStr = secsToTimeString(m_muteTime - time(NULL));
             SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING),timeStr.c_str());
             return;
         }
-
         if (type != CHAT_MSG_AFK && type != CHAT_MSG_DND)
             GetPlayer()->UpdateSpeakTime();
     }
-
     if (GetPlayer()->HasAura(1852) && type != CHAT_MSG_WHISPER)
     {
         std::string msg="";
         recv_data >> msg;
-
         SendNotification(GetTrinityString(LANG_GM_SILENCE), GetPlayer()->GetName());
         return;
     }
-
     switch(type)
     {
         case CHAT_MSG_SAY:
@@ -192,19 +172,14 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         {
             std::string msg = "";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             if(type == CHAT_MSG_SAY)
                 GetPlayer()->Say(msg, lang);
             else if(type == CHAT_MSG_EMOTE)
@@ -212,19 +187,15 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
             else if(type == CHAT_MSG_YELL)
                 GetPlayer()->Yell(msg, lang);
         } break;
-
         case CHAT_MSG_WHISPER:
         {
             std::string to, msg;
             recv_data >> to;
             recv_data >> msg;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             if(!normalizePlayerName(to))
             {
                 WorldPacket data(SMSG_CHAT_PLAYER_NOT_FOUND, (to.size()+1));
@@ -232,7 +203,6 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 SendPacket(&data);
                 break;
             }
-
             Player *player = objmgr.GetPlayer(to.c_str());
             uint32 tSecurity = GetSecurity();
             uint32 pSecurity = player ? player->GetSession()->GetSecurity() : SEC_PLAYER;
@@ -243,7 +213,6 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 SendPacket(&data);
                 return;
             }
-
             if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT) && tSecurity == SEC_PLAYER && pSecurity == SEC_PLAYER )
             {
                 uint32 sidea = GetPlayer()->GetTeam();
@@ -256,43 +225,33 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                     return;
                 }
             }
-
             if (GetPlayer()->HasAura(1852) && !player->isGameMaster())
             {
                 SendNotification(GetTrinityString(LANG_GM_SILENCE), GetPlayer()->GetName());
                 return;
             }
-
             GetPlayer()->Whisper(msg, lang,player->GetGUID());
         } break;
-
         case CHAT_MSG_PARTY:
         {
             std::string msg = "";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             // if player is in battleground, he cannot say to battleground members by /p
             Group *group = GetPlayer()->GetOriginalGroup();
             // so if player hasn't OriginalGroup and his player->GetGroup() is BG raid, then return
             if( !group && (!(group = GetPlayer()->GetGroup()) || group->isBGGroup()) )
                 return;
-
             WorldPacket data;
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_PARTY, lang, NULL, 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false, group->GetMemberGroup(GetPlayer()->GetGUID()));
-
             if(sWorld.getConfig(CONFIG_CHATLOG_PARTY))
                 sLog.outChat("[PARTY] Player %s tells group with leader %s: %s",
                     GetPlayer()->GetName(), group->GetLeaderName(), msg.c_str());
@@ -302,25 +261,19 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         {
             std::string msg = "";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             if (GetPlayer()->GetGuildId())
             {
                 Guild *guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
                 if (guild)
                     guild->BroadcastToGuild(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
-
                 if(lang != LANG_ADDON && sWorld.getConfig(CONFIG_CHATLOG_GUILD))
                 {
                     sLog.outChat("[GUILD] Player %s tells guild %s: %s",
@@ -332,32 +285,25 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                         GetPlayer()->GetName(), guild->GetName().c_str(), msg.c_str());
                 }
             }
-
             break;
         }
         case CHAT_MSG_OFFICER:
         {
             std::string msg = "";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             if (GetPlayer()->GetGuildId())
             {
                 Guild *guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
                 if (guild)
                     guild->BroadcastToOfficers(this, msg, lang == LANG_ADDON ? LANG_ADDON : LANG_UNIVERSAL);
-
                 if(sWorld.getConfig(CONFIG_CHATLOG_GUILD))
                     sLog.outChat("[OFFICER] Player %s tells guild %s officers: %s",
                         GetPlayer()->GetName(), guild->GetName().c_str(), msg.c_str());
@@ -368,29 +314,22 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         {
             std::string msg="";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             // if player is in battleground, he cannot say to battleground members by /ra
             Group *group = GetPlayer()->GetOriginalGroup();
             // so if player hasn't OriginalGroup and his player->GetGroup() is BG raid or his group isn't raid, then return
             if ((!group && !(group = GetPlayer()->GetGroup())) || group->isBGGroup() || !group->isRaidGroup())
                 return;
-
             WorldPacket data;
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID, lang, "", 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false);
-
             if(sWorld.getConfig(CONFIG_CHATLOG_RAID))
                 sLog.outChat("[RAID] Player %s tells raid with leader %s: %s",
                     GetPlayer()->GetName(), group->GetLeaderName(), msg.c_str());
@@ -399,28 +338,21 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         {
             std::string msg="";
             recv_data >> msg;
-
             if(msg.empty())
                 break;
-
             if (ChatHandler(this).ParseCommands(msg.c_str()) > 0)
                 break;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             // if player is in battleground, he cannot say to battleground members by /ra
             Group *group = GetPlayer()->GetOriginalGroup();
             if( !group && !(group = GetPlayer()->GetGroup()) || group->isBGGroup() || !group->isRaidGroup() || !group->IsLeader(GetPlayer()->GetGUID()))
                 return;
-
             WorldPacket data;
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_LEADER, lang, "", 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false);
-
             if(sWorld.getConfig(CONFIG_CHATLOG_RAID))
                 sLog.outChat("[RAID] Leader player %s tells raid: %s",
                     GetPlayer()->GetName(), msg.c_str());
@@ -429,97 +361,74 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
         {
             std::string msg="";
             recv_data >> msg;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             Group *group = GetPlayer()->GetGroup();
             if(!group || !group->isRaidGroup() || !(group->IsLeader(GetPlayer()->GetGUID()) || group->IsAssistant(GetPlayer()->GetGUID())) || group->isBGGroup())
                 return;
-
             WorldPacket data;
             //in battleground, raid warning is sent only to players in battleground - code is ok
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_RAID_WARNING, lang, "", 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false);
-
             if(sWorld.getConfig(CONFIG_CHATLOG_RAID))
                 sLog.outChat("[RAID] Leader player %s warns raid with: %s",
                     GetPlayer()->GetName(), msg.c_str());
         } break;
-
         case CHAT_MSG_BATTLEGROUND:
         {
             std::string msg="";
             recv_data >> msg;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             //battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
             Group *group = GetPlayer()->GetGroup();
             if(!group || !group->isBGGroup())
                 return;
-
             WorldPacket data;
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_BATTLEGROUND, lang, "", 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false);
-
             if(sWorld.getConfig(CONFIG_CHATLOG_BGROUND))
                 sLog.outChat("[BATTLEGROUND] Player %s tells battleground with leader %s: %s",
                     GetPlayer()->GetName(), group->GetLeaderName(), msg.c_str());
         } break;
-
         case CHAT_MSG_BATTLEGROUND_LEADER:
         {
             std::string msg="";
             recv_data >> msg;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             //battleground raid is always in Player->GetGroup(), never in GetOriginalGroup()
             Group *group = GetPlayer()->GetGroup();
             if(!group || !group->isBGGroup() || !group->IsLeader(GetPlayer()->GetGUID()))
                 return;
-
             WorldPacket data;
             ChatHandler::FillMessageData(&data, this, CHAT_MSG_BATTLEGROUND_LEADER, lang, "", 0, msg.c_str(),NULL);
             group->BroadcastPacket(&data, false);
-
             if(sWorld.getConfig(CONFIG_CHATLOG_BGROUND))
                 sLog.outChat("[RAID] Leader player %s tells battleground: %s",
                     GetPlayer()->GetName(), msg.c_str());
         } break;
-
         case CHAT_MSG_CHANNEL:
         {
             std::string channel = "", msg = "";
             recv_data >> channel;
-
             recv_data >> msg;
-
             if (!processChatmessageFurtherAfterSecurityChecks(msg, lang))
                 return;
-
             if(msg.empty())
                 break;
-
             if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
             {
                 Channel *chn = cMgr->GetChannel(channel,_player);
                 if(chn)
                 {
                     chn->Say(_player->GetGUID(),msg.c_str(),lang);
-
                     if((chn->HasFlag(CHANNEL_FLAG_TRADE) ||
                         chn->HasFlag(CHANNEL_FLAG_GENERAL) ||
                         chn->HasFlag(CHANNEL_FLAG_CITY) ||
@@ -533,12 +442,10 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                 }
             }
         } break;
-
         case CHAT_MSG_AFK:
         {
             std::string msg;
             recv_data >> msg;
-
             if((msg.empty() || !_player->isAFK()) && !_player->isInCombat() )
             {
                 if(!_player->isAFK())
@@ -552,12 +459,10 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                     _player->ToggleDND();
             }
         } break;
-
         case CHAT_MSG_DND:
         {
             std::string msg;
             recv_data >> msg;
-
             if(msg.empty() || !_player->isDND())
             {
                 if(!_player->isDND())
@@ -571,23 +476,19 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
                     _player->ToggleAFK();
             }
         } break;
-
         default:
             sLog.outError("CHAT: unknown message type %u, lang: %u", type, lang);
             break;
     }
 }
-
 void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data )
 {
     if(!GetPlayer()->isAlive())
         return;
-
     uint32 emote;
     recv_data >> emote;
     GetPlayer()->HandleEmoteCommand(emote);
 }
-
 namespace MaNGOS
 {
     class EmoteChatBuilder
@@ -595,12 +496,10 @@ namespace MaNGOS
         public:
             EmoteChatBuilder(Player const& pl, uint32 text_emote, uint32 emote_num, Unit const* target)
                 : i_player(pl), i_text_emote(text_emote), i_emote_num(emote_num), i_target(target) {}
-
             void operator()(WorldPacket& data, int32 loc_idx)
             {
                 char const* nam = i_target ? i_target->GetNameForLocaleIdx(loc_idx) : NULL;
                 uint32 namlen = (nam ? strlen(nam) : 0) + 1;
-
                 data.Initialize(SMSG_TEXT_EMOTE, (20+namlen));
                 data << i_player.GetGUID();
                 data << (uint32)i_text_emote;
@@ -611,7 +510,6 @@ namespace MaNGOS
                 else
                     data << (uint8)0x00;
             }
-
         private:
             Player const& i_player;
             uint32        i_text_emote;
@@ -619,32 +517,25 @@ namespace MaNGOS
             Unit const*   i_target;
     };
 }                                                           // namespace MaNGOS
-
 void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
 {
     if(!GetPlayer()->isAlive())
         return;
-
     if (!GetPlayer()->CanSpeak())
     {
         std::string timeStr = secsToTimeString(m_muteTime - time(NULL));
         SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING),timeStr.c_str());
         return;
     }
-
     uint32 text_emote, emoteNum;
     uint64 guid;
-
     recv_data >> text_emote;
     recv_data >> emoteNum;
     recv_data >> guid;
-
     EmotesTextEntry const *em = sEmotesTextStore.LookupEntry(text_emote);
     if (!em)
         return;
-
     uint32 emote_anim = em->textid;
-
     switch(emote_anim)
     {
         case EMOTE_STATE_SLEEP:
@@ -656,47 +547,36 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
             GetPlayer()->HandleEmoteCommand(emote_anim);
             break;
     }
-
     Unit* unit = ObjectAccessor::GetUnit(*_player, guid);
-
     CellPair p = MaNGOS::ComputeCellPair(GetPlayer()->GetPositionX(), GetPlayer()->GetPositionY());
-
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::EmoteChatBuilder emote_builder(*GetPlayer(), text_emote, emoteNum, unit);
     MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > emote_do(emote_builder);
     MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > > emote_worker(GetPlayer(),sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),emote_do);
     TypeContainerVisitor<MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::EmoteChatBuilder > >, WorldTypeMapContainer > message(emote_worker);
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *GetPlayer()->GetMap(), *GetPlayer(), sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE));
-
     GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE, text_emote, 0, unit);
-
     //Send scripted event call
     if (unit && unit->GetTypeId()==TYPEID_UNIT && ((Creature*)unit)->AI())
         ((Creature*)unit)->AI()->ReceiveEmote(GetPlayer(),text_emote);
 }
-
 void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data )
 {
     uint64 iguid;
     uint8 unk;
     //sLog.outDebug("WORLD: Received CMSG_CHAT_IGNORED");
-
     recv_data >> iguid;
     recv_data >> unk;                                       // probably related to spam reporting
-
     Player *player = objmgr.GetPlayer(iguid);
     if(!player || !player->GetSession())
         return;
-
     WorldPacket data;
     ChatHandler::FillMessageData(&data, this, CHAT_MSG_IGNORED, LANG_UNIVERSAL, NULL, GetPlayer()->GetGUID(), GetPlayer()->GetName(),NULL);
     player->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandleChannelDeclineInvite(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());
diff --git a/src/game/CombatAI.cpp b/src/game/CombatAI.cpp
index b18e6dd7532..00d06b9ec33 100644
--- a/src/game/CombatAI.cpp
+++ b/src/game/CombatAI.cpp
@@ -17,64 +17,51 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "CombatAI.h"
 #include "SpellMgr.h"
-
 int AggressorAI::Permissible(const Creature *creature)
 {
     // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight
     if( !creature->isCivilian() && !creature->IsNeutralToAll() )
         return PERMIT_BASE_PROACTIVE;
-
     return PERMIT_BASE_NO;
 }
-
 void AggressorAI::UpdateAI(const uint32 /*diff*/)
 {
     if(!UpdateVictim())
         return;
-
     DoMeleeAttackIfReady();
 }
-
 // some day we will delete these useless things
 int CombatAI::Permissible(const Creature *creature)
 {
     return PERMIT_BASE_NO;
 }
-
 int ArchorAI::Permissible(const Creature *creature)
 {
     return PERMIT_BASE_NO;
 }
-
 int TurretAI::Permissible(const Creature *creature)
 {
     return PERMIT_BASE_NO;
 }
-
 void CombatAI::InitializeAI()
 {
     for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
         if(me->m_spells[i] && GetSpellStore()->LookupEntry(me->m_spells[i]))
             spells.push_back(me->m_spells[i]);
-
     CreatureAI::InitializeAI();
 }
-
 void CombatAI::Reset()
 {
     events.Reset();
 }
-
 void CombatAI::JustDied(Unit *killer)
 {
     for(SpellVct::iterator i = spells.begin(); i != spells.end(); ++i)
         if(AISpellInfo[*i].condition == AICOND_DIE)
             me->CastSpell(killer, *i, true);
 }
-
 void CombatAI::EnterCombat(Unit *who)
 {
     for(SpellVct::iterator i = spells.begin(); i != spells.end(); ++i)
@@ -85,17 +72,13 @@ void CombatAI::EnterCombat(Unit *who)
             events.ScheduleEvent(*i, AISpellInfo[*i].cooldown + rand()%AISpellInfo[*i].cooldown);
     }
 }
-
 void CombatAI::UpdateAI(const uint32 diff)
 {
     if(!UpdateVictim())
         return;
-
     events.Update(diff);
-
     if(me->hasUnitState(UNIT_STAT_CASTING))
         return;
-
     if(uint32 spellId = events.ExecuteEvent())
     {
         DoCast(spellId);
@@ -105,15 +88,12 @@ void CombatAI::UpdateAI(const uint32 diff)
         DoMeleeAttackIfReady();
 }
 
-
 /////////////////
 //CasterAI
 /////////////////
-
 void CasterAI::InitializeAI()
 {
     CombatAI::InitializeAI();
-
     float m_attackDist = 30.0f;
     for(SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr)
         if (AISpellInfo[*itr].condition == AICOND_COMBAT && m_attackDist > GetAISpellInfo(*itr)->maxRange)
@@ -121,12 +101,10 @@ void CasterAI::InitializeAI()
     if (m_attackDist == 30.0f)
         m_attackDist = MELEE_RANGE;
 }
-
 void CasterAI::EnterCombat(Unit *who)
 {
     if (spells.empty())
         return;
-
     uint32 spell = rand()%spells.size();
     uint32 count = 0;
     for(SpellVct::iterator itr = spells.begin(); itr != spells.end(); ++itr, ++count)
@@ -145,17 +123,13 @@ void CasterAI::EnterCombat(Unit *who)
         }
     }
 }
-
 void CasterAI::UpdateAI(const uint32 diff)
 {
     if(!UpdateVictim())
         return;
-
     events.Update(diff);
-
     if(me->hasUnitState(UNIT_STAT_CASTING))
         return;
-
     if(uint32 spellId = events.ExecuteEvent())
     {
         DoCast(spellId);
@@ -164,11 +138,9 @@ void CasterAI::UpdateAI(const uint32 diff)
     }
 }
 
-
 //////////////
 //ArchorAI
 //////////////
-
 ArchorAI::ArchorAI(Creature *c) : CreatureAI(c)
 {
     ASSERT(me->m_spells[0]);
@@ -178,12 +150,10 @@ ArchorAI::ArchorAI(Creature *c) : CreatureAI(c)
     me->m_CombatDistance = GetSpellMaxRange(me->m_spells[0], false);
     me->m_SightDistance = me->m_CombatDistance;
 }
-
 void ArchorAI::AttackStart(Unit *who)
 {
     if(!who)
         return;
-
     if(me->IsWithinCombatRange(who, m_minRange))
     {
         if(me->Attack(who, true) && !who->IsFlying())
@@ -194,27 +164,22 @@ void ArchorAI::AttackStart(Unit *who)
         if(me->Attack(who, false) && !who->IsFlying())
             me->GetMotionMaster()->MoveChase(who, me->m_CombatDistance);
     }
-
     if(who->IsFlying())
         me->GetMotionMaster()->MoveIdle();
 }
-
 void ArchorAI::UpdateAI(const uint32 diff)
 {
     if(!UpdateVictim())
         return;
-
     if(!me->IsWithinCombatRange(me->getVictim(), m_minRange))
         DoSpellAttackIfReady(me->m_spells[0]);
     else
         DoMeleeAttackIfReady();
 }
 
-
 //////////////
 //TurretAI
 //////////////
-
 TurretAI::TurretAI(Creature *c) : CreatureAI(c)
 {
     ASSERT(me->m_spells[0]);
@@ -222,7 +187,6 @@ TurretAI::TurretAI(Creature *c) : CreatureAI(c)
     me->m_CombatDistance = GetSpellMaxRange(me->m_spells[0], false);
     me->m_SightDistance = me->m_CombatDistance;
 }
-
 bool TurretAI::CanAIAttack(const Unit *who) const
 {
     // TODO: use one function to replace it
@@ -231,20 +195,16 @@ bool TurretAI::CanAIAttack(const Unit *who) const
         return false;
     return true;
 }
-
 void TurretAI::AttackStart(Unit *who)
 {
     if(who)
         me->Attack(who, false);
 }
-
 void TurretAI::UpdateAI(const uint32 diff)
 {
     if(!UpdateVictim())
         return;
-
     DoSpellAttackIfReady(me->m_spells[0]);
-
     //if(!DoSpellAttackIfReady(me->m_spells[0]))
         //if(HostilReference *ref = me->getThreatManager().getCurrentVictim())
             //ref->removeReference();
diff --git a/src/game/CombatAI.h b/src/game/CombatAI.h
index 5ded95601ae..d63ee424bf5 100644
--- a/src/game/CombatAI.h
+++ b/src/game/CombatAI.h
@@ -17,31 +17,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_COMBATAI_H
 #define TRINITY_COMBATAI_H
-
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-
 class Creature;
-
 class TRINITY_DLL_DECL AggressorAI : public CreatureAI
 {
     public:
         explicit AggressorAI(Creature *c) : CreatureAI(c) {}
-
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
 };
-
 typedef std::vector<uint32> SpellVct;
-
 class TRINITY_DLL_SPEC CombatAI : public CreatureAI
 {
     public:
         explicit CombatAI(Creature *c) : CreatureAI(c) {}
-
         void InitializeAI();
         void Reset();
         void EnterCombat(Unit* who);
@@ -52,7 +44,6 @@ class TRINITY_DLL_SPEC CombatAI : public CreatureAI
         EventMap events;
         SpellVct spells;
 };
-
 class TRINITY_DLL_SPEC CasterAI : public CombatAI
 {
     public:
@@ -64,19 +55,16 @@ class TRINITY_DLL_SPEC CasterAI : public CombatAI
     private:
         float m_attackDist;
 };
-
 struct TRINITY_DLL_SPEC ArchorAI : public CreatureAI
 {
     public:
         explicit ArchorAI(Creature *c);
         void AttackStart(Unit *who);
         void UpdateAI(const uint32 diff);
-
         static int Permissible(const Creature *);
     protected:
         float m_minRange;
 };
-
 struct TRINITY_DLL_SPEC TurretAI : public CreatureAI
 {
     public:
@@ -84,10 +72,8 @@ struct TRINITY_DLL_SPEC TurretAI : public CreatureAI
         bool CanAIAttack(const Unit *who) const;
         void AttackStart(Unit *who);
         void UpdateAI(const uint32 diff);
-
         static int Permissible(const Creature *);
     protected:
         float m_minRange;
 };
-
 #endif
diff --git a/src/game/CombatHandler.cpp b/src/game/CombatHandler.cpp
index 095986303f8..80ca6ba3532 100644
--- a/src/game/CombatHandler.cpp
+++ b/src/game/CombatHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Log.h"
 #include "WorldPacket.h"
@@ -25,61 +24,47 @@
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectDefines.h"
-
 void WorldSession::HandleAttackSwingOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     DEBUG_LOG( "WORLD: Recvd CMSG_ATTACKSWING Message guidlow:%u guidhigh:%u", GUID_LOPART(guid), GUID_HIPART(guid) );
-
     Unit *pEnemy = ObjectAccessor::GetUnit(*_player, guid);
-
     if(!pEnemy)
     {
         if(!IS_UNIT_GUID(guid))
             sLog.outError("WORLD: Object %u (TypeID: %u) isn't player, pet or creature",GUID_LOPART(guid),GuidHigh2TypeId(GUID_HIPART(guid)));
         else
             sLog.outError( "WORLD: Enemy %s %u not found",GetLogNameForGuid(guid),GUID_LOPART(guid));
-
         // stop attack state at client
         SendAttackStop(NULL);
         return;
     }
-
     if(!_player->canAttack(pEnemy))
     {
         sLog.outError( "WORLD: Enemy %s %u is friendly",(IS_PLAYER_GUID(guid) ? "player" : "creature"),GUID_LOPART(guid));
-
         // stop attack state at client
         SendAttackStop(pEnemy);
         return;
     }
-
     _player->Attack(pEnemy,true);
 }
-
 void WorldSession::HandleAttackStopOpcode( WorldPacket & /*recv_data*/ )
 {
     GetPlayer()->AttackStop();
 }
-
 void WorldSession::HandleSetSheathedOpcode( WorldPacket & recv_data )
 {
     uint32 sheathed;
     recv_data >> sheathed;
-
     //sLog.outDebug( "WORLD: Recvd CMSG_SETSHEATHED Message guidlow:%u value1:%u", GetPlayer()->GetGUIDLow(), sheathed );
-
     if(sheathed >= MAX_SHEATH_STATE)
     {
         sLog.outError("Unknown sheath state %u ??",sheathed);
         return;
     }
-
     GetPlayer()->SetSheath(SheathState(sheathed));
 }
-
 void WorldSession::SendAttackStop(Unit const* enemy)
 {
     WorldPacket data( SMSG_ATTACKSTOP, (4+20) );            // we guess size
diff --git a/src/game/ConfusedMovementGenerator.cpp b/src/game/ConfusedMovementGenerator.cpp
index 23477c6e62f..76531d35f01 100644
--- a/src/game/ConfusedMovementGenerator.cpp
+++ b/src/game/ConfusedMovementGenerator.cpp
@@ -17,19 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Creature.h"
 #include "MapManager.h"
 #include "Opcodes.h"
 #include "ConfusedMovementGenerator.h"
 #include "DestinationHolderImp.h"
 #include "VMapFactory.h"
-
 #ifdef MAP_BASED_RAND_GEN
 #define rand_norm() unit.rand_norm()
 #define urand(a,b) unit.urand(a,b)
 #endif
-
 template<class T>
 void
 ConfusedMovementGenerator<T>::Initialize(T &unit)
@@ -39,35 +36,26 @@ ConfusedMovementGenerator<T>::Initialize(T &unit)
     x = unit.GetPositionX();
     y = unit.GetPositionY();
     z = unit.GetPositionZ();
-
     Map const* map = unit.GetBaseMap();
-
     i_nextMove = 1;
-
     bool is_water_ok, is_land_ok;
     _InitSpecific(unit, is_water_ok, is_land_ok);
-
     VMAP::IVMapManager *vMaps = VMAP::VMapFactory::createOrGetVMapManager();
-
     for(unsigned int idx=0; idx < MAX_CONF_WAYPOINTS+1; ++idx)
     {
         const float wanderX=wander_distance*rand_norm() - wander_distance/2;
         const float wanderY=wander_distance*rand_norm() - wander_distance/2;
-
-        const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f); 
+        const bool isInLoS = vMaps->isInLineOfSight(unit.GetMapId(), x, y, z + 2.0f, i_waypoints[idx][0], i_waypoints[idx][1], z + 2.0f);
         if (!isInLoS)
         {
-            i_waypoints[idx][0] = x; 
+            i_waypoints[idx][0] = x;
             i_waypoints[idx][1] = y;
         }
-
         i_waypoints[idx][0] = x + wanderX;
         i_waypoints[idx][1] = y + wanderY;
-
         // prevent invalid coordinates generation
         Trinity::NormalizeMapCoord(i_waypoints[idx][0]);
         Trinity::NormalizeMapCoord(i_waypoints[idx][1]);
-
         bool is_water = map->IsInWater(i_waypoints[idx][0],i_waypoints[idx][1],z);
         // if generated wrong path just ignore
         if ((is_water && !is_water_ok) || (!is_water && !is_land_ok))
@@ -75,11 +63,9 @@ ConfusedMovementGenerator<T>::Initialize(T &unit)
             i_waypoints[idx][0] = idx > 0 ? i_waypoints[idx-1][0] : x;
             i_waypoints[idx][1] = idx > 0 ? i_waypoints[idx-1][1] : y;
         }
-
         unit.UpdateGroundPositionZ(i_waypoints[idx][0],i_waypoints[idx][1],z);
         i_waypoints[idx][2] =  z;
     }
-
     unit.SetUInt64Value(UNIT_FIELD_TARGET, 0);
     unit.SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_CONFUSED);
     unit.CastStop();
@@ -87,7 +73,6 @@ ConfusedMovementGenerator<T>::Initialize(T &unit)
     unit.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
     unit.addUnitState(UNIT_STAT_CONFUSED);
 }
-
 template<>
 void
 ConfusedMovementGenerator<Creature>::_InitSpecific(Creature &creature, bool &is_water_ok, bool &is_land_ok)
@@ -95,7 +80,6 @@ ConfusedMovementGenerator<Creature>::_InitSpecific(Creature &creature, bool &is_
     is_water_ok = creature.canSwim();
     is_land_ok  = creature.canWalk();
 }
-
 template<>
 void
 ConfusedMovementGenerator<Player>::_InitSpecific(Player &, bool &is_water_ok, bool &is_land_ok)
@@ -103,7 +87,6 @@ ConfusedMovementGenerator<Player>::_InitSpecific(Player &, bool &is_water_ok, bo
     is_water_ok = true;
     is_land_ok  = true;
 }
-
 template<class T>
 void
 ConfusedMovementGenerator<T>::Reset(T &unit)
@@ -113,17 +96,14 @@ ConfusedMovementGenerator<T>::Reset(T &unit)
     i_destinationHolder.ResetUpdate();
     unit.StopMoving();
 }
-
 template<class T>
 bool
 ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff)
 {
     if(!&unit)
         return true;
-
     if(unit.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED))
         return true;
-
     if( i_nextMoveTime.Passed() )
     {
         // currently moving, update location
@@ -134,7 +114,6 @@ ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff)
             {
                 // arrived, stop and wait a bit
                 unit.clearUnitState(UNIT_STAT_MOVE);
-
                 i_nextMove = urand(1,MAX_CONF_WAYPOINTS);
                 i_nextMoveTime.Reset(urand(0, 1500-1));     // TODO: check the minimum reset time, should be probably higher
             }
@@ -157,7 +136,6 @@ ConfusedMovementGenerator<T>::Update(T &unit, const uint32 &diff)
     }
     return true;
 }
-
 template<class T>
 void
 ConfusedMovementGenerator<T>::Finalize(T &unit)
@@ -167,7 +145,6 @@ ConfusedMovementGenerator<T>::Finalize(T &unit)
     if(unit.GetTypeId() == TYPEID_UNIT && unit.getVictim())
         unit.SetUInt64Value(UNIT_FIELD_TARGET, unit.getVictim()->GetGUID());
 }
-
 template void ConfusedMovementGenerator<Player>::Initialize(Player &player);
 template void ConfusedMovementGenerator<Creature>::Initialize(Creature &creature);
 template void ConfusedMovementGenerator<Player>::Finalize(Player &player);
diff --git a/src/game/ConfusedMovementGenerator.h b/src/game/ConfusedMovementGenerator.h
index ad47b13cb39..0675ea49e4c 100644
--- a/src/game/ConfusedMovementGenerator.h
+++ b/src/game/ConfusedMovementGenerator.h
@@ -17,35 +17,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CONFUSEDGENERATOR_H
 #define TRINITY_CONFUSEDGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-
 #define MAX_CONF_WAYPOINTS 24
-
 template<class T>
 class TRINITY_DLL_SPEC ConfusedMovementGenerator
 : public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> >
 {
     public:
         explicit ConfusedMovementGenerator() : i_nextMoveTime(0) {}
-
         void Initialize(T &);
         void Finalize(T &);
         void Reset(T &);
         bool Update(T &, const uint32 &);
-
         bool GetDestination(float &x, float &y, float &z) const
         {
             if(i_destinationHolder.HasArrived()) return false;
             i_destinationHolder.GetDestination(x,y,z);
             return true;
         }
-
         MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; }
     private:
         void _InitSpecific(T &, bool &, bool &);
diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp
index 16e52ef46aa..350e314152d 100644
--- a/src/game/Corpse.cpp
+++ b/src/game/Corpse.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Corpse.h"
 #include "Player.h"
@@ -27,87 +26,65 @@
 #include "Opcodes.h"
 #include "GossipDef.h"
 #include "World.h"
-
 Corpse::Corpse(CorpseType type) : WorldObject()
 , m_type(type)
 {
     m_objectType |= TYPEMASK_CORPSE;
     m_objectTypeId = TYPEID_CORPSE;
-
     m_updateFlag = (UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_POSITION);
-
     m_valuesCount = CORPSE_END;
-
     m_time = time(NULL);
-
     lootForBody = false;
-
     if(type != CORPSE_BONES)
         m_isWorldObject = true;
 }
-
 Corpse::~Corpse()
 {
 }
-
 void Corpse::AddToWorld()
 {
     ///- Register the corpse for guid lookup
     if(!IsInWorld())
         ObjectAccessor::Instance().AddObject(this);
-
     Object::AddToWorld();
 }
-
 void Corpse::RemoveFromWorld()
 {
     ///- Remove the corpse from the accessor
     if(IsInWorld())
         ObjectAccessor::Instance().RemoveObject(this);
-
     Object::RemoveFromWorld();
 }
-
 bool Corpse::Create( uint32 guidlow, Map *map )
 {
     SetMap(map);
     Object::_Create(guidlow, 0, HIGHGUID_CORPSE);
     return true;
 }
-
 bool Corpse::Create( uint32 guidlow, Player *owner)
 {
     ASSERT(owner);
-
     Relocate(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), owner->GetOrientation());
-
     if(!IsPositionValid())
     {
         sLog.outError("Corpse (guidlow %d, owner %s) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
             guidlow, owner->GetName(), owner->GetPositionX(), owner->GetPositionY());
         return false;
     }
-
     //we need to assign owner's map for corpse
     //in other way we will get a crash in Corpse::SaveToDB()
     SetMap(owner->GetMap());
-
     WorldObject::_Create(guidlow, HIGHGUID_CORPSE, owner->GetPhaseMask());
-
     SetFloatValue( OBJECT_FIELD_SCALE_X, 1 );
     SetUInt64Value( CORPSE_FIELD_OWNER, owner->GetGUID() );
-
     m_grid = Trinity::ComputeGridPair(GetPositionX(), GetPositionY());
-
     return true;
 }
-
 void Corpse::SaveToDB()
 {
     // prevent DB data inconsistence problems and duplicates
     CharacterDatabase.BeginTransaction();
     DeleteFromDB();
-
     std::ostringstream ss;
     ss  << "INSERT INTO corpse (guid,player,position_x,position_y,position_z,orientation,zone,map,data,time,corpse_type,instance,phaseMask) VALUES ("
         << GetGUIDLow() << ", "
@@ -128,21 +105,17 @@ void Corpse::SaveToDB()
     CharacterDatabase.Execute( ss.str().c_str() );
     CharacterDatabase.CommitTransaction();
 }
-
 void Corpse::DeleteBonesFromWorld()
 {
     assert(GetType() == CORPSE_BONES);
     Corpse* corpse = ObjectAccessor::GetCorpse(*this, GetGUID());
-
     if (!corpse)
     {
         sLog.outError("Bones %u not found in world.", GetGUIDLow());
         return;
     }
-
     AddObjectToRemoveList();
 }
-
 void Corpse::DeleteFromDB()
 {
     if(GetType() == CORPSE_BONES)
@@ -152,7 +125,6 @@ void Corpse::DeleteFromDB()
         // all corpses (not bones)
         CharacterDatabase.PExecute("DELETE FROM corpse WHERE player = '%d' AND corpse_type <> '0'",  GUID_LOPART(GetOwnerGUID()));
 }
-
 /*
 bool Corpse::LoadFromDB(uint32 guid, QueryResult *result, uint32 InstanceId)
 {
@@ -160,29 +132,22 @@ bool Corpse::LoadFromDB(uint32 guid, QueryResult *result, uint32 InstanceId)
     if (!external)
         //                                        0          1          2          3           4   5    6    7           8        9
         result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,data,time,corpse_type,instance,phaseMask FROM corpse WHERE guid = '%u'",guid);
-
     if( !result )
     {
         sLog.outError("Corpse (GUID: %u) not found in table `corpse`, can't load. ",guid);
         return false;
     }
-
     Field *fields = result->Fetch();
-
     if(!LoadFromDB(guid, fields))
     {
         if (!external)
             delete result;
-
         return false;
     }
-
     if (!external)
         delete result;
-
     return true;
 }*/
-
 bool Corpse::LoadFromDB(uint32 guid, Field *fields)
 {
     //                                          0          1          2          3           4   5    6    7           8        9
@@ -192,52 +157,39 @@ bool Corpse::LoadFromDB(uint32 guid, Field *fields)
     float positionZ = fields[2].GetFloat();
     float ort       = fields[3].GetFloat();
     uint32 mapid    = fields[4].GetUInt32();
-
     Object::_Create(guid, 0, HIGHGUID_CORPSE);
-
     if(!LoadValues( fields[5].GetString() ))
     {
         sLog.outError("Corpse #%d have broken data in `data` field. Can't be loaded.",guid);
         return false;
     }
-
     m_time = time_t(fields[6].GetUInt64());
     m_type = CorpseType(fields[7].GetUInt32());
-
     if(m_type >= MAX_CORPSE_TYPE)
     {
         sLog.outError("Corpse (guidlow %d, owner %d) have wrong corpse type, not load.",GetGUIDLow(),GUID_LOPART(GetOwnerGUID()));
         return false;
     }
-
     if(m_type != CORPSE_BONES)
         m_isWorldObject = true;
-
     uint32 instanceid  = fields[8].GetUInt32();
-
     uint32 phaseMask   = fields[9].GetUInt32();
-
     // overwrite possible wrong/corrupted guid
     SetUInt64Value(OBJECT_FIELD_GUID, MAKE_NEW_GUID(guid, 0, HIGHGUID_CORPSE));
-
     // place
     SetLocationInstanceId(instanceid);
     SetLocationMapId(mapid);
     SetPhaseMask(phaseMask, false);
     Relocate(positionX, positionY, positionZ, ort);
-
     if(!IsPositionValid())
     {
         sLog.outError("Corpse (guidlow %d, owner %d) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
             GetGUIDLow(), GUID_LOPART(GetOwnerGUID()), GetPositionX(), GetPositionY());
         return false;
     }
-
     m_grid = Trinity::ComputeGridPair(GetPositionX(), GetPositionY());
-
     return true;
 }
-
 bool Corpse::isVisibleForInState(Player const* u, bool inVisibleList) const
 {
     return IsInWorld() && u->IsInWorld() && IsWithinDistInMap(u->m_seer, World::GetMaxVisibleDistanceForObject() + (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
diff --git a/src/game/Corpse.h b/src/game/Corpse.h
index e0374a03470..ca9a16d8ced 100644
--- a/src/game/Corpse.h
+++ b/src/game/Corpse.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_CORPSE_H
 #define TRINITYCORE_CORPSE_H
-
 #include "Object.h"
 #include "Database/DatabaseEnv.h"
 #include "GridDefines.h"
 #include "LootMgr.h"
-
 enum CorpseType
 {
     CORPSE_BONES             = 0,
@@ -33,10 +30,8 @@ enum CorpseType
     CORPSE_RESURRECTABLE_PVP = 2
 };
 #define MAX_CORPSE_TYPE        3
-
 // Value equal client resurrection dialog show radius.
 #define CORPSE_RECLAIM_RADIUS 39
-
 enum CorpseFlags
 {
     CORPSE_FLAG_NONE        = 0x00,
@@ -47,51 +42,38 @@ enum CorpseFlags
     CORPSE_FLAG_HIDE_CLOAK  = 0x10,
     CORPSE_FLAG_LOOTABLE    = 0x20
 };
-
 class Corpse : public WorldObject
 {
     public:
         explicit Corpse( CorpseType type = CORPSE_BONES );
         ~Corpse( );
-
         void AddToWorld();
         void RemoveFromWorld();
-
         bool Create( uint32 guidlow, Map *map );
         bool Create( uint32 guidlow, Player *owner );
-
         void SaveToDB();
         //bool LoadFromDB(uint32 guid, QueryResult *result, uint32 InstanceId);
         bool LoadFromDB(uint32 guid, Field *fields);
-
         void DeleteBonesFromWorld();
         void DeleteFromDB();
-
         uint64 const& GetOwnerGUID() const { return GetUInt64Value(CORPSE_FIELD_OWNER); }
-
         time_t const& GetGhostTime() const { return m_time; }
         void ResetGhostTime() { m_time = time(NULL); }
         CorpseType GetType() const { return m_type; }
-
         GridPair const& GetGrid() const { return m_grid; }
         void SetGrid(GridPair const& grid) { m_grid = grid; }
-
         bool isVisibleForInState(Player const* u, bool inVisibleList) const;
-
         Loot loot;                                          // remove insignia ONLY at BG
         Player* lootRecipient;
         bool lootForBody;
-
         void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
         void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
         void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
         void Whisper(int32 textId,uint64 receiver) { MonsterWhisper(textId,receiver); }
         void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); }
-
         GridReference<Corpse> &GetGridRef() { return m_gridRef; }
     private:
         GridReference<Corpse> m_gridRef;
-
         CorpseType m_type;
         time_t m_time;
         GridPair m_grid;                                    // gride for corpse position for fast search
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index a3a2e5c1690..63c9d34d157 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -49,16 +48,13 @@
 #include "Vehicle.h"
 // apply implementation of the singletons
 #include "Policies/SingletonImp.h"
-
 TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
 {
     TrainerSpellMap::const_iterator itr = spellList.find(spell_id);
     if (itr != spellList.end())
         return &itr->second;
-
     return NULL;
 }
-
 bool VendorItemData::RemoveItem( uint32 item_id )
 {
     for(VendorItemList::iterator i = m_items.begin(); i != m_items.end(); ++i )
@@ -71,7 +67,6 @@ bool VendorItemData::RemoveItem( uint32 item_id )
     }
     return false;
 }
-
 size_t VendorItemData::FindItemSlot(uint32 item_id) const
 {
     for(size_t i = 0; i < m_items.size(); ++i )
@@ -79,7 +74,6 @@ size_t VendorItemData::FindItemSlot(uint32 item_id) const
             return i;
     return m_items.size();
 }
-
 VendorItem const* VendorItemData::FindItem(uint32 item_id) const
 {
     for(VendorItemList::const_iterator i = m_items.begin(); i != m_items.end(); ++i )
@@ -87,20 +81,16 @@ VendorItem const* VendorItemData::FindItem(uint32 item_id) const
             return *i;
     return NULL;
 }
-
 uint32 CreatureInfo::GetRandomValidModelId() const
 {
     uint8 c = 0;
     uint32 modelIDs[4];
-
     if (Modelid1) modelIDs[c++] = Modelid1;
     if (Modelid2) modelIDs[c++] = Modelid2;
     if (Modelid3) modelIDs[c++] = Modelid3;
     if (Modelid4) modelIDs[c++] = Modelid4;
-
     return ((c>0) ? modelIDs[urand(0,c-1)] : 0);
 }
-
 uint32 CreatureInfo::GetFirstValidModelId() const
 {
     if(Modelid1) return Modelid1;
@@ -109,7 +99,6 @@ uint32 CreatureInfo::GetFirstValidModelId() const
     if(Modelid4) return Modelid4;
     return 0;
 }
-
 bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
 {
     if(Unit* victim = Unit::GetUnit(m_owner, m_victim))
@@ -118,7 +107,6 @@ bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
         {
             Creature* assistant = Unit::GetCreature(m_owner, *m_assistants.begin());
             m_assistants.pop_front();
-
             if (assistant && assistant->CanAssistTo(&m_owner, victim))
             {
                 assistant->SetNoCallAssistance(true);
@@ -130,7 +118,6 @@ bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
     }
     return true;
 }
-
 Creature::Creature() :
 Unit(),
 lootForPickPocketed(false), lootForBody(false), m_groupLootTimer(0), lootingGroupLeaderGUID(0),
@@ -145,34 +132,27 @@ m_creatureInfo(NULL), m_reactState(REACT_AGGRESSIVE), m_formation(NULL)
 {
     m_regenTimer = 200;
     m_valuesCount = UNIT_END;
-
     for(uint8 i =0; i<CREATURE_MAX_SPELLS; ++i)
         m_spells[i] = 0;
-
     m_CreatureSpellCooldowns.clear();
     m_CreatureCategoryCooldowns.clear();
     m_GlobalCooldown = 0;
     DisableReputationGain = false;
     //m_unit_movement_flags = MONSTER_MOVE_WALK;
-
     m_SightDistance = sWorld.getConfig(CONFIG_SIGHT_MONSTER);
     m_CombatDistance = 0;//MELEE_RANGE;
 }
-
 Creature::~Creature()
 {
     m_vendorItemCounts.clear();
-
     if(i_AI)
     {
         delete i_AI;
         i_AI = NULL;
     }
-
     //if(m_uint32Values)
     //    sLog.outError("Deconstruct Creature Entry = %u", GetEntry());
 }
-
 void Creature::AddToWorld()
 {
     ///- Register the creature for guid lookup
@@ -188,7 +168,6 @@ void Creature::AddToWorld()
             GetVehicleKit()->Install();
     }
 }
-
 void Creature::RemoveFromWorld()
 {
     if(IsInWorld())
@@ -201,7 +180,6 @@ void Creature::RemoveFromWorld()
         ObjectAccessor::Instance().RemoveObject(this);
     }
 }
-
 void Creature::DisappearAndDie()
 {
     DestroyForNearbyPlayers();
@@ -211,26 +189,21 @@ void Creature::DisappearAndDie()
         setDeathState(JUST_DIED);
     RemoveCorpse();
 }
-
 void Creature::SearchFormation()
 {
     if(isSummon())
         return;
-
     uint32 lowguid = GetDBTableGUIDLow();
     if(!lowguid)
         return;
-
     CreatureGroupInfoType::iterator frmdata = CreatureGroupMap.find(lowguid);
     if(frmdata != CreatureGroupMap.end())
         formation_mgr.AddCreatureToGroup(frmdata->second->leaderGUID, this);
 }
-
 void Creature::RemoveCorpse()
 {
     if ((getDeathState()!=CORPSE && !m_isDeadByDefault) || (getDeathState()!=ALIVE && m_isDeadByDefault))
         return;
-
     m_deathTimer = 0;
     setDeathState(DEAD);
     ObjectAccessor::UpdateObjectVisibility(this);
@@ -238,15 +211,12 @@ void Creature::RemoveCorpse()
     uint32 respawnDelay = m_respawnDelay;
     if (AI())
         AI()->CorpseRemoved(respawnDelay);
-
     m_respawnTime = time(NULL) + m_respawnDelay;
-
     float x,y,z,o;
     GetRespawnCoord(x, y, z, &o);
     SetHomePosition(x,y,z,o);
     GetMap()->CreatureRelocation(this,x,y,z,o);
 }
-
 /**
  * change the entry of creature until respawn
  */
@@ -258,7 +228,6 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
         sLog.outErrorDb("Creature::UpdateEntry creature entry %u does not exist.", Entry);
         return false;
     }
-
     // get heroic mode entry
     uint32 actualEntry = Entry;
     CreatureInfo const *cinfo = normalInfo;
@@ -275,23 +244,18 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
             }
         }
     }
-
     SetEntry(Entry);                                        // normal entry always
     m_creatureInfo = cinfo;                                 // map mode related always
-
     // equal to player Race field, but creature does not have race
     SetByteValue(UNIT_FIELD_BYTES_0, 0, 0);
-
     // known valid are: CLASS_WARRIOR,CLASS_PALADIN,CLASS_ROGUE,CLASS_MAGE
     SetByteValue(UNIT_FIELD_BYTES_0, 1, uint8(cinfo->unit_class));
-
     // Cancel load if no model defined
     if (!(cinfo->GetFirstValidModelId()))
     {
         sLog.outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ",Entry);
         return false;
     }
-
     uint32 display_id = objmgr.ChooseDisplayId(0, GetCreatureInfo(), data);
     CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(display_id);
     if (!minfo)                                             // Cancel load if no model defined
@@ -299,13 +263,10 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
         sLog.outErrorDb("Creature (Entry: %u) has no model defined in table `creature_template`, can't load. ",Entry);
         return false;
     }
-
     display_id = minfo->modelid;                            // it can be different (for another gender)
-
     SetDisplayId(display_id);
     SetNativeDisplayId(display_id);
     SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
-
     // Load creature equipment
     if(!data || data->equipmentId == 0)
     {                                                       // use default from the template
@@ -315,61 +276,44 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
     {                                                       // override, -1 means no equipment
         LoadEquipment(data->equipmentId);
     }
-
     SetName(normalInfo->Name);                              // at normal entry always
-
     SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS,minfo->bounding_radius);
     SetFloatValue(UNIT_FIELD_COMBATREACH,minfo->combat_reach );
-
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
-
     SetSpeed(MOVE_WALK,     cinfo->speed );
     SetSpeed(MOVE_RUN,      cinfo->speed );
     SetSpeed(MOVE_SWIM,     cinfo->speed );
-
     SetFloatValue(OBJECT_FIELD_SCALE_X, cinfo->scale);
-
     // checked at loading
     m_defaultMovementType = MovementGeneratorType(cinfo->MovementType);
     if(!m_respawnradius && m_defaultMovementType==RANDOM_MOTION_TYPE)
         m_defaultMovementType = IDLE_MOTION_TYPE;
-
     for(uint8 i=0; i < CREATURE_MAX_SPELLS; ++i)
         m_spells[i] = GetCreatureInfo()->spells[i];
-
     return true;
 }
-
 bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
 {
     if(!InitEntry(Entry,team,data))
         return false;
-
     m_regenHealth = GetCreatureInfo()->RegenHealth;
-
     // creatures always have melee weapon ready if any
     SetSheath(SHEATH_STATE_MELEE);
-
     SelectLevel(GetCreatureInfo());
     if (team == HORDE)
         setFaction(GetCreatureInfo()->faction_H);
     else
         setFaction(GetCreatureInfo()->faction_A);
-
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT)
         SetUInt32Value(UNIT_NPC_FLAGS,GetCreatureInfo()->npcflag | gameeventmgr.GetNPCFlag(this));
     else
         SetUInt32Value(UNIT_NPC_FLAGS,GetCreatureInfo()->npcflag);
-
     SetAttackTime(BASE_ATTACK,  GetCreatureInfo()->baseattacktime);
     SetAttackTime(OFF_ATTACK,   GetCreatureInfo()->baseattacktime);
     SetAttackTime(RANGED_ATTACK,GetCreatureInfo()->rangeattacktime);
-
     SetUInt32Value(UNIT_FIELD_FLAGS,GetCreatureInfo()->unit_flags);
     SetUInt32Value(UNIT_DYNAMIC_FLAGS,GetCreatureInfo()->dynamicflags);
-
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
-
     SetMeleeDamageSchool(SpellSchools(GetCreatureInfo()->dmgschool));
     SetModifierValue(UNIT_MOD_ARMOR,             BASE_VALUE, float(GetCreatureInfo()->armor));
     SetModifierValue(UNIT_MOD_RESISTANCE_HOLY,   BASE_VALUE, float(GetCreatureInfo()->resistance1));
@@ -378,10 +322,8 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
     SetModifierValue(UNIT_MOD_RESISTANCE_FROST,  BASE_VALUE, float(GetCreatureInfo()->resistance4));
     SetModifierValue(UNIT_MOD_RESISTANCE_SHADOW, BASE_VALUE, float(GetCreatureInfo()->resistance5));
     SetModifierValue(UNIT_MOD_RESISTANCE_ARCANE, BASE_VALUE, float(GetCreatureInfo()->resistance6));
-
     SetCanModifyStats(true);
     UpdateAllStats();
-
     FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(GetCreatureInfo()->faction_A);
     if (factionTemplate)                                    // check and error show at loading templates
     {
@@ -391,11 +333,9 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
                 (factionEntry->team == ALLIANCE || factionEntry->team == HORDE) )
                 SetPvP(true);
     }
-
     // HACK: trigger creature is always not selectable
     if(isTrigger())
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-
     if(isTotem() || isTrigger()
         || GetCreatureType() == CREATURE_TYPE_CRITTER)
         SetReactState(REACT_PASSIVE);
@@ -403,26 +343,21 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
         SetReactState(REACT_DEFENSIVE);*/
     else
         SetReactState(REACT_AGGRESSIVE);
-
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_TAUNT)
     {
         ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
         ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
     }
-
     if(GetCreatureInfo()->InhabitType & INHABIT_AIR)
         AddUnitMovementFlag(MOVEMENTFLAG_FLY_MODE + MOVEMENTFLAG_FLYING);
-
     return true;
 }
-
 void Creature::Update(uint32 diff)
 {
     if(m_GlobalCooldown <= diff)
         m_GlobalCooldown = 0;
     else
         m_GlobalCooldown -= diff;
-
     switch( m_deathState )
     {
         case JUST_ALIVED:
@@ -459,7 +394,6 @@ void Creature::Update(uint32 diff)
         {
             if (m_isDeadByDefault)
                 break;
-
             if( m_deathTimer <= diff )
             {
                 RemoveCorpse();
@@ -469,7 +403,6 @@ void Creature::Update(uint32 diff)
             {
                 // for delayed spells
                 m_Events.Update( diff );
-
                 m_deathTimer -= diff;
                 if (m_groupLootTimer && lootingGroupLeaderGUID)
                 {
@@ -487,7 +420,6 @@ void Creature::Update(uint32 diff)
                     }
                 }
             }
-
             break;
         }
         case ALIVE:
@@ -504,14 +436,11 @@ void Creature::Update(uint32 diff)
                     m_deathTimer -= diff;
                 }
             }
-
             Unit::Update( diff );
-
             // creature can be dead after Unit::Update call
             // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly)
             if(!isAlive())
                 break;
-
             // if creature is charmed, switch to charmed AI
             if(NeedChangeAI)
             {
@@ -519,7 +448,6 @@ void Creature::Update(uint32 diff)
                 NeedChangeAI = false;
                 IsAIEnabled = true;
             }
-
             if(!IsInEvadeMode() && IsAIEnabled)
             {
                 // do not allow the AI to be changed during update
@@ -527,12 +455,10 @@ void Creature::Update(uint32 diff)
                 i_AI->UpdateAI(diff);
                 m_AI_locked = false;
             }
-
             // creature can be dead after UpdateAI call
             // CORPSE/DEAD state will processed at next tick (in other case death timer will be updated unexpectedly)
             if(!isAlive())
                 break;
-
             if(m_regenTimer > 0)
             {
                 if(diff >= m_regenTimer)
@@ -540,20 +466,16 @@ void Creature::Update(uint32 diff)
                 else
                     m_regenTimer -= diff;
             }
-
             if (m_regenTimer != 0)
                break;
-
             bool bIsPolymorphed = IsPolymorphed();
             bool bInCombat = isInCombat() && (!getVictim() ||                                        // if isInCombat() is true and this has no victim
                              !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself() ||                // or the victim/owner/charmer is not a player
                              !getVictim()->GetCharmerOrOwnerPlayerOrPlayerItself()->isGameMaster()); // or the victim/owner/charmer is not a GameMaster
-
-            /*if(m_regenTimer <= diff) 
+            /*if(m_regenTimer <= diff)
             {*/
             if(!bInCombat || bIsPolymorphed) // regenerate health if not in combat or if polymorphed
                 RegenerateHealth();
-
             if(getPowerType() == POWER_ENERGY)
             {
                 if(!IsVehicle() || GetVehicleKit()->GetVehicleInfo()->m_powerType != POWER_PYRITE)
@@ -561,10 +483,9 @@ void Creature::Update(uint32 diff)
             }
             else
                 RegenerateMana();
-
             /*if(!bIsPolymorphed) // only increase the timer if not polymorphed
                     m_regenTimer += 2000 - diff;
-            }   
+            }
             else
                 if(!bIsPolymorphed) // if polymorphed, skip the timer
                     m_regenTimer -= diff;*/
@@ -577,17 +498,13 @@ void Creature::Update(uint32 diff)
             break;
     }
 }
-
 void Creature::RegenerateMana()
 {
     uint32 curValue = GetPower(POWER_MANA);
     uint32 maxValue = GetMaxPower(POWER_MANA);
-
     if (curValue >= maxValue)
         return;
-
     uint32 addvalue = 0;
-
     // Combat and any controlled creature
     if (isInCombat() || GetCharmerOrOwnerGUID())
     {
@@ -595,35 +512,27 @@ void Creature::RegenerateMana()
         {
             float ManaIncreaseRate = sWorld.getRate(RATE_POWER_MANA);
             float Spirit = GetStat(STAT_SPIRIT);
-
             addvalue = uint32((Spirit/5.0f + 17.0f) * ManaIncreaseRate);
         }
     }
     else
         addvalue = maxValue/3;
-
     ModifyPower(POWER_MANA, addvalue);
 }
-
 void Creature::RegenerateHealth()
 {
     if (!isRegeneratingHealth())
         return;
-
     uint32 curValue = GetHealth();
     uint32 maxValue = GetMaxHealth();
-
     if (curValue >= maxValue)
         return;
-
     uint32 addvalue = 0;
-
     // Not only pet, but any controlled creature
     if(GetCharmerOrOwnerGUID())
     {
         float HealthIncreaseRate = sWorld.getRate(RATE_HEALTH);
         float Spirit = GetStat(STAT_SPIRIT);
-
         if( GetPower(POWER_MANA) > 0 )
             addvalue = uint32(Spirit * 0.25 * HealthIncreaseRate);
         else
@@ -631,35 +540,27 @@ void Creature::RegenerateHealth()
     }
     else
         addvalue = maxValue/3;
-
     ModifyHealth(addvalue);
 }
-
 void Creature::DoFleeToGetAssistance()
 {
     if (!getVictim())
         return;
-
     if(HasAuraType(SPELL_AURA_PREVENTS_FLEEING))
         return;
-
     float radius = sWorld.getConfig(CONFIG_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS);
     if (radius >0)
     {
         Creature* pCreature = NULL;
-
         CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY()));
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
         cell.SetNoCreate();
         MaNGOS::NearestAssistCreatureInCreatureRangeCheck u_check(this, getVictim(), radius);
         MaNGOS::CreatureLastSearcher<MaNGOS::NearestAssistCreatureInCreatureRangeCheck> searcher(this, pCreature, u_check);
-
         TypeContainerVisitor<MaNGOS::CreatureLastSearcher<MaNGOS::NearestAssistCreatureInCreatureRangeCheck>, GridTypeMapContainer > grid_creature_searcher(searcher);
-
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, grid_creature_searcher, *GetMap(), *this, radius);
-
         SetNoSearchAssistance(true);
         if(!pCreature)
             //SetFeared(true, getVictim()->GetGUID(), 0 ,sWorld.getConfig(CONFIG_CREATURE_FAMILY_FLEE_DELAY));
@@ -669,7 +570,6 @@ void Creature::DoFleeToGetAssistance()
             GetMotionMaster()->MoveSeekAssistance(pCreature->GetPositionX(), pCreature->GetPositionY(), pCreature->GetPositionZ());
     }
 }
-
 bool Creature::AIM_Initialize(CreatureAI* ai)
 {
     // make sure nothing can change the AI during AI update
@@ -678,24 +578,20 @@ bool Creature::AIM_Initialize(CreatureAI* ai)
         sLog.outDebug("AIM_Initialize: failed to init, locked.");
         return false;
     }
-
     UnitAI *oldAI = i_AI;
-
     Motion_Initialize();
-    
     i_AI = ai ? ai : FactorySelector::selectAI(this);
     if(oldAI) delete oldAI;
     IsAIEnabled = true;
     i_AI->InitializeAI();
     return true;
 }
-
 void Creature::Motion_Initialize()
 {
     if(!m_formation)
         i_motionMaster.Initialize();
     else if(m_formation->getLeader() == this)
-    {    
+    {
         m_formation->FormationReset(false);
         i_motionMaster.Initialize();
     }
@@ -704,24 +600,19 @@ void Creature::Motion_Initialize()
     else
         i_motionMaster.Initialize();
 }
-
 bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 vehId, uint32 team, float x, float y, float z, float ang, const CreatureData *data)
 {
     ASSERT(map);
     SetMap(map);
     SetPhaseMask(phaseMask,false);
-
     Relocate(x, y, z, ang);
-
     if(!IsPositionValid())
     {
         sLog.outError("Creature (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,Entry,x,y);
         return false;
     }
-
     //oX = x;     oY = y;    dX = x;    dY = y;    m_moveTime = 0;    m_startMove = 0;
     const bool bResult = CreateFromProto(guidlow, Entry, vehId, team, data);
-
     if (bResult)
     {
         switch (GetCreatureInfo()->rank)
@@ -747,7 +638,6 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
         if (minfo && !isTotem())                               // Cancel load if no model defined or if totem
         {
             uint32 display_id = minfo->modelid;                // it can be different (for another gender)
-
             SetDisplayId(display_id);
             SetNativeDisplayId(display_id);
             SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
@@ -755,21 +645,17 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry,
     }
     return bResult;
 }
-
 bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const
 {
     if(!isTrainer())
         return false;
-
     TrainerSpellData const* trainer_spells = GetTrainerSpells();
-
     if(!trainer_spells || trainer_spells->spellList.empty())
     {
         sLog.outErrorDb("Creature %u (Entry: %u) have UNIT_NPC_FLAG_TRAINER but have empty trainer spell list.",
             GetGUIDLow(),GetEntry());
         return false;
     }
-
     switch(GetCreatureInfo()->trainer_type)
     {
         case TRAINER_TYPE_CLASS:
@@ -841,16 +727,13 @@ bool Creature::isCanTrainingOf(Player* pPlayer, bool msg) const
     }
     return true;
 }
-
 bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const
 {
     if(!isBattleMaster())
         return false;
-
     BattleGroundTypeId bgTypeId = sBattleGroundMgr.GetBattleMasterBG(GetEntry());
     if(!msg)
         return pPlayer->GetBGAccessByLevel(bgTypeId);
-
     if(!pPlayer->GetBGAccessByLevel(bgTypeId))
     {
         pPlayer->PlayerTalkClass->ClearMenus();
@@ -873,27 +756,22 @@ bool Creature::isCanInteractWithBattleMaster(Player* pPlayer, bool msg) const
     }
     return true;
 }
-
 bool Creature::isCanTrainingAndResetTalentsOf(Player* pPlayer) const
 {
     return pPlayer->getLevel() >= 10
         && GetCreatureInfo()->trainer_type == TRAINER_TYPE_CLASS
         && pPlayer->getClass() == GetCreatureInfo()->trainer_class;
 }
-
 void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid )
 {
     //Prevent gossip from NPCs that are possessed.
     Unit* Charmed = Unit::GetCharmer();
     if (Charmed)
         return;
-
     PlayerMenu* pm=pPlayer->PlayerTalkClass;
     pm->ClearMenus();
-
     // lazy loading single time at use
     LoadGossipOptions();
-
     for( GossipOptionList::iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i )
     {
         GossipOption* gso=&*i;
@@ -976,7 +854,6 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid )
                         break;
                 }
             }
-
             //note for future dev: should have database fields for BoxMessage & BoxMoney
             if(!gso->OptionText.empty() && cantalking)
             {
@@ -998,7 +875,6 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid )
             }
         }
     }
-
     ///some gossips aren't handled in normal way ... so we need to do it this way .. TODO: handle it in normal way ;-)
     if(pm->Empty())
     {
@@ -1012,38 +888,30 @@ void Creature::prepareGossipMenu( Player *pPlayer,uint32 gossipid )
         }
     }
 }
-
 void Creature::sendPreparedGossip(Player* player)
 {
     if(!player)
         return;
-
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT) // if world event npc then
         gameeventmgr.HandleWorldEventGossip(player, this);      // update world state with progress
-
     // in case no gossip flag and quest menu not empty, open quest menu (client expect gossip menu with this flag)
     if (!HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_GOSSIP) && !player->PlayerTalkClass->GetQuestMenu().Empty())
     {
         player->SendPreparedQuest(GetGUID());
         return;
     }
-
     // in case non empty gossip menu (that not included quests list size) show it
     // (quest entries from quest menu will be included in list)
     player->PlayerTalkClass->SendGossipMenu(GetNpcTextId(), GetGUID());
 }
-
 void Creature::OnGossipSelect(Player* player, uint32 option)
 {
     GossipMenu& gossipmenu = player->PlayerTalkClass->GetGossipMenu();
-
     if(option >= gossipmenu.MenuItemCount())
         return;
-
     uint32 action=gossipmenu.GetItem(option).m_gAction;
     uint32 zoneid=GetZoneId();
     uint64 guid=GetGUID();
-
     GossipOption const *gossip=GetGossipOption( action );
     if(!gossip)
     {
@@ -1052,7 +920,6 @@ void Creature::OnGossipSelect(Player* player, uint32 option)
         if(!gossip)
             return;
     }
-
     switch (gossip->Action)
     {
         case GOSSIP_OPTION_GOSSIP:
@@ -1060,7 +927,6 @@ void Creature::OnGossipSelect(Player* player, uint32 option)
             uint32 textid = GetGossipTextId(action, zoneid);
             if (textid == 0)
                 textid=GetNpcTextId();
-
             player->PlayerTalkClass->CloseGossip();
             player->PlayerTalkClass->SendTalking(textid);
             break;
@@ -1102,12 +968,10 @@ void Creature::OnGossipSelect(Player* player, uint32 option)
                 else
                 {
                     player->ModifyMoney(-10000000);
-
                     // Cast spells that teach dual spec
                     // Both are also ImplicitTarget self and must be cast by player
                     player->CastSpell(player,63680,true,NULL,NULL,player->GetGUID());
                     player->CastSpell(player,63624,true,NULL,NULL,player->GetGUID());
-
                     // Should show another Gossip text with "Congratulations..."
                     player->PlayerTalkClass->CloseGossip();
                 }
@@ -1154,9 +1018,7 @@ void Creature::OnGossipSelect(Player* player, uint32 option)
             OnPoiSelect( player, gossip );
             break;
     }
-
 }
-
 void Creature::OnPoiSelect(Player* player, GossipOption const *gossip)
 {
     if(gossip->GossipId==GOSSIP_GUARD_SPELLTRAINER || gossip->GossipId==GOSSIP_GUARD_SKILLTRAINER)
@@ -1184,38 +1046,28 @@ void Creature::OnPoiSelect(Player* player, GossipOption const *gossip)
         // how this could worked player->PlayerTalkClass->SendPointOfInterest( x, y, icon, 2, 15, areaname.c_str() );
     }
 }
-
 uint32 Creature::GetGossipTextId(uint32 action, uint32 zoneid)
 {
     QueryResult *result= WorldDatabase.PQuery("SELECT textid FROM npc_gossip_textid WHERE action = '%u' AND zoneid ='%u'", action, zoneid );
-
     if(!result)
         return 0;
-
     Field *fields = result->Fetch();
     uint32 id = fields[0].GetUInt32();
-
     delete result;
-
     return id;
 }
-
 uint32 Creature::GetNpcTextId()
 {
     // don't cache / use cache in case it's a world event announcer
     if(GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_WORLDEVENT)
         if(uint32 textid = gameeventmgr.GetNpcTextId(m_DBTableGuid))
             return textid;
-
     if (!m_DBTableGuid)
         return DEFAULT_GOSSIP_MESSAGE;
-
     if(uint32 pos = objmgr.GetNpcGossip(m_DBTableGuid))
         return pos;
-
     return DEFAULT_GOSSIP_MESSAGE;
 }
-
 GossipOption const* Creature::GetGossipOption( uint32 id ) const
 {
     for( GossipOptionList::const_iterator i = m_goptions.begin( ); i != m_goptions.end( ); ++i )
@@ -1225,28 +1077,22 @@ GossipOption const* Creature::GetGossipOption( uint32 id ) const
     }
     return NULL;
 }
-
 void Creature::ResetGossipOptions()
 {
     m_gossipOptionLoaded = false;
     m_goptions.clear();
 }
-
 void Creature::LoadGossipOptions()
 {
     if(m_gossipOptionLoaded)
         return;
-
     uint32 npcflags=GetUInt32Value(UNIT_NPC_FLAGS);
-
     CacheNpcOptionList const& noList = objmgr.GetNpcOptions ();
     for (CacheNpcOptionList::const_iterator i = noList.begin (); i != noList.end (); ++i)
         if(i->NpcFlag & npcflags)
             addGossipOption(*i);
-
     m_gossipOptionLoaded = true;
 }
-
 void Creature::AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 MovementFlags, uint8 type)
 {
     /*    uint32 timeElap = getMSTime();
@@ -1260,28 +1106,23 @@ void Creature::AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint3
             oX = dX;
             oY = dY;
         }
-
         dX = x;
         dY = y;
         m_orientation = atan2((oY - dY), (oX - dX));
-
         m_startMove = getMSTime();
         m_moveTime = time;*/
     SendMonsterMove(x, y, z, time);
 }
-
 Player *Creature::GetLootRecipient() const
 {
     if (!m_lootRecipient) return NULL;
     else return ObjectAccessor::FindPlayer(m_lootRecipient);
 }
-
 void Creature::SetLootRecipient(Unit *unit)
 {
     // set the player whose group should receive the right
     // to loot the creature after it dies
     // should be set to NULL after the loot disappears
-
     if (!unit)
     {
         m_lootRecipient = 0;
@@ -1289,15 +1130,12 @@ void Creature::SetLootRecipient(Unit *unit)
         RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER);
         return;
     }
-
     Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself();
     if(!player)                                             // normal creature, no player involved
         return;
-
     m_lootRecipient = player->GetGUID();
     SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER);
 }
-
 void Creature::SaveToDB()
 {
     // this should only be used when the creature has already been loaded
@@ -1308,19 +1146,15 @@ void Creature::SaveToDB()
         sLog.outError("Creature::SaveToDB failed, cannot get creature data!");
         return;
     }
-
     SaveToDB(GetMapId(), data->spawnMask,GetPhaseMask());
 }
-
 void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
 {
     // update in loaded data
     if (!m_DBTableGuid)
         m_DBTableGuid = GetGUIDLow();
     CreatureData& data = objmgr.NewOrExistCreatureData(m_DBTableGuid);
-
     uint32 displayId = GetNativeDisplayId();
-
     // check if it's a custom model and if not, use 0 for displayId
     CreatureInfo const *cinfo = GetCreatureInfo();
     if (cinfo)
@@ -1329,7 +1163,6 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
             displayId == cinfo->Modelid3 || displayId == cinfo->Modelid4)
             displayId = 0;
     }
-
     // data->guid = guid don't must be update at save
     data.id = GetEntry();
     data.mapid = mapid;
@@ -1351,12 +1184,9 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     data.movementType = !m_respawnradius && GetDefaultMovementType()==RANDOM_MOTION_TYPE
         ? IDLE_MOTION_TYPE : GetDefaultMovementType();
     data.spawnMask = spawnMask;
-
     // updated in DB
     WorldDatabase.BeginTransaction();
-
     WorldDatabase.PExecuteLog("DELETE FROM creature WHERE guid = '%u'", m_DBTableGuid);
-
     std::ostringstream ss;
     ss << "INSERT INTO creature VALUES ("
         << m_DBTableGuid << ","
@@ -1377,64 +1207,46 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
         << GetPower(POWER_MANA) << ","                      //curmana
         << (m_isDeadByDefault ? 1 : 0) << ","               //is_dead
         << GetDefaultMovementType() << ")";                 //default movement generator type
-
     WorldDatabase.PExecuteLog( ss.str( ).c_str( ) );
-
     WorldDatabase.CommitTransaction();
 }
-
 void Creature::SelectLevel(const CreatureInfo *cinfo)
 {
     uint32 rank = isPet()? 0 : cinfo->rank;
-
     // level
     uint32 minlevel = std::min(cinfo->maxlevel, cinfo->minlevel);
     uint32 maxlevel = std::max(cinfo->maxlevel, cinfo->minlevel);
     uint32 level = minlevel == maxlevel ? minlevel : urand(minlevel, maxlevel);
     SetLevel(level);
-
     float rellevel = maxlevel == minlevel ? 0 : (float(level - minlevel))/(maxlevel - minlevel);
-
     // health
     float healthmod = _GetHealthMod(rank);
-
     uint32 minhealth = std::min(cinfo->maxhealth, cinfo->minhealth);
     uint32 maxhealth = std::max(cinfo->maxhealth, cinfo->minhealth);
     uint32 health = uint32(healthmod * (minhealth + uint32(rellevel*(maxhealth - minhealth))));
-
     SetCreateHealth(health);
     SetMaxHealth(health);
     SetHealth(health);
     ResetPlayerDamageReq();
-
     // mana
     uint32 minmana = std::min(cinfo->maxmana, cinfo->minmana);
     uint32 maxmana = std::max(cinfo->maxmana, cinfo->minmana);
     uint32 mana = minmana + uint32(rellevel*(maxmana - minmana));
-
     SetCreateMana(mana);
     SetMaxPower(POWER_MANA, mana);                          //MAX Mana
     SetPower(POWER_MANA, mana);
-
     // TODO: set UNIT_FIELD_POWER*, for some creature class case (energy, etc)
-
     SetModifierValue(UNIT_MOD_HEALTH, BASE_VALUE, health);
     SetModifierValue(UNIT_MOD_MANA, BASE_VALUE, mana);
 
-
     //damage
     float damagemod = 1.0f;//_GetDamageMod(rank);
-
     SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, cinfo->mindmg * damagemod);
     SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, cinfo->maxdmg * damagemod);
-
     SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE,cinfo->minrangedmg * damagemod);
     SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE,cinfo->maxrangedmg * damagemod);
-
     SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, cinfo->attackpower * damagemod);
-
 }
-
 float Creature::_GetHealthMod(int32 Rank)
 {
     switch (Rank)                                           // define rates for each elite rank
@@ -1453,7 +1265,6 @@ float Creature::_GetHealthMod(int32 Rank)
             return sWorld.getRate(RATE_CREATURE_ELITE_ELITE_HP);
     }
 }
-
 float Creature::_GetDamageMod(int32 Rank)
 {
     switch (Rank)                                           // define rates for each elite rank
@@ -1472,7 +1283,6 @@ float Creature::_GetDamageMod(int32 Rank)
             return sWorld.getRate(RATE_CREATURE_ELITE_ELITE_DAMAGE);
     }
 }
-
 float Creature::GetSpellDamageMod(int32 Rank)
 {
     switch (Rank)                                           // define rates for each elite rank
@@ -1491,7 +1301,6 @@ float Creature::GetSpellDamageMod(int32 Rank)
             return sWorld.getRate(RATE_CREATURE_ELITE_ELITE_SPELLDAMAGE);
     }
 }
-
 bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, uint32 team, const CreatureData *data)
 {
     SetZoneScript();
@@ -1501,56 +1310,41 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, uint3
         if(!Entry)
             return false;
     }
-
     CreatureInfo const *cinfo = objmgr.GetCreatureTemplate(Entry);
     if(!cinfo)
     {
         sLog.outErrorDb("Creature entry %u does not exist.", Entry);
         return false;
     }
-
     SetOriginalEntry(Entry);
-
     if(!vehId)
         vehId = cinfo->VehicleId;
-
     if(vehId && !CreateVehicleKit(vehId))
         vehId = 0;
-
     Object::_Create(guidlow, Entry, vehId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT);
-
     if(!UpdateEntry(Entry, team, data))
         return false;
-
     return true;
 }
-
 bool Creature::LoadFromDB(uint32 guid, Map *map)
 {
     CreatureData const* data = objmgr.GetCreatureData(guid);
-
     if(!data)
     {
         sLog.outErrorDb("Creature (GUID: %u) not found in table `creature`, can't load. ",guid);
         return false;
     }
-
     m_DBTableGuid = guid;
     if (map->GetInstanceId() != 0) guid = objmgr.GenerateLowGuid(HIGHGUID_UNIT);
-
     uint16 team = 0;
     if(!Create(guid,map,data->phaseMask,data->id,0,team,data->posX,data->posY,data->posZ,data->orientation,data))
         return false;
-
     //We should set first home position, because then AI calls home movement
     SetHomePosition(data->posX,data->posY,data->posZ,data->orientation);
-
     m_respawnradius = data->spawndist;
-
     m_respawnDelay = data->spawntimesecs;
     m_isDeadByDefault = data->is_dead;
     m_deathState = m_isDeadByDefault ? DEAD : ALIVE;
-
     m_respawnTime  = objmgr.GetCreatureRespawnTime(m_DBTableGuid,GetInstanceId());
     if(m_respawnTime)                          // respawn on Update
     {
@@ -1562,7 +1356,6 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
                 Relocate(data->posX,data->posY,tz);
         }
     }
-
     uint32 curhealth = data->curhealth;
     if(curhealth)
     {
@@ -1570,18 +1363,13 @@ bool Creature::LoadFromDB(uint32 guid, Map *map)
         if(curhealth < 1)
             curhealth = 1;
     }
-
     SetHealth(m_deathState == ALIVE ? curhealth : 0);
     SetPower(POWER_MANA,data->curmana);
-
     // checked at creature_template loading
     m_defaultMovementType = MovementGeneratorType(data->movementType);
-
     m_creatureData = data;
-
     return true;
 }
-
 void Creature::LoadEquipment(uint32 equip_entry, bool force)
 {
     if(equip_entry == 0)
@@ -1594,16 +1382,13 @@ void Creature::LoadEquipment(uint32 equip_entry, bool force)
         }
         return;
     }
-
     EquipmentInfo const *einfo = objmgr.GetEquipmentInfo(equip_entry);
     if (!einfo)
         return;
-
     m_equipmentId = equip_entry;
     for (uint8 i = 0; i < 3; ++i)
         SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, einfo->equipentry[i]);
 }
-
 bool Creature::hasQuest(uint32 quest_id) const
 {
     QuestRelations const& qr = objmgr.mCreatureQuestRelations;
@@ -1614,7 +1399,6 @@ bool Creature::hasQuest(uint32 quest_id) const
     }
     return false;
 }
-
 bool Creature::hasInvolvedQuest(uint32 quest_id) const
 {
     QuestRelations const& qr = objmgr.mCreatureQuestInvolvedRelations;
@@ -1625,7 +1409,6 @@ bool Creature::hasInvolvedQuest(uint32 quest_id) const
     }
     return false;
 }
-
 void Creature::DeleteFromDB()
 {
     if (!m_DBTableGuid)
@@ -1633,10 +1416,8 @@ void Creature::DeleteFromDB()
         sLog.outDebug("Trying to delete not saved creature!");
         return;
     }
-
     objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),0);
     objmgr.DeleteCreatureData(m_DBTableGuid);
-
     WorldDatabase.BeginTransaction();
     WorldDatabase.PExecuteLog("DELETE FROM creature WHERE guid = '%u'", m_DBTableGuid);
     WorldDatabase.PExecuteLog("DELETE FROM creature_addon WHERE guid = '%u'", m_DBTableGuid);
@@ -1644,40 +1425,31 @@ void Creature::DeleteFromDB()
     WorldDatabase.PExecuteLog("DELETE FROM game_event_model_equip WHERE guid = '%u'", m_DBTableGuid);
     WorldDatabase.CommitTransaction();
 }
-
 bool Creature::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const
 {
     // not in world
     if(!IsInWorld() || !u->IsInWorld())
         return false;
-
     // all dead creatures/players not visible for any creatures
     if(!u->isAlive() || !isAlive())
         return false;
-
     // Always can see self
     if (u == this)
         return true;
-
     // phased visibility (both must phased in same way)
     if(!InSamePhase(u))
         return false;
-
     // always seen by owner
     if(GetGUID() == u->GetCharmerOrOwnerGUID())
         return true;
-
     if(u->GetVisibility() == VISIBILITY_OFF) //GM
         return false;
-
     // invisible aura
     if((m_invisibilityMask || u->m_invisibilityMask) && !canDetectInvisibilityOf(u))
         return false;
-
     // unit got in stealth in this moment and must ignore old detected state
     //if (m_Visibility == VISIBILITY_GROUP_NO_DETECT)
     //    return false;
-
     // GM invisibility checks early, invisibility if any detectable, so if not stealth then visible
     if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH)
     {
@@ -1685,113 +1457,86 @@ bool Creature::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bo
         if(!detect || !canDetectStealthOf(u, GetDistance(u)))
             return false;
     }
-
     // Now check is target visible with LoS
     //return u->IsWithinLOS(GetPositionX(),GetPositionY(),GetPositionZ());
     return true;
 }
-
 bool Creature::canStartAttack(Unit const* who, bool force) const
 {
     if(isCivilian())
         return false;
-    
     if(!canFly() && (GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE + m_CombatDistance))
         //|| who->IsControlledByPlayer() && who->IsFlying()))
         // we cannot check flying for other creatures, too much map/vmap calculation
         // TODO: should switch to range attack
         return false;
-
     if(!force)
     {
         if(!_IsTargetAcceptable(who))
             return false;
-
         if(who->isInCombat())
             if(Unit *victim = who->getAttackerForHelper())
                 if(IsWithinDistInMap(victim, sWorld.getConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS)))
                     force = true;
-
         if(!force && (IsNeutralToAll() || !IsWithinDistInMap(who, GetAttackDistance(who) + m_CombatDistance)))
             return false;
     }
-
     if(!canCreatureAttack(who, force))
         return false;
-
     return IsWithinLOSInMap(who);
 }
-
 float Creature::GetAttackDistance(Unit const* pl) const
 {
     float aggroRate = sWorld.getRate(RATE_CREATURE_AGGRO);
     if(aggroRate==0)
         return 0.0f;
-
     uint32 playerlevel   = pl->getLevelForTarget(this);
     uint32 creaturelevel = getLevelForTarget(pl);
-
     int32 leveldif       = int32(playerlevel) - int32(creaturelevel);
-
     // "The maximum Aggro Radius has a cap of 25 levels under. Example: A level 30 char has the same Aggro Radius of a level 5 char on a level 60 mob."
     if ( leveldif < - 25)
         leveldif = -25;
-
     // "The aggro radius of a mob having the same level as the player is roughly 20 yards"
     float RetDistance = 20;
-
     // "Aggro Radius varies with level difference at a rate of roughly 1 yard/level"
     // radius grow if playlevel < creaturelevel
     RetDistance -= (float)leveldif;
-
     if(creaturelevel+5 <= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
     {
         // detect range auras
         RetDistance += GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE);
-
         // detected range auras
         RetDistance += pl->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE);
     }
-
     // "Minimum Aggro Radius for a mob seems to be combat range (5 yards)"
     if(RetDistance < 5)
         RetDistance = 5;
-
     return (RetDistance*aggroRate);
 }
-
 void Creature::setDeathState(DeathState s)
 {
     if((s == JUST_DIED && !m_isDeadByDefault)||(s == JUST_ALIVED && m_isDeadByDefault))
     {
         m_deathTimer = m_corpseDelay*IN_MILISECONDS;
-
         // always save boss respawn time at death to prevent crash cheating
         if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY) || isWorldBoss())
             SaveRespawnTime();
     }
     Unit::setDeathState(s);
-
     if(s == JUST_DIED)
     {
         SetUInt64Value(UNIT_FIELD_TARGET,0);                // remove target selection in any cases (can be set at aura remove in Unit::setDeathState)
         SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-
         setActive(false);
-
         if(!isPet() && GetCreatureInfo()->SkinLootId)
             if ( LootTemplates_Skinning.HaveLootFor(GetCreatureInfo()->SkinLootId) )
                 SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
-
         SetNoSearchAssistance(false);
-    
         //Dismiss group if is leader
         if(m_formation && m_formation->getLeader() == this)
             m_formation->FormationReset(true);
-
         if ((canFly() || IsFlying()) && FallGround())
             return;
-
         Unit::setDeathState(CORPSE);
     }
     else if(s == JUST_ALIVED)
@@ -1816,28 +1561,23 @@ void Creature::setDeathState(DeathState s)
         Unit::setDeathState(ALIVE);
     }
 }
-
 bool Creature::FallGround()
 {
     // Let's abort after we called this function one time
     if (getDeathState() == DEAD_FALLING)
         return false;
-
     float x, y, z;
     GetPosition(x, y, z);
     float ground_Z = GetMap()->GetVmapHeight(x, y, z, true);
     if (fabs(ground_Z - z) < 0.1f)
         return false;
-
     GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
     Unit::setDeathState(DEAD_FALLING);
     return true;
 }
-
 void Creature::Respawn(bool force)
 {
     DestroyForNearbyPlayers();
-
     if(force)
     {
         if(isAlive())
@@ -1845,25 +1585,19 @@ void Creature::Respawn(bool force)
         else if(getDeathState() != CORPSE)
             setDeathState(CORPSE);
     }
-
     RemoveCorpse();
-
     if(getDeathState()==DEAD)
     {
         if (m_DBTableGuid)
             objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),0);
-
         DEBUG_LOG("Respawning...");
         m_respawnTime = 0;
         lootForPickPocketed = false;
         lootForBody         = false;
-
         if(m_originalEntry != GetEntry())
             UpdateEntry(m_originalEntry);
-
         CreatureInfo const *cinfo = GetCreatureInfo();
         SelectLevel(cinfo);
-
         if (m_isDeadByDefault)
         {
             setDeathState(JUST_DIED);
@@ -1874,59 +1608,46 @@ void Creature::Respawn(bool force)
         }
         else
             setDeathState( JUST_ALIVED );
-
         CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(GetNativeDisplayId());
         if (minfo)                                             // Cancel load if no model defined
         {
             uint32 display_id = minfo->modelid;                // it can be different (for another gender)
-
             SetDisplayId(display_id);
             SetNativeDisplayId(display_id);
             SetByteValue(UNIT_FIELD_BYTES_0, 2, minfo->gender);
         }
-
         //Call AI respawn virtual function
         AI()->JustRespawned();
-
         uint16 poolid = poolhandler.IsPartOfAPool(GetGUIDLow(), GetTypeId());
         if (poolid)
             poolhandler.UpdatePool(poolid, GetGUIDLow(), GetTypeId());
     }
-
     SetToNotify();
 }
-
 void Creature::ForcedDespawn()
 {
     setDeathState(JUST_DIED);
     RemoveCorpse();
     SetHealth(0);                                           // just for nice GM-mode view
 }
-
 bool Creature::IsImmunedToSpell(SpellEntry const* spellInfo)
 {
     if (!spellInfo)
         return false;
-
     if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->Mechanic - 1)))
         return true;
-
     return Unit::IsImmunedToSpell(spellInfo);
 }
-
 bool Creature::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
 {
     if (GetCreatureInfo()->MechanicImmuneMask & (1 << (spellInfo->EffectMechanic[index] - 1)))
         return true;
-
     return Unit::IsImmunedToSpellEffect(spellInfo, index);
 }
-
 SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
 {
     if(!pVictim)
         return NULL;
-
     for(uint32 i=0; i < CREATURE_MAX_SPELLS; ++i)
     {
         if(!m_spells[i])
@@ -1937,7 +1658,6 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
             sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
             continue;
         }
-
         bool bcontinue = true;
         for(uint32 j=0;j<3;j++)
         {
@@ -1952,7 +1672,6 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
             }
         }
         if(bcontinue) continue;
-
         if(spellInfo->manaCost > GetPower(POWER_MANA))
             continue;
         SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
@@ -1971,12 +1690,10 @@ SpellEntry const *Creature::reachWithSpellAttack(Unit *pVictim)
     }
     return NULL;
 }
-
 SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
 {
     if(!pVictim)
         return NULL;
-
     for(uint32 i=0; i < CREATURE_MAX_SPELLS; ++i)
     {
         if(!m_spells[i])
@@ -1987,7 +1704,6 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
             sLog.outError("WORLD: unknown spell id %i", m_spells[i]);
             continue;
         }
-
         bool bcontinue = true;
         for(uint32 j=0;j<3;j++)
         {
@@ -1998,7 +1714,6 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
             }
         }
         if(bcontinue) continue;
-
         if(spellInfo->manaCost > GetPower(POWER_MANA))
             continue;
         SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
@@ -2017,17 +1732,14 @@ SpellEntry const *Creature::reachWithSpellCure(Unit *pVictim)
     }
     return NULL;
 }
-
 bool Creature::IsVisibleInGridForPlayer(Player const* pl) const
 {
     // gamemaster in GM mode see all, including ghosts
     if(pl->isGameMaster())
         return true;
-
     // Trigger shouldn't be visible for players
     if(isTrigger())
         return false;
-
     // Live player (or with not release body see live creatures or death creatures with corpse disappearing time > 0
     if(pl->isAlive() || pl->GetDeathTimer() > 0)
     {
@@ -2035,7 +1747,6 @@ bool Creature::IsVisibleInGridForPlayer(Player const* pl) const
             return false;
         return (isAlive() || m_deathTimer > 0 || (m_isDeadByDefault && m_deathState==CORPSE));
     }
-
     // Dead player see live creatures near own corpse
     if(isAlive())
     {
@@ -2047,66 +1758,50 @@ bool Creature::IsVisibleInGridForPlayer(Player const* pl) const
                 return true;
         }
     }
-
     // Dead player see Spirit Healer or Spirit Guide
     if(isSpiritService())
         return true;
-
     // and not see any other
     return false;
 }
-
 Unit* Creature::SelectNearestTarget(float dist) const
 {
     CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     Unit *target = NULL;
-
     {
         Trinity::NearestHostileUnitInAttackDistanceCheck u_check(this, dist);
         Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck> searcher(this, target, u_check);
-
         TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, WorldTypeMapContainer > world_unit_searcher(searcher);
         TypeContainerVisitor<Trinity::UnitLastSearcher<Trinity::NearestHostileUnitInAttackDistanceCheck>, GridTypeMapContainer >  grid_unit_searcher(searcher);
-
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, world_unit_searcher, *GetMap(), *this, ATTACK_DISTANCE);
         cell_lock->Visit(cell_lock, grid_unit_searcher, *GetMap(), *this, ATTACK_DISTANCE);
     }
-
     return target;
 }
-
 void Creature::CallAssistance()
 {
     if( !m_AlreadyCallAssistance && getVictim() && !isPet() && !isCharmed())
     {
         SetNoCallAssistance(true);
-
         float radius = sWorld.getConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS);
-
         if(radius > 0)
         {
             std::list<Creature*> assistList;
-
             {
                 CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
                 Cell cell(p);
                 cell.data.Part.reserved = ALL_DISTRICT;
                 cell.SetNoCreate();
-
                 MaNGOS::AnyAssistCreatureInRangeCheck u_check(this, getVictim(), radius);
                 MaNGOS::CreatureListSearcher<MaNGOS::AnyAssistCreatureInRangeCheck> searcher(this, assistList, u_check);
-
                 TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AnyAssistCreatureInRangeCheck>, GridTypeMapContainer >  grid_creature_searcher(searcher);
-
                 CellLock<GridReadGuard> cell_lock(cell, p);
                 cell_lock->Visit(cell_lock, grid_creature_searcher, *GetMap(), *this, radius);
             }
-
             if (!assistList.empty())
             {
                 AssistDelayEvent *e = new AssistDelayEvent(getVictim()->GetGUID(), *this);
@@ -2121,48 +1816,37 @@ void Creature::CallAssistance()
         }
     }
 }
-
 void Creature::CallForHelp(float fRadius)
 {
     if (fRadius <= 0.0f || !getVictim() || isPet() || isCharmed())
         return;
-
     CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::CallOfHelpCreatureInRangeDo u_do(this, getVictim(), fRadius);
     MaNGOS::CreatureWorker<MaNGOS::CallOfHelpCreatureInRangeDo> worker(this, u_do);
-
     TypeContainerVisitor<MaNGOS::CreatureWorker<MaNGOS::CallOfHelpCreatureInRangeDo>, GridTypeMapContainer >  grid_creature_searcher(worker);
-
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, grid_creature_searcher, *GetMap(), *this, fRadius);
 }
-
 bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /*= true*/) const
 {
     // is it true?
     if(!HasReactState(REACT_AGGRESSIVE))
         return false;
-
     // we don't need help from zombies :)
     if (!isAlive())
         return false;
-
     // we don't need help from non-combatant ;)
     if (isCivilian())
         return false;
-
     // skip fighting creature
     if (isInCombat())
         return false;
-
     // only free creature
     if (GetCharmerOrOwnerGUID())
         return false;
-
     // only from same creature faction
     if (checkfaction)
     {
@@ -2174,80 +1858,61 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction /
         if (!IsFriendlyTo(u))
             return false;
     }
-
     // skip non hostile to caster enemy creatures
     if (!IsHostileTo(enemy))
         return false;
-
     return true;
 }
-
 // use this function to avoid having hostile creatures attack
 // friendlies and other mobs they shouldn't attack
 bool Creature::_IsTargetAcceptable(const Unit *target) const
 {
     const Unit *myVictim = getAttackerForHelper();
-
     // if I'm already fighting target, the target is acceptable
     if (myVictim == target || target->getVictim() == this)
         return true;
-
     // if I'm hostile towards the target, the target is acceptable
     if (IsHostileTo(target))
         return true;
-
     const Unit *targetVictim = target->getAttackerForHelper();
-
     // if the target does not have a victim, the target is not acceptable
     if (!targetVictim)
         return false;
-
     // if the target's victim is friendly, and the target is neutral, the target is acceptable
     if (IsFriendlyTo(targetVictim) && !IsFriendlyTo(target))
         return true;
-
     // if the target's victim is not friendly, or the target is friendly, the target is not acceptable
     return false;
 }
-
 void Creature::SaveRespawnTime()
 {
     if(isSummon() || !m_DBTableGuid || m_creatureData && !m_creatureData->dbData)
         return;
-
     if(m_respawnTime > time(NULL))                          // dead (no corpse)
         objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime);
     else if(m_deathTimer > 0)                               // dead (corpse)
         objmgr.SaveCreatureRespawnTime(m_DBTableGuid,GetInstanceId(),time(NULL)+m_respawnDelay+m_deathTimer/IN_MILISECONDS);
 }
-
-// this should not be called by petAI or 
+// this should not be called by petAI or
 bool Creature::canCreatureAttack(Unit const *pVictim, bool force) const
 {
     if(!pVictim->IsInMap(this))
         return false;
-
     if(!canAttack(pVictim, force))
         return false;
-
     if(!pVictim->isInAccessiblePlaceFor(this))
         return false;
-
     if(IsAIEnabled && !AI()->CanAIAttack(pVictim))
         return false;
-
     if(sMapStore.LookupEntry(GetMapId())->IsDungeon())
         return true;
-
     //Use AttackDistance in distance check if threat radius is lower. This prevents creature bounce in and out of combat every update tick.
     float dist = std::max(GetAttackDistance(pVictim), (float)sWorld.getConfig(CONFIG_THREAT_RADIUS)) + m_CombatDistance;
-
     if(Unit *unit = GetCharmerOrOwner())
         return pVictim->IsWithinDist(unit, dist);
     else
         return pVictim->IsInDist(&m_homePosition, dist);
 }
-
 CreatureDataAddon const* Creature::GetCreatureAddon() const
 {
     if (m_DBTableGuid)
@@ -2255,42 +1920,35 @@ CreatureDataAddon const* Creature::GetCreatureAddon() const
         if(CreatureDataAddon const* addon = ObjectMgr::GetCreatureAddon(m_DBTableGuid))
             return addon;
     }
-
     // dependent from heroic mode entry
     return ObjectMgr::GetCreatureTemplateAddon(GetCreatureInfo()->Entry);
 }
-
 //creature_addon table
 bool Creature::LoadCreaturesAddon(bool reload)
 {
     CreatureDataAddon const *cainfo = GetCreatureAddon();
     if(!cainfo)
         return false;
-
     if (cainfo->mount != 0)
         Mount(cainfo->mount);
-
     if (cainfo->bytes1 != 0)
     {
         // 0 StandState
         // 1 FreeTalentPoints   Pet only, so always 0 for default creature
         // 2 StandFlags
         // 3 StandMiscFlags
-
         SetByteValue(UNIT_FIELD_BYTES_1, 0, uint8(cainfo->bytes1 & 0xFF));
         //SetByteValue(UNIT_FIELD_BYTES_1, 1, uint8((cainfo->bytes1 >> 8) & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_1, 1, 0);
         SetByteValue(UNIT_FIELD_BYTES_1, 2, uint8((cainfo->bytes1 >> 16) & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_1, 3, uint8((cainfo->bytes1 >> 24) & 0xFF));
     }
-
     if (cainfo->bytes2 != 0)
     {
         // 0 SheathState
         // 1 Bytes2Flags
         // 2 UnitRename         Pet only, so always 0 for default creature
         // 3 ShapeshiftForm     Must be determined/set by shapeshift spell/aura
-
         SetByteValue(UNIT_FIELD_BYTES_2, 0, uint8(cainfo->bytes2 & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_2, 1, uint8((cainfo->bytes2 >> 8) & 0xFF));
         //SetByteValue(UNIT_FIELD_BYTES_2, 2, uint8((cainfo->bytes2 >> 16) & 0xFF));
@@ -2298,20 +1956,15 @@ bool Creature::LoadCreaturesAddon(bool reload)
         //SetByteValue(UNIT_FIELD_BYTES_2, 3, uint8((cainfo->bytes2 >> 24) & 0xFF));
         SetByteValue(UNIT_FIELD_BYTES_2, 3, 0);
     }
-
     if (cainfo->emote != 0)
         SetUInt32Value(UNIT_NPC_EMOTESTATE, cainfo->emote);
-
     if (cainfo->move_flags != 0)
         SetUnitMovementFlags(cainfo->move_flags);
-
     if (cainfo->move_flags & (MOVEMENTFLAG_FLY_MODE | MOVEMENTFLAG_FLYING))
         sLog.outErrorDb("Creature (GUID: %u Entry: %u) has improper `moveflags` value in `creature_template_addon`. Use `InhabitType` = 4 (Flying) in `creature_template`, not MOVEMENTFLAG_FLY_MODE or MOVEMENTFLAG_FLYING in `creature_template_addon`.",GetGUIDLow(),GetEntry());
-
     //Load Path
     if (cainfo->path_id != 0)
         m_path_id = cainfo->path_id;
-
     if(cainfo->auras)
     {
         for (CreatureDataAddonAura const* cAura = cainfo->auras; cAura->spell_id; ++cAura)
@@ -2322,33 +1975,27 @@ bool Creature::LoadCreaturesAddon(bool reload)
                 sLog.outErrorDb("Creature (GUID: %u Entry: %u) has wrong spell %u defined in `auras` field.",GetGUIDLow(),GetEntry(),cAura->spell_id);
                 continue;
             }
-
             // skip already applied aura
             if(HasAuraEffect(cAura->spell_id,cAura->effect_idx))
             {
                 if(!reload)
                     sLog.outErrorDb("Creature (GUID: %u Entry: %u) has duplicate aura (spell %u effect %u) in `auras` field.",GetGUIDLow(),GetEntry(),cAura->spell_id,cAura->effect_idx);
-
                 continue;
             }
-
             AddAuraEffect(AdditionalSpellInfo, cAura->effect_idx, this, this);
             sLog.outDebug("Spell: %u with Aura %u added to creature (GUID: %u Entry: %u)", cAura->spell_id, AdditionalSpellInfo->EffectApplyAuraName[cAura->effect_idx],GetGUIDLow(),GetEntry());
         }
     }
     return true;
 }
-
 /// Send a message to LocalDefense channel for players opposition team in the zone
 void Creature::SendZoneUnderAttackMessage(Player* attacker)
 {
     uint32 enemy_team = attacker->GetTeam();
-
     WorldPacket data(SMSG_ZONE_UNDER_ATTACK,4);
     data << (uint32)GetAreaId();
     sWorld.SendGlobalMessage(&data,NULL,(enemy_team==ALLIANCE ? HORDE : ALLIANCE));
 }
-
 void Creature::SetInCombatWithZone()
 {
     if (!CanHaveThreatList())
@@ -2356,27 +2003,21 @@ void Creature::SetInCombatWithZone()
         sLog.outError("Creature entry %u call SetInCombatWithZone but creature cannot have threat list.", GetEntry());
         return;
     }
-
     Map* pMap = GetMap();
-
     if (!pMap->IsDungeon())
     {
         sLog.outError("Creature entry %u call SetInCombatWithZone for map (id: %u) that isn't an instance.", GetEntry(), pMap->GetId());
         return;
     }
-
     Map::PlayerList const &PlList = pMap->GetPlayers();
-
     if (PlList.isEmpty())
         return;
-
     for(Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
     {
         if (Player* pPlayer = i->getSource())
         {
             if (pPlayer->isGameMaster())
                 continue;
-
             if (pPlayer->isAlive())
             {
                 pPlayer->SetInCombatWith(this);
@@ -2385,56 +2026,44 @@ void Creature::SetInCombatWithZone()
         }
     }
 }
-
 void Creature::_AddCreatureSpellCooldown(uint32 spell_id, time_t end_time)
 {
     m_CreatureSpellCooldowns[spell_id] = end_time;
 }
-
 void Creature::_AddCreatureCategoryCooldown(uint32 category, time_t apply_time)
 {
     m_CreatureCategoryCooldowns[category] = apply_time;
 }
-
 void Creature::AddCreatureSpellCooldown(uint32 spellid)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
     if(!spellInfo)
         return;
-
     uint32 cooldown = GetSpellRecoveryTime(spellInfo);
     if(Player *modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellid, SPELLMOD_COOLDOWN, cooldown);
-   
     if(cooldown)
         _AddCreatureSpellCooldown(spellid, time(NULL) + cooldown/IN_MILISECONDS);
-
     if(spellInfo->Category)
         _AddCreatureCategoryCooldown(spellInfo->Category, time(NULL));
-
     m_GlobalCooldown = spellInfo->StartRecoveryTime;
 }
-
 bool Creature::HasCategoryCooldown(uint32 spell_id) const
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
     if(!spellInfo)
         return false;
-
     // check global cooldown if spell affected by it
     if (spellInfo->StartRecoveryCategory > 0 && m_GlobalCooldown > 0)
         return true;
-
     CreatureSpellCooldowns::const_iterator itr = m_CreatureCategoryCooldowns.find(spellInfo->Category);
     return(itr != m_CreatureCategoryCooldowns.end() && time_t(itr->second + (spellInfo->CategoryRecoveryTime / IN_MILISECONDS)) > time(NULL));
 }
-
 bool Creature::HasSpellCooldown(uint32 spell_id) const
 {
     CreatureSpellCooldowns::const_iterator itr = m_CreatureSpellCooldowns.find(spell_id);
     return (itr != m_CreatureSpellCooldowns.end() && itr->second > time(NULL)) || HasCategoryCooldown(spell_id);
 }
-
 bool Creature::HasSpell(uint32 spellID) const
 {
     uint8 i;
@@ -2443,7 +2072,6 @@ bool Creature::HasSpell(uint32 spellID) const
             break;
     return i < CREATURE_MAX_SPELLS;                         //broke before end of iteration of known spells
 }
-
 time_t Creature::GetRespawnTimeEx() const
 {
     time_t now = time(NULL);
@@ -2454,7 +2082,6 @@ time_t Creature::GetRespawnTimeEx() const
     else
         return now;
 }
-
 void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float* dist ) const
 {
     if (m_DBTableGuid)
@@ -2468,11 +2095,9 @@ void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float*
                 *ori = data->orientation;
             if(dist)
                 *dist = data->spawndist;
-
             return;
         }
     }
-
     x = GetPositionX();
     y = GetPositionY();
     z = GetPositionZ();
@@ -2481,33 +2106,27 @@ void Creature::GetRespawnCoord( float &x, float &y, float &z, float* ori, float*
     if(dist)
         *dist = 0;
 }
-
 void Creature::AllLootRemovedFromCorpse()
 {
     if (!HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE))
     {
         uint32 nDeathTimer;
-
         CreatureInfo const *cinfo = GetCreatureInfo();
-
         // corpse was not skinnable -> apply corpse looted timer
         if (!cinfo || !cinfo->SkinLootId)
             nDeathTimer = (uint32)((m_corpseDelay * IN_MILISECONDS) * sWorld.getRate(RATE_CORPSE_DECAY_LOOTED));
         // corpse skinnable, but without skinning flag, and then skinned, corpse will despawn next update
         else
             nDeathTimer = 0;
-
         // update death timer only if looted timer is shorter
         if (m_deathTimer > nDeathTimer)
             m_deathTimer = nDeathTimer;
     }
 }
-
 uint32 Creature::getLevelForTarget( Unit const* target ) const
 {
     if(!isWorldBoss())
         return Unit::getLevelForTarget(target);
-
     uint32 level = target->getLevel()+sWorld.getConfig(CONFIG_WORLD_BOSS_LEVEL_DIFF);
     if(level < 1)
         return 1;
@@ -2515,104 +2134,81 @@ uint32 Creature::getLevelForTarget( Unit const* target ) const
         return 255;
     return level;
 }
-
 std::string Creature::GetAIName() const
 {
     return ObjectMgr::GetCreatureTemplate(GetEntry())->AIName;
 }
-
 std::string Creature::GetScriptName() const
 {
     return objmgr.GetScriptName(GetScriptId());
 }
-
 uint32 Creature::GetScriptId() const
 {
     return ObjectMgr::GetCreatureTemplate(GetEntry())->ScriptID;
 }
-
 VendorItemData const* Creature::GetVendorItems() const
 {
     return objmgr.GetNpcVendorItemList(GetEntry());
 }
-
 uint32 Creature::GetVendorItemCurrentCount(VendorItem const* vItem)
 {
     if(!vItem->maxcount)
         return vItem->maxcount;
-
     VendorItemCounts::iterator itr = m_vendorItemCounts.begin();
     for(; itr != m_vendorItemCounts.end(); ++itr)
         if(itr->itemId==vItem->item)
             break;
-
     if(itr == m_vendorItemCounts.end())
         return vItem->maxcount;
-
     VendorItemCount* vCount = &*itr;
-
     time_t ptime = time(NULL);
-
     if( vCount->lastIncrementTime + vItem->incrtime <= ptime )
     {
         ItemPrototype const* pProto = objmgr.GetItemPrototype(vItem->item);
-
         uint32 diff = uint32((ptime - vCount->lastIncrementTime)/vItem->incrtime);
         if((vCount->count + diff * pProto->BuyCount) >= vItem->maxcount )
         {
             m_vendorItemCounts.erase(itr);
             return vItem->maxcount;
         }
-
         vCount->count += diff * pProto->BuyCount;
         vCount->lastIncrementTime = ptime;
     }
-
     return vCount->count;
 }
-
 uint32 Creature::UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 used_count)
 {
     if(!vItem->maxcount)
         return 0;
-
     VendorItemCounts::iterator itr = m_vendorItemCounts.begin();
     for(; itr != m_vendorItemCounts.end(); ++itr)
         if(itr->itemId==vItem->item)
             break;
-
     if(itr == m_vendorItemCounts.end())
     {
         uint32 new_count = vItem->maxcount > used_count ? vItem->maxcount-used_count : 0;
         m_vendorItemCounts.push_back(VendorItemCount(vItem->item,new_count));
         return new_count;
     }
-
     VendorItemCount* vCount = &*itr;
-
     time_t ptime = time(NULL);
-
     if( vCount->lastIncrementTime + vItem->incrtime <= ptime )
     {
         ItemPrototype const* pProto = objmgr.GetItemPrototype(vItem->item);
-
         uint32 diff = uint32((ptime - vCount->lastIncrementTime)/vItem->incrtime);
         if((vCount->count + diff * pProto->BuyCount) < vItem->maxcount )
             vCount->count += diff * pProto->BuyCount;
         else
             vCount->count = vItem->maxcount;
     }
-
     vCount->count = vCount->count > used_count ? vCount->count-used_count : 0;
     vCount->lastIncrementTime = ptime;
     return vCount->count;
 }
-
 TrainerSpellData const* Creature::GetTrainerSpells() const
 {
     return objmgr.GetNpcTrainerSpells(GetEntry());
 }
-
 // overwrite WorldObject function for proper name localization
 const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const
 {
@@ -2625,27 +2221,21 @@ const char* Creature::GetNameForLocaleIdx(int32 loc_idx) const
                 return cl->Name[loc_idx].c_str();
         }
     }
-
     return GetName();
 }
-
 const CreatureData* Creature::GetLinkedRespawnCreatureData() const
 {
     if(!m_DBTableGuid) // only hard-spawned creatures from DB can have a linked master
         return NULL;
-
     if(uint32 targetGuid = objmgr.GetLinkedRespawnGuid(m_DBTableGuid))
         return objmgr.GetCreatureData(targetGuid);
-
     return NULL;
 }
-
 // returns master's remaining respawn time if any
 time_t Creature::GetLinkedCreatureRespawnTime() const
 {
     if(!m_DBTableGuid) // only hard-spawned creatures from DB can have a linked master
         return 0;
-
     if(uint32 targetGuid = objmgr.GetLinkedRespawnGuid(m_DBTableGuid))
     {
         Map* targetMap = NULL;
@@ -2659,7 +2249,6 @@ time_t Creature::GetLinkedCreatureRespawnTime() const
         if(targetMap)
             return objmgr.GetCreatureRespawnTime(targetGuid,targetMap->GetInstanceId());
     }
-
     return 0;
 }
 
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 5fbe4a07a28..f66d485d183 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_CREATURE_H
 #define TRINITYCORE_CREATURE_H
-
 #include "Common.h"
 #include "Unit.h"
 #include "UpdateMask.h"
@@ -28,17 +26,13 @@
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Cell.h"
-
 #include <list>
-
 struct SpellEntry;
-
 class CreatureAI;
 class Quest;
 class Player;
 class WorldSession;
 class CreatureGroup;
-
 enum Gossip_Option
 {
     GOSSIP_OPTION_NONE              = 0,                    //UNIT_NPC_FLAG_NONE              = 0,
@@ -62,7 +56,6 @@ enum Gossip_Option
     GOSSIP_OPTION_LEARNDUALSPEC     = 18,                   //UNIT_NPC_FLAG_TRAINER (bonus option for GOSSIP_OPTION_TRAINER)
     GOSSIP_OPTION_OUTDOORPVP        = 19                    //added by code (option for outdoor pvp creatures)
 };
-
 enum Gossip_Guard
 {
     GOSSIP_GUARD_BANK               = 32,
@@ -77,7 +70,6 @@ enum Gossip_Guard
     GOSSIP_GUARD_SPELLTRAINER       = 41,
     GOSSIP_GUARD_SKILLTRAINER       = 42
 };
-
 enum Gossip_Guard_Spell
 {
     GOSSIP_GUARD_SPELL_WARRIOR      = 64,
@@ -92,7 +84,6 @@ enum Gossip_Guard_Spell
     GOSSIP_GUARD_SPELL_UNKNOWN2     = 73,
     GOSSIP_GUARD_SPELL_DRUID        = 74
 };
-
 enum Gossip_Guard_Skill
 {
     GOSSIP_GUARD_SKILL_ALCHEMY      = 80,
@@ -108,7 +99,6 @@ enum Gossip_Guard_Skill
     GOSSIP_GUARD_SKILL_TAILORING    = 90,
     GOSSIP_GUARD_SKILL_ENGINERING   = 91
 };
-
 enum GossipOptionIcon
 {
     GOSSIP_ICON_CHAT                = 0,                    //white chat bubble
@@ -123,7 +113,6 @@ enum GossipOptionIcon
     GOSSIP_ICON_BATTLE              = 9,                    //two swords
     GOSSIP_ICON_DOT                 = 10                    //yellow dot
 };
-
 struct GossipOption
 {
     uint32 Id;
@@ -136,7 +125,6 @@ struct GossipOption
     std::string OptionText;
     std::string BoxText;
 };
-
 enum CreatureFlagsExtra
 {
     CREATURE_FLAG_EXTRA_INSTANCE_BIND   = 0x00000001,       // creature kill bind instance with killer and killer's group
@@ -153,16 +141,13 @@ enum CreatureFlagsExtra
     CREATURE_FLAG_EXTRA_NO_CRIT         = 0x00020000,       // creature can't do critical strikes
     CREATURE_FLAG_EXTRA_NO_SKILLGAIN    = 0x00040000,       // creature won't increase weapon skills
 };
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 #define MAX_KILL_CREDIT 2
-
 // from `creature_template` table
 struct CreatureInfo
 {
@@ -238,7 +223,6 @@ struct CreatureInfo
     uint32  ScriptID;
     uint32  GetRandomValidModelId() const;
     uint32  GetFirstValidModelId() const;
-
     // helpers
     SkillType GetRequiredLootSkill() const
     {
@@ -251,40 +235,33 @@ struct CreatureInfo
         else
             return SKILL_SKINNING;                          // normal case
     }
-
     bool isTameable(bool exotic) const
     {
         if(type != CREATURE_TYPE_BEAST || family == 0 || (type_flags & CREATURE_TYPEFLAGS_TAMEABLE)==0)
             return false;
-
         // if can tame exotic then can tame any temable
         return exotic || (type_flags & CREATURE_TYPEFLAGS_EXOTIC)==0;
     }
 };
-
 struct CreatureLocale
 {
     std::vector<std::string> Name;
     std::vector<std::string> SubName;
 };
-
 struct NpcOptionLocale
 {
     std::vector<std::string> OptionText;
     std::vector<std::string> BoxText;
 };
-
 struct PointOfInterestLocale
 {
     std::vector<std::string> IconName;
 };
-
 struct EquipmentInfo
 {
     uint32  entry;
     uint32  equipentry[3];
 };
-
 // from `creature` table
 struct CreatureData
 {
@@ -308,13 +285,11 @@ struct CreatureData
     uint8 spawnMask;
     bool dbData;
 };
-
 struct CreatureDataAddonAura
 {
     uint32 spell_id;
     uint8 effect_idx;
 };
-
 // from `creature_addon` table
 struct CreatureDataAddon
 {
@@ -327,7 +302,6 @@ struct CreatureDataAddon
     uint32 move_flags;
     CreatureDataAddonAura const* auras;                     // loaded as char* "spell1 eff1 spell2 eff2 ... "
 };
-
 struct CreatureModelInfo
 {
     uint32 modelid;
@@ -336,7 +310,6 @@ struct CreatureModelInfo
     uint8 gender;
     uint32 modelid_other_gender;
 };
-
 enum InhabitTypeValues
 {
     INHABIT_GROUND = 1,
@@ -344,7 +317,6 @@ enum InhabitTypeValues
     INHABIT_AIR    = 4,
     INHABIT_ANYWHERE = INHABIT_GROUND | INHABIT_WATER | INHABIT_AIR
 };
-
 // Enums used by StringTextData::Type (CreatureEventAI)
 enum ChatType
 {
@@ -356,7 +328,6 @@ enum ChatType
     CHAT_TYPE_BOSS_WHISPER      = 5,
     CHAT_TYPE_ZONE_YELL         = 6
 };
-
 //Selection method used by SelectTarget (CreatureEventAI)
 enum AttackingTarget
 {
@@ -369,31 +340,26 @@ enum AttackingTarget
     ATTACKING_TARGET_BOTTOMAGGRO_PLAYER,                    //Selects targets from bottom aggro to top (player only)
     */
 };
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 // Vendors
 struct VendorItem
 {
     VendorItem(uint32 _item, uint32 _maxcount, uint32 _incrtime, uint32 _ExtendedCost)
         : item(_item), maxcount(_maxcount), incrtime(_incrtime), ExtendedCost(_ExtendedCost) {}
-
     uint32 item;
     uint32 maxcount;                                        // 0 for infinity item amount
     uint32 incrtime;                                        // time for restore items amount if maxcount != 0
     uint32 ExtendedCost;
 };
 typedef std::vector<VendorItem*> VendorItemList;
-
 struct VendorItemData
 {
     VendorItemList m_items;
-
     VendorItem* GetItem(uint32 slot) const
     {
         if(slot>=m_items.size()) return NULL;
@@ -408,7 +374,6 @@ struct VendorItemData
     bool RemoveItem( uint32 item_id );
     VendorItem const* FindItem(uint32 item_id) const;
     size_t FindItemSlot(uint32 item_id) const;
-
     void Clear()
     {
         for (VendorItemList::const_iterator itr = m_items.begin(); itr != m_items.end(); ++itr)
@@ -416,84 +381,62 @@ struct VendorItemData
         m_items.clear();
     }
 };
-
 struct VendorItemCount
 {
     explicit VendorItemCount(uint32 _item, uint32 _count)
         : itemId(_item), count(_count), lastIncrementTime(time(NULL)) {}
-
     uint32 itemId;
     uint32 count;
     time_t lastIncrementTime;
 };
-
 typedef std::list<VendorItemCount> VendorItemCounts;
-
 struct TrainerSpell
 {
     TrainerSpell() : spell(0), spellCost(0), reqSkill(0), reqSkillValue(0), reqLevel(0), learnedSpell(0) {}
-
     TrainerSpell(uint32 _spell, uint32 _spellCost, uint32 _reqSkill, uint32 _reqSkillValue, uint32 _reqLevel, uint32 _learnedspell)
         : spell(_spell), spellCost(_spellCost), reqSkill(_reqSkill), reqSkillValue(_reqSkillValue), reqLevel(_reqLevel), learnedSpell(_learnedspell)
     {}
-
     uint32 spell;
     uint32 spellCost;
     uint32 reqSkill;
     uint32 reqSkillValue;
     uint32 reqLevel;
     uint32 learnedSpell;
-
     // helpers
     bool IsCastable() const { return learnedSpell != spell; }
 };
-
 typedef UNORDERED_MAP<uint32 /*spellid*/, TrainerSpell> TrainerSpellMap;
-
 struct TrainerSpellData
 {
     TrainerSpellData() : trainerType(0) {}
-
     TrainerSpellMap spellList;
     uint32 trainerType;                                     // trainer type based at trainer spells, can be different from creature_template value.
                                                             // req. for correct show non-prof. trainers like weaponmaster, allowed values 0 and 2.
     TrainerSpell const* Find(uint32 spell_id) const;
     void Clear() { spellList.clear(); }
 };
-
 typedef std::list<GossipOption> GossipOptionList;
-
 typedef std::map<uint32,time_t> CreatureSpellCooldowns;
-
 // max different by z coordinate for creature aggro reaction
 #define CREATURE_Z_ATTACK_RANGE 3
-
 #define MAX_VENDOR_ITEMS 150                                // Limitation in 3.x.x item count in SMSG_LIST_INVENTORY
-
 class TRINITY_DLL_SPEC Creature : public Unit
 {
     public:
-
         explicit Creature();
         virtual ~Creature();
-
         void AddToWorld();
         void RemoveFromWorld();
-
         void DisappearAndDie();
-
         bool Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 vehId, uint32 team, float x, float y, float z, float ang, const CreatureData *data = NULL);
         bool LoadCreaturesAddon(bool reload = false);
         void SelectLevel(const CreatureInfo *cinfo);
         void LoadEquipment(uint32 equip_entry, bool force=false);
-
         uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; }
         char const* GetSubName() const { return GetCreatureInfo()->SubName; }
-
         void Update( uint32 time );                         // overwrited Unit::Update
         void GetRespawnCoord(float &x, float &y, float &z, float* ori = NULL, float* dist =NULL) const;
         uint32 GetEquipmentId() const { return GetCreatureInfo()->equipmentId; }
-
         void SetCorpseDelay(uint32 delay) { m_corpseDelay = delay; }
         bool isRacialLeader() const { return GetCreatureInfo()->RacialLeader; }
         bool isCivilian() const { return GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_CIVILIAN; }
@@ -517,45 +460,33 @@ class TRINITY_DLL_SPEC Creature : public Unit
         {
             if(isPet())
                 return false;
-
             uint32 rank = GetCreatureInfo()->rank;
             return rank != CREATURE_ELITE_NORMAL && rank != CREATURE_ELITE_RARE;
         }
-
         bool isWorldBoss() const
         {
             if(isPet())
                 return false;
-
             return GetCreatureInfo()->rank == CREATURE_ELITE_WORLDBOSS;
         }
-
         uint32 getLevelForTarget(Unit const* target) const; // overwrite Unit::getLevelForTarget for boss level support
-
         bool IsInEvadeMode() const { return hasUnitState(UNIT_STAT_EVADE); }
-
         bool AIM_Initialize(CreatureAI* ai = NULL);
         void Motion_Initialize();
-
         void AI_SendMoveToPacket(float x, float y, float z, uint32 time, uint32 MovementFlags, uint8 type);
         CreatureAI * AI() const { return (CreatureAI*)i_AI; }
-
         uint32 GetShieldBlockValue() const                  //dunno mob block value
         {
             return (getLevel()/2 + uint32(GetStat(STAT_STRENGTH)/20));
         }
-
         SpellSchoolMask GetMeleeDamageSchoolMask() const { return m_meleeDamageSchoolMask; }
         void SetMeleeDamageSchool(SpellSchools school) { m_meleeDamageSchoolMask = SpellSchoolMask(1 << school); }
-
         void _AddCreatureSpellCooldown(uint32 spell_id, time_t end_time);
         void _AddCreatureCategoryCooldown(uint32 category, time_t apply_time);
         void AddCreatureSpellCooldown(uint32 spellid);
         bool HasSpellCooldown(uint32 spell_id) const;
         bool HasCategoryCooldown(uint32 spell_id) const;
-
         bool HasSpell(uint32 spellID) const;
-
         bool UpdateEntry(uint32 entry, uint32 team=ALLIANCE, const CreatureData* data=NULL);
         bool UpdateStats(Stats stat);
         bool UpdateAllStats();
@@ -567,72 +498,56 @@ class TRINITY_DLL_SPEC Creature : public Unit
         void UpdateDamagePhysical(WeaponAttackType attType);
         uint32 GetCurrentEquipmentId() { return m_equipmentId; }
         float GetSpellDamageMod(int32 Rank);
-
         VendorItemData const* GetVendorItems() const;
         uint32 GetVendorItemCurrentCount(VendorItem const* vItem);
         uint32 UpdateVendorItemCurrentCount(VendorItem const* vItem, uint32 used_count);
-
         TrainerSpellData const* GetTrainerSpells() const;
-
         CreatureInfo const *GetCreatureInfo() const { return m_creatureInfo; }
         CreatureData const *GetCreatureData() const { return m_creatureData; }
         CreatureDataAddon const* GetCreatureAddon() const;
-
         std::string GetAIName() const;
         std::string GetScriptName() const;
         uint32 GetScriptId() const;
-
         void prepareGossipMenu( Player *pPlayer, uint32 gossipid = 0 );
         void sendPreparedGossip( Player* player );
         void OnGossipSelect(Player* player, uint32 option);
         void OnPoiSelect(Player* player, GossipOption const *gossip);
-
         uint32 GetGossipTextId(uint32 action, uint32 zoneid);
         uint32 GetNpcTextId();
         void LoadGossipOptions();
         void ResetGossipOptions();
         GossipOption const* GetGossipOption( uint32 id ) const;
         void addGossipOption(GossipOption const& gso) { m_goptions.push_back(gso); }
-
         void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
         void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
         void TextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote = false) { MonsterTextEmote(textId,TargetGuid,IsBossEmote); }
         void Whisper(int32 textId, uint64 receiver, bool IsBossWhisper = false) { MonsterWhisper(textId,receiver,IsBossWhisper); }
         void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); }
-
         // overwrite WorldObject function for proper name localization
         const char* GetNameForLocaleIdx(int32 locale_idx) const;
-
         void setDeathState(DeathState s);                   // overwrite virtual Unit::setDeathState
         bool FallGround();
-
         bool LoadFromDB(uint32 guid, Map *map);
         void SaveToDB();
                                                             // overwrited in Pet
         virtual void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask);
         virtual void DeleteFromDB();                        // overwrited in Pet
-
         Loot loot;
         bool lootForPickPocketed;
         bool lootForBody;
         Player *GetLootRecipient() const;
         bool hasLootRecipient() const { return m_lootRecipient!=0; }
-
         void SetLootRecipient (Unit* unit);
         void AllLootRemovedFromCorpse();
-
         SpellEntry const *reachWithSpellAttack(Unit *pVictim);
         SpellEntry const *reachWithSpellCure(Unit *pVictim);
-
         uint32 m_spells[CREATURE_MAX_SPELLS];
         CreatureSpellCooldowns m_CreatureSpellCooldowns;
         CreatureSpellCooldowns m_CreatureCategoryCooldowns;
         uint32 m_GlobalCooldown;
-
         bool canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList = false, bool is3dDistance = true) const;
         bool canStartAttack(Unit const* u, bool force) const;
         float GetAttackDistance(Unit const* pl) const;
-
         Unit* SelectNearestTarget(float dist = 0) const;
         void DoFleeToGetAssistance();
         void CallForHelp(float fRadius);
@@ -642,47 +557,33 @@ class TRINITY_DLL_SPEC Creature : public Unit
         bool HasSearchedAssistance() { return m_AlreadySearchedAssistance; }
         bool CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction = true) const;
         bool _IsTargetAcceptable(const Unit* target) const;
-
         MovementGeneratorType GetDefaultMovementType() const { return m_defaultMovementType; }
         void SetDefaultMovementType(MovementGeneratorType mgt) { m_defaultMovementType = mgt; }
-
         // for use only in LoadHelper, Map::Add Map::CreatureCellRelocation
         Cell const& GetCurrentCell() const { return m_currentCell; }
         void SetCurrentCell(Cell const& cell) { m_currentCell = cell; }
-
         bool IsVisibleInGridForPlayer(Player const* pl) const;
-
         void RemoveCorpse();
         bool isDeadByDefault() const { return m_isDeadByDefault; };
-
         void ForcedDespawn();
-
         time_t const& GetRespawnTime() const { return m_respawnTime; }
         time_t GetRespawnTimeEx() const;
         void SetRespawnTime(uint32 respawn) { m_respawnTime = respawn ? time(NULL) + respawn : 0; }
         void Respawn(bool force = false);
         void SaveRespawnTime();
-
         uint32 GetRespawnDelay() const { return m_respawnDelay; }
         void SetRespawnDelay(uint32 delay) { m_respawnDelay = delay; }
-
         float GetRespawnRadius() const { return m_respawnradius; }
         void SetRespawnRadius(float dist) { m_respawnradius = dist; }
-
         // Linked Creature Respawning System
         time_t GetLinkedCreatureRespawnTime() const;
         const CreatureData* GetLinkedRespawnCreatureData() const;
-
         uint32 m_groupLootTimer;                            // (msecs)timer used for group loot
         uint64 lootingGroupLeaderGUID;                      // used to find group which is looting corpse
-
         void SendZoneUnderAttackMessage(Player* attacker);
-
         void SetInCombatWithZone();
-
         bool hasQuest(uint32 quest_id) const;
         bool hasInvolvedQuest(uint32 quest_id)  const;
-
         GridReference<Creature> &GetGridRef() { return m_gridRef; }
         bool isRegeneratingHealth() { return m_regenHealth; }
         virtual uint8 GetPetAutoSpellSize() const { return CREATURE_MAX_SPELLS; }
@@ -693,26 +594,19 @@ class TRINITY_DLL_SPEC Creature : public Unit
             else
                 return m_charmInfo->GetCharmSpell(pos)->GetAction();
         }
-
         void SetHomePosition(float x, float y, float z, float o) { m_homePosition.Relocate(x, y, z, o); }
         void SetHomePosition(const Position &pos) { m_homePosition.Relocate(pos);}
         void GetHomePosition(float &x, float &y, float &z, float &ori) { m_homePosition.GetPosition(x, y, z, ori); }
-
         uint32 GetGlobalCooldown() const { return m_GlobalCooldown; }
-
         uint32 GetWaypointPath(){return m_path_id;}
         void LoadPath(uint32 pathid) { m_path_id = pathid; }
-
         uint32 GetCurrentWaypointID(){return m_waypointID;}
         void UpdateWaypointID(uint32 wpID){m_waypointID = wpID;}
-
         void SearchFormation();
         CreatureGroup *GetFormation() {return m_formation;}
         void SetFormation(CreatureGroup *formation) {m_formation = formation;}
-
         Unit *SelectVictim();
         void SetDeadByDefault (bool death_state) {m_isDeadByDefault = death_state;}
-
         void SetDisableReputationGain(bool disable) { DisableReputationGain = disable; }
         bool IsReputationGainDisabled() { return DisableReputationGain; }
         bool IsDamageEnoughForLootingAndReward() { return m_PlayerDamageReq == 0; }
@@ -723,36 +617,26 @@ class TRINITY_DLL_SPEC Creature : public Unit
         }
         void ResetPlayerDamageReq() { m_PlayerDamageReq = GetHealth() / 2; }
         uint32 m_PlayerDamageReq;
-
         void SetOriginalEntry(uint32 entry) { m_originalEntry = entry; }
-
         static float _GetDamageMod(int32 Rank);
-
         float m_SightDistance, m_CombatDistance;
     protected:
         bool CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, uint32 team, const CreatureData *data = NULL);
         bool InitEntry(uint32 entry, uint32 team=ALLIANCE, const CreatureData* data=NULL);
-
         // vendor items
         VendorItemCounts m_vendorItemCounts;
-
         void _RealtimeSetCreatureInfo();
-
         static float _GetHealthMod(int32 Rank);
-
         uint32 m_lootMoney;
         uint64 m_lootRecipient;
-
         /// Timers
         uint32 m_deathTimer;                                // (msecs)timer for death or corpse disappearance
         time_t m_respawnTime;                               // (secs) time of next respawn
         uint32 m_respawnDelay;                              // (secs) delay between corpse disappearance and respawning
         uint32 m_corpseDelay;                               // (secs) delay between death and corpse disappearance
         float m_respawnradius;
-
         bool m_gossipOptionLoaded;
         GossipOptionList m_goptions;
-
         ReactStates m_reactState;                           // for AI, not charmInfo
         void RegenerateMana();
         void RegenerateHealth();
@@ -761,48 +645,36 @@ class TRINITY_DLL_SPEC Creature : public Unit
         Cell m_currentCell;                                 // store current cell where creature listed
         uint32 m_DBTableGuid;                               ///< For new or temporary creatures is 0 for saved it is lowguid
         uint32 m_equipmentId;
-
         bool m_AlreadyCallAssistance;
         bool m_AlreadySearchedAssistance;
         bool m_regenHealth;
         bool m_AI_locked;
         bool m_isDeadByDefault;
-
         SpellSchoolMask m_meleeDamageSchoolMask;
         uint32 m_originalEntry;
-
         Position m_homePosition;
-
         bool DisableReputationGain;
-
         CreatureInfo const* m_creatureInfo;                 // in heroic mode can different from ObjMgr::GetCreatureTemplate(GetEntry())
         CreatureData const* m_creatureData;
-
     private:
         //WaypointMovementGenerator vars
         uint32 m_waypointID;
         uint32 m_path_id;
-
         //Formation var
         CreatureGroup *m_formation;
-
         GridReference<Creature> m_gridRef;
 };
-
 class AssistDelayEvent : public BasicEvent
 {
     public:
         AssistDelayEvent(const uint64& victim, Unit& owner) : BasicEvent(), m_victim(victim), m_owner(owner) { }
-
         bool Execute(uint64 e_time, uint32 p_time);
         void AddAssistant(const uint64& guid) { m_assistants.push_back(guid); }
     private:
         AssistDelayEvent();
-
         uint64            m_victim;
         std::list<uint64> m_assistants;
         Unit&             m_owner;
 };
-
 #endif
 
diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index 27fe428efd1..6727575e920 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
 #include "Creature.h"
 #include "World.h"
 #include "SpellMgr.h"
 #include "Vehicle.h"
-
 //Disable CreatureAI when charmed
 void CreatureAI::OnCharmed(bool apply)
 {
@@ -32,25 +30,20 @@ void CreatureAI::OnCharmed(bool apply)
     me->NeedChangeAI = true;
     me->IsAIEnabled = false;
 }
-
 AISpellInfoType * UnitAI::AISpellInfo;
 TRINITY_DLL_SPEC AISpellInfoType * GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; }
-
 void CreatureAI::DoZoneInCombat(Creature* creature)
 {
     if (!creature)
         creature = me;
-
     if(!creature->CanHaveThreatList())
         return;
-
     Map *map = creature->GetMap();
     if (!map->IsDungeon())                                  //use IsDungeon instead of Instanceable, in case battlegrounds will be instantiated
     {
         sLog.outError("DoZoneInCombat call for map that isn't an instance (creature entry = %d)", creature->GetTypeId() == TYPEID_UNIT ? ((Creature*)creature)->GetEntry() : 0);
         return;
     }
-
     if(!creature->HasReactState(REACT_PASSIVE) && !creature->getVictim())
     {
         if(Unit *target = creature->SelectNearestTarget(50))
@@ -67,32 +60,26 @@ void CreatureAI::DoZoneInCombat(Creature* creature)
             }
         }
     }
-
     if(!creature->HasReactState(REACT_PASSIVE) && !creature->getVictim())
     {
         sLog.outError("DoZoneInCombat called for creature that has empty threat list (creature entry = %u)", creature->GetEntry());
         return;
     }
-
     Map::PlayerList const &PlList = map->GetPlayers();
-
     if(PlList.isEmpty())
         return;
-
     for(Map::PlayerList::const_iterator i = PlList.begin(); i != PlList.end(); ++i)
     {
         if(Player* pPlayer = i->getSource())
         {
             if(pPlayer->isGameMaster())
                 continue;
-
             if(pPlayer->isAlive())
             {
                 creature->SetInCombatWith(pPlayer);
                 pPlayer->SetInCombatWith(creature);
                 creature->AddThreat(pPlayer, 0.0f);
             }
-
             /* Causes certain things to never leave the threat list (Priest Lightwell, etc):
             for(Unit::ControlList::const_iterator itr = pPlayer->m_Controlled.begin(); itr != pPlayer->m_Controlled.end(); ++itr)
             {
@@ -103,15 +90,12 @@ void CreatureAI::DoZoneInCombat(Creature* creature)
         }
     }
 }
-
 void CreatureAI::MoveInLineOfSight(Unit *who)
 {
     if(me->getVictim())
         return;
-        
     if (me->GetTypeId() == CREATURE_TYPE_NON_COMBAT_PET) // non-combat pets should just stand there and look good;)
         return;
-
     if(me->canStartAttack(who, false))
         AttackStart(who);
     //else if(who->getVictim() && me->IsFriendlyTo(who)
@@ -119,7 +103,6 @@ void CreatureAI::MoveInLineOfSight(Unit *who)
     //    && me->canStartAttack(who->getVictim(), true)) // TODO: if we use true, it will not attack it when it arrives
     //    me->GetMotionMaster()->MoveChase(who->getVictim());
 }
-
 void CreatureAI::SelectNearestTarget(Unit *who)
 {
     if(me->getVictim() && me->GetDistanceOrder(who, me->getVictim()) && me->canAttack(who))
@@ -128,14 +111,11 @@ void CreatureAI::SelectNearestTarget(Unit *who)
         me->AddThreat(who, 1000000.0f);
     }
 }
-
 void CreatureAI::EnterEvadeMode()
 {
     if(!_EnterEvadeMode())
         return;
-
     sLog.outDebug("Creature %u enters evade mode.", me->GetEntry());
-
     if(!me->GetVehicle()) // otherwise me will be in evade mode forever
     {
         if(Unit *owner = me->GetCharmerOrOwner())
@@ -146,13 +126,10 @@ void CreatureAI::EnterEvadeMode()
         else
             me->GetMotionMaster()->MoveTargetedHome();
     }
-
     Reset();
-
     if(me->IsVehicle()) // use the same sequence of addtoworld, aireset may remove all summons!
         me->GetVehicleKit()->Reset();
 }
-
 /*void CreatureAI::AttackedBy( Unit* attacker )
 {
     if(!m_creature->getVictim())
diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
index 556e9be14e0..98a145b79e0 100644
--- a/src/game/CreatureAI.h
+++ b/src/game/CreatureAI.h
@@ -17,38 +17,29 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CREATUREAI_H
 #define TRINITY_CREATUREAI_H
-
 #include "UnitAI.h"
 #include "Common.h"
-
 class WorldObject;
 class Unit;
 class Creature;
 class Player;
 struct SpellEntry;
-
 #define TIME_INTERVAL_LOOK   5000
 #define VISIBILITY_RANGE    10000
-
 //Spell targets used by SelectSpell
 enum SelectTargetType
 {
     SELECT_TARGET_DONTCARE = 0,                             //All target types allowed
-
     SELECT_TARGET_SELF,                                     //Only Self casting
-
     SELECT_TARGET_SINGLE_ENEMY,                             //Only Single Enemy
     SELECT_TARGET_AOE_ENEMY,                                //Only AoE Enemy
     SELECT_TARGET_ANY_ENEMY,                                //AoE or Single Enemy
-
     SELECT_TARGET_SINGLE_FRIEND,                            //Only Single Friend
     SELECT_TARGET_AOE_FRIEND,                               //Only AoE Friend
     SELECT_TARGET_ANY_FRIEND,                               //AoE or Single Friend
 };
-
 //Spell Effects used by SelectSpell
 enum SelectEffect
 {
@@ -57,123 +48,84 @@ enum SelectEffect
     SELECT_EFFECT_HEALING,                                  //Spell does healing
     SELECT_EFFECT_AURA,                                     //Spell applies an aura
 };
-
 enum SCEquip
 {
     EQUIP_NO_CHANGE = -1,
     EQUIP_UNEQUIP   = 0
 };
-
 class TRINITY_DLL_SPEC CreatureAI : public UnitAI
 {
     protected:
         Creature * const me;
         Creature * const m_creature;
-
         bool UpdateVictim();
         bool UpdateVictimWithGaze();
         bool UpdateCombatState();
-
         void SelectNearestTarget(Unit *who);
-
         void SetGazeOn(Unit *target);
-
         Creature *DoSummon(uint32 uiEntry, const Position &pos, uint32 uiDespawntime = 30000, TempSummonType uiType = TEMPSUMMON_CORPSE_TIMED_DESPAWN);
         Creature *DoSummon(uint32 uiEntry, WorldObject *obj, float fRadius = 5.0f, uint32 uiDespawntime = 30000, TempSummonType uiType = TEMPSUMMON_CORPSE_TIMED_DESPAWN);
         Creature *DoSummonFlyer(uint32 uiEntry, WorldObject *obj, float fZ, float fRadius = 5.0f, uint32 uiDespawntime = 30000, TempSummonType uiType = TEMPSUMMON_CORPSE_TIMED_DESPAWN);
-
     public:
         explicit CreatureAI(Creature *c) : UnitAI((Unit*)c), me(c), m_creature(c) {}
-
         virtual ~CreatureAI() {}
-
         ///== Reactions At =================================
-
         // Called if IsVisible(Unit *who) is true at each *who move, reaction at visibility zone enter
         virtual void MoveInLineOfSight(Unit *);
-
         // Called for reaction at stopping attack at no attackers or targets
         virtual void EnterEvadeMode();
-
         // Called for reaction at enter to combat if not in combat yet (enemy can be NULL)
         virtual void EnterCombat(Unit* /*enemy*/) {}
-
         // Called at any Damage from any attacker (before damage apply)
         // Note: it for recalculation damage or special reaction at damage
         // for attack reaction use AttackedBy called for not DOT damage in Unit::DealDamage also
         virtual void DamageTaken(Unit *done_by, uint32 & /*damage*/) {}
-
         // Called when the creature is killed
         virtual void JustDied(Unit *) {}
-
         // Called when the creature kills a unit
         virtual void KilledUnit(Unit *) {}
-
         // Called when the creature summon successfully other creature
         virtual void JustSummoned(Creature* ) {}
         virtual void IsSummonedBy(Unit *summoner) {}
-
         virtual void SummonedCreatureDespawn(Creature* /*unit*/) {}
-
         // Called when hit by a spell
         virtual void SpellHit(Unit*, const SpellEntry*) {}
-
         // Called when spell hits a target
         virtual void SpellHitTarget(Unit* target, const SpellEntry*) {}
-
         // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
         //virtual void AttackedBy(Unit* attacker);
         virtual bool IsEscorted() {return false;}
-
         // Called when creature is spawned or respawned (for reseting variables)
         virtual void JustRespawned() { Reset(); }
-
         // Called at waypoint reached or point movement finished
         virtual void MovementInform(uint32 /*MovementType*/, uint32 /*Data*/) {}
-
         void OnCharmed(bool apply);
-
         //virtual void SpellClick(Player *player) {}
-
         // Called at reaching home after evade
         virtual void JustReachedHome() {}
-
         void DoZoneInCombat(Creature* pUnit = NULL);
-
-        // Called at text emote receive from player 
+        // Called at text emote receive from player
         virtual void ReceiveEmote(Player* pPlayer, uint32 text_emote) {}
-
         ///== Triggered Actions Requested ==================
-
         // Called when creature attack expected (if creature can and no have current victim)
         // Note: for reaction at hostile action must be called AttackedBy function.
         //virtual void AttackStart(Unit *) {}
-
         // Called at World update tick
         //virtual void UpdateAI(const uint32 diff ) {}
-
         ///== State checks =================================
-
         // Is unit visible for MoveInLineOfSight
         //virtual bool IsVisible(Unit *) const { return false; }
-
         // called when the corpse of this creature gets removed
         virtual void CorpseRemoved(uint32 & /*respawnDelay*/) {}
-
         // Called when victim entered water and creature can not enter water
         //virtual bool canReachByRangeAttack(Unit*) { return false; }
-
         ///== Fields =======================================
-
         // Pointer to controlled by AI creature
         //Creature* const m_creature;
-
         virtual void PassengerBoarded(Unit *who, int8 seatId, bool apply) {}
-
     protected:
         bool _EnterEvadeMode();
 };
-
 enum Permitions
 {
     PERMIT_BASE_NO                 = -1,
@@ -183,5 +135,4 @@ enum Permitions
     PERMIT_BASE_FACTION_SPECIFIC   = 400,
     PERMIT_BASE_SPECIAL            = 800
 };
-
 #endif
diff --git a/src/game/CreatureAIFactory.h b/src/game/CreatureAIFactory.h
index d546c2b1720..a2396fc5117 100644
--- a/src/game/CreatureAIFactory.h
+++ b/src/game/CreatureAIFactory.h
@@ -19,26 +19,20 @@
  */
 #ifndef TRINITY_CREATUREAIFACTORY_H
 #define TRINITY_CREATUREAIFACTORY_H
-
 //#include "Policies/Singleton.h"
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
-
 struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature>
 {
     SelectableAI(const char *id) : FactoryHolder<CreatureAI>(id) {}
 };
-
 template<class REAL_AI>
 struct CreatureAIFactory : public SelectableAI
 {
     CreatureAIFactory(const char *name) : SelectableAI(name) {}
-
     CreatureAI* Create(void *) const;
-
     int Permit(const Creature *c) const { return REAL_AI::Permissible(c); }
 };
-
 template<class REAL_AI>
 inline CreatureAI*
 CreatureAIFactory<REAL_AI>::Create(void *data) const
@@ -46,7 +40,6 @@ CreatureAIFactory<REAL_AI>::Create(void *data) const
     Creature* creature = reinterpret_cast<Creature *>(data);
     return (new REAL_AI(creature));
 }
-
 typedef FactoryHolder<CreatureAI> CreatureAICreator;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRegistry CreatureAIRegistry;
 typedef FactoryHolder<CreatureAI>::FactoryHolderRepository CreatureAIRepository;
diff --git a/src/game/CreatureAIImpl.h b/src/game/CreatureAIImpl.h
index 89d5bbc2a9e..4fddcc6392d 100644
--- a/src/game/CreatureAIImpl.h
+++ b/src/game/CreatureAIImpl.h
@@ -17,21 +17,17 @@
  */
 #ifndef CREATUREAIIMPL_H
 #define CREATUREAIIMPL_H
-
 #include "Common.h"
 #include "Platform/Define.h"
 #include "TemporarySummon.h"
 #include "CreatureAI.h"
-
 #define HEROIC(n,h) (HeroicMode ? h : n)
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2)
 {
     return (rand()%2) ? v1 : v2;
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3)
@@ -44,7 +40,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3)
         case 2: return v3;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4)
@@ -58,7 +53,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4)
         case 3: return v4;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5)
@@ -73,7 +67,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5)
         case 4: return v5;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6)
@@ -89,7 +82,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 5: return v6;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7)
@@ -106,7 +98,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 6: return v7;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8)
@@ -124,7 +115,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 7: return v8;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -144,7 +134,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 8: return v9;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -165,7 +154,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 9: return v10;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -187,7 +175,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 10: return v11;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -210,7 +197,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 11: return v12;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -234,7 +220,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 12: return v13;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -259,7 +244,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 13: return v14;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -285,7 +269,6 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 14: return v15;
     }
 }
-
 template<class T>
 inline
 const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, const T& v6, const T& v7, const T& v8,
@@ -312,26 +295,20 @@ const T& RAND(const T& v1, const T& v2, const T& v3, const T& v4, const T& v5, c
         case 15: return v16;
     }
 }
-
 class EventMap : private std::map<uint32, uint32>
 {
     private:
         uint32 m_time, m_phase;
     public:
         explicit EventMap() : m_phase(0), m_time(0) {}
-
         uint32 GetTimer() const { return m_time; }
-
         void Reset() { clear(); m_time = 0; m_phase = 0; }
-
         void Update(uint32 time) { m_time += time; }
-
         void SetPhase(uint32 phase)
         {
             if(phase && phase < 9)
                 m_phase = (1 << (phase + 24));
         }
-
         void ScheduleEvent(uint32 eventId, uint32 time, uint32 gcd = 0, uint32 phase = 0)
         {
             time += m_time;
@@ -347,13 +324,11 @@ class EventMap : private std::map<uint32, uint32>
             }
             insert(std::make_pair(time, eventId));
         }
-
         void RescheduleEvent(uint32 eventId, uint32 time, uint32 gcd = 0, uint32 phase = 0)
         {
             CancelEvent(eventId);
             ScheduleEvent(eventId, time, gcd, phase);
         }
-
         void RepeatEvent(uint32 time)
         {
             if(empty())
@@ -369,12 +344,10 @@ class EventMap : private std::map<uint32, uint32>
             }
             insert(std::make_pair(time, eventId));
         }
-
         void PopEvent()
         {
             erase(begin());
         }
-
         uint32 ExecuteEvent()
         {
             while(!empty())
@@ -392,7 +365,6 @@ class EventMap : private std::map<uint32, uint32>
             }
             return 0;
         }
-
         uint32 GetEvent()
         {
             while(!empty())
@@ -408,7 +380,6 @@ class EventMap : private std::map<uint32, uint32>
             }
             return 0;
         }
-
         void DelayEvents(uint32 time, uint32 gcd)
         {
             time += m_time;
@@ -426,7 +397,6 @@ class EventMap : private std::map<uint32, uint32>
                     ++itr;
             }
         }
-
         void CancelEvent(uint32 eventId)
         {
             for(iterator itr = begin(); itr != end();)
@@ -437,7 +407,6 @@ class EventMap : private std::map<uint32, uint32>
                     ++itr;
             }
         }
-
         void CancelEventsByGCD(uint32 gcd)
         {
             for(iterator itr = begin(); itr != end();)
@@ -449,7 +418,6 @@ class EventMap : private std::map<uint32, uint32>
             }
         }
 };
-
 enum AITarget
 {
     AITARGET_SELF,
@@ -459,16 +427,13 @@ enum AITarget
     AITARGET_BUFF,
     AITARGET_DEBUFF,
 };
-
 enum AICondition
 {
     AICOND_AGGRO,
     AICOND_COMBAT,
     AICOND_DIE,
 };
-
 #define AI_DEFAULT_COOLDOWN 5000
-
 struct AISpellInfoType
 {
     AISpellInfoType() : target(AITARGET_SELF), condition(AICOND_COMBAT)
@@ -479,10 +444,8 @@ struct AISpellInfoType
     uint32 realCooldown;
     float maxRange;
 };
-
 TRINITY_DLL_SPEC AISpellInfoType * GetAISpellInfo(uint32 i);
 
-
 inline void CreatureAI::SetGazeOn(Unit *target)
 {
     if(me->canAttack(target))
@@ -491,12 +454,10 @@ inline void CreatureAI::SetGazeOn(Unit *target)
         me->SetReactState(REACT_PASSIVE);
     }
 }
-
 inline bool CreatureAI::UpdateVictimWithGaze()
 {
     if(!me->isInCombat())
         return false;
-
     if(me->HasReactState(REACT_PASSIVE))
     {
         if(me->getVictim())
@@ -504,17 +465,14 @@ inline bool CreatureAI::UpdateVictimWithGaze()
         else
             me->SetReactState(REACT_AGGRESSIVE);
     }
-
     if(Unit *victim = me->SelectVictim())
         AttackStart(victim);
     return me->getVictim();
 }
-
 inline bool CreatureAI::UpdateCombatState()
 {
     if(!me->isInCombat())
         return false;
-
     if(!me->HasReactState(REACT_PASSIVE))
     {
         if(Unit *victim = me->SelectVictim())
@@ -526,15 +484,12 @@ inline bool CreatureAI::UpdateCombatState()
         EnterEvadeMode();
         return false;
     }
-
     return true;
 }
-
 inline bool CreatureAI::UpdateVictim()
 {
     if(!me->isInCombat())
         return false;
-
     if(!me->HasReactState(REACT_PASSIVE))
     {
         if(Unit *victim = me->SelectVictim())
@@ -546,10 +501,8 @@ inline bool CreatureAI::UpdateVictim()
         EnterEvadeMode();
         return false;
     }
-
     return true;
 }
-
 /*
 inline bool CreatureAI::UpdateVictim()
 {
@@ -560,12 +513,10 @@ inline bool CreatureAI::UpdateVictim()
     return me->getVictim();
 }
 */
-
 inline bool CreatureAI::_EnterEvadeMode()
 {
     if(!me->isAlive())
         return false;
-
     // sometimes bosses stuck in combat?
     me->RemoveAllAuras();
     me->DeleteThreatList();
@@ -573,46 +524,36 @@ inline bool CreatureAI::_EnterEvadeMode()
     me->LoadCreaturesAddon();
     me->SetLootRecipient(NULL);
     me->ResetPlayerDamageReq();
-    
     if(me->IsInEvadeMode())
         return false;
-
     return true;
 }
-
 inline void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered)
 {
     if(!victim || me->hasUnitState(UNIT_STAT_CASTING) && !triggered)
         return;
-
     me->CastSpell(victim, spellId, triggered);
 }
-
 inline void UnitAI::DoCastVictim(uint32 spellId, bool triggered)
 {
     me->CastSpell(me->getVictim(), spellId, triggered);
 }
-
 inline void UnitAI::DoCastAOE(uint32 spellId, bool triggered)
 {
     if(!triggered && me->hasUnitState(UNIT_STAT_CASTING))
         return;
-
     me->CastSpell((Unit*)NULL, spellId, triggered);
 }
-
 inline Creature *CreatureAI::DoSummon(uint32 uiEntry, const Position &pos, uint32 uiDespawntime, TempSummonType uiType)
 {
     return me->SummonCreature(uiEntry, pos, uiType, uiDespawntime);
 }
-
 inline Creature *CreatureAI::DoSummon(uint32 uiEntry, WorldObject* obj, float fRadius, uint32 uiDespawntime, TempSummonType uiType)
 {
     Position pos;
     obj->GetRandomNearPosition(pos, fRadius);
     return me->SummonCreature(uiEntry, pos, uiType, uiDespawntime);
 }
-
 inline Creature *CreatureAI::DoSummonFlyer(uint32 uiEntry, WorldObject *obj, float _fZ, float fRadius, uint32 uiDespawntime, TempSummonType uiType)
 {
     Position pos;
@@ -620,6 +561,5 @@ inline Creature *CreatureAI::DoSummonFlyer(uint32 uiEntry, WorldObject *obj, flo
     pos.m_positionZ += _fZ;
     return me->SummonCreature(uiEntry, pos, uiType, uiDespawntime);
 }
-
 #endif
 
diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp
index 67c1f857a56..900f89da3b4 100644
--- a/src/game/CreatureAIRegistry.cpp
+++ b/src/game/CreatureAIRegistry.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "PassiveAI.h"
 #include "ReactorAI.h"
 #include "CombatAI.h"
@@ -30,7 +29,6 @@
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
-
 //#include "CreatureAIImpl.h"
 namespace AIRegistry
 {
@@ -49,7 +47,6 @@ namespace AIRegistry
         (new CreatureAIFactory<ArchorAI>("ArchorAI"))->RegisterSelf();
         (new CreatureAIFactory<TurretAI>("TurretAI"))->RegisterSelf();
         (new CreatureAIFactory<CreatureEventAI>("EventAI"))->RegisterSelf();
-
         (new MovementGeneratorFactory<RandomMovementGenerator<Creature> >(RANDOM_MOTION_TYPE))->RegisterSelf();
         (new MovementGeneratorFactory<WaypointMovementGenerator<Creature> >(WAYPOINT_MOTION_TYPE))->RegisterSelf();
     }
diff --git a/src/game/CreatureAIRegistry.h b/src/game/CreatureAIRegistry.h
index 2b92a096731..c75167d74af 100644
--- a/src/game/CreatureAIRegistry.h
+++ b/src/game/CreatureAIRegistry.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CREATUREAIREGISTRY_H
 #define TRINITY_CREATUREAIREGISTRY_H
-
 namespace AIRegistry
 {
     void Initialize(void);
diff --git a/src/game/CreatureAISelector.cpp b/src/game/CreatureAISelector.cpp
index 9f2828bf776..2f7bd0ff211 100644
--- a/src/game/CreatureAISelector.cpp
+++ b/src/game/CreatureAISelector.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Creature.h"
 #include "CreatureAISelector.h"
 #include "PassiveAI.h"
@@ -27,30 +26,24 @@
 #include "Pet.h"
 #include "TemporarySummon.h"
 #include "CreatureAIFactory.h"
-
 INSTANTIATE_SINGLETON_1(CreatureAIRegistry);
 INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry);
-
 namespace FactorySelector
 {
     CreatureAI* selectAI(Creature *creature)
     {
         const CreatureAICreator *ai_factory = NULL;
         CreatureAIRegistry &ai_registry(CreatureAIRepository::Instance());
-
         if(creature->isPet())
             ai_factory = ai_registry.GetRegistryItem("PetAI");
-
         //scriptname in db
         if(!ai_factory)
             if(CreatureAI* scriptedAI = Script->GetAI(creature))
                 return scriptedAI;
-
         // AIname in db
         std::string ainame=creature->GetAIName();
         if(!ai_factory && !ainame.empty())
             ai_factory = ai_registry.GetRegistryItem( ainame.c_str() );
-
         // select by NPC flags
         if(!ai_factory)
         {
@@ -74,7 +67,6 @@ namespace FactorySelector
             else if(creature->GetCreatureType() == CREATURE_TYPE_CRITTER && !creature->HasUnitTypeMask(UNIT_MASK_GUARDIAN))
                 ai_factory = ai_registry.GetRegistryItem("CritterAI");
         }
-
         if(!ai_factory)
         {
             for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
@@ -86,7 +78,6 @@ namespace FactorySelector
                 }
             }
         }
-
         // select by permit check
         if(!ai_factory)
         {
@@ -106,20 +97,16 @@ namespace FactorySelector
                 }
             }
         }
-
         // select NullCreatureAI if not another cases
         ainame = (ai_factory == NULL) ? "NullCreatureAI" : ai_factory->key();
-
         DEBUG_LOG("Creature %u used AI is %s.", creature->GetGUIDLow(), ainame.c_str() );
         return ( ai_factory == NULL ? new NullCreatureAI(creature) : ai_factory->Create(creature) );
     }
-
     MovementGenerator* selectMovementGenerator(Creature *creature)
     {
         MovementGeneratorRegistry &mv_registry(MovementGeneratorRepository::Instance());
         assert( creature->GetCreatureInfo() != NULL );
         const MovementGeneratorCreator *mv_factory = mv_registry.GetRegistryItem( creature->GetDefaultMovementType());
-
         /* if( mv_factory == NULL  )
         {
             int best_val = -1;
@@ -138,9 +125,7 @@ namespace FactorySelector
             }
             }
         }*/
-
         return ( mv_factory == NULL ? NULL : mv_factory->Create(creature) );
-
     }
 }
 
diff --git a/src/game/CreatureAISelector.h b/src/game/CreatureAISelector.h
index 436233b5b21..e7e980518dd 100644
--- a/src/game/CreatureAISelector.h
+++ b/src/game/CreatureAISelector.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_CREATUREAISELECTOR_H
 #define TRINITY_CREATUREAISELECTOR_H
-
 class CreatureAI;
 class Creature;
 class MovementGenerator;
-
 namespace FactorySelector
 {
     CreatureAI* selectAI(Creature *);
diff --git a/src/game/CreatureEventAI.cpp b/src/game/CreatureEventAI.cpp
index b2f5dc354d2..9a6e907f33b 100644
--- a/src/game/CreatureEventAI.cpp
+++ b/src/game/CreatureEventAI.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
@@ -32,7 +31,6 @@
 #include "InstanceData.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
-
 bool CreatureEventAIHolder::UpdateRepeatTimer( Creature* creature, uint32 repeatMin, uint32 repeatMax )
 {
     if (repeatMin == repeatMax)
@@ -45,17 +43,14 @@ bool CreatureEventAIHolder::UpdateRepeatTimer( Creature* creature, uint32 repeat
         Enabled = false;
         return false;
     }
-
     return true;
 }
-
 int CreatureEventAI::Permissible(const Creature *creature)
 {
     if( creature->GetAIName() == "EventAI" )
         return PERMIT_BASE_SPECIAL;
     return PERMIT_BASE_NO;
 }
-
 CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
 {
     // Need make copy for filter unneeded steps and safe in case table reload
@@ -65,7 +60,6 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
         std::vector<CreatureEventAI_Event>::const_iterator i;
         for (i = (*CreatureEvents).second.begin(); i != (*CreatureEvents).second.end(); ++i)
         {
-
             //Debug check
             #ifndef TRINITY_DEBUG
             if ((*i).event_flags & EFLAG_DEBUG_ONLY)
@@ -89,16 +83,13 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
     }
     else
         sLog.outError("CreatureEventAI: EventMap for Creature %u is empty but creature is using CreatureEventAI.", m_creature->GetEntry());
-
     bEmptyList = CreatureEventAIList.empty();
     Phase = 0;
     CombatMovementEnabled = true;
     MeleeEnabled = true;
     AttackDistance = 0.0f;
     AttackAngle = 0.0f;
-
     InvinceabilityHpLevel = 0;
-
     //Handle Spawned Events
     if (!bEmptyList)
     {
@@ -107,32 +98,26 @@ CreatureEventAI::CreatureEventAI(Creature *c ) : CreatureAI(c)
                 ProcessEvent(*i);
     }
 }
-
 bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker)
 {
     if (!pHolder.Enabled || pHolder.Time)
         return false;
-
     //Check the inverse phase mask (event doesn't trigger if current phase bit is set in mask)
     if (pHolder.Event.event_inverse_phase_mask & (1 << Phase))
         return false;
-
     CreatureEventAI_Event const& event = pHolder.Event;
-
     //Check event conditions based on the event type, also reset events
     switch (event.event_type)
     {
         case EVENT_T_TIMER:
             if (!m_creature->isInCombat())
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.timer.repeatMin,event.timer.repeatMax);
             break;
         case EVENT_T_TIMER_OOC:
             if (m_creature->isInCombat())
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.timer.repeatMin,event.timer.repeatMax);
             break;
@@ -140,12 +125,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat() || !m_creature->GetMaxHealth())
                 return false;
-
             uint32 perc = (m_creature->GetHealth()*100) / m_creature->GetMaxHealth();
-
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
             break;
@@ -154,12 +136,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat() || !m_creature->GetMaxPower(POWER_MANA))
                 return false;
-
             uint32 perc = (m_creature->GetPower(POWER_MANA)*100) / m_creature->GetMaxPower(POWER_MANA);
-
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
             break;
@@ -175,7 +154,6 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             break;
         case EVENT_T_SPELLHIT:
             //Spell hit is special case, param1 and param2 handled within CreatureEventAI::SpellHit
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.spell_hit.repeatMin,event.spell_hit.repeatMax);
             break;
@@ -193,12 +171,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->GetMaxHealth())
                 return false;
-
             uint32 perc = (m_creature->getVictim()->GetHealth()*100) / m_creature->getVictim()->GetMaxHealth();
-
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
             break;
@@ -206,7 +181,6 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         case EVENT_T_TARGET_CASTING:
             if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->IsNonMeleeSpellCasted(false, false, true))
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.target_casting.repeatMin,event.target_casting.repeatMax);
             break;
@@ -214,13 +188,10 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat())
                 return false;
-
             Unit* pUnit = DoSelectLowestHpFriendly(event.friendly_hp.radius, event.friendly_hp.hpDeficit);
             if (!pUnit)
                 return false;
-
             pActionInvoker = pUnit;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.friendly_hp.repeatMin,event.friendly_hp.repeatMax);
             break;
@@ -229,17 +200,13 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat())
                 return false;
-
             std::list<Creature*> pList;
             DoFindFriendlyCC(pList, event.friendly_is_cc.radius);
-
             //List is empty
             if (pList.empty())
                 return false;
-
             //We don't really care about the whole list, just return first available
             pActionInvoker = *(pList.begin());
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.friendly_is_cc.repeatMin,event.friendly_is_cc.repeatMax);
             break;
@@ -248,14 +215,11 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             std::list<Creature*> pList;
             DoFindFriendlyMissingBuff(pList, event.friendly_buff.radius, event.friendly_buff.spellId);
-
             //List is empty
             if (pList.empty())
                 return false;
-
             //We don't really care about the whole list, just return first available
             pActionInvoker = *(pList.begin());
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.friendly_buff.repeatMin,event.friendly_buff.repeatMax);
             break;
@@ -265,11 +229,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             //Prevent event from occuring on no unit or non creatures
             if (!pActionInvoker || pActionInvoker->GetTypeId()!=TYPEID_UNIT)
                 return false;
-
             //Creature id doesn't match up
             if (((Creature*)pActionInvoker)->GetEntry() != event.summon_unit.creatureId)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.summon_unit.repeatMin,event.summon_unit.repeatMax);
             break;
@@ -278,12 +240,9 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
         {
             if (!m_creature->isInCombat() || !m_creature->getVictim() || !m_creature->getVictim()->GetMaxPower(POWER_MANA))
                 return false;
-
             uint32 perc = (m_creature->getVictim()->GetPower(POWER_MANA)*100) / m_creature->getVictim()->GetMaxPower(POWER_MANA);
-
             if (perc > event.percent_range.percentMax || perc < event.percent_range.percentMin)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.percent_range.repeatMin,event.percent_range.repeatMax);
             break;
@@ -298,7 +257,6 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             Aura* aura = m_creature->GetAura(event.buffed.spellId,0);
             if(!aura || aura->GetStackAmount() < event.buffed.amount)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
             break;
@@ -308,13 +266,11 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             //Prevent event from occuring on no unit
             if (!pActionInvoker)
                 return false;
-
             //Note: checked only aura for effect 0, if need check aura for effect 1/2 then
             // possible way: pack in event.buffed.amount 2 uint16 (ammount+effectIdx)
             Aura* aura = pActionInvoker->GetAura(event.buffed.spellId,0);
             if(!aura || aura->GetStackAmount() < event.buffed.amount)
                 return false;
-
             //Repeat Timers
             pHolder.UpdateRepeatTimer(m_creature,event.buffed.repeatMin,event.buffed.repeatMax);
             break;
@@ -323,25 +279,19 @@ bool CreatureEventAI::ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pAction
             sLog.outErrorDb("CreatureEventAI: Creature %u using Event %u has invalid Event Type(%u), missing from ProcessEvent() Switch.", m_creature->GetEntry(), pHolder.Event.event_id, pHolder.Event.event_type);
             break;
     }
-
     //Disable non-repeatable events
     if (!(pHolder.Event.event_flags & EFLAG_REPEATABLE))
         pHolder.Enabled = false;
-
     //Store random here so that all random actions match up
     uint32 rnd = rand();
-
     //Return if chance for event is not met
     if (pHolder.Event.event_chance <= rnd % 100)
         return false;
-
     //Process actions
     for (uint32 j = 0; j < MAX_ACTIONS; j++)
         ProcessAction(pHolder.Event.action[j], rnd, pHolder.Event.event_id, pActionInvoker);
-
     return true;
 }
-
 void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker)
 {
     switch (action.type)
@@ -350,20 +300,16 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         {
             if (!action.text.TextId1)
                 return;
-
             int32 temp = 0;
-
             if (action.text.TextId2 && action.text.TextId3)
                 temp = RAND(action.text.TextId1,action.text.TextId2,action.text.TextId3);
             else if (action.text.TextId2 && urand(0,1))
                 temp = action.text.TextId2;
             else
                 temp = action.text.TextId1;
-
             if (temp)
             {
                 Unit* target = NULL;
-
                 if (pActionInvoker)
                 {
                     if (pActionInvoker->GetTypeId() == TYPEID_PLAYER)
@@ -381,7 +327,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                             if (owner->GetTypeId() == TYPEID_PLAYER)
                                 target = owner;
                 }
-
                 DoScriptText(temp, m_creature, target);
             }
             break;
@@ -446,27 +391,21 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         {
             Unit* target = GetTargetByType(action.cast.target, pActionInvoker);
             Unit* caster = m_creature;
-
             if (!target)
                 return;
-
             if (action.cast.castFlags & CAST_FORCE_TARGET_SELF)
                 caster = target;
-
             //Allowed to cast only if not casting (unless we interrupt ourself) or if spell is triggered
             bool canCast = !caster->IsNonMeleeSpellCasted(false) || (action.cast.castFlags & (CAST_TRIGGERED | CAST_INTURRUPT_PREVIOUS));
-
             // If cast flag CAST_AURA_NOT_PRESENT is active, check if target already has aura on them
             if(action.cast.castFlags & CAST_AURA_NOT_PRESENT)
             {
                 if(target->HasAura(action.cast.spellId))
                     return;
             }
-
             if (canCast)
             {
                 const SpellEntry* tSpell = GetSpellStore()->LookupEntry(action.cast.spellId);
-
                 //Verify that spell exists
                 if (tSpell)
                 {
@@ -481,21 +420,17 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                             {
                                 AttackDistance = 0.0f;
                                 AttackAngle = 0.0f;
-
                                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
                             }
                         }
-
                     }
                     else
                     {
                         //Interrupt any previous spell
                         if (caster->IsNonMeleeSpellCasted(false) && action.cast.castFlags & CAST_INTURRUPT_PREVIOUS)
                             caster->InterruptNonMeleeSpells(false);
-
                         caster->CastSpell(target, action.cast.spellId, (action.cast.castFlags & CAST_TRIGGERED));
                     }
-
                 }
                 else
                     sLog.outErrorDb("CreatureEventAI: event %d creature %d attempt to cast spell that doesn't exist %d", EventId, m_creature->GetEntry(), action.cast.spellId);
@@ -505,14 +440,11 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_SUMMON:
         {
             Unit* target = GetTargetByType(action.summon.target, pActionInvoker);
-
             Creature* pCreature = NULL;
-
             if (action.summon.duration)
                 pCreature = m_creature->SummonCreature(action.summon.creatureId, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, action.summon.duration);
             else
                 pCreature = m_creature->SummonCreature(action.summon.creatureId, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
-
             if (!pCreature)
                 sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Spawn event %d is on creature %d", action.summon.creatureId, EventId, m_creature->GetEntry());
             else if (action.summon.target != TARGET_T_SELF && target)
@@ -544,14 +476,11 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_SET_UNIT_FIELD:
         {
             Unit* target = GetTargetByType(action.set_unit_field.target, pActionInvoker);
-
             // not allow modify important for integrity object fields
             if (action.set_unit_field.field < OBJECT_END || action.set_unit_field.field >= UNIT_END)
                 return;
-
             if (target)
                 target->SetUInt32Value(action.set_unit_field.field, action.set_unit_field.value);
-
             break;
         }
         case ACTION_T_SET_UNIT_FLAG:
@@ -569,16 +498,13 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             // ignore no affect case
             if(CombatMovementEnabled==(action.combat_movement.state!=0))
                 return;
-
             CombatMovementEnabled = action.combat_movement.state != 0;
-
             //Allow movement (create new targeted movement gen only if idle)
             if (CombatMovementEnabled)
             {
                 if(action.combat_movement.melee && m_creature->isInCombat())
                     if(Unit* victim = m_creature->getVictim())
                         m_creature->SendMeleeAttackStart(victim);
-
                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
             }
             else
@@ -586,7 +512,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                 if(action.combat_movement.melee && m_creature->isInCombat())
                     if(Unit* victim = m_creature->getVictim())
                         m_creature->SendMeleeAttackStop(victim);
-
                 m_creature->GetMotionMaster()->MoveIdle();
             }
             break;
@@ -608,7 +533,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             }
             else
                 Phase = new_phase;
-
             break;
         }
         case ACTION_T_EVADE:
@@ -641,7 +565,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_RANGED_MOVEMENT:
             AttackDistance = (float)action.ranged_movement.distance;
             AttackAngle = action.ranged_movement.angle/180.0f*M_PI;
-
             if (CombatMovementEnabled)
             {
                 m_creature->GetMotionMaster()->MoveChase(m_creature->getVictim(), AttackDistance, AttackAngle);
@@ -659,25 +582,21 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_SUMMON_ID:
         {
             Unit* target = GetTargetByType(action.summon_id.target, pActionInvoker);
-
             CreatureEventAI_Summon_Map::const_iterator i = CreatureEAI_Mgr.GetCreatureEventAISummonMap().find(action.summon_id.spawnId);
             if (i == CreatureEAI_Mgr.GetCreatureEventAISummonMap().end())
             {
                 sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. Summon map index %u does not exist. EventID %d. CreatureID %d", action.summon_id.creatureId, action.summon_id.spawnId, EventId, m_creature->GetEntry());
                 return;
             }
-
             Creature* pCreature = NULL;
             if ((*i).second.SpawnTimeSecs)
                 pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, (*i).second.SpawnTimeSecs);
             else
                 pCreature = m_creature->SummonCreature(action.summon_id.creatureId, (*i).second.position_x, (*i).second.position_y, (*i).second.position_z, (*i).second.orientation, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0);
-
             if (!pCreature)
                 sLog.outErrorDb( "CreatureEventAI: failed to spawn creature %u. EventId %d.Creature %d", action.summon_id.creatureId, EventId, m_creature->GetEntry());
             else if (action.summon_id.target != TARGET_T_SELF && target)
                 pCreature->AI()->AttackStart(target);
-
             break;
         }
         case ACTION_T_KILLED_MONSTER:
@@ -700,7 +619,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                 sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data without instance script. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
-
             pInst->SetData(action.set_inst_data.field, action.set_inst_data.value);
             break;
         }
@@ -712,31 +630,26 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
                 sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 but Target == NULL. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
-
             InstanceData* pInst = (InstanceData*)m_creature->GetInstanceData();
             if (!pInst)
             {
                 sLog.outErrorDb("CreatureEventAI: Event %d attempt to set instance data64 without instance script. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
-
             pInst->SetData64(action.set_inst_data64.field, target->GetGUID());
             break;
         }
         case ACTION_T_UPDATE_TEMPLATE:
             if (m_creature->GetEntry() == action.update_template.creatureId)
             {
-
                 sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_UPDATE_TEMPLATE call with param1 == current entry. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
-
             m_creature->UpdateEntry(action.update_template.creatureId, action.update_template.team ? HORDE : ALLIANCE);
             break;
         case ACTION_T_DIE:
             if (m_creature->isDead())
             {
-
                 sLog.outErrorDb("CreatureEventAI: Event %d ACTION_T_DIE on dead creature. Creature %d", EventId, m_creature->GetEntry());
                 return;
             }
@@ -753,7 +666,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             break;
         }
         break;
-
         // TRINITY ONLY
         case ACTION_T_SET_ACTIVE:
             me->setActive(action.raw.param1 ? true : false);
@@ -767,7 +679,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         case ACTION_T_SUMMON_GO:
         {
             GameObject* pObject = NULL;
-
             float x,y,z;
             m_creature->GetPosition(x,y,z);
             pObject = m_creature->SummonGameObject(action.raw.param1, x, y, z, 0, 0, 0, 0, 0, action.raw.param2);
@@ -777,7 +688,6 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
             }
             break;
         }
-
         case ACTION_T_SET_SHEATH:
         {
             m_creature->SetSheath(SheathState(action.set_sheath.sheath));
@@ -798,28 +708,22 @@ void CreatureEventAI::ProcessAction(CreatureEventAI_Action const& action, uint32
         }
     }
 }
-
 void CreatureEventAI::JustRespawned()
 {
     Reset();
-
     if (bEmptyList)
         return;
-
     //Handle Spawned Events
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
         if (SpawnedEventConditionsCheck((*i).Event))
             ProcessEvent(*i);
 }
-
 void CreatureEventAI::Reset()
 {
     EventUpdateTime = EVENT_UPDATE_TIME;
     EventDiff = 0;
-
     if (bEmptyList)
         return;
-
     //Reset all events to enabled
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
     {
@@ -841,11 +745,9 @@ void CreatureEventAI::Reset()
         }
     }
 }
-
 void CreatureEventAI::JustReachedHome()
 {
     m_creature->LoadCreaturesAddon();
-
     if (!bEmptyList)
     {
         for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
@@ -854,17 +756,13 @@ void CreatureEventAI::JustReachedHome()
                 ProcessEvent(*i);
         }
     }
-
     Reset();
 }
-
 void CreatureEventAI::EnterEvadeMode()
 {
     CreatureAI::EnterEvadeMode();
-
     if (bEmptyList)
         return;
-
     //Handle Evade events
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
     {
@@ -872,49 +770,40 @@ void CreatureEventAI::EnterEvadeMode()
             ProcessEvent(*i);
     }
 }
-
 void CreatureEventAI::JustDied(Unit* killer)
 {
     Reset();
-
     if (bEmptyList)
         return;
-
     //Handle Evade events
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_DEATH)
             ProcessEvent(*i, killer);
     }
-
     // reset phase after any death state events
     Phase = 0;
 }
-
 void CreatureEventAI::KilledUnit(Unit* victim)
 {
     if (bEmptyList || victim->GetTypeId() != TYPEID_PLAYER)
         return;
-
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_KILL)
             ProcessEvent(*i, victim);
     }
 }
-
 void CreatureEventAI::JustSummoned(Creature* pUnit)
 {
     if (bEmptyList || !pUnit)
         return;
-
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
     {
         if ((*i).Event.event_type == EVENT_T_SUMMONED_UNIT)
             ProcessEvent(*i, pUnit);
     }
 }
-
 void CreatureEventAI::EnterCombat(Unit *enemy)
 {
     //Check for on combat start events
@@ -942,16 +831,13 @@ void CreatureEventAI::EnterCombat(Unit *enemy)
             }
         }
     }
-
     EventUpdateTime = EVENT_UPDATE_TIME;
     EventDiff = 0;
 }
-
 void CreatureEventAI::AttackStart(Unit *who)
 {
     if (!who)
         return;
-
     if (m_creature->Attack(who, MeleeEnabled))
     {
         if (CombatMovementEnabled)
@@ -964,12 +850,10 @@ void CreatureEventAI::AttackStart(Unit *who)
         }
     }
 }
-
 void CreatureEventAI::MoveInLineOfSight(Unit *who)
 {
     if(me->getVictim())
         return;
-
     //Check for OOC LOS Event
     if (!bEmptyList)
     {
@@ -979,7 +863,6 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
             {
                 //can trigger if closer than fMaxAllowedRange
                 float fMaxAllowedRange = (*itr).Event.ooc_los.maxRange;
-
                 //if range is ok and we are actually in LOS
                 if (m_creature->IsWithinDistInMap(who, fMaxAllowedRange) && m_creature->IsWithinLOSInMap(who))
                 {
@@ -991,16 +874,12 @@ void CreatureEventAI::MoveInLineOfSight(Unit *who)
             }
         }
     }
-
     CreatureAI::MoveInLineOfSight(who);
 }
-
 void CreatureEventAI::SpellHit(Unit* pUnit, const SpellEntry* pSpell)
 {
-
     if (bEmptyList)
         return;
-
     for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
         if ((*i).Event.event_type == EVENT_T_SPELLHIT)
             //If spell id matches (or no spell id) & if spell school matches (or no spell school)
@@ -1008,19 +887,16 @@ void CreatureEventAI::SpellHit(Unit* pUnit, const SpellEntry* pSpell)
                 if (pSpell->SchoolMask & (*i).Event.spell_hit.schoolMask)
                     ProcessEvent(*i, pUnit);
 }
-
 void CreatureEventAI::UpdateAI(const uint32 diff)
 {
     //Check if we are in combat (also updates calls threat update code)
     bool Combat = UpdateVictim();
-
     if (!bEmptyList)
     {
         //Events are only updated once every EVENT_UPDATE_TIME ms to prevent lag with large amount of events
         if (EventUpdateTime < diff)
         {
             EventDiff += diff;
-
             //Check for time based events
             for (std::list<CreatureEventAIHolder>::iterator i = CreatureEventAIList.begin(); i != CreatureEventAIList.end(); ++i)
             {
@@ -1032,13 +908,11 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
                         //Do not decrement timers if event cannot trigger in this phase
                         if (!((*i).Event.event_inverse_phase_mask & (1 << Phase)))
                             (*i).Time -= EventDiff;
-
                         //Skip processing of events that have time remaining
                         continue;
                     }
                     else (*i).Time = 0;
                 }
-
                 //Events that are updated every EVENT_UPDATE_TIME
                 switch ((*i).Event.event_type)
                 {
@@ -1062,7 +936,6 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
                         break;
                 }
             }
-
             EventDiff = 0;
             EventUpdateTime = EVENT_UPDATE_TIME;
         }
@@ -1072,22 +945,18 @@ void CreatureEventAI::UpdateAI(const uint32 diff)
             EventUpdateTime -= diff;
         }
     }
-
     //Melee Auto-Attack
     if (Combat && MeleeEnabled)
         DoMeleeAttackIfReady();
 }
-
 inline Unit* CreatureEventAI::SelectUnit(AttackingTarget target, uint32 position)
 {
     //ThreatList m_threatlist;
     std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
     std::list<HostilReference*>::iterator i = m_threatlist.begin();
     std::list<HostilReference*>::reverse_iterator r = m_threatlist.rbegin();
-
     if (position >= m_threatlist.size() || !m_threatlist.size())
         return NULL;
-
     switch (target)
     {
         case ATTACKING_TARGET_RANDOM:
@@ -1108,7 +977,6 @@ inline Unit* CreatureEventAI::SelectUnit(AttackingTarget target, uint32 position
     }
     return NULL;
 }
-
 inline uint32 CreatureEventAI::GetRandActionParam(uint32 rnd, uint32 param1, uint32 param2, uint32 param3)
 {
     switch (rnd % 3)
@@ -1119,7 +987,6 @@ inline uint32 CreatureEventAI::GetRandActionParam(uint32 rnd, uint32 param1, uin
     }
     return 0;
 }
-
 inline int32 CreatureEventAI::GetRandActionParam(uint32 rnd, int32 param1, int32 param2, int32 param3)
 {
     switch (rnd % 3)
@@ -1130,7 +997,6 @@ inline int32 CreatureEventAI::GetRandActionParam(uint32 rnd, int32 param1, int32
     }
     return 0;
 }
-
 inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoker)
 {
     switch (Target)
@@ -1153,65 +1019,50 @@ inline Unit* CreatureEventAI::GetTargetByType(uint32 Target, Unit* pActionInvoke
             return NULL;
     };
 }
-
 Unit* CreatureEventAI::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
 {
     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     Unit* pUnit = NULL;
-
     MaNGOS::MostHPMissingInRange u_check(m_creature, range, MinHPDiff);
     MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange> searcher(m_creature, pUnit, u_check);
-
     /*
     typedef TYPELIST_4(GameObject, Creature*except pets*, DynamicObject, Corpse*Bones*) AllGridObjectTypes;
     This means that if we only search grid then we cannot possibly return pets or players so this is safe
     */
     TypeContainerVisitor<MaNGOS::UnitLastSearcher<MaNGOS::MostHPMissingInRange>, GridTypeMapContainer >  grid_unit_searcher(searcher);
-
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, grid_unit_searcher, *m_creature->GetMap(), *m_creature, range);
     return pUnit;
 }
-
 void CreatureEventAI::DoFindFriendlyCC(std::list<Creature*>& _list, float range)
 {
     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::FriendlyCCedInRange u_check(m_creature, range);
     MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange> searcher(m_creature, _list, u_check);
-
     TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyCCedInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher);
-
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature->GetMap());
 }
-
 void CreatureEventAI::DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid)
 {
     CellPair p(MaNGOS::ComputeCellPair(m_creature->GetPositionX(), m_creature->GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::FriendlyMissingBuffInRange u_check(m_creature, range, spellid);
     MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange> searcher(m_creature, _list, u_check);
-
     TypeContainerVisitor<MaNGOS::CreatureListSearcher<MaNGOS::FriendlyMissingBuffInRange>, GridTypeMapContainer >  grid_creature_searcher(searcher);
-
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, grid_creature_searcher, *m_creature->GetMap());
 }
-
 //*********************************
 //*** Functions used globally ***
-
 void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target)
 {
     if (!pSource)
@@ -1219,23 +1070,18 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit*
         sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i, invalid Source pointer.",textEntry);
         return;
     }
-
     if (textEntry >= 0)
     {
         sLog.outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) attempts to process text entry %i, but text entry must be negative.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
         return;
     }
-
     CreatureEventAI_TextMap::const_iterator i = CreatureEAI_Mgr.GetCreatureEventAITextMap().find(textEntry);
-
     if (i == CreatureEAI_Mgr.GetCreatureEventAITextMap().end())
     {
         sLog.outErrorDb("CreatureEventAI: DoScriptText with source entry %u (TypeId=%u, guid=%u) could not find text entry %i.",pSource->GetEntry(),pSource->GetTypeId(),pSource->GetGUIDLow(),textEntry);
         return;
     }
-
     sLog.outDebug("CreatureEventAI: DoScriptText: text entry=%i, Sound=%u, Type=%u, Language=%u, Emote=%u",textEntry,(*i).second.SoundId,(*i).second.Type,(*i).second.Language,(*i).second.Emote);
-
     if((*i).second.SoundId)
     {
         if (GetSoundEntriesStore()->LookupEntry((*i).second.SoundId))
@@ -1243,7 +1089,6 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit*
         else
             sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process invalid sound id %u.",textEntry,(*i).second.SoundId);
     }
-
     if((*i).second.Emote)
     {
         if (pSource->GetTypeId() == TYPEID_UNIT || pSource->GetTypeId() == TYPEID_PLAYER)
@@ -1253,7 +1098,6 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit*
         else
             sLog.outErrorDb("CreatureEventAI: DoScriptText entry %i tried to process emote for invalid TypeId (%u).",textEntry,pSource->GetTypeId());
     }
-
     switch((*i).second.Type)
     {
         case CHAT_TYPE_SAY:
@@ -1285,48 +1129,37 @@ void CreatureEventAI::DoScriptText(int32 textEntry, WorldObject* pSource, Unit*
             break;
     }
 }
-
 bool CreatureEventAI::CanCast(Unit* Target, SpellEntry const *Spell, bool Triggered)
 {
     //No target so we can't cast
     if (!Target || !Spell)
         return false;
-
     //Silenced so we can't cast
     if (!Triggered && me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED))
         return false;
-
     //Check for power
     if (!Triggered && me->GetPower((Powers)Spell->powerType) < CalculatePowerCost(Spell, me, GetSpellSchoolMask(Spell)))
         return false;
-
     SpellRangeEntry const *TempRange = NULL;
-
     TempRange = GetSpellRangeStore()->LookupEntry(Spell->rangeIndex);
-
     //Spell has invalid range store so we can't use it
     if (!TempRange)
         return false;
-
     //Unit is out of range of this spell
     if (!m_creature->IsInRange(Target,TempRange->minRangeHostile,TempRange->maxRangeHostile))
         return false;
-
     return true;
 }
-
 void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
 {
     if (bEmptyList)
         return;
-
     for (std::list<CreatureEventAIHolder>::iterator itr = CreatureEventAIList.begin(); itr != CreatureEventAIList.end(); ++itr)
     {
         if ((*itr).Event.event_type == EVENT_T_RECEIVE_EMOTE)
         {
             if ((*itr).Event.receive_emote.emoteId != text_emote)
                 return;
-
             PlayerCondition pcon((*itr).Event.receive_emote.condition,(*itr).Event.receive_emote.conditionValue1,(*itr).Event.receive_emote.conditionValue2);
             if (pcon.Meets(pPlayer))
             {
@@ -1336,7 +1169,6 @@ void CreatureEventAI::ReceiveEmote(Player* pPlayer, uint32 text_emote)
         }
     }
 }
-
 void CreatureEventAI::DamageTaken( Unit* done_by, uint32& damage )
 {
     if(InvinceabilityHpLevel > 0 && m_creature->GetHealth() < InvinceabilityHpLevel+damage)
@@ -1347,12 +1179,10 @@ void CreatureEventAI::DamageTaken( Unit* done_by, uint32& damage )
             damage = m_creature->GetHealth() - InvinceabilityHpLevel;
     }
 }
-
 bool CreatureEventAI::SpawnedEventConditionsCheck(CreatureEventAI_Event const& event)
 {
     if(event.event_type != EVENT_T_SPAWNED)
         return false;
-
     switch (event.spawned.condition)
     {
         case SPAWNED_EVENT_ALWAY:
@@ -1371,6 +1201,5 @@ bool CreatureEventAI::SpawnedEventConditionsCheck(CreatureEventAI_Event const& e
         default:
             break;
     }
-
     return false;
 }
diff --git a/src/game/CreatureEventAI.h b/src/game/CreatureEventAI.h
index 7882e7542ec..b26dfe2e055 100644
--- a/src/game/CreatureEventAI.h
+++ b/src/game/CreatureEventAI.h
@@ -15,22 +15,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_CREATURE_EAI_H
 #define MANGOS_CREATURE_EAI_H
-
 #include "Common.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Unit.h"
-
 class Player;
 class WorldObject;
-
 #define EVENT_UPDATE_TIME               500
 #define MAX_ACTIONS                     3
 #define MAX_PHASE                       32
-
 enum EventAI_Type
 {
     EVENT_T_TIMER                   = 0,                    // InitialMin, InitialMax, RepeatMin, RepeatMax
@@ -58,10 +53,8 @@ enum EventAI_Type
     EVENT_T_RECEIVE_EMOTE           = 22,                   // EmoteId, Condition, CondValue1, CondValue2
     EVENT_T_BUFFED                  = 23,                   // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
     EVENT_T_TARGET_BUFFED           = 24,                   // Param1 = SpellID, Param2 = Number of Time STacked, Param3/4 Repeat Min/Max
-
     EVENT_T_END,
 };
-
 enum EventAI_ActionType
 {
     ACTION_T_NONE                       = 0,                // No action
@@ -105,44 +98,35 @@ enum EventAI_ActionType
     ACTION_T_ZONE_COMBAT_PULSE          = 38,               // No Params
     ACTION_T_CALL_FOR_HELP              = 39,               // Radius
     ACTION_T_SET_SHEATH                 = 40,               // Sheath (0-passive,1-melee,2-ranged)
-
     ACTION_T_SET_ACTIVE                 = 101,  //Apply
     ACTION_T_SET_AGGRESSIVE             = 102,  //Apply
     ACTION_T_ATTACK_START_PULSE         = 103,  //Distance
     ACTION_T_SUMMON_GO                  = 104,  //GameObjectID, DespawnTime in ms
-
     ACTION_T_FORCE_DESPAWN              = 41,               // No Params
     ACTION_T_END = 105,
     ACTION_T_SET_INVINCIBILITY_HP_LEVEL = 42,               // MinHpValue, format(0-flat,1-percent from max health)
 };
-
 enum Target
 {
     //Self (m_creature)
     TARGET_T_SELF = 0,                                      //Self cast
-
     //Hostile targets (if pet then returns pet owner)
     TARGET_T_HOSTILE,                                       //Our current target (ie: highest aggro)
     TARGET_T_HOSTILE_SECOND_AGGRO,                          //Second highest aggro (generaly used for cleaves and some special attacks)
     TARGET_T_HOSTILE_LAST_AGGRO,                            //Dead last on aggro (no idea what this could be used for)
     TARGET_T_HOSTILE_RANDOM,                                //Just any random target on our threat list
     TARGET_T_HOSTILE_RANDOM_NOT_TOP,                        //Any random target except top threat
-
     //Invoker targets (if pet then returns pet owner)
     TARGET_T_ACTION_INVOKER,                                //Unit who caused this Event to occur (only works for EVENT_T_AGGRO, EVENT_T_KILL, EVENT_T_DEATH, EVENT_T_SPELLHIT, EVENT_T_OOC_LOS, EVENT_T_FRIENDLY_HP, EVENT_T_FRIENDLY_IS_CC, EVENT_T_FRIENDLY_MISSING_BUFF)
-
     //Hostile targets (including pets)
     TARGET_T_HOSTILE_WPET,                                  //Current target (can be a pet)
     TARGET_T_HOSTILE_WPET_SECOND_AGGRO,                     //Second highest aggro (generaly used for cleaves and some special attacks)
     TARGET_T_HOSTILE_WPET_LAST_AGGRO,                       //Dead last on aggro (no idea what this could be used for)
     TARGET_T_HOSTILE_WPET_RANDOM,                           //Just any random target on our threat list
     TARGET_T_HOSTILE_WPET_RANDOM_NOT_TOP,                   //Any random target except top threat
-
     TARGET_T_ACTION_INVOKER_WPET,
-
     TARGET_T_END
 };
-
 enum CastFlags
 {
     CAST_INTURRUPT_PREVIOUS     = 0x01,                     //Interrupt any spell casting
@@ -152,7 +136,6 @@ enum CastFlags
     CAST_FORCE_TARGET_SELF      = 0x10,                     //Forces the target to cast this spell on itself
     CAST_AURA_NOT_PRESENT       = 0x20,                     //Only casts the spell if the target does not have an aura from the spell
 };
-
 enum EventFlags
 {
     EFLAG_REPEATABLE            = 0x01,                     //Event repeats
@@ -164,14 +147,12 @@ enum EventFlags
     EFLAG_RESERVED_6            = 0x40,
     EFLAG_DEBUG_ONLY            = 0x80,                     //Event only occurs in debug build
 };
-
 enum SpawnedEventMode
 {
     SPAWNED_EVENT_ALWAY = 0,
     SPAWNED_EVENT_MAP   = 1,
     SPAWNED_EVENT_ZONE  = 2
 };
-
 // String text additional data, used in (CreatureEventAI)
 struct StringTextData
 {
@@ -182,7 +163,6 @@ struct StringTextData
 };
 // Text Maps
 typedef UNORDERED_MAP<int32, StringTextData> CreatureEventAI_TextMap;
-
 struct CreatureEventAI_Action
 {
     EventAI_ActionType type: 16;
@@ -395,19 +375,14 @@ struct CreatureEventAI_Action
         } raw;
     };
 };
-
 struct CreatureEventAI_Event
 {
     uint32 event_id;
-
     uint32 creature_id;
-
     uint32 event_inverse_phase_mask;
-
     EventAI_Type event_type : 16;
     uint8 event_chance : 8;
     uint8 event_flags  : 8;
-
     union
     {
         // EVENT_T_TIMER                                    = 0
@@ -526,7 +501,6 @@ struct CreatureEventAI_Event
             uint32 repeatMin;
             uint32 repeatMax;
         } buffed;
-
         // RAW
         struct
         {
@@ -536,41 +510,32 @@ struct CreatureEventAI_Event
             uint32 param4;
         } raw;
     };
-
     CreatureEventAI_Action action[MAX_ACTIONS];
 };
 //Event_Map
 typedef UNORDERED_MAP<uint32, std::vector<CreatureEventAI_Event> > CreatureEventAI_Event_Map;
-
 struct CreatureEventAI_Summon
 {
     uint32 id;
-
     float position_x;
     float position_y;
     float position_z;
     float orientation;
     uint32 SpawnTimeSecs;
 };
-
 //EventSummon_Map
 typedef UNORDERED_MAP<uint32, CreatureEventAI_Summon> CreatureEventAI_Summon_Map;
-
 struct CreatureEventAIHolder
 {
     CreatureEventAIHolder(CreatureEventAI_Event p) : Event(p), Time(0), Enabled(true){}
-
     CreatureEventAI_Event Event;
     uint32 Time;
     bool Enabled;
-
     // helper
     bool UpdateRepeatTimer(Creature* creature, uint32 repeatMin, uint32 repeatMax);
 };
-
 class TRINITY_DLL_SPEC CreatureEventAI : public CreatureAI
 {
-
     public:
         explicit CreatureEventAI(Creature *c);
         ~CreatureEventAI()
@@ -592,29 +557,23 @@ class TRINITY_DLL_SPEC CreatureEventAI : public CreatureAI
         void UpdateAI(const uint32 diff);
         void ReceiveEmote(Player* pPlayer, uint32 text_emote);
         static int Permissible(const Creature *);
-
         bool ProcessEvent(CreatureEventAIHolder& pHolder, Unit* pActionInvoker = NULL);
         void ProcessAction(CreatureEventAI_Action const& action, uint32 rnd, uint32 EventId, Unit* pActionInvoker);
         inline uint32 GetRandActionParam(uint32 rnd, uint32 param1, uint32 param2, uint32 param3);
         inline int32 GetRandActionParam(uint32 rnd, int32 param1, int32 param2, int32 param3);
         inline Unit* GetTargetByType(uint32 Target, Unit* pActionInvoker);
         inline Unit* SelectUnit(AttackingTarget target, uint32 position);
-
         void DoScriptText(int32 textEntry, WorldObject* pSource, Unit* target);
         bool CanCast(Unit* Target, SpellEntry const *Spell, bool Triggered);
-
         bool SpawnedEventConditionsCheck(CreatureEventAI_Event const& event);
-
         Unit* DoSelectLowestHpFriendly(float range, uint32 MinHPDiff);
         void DoFindFriendlyMissingBuff(std::list<Creature*>& _list, float range, uint32 spellid);
         void DoFindFriendlyCC(std::list<Creature*>& _list, float range);
-
                                                             //Holder for events (stores enabled, time, and eventid)
         std::list<CreatureEventAIHolder> CreatureEventAIList;
         uint32 EventUpdateTime;                             //Time between event updates
         uint32 EventDiff;                                   //Time between the last event call
         bool bEmptyList;
-
         //Variables used by Events themselves
         uint8 Phase;                                        // Current phase, max 32 phases
         bool CombatMovementEnabled;                         // If we allow targeted movment gen (movement twoards top threat)
diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp
index 5325edff4a9..18c4ca97de4 100644
--- a/src/game/CreatureEventAIMgr.cpp
+++ b/src/game/CreatureEventAIMgr.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
@@ -26,77 +25,61 @@
 #include "Policies/SingletonImp.h"
 #include "ObjectDefines.h"
 #include "GridDefines.h"
-
 INSTANTIATE_SINGLETON_1(CreatureEventAIMgr);
-
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Texts()
 {
     // Drop Existing Text Map, only done once and we are ready to add data from multiple sources.
     m_CreatureEventAI_TextMap.clear();
-
     // Load EventAI Text
     objmgr.LoadTrinityStrings(WorldDatabase,"creature_ai_texts",MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID);
-
     // Gather Additional data from EventAI Texts
     QueryResult *result = WorldDatabase.Query("SELECT entry, sound, type, language, emote FROM creature_ai_texts");
-
     sLog.outString("Loading EventAI Texts additional data...");
     if (result)
     {
         barGoLink bar(result->GetRowCount());
         uint32 count = 0;
-
         do
         {
             bar.step();
             Field* fields = result->Fetch();
             StringTextData temp;
-
             int32 i             = fields[0].GetInt32();
             temp.SoundId        = fields[1].GetInt32();
             temp.Type           = fields[2].GetInt32();
             temp.Language       = fields[3].GetInt32();
             temp.Emote          = fields[4].GetInt32();
-
             // range negative
             if (i > MIN_CREATURE_AI_TEXT_STRING_ID || i <= MAX_CREATURE_AI_TEXT_STRING_ID)
             {
                 sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` is not in valid range(%d-%d)",i,MIN_CREATURE_AI_TEXT_STRING_ID,MAX_CREATURE_AI_TEXT_STRING_ID);
                 continue;
             }
-
             // range negative (don't must be happen, loaded from same table)
             if (!objmgr.GetTrinityStringLocale(i))
             {
                 sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` not found",i);
                 continue;
             }
-
             if (temp.SoundId)
             {
                 if (!sSoundEntriesStore.LookupEntry(temp.SoundId))
                     sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Sound %u but sound does not exist.",i,temp.SoundId);
             }
-
             if (!GetLanguageDescByID(temp.Language))
                 sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` using Language %u but Language does not exist.",i,temp.Language);
-
             if (temp.Type > CHAT_TYPE_ZONE_YELL)
                 sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Type %u but this Chat Type does not exist.",i,temp.Type);
-
             if (temp.Emote)
             {
                 if (!sEmotesStore.LookupEntry(temp.Emote))
                     sLog.outErrorDb("CreatureEventAI:  Entry %i in table `creature_ai_texts` has Emote %u but emote does not exist.",i,temp.Emote);
             }
-
             m_CreatureEventAI_TextMap[i] = temp;
             ++count;
         } while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString(">> Loaded %u additional CreatureEventAI Texts data.", count);
     }
@@ -107,50 +90,39 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Texts()
         sLog.outString();
         sLog.outString(">> Loaded 0 additional CreatureEventAI Texts data. DB table `creature_ai_texts` is empty.");
     }
-
 }
-
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Summons()
 {
-
     //Drop Existing EventSummon Map
     m_CreatureEventAI_Summon_Map.clear();
-
     // Gather additional data for EventAI
     QueryResult *result = WorldDatabase.Query("SELECT id, position_x, position_y, position_z, orientation, spawntimesecs FROM creature_ai_summons");
     if (result)
     {
         barGoLink bar(result->GetRowCount());
         uint32 Count = 0;
-
         do
         {
             bar.step();
             Field *fields = result->Fetch();
-
             CreatureEventAI_Summon temp;
-
             uint32 i = fields[0].GetUInt32();
             temp.position_x = fields[1].GetFloat();
             temp.position_y = fields[2].GetFloat();
             temp.position_z = fields[3].GetFloat();
             temp.orientation = fields[4].GetFloat();
             temp.SpawnTimeSecs = fields[5].GetUInt32();
-
             if(!MaNGOS::IsValidMapCoord(temp.position_x,temp.position_y,temp.position_z,temp.orientation))
             {
                 sLog.outErrorDb("CreatureEventAI:  Summon id %u have wrong coordinates (%f,%f,%f,%f), skipping.", i,temp.position_x,temp.position_y,temp.position_z,temp.orientation);
                 continue;
             }
-
             //Add to map
             m_CreatureEventAI_Summon_Map[i] = temp;
             ++Count;
         } while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString(">> Loaded %u CreatureEventAI summon definitions", Count);
     }
@@ -161,15 +133,12 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Summons()
         sLog.outString();
         sLog.outString(">> Loaded 0 CreatureEventAI Summon definitions. DB table `creature_ai_summons` is empty.");
     }
-
 }
-
 // -------------------
 void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
 {
     //Drop Existing EventAI List
     m_CreatureEventAI_Event_Map.clear();
-
     // Gather event data
     QueryResult *result = WorldDatabase.Query("SELECT id, creature_id, event_type, event_inverse_phase_mask, event_chance, event_flags, "
         "event_param1, event_param2, event_param3, event_param4, "
@@ -181,19 +150,15 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
     {
         barGoLink bar(result->GetRowCount());
         uint32 Count = 0;
-
         do
         {
             bar.step();
             Field *fields = result->Fetch();
-
             CreatureEventAI_Event temp;
             temp.event_id = EventAI_Type(fields[0].GetUInt32());
             uint32 i = temp.event_id;
-
             temp.creature_id = fields[1].GetUInt32();
             uint32 creature_id = temp.creature_id;
-
             uint32 e_type = fields[2].GetUInt32();
             //Report any errors in event
             if (e_type >= EVENT_T_END)
@@ -202,7 +167,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 continue;
             }
             temp.event_type = EventAI_Type(e_type);
-
             temp.event_inverse_phase_mask = fields[3].GetUInt32();
             temp.event_chance = fields[4].GetUInt8();
             temp.event_flags  = fields[5].GetUInt8();
@@ -210,14 +174,12 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
             temp.raw.param2 = fields[7].GetUInt32();
             temp.raw.param3 = fields[8].GetUInt32();
             temp.raw.param4 = fields[9].GetUInt32();
-
             //Creature does not exist in database
             if (!sCreatureStorage.LookupEntry<CreatureInfo>(temp.creature_id))
             {
                 sLog.outErrorDb("CreatureEventAI:  Event %u has script for non-existing creature entry (%u), skipping.", i, temp.creature_id);
                 continue;
             }
-
             //No chance of this event occuring
             if (temp.event_chance == 0)
                 sLog.outErrorDb("CreatureEventAI:  Event %u has 0 percent chance. Event will never trigger!", i);
@@ -227,7 +189,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 sLog.outErrorDb("CreatureEventAI:  Creature %u are using event %u with more than 100 percent chance. Adjusting to 100 percent.", temp.creature_id, i);
                 temp.event_chance = 100;
             }
-
             //Individual event checks
             switch (temp.event_type)
             {
@@ -244,10 +205,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 case EVENT_T_TARGET_MANA:
                     if (temp.percent_range.percentMax > 100)
                         sLog.outErrorDb("CreatureEventAI:  Creature %u are using percentage event(%u) with param2 (MinPercent) > 100. Event will never trigger! ", temp.creature_id, i);
-
                     if (temp.percent_range.percentMax <= temp.percent_range.percentMin)
                         sLog.outErrorDb("CreatureEventAI:  Creature %u are using percentage event(%u) with param1 <= param2 (MaxPercent <= MinPercent). Event will never trigger! ", temp.creature_id, i);
-
                     if (temp.event_flags & EFLAG_REPEATABLE && !temp.percent_range.repeatMin && !temp.percent_range.repeatMax)
                     {
                         sLog.outErrorDb("CreatureEventAI:  Creature %u has param3 and param4=0 (RepeatMin/RepeatMax) but cannot be repeatable without timers. Removing EFLAG_REPEATABLE for event %u.", temp.creature_id, i);
@@ -263,14 +222,11 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                             sLog.outErrorDb("CreatureEventAI:  Creature %u has non-existant SpellID(%u) defined in event %u.", temp.creature_id, temp.spell_hit.spellId, i);
                             continue;
                         }
-
                         if ((temp.spell_hit.schoolMask & pSpell->SchoolMask) != pSpell->SchoolMask)
                             sLog.outErrorDb("CreatureEventAI:  Creature %u has param1(spellId %u) but param2 is not -1 and not equal to spell's school mask. Event %u can never trigger.", temp.creature_id, temp.spell_hit.schoolMask, i);
                     }
-
                     if (!temp.spell_hit.schoolMask)
                         sLog.outErrorDb("CreatureEventAI:  Creature %u is using invalid SpellSchoolMask(%u) defined in event %u.", temp.creature_id, temp.spell_hit.schoolMask, i);
-
                     if (temp.spell_hit.repeatMax < temp.spell_hit.repeatMin)
                         sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
@@ -341,7 +297,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         sLog.outErrorDb("CreatureEventAI:  Creature %u are using event(%u) with not existed qyest id (%u) in param1, skipped.", temp.creature_id, i, temp.quest.questId);
                     sLog.outErrorDb("CreatureEventAI: Creature %u using not implemented event (%u) in event %u.", temp.creature_id, temp.event_id, i);
                     continue;
-
                 case EVENT_T_AGGRO:
                 case EVENT_T_DEATH:
                 case EVENT_T_EVADE:
@@ -352,10 +307,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         sLog.outErrorDb("CreatureEventAI:  Creature %u has EFLAG_REPEATABLE set. Event can never be repeatable. Removing flag for event %u.", temp.creature_id, i);
                         temp.event_flags &= ~EFLAG_REPEATABLE;
                     }
-
                     break;
                 }
-
                 case EVENT_T_RECEIVE_EMOTE:
                 {
                     if (!sEmotesTextStore.LookupEntry(temp.receive_emote.emoteId))
@@ -363,22 +316,18 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param1 (EmoteTextId: %u) are not valid.",temp.creature_id, i, temp.receive_emote.emoteId);
                         continue;
                     }
-
                     if (!PlayerCondition::IsValid(ConditionType(temp.receive_emote.condition), temp.receive_emote.conditionValue1, temp.receive_emote.conditionValue2))
                     {
                         sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.",temp.creature_id, i, temp.receive_emote.condition);
                         continue;
                     }
-
                     if (!(temp.event_flags & EFLAG_REPEATABLE))
                     {
                         sLog.outErrorDb("CreatureEventAI: Creature %u using event %u: EFLAG_REPEATABLE not set. Event must always be repeatable. Flag applied.", temp.creature_id, i);
                         temp.event_flags |= EFLAG_REPEATABLE;
                     }
-
                     break;
                 }
-
                 case EVENT_T_BUFFED:
                 case EVENT_T_TARGET_BUFFED:
                 {
@@ -392,12 +341,10 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         sLog.outErrorDb("CreatureEventAI:  Creature %u are using repeatable event(%u) with param4 < param3 (RepeatMax < RepeatMin). Event will never repeat.", temp.creature_id, i);
                     break;
                 }
-
                 default:
                     sLog.outErrorDb("CreatureEventAI: Creature %u using not checked at load event (%u) in event %u. Need check code update?", temp.creature_id, temp.event_id, i);
                     break;
             }
-
             for (uint32 j = 0; j < MAX_ACTIONS; j++)
             {
                 uint16 action_type = fields[10+(j*4)].GetUInt16();
@@ -407,14 +354,11 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                     temp.action[j].type = ACTION_T_NONE;
                     continue;
                 }
-
                 CreatureEventAI_Action& action = temp.action[j];
-
                 action.type = EventAI_ActionType(action_type);
                 action.raw.param1 = fields[11+(j*4)].GetUInt32();
                 action.raw.param2 = fields[12+(j*4)].GetUInt32();
                 action.raw.param3 = fields[13+(j*4)].GetUInt32();
-
                 //Report any errors in actions
                 switch (action.type)
                 {
@@ -431,7 +375,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         {
                             if (m_CreatureEventAI_TextMap.find(action.text.TextId2) == m_CreatureEventAI_TextMap.end())
                                 sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param2 refrences non-existing entry in texts table.", i, j+1);
-
                             if (!action.text.TextId1)
                                 sLog.outErrorDb("CreatureEventAI:  Event %u Action %u has param2, but param1 is not set. Required for randomized text.", i, j+1);
                         }
@@ -439,7 +382,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         {
                             if (m_CreatureEventAI_TextMap.find(action.text.TextId3) == m_CreatureEventAI_TextMap.end())
                                 sLog.outErrorDb("CreatureEventAI:  Event %u Action %u param3 refrences non-existing entry in texts table.", i, j+1);
-
                             if (!action.text.TextId1 || !action.text.TextId2)
                                 sLog.outErrorDb("CreatureEventAI:  Event %u Action %u has param3, but param1 and/or param2 is not set. Required for randomized text.", i, j+1);
                         }
@@ -460,7 +402,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                                 sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses non-existant Creature entry %u.", i, j+1, action.morph.creatureId);
                                 action.morph.creatureId = 0;
                             }
-
                             if (action.morph.modelId)
                             {
                                 if (action.morph.creatureId)
@@ -516,11 +457,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                             }
                         }
                         */
-
                         //Cast is always triggered if target is forced to cast on self
                         if (action.cast.castFlags & CAST_FORCE_TARGET_SELF)
                             action.cast.castFlags |= CAST_TRIGGERED;
-
                         if (action.cast.target >= TARGET_T_END)
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
                         break;
@@ -528,7 +467,6 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                     case ACTION_T_SUMMON:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.summon.creatureId))
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses non-existent creature entry %u.", i, j+1, action.summon.creatureId);
-
                         if (action.summon.target >= TARGET_T_END)
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
                         break;
@@ -550,10 +488,8 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                         }
                         else
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses non-existent Quest entry %u.", i, j+1, action.quest_event.questId);
-
                         if (action.quest_event.target >= TARGET_T_END)
                             sLog.outErrorDb("CreatureEventAI:  Event %u Action %u uses incorrect Target type", i, j+1);
-
                         break;
                     case ACTION_T_CAST_EVENT:
                         if (!sCreatureStorage.LookupEntry<CreatureInfo>(action.cast_event.creatureId))
@@ -682,29 +618,24 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                     case ACTION_T_RANGED_MOVEMENT:          //Distance, Angle
                     case ACTION_T_CALL_FOR_HELP:            //Distance
                         break;
-
                     case ACTION_T_RANDOM_SAY:
                     case ACTION_T_RANDOM_YELL:
                     case ACTION_T_RANDOM_TEXTEMOTE:
                         sLog.outErrorDb("CreatureEventAI:  Event %u Action %u currently unused ACTION type. Did you forget to update database?", i, j+1);
                         break;
-
                     case ACTION_T_SET_ACTIVE:
                     case ACTION_T_SET_AGGRESSIVE:
                     case ACTION_T_ATTACK_START_PULSE:
                     case ACTION_T_SUMMON_GO:
                         break;
-
                     default:
                         sLog.outErrorDb("CreatureEventAI:  Event %u Action %u have currently not checked at load action type (%u). Need check code update?", i, j+1, temp.action[j].type);
                         break;
                 }
             }
-
             //Add to list
             m_CreatureEventAI_Event_Map[creature_id].push_back(temp);
             ++Count;
-
             if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(temp.creature_id))
             {
                 if(!cInfo->AIName || !cInfo->AIName[0])
@@ -722,11 +653,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 {
                     //sLog.outErrorDb("CreatureEventAI: Creature Entry %u has EventAI script but it also has C++ script. EventAI script will be overriden.", cInfo->Entry);
                 }
-            }            
+            }
         } while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString(">> Loaded %u CreatureEventAI scripts", Count);
     }
diff --git a/src/game/CreatureEventAIMgr.h b/src/game/CreatureEventAIMgr.h
index b4672460cc6..821cdb35c6a 100644
--- a/src/game/CreatureEventAIMgr.h
+++ b/src/game/CreatureEventAIMgr.h
@@ -15,32 +15,25 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_CREATURE_EAI_MGR_H
 #define MANGOS_CREATURE_EAI_MGR_H
-
 #include "Common.h"
 #include "CreatureEventAI.h"
-
 class CreatureEventAIMgr
 {
     public:
         CreatureEventAIMgr(){};
         ~CreatureEventAIMgr(){};
-
         void LoadCreatureEventAI_Texts();
         void LoadCreatureEventAI_Summons();
         void LoadCreatureEventAI_Scripts();
-
         CreatureEventAI_Event_Map  const& GetCreatureEventAIMap()       const { return m_CreatureEventAI_Event_Map; }
         CreatureEventAI_Summon_Map const& GetCreatureEventAISummonMap() const { return m_CreatureEventAI_Summon_Map; }
         CreatureEventAI_TextMap    const& GetCreatureEventAITextMap()   const { return m_CreatureEventAI_TextMap; }
-
     private:
         CreatureEventAI_Event_Map  m_CreatureEventAI_Event_Map;
         CreatureEventAI_Summon_Map m_CreatureEventAI_Summon_Map;
         CreatureEventAI_TextMap    m_CreatureEventAI_TextMap;
 };
-
 #define CreatureEAI_Mgr MaNGOS::Singleton<CreatureEventAIMgr>::Instance()
 #endif
diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 97610754e69..c0816f36804 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -17,28 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Creature.h"
 #include "CreatureGroups.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
 #include "CreatureAI.h"
-
 #define MAX_DESYNC 5.0f
-
 INSTANTIATE_SINGLETON_1(CreatureGroupManager);
-
 CreatureGroupInfoType   CreatureGroupMap;
-
 void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
 {
     Map *map = member->FindMap();
     if(!map)
         return;
-
     CreatureGroupHolderType::iterator itr = map->CreatureGroupHolder.find(groupId);
-
     //Add member to an existing group
     if(itr != map->CreatureGroupHolder.end())
     {
@@ -54,58 +47,47 @@ void CreatureGroupManager::AddCreatureToGroup(uint32 groupId, Creature *member)
         group->AddMember(member);
     }
 }
-
 void CreatureGroupManager::RemoveCreatureFromGroup(CreatureGroup *group, Creature *member)
 {
     sLog.outDebug("Deleting member pointer to GUID: %u from group %u", group->GetId(), member->GetDBTableGUIDLow());
     group->RemoveMember(member);
-
     if(group->isEmpty())
     {
         Map *map = member->FindMap();
         if(!map)
             return;
-
         sLog.outDebug("Deleting group with InstanceID %u", member->GetInstanceId());
         map->CreatureGroupHolder.erase(group->GetId());
         delete group;
     }
 }
-
 void CreatureGroupManager::LoadCreatureFormations()
 {
     //Clear existing map
     CreatureGroupMap.clear();
-
     //Check Integrity of the table
     QueryResult *result = WorldDatabase.PQuery("SELECT MAX(leaderGUID) FROM creature_formations");
-
     if(!result)
     {
         sLog.outErrorDb(" ...an error occured while loading the table creature_formations ( maybe it doesn't exist ?)\n");
         return;
     }
     delete result;
-
     //Get group data
     result = WorldDatabase.PQuery("SELECT leaderGUID, memberGUID, dist, angle, groupAI FROM creature_formations ORDER BY leaderGUID");
-
     if(!result)
     {
         sLog.outErrorDb("The table creature_formations is empty or corrupted");
         return;
     }
-
     uint32 total_records = result->GetRowCount();
     barGoLink bar( total_records);
     Field *fields;
-
     FormationInfo *group_member;
     //Loading data...
     do
     {
         fields = result->Fetch();
-
         bar.step();
         //Load group member data
         group_member                        = new FormationInfo;
@@ -123,7 +105,6 @@ void CreatureGroupManager::LoadCreatureFormations()
             group_member->follow_dist       = 0;
             group_member->follow_angle      = 0;
         }
-
         // check data correctness
         {
             QueryResult* result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", group_member->leaderGUID);
@@ -132,7 +113,6 @@ void CreatureGroupManager::LoadCreatureFormations()
                 sLog.outErrorDb("creature_formations table leader guid %u incorrect (not exist)", group_member->leaderGUID);
                 continue;
             }
-
             result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE guid = %u", memberGUID);
             if(!result)
             {
@@ -140,71 +120,56 @@ void CreatureGroupManager::LoadCreatureFormations()
                 continue;
             }
         }
-
         CreatureGroupMap[memberGUID] = group_member;
-    } 
+    }
     while(result->NextRow()) ;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u creatures in formations", total_records );
     sLog.outString();
     //Free some heap
     delete result;
 }
-
 void CreatureGroup::AddMember(Creature *member)
 {
     sLog.outDebug("CreatureGroup::AddMember: Adding unit GUID: %u.", member->GetGUIDLow());
-
     //Check if it is a leader
     if(member->GetDBTableGUIDLow() == m_groupID)
     {
         sLog.outDebug("Unit GUID: %u is formation leader. Adding group.", member->GetGUIDLow());
         m_leader = member;
     }
-
     m_members[member] = CreatureGroupMap.find(member->GetDBTableGUIDLow())->second;
     member->SetFormation(this);
 }
-
 void CreatureGroup::RemoveMember(Creature *member)
 {
     if(m_leader == member)
         m_leader = NULL;
-
     m_members.erase(member);
     member->SetFormation(NULL);
 }
-
 void CreatureGroup::MemberAttackStart(Creature *member, Unit *target)
 {
     uint8 groupAI = CreatureGroupMap[member->GetDBTableGUIDLow()]->groupAI;
     if(!groupAI)
         return;
-
     if(groupAI == 1 && member != m_leader)
         return;
-
     for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
         sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
         //sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
-
         //Skip one check
         if(itr->first == member)
             continue;
-
         if(!itr->first->isAlive())
             continue;
-
         if(itr->first->getVictim())
             continue;
-
         if(itr->first->canAttack(target))
             itr->first->AI()->AttackStart(target);
     }
 }
-
 void CreatureGroup::FormationReset(bool dismiss)
 {
     for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
@@ -220,37 +185,28 @@ void CreatureGroup::FormationReset(bool dismiss)
     }
     m_Formed = !dismiss;
 }
-
 void CreatureGroup::LeaderMoveTo(float x, float y, float z)
 {
     if(!m_leader)
         return;
-
     float pathangle    = atan2(m_leader->GetPositionY() - y, m_leader->GetPositionX() - x);
-
     for(CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
         Creature *member = itr->first;
         if(member == m_leader || !member->isAlive() || member->getVictim())
             continue;
-
         float angle = itr->second->follow_angle;
-        float dist = itr->second->follow_dist;    
-
+        float dist = itr->second->follow_dist;
         float dx = x + cos(angle + pathangle) * dist;
         float dy = y + sin(angle + pathangle) * dist;
         float dz = z;
-
         Trinity::NormalizeMapCoord(dx);
         Trinity::NormalizeMapCoord(dy);
-
         member->UpdateGroundPositionZ(dx, dy, dz);
-
         if(member->IsWithinDist(m_leader, dist + MAX_DESYNC))
             member->SetUnitMovementFlags(m_leader->GetUnitMovementFlags());
         else
             member->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-
         member->GetMotionMaster()->MovePoint(0, dx, dy, dz);
         member->SetHomePosition(dx, dy, dz, pathangle);
     }
diff --git a/src/game/CreatureGroups.h b/src/game/CreatureGroups.h
index cc3eacfe185..1cdbc5c3695 100644
--- a/src/game/CreatureGroups.h
+++ b/src/game/CreatureGroups.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
  *
  * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
@@ -17,22 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _FORMATIONS_H
 #define _FORMATIONS_H
-
 #include "Common.h"
-
 class CreatureGroup;
-
 struct FormationInfo
 {
     uint32 leaderGUID;
-    float follow_dist; 
-    float follow_angle; 
+    float follow_dist;
+    float follow_angle;
     uint8 groupAI;
 };
-
 class CreatureGroupManager
 {
     public:
@@ -40,39 +35,29 @@ class CreatureGroupManager
         void RemoveCreatureFromGroup(CreatureGroup *group, Creature *creature);
         void LoadCreatureFormations();
 };
-
 typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*>   CreatureGroupInfoType;
-
 extern CreatureGroupInfoType    CreatureGroupMap;
-
 class CreatureGroup
 {
     private:
         Creature *m_leader; //Important do not forget sometimes to work with pointers instead synonims :D:D
         typedef std::map<Creature*, FormationInfo*>  CreatureGroupMemberType;
         CreatureGroupMemberType m_members;
-
         uint32 m_groupID;
         bool m_Formed;
-
     public:
         //Group cannot be created empty
         explicit CreatureGroup(uint32 id) : m_groupID(id), m_leader(NULL), m_Formed(false) {}
         ~CreatureGroup() { sLog.outDebug("Destroying group"); }
-        
         Creature* getLeader() const { return m_leader; }
         uint32 GetId() const { return m_groupID; }
         bool isEmpty() const { return m_members.empty(); }
         bool isFormed() const { return m_Formed; }
-
         void AddMember(Creature *member);
         void RemoveMember(Creature *member);
         void FormationReset(bool dismiss);
-
         void LeaderMoveTo(float x, float y, float z);
         void MemberAttackStart(Creature* member, Unit *target);
 };
-
 #define formation_mgr Trinity::Singleton<CreatureGroupManager>::Instance()
-
 #endif
diff --git a/src/game/DBCEnums.h b/src/game/DBCEnums.h
index a0e030bf7cb..21d23dca840 100644
--- a/src/game/DBCEnums.h
+++ b/src/game/DBCEnums.h
@@ -15,36 +15,29 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 #ifndef DBCENUMS_H
 #define DBCENUMS_H
-
 // Client expected level limitation, like as used in DBC item max levels for "until max player level"
 // use as default max player level, must be fit max level for used client
 // also see MAX_LEVEL and STRONG_MAX_LEVEL define
 #define DEFAULT_MAX_LEVEL 80
-
 // client supported max level for player/pets/etc. Avoid overflow or client stability affected.
 // also see GT_MAX_LEVEL define
 #define MAX_LEVEL    100
-
 // Server side limitation. Base at used code requirements.
 // also see MAX_LEVEL and GT_MAX_LEVEL define
 #define STRONG_MAX_LEVEL 255
-
 enum AreaTeams
 {
     AREATEAM_NONE  = 0,
     AREATEAM_ALLY  = 2,
     AREATEAM_HORDE = 4
 };
-
 enum AchievementFactionFlags
 {
     ACHIEVEMENT_FACTION_FLAG_HORDE    = 0x00000000,
     ACHIEVEMENT_FACTION_FLAG_ALLIANCE = 0x00000001,
 };
-
 enum AchievementFlags
 {
     ACHIEVEMENT_FLAG_COUNTER           = 0x00000001,        // Just count statistic (never stop and complete)
@@ -58,7 +51,6 @@ enum AchievementFlags
     ACHIEVEMENT_FLAG_REALM_FIRST_REACH = 0x00000100,        //
     ACHIEVEMENT_FLAG_REALM_FIRST_KILL  = 0x00000200,        //
 };
-
 enum AchievementCriteriaCondition
 {
     ACHIEVEMENT_CRITERIA_CONDITION_NONE      = 0,
@@ -69,7 +61,6 @@ enum AchievementCriteriaCondition
     ACHIEVEMENT_CRITERIA_CONDITION_UNK2      = 9,           // unk
     ACHIEVEMENT_CRITERIA_CONDITION_UNK3      = 13,          // unk
 };
-
 enum AchievementCriteriaCompletionFlags
 {
     ACHIEVEMENT_CRITERIA_FLAG_SHOW_PROGRESS_BAR = 0x00000001,         // Show progress as bar
@@ -79,13 +70,11 @@ enum AchievementCriteriaCompletionFlags
     ACHIEVEMENT_CRITERIA_FLAG_UNK5              = 0x00000010,         // not used
     ACHIEVEMENT_CRITERIA_FLAG_MONEY_COUNTER     = 0x00000020,         // Displays counter as money
 };
-
 enum AchievementCriteriaGroupFlags
 {
     // you mustn't be in a group while fulfilling this achievement
     ACHIEVEMENT_CRITERIA_GROUP_NOT_IN_GROUP = 2,
 };
-
 enum AchievementCriteriaTypes
 {
     ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE = 0,
@@ -199,7 +188,6 @@ enum AchievementCriteriaTypes
     // 0..114 => 115 criteria types total
     ACHIEVEMENT_CRITERIA_TYPE_TOTAL = 115,
 };
-
 enum AreaFlags
 {
     AREA_FLAG_SNOW             = 0x00000001,                // snow (only Dun Morogh, Naxxramas, Razorfen Downs and Winterspring)
@@ -231,12 +219,10 @@ enum AreaFlags
     AREA_FLAG_UNK10            = 0x04000000,                // unknown
     AREA_FLAG_OUTDOOR_PVP2     = 0x08000000                 // Wintergrasp and it's subzones
 };
-
 enum FactionTemplateFlags
 {
     FACTION_TEMPLATE_FLAG_CONTESTED_GUARD   =   0x00001000, // faction will attack players that were involved in PvP combats
 };
-
 enum FactionMasks
 {
     FACTION_MASK_PLAYER   = 1,                              // any player
@@ -245,7 +231,6 @@ enum FactionMasks
     FACTION_MASK_MONSTER  = 8                               // aggressive creature from monster team
     // if none flags set then non-aggressive creature
 };
-
 enum MapTypes
 {
     MAP_COMMON          = 0,
@@ -254,13 +239,11 @@ enum MapTypes
     MAP_BATTLEGROUND    = 3,
     MAP_ARENA           = 4
 };
-
 enum AbilytyLearnType
 {
     ABILITY_LEARNED_ON_GET_PROFESSION_SKILL     = 1,
     ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL  = 2
 };
-
 enum ItemEnchantmentType
 {
     ITEM_ENCHANTMENT_TYPE_NONE             = 0,
@@ -273,7 +256,6 @@ enum ItemEnchantmentType
     ITEM_ENCHANTMENT_TYPE_USE_SPELL        = 7,
     ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET = 8
 };
-
 enum TotemCategoryType
 {
     TOTEM_CATEGORY_TYPE_KNIFE   = 1,
@@ -284,7 +266,6 @@ enum TotemCategoryType
     TOTEM_CATEGORY_TYPE_HAMMER  = 23,
     TOTEM_CATEGORY_TYPE_SPANNER = 24
 };
-
 // SummonProperties.dbc, col 1
 enum SummonPropGroup
 {
@@ -294,7 +275,6 @@ enum SummonPropGroup
     SUMMON_PROP_GROUP_CONTROLLABLE   = 3,                   // 13 spells in 3.0.3, mostly controllable
     SUMMON_PROP_GROUP_UNKNOWN3       = 4                    // 86 spells in 3.0.3, taxi/mounts
 };
-
 // SummonProperties.dbc, col 3
 enum SummonPropType
 {
@@ -311,7 +291,6 @@ enum SummonPropType
     SUMMON_PROP_TYPE_DRAKE_VEH       = 10,                  // summon drake (vehicle), 3 spells
     SUMMON_PROP_TYPE_LIGHTWELL       = 11                   // summon lightwell, 6 spells in 3.0.3
 };
-
 // SummonProperties.dbc, col 5
 enum SummonPropFlags
 {
@@ -331,6 +310,5 @@ enum SummonPropFlags
     SUMMON_PROP_FLAG_UNK13           = 0x1000,              // 8 spells in 3.0.3, siege vehicle
     SUMMON_PROP_FLAG_UNK14           = 0x2000,              // 2 spells in 3.0.3, escort?
 };
-
 #endif
 
diff --git a/src/game/DBCStores.cpp b/src/game/DBCStores.cpp
index 5dae4cb6e17..fa117a169c0 100644
--- a/src/game/DBCStores.cpp
+++ b/src/game/DBCStores.cpp
@@ -17,27 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "DBCStores.h"
 #include "Policies/SingletonImp.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
 #include "SpellMgr.h"
-
 #include "DBCfmt.h"
-
 #include <map>
-
 typedef std::map<uint16,uint32> AreaFlagByAreaID;
 typedef std::map<uint32,uint32> AreaFlagByMapID;
-
 DBCStorage <AreaTableEntry> sAreaStore(AreaTableEntryfmt);
 DBCStorage <AreaGroupEntry> sAreaGroupStore(AreaGroupEntryfmt);
 DBCStorage <AreaPOIEntry> sAreaPOIStore(AreaPOIEntryfmt);
 static AreaFlagByAreaID sAreaFlagByAreaID;
 static AreaFlagByMapID  sAreaFlagByMapID;                   // for instances without generated *.map files
-
 DBCStorage <AchievementEntry> sAchievementStore(Achievementfmt);
 DBCStorage <AchievementCriteriaEntry> sAchievementCriteriaStore(AchievementCriteriafmt);
 DBCStorage <AreaTriggerEntry> sAreaTriggerStore(AreaTriggerEntryfmt);
@@ -56,23 +50,18 @@ DBCStorage <CreatureFamilyEntry> sCreatureFamilyStore(CreatureFamilyfmt);
 DBCStorage <CreatureSpellDataEntry> sCreatureSpellDataStore(CreatureSpellDatafmt);
 DBCStorage <CreatureTypeEntry> sCreatureTypeStore(CreatureTypefmt);
 DBCStorage <CurrencyTypesEntry> sCurrencyTypesStore(CurrencyTypesfmt);
-
 DBCStorage <DurabilityQualityEntry> sDurabilityQualityStore(DurabilityQualityfmt);
 DBCStorage <DurabilityCostsEntry> sDurabilityCostsStore(DurabilityCostsfmt);
-
 DBCStorage <EmotesEntry> sEmotesStore(EmotesEntryfmt);
 DBCStorage <EmotesTextEntry> sEmotesTextStore(EmotesTextEntryfmt);
-
 typedef std::map<uint32,SimpleFactionsList> FactionTeamMap;
 static FactionTeamMap sFactionTeamMap;
 DBCStorage <FactionEntry> sFactionStore(FactionEntryfmt);
 DBCStorage <FactionTemplateEntry> sFactionTemplateStore(FactionTemplateEntryfmt);
-
 DBCStorage <GameObjectDisplayInfoEntry> sGameObjectDisplayInfoStore(GameObjectDisplayInfofmt);
 DBCStorage <GemPropertiesEntry> sGemPropertiesStore(GemPropertiesEntryfmt);
 DBCStorage <GlyphPropertiesEntry> sGlyphPropertiesStore(GlyphPropertiesfmt);
 DBCStorage <GlyphSlotEntry> sGlyphSlotStore(GlyphSlotfmt);
-
 DBCStorage <GtBarberShopCostBaseEntry>    sGtBarberShopCostBaseStore(GtBarberShopCostBasefmt);
 DBCStorage <GtCombatRatingsEntry>         sGtCombatRatingsStore(GtCombatRatingsfmt);
 DBCStorage <GtChanceToMeleeCritBaseEntry> sGtChanceToMeleeCritBaseStore(GtChanceToMeleeCritBasefmt);
@@ -83,9 +72,7 @@ DBCStorage <GtOCTRegenHPEntry>            sGtOCTRegenHPStore(GtOCTRegenHPfmt);
 //DBCStorage <GtOCTRegenMPEntry>            sGtOCTRegenMPStore(GtOCTRegenMPfmt);  -- not used currently
 DBCStorage <GtRegenHPPerSptEntry>         sGtRegenHPPerSptStore(GtRegenHPPerSptfmt);
 DBCStorage <GtRegenMPPerSptEntry>         sGtRegenMPPerSptStore(GtRegenMPPerSptfmt);
-
 DBCStorage <HolidaysEntry>                sHolidaysStore(Holidaysfmt);
-
 DBCStorage <ItemEntry>                    sItemStore(Itemfmt);
 DBCStorage <ItemBagFamilyEntry>           sItemBagFamilyStore(ItemBagFamilyfmt);
 //DBCStorage <ItemCondExtCostsEntry> sItemCondExtCostsStore(ItemCondExtCostsEntryfmt);
@@ -95,30 +82,22 @@ DBCStorage <ItemLimitCategoryEntry> sItemLimitCategoryStore(ItemLimitCategoryEnt
 DBCStorage <ItemRandomPropertiesEntry> sItemRandomPropertiesStore(ItemRandomPropertiesfmt);
 DBCStorage <ItemRandomSuffixEntry> sItemRandomSuffixStore(ItemRandomSuffixfmt);
 DBCStorage <ItemSetEntry> sItemSetStore(ItemSetEntryfmt);
-
 DBCStorage <LockEntry> sLockStore(LockEntryfmt);
-
 DBCStorage <MailTemplateEntry> sMailTemplateStore(MailTemplateEntryfmt);
 DBCStorage <MapEntry> sMapStore(MapEntryfmt);
 DBCStorage <MovieEntry> sMovieStore(MovieEntryfmt);
-
 DBCStorage <QuestSortEntry> sQuestSortStore(QuestSortEntryfmt);
-
 DBCStorage <RandomPropertiesPointsEntry> sRandomPropertiesPointsStore(RandomPropertiesPointsfmt);
 DBCStorage <ScalingStatDistributionEntry> sScalingStatDistributionStore(ScalingStatDistributionfmt);
 DBCStorage <ScalingStatValuesEntry> sScalingStatValuesStore(ScalingStatValuesfmt);
-
 DBCStorage <SkillLineEntry> sSkillLineStore(SkillLinefmt);
 DBCStorage <SkillLineAbilityEntry> sSkillLineAbilityStore(SkillLineAbilityfmt);
-
 DBCStorage <SoundEntriesEntry> sSoundEntriesStore(SoundEntriesfmt);
-
 DBCStorage <SpellItemEnchantmentEntry> sSpellItemEnchantmentStore(SpellItemEnchantmentfmt);
 DBCStorage <SpellItemEnchantmentConditionEntry> sSpellItemEnchantmentConditionStore(SpellItemEnchantmentConditionfmt);
 DBCStorage <SpellEntry> sSpellStore(SpellEntryfmt);
 SpellCategoryStore sSpellCategoryStore;
 PetFamilySpellsStore sPetFamilySpellsStore;
-
 DBCStorage <SpellCastTimesEntry> sSpellCastTimesStore(SpellCastTimefmt);
 DBCStorage <SpellDurationEntry> sSpellDurationStore(SpellDurationfmt);
 DBCStorage <SpellFocusObjectEntry> sSpellFocusObjectStore(SpellFocusObjectfmt);
@@ -131,21 +110,16 @@ DBCStorage <SummonPropertiesEntry> sSummonPropertiesStore(SummonPropertiesfmt);
 DBCStorage <TalentEntry> sTalentStore(TalentEntryfmt);
 TalentSpellPosMap sTalentSpellPosMap;
 DBCStorage <TalentTabEntry> sTalentTabStore(TalentTabEntryfmt);
-
 // store absolute bit position for first rank for talent inspect
 static uint32 sTalentTabPages[12/*MAX_CLASSES*/][3];
-
 DBCStorage <TaxiNodesEntry> sTaxiNodesStore(TaxiNodesEntryfmt);
 TaxiMask sTaxiNodesMask;
 TaxiMask sOldContinentsNodesMask;
-
 // DBC used only for initialization sTaxiPathSetBySource at startup.
 TaxiPathSetBySource sTaxiPathSetBySource;
 DBCStorage <TaxiPathEntry> sTaxiPathStore(TaxiPathEntryfmt);
-
 // DBC used only for initialization sTaxiPathSetBySource at startup.
 TaxiPathNodesByPath sTaxiPathNodesByPath;
-
 static DBCStorage <TaxiPathNodeEntry> sTaxiPathNodeStore(TaxiPathNodeEntryfmt);
 DBCStorage <TotemCategoryEntry> sTotemCategoryStore(TotemCategoryEntryfmt);
 DBCStorage <VehicleEntry> sVehicleStore(VehicleEntryfmt);
@@ -153,28 +127,22 @@ DBCStorage <VehicleSeatEntry> sVehicleSeatStore(VehicleSeatEntryfmt);
 DBCStorage <WorldMapAreaEntry>  sWorldMapAreaStore(WorldMapAreaEntryfmt);
 DBCStorage <WorldMapOverlayEntry> sWorldMapOverlayStore(WorldMapOverlayEntryfmt);
 DBCStorage <WorldSafeLocsEntry> sWorldSafeLocsStore(WorldSafeLocsEntryfmt);
-
 typedef std::list<std::string> StoreProblemList;
-
 static bool LoadDBC_assert_print(uint32 fsize,uint32 rsize, const std::string& filename)
 {
     sLog.outError("ERROR: Size of '%s' setted by format string (%u) not equal size of C++ structure (%u).",filename.c_str(),fsize,rsize);
-
     // assert must fail after function call
     return false;
 }
-
 template<class T>
 inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList& errlist, DBCStorage<T>& storage, const std::string& dbc_path, const std::string& filename, const std::string * custom_entries = NULL, const std::string * idname = NULL)
 {
     // compatibility format and C++ structure sizes
     assert(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()) == sizeof(T) || LoadDBC_assert_print(DBCFileLoader::GetFormatRecordSize(storage.GetFormat()),sizeof(T),filename));
-
     std::string dbc_filename = dbc_path + filename;
     SqlDbc * sql = NULL;
     if (custom_entries)
         sql = new SqlDbc(&filename,custom_entries, idname,storage.GetFormat());
-
     if(storage.Load(dbc_filename.c_str(), sql))
     {
         bar.step();
@@ -182,7 +150,6 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList
         {
             if(!(availableDbcLocales & (1 << i)))
                 continue;
-
             std::string dbc_filename_loc = dbc_path + localeNames[i] + "/" + filename;
             if(!storage.LoadStringsFrom(dbc_filename_loc.c_str()))
                 availableDbcLocales &= ~(1<<i);             // mark as not available for speedup next checks
@@ -205,20 +172,14 @@ inline void LoadDBC(uint32& availableDbcLocales,barGoLink& bar, StoreProblemList
     if (sql)
        delete sql;
 }
-
 void LoadDBCStores(const std::string& dataPath)
 {
     std::string dbcPath = dataPath+"dbc/";
-
     const uint32 DBCFilesCount = 79;
-
     barGoLink bar( DBCFilesCount );
-
     StoreProblemList bad_dbc_files;
     uint32 availableDbcLocales = 0xFFFFFFFF;
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaStore,                dbcPath,"AreaTable.dbc");
-
     // must be after sAreaStore loading
     for(uint32 i = 0; i < sAreaStore.GetNumRows(); ++i)           // areaflag numbered from 0
     {
@@ -226,13 +187,11 @@ void LoadDBCStores(const std::string& dataPath)
         {
             // fill AreaId->DBC records
             sAreaFlagByAreaID.insert(AreaFlagByAreaID::value_type(uint16(area->ID),area->exploreFlag));
-
             // fill MapId->DBC records ( skip sub zones and continents )
             if(area->zone==0 && area->mapid != 0 && area->mapid != 1 && area->mapid != 530 && area->mapid != 571 )
                 sAreaFlagByMapID.insert(AreaFlagByMapID::value_type(area->mapid,area->exploreFlag));
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAchievementStore,         dbcPath,"Achievement.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAchievementCriteriaStore, dbcPath,"Achievement_Criteria.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sAreaTriggerStore,         dbcPath,"AreaTrigger.dbc");
@@ -243,7 +202,6 @@ void LoadDBCStores(const std::string& dataPath)
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBattlemasterListStore,    dbcPath,"BattlemasterList.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sBarberShopStyleStore,     dbcPath,"BarberShopStyle.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharStartOutfitStore,     dbcPath,"CharStartOutfit.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sCharTitlesStore,          dbcPath,"CharTitles.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChatChannelsStore,        dbcPath,"ChatChannels.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sChrClassesStore,          dbcPath,"ChrClasses.dbc");
@@ -268,7 +226,6 @@ void LoadDBCStores(const std::string& dataPath)
             flist.push_back(i);
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sFactionTemplateStore,     dbcPath,"FactionTemplate.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGameObjectDisplayInfoStore, dbcPath,"GameObjectDisplayInfo.dbc");
     for(uint32 i = 0; i < sGameObjectDisplayInfoStore.GetNumRows(); ++i)
@@ -283,20 +240,15 @@ void LoadDBCStores(const std::string& dataPath)
                 std::swap(*(float*)(&info->maxZ), *(float*)(&info->minZ));
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGemPropertiesStore,       dbcPath,"GemProperties.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGlyphPropertiesStore,     dbcPath,"GlyphProperties.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGlyphSlotStore,           dbcPath,"GlyphSlot.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtBarberShopCostBaseStore,dbcPath,"gtBarberShopCostBase.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtCombatRatingsStore,     dbcPath,"gtCombatRatings.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToMeleeCritBaseStore, dbcPath,"gtChanceToMeleeCritBase.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToMeleeCritStore, dbcPath,"gtChanceToMeleeCrit.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToSpellCritBaseStore, dbcPath,"gtChanceToSpellCritBase.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtChanceToSpellCritStore, dbcPath,"gtChanceToSpellCrit.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTRegenHPStore,        dbcPath,"gtOCTRegenHP.dbc");
     //LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtOCTRegenMPStore,        dbcPath,"gtOCTRegenMP.dbc");       -- not used currently
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sGtRegenHPPerSptStore,     dbcPath,"gtRegenHPPerSpt.dbc");
@@ -329,16 +281,12 @@ void LoadDBCStores(const std::string& dataPath)
         if(spell && spell->Category)
             sSpellCategoryStore[spell->Category].insert(i);
     }
-
     for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
     {
         SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(j);
-
         if(!skillLine)
             continue;
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId);
-
         if(spellInfo && IsPassiveSpell(spellInfo->Id))
         {
             for (uint32 i = 1; i < sCreatureFamilyStore.GetNumRows(); ++i)
@@ -346,20 +294,16 @@ void LoadDBCStores(const std::string& dataPath)
                 CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(i);
                 if(!cFamily)
                     continue;
-
                 if(skillLine->skillId != cFamily->skillLine[0] && skillLine->skillId != cFamily->skillLine[1])
                     continue;
                 if(spellInfo->spellLevel)
                     continue;
-
                 if(skillLine->learnOnGetSkill != ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL)
                     continue;
-
                 sPetFamilySpellsStore[i].insert(spellInfo->Id);
             }
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellCastTimesStore,      dbcPath,"SpellCastTimes.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellDurationStore,       dbcPath,"SpellDuration.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellFocusObjectStore,    dbcPath,"SpellFocusObject.dbc");
@@ -372,7 +316,6 @@ void LoadDBCStores(const std::string& dataPath)
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sStableSlotPricesStore,    dbcPath,"StableSlotPrices.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSummonPropertiesStore,    dbcPath,"SummonProperties.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentStore,              dbcPath,"Talent.dbc");
-
     // create talent spells set
     for (unsigned int i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
@@ -382,9 +325,7 @@ void LoadDBCStores(const std::string& dataPath)
             if(talentInfo->RankID[j])
                 sTalentSpellPosMap[talentInfo->RankID[j]] = TalentSpellPos(i,j);
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentTabStore,           dbcPath,"TalentTab.dbc");
-
     // prepare fast data access to bit pos of talent ranks for use at inspecting
     {
         // now have all max ranks (and then bit amount used for store talent ranks in inspect)
@@ -393,27 +334,21 @@ void LoadDBCStores(const std::string& dataPath)
             TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId );
             if(!talentTabInfo)
                 continue;
-
             // prevent memory corruption; otherwise cls will become 12 below
             if ((talentTabInfo->ClassMask & CLASSMASK_ALL_PLAYABLE)==0)
                 continue;
-
             // store class talent tab pages
             uint32 cls = 1;
             for(uint32 m=1;!(m & talentTabInfo->ClassMask) && cls < MAX_CLASSES;m <<=1, ++cls) {}
-
             sTalentTabPages[cls][talentTabInfo->tabpage]=talentTabId;
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiNodesStore,           dbcPath,"TaxiNodes.dbc");
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiPathStore,            dbcPath,"TaxiPath.dbc");
     for(uint32 i = 1; i < sTaxiPathStore.GetNumRows(); ++i)
         if(TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(i))
             sTaxiPathSetBySource[entry->from][entry->to] = TaxiPathBySourceAndDestination(entry->ID,entry->price);
     uint32 pathCount = sTaxiPathStore.GetNumRows();
-
     //## TaxiPathNode.dbc ## Loaded only for initialization different structures
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTaxiPathNodeStore,        dbcPath,"TaxiPathNode.dbc");
     // Calculate path nodes count
@@ -434,7 +369,6 @@ void LoadDBCStores(const std::string& dataPath)
         if(TaxiPathNodeEntry const* entry = sTaxiPathNodeStore.LookupEntry(i))
             sTaxiPathNodesByPath[entry->path][entry->index] = TaxiPathNode(entry->mapid,entry->x,entry->y,entry->z,entry->actionFlag,entry->delay);
     sTaxiPathNodeStore.Clear();
-
     // Initialize global taxinodes mask
     // include existed nodes that have at least single not spell base (scripted) path
     {
@@ -444,7 +378,6 @@ void LoadDBCStores(const std::string& dataPath)
                 for(int j=0; j < 3; ++j)
                     if(sInfo->Effect[j]==123 /*SPELL_EFFECT_SEND_TAXI*/)
                         spellPaths.insert(sInfo->EffectMiscValue[j]);
-
         memset(sTaxiNodesMask,0,sizeof(sTaxiNodesMask));
         memset(sOldContinentsNodesMask,0,sizeof(sTaxiNodesMask));
         for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
@@ -452,7 +385,6 @@ void LoadDBCStores(const std::string& dataPath)
             TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i);
             if(!node)
                 continue;
-
             TaxiPathSetBySource::const_iterator src_i = sTaxiPathSetBySource.find(i);
             if(src_i!=sTaxiPathSetBySource.end() && !src_i->second.empty())
             {
@@ -466,29 +398,24 @@ void LoadDBCStores(const std::string& dataPath)
                         break;
                     }
                 }
-
                 if(!ok)
                     continue;
             }
-
             // valid taxi network node
             uint8  field   = (uint8)((i - 1) / 32);
             uint32 submask = 1<<((i-1)%32);
             sTaxiNodesMask[field] |= submask;
-
             // old continent node (+ nodes virtually at old continents, check explicitly to avoid loading map files for zone info)
             if (node->map_id < 2 || i == 82 || i == 83 || i == 93 || i == 94)
                 sOldContinentsNodesMask[field] |= submask;
         }
     }
-
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTotemCategoryStore,       dbcPath,"TotemCategory.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleStore,             dbcPath,"Vehicle.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleSeatStore,         dbcPath,"VehicleSeat.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapAreaStore,        dbcPath,"WorldMapArea.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapOverlayStore,     dbcPath,"WorldMapOverlay.dbc");
     LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldSafeLocsStore,       dbcPath,"WorldSafeLocs.dbc");
-
     // error checks
     if(bad_dbc_files.size() >= DBCFilesCount )
     {
@@ -500,11 +427,9 @@ void LoadDBCStores(const std::string& dataPath)
         std::string str;
         for(std::list<std::string>::iterator i = bad_dbc_files.begin(); i != bad_dbc_files.end(); ++i)
             str += *i + "\n";
-
         sLog.outError("\nSome required *.dbc files (%u from %d) not found or not compatible:\n%s",(uint32)bad_dbc_files.size(),DBCFilesCount,str.c_str());
         exit(1);
     }
-
     // Check loaded DBC files proper version
     if( !sSpellStore.LookupEntry(66530)            ||       // last added spell in 3.1.3
         !sMapStore.LookupEntry(624)                ||       // last map added in 3.1.3
@@ -517,11 +442,9 @@ void LoadDBCStores(const std::string& dataPath)
         sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client.");
         exit(1);
     }
-
     sLog.outString();
     sLog.outString( ">> Initialized %d data stores", DBCFilesCount );
 }
-
 SimpleFactionsList const* GetFactionTeamList(uint32 faction, bool &isTeamMember)
 {
     for(FactionTeamMap::const_iterator itr = sFactionTeamMap.begin(); itr != sFactionTeamMap.end(); ++itr)
@@ -542,7 +465,6 @@ SimpleFactionsList const* GetFactionTeamList(uint32 faction, bool &isTeamMember)
     }
     return NULL;
 }
-
 char* GetPetName(uint32 petfamily, uint32 dbclang)
 {
     if(!petfamily)
@@ -552,53 +474,41 @@ char* GetPetName(uint32 petfamily, uint32 dbclang)
         return NULL;
     return pet_family->Name[dbclang]?pet_family->Name[dbclang]:NULL;
 }
-
 TalentSpellPos const* GetTalentSpellPos(uint32 spellId)
 {
     TalentSpellPosMap::const_iterator itr = sTalentSpellPosMap.find(spellId);
     if(itr==sTalentSpellPosMap.end())
         return NULL;
-
     return &itr->second;
 }
-
 uint32 GetTalentSpellCost(uint32 spellId)
 {
     if(TalentSpellPos const* pos = GetTalentSpellPos(spellId))
         return pos->rank+1;
-
     return 0;
 }
-
 int32 GetAreaFlagByAreaID(uint32 area_id)
 {
     AreaFlagByAreaID::iterator i = sAreaFlagByAreaID.find(area_id);
     if(i == sAreaFlagByAreaID.end())
         return -1;
-
     return i->second;
 }
-
 AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id)
 {
     int32 areaflag = GetAreaFlagByAreaID(area_id);
     if(areaflag < 0)
         return NULL;
-
     return sAreaStore.LookupEntry(areaflag );
 }
-
 AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id)
 {
     if(area_flag)
         return sAreaStore.LookupEntry(area_flag);
-
     if(MapEntry const* mapEntry = sMapStore.LookupEntry(map_id))
         return GetAreaEntryByAreaID(mapEntry->linked_zone);
-
     return NULL;
 }
-
 uint32 GetAreaFlagByMapId(uint32 mapid)
 {
     AreaFlagByMapID::iterator i = sAreaFlagByMapID.find(mapid);
@@ -607,28 +517,22 @@ uint32 GetAreaFlagByMapId(uint32 mapid)
     else
         return i->second;
 }
-
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId)
 {
     if(mapid != 530 && mapid != 571)                        // speed for most cases
         return mapid;
-
     if(WorldMapAreaEntry const* wma = sWorldMapAreaStore.LookupEntry(zoneId))
         return wma->virtual_map_id >= 0 ? wma->virtual_map_id : wma->map_id;
-
     return mapid;
 }
-
 ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId)
 {
     mapid = GetVirtualMapForMapAndZone(mapid,zoneId);
     if(mapid < 2)
         return CONTENT_1_60;
-
     MapEntry const* mapEntry = sMapStore.LookupEntry(mapid);
     if(!mapEntry)
         return CONTENT_1_60;
-
     switch(mapEntry->Expansion())
     {
         default: return CONTENT_1_60;
@@ -636,7 +540,6 @@ ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId)
         case 2:  return CONTENT_71_80;
     }
 }
-
 ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id)
 {
     // not sorted, numbering index from 0
@@ -648,58 +551,46 @@ ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id)
     }
     return NULL;
 }
-
 bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId)
 {
     if(requiredTotemCategoryId==0)
         return true;
     if(itemTotemCategoryId==0)
         return false;
-
     TotemCategoryEntry const* itemEntry = sTotemCategoryStore.LookupEntry(itemTotemCategoryId);
     if(!itemEntry)
         return false;
     TotemCategoryEntry const* reqEntry = sTotemCategoryStore.LookupEntry(requiredTotemCategoryId);
     if(!reqEntry)
         return false;
-
     if(itemEntry->categoryType!=reqEntry->categoryType)
         return false;
-
     return (itemEntry->categoryMask & reqEntry->categoryMask)==reqEntry->categoryMask;
 }
-
 void Zone2MapCoordinates(float& x,float& y,uint32 zone)
 {
     WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone);
-
     // if not listed then map coordinates (instance)
     if(!maEntry)
         return;
-
     std::swap(x,y);                                         // at client map coords swapped
     x = x*((maEntry->x2-maEntry->x1)/100)+maEntry->x1;
     y = y*((maEntry->y2-maEntry->y1)/100)+maEntry->y1;      // client y coord from top to down
 }
-
 void Map2ZoneCoordinates(float& x,float& y,uint32 zone)
 {
     WorldMapAreaEntry const* maEntry = sWorldMapAreaStore.LookupEntry(zone);
-
     // if not listed then map coordinates (instance)
     if(!maEntry)
         return;
-
     x = (x-maEntry->x1)/((maEntry->x2-maEntry->x1)/100);
     y = (y-maEntry->y1)/((maEntry->y2-maEntry->y1)/100);    // client y coord from top to down
     std::swap(x,y);                                         // client have map coords swapped
 }
-
 uint32 const* GetTalentTabPages(uint32 cls)
 {
     return sTalentTabPages[cls];
 }
-
 // script support functions
 TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore()   { return &sSoundEntriesStore;   }
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore()          { return &sSpellStore;          }
diff --git a/src/game/DBCStores.h b/src/game/DBCStores.h
index 4fd5b6bcb59..90ac6dd97c8 100644
--- a/src/game/DBCStores.h
+++ b/src/game/DBCStores.h
@@ -15,30 +15,22 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_DBCSTORES_H
 #define MANGOS_DBCSTORES_H
-
 #include "Common.h"
 #include "Database/DBCStore.h"
 #include "DBCStructure.h"
-
 #include <list>
-
 typedef std::list<uint32> SimpleFactionsList;
-
 SimpleFactionsList const* GetFactionTeamList(uint32 faction, bool &isTeamMember);
 char* GetPetName(uint32 petfamily, uint32 dbclang);
 uint32 GetTalentSpellCost(uint32 spellId);
 TalentSpellPos const* GetTalentSpellPos(uint32 spellId);
-
 int32 GetAreaFlagByAreaID(uint32 area_id);                  // -1 if not found
 AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
 AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag,uint32 map_id);
 uint32 GetAreaFlagByMapId(uint32 mapid);
-
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId);
-
 enum ContentLevels
 {
     CONTENT_1_60 = 0,
@@ -46,16 +38,11 @@ enum ContentLevels
     CONTENT_71_80
 };
 ContentLevels GetContentLevelsForMapAndZone(uint32 mapid, uint32 zoneId);
-
 ChatChannelsEntry const* GetChannelEntryFor(uint32 channel_id);
-
 bool IsTotemCategoryCompatiableWith(uint32 itemTotemCategoryId, uint32 requiredTotemCategoryId);
-
 void Zone2MapCoordinates(float& x,float& y,uint32 zone);
 void Map2ZoneCoordinates(float& x,float& y,uint32 zone);
-
 uint32 const* /*[3]*/ GetTalentTabPages(uint32 cls);
-
 extern DBCStorage <AchievementEntry>             sAchievementStore;
 extern DBCStorage <AchievementCriteriaEntry>     sAchievementCriteriaStore;
 extern DBCStorage <AreaTableEntry>               sAreaStore;// recommend access using functions
@@ -87,7 +74,6 @@ extern DBCStorage <GameObjectDisplayInfoEntry>   sGameObjectDisplayInfoStore;
 extern DBCStorage <GemPropertiesEntry>           sGemPropertiesStore;
 extern DBCStorage <GlyphPropertiesEntry>         sGlyphPropertiesStore;
 extern DBCStorage <GlyphSlotEntry>               sGlyphSlotStore;
-
 extern DBCStorage <GtBarberShopCostBaseEntry>    sGtBarberShopCostBaseStore;
 extern DBCStorage <GtCombatRatingsEntry>         sGtCombatRatingsStore;
 extern DBCStorage <GtChanceToMeleeCritBaseEntry> sGtChanceToMeleeCritBaseStore;
@@ -146,9 +132,7 @@ extern DBCStorage <VehicleSeatEntry>             sVehicleSeatStore;
 //extern DBCStorage <WorldMapAreaEntry>           sWorldMapAreaStore; -- use Zone2MapCoordinates and Map2ZoneCoordinates
 extern DBCStorage <WorldMapOverlayEntry>         sWorldMapOverlayStore;
 extern DBCStorage <WorldSafeLocsEntry>           sWorldSafeLocsStore;
-
 void LoadDBCStores(const std::string& dataPath);
-
 // script support functions
 TRINITY_DLL_SPEC DBCStorage <SoundEntriesEntry>          const* GetSoundEntriesStore();
 TRINITY_DLL_SPEC DBCStorage <SpellEntry>                 const* GetSpellStore();
diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h
index 7e459c61e8b..98f4dfd3744 100644
--- a/src/game/DBCStructure.h
+++ b/src/game/DBCStructure.h
@@ -17,27 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_DBCSTRUCTURE_H
 #define MANGOS_DBCSTRUCTURE_H
-
 #include "DBCEnums.h"
 #include "Platform/Define.h"
 #include "Util.h"
-
 #include <map>
 #include <set>
 #include <vector>
-
 // Structures using to access raw DBC data and required packing to portability
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 struct AchievementEntry
 {
     uint32    ID;                                           // 0
@@ -58,7 +52,6 @@ struct AchievementEntry
     uint32 count;                                           // 60 - need this count of completed criterias (own or referenced achievement criterias)
     uint32 refAchievement;                                  // 61 - referenced achievement (counting of all completed criterias)
 };
-
 struct AchievementCategoryEntry
 {
     uint32    ID;                                           // 0
@@ -67,7 +60,6 @@ struct AchievementCategoryEntry
     //uint32 name_flags;                                    // 18
     //uint32    sortOrder;                                  // 19
 };
-
 struct AchievementCriteriaEntry
 {
     uint32  ID;                                             // 0
@@ -82,7 +74,6 @@ struct AchievementCriteriaEntry
             uint32  creatureID;                             // 3
             uint32  creatureCount;                          // 4
         } kill_creature;
-
         // ACHIEVEMENT_CRITERIA_TYPE_WIN_BG                 = 1
         struct
         {
@@ -93,105 +84,89 @@ struct AchievementCriteriaEntry
             uint32  additionalRequirement2_type;            // 7 additional requirement 2 type
             uint32  additionalRequirement2_value;           // 8 additional requirement 1 value
         } win_bg;
-
         // ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL            = 5
         struct
         {
             uint32  unused;                                 // 3
             uint32  level;                                  // 4
         } reach_level;
-
         // ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL      = 7
         struct
         {
             uint32  skillID;                                // 3
             uint32  skillLevel;                             // 4
         } reach_skill_level;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_ACHIEVEMENT   = 8
         struct
         {
             uint32  linkedAchievement;                      // 3
         } complete_achievement;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT   = 9
         struct
         {
             uint32  unused;                                 // 3
             uint32  totalQuestCount;                        // 4
         } complete_quest_count;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST_DAILY = 10
         struct
         {
             uint32  unused;                                 // 3
             uint32  numberOfDays;                           // 4
         } complete_daily_quest_daily;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE = 11
         struct
         {
             uint32  zoneID;                                 // 3
             uint32  questCount;                             // 4
         } complete_quests_in_zone;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST   = 14
         struct
         {
             uint32  unused;                                 // 3
             uint32  questCount;                             // 4
         } complete_daily_quest;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_BATTLEGROUND  = 15
         struct
         {
             uint32  mapID;                                  // 3
         } complete_battleground;
-
         // ACHIEVEMENT_CRITERIA_TYPE_DEATH_AT_MAP           = 16
         struct
         {
             uint32  mapID;                                  // 3
         } death_at_map;
-
         // ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON       = 18
         struct
         {
             uint32  manLimit;                               // 3
         } death_in_dungeon;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_RAID          = 19
         struct
         {
             uint32  groupSize;                              // 3 can be 5, 10 or 25
         } complete_raid;
-
         // ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_CREATURE     = 20
         struct
         {
             uint32  creatureEntry;                          // 3
         } killed_by_creature;
-
         // ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING     = 24
         struct
         {
             uint32  unused;                                 // 3
             uint32  fallHeight;                             // 4
         } fall_without_dying;
-
         // ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM            = 26
         struct
         {
             uint32 type;                                    // 3, see enum EnviromentalDamage
         } death_from;
-
         // ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST         = 27
         struct
         {
             uint32  questID;                                // 3
             uint32  questCount;                             // 4
         } complete_quest;
-
         // ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET        = 28
         // ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2       = 69
         struct
@@ -199,7 +174,6 @@ struct AchievementCriteriaEntry
             uint32  spellID;                                // 3
             uint32  spellCount;                             // 4
         } be_spell_target;
-
         // ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL             = 29
         // ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2            = 110
         struct
@@ -207,39 +181,33 @@ struct AchievementCriteriaEntry
             uint32  spellID;                                // 3
             uint32  castCount;                              // 4
         } cast_spell;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HONORABLE_KILL_AT_AREA = 31
         struct
         {
             uint32  areaID;                                 // 3 Reference to AreaTable.dbc
             uint32  killCount;                              // 4
         } honorable_kill_at_area;
-
         // ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA              = 32
         struct
         {
             uint32  mapID;                                  // 3 Reference to Map.dbc
         } win_arena;
-
         // ACHIEVEMENT_CRITERIA_TYPE_PLAY_ARENA             = 33
         struct
         {
             uint32  mapID;                                  // 3 Reference to Map.dbc
         } play_arena;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL            = 34
         struct
         {
             uint32  spellID;                                // 3 Reference to Map.dbc
         } learn_spell;
-
         // ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM               = 36
         struct
         {
             uint32  itemID;                                 // 3
             uint32  itemCount;                              // 4
         } own_item;
-
         // ACHIEVEMENT_CRITERIA_TYPE_WIN_RATED_ARENA        = 37
         struct
         {
@@ -247,90 +215,77 @@ struct AchievementCriteriaEntry
             uint32  count;                                  // 4
             uint32  flag;                                   // 5 4=in a row
         } win_rated_arena;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_TEAM_RATING    = 38
         struct
         {
             uint32  teamtype;                               // 3 {2,3,5}
         } highest_team_rating;
-
         // ACHIEVEMENT_CRITERIA_TYPE_REACH_TEAM_RATING      = 39
         struct
         {
             uint32  teamtype;                               // 3 {2,3,5}
             uint32  teamrating;                             // 4
         } reach_team_rating;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL      = 40
         struct
         {
             uint32  skillID;                                // 3
             uint32  skillLevel;                             // 4 apprentice=1, journeyman=2, expert=3, artisan=4, master=5, grand master=6
         } learn_skill_level;
-
         // ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM               = 41
         struct
         {
             uint32  itemID;                                 // 3
             uint32  itemCount;                              // 4
         } use_item;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM              = 42
         struct
         {
             uint32  itemID;                                 // 3
             uint32  itemCount;                              // 4
         } loot_item;
-
         // ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA           = 43
         struct
         {
             // TODO: This rank is _NOT_ the index from AreaTable.dbc
             uint32  areaReference;                          // 3
         } explore_area;
-
         // ACHIEVEMENT_CRITERIA_TYPE_OWN_RANK               = 44
         struct
         {
             // TODO: This rank is _NOT_ the index from CharTitles.dbc
             uint32  rank;                                   // 3
         } own_rank;
-
         // ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT          = 45
         struct
         {
             uint32  unused;                                 // 3
             uint32  numberOfSlots;                          // 4
         } buy_bank_slot;
-
         // ACHIEVEMENT_CRITERIA_TYPE_GAIN_REPUTATION        = 46
         struct
         {
             uint32  factionID;                              // 3
             uint32  reputationAmount;                       // 4 Total reputation amount, so 42000 = exalted
         } gain_reputation;
-
         // ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION= 47
         struct
         {
             uint32  unused;                                 // 3
             uint32  numberOfExaltedFactions;                // 4
         } gain_exalted_reputation;
-
         // ACHIEVEMENT_CRITERIA_TYPE_VISIT_BARBER_SHOP      = 48
         struct
         {
             uint32 unused;                                  // 3
             uint32 numberOfVisits;                          // 4
         } visit_barber;
-
         // ACHIEVEMENT_CRITERIA_TYPE_EQUIP_EPIC_ITEM        = 49
         // TODO: where is the required itemlevel stored?
         struct
         {
             uint32  itemSlot;                               // 3
         } equip_epic_item;
-
         // ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT      = 50
         struct
         {
@@ -343,21 +298,18 @@ struct AchievementCriteriaEntry
             uint32  rollValue;                              // 3
             uint32  count;                                  // 4
         } roll_greed_on_loot;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HK_CLASS               = 52
         struct
         {
             uint32  classID;                                // 3
             uint32  count;                                  // 4
         } hk_class;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HK_RACE                = 53
         struct
         {
             uint32  raceID;                                 // 3
             uint32  count;                                  // 4
         } hk_race;
-
         // ACHIEVEMENT_CRITERIA_TYPE_DO_EMOTE               = 54
         // TODO: where is the information about the target stored?
         struct
@@ -375,14 +327,12 @@ struct AchievementCriteriaEntry
             uint32  flag;                                   // 5 =3 for battleground healing
             uint32  mapid;                                  // 6
         } healing_done;
-
         // ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM             = 57
         struct
         {
             uint32  itemID;                                 // 3
             uint32  count;                                  // 4
         } equip_item;
-
         // ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD= 62
         struct
         {
@@ -390,21 +340,18 @@ struct AchievementCriteriaEntry
             uint32  goldInCopper;                           // 4
         } quest_reward_money;
 
-
         // ACHIEVEMENT_CRITERIA_TYPE_LOOT_MONEY             = 67
         struct
         {
             uint32  unused;                                 // 3
             uint32  goldInCopper;                           // 4
         } loot_money;
-
         // ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT         = 68
         struct
         {
             uint32  goEntry;                                // 3
             uint32  useCount;                               // 4
         } use_gameobject;
-
         // ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL       = 70
         // TODO: are those special criteria stored in the dbc or do we have to add another sql table?
         struct
@@ -412,73 +359,62 @@ struct AchievementCriteriaEntry
             uint32  unused;                                 // 3
             uint32  killCount;                              // 4
         } special_pvp_kill;
-
         // ACHIEVEMENT_CRITERIA_TYPE_FISH_IN_GAMEOBJECT     = 72
         struct
         {
             uint32  goEntry;                                // 3
             uint32  lootCount;                              // 4
         } fish_in_gameobject;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS = 75
         struct
         {
             uint32  skillLine;                              // 3
             uint32  spellCount;                             // 4
         } learn_skillline_spell;
-
         // ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL               = 76
         struct
         {
             uint32  unused;                                 // 3
             uint32  duelCount;                              // 4
         } win_duel;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_POWER          = 96
         struct
         {
             uint32  powerType;                              // 3 mana=0, 1=rage, 3=energy, 6=runic power
         } highest_power;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_STAT           = 97
         struct
         {
             uint32  statType;                               // 3 4=spirit, 3=int, 2=stamina, 1=agi, 0=strength
         } highest_stat;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_SPELLPOWER     = 98
         struct
         {
             uint32  spellSchool;                            // 3
         } highest_spellpower;
-
         // ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_RATING         = 100
         struct
         {
             uint32  ratingType;                             // 3
         } highest_rating;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE              = 109
         struct
         {
             uint32  lootType;                               // 3 3=fishing, 2=pickpocket, 4=disentchant
             uint32  lootTypeCount;                          // 4
         } loot_type;
-
         // ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE       = 112
         struct
         {
             uint32  skillLine;                              // 3
             uint32  spellCount;                             // 4
         } learn_skill_line;
-
         // ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL    = 113
         struct
         {
             uint32  unused;                                 // 3
             uint32  killCount;                              // 4
         } honorable_kill;
-
         struct
         {
             uint32  field3;                                 // 3 main requirement
@@ -499,7 +435,6 @@ struct AchievementCriteriaEntry
     uint32  timeLimit;                                      // 29 time limit in seconds
     //uint32 showOrder;                                     // 30 show order
 };
-
 struct AreaTableEntry
 {
     uint32  ID;                                             // 0
@@ -512,7 +447,6 @@ struct AreaTableEntry
     char*   area_name[16];                                  // 11-26
                                                             // 27, string flags, unused
     uint32  team;                                           // 28
-
     // helpers
     bool IsSanctuary() const
     {
@@ -521,14 +455,12 @@ struct AreaTableEntry
         return (flags & AREA_FLAG_SANCTUARY);
     }
 };
-
 struct AreaGroupEntry
 {
     uint32  AreaGroupId;                                    // 0
     uint32  AreaId[6];                                      // 1-6
     uint32  nextGroup;                                      // 7 index of next group
 };
-
 struct AreaPOIEntry
 {
     uint32 id;              //0
@@ -546,7 +478,6 @@ struct AreaPOIEntry
     uint32 worldState;      //52
     //uint32 val2;          //53
 };
-
 struct AreaTriggerEntry
 {
     uint32  id;                                             // 0        m_ID
@@ -560,7 +491,6 @@ struct AreaTriggerEntry
     float   box_z;                                          // 8        m_box_heigh
     float   box_orientation;                                // 9        m_box_yaw
 };
-
 struct AuctionHouseEntry
 {
     uint32    houseId;                                      // 0 index
@@ -570,13 +500,11 @@ struct AuctionHouseEntry
     //char*     name[16];                                   // 4-19
                                                             // 20 string flag, unused
 };
-
 struct BankBagSlotPricesEntry
 {
     uint32  ID;
     uint32  price;
 };
-
 struct BarberShopStyleEntry
 {
     uint32  Id;                                             // 0
@@ -590,7 +518,6 @@ struct BarberShopStyleEntry
     uint32  gender;                                         // 38 0 -> male, 1 -> female
     uint32  hair_id;                                        // 39 real ID to hair/facial hair
 };
-
 struct BattlemasterListEntry
 {
     uint32  id;                                             // 0
@@ -607,9 +534,7 @@ struct BattlemasterListEntry
                                                             // 33 unused
     //uint32 unk;                                           // 34 new 3.1
 };
-
 #define MAX_OUTFIT_ITEMS 24
-
 struct CharStartOutfitEntry
 {
     //uint32 Id;                                            // 0
@@ -621,7 +546,6 @@ struct CharStartOutfitEntry
     //uint32 Unknown2;                                      // 39
     //uint32 Unknown3;                                      // 40
 };
-
 struct CharTitlesEntry
 {
     uint32  ID;                                             // 0, title ids, for example in Quest::GetCharTitleId()
@@ -632,7 +556,6 @@ struct CharTitlesEntry
                                                             // 35 string flag, unused
     uint32  bit_index;                                      // 36 used in PLAYER_CHOSEN_TITLE and 1<<index in PLAYER__FIELD_KNOWN_TITLES
 };
-
 struct ChatChannelsEntry
 {
     uint32  ChannelID;                                      // 0
@@ -642,7 +565,6 @@ struct ChatChannelsEntry
     //char*       name[16];                                 // 20-35 unused
                                                             // 36 string flag, unused
 };
-
 struct ChrClassesEntry
 {
     uint32  ClassID;                                        // 0
@@ -661,7 +583,6 @@ struct ChrClassesEntry
     uint32  CinematicSequence;                              // 58 id from CinematicSequences.dbc
     uint32  addon;                                          // 59 (0 - original race, 1 - tbc addon, ...)
 };
-
 struct ChrRacesEntry
 {
     uint32      RaceID;                                     // 0
@@ -683,7 +604,6 @@ struct ChrRacesEntry
                                                             // 65-67 unused
     uint32      addon;                                      // 68 (0 - original race, 1 - tbc addon, ...)
 };
-
 /* not used
 struct CinematicCameraEntry
 {
@@ -696,7 +616,6 @@ struct CinematicCameraEntry
     float       unk6;                                       // 6 speed?
 };
 */
-
 struct CinematicSequencesEntry
 {
     uint32      Id;                                         // 0 index
@@ -704,7 +623,6 @@ struct CinematicSequencesEntry
     //uint32      cinematicCamera;                          // 2 id in CinematicCamera.dbc
                                                             // 3-9 always 0
 };
-
 struct CreatureDisplayInfoEntry
 {
     uint32      Displayid;                                  // 0        m_ID
@@ -722,7 +640,6 @@ struct CreatureDisplayInfoEntry
                                                             // 14       m_creatureGeosetData
                                                             // 15       m_objectEffectPackageID
 };
-
 struct CreatureFamilyEntry
 {
     uint32  ID;                                             // 0        m_ID
@@ -738,16 +655,13 @@ struct CreatureFamilyEntry
                                                             // 26 string flags
                                                             // 27       m_iconFile
 };
-
 #define MAX_CREATURE_SPELL_DATA_SLOT 4
-
 struct CreatureSpellDataEntry
 {
     uint32    ID;                                           // 0        m_ID
     uint32    spellId[MAX_CREATURE_SPELL_DATA_SLOT];        // 1-4      m_spells[4]
     //uint32    availability[MAX_CREATURE_SPELL_DATA_SLOT]; // 4-7      m_availability[4]
 };
-
 struct CreatureTypeEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -755,7 +669,6 @@ struct CreatureTypeEntry
                                                             // 17       string flags
     //uint32    no_expirience;                              // 18 no exp? critters, non-combat pets, gas cloud.
 };
-
 /* not used
 struct CurrencyCategoryEntry
 {
@@ -765,7 +678,6 @@ struct CurrencyCategoryEntry
     //                                                      // 18       string flags
 };
 */
-
 struct CurrencyTypesEntry
 {
     //uint32    ID;                                         // 0        not used
@@ -773,19 +685,16 @@ struct CurrencyTypesEntry
     //uint32    Category;                                   // 2        may be category
     uint32    BitIndex;                                     // 3        bit index in PLAYER_FIELD_KNOWN_CURRENCIES (1 << (index-1))
 };
-
 struct DurabilityCostsEntry
 {
     uint32    Itemlvl;                                      // 0
     uint32    multiplier[29];                               // 1-29
 };
-
 struct DurabilityQualityEntry
 {
     uint32    Id;                                           // 0
     float     quality_mod;                                  // 1
 };
-
 struct EmotesEntry
 {
     uint32  Id;                                             // 0
@@ -796,13 +705,11 @@ struct EmotesEntry
     uint32  UnitStandState;                                 // 5, uncomfirmed, may be enum UnitStandStateType
     //uint32  SoundId;                                      // 6, ref to soundEntries
 };
-
 struct EmotesTextEntry
 {
     uint32  Id;
     uint32  textid;
 };
-
 struct FactionEntry
 {
     uint32      ID;                                         // 0        m_ID
@@ -817,7 +724,6 @@ struct FactionEntry
     //char*     description[16];                            // 36-51    m_description_lang
                                                             // 52 string flags
 };
-
 struct FactionTemplateEntry
 {
     uint32      ID;                                         // 0        m_ID
@@ -829,7 +735,6 @@ struct FactionTemplateEntry
     uint32      enemyFaction[4];                            // 6        m_enemies[4]
     uint32      friendFaction[4];                           // 10       m_friend[4]
     //-------------------------------------------------------  end structure
-
     // helpers
     bool IsFriendlyTo(FactionTemplateEntry const& entry) const
     {
@@ -871,7 +776,6 @@ struct FactionTemplateEntry
     }
     bool IsContestedGuardFaction() const { return (factionFlags & FACTION_TEMPLATE_FLAG_CONTESTED_GUARD)!=0; }
 };
-
 struct GameObjectDisplayInfoEntry
 {
     uint32      Displayid;                                  // 0        m_ID
@@ -885,14 +789,12 @@ struct GameObjectDisplayInfoEntry
     float   maxZ;
     //uint32  transport;  //18
 };
-
 struct GemPropertiesEntry
 {
     uint32      ID;
     uint32      spellitemenchantement;
     uint32      color;
 };
-
 struct GlyphPropertiesEntry
 {
     uint32  Id;
@@ -900,67 +802,54 @@ struct GlyphPropertiesEntry
     uint32  TypeFlags;
     uint32  Unk1;                                           // GlyphIconId (SpellIcon.dbc)
 };
-
 struct GlyphSlotEntry
 {
     uint32  Id;
     uint32  TypeFlags;
     uint32  Order;
 };
-
 // All Gt* DBC store data for 100 levels, some by 100 per class/race
 #define GT_MAX_LEVEL    100
-
 struct GtBarberShopCostBaseEntry
 {
     float   cost;
 };
-
 struct GtCombatRatingsEntry
 {
     float    ratio;
 };
-
 struct GtChanceToMeleeCritBaseEntry
 {
     float    base;
 };
-
 struct GtChanceToMeleeCritEntry
 {
     float    ratio;
 };
-
 struct GtChanceToSpellCritBaseEntry
 {
     float    base;
 };
-
 struct GtChanceToSpellCritEntry
 {
     float    ratio;
 };
-
 struct GtOCTRegenHPEntry
 {
     float    ratio;
 };
-
 //struct GtOCTRegenMPEntry
 //{
 //    float    ratio;
 //};
-
 struct GtRegenHPPerSptEntry
 {
     float    ratio;
 };
-
 struct GtRegenMPPerSptEntry
 {
     float    ratio;
 };
-
 /* no used
 struct HolidayDescriptionsEntry
 {
@@ -969,7 +858,6 @@ struct HolidayDescriptionsEntry
                                                             // 17 name flags
 };
 */
-
 /* no used
 struct HolidayNamesEntry
 {
@@ -978,7 +866,6 @@ struct HolidayNamesEntry
     // 17 name flags
 };
 */
-
 struct HolidaysEntry
 {
     uint32 ID;                                              // 0, holiday id
@@ -995,7 +882,6 @@ struct HolidaysEntry
     //uint32 unk53;                                         // 53
     //uint32 unk54;                                         // 54
 };
-
 struct ItemEntry
 {
    uint32   ID;                                             // 0
@@ -1007,14 +893,12 @@ struct ItemEntry
    uint32   InventoryType;                                  // 6
    uint32   Sheath;                                         // 7
 };
-
 struct ItemBagFamilyEntry
 {
     uint32   ID;                                            // 0
     //char*     name[16]                                    // 1-16     m_name_lang
     //                                                      // 17       name flags
 };
-
 struct ItemDisplayInfoEntry
 {
     uint32      ID;                                         // 0        m_ID
@@ -1030,7 +914,6 @@ struct ItemDisplayInfoEntry
                                                             // 10       m_itemVisual[8]
                                                             // 11       m_particleColorID
 };
-
 //struct ItemCondExtCostsEntry
 //{
 //    uint32      ID;
@@ -1038,7 +921,6 @@ struct ItemDisplayInfoEntry
 //    uint32      itemextendedcostentry;                    // ItemPrototype::ExtendedCost
 //    uint32      arenaseason;                              // arena season number(1-4)
 //};
-
 struct ItemExtendedCostEntry
 {
     uint32      ID;                                         // 0 extended-cost entry id
@@ -1048,7 +930,6 @@ struct ItemExtendedCostEntry
     uint32      reqitemcount[5];                            // 8-12 required count of 1st item
     uint32      reqpersonalarenarating;                     // 13 required personal arena rating
 };
-
 struct ItemLimitCategoryEntry
 {
     uint32      ID;                                         // 0 Id
@@ -1057,7 +938,6 @@ struct ItemLimitCategoryEntry
     uint32      maxCount;                                   // 18, max allowed equipped as item or in gem slot
     //uint32      unk;                                      // 19, 1 for gems only...
 };
-
 struct ItemRandomPropertiesEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -1066,7 +946,6 @@ struct ItemRandomPropertiesEntry
     //char*     nameSuffix[16]                              // 7-22     m_name_lang
                                                             // 23 name flags
 };
-
 struct ItemRandomSuffixEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -1076,7 +955,6 @@ struct ItemRandomSuffixEntry
     uint32    enchant_id[5];                                // 19-21    m_enchantment
     uint32    prefix[5];                                    // 22-24    m_allocationPct
 };
-
 struct ItemSetEntry
 {
     //uint32    id                                          // 0        m_ID
@@ -1088,9 +966,7 @@ struct ItemSetEntry
     uint32    required_skill_id;                            // 51       m_requiredSkill
     uint32    required_skill_value;                         // 52       m_requiredSkillRank
 };
-
 #define MAX_LOCK_CASE 8
-
 struct LockEntry
 {
     uint32      ID;                                         // 0        m_ID
@@ -1099,7 +975,6 @@ struct LockEntry
     uint32      Skill[MAX_LOCK_CASE];                       // 17-24    m_Skill
     //uint32      Action[MAX_LOCK_CASE];                    // 25-32    m_Action
 };
-
 struct MailTemplateEntry
 {
     uint32      ID;                                         // 0
@@ -1107,7 +982,6 @@ struct MailTemplateEntry
                                                             // 17 name flags, unused
     //char*       content[16];                              // 18-33
 };
-
 struct MapEntry
 {
     uint32  MapID;                                          // 0
@@ -1138,10 +1012,8 @@ struct MapEntry
                                                             // 115 -1, 0 and 720
     uint32  addon;                                          // 116 (0-original maps,1-tbc addon)
                                                             // 117 some kind of time?
-
     // Helpers
     uint32 Expansion() const { return addon; }
-
     bool IsDungeon() const { return map_type == MAP_INSTANCE || map_type == MAP_RAID; }
     bool IsNonRaidDungeon() const { return map_type == MAP_INSTANCE; }
     bool Instanceable() const { return map_type == MAP_INSTANCE || map_type == MAP_RAID || map_type == MAP_BATTLEGROUND || map_type == MAP_ARENA; }
@@ -1151,7 +1023,6 @@ struct MapEntry
     bool IsBattleGroundOrArena() const { return map_type == MAP_BATTLEGROUND || map_type == MAP_ARENA; }
     bool SupportsHeroicMode() const { return resetTimeHeroic != 0; }
     bool HasResetTime() const { return resetTimeHeroic || resetTimeRaid; }
-
     bool IsMountAllowed() const
     {
         return !IsDungeon() ||
@@ -1160,27 +1031,23 @@ struct MapEntry
             MapID==568 || MapID==580 || MapID==615 ||       // ZulAman, Sunwell Plateau, Obsidian Sanctrum
             MapID==616;                                     // Eye Of Eternity
     }
-
     bool IsContinent() const
     {
         return MapID == 0 || MapID == 1 || MapID == 530 || MapID == 571;
     }
 };
-
 struct MovieEntry
 {
     uint32      Id;                                         // 0 index
     //char*       filename;                                 // 1
     //uint32      unk2;                                     // 2 always 100
 };
-
 struct QuestSortEntry
 {
     uint32      id;                                         // 0        m_ID
     //char*       name[16];                                 // 1-16     m_SortName_lang
                                                             // 17 name flags
 };
-
 struct RandomPropertiesPointsEntry
 {
     //uint32  Id;                                           // 0 hidden key
@@ -1189,7 +1056,6 @@ struct RandomPropertiesPointsEntry
     uint32    RarePropertiesPoints[5];                      // 7-11
     uint32    UncommonPropertiesPoints[5];                  // 12-16
 };
-
 struct ScalingStatDistributionEntry
 {
     uint32  Id;
@@ -1197,7 +1063,6 @@ struct ScalingStatDistributionEntry
     uint32  Modifier[10];
     uint32  MaxLevel;
 };
-
 struct ScalingStatValuesEntry
 {
     uint32  Id;
@@ -1207,7 +1072,6 @@ struct ScalingStatValuesEntry
     uint32  dpsMod[6];                                      // DPS mod for level
     uint32  spellBonus;                                     // not sure.. TODO: need more info about
     uint32  feralBonus;                                     // Feral AP bonus
-
     uint32  getssdMultiplier(uint32 mask) const
     {
         if (mask&0x001F)
@@ -1255,14 +1119,12 @@ struct ScalingStatValuesEntry
         return 0;
     }
 };
-
 //struct SkillLineCategoryEntry{
 //    uint32    id;                                         // 0      m_ID
 //    char*     name[16];                                   // 1-17   m_name_lang
 //                                                          // 18 string flag
 //    uint32    displayOrder;                               // 19     m_sortIndex
 //};
-
 //struct SkillRaceClassInfoEntry{
 //    uint32    id;                                         // 0      m_ID
 //    uint32    skillId;                                    // 1      m_skillID
@@ -1273,13 +1135,11 @@ struct ScalingStatValuesEntry
 //    uint32    skillTierId;                                // 6      m_skillTierID
 //    uint32    skillCostID;                                // 7      m_skillCostIndex
 //};
-
 //struct SkillTiersEntry{
 //    uint32    id;                                         // 0      m_ID
 //    uint32    skillValue[16];                             // 1-17   m_cost
 //    uint32    maxSkillValue[16];                          // 18-32  m_valueMax
 //};
-
 struct SkillLineEntry
 {
     uint32    id;                                           // 0        m_ID
@@ -1294,7 +1154,6 @@ struct SkillLineEntry
                                                             // 54 string flags
     uint32    canLink;                                      // 55       m_canLink (prof. with recipes
 };
-
 struct SkillLineAbilityEntry
 {
     uint32    id;                                           // 0        m_ID
@@ -1311,7 +1170,6 @@ struct SkillLineAbilityEntry
     uint32    min_value;                                    // 11       m_trivialSkillLineRankLow
     //uint32    characterPoints[2];                         // 12-13    m_characterPoints[2]
 };
-
 struct SoundEntriesEntry
 {
     uint32    Id;                                           // 0        m_ID
@@ -1327,9 +1185,7 @@ struct SoundEntriesEntry
                                                             // 28       m_EAXDef
                                                             // 29       new in 3.1
 };
-
 #define MAX_SPELL_EFFECTS 3
-
 struct SpellEntry
 {
     uint32    Id;                                           // 0        m_ID
@@ -1437,20 +1293,16 @@ struct SpellEntry
     uint32    runeCostID;                                   // 229      m_runeCostID
     //uint32    spellMissileID;                             // 230      m_spellMissileID not used
     //uint32  PowerDisplayId;                               // 231      PowerDisplay.dbc, new in 3.1
-
     // helpers
     int32 CalculateSimpleValue(uint8 eff) const { return EffectBasePoints[eff]+int32(EffectBaseDice[eff]); }
-
     private:
         // prevent creating custom entries (copy data from original in fact)
         SpellEntry(SpellEntry const&);                      // DON'T must have implementation
 };
-
 typedef std::set<uint32> SpellCategorySet;
 typedef std::map<uint32,SpellCategorySet > SpellCategoryStore;
 typedef std::set<uint32> PetFamilySpellsSet;
 typedef std::map<uint32,PetFamilySpellsSet > PetFamilySpellsStore;
-
 struct SpellCastTimesEntry
 {
     uint32    ID;                                           // 0
@@ -1458,14 +1310,12 @@ struct SpellCastTimesEntry
     //float     CastTimePerLevel;                           // 2 unsure / per skill?
     //int32     MinCastTime;                                // 3 unsure
 };
-
 struct SpellFocusObjectEntry
 {
     uint32    ID;                                           // 0
     //char*     Name[16];                                   // 1-15 unused
                                                             // 16 string flags, unused
 };
-
 struct SpellRadiusEntry
 {
     uint32    ID;
@@ -1473,7 +1323,6 @@ struct SpellRadiusEntry
     //uint32    Unk    //always 0
     float     radiusFriend;
 };
-
 struct SpellRangeEntry
 {
     uint32    ID;
@@ -1487,19 +1336,15 @@ struct SpellRangeEntry
     //char*     Name2[16];                                  // 25-40 unused
                                                             // 41 string flags, unused
 };
-
 struct SpellRuneCostEntry
 {
     uint32  ID;                                             // 0
     uint32  RuneCost[3];                                    // 1-3 (0=blood, 1=frost, 2=unholy)
     uint32  runePowerGain;                                  // 4
-
     bool NoRuneCost() const { return RuneCost[0] == 0 && RuneCost[1] == 0 && RuneCost[2] == 0; }
     bool NoRunicPowerGain() const { return runePowerGain == 0; }
 };
-
 #define MAX_SHAPESHIFT_SPELLS 8
-
 struct SpellShapeshiftEntry
 {
     uint32 ID;                                              // 0
@@ -1516,13 +1361,11 @@ struct SpellShapeshiftEntry
     //uint32 unk4;                                          // 26 unused
     uint32 stanceSpell[MAX_SHAPESHIFT_SPELLS];                                  // 27 - 34 unused
 };
-
 struct SpellDurationEntry
 {
     uint32    ID;
     int32     Duration[3];
 };
-
 struct SpellItemEnchantmentEntry
 {
     uint32      ID;                                         // 0        m_ID
@@ -1541,7 +1384,6 @@ struct SpellItemEnchantmentEntry
     //uint32      requiredSkillValue;                       // 36       m_requiredSkillRank
                                                             // 37       new in 3.1
 };
-
 struct SpellItemEnchantmentConditionEntry
 {
     uint32  ID;                                             // 0        m_ID
@@ -1552,13 +1394,11 @@ struct SpellItemEnchantmentConditionEntry
     uint32  Value[5];                                       // 21-25    m_rt_operand[5]
     //uint8   Logic[5]                                      // 25-30    m_logic[5]
 };
-
 struct StableSlotPricesEntry
 {
     uint32 Slot;
     uint32 Price;
 };
-
 struct SummonPropertiesEntry
 {
     uint32  Id;                                             // 0
@@ -1568,10 +1408,8 @@ struct SummonPropertiesEntry
     uint32  Slot;                                           // 4, 0-6
     uint32  Flags;                                          // 5
 };
-
 #define MAX_TALENT_RANK 5
 #define MAX_PET_TALENT_RANK 3                               // use in calculations, expected <= MAX_TALENT_RANK
-
 struct TalentEntry
 {
     uint32    TalentID;                                     // 0
@@ -1588,7 +1426,6 @@ struct TalentEntry
     //uint32  unk2;                                         // 20, all 0
     //uint64  allowForPet;                                  // 21 its a 64 bit mask for pet 1<<m_categoryEnumID in CreatureFamily.dbc
 };
-
 struct TalentTabEntry
 {
     uint32  TalentTabID;                                    // 0
@@ -1601,7 +1438,6 @@ struct TalentTabEntry
     uint32  tabpage;                                        // 22
     //char* internalname;                                   // 23
 };
-
 struct TaxiNodesEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -1613,7 +1449,6 @@ struct TaxiNodesEntry
                                                             // 22 string flags
     uint32    MountCreatureID[2];                           // 23-24    m_MountCreatureID[2]
 };
-
 struct TaxiPathEntry
 {
     uint32    ID;                                           // 0        m_ID
@@ -1621,7 +1456,6 @@ struct TaxiPathEntry
     uint32    to;                                           // 2        m_ToTaxiNode
     uint32    price;                                        // 3        m_Cost
 };
-
 struct TaxiPathNodeEntry
 {
                                                             // 0        m_ID
@@ -1636,7 +1470,6 @@ struct TaxiPathNodeEntry
                                                             // 9        m_arrivalEventID
                                                             // 10       m_departureEventID
 };
-
 struct TotemCategoryEntry
 {
     uint32    ID;                                           // 0
@@ -1645,7 +1478,6 @@ struct TotemCategoryEntry
     uint32    categoryType;                                 // 18 (one for specialization)
     uint32    categoryMask;                                 // 19 (compatibility mask for same type: different for totems, compatible from high to low for rods)
 };
-
 struct VehicleEntry
 {
     uint32  m_ID;                                           // 0
@@ -1682,7 +1514,6 @@ struct VehicleEntry
                                                             // 38, new in 3.1
                                                             // 39, new in 3.1
 };
-
 struct VehicleSeatEntry
 {
     uint32  m_ID;                                           // 0
@@ -1732,10 +1563,8 @@ struct VehicleSeatEntry
     int32   m_uiSkin;                                       // 44
     uint32  m_flagsB;                                       // 45
                                                             // 46-57 added in 3.1, floats mostly
-
     bool IsUsable() const { return m_flags & 0x2000000; }
 };
-
 struct WorldMapAreaEntry
 {
     //uint32  ID;                                           // 0
@@ -1749,9 +1578,7 @@ struct WorldMapAreaEntry
     int32   virtual_map_id;                                 // 8 -1 (map_id have correct map) other: virtual map where zone show (map_id - where zone in fact internally)
     // int32   dungeonMap_id;                               // 9 pointer to DungeonMap.dbc (owerride x1,x2,y1,y2 coordinates)
 };
-
 #define MAX_WORLD_MAP_OVERLAY_AREA_IDX 4
-
 struct WorldMapOverlayEntry
 {
     uint32    ID;                                           // 0
@@ -1761,7 +1588,6 @@ struct WorldMapOverlayEntry
     //char* internal_name                                   // 8
                                                             // 9-16 some ints
 };
-
 struct WorldSafeLocsEntry
 {
     uint32    ID;                                           // 0
@@ -1772,42 +1598,34 @@ struct WorldSafeLocsEntry
     //char*   name[16]                                      // 5-20 name, unused
                                                             // 21 name flags, unused
 };
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 // Structures not used for casting to loaded DBC data and not required then packing
 struct TalentSpellPos
 {
     TalentSpellPos() : talent_id(0), rank(0) {}
     TalentSpellPos(uint16 _talent_id, uint8 _rank) : talent_id(_talent_id), rank(_rank) {}
-
     uint16 talent_id;
     uint8  rank;
 };
-
 typedef std::map<uint32,TalentSpellPos> TalentSpellPosMap;
-
 struct TaxiPathBySourceAndDestination
 {
     TaxiPathBySourceAndDestination() : ID(0),price(0) {}
     TaxiPathBySourceAndDestination(uint32 _id,uint32 _price) : ID(_id),price(_price) {}
-
     uint32    ID;
     uint32    price;
 };
 typedef std::map<uint32,TaxiPathBySourceAndDestination> TaxiPathSetForSource;
 typedef std::map<uint32,TaxiPathSetForSource> TaxiPathSetBySource;
-
 struct TaxiPathNode
 {
     TaxiPathNode() : mapid(0), x(0),y(0),z(0),actionFlag(0),delay(0) {}
     TaxiPathNode(uint32 _mapid, float _x, float _y, float _z, uint32 _actionFlag, uint32 _delay) : mapid(_mapid), x(_x),y(_y),z(_z),actionFlag(_actionFlag),delay(_delay) {}
-
     uint32    mapid;
     float     x;
     float     y;
@@ -1817,7 +1635,6 @@ struct TaxiPathNode
 };
 typedef std::vector<TaxiPathNode> TaxiPathNodeList;
 typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
-
 #define TaxiMaskSize 12
 typedef uint32 TaxiMask[TaxiMaskSize];
 #endif
diff --git a/src/game/DBCfmt.h b/src/game/DBCfmt.h
index 7487ac116a2..1152a3482c5 100644
--- a/src/game/DBCfmt.h
+++ b/src/game/DBCfmt.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_DBCSFRM_H
 #define MANGOS_DBCSFRM_H
-
 const char Achievementfmt[]="niixssssssssssssssssxxxxxxxxxxxxxxxxxxiixixxxxxxxxxxxxxxxxxxii";
 const char AchievementCriteriafmt[]="niiiiiiiixxxxxxxxxxxxxxxxxiixix";
 const char AreaTableEntryfmt[]="iiinixxxxxissssssssssssssssxixxxxxxx";
@@ -109,5 +107,4 @@ const char VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiii
 const char WorldMapAreaEntryfmt[]="xinxffffix";
 const char WorldMapOverlayEntryfmt[]="nxiiiixxxxxxxxxxx";
 const char WorldSafeLocsEntryfmt[]="nifffxxxxxxxxxxxxxxxxx";
-
 #endif
diff --git a/src/game/Debugcmds.cpp b/src/game/Debugcmds.cpp
index 97f90e33af4..a74750ebce9 100644
--- a/src/game/Debugcmds.cpp
+++ b/src/game/Debugcmds.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -38,26 +37,20 @@
 #include "GridNotifiersImpl.h"
 #include "SpellMgr.h"
 #include "ScriptCalls.h"
-
 bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* px = strtok((char*)args, " ");
     if (!px)
         return false;
-
     uint8 failnum = (uint8)atoi(px);
     if (failnum==0 && *px!='0')
         return false;
-
     char* p1 = strtok(NULL, " ");
     uint8 failarg1 = p1 ? (uint8)atoi(p1) : 0;
-
     char* p2 = strtok(NULL, " ");
     uint8 failarg2 = p2 ? (uint8)atoi(p2) : 0;
-
     WorldPacket data(SMSG_CAST_FAILED, 5);
     data << uint8(0);
     data << uint32(133);
@@ -66,17 +59,13 @@ bool ChatHandler::HandleDebugSendSpellFailCommand(const char* args)
         data << uint32(failarg1);
     if (p2)
         data << uint32(failarg2);
-
     m_session->SendPacket(&data);
-
     return true;
 }
-
 bool ChatHandler::HandleDebugSendPoiCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *pPlayer = m_session->GetPlayer();
     Unit* target = getSelectedUnit();
     if (!target)
@@ -84,50 +73,40 @@ bool ChatHandler::HandleDebugSendPoiCommand(const char* args)
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         return true;
     }
-
     char* icon_text = strtok((char*)args, " ");
     char* flags_text = strtok(NULL, " ");
     if (!icon_text || !flags_text)
         return false;
-
     uint32 icon = atol(icon_text);
     uint32 flags = atol(flags_text);
-
     sLog.outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags);
     pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI");
     return true;
 }
-
 bool ChatHandler::HandleDebugSendEquipErrorCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint8 msg = atoi(args);
     m_session->GetPlayer()->SendEquipError(msg, 0, 0);
     return true;
 }
-
 bool ChatHandler::HandleDebugSendSellErrorCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint8 msg = atoi(args);
     m_session->GetPlayer()->SendSellError(msg, 0, 0, 0);
     return true;
 }
-
 bool ChatHandler::HandleDebugSendBuyErrorCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint8 msg = atoi(args);
     m_session->GetPlayer()->SendBuyError(msg, 0, 0, 0);
     return true;
 }
-
 bool ChatHandler::HandleDebugSendOpcodeCommand(const char* /*args*/)
 {
     Unit *unit = getSelectedUnit();
@@ -137,24 +116,18 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(const char* /*args*/)
     else
         player = (Player*)unit;
     if(!unit) unit = player;
-
     std::ifstream ifs("opcode.txt");
     if (ifs.bad())
         return false;
-
     uint32 opcode;
     ifs >> opcode;
-
     WorldPacket data(opcode, 0);
-
     while(!ifs.eof())
     {
         std::string type;
         ifs >> type;
-
         if(type == "")
             break;
-
         if(type == "uint8")
         {
             uint16 val1;
@@ -256,21 +229,17 @@ bool ChatHandler::HandleDebugSendOpcodeCommand(const char* /*args*/)
     PSendSysMessage(LANG_COMMAND_OPCODESENT, data.GetOpcode(), unit->GetName());
     return true;
 }
-
 bool ChatHandler::HandleDebugUpdateWorldStateCommand(const char* args)
 {
     char* w = strtok((char*)args, " ");
     char* s = strtok(NULL, " ");
-
     if (!w || !s)
         return false;
-
     uint32 world = (uint32)atoi(w);
     uint32 state = (uint32)atoi(s);
     m_session->GetPlayer()->SendUpdateWorldState(world, state);
     return true;
 }
-
 bool ChatHandler::HandleDebugPlayCinematicCommand(const char* args)
 {
     // USAGE: .debug play cinematic #cinematicid
@@ -281,20 +250,16 @@ bool ChatHandler::HandleDebugPlayCinematicCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 dwId = atoi((char*)args);
-
     if (!sCinematicSequencesStore.LookupEntry(dwId))
     {
         PSendSysMessage(LANG_CINEMATIC_NOT_EXIST, dwId);
         SetSentErrorMessage(true);
         return false;
     }
-
     m_session->GetPlayer()->SendCinematicStart(dwId);
     return true;
 }
-
 bool ChatHandler::HandleDebugPlayMovieCommand(const char* args)
 {
     // USAGE: .debug play movie #movieid
@@ -305,20 +270,16 @@ bool ChatHandler::HandleDebugPlayMovieCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 dwId = atoi((char*)args);
-
     if (!sMovieStore.LookupEntry(dwId))
     {
         PSendSysMessage(LANG_MOVIE_NOT_EXIST, dwId);
         SetSentErrorMessage(true);
         return false;
     }
-
     m_session->GetPlayer()->SendMovieStart(dwId);
     return true;
 }
-
 //Play sound
 bool ChatHandler::HandleDebugPlaySoundCommand(const char* args)
 {
@@ -330,16 +291,13 @@ bool ChatHandler::HandleDebugPlaySoundCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 dwSoundId = atoi((char*)args);
-
     if (!sSoundEntriesStore.LookupEntry(dwSoundId))
     {
         PSendSysMessage(LANG_SOUND_NOT_EXIST, dwSoundId);
         SetSentErrorMessage(true);
         return false;
     }
-
     Unit* unit = getSelectedUnit();
     if (!unit)
     {
@@ -347,25 +305,20 @@ bool ChatHandler::HandleDebugPlaySoundCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (m_session->GetPlayer()->GetSelection())
         unit->PlayDistanceSound(dwSoundId,m_session->GetPlayer());
     else
         unit->PlayDirectSound(dwSoundId,m_session->GetPlayer());
-
     PSendSysMessage(LANG_YOU_HEAR_SOUND, dwSoundId);
     return true;
 }
-
 //Send notification in channel
 bool ChatHandler::HandleDebugSendChannelNotifyCommand(const char* args)
 {
     if (!*args)
         return false;
-
     const char *name = "test";
     uint8 code = atoi(args);
-
     WorldPacket data(SMSG_CHANNEL_NOTIFY, (1+10));
     data << code;                                           // notify type
     data << name;                                           // channel name
@@ -374,13 +327,11 @@ bool ChatHandler::HandleDebugSendChannelNotifyCommand(const char* args)
     m_session->SendPacket(&data);
     return true;
 }
-
 //Send notification in chat
 bool ChatHandler::HandleDebugSendChatMsgCommand(const char* args)
 {
     if (!*args)
         return false;
-
     const char *msg = "testtest";
     uint8 type = atoi(args);
     WorldPacket data;
@@ -388,38 +339,31 @@ bool ChatHandler::HandleDebugSendChatMsgCommand(const char* args)
     m_session->SendPacket(&data);
     return true;
 }
-
 bool ChatHandler::HandleDebugSendQuestPartyMsgCommand(const char* args)
 {
     uint32 msg = atol((char*)args);
     m_session->GetPlayer()->SendPushToPartyResponse(m_session->GetPlayer(), msg);
     return true;
 }
-
 bool ChatHandler::HandleDebugGetLootRecipientCommand(const char* /*args*/)
 {
     Creature* target = getSelectedCreature();
     if (!target)
         return false;
-
     PSendSysMessage("loot recipient: %s", target->hasLootRecipient()?(target->GetLootRecipient()?target->GetLootRecipient()->GetName():"offline"):"no loot recipient");
     return true;
 }
-
 bool ChatHandler::HandleDebugSendQuestInvalidMsgCommand(const char* args)
 {
     uint32 msg = atol((char*)args);
     m_session->GetPlayer()->SendCanTakeQuestResponse(msg);
     return true;
 }
-
 bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
 {
     if (!*args)
         return false;
-
     std::string state_str = args;
-
     ItemUpdateState state = ITEM_UNCHANGED;
     bool list_queue = false, check_all = false;
     if (state_str == "unchanged") state = ITEM_UNCHANGED;
@@ -429,10 +373,8 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
     else if (state_str == "queue") list_queue = true;
     else if (state_str == "check_all") check_all = true;
     else return false;
-
     Player* player = getSelectedPlayer();
     if (!player) player = m_session->GetPlayer();
-
     if (!list_queue && !check_all)
     {
         state_str = "The player has the following " + state_str + " items: ";
@@ -441,7 +383,6 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
         {
             if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END)
                 continue;
-
             Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
             if (!item) continue;
             if (!item->IsBag())
@@ -461,7 +402,6 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
             }
         }
     }
-
     if (list_queue)
     {
         std::vector<Item *> &updateQueue = player->GetItemUpdateQueue();
@@ -469,10 +409,8 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
         {
             Item *item = updateQueue[i];
             if(!item) continue;
-
             Bag *container = item->GetContainer();
             uint8 bag_slot = container ? container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0);
-
             std::string st;
             switch(item->GetState())
             {
@@ -481,13 +419,11 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                 case ITEM_NEW: st = "new"; break;
                 case ITEM_REMOVED: st = "removed"; break;
             }
-
             PSendSysMessage("bag: %d slot: %d guid: %d - state: %s", bag_slot, item->GetSlot(), item->GetGUIDLow(), st.c_str());
         }
         if (updateQueue.empty())
             PSendSysMessage("updatequeue empty");
     }
-
     if (check_all)
     {
         bool error = false;
@@ -496,28 +432,23 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
         {
             if(i >= BUYBACK_SLOT_START && i < BUYBACK_SLOT_END)
                 continue;
-
             Item *item = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
             if (!item) continue;
-
             if (item->GetSlot() != i)
             {
                 PSendSysMessage("item at slot %d, guid %d has an incorrect slot value: %d", i, item->GetGUIDLow(), item->GetSlot());
                 error = true; continue;
             }
-
             if (item->GetOwnerGUID() != player->GetGUID())
             {
                 PSendSysMessage("for the item at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", item->GetSlot(), item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow());
                 error = true; continue;
             }
-
             if (Bag *container = item->GetContainer())
             {
                 PSendSysMessage("item at slot: %d guid: %d has a container (slot: %d, guid: %d) but shouldnt!", item->GetSlot(), item->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow());
                 error = true; continue;
             }
-
             if (item->IsInUpdateQueue())
             {
                 uint16 qp = item->GetQueuePos();
@@ -526,13 +457,11 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                     PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", item->GetSlot(), item->GetGUIDLow(), qp);
                     error = true; continue;
                 }
-
                 if (updateQueue[qp] == NULL)
                 {
                     PSendSysMessage("item at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", item->GetSlot(), item->GetGUIDLow(), qp);
                     error = true; continue;
                 }
-
                 if (updateQueue[qp] != item)
                 {
                     PSendSysMessage("item at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", item->GetSlot(), item->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow());
@@ -544,7 +473,6 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                 PSendSysMessage("item at slot: %d guid: %d is not in queue but should be (state: %d)!", item->GetSlot(), item->GetGUIDLow(), item->GetState());
                 error = true; continue;
             }
-
             if(item->IsBag())
             {
                 Bag *bag = (Bag*)item;
@@ -552,32 +480,27 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                 {
                     Item* item2 = bag->GetItemByPos(j);
                     if (!item2) continue;
-
                     if (item2->GetSlot() != j)
                     {
                         PSendSysMessage("the item in bag %d slot %d, guid %d has an incorrect slot value: %d", bag->GetSlot(), j, item2->GetGUIDLow(), item2->GetSlot());
                         error = true; continue;
                     }
-
                     if (item2->GetOwnerGUID() != player->GetGUID())
                     {
                         PSendSysMessage("for the item in bag %d at slot %d and itemguid %d, owner's guid (%d) and player's guid (%d) don't match!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), GUID_LOPART(item2->GetOwnerGUID()), player->GetGUIDLow());
                         error = true; continue;
                     }
-
                     Bag *container = item2->GetContainer();
                     if (!container)
                     {
                         PSendSysMessage("the item in bag %d at slot %d with guid %d has no container!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow());
                         error = true; continue;
                     }
-
                     if (container != bag)
                     {
                         PSendSysMessage("the item in bag %d at slot %d with guid %d has a different container(slot %d guid %d)!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), container->GetSlot(), container->GetGUIDLow());
                         error = true; continue;
                     }
-
                     if (item2->IsInUpdateQueue())
                     {
                         uint16 qp = item2->GetQueuePos();
@@ -586,13 +509,11 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                             PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) larger than the update queue size! ", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp);
                             error = true; continue;
                         }
-
                         if (updateQueue[qp] == NULL)
                         {
                             PSendSysMessage("item in bag: %d at slot: %d guid: %d has a queuepos (%d) that points to NULL in the queue!", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp);
                             error = true; continue;
                         }
-
                         if (updateQueue[qp] != item2)
                         {
                             PSendSysMessage("item in bag: %d at slot: %d guid: %d has has a queuepos (%d) that points to another item in the queue (bag: %d, slot: %d, guid: %d)", bag->GetSlot(), item2->GetSlot(), item2->GetGUIDLow(), qp, updateQueue[qp]->GetBagSlot(), updateQueue[qp]->GetSlot(), updateQueue[qp]->GetGUIDLow());
@@ -607,33 +528,27 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
                 }
             }
         }
-
         for(size_t i = 0; i < updateQueue.size(); ++i)
         {
             Item *item = updateQueue[i];
             if(!item) continue;
-
             if (item->GetOwnerGUID() != player->GetGUID())
             {
                 PSendSysMessage("queue(" SIZEFMTD "): for the an item (guid %d), the owner's guid (%d) and player's guid (%d) don't match!", i, item->GetGUIDLow(), GUID_LOPART(item->GetOwnerGUID()), player->GetGUIDLow());
                 error = true; continue;
             }
-
             if (item->GetQueuePos() != i)
             {
                 PSendSysMessage("queue(" SIZEFMTD "): for the an item (guid %d), the queuepos doesn't match it's position in the queue!", i, item->GetGUIDLow());
                 error = true; continue;
             }
-
             if (item->GetState() == ITEM_REMOVED) continue;
             Item *test = player->GetItemByPos( item->GetBagSlot(), item->GetSlot());
-
             if (test == NULL)
             {
                 PSendSysMessage("queue(" SIZEFMTD "): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the player doesn't have an item at that position!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow());
                 error = true; continue;
             }
-
             if (test != item)
             {
                 PSendSysMessage("queue(" SIZEFMTD "): the bag(%d) and slot(%d) values for the item with guid %d are incorrect, the item with guid %d is there instead!", i, item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), test->GetGUIDLow());
@@ -643,28 +558,23 @@ bool ChatHandler::HandleDebugGetItemStateCommand(const char* args)
         if (!error)
             SendSysMessage("All OK!");
     }
-
     return true;
 }
-
 bool ChatHandler::HandleDebugBattlegroundCommand(const char * /*args*/)
 {
     sBattleGroundMgr.ToggleTesting();
     return true;
 }
-
 bool ChatHandler::HandleDebugArenaCommand(const char * /*args*/)
 {
     sBattleGroundMgr.ToggleArenaTesting();
     return true;
 }
-
 bool ChatHandler::HandleDebugThreatList(const char * /*args*/)
 {
     Creature* target = getSelectedCreature();
     if(!target || target->isTotem() || target->isPet())
         return false;
-
     std::list<HostilReference*>& tlist = target->getThreatManager().getThreatList();
     std::list<HostilReference*>::iterator itr;
     uint32 cnt = 0;
@@ -680,7 +590,6 @@ bool ChatHandler::HandleDebugThreatList(const char * /*args*/)
     SendSysMessage("End of threat list.");
     return true;
 }
-
 bool ChatHandler::HandleDebugHostilRefList(const char * /*args*/)
 {
     Unit* target = getSelectedUnit();
@@ -701,45 +610,35 @@ bool ChatHandler::HandleDebugHostilRefList(const char * /*args*/)
     SendSysMessage("End of hostil reference list.");
     return true;
 }
-
 bool ChatHandler::HandleDebugSetVehicleId(const char *args)
 {
     Unit* target = getSelectedUnit();
     if(!target || target->IsVehicle())
         return false;
-
     if(!args)
         return false;
-
     char* i = strtok((char*)args, " ");
     if(!i)
         return false;
-
     uint32 id = (uint32)atoi(i);
     //target->SetVehicleId(id);
     target->SendUpdateObjectToAllExcept(NULL);
     PSendSysMessage("Vehicle id set to %u", id);
     return true;
 }
-
 bool ChatHandler::HandleDebugEnterVehicle(const char * args)
 {
     Unit* target = getSelectedUnit();
     if(!target || !target->IsVehicle())
         return false;
-
     if(!args)
         return false;
-
     char* i = strtok((char*)args, " ");
     if(!i)
         return false;
-
     char* j = strtok(NULL, " ");
-
     uint32 entry = (uint32)atoi(i);
     int8 seatId = j ? (int8)atoi(j) : -1;
-
     if(!entry)
         m_session->GetPlayer()->EnterVehicle(target, seatId);
     else
@@ -752,57 +651,39 @@ bool ChatHandler::HandleDebugEnterVehicle(const char * args)
             return false;
         passenger->EnterVehicle(target, seatId);
     }
-
     PSendSysMessage("Unit %u entered vehicle %d", entry, (int32)seatId);
     return true;
 }
-
 bool ChatHandler::HandleDebugSpawnVehicle(const char* args)
 {
     if (!*args)
         return false;
-
     char* e = strtok((char*)args, " ");
     char* i = strtok(NULL, " ");
-
     if (!e)
         return false;
-
     uint32 entry = (uint32)atoi(e);
-
     float x, y, z, o = m_session->GetPlayer()->GetOrientation();
     m_session->GetPlayer()->GetClosePoint(x, y, z, m_session->GetPlayer()->GetObjectSize());
-
     if(!i)
         return m_session->GetPlayer()->SummonCreature(entry, x, y, z, o);
-
     uint32 id = (uint32)atoi(i);
-
     CreatureInfo const *ci = objmgr.GetCreatureTemplate(entry);
-
     if (!ci)
         return false;
-
     VehicleEntry const *ve = sVehicleStore.LookupEntry(id);
-
     if (!ve)
         return false;
-
     Creature *v = new Creature;
-
     Map *map = m_session->GetPlayer()->GetMap();
-
     if(!v->Create(objmgr.GenerateLowGuid(HIGHGUID_VEHICLE), map, m_session->GetPlayer()->GetPhaseMask(), entry, id, m_session->GetPlayer()->GetTeam(), x, y, z, o))
     {
         delete v;
         return false;
     }
-
     map->Add((Creature*)v);
-
     return true;
 }
-
 bool ChatHandler::HandleDebugSendLargePacketCommand(const char* /*args*/)
 {
     const char* stuffingString = "This is a dummy string to push the packet's size beyond 128000 bytes. ";
@@ -812,74 +693,54 @@ bool ChatHandler::HandleDebugSendLargePacketCommand(const char* /*args*/)
     SendSysMessage(ss.str().c_str());
     return true;
 }
-
 bool ChatHandler::HandleDebugSendSetPhaseShiftCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 PhaseShift = atoi(args);
     m_session->SendSetPhaseShift(PhaseShift);
     return true;
 }
-
 bool ChatHandler::HandleDebugSetItemFlagCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* e = strtok((char*)args, " ");
     char* f = strtok(NULL, " ");
-
     if (!e || !f)
         return false;
-
     uint32 guid = (uint32)atoi(e);
     uint32 flag = (uint32)atoi(f);
-
     Item *i = m_session->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
-
     if (!i)
         return false;
-
     i->SetUInt32Value(ITEM_FIELD_FLAGS, flag);
-
     return true;
 }
-
 bool ChatHandler::HandleDebugItemExpireCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* e = strtok((char*)args, " ");
     if (!e)
         return false;
-
     uint32 guid = (uint32)atoi(e);
-
     Item *i = m_session->GetPlayer()->GetItemByGuid(MAKE_NEW_GUID(guid, 0, HIGHGUID_ITEM));
-
     if (!i)
         return false;
-
     m_session->GetPlayer()->DestroyItem( i->GetBagSlot(),i->GetSlot(), true);
     Script->ItemExpire(m_session->GetPlayer(),i->GetProto());
-
     return true;
 }
-
 //show animation
 bool ChatHandler::HandleDebugAnimCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 anim_id = atoi((char*)args);
     m_session->GetPlayer()->HandleEmoteCommand(anim_id);
     return true;
 }
-
 bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args)
 {
     if (!*args)
@@ -888,7 +749,6 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Unit* unit = getSelectedUnit();
     if (!unit)
     {
@@ -896,7 +756,6 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     int32 state = atoi((char*)args);
     if (!state)
     {
@@ -905,23 +764,18 @@ bool ChatHandler::HandleDebugSetAuraStateCommand(const char* args)
             unit->ModifyAuraState(AuraState(i),false);
         return true;
     }
-
     unit->ModifyAuraState(AuraState(abs(state)),state > 0);
     return true;
 }
-
 bool ChatHandler::HandleDebugSetValueCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
     char* pz = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     WorldObject* target = getSelectedObject();
     if(!target)
     {
@@ -929,9 +783,7 @@ bool ChatHandler::HandleDebugSetValueCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint64 guid = target->GetGUID();
-
     uint32 Opcode = (uint32)atoi(px);
     if(Opcode >= target->GetValuesCount())
     {
@@ -957,21 +809,16 @@ bool ChatHandler::HandleDebugSetValueCommand(const char* args)
         target->SetFloatValue( Opcode , fValue );
         PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode,fValue);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleDebugGetValueCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* px = strtok((char*)args, " ");
     char* pz = strtok(NULL, " ");
-
     if (!px)
         return false;
-
     Unit* target = getSelectedUnit();
     if(!target)
     {
@@ -979,9 +826,7 @@ bool ChatHandler::HandleDebugGetValueCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint64 guid = target->GetGUID();
-
     uint32 Opcode = (uint32)atoi(px);
     if(Opcode >= target->GetValuesCount())
     {
@@ -993,7 +838,6 @@ bool ChatHandler::HandleDebugGetValueCommand(const char* args)
     bool isint32 = true;
     if(pz)
         isint32 = (bool)atoi(pz);
-
     if(isint32)
     {
         iValue = target->GetUInt32Value( Opcode );
@@ -1006,52 +850,37 @@ bool ChatHandler::HandleDebugGetValueCommand(const char* args)
         sLog.outDebug(GetTrinityString(LANG_GET_FLOAT), GUID_LOPART(guid), Opcode, fValue);
         PSendSysMessage(LANG_GET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleDebugMod32ValueCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     uint32 Opcode = (uint32)atoi(px);
     int Value = atoi(py);
-
     if(Opcode >= m_session->GetPlayer()->GetValuesCount())
     {
         PSendSysMessage(LANG_TOO_BIG_INDEX, Opcode, m_session->GetPlayer()->GetGUIDLow(), m_session->GetPlayer( )->GetValuesCount());
         return false;
     }
-
     sLog.outDebug(GetTrinityString(LANG_CHANGE_32BIT), Opcode, Value);
-
     int CurrentValue = (int)m_session->GetPlayer( )->GetUInt32Value( Opcode );
-
     CurrentValue += Value;
     m_session->GetPlayer( )->SetUInt32Value( Opcode , (uint32)CurrentValue );
-
     PSendSysMessage(LANG_CHANGE_32BIT_FIELD, Opcode,CurrentValue);
-
     return true;
 }
-
 bool ChatHandler::HandleDebugUpdateCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint32 updateIndex;
     uint32 value;
-
     char* pUpdateIndex = strtok((char*)args, " ");
-
     Unit* chr = getSelectedUnit();
     if (chr == NULL)
     {
@@ -1059,7 +888,6 @@ bool ChatHandler::HandleDebugUpdateCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!pUpdateIndex)
     {
         return true;
@@ -1074,21 +902,15 @@ bool ChatHandler::HandleDebugUpdateCommand(const char* args)
     {
         if (updateIndex>=UNIT_END) return true;
     }
-
     char*  pvalue = strtok(NULL, " ");
     if (!pvalue)
     {
         value=chr->GetUInt32Value(updateIndex);
-
         PSendSysMessage(LANG_UPDATE, chr->GetGUIDLow(),updateIndex,value);
         return true;
     }
-
     value=atoi(pvalue);
-
     PSendSysMessage(LANG_UPDATE_CHANGE, chr->GetGUIDLow(),updateIndex,value);
-
     chr->SetUInt32Value(updateIndex,value);
-
     return true;
 }
diff --git a/src/game/DestinationHolder.cpp b/src/game/DestinationHolder.cpp
index f2158e3b5be..997f250abca 100644
--- a/src/game/DestinationHolder.cpp
+++ b/src/game/DestinationHolder.cpp
@@ -17,6 +17,5 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "DestinationHolder.h"
 
diff --git a/src/game/DestinationHolder.h b/src/game/DestinationHolder.h
index e41ced5980a..f70538bd768 100644
--- a/src/game/DestinationHolder.h
+++ b/src/game/DestinationHolder.h
@@ -17,18 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_DESTINATION_HOLDER_H
 #define TRINITY_DESTINATION_HOLDER_H
-
 #include "Platform/Define.h"
 #include "Timer.h"
-
 class WorldObject;
 class Map;
-
 #define TRAVELLER_UPDATE_INTERVAL  300
-
 template<typename TRAVELLER>
 class TRINITY_DLL_DECL DestinationHolder
 {
@@ -38,11 +33,9 @@ class TRINITY_DLL_DECL DestinationHolder
     bool i_destSet;
     float i_fromX, i_fromY, i_fromZ;
     float i_destX, i_destY, i_destZ;
-
     public:
         DestinationHolder() : i_tracker(TRAVELLER_UPDATE_INTERVAL), i_totalTravelTime(0), i_timeElapsed(0),
             i_destSet(false), i_fromX(0), i_fromY(0), i_fromZ(0), i_destX(0), i_destY(0), i_destZ(0) {}
-
         uint32 SetDestination(TRAVELLER &traveller, float dest_x, float dest_y, float dest_z, bool sendMove = true);
         void GetDestination(float &x, float &y, float &z) const { x = i_destX; y = i_destY; z = i_destZ; }
         bool UpdateExpired(void) const { return i_tracker.Passed(); }
@@ -57,10 +50,8 @@ class TRINITY_DLL_DECL DestinationHolder
         void GetLocationNow(const Map * map, float &x, float &y, float &z, bool is3D = false) const;
         void GetLocationNowNoMicroMovement(float &x, float &y, float &z) const; // For use without micro movement
         float GetDistance3dFromDestSq(const WorldObject &obj) const;
-
     private:
         void _findOffSetPoint(float x1, float y1, float x2, float y2, float offset, float &x, float &y);
-
 };
 #endif
 
diff --git a/src/game/DestinationHolderImp.h b/src/game/DestinationHolderImp.h
index 226a90d9279..db14ae50f34 100644
--- a/src/game/DestinationHolderImp.h
+++ b/src/game/DestinationHolderImp.h
@@ -17,15 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_DESTINATIONHOLDERIMP_H
 #define TRINITY_DESTINATIONHOLDERIMP_H
-
 #include "MapManager.h"
 #include "DestinationHolder.h"
-
 #include <cmath>
-
 template<typename TRAVELLER>
 void
 DestinationHolder<TRAVELLER>::_findOffSetPoint(float x1, float y1, float x2, float y2, float offset, float &x, float &y)
@@ -61,7 +57,6 @@ DestinationHolder<TRAVELLER>::_findOffSetPoint(float x1, float y1, float x2, flo
         }
     }
 }
-
 template<typename TRAVELLER>
 uint32
 DestinationHolder<TRAVELLER>::SetDestination(TRAVELLER &traveller, float dest_x, float dest_y, float dest_z, bool sendMove)
@@ -70,42 +65,34 @@ DestinationHolder<TRAVELLER>::SetDestination(TRAVELLER &traveller, float dest_x,
     i_destX = dest_x;
     i_destY = dest_y;
     i_destZ = dest_z;
-
     return StartTravel(traveller, sendMove);
 }
-
 template<typename TRAVELLER>
 uint32
 DestinationHolder<TRAVELLER>::StartTravel(TRAVELLER &traveller, bool sendMove)
 {
     if(!i_destSet) return 0;
-
     i_fromX = traveller.GetPositionX();
     i_fromY = traveller.GetPositionY();
     i_fromZ = traveller.GetPositionZ();
-
     i_totalTravelTime = traveller.GetTotalTrevelTimeTo(i_destX,i_destY,i_destZ);
     i_timeElapsed = 0;
     if(sendMove)
         traveller.MoveTo(i_destX, i_destY, i_destZ, i_totalTravelTime);
     return i_totalTravelTime;
 }
-
 template<typename TRAVELLER>
 bool
 DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff, bool micro_movement)
 {
     i_timeElapsed += diff;
-
     // Update every TRAVELLER_UPDATE_INTERVAL
     i_tracker.Update(diff);
     if(!i_tracker.Passed())
         return false;
     else
         ResetUpdate();
-
     if(!i_destSet) return true;
-
     float x, y, z;
     if (!micro_movement)
         GetLocationNowNoMicroMovement(x, y, z);
@@ -113,36 +100,29 @@ DestinationHolder<TRAVELLER>::UpdateTraveller(TRAVELLER &traveller, uint32 diff,
     {
         if (!traveller.GetTraveller().hasUnitState(UNIT_STAT_MOVING | UNIT_STAT_IN_FLIGHT))
             return true;
-
         if (traveller.GetTraveller().hasUnitState(UNIT_STAT_IN_FLIGHT))
             GetLocationNow(traveller.GetTraveller().GetBaseMap() ,x, y, z, true);                  // Should reposition Object with right Coord, so I can bypass some Grid Relocation
         else
             GetLocationNow(traveller.GetTraveller().GetBaseMap(), x, y, z, false);
-
         // Change movement computation to micro movement based on last tick coords, this makes system work
         // even on multiple floors zones without hugh vmaps usage ;)
-
         // Take care of underrun of uint32
         if (i_totalTravelTime >= i_timeElapsed)
             i_totalTravelTime -= i_timeElapsed;     // Consider only the remaining part
         else
             i_totalTravelTime = 0;
-
         i_timeElapsed = 0;
         i_fromX = x;                            // and change origine
         i_fromY = y;                            // then I take into account only micro movement
         i_fromZ = z;
     }
-
     if (traveller.GetTraveller().GetPositionX() != x || traveller.GetTraveller().GetPositionY() != y || traveller.GetTraveller().GetPositionZ() != z)
     {
         float ori = traveller.GetTraveller().GetAngle(x, y);
         traveller.Relocation(x, y, z, ori);
     }
-
     return true;
 }
-
 template<typename TRAVELLER>
 void
 DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y, float &z, bool is3D) const
@@ -177,7 +157,6 @@ DestinationHolder<TRAVELLER>::GetLocationNow(const Map * map, float &x, float &y
         }
     }
 }
-
 template<typename TRAVELLER>
 float
 DestinationHolder<TRAVELLER>::GetDistance3dFromDestSq(const WorldObject &obj) const
@@ -186,14 +165,12 @@ DestinationHolder<TRAVELLER>::GetDistance3dFromDestSq(const WorldObject &obj) co
     obj.GetPosition(x,y,z);
     return (i_destX-x)*(i_destX-x)+(i_destY-y)*(i_destY-y)+(i_destZ-z)*(i_destZ-z);
 }
-
 template<typename TRAVELLER>
 float
 DestinationHolder<TRAVELLER>::GetDestinationDiff(float x, float y, float z) const
 {
     return sqrt(((x-i_destX)*(x-i_destX)) + ((y-i_destY)*(y-i_destY)) + ((z-i_destZ)*(z-i_destZ)));
 }
-
 template<typename TRAVELLER>
 void
 DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y, float &z) const
@@ -212,6 +189,5 @@ DestinationHolder<TRAVELLER>::GetLocationNowNoMicroMovement(float &x, float &y,
         z = i_fromZ + ((i_destZ - i_fromZ) * percent_passed);
     }
 }
-
 #endif
 
diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp
index c35b9dbdc07..64ec8f6352b 100644
--- a/src/game/DuelHandler.cpp
+++ b/src/game/DuelHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -25,63 +24,49 @@
 #include "Opcodes.h"
 #include "UpdateData.h"
 #include "Player.h"
-
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
 {
     uint64 guid;
     Player *pl;
     Player *plTarget;
-
     if(!GetPlayer()->duel)                                  // ignore accept from duel-sender
         return;
-
     recvPacket >> guid;
-
     pl       = GetPlayer();
     plTarget = pl->duel->opponent;
-
     if(pl == pl->duel->initiator || !plTarget || pl == plTarget || pl->duel->startTime != 0 || plTarget->duel->startTime != 0)
         return;
-
     //sLog.outDebug( "WORLD: received CMSG_DUEL_ACCEPTED" );
     DEBUG_LOG("Player 1 is: %u (%s)", pl->GetGUIDLow(),pl->GetName());
     DEBUG_LOG("Player 2 is: %u (%s)", plTarget->GetGUIDLow(),plTarget->GetName());
-
     time_t now = time(NULL);
     pl->duel->startTimer = now;
     plTarget->duel->startTimer = now;
-
     WorldPacket data(SMSG_DUEL_COUNTDOWN, 4);
     data << (uint32)3000;                                   // 3 seconds
     pl->GetSession()->SendPacket(&data);
     plTarget->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandleDuelCancelledOpcode(WorldPacket& recvPacket)
 {
     //sLog.outDebug( "WORLD: received CMSG_DUEL_CANCELLED" );
-
     // no duel requested
     if(!GetPlayer()->duel)
         return;
-
     // player surrendered in a duel using /forfeit
     if(GetPlayer()->duel->startTime != 0)
     {
         GetPlayer()->CombatStopWithPets(true);
         if(GetPlayer()->duel->opponent)
             GetPlayer()->duel->opponent->CombatStopWithPets(true);
-
         GetPlayer()->CastSpell(GetPlayer(), SPELL_ID_DUEL_BEG, true);    // beg
         GetPlayer()->DuelComplete(DUEL_WON);
         return;
     }
-
     // player either discarded the duel using the "discard button"
     // or used "/forfeit" before countdown reached 0
     uint64 guid;
     recvPacket >> guid;
-
     GetPlayer()->DuelComplete(DUEL_INTERUPTED);
 }
 
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index 30147732b08..fcc3922a987 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "UpdateMask.h"
 #include "Opcodes.h"
@@ -27,17 +26,13 @@
 #include "GridNotifiers.h"
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
-
 DynamicObject::DynamicObject() : WorldObject()
 {
     m_objectType |= TYPEMASK_DYNAMICOBJECT;
     m_objectTypeId = TYPEID_DYNAMICOBJECT;
-
     m_updateFlag = (UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION);
-
     m_valuesCount = DYNAMICOBJECT_END;
 }
-
 void DynamicObject::AddToWorld()
 {
     ///- Register the dynamicObject for guid lookup
@@ -47,7 +42,6 @@ void DynamicObject::AddToWorld()
         WorldObject::AddToWorld();
     }
 }
-
 void DynamicObject::RemoveFromWorld()
 {
     ///- Remove the dynamicObject from the accessor
@@ -69,7 +63,6 @@ void DynamicObject::RemoveFromWorld()
         ObjectAccessor::Instance().RemoveObject(this);
     }
 }
-
 bool DynamicObject::Create(uint32 guidlow, Unit *caster, uint32 spellId, uint32 effMask, const Position &pos, int32 duration, float radius, bool active)
 {
     SetMap(caster->GetMap());
@@ -79,9 +72,7 @@ bool DynamicObject::Create(uint32 guidlow, Unit *caster, uint32 spellId, uint32
         sLog.outError("DynamicObject (spell %u eff %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",spellId,effMask,GetPositionX(),GetPositionY());
         return false;
     }
-
     WorldObject::_Create(guidlow, HIGHGUID_DYNAMICOBJECT, caster->GetPhaseMask());
-
     SetEntry(spellId);
     SetFloatValue( OBJECT_FIELD_SCALE_X, 1 );
     SetUInt64Value( DYNAMICOBJECT_CASTER, caster->GetGUID() );
@@ -92,23 +83,19 @@ bool DynamicObject::Create(uint32 guidlow, Unit *caster, uint32 spellId, uint32
     SetFloatValue( DYNAMICOBJECT_POS_Y, pos.m_positionY );
     SetFloatValue( DYNAMICOBJECT_POS_Z, pos.m_positionZ );
     SetUInt32Value( DYNAMICOBJECT_CASTTIME, getMSTime() );  // new 2.4.0
-
     m_aliveDuration = duration;
     m_radius = radius;
     m_effMask = effMask;
     m_spellId = spellId;
     m_updateTimer = 0;
-
     m_isWorldObject = active;
     return true;
 }
-
 Unit* DynamicObject::GetCaster() const
 {
     // can be not found in some cases
     return ObjectAccessor::GetUnit(*this, GetCasterGUID());
 }
-
 void DynamicObject::Update(uint32 p_time)
 {
     // caster can be not in world at time dynamic object update, but dynamic object not yet deleted in Unit destructor
@@ -118,14 +105,11 @@ void DynamicObject::Update(uint32 p_time)
         Delete();
         return;
     }
-
     bool deleteThis = false;
-
     if(m_aliveDuration > int32(p_time))
         m_aliveDuration -= p_time;
     else
         deleteThis = true;
-
     /*
     // have radius and work as persistent effect
     if(m_radius)
@@ -135,18 +119,14 @@ void DynamicObject::Update(uint32 p_time)
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
         cell.SetNoCreate();
- 
         MaNGOS::DynamicObjectUpdater notifier(*this, caster);
- 
         TypeContainerVisitor<MaNGOS::DynamicObjectUpdater, WorldTypeMapContainer > world_object_notifier(notifier);
         TypeContainerVisitor<MaNGOS::DynamicObjectUpdater, GridTypeMapContainer > grid_object_notifier(notifier);
- 
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, world_object_notifier, *GetMap(), *this, m_radius);
         cell_lock->Visit(cell_lock, grid_object_notifier, *GetMap(), *this, m_radius);
     }
     */
-
     if (m_effMask)
     {
         if (m_updateTimer < p_time)
@@ -156,21 +136,18 @@ void DynamicObject::Update(uint32 p_time)
             m_updateTimer = 500; // is this official-like?
         } else m_updateTimer -= p_time;
     }
-
     if (deleteThis)
     {
         caster->RemoveDynObjectWithGUID(GetGUID());
         Delete();
     }
 }
-
 void DynamicObject::Delete()
 {
     SendObjectDeSpawnAnim(GetGUID());
     RemoveFromWorld();
     AddObjectToRemoveList();
 }
-
 void DynamicObject::Delay(int32 delaytime)
 {
     m_aliveDuration -= delaytime;
@@ -178,7 +155,6 @@ void DynamicObject::Delay(int32 delaytime)
         if (*iunit)
             (*iunit)->DelayAura(m_spellId, GetCaster()->GetGUID(), delaytime);
 }
-
 bool DynamicObject::isVisibleForInState(Player const* u, bool inVisibleList) const
 {
     return IsInWorld() && u->IsInWorld()
diff --git a/src/game/DynamicObject.h b/src/game/DynamicObject.h
index 13747891964..0fd5e50eb50 100644
--- a/src/game/DynamicObject.h
+++ b/src/game/DynamicObject.h
@@ -17,24 +17,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_DYNAMICOBJECT_H
 #define TRINITYCORE_DYNAMICOBJECT_H
-
 #include "Object.h"
-
 class Unit;
 struct SpellEntry;
-
 class DynamicObject : public WorldObject
 {
     public:
         typedef std::set<Unit*> AffectedSet;
         explicit DynamicObject();
-
         void AddToWorld();
         void RemoveFromWorld();
-
         bool Create(uint32 guidlow, Unit *caster, uint32 spellId, uint32 effMask, const Position &pos, int32 duration, float radius, bool active);
         void Update(uint32 p_time);
         void Delete();
@@ -51,13 +45,11 @@ class DynamicObject : public WorldObject
         void RemoveAffected(Unit *unit) { m_affected.erase(unit); }
         void Delay(int32 delaytime);
         bool isVisibleForInState(Player const* u, bool inVisibleList) const;
-
         void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
         void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
         void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
         void Whisper(int32 textId,uint64 receiver) { MonsterWhisper(textId,receiver); }
         void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); }
-
         GridReference<DynamicObject> &GetGridRef() { return m_gridRef; }
     protected:
         uint32 m_spellId;
diff --git a/src/game/FleeingMovementGenerator.cpp b/src/game/FleeingMovementGenerator.cpp
index eef98b705cc..35cfcca52d0 100644
--- a/src/game/FleeingMovementGenerator.cpp
+++ b/src/game/FleeingMovementGenerator.cpp
@@ -17,66 +17,53 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "MapManager.h"
 #include "FleeingMovementGenerator.h"
 #include "DestinationHolderImp.h"
 #include "ObjectAccessor.h"
-
 #define MIN_QUIET_DISTANCE 28.0f
 #define MAX_QUIET_DISTANCE 43.0f
-
 template<class T>
 void
 FleeingMovementGenerator<T>::_setTargetLocation(T &owner)
 {
     if( !&owner )
         return;
-
     if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED) )
         return;
-
     if(!_setMoveData(owner))
         return;
-
     float x, y, z;
     if(!_getPoint(owner, x, y, z))
         return;
-
     owner.addUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING);
     Traveller<T> traveller(owner);
     i_destinationHolder.SetDestination(traveller, x, y, z);
 }
-
 template<>
 bool FleeingMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
     if(i_destinationHolder.HasArrived())
         return false;
-
     i_destinationHolder.GetDestination(x, y, z);
     return true;
 }
-
 template<>
 bool FleeingMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const
 {
     return false;
 }
-
 template<class T>
 bool
 FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
 {
     if(!&owner)
         return false;
-
     x = owner.GetPositionX();
     y = owner.GetPositionY();
     z = owner.GetPositionZ();
-
     float temp_x, temp_y, angle;
     const Map * _map = owner.GetBaseMap();
     //primitive path-finding
@@ -84,9 +71,7 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
     {
         if(i_only_forward && i > 2)
             break;
-
         float distance = 5.0f;
-
         switch(i)
         {
             case 0:
@@ -164,7 +149,6 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
         if( owner.IsWithinLOS(temp_x,temp_y,z))
         {
             bool is_water_now = _map->IsInWater(x,y,z);
-
             if(is_water_now && _map->IsInWater(temp_x,temp_y,z))
             {
                 x = temp_x;
@@ -172,15 +156,11 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
                 return true;
             }
             float new_z = _map->GetHeight(temp_x,temp_y,z,true);
-
             if(new_z <= INVALID_HEIGHT)
                 continue;
-
             bool is_water_next = _map->IsInWater(temp_x,temp_y,new_z);
-
             if((is_water_now && !is_water_next && !is_land_ok) || (!is_water_now && is_water_next && !is_water_ok))
                 continue;
-
             if( !(new_z - z) || distance / fabs(new_z - z) > 1.0f)
             {
                 float new_z_left = _map->GetHeight(temp_x + 1.0f*cos(angle+M_PI/2),temp_y + 1.0f*sin(angle+M_PI/2),z,true);
@@ -199,13 +179,11 @@ FleeingMovementGenerator<T>::_getPoint(T &owner, float &x, float &y, float &z)
     i_nextCheckTime.Reset( urand(500,1000) );
     return false;
 }
-
 template<class T>
 bool
 FleeingMovementGenerator<T>::_setMoveData(T &owner)
 {
     float cur_dist_xyz = owner.GetDistance(i_caster_x, i_caster_y, i_caster_z);
-
     if(i_to_distance_from_caster > 0.0f)
     {
         if((i_last_distance_from_caster > i_to_distance_from_caster && cur_dist_xyz < i_to_distance_from_caster)   ||
@@ -230,12 +208,9 @@ FleeingMovementGenerator<T>::_setMoveData(T &owner)
             return true;
         }
     }
-
     float cur_dist;
     float angle_to_caster;
-
     Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID);
-
     if(fright)
     {
         cur_dist = fright->GetDistance(&owner);
@@ -257,13 +232,10 @@ FleeingMovementGenerator<T>::_setMoveData(T &owner)
         cur_dist = cur_dist_xyz;
         angle_to_caster = owner.GetAngle(i_caster_x, i_caster_y) + M_PI;
     }
-
     // if we too close may use 'path-finding' else just stop
     i_only_forward = cur_dist >= MIN_QUIET_DISTANCE/3;
-
     //get angle and 'distance from caster' to run
     float angle;
-
     if(i_cur_angle == 0.0f && i_last_distance_from_caster == 0.0f) //just started, first time
     {
         angle = rand_norm()*(1.0f - cur_dist/MIN_QUIET_DISTANCE) * M_PI/3 + rand_norm()*M_PI*2/3;
@@ -285,30 +257,24 @@ FleeingMovementGenerator<T>::_setMoveData(T &owner)
         angle = rand_norm()*M_PI;
         i_to_distance_from_caster = MIN_QUIET_DISTANCE + 2.5f + rand_norm()*(MAX_QUIET_DISTANCE - MIN_QUIET_DISTANCE - 2.5f);
     }
-
     int8 sign = rand_norm() > 0.5f ? 1 : -1;
     i_cur_angle = sign*angle + angle_to_caster;
-
     // current distance
     i_last_distance_from_caster = cur_dist;
-
     return true;
 }
-
 template<class T>
 void
 FleeingMovementGenerator<T>::Initialize(T &owner)
 {
     if(!&owner)
         return;
-
     _Init(owner);
     owner.CastStop();
     owner.addUnitState(UNIT_STAT_FLEEING | UNIT_STAT_ROAMING);
     owner.SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
     owner.SetUInt64Value(UNIT_FIELD_TARGET, 0);
     owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-
     if(Unit * fright = ObjectAccessor::GetUnit(owner, i_frightGUID))
     {
         i_caster_x = fright->GetPositionX();
@@ -321,25 +287,21 @@ FleeingMovementGenerator<T>::Initialize(T &owner)
         i_caster_y = owner.GetPositionY();
         i_caster_z = owner.GetPositionZ();
     }
-
     i_only_forward = true;
     i_cur_angle = 0.0f;
     i_last_distance_from_caster = 0.0f;
     i_to_distance_from_caster = 0.0f;
     _setTargetLocation(owner);
 }
-
 template<>
 void
 FleeingMovementGenerator<Creature>::_Init(Creature &owner)
 {
     if(!&owner)
         return;
-
     is_water_ok = owner.canSwim();
     is_land_ok  = owner.canWalk();
 }
-
 template<>
 void
 FleeingMovementGenerator<Player>::_Init(Player &)
@@ -347,7 +309,6 @@ FleeingMovementGenerator<Player>::_Init(Player &)
     is_water_ok = true;
     is_land_ok  = true;
 }
-
 template<class T>
 void
 FleeingMovementGenerator<T>::Finalize(T &owner)
@@ -357,14 +318,12 @@ FleeingMovementGenerator<T>::Finalize(T &owner)
     if(owner.GetTypeId() == TYPEID_UNIT && owner.getVictim())
         owner.SetUInt64Value(UNIT_FIELD_TARGET, owner.getVictim()->GetGUID());
 }
-
 template<class T>
 void
 FleeingMovementGenerator<T>::Reset(T &owner)
 {
     Initialize(owner);
 }
-
 template<class T>
 bool
 FleeingMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
@@ -373,17 +332,13 @@ FleeingMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
         return false;
     if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED) )
         return true;
-
     Traveller<T> traveller(owner);
-
     i_nextCheckTime.Update(time_diff);
-
     if( (owner.IsStopped() && !i_destinationHolder.HasArrived()) || !i_destinationHolder.HasDestination() )
     {
         _setTargetLocation(owner);
         return true;
     }
-
     if (i_destinationHolder.UpdateTraveller(traveller, time_diff))
     {
         i_destinationHolder.ResetUpdate(50);
@@ -395,7 +350,6 @@ FleeingMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
     }
     return true;
 }
-
 template void FleeingMovementGenerator<Player>::Initialize(Player &);
 template void FleeingMovementGenerator<Creature>::Initialize(Creature &);
 template bool FleeingMovementGenerator<Player>::_setMoveData(Player &);
@@ -410,7 +364,6 @@ template void FleeingMovementGenerator<Player>::Reset(Player &);
 template void FleeingMovementGenerator<Creature>::Reset(Creature &);
 template bool FleeingMovementGenerator<Player>::Update(Player &, const uint32 &);
 template bool FleeingMovementGenerator<Creature>::Update(Creature &, const uint32 &);
-
 void TimedFleeingMovementGenerator::Finalize(Unit &owner)
 {
     owner.RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_FLEEING);
@@ -424,19 +377,15 @@ void TimedFleeingMovementGenerator::Finalize(Unit &owner)
         }
     }
 }
-
 bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32 & time_diff)
 {
     if( !owner.isAlive() )
         return false;
-
     if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED) )
         return true;
-
     i_totalFleeTime.Update(time_diff);
     if (i_totalFleeTime.Passed())
         return false;
-
     // This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version
     // This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly
     return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff);
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h
index 0bc4bdb9757..98a2058ad1d 100644
--- a/src/game/FleeingMovementGenerator.h
+++ b/src/game/FleeingMovementGenerator.h
@@ -17,39 +17,31 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
 #ifndef TRINITY_FLEEINGMOVEMENTGENERATOR_H
 #define TRINITY_FLEEINGMOVEMENTGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-
 template<class T>
 class TRINITY_DLL_SPEC FleeingMovementGenerator
 : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> >
 {
     public:
         FleeingMovementGenerator(uint64 fright) : i_frightGUID(fright), i_nextCheckTime(0) {}
-
         void Initialize(T &);
         void Finalize(T &);
         void Reset(T &);
         bool Update(T &, const uint32 &);
         bool GetDestination(float &x, float &y, float &z) const;
-
         MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; }
-
     private:
         void _setTargetLocation(T &owner);
         bool _getPoint(T &owner, float &x, float &y, float &z);
         bool _setMoveData(T &owner);
         void _Init(T &);
-
         bool is_water_ok   :1;
         bool is_land_ok    :1;
         bool i_only_forward:1;
-
         float i_caster_x;
         float i_caster_y;
         float i_caster_z;
@@ -58,10 +50,8 @@ class TRINITY_DLL_SPEC FleeingMovementGenerator
         float i_cur_angle;
         uint64 i_frightGUID;
         TimeTracker i_nextCheckTime;
-
         DestinationHolder< Traveller<T> > i_destinationHolder;
 };
-
 class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
 : public FleeingMovementGenerator<Creature>
 {
@@ -69,14 +59,11 @@ class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
         TimedFleeingMovementGenerator(uint64 fright, uint32 time) :
             FleeingMovementGenerator<Creature>(fright),
             i_totalFleeTime(time) {}
-
         MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; }
         bool Update(Unit &, const uint32 &);
         void Finalize(Unit &);
-
     private:
         TimeTracker i_totalFleeTime;
 };
-
 #endif
 
diff --git a/src/game/FollowerRefManager.h b/src/game/FollowerRefManager.h
index 093c85adcee..4f830b5e200 100644
--- a/src/game/FollowerRefManager.h
+++ b/src/game/FollowerRefManager.h
@@ -17,18 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER
-
 #include "Utilities/LinkedReference/RefManager.h"
-
 class Unit;
 class TargetedMovementGeneratorBase;
-
 class FollowerRefManager : public RefManager<Unit, TargetedMovementGeneratorBase>
 {
-
 };
 #endif
 
diff --git a/src/game/FollowerReference.cpp b/src/game/FollowerReference.cpp
index 173f9881c54..b81194e6daa 100644
--- a/src/game/FollowerReference.cpp
+++ b/src/game/FollowerReference.cpp
@@ -17,21 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Unit.h"
 #include "TargetedMovementGenerator.h"
 #include "FollowerReference.h"
-
 void FollowerReference::targetObjectBuildLink()
 {
     getTarget()->addFollower(this);
 }
-
 void FollowerReference::targetObjectDestroyLink()
 {
     getTarget()->removeFollower(this);
 }
-
 void FollowerReference::sourceObjectDestroyLink()
 {
     getSource()->stopFollowing();
diff --git a/src/game/FollowerReference.h b/src/game/FollowerReference.h
index 3c0b3dc9e7c..0e42ac54ce7 100644
--- a/src/game/FollowerReference.h
+++ b/src/game/FollowerReference.h
@@ -17,15 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H
-
 #include "Utilities/LinkedReference/Reference.h"
-
 class TargetedMovementGeneratorBase;
 class Unit;
-
 class TRINITY_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase>
 {
     protected:
diff --git a/src/game/Formulas.h b/src/game/Formulas.h
index 2ec175f95be..7a2efdffc4e 100644
--- a/src/game/Formulas.h
+++ b/src/game/Formulas.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_FORMULAS_H
 #define TRINITY_FORMULAS_H
-
 #include "World.h"
-
 namespace Trinity
 {
     namespace Honor
@@ -35,7 +32,6 @@ namespace Trinity
     namespace XP
     {
         enum XPColorChar { RED, ORANGE, YELLOW, GREEN, GRAY };
-
         inline uint32 GetGrayLevel(uint32 pl_level)
         {
             if( pl_level <= 5 )
@@ -47,7 +43,6 @@ namespace Trinity
             else
                 return pl_level - 9;
         }
-
         inline XPColorChar GetColorCode(uint32 pl_level, uint32 mob_level)
         {
             if( mob_level >= pl_level + 5 )
@@ -61,7 +56,6 @@ namespace Trinity
             else
                 return GRAY;
         }
-
         inline uint32 GetZeroDifference(uint32 pl_level)
         {
             if( pl_level < 8 )  return 5;
@@ -77,7 +71,6 @@ namespace Trinity
             if( pl_level < 60 ) return 16;
             return 17;
         }
-
         inline uint32 BaseGain(uint32 pl_level, uint32 mob_level, ContentLevels content)
         {
             uint32 nBaseExp;
@@ -90,7 +83,6 @@ namespace Trinity
                     sLog.outError("BaseGain: Unsupported content level %u",content);
                     nBaseExp = 45;  break;
             }
-
             if( mob_level >= pl_level )
             {
                 uint32 nLevelDiff = mob_level - pl_level;
@@ -109,24 +101,19 @@ namespace Trinity
                 return 0;
             }
         }
-
         inline uint32 Gain(Player *pl, Unit *u)
         {
             if(u->GetTypeId()==TYPEID_UNIT && (
                 ((Creature*)u)->isTotem() || ((Creature*)u)->isPet() ||
                 (((Creature*)u)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_XP_AT_KILL) ))
                 return 0;
-
             uint32 xp_gain= BaseGain(pl->getLevel(), u->getLevel(), GetContentLevelsForMapAndZone(u->GetMapId(),u->GetZoneId()));
             if( xp_gain == 0 )
                 return 0;
-
             if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->isElite())
                 xp_gain *= 2;
-
             return (uint32)(xp_gain*sWorld.getRate(RATE_XP_KILL));
         }
-
         inline float xp_in_group_rate(uint32 count, bool isRaid)
         {
             if(isRaid)
diff --git a/src/game/GameEventMgr.cpp b/src/game/GameEventMgr.cpp
index 5b7aa737bc0..9b70b253afc 100644
--- a/src/game/GameEventMgr.cpp
+++ b/src/game/GameEventMgr.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "GameEventMgr.h"
 #include "World.h"
 #include "ObjectMgr.h"
@@ -30,9 +29,7 @@
 #include "GossipDef.h"
 #include "Player.h"
 #include "BattleGroundMgr.h"
-
 INSTANTIATE_SINGLETON_1(GameEventMgr);
-
 bool GameEventMgr::CheckOneGameEvent(uint16 entry) const
 {
     switch(mGameEvent[entry].state)
@@ -70,27 +67,21 @@ bool GameEventMgr::CheckOneGameEvent(uint16 entry) const
         }
     }
 }
-
 uint32 GameEventMgr::NextCheck(uint16 entry) const
 {
     time_t currenttime = time(NULL);
-
     // for NEXTPHASE state world events, return the delay to start the next event, so the followup event will be checked correctly
     if ((mGameEvent[entry].state == GAMEEVENT_WORLD_NEXTPHASE || mGameEvent[entry].state == GAMEEVENT_WORLD_FINISHED) && mGameEvent[entry].nextstart >= currenttime)
         return (mGameEvent[entry].nextstart - currenttime);
-
     // for CONDITIONS state world events, return the length of the wait period, so if the conditions are met, this check will be called again to set the timer as NEXTPHASE event
     if (mGameEvent[entry].state == GAMEEVENT_WORLD_CONDITIONS)
         return mGameEvent[entry].length ? mGameEvent[entry].length * 60 : max_ge_check_delay;
-
     // outdated event: we return max
     if (currenttime > mGameEvent[entry].end)
         return max_ge_check_delay;
-
     // never started event, we return delay before start
     if (mGameEvent[entry].start > currenttime)
         return (mGameEvent[entry].start - currenttime);
-
     uint32 delay;
     // in event, we return the end of it
     if ((((currenttime - mGameEvent[entry].start) % (mGameEvent[entry].occurence * 60)) < (mGameEvent[entry].length * 60)))
@@ -104,21 +95,16 @@ uint32 GameEventMgr::NextCheck(uint16 entry) const
     else
         return delay;
 }
-
 void GameEventMgr::StartInternalEvent(uint16 event_id)
 {
     if(event_id < 1 || event_id >= mGameEvent.size())
         return;
-
     if(!mGameEvent[event_id].isValid())
         return;
-
     if(m_ActiveEvents.find(event_id) != m_ActiveEvents.end())
         return;
-
     StartEvent(event_id);
 }
-
 bool GameEventMgr::StartEvent( uint16 event_id, bool overwrite )
 {
     if(mGameEvent[event_id].state == GAMEEVENT_NORMAL
@@ -139,12 +125,10 @@ bool GameEventMgr::StartEvent( uint16 event_id, bool overwrite )
         if( mGameEvent[event_id].state == GAMEEVENT_WORLD_INACTIVE )
             // set to conditions phase
             mGameEvent[event_id].state = GAMEEVENT_WORLD_CONDITIONS;
-
         // add to active events
         AddActiveEvent(event_id);
         // add spawns
         ApplyNewEvent(event_id);
-
         // check if can go to next state
         bool conditions_met = CheckOneGameEventConditions(event_id);
         // save to db
@@ -154,18 +138,14 @@ bool GameEventMgr::StartEvent( uint16 event_id, bool overwrite )
         // or to scedule another update where the next event will be started
         if(overwrite && conditions_met)
             sWorld.ForceGameEventUpdate();
-
         return conditions_met;
     }
 }
-
 void GameEventMgr::StopEvent( uint16 event_id, bool overwrite )
 {
     bool serverwide_evt = mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL;
-
     RemoveActiveEvent(event_id);
     UnApplyEvent(event_id);
-
     if(overwrite && !serverwide_evt)
     {
         mGameEvent[event_id].start = time(NULL) - mGameEvent[event_id].length * MINUTE;
@@ -190,7 +170,6 @@ void GameEventMgr::StopEvent( uint16 event_id, bool overwrite )
         }
     }
 }
-
 void GameEventMgr::LoadFromDB()
 {
     {
@@ -201,15 +180,11 @@ void GameEventMgr::LoadFromDB()
             sLog.outString();
             return;
         }
-
         Field *fields = result->Fetch();
-
         uint32 max_event_id = fields[0].GetUInt16();
         delete result;
-
         mGameEvent.resize(max_event_id+1);
     }
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,UNIX_TIMESTAMP(start_time),UNIX_TIMESTAMP(end_time),occurence,length,holiday,description,world_event FROM game_event");
     if( !result )
     {
@@ -218,25 +193,20 @@ void GameEventMgr::LoadFromDB()
         sLog.outString();
         return;
     }
-
     uint32 count = 0;
-
     {
         barGoLink bar( result->GetRowCount() );
         do
         {
             ++count;
             Field *fields = result->Fetch();
-
             bar.step();
-
             uint16 event_id = fields[0].GetUInt16();
             if(event_id==0)
             {
                 sLog.outErrorDb("`game_event` game event id (%i) is reserved and can't be used.",event_id);
                 continue;
             }
-
             GameEventData& pGameEvent = mGameEvent[event_id];
             uint64 starttime        = fields[1].GetUInt64();
             pGameEvent.start        = time_t(starttime);
@@ -245,16 +215,13 @@ void GameEventMgr::LoadFromDB()
             pGameEvent.occurence    = fields[3].GetUInt32();
             pGameEvent.length       = fields[4].GetUInt32();
             pGameEvent.holiday_id   = fields[5].GetUInt32();
-
             pGameEvent.state        = (GameEventState)(fields[7].GetUInt8());
             pGameEvent.nextstart    = 0;
-
             if(pGameEvent.length==0 && pGameEvent.state == GAMEEVENT_NORMAL)                            // length>0 is validity check
             {
                 sLog.outErrorDb("`game_event` game event id (%i) isn't a world event and has length = 0, thus it can't be used.",event_id);
                 continue;
             }
-
             if(pGameEvent.holiday_id)
             {
                 if(!sHolidaysStore.LookupEntry(pGameEvent.holiday_id))
@@ -263,47 +230,36 @@ void GameEventMgr::LoadFromDB()
                     pGameEvent.holiday_id = 0;
                 }
             }
-
             pGameEvent.description  = fields[6].GetCppString();
-
         } while( result->NextRow() );
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u game events", count );
     }
-
     // load game event saves
     //                                       0         1      2
     result = CharacterDatabase.Query("SELECT event_id, state, UNIX_TIMESTAMP(next_start) FROM game_event_save");
-
     count = 0;
     if( !result )
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u game event saves in game events", count );
     }
     else
     {
-
         barGoLink bar2( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint16 event_id = fields[0].GetUInt16();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_save` game event id (%i) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             if(mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL)
             {
                 mGameEvent[event_id].state = (GameEventState)(fields[1].GetUInt8());
@@ -314,44 +270,35 @@ void GameEventMgr::LoadFromDB()
                 sLog.outErrorDb("game_event_save includes event save for non-worldevent id %u",event_id);
                 continue;
             }
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u game event saves in game events", count );
         delete result;
     }
-
     // load game event links (prerequisites)
     result = WorldDatabase.Query("SELECT event_id, prerequisite_event FROM game_event_prerequisite");
     if( !result )
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u game event prerequisites in game events", count );
     }
     else
     {
-
         barGoLink bar2( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint16 event_id = fields[0].GetUInt16();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_prerequisite` game event id (%i) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
 
-
             if(mGameEvent[event_id].state != GAMEEVENT_NORMAL && mGameEvent[event_id].state != GAMEEVENT_INTERNAL)
             {
                 uint16 prerequisite_event = fields[1].GetUInt16();
@@ -367,141 +314,110 @@ void GameEventMgr::LoadFromDB()
                 sLog.outErrorDb("game_event_prerequisiste includes event entry for non-worldevent id %u",event_id);
                 continue;
             }
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u game event prerequisites in game events", count );
         delete result;
     }
-
     mGameEventCreatureGuids.resize(mGameEvent.size()*2-1);
     //                                   1              2
     result = WorldDatabase.Query("SELECT creature.guid, game_event_creature.event "
         "FROM creature JOIN game_event_creature ON creature.guid = game_event_creature.guid");
-
     count = 0;
     if( !result )
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u creatures in game events", count );
     }
     else
     {
-
         barGoLink bar( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar.step();
-
             uint32 guid    = fields[0].GetUInt32();
             int16 event_id = fields[1].GetInt16();
-
             int32 internal_event_id = mGameEvent.size() + event_id - 1;
-
             if(internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size())
             {
                 sLog.outErrorDb("`game_event_creature` game event id (%i) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             GuidList& crelist = mGameEventCreatureGuids[internal_event_id];
             crelist.push_back(guid);
-
         } while( result->NextRow() );
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u creatures in game events", count );
     }
-
     mGameEventGameobjectGuids.resize(mGameEvent.size()*2-1);
     //                                   1                2
     result = WorldDatabase.Query("SELECT gameobject.guid, game_event_gameobject.event "
         "FROM gameobject JOIN game_event_gameobject ON gameobject.guid=game_event_gameobject.guid");
-
     count = 0;
     if( !result )
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u gameobjects in game events", count );
     }
     else
     {
-
         barGoLink bar( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar.step();
-
             uint32 guid    = fields[0].GetUInt32();
             int16 event_id = fields[1].GetInt16();
-
             int32 internal_event_id = mGameEvent.size() + event_id - 1;
-
             if(internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size())
             {
                 sLog.outErrorDb("`game_event_gameobject` game event id (%i) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             GuidList& golist = mGameEventGameobjectGuids[internal_event_id];
             golist.push_back(guid);
-
         } while( result->NextRow() );
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u gameobjects in game events", count );
     }
-
     mGameEventModelEquip.resize(mGameEvent.size());
     //                                   0              1                             2
     result = WorldDatabase.Query("SELECT creature.guid, game_event_model_equip.event, game_event_model_equip.modelid,"
     //   3
         "game_event_model_equip.equipment_id "
         "FROM creature JOIN game_event_model_equip ON creature.guid=game_event_model_equip.guid");
-
     count = 0;
     if( !result )
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u model/equipment changes in game events", count );
     }
     else
     {
-
         barGoLink bar( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar.step();
             uint32 guid     = fields[0].GetUInt32();
             uint16 event_id = fields[1].GetUInt16();
-
             if(event_id >= mGameEventModelEquip.size())
             {
                 sLog.outErrorDb("`game_event_model_equip` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             ModelEquipList& equiplist = mGameEventModelEquip[event_id];
             ModelEquip newModelEquipSet;
@@ -509,7 +425,6 @@ void GameEventMgr::LoadFromDB()
             newModelEquipSet.equipment_id = fields[3].GetUInt32();
             newModelEquipSet.equipement_id_prev = 0;
             newModelEquipSet.modelid_prev = 0;
-
             if(newModelEquipSet.equipment_id > 0)
             {
                 if(!objmgr.GetEquipmentInfo(newModelEquipSet.equipment_id))
@@ -518,223 +433,176 @@ void GameEventMgr::LoadFromDB()
                     continue;
                 }
             }
-
             equiplist.push_back(std::pair<uint32, ModelEquip>(guid, newModelEquipSet));
-
         } while( result->NextRow() );
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u model/equipment changes in game events", count );
     }
-
     mGameEventCreatureQuests.resize(mGameEvent.size());
     //                                   0   1      2
     result = WorldDatabase.Query("SELECT id, quest, event FROM game_event_creature_quest");
-
     count = 0;
     if( !result )
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u quests additions in game events", count );
     }
     else
     {
-
         barGoLink bar( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar.step();
             uint32 id       = fields[0].GetUInt32();
             uint32 quest    = fields[1].GetUInt32();
             uint16 event_id = fields[2].GetUInt16();
-
             if(event_id >= mGameEventCreatureQuests.size())
             {
                 sLog.outErrorDb("`game_event_creature_quest` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             QuestRelList& questlist = mGameEventCreatureQuests[event_id];
             questlist.push_back(QuestRelation(id, quest));
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u quests additions in game events", count );
-
         delete result;
     }
-
     mGameEventGameObjectQuests.resize(mGameEvent.size());
     //                                   0   1      2
     result = WorldDatabase.Query("SELECT id, quest, event FROM game_event_gameobject_quest");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u go quests additions in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint32 id       = fields[0].GetUInt32();
             uint32 quest    = fields[1].GetUInt32();
             uint16 event_id = fields[2].GetUInt16();
-
             if(event_id >= mGameEventGameObjectQuests.size())
             {
                 sLog.outErrorDb("`game_event_gameobject_quest` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             QuestRelList& questlist = mGameEventGameObjectQuests[event_id];
             questlist.push_back(QuestRelation(id, quest));
-
         } while( result->NextRow() );
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u quests additions in game events", count );
     }
-
     // Load quest to (event,condition) mapping
     //                                   0      1         2             3
     result = WorldDatabase.Query("SELECT quest, event_id, condition_id, num FROM game_event_quest_condition");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u quest event conditions in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint32 quest     = fields[0].GetUInt32();
             uint16 event_id  = fields[1].GetUInt16();
             uint32 condition = fields[2].GetUInt32();
             float num       = fields[3].GetFloat();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_quest_condition` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
             mQuestToEventConditions[quest].event_id = event_id;
             mQuestToEventConditions[quest].condition = condition;
             mQuestToEventConditions[quest].num = num;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u quest event conditions in game events", count );
-
         delete result;
     }
-
     // load conditions of the events
     //                                   0         1             2        3                      4
     result = WorldDatabase.Query("SELECT event_id, condition_id, req_num, max_world_state_field, done_world_state_field FROM game_event_condition");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u conditions in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint16 event_id  = fields[0].GetUInt16();
             uint32 condition = fields[1].GetUInt32();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_condition` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             mGameEvent[event_id].conditions[condition].reqNum = fields[2].GetFloat();
             mGameEvent[event_id].conditions[condition].done = 0;
             mGameEvent[event_id].conditions[condition].max_world_state = fields[3].GetUInt32();
             mGameEvent[event_id].conditions[condition].done_world_state = fields[4].GetUInt32();
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u conditions in game events", count );
-
         delete result;
     }
-
     // load condition saves
     //                                       0         1             2
     result = CharacterDatabase.Query("SELECT event_id, condition_id, done FROM game_event_condition_save");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u condition saves in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint16 event_id  = fields[0].GetUInt16();
             uint32 condition = fields[1].GetUInt32();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_condition_save` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             std::map<uint32, GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.find(condition);
             if(itr != mGameEvent[event_id].conditions.end())
             {
@@ -745,90 +613,70 @@ void GameEventMgr::LoadFromDB()
                 sLog.outErrorDb("game_event_condition_save contains not present condition evt id %u cond id %u",event_id, condition);
                 continue;
             }
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u condition saves in game events", count );
-
         delete result;
     }
-
     mGameEventNPCFlags.resize(mGameEvent.size());
     // load game event npcflag
     //                                   0         1        2
     result = WorldDatabase.Query("SELECT guid, event_id, npcflag FROM game_event_npcflag");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u npcflags in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint32 guid     = fields[0].GetUInt32();
             uint16 event_id = fields[1].GetUInt16();
             uint32 npcflag  = fields[2].GetUInt32();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_npcflag` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             mGameEventNPCFlags[event_id].push_back(GuidNPCFlagPair(guid,npcflag));
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u npcflags in game events", count );
-
         delete result;
     }
-
     mGameEventVendors.resize(mGameEvent.size());
     //                                   0      1      2     3         4         5
     result = WorldDatabase.Query("SELECT event, guid, item, maxcount, incrtime, ExtendedCost FROM game_event_npc_vendor");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u vendor additions in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint16 event_id  = fields[0].GetUInt16();
-
             if(event_id >= mGameEventVendors.size())
             {
                 sLog.outErrorDb("`game_event_npc_vendor` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             NPCVendorList& vendors = mGameEventVendors[event_id];
             NPCVendorEntry newEntry;
             uint32 guid = fields[1].GetUInt32();
@@ -849,171 +697,132 @@ void GameEventMgr::LoadFromDB()
             }
             // get creature entry
             newEntry.entry = 0;
-
             if( CreatureData const* data = objmgr.GetCreatureData(guid) )
                 newEntry.entry = data->id;
-
             // check validity with event's npcflag
             if(!objmgr.IsVendorItemValid(newEntry.entry, newEntry.item, newEntry.maxcount, newEntry.incrtime, newEntry.ExtendedCost, NULL, NULL, event_npc_flag))
                 continue;
             ++count;
             vendors.push_back(newEntry);
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u vendor additions in game events", count );
-
         delete result;
     }
-
     // load game event npc gossip ids
     //                                   0         1        2
     result = WorldDatabase.Query("SELECT guid, event_id, textid FROM game_event_npc_gossip");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u npc gossip textids in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
             uint32 guid     = fields[0].GetUInt32();
             uint16 event_id = fields[1].GetUInt16();
             uint32 textid  = fields[2].GetUInt32();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_npc_gossip` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             mNPCGossipIds[guid]=EventNPCGossipIdPair(event_id, textid);
-
             ++count;
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u npc gossip textids in game events", count );
-
         delete result;
     }
-
     // set all flags to 0
     mGameEventBattleGroundHolidays.resize(mGameEvent.size(),0);
     // load game event battleground flags
     //                                   0     1
     result = WorldDatabase.Query("SELECT event, bgflag FROM game_event_battleground_holiday");
-
     count = 0;
     if( !result )
     {
         barGoLink bar3(1);
         bar3.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u battleground holidays in game events", count );
     }
     else
     {
-
         barGoLink bar3( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar3.step();
-
             uint16 event_id = fields[0].GetUInt16();
-
             if(event_id >= mGameEvent.size())
             {
                 sLog.outErrorDb("`game_event_battleground_holiday` game event id (%u) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             ++count;
-
             mGameEventBattleGroundHolidays[event_id] = fields[1].GetUInt32();
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u battleground holidays in game events", count );
-
         delete result;
     }
-
     ////////////////////////
     // GameEventPool
     ////////////////////////
-
     mGameEventPoolIds.resize(mGameEvent.size()*2-1);
     //                                   1                    2
     result = WorldDatabase.Query("SELECT pool_template.entry, game_event_pool.event "
         "FROM pool_template JOIN game_event_pool ON pool_template.entry = game_event_pool.pool_entry");
-
     count = 0;
     if( !result )
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u pools in game events", count );
     }
     else
     {
-
         barGoLink bar2( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint32 entry   = fields[0].GetUInt16();
             int16 event_id = fields[1].GetInt16();
-
             int32 internal_event_id = mGameEvent.size() + event_id - 1;
-
             if(internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size())
             {
                 sLog.outErrorDb("`game_event_pool` game event id (%i) is out of range compared to max event id in `game_event`",event_id);
                 continue;
             }
-
             if (!poolhandler.CheckPool(entry))
             {
                 sLog.outErrorDb("Pool Id (%u) has all creatures or gameobjects with explicit chance sum <>100 and no equal chance defined. The pool system cannot pick one to spawn.", entry);
                 continue;
             }
-
             ++count;
             IdList& poollist = mGameEventPoolIds[internal_event_id];
             poollist.push_back(entry);
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u pools in game events", count );
         delete result;
     }
 }
-
 uint32 GameEventMgr::GetNPCFlag(Creature * cr)
 {
     uint32 mask = 0;
     uint32 guid = cr->GetDBTableGUIDLow();
-
     for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr)
     {
         for(NPCFlagList::iterator itr = mGameEventNPCFlags[*e_itr].begin();
@@ -1022,10 +831,8 @@ uint32 GameEventMgr::GetNPCFlag(Creature * cr)
             if(itr->first == guid)
                 mask |= itr->second;
     }
-
     return mask;
 }
-
 uint32 GameEventMgr::GetNpcTextId(uint32 guid)
 {
     GuidEventNpcGossipIdMap::iterator itr = mNPCGossipIds.find(guid);
@@ -1034,7 +841,6 @@ uint32 GameEventMgr::GetNpcTextId(uint32 guid)
             return itr->second.second;
     return 0;
 }
-
 uint32 GameEventMgr::Initialize()                           // return the next event delay in ms
 {
     m_ActiveEvents.clear();
@@ -1043,7 +849,6 @@ uint32 GameEventMgr::Initialize()                           // return the next e
     isSystemInit = true;
     return delay;
 }
-
 uint32 GameEventMgr::Update()                               // return the next event delay in ms
 {
     time_t currenttime = time(NULL);
@@ -1074,7 +879,6 @@ uint32 GameEventMgr::Update()                               // return the next e
             else if (mGameEvent[itr].state == GAMEEVENT_WORLD_CONDITIONS && CheckOneGameEventConditions(itr))
                 // changed, save to DB the gameevent state, will be updated in next update cycle
                 SaveWorldEventStateToDB(itr);
-
             //sLog.outDebug("GameEvent %u is active",itr->first);
             // queue for activation
             if (!IsActiveEvent(itr))
@@ -1113,7 +917,6 @@ uint32 GameEventMgr::Update()                               // return the next e
     sLog.outDetail("Next game event check in %u seconds.", nextEventDelay + 1);
     return (nextEventDelay + 1) * IN_MILISECONDS;           // Add 1 second to be sure event has started/stopped at next call
 }
-
 void GameEventMgr::UnApplyEvent(uint16 event_id)
 {
     sLog.outString("GameEvent %u \"%s\" removed.", event_id, mGameEvent[event_id].description.c_str());
@@ -1133,7 +936,6 @@ void GameEventMgr::UnApplyEvent(uint16 event_id)
     // update bg holiday
     UpdateBattleGroundSettings();
 }
-
 void GameEventMgr::ApplyNewEvent(uint16 event_id)
 {
     switch(sWorld.getConfig(CONFIG_EVENT_ANNOUNCE))
@@ -1144,9 +946,7 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id)
             sWorld.SendWorldText(LANG_EVENTMESSAGE, mGameEvent[event_id].description.c_str());
             break;
     }
-
     sLog.outString("GameEvent %u \"%s\" started.", event_id, mGameEvent[event_id].description.c_str());
-
     // spawn positive event tagget objects
     GameEventSpawn(event_id);
     // un-spawn negative event tagged objects
@@ -1163,7 +963,6 @@ void GameEventMgr::ApplyNewEvent(uint16 event_id)
     // update bg holiday
     UpdateBattleGroundSettings();
 }
-
 void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)
 {
     // go through the creatures whose npcflags are changed in the event
@@ -1189,7 +988,6 @@ void GameEventMgr::UpdateEventNPCFlags(uint16 event_id)
         }
     }
 }
-
 void GameEventMgr::UpdateBattleGroundSettings()
 {
     uint32 mask = 0;
@@ -1197,7 +995,6 @@ void GameEventMgr::UpdateBattleGroundSettings()
         mask |= mGameEventBattleGroundHolidays[*itr];
     sBattleGroundMgr.SetHolidayWeekends(mask);
 }
-
 void GameEventMgr::UpdateEventNPCVendor(uint16 event_id, bool activate)
 {
     for(NPCVendorList::iterator itr = mGameEventVendors[event_id].begin(); itr != mGameEventVendors[event_id].end(); ++itr)
@@ -1208,17 +1005,14 @@ void GameEventMgr::UpdateEventNPCVendor(uint16 event_id, bool activate)
             objmgr.RemoveVendorItem(itr->entry, itr->item, false);
     }
 }
-
 void GameEventMgr::GameEventSpawn(int16 event_id)
 {
     int32 internal_event_id = mGameEvent.size() + event_id - 1;
-
     if(internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size())
     {
         sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size());
         return;
     }
-
     for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr)
     {
         // Add to correct cell
@@ -1226,7 +1020,6 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
         if (data)
         {
             objmgr.AddCreatureToGrid(*itr, data);
-
             // Spawn if necessary (loaded grids only)
             Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
             // We use spawn coords to spawn
@@ -1245,13 +1038,11 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             }
         }
     }
-
     if(internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size())
     {
         sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size());
         return;
     }
-
     for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr)
     {
         // Add to correct cell
@@ -1279,29 +1070,24 @@ void GameEventMgr::GameEventSpawn(int16 event_id)
             }
         }
     }
-
     if(internal_event_id < 0 || internal_event_id >= mGameEventPoolIds.size())
     {
         sLog.outError("GameEventMgr::GameEventSpawn attempt access to out of range mGameEventPoolIds element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size());
         return;
     }
-
     for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin();itr != mGameEventPoolIds[internal_event_id].end();++itr)
     {
         poolhandler.SpawnPool(*itr);
     }
 }
-
 void GameEventMgr::GameEventUnspawn(int16 event_id)
 {
     int32 internal_event_id = mGameEvent.size() + event_id - 1;
-
     if(internal_event_id < 0 || internal_event_id >= mGameEventCreatureGuids.size())
     {
         sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventCreatureGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventCreatureGuids.size());
         return;
     }
-
     for (GuidList::iterator itr = mGameEventCreatureGuids[internal_event_id].begin();itr != mGameEventCreatureGuids[internal_event_id].end();++itr)
     {
         // check if it's needed by another event, if so, don't remove
@@ -1311,18 +1097,15 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         if( CreatureData const* data = objmgr.GetCreatureData(*itr) )
         {
             objmgr.RemoveCreatureFromGrid(*itr, data);
-
             if( Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_UNIT), (Creature*)NULL) )
                 pCreature->AddObjectToRemoveList();
         }
     }
-
     if(internal_event_id < 0 || internal_event_id >= mGameEventGameobjectGuids.size())
     {
         sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventGameobjectGuids element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventGameobjectGuids.size());
         return;
     }
-
     for (GuidList::iterator itr = mGameEventGameobjectGuids[internal_event_id].begin();itr != mGameEventGameobjectGuids[internal_event_id].end();++itr)
     {
         // check if it's needed by another event, if so, don't remove
@@ -1332,7 +1115,6 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         if(GameObjectData const* data = objmgr.GetGOData(*itr))
         {
             objmgr.RemoveGameobjectFromGrid(*itr, data);
-
             if( GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(*itr, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL) )
                 pGameobject->AddObjectToRemoveList();
         }
@@ -1342,13 +1124,11 @@ void GameEventMgr::GameEventUnspawn(int16 event_id)
         sLog.outError("GameEventMgr::GameEventUnspawn attempt access to out of range mGameEventPoolIds element %i (size: " SIZEFMTD ")",internal_event_id,mGameEventPoolIds.size());
         return;
     }
-
     for (IdList::iterator itr = mGameEventPoolIds[internal_event_id].begin();itr != mGameEventPoolIds[internal_event_id].end();++itr)
     {
         poolhandler.DespawnPool(*itr);
     }
 }
-
 void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
 {
     for(ModelEquipList::iterator itr = mGameEventModelEquip[event_id].begin();itr != mGameEventModelEquip[event_id].end();++itr)
@@ -1357,7 +1137,6 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
         CreatureData const* data = objmgr.GetCreatureData(itr->first);
         if(!data)
             continue;
-
         // Update if spawned
         Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(itr->first, data->id,HIGHGUID_UNIT), (Creature*)NULL);
         if (pCreature)
@@ -1405,7 +1184,6 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
                 CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(display_id);
                 if (minfo)
                     display_id = minfo->modelid;
-
                 if (data2->equipmentId == 0)
                     itr->second.equipement_id_prev = cinfo->equipmentId;
                 else if (data2->equipmentId != -1)
@@ -1428,7 +1206,6 @@ void GameEventMgr::ChangeEquipOrModel(int16 event_id, bool activate)
         }
     }
 }
-
 bool GameEventMgr::hasCreatureQuestActiveEventExcept(uint32 quest_id, uint16 event_id)
 {
     for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr)
@@ -1442,7 +1219,6 @@ bool GameEventMgr::hasCreatureQuestActiveEventExcept(uint32 quest_id, uint16 eve
     }
     return false;
 }
-
 bool GameEventMgr::hasGameObjectQuestActiveEventExcept(uint32 quest_id, uint16 event_id)
 {
     for(ActiveEvents::iterator e_itr = m_ActiveEvents.begin(); e_itr != m_ActiveEvents.end(); ++e_itr)
@@ -1488,7 +1264,6 @@ bool GameEventMgr::hasGameObjectActiveEventExcept(uint32 go_id, uint16 event_id)
     }
     return false;
 }
-
 void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
 {
     QuestRelList::iterator itr;
@@ -1542,12 +1317,10 @@ void GameEventMgr::UpdateEventQuests(uint16 event_id, bool Activate)
             }
         }
     }}
-
 GameEventMgr::GameEventMgr()
 {
     isSystemInit = false;
 }
-
 void GameEventMgr::HandleQuestComplete(uint32 quest_id)
 {
     // translate the quest to event and condition
@@ -1558,7 +1331,6 @@ void GameEventMgr::HandleQuestComplete(uint32 quest_id)
         uint16 event_id = itr->second.event_id;
         uint32 condition = itr->second.condition;
         float num = itr->second.num;
-
         // the event is not active, so return, don't increase condition finishes
         if(!IsActiveEvent(event_id))
             return;
@@ -1593,7 +1365,6 @@ void GameEventMgr::HandleQuestComplete(uint32 quest_id)
         }
     }
 }
-
 bool GameEventMgr::CheckOneGameEventConditions(uint16 event_id)
 {
     for(std::map<uint32,GameEventFinishCondition>::iterator itr = mGameEvent[event_id].conditions.begin(); itr != mGameEvent[event_id].conditions.end(); ++itr)
@@ -1610,7 +1381,6 @@ bool GameEventMgr::CheckOneGameEventConditions(uint16 event_id)
     }
     return true;
 }
-
 void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id)
 {
     CharacterDatabase.BeginTransaction();
@@ -1621,7 +1391,6 @@ void GameEventMgr::SaveWorldEventStateToDB(uint16 event_id)
         CharacterDatabase.PExecute("INSERT INTO game_event_save (event_id, state, next_start) VALUES ('%u','%u','0000-00-00 00:00:00')",event_id,mGameEvent[event_id].state);
     CharacterDatabase.CommitTransaction();
 }
-
 void GameEventMgr::HandleWorldEventGossip(Player *plr, Creature *c)
 {
     // this function is used to send world state update before sending gossip menu
@@ -1633,7 +1402,6 @@ void GameEventMgr::HandleWorldEventGossip(Player *plr, Creature *c)
             // send world state updates to the player about the progress
             SendWorldStateUpdate(plr, itr->second.first);
 }
-
 void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id)
 {
     std::map<uint32,GameEventFinishCondition>::iterator itr;
@@ -1645,15 +1413,12 @@ void GameEventMgr::SendWorldStateUpdate(Player * plr, uint16 event_id)
             plr->SendUpdateWorldState(itr->second.max_world_state, (uint32)(itr->second.reqNum));
     }
 }
-
 TRINITY_DLL_SPEC bool IsHolidayActive( HolidayIds id )
 {
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
     GameEventMgr::ActiveEvents const& ae = gameeventmgr.GetActiveEventList();
-
     for(GameEventMgr::ActiveEvents::const_iterator itr = ae.begin(); itr != ae.end(); ++itr)
         if(events[*itr].holiday_id==id)
             return true;
-
     return false;
 }
diff --git a/src/game/GameEventMgr.h b/src/game/GameEventMgr.h
index e5c72524004..fb3947b4daf 100644
--- a/src/game/GameEventMgr.h
+++ b/src/game/GameEventMgr.h
@@ -17,17 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_GAMEEVENT_MGR_H
 #define TRINITY_GAMEEVENT_MGR_H
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
-
 #define max_ge_check_delay 86400                            // 1 day in seconds
-
 enum GameEventState
 {
     GAMEEVENT_NORMAL = 0,   // standard game events
@@ -37,7 +33,6 @@ enum GameEventState
     GAMEEVENT_WORLD_FINISHED = 4,    // next events are started, unapply this one
     GAMEEVENT_INTERNAL = 5, // never handled in update
 };
-
 struct GameEventFinishCondition
 {
     float reqNum;  // required number // use float, since some events use percent
@@ -45,14 +40,12 @@ struct GameEventFinishCondition
     uint32 max_world_state;  // max resource count world state update id
     uint32 done_world_state; // done resource count world state update id
 };
-
 struct GameEventQuestToEventConditionNum
 {
     uint16 event_id;
     uint32 condition;
     float num;
 };
-
 struct GameEventData
 {
     GameEventData() : start(1),end(0),nextstart(0),occurence(0),length(0),state(GAMEEVENT_NORMAL) {}
@@ -66,10 +59,8 @@ struct GameEventData
     std::map<uint32 /*condition id*/, GameEventFinishCondition> conditions;  // conditions to finish
     std::set<uint16 /*gameevent id*/> prerequisite_events;  // events that must be completed before starting this event
     std::string description;
-
     bool isValid() const { return ((length > 0) || (state > GAMEEVENT_NORMAL)); }
 };
-
 struct ModelEquip
 {
     uint32 modelid;
@@ -77,7 +68,6 @@ struct ModelEquip
     uint32 modelid_prev;
     uint32 equipement_id_prev;
 };
-
 struct NPCVendorEntry
 {
     uint32 entry;                                           // creature entry
@@ -86,10 +76,8 @@ struct NPCVendorEntry
     uint32 incrtime;                                        // time for restore items amount if maxcount != 0
     uint32 ExtendedCost;
 };
-
 class Player;
 class Creature;
-
 class GameEventMgr
 {
     public:
@@ -169,10 +157,7 @@ class GameEventMgr
         GameEventGuidMap  mGameEventCreatureGuids;
         GameEventGuidMap  mGameEventGameobjectGuids;
 };
-
 #define gameeventmgr Trinity::Singleton<GameEventMgr>::Instance()
-
 TRINITY_DLL_SPEC bool IsHolidayActive(HolidayIds id);
-
 #endif
 
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index d7315f9626b..f4cd1fb8af4 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "QuestDef.h"
 #include "GameObject.h"
@@ -39,14 +38,11 @@
 #include "Util.h"
 #include "OutdoorPvPMgr.h"
 #include "BattleGroundAV.h"
-
 GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue)
 {
     m_objectType |= TYPEMASK_GAMEOBJECT;
     m_objectTypeId = TYPEID_GAMEOBJECT;
-
     m_updateFlag = (UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_POSITION | UPDATEFLAG_ROTATION);
-
     m_valuesCount = GAMEOBJECT_END;
     m_respawnTime = 0;
     m_respawnDelayTime = 25;
@@ -57,17 +53,14 @@ GameObject::GameObject() : WorldObject(), m_goValue(new GameObjectValue)
     m_cooldownTime = 0;
     m_goInfo = NULL;
     m_goData = NULL;
-
     m_DBTableGuid = 0;
     m_rotation = 0;
 }
-
 GameObject::~GameObject()
 {
     //if(m_uint32Values)                                      // field array can be not exist if GameOBject not loaded
     //    CleanupsBeforeDelete();
 }
-
 void GameObject::CleanupsBeforeDelete()
 {
     if(m_uint32Values)                                      // field array can be not exist if GameOBject not loaded
@@ -81,7 +74,6 @@ void GameObject::CleanupsBeforeDelete()
                 owner = ObjectAccessor::GetObjectInWorld(owner_guid, (Player*)NULL);
             else*/
                 owner = ObjectAccessor::GetUnit(*this,owner_guid);
-
             if(owner)
                 owner->RemoveGameObject(this,false);
             else
@@ -91,14 +83,12 @@ void GameObject::CleanupsBeforeDelete()
                     ownerType = "player";
                 else if(IS_PET_GUID(owner_guid))
                     ownerType = "pet";
-
                 sLog.outError("Delete GameObject (GUID: %u Entry: %u SpellId %u LinkedGO %u) that lost references to owner (GUID %u Type '%s') GO list. Crash possible later.",
                     GetGUIDLow(), GetGOInfo()->id, m_spellId, GetGOInfo()->GetLinkedGameObjectEntry(), GUID_LOPART(owner_guid), ownerType);
             }
         }
     }
 }
-
 void GameObject::AddToWorld()
 {
     ///- Register the gameobject for guid lookup
@@ -106,12 +96,10 @@ void GameObject::AddToWorld()
     {
         if(m_zoneScript)
             m_zoneScript->OnGameObjectCreate(this, true);
-
         ObjectAccessor::Instance().AddObject(this);
         WorldObject::AddToWorld();
     }
 }
-
 void GameObject::RemoveFromWorld()
 {
     ///- Remove the gameobject from the accessor
@@ -119,7 +107,6 @@ void GameObject::RemoveFromWorld()
     {
         if(m_zoneScript)
             m_zoneScript->OnGameObjectCreate(this, false);
-
         // Possible crash at access to deleted GO in Unit::m_gameobj
         if(uint64 owner_guid = GetOwnerGUID())
         {
@@ -132,73 +119,53 @@ void GameObject::RemoveFromWorld()
         ObjectAccessor::Instance().RemoveObject(this);
     }
 }
-
 bool GameObject::Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 artKit)
 {
     ASSERT(map);
     SetMap(map);
-
     Relocate(x,y,z,ang);
     if(!IsPositionValid())
     {
         sLog.outError("Gameobject (GUID: %u Entry: %u ) not created. Suggested coordinates isn't valid (X: %f Y: %f)",guidlow,name_id,x,y);
         return false;
     }
-
     SetPhaseMask(phaseMask,false);
-
     GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(name_id);
     if (!goinfo)
     {
         sLog.outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist entry in `gameobject_template`. Map: %u  (X: %f Y: %f Z: %f) ang: %f rotation0: %f rotation1: %f rotation2: %f rotation3: %f",guidlow, name_id, map->GetId(), x, y, z, ang, rotation0, rotation1, rotation2, rotation3);
         return false;
     }
-
     Object::_Create(guidlow, goinfo->id, HIGHGUID_GAMEOBJECT);
-
     m_goInfo = goinfo;
-
     if (goinfo->type >= MAX_GAMEOBJECT_TYPE)
     {
         sLog.outErrorDb("Gameobject (GUID: %u Entry: %u) not created: it have not exist GO type '%u' in `gameobject_template`. It's will crash client if created.",guidlow,name_id,goinfo->type);
         return false;
     }
-
     SetFloatValue(GAMEOBJECT_PARENTROTATION+0, rotation0);
     SetFloatValue(GAMEOBJECT_PARENTROTATION+1, rotation1);
-
     UpdateRotationFields(rotation2,rotation3);              // GAMEOBJECT_FACING, GAMEOBJECT_ROTATION, GAMEOBJECT_PARENTROTATION+2/3
-
     SetFloatValue(OBJECT_FIELD_SCALE_X, goinfo->size);
-
     SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction);
     SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags);
-
     SetEntry(goinfo->id);
-
     SetUInt32Value(GAMEOBJECT_DISPLAYID, goinfo->displayId);
-
     // GAMEOBJECT_BYTES_1, index at 0, 1, 2 and 3
     SetGoState(go_state);
     SetGoType(GameobjectTypes(goinfo->type));
-
     SetGoArtKit(0);                                         // unknown what this is
     SetGoAnimProgress(animprogress);
-
     SetByteValue(GAMEOBJECT_BYTES_1, 2, artKit);
-
     switch(goinfo->type)
     {
         case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
             m_goValue->building.health = goinfo->building.intactNumHits + goinfo->building.damagedNumHits;
             break;
     }
-
     SetZoneScript();
-
     return true;
 }
-
 void GameObject::Update(uint32 /*p_time*/)
 {
     if (IS_MO_TRANSPORT(GetGUID()))
@@ -206,7 +173,6 @@ void GameObject::Update(uint32 /*p_time*/)
         //((Transport*)this)->Update(p_time);
         return;
     }
-
     switch (m_lootState)
     {
         case GO_NOT_READY:
@@ -233,16 +199,13 @@ void GameObject::Update(uint32 /*p_time*/)
                         {
                             SetGoState(GO_STATE_ACTIVE);
                             SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_NODESPAWN);
-
                             UpdateData udata;
                             WorldPacket packet;
                             BuildValuesUpdateBlockForPlayer(&udata,((Player*)caster));
                             udata.BuildPacket(&packet);
                             ((Player*)caster)->GetSession()->SendPacket(&packet);
-
                             SendCustomAnim();
                         }
-
                         m_lootState = GO_READY;                 // can be successfully open with some chance
                     }
                     return;
@@ -262,7 +225,6 @@ void GameObject::Update(uint32 /*p_time*/)
                     m_respawnTime = 0;
                     m_SkillupList.clear();
                     m_usetimes = 0;
-
                     switch (GetGoType())
                     {
                         case GAMEOBJECT_TYPE_FISHINGNODE:   //  can't fish now
@@ -271,7 +233,6 @@ void GameObject::Update(uint32 /*p_time*/)
                             if(caster && caster->GetTypeId()==TYPEID_PLAYER)
                             {
                                 caster->FinishSpell(CURRENT_CHANNELED_SPELL);
-
                                 WorldPacket data(SMSG_FISH_NOT_HOOKED,0);
                                 ((Player*)caster)->GetSession()->SendPacket(&data);
                             }
@@ -302,7 +263,6 @@ void GameObject::Update(uint32 /*p_time*/)
                     }
                 }
             }
-
             if(isSpawned())
             {
                 // traps can have time and can not have
@@ -311,11 +271,9 @@ void GameObject::Update(uint32 /*p_time*/)
                 {
                     if(m_cooldownTime >= time(NULL))
                         return;
-
                     // traps
                     Unit* owner = GetOwner();
                     Unit* ok = NULL;                            // pointer to appropriate target if found any
-
                     bool IsBattleGroundTrap = false;
                     //FIXME: this is activation radius (in different casting radius that must be selected from spell data)
                     //TODO: move activated state code (cast itself) to GO_ACTIVATED, in this place only check activating and set state
@@ -328,15 +286,12 @@ void GameObject::Update(uint32 /*p_time*/)
                         {
                             if(m_respawnTime > 0)
                                 break;
-
                             radius = goInfo->trap.cooldown;       // battlegrounds gameobjects has data2 == 0 && data5 == 3
                             IsBattleGroundTrap = true;
-
                             if(!radius)
                                 return;
                         }
                     }
-
                     // Note: this hack with search required until GO casting not implemented
                     // search unfriendly creature
                     if(owner)                    // hunter trap
@@ -356,22 +311,17 @@ void GameObject::Update(uint32 /*p_time*/)
                         VisitNearbyWorldObject(radius, searcher);
                         ok = player;
                     }
-
                     if (ok)
                     {
                         // some traps do not have spell but should be triggered
                         if(goInfo->trap.spellId)
                             CastSpell(ok, goInfo->trap.spellId);
-
                         m_cooldownTime = time(NULL) + 4;        // 4 seconds
-
                         // count charges
                         //if(goInfo->trap.charges > 0)
                         //    AddUse();
-
                         if(owner)
                             SetLootState(GO_JUST_DEACTIVATED);
-
                         if(IsBattleGroundTrap && ok->GetTypeId() == TYPEID_PLAYER)
                         {
                             //BattleGround gameobjects case
@@ -390,7 +340,6 @@ void GameObject::Update(uint32 /*p_time*/)
                     }
                 }
             }
-
             break;
         }
         case GO_ACTIVATED:
@@ -412,7 +361,6 @@ void GameObject::Update(uint32 /*p_time*/)
             if (GetGoType() == GAMEOBJECT_TYPE_GOOBER)
             {
                 uint32 spellId = GetGOInfo()->goober.spellId;
-
                 if(spellId)
                 {
                     std::set<uint32>::const_iterator it = m_unique_users.begin();
@@ -424,13 +372,11 @@ void GameObject::Update(uint32 /*p_time*/)
                         //if (owner) owner->CastSpell(owner, spellId, false, 0, 0, GetGUID());
                         if (owner) owner->CastSpell(owner, spellId, false);
                     }
-
                     m_unique_users.clear();
                     m_usetimes = 0;
                 }
                 //any return here in case battleground traps
             }
-
             if(GetOwnerGUID())
             {
                 if(Unit* owner = GetOwner(false))
@@ -441,7 +387,6 @@ void GameObject::Update(uint32 /*p_time*/)
                 }
                 return;
             }
-
             //burning flags in some battlegrounds, if you find better condition, just add it
             if (GetGOInfo()->IsDespawnAtAction() || GetGoAnimProgress() > 0)
             {
@@ -449,76 +394,59 @@ void GameObject::Update(uint32 /*p_time*/)
                 //reset flags
                 SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
             }
-
             loot.clear();
             SetLootState(GO_READY);
-
             if(!m_respawnDelayTime)
                 return;
-
             if(!m_spawnedByDefault)
             {
                 m_respawnTime = 0;
                 ObjectAccessor::UpdateObjectVisibility(this);
                 return;
             }
-
             m_respawnTime = time(NULL) + m_respawnDelayTime;
-
             // if option not set then object will be saved at grid unload
             if(sWorld.getConfig(CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY))
                 SaveRespawnTime();
-
             ObjectAccessor::UpdateObjectVisibility(this);
-
             break;
         }
     }
 }
-
 void GameObject::Refresh()
 {
     // not refresh despawned not casted GO (despawned casted GO destroyed in all cases anyway)
     if(m_respawnTime > 0 && m_spawnedByDefault)
         return;
-
     if(isSpawned())
         GetMap()->Add(this);
 }
-
 void GameObject::AddUniqueUse(Player* player)
 {
     AddUse();
     m_unique_users.insert(player->GetGUIDLow());
 }
-
 void GameObject::Delete()
 {
     SetLootState(GO_NOT_READY);
     if (GetOwnerGUID())
         if (Unit * owner = GetOwner(false))
             owner->RemoveGameObject(this, false);
-
     assert (!GetOwnerGUID());
     SendObjectDeSpawnAnim(GetGUID());
-
     SetGoState(GO_STATE_READY);
     SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags);
-
     uint16 poolid = poolhandler.IsPartOfAPool(GetGUIDLow(), TYPEID_GAMEOBJECT);
     if (poolid)
         poolhandler.UpdatePool(poolid, GetGUIDLow(), TYPEID_GAMEOBJECT);
     else
         AddObjectToRemoveList();
 }
-
 void GameObject::getFishLoot(Loot *fishloot, Player* loot_owner)
 {
     fishloot->clear();
-
     uint32 zone, subzone;
     GetZoneAndAreaId(zone,subzone);
-
     // if subzone loot exist use it
     if(LootTemplates_Fishing.HaveLootFor(subzone))
         fishloot->FillLoot(subzone, LootTemplates_Fishing, loot_owner,true);
@@ -526,7 +454,6 @@ void GameObject::getFishLoot(Loot *fishloot, Player* loot_owner)
     else
         fishloot->FillLoot(zone, LootTemplates_Fishing, loot_owner,true);
 }
-
 void GameObject::SaveToDB()
 {
     // this should only be used when the gameobject has already been loaded
@@ -537,22 +464,17 @@ void GameObject::SaveToDB()
         sLog.outError("GameObject::SaveToDB failed, cannot get gameobject data!");
         return;
     }
-
     SaveToDB(GetMapId(), data->spawnMask, data->phaseMask);
 }
-
 void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
 {
     const GameObjectInfo *goI = GetGOInfo();
-
     if (!goI)
         return;
-
     if (!m_DBTableGuid)
         m_DBTableGuid = GetGUIDLow();
     // update in loaded data (changing data only in this place)
     GameObjectData& data = objmgr.NewGOData(m_DBTableGuid);
-
     // data->guid = guid don't must be update at save
     data.id = GetEntry();
     data.mapid = mapid;
@@ -570,7 +492,6 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     data.go_state = GetGoState();
     data.spawnMask = spawnMask;
     data.artKit = GetGoArtKit();
-
     // updated in DB
     std::ostringstream ss;
     ss << "INSERT INTO gameobject VALUES ( "
@@ -590,23 +511,19 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
         << m_respawnDelayTime << ", "
         << uint32(GetGoAnimProgress()) << ", "
         << uint32(GetGoState()) << ")";
-
     WorldDatabase.BeginTransaction();
     WorldDatabase.PExecuteLog("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid);
     WorldDatabase.PExecuteLog( ss.str( ).c_str( ) );
     WorldDatabase.CommitTransaction();
 }
-
 bool GameObject::LoadFromDB(uint32 guid, Map *map)
 {
     GameObjectData const* data = objmgr.GetGOData(guid);
-
     if( !data )
     {
         sLog.outErrorDb("Gameobject (GUID: %u) not found in table `gameobject`, can't load. ",guid);
         return false;
     }
-
     uint32 entry = data->id;
     //uint32 map_id = data->mapid;                          // already used before call
     uint32 phaseMask = data->phaseMask;
@@ -614,26 +531,20 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
     float y = data->posY;
     float z = data->posZ;
     float ang = data->orientation;
-
     float rotation0 = data->rotation0;
     float rotation1 = data->rotation1;
     float rotation2 = data->rotation2;
     float rotation3 = data->rotation3;
-
     uint32 animprogress = data->animprogress;
     GOState go_state = data->go_state;
     uint32 artKit = data->artKit;
-
     m_DBTableGuid = guid;
     if (map->GetInstanceId() != 0) guid = objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
-
     if (!Create(guid,entry, map, phaseMask, x, y, z, ang, rotation0, rotation1, rotation2, rotation3, animprogress, go_state, artKit) )
         return false;
-
     if(data->spawntimesecs >= 0)
     {
         m_spawnedByDefault = true;
-        
         if(!GetGOInfo()->GetDespawnPossibility() && !GetGOInfo()->IsDespawnAtAction())
         {
             SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NODESPAWN);
@@ -644,7 +555,6 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
         {
             m_respawnDelayTime = data->spawntimesecs;
             m_respawnTime = objmgr.GetGORespawnTime(m_DBTableGuid, map->GetInstanceId());
-
             // ready to respawn
             if(m_respawnTime && m_respawnTime <= time(NULL))
             {
@@ -659,12 +569,9 @@ bool GameObject::LoadFromDB(uint32 guid, Map *map)
         m_respawnDelayTime = -data->spawntimesecs;
         m_respawnTime = 0;
     }
-
     m_goData = data;
-
     return true;
 }
-
 void GameObject::DeleteFromDB()
 {
     objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),0);
@@ -672,12 +579,10 @@ void GameObject::DeleteFromDB()
     WorldDatabase.PExecuteLog("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid);
     WorldDatabase.PExecuteLog("DELETE FROM game_event_gameobject WHERE guid = '%u'", m_DBTableGuid);
 }
-
 GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid)
 {
     return object.GetMap()->GetGameObject(guid);
 }
-
 /*********************************************************/
 /***                    QUEST SYSTEM                   ***/
 /*********************************************************/
@@ -691,7 +596,6 @@ bool GameObject::hasQuest(uint32 quest_id) const
     }
     return false;
 }
-
 bool GameObject::hasInvolvedQuest(uint32 quest_id) const
 {
     QuestRelations const& qr = objmgr.mGOQuestInvolvedRelations;
@@ -702,7 +606,6 @@ bool GameObject::hasInvolvedQuest(uint32 quest_id) const
     }
     return false;
 }
-
 bool GameObject::IsTransport() const
 {
     // If something is marked as a transport, don't transmit an out of range packet for it.
@@ -710,37 +613,31 @@ bool GameObject::IsTransport() const
     if(!gInfo) return false;
     return gInfo->type == GAMEOBJECT_TYPE_TRANSPORT || gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT;
 }
-
 Unit* GameObject::GetOwner(bool inWorld) const
 {
     if (inWorld)
         return ObjectAccessor::GetUnit(*this, GetOwnerGUID());
     return ObjectAccessor::GetUnitInOrOutOfWorld(*this, GetOwnerGUID());
 }
-
 void GameObject::SaveRespawnTime()
 {
     if(m_goData && m_goData->dbData && m_respawnTime > time(NULL) && m_spawnedByDefault)
         objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),m_respawnTime);
 }
-
 bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const
 {
     // Not in world
     if(!IsInWorld() || !u->IsInWorld())
         return false;
-
     // Transport always visible at this step implementation
     if(IsTransport() && IsInMap(u))
         return true;
-
     // quick check visibility false cases for non-GM-mode
     if(!u->isGameMaster())
     {
         // despawned and then not visible for non-GM in GM-mode
         if(!isSpawned())
             return false;
-
         // special invisibility cases
         if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed)
         {
@@ -749,12 +646,10 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const
                 return false;
         }
     }
-
     // check distance
     return IsWithinDistInMap(u->m_seer,World::GetMaxVisibleDistanceForObject() +
         (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
-
 bool GameObject::canDetectTrap(Player const* u, float distance) const
 {
     if(u->hasUnitState(UNIT_STAT_STUNNED))
@@ -765,17 +660,14 @@ bool GameObject::canDetectTrap(Player const* u, float distance) const
         return false;
     if(u->HasAuraType(SPELL_AURA_DETECT_STEALTH))
         return true;
-
     //Visible distance is modified by -Level Diff (every level diff = 0.25f in visible distance)
     float visibleDistance = (int32(u->getLevel()) - int32(GetOwner()->getLevel()))* 0.25f;
     //GetModifier for trap (miscvalue 1)
     //35y for aura 2836
     //WARNING: these values are guessed, may be not blizzlike
     visibleDistance += u->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DETECT, 1)* 0.5f;
-
     return distance < visibleDistance;
 }
-
 void GameObject::Respawn()
 {
     if(m_spawnedByDefault && m_respawnTime > 0)
@@ -784,12 +676,10 @@ void GameObject::Respawn()
         objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),0);
     }
 }
-
 bool GameObject::ActivateToQuest( Player *pTarget)const
 {
     if(!objmgr.IsGameObjectForQuests(GetEntry()))
         return false;
-
     switch(GetGoType())
     {
         // scan GO chest with loot including quest items
@@ -816,20 +706,16 @@ bool GameObject::ActivateToQuest( Player *pTarget)const
         default:
             break;
     }
-
     return false;
 }
-
 void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target)
 {
     GameObjectInfo const* trapInfo = sGOStorage.LookupEntry<GameObjectInfo>(trapEntry);
     if(!trapInfo || trapInfo->type!=GAMEOBJECT_TYPE_TRAP)
         return;
-
     SpellEntry const* trapSpell = sSpellStore.LookupEntry(trapInfo->trap.spellId);
     if(!trapSpell)                                          // checked at load already
         return;
-
     float range;
     SpellRangeEntry const * srentry = sSpellRangeStore.LookupEntry(trapSpell->rangeIndex);
     //get owner to check hostility of GameObject
@@ -844,7 +730,6 @@ void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target)
             //if no owner assume that object is hostile to target
             range = GetSpellMaxRangeForHostile(srentry);
     }
-
     // search nearest linked GO
     GameObject* trapGO = NULL;
     {
@@ -852,63 +737,48 @@ void GameObject::TriggeringLinkedGameObject( uint32 trapEntry, Unit* target)
         CellPair p(Trinity::ComputeCellPair(GetPositionX(), GetPositionY()));
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
-
         MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*target,trapEntry,range);
         MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> checker(this, trapGO,go_check);
-
         TypeContainerVisitor<Trinity::GameObjectLastSearcher<Trinity::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer > object_checker(checker);
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, object_checker, *GetMap(), *target, range);
     }
-
     // found correct GO
     // FIXME: when GO casting will be implemented trap must cast spell to target
     if(trapGO)
         target->CastSpell(target,trapSpell,true, 0, 0, GetGUID());
 }
-
 GameObject* GameObject::LookupFishingHoleAround(float range)
 {
     GameObject* ok = NULL;
-
     CellPair p(Trinity::ComputeCellPair(GetPositionX(),GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     MaNGOS::NearestGameObjectFishingHole u_check(*this, range);
     MaNGOS::GameObjectSearcher<MaNGOS::NearestGameObjectFishingHole> checker(this, ok, u_check);
-
     CellLock<GridReadGuard> cell_lock(cell, p);
-
     TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::NearestGameObjectFishingHole>, GridTypeMapContainer > grid_object_checker(checker);
     cell_lock->Visit(cell_lock, grid_object_checker, *GetMap(), *this, range);
-
     return ok;
 }
-
 void GameObject::ResetDoorOrButton()
 {
     if (m_lootState == GO_READY || m_lootState == GO_JUST_DEACTIVATED)
         return;
-
     SwitchDoorOrButton(false);
     SetLootState(GO_JUST_DEACTIVATED);
     m_cooldownTime = 0;
 }
-
 void GameObject::UseDoorOrButton(uint32 time_to_restore, bool alternative /* = false */)
 {
     if(m_lootState != GO_READY)
         return;
-
     if(!time_to_restore)
         time_to_restore = GetGOInfo()->GetAutoCloseTime();
-
     SwitchDoorOrButton(true,alternative);
     SetLootState(GO_ACTIVATED);
-
     m_cooldownTime = time(NULL) + time_to_restore;
 }
-
 void GameObject::SetGoArtKit(uint8 kit)
 {
     SetByteValue(GAMEOBJECT_BYTES_1, 2, kit);
@@ -916,7 +786,6 @@ void GameObject::SetGoArtKit(uint8 kit)
     if(data)
         data->artKit = kit;
 }
-
 void GameObject::SetGoArtKit(uint8 artkit, GameObject *go, uint32 lowguid)
 {
     const GameObjectData *data = NULL;
@@ -927,49 +796,40 @@ void GameObject::SetGoArtKit(uint8 artkit, GameObject *go, uint32 lowguid)
     }
     else if(lowguid)
         data = objmgr.GetGOData(lowguid);
-
     if(data)
         const_cast<GameObjectData*>(data)->artKit = artkit;
 }
-
 void GameObject::SwitchDoorOrButton(bool activate, bool alternative /* = false */)
 {
     if(activate)
         SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
     else
         RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
-
     if(GetGoState() == GO_STATE_READY)                      //if closed -> open
         SetGoState(alternative ? GO_STATE_ACTIVE_ALTERNATIVE : GO_STATE_ACTIVE);
     else                                                    //if open -> close
         SetGoState(GO_STATE_READY);
 }
-
 void GameObject::Use(Unit* user)
 {
     // by default spell caster is user
     Unit* spellCaster = user;
     uint32 spellId = 0;
     bool triggered = false;
-
     switch(GetGoType())
     {
         case GAMEOBJECT_TYPE_DOOR:                          //0
         case GAMEOBJECT_TYPE_BUTTON:                        //1
             //doors/buttons never really despawn, only reset to default state/flags
             UseDoorOrButton();
-
             // activate script
             GetMap()->ScriptsStart(sGameObjectScripts, GetDBTableGUIDLow(), spellCaster, this);
             return;
-
         case GAMEOBJECT_TYPE_QUESTGIVER:                    //2
         {
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             player->PrepareQuestMenu( GetGUID() );
             player->SendPreparedQuest( GetGUID() );
             return;
@@ -980,22 +840,16 @@ void GameObject::Use(Unit* user)
             GameObjectInfo const* info = GetGOInfo();
             if(!info)
                 return;
-
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             // a chair may have n slots. we have to calculate their positions and teleport the player to the nearest one
-
             // check if the db is sane
             if(info->chair.slots > 0)
             {
                 float lowestDist = DEFAULT_VISIBILITY_DISTANCE;
-
                 float x_lowest = GetPositionX();
                 float y_lowest = GetPositionY();
-
                 // the object orientation + 1/2 pi
                 // every slot will be on that straight line
                 float orthogonalOrientation = GetOrientation()+M_PI*0.5f;
@@ -1004,20 +858,16 @@ void GameObject::Use(Unit* user)
                 {
                     // the distance between this slot and the center of the go - imagine a 1D space
                     float relativeDistance = (info->size*i)-(info->size*(info->chair.slots-1)/2.0f);
-
                     float x_i = GetPositionX() + relativeDistance * cos(orthogonalOrientation);
                     float y_i = GetPositionY() + relativeDistance * sin(orthogonalOrientation);
-
                     // calculate the distance between the player and this slot
                     float thisDistance = player->GetDistance2d(x_i, y_i);
-
                     /* debug code. It will spawn a npc on each slot to visualize them.
                     Creature* helper = player->SummonCreature(14496, x_i, y_i, GetPositionZ(), GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 10000);
                     std::ostringstream output;
                     output << i << ": thisDist: " << thisDistance;
                     helper->MonsterSay(output.str().c_str(), LANG_UNIVERSAL, 0);
                     */
-
                     if(thisDistance <= lowestDist)
                     {
                         lowestDist = thisDistance;
@@ -1039,11 +889,9 @@ void GameObject::Use(Unit* user)
         case GAMEOBJECT_TYPE_GOOBER:                        //10
         {
             GameObjectInfo const* info = GetGOInfo();
-
             if(user->GetTypeId()==TYPEID_PLAYER)
             {
                 Player* player = (Player*)user;
-
                 // show page
                 if(info->goober.pageId)
                 {
@@ -1051,17 +899,13 @@ void GameObject::Use(Unit* user)
                     data << GetGUID();
                     player->GetSession()->SendPacket(&data);
                 }
-
                 // possible quest objective for active quests
                 player->CastedCreatureOrGO(info->id, GetGUID(), 0);
-
                 if (info->goober.eventId)
                     GetMap()->ScriptsStart(sEventScripts, info->goober.eventId, player, this);
             }
-
             // cast this spell later if provided
             spellId = info->goober.spellId;
-
             break;
         }
         case GAMEOBJECT_TYPE_CAMERA:                        //13
@@ -1069,18 +913,13 @@ void GameObject::Use(Unit* user)
             GameObjectInfo const* info = GetGOInfo();
             if(!info)
                 return;
-
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             if (info->camera.cinematicId)
                 player->SendCinematicStart(info->camera.cinematicId);
-
             if (info->camera.eventID)
                 GetMap()->ScriptsStart(sEventScripts, info->camera.eventID, player, this);
-
             return;
         }
         //fishing bobber
@@ -1088,12 +927,9 @@ void GameObject::Use(Unit* user)
         {
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             if(player->GetGUID() != GetOwnerGUID())
                 return;
-
             switch(getLootState())
             {
                 case GO_READY:                              // ready for loot
@@ -1101,24 +937,18 @@ void GameObject::Use(Unit* user)
                     // 1) skill must be >= base_zone_skill
                     // 2) if skill == base_zone_skill => 5% chance
                     // 3) chance is linear dependence from (base_zone_skill-skill)
-
                     uint32 zone, subzone;
                     GetZoneAndAreaId(zone,subzone);
-
                     int32 zone_skill = objmgr.GetFishingBaseSkillLevel( subzone );
                     if(!zone_skill)
                         zone_skill = objmgr.GetFishingBaseSkillLevel( zone );
-
                     //provide error, no fishable zone or area should be 0
                     if(!zone_skill)
                         sLog.outErrorDb("Fishable areaId %u are not properly defined in `skill_fishing_base_level`.",subzone);
-
                     int32 skill = player->GetSkillValue(SKILL_FISHING);
                     int32 chance = skill - zone_skill + 5;
                     int32 roll = irand(1,100);
-
                     DEBUG_LOG("Fishing check (skill: %i zone min skill: %i chance %i roll: %i",skill,zone_skill,chance,roll);
-
                     if(chance >= roll)
                     {
                         player->UpdateFishingSkill();
@@ -1129,7 +959,6 @@ void GameObject::Use(Unit* user)
                             // prevent removing GO at spell cancel
                             player->RemoveGameObject(this,false);
                             SetOwnerGUID(player->GetGUID());
-
                             //TODO: find reasonable value for fishing hole search
                             GameObject* ok = LookupFishingHoleAround(20.0f + CONTACT_DISTANCE);
                             if (ok)
@@ -1149,47 +978,34 @@ void GameObject::Use(Unit* user)
                 default:
                 {
                     SetLootState(GO_JUST_DEACTIVATED);
-
                     WorldPacket data(SMSG_FISH_NOT_HOOKED, 0);
                     player->GetSession()->SendPacket(&data);
                     break;
                 }
             }
-
             player->FinishSpell(CURRENT_CHANNELED_SPELL);
             return;
         }
-
         case GAMEOBJECT_TYPE_SUMMONING_RITUAL:              //18
         {
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             Unit* caster = GetOwner();
-
             GameObjectInfo const* info = GetGOInfo();
-
             if( !caster || caster->GetTypeId()!=TYPEID_PLAYER )
                 return;
-
             // accept only use by player from same group for caster except caster itself
             if(((Player*)caster)==player || !((Player*)caster)->IsInSameRaidWith(player))
                 return;
-
             AddUniqueUse(player);
-
             // full amount unique participants including original summoner
             if(GetUniqueUseCount() < info->summoningRitual.reqParticipants)
                 return;
-
             // in case summoning ritual caster is GO creator
             spellCaster = caster;
-
             if(!caster->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
                 return;
-
             spellId = info->summoningRitual.spellId;
             if(spellId==62330)                              // GO store not existed spell, replace by expected
             {
@@ -1198,54 +1014,41 @@ void GameObject::Use(Unit* user)
                 spellId = 61993;
                 triggered = true;
             }
-
             // finish spell
             player->FinishSpell(CURRENT_CHANNELED_SPELL);
-
             // can be deleted now
             SetLootState(GO_JUST_DEACTIVATED);
-
             // go to end function to spell casting
             break;
         }
         case GAMEOBJECT_TYPE_SPELLCASTER:                   //22
         {
             SetUInt32Value(GAMEOBJECT_FLAGS,2);
-
             GameObjectInfo const* info = GetGOInfo();
             if(!info)
                 return;
-
             if(info->spellcaster.partyOnly)
             {
                 Unit* caster = GetOwner();
                 if( !caster || caster->GetTypeId()!=TYPEID_PLAYER )
                     return;
-
                 if(user->GetTypeId()!=TYPEID_PLAYER || !((Player*)user)->IsInSameRaidWith((Player*)caster))
                     return;
             }
-
             spellId = info->spellcaster.spellId;
-
             AddUse();
             break;
         }
         case GAMEOBJECT_TYPE_MEETINGSTONE:                  //23
         {
             GameObjectInfo const* info = GetGOInfo();
-
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             Player* targetPlayer = ObjectAccessor::FindPlayer(player->GetSelection());
-
             // accept only use by player from same group for caster except caster itself
             if(!targetPlayer || targetPlayer == player || !targetPlayer->IsInSameGroupWith(player))
                 return;
-
             //required lvl checks!
             uint8 level = player->getLevel();
             if (level < info->meetingstone.minLevel || level > info->meetingstone.maxLevel)
@@ -1253,22 +1056,17 @@ void GameObject::Use(Unit* user)
             level = targetPlayer->getLevel();
             if (level < info->meetingstone.minLevel || level > info->meetingstone.maxLevel)
                 return;
-
             if(info->id==194097)
                 spellId = 61994;                            // Ritual of Summoning
             else
                 spellId = 59782;                            // Summoning Stone Effect
-
             break;
         }
-
         case GAMEOBJECT_TYPE_FLAGSTAND:                     // 24
         {
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             if( player->CanUseBattleGroundObject() )
             {
                 // in battleground check
@@ -1291,9 +1089,7 @@ void GameObject::Use(Unit* user)
         {
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             if( player->CanUseBattleGroundObject() )
             {
                 // in battleground check
@@ -1337,18 +1133,13 @@ void GameObject::Use(Unit* user)
             GameObjectInfo const* info = GetGOInfo();
             if(!info)
                 return;
-
             if(user->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             Player* player = (Player*)user;
-
             // fallback, will always work
             player->TeleportTo(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(),TELE_TO_NOT_LEAVE_TRANSPORT | TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET);
-
             WorldPacket data(SMSG_ENABLE_BARBER_SHOP, 0);
             player->GetSession()->SendPacket(&data);
-
             player->SetStandState(UNIT_STAND_STATE_SIT_LOW_CHAIR+info->barberChair.chairheight);
             return;
         }
@@ -1356,10 +1147,8 @@ void GameObject::Use(Unit* user)
             sLog.outDebug("Unknown Object Type %u", GetGoType());
             break;
     }
-
     if(!spellId)
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellId );
     if(!spellInfo)
     {
@@ -1369,23 +1158,18 @@ void GameObject::Use(Unit* user)
             sLog.outDebug("WORLD: %u non-dbc spell was handled by OutdoorPvP", spellId);
         return;
     }
-
     Spell *spell = new Spell(spellCaster, spellInfo, triggered);
     //Spell *spell = new Spell(spellCaster, spellInfo, triggered,GetGUID());
-
     // spell target is user of GO
     SpellCastTargets targets;
     targets.setUnitTarget( user );
-
     spell->prepare(&targets);
 }
-
 void GameObject::CastSpell(Unit* target, uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return;
-
     bool self = false;
     for(uint8 i = 0; i < 3; ++i)
     {
@@ -1395,18 +1179,15 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
             break;
         }
     }
-
     if(self)
     {
         if(target)
             target->CastSpell(target, spellInfo, true);
         return;
     }
-
     //summon world trigger
     Creature *trigger = SummonTrigger(GetPositionX(), GetPositionY(), GetPositionZ(), 0, 1);
     if(!trigger) return;
-
     trigger->SetVisibility(VISIBILITY_OFF); //should this be true?
     if(Unit *owner = GetOwner())
     {
@@ -1416,14 +1197,13 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
     else
     {
         trigger->setFaction(14);
-        // Set owner guid for target if no owner avalible - needed by trigger auras 
+        // Set owner guid for target if no owner avalible - needed by trigger auras
         // - trigger gets despawned and there's no caster avalible (see AuraEffect::TriggerSpell())
         trigger->CastSpell(target, spellInfo, true, 0, 0, target ? target->GetGUID() : 0);
     }
     //trigger->setDeathState(JUST_DIED);
     //trigger->RemoveCorpse();
 }
-
 void GameObject::SendCustomAnim()
 {
     WorldPacket data(SMSG_GAMEOBJECT_CUSTOM_ANIM,8+4);
@@ -1431,13 +1211,11 @@ void GameObject::SendCustomAnim()
     data << (uint32)0;
     SendMessageToSet(&data, true);
 }
-
 bool GameObject::IsInRange(float x, float y, float z, float radius) const
 {
     GameObjectDisplayInfoEntry const * info = sGameObjectDisplayInfoStore.LookupEntry(GetUInt32Value(GAMEOBJECT_DISPLAYID));
     if(!info)
         return IsWithinDist3d(x, y, z, radius);
-
     float sinA = sin(GetOrientation());
     float cosA = cos(GetOrientation());
     float dx = x - GetPositionX();
@@ -1452,23 +1230,19 @@ bool GameObject::IsInRange(float x, float y, float z, float radius) const
         && dy < info->maxY + radius && dy > info->minY - radius
         && dz < info->maxZ + radius && dz > info->minZ - radius;
 }
-
 void GameObject::TakenDamage(uint32 damage)
 {
     if(!m_goValue->building.health)
         return;
-
     if(m_goValue->building.health > damage)
         m_goValue->building.health -= damage;
     else
         m_goValue->building.health = 0;
-
     if(HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED)) // from damaged to destroyed
     {
         if(!m_goValue->building.health)
         {
             RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED);
-
             SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
             SetUInt32Value(GAMEOBJECT_DISPLAYID, m_goInfo->building.destroyedDisplayId);
             EventInform(m_goInfo->building.destroyedEvent);
@@ -1482,14 +1256,12 @@ void GameObject::TakenDamage(uint32 damage)
                 m_goValue->building.health = 0;
             else if(!m_goValue->building.health)
                 m_goValue->building.health = 1;
-
             SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED);
             SetUInt32Value(GAMEOBJECT_DISPLAYID, m_goInfo->building.damagedDisplayId);
             EventInform(m_goInfo->building.damagedEvent);
         }
     }
 }
-
 void GameObject::Rebuild()
 {
     RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED + GO_FLAG_DESTROYED);
@@ -1497,13 +1269,11 @@ void GameObject::Rebuild()
     m_goValue->building.health = m_goInfo->building.intactNumHits + m_goInfo->building.damagedNumHits;
     EventInform(m_goInfo->building.rebuildingEvent);
 }
-
 void GameObject::EventInform(uint32 eventId)
 {
     if(eventId && m_zoneScript)
         m_zoneScript->ProcessEvent(this, eventId);
 }
-
 // overwrite WorldObject function for proper name localization
 const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
 {
@@ -1516,36 +1286,27 @@ const char* GameObject::GetNameForLocaleIdx(int32 loc_idx) const
                 return cl->Name[loc_idx].c_str();
         }
     }
-
     return GetName();
 }
-
 void GameObject::UpdateRotationFields(float rotation2 /*=0.0f*/, float rotation3 /*=0.0f*/)
 {
     static double const atan_pow = atan(pow(2.0f, -20.0f));
-
     double f_rot1 = sin(GetOrientation() / 2.0f);
     double f_rot2 = cos(GetOrientation() / 2.0f);
-
     int64 i_rot1 = int64(f_rot1 / atan_pow *(f_rot2 >= 0 ? 1.0f : -1.0f));
     int64 rotation = (i_rot1 << 43 >> 43) & 0x00000000001FFFFF;
-
     //float f_rot2 = sin(0.0f / 2.0f);
     //int64 i_rot2 = f_rot2 / atan(pow(2.0f, -20.0f));
     //rotation |= (((i_rot2 << 22) >> 32) >> 11) & 0x000003FFFFE00000;
-
     //float f_rot3 = sin(0.0f / 2.0f);
     //int64 i_rot3 = f_rot3 / atan(pow(2.0f, -21.0f));
     //rotation |= (i_rot3 >> 42) & 0x7FFFFC0000000000;
-
     m_rotation = rotation;
-
     if(rotation2==0.0f && rotation3==0.0f)
     {
         rotation2 = f_rot1;
         rotation3 = f_rot2;
     }
-
     SetFloatValue(GAMEOBJECT_PARENTROTATION+2, rotation2);
     SetFloatValue(GAMEOBJECT_PARENTROTATION+3, rotation3);
 }
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index 358eb0cbfb7..7455925a1d5 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -17,23 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_GAMEOBJECT_H
 #define TRINITYCORE_GAMEOBJECT_H
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
 #include "Database/DatabaseEnv.h"
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 // from `gameobject_template`
 struct GameObjectInfo
 {
@@ -391,7 +387,6 @@ struct GameObjectInfo
             uint32 startOpen;                               // 1
             uint32 autoClose;                               // 2
         } trapDoor;
-
         // not use for specific field access (only for output with loop by all filed), also this determinate max union size
         struct
         {
@@ -399,7 +394,6 @@ struct GameObjectInfo
         } raw;
     };
     uint32 ScriptId;
-
     // helpers
     bool IsDespawnAtAction() const
     {
@@ -410,7 +404,6 @@ struct GameObjectInfo
             default: return false;
         }
     }
-
     uint32 GetLockId() const
     {
         switch(type)
@@ -429,7 +422,6 @@ struct GameObjectInfo
             default: return 0;
         }
     }
-
     bool GetDespawnPossibility() const                      // despawn at targeting of cast?
     {
         switch(type)
@@ -443,7 +435,6 @@ struct GameObjectInfo
             default: return true;
         }
     }
-
     uint32 GetCharges() const                               // despawn at uses amount
     {
         switch(type)
@@ -454,7 +445,6 @@ struct GameObjectInfo
             default: return 0;
         }
     }
-
     uint32 GetLinkedGameObjectEntry() const
     {
         switch(type)
@@ -465,7 +455,6 @@ struct GameObjectInfo
             default: return 0;
         }
     }
-
     uint32 GetAutoCloseTime() const
     {
         uint32 autoCloseTime = 0;
@@ -481,7 +470,6 @@ struct GameObjectInfo
         }
         return autoCloseTime / 0x10000;
     }
-
     uint32 GetLootId() const
     {
         switch(type)
@@ -492,9 +480,7 @@ struct GameObjectInfo
         }
     }
 };
-
 class OPvPCapturePoint;
-
 union GameObjectValue
 {
     //29 GAMEOBJECT_TYPE_CAPTURE_POINT
@@ -508,20 +494,17 @@ union GameObjectValue
         uint32 health;
     }building;
 };
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 struct GameObjectLocale
 {
     std::vector<std::string> Name;
     std::vector<std::string> CastBarCaption;
 };
-
 // client side GO show states
 enum GOState
 {
@@ -529,9 +512,7 @@ enum GOState
     GO_STATE_READY              = 1,                        // show in world as ready (closed door close)
     GO_STATE_ACTIVE_ALTERNATIVE = 2                         // show in world as used in alt way and not reset (closed door open by cannon fire)
 };
-
 #define MAX_GO_STATE              3
-
 // from `gameobject`
 struct GameObjectData
 {
@@ -554,7 +535,6 @@ struct GameObjectData
     uint8 artKit;
     bool dbData;
 };
-
 // For containers:  [GO_NOT_READY]->GO_READY (close)->GO_ACTIVATED (open) ->GO_JUST_DEACTIVATED->GO_READY        -> ...
 // For bobber:      GO_NOT_READY  ->GO_READY (close)->GO_ACTIVATED (open) ->GO_JUST_DEACTIVATED-><deleted>
 // For door(closed):[GO_NOT_READY]->GO_READY (close)->GO_ACTIVATED (open) ->GO_JUST_DEACTIVATED->GO_READY(close) -> ...
@@ -566,49 +546,37 @@ enum LootState
     GO_ACTIVATED,
     GO_JUST_DEACTIVATED
 };
-
 class Unit;
-
 // 5 sec for bobber catch
 #define FISHING_BOBBER_READY_TIME 5
-
 class TRINITY_DLL_SPEC GameObject : public WorldObject
 {
     public:
         explicit GameObject();
         ~GameObject();
-
         void AddToWorld();
         void RemoveFromWorld();
         void CleanupsBeforeDelete();
-
         bool Create(uint32 guidlow, uint32 name_id, Map *map, uint32 phaseMask, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, GOState go_state, uint32 artKit = 0);
         void Update(uint32 p_time);
         static GameObject* GetGameObject(WorldObject& object, uint64 guid);
         GameObjectInfo const* GetGOInfo() const { return m_goInfo; }
         GameObjectData const* GetGOData() const { return m_goData; }
         GameObjectValue * GetGOValue() const { return m_goValue; }
-
         bool IsTransport() const;
-
         uint32 GetDBTableGUIDLow() const { return m_DBTableGuid; }
-
         void UpdateRotationFields(float rotation2 = 0.0f, float rotation3 = 0.0f);
-
         void Say(int32 textId, uint32 language, uint64 TargetGuid) { MonsterSay(textId,language,TargetGuid); }
         void Yell(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYell(textId,language,TargetGuid); }
         void TextEmote(int32 textId, uint64 TargetGuid) { MonsterTextEmote(textId,TargetGuid); }
         void Whisper(int32 textId, uint64 receiver) { MonsterWhisper(textId,receiver); }
         void YellToZone(int32 textId, uint32 language, uint64 TargetGuid) { MonsterYellToZone(textId,language,TargetGuid); }
-
         // overwrite WorldObject function for proper name localization
         const char* GetNameForLocaleIdx(int32 locale_idx) const;
-
         void SaveToDB();
         void SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask);
         bool LoadFromDB(uint32 guid, Map *map);
         void DeleteFromDB();
-
         void SetOwnerGUID(uint64 owner)
         {
             // Owner already found and different than expected owner - remove object from old owner
@@ -621,14 +589,12 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         }
         uint64 GetOwnerGUID() const { return GetUInt64Value(OBJECT_FIELD_CREATED_BY); }
         Unit* GetOwner(bool inWorld = true) const;
-
         void SetSpellId(uint32 id)
         {
             m_spawnedByDefault = false;                     // all summoned object is despawned after delay
             m_spellId = id;
         }
         uint32 GetSpellId() const { return m_spellId;}
-
         time_t GetRespawnTime() const { return m_respawnTime; }
         time_t GetRespawnTimeEx() const
         {
@@ -638,7 +604,6 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
             else
                 return now;
         }
-
         void SetRespawnTime(int32 respawn)
         {
             m_respawnTime = respawn > 0 ? time(NULL) + respawn : 0;
@@ -666,12 +631,9 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         uint8 GetGoAnimProgress() const { return GetByteValue(GAMEOBJECT_BYTES_1, 3); }
         void SetGoAnimProgress(uint8 animprogress) { SetByteValue(GAMEOBJECT_BYTES_1, 3, animprogress); }
         static void SetGoArtKit(uint8 artkit, GameObject *go, uint32 lowguid = 0);
-
         void Use(Unit* user);
-
         LootState getLootState() const { return m_lootState; }
         void SetLootState(LootState s) { m_lootState = s; }
-
         void AddToSkillupList(uint32 PlayerGuidLow) { m_SkillupList.push_back(PlayerGuidLow); }
         bool IsInSkillupList(uint32 PlayerGuidLow) const
         {
@@ -680,17 +642,12 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
             return false;
         }
         void ClearSkillupList() { m_SkillupList.clear(); }
-
         void AddUniqueUse(Player* player);
         void AddUse() { ++m_usetimes; }
-
         uint32 GetUseCount() const { return m_usetimes; }
         uint32 GetUniqueUseCount() const { return m_unique_users.size(); }
-
         void SaveRespawnTime();
-
         Loot        loot;
-
         bool hasQuest(uint32 quest_id) const;
         bool hasInvolvedQuest(uint32 quest_id) const;
         bool ActivateToQuest(Player *pTarget) const;
@@ -698,24 +655,17 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
                                                             // 0 = use `gameobject`.`spawntimesecs`
         void ResetDoorOrButton();
 
-
         void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target);
-
         bool isVisibleForInState(Player const* u, bool inVisibleList) const;
         bool canDetectTrap(Player const* u, float distance) const;
-
         GameObject* LookupFishingHoleAround(float range);
-
         GridReference<GameObject> &GetGridRef() { return m_gridRef; }
-
         void CastSpell(Unit *target, uint32 spell);
         void SendCustomAnim();
         bool IsInRange(float x, float y, float z, float radius) const;
         void TakenDamage(uint32 damage);
         void Rebuild();
-
         void EventInform(uint32 eventId);
-
         uint64 GetRotation() const { return m_rotation; }
     protected:
         uint32      m_spellId;
@@ -726,19 +676,15 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         time_t      m_cooldownTime;                         // used as internal reaction delay time store (not state change reaction).
                                                             // For traps this: spell casting cooldown, for doors/buttons: reset time.
         std::list<uint32> m_SkillupList;
-
         std::set<uint32> m_unique_users;
         uint32 m_usetimes;
-
         uint32 m_DBTableGuid;                               ///< For new or temporary gameobjects is 0 for saved it is lowguid
         GameObjectInfo const* m_goInfo;
         GameObjectData const* m_goData;
         GameObjectValue * const m_goValue;
-
         uint64 m_rotation;
     private:
         void SwitchDoorOrButton(bool activate, bool alternative = false);
-
         GridReference<GameObject> m_gridRef;
 };
 #endif
diff --git a/src/game/GlobalEvents.cpp b/src/game/GlobalEvents.cpp
index a544113f5c8..25fd4550d40 100644
--- a/src/game/GlobalEvents.cpp
+++ b/src/game/GlobalEvents.cpp
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /** \file
     \ingroup world
 */
-
 #include "Log.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/DatabaseImpl.h"
@@ -31,12 +29,10 @@
 #include "GlobalEvents.h"
 #include "ObjectDefines.h"
 #include "Corpse.h"
-
 static void CorpsesEraseCallBack(QueryResult *result, bool bones)
 {
     if(!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
@@ -45,11 +41,8 @@ static void CorpsesEraseCallBack(QueryResult *result, bool bones)
         float positionY = fields[2].GetFloat();
         uint32 mapid    = fields[3].GetUInt32();
         uint64 player_guid = MAKE_NEW_GUID(fields[4].GetUInt32(), 0, HIGHGUID_PLAYER);
-
         uint64 guid = MAKE_NEW_GUID(guidlow, 0, HIGHGUID_CORPSE);
-
         sLog.outDebug("[Global event] Removing %s %u (X:%f Y:%f Map:%u).",(bones?"bones":"corpse"),guidlow,positionX,positionY,mapid);
-
         /// Resurrectable - convert corpses to bones
         if(!bones)
         {
@@ -63,15 +56,12 @@ static void CorpsesEraseCallBack(QueryResult *result, bool bones)
             ///- or delete bones
         {
             MapManager::Instance().RemoveBonesFromMap(mapid, guid, positionX, positionY);
-
             ///- remove bones from the database
             CharacterDatabase.PExecute("DELETE FROM corpse WHERE guid = '%u'",guidlow);
         }
     } while (result->NextRow());
-
     delete result;
 }
-
 /// Handle periodic erase of corpses and bones
 static void CorpsesErase(bool bones,uint32 delay)
 {
@@ -79,7 +69,6 @@ static void CorpsesErase(bool bones,uint32 delay)
     //No SQL injection (uint32 and enum)
     CharacterDatabase.AsyncPQuery(&CorpsesEraseCallBack, bones, "SELECT guid,position_x,position_y,map,player FROM corpse WHERE UNIX_TIMESTAMP()-time > '%u' AND corpse_type %s '0'", delay, (bones ? "=" : "<>"));
 }
-
 /// not thread guarded variant for call from other thread
 void CorpsesErase()
 {
diff --git a/src/game/GlobalEvents.h b/src/game/GlobalEvents.h
index aa99c47985e..26b1fc80ae1 100644
--- a/src/game/GlobalEvents.h
+++ b/src/game/GlobalEvents.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /// \addtogroup world
 /// @{
 /// \file
-
 #ifndef __GLOBALEVENTS_H
 #define __GLOBALEVENTS_H
-
 void CorpsesErase();
 void HandleCorpsesErase(void*);
 #endif
diff --git a/src/game/GossipDef.cpp b/src/game/GossipDef.cpp
index cd633f6ab8b..4f22573d2be 100644
--- a/src/game/GossipDef.cpp
+++ b/src/game/GossipDef.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "QuestDef.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
@@ -25,23 +24,18 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Formulas.h"
-
 GossipMenu::GossipMenu()
 {
     m_gItems.reserve(16);                                   // can be set for max from most often sizes to speedup push_back and less memory use
 }
-
 GossipMenu::~GossipMenu()
 {
     ClearMenu();
 }
-
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSender, uint32 dtAction, const std::string& BoxMessage, uint32 BoxMoney, bool Coded)
 {
     ASSERT( m_gItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
-
     GossipMenuItem gItem;
-
     gItem.m_gIcon       = Icon;
     gItem.m_gMessage    = Message;
     gItem.m_gCoded      = Coded;
@@ -49,81 +43,63 @@ void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSe
     gItem.m_gAction     = dtAction;
     gItem.m_gBoxMessage = BoxMessage;
     gItem.m_gBoxMoney   = BoxMoney;
-
     m_gItems.push_back(gItem);
 }
-
 void GossipMenu::AddMenuItem(uint8 Icon, const std::string& Message, bool Coded)
 {
     AddMenuItem( Icon, Message, 0, 0, "", 0, Coded);
 }
-
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, bool Coded)
 {
     AddMenuItem(Icon, std::string(Message ? Message : ""),Coded);
 }
-
 void GossipMenu::AddMenuItem(uint8 Icon, char const* Message, uint32 dtSender, uint32 dtAction, char const* BoxMessage, uint32 BoxMoney, bool Coded)
 {
     AddMenuItem(Icon, std::string(Message ? Message : ""), dtSender, dtAction, std::string(BoxMessage ? BoxMessage : ""), BoxMoney, Coded);
 }
-
 uint32 GossipMenu::MenuItemSender( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
-
     return m_gItems[ ItemId ].m_gSender;
 }
-
 uint32 GossipMenu::MenuItemAction( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
-
     return m_gItems[ ItemId ].m_gAction;
 }
-
 bool GossipMenu::MenuItemCoded( unsigned int ItemId )
 {
     if ( ItemId >= m_gItems.size() ) return 0;
-
     return m_gItems[ ItemId ].m_gCoded;
 }
-
 void GossipMenu::ClearMenu()
 {
     m_gItems.clear();
 }
-
 PlayerMenu::PlayerMenu( WorldSession *session ) : pSession(session)
 {
 }
-
 PlayerMenu::~PlayerMenu()
 {
     ClearMenus();
 }
-
 void PlayerMenu::ClearMenus()
 {
     mGossipMenu.ClearMenu();
     mQuestMenu.ClearMenu();
 }
-
 uint32 PlayerMenu::GossipOptionSender( unsigned int Selection )
 {
     return mGossipMenu.MenuItemSender( Selection );
 }
-
 uint32 PlayerMenu::GossipOptionAction( unsigned int Selection )
 {
     return mGossipMenu.MenuItemAction( Selection );
 }
-
 bool PlayerMenu::GossipOptionCoded( unsigned int Selection )
 {
     return mGossipMenu.MenuItemCoded( Selection );
 }
-
 void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
 {
     WorldPacket data( SMSG_GOSSIP_MESSAGE, (100) );         // guess size
@@ -131,7 +107,6 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
     data << uint32(0);                                      // new 2.4.0
     data << uint32( TitleTextId );
     data << uint32( mGossipMenu.MenuItemCount() );          // max count 0x10
-
     for (uint32 iI = 0; iI < mGossipMenu.MenuItemCount(); ++iI )
     {
         GossipMenuItem const& gItem = mGossipMenu.GetItem(iI);
@@ -142,20 +117,16 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
         data << gItem.m_gMessage;                           // text for gossip item
         data << gItem.m_gBoxMessage;                        // accept text (related to money) pop up box, 2.0.3
     }
-
     data << uint32( mQuestMenu.MenuItemCount() );           // max count 0x20
-
     for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
     {
         QuestMenuItem const& qItem = mQuestMenu.GetItem(iI);
         uint32 questID = qItem.m_qId;
         Quest const* pQuest = objmgr.GetQuestTemplate(questID);
-
         data << uint32(questID);
         data << uint32(qItem.m_qIcon);
         data << uint32(pSession->GetPlayer()->GetQuestLevel(pQuest));
         std::string Title = pQuest->GetTitle();
-
         int loc_idx = pSession->GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -168,19 +139,15 @@ void PlayerMenu::SendGossipMenu( uint32 TitleTextId, uint64 npcGUID )
         }
         data << Title;
     }
-
     pSession->SendPacket( &data );
     //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_MESSAGE NPCGuid=%u",GUID_LOPART(npcGUID) );
 }
-
 void PlayerMenu::CloseGossip()
 {
     WorldPacket data( SMSG_GOSSIP_COMPLETE, 0 );
     pSession->SendPacket( &data );
-
     //sLog.outDebug( "WORLD: Sent SMSG_GOSSIP_COMPLETE" );
 }
-
 // Outdated
 void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, char const * locName )
 {
@@ -190,11 +157,9 @@ void PlayerMenu::SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flag
     data << uint32(Icon);
     data << uint32(Data);
     data << locName;
-
     pSession->SendPacket( &data );
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
-
 void PlayerMenu::SendPointOfInterest( uint32 poi_id )
 {
     PointOfInterest const* poi = objmgr.GetPointOfInterest(poi_id);
@@ -203,9 +168,7 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
         sLog.outErrorDb("Requested send not existed POI (Id: %u), ignore.",poi_id);
         return;
     }
-
     std::string icon_name = poi->icon_name;
-
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -216,7 +179,6 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
                 icon_name = pl->IconName[loc_idx];
         }
     }
-
     WorldPacket data( SMSG_GOSSIP_POI, (4+4+4+4+4+10) );    // guess size
     data << uint32(poi->flags);
     data << float(poi->x);
@@ -224,18 +186,14 @@ void PlayerMenu::SendPointOfInterest( uint32 poi_id )
     data << uint32(poi->icon);
     data << uint32(poi->data);
     data << icon_name;
-
     pSession->SendPacket( &data );
     //sLog.outDebug("WORLD: Sent SMSG_GOSSIP_POI");
 }
-
 void PlayerMenu::SendTalking( uint32 textID )
 {
     GossipText const* pGossip = objmgr.GetGossipText(textID);
-
     WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
     data << textID;                                         // can be < 0
-
     if (!pGossip)
     {
         for(uint32 i = 0; i < 8; ++i)
@@ -278,19 +236,15 @@ void PlayerMenu::SendTalking( uint32 textID )
         for (int i=0; i<8; ++i)
         {
             data << pGossip->Options[i].Probability;
-
             if ( Text_0[i].empty() )
                 data << Text_1[i];
             else
                 data << Text_0[i];
-
             if ( Text_1[i].empty() )
                 data << Text_0[i];
             else
                 data << Text_1[i];
-
             data << pGossip->Options[i].Language;
-
             for(int j = 0; j < 3; ++j)
             {
                 data << pGossip->Options[i].Emotes[j]._Delay;
@@ -299,10 +253,8 @@ void PlayerMenu::SendTalking( uint32 textID )
         }
     }
     pSession->SendPacket( &data );
-
     sLog.outDebug(  "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
 }
-
 void PlayerMenu::SendTalking( char const * title, char const * text )
 {
     WorldPacket data( SMSG_NPC_TEXT_UPDATE, 50 );           // guess size
@@ -320,41 +272,30 @@ void PlayerMenu::SendTalking( char const * title, char const * text )
         data << uint32(0);
         data << uint32(0);
     }
-
     pSession->SendPacket( &data );
-
     sLog.outDebug( "WORLD: Sent SMSG_NPC_TEXT_UPDATE " );
 }
-
 /*********************************************************/
 /***                    QUEST SYSTEM                   ***/
 /*********************************************************/
-
 QuestMenu::QuestMenu()
 {
     m_qItems.reserve(16);                                   // can be set for max from most often sizes to speedup push_back and less memory use
 }
-
 QuestMenu::~QuestMenu()
 {
     ClearMenu();
 }
-
 void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
 {
     Quest const* qinfo = objmgr.GetQuestTemplate(QuestId);
     if (!qinfo) return;
-
     ASSERT( m_qItems.size() <= GOSSIP_MAX_MENU_ITEMS  );
-
     QuestMenuItem qItem;
-
     qItem.m_qId        = QuestId;
     qItem.m_qIcon      = Icon;
-
     m_qItems.push_back(qItem);
 }
-
 bool QuestMenu::HasItem( uint32 questid )
 {
     for (QuestMenuItemList::const_iterator i = m_qItems.begin(); i != m_qItems.end(); ++i)
@@ -366,12 +307,10 @@ bool QuestMenu::HasItem( uint32 questid )
     }
     return false;
 }
-
 void QuestMenu::ClearMenu()
 {
     m_qItems.clear();
 }
-
 void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Title, uint64 npcGUID )
 {
     WorldPacket data( SMSG_QUESTGIVER_QUEST_LIST, 100 );    // guess size
@@ -380,16 +319,12 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
     data << uint32(eEmote._Delay );                         // player emote
     data << uint32(eEmote._Emote );                         // NPC emote
     data << uint8 ( mQuestMenu.MenuItemCount() );
-
     for (uint32 iI = 0; iI < mQuestMenu.MenuItemCount(); ++iI )
     {
         QuestMenuItem const& qmi = mQuestMenu.GetItem(iI);
-
         uint32 questID = qmi.m_qId;
         Quest const *pQuest = objmgr.GetQuestTemplate(questID);
-
         std::string title = pQuest ? pQuest->GetTitle() : "";
-
         int loc_idx = pSession->GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -399,7 +334,6 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
                     title=ql->Title[loc_idx];
             }
         }
-
         data << uint32(questID);
         data << uint32(qmi.m_qIcon);
         data << uint32(pSession->GetPlayer()->GetQuestLevel(pQuest));
@@ -408,26 +342,21 @@ void PlayerMenu::SendQuestGiverQuestList( QEmote eEmote, const std::string& Titl
     pSession->SendPacket( &data );
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_LIST NPC Guid=%u", GUID_LOPART(npcGUID));
 }
-
 void PlayerMenu::SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID )
 {
     WorldPacket data( SMSG_QUESTGIVER_STATUS, 9 );
     data << uint64(npcGUID);
     data << uint8(questStatus);
-
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_STATUS NPC Guid=%u, status=%u", GUID_LOPART(npcGUID), questStatus);
 }
-
 void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID, bool ActivateAccept )
 {
     WorldPacket data(SMSG_QUESTGIVER_QUEST_DETAILS, 100);   // guess size
-
     std::string Title      = pQuest->GetTitle();
     std::string Details    = pQuest->GetDetails();
     std::string Objectives = pQuest->GetObjectives();
     std::string EndText    = pQuest->GetEndText();
-
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -444,7 +373,6 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
                 EndText=ql->EndText[loc_idx];
         }
     }
-
     data << uint64(npcGUID);
     data << uint64(0);                                      // wotlk, something todo with quest sharing?
     data << uint32(pQuest->GetQuestId());
@@ -455,7 +383,6 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
     data << uint32(pQuest->GetSuggestedPlayers());
     data << uint8(0);                                       // new wotlk
     data << uint8(0);                                       // new 3.1
-
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
     {
         data << uint32(0);                                  // Rewarded chosen items hidden
@@ -465,7 +392,6 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
     else
     {
         ItemPrototype const* IProto;
-
         data << uint32(pQuest->GetRewChoiceItemsCount());
         for (uint32 i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         {
@@ -478,7 +404,6 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
             else
                 data << uint32( 0x00 );
         }
-
         data << uint32(pQuest->GetRewItemsCount());
         for (uint32 i=0; i < QUEST_REWARDS_COUNT; ++i)
         {
@@ -491,17 +416,14 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
             else
                 data << uint32(0);
         }
-
         data << uint32(pQuest->GetRewOrReqMoney());
     }
-
     // rewarded honor points. Multiply with 10 to satisfy client
     data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast==0)
     data << uint32(pQuest->GetRewSpellCast());              // casted spell
     data << uint32(pQuest->GetCharTitleId());               // CharTitleId, new 2.4.0, player gets this title (id from CharTitles)
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
-
     data << uint32(QUEST_EMOTE_COUNT);
     for (uint32 i=0; i < QUEST_EMOTE_COUNT; ++i)
     {
@@ -509,10 +431,8 @@ void PlayerMenu::SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID
         data << uint32(pQuest->DetailsEmoteDelay[i]);       // DetailsEmoteDelay (in ms)
     }
     pSession->SendPacket( &data );
-
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_DETAILS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId());
 }
-
 void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
 {
     std::string Title,Details,Objectives,EndText;
@@ -523,7 +443,6 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     EndText = pQuest->GetEndText();
     for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i)
         ObjectiveText[i]=pQuest->ObjectiveText[i];
-
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -538,40 +457,30 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
                 Objectives=ql->Objectives[loc_idx];
             if (ql->EndText.size() > loc_idx && !ql->EndText[loc_idx].empty())
                 EndText=ql->EndText[loc_idx];
-
             for (int i=0;i<QUEST_OBJECTIVES_COUNT;++i)
                 if (ql->ObjectiveText[i].size() > loc_idx && !ql->ObjectiveText[i][loc_idx].empty())
                     ObjectiveText[i]=ql->ObjectiveText[i][loc_idx];
         }
     }
-
     WorldPacket data( SMSG_QUEST_QUERY_RESPONSE, 100 );     // guess size
-
     data << uint32(pQuest->GetQuestId());
     data << uint32(pQuest->GetQuestMethod());               // Accepted values: 0, 1 or 2. 0==IsAutoComplete() (skip objectives/details)
     data << uint32(pQuest->GetQuestLevel());                // may be 0, static data, in other cases must be used dynamic level: Player::GetQuestLevel
     data << uint32(pQuest->GetZoneOrSort());                // zone or sort to display in quest log
-
     data << uint32(pQuest->GetType());
     data << uint32(pQuest->GetSuggestedPlayers());
-
     data << uint32(pQuest->GetRepObjectiveFaction());       // shown in quest log as part of quest objective
     data << uint32(pQuest->GetRepObjectiveValue());         // shown in quest log as part of quest objective
-
     data << uint32(0);                                      // RequiredOpositeRepFaction
     data << uint32(0);                                      // RequiredOpositeRepValue, required faction value with another (oposite) faction (objective)
-
     data << uint32(pQuest->GetNextQuestInChain());          // client will request this quest from NPC, if not 0
-
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
         data << uint32(0);                                  // Hide money rewarded
     else
         data << uint32(pQuest->GetRewOrReqMoney());
-
     data << uint32(pQuest->GetRewMoneyMaxLevel());          // used in XP calculation at client
     data << uint32(pQuest->GetRewSpell());                  // reward spell, this spell will display (icon) (casted if RewSpellCast==0)
     data << uint32(pQuest->GetRewSpellCast());              // casted spell
-
     // rewarded honor points
     data << uint32(Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(pQuest->GetSrcItemId());
@@ -579,9 +488,7 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
     data << uint32(pQuest->GetCharTitleId());               // CharTitleId, new 2.4.0, player gets this title (id from CharTitles)
     data << uint32(pQuest->GetPlayersSlain());              // players slain
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
-
     int iI;
-
     if (pQuest->HasFlag(QUEST_FLAGS_HIDDEN_REWARDS))
     {
         for (iI = 0; iI < QUEST_REWARDS_COUNT; ++iI)
@@ -602,17 +509,14 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
             data << uint32(pQuest->RewChoiceItemCount[iI]);
         }
     }
-
     data << pQuest->GetPointMapId();
     data << pQuest->GetPointX();
     data << pQuest->GetPointY();
     data << pQuest->GetPointOpt();
-
     data << Title;
     data << Objectives;
     data << Details;
     data << EndText;
-
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
     {
         if (pQuest->ReqCreatureOrGOId[iI] < 0)
@@ -627,28 +531,22 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
         data << uint32(pQuest->ReqCreatureOrGOCount[iI]);
         data << uint32(pQuest->ReqSourceId[iI]);
     }
-
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
     {
         data << uint32(pQuest->ReqItemId[iI]);
         data << uint32(pQuest->ReqItemCount[iI]);
     }
-
     data << uint32(0);                                      // TODO: 5 item objective
     data << uint32(0);
-
     for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; ++iI)
         data << ObjectiveText[iI];
-
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUEST_QUERY_RESPONSE questid=%u", pQuest->GetQuestId() );
 }
-
 void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, bool EnableNext )
 {
     std::string Title = pQuest->GetTitle();
     std::string OfferRewardText = pQuest->GetOfferRewardText();
-
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -661,17 +559,13 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
                 OfferRewardText=ql->OfferRewardText[loc_idx];
         }
     }
-
     WorldPacket data( SMSG_QUESTGIVER_OFFER_REWARD, 50 );   // guess size
-
     data << npcGUID;
     data << pQuest->GetQuestId();
     data << Title;
     data << OfferRewardText;
-
     data << uint32( EnableNext );
     data << uint32(0);                                      // unk
-
     uint32 EmoteCount = 0;
     for (uint32 i = 0; i < QUEST_EMOTE_COUNT; ++i)
     {
@@ -679,45 +573,36 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
             break;
         ++EmoteCount;
     }
-
     data << EmoteCount;                                     // Emote Count
     for (uint32 i = 0; i < EmoteCount; ++i)
     {
         data << uint32(pQuest->OfferRewardEmoteDelay[i]);   // Delay Emote
         data << uint32(pQuest->OfferRewardEmote[i]);
     }
-
     ItemPrototype const *pItem;
-
     data << uint32(pQuest->GetRewChoiceItemsCount());
     for (uint32 i=0; i < pQuest->GetRewChoiceItemsCount(); ++i)
     {
         pItem = objmgr.GetItemPrototype( pQuest->RewChoiceItemId[i] );
-
         data << uint32(pQuest->RewChoiceItemId[i]);
         data << uint32(pQuest->RewChoiceItemCount[i]);
-
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
-
     data << uint32(pQuest->GetRewItemsCount());
     for (uint16 i=0; i < pQuest->GetRewItemsCount(); ++i)
     {
         pItem = objmgr.GetItemPrototype(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemId[i]);
         data << uint32(pQuest->RewItemCount[i]);
-
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
-
     data << uint32(pQuest->GetRewOrReqMoney());
-
     // rewarded honor points. Multiply with 10 to satisfy client
     data << uint32(10*Trinity::Honor::hk_honor_at_level(pSession->GetPlayer()->getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(0x08);                                   // unused by client?
@@ -728,15 +613,12 @@ void PlayerMenu::SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID,
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_OFFER_REWARD NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }
-
 void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel )
 {
     // We can always call to RequestItems, but this packet only goes out if there are actually
     // items.  Otherwise, we'll skip straight to the OfferReward
-
     std::string Title = pQuest->GetTitle();
     std::string RequestItemsText = pQuest->GetRequestItemsText();
-
     int loc_idx = pSession->GetSessionDbLocaleIndex();
     if (loc_idx >= 0)
     {
@@ -749,37 +631,29 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
                 RequestItemsText=ql->RequestItemsText[loc_idx];
         }
     }
-
     if (!pQuest->GetReqItemsCount() && Completable)
     {
         SendQuestGiverOfferReward(pQuest, npcGUID, true);
         return;
     }
-
     WorldPacket data( SMSG_QUESTGIVER_REQUEST_ITEMS, 50 );  // guess size
     data << npcGUID;
     data << pQuest->GetQuestId();
     data << Title;
     data << RequestItemsText;
-
     data << uint32(0x00);                                   // unknown
-
     if(Completable)
         data << pQuest->GetCompleteEmote();
     else
         data << pQuest->GetIncompleteEmote();
-
     // Close Window after cancel
     if (CloseOnCancel)
         data << uint32(0x01);
     else
         data << uint32(0x00);
-
     data << uint32(0x00);                                   // unknown
-
     // Required Money
     data << uint32(pQuest->GetRewOrReqMoney() < 0 ? -pQuest->GetRewOrReqMoney() : 0);
-
     data << uint32( pQuest->GetReqItemsCount() );
     ItemPrototype const *pItem;
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -788,22 +662,18 @@ void PlayerMenu::SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID
         pItem = objmgr.GetItemPrototype(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemId[i]);
         data << uint32(pQuest->ReqItemCount[i]);
-
         if ( pItem )
             data << uint32(pItem->DisplayInfoID);
         else
             data << uint32(0);
     }
-
     if ( !Completable )
         data << uint32(0x00);
     else
         data << uint32(0x03);
-
     data << uint32(0x04);
     data << uint32(0x08);
     data << uint32(0x10);
-
     pSession->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTGIVER_REQUEST_ITEMS NPCGuid=%u, questid=%u", GUID_LOPART(npcGUID), pQuest->GetQuestId() );
 }
diff --git a/src/game/GossipDef.h b/src/game/GossipDef.h
index 88c15f334a1..b70348f1715 100644
--- a/src/game/GossipDef.h
+++ b/src/game/GossipDef.h
@@ -17,19 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_GOSSIP_H
 #define TRINITYCORE_GOSSIP_H
-
 #include "Common.h"
 #include "QuestDef.h"
 #include "NPCHandler.h"
-
 class WorldSession;
-
 #define GOSSIP_MAX_MENU_ITEMS 64                            // client supported items unknown, but provided number must be enough
 #define DEFAULT_GOSSIP_MESSAGE              0xffffff
-
 //POI icons. Many more exist, list not complete.
 enum Poi_Icon
 {
@@ -75,7 +70,6 @@ enum Poi_Icon
     ICON_POI_RWHORSE            =   39,                     // Red and White Horse
     ICON_POI_REDHORSE           =   40                      // Red Horse
 };
-
 struct GossipMenuItem
 {
     uint8       m_gIcon;
@@ -86,123 +80,94 @@ struct GossipMenuItem
     std::string m_gBoxMessage;
     uint32      m_gBoxMoney;
 };
-
 typedef std::vector<GossipMenuItem> GossipMenuItemList;
-
 struct QuestMenuItem
 {
     uint32      m_qId;
     uint8       m_qIcon;
 };
-
 typedef std::vector<QuestMenuItem> QuestMenuItemList;
-
 class TRINITY_DLL_SPEC GossipMenu
 {
     public:
         GossipMenu();
         ~GossipMenu();
-
         void AddMenuItem(uint8 Icon, const std::string& Message, bool Coded = false);
         void AddMenuItem(uint8 Icon, const std::string& Message, uint32 dtSender, uint32 dtAction, const std::string& BoxMessage, uint32 BoxMoney, bool Coded = false);
-
         // for using from scripts, don't must be inlined
         void AddMenuItem(uint8 Icon, char const* Message, bool Coded = false);
         void AddMenuItem(uint8 Icon, char const* Message, uint32 dtSender, uint32 dtAction, char const* BoxMessage, uint32 BoxMoney, bool Coded = false);
-
         unsigned int MenuItemCount() const
         {
             return m_gItems.size();
         }
-
         bool Empty() const
         {
             return m_gItems.empty();
         }
-
         GossipMenuItem const& GetItem( unsigned int Id )
         {
             return m_gItems[ Id ];
         }
-
         uint32 MenuItemSender( unsigned int ItemId );
         uint32 MenuItemAction( unsigned int ItemId );
         bool MenuItemCoded( unsigned int ItemId );
-
         void ClearMenu();
-
     protected:
         GossipMenuItemList m_gItems;
 };
-
 class QuestMenu
 {
     public:
         QuestMenu();
         ~QuestMenu();
-
         void AddMenuItem( uint32 QuestId, uint8 Icon);
         void ClearMenu();
-
         uint8 MenuItemCount() const
         {
             return m_qItems.size();
         }
-
         bool Empty() const
         {
             return m_qItems.empty();
         }
-
         bool HasItem( uint32 questid );
-
         QuestMenuItem const& GetItem( uint16 Id )
         {
             return m_qItems[ Id ];
         }
-
     protected:
         QuestMenuItemList m_qItems;
 };
-
 class TRINITY_DLL_SPEC PlayerMenu
 {
     private:
         GossipMenu mGossipMenu;
         QuestMenu  mQuestMenu;
         WorldSession* pSession;
-
     public:
         PlayerMenu( WorldSession *Session );
         ~PlayerMenu();
-
         GossipMenu& GetGossipMenu() { return mGossipMenu; }
         QuestMenu& GetQuestMenu() { return mQuestMenu; }
-
         bool Empty() const { return mGossipMenu.Empty() && mQuestMenu.Empty(); }
-
         void ClearMenus();
         uint32 GossipOptionSender( unsigned int Selection );
         uint32 GossipOptionAction( unsigned int Selection );
         bool GossipOptionCoded( unsigned int Selection );
-
         void SendGossipMenu( uint32 TitleTextId, uint64 npcGUID );
         void CloseGossip();
         void SendPointOfInterest( float X, float Y, uint32 Icon, uint32 Flags, uint32 Data, const char * locName );
         void SendPointOfInterest( uint32 poi_id );
         void SendTalking( uint32 textID );
         void SendTalking( char const * title, char const * text );
-
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
         /*********************************************************/
         void SendQuestGiverStatus( uint8 questStatus, uint64 npcGUID );
-
         void SendQuestGiverQuestList( QEmote eEmote, const std::string& Title, uint64 npcGUID );
-
         void SendQuestQueryResponse ( Quest const *pQuest );
         void SendQuestGiverQuestDetails( Quest const *pQuest, uint64 npcGUID, bool ActivateAccept);
-
         void SendQuestGiverOfferReward( Quest const* pQuest, uint64 npcGUID, bool EnableNext );
         void SendQuestGiverRequestItems( Quest const *pQuest, uint64 npcGUID, bool Completable, bool CloseOnCancel );
 };
diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h
index c51b507fcbd..403270fa1fd 100644
--- a/src/game/GridDefines.h
+++ b/src/game/GridDefines.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_GRIDDEFINES_H
 #define TRINITY_GRIDDEFINES_H
-
 #include "Common.h"
 #include "GameSystem/NGrid.h"
 #include <cmath>
-
 // Forward class definitions
 class Corpse;
 class Creature;
@@ -32,47 +29,32 @@ class DynamicObject;
 class GameObject;
 class Pet;
 class Player;
-
 #define MAX_NUMBER_OF_CELLS     8
-
 #define MAX_NUMBER_OF_GRIDS      64
-
 #define SIZE_OF_GRIDS            533.33333f
 #define CENTER_GRID_ID           (MAX_NUMBER_OF_GRIDS/2)
-
 #define CENTER_GRID_OFFSET      (SIZE_OF_GRIDS/2)
-
 #define MIN_GRID_DELAY          (MINUTE*IN_MILISECONDS)
 #define MIN_MAP_UPDATE_DELAY    50
-
 #define SIZE_OF_GRID_CELL       (SIZE_OF_GRIDS/MAX_NUMBER_OF_CELLS)
-
 #define CENTER_GRID_CELL_ID     (MAX_NUMBER_OF_CELLS*MAX_NUMBER_OF_GRIDS/2)
 #define CENTER_GRID_CELL_OFFSET (SIZE_OF_GRID_CELL/2)
-
 #define TOTAL_NUMBER_OF_CELLS_PER_MAP    (MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_CELLS)
-
 #define MAP_RESOLUTION 128
-
 #define MAP_SIZE                (SIZE_OF_GRIDS*MAX_NUMBER_OF_GRIDS)
 #define MAP_HALFSIZE            (MAP_SIZE/2)
-
 // Creature used instead pet to simplify *::Visit templates (not required duplicate code for Creature->Pet case)
 typedef TYPELIST_4(Player, Creature/*pets*/, Corpse/*resurrectable*/, DynamicObject/*farsight target*/) AllWorldObjectTypes;
 typedef TYPELIST_4(GameObject, Creature/*except pets*/, DynamicObject, Corpse/*Bones*/) AllGridObjectTypes;
-
 typedef GridRefManager<Corpse>          CorpseMapType;
 typedef GridRefManager<Creature>        CreatureMapType;
 typedef GridRefManager<DynamicObject>   DynamicObjectMapType;
 typedef GridRefManager<GameObject>      GameObjectMapType;
 typedef GridRefManager<Player>          PlayerMapType;
-
 typedef Grid<Player, AllWorldObjectTypes,AllGridObjectTypes> GridType;
 typedef NGrid<MAX_NUMBER_OF_CELLS, Player, AllWorldObjectTypes, AllGridObjectTypes> NGridType;
-
 typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
-
 template<const unsigned int LIMIT>
 struct TRINITY_DLL_DECL CoordPair
 {
@@ -86,7 +68,6 @@ struct TRINITY_DLL_DECL CoordPair
         y_coord = obj.y_coord;
         return *this;
     }
-
     void operator<<(const uint32 val)
     {
         if( x_coord > val )
@@ -94,7 +75,6 @@ struct TRINITY_DLL_DECL CoordPair
         else
             x_coord = 0;
     }
-
     void operator>>(const uint32 val)
     {
         if( x_coord+val < LIMIT )
@@ -102,7 +82,6 @@ struct TRINITY_DLL_DECL CoordPair
         else
             x_coord = LIMIT - 1;
     }
-
     void operator-=(const uint32 val)
     {
         if( y_coord > val )
@@ -110,7 +89,6 @@ struct TRINITY_DLL_DECL CoordPair
         else
             y_coord = 0;
     }
-
     void operator+=(const uint32 val)
     {
         if( y_coord+val < LIMIT )
@@ -118,14 +96,11 @@ struct TRINITY_DLL_DECL CoordPair
         else
             y_coord = LIMIT - 1;
     }
-
     uint32 x_coord;
     uint32 y_coord;
 };
-
 typedef CoordPair<MAX_NUMBER_OF_GRIDS> GridPair;
 typedef CoordPair<TOTAL_NUMBER_OF_CELLS_PER_MAP> CellPair;
-
 namespace Trinity
 {
     template<class RET_TYPE, int CENTER_VAL>
@@ -134,34 +109,28 @@ namespace Trinity
         // calculate and store temporary values in double format for having same result as same mySQL calculations
         double x_offset = (double(x) - center_offset)/size;
         double y_offset = (double(y) - center_offset)/size;
-
         int x_val = int(x_offset+CENTER_VAL + 0.5);
         int y_val = int(y_offset+CENTER_VAL + 0.5);
         return RET_TYPE(x_val, y_val);
     }
-
     inline GridPair ComputeGridPair(float x, float y)
     {
         return Compute<GridPair, CENTER_GRID_ID>(x, y, CENTER_GRID_OFFSET, SIZE_OF_GRIDS);
     }
-
     inline CellPair ComputeCellPair(float x, float y)
     {
         return Compute<CellPair, CENTER_GRID_CELL_ID>(x, y, CENTER_GRID_CELL_OFFSET, SIZE_OF_GRID_CELL);
     }
-
     inline CellPair ComputeCellPair(float x, float y, float &x_off, float &y_off)
     {
         double x_offset = (double(x) - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
         double y_offset = (double(y) - CENTER_GRID_CELL_OFFSET)/SIZE_OF_GRID_CELL;
-
         int x_val = int(x_offset + CENTER_GRID_CELL_ID + 0.5);
         int y_val = int(y_offset + CENTER_GRID_CELL_ID + 0.5);
         x_off = (float(x_offset) - x_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
         y_off = (float(y_offset) - y_val + CENTER_GRID_CELL_ID) * SIZE_OF_GRID_CELL;
         return CellPair(x_val, y_val);
     }
-
     inline void NormalizeMapCoord(float &c)
     {
         if(c > MAP_HALFSIZE - 0.5)
@@ -169,22 +138,18 @@ namespace Trinity
         else if(c < -(MAP_HALFSIZE - 0.5))
             c = -(MAP_HALFSIZE - 0.5);
     }
-
     inline bool IsValidMapCoord(float c)
     {
         return finite(c) && (std::fabs(c) <= MAP_HALFSIZE - 0.5);
     }
-
     inline bool IsValidMapCoord(float x, float y)
     {
         return IsValidMapCoord(x) && IsValidMapCoord(y);
     }
-
     inline bool IsValidMapCoord(float x, float y, float z)
     {
         return IsValidMapCoord(x,y) && finite(z);
     }
-
     inline bool IsValidMapCoord(float x, float y, float z, float o)
     {
         return IsValidMapCoord(x,y,z) && finite(o);
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp
index 11cbb741e45..9673db24732 100644
--- a/src/game/GridNotifiers.cpp
+++ b/src/game/GridNotifiers.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "GridNotifiers.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -26,9 +25,7 @@
 #include "Map.h"
 #include "Transports.h"
 #include "ObjectAccessor.h"
-
 using namespace Trinity;
-
 void
 VisibleChangesNotifier::Visit(PlayerMapType &m)
 {
@@ -36,9 +33,7 @@ VisibleChangesNotifier::Visit(PlayerMapType &m)
     {
         if(iter->getSource() == &i_object)
             continue;
-
         iter->getSource()->UpdateVisibilityOf(&i_object);
-
         if(!iter->getSource()->GetSharedVisionList().empty())
             for(SharedVisionList::const_iterator i = iter->getSource()->GetSharedVisionList().begin();
                 i != iter->getSource()->GetSharedVisionList().end(); ++i)
@@ -46,7 +41,6 @@ VisibleChangesNotifier::Visit(PlayerMapType &m)
                     (*i)->UpdateVisibilityOf(&i_object);
     }
 }
-
 void
 VisibleChangesNotifier::Visit(CreatureMapType &m)
 {
@@ -57,7 +51,6 @@ VisibleChangesNotifier::Visit(CreatureMapType &m)
                 if((*i)->m_seer == iter->getSource())
                     (*i)->UpdateVisibilityOf(&i_object);
 }
-
 void
 VisibleChangesNotifier::Visit(DynamicObjectMapType &m)
 {
@@ -67,7 +60,6 @@ VisibleChangesNotifier::Visit(DynamicObjectMapType &m)
                 if(caster->m_seer == iter->getSource())
                     caster->UpdateVisibilityOf(&i_object);
 }
-
 void
 PlayerVisibilityNotifier::Notify()
 {
@@ -85,19 +77,16 @@ PlayerVisibilityNotifier::Notify()
             }
         }
     }
-
     // generate outOfRange for not iterate objects
     i_data.AddOutOfRangeGUID(i_clientGUIDs);
     for(Player::ClientGUIDs::iterator itr = i_clientGUIDs.begin();itr!=i_clientGUIDs.end();++itr)
     {
         i_player.m_clientGUIDs.erase(*itr);
-
         #ifdef TRINITY_DEBUG
         if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
             sLog.outDebug("Object %u (Type: %u) is out of range (no in active cells set) now for player %u",GUID_LOPART(*itr),GuidHigh2TypeId(GUID_HIPART(*itr)),i_player.GetGUIDLow());
         #endif
     }
-
     if( i_data.HasData() )
     {
         /*uint32 entry = 0, map;
@@ -110,37 +99,30 @@ PlayerVisibilityNotifier::Notify()
             y = (*i_visibleNow.begin())->GetPositionY();
             sLog.outError("notify %u %u %f %f", entry, map, x, y);
         }*/
-
         // send create/outofrange packet to player (except player create updates that already sent using SendUpdateToPlayer)
         WorldPacket packet;
         i_data.BuildPacket(&packet);
         i_player.GetSession()->SendPacket(&packet);
-
         // send out of range to other players if need
         std::set<uint64> const& oor = i_data.GetOutOfRangeGUIDs();
         for(std::set<uint64>::const_iterator iter = oor.begin(); iter != oor.end(); ++iter)
         {
             if(!IS_PLAYER_GUID(*iter))
                 continue;
-
             Player* plr = ObjectAccessor::GetPlayer(i_player,*iter);
             if(plr)
                 plr->UpdateVisibilityOf(&i_player);
         }
     }
-
     // Now do operations that required done at object visibility change to visible
-
     // send data at target visibility change (adding to client)
     for(std::set<WorldObject*>::const_iterator vItr = i_visibleNow.begin(); vItr != i_visibleNow.end(); ++vItr)
         // target aura duration for caster show only if target exist at caster client
         if((*vItr)!=&i_player && (*vItr)->isType(TYPEMASK_UNIT))
             i_player.SendInitialVisiblePackets((Unit*)(*vItr));
-
     if(i_visibleNow.size() >= 30)
         i_player.SetToNotify();
 }
-
 void
 MessageDistDeliverer::Visit(PlayerMapType &m)
 {
@@ -149,10 +131,8 @@ MessageDistDeliverer::Visit(PlayerMapType &m)
         Player *target = iter->getSource();
         if(!target->InSamePhase(i_phaseMask))
             continue;
-
         if(target->GetExactDistSq(i_source) > i_distSq)
             continue;
-
         // Send packet to all who are sharing the player's vision
         if (!target->GetSharedVisionList().empty())
         {
@@ -161,12 +141,10 @@ MessageDistDeliverer::Visit(PlayerMapType &m)
                 if((*i)->m_seer == target)
                     SendPacket(*i);
         }
-
         if(target->m_seer == target || target->GetVehicle())
             SendPacket(target);
     }
 }
-
 void
 MessageDistDeliverer::Visit(CreatureMapType &m)
 {
@@ -174,10 +152,8 @@ MessageDistDeliverer::Visit(CreatureMapType &m)
     {
         if(!iter->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(iter->getSource()->GetExactDistSq(i_source) > i_distSq)
             continue;
-
         // Send packet to all who are sharing the creature's vision
         if (!iter->getSource()->GetSharedVisionList().empty())
         {
@@ -188,7 +164,6 @@ MessageDistDeliverer::Visit(CreatureMapType &m)
         }
     }
 }
-
 void
 MessageDistDeliverer::Visit(DynamicObjectMapType &m)
 {
@@ -196,10 +171,8 @@ MessageDistDeliverer::Visit(DynamicObjectMapType &m)
     {
         if(!iter->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(iter->getSource()->GetExactDistSq(i_source) > i_distSq)
             continue;
-
         if (IS_PLAYER_GUID(iter->getSource()->GetCasterGUID()))
         {
             // Send packet back to the caster if the caster has vision of dynamic object
@@ -209,7 +182,6 @@ MessageDistDeliverer::Visit(DynamicObjectMapType &m)
         }
     }
 }
-
 /*
 void
 MessageDistDeliverer::VisitObject(Player* plr)
@@ -220,7 +192,6 @@ MessageDistDeliverer::VisitObject(Player* plr)
     }
 }
 */
-
 template<class T> void
 ObjectUpdater::Visit(GridRefManager<T> &m)
 {
@@ -230,23 +201,17 @@ ObjectUpdater::Visit(GridRefManager<T> &m)
             iter->getSource()->Update(i_timeDiff);
     }
 }
-
 bool CannibalizeObjectCheck::operator()(Corpse* u)
 {
     // ignore bones
     if(u->GetType()==CORPSE_BONES)
         return false;
-
     Player* owner = ObjectAccessor::FindPlayer(u->GetOwnerGUID());
-
     if( !owner || i_funit->IsFriendlyTo(owner))
         return false;
-
     if(i_funit->IsWithinDistInMap(u, i_range) )
         return true;
-
     return false;
 }
-
 template void ObjectUpdater::Visit<GameObject>(GameObjectMapType &);
 template void ObjectUpdater::Visit<DynamicObject>(DynamicObjectMapType &);
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index b76bbb27256..54e3e466c41 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_GRIDNOTIFIERS_H
 #define TRINITY_GRIDNOTIFIERS_H
-
 #include "ObjectGridLoader.h"
 #include "UpdateData.h"
 #include <iostream>
-
 #include "Corpse.h"
 #include "Object.h"
 #include "DynamicObject.h"
@@ -32,10 +29,8 @@
 #include "Player.h"
 #include "Unit.h"
 #include "CreatureAI.h"
-
 class Player;
 //class Map;
-
 namespace Trinity
 {
     struct TRINITY_DLL_DECL PlayerVisibilityNotifier
@@ -44,14 +39,10 @@ namespace Trinity
         UpdateData i_data;
         Player::ClientGUIDs i_clientGUIDs;
         std::set<WorldObject*> i_visibleNow;
-
         PlayerVisibilityNotifier(Player &player) : i_player(player),i_clientGUIDs(player.m_clientGUIDs) {}
-
         template<class T> inline void Visit(GridRefManager<T> &);
-
         void Notify(void);
     };
-
     struct TRINITY_DLL_DECL PlayerRelocationNotifier : public PlayerVisibilityNotifier
     {
         PlayerRelocationNotifier(Player &player) : PlayerVisibilityNotifier(player) {}
@@ -61,7 +52,6 @@ namespace Trinity
         template<> inline void Visit(CreatureMapType &);
         #endif
     };
-
     struct TRINITY_DLL_DECL CreatureRelocationNotifier
     {
         Creature &i_creature;
@@ -72,37 +62,31 @@ namespace Trinity
         template<> inline void Visit(CreatureMapType &);
         #endif
     };
-
     struct TRINITY_DLL_DECL VisibleChangesNotifier
     {
         WorldObject &i_object;
-
         explicit VisibleChangesNotifier(WorldObject &object) : i_object(object) {}
         template<class T> void Visit(GridRefManager<T> &) {}
         void Visit(PlayerMapType &);
         void Visit(CreatureMapType &);
         void Visit(DynamicObjectMapType &);
     };
-
     struct TRINITY_DLL_DECL GridUpdater
     {
         GridType &i_grid;
         uint32 i_timeDiff;
         GridUpdater(GridType &grid, uint32 diff) : i_grid(grid), i_timeDiff(diff) {}
-
         template<class T> void updateObjects(GridRefManager<T> &m)
         {
             for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
                 iter->getSource()->Update(i_timeDiff);
         }
-
         void Visit(PlayerMapType &m) { updateObjects<Player>(m); }
         void Visit(CreatureMapType &m){ updateObjects<Creature>(m); }
         void Visit(GameObjectMapType &m) { updateObjects<GameObject>(m); }
         void Visit(DynamicObjectMapType &m) { updateObjects<DynamicObject>(m); }
         void Visit(CorpseMapType &m) { updateObjects<Corpse>(m); }
     };
-
     struct TRINITY_DLL_DECL MessageDistDeliverer
     {
         WorldObject *i_source;
@@ -119,17 +103,14 @@ namespace Trinity
         void Visit(CreatureMapType &m);
         void Visit(DynamicObjectMapType &m);
         template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
-
         void SendPacket(Player* plr)
         {
             // never send packet to self
             if(plr == i_source || team && plr->GetTeam() != team)
                 return;
-
             plr->GetSession()->SendPacket(i_message);
         }
     };
-
     struct TRINITY_DLL_DECL ObjectUpdater
     {
         uint32 i_timeDiff;
@@ -139,18 +120,15 @@ namespace Trinity
         void Visit(CorpseMapType &) {}
         void Visit(CreatureMapType &);
     };
-
     template<class T>
         struct TRINITY_DLL_DECL ObjectAccessorNotifier
     {
         T *& i_object;
-
         uint64 i_id;
         ObjectAccessorNotifier(T * &obj, uint64 id) : i_object(obj), i_id(id)
         {
             i_object = NULL;
         }
-
         void Visit(GridRefManager<T> &m )
         {
             if( i_object == NULL )
@@ -163,10 +141,8 @@ namespace Trinity
                 }
             }
         }
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     struct TRINITY_DLL_DECL DynamicObjectUpdater
     {
         DynamicObject &i_dynobject;
@@ -178,74 +154,58 @@ namespace Trinity
             if(owner)
                 i_check = owner;
         }
-
         template<class T> inline void Visit(GridRefManager<T>  &) {}
         #ifdef WIN32
         template<> inline void Visit<Player>(PlayerMapType &);
         template<> inline void Visit<Creature>(CreatureMapType &);
         #endif
-
         void VisitHelper(Unit* target);
     };
-
     // SEARCHERS & LIST SEARCHERS & WORKERS
-
     // WorldObject searchers & workers
-
     template<class Check>
         struct TRINITY_DLL_DECL WorldObjectSearcher
     {
         uint32 i_phaseMask;
         WorldObject* &i_object;
         Check &i_check;
-
         WorldObjectSearcher(WorldObject const* searcher, WorldObject* & result, Check& check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(GameObjectMapType &m);
         void Visit(PlayerMapType &m);
         void Visit(CreatureMapType &m);
         void Visit(CorpseMapType &m);
         void Visit(DynamicObjectMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Check>
         struct TRINITY_DLL_DECL WorldObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<WorldObject*> &i_objects;
         Check& i_check;
-
         WorldObjectListSearcher(WorldObject const* searcher, std::list<WorldObject*> &objects, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {}
-
         void Visit(PlayerMapType &m);
         void Visit(CreatureMapType &m);
         void Visit(CorpseMapType &m);
         void Visit(GameObjectMapType &m);
         void Visit(DynamicObjectMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Do>
         struct TRINITY_DLL_DECL WorldObjectWorker
     {
         uint32 i_phaseMask;
         Do const& i_do;
-
         WorldObjectWorker(WorldObject const* searcher, Do const& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
-
         void Visit(GameObjectMapType &m)
         {
             for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         void Visit(PlayerMapType &m)
         {
             for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
@@ -258,41 +218,32 @@ namespace Trinity
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         void Visit(CorpseMapType &m)
         {
             for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         void Visit(DynamicObjectMapType &m)
         {
             for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Gameobject searchers
-
     template<class Check>
         struct TRINITY_DLL_DECL GameObjectSearcher
     {
         uint32 i_phaseMask;
         GameObject* &i_object;
         Check &i_check;
-
         GameObjectSearcher(WorldObject const* searcher, GameObject* & result, Check& check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(GameObjectMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Last accepted by Check GO if any (Check can change requirements at each call)
     template<class Check>
         struct TRINITY_DLL_DECL GameObjectLastSearcher
@@ -300,32 +251,23 @@ namespace Trinity
         uint32 i_phaseMask;
         GameObject* &i_object;
         Check& i_check;
-
         GameObjectLastSearcher(WorldObject const* searcher, GameObject* & result, Check& check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result), i_check(check) {}
-
         void Visit(GameObjectMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Check>
         struct TRINITY_DLL_DECL GameObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<GameObject*> &i_objects;
         Check& i_check;
-
         GameObjectListSearcher(WorldObject const* searcher, std::list<GameObject*> &objects, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects), i_check(check) {}
-
         void Visit(GameObjectMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Unit searchers
-
     // First accepted by Check Unit if any
     template<class Check>
         struct TRINITY_DLL_DECL UnitSearcher
@@ -333,16 +275,12 @@ namespace Trinity
         uint32 i_phaseMask;
         Unit* &i_object;
         Check & i_check;
-
         UnitSearcher(WorldObject const* searcher, Unit* & result, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(CreatureMapType &m);
         void Visit(PlayerMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Last accepted by Check Unit if any (Check can change requirements at each call)
     template<class Check>
         struct TRINITY_DLL_DECL UnitLastSearcher
@@ -350,16 +288,12 @@ namespace Trinity
         uint32 i_phaseMask;
         Unit* &i_object;
         Check & i_check;
-
         UnitLastSearcher(WorldObject const* searcher, Unit* & result, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(CreatureMapType &m);
         void Visit(PlayerMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // All accepted by Check units if any
     template<class Check>
         struct TRINITY_DLL_DECL UnitListSearcher
@@ -367,33 +301,24 @@ namespace Trinity
         uint32 i_phaseMask;
         std::list<Unit*> &i_objects;
         Check& i_check;
-
         UnitListSearcher(WorldObject const* searcher, std::list<Unit*> &objects, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {}
-
         void Visit(PlayerMapType &m);
         void Visit(CreatureMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Creature searchers
-
     template<class Check>
         struct TRINITY_DLL_DECL CreatureSearcher
     {
         uint32 i_phaseMask;
         Creature* &i_object;
         Check & i_check;
-
         CreatureSearcher(WorldObject const* searcher, Creature* & result, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(CreatureMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Last accepted by Check Creature if any (Check can change requirements at each call)
     template<class Check>
         struct TRINITY_DLL_DECL CreatureLastSearcher
@@ -401,122 +326,92 @@ namespace Trinity
         uint32 i_phaseMask;
         Creature* &i_object;
         Check & i_check;
-
         CreatureLastSearcher(WorldObject const* searcher, Creature* & result, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(CreatureMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Check>
         struct TRINITY_DLL_DECL CreatureListSearcher
     {
         uint32 i_phaseMask;
         std::list<Creature*> &i_objects;
         Check& i_check;
-
         CreatureListSearcher(WorldObject const* searcher, std::list<Creature*> &objects, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {}
-
         void Visit(CreatureMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Do>
     struct MANGOS_DLL_DECL CreatureWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
-
         CreatureWorker(WorldObject const* searcher, Do& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
-
         void Visit(CreatureMapType &m)
         {
             for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // Player searchers
-
     template<class Check>
     struct TRINITY_DLL_DECL PlayerSearcher
     {
         uint32 i_phaseMask;
         Player* &i_object;
         Check & i_check;
-
         PlayerSearcher(WorldObject const* searcher, Player* & result, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_object(result),i_check(check) {}
-
         void Visit(PlayerMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Check>
         struct TRINITY_DLL_DECL PlayerListSearcher
     {
         uint32 i_phaseMask;
         std::list<Player*> &i_objects;
         Check& i_check;
-
         PlayerListSearcher(WorldObject const* searcher, std::list<Player*> &objects, Check & check)
             : i_phaseMask(searcher->GetPhaseMask()), i_objects(objects),i_check(check) {}
-
         void Visit(PlayerMapType &m);
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Do>
     struct TRINITY_DLL_DECL PlayerWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
-
         PlayerWorker(WorldObject const* searcher, Do& _do)
             : i_phaseMask(searcher->GetPhaseMask()), i_do(_do) {}
-
         void Visit(PlayerMapType &m)
         {
             for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if(itr->getSource()->InSamePhase(i_phaseMask))
                     i_do(itr->getSource());
         }
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     template<class Do>
     struct TRINITY_DLL_DECL PlayerDistWorker
     {
         WorldObject const* i_searcher;
         float i_dist;
         Do& i_do;
-
         PlayerDistWorker(WorldObject const* searcher, float _dist, Do& _do)
             : i_searcher(searcher), i_dist(_dist), i_do(_do) {}
-
         void Visit(PlayerMapType &m)
         {
             for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
                 if (itr->getSource()->InSamePhase(i_searcher) && itr->getSource()->IsWithinDist(i_searcher,i_dist))
                     i_do(itr->getSource());
         }
-
         template<class NOT_INTERESTED> void Visit(GridRefManager<NOT_INTERESTED> &) {}
     };
-
     // CHECKS && DO classes
-
     // WorldObject check classes
     class RaiseDeadObjectCheck
     {
@@ -529,7 +424,6 @@ namespace Trinity
                     ( u->GetCreatureTypeMask() & (1 << (CREATURE_TYPE_HUMANOID-1)) )==0 ||
                     (u->GetDisplayId() != u->GetNativeDisplayId()))
                     return false;
-
                 return i_funit->IsWithinDistInMap(u, i_range);
             }
             template<class NOT_INTERESTED> bool operator()(NOT_INTERESTED*) { return false; }
@@ -537,7 +431,6 @@ namespace Trinity
             Unit* const i_funit;
             float i_range;
     };
-
     class ExplodeCorpseObjectCheck
     {
         public:
@@ -547,7 +440,6 @@ namespace Trinity
                 if (u->getDeathState()!=CORPSE || u->isInFlight() ||
                     u->HasAuraType(SPELL_AURA_GHOST) || (u->GetDisplayId() != u->GetNativeDisplayId()))
                     return false;
-
                 return i_funit->IsWithinDistInMap(u, i_range);
             }
             bool operator()(Creature* u)
@@ -556,7 +448,6 @@ namespace Trinity
                     (u->GetDisplayId() != u->GetNativeDisplayId()) ||
                     (u->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL)!=0)
                     return false;
-
                 return i_funit->IsWithinDistInMap(u, i_range);
             }
             template<class NOT_INTERESTED> bool operator()(NOT_INTERESTED*) { return false; }
@@ -564,7 +455,6 @@ namespace Trinity
             Unit* const i_funit;
             float i_range;
     };
-
     class CannibalizeObjectCheck
     {
         public:
@@ -573,7 +463,6 @@ namespace Trinity
             {
                 if( i_funit->IsFriendlyTo(u) || u->isAlive() || u->isInFlight() )
                     return false;
-
                 return i_funit->IsWithinDistInMap(u, i_range);
             }
             bool operator()(Corpse* u);
@@ -582,7 +471,6 @@ namespace Trinity
                 if (i_funit->IsFriendlyTo(u) || u->isAlive() || u->isInFlight() ||
                     (u->GetCreatureTypeMask() & CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD)==0)
                     return false;
-
                 return i_funit->IsWithinDistInMap(u, i_range);
             }
             template<class NOT_INTERESTED> bool operator()(NOT_INTERESTED*) { return false; }
@@ -590,9 +478,7 @@ namespace Trinity
             Unit* const i_funit;
             float i_range;
     };
-
     // WorldObject do classes
-
     class RespawnDo
     {
         public:
@@ -602,9 +488,7 @@ namespace Trinity
             void operator()(WorldObject*) const {}
             void operator()(Corpse*) const {}
     };
-
     // GameObject checks
-
     class GameObjectFocusCheck
     {
         public:
@@ -613,19 +497,15 @@ namespace Trinity
             {
                 if(go->GetGOInfo()->type != GAMEOBJECT_TYPE_SPELL_FOCUS)
                     return false;
-
                 if(go->GetGOInfo()->spellFocus.focusId != i_focusId)
                     return false;
-
                 float dist = go->GetGOInfo()->spellFocus.dist;
-
                 return go->IsWithinDistInMap(i_unit, dist);
             }
         private:
             Unit const* i_unit;
             uint32 i_focusId;
     };
-
     // Find the nearest Fishing hole and return true only if source object is in range of hole
     class NearestGameObjectFishingHole
     {
@@ -644,11 +524,9 @@ namespace Trinity
         private:
             WorldObject const& i_obj;
             float  i_range;
-
             // prevent clone
             NearestGameObjectFishingHole(NearestGameObjectFishingHole const&);
     };
-
     class NearestGameObjectCheck
     {
         public:
@@ -666,11 +544,9 @@ namespace Trinity
         private:
             WorldObject const& i_obj;
             float i_range;
-
             // prevent clone this object
             NearestGameObjectCheck(NearestGameObjectCheck const&);
     };
-
     // Success at unit in range, range update for next check (this can be use with GameobjectLastSearcher to find nearest GO)
     class NearestGameObjectEntryInObjectRangeCheck
     {
@@ -690,11 +566,9 @@ namespace Trinity
             WorldObject const& i_obj;
             uint32 i_entry;
             float  i_range;
-
             // prevent clone this object
             NearestGameObjectEntryInObjectRangeCheck(NearestGameObjectEntryInObjectRangeCheck const&);
     };
-
     class GameObjectWithDbGUIDCheck
     {
         public:
@@ -707,9 +581,7 @@ namespace Trinity
             WorldObject const& i_obj;
             uint32 i_db_guid;
     };
-
     // Unit checks
-
     class MostHPMissingInRange
     {
         public:
@@ -728,7 +600,6 @@ namespace Trinity
             float i_range;
             uint32 i_hp;
     };
-
     class FriendlyCCedInRange
     {
         public:
@@ -746,7 +617,6 @@ namespace Trinity
             Unit const* i_obj;
             float i_range;
     };
-
     class FriendlyMissingBuffInRange
     {
         public:
@@ -765,7 +635,6 @@ namespace Trinity
             float i_range;
             uint32 i_spell;
     };
-
     class AnyUnfriendlyUnitInObjectRangeCheck
     {
         public:
@@ -782,7 +651,6 @@ namespace Trinity
             Unit const* i_funit;
             float i_range;
     };
-
     class AnyUnfriendlyNoTotemUnitInObjectRangeCheck
     {
         public:
@@ -791,10 +659,8 @@ namespace Trinity
             {
                 if(!u->isAlive())
                     return false;
-
                 if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->isTotem())
                     return false;
-
                 return i_obj->IsWithinDistInMap(u, i_range) && !i_funit->IsFriendlyTo(u);
             }
         private:
@@ -802,13 +668,11 @@ namespace Trinity
             Unit const* i_funit;
             float i_range;
     };
-
     class AnyUnfriendlyVisibleUnitInObjectRangeCheck
     {
         public:
             AnyUnfriendlyVisibleUnitInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range)
                 : i_obj(obj), i_funit(funit), i_range(range) {}
-
             bool operator()(Unit* u)
             {
                 return u->isAlive()
@@ -821,7 +685,6 @@ namespace Trinity
             Unit const* i_funit;
             float i_range;
     };
-
     class CreatureWithDbGUIDCheck
     {
         public:
@@ -834,7 +697,6 @@ namespace Trinity
             WorldObject const* i_obj;
             uint32 i_lowguid;
     };
-
     class AnyFriendlyUnitInObjectRangeCheck
     {
         public:
@@ -851,7 +713,6 @@ namespace Trinity
             Unit const* i_funit;
             float i_range;
     };
-
     class AnyUnitInObjectRangeCheck
     {
         public:
@@ -860,14 +721,12 @@ namespace Trinity
             {
                 if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
                     return true;
-
                 return false;
             }
         private:
             WorldObject const* i_obj;
             float i_range;
     };
-
     // Success at unit in range, range update for next check (this can be use with UnitLastSearcher to find nearest unit)
     class NearestAttackableUnitInObjectRangeCheck
     {
@@ -881,18 +740,15 @@ namespace Trinity
                     i_range = i_obj->GetDistance(u);        // use found unit range as new range limit for next check
                     return true;
                 }
-
                 return false;
             }
         private:
             WorldObject const* i_obj;
             Unit const* i_funit;
             float i_range;
-
             // prevent clone this object
             NearestAttackableUnitInObjectRangeCheck(NearestAttackableUnitInObjectRangeCheck const&);
     };
-
     class AnyAoETargetUnitInObjectRangeCheck
     {
         public:
@@ -912,10 +768,8 @@ namespace Trinity
                     return false;
                 if(u->GetTypeId()==TYPEID_UNIT && ((Creature*)u)->isTotem())
                     return false;
-
                 if(( i_targetForPlayer ? !i_funit->IsFriendlyTo(u) : i_funit->IsHostileTo(u) )&& i_obj->IsWithinDistInMap(u, i_range))
                     return true;
-
                 return false;
             }
         private:
@@ -924,7 +778,6 @@ namespace Trinity
             Unit const* i_funit;
             float i_range;
     };
-
     // do attack at call of help to friendly crearture
     class CallOfHelpCreatureInRangeDo
     {
@@ -936,18 +789,14 @@ namespace Trinity
             {
                 if (u == i_funit)
                     return;
-
                 if (!u->CanAssistTo(i_funit, i_enemy, false))
                     return;
-
                 // too far
                 if (!u->IsWithinDistInMap(i_enemy, i_range))
                     return;
-
                 // only if see assisted creature's enemy
                 if (!u->IsWithinLOSInMap(i_enemy))
                     return;
-
                 if (u->AI())
                     u->AI()->AttackStart(i_enemy);
             }
@@ -956,19 +805,15 @@ namespace Trinity
             Unit* const i_enemy;
             float i_range;
     };
-
     struct AnyDeadUnitCheck
     {
         bool operator()(Unit* u) { return !u->isAlive(); }
     };
-
     struct AnyStealthedCheck
     {
         bool operator()(Unit* u) { return u->GetVisibility()==VISIBILITY_GROUP_STEALTH; }
     };
-
     // Creature checks
-
     class NearestHostileUnitInAttackDistanceCheck
     {
         public:
@@ -982,7 +827,6 @@ namespace Trinity
                 // TODO: addthreat for every enemy in range?
                 if(!m_creature->IsWithinDistInMap(u, m_range))
                     return false;
-
                 if(m_force)
                 {
                     if(!m_creature->canAttack(u))
@@ -993,7 +837,6 @@ namespace Trinity
                     if(!m_creature->canStartAttack(u, false))
                         return false;
                 }
-
                 m_range = m_creature->GetDistance(u);
                 return true;
             }
@@ -1004,7 +847,6 @@ namespace Trinity
             bool m_force;
             NearestHostileUnitInAttackDistanceCheck(NearestHostileUnitInAttackDistanceCheck const&);
     };
-
     class AnyAssistCreatureInRangeCheck
     {
         public:
@@ -1016,18 +858,14 @@ namespace Trinity
             {
                 if(u == i_funit)
                     return false;
-
                 if ( !u->CanAssistTo(i_funit, i_enemy) )
                     return false;
-
                 // too far
                 if( !i_funit->IsWithinDistInMap(u, i_range) )
                     return false;
-
                 // only if see assisted creature
                 if( !i_funit->IsWithinLOSInMap(u) )
                     return false;
-
                 return true;
             }
         private:
@@ -1035,26 +873,21 @@ namespace Trinity
             Unit* const i_enemy;
             float i_range;
     };
-
     class NearestAssistCreatureInCreatureRangeCheck
     {
         public:
             NearestAssistCreatureInCreatureRangeCheck(Creature* obj, Unit* enemy, float range)
                 : i_obj(obj), i_enemy(enemy), i_range(range) {}
-
             bool operator()(Creature* u)
             {
                 if(u == i_obj)
                     return false;
                 if(!u->CanAssistTo(i_obj,i_enemy))
                     return false;
-
                 if(!i_obj->IsWithinDistInMap(u, i_range))
                     return false;
-
                 if(!i_obj->IsWithinLOSInMap(u))
                     return false;
-
                 i_range = i_obj->GetDistance(u);            // use found unit range as new range limit for next check
                 return true;
             }
@@ -1063,18 +896,15 @@ namespace Trinity
             Creature* const i_obj;
             Unit* const i_enemy;
             float  i_range;
-
             // prevent clone this object
             NearestAssistCreatureInCreatureRangeCheck(NearestAssistCreatureInCreatureRangeCheck const&);
     };
-
     // Success at unit in range, range update for next check (this can be use with CreatureLastSearcher to find nearest creature)
     class NearestCreatureEntryWithLiveStateInObjectRangeCheck
     {
         public:
             NearestCreatureEntryWithLiveStateInObjectRangeCheck(WorldObject const& obj,uint32 entry, bool alive, float range)
                 : i_obj(obj), i_entry(entry), i_alive(alive), i_range(range) {}
-
             bool operator()(Creature* u)
             {
                 if(u->GetEntry() == i_entry && u->isAlive()==i_alive && i_obj.IsWithinDistInMap(u, i_range))
@@ -1090,11 +920,9 @@ namespace Trinity
             uint32 i_entry;
             bool   i_alive;
             float  i_range;
-
             // prevent clone this object
             NearestCreatureEntryWithLiveStateInObjectRangeCheck(NearestCreatureEntryWithLiveStateInObjectRangeCheck const&);
     };
-
     class AnyPlayerInObjectRangeCheck
     {
     public:
@@ -1103,14 +931,12 @@ namespace Trinity
         {
             if(u->isAlive() && i_obj->IsWithinDistInMap(u, i_range))
                 return true;
-
             return false;
         }
     private:
         WorldObject const* i_obj;
         float i_range;
     };
-
     class AllFriendlyCreaturesInGrid
     {
     public:
@@ -1119,13 +945,11 @@ namespace Trinity
         {
             if(u->isAlive() && u->GetVisibility() == VISIBILITY_ON && u->IsFriendlyTo(pUnit))
                 return true;
-
             return false;
         }
     private:
         Unit const* pUnit;
     };
-
     class AllGameObjectsWithEntryInRange
     {
     public:
@@ -1134,7 +958,6 @@ namespace Trinity
         {
             if (pGo->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pGo,m_fRange,false))
                 return true;
-
             return false;
         }
     private:
@@ -1142,7 +965,6 @@ namespace Trinity
         uint32 m_uiEntry;
         float m_fRange;
     };
-
     class AllCreaturesOfEntryInRange
     {
         public:
@@ -1151,16 +973,13 @@ namespace Trinity
             {
                 if (pUnit->GetEntry() == m_uiEntry && m_pObject->IsWithinDist(pUnit,m_fRange,false))
                     return true;
-
                 return false;
             }
-
         private:
             const WorldObject* m_pObject;
             uint32 m_uiEntry;
             float m_fRange;
     };
-
     class PlayerAtMinimumRangeAway
     {
     public:
@@ -1170,15 +989,12 @@ namespace Trinity
             //No threat list check, must be done explicit if expected to be in combat with creature
             if (!pPlayer->isGameMaster() && pPlayer->isAlive() && !pUnit->IsWithinDist(pPlayer,fRange,false))
                 return true;
-
             return false;
         }
-
     private:
         Unit const* pUnit;
         float fRange;
     };
-
     class GameObjectInRangeCheck
     {
     public:
@@ -1190,28 +1006,23 @@ namespace Trinity
     private:
         float x, y, z, range;
     };
-
     // Player checks and do
-
     // Prepare using Builder localized packets with caching and send to player
     template<class Builder>
     class LocalizedPacketDo
     {
         public:
             explicit LocalizedPacketDo(Builder& builder) : i_builder(builder) {}
-
             ~LocalizedPacketDo()
             {
                 for(size_t i = 0; i < i_data_cache.size(); ++i)
                     delete i_data_cache[i];
             }
             void operator()( Player* p );
-
         private:
             Builder& i_builder;
             std::vector<WorldPacket*> i_data_cache;         // 0 = default, i => i-1 locale index
     };
-
     // Prepare using Builder localized packets with caching and send to player
     template<class Builder>
     class LocalizedPacketListDo
@@ -1219,7 +1030,6 @@ namespace Trinity
         public:
             typedef std::vector<WorldPacket*> WorldPacketList;
             explicit LocalizedPacketListDo(Builder& builder) : i_builder(builder) {}
-
             ~LocalizedPacketListDo()
             {
                 for(size_t i = 0; i < i_data_cache.size(); ++i)
@@ -1227,13 +1037,11 @@ namespace Trinity
                         delete i_data_cache[i][j];
             }
             void operator()( Player* p );
-
         private:
             Builder& i_builder;
             std::vector<WorldPacketList> i_data_cache;
                                                             // 0 = default, i => i-1 locale index
     };
-
     #ifndef WIN32
     template<> inline void PlayerRelocationNotifier::Visit<Creature>(CreatureMapType &);
     template<> inline void PlayerRelocationNotifier::Visit<Player>(PlayerMapType &);
diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h
index d9e27cc8bcc..a8e0116a7cf 100644
--- a/src/game/GridNotifiersImpl.h
+++ b/src/game/GridNotifiersImpl.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_GRIDNOTIFIERSIMPL_H
 #define TRINITY_GRIDNOTIFIERSIMPL_H
-
 #include "GridNotifiers.h"
 #include "WorldPacket.h"
 #include "Corpse.h"
@@ -28,7 +26,6 @@
 #include "UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
-
 inline void
 Trinity::ObjectUpdater::Visit(CreatureMapType &m)
 {
@@ -36,29 +33,24 @@ Trinity::ObjectUpdater::Visit(CreatureMapType &m)
         if(iter->getSource()->IsInWorld() && !iter->getSource()->isSpiritService())
             iter->getSource()->Update(i_timeDiff);
 }
-
 inline void PlayerCreatureRelocationWorker(Player* pl, Creature* c)
 {
     if(!pl->isAlive() || !c->isAlive() || pl->isInFlight())
         return;
-
     // Creature AI reaction
     if(c->HasReactState(REACT_AGGRESSIVE) && !c->hasUnitState(UNIT_STAT_SIGHTLESS))
         if(c->_IsWithinDist(pl, c->m_SightDistance, true) && c->IsAIEnabled)
             c->AI()->MoveInLineOfSight(pl);
 }
-
 inline void CreatureCreatureRelocationWorker(Creature* c1, Creature* c2)
 {
     if(c1->HasReactState(REACT_AGGRESSIVE) && !c1->hasUnitState(UNIT_STAT_SIGHTLESS))
         if(c1->_IsWithinDist(c2, c1->m_SightDistance, true) && c1->IsAIEnabled)
             c1->AI()->MoveInLineOfSight(c2);
-
     if(c2->HasReactState(REACT_AGGRESSIVE) && !c2->hasUnitState(UNIT_STAT_SIGHTLESS))
         if(c1->_IsWithinDist(c2, c2->m_SightDistance, true) && c2->IsAIEnabled)
             c2->AI()->MoveInLineOfSight(c1);
 }
-
 template<class T>
 inline void
 Trinity::PlayerVisibilityNotifier::Visit(GridRefManager<T> &m)
@@ -69,7 +61,6 @@ Trinity::PlayerVisibilityNotifier::Visit(GridRefManager<T> &m)
         i_clientGUIDs.erase(iter->getSource()->GetGUID());
     }
 }
-
 template<>
 inline void
 Trinity::PlayerRelocationNotifier::Visit(PlayerMapType &m)
@@ -77,24 +68,19 @@ Trinity::PlayerRelocationNotifier::Visit(PlayerMapType &m)
     for(PlayerMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         i_clientGUIDs.erase(iter->getSource()->GetGUID());
-
         if(iter->getSource()->m_Notified) //self is also skipped in this check
             continue;
-
         i_player.UpdateVisibilityOf(iter->getSource(),i_data,i_visibleNow);
         iter->getSource()->UpdateVisibilityOf(&i_player);
-
         //if (!i_player.GetSharedVisionList().empty())
         //    for (SharedVisionList::const_iterator it = i_player.GetSharedVisionList().begin(); it != i_player.GetSharedVisionList().end(); ++it)
         //        (*it)->UpdateVisibilityOf(iter->getSource());
-
         // Cancel Trade
         if(i_player.GetTrader()==iter->getSource())
             if(!i_player.IsWithinDistInMap(iter->getSource(), 5)) // iteraction distance
                 i_player.GetSession()->SendCancelTrade();   // will clode both side trade windows
     }
 }
-
 template<>
 inline void
 Trinity::PlayerRelocationNotifier::Visit(CreatureMapType &m)
@@ -102,16 +88,12 @@ Trinity::PlayerRelocationNotifier::Visit(CreatureMapType &m)
     for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         i_clientGUIDs.erase(iter->getSource()->GetGUID());
-
         if(iter->getSource()->m_Notified)
             continue;
-
         i_player.UpdateVisibilityOf(iter->getSource(),i_data,i_visibleNow);
-
         PlayerCreatureRelocationWorker(&i_player, iter->getSource());
     }
 }
-
 template<>
 inline void
 Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m)
@@ -120,70 +102,53 @@ Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m)
     {
         if(iter->getSource()->m_Notified)
             continue;
-
         iter->getSource()->UpdateVisibilityOf(&i_creature);
-
         PlayerCreatureRelocationWorker(iter->getSource(), &i_creature);
     }
 }
-
 template<>
 inline void
 Trinity::CreatureRelocationNotifier::Visit(CreatureMapType &m)
 {
     if(!i_creature.isAlive())
         return;
-
     for(CreatureMapType::iterator iter = m.begin(); iter != m.end(); ++iter)
     {
         if(iter->getSource()->m_Notified)
             continue;
-
         if(!iter->getSource()->isAlive())
             continue;
-
         CreatureCreatureRelocationWorker(iter->getSource(), &i_creature);
     }
 }
-
 inline void Trinity::DynamicObjectUpdater::VisitHelper(Unit* target)
 {
     if(!target->isAlive() || target->isInFlight() )
         return;
-
     if(target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->isTotem())
         return;
-
     if (!i_dynobject.IsWithinDistInMap(target, i_dynobject.GetRadius()))
         return;
-
     //Check targets for not_selectable unit flag and remove
     if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE))
         return;
-
     // Evade target
     if( target->GetTypeId()==TYPEID_UNIT && ((Creature*)target)->IsInEvadeMode() )
         return;
-
     //Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
     if( target->GetTypeId()==TYPEID_PLAYER && target != i_check && (((Player*)target)->isGameMaster() || ((Player*)target)->GetVisibility()==VISIBILITY_OFF) )
         return;
-
     if (i_dynobject.IsAffecting(target))
         return;
-
     if(target->HasAura(i_dynobject.GetSpellId(), i_check->GetGUID()))
         return;
 
-
     uint32 eff_index = 0;
     for(; eff_index < MAX_SPELL_EFFECTS; ++eff_index)
         if(i_dynobject.HasEffect(eff_index))
             break;
-
     if(eff_index == MAX_SPELL_EFFECTS)
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(i_dynobject.GetSpellId());
     if(spellInfo->EffectImplicitTargetB[eff_index] == TARGET_DEST_DYNOBJ_ALLY
         || spellInfo->EffectImplicitTargetB[eff_index] == TARGET_UNIT_AREA_ALLY_DST)
@@ -195,28 +160,23 @@ inline void Trinity::DynamicObjectUpdater::VisitHelper(Unit* target)
     {
         if (i_check->IsFriendlyTo( target ))
             return;
-
         i_check->CombatStart(target);
     }
     else
     {
         if (!i_check->IsHostileTo( target ))
             return;
-
         i_check->CombatStart(target);
     }
-
     // Check target immune to spell or aura
     if (target->IsImmunedToSpell(spellInfo) || target->IsImmunedToSpellEffect(spellInfo, eff_index))
         return;
-
     // Apply PersistentAreaAura on target
     Aura *aur = new Aura(spellInfo, i_dynobject.GetEffectMask(), target, &i_dynobject, i_check);
     aur->SetAuraDuration(i_dynobject.GetDuration());
     if(target->AddAura(aur, true))
         i_dynobject.AddAffected(target);
 }
-
 template<>
 inline void
 Trinity::DynamicObjectUpdater::Visit(CreatureMapType  &m)
@@ -224,7 +184,6 @@ Trinity::DynamicObjectUpdater::Visit(CreatureMapType  &m)
     for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
         VisitHelper(itr->getSource());
 }
-
 template<>
 inline void
 Trinity::DynamicObjectUpdater::Visit(PlayerMapType  &m)
@@ -232,23 +191,18 @@ Trinity::DynamicObjectUpdater::Visit(PlayerMapType  &m)
     for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
         VisitHelper(itr->getSource());
 }
-
 // SEARCHERS & LIST SEARCHERS & WORKERS
-
 // WorldObject searchers & workers
-
 template<class Check>
 void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if (i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -256,19 +210,16 @@ void Trinity::WorldObjectSearcher<Check>::Visit(GameObjectMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -276,19 +227,16 @@ void Trinity::WorldObjectSearcher<Check>::Visit(PlayerMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -296,19 +244,16 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CreatureMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(CorpseMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -316,19 +261,16 @@ void Trinity::WorldObjectSearcher<Check>::Visit(CorpseMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(DynamicObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -336,7 +278,6 @@ void Trinity::WorldObjectSearcher<Check>::Visit(DynamicObjectMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m)
 {
@@ -345,7 +286,6 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(PlayerMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m)
 {
@@ -354,7 +294,6 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CreatureMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m)
 {
@@ -363,7 +302,6 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(CorpseMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m)
 {
@@ -372,7 +310,6 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(GameObjectMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m)
 {
@@ -381,21 +318,17 @@ void Trinity::WorldObjectListSearcher<Check>::Visit(DynamicObjectMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 // Gameobject searchers
-
 template<class Check>
 void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(GameObjectMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -403,7 +336,6 @@ void Trinity::GameObjectSearcher<Check>::Visit(GameObjectMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
 {
@@ -411,12 +343,10 @@ void Trinity::GameObjectLastSearcher<Check>::Visit(GameObjectMapType &m)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
             i_object = itr->getSource();
     }
 }
-
 template<class Check>
 void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m)
 {
@@ -425,21 +355,17 @@ void Trinity::GameObjectListSearcher<Check>::Visit(GameObjectMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 // Unit searchers
-
 template<class Check>
 void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -447,19 +373,16 @@ void Trinity::UnitSearcher<Check>::Visit(CreatureMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -467,7 +390,6 @@ void Trinity::UnitSearcher<Check>::Visit(PlayerMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
 {
@@ -475,12 +397,10 @@ void Trinity::UnitLastSearcher<Check>::Visit(CreatureMapType &m)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
             i_object = itr->getSource();
     }
 }
-
 template<class Check>
 void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
 {
@@ -488,12 +408,10 @@ void Trinity::UnitLastSearcher<Check>::Visit(PlayerMapType &m)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
             i_object = itr->getSource();
     }
 }
-
 template<class Check>
 void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m)
 {
@@ -502,7 +420,6 @@ void Trinity::UnitListSearcher<Check>::Visit(PlayerMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m)
 {
@@ -511,21 +428,17 @@ void Trinity::UnitListSearcher<Check>::Visit(CreatureMapType &m)
             if(i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 // Creature searchers
-
 template<class Check>
 void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(CreatureMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -533,7 +446,6 @@ void Trinity::CreatureSearcher<Check>::Visit(CreatureMapType &m)
         }
     }
 }
-
 template<class Check>
 void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
 {
@@ -541,12 +453,10 @@ void Trinity::CreatureLastSearcher<Check>::Visit(CreatureMapType &m)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
             i_object = itr->getSource();
     }
 }
-
 template<class Check>
 void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m)
 {
@@ -555,7 +465,6 @@ void Trinity::CreatureListSearcher<Check>::Visit(CreatureMapType &m)
             if( i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m)
 {
@@ -564,19 +473,16 @@ void Trinity::PlayerListSearcher<Check>::Visit(PlayerMapType &m)
             if( i_check(itr->getSource()))
                 i_objects.push_back(itr->getSource());
 }
-
 template<class Check>
 void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m)
 {
     // already found
     if(i_object)
         return;
-
     for(PlayerMapType::iterator itr=m.begin(); itr != m.end(); ++itr)
     {
         if(!itr->getSource()->InSamePhase(i_phaseMask))
             continue;
-
         if(i_check(itr->getSource()))
         {
             i_object = itr->getSource();
@@ -584,78 +490,60 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m)
         }
     }
 }
-
 template<class Builder>
 void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
 {
     int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
     uint32 cache_idx = loc_idx+1;
     WorldPacket* data;
-
     // create if not cached yet
     if(i_data_cache.size() < cache_idx+1 || !i_data_cache[cache_idx])
     {
         if(i_data_cache.size() < cache_idx+1)
             i_data_cache.resize(cache_idx+1);
-
         data = new WorldPacket(SMSG_MESSAGECHAT, 200);
-
         i_builder(*data,loc_idx);
-
         i_data_cache[cache_idx] = data;
     }
     else
         data = i_data_cache[cache_idx];
-
     p->SendDirectMessage(data);
 }
-
 template<class Builder>
 void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p )
 {
     int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
     uint32 cache_idx = loc_idx+1;
     WorldPacketList* data_list;
-
     // create if not cached yet
     if(i_data_cache.size() < cache_idx+1 || i_data_cache[cache_idx].empty())
     {
         if(i_data_cache.size() < cache_idx+1)
             i_data_cache.resize(cache_idx+1);
-
         data_list = &i_data_cache[cache_idx];
-
         i_builder(*data_list,loc_idx);
     }
     else
         data_list = &i_data_cache[cache_idx];
-
     for(size_t i = 0; i < data_list->size(); ++i)
         p->SendDirectMessage((*data_list)[i]);
 }
-
 struct ObjectDistanceOrder : public std::binary_function<const WorldObject, const WorldObject, bool>
 {
     const Unit* m_pSource;
-
     ObjectDistanceOrder(const Unit* pSource) : m_pSource(pSource) {};
-
     bool operator()(const WorldObject* pLeft, const WorldObject* pRight) const
     {
         return m_pSource->GetDistanceOrder(pLeft, pRight);
     }
 };
-
 struct ObjectDistanceOrderReversed : public std::binary_function<const WorldObject, const WorldObject, bool>
 {
     const Unit* m_pSource;
-
     ObjectDistanceOrderReversed(const Unit* pSource) : m_pSource(pSource) {};
-
     bool operator()(const WorldObject* pLeft, const WorldObject* pRight) const
     {
         return !m_pSource->GetDistanceOrder(pLeft, pRight);
     }
 };
-
 #endif                                                      // MANGOS_GRIDNOTIFIERSIMPL_H
diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp
index 36092fbdc29..b8cb6d40ebb 100644
--- a/src/game/GridStates.cpp
+++ b/src/game/GridStates.cpp
@@ -17,17 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "GridStates.h"
 #include "GridNotifiers.h"
 #include "GameSystem/Grid.h"
 #include "Log.h"
-
 void
 InvalidState::Update(Map &, NGridType &, GridInfo &, const uint32 &/*x*/, const uint32 &/*y*/, const uint32 &) const
 {
 }
-
 void
 ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, const uint32 &y, const uint32 &t_diff) const
 {
@@ -48,7 +45,6 @@ ActiveState::Update(Map &m, NGridType &grid, GridInfo & info, const uint32 &x, c
         }
     }
 }
-
 void
 IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &) const
 {
@@ -56,7 +52,6 @@ IdleState::Update(Map &m, NGridType &grid, GridInfo &, const uint32 &x, const ui
     grid.SetGridState(GRID_STATE_REMOVAL);
     sLog.outDebug("Grid[%u,%u] on map %u moved to REMOVAL state", x, y, m.GetId());
 }
-
 void
 RemovalState::Update(Map &m, NGridType &grid, GridInfo &info, const uint32 &x, const uint32 &y, const uint32 &t_diff) const
 {
diff --git a/src/game/GridStates.h b/src/game/GridStates.h
index 12d64ad58ca..f44cd1cd1db 100644
--- a/src/game/GridStates.h
+++ b/src/game/GridStates.h
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_GRIDSTATES_H
 #define TRINITY_GRIDSTATES_H
-
 #include "Map.h"
 #include "Object.h"
-
 class TRINITY_DLL_DECL GridState
 {
     public:
@@ -44,32 +41,24 @@ class TRINITY_DLL_DECL GridState
 #endif
         virtual void Update(Map &, NGridType&, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const = 0;
 };
-
 class TRINITY_DLL_DECL InvalidState : public GridState
 {
     public:
-
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
-
 class TRINITY_DLL_DECL ActiveState : public GridState
 {
     public:
-
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
-
 class TRINITY_DLL_DECL IdleState : public GridState
 {
     public:
-
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
-
 class TRINITY_DLL_DECL RemovalState : public GridState
 {
     public:
-
         void Update(Map &, NGridType &, GridInfo &, const uint32 &x, const uint32 &y, const uint32 &t_diff) const;
 };
 #endif
diff --git a/src/game/Group.cpp b/src/game/Group.cpp
index 8a02afa25d2..16e91e564d2 100644
--- a/src/game/Group.cpp
+++ b/src/game/Group.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
@@ -33,7 +32,6 @@
 #include "InstanceSaveMgr.h"
 #include "MapInstanced.h"
 #include "Util.h"
-
 Group::Group()
 {
     m_leaderGuid        = 0;
@@ -45,11 +43,9 @@ Group::Group()
     m_looterGuid        = 0;
     m_lootThreshold     = ITEM_QUALITY_UNCOMMON;
     m_subGroupsCounts   = NULL;
-
     for (int i=0; i<TARGETICONCOUNT; ++i)
         m_targetIcons[i] = 0;
 }
-
 Group::~Group()
 {
     if(m_bgGroup)
@@ -67,41 +63,32 @@ Group::~Group()
         RollId.erase(itr);
         delete(r);
     }
-
     // it is undefined whether objectmgr (which stores the groups) or instancesavemgr
     // will be unloaded first so we must be prepared for both cases
     // this may unload some instance saves
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i)
         for(BoundInstancesMap::iterator itr2 = m_boundInstances[i].begin(); itr2 != m_boundInstances[i].end(); ++itr2)
             itr2->second.save->RemoveGroup(this);
-
     // Sub group counters clean up
     if (m_subGroupsCounts)
         delete[] m_subGroupsCounts;
 }
-
 bool Group::Create(const uint64 &guid, const char * name)
 {
     m_leaderGuid = guid;
     m_leaderName = name;
-
     m_groupType  = isBGGroup() ? GROUPTYPE_RAID : GROUPTYPE_NORMAL;
-
     if (m_groupType == GROUPTYPE_RAID)
         _initRaidSubGroupsCounter();
-
     m_lootMethod = GROUP_LOOT;
     m_lootThreshold = ITEM_QUALITY_UNCOMMON;
     m_looterGuid = guid;
-
     m_difficulty = DIFFICULTY_NORMAL;
     if(!isBGGroup())
     {
         Player *leader = objmgr.GetPlayer(guid);
         if(leader) m_difficulty = leader->GetDifficulty();
-
         Player::ConvertInstancesToGroup(leader, this, guid);
-
         // store group in database
         CharacterDatabase.BeginTransaction();
         CharacterDatabase.PExecute("DELETE FROM groups WHERE leaderGuid ='%u'", GUID_LOPART(m_leaderGuid));
@@ -111,20 +98,15 @@ bool Group::Create(const uint64 &guid, const char * name)
             GUID_LOPART(m_leaderGuid), GUID_LOPART(m_mainTank), GUID_LOPART(m_mainAssistant), uint32(m_lootMethod),
             GUID_LOPART(m_looterGuid), uint32(m_lootThreshold), m_targetIcons[0], m_targetIcons[1], m_targetIcons[2], m_targetIcons[3], m_targetIcons[4], m_targetIcons[5], m_targetIcons[6], m_targetIcons[7], isRaidGroup(), m_difficulty);
     }
-
     if(!AddMember(guid, name))
         return false;
-
     if(!isBGGroup()) CharacterDatabase.CommitTransaction();
-
     return true;
 }
-
 bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult *result, bool loadMembers)
 {
     if(isBGGroup())
         return false;
-
     bool external = true;
     if(!result)
     {
@@ -134,38 +116,30 @@ bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult *result, bool
         if(!result)
             return false;
     }
-
     m_leaderGuid = leaderGuid;
-
     // group leader not exist
     if(!objmgr.GetPlayerNameByGUID(m_leaderGuid, m_leaderName))
     {
         if(!external) delete result;
         return false;
     }
-
     m_groupType  = (*result)[13].GetBool() ? GROUPTYPE_RAID : GROUPTYPE_NORMAL;
-
     if (m_groupType == GROUPTYPE_RAID)
         _initRaidSubGroupsCounter();
-
     m_difficulty = (*result)[14].GetUInt8();
     m_mainTank = (*result)[0].GetUInt64();
     m_mainAssistant = (*result)[1].GetUInt64();
     m_lootMethod = (LootMethod)(*result)[2].GetUInt8();
     m_looterGuid = MAKE_NEW_GUID((*result)[3].GetUInt32(), 0, HIGHGUID_PLAYER);
     m_lootThreshold = (ItemQualities)(*result)[4].GetUInt16();
-
     for(int i=0; i<TARGETICONCOUNT; ++i)
         m_targetIcons[i] = (*result)[5+i].GetUInt64();
     if(!external) delete result;
-
     if(loadMembers)
     {
         result = CharacterDatabase.PQuery("SELECT memberGuid, assistant, subgroup FROM group_member WHERE leaderGuid ='%u'", GUID_LOPART(leaderGuid));
         if(!result)
             return false;
-
         do
         {
             LoadMemberFromDB((*result)[0].GetUInt32(), (*result)[2].GetUInt8(), (*result)[1].GetBool());
@@ -175,44 +149,33 @@ bool Group::LoadGroupFromDB(const uint64 &leaderGuid, QueryResult *result, bool
         if(GetMembersCount() < 2)
             return false;
     }
-
     return true;
 }
-
 bool Group::LoadMemberFromDB(uint32 guidLow, uint8 subgroup, bool assistant)
 {
     MemberSlot member;
     member.guid      = MAKE_NEW_GUID(guidLow, 0, HIGHGUID_PLAYER);
-
     // skip non-existed member
     if(!objmgr.GetPlayerNameByGUID(member.guid, member.name))
         return false;
-
     member.group     = subgroup;
     member.assistant = assistant;
     m_memberSlots.push_back(member);
-
     SubGroupCounterIncrease(subgroup);
-
     return true;
 }
-
 void Group::ConvertToRaid()
 {
     m_groupType = GROUPTYPE_RAID;
-
     _initRaidSubGroupsCounter();
-
     if(!isBGGroup())
         CharacterDatabase.PExecute("UPDATE groups SET isRaid = 1 WHERE leaderGuid='%u'", GUID_LOPART(m_leaderGuid));
     SendUpdate();
-
     // update quest related GO states (quest activity dependent from raid membership)
     for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
         if(Player* player = objmgr.GetPlayer(citr->guid))
             player->UpdateForQuestWorldObjects();
 }
-
 bool Group::AddInvite(Player *player)
 {
     if( !player || player->GetGroupInvite() )
@@ -222,42 +185,31 @@ bool Group::AddInvite(Player *player)
         group = player->GetOriginalGroup();
     if( group )
         return false;
-
     RemoveInvite(player);
-
     m_invitees.insert(player);
-
     player->SetGroupInvite(this);
-
     return true;
 }
-
 bool Group::AddLeaderInvite(Player *player)
 {
     if(!AddInvite(player))
         return false;
-
     m_leaderGuid = player->GetGUID();
     m_leaderName = player->GetName();
     return true;
 }
-
 uint32 Group::RemoveInvite(Player *player)
 {
     m_invitees.erase(player);
-
     player->SetGroupInvite(NULL);
     return GetMembersCount();
 }
-
 void Group::RemoveAllInvites()
 {
     for(InvitesList::iterator itr=m_invitees.begin(); itr!=m_invitees.end(); ++itr)
         (*itr)->SetGroupInvite(NULL);
-
     m_invitees.clear();
 }
-
 Player* Group::GetInvited(const uint64& guid) const
 {
     for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
@@ -267,7 +219,6 @@ Player* Group::GetInvited(const uint64& guid) const
     }
     return NULL;
 }
-
 Player* Group::GetInvited(const std::string& name) const
 {
     for(InvitesList::const_iterator itr = m_invitees.begin(); itr != m_invitees.end(); ++itr)
@@ -277,13 +228,11 @@ Player* Group::GetInvited(const std::string& name) const
     }
     return NULL;
 }
-
 bool Group::AddMember(const uint64 &guid, const char* name)
 {
     if(!_addMember(guid, name))
         return false;
     SendUpdate();
-
     Player *player = objmgr.GetPlayer(guid);
     if(player)
     {
@@ -292,7 +241,6 @@ bool Group::AddMember(const uint64 &guid, const char* name)
             // reset the new member's instances, unless he is currently in one of them
             // including raid/heroic instances that they are not permanently bound to!
             player->ResetInstances(INSTANCE_RESET_GROUP_JOIN);
-
             if(player->getLevel() >= LEVELREQUIREMENT_HEROIC && player->GetDifficulty() != GetDifficulty() )
             {
                 player->SetDifficulty(m_difficulty);
@@ -301,38 +249,30 @@ bool Group::AddMember(const uint64 &guid, const char* name)
         }
         player->SetGroupUpdateFlag(GROUP_UPDATE_FULL);
         UpdatePlayerOutOfRange(player);
-
         // quest related GO state dependent from raid memebership
         if(isRaidGroup())
             player->UpdateForQuestWorldObjects();
     }
-
     return true;
 }
-
 uint32 Group::RemoveMember(const uint64 &guid, const uint8 &method)
 {
     BroadcastGroupUpdate();
-
     // remove member and change leader (if need) only if strong more 2 members _before_ member remove
     if(GetMembersCount() > (isBGGroup() ? 1 : 2))           // in BG group case allow 1 members group
     {
         bool leaderChanged = _removeMember(guid);
-
         if(Player *player = objmgr.GetPlayer( guid ))
         {
             // quest related GO state dependent from raid membership
             if(isRaidGroup())
                 player->UpdateForQuestWorldObjects();
-
             WorldPacket data;
-
             if(method == 1)
             {
                 data.Initialize( SMSG_GROUP_UNINVITE, 0 );
                 player->GetSession()->SendPacket( &data );
             }
-
             //we already removed player from group and in player->GetGroup() is his original group!
             if( Group* group = player->GetGroup() )
             {
@@ -344,51 +284,40 @@ uint32 Group::RemoveMember(const uint64 &guid, const uint8 &method)
                 data << uint64(0) << uint64(0) << uint64(0);
                 player->GetSession()->SendPacket(&data);
             }
-
             _homebindIfInstance(player);
         }
-
         if(leaderChanged)
         {
             WorldPacket data(SMSG_GROUP_SET_LEADER, (m_memberSlots.front().name.size()+1));
             data << m_memberSlots.front().name;
             BroadcastPacket(&data, true);
         }
-
         SendUpdate();
     }
     // if group before remove <= 2 disband it
     else
         Disband(true);
-
     return m_memberSlots.size();
 }
-
 void Group::ChangeLeader(const uint64 &guid)
 {
     member_citerator slot = _getMemberCSlot(guid);
-
     if(slot==m_memberSlots.end())
         return;
-
     _setLeader(guid);
-
     WorldPacket data(SMSG_GROUP_SET_LEADER, slot->name.size()+1);
     data << slot->name;
     BroadcastPacket(&data, true);
     SendUpdate();
 }
-
 void Group::Disband(bool hideDestroy)
 {
     Player *player;
-
     for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
         player = objmgr.GetPlayer(citr->guid);
         if(!player)
             continue;
-
         //we cannot call _removeMember because it would invalidate member iterator
         //if we are removing player from battleground raid
         if( isBGGroup() )
@@ -401,21 +330,17 @@ void Group::Disband(bool hideDestroy)
             else
                 player->SetGroup(NULL);
         }
-
         // quest related GO state dependent from raid membership
         if(isRaidGroup())
             player->UpdateForQuestWorldObjects();
-
         if(!player->GetSession())
             continue;
-
         WorldPacket data;
         if(!hideDestroy)
         {
             data.Initialize(SMSG_GROUP_DESTROYED, 0);
             player->GetSession()->SendPacket(&data);
         }
-
         //we already removed player from group and in player->GetGroup() is his original group, send update
         if( Group* group = player->GetGroup() )
         {
@@ -427,14 +352,11 @@ void Group::Disband(bool hideDestroy)
             data << uint64(0) << uint64(0) << uint64(0);
             player->GetSession()->SendPacket(&data);
         }
-
         _homebindIfInstance(player);
     }
     RollId.clear();
     m_memberSlots.clear();
-
     RemoveAllInvites();
-
     if(!isBGGroup())
     {
         CharacterDatabase.BeginTransaction();
@@ -443,15 +365,12 @@ void Group::Disband(bool hideDestroy)
         CharacterDatabase.CommitTransaction();
         ResetInstances(INSTANCE_RESET_GROUP_DISBAND, NULL);
     }
-
     m_leaderGuid = 0;
     m_leaderName = "";
 }
-
 /*********************************************************/
 /***                   LOOT SYSTEM                     ***/
 /*********************************************************/
-
 void Group::SendLootStartRoll(uint32 CountDown, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_START_ROLL, (8+4+4+4+4+4));
@@ -461,18 +380,15 @@ void Group::SendLootStartRoll(uint32 CountDown, const Roll &r)
     data << uint32(r.itemRandomSuffix);                     // randomSuffix
     data << uint32(r.itemRandomPropId);                     // item random property ID
     data << uint32(CountDown);                              // the countdown time to choose "need" or "greed"
-
     for (Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
     {
         Player *p = objmgr.GetPlayer(itr->first);
         if(!p || !p->GetSession())
             continue;
-
         if(itr->second != NOT_VALID)
             p->GetSession()->SendPacket( &data );
     }
 }
-
 void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_ROLL, (8+4+8+4+4+4+1+1));
@@ -485,18 +401,15 @@ void Group::SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uin
     data << uint8(RollNumber);                              // 0: "Need for: [item name]" > 127: "you passed on: [item name]"      Roll number
     data << uint8(RollType);                                // 0: "Need for: [item name]" 0: "You have selected need for [item name] 1: need roll 2: greed roll
     data << uint8(0);                                       // 2.4.0
-
     for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
     {
         Player *p = objmgr.GetPlayer(itr->first);
         if(!p || !p->GetSession())
             continue;
-
         if(itr->second != NOT_VALID)
             p->GetSession()->SendPacket( &data );
     }
 }
-
 void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_ROLL_WON, (8+4+4+4+4+8+1+1));
@@ -508,18 +421,15 @@ void Group::SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid,
     data << uint64(TargetGuid);                             // guid of the player who won.
     data << uint8(RollNumber);                              // rollnumber realted to SMSG_LOOT_ROLL
     data << uint8(RollType);                                // Rolltype related to SMSG_LOOT_ROLL
-
     for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
     {
         Player *p = objmgr.GetPlayer(itr->first);
         if(!p || !p->GetSession())
             continue;
-
         if(itr->second != NOT_VALID)
             p->GetSession()->SendPacket( &data );
     }
 }
-
 void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r)
 {
     WorldPacket data(SMSG_LOOT_ALL_PASSED, (8+4+4+4+4));
@@ -528,18 +438,15 @@ void Group::SendLootAllPassed(uint32 NumberOfPlayers, const Roll &r)
     data << uint32(r.itemid);                               // The itemEntryId for the item that shall be rolled for
     data << uint32(r.itemRandomPropId);                     // Item random property ID
     data << uint32(r.itemRandomSuffix);                     // Item random suffix ID
-
     for( Roll::PlayerVote::const_iterator itr=r.playerVote.begin(); itr!=r.playerVote.end(); ++itr)
     {
         Player *p = objmgr.GetPlayer(itr->first);
         if(!p || !p->GetSession())
             continue;
-
         if(itr->second != NOT_VALID)
             p->GetSession()->SendPacket( &data );
     }
 }
-
 void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature)
 {
     std::vector<LootItem>::iterator i;
@@ -547,7 +454,6 @@ void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature)
     uint8 itemSlot = 0;
     Player *player = objmgr.GetPlayer(playerGUID);
     Group *group = player->GetGroup();
-
     for (i=loot->items.begin(); i != loot->items.end(); ++i, ++itemSlot)
     {
         item = objmgr.GetItemPrototype(i->itemid);
@@ -556,13 +462,11 @@ void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature)
             //sLog.outDebug("Group::GroupLoot: missing item prototype for item with id: %d", i->itemid);
             continue;
         }
-
         //roll for over-threshold item if it's one-player loot
         if (item->Quality >= uint32(m_lootThreshold) && !i->freeforall)
         {
             uint64 newitemGUID = MAKE_NEW_GUID(objmgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
             Roll* r=new Roll(newitemGUID,*i);
-
             //a vector is filled with only near party members
             for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
             {
@@ -578,47 +482,37 @@ void Group::GroupLoot(const uint64& playerGUID, Loot *loot, Creature *creature)
                     }
                 }
             }
-
             r->setLoot(loot);
             r->itemSlot = itemSlot;
-
             group->SendLootStartRoll(60000, *r);
-
             loot->items[itemSlot].is_blocked = true;
             creature->m_groupLootTimer = 60000;
             creature->lootingGroupLeaderGUID = GetLeaderGUID();
-
             RollId.push_back(r);
         }
         else
             i->is_underthreshold=1;
-
     }
 }
-
 void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *creature)
 {
     ItemPrototype const *item;
     Player *player = objmgr.GetPlayer(playerGUID);
     Group *group = player->GetGroup();
-
     uint8 itemSlot = 0;
     for(std::vector<LootItem>::iterator i=loot->items.begin(); i != loot->items.end(); ++i, ++itemSlot)
     {
         item = objmgr.GetItemPrototype(i->itemid);
-
         //only roll for one-player items, not for ones everyone can get
         if (item->Quality >= uint32(m_lootThreshold) && !i->freeforall)
         {
             uint64 newitemGUID = MAKE_NEW_GUID(objmgr.GenerateLowGuid(HIGHGUID_ITEM),0,HIGHGUID_ITEM);
             Roll* r=new Roll(newitemGUID,*i);
-
             for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
             {
                 Player *playerToRoll = itr->getSource();
                 if(!playerToRoll || !playerToRoll->GetSession())
                     continue;
-
                 if (playerToRoll->CanUseItem(item) && i->AllowedForPlayer(playerToRoll) )
                 {
                     if (playerToRoll->IsWithinDist(creature,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false))
@@ -628,16 +522,12 @@ void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *crea
                     }
                 }
             }
-
             if (r->totalPlayersRolling > 0)
             {
                 r->setLoot(loot);
                 r->itemSlot = itemSlot;
-
                 group->SendLootStartRoll(60000, *r);
-
                 loot->items[itemSlot].is_blocked = true;
-
                 RollId.push_back(r);
             }
             else
@@ -649,35 +539,27 @@ void Group::NeedBeforeGreed(const uint64& playerGUID, Loot *loot, Creature *crea
             i->is_underthreshold=1;
     }
 }
-
 void Group::MasterLoot(const uint64& playerGUID, Loot* /*loot*/, Creature *creature)
 {
     Player *player = objmgr.GetPlayer(playerGUID);
     if(!player)
         return;
-
     sLog.outDebug("Group::MasterLoot (SMSG_LOOT_MASTER_LIST, 330) player = [%s].", player->GetName());
-
     uint32 real_count = 0;
-
     WorldPacket data(SMSG_LOOT_MASTER_LIST, 330);
     data << (uint8)GetMembersCount();
-
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player *looter = itr->getSource();
         if (!looter->IsInWorld())
             continue;
-
         if (looter->IsWithinDist(creature,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false))
         {
             data << looter->GetGUID();
             ++real_count;
         }
     }
-
     data.put<uint8>(0,real_count);
-
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player *looter = itr->getSource();
@@ -685,23 +567,19 @@ void Group::MasterLoot(const uint64& playerGUID, Loot* /*loot*/, Creature *creat
             looter->GetSession()->SendPacket(&data);
     }
 }
-
 void Group::CountRollVote(const uint64& playerGUID, const uint64& Guid, uint32 NumberOfPlayers, uint8 Choise)
 {
     Rolls::iterator rollI = GetRoll(Guid);
     if (rollI == RollId.end())
         return;
     Roll* roll = *rollI;
-
     Roll::PlayerVote::iterator itr = roll->playerVote.find(playerGUID);
     // this condition means that player joins to the party after roll begins
     if (itr == roll->playerVote.end())
         return;
-
     if (roll->getLoot())
         if (roll->getLoot()->items.empty())
             return;
-
     switch (Choise)
     {
         case 0:                                             //Player choose pass
@@ -731,7 +609,6 @@ void Group::CountRollVote(const uint64& playerGUID, const uint64& Guid, uint32 N
         CountTheRoll(rollI, NumberOfPlayers);
     }
 }
-
 //called when roll timer expires
 void Group::EndRoll()
 {
@@ -743,7 +620,6 @@ void Group::EndRoll()
         CountTheRoll(itr, GetMembersCount());               //i don't have to edit player votes, who didn't vote ... he will pass
     }
 }
-
 void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
 {
     Roll* roll = *rollI;
@@ -761,12 +637,10 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
             uint8 maxresul = 0;
             uint64 maxguid  = (*roll->playerVote.begin()).first;
             Player *player;
-
             for( Roll::PlayerVote::const_iterator itr=roll->playerVote.begin(); itr!=roll->playerVote.end(); ++itr)
             {
                 if (itr->second != NEED)
                     continue;
-
                 uint8 randomN = urand(1, 99);
                 SendLootRoll(0, itr->first, randomN, 1, *roll);
                 if (maxresul < randomN)
@@ -777,11 +651,9 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
             }
             SendLootRollWon(0, maxguid, maxresul, 1, *roll);
             player = objmgr.GetPlayer(maxguid);
-
             if(player && player->GetSession())
             {
                 player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED_ON_LOOT, roll->itemid, maxresul);
-
                 ItemPosCountVec dest;
                 LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
                 uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
@@ -807,13 +679,11 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
             uint8 maxresul = 0;
             uint64 maxguid = (*roll->playerVote.begin()).first;
             Player *player;
-
             Roll::PlayerVote::iterator itr;
             for (itr=roll->playerVote.begin(); itr!=roll->playerVote.end(); ++itr)
             {
                 if (itr->second != GREED)
                     continue;
-
                 uint8 randomN = urand(1, 99);
                 SendLootRoll(0, itr->first, randomN, 2, *roll);
                 if (maxresul < randomN)
@@ -824,11 +694,9 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
             }
             SendLootRollWon(0, maxguid, maxresul, 2, *roll);
             player = objmgr.GetPlayer(maxguid);
-
             if(player && player->GetSession())
             {
                 player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED_ON_LOOT, roll->itemid, maxresul);
-
                 ItemPosCountVec dest;
                 LootItem *item = &(roll->getLoot()->items[roll->itemSlot]);
                 uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count );
@@ -856,27 +724,22 @@ void Group::CountTheRoll(Rolls::iterator rollI, uint32 NumberOfPlayers)
     RollId.erase(rollI);
     delete roll;
 }
-
 void Group::SetTargetIcon(uint8 id, uint64 guid)
 {
     if(id >= TARGETICONCOUNT)
         return;
-
     // clean other icons
     if( guid != 0 )
         for(int i=0; i<TARGETICONCOUNT; ++i)
             if( m_targetIcons[i] == guid )
                 SetTargetIcon(i, 0);
-
     m_targetIcons[id] = guid;
-
     WorldPacket data(MSG_RAID_TARGET_UPDATE, (2+8));
     data << (uint8)0;
     data << id;
     data << guid;
     BroadcastPacket(&data, true);
 }
-
 void Group::GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_level, Player* & member_with_max_level, Player* & not_gray_member_with_max_level)
 {
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
@@ -884,46 +747,36 @@ void Group::GetDataForXPAtKill(Unit const* victim, uint32& count,uint32& sum_lev
         Player* member = itr->getSource();
         if(!member || !member->isAlive())                   // only for alive
             continue;
-
         if(!member->IsAtGroupRewardDistance(victim))        // at req. distance
             continue;
-
         ++count;
         sum_level += member->getLevel();
         if(!member_with_max_level || member_with_max_level->getLevel() < member->getLevel())
             member_with_max_level = member;
-
         uint32 gray_level = MaNGOS::XP::GetGrayLevel(member->getLevel());
         if( victim->getLevel() > gray_level && (!not_gray_member_with_max_level
            || not_gray_member_with_max_level->getLevel() < member->getLevel()))
             not_gray_member_with_max_level = member;
     }
 }
-
 void Group::SendTargetIconList(WorldSession *session)
 {
     if(!session)
         return;
-
     WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+TARGETICONCOUNT*9));
     data << (uint8)1;
-
     for(int i=0; i<TARGETICONCOUNT; ++i)
     {
         if(m_targetIcons[i] == 0)
             continue;
-
         data << (uint8)i;
         data << m_targetIcons[i];
     }
-
     session->SendPacket(&data);
 }
-
 void Group::SendUpdate()
 {
     Player *player;
-
     for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
         player = objmgr.GetPlayer(citr->guid);
@@ -944,7 +797,6 @@ void Group::SendUpdate()
             Player* member = objmgr.GetPlayer(citr2->guid);
             uint8 onlineState = (member) ? MEMBER_STATUS_ONLINE : MEMBER_STATUS_OFFLINE;
             onlineState = onlineState | ((isBGGroup()) ? MEMBER_STATUS_PVP : 0);
-
             data << citr2->name;
             data << (uint64)citr2->guid;
                                                             // online-state
@@ -952,7 +804,6 @@ void Group::SendUpdate()
             data << (uint8)(citr2->group);                  // groupid
             data << (uint8)(citr2->assistant?0x01:0);       // 0x2 main assist, 0x4 main tank
         }
-
         data << uint64(m_leaderGuid);                       // leader guid
         if(GetMembersCount()-1)
         {
@@ -964,16 +815,13 @@ void Group::SendUpdate()
         player->GetSession()->SendPacket( &data );
     }
 }
-
 void Group::UpdatePlayerOutOfRange(Player* pPlayer)
 {
     if(!pPlayer || !pPlayer->IsInWorld())
         return;
-
     Player *player;
     WorldPacket data;
     pPlayer->GetSession()->BuildPartyMemberStatsChangedPacket(pPlayer, &data);
-
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         player = itr->getSource();
@@ -981,7 +829,6 @@ void Group::UpdatePlayerOutOfRange(Player* pPlayer)
             player->GetSession()->SendPacket(&data);
     }
 }
-
 void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int group, uint64 ignore)
 {
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
@@ -989,12 +836,10 @@ void Group::BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int
         Player *pl = itr->getSource();
         if(!pl || (ignore != 0 && pl->GetGUID() == ignore) || (ignorePlayersInBGRaid && pl->GetGroup() != this) )
             continue;
-
         if (pl->GetSession() && (group==-1 || itr->getSubGroup()==group))
             pl->GetSession()->SendPacket(packet);
     }
 }
-
 void Group::BroadcastReadyCheck(WorldPacket *packet)
 {
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
@@ -1005,7 +850,6 @@ void Group::BroadcastReadyCheck(WorldPacket *packet)
                 pl->GetSession()->SendPacket(packet);
     }
 }
-
 void Group::OfflineReadyCheck()
 {
     for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
@@ -1020,7 +864,6 @@ void Group::OfflineReadyCheck()
         }
     }
 }
-
 bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant)
 {
     // get first not-full group
@@ -1040,29 +883,22 @@ bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant)
         if (!groupFound)
             return false;
     }
-
     return _addMember(guid, name, isAssistant, groupid);
 }
-
 bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant, uint8 group)
 {
     if(IsFull())
         return false;
-
     if(!guid)
         return false;
-
     Player *player = objmgr.GetPlayer(guid);
-
     MemberSlot member;
     member.guid      = guid;
     member.name      = name;
     member.group     = group;
     member.assistant = isAssistant;
     m_memberSlots.push_back(member);
-
     SubGroupCounterIncrease(group);
-
     if(player)
     {
         player->SetGroupInvite(NULL);
@@ -1080,22 +916,18 @@ bool Group::_addMember(const uint64 &guid, const char* name, bool isAssistant, u
         if(bind && bind->save->GetInstanceId() == player->GetInstanceId())
             player->m_InstanceValid = true;
     }
-
     if(!isRaidGroup())                                      // reset targetIcons for non-raid-groups
     {
         for(int i=0; i<TARGETICONCOUNT; ++i)
             m_targetIcons[i] = 0;
     }
-
     if(!isBGGroup())
     {
         // insert into group table
         CharacterDatabase.PExecute("INSERT INTO group_member(leaderGuid,memberGuid,assistant,subgroup) VALUES('%u','%u','%u','%u')", GUID_LOPART(m_leaderGuid), GUID_LOPART(member.guid), ((member.assistant==1)?1:0), member.group);
     }
-
     return true;
 }
-
 bool Group::_removeMember(const uint64 &guid)
 {
     Player *player = objmgr.GetPlayer(guid);
@@ -1113,43 +945,33 @@ bool Group::_removeMember(const uint64 &guid)
                 player->SetGroup(NULL);
         }
     }
-
     _removeRolls(guid);
-
     member_witerator slot = _getMemberWSlot(guid);
     if (slot != m_memberSlots.end())
     {
         SubGroupCounterDecrease(slot->group);
-
         m_memberSlots.erase(slot);
     }
-
     if(!isBGGroup())
         CharacterDatabase.PExecute("DELETE FROM group_member WHERE memberGuid='%u'", GUID_LOPART(guid));
-
     if(m_leaderGuid == guid)                                // leader was removed
     {
         if(GetMembersCount() > 0)
             _setLeader(m_memberSlots.front().guid);
         return true;
     }
-
     return false;
 }
-
 void Group::_setLeader(const uint64 &guid)
 {
     member_citerator slot = _getMemberCSlot(guid);
     if(slot==m_memberSlots.end())
         return;
-
     if(!isBGGroup())
     {
         // TODO: set a time limit to have this function run rarely cause it can be slow
         CharacterDatabase.BeginTransaction();
-
         // update the group's bound instances when changing leaders
-
         // remove all permanent binds from the group
         // in the DB also remove solo binds that will be replaced with permbinds
         // from the new leader
@@ -1158,7 +980,6 @@ void Group::_setLeader(const uint64 &guid)
             "instance IN (SELECT instance FROM character_instance WHERE guid = '%u')"
             ")", GUID_LOPART(m_leaderGuid), GUID_LOPART(slot->guid)
         );
-
         Player *player = objmgr.GetPlayer(slot->guid);
         if(player)
         {
@@ -1176,25 +997,20 @@ void Group::_setLeader(const uint64 &guid)
                 }
             }
         }
-
         // update the group's solo binds to the new leader
         CharacterDatabase.PExecute("UPDATE group_instance SET leaderGuid='%u' WHERE leaderGuid = '%u'", GUID_LOPART(slot->guid), GUID_LOPART(m_leaderGuid));
-
         // copy the permanent binds from the new leader to the group
         // overwriting the solo binds with permanent ones if necessary
         // in the DB those have been deleted already
         Player::ConvertInstancesToGroup(player, this, slot->guid);
-
         // update the group leader
         CharacterDatabase.PExecute("UPDATE groups SET leaderGuid='%u' WHERE leaderGuid='%u'", GUID_LOPART(slot->guid), GUID_LOPART(m_leaderGuid));
         CharacterDatabase.PExecute("UPDATE group_member SET leaderGuid='%u' WHERE leaderGuid='%u'", GUID_LOPART(slot->guid), GUID_LOPART(m_leaderGuid));
         CharacterDatabase.CommitTransaction();
     }
-
     m_leaderGuid = slot->guid;
     m_leaderName = slot->name;
 }
-
 void Group::_removeRolls(const uint64 &guid)
 {
     for (Rolls::iterator it = RollId.begin(); it != RollId.end(); ++it)
@@ -1203,91 +1019,72 @@ void Group::_removeRolls(const uint64 &guid)
         Roll::PlayerVote::iterator itr2 = roll->playerVote.find(guid);
         if(itr2 == roll->playerVote.end())
             continue;
-
         if (itr2->second == GREED) --roll->totalGreed;
         if (itr2->second == NEED) --roll->totalNeed;
         if (itr2->second == PASS) --roll->totalPass;
         if (itr2->second != NOT_VALID) --roll->totalPlayersRolling;
-
         roll->playerVote.erase(itr2);
-
         CountRollVote(guid, roll->itemGUID, GetMembersCount()-1, 3);
     }
 }
-
 bool Group::_setMembersGroup(const uint64 &guid, const uint8 &group)
 {
     member_witerator slot = _getMemberWSlot(guid);
     if(slot==m_memberSlots.end())
         return false;
-
     slot->group = group;
-
     SubGroupCounterIncrease(group);
-
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE group_member SET subgroup='%u' WHERE memberGuid='%u'", group, GUID_LOPART(guid));
-
     return true;
 }
-
 bool Group::_setAssistantFlag(const uint64 &guid, const bool &state)
 {
     member_witerator slot = _getMemberWSlot(guid);
     if(slot==m_memberSlots.end())
         return false;
-
     slot->assistant = state;
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE group_member SET assistant='%u' WHERE memberGuid='%u'", (state==true)?1:0, GUID_LOPART(guid));
     return true;
 }
-
 bool Group::_setMainTank(const uint64 &guid)
 {
     member_citerator slot = _getMemberCSlot(guid);
     if(slot==m_memberSlots.end())
         return false;
-
     if(m_mainAssistant == guid)
         _setMainAssistant(0);
     m_mainTank = guid;
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET mainTank='%u' WHERE leaderGuid='%u'", GUID_LOPART(m_mainTank), GUID_LOPART(m_leaderGuid));
     return true;
 }
-
 bool Group::_setMainAssistant(const uint64 &guid)
 {
     member_witerator slot = _getMemberWSlot(guid);
     if(slot==m_memberSlots.end())
         return false;
-
     if(m_mainTank == guid)
         _setMainTank(0);
     m_mainAssistant = guid;
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET mainAssistant='%u' WHERE leaderGuid='%u'", GUID_LOPART(m_mainAssistant), GUID_LOPART(m_leaderGuid));
     return true;
 }
-
 bool Group::SameSubGroup(Player const* member1, Player const* member2) const
 {
     if(!member1 || !member2) return false;
     if (member1->GetGroup() != this || member2->GetGroup() != this) return false;
     else return member1->GetSubGroup() == member2->GetSubGroup();
 }
-
 // allows setting subgroup for offline members
 void Group::ChangeMembersGroup(const uint64 &guid, const uint8 &group)
 {
     if(!isRaidGroup())
         return;
     Player *player = objmgr.GetPlayer(guid);
-
     if (!player)
     {
         uint8 prevSubGroup;
         prevSubGroup = GetMemberGroup(guid);
-
         SubGroupCounterDecrease(prevSubGroup);
-
         if(_setMembersGroup(guid, group))
             SendUpdate();
     }
@@ -1295,7 +1092,6 @@ void Group::ChangeMembersGroup(const uint64 &guid, const uint8 &group)
         // This methods handles itself groupcounter decrease
         ChangeMembersGroup(player, group);
 }
-
 // only for online members
 void Group::ChangeMembersGroup(Player *player, const uint8 &group)
 {
@@ -1313,11 +1109,9 @@ void Group::ChangeMembersGroup(Player *player, const uint8 &group)
             player->GetOriginalGroupRef().setSubGroup(group);
         }
         SubGroupCounterDecrease(prevSubGroup);
-
         SendUpdate();
     }
 }
-
 void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
 {
     switch (GetLootMethod())
@@ -1330,7 +1124,6 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
             // quality items in each loot method except free for all and master loot
             break;
     }
-
     member_citerator guid_itr = _getMemberCSlot(GetLooterGuid());
     if(guid_itr != m_memberSlots.end())
     {
@@ -1343,7 +1136,6 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
         }
         ++guid_itr;
     }
-
     // search next after current
     if(guid_itr != m_memberSlots.end())
     {
@@ -1354,7 +1146,6 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
                 if (pl->IsWithinDist(creature,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false))
                 {
                     bool refresh = pl->GetLootGUID()==creature->GetGUID();
-
                     //if(refresh)                             // update loot for new looter
                     //    pl->GetSession()->DoLootRelease(pl->GetLootGUID());
                     SetLooterGuid(pl->GetGUID());
@@ -1366,7 +1157,6 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
             }
         }
     }
-
     // search from start
     for(member_citerator itr = m_memberSlots.begin(); itr != guid_itr; ++itr)
     {
@@ -1375,7 +1165,6 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
             if (pl->IsWithinDist(creature,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false))
             {
                 bool refresh = pl->GetLootGUID()==creature->GetGUID();
-
                 //if(refresh)                               // update loot for new looter
                 //    pl->GetSession()->DoLootRelease(pl->GetLootGUID());
                 SetLooterGuid(pl->GetGUID());
@@ -1386,11 +1175,9 @@ void Group::UpdateLooterGuid( Creature* creature, bool ifneed )
             }
         }
     }
-
     SetLooterGuid(0);
     SendUpdate();
 }
-
 uint32 Group::CanJoinBattleGroundQueue(BattleGroundTypeId bgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot)
 {
     // check for min / max count
@@ -1399,17 +1186,14 @@ uint32 Group::CanJoinBattleGroundQueue(BattleGroundTypeId bgTypeId, BattleGround
         return BG_JOIN_ERR_GROUP_NOT_ENOUGH;
     if(memberscount > MaxPlayerCount)
         return BG_JOIN_ERR_GROUP_TOO_MANY;
-
     // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.)
     Player * reference = GetFirstMember()->getSource();
     // no reference found, can't join this way
     if(!reference)
         return BG_JOIN_ERR_OFFLINE_MEMBER;
-
     BGQueueIdBasedOnLevel queue_id = reference->GetBattleGroundQueueIdFromLevel(bgTypeId);
     uint32 arenaTeamId = reference->GetArenaTeamId(arenaSlot);
     uint32 team = reference->GetTeam();
-
     // check every member of the group to be able to join
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
@@ -1438,22 +1222,18 @@ uint32 Group::CanJoinBattleGroundQueue(BattleGroundTypeId bgTypeId, BattleGround
     }
     return BG_JOIN_ERR_OK;
 }
-
 //===================================================
 //============== Roll ===============================
 //===================================================
-
 void Roll::targetObjectBuildLink()
 {
     // called from link()
     getTarget()->addLootValidatorRef(this);
 }
-
 void Group::SetDifficulty(uint8 difficulty)
 {
     m_difficulty = difficulty;
     if(!isBGGroup()) CharacterDatabase.PExecute("UPDATE groups SET difficulty = %u WHERE leaderGuid ='%u'", m_difficulty, GUID_LOPART(m_leaderGuid));
-
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player *player = itr->getSource();
@@ -1463,7 +1243,6 @@ void Group::SetDifficulty(uint8 difficulty)
         player->SendDungeonDifficulty(true);
     }
 }
-
 bool Group::InCombatToInstance(uint32 instanceId)
 {
     for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next())
@@ -1476,17 +1255,13 @@ bool Group::InCombatToInstance(uint32 instanceId)
     }
     return false;
 }
-
 void Group::ResetInstances(uint8 method, Player* SendMsgTo)
 {
     if(isBGGroup())
         return;
-
     // method can be INSTANCE_RESET_ALL, INSTANCE_RESET_CHANGE_DIFFICULTY, INSTANCE_RESET_GROUP_DISBAND
-
     // we assume that when the difficulty changes, all instances that can be reset will be
     uint8 dif = GetDifficulty();
-
     for(BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end();)
     {
         InstanceSave *p = itr->second.save;
@@ -1496,7 +1271,6 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo)
             ++itr;
             continue;
         }
-
         if(method == INSTANCE_RESET_ALL)
         {
             // the "reset all instances" method can only reset normal maps
@@ -1506,7 +1280,6 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo)
                 continue;
             }
         }
-
         bool isEmpty = true;
         // if the map is loaded, reset it
         Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
@@ -1517,13 +1290,11 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo)
             else
                 isEmpty = !map->HavePlayers();
         }
-
         if(SendMsgTo)
         {
             if(isEmpty) SendMsgTo->SendResetInstanceSuccess(p->GetMapId());
             else SendMsgTo->SendResetInstanceFailed(0, p->GetMapId());
         }
-
         if(isEmpty || method == INSTANCE_RESET_GROUP_DISBAND || method == INSTANCE_RESET_CHANGE_DIFFICULTY)
         {
             // do not reset the instance, just unbind if others are permanently bound to it
@@ -1540,20 +1311,17 @@ void Group::ResetInstances(uint8 method, Player* SendMsgTo)
             ++itr;
     }
 }
-
 InstanceGroupBind* Group::GetBoundInstance(uint32 mapid, uint8 difficulty)
 {
     // some instances only have one difficulty
     const MapEntry* entry = sMapStore.LookupEntry(mapid);
     if(!entry || !entry->SupportsHeroicMode()) difficulty = DIFFICULTY_NORMAL;
-
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
     if(itr != m_boundInstances[difficulty].end())
         return &itr->second;
     else
         return NULL;
 }
-
 InstanceGroupBind* Group::BindToInstance(InstanceSave *save, bool permanent, bool load)
 {
     if(save && !isBGGroup())
@@ -1567,13 +1335,11 @@ InstanceGroupBind* Group::BindToInstance(InstanceSave *save, bool permanent, boo
         }
         else
             if(!load) CharacterDatabase.PExecute("INSERT INTO group_instance (leaderGuid, instance, permanent) VALUES ('%u', '%u', '%u')", GUID_LOPART(GetLeaderGUID()), save->GetInstanceId(), permanent);
-
         if(bind.save != save)
         {
             if(bind.save) bind.save->RemoveGroup(this);
             save->AddGroup(this);
         }
-
         bind.save = save;
         bind.perm = permanent;
         if(!load) sLog.outDebug("Group::BindToInstance: %d is now bound to map %d, instance %d, difficulty %d", GUID_LOPART(GetLeaderGUID()), save->GetMapId(), save->GetInstanceId(), save->GetDifficulty());
@@ -1582,7 +1348,6 @@ InstanceGroupBind* Group::BindToInstance(InstanceSave *save, bool permanent, boo
     else
         return NULL;
 }
-
 void Group::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload)
 {
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
@@ -1593,7 +1358,6 @@ void Group::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload)
         m_boundInstances[difficulty].erase(itr);
     }
 }
-
 void Group::_homebindIfInstance(Player *player)
 {
     if(player && !player->isGameMaster() && sMapStore.LookupEntry(player->GetMapId())->IsDungeon())
@@ -1606,14 +1370,12 @@ void Group::_homebindIfInstance(Player *player)
             player->m_InstanceValid = false;
     }
 }
-
 void Group::BroadcastGroupUpdate(void)
 {
     // FG: HACK: force flags update on group leave - for values update hack
     // -- not very efficient but safe
     for(member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr)
     {
-
         Player *pp = objmgr.GetPlayer(citr->guid);
         if(pp && pp->IsInWorld())
         {
diff --git a/src/game/Group.h b/src/game/Group.h
index d09ef616897..a77c106c550 100644
--- a/src/game/Group.h
+++ b/src/game/Group.h
@@ -17,22 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_GROUP_H
 #define TRINITYCORE_GROUP_H
-
 #include "GroupReference.h"
 #include "GroupRefManager.h"
 #include "BattleGround.h"
 #include "LootMgr.h"
-
 #include <map>
 #include <vector>
-
 #define MAXGROUPSIZE 5
 #define MAXRAIDSIZE 40
 #define TARGETICONCOUNT 8
-
 enum RollVote
 {
     PASS              = 0,
@@ -41,7 +36,6 @@ enum RollVote
     NOT_EMITED_YET    = 3,
     NOT_VALID         = 4
 };
-
 enum GroupMemberOnlineStatus
 {
     MEMBER_STATUS_OFFLINE   = 0x0000,
@@ -54,15 +48,12 @@ enum GroupMemberOnlineStatus
     MEMBER_STATUS_UNK4      = 0x0040,                       // appears with dead and ghost flags
     MEMBER_STATUS_UNK5      = 0x0080,                       // never seen
 };
-
 enum GroupType
 {
     GROUPTYPE_NORMAL = 0,
     GROUPTYPE_RAID   = 1
 };
-
 class BattleGround;
-
 enum GroupUpdateFlags
 {
     GROUP_UPDATE_FLAG_NONE              = 0x00000000,       // nothing
@@ -89,13 +80,10 @@ enum GroupUpdateFlags
     GROUP_UPDATE_PET                    = 0x0007FC00,       // all pet flags
     GROUP_UPDATE_FULL                   = 0x0007FFFF,       // all known flags
 };
-
 #define GROUP_UPDATE_FLAGS_COUNT          20
                                                                 // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19
 static const uint8 GroupUpdateLength[GROUP_UPDATE_FLAGS_COUNT] = { 0, 2, 2, 2, 1, 2, 2, 2, 2, 4, 8, 8, 1, 2, 2, 2, 1, 2, 2, 8};
-
 class InstanceSave;
-
 class Roll : public LootValidatorRef
 {
     public:
@@ -106,7 +94,6 @@ class Roll : public LootValidatorRef
         void setLoot(Loot *pLoot) { link(pLoot, this); }
         Loot *getLoot() { return getTarget(); }
         void targetObjectBuildLink();
-
         uint64 itemGUID;
         uint32 itemid;
         int32  itemRandomPropId;
@@ -119,7 +106,6 @@ class Roll : public LootValidatorRef
         uint8 totalPass;
         uint8 itemSlot;
 };
-
 struct InstanceGroupBind
 {
     InstanceSave *save;
@@ -128,7 +114,6 @@ struct InstanceGroupBind
        PlayerInstanceBind for the same instance. */
     InstanceGroupBind() : save(NULL), perm(false) {}
 };
-
 /** request member stats checken **/
 /** todo: uninvite people that not accepted invite **/
 class TRINITY_DLL_SPEC Group
@@ -143,18 +128,14 @@ class TRINITY_DLL_SPEC Group
         };
         typedef std::list<MemberSlot> MemberSlotList;
         typedef MemberSlotList::const_iterator member_citerator;
-
         typedef UNORDERED_MAP< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap;
     protected:
         typedef MemberSlotList::iterator member_witerator;
         typedef std::set<Player*> InvitesList;
-
         typedef std::vector<Roll*> Rolls;
-
     public:
         Group();
         ~Group();
-
         // group manipulation methods
         bool   Create(const uint64 &guid, const char * name);
         bool   LoadGroupFromDB(const uint64 &leaderGuid, QueryResult *result = NULL, bool loadMembers = true);
@@ -172,7 +153,6 @@ class TRINITY_DLL_SPEC Group
         void   UpdateLooterGuid( Creature* creature, bool ifneed = false );
         void   SetLootThreshold(ItemQualities threshold) { m_lootThreshold = threshold; }
         void   Disband(bool hideDestroy=false);
-
         // properties accessories
         bool IsFull() const { return (m_groupType==GROUPTYPE_NORMAL) ? (m_memberSlots.size()>=MAXGROUPSIZE) : (m_memberSlots.size()>=MAXRAIDSIZE); }
         bool isRaidGroup() const { return m_groupType==GROUPTYPE_RAID; }
@@ -183,7 +163,6 @@ class TRINITY_DLL_SPEC Group
         LootMethod    GetLootMethod() const { return m_lootMethod; }
         const uint64& GetLooterGuid() const { return m_looterGuid; }
         ItemQualities GetLootThreshold() const { return m_lootThreshold; }
-
         // member manipulation methods
         bool IsMember(const uint64& guid) const { return _getMemberCSlot(guid) != m_memberSlots.end(); }
         bool IsLeader(const uint64& guid) const { return (GetLeaderGUID() == guid); }
@@ -203,37 +182,29 @@ class TRINITY_DLL_SPEC Group
             member_citerator mslot = _getMemberCSlot(guid);
             if(mslot==m_memberSlots.end())
                 return false;
-
             return mslot->assistant;
         }
         Player* GetInvited(const uint64& guid) const;
         Player* GetInvited(const std::string& name) const;
-
         bool SameSubGroup(uint64 guid1,const uint64& guid2) const
         {
             member_citerator mslot2 = _getMemberCSlot(guid2);
             if(mslot2==m_memberSlots.end())
                 return false;
-
             return SameSubGroup(guid1,&*mslot2);
         }
-
         bool SameSubGroup(uint64 guid1, MemberSlot const* slot2) const
         {
             member_citerator mslot1 = _getMemberCSlot(guid1);
             if(mslot1==m_memberSlots.end() || !slot2)
                 return false;
-
             return (mslot1->group==slot2->group);
         }
-
         bool HasFreeSlotSubGroup(uint8 subgroup) const
         {
             return (m_subGroupsCounts && m_subGroupsCounts[subgroup] < MAXGROUPSIZE);
         }
-
         bool SameSubGroup(Player const* member1, Player const* member2) const;
-
         MemberSlotList const& GetMemberSlots() const { return m_memberSlots; }
         GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); }
         uint32 GetMembersCount() const { return m_memberSlots.size(); }
@@ -243,19 +214,14 @@ class TRINITY_DLL_SPEC Group
             member_citerator mslot = _getMemberCSlot(guid);
             if(mslot==m_memberSlots.end())
                 return (MAXRAIDSIZE/MAXGROUPSIZE+1);
-
             return mslot->group;
         }
-
         // some additional raid methods
         void ConvertToRaid();
-
         void SetBattlegroundGroup(BattleGround *bg) { m_bgGroup = bg; }
         uint32 CanJoinBattleGroundQueue(BattleGroundTypeId bgTypeId, BattleGroundQueueTypeId bgQueueTypeId, uint32 MinPlayerCount, uint32 MaxPlayerCount, bool isRated, uint32 arenaSlot);
-
         void ChangeMembersGroup(const uint64 &guid, const uint8 &group);
         void ChangeMembersGroup(Player *player, const uint8 &group);
-
         void SetAssistant(uint64 guid, const bool &state)
         {
             if(!isRaidGroup())
@@ -267,7 +233,6 @@ class TRINITY_DLL_SPEC Group
         {
             if(!isRaidGroup())
                 return;
-
             if(_setMainTank(guid))
                 SendUpdate();
         }
@@ -275,18 +240,15 @@ class TRINITY_DLL_SPEC Group
         {
             if(!isRaidGroup())
                 return;
-
             if(_setMainAssistant(guid))
                 SendUpdate();
         }
-
         void SetTargetIcon(uint8 id, uint64 guid);
         void SetDifficulty(uint8 difficulty);
         uint8 GetDifficulty() { return m_difficulty; }
         uint16 InInstance();
         bool InCombatToInstance(uint32 instanceId);
         void ResetInstances(uint8 method, Player* SendMsgTo);
-
         // -no description-
         //void SendInit(WorldSession *session);
         void SendTargetIconList(WorldSession *session);
@@ -296,11 +258,9 @@ class TRINITY_DLL_SPEC Group
         void BroadcastPacket(WorldPacket *packet, bool ignorePlayersInBGRaid, int group=-1, uint64 ignore=0);
         void BroadcastReadyCheck(WorldPacket *packet);
         void OfflineReadyCheck();
-
         /*********************************************************/
         /***                   LOOT SYSTEM                     ***/
         /*********************************************************/
-
         void SendLootStartRoll(uint32 CountDown, const Roll &r);
         void SendLootRoll(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
         void SendLootRollWon(const uint64& SourceGuid, const uint64& TargetGuid, uint8 RollNumber, uint8 RollType, const Roll &r);
@@ -323,45 +283,34 @@ class TRINITY_DLL_SPEC Group
         void CountTheRoll(Rolls::iterator roll, uint32 NumberOfPlayers);
         void CountRollVote(const uint64& playerGUID, const uint64& Guid, uint32 NumberOfPlayers, uint8 Choise);
         void EndRoll();
-
         void LinkMember(GroupReference *pRef) { m_memberMgr.insertFirst(pRef); }
         void DelinkMember(GroupReference* /*pRef*/ ) { }
-
         InstanceGroupBind* BindToInstance(InstanceSave *save, bool permanent, bool load = false);
         void UnbindInstance(uint32 mapid, uint8 difficulty, bool unload = false);
         InstanceGroupBind* GetBoundInstance(uint32 mapid, uint8 difficulty);
         BoundInstancesMap& GetBoundInstances(uint8 difficulty) { return m_boundInstances[difficulty]; }
-
         // FG: evil hacks
         void BroadcastGroupUpdate(void);
-
     protected:
         bool _addMember(const uint64 &guid, const char* name, bool isAssistant=false);
         bool _addMember(const uint64 &guid, const char* name, bool isAssistant, uint8 group);
         bool _removeMember(const uint64 &guid);             // returns true if leader has changed
         void _setLeader(const uint64 &guid);
-
         void _removeRolls(const uint64 &guid);
-
         bool _setMembersGroup(const uint64 &guid, const uint8 &group);
         bool _setAssistantFlag(const uint64 &guid, const bool &state);
         bool _setMainTank(const uint64 &guid);
         bool _setMainAssistant(const uint64 &guid);
-
         void _homebindIfInstance(Player *player);
-
         void _initRaidSubGroupsCounter()
         {
             // Sub group counters initialization
             if (!m_subGroupsCounts)
                 m_subGroupsCounts = new uint8[MAXRAIDSIZE / MAXGROUPSIZE];
-
             memset((void*)m_subGroupsCounts, 0, (MAXRAIDSIZE / MAXGROUPSIZE)*sizeof(uint8));
-
             for (member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
                 ++m_subGroupsCounts[itr->group];
         }
-
         member_citerator _getMemberCSlot(uint64 Guid) const
         {
             for(member_citerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
@@ -371,7 +320,6 @@ class TRINITY_DLL_SPEC Group
             }
             return m_memberSlots.end();
         }
-
         member_witerator _getMemberWSlot(uint64 Guid)
         {
             for(member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr)
@@ -381,19 +329,16 @@ class TRINITY_DLL_SPEC Group
             }
             return m_memberSlots.end();
         }
-
         void SubGroupCounterIncrease(uint8 subgroup)
         {
             if (m_subGroupsCounts)
                 ++m_subGroupsCounts[subgroup];
         }
-
         void SubGroupCounterDecrease(uint8 subgroup)
         {
             if (m_subGroupsCounts)
                 --m_subGroupsCounts[subgroup];
         }
-
         MemberSlotList      m_memberSlots;
         GroupRefManager     m_memberMgr;
         InvitesList         m_invitees;
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 2746c6c7772..d2a347c8763 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
@@ -31,9 +30,7 @@
 #include "SocialMgr.h"
 #include "Util.h"
 #include "SpellAuras.h"
-
 class Aura;
-
 /* differeces from off:
     -you can uninvite yourself - is is useful
     -you can accept invitation even if leader went offline
@@ -44,40 +41,32 @@ class Aura;
     -quest sharing has to be corrected
     -FIX sending PartyMemberStats
 */
-
 void WorldSession::SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res)
 {
     WorldPacket data(SMSG_PARTY_COMMAND_RESULT, (8+member.size()+1));
     data << (uint32)operation;
     data << member;
     data << (uint32)res;
-
     SendPacket( &data );
 }
-
 void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
 {
     std::string membername;
     recv_data >> membername;
-
     // attempt add selected player
-
     // cheating
     if(!normalizePlayerName(membername))
     {
         SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_CANT_FIND_TARGET);
         return;
     }
-
     Player *player = objmgr.GetPlayer(membername.c_str());
-
     // no player
     if(!player)
     {
         SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_CANT_FIND_TARGET);
         return;
     }
-
     // restrict invite to GMs
     if (!sWorld.getConfig(CONFIG_ALLOW_GM_GROUP) && !GetPlayer()->isGameMaster() && player->isGameMaster())
     {
@@ -101,17 +90,14 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
         SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_TARGET_IGNORE_YOU);
         return;
     }
-
     if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
     {
         SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_TARGET_IGNORE_YOU);
         return;
     }
-
     Group *group = GetPlayer()->GetGroup();
     if( group && group->isBGGroup() )
         group = GetPlayer()->GetOriginalGroup();
-
     Group *group2 = player->GetGroup();
     if( group2 && group2->isBGGroup() )
         group2 = player->GetOriginalGroup();
@@ -121,7 +107,6 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
         SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_ALREADY_IN_GROUP);
         return;
     }
-
     if(group)
     {
         // not have permissions for invite
@@ -137,7 +122,6 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     // ok, but group not exist, start a new group
     // but don't create and save the group to the DB until
     // at least one person joins
@@ -164,42 +148,33 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     // ok, we do it
     WorldPacket data(SMSG_GROUP_INVITE, 10);                // guess size
     data << uint8(1);                                       // ok
     data << GetPlayer()->GetName();
     player->GetSession()->SendPacket(&data);
-
     SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_OK);
 }
-
 void WorldSession::HandleGroupAcceptOpcode( WorldPacket & /*recv_data*/ )
 {
     Group *group = GetPlayer()->GetGroupInvite();
     if (!group) return;
-
     if(group->GetLeaderGUID() == GetPlayer()->GetGUID())
     {
         sLog.outError("HandleGroupAcceptOpcode: player %s(%d) tried to accept an invite to his own group", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow());
         return;
     }
-
     // remove in from ivites in any case
     group->RemoveInvite(GetPlayer());
-
     /** error handling **/
     /********************/
-
     // not have place
     if(group->IsFull())
     {
         SendPartyResult(PARTY_OP_INVITE, "", PARTY_RESULT_PARTY_FULL);
         return;
     }
-
     Player* leader = objmgr.GetPlayer(group->GetLeaderGUID());
-
     // forming a new group, create it
     if(!group->IsCreated())
     {
@@ -208,198 +183,156 @@ void WorldSession::HandleGroupAcceptOpcode( WorldPacket & /*recv_data*/ )
         group->Create(group->GetLeaderGUID(), group->GetLeaderName());
         objmgr.AddGroup(group);
     }
-
     // everything's fine, do it, PLAYER'S GROUP IS SET IN ADDMEMBER!!!
     if(!group->AddMember(GetPlayer()->GetGUID(), GetPlayer()->GetName()))
         return;
-
     group->BroadcastGroupUpdate();
 }
-
 void WorldSession::HandleGroupDeclineOpcode( WorldPacket & /*recv_data*/ )
 {
     Group  *group  = GetPlayer()->GetGroupInvite();
     if (!group) return;
-
     // remember leader if online
     Player *leader = objmgr.GetPlayer(group->GetLeaderGUID());
-
     // uninvite, group can be deleted
     GetPlayer()->UninviteFromGroup();
-
     if(!leader || !leader->GetSession())
         return;
-
     // report
     WorldPacket data( SMSG_GROUP_DECLINE, 10 );             // guess size
     data << GetPlayer()->GetName();
     leader->GetSession()->SendPacket( &data );
 }
-
 void WorldSession::HandleGroupUninviteGuidOpcode(WorldPacket & recv_data)
 {
     uint64 guid;
     recv_data >> guid;
-
     //can't uninvite yourself
     if(guid == GetPlayer()->GetGUID())
     {
         sLog.outError("WorldSession::HandleGroupUninviteGuidOpcode: leader %s(%d) tried to uninvite himself from the group.", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow());
         return;
     }
-
     PartyResult res = GetPlayer()->CanUninviteFromGroup();
     if(res != PARTY_RESULT_OK)
     {
         SendPartyResult(PARTY_OP_LEAVE, "", res);
         return;
     }
-
     Group* grp = GetPlayer()->GetGroup();
     if(!grp)
         return;
-
     if(grp->IsMember(guid))
     {
         Player::RemoveFromGroup(grp,guid);
         return;
     }
-
     if(Player* plr = grp->GetInvited(guid))
     {
         plr->UninviteFromGroup();
         return;
     }
-
     SendPartyResult(PARTY_OP_LEAVE, "", PARTY_RESULT_NOT_IN_YOUR_PARTY);
 }
-
 void WorldSession::HandleGroupUninviteOpcode(WorldPacket & recv_data)
 {
     std::string membername;
     recv_data >> membername;
-
     // player not found
     if(!normalizePlayerName(membername))
         return;
-
     // can't uninvite yourself
     if(GetPlayer()->GetName() == membername)
     {
         sLog.outError("WorldSession::HandleGroupUninviteOpcode: leader %s(%d) tried to uninvite himself from the group.", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow());
         return;
     }
-
     PartyResult res = GetPlayer()->CanUninviteFromGroup();
     if(res != PARTY_RESULT_OK)
     {
         SendPartyResult(PARTY_OP_LEAVE, "", res);
         return;
     }
-
     Group* grp = GetPlayer()->GetGroup();
     if(!grp)
         return;
-
     if(uint64 guid = grp->GetMemberGUID(membername))
     {
         Player::RemoveFromGroup(grp,guid);
         return;
     }
-
     if(Player* plr = grp->GetInvited(membername))
     {
         plr->UninviteFromGroup();
         return;
     }
-
     SendPartyResult(PARTY_OP_LEAVE, membername, PARTY_RESULT_NOT_IN_YOUR_PARTY);
 }
-
 void WorldSession::HandleGroupSetLeaderOpcode( WorldPacket & recv_data )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     uint64 guid;
     recv_data >> guid;
-
     Player *player = objmgr.GetPlayer(guid);
-
     /** error handling **/
     if (!player || !group->IsLeader(GetPlayer()->GetGUID()) || player->GetGroup() != group)
         return;
     /********************/
-
     // everything's fine, do it
     group->ChangeLeader(guid);
 }
-
 void WorldSession::HandleGroupDisbandOpcode( WorldPacket & /*recv_data*/ )
 {
     if(!GetPlayer()->GetGroup())
         return;
-
     if(_player->InBattleGround())
     {
         SendPartyResult(PARTY_OP_INVITE, "", PARTY_RESULT_INVITE_RESTRICTED);
         return;
     }
-
     /** error handling **/
     /********************/
-
     // everything's fine, do it
     SendPartyResult(PARTY_OP_LEAVE, GetPlayer()->GetName(), PARTY_RESULT_OK);
-
     GetPlayer()->RemoveFromGroup();
 }
-
 void WorldSession::HandleLootMethodOpcode( WorldPacket & recv_data )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     uint32 lootMethod;
     uint64 lootMaster;
     uint32 lootThreshold;
     recv_data >> lootMethod >> lootMaster >> lootThreshold;
-
     /** error handling **/
     if(!group->IsLeader(GetPlayer()->GetGUID()))
         return;
     /********************/
-
     // everything's fine, do it
     group->SetLootMethod((LootMethod)lootMethod);
     group->SetLooterGuid(lootMaster);
     group->SetLootThreshold((ItemQualities)lootThreshold);
     group->SendUpdate();
 }
-
 void WorldSession::HandleLootRoll( WorldPacket &recv_data )
 {
     if(!GetPlayer()->GetGroup())
         return;
-
     uint64 Guid;
     uint32 NumberOfPlayers;
     uint8  Choise;
     recv_data >> Guid;                                      //guid of the item rolled
     recv_data >> NumberOfPlayers;
     recv_data >> Choise;                                    //0: pass, 1: need, 2: greed
-
     //sLog.outDebug("WORLD RECIEVE CMSG_LOOT_ROLL, From:%u, Numberofplayers:%u, Choise:%u", (uint32)Guid, NumberOfPlayers, Choise);
-
     Group* group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     // everything's fine, do it
     group->CountRollVote(GetPlayer()->GetGUID(), Guid, NumberOfPlayers, Choise);
-
     switch (Choise)
     {
         case 1:
@@ -410,21 +343,16 @@ void WorldSession::HandleLootRoll( WorldPacket &recv_data )
             break;
     }
 }
-
 void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)
 {
     if(!GetPlayer()->GetGroup())
         return;
-
     float x, y;
     recv_data >> x;
     recv_data >> y;
-
     //sLog.outDebug("Received opcode MSG_MINIMAP_PING X: %f, Y: %f", x, y);
-
     /** error handling **/
     /********************/
-
     // everything's fine, do it
     WorldPacket data(MSG_MINIMAP_PING, (8+4+4));
     data << GetPlayer()->GetGUID();
@@ -432,23 +360,18 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recv_data)
     data << y;
     GetPlayer()->GetGroup()->BroadcastPacket(&data, true, -1, GetPlayer()->GetGUID());
 }
-
 void WorldSession::HandleRandomRollOpcode(WorldPacket& recv_data)
 {
     uint32 minimum, maximum, roll;
     recv_data >> minimum;
     recv_data >> maximum;
-
     /** error handling **/
     if(minimum > maximum || maximum > 10000)                // < 32768 for urand call
         return;
     /********************/
-
     // everything's fine, do it
     roll = urand(minimum, maximum);
-
     //sLog.outDebug("ROLL: MIN: %u, MAX: %u, ROLL: %u", minimum, maximum, roll);
-
     WorldPacket data(MSG_RANDOM_ROLL, 4+4+4+8);
     data << minimum;
     data << maximum;
@@ -459,19 +382,15 @@ void WorldSession::HandleRandomRollOpcode(WorldPacket& recv_data)
     else
         SendPacket(&data);
 }
-
 void WorldSession::HandleRaidTargetUpdateOpcode( WorldPacket & recv_data )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     uint8  x;
     recv_data >> x;
-
     /** error handling **/
     /********************/
-
     // everything's fine, do it
     if(x == 0xFF)                                           // target icon request
     {
@@ -481,57 +400,45 @@ void WorldSession::HandleRaidTargetUpdateOpcode( WorldPacket & recv_data )
     {
         if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
             return;
-
         uint64 guid;
         recv_data >> guid;
         group->SetTargetIcon(x, guid);
     }
 }
-
 void WorldSession::HandleGroupRaidConvertOpcode( WorldPacket & /*recv_data*/ )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     if(_player->InBattleGround())
         return;
-
     /** error handling **/
     if(!group->IsLeader(GetPlayer()->GetGUID()) || group->GetMembersCount() < 2)
         return;
     /********************/
-
     // everything's fine, do it (is it 0 (PARTY_OP_INVITE) correct code)
     SendPartyResult(PARTY_OP_INVITE, "", PARTY_RESULT_OK);
     group->ConvertToRaid();
 }
-
 void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
 {
     // we will get correct pointer for group here, so we don't have to check if group is BG raid
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     std::string name;
     uint8 groupNr;
     recv_data >> name;
-
     recv_data >> groupNr;
-
     /** error handling **/
     if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
         return;
-
     if (!group->HasFreeSlotSubGroup(groupNr))
         return;
     /********************/
-
     Player *movedPlayer=objmgr.GetPlayer(name.c_str());
     if(!movedPlayer)
         return;
-
     //Do not allow leader to change group of player in combat
     if (movedPlayer->isInCombat())
     {
@@ -539,39 +446,31 @@ void WorldSession::HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     // everything's fine, do it
     group->ChangeMembersGroup(movedPlayer, groupNr);
 }
-
 void WorldSession::HandleGroupAssistantLeaderOpcode( WorldPacket & recv_data )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     uint64 guid;
     uint8 flag;
     recv_data >> guid;
     recv_data >> flag;
-
     /** error handling **/
     if(!group->IsLeader(GetPlayer()->GetGUID()))
         return;
     /********************/
-
     // everything's fine, do it
     group->SetAssistant(guid, (flag==0?false:true));
 }
-
 void WorldSession::HandlePartyAssignmentOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("MSG_PARTY_ASSIGNMENT");
-
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     uint8 flag1, flag2;
     uint64 guid;
     recv_data >> flag1 >> flag2;
@@ -580,44 +479,37 @@ void WorldSession::HandlePartyAssignmentOpcode( WorldPacket & recv_data )
     //     0x4
     // if(flag2) Main Tank
     //     0x2
-
     /** error handling **/
     if(!group->IsLeader(GetPlayer()->GetGUID()))
         return;
     /********************/
-
     // everything's fine, do it
     if(flag1 == 1)
         group->SetMainAssistant(guid);
     if(flag2 == 1)
         group->SetMainTank(guid);
 }
-
 void WorldSession::HandleRaidReadyCheckOpcode( WorldPacket & recv_data )
 {
     Group *group = GetPlayer()->GetGroup();
     if(!group)
         return;
-
     if(recv_data.empty())                                   // request
     {
         /** error handling **/
         if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
             return;
         /********************/
-
         // everything's fine, do it
         WorldPacket data(MSG_RAID_READY_CHECK, 8);
         data << GetPlayer()->GetGUID();
         group->BroadcastPacket(&data, false, -1);
-
         group->OfflineReadyCheck();
     }
     else                                                    // answer
     {
         uint8 state;
         recv_data >> state;
-
         // everything's fine, do it
         WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9);
         data << GetPlayer()->GetGUID();
@@ -625,41 +517,31 @@ void WorldSession::HandleRaidReadyCheckOpcode( WorldPacket & recv_data )
         group->BroadcastReadyCheck(&data);
     }
 }
-
 void WorldSession::HandleRaidReadyCheckFinishedOpcode( WorldPacket & /*recv_data*/ )
 {
     //Group* group = GetPlayer()->GetGroup();
     //if(!group)
     //    return;
-
     //if(!group->IsLeader(GetPlayer()->GetGUID()) && !group->IsAssistant(GetPlayer()->GetGUID()))
     //    return;
-
     // Is any reaction need?
 }
-
 void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data)
 {
     uint32 mask = player->GetGroupUpdateFlag();
-
     if (mask == GROUP_UPDATE_FLAG_NONE)
         return;
-
     if (mask & GROUP_UPDATE_FLAG_POWER_TYPE)                // if update power type, update current/max power also
         mask |= (GROUP_UPDATE_FLAG_CUR_POWER | GROUP_UPDATE_FLAG_MAX_POWER);
-
     if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE)            // same for pets
         mask |= (GROUP_UPDATE_FLAG_PET_CUR_POWER | GROUP_UPDATE_FLAG_PET_MAX_POWER);
-
     uint32 byteCount = 0;
     for (int i = 1; i < GROUP_UPDATE_FLAGS_COUNT; ++i)
         if (mask & (1 << i))
             byteCount += GroupUpdateLength[i];
-
     data->Initialize(SMSG_PARTY_MEMBER_STATS, 8 + 4 + byteCount);
     data->append(player->GetPackGUID());
     *data << (uint32) mask;
-
     if (mask & GROUP_UPDATE_FLAG_STATUS)
     {
         if (player)
@@ -672,32 +554,23 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint16) MEMBER_STATUS_OFFLINE;
     }
-
     if (mask & GROUP_UPDATE_FLAG_CUR_HP)
         *data << (uint32) player->GetHealth();
-
     if (mask & GROUP_UPDATE_FLAG_MAX_HP)
         *data << (uint32) player->GetMaxHealth();
-
     Powers powerType = player->getPowerType();
     if (mask & GROUP_UPDATE_FLAG_POWER_TYPE)
         *data << (uint8) powerType;
-
     if (mask & GROUP_UPDATE_FLAG_CUR_POWER)
         *data << (uint16) player->GetPower(powerType);
-
     if (mask & GROUP_UPDATE_FLAG_MAX_POWER)
         *data << (uint16) player->GetMaxPower(powerType);
-
     if (mask & GROUP_UPDATE_FLAG_LEVEL)
         *data << (uint16) player->getLevel();
-
     if (mask & GROUP_UPDATE_FLAG_ZONE)
         *data << (uint16) player->GetZoneId();
-
     if (mask & GROUP_UPDATE_FLAG_POSITION)
         *data << (uint16) player->GetPositionX() << (uint16) player->GetPositionY();
-
     if (mask & GROUP_UPDATE_FLAG_AURAS)
     {
         const uint64& auramask = player->GetAuraUpdateMaskForRaid();
@@ -712,7 +585,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
             }
         }
     }
-
     Pet *pet = player->GetPet();
     if (mask & GROUP_UPDATE_FLAG_PET_GUID)
     {
@@ -721,7 +593,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint64) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_NAME)
     {
         if(pet)
@@ -729,7 +600,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint8)  0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_MODEL_ID)
     {
         if(pet)
@@ -737,7 +607,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint16) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_CUR_HP)
     {
         if(pet)
@@ -745,7 +614,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint32) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_MAX_HP)
     {
         if(pet)
@@ -753,7 +621,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint32) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
     {
         if(pet)
@@ -761,7 +628,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint8)  0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_CUR_POWER)
     {
         if(pet)
@@ -769,7 +635,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint16) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_MAX_POWER)
     {
         if(pet)
@@ -777,7 +642,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
         else
             *data << (uint16) 0;
     }
-
     if (mask & GROUP_UPDATE_FLAG_PET_AURAS)
     {
         if(pet)
@@ -798,14 +662,12 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player *player, WorldPacke
             *data << (uint64) 0;
     }
 }
-
 /*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
 void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
 {
     sLog.outDebug("WORLD: Received CMSG_REQUEST_PARTY_MEMBER_STATS");
     uint64 Guid;
     recv_data >> Guid;
-
     Player *player = objmgr.GetPlayer(Guid);
     if(!player)
     {
@@ -817,17 +679,13 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
         SendPacket(&data);
         return;
     }
-
     Pet *pet = player->GetPet();
-
     WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 4+2+2+2+1+2*6+8+1+8);
     data << uint8(0);                                       // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
     data.append(player->GetPackGUID());
-
     uint32 mask1 = 0x00040BFF;                              // common mask, real flags used 0x000040BFF
     if(pet)
         mask1 = 0x7FFFFFFF;                                 // for hunters and other classes with pets
-
     Powers powerType = player->getPowerType();
     data << (uint32) mask1;                                 // group update mask
     data << (uint16) MEMBER_STATUS_ONLINE;                  // member's online status
@@ -840,7 +698,6 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
     data << (uint16) player->GetZoneId();                   // GROUP_UPDATE_FLAG_ZONE
     data << (uint16) player->GetPositionX();                // GROUP_UPDATE_FLAG_POSITION
     data << (uint16) player->GetPositionY();                // GROUP_UPDATE_FLAG_POSITION
-
     uint64 auramask = 0;
     size_t maskPos = data.wpos();
     data << (uint64) auramask;                              // placeholder
@@ -854,7 +711,6 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
         }
     }
     data.put<uint64>(maskPos,auramask);                     // GROUP_UPDATE_FLAG_AURAS
-
     if(pet)
     {
         Powers petpowertype = pet->getPowerType();
@@ -866,7 +722,6 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
         data << (uint8)  petpowertype;                      // GROUP_UPDATE_FLAG_PET_POWER_TYPE
         data << (uint16) pet->GetPower(petpowertype);       // GROUP_UPDATE_FLAG_PET_CUR_POWER
         data << (uint16) pet->GetMaxPower(petpowertype);    // GROUP_UPDATE_FLAG_PET_MAX_POWER
-
         uint64 petauramask = 0;
         size_t petMaskPos = data.wpos();
         data << (uint64) petauramask;                       // placeholder
@@ -886,28 +741,22 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
         data << (uint8)  0;                                 // GROUP_UPDATE_FLAG_PET_NAME
         data << (uint64) 0;                                 // GROUP_UPDATE_FLAG_PET_AURAS
     }
-
     SendPacket(&data);
 }
-
 /*!*/void WorldSession::HandleRequestRaidInfoOpcode( WorldPacket & /*recv_data*/ )
 {
     // every time the player checks the character screen
     _player->SendRaidInfo();
 }
-
 /*void WorldSession::HandleGroupCancelOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: got CMSG_GROUP_CANCEL." );
 }*/
-
 void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received CMSG_OPT_OUT_OF_LOOT");
-
     uint32 unkn;
     recv_data >> unkn;
-
     // ignore if player not loaded
     if(!GetPlayer())                                        // needed because STATUS_AUTHED
     {
@@ -915,7 +764,6 @@ void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data )
             sLog.outError("CMSG_GROUP_PASS_ON_LOOT value<>0 for not-loaded character!");
         return;
     }
-
     if(unkn!=0)
         sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!");
 }
diff --git a/src/game/GroupRefManager.h b/src/game/GroupRefManager.h
index ab3b6417611..d1f24c3f847 100644
--- a/src/game/GroupRefManager.h
+++ b/src/game/GroupRefManager.h
@@ -17,16 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _GROUPREFMANAGER
 #define _GROUPREFMANAGER
-
 #include "Utilities/LinkedReference/RefManager.h"
-
 class Group;
 class Player;
 class GroupReference;
-
 class GroupRefManager : public RefManager<Group, Player>
 {
     public:
diff --git a/src/game/GroupReference.cpp b/src/game/GroupReference.cpp
index a09fc769dad..218bceee0f4 100644
--- a/src/game/GroupReference.cpp
+++ b/src/game/GroupReference.cpp
@@ -17,23 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Player.h"
 #include "Group.h"
 #include "GroupReference.h"
-
 void GroupReference::targetObjectBuildLink()
 {
     // called from link()
     getTarget()->LinkMember(this);
 }
-
 void GroupReference::targetObjectDestroyLink()
 {
     // called from unlink()
     getTarget()->DelinkMember(this);
 }
-
 void GroupReference::sourceObjectDestroyLink()
 {
     // called from invalidate()
diff --git a/src/game/GroupReference.h b/src/game/GroupReference.h
index da896cf02dd..e1e550ada73 100644
--- a/src/game/GroupReference.h
+++ b/src/game/GroupReference.h
@@ -17,15 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _GROUPREFERENCE_H
 #define _GROUPREFERENCE_H
-
 #include "Utilities/LinkedReference/Reference.h"
-
 class Group;
 class Player;
-
 class TRINITY_DLL_SPEC GroupReference : public Reference<Group, Player>
 {
     protected:
diff --git a/src/game/GuardAI.cpp b/src/game/GuardAI.cpp
index a821939910a..5454213ce65 100644
--- a/src/game/GuardAI.cpp
+++ b/src/game/GuardAI.cpp
@@ -17,32 +17,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "GuardAI.h"
 #include "Errors.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "World.h"
 #include "CreatureAIImpl.h"
-
 int GuardAI::Permissible(const Creature *creature)
 {
     if( creature->isGuard())
         return PERMIT_BASE_SPECIAL;
-
     return PERMIT_BASE_NO;
 }
-
 GuardAI::GuardAI(Creature *c) : CreatureAI(c), i_victimGuid(0), i_state(STATE_NORMAL), i_tracker(TIME_INTERVAL_LOOK)
 {
 }
-
 void GuardAI::MoveInLineOfSight(Unit *u)
 {
     // Ignore Z for flying creatures
     if ( !m_creature->canFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE )
         return;
-
     if( !m_creature->getVictim() && m_creature->canAttack(u) &&
         ( u->IsHostileToPlayers() || m_creature->IsHostileTo(u) /*|| u->getVictim() && m_creature->IsFriendlyTo(u->getVictim())*/ ) &&
         u->isInAccessiblePlaceFor(m_creature))
@@ -56,24 +50,19 @@ void GuardAI::MoveInLineOfSight(Unit *u)
         }
     }
 }
-
 void GuardAI::EnterEvadeMode()
 {
     if( !m_creature->isAlive() )
     {
         DEBUG_LOG("Creature stopped attacking because he's dead [guid=%u]", m_creature->GetGUIDLow());
         m_creature->GetMotionMaster()->MoveIdle();
-
         i_state = STATE_NORMAL;
-
         i_victimGuid = 0;
         m_creature->CombatStop(true);
         m_creature->DeleteThreatList();
         return;
     }
-
     Unit* victim = ObjectAccessor::GetUnit(*m_creature, i_victimGuid );
-
     if( !victim  )
     {
         DEBUG_LOG("Creature stopped attacking because victim is non exist [guid=%u]", m_creature->GetGUIDLow());
@@ -94,26 +83,21 @@ void GuardAI::EnterEvadeMode()
     {
         DEBUG_LOG("Creature stopped attacking because victim outran him [guid=%u]", m_creature->GetGUIDLow());
     }
-
     m_creature->RemoveAllAuras();
     m_creature->DeleteThreatList();
     i_victimGuid = 0;
     m_creature->CombatStop(true);
     i_state = STATE_NORMAL;
-
     // Remove TargetedMovementGenerator from MotionMaster stack list, and add HomeMovementGenerator instead
     if( m_creature->GetMotionMaster()->GetCurrentMovementGeneratorType() == TARGETED_MOTION_TYPE )
         m_creature->GetMotionMaster()->MoveTargetedHome();
 }
-
 void GuardAI::UpdateAI(const uint32 /*diff*/)
 {
     // update i_victimGuid if m_creature->getVictim() !=0 and changed
     if(!UpdateVictim())
         return;
-
     i_victimGuid = m_creature->getVictim()->GetGUID();
-
     if( m_creature->isAttackReady() )
     {
         if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
@@ -123,17 +107,14 @@ void GuardAI::UpdateAI(const uint32 /*diff*/)
         }
     }
 }
-
 bool GuardAI::IsVisible(Unit *pl) const
 {
     return m_creature->IsWithinDist(pl,sWorld.getConfig(CONFIG_SIGHT_GUARDER))
         && pl->isVisibleForOrDetect(m_creature,true);
 }
-
 void GuardAI::JustDied(Unit *killer)
 {
     if(Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
         m_creature->SendZoneUnderAttackMessage(pkiller);
 }
 
-
diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h
index db1bfe0229d..3d6b07e998b 100644
--- a/src/game/GuardAI.h
+++ b/src/game/GuardAI.h
@@ -17,15 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_GUARDAI_H
 #define TRINITY_GUARDAI_H
-
 #include "CreatureAI.h"
 #include "Timer.h"
-
 class Creature;
-
 class TRINITY_DLL_DECL GuardAI : public CreatureAI
 {
     enum GuardState
@@ -33,19 +29,14 @@ class TRINITY_DLL_DECL GuardAI : public CreatureAI
         STATE_NORMAL = 1,
         STATE_LOOK_AT_VICTIM = 2
     };
-
     public:
-
         explicit GuardAI(Creature *c);
-
         void MoveInLineOfSight(Unit *);
         void EnterEvadeMode();
         void JustDied(Unit *);
         bool IsVisible(Unit *) const;
-
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
-
     private:
         uint64 i_victimGuid;
         GuardState i_state;
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index 92faebccad5..2b7d49d7dbf 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -31,7 +30,6 @@
 #include "Language.h"
 #include "World.h"
 #include "Config/ConfigEnv.h"
-
 Guild::Guild()
 {
     m_Id = 0;
@@ -43,37 +41,29 @@ Guild::Guild()
     m_BorderStyle = 0;
     m_BorderColor = 0;
     m_BackgroundColor = 0;
-
     m_CreatedYear = 0;
     m_CreatedMonth = 0;
     m_CreatedDay = 0;
-
     m_EventLogLoaded = false;
     m_GuildBankLoaded = false;
     m_OnlineMembers = 0;
     m_GuildBankMoney = 0;
     m_PurchasedTabs = 0;
-
     m_GuildEventLogNextGuid = 0;
     m_GuildBankEventLogNextGuid_Money = 0;
     for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; i++)
         m_GuildBankEventLogNextGuid_Item[i] = 0;
 }
-
 Guild::~Guild()
 {
-
 }
-
 bool Guild::Create(Player* leader, std::string gname)
 {
     if (objmgr.GetGuildByName(gname))
         return false;
-
     WorldSession* lSession = leader->GetSession();
     if (!lSession)
         return false;
-
     m_LeaderGuid = leader->GetGUID();
     m_Name = gname;
     GINFO = "";
@@ -81,17 +71,13 @@ bool Guild::Create(Player* leader, std::string gname)
     m_GuildBankMoney = 0;
     m_PurchasedTabs = 0;
     m_Id = objmgr.GenerateGuildId();
-
     sLog.outDebug("GUILD: creating guild %s to leader: %u", gname.c_str(), GUID_LOPART(m_LeaderGuid));
-
     // gname already assigned to Guild::name, use it to encode string for DB
     CharacterDatabase.escape_string(gname);
-
     std::string dbGINFO = GINFO;
     std::string dbMOTD = MOTD;
     CharacterDatabase.escape_string(dbGINFO);
     CharacterDatabase.escape_string(dbMOTD);
-
     CharacterDatabase.BeginTransaction();
     // CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid='%u'", Id); - MAX(guildid)+1 not exist
     CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guildid='%u'", m_Id);
@@ -99,24 +85,19 @@ bool Guild::Create(Player* leader, std::string gname)
         "VALUES('%u','%s','%u', '%s', '%s', UNIX_TIMESTAMP(NOW()),'%u','%u','%u','%u','%u','" UI64FMTD "')",
         m_Id, gname.c_str(), GUID_LOPART(m_LeaderGuid), dbGINFO.c_str(), dbMOTD.c_str(), m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_GuildBankMoney);
     CharacterDatabase.CommitTransaction();
-
     CreateDefaultGuildRanks(lSession->GetSessionDbLocaleIndex());
-
     return AddMember(m_LeaderGuid, (uint32)GR_GUILDMASTER);
 }
-
 void Guild::CreateDefaultGuildRanks(int locale_idx)
 {
     CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", m_Id);
     CharacterDatabase.PExecute("DELETE FROM guild_bank_right WHERE guildid = '%u'", m_Id);
-
     CreateRank(objmgr.GetMangosString(LANG_GUILD_MASTER, locale_idx),   GR_RIGHT_ALL);
     CreateRank(objmgr.GetMangosString(LANG_GUILD_OFFICER, locale_idx),  GR_RIGHT_ALL);
     CreateRank(objmgr.GetMangosString(LANG_GUILD_VETERAN, locale_idx),  GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
     CreateRank(objmgr.GetMangosString(LANG_GUILD_MEMBER, locale_idx),   GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
     CreateRank(objmgr.GetMangosString(LANG_GUILD_INITIATE, locale_idx), GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
 }
-
 bool Guild::AddMember(uint64 plGuid, uint32 plRank)
 {
     Player* pl = objmgr.GetPlayer(plGuid);
@@ -130,14 +111,11 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
         if (Player::GetGuildIdFromDB(plGuid) != 0)           // player already in guild
             return false;
     }
-
     // remove all player signs from another petitions
     // this will be prevent attempt joining player to many guilds and corrupt guild data integrity
     Player::RemovePetitionsAndSigns(plGuid, 9);
-
     // fill player data
     MemberSlot newmember;
-
     if (pl)
     {
         newmember.Name   = pl->GetName();
@@ -150,7 +128,6 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
         QueryResult *result = CharacterDatabase.PQuery("SELECT name,zone,level,class FROM characters WHERE guid = '%u'", GUID_LOPART(plGuid));
         if (!result)
             return false;                                   // player doesn't exist
-
         Field *fields    = result->Fetch();
         newmember.Name   = fields[0].GetCppString();
         newmember.ZoneId = fields[1].GetUInt32();
@@ -164,7 +141,6 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
             return false;
         }
     }
-
     newmember.RankId  = plRank;
     newmember.OFFnote = (std::string)"";
     newmember.Pnote   = (std::string)"";
@@ -173,15 +149,12 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
     for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
         newmember.BankResetTimeTab[i] = 0;
     members[GUID_LOPART(plGuid)] = newmember;
-
     std::string dbPnote   = newmember.Pnote;
     std::string dbOFFnote = newmember.OFFnote;
     CharacterDatabase.escape_string(dbPnote);
     CharacterDatabase.escape_string(dbOFFnote);
-
     CharacterDatabase.PExecute("INSERT INTO guild_member (guildid,guid,rank,pnote,offnote) VALUES ('%u', '%u', '%u','%s','%s')",
         m_Id, GUID_LOPART(plGuid), newmember.RankId, dbPnote.c_str(), dbOFFnote.c_str());
-
     // If player not in game data in data field will be loaded from guild tables, no need to update it!!
     if (pl)
     {
@@ -191,30 +164,24 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
     }
     return true;
 }
-
 void Guild::SetMOTD(std::string motd)
 {
     MOTD = motd;
-
     // motd now can be used for encoding to DB
     CharacterDatabase.escape_string(motd);
     CharacterDatabase.PExecute("UPDATE guild SET motd='%s' WHERE guildid='%u'", motd.c_str(), m_Id);
 }
-
 void Guild::SetGINFO(std::string ginfo)
 {
     GINFO = ginfo;
-
     // ginfo now can be used for encoding to DB
     CharacterDatabase.escape_string(ginfo);
     CharacterDatabase.PExecute("UPDATE guild SET info='%s' WHERE guildid='%u'", ginfo.c_str(), m_Id);
 }
-
 bool Guild::LoadGuildFromDB(uint32 GuildId)
 {
     //set m_Id in case guild data are broken in DB and Guild will be Disbanded (deleted from DB)
     m_Id = GuildId;
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT COUNT(TabId) FROM guild_bank_tab WHERE guildid='%u'", GuildId);
     if (result)
     {
@@ -224,28 +191,20 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
             m_PurchasedTabs = GUILD_BANK_MAX_TABS;
         delete result;
     }
-
     if (!LoadRanksFromDB(GuildId))
         return false;
-
     if (!LoadMembersFromDB(GuildId))
         return false;
-
     LoadBankRightsFromDB(GuildId);                          // Must be after LoadRanksFromDB because it populates rank struct
-
     //                                                     0     1           2            3            4            5
     result = CharacterDatabase.PQuery("SELECT name, leaderguid, EmblemStyle, EmblemColor, BorderStyle, BorderColor,"
     //   6                7     8     9           10
         "BackgroundColor, info, motd, createdate, BankMoney FROM guild WHERE guildid = '%u'", GuildId);
-
     if (!result)
         return false;
-
     Field *fields = result->Fetch();
-
     m_Name = fields[0].GetCppString();
     m_LeaderGuid  = MAKE_NEW_GUID(fields[1].GetUInt32(), 0, HIGHGUID_PLAYER);
-
     m_EmblemStyle = fields[2].GetUInt32();
     m_EmblemColor = fields[3].GetUInt32();
     m_BorderStyle = fields[4].GetUInt32();
@@ -255,9 +214,7 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
     MOTD = fields[8].GetCppString();
     time_t time = fields[9].GetUInt64();
     m_GuildBankMoney = fields[10].GetUInt64();
-
     delete result;
-
     if (time > 0)
     {
         tm local = *(localtime(&time));                     // dereference and assign
@@ -265,7 +222,6 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
         m_CreatedMonth = local.tm_mon + 1;
         m_CreatedYear  = local.tm_year + 1900;
     }
-
     // Repair the structure of guild
     // If the guildmaster doesn't exist or isn't the member of guild
     // attempt to promote another member
@@ -279,58 +235,45 @@ bool Guild::LoadGuildFromDB(uint32 GuildId)
     }
     else if (GM_rights != GR_GUILDMASTER)
         SetLeader(m_LeaderGuid);
-
     // Check config if multiple guildmasters are allowed
     if (sConfig.GetBoolDefault("Guild.AllowMultipleGuildMaster", 0) == 0)
         for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
             if (itr->second.RankId == GR_GUILDMASTER && GUID_LOPART(m_LeaderGuid) != itr->first) // Allow only 1 guildmaster
                 ChangeRank(itr->first, GR_OFFICER); // set right of member to officer
-
     sLog.outDebug("Guild %u Creation time Loaded day: %u, month: %u, year: %u", GuildId, m_CreatedDay, m_CreatedMonth, m_CreatedYear);
-
     return true;
 }
-
 bool Guild::LoadRanksFromDB(uint32 GuildId)
 {
     Field *fields;
     //                                                     0   1     2      3
     QueryResult *result = CharacterDatabase.PQuery("SELECT rid,rname,rights,BankMoneyPerDay FROM guild_rank WHERE guildid = '%u' ORDER BY rid ASC", GuildId);
-
     if (!result)
     {
         sLog.outError("Guild %u has broken `guild_rank` data, creating new...",GuildId);
         CreateDefaultGuildRanks(0);
         return true;
     }
-
     bool broken_ranks = false;
-
     //GUILD RANKS are sequence starting from 0 = GUILD_MASTER (ALL PRIVILEGES) to max 9 (lowest privileges)
     //the lower rank id is considered higher rank - so promotion does rank-- and demotion does rank++
     //between ranks in sequence cannot be gaps - so 0,1,2,4 cannot be
     //min ranks count is 5 and max is 10.
-
     do
     {
         fields = result->Fetch();
-
         uint32 rankID        = fields[0].GetUInt32();
         std::string rankName = fields[1].GetCppString();
         uint32 rankRights    = fields[2].GetUInt32();
         uint32 rankMoney     = fields[3].GetUInt32();
-
         if (rankID != m_Ranks.size())                       // guild_rank.ids are sequence 0,1,2,3..
             broken_ranks =  true;
-
         //first rank is guildmaster, prevent loss leader rights
         if (m_Ranks.empty())
             rankRights |= GR_RIGHT_ALL;
-
         AddRank(rankName,rankRights,rankMoney);
     }while (result->NextRow());
     delete result;
-
     if (m_Ranks.size() < GUILD_RANKS_MIN_COUNT)             // if too few ranks, renew them
     {
         m_Ranks.clear();
@@ -353,10 +296,8 @@ bool Guild::LoadRanksFromDB(uint32 GuildId)
         }
         CharacterDatabase.CommitTransaction();
     }
-
     return true;
 }
-
 bool Guild::LoadMembersFromDB(uint32 GuildId)
 {
     //                                                     0                 1     2      3        4                  5
@@ -368,10 +309,8 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
     //   18               19                20               21                22
         "characters.name, characters.level, characters.zone, characters.class, characters.logout_time "
         "FROM guild_member LEFT JOIN characters ON characters.guid = guild_member.guid WHERE guildid = '%u'", GuildId);
-
     if (!result)
         return false;
-
     do
     {
         Field *fields = result->Fetch();
@@ -381,7 +320,6 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
         //don't allow member to have not existing rank!
         if (newmember.RankId >= m_Ranks.size())
             newmember.RankId = GetLowestRank();
-
         newmember.Pnote                 = fields[2].GetCppString();
         newmember.OFFnote               = fields[3].GetCppString();
         newmember.BankResetTimeMoney    = fields[4].GetUInt32();
@@ -391,13 +329,11 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
             newmember.BankResetTimeTab[i] = fields[6+(2*i)].GetUInt32();
             newmember.BankRemSlotsTab[i]  = fields[7+(2*i)].GetUInt32();
         }
-
         newmember.Name                  = fields[18].GetCppString();
         newmember.Level                 = fields[19].GetUInt8();
         newmember.ZoneId                = fields[20].GetUInt32();
         newmember.Class                 = fields[21].GetUInt8();
         newmember.LogoutTime            = fields[22].GetUInt64();
-
         //this code will remove unexisting character guids from guild
         if (newmember.Level < 1 || newmember.Level > STRONG_MAX_LEVEL) // can be at broken `data` field
         {
@@ -418,24 +354,18 @@ bool Guild::LoadMembersFromDB(uint32 GuildId)
             CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", GUID_LOPART(guid));
             continue;
         }
-
         members[GUID_LOPART(guid)]      = newmember;
-
     }while (result->NextRow());
     delete result;
-
     if (members.empty())
         return false;
-
     return true;
 }
-
 void Guild::SetMemberStats(uint64 guid)
 {
     MemberList::iterator itr = members.find(GUID_LOPART(guid));
     if (itr == members.end() )
         return;
-
     Player *pl = ObjectAccessor::FindPlayer(guid);
     if (!pl)
         return;
@@ -444,15 +374,12 @@ void Guild::SetMemberStats(uint64 guid)
     itr->second.Class  = pl->getClass();
     itr->second.ZoneId = pl->GetZoneId();
 }
-
 void Guild::SetLeader(uint64 guid)
 {
     m_LeaderGuid = guid;
     ChangeRank(guid, GR_GUILDMASTER);
-
     CharacterDatabase.PExecute("UPDATE guild SET leaderguid='%u' WHERE guildid='%u'", GUID_LOPART(guid), m_Id);
 }
-
 void Guild::DelMember(uint64 guid, bool isDisbanding)
 {
     //guild master can be deleted when loading guild and guid doesn't exist in characters table
@@ -469,7 +396,6 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
                 oldLeader = &(i->second);
                 continue;
             }
-
             if (!best || best->RankId > i->second.RankId)
             {
                 best = &(i->second);
@@ -481,13 +407,10 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
             Disband();
             return;
         }
-
         SetLeader(newLeaderGUID);
-
         // If player not online data in data field will be loaded from guild tabs no need to update it !!
         if (Player *newLeader = objmgr.GetPlayer(newLeaderGUID))
             newLeader->SetRank(GR_GUILDMASTER);
-
         // when leader non-exist (at guild load with deleted leader only) not send broadcasts
         if (oldLeader)
         {
@@ -497,19 +420,15 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
             data << oldLeader->Name;
             data << best->Name;
             BroadcastPacket(&data);
-
             data.Initialize(SMSG_GUILD_EVENT, (1+1+(oldLeader->Name).size()+1));
             data << (uint8)GE_LEFT;
             data << (uint8)1;
             data << oldLeader->Name;
             BroadcastPacket(&data);
         }
-
         sLog.outDebug( "WORLD: Sent (SMSG_GUILD_EVENT)" );
     }
-
     members.erase(GUID_LOPART(guid));
-
     Player *player = objmgr.GetPlayer(guid);
     // If player not online data in data field will be loaded from guild tabs no need to update it !!
     if (player)
@@ -517,37 +436,29 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
         player->SetInGuild(0);
         player->SetRank(0);
     }
-
     CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", GUID_LOPART(guid));
 }
-
 void Guild::ChangeRank(uint64 guid, uint32 newRank)
 {
     MemberList::iterator itr = members.find(GUID_LOPART(guid));
     if (itr != members.end())
         itr->second.RankId = newRank;
-
     Player *player = objmgr.GetPlayer(guid);
     // If player not online data in data field will be loaded from guild tabs no need to update it !!
     if (player)
         player->SetRank(newRank);
-
     CharacterDatabase.PExecute( "UPDATE guild_member SET rank='%u' WHERE guid='%u'", newRank, GUID_LOPART(guid) );
 }
-
 void Guild::SetPNOTE(uint64 guid,std::string pnote)
 {
     MemberList::iterator itr = members.find(GUID_LOPART(guid));
     if (itr == members.end())
         return;
-
     itr->second.Pnote = pnote;
-
     // pnote now can be used for encoding to DB
     CharacterDatabase.escape_string(pnote);
     CharacterDatabase.PExecute("UPDATE guild_member SET pnote = '%s' WHERE guid = '%u'", pnote.c_str(), itr->first);
 }
-
 void Guild::SetOFFNOTE(uint64 guid,std::string offnote)
 {
     MemberList::iterator itr = members.find(GUID_LOPART(guid));
@@ -558,24 +469,20 @@ void Guild::SetOFFNOTE(uint64 guid,std::string offnote)
     CharacterDatabase.escape_string(offnote);
     CharacterDatabase.PExecute("UPDATE guild_member SET offnote = '%s' WHERE guid = '%u'", offnote.c_str(), itr->first);
 }
-
 void Guild::BroadcastToGuild(WorldSession *session, const std::string& msg, uint32 language)
 {
     if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(),GR_RIGHT_GCHATSPEAK))
     {
         WorldPacket data;
         ChatHandler(session).FillMessageData(&data, CHAT_MSG_GUILD, language, 0, msg.c_str());
-
         for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
         {
             Player *pl = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
-
             if (pl && pl->GetSession() && HasRankRight(pl->GetRank(),GR_RIGHT_GCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetGUIDLow()) )
                 pl->GetSession()->SendPacket(&data);
         }
     }
 }
-
 void Guild::BroadcastToOfficers(WorldSession *session, const std::string& msg, uint32 language)
 {
     if (session && session->GetPlayer() && HasRankRight(session->GetPlayer()->GetRank(),GR_RIGHT_OFFCHATSPEAK))
@@ -584,15 +491,12 @@ void Guild::BroadcastToOfficers(WorldSession *session, const std::string& msg, u
         {
             WorldPacket data;
             ChatHandler::FillMessageData(&data, session, CHAT_MSG_OFFICER, language, NULL, 0, msg.c_str(),NULL);
-
             Player *pl = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
-
             if (pl && pl->GetSession() && HasRankRight(pl->GetRank(),GR_RIGHT_OFFCHATLISTEN) && !pl->GetSocial()->HasIgnore(session->GetPlayer()->GetGUIDLow()))
                 pl->GetSession()->SendPacket(&data);
         }
     }
 }
-
 void Guild::BroadcastPacket(WorldPacket *packet)
 {
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
@@ -602,7 +506,6 @@ void Guild::BroadcastPacket(WorldPacket *packet)
             player->GetSession()->SendPacket(packet);
     }
 }
-
 void Guild::BroadcastPacketToRank(WorldPacket *packet, uint32 rankId)
 {
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
@@ -615,19 +518,14 @@ void Guild::BroadcastPacketToRank(WorldPacket *packet, uint32 rankId)
         }
     }
 }
-
 void Guild::CreateRank(std::string name_,uint32 rights)
 {
     if (m_Ranks.size() >= GUILD_RANKS_MAX_COUNT)
         return;
-
     // ranks are sequence 0,1,2,... where 0 means guildmaster
     uint32 new_rank_id = m_Ranks.size();
-
     AddRank(name_, rights, 0);
-
     //existing records in db should be deleted before calling this procedure and m_PurchasedTabs must be loaded already
-
     for (uint32 i = 0; i < m_PurchasedTabs; ++i)
     {
         //create bank rights with 0
@@ -637,84 +535,65 @@ void Guild::CreateRank(std::string name_,uint32 rights)
     CharacterDatabase.escape_string(name_);
     CharacterDatabase.PExecute( "INSERT INTO guild_rank (guildid,rid,rname,rights) VALUES ('%u', '%u', '%s', '%u')", m_Id, new_rank_id, name_.c_str(), rights );
 }
-
 void Guild::AddRank(const std::string& name_,uint32 rights, uint32 money)
 {
     m_Ranks.push_back(RankInfo(name_,rights,money));
 }
-
 void Guild::DelRank()
 {
     // client won't allow to have less than GUILD_RANKS_MIN_COUNT ranks in guild
     if (m_Ranks.size() <= GUILD_RANKS_MIN_COUNT)
         return;
-
     // delete lowest guild_rank
     uint32 rank = GetLowestRank();
     CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE rid>='%u' AND guildid='%u'", rank, m_Id);
-
     m_Ranks.pop_back();
 }
-
 std::string Guild::GetRankName(uint32 rankId)
 {
     if (rankId >= m_Ranks.size())
         return "<unknown>";
-
     return m_Ranks[rankId].Name;
 }
-
 uint32 Guild::GetRankRights(uint32 rankId)
 {
     if (rankId >= m_Ranks.size())
         return 0;
-
     return m_Ranks[rankId].Rights;
 }
-
 void Guild::SetRankName(uint32 rankId, std::string name_)
 {
     if (rankId >= m_Ranks.size())
         return;
-
     m_Ranks[rankId].Name = name_;
-
     // name now can be used for encoding to DB
     CharacterDatabase.escape_string(name_);
     CharacterDatabase.PExecute("UPDATE guild_rank SET rname='%s' WHERE rid='%u' AND guildid='%u'", name_.c_str(), rankId, m_Id);
 }
-
 void Guild::SetRankRights(uint32 rankId, uint32 rights)
 {
     if (rankId >= m_Ranks.size())
         return;
-
     m_Ranks[rankId].Rights = rights;
-
     CharacterDatabase.PExecute("UPDATE guild_rank SET rights='%u' WHERE rid='%u' AND guildid='%u'", rights, rankId, m_Id);
 }
-
 int32 Guild::GetRank(uint32 LowGuid)
 {
     MemberList::const_iterator itr = members.find(LowGuid);
     if (itr == members.end())
         return -1;
-
     return itr->second.RankId;
 }
-
 void Guild::Disband()
 {
     WorldPacket data(SMSG_GUILD_EVENT, 1);
     data << (uint8)GE_DISBANDED;
     BroadcastPacket(&data);
-
     while (!members.empty())
     {
         MemberList::const_iterator itr = members.begin();
         DelMember(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER), true);
     }
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM guild WHERE guildid = '%u'", m_Id);
     CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid = '%u'", m_Id);
@@ -727,7 +606,6 @@ void Guild::Disband()
     CharacterDatabase.CommitTransaction();
     objmgr.RemoveGuild(m_Id);
 }
-
 void Guild::Roster(WorldSession *session /*= NULL*/)
 {
                                                             // we can only guess size
@@ -735,7 +613,6 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
     data << (uint32)members.size();
     data << MOTD;
     data << GINFO;
-
     data << (uint32)m_Ranks.size();
     for (RankList::const_iterator ritr = m_Ranks.begin(); ritr != m_Ranks.end(); ++ritr)
     {
@@ -783,14 +660,11 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
         BroadcastPacket(&data);
     sLog.outDebug( "WORLD: Sent (SMSG_GUILD_ROSTER)" );
 }
-
 void Guild::Query(WorldSession *session)
 {
     WorldPacket data(SMSG_GUILD_QUERY_RESPONSE, (8*32+200));// we can only guess size
-
     data << m_Id;
     data << m_Name;
-
     for (size_t i = 0 ; i < 10; ++i)                        // show always 10 ranks
     {
         if (i < m_Ranks.size())
@@ -798,18 +672,15 @@ void Guild::Query(WorldSession *session)
         else
             data << (uint8)0;                               // null string
     }
-
     data << uint32(m_EmblemStyle);
     data << uint32(m_EmblemColor);
     data << uint32(m_BorderStyle);
     data << uint32(m_BorderColor);
     data << uint32(m_BackgroundColor);
     data << uint32(0);                                      // something new in WotLK
-
     session->SendPacket( &data );
     sLog.outDebug( "WORLD: Sent (SMSG_GUILD_QUERY_RESPONSE)" );
 }
-
 void Guild::SetEmblem(uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor, uint32 backgroundColor)
 {
     m_EmblemStyle = emblemStyle;
@@ -817,18 +688,14 @@ void Guild::SetEmblem(uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle
     m_BorderStyle = borderStyle;
     m_BorderColor = borderColor;
     m_BackgroundColor = backgroundColor;
-
     CharacterDatabase.PExecute("UPDATE guild SET EmblemStyle=%u, EmblemColor=%u, BorderStyle=%u, BorderColor=%u, BackgroundColor=%u WHERE guildid = %u", m_EmblemStyle, m_EmblemColor, m_BorderStyle, m_BorderColor, m_BackgroundColor, m_Id);
 }
-
 void Guild::UpdateLogoutTime(uint64 guid)
 {
     MemberList::iterator itr = members.find(GUID_LOPART(guid));
     if (itr == members.end())
         return;
-
     itr->second.LogoutTime = time(NULL);
-
     if (m_OnlineMembers > 0)
         --m_OnlineMembers;
     else
@@ -837,7 +704,6 @@ void Guild::UpdateLogoutTime(uint64 guid)
         UnloadGuildEventLog();
     }
 }
-
 // *************************************************
 // Guild Eventlog part
 // *************************************************
@@ -847,7 +713,6 @@ void Guild::DisplayGuildEventLog(WorldSession *session)
     // Load guild eventlog, if not already done
     if (!m_EventLogLoaded)
         LoadGuildEventLogFromDB();
-
     // Sending result
     WorldPacket data(MSG_GUILD_EVENT_LOG_QUERY, 0);
     // count, max count == 100
@@ -870,14 +735,12 @@ void Guild::DisplayGuildEventLog(WorldSession *session)
     session->SendPacket(&data);
     sLog.outDebug("WORLD: Sent (MSG_GUILD_EVENT_LOG_QUERY)");
 }
-
 // Load guild eventlog from DB
 void Guild::LoadGuildEventLogFromDB()
 {
     // Return if already loaded
     if (m_EventLogLoaded)
         return;
-
     //                                                     0        1          2            3            4        5
     QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp FROM guild_eventlog WHERE guildid=%u ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_EVENTLOG_MAX_RECORDS);
     if (!result)
@@ -900,30 +763,23 @@ void Guild::LoadGuildEventLogFromDB()
         NewEvent.PlayerGuid2 = fields[3].GetUInt32();
         NewEvent.NewRank = fields[4].GetUInt8();
         NewEvent.TimeStamp = fields[5].GetUInt64();
-
         // There can be a problem if more events have same TimeStamp the ORDER can be broken when fields[0].GetUInt32() == configCount, but
         // events with same timestamp can appear when there is lag, and we naivly suppose that mangos isn't laggy
         // but if problem appears, player will see set of guild events that have same timestamp in bad order
-
         // Add entry to list
         m_GuildEventLog.push_front(NewEvent);
-
     } while (result->NextRow());
     delete result;
-
     m_EventLogLoaded = true;
 }
-
 // Unload guild eventlog
 void Guild::UnloadGuildEventLog()
 {
     if (!m_EventLogLoaded)
         return;
-
     m_GuildEventLog.clear();
     m_EventLogLoaded = false;
 }
-
 // Add entry to guild eventlog
 void Guild::LogGuildEvent(uint8 EventType, uint32 PlayerGuid1, uint32 PlayerGuid2, uint8 NewRank)
 {
@@ -946,7 +802,6 @@ void Guild::LogGuildEvent(uint8 EventType, uint32 PlayerGuid1, uint32 PlayerGuid
     CharacterDatabase.PExecute("INSERT INTO guild_eventlog (guildid, LogGuid, EventType, PlayerGuid1, PlayerGuid2, NewRank, TimeStamp) VALUES ('%u','%u','%u','%u','%u','%u','" UI64FMTD "')",
         m_Id, m_GuildEventLogNextGuid, uint32(NewEvent.EventType), NewEvent.PlayerGuid1, NewEvent.PlayerGuid2, uint32(NewEvent.NewRank), NewEvent.TimeStamp);
 }
-
 // *************************************************
 // Guild Bank part
 // *************************************************
@@ -954,142 +809,105 @@ void Guild::LogGuildEvent(uint8 EventType, uint32 PlayerGuid1, uint32 PlayerGuid
 void Guild::DisplayGuildBankContent(WorldSession *session, uint8 TabId)
 {
     WorldPacket data(SMSG_GUILD_BANK_LIST, 1300);
-
     GuildBankTab const* tab = GetBankTab(TabId);
     if (!tab)
         return;
-
     if (!IsMemberHaveRights(session->GetPlayer()->GetGUIDLow(),TabId,GUILD_BANK_RIGHT_VIEW_TAB))
         return;
-
     data << uint64(GetGuildBankMoney());
     data << uint8(TabId);
     data << uint32(GetMemberSlotWithdrawRem(session->GetPlayer()->GetGUIDLow(), TabId)); // remaining slots for today
     data << uint8(0);                                       // Tell client this is a tab content packet
-
     data << uint8(GUILD_BANK_MAX_SLOTS);
-
     for (uint8 i=0; i<GUILD_BANK_MAX_SLOTS; ++i)
         AppendDisplayGuildBankSlot(data, tab, i);
-
     session->SendPacket(&data);
-
     sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
 }
-
 void Guild::DisplayGuildBankContentUpdate(uint8 TabId, int32 slot1, int32 slot2)
 {
     GuildBankTab const* tab = GetBankTab(TabId);
     if (!tab)
         return;
-
     WorldPacket data(SMSG_GUILD_BANK_LIST,1200);
-
     data << uint64(GetGuildBankMoney());
     data << uint8(TabId);
     // remaining slots for today
-
     size_t rempos = data.wpos();
     data << uint32(0);                                      // will be filled later
     data << uint8(0);                                       // Tell client this is a tab content packet
-
     if (slot2 == -1)                                        // single item in slot1
     {
         data << uint8(1);
-
         AppendDisplayGuildBankSlot(data, tab, slot1);
     }
     else                                                    // 2 items (in slot1 and slot2)
     {
         data << uint8(2);
-
         if (slot1 > slot2)
             std::swap(slot1,slot2);
-
         AppendDisplayGuildBankSlot(data, tab, slot1);
         AppendDisplayGuildBankSlot(data, tab, slot2);
     }
-
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
         Player *player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
         if (!player)
             continue;
-
         if (!IsMemberHaveRights(itr->first,TabId,GUILD_BANK_RIGHT_VIEW_TAB))
             continue;
-
         data.put<uint32>(rempos,uint32(GetMemberSlotWithdrawRem(player->GetGUIDLow(), TabId)));
-
         player->GetSession()->SendPacket(&data);
     }
-
     sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
 }
-
 void Guild::DisplayGuildBankContentUpdate(uint8 TabId, GuildItemPosCountVec const& slots)
 {
     GuildBankTab const* tab = GetBankTab(TabId);
     if (!tab)
         return;
-
     WorldPacket data(SMSG_GUILD_BANK_LIST,1200);
-
     data << uint64(GetGuildBankMoney());
     data << uint8(TabId);
     // remaining slots for today
-
     size_t rempos = data.wpos();
     data << uint32(0);                                      // will be filled later
     data << uint8(0);                                       // Tell client this is a tab content packet
-
     data << uint8(slots.size());                            // updates count
-
     for (GuildItemPosCountVec::const_iterator itr = slots.begin(); itr != slots.end(); ++itr)
         AppendDisplayGuildBankSlot(data, tab, itr->Slot);
-
     for (MemberList::const_iterator itr = members.begin(); itr != members.end(); ++itr)
     {
         Player *player = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
         if (!player)
             continue;
-
         if (!IsMemberHaveRights(itr->first,TabId,GUILD_BANK_RIGHT_VIEW_TAB))
             continue;
-
         data.put<uint32>(rempos,uint32(GetMemberSlotWithdrawRem(player->GetGUIDLow(), TabId)));
-
         player->GetSession()->SendPacket(&data);
     }
-
     sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
 }
-
 Item* Guild::GetItem(uint8 TabId, uint8 SlotId)
 {
     if (TabId >= m_TabListMap.size() || SlotId >= GUILD_BANK_MAX_SLOTS)
         return NULL;
     return m_TabListMap[TabId]->Slots[SlotId];
 }
-
 // *************************************************
 // Tab related
-
 void Guild::DisplayGuildBankTabsInfo(WorldSession *session)
 {
     // Time to load bank if not already done
     if (!m_GuildBankLoaded)
         LoadGuildBankFromDB();
-
     WorldPacket data(SMSG_GUILD_BANK_LIST, 500);
-
     data << uint64(GetGuildBankMoney());
     data << uint8(0);                                       // TabInfo packet must be for TabId 0
     //data << uint32(0xFFFFFFFF);                             // bit 9 must be set for this packet to work
     data << uint32(0);
     data << uint8(1);                                       // Tell Client this is a TabInfo packet
     data << uint8(m_PurchasedTabs);                         // here is the number of tabs
-
     for (uint8 i = 0; i < m_PurchasedTabs; ++i)
     {
         data << m_TabListMap[i]->Name.c_str();
@@ -1097,69 +915,53 @@ void Guild::DisplayGuildBankTabsInfo(WorldSession *session)
     }
     data << uint8(0);                                       // Do not send tab content
     session->SendPacket(&data);
-
     sLog.outDebug("WORLD: Sent (SMSG_GUILD_BANK_LIST)");
 }
-
 void Guild::CreateNewBankTab()
 {
     if (m_PurchasedTabs >= GUILD_BANK_MAX_TABS)
         return;
-
     ++m_PurchasedTabs;
-
     GuildBankTab* AnotherTab = new GuildBankTab;
     memset(AnotherTab->Slots, 0, GUILD_BANK_MAX_SLOTS * sizeof(Item*));
     m_TabListMap.resize(m_PurchasedTabs);
     m_TabListMap[m_PurchasedTabs-1] = AnotherTab;
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM guild_bank_tab WHERE guildid='%u' AND TabId='%u'", m_Id, uint32(m_PurchasedTabs-1));
     CharacterDatabase.PExecute("INSERT INTO guild_bank_tab (guildid,TabId) VALUES ('%u','%u')", m_Id, uint32(m_PurchasedTabs-1));
     CharacterDatabase.CommitTransaction();
 }
-
 void Guild::SetGuildBankTabInfo(uint8 TabId, std::string Name, std::string Icon)
 {
     if (TabId >= GUILD_BANK_MAX_TABS)
         return;
     if (TabId >= m_TabListMap.size())
         return;
-
     if (!m_TabListMap[TabId])
         return;
-
     if (m_TabListMap[TabId]->Name == Name && m_TabListMap[TabId]->Icon == Icon)
         return;
-
     m_TabListMap[TabId]->Name = Name;
     m_TabListMap[TabId]->Icon = Icon;
-
     CharacterDatabase.escape_string(Name);
     CharacterDatabase.escape_string(Icon);
     CharacterDatabase.PExecute("UPDATE guild_bank_tab SET TabName='%s',TabIcon='%s' WHERE guildid='%u' AND TabId='%u'", Name.c_str(), Icon.c_str(), m_Id, uint32(TabId));
 }
-
 uint32 Guild::GetBankRights(uint32 rankId, uint8 TabId) const
 {
     if (rankId >= m_Ranks.size() || TabId >= GUILD_BANK_MAX_TABS)
         return 0;
-
     return m_Ranks[rankId].TabRight[TabId];
 }
-
 // *************************************************
 // Guild bank loading/unloading related
-
 // This load should be called when the bank is first accessed by a guild member
 void Guild::LoadGuildBankFromDB()
 {
     if (m_GuildBankLoaded)
         return;
-
     m_GuildBankLoaded = true;
     LoadGuildBankEventLogFromDB();
-
     //                                                     0      1        2        3
     QueryResult *result = CharacterDatabase.PQuery("SELECT TabId, TabName, TabIcon, TabText FROM guild_bank_tab WHERE guildid='%u' ORDER BY TabId", m_Id);
     if (!result)
@@ -1167,31 +969,24 @@ void Guild::LoadGuildBankFromDB()
         m_PurchasedTabs = 0;
         return;
     }
-
     m_TabListMap.resize(m_PurchasedTabs);
     do
     {
         Field *fields = result->Fetch();
         uint8 TabId = fields[0].GetUInt8();
-
         GuildBankTab *NewTab = new GuildBankTab;
         memset(NewTab->Slots, 0, GUILD_BANK_MAX_SLOTS * sizeof(Item*));
-
         NewTab->Name = fields[1].GetCppString();
         NewTab->Icon = fields[2].GetCppString();
         NewTab->Text = fields[3].GetCppString();
-
         m_TabListMap[TabId] = NewTab;
     }while (result->NextRow());
-
     delete result;
-
     // data needs to be at first place for Item::LoadFromDB
     //                                        0     1      2       3          4
     result = CharacterDatabase.PQuery("SELECT data, TabId, SlotId, item_guid, item_entry FROM guild_bank_item JOIN item_instance ON item_guid = guid WHERE guildid='%u' ORDER BY TabId", m_Id);
     if (!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
@@ -1199,27 +994,22 @@ void Guild::LoadGuildBankFromDB()
         uint8 SlotId = fields[2].GetUInt8();
         uint32 ItemGuid = fields[3].GetUInt32();
         uint32 ItemEntry = fields[4].GetUInt32();
-
         if (TabId >= m_PurchasedTabs || TabId >= GUILD_BANK_MAX_TABS)
         {
             sLog.outError( "Guild::LoadGuildBankFromDB: Invalid tab for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
             continue;
         }
-
         if (SlotId >= GUILD_BANK_MAX_SLOTS)
         {
             sLog.outError( "Guild::LoadGuildBankFromDB: Invalid slot for item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
             continue;
         }
-
         ItemPrototype const *proto = objmgr.GetItemPrototype(ItemEntry);
-
         if (!proto)
         {
             sLog.outError( "Guild::LoadGuildBankFromDB: Unknown item (GUID: %u id: #%u) in guild bank, skipped.", ItemGuid,ItemEntry);
             continue;
         }
-
         Item *pItem = NewItemOrBag(proto);
         if (!pItem->LoadFromDB(ItemGuid, 0, result))
         {
@@ -1228,14 +1018,11 @@ void Guild::LoadGuildBankFromDB()
             delete pItem;
             continue;
         }
-
         pItem->AddToWorld();
         m_TabListMap[TabId]->Slots[SlotId] = pItem;
     }while (result->NextRow());
-
     delete result;
 }
-
 // This unload should be called when the last member of the guild gets offline
 void Guild::UnloadGuildBank()
 {
@@ -1254,14 +1041,11 @@ void Guild::UnloadGuildBank()
         delete m_TabListMap[i];
     }
     m_TabListMap.clear();
-
     UnloadGuildBankEventLog();
     m_GuildBankLoaded = false;
 }
-
 // *************************************************
 // Money deposit/withdraw related
-
 void Guild::SendMoneyInfo(WorldSession *session, uint32 LowGuid)
 {
     WorldPacket data(MSG_GUILD_BANK_MONEY_WITHDRAWN, 4);
@@ -1269,16 +1053,12 @@ void Guild::SendMoneyInfo(WorldSession *session, uint32 LowGuid)
     session->SendPacket(&data);
     sLog.outDebug("WORLD: Sent MSG_GUILD_BANK_MONEY_WITHDRAWN");
 }
-
 bool Guild::MemberMoneyWithdraw(uint32 amount, uint32 LowGuid)
 {
     uint32 MoneyWithDrawRight = GetMemberMoneyWithdrawRem(LowGuid);
-
     if (MoneyWithDrawRight < amount || GetGuildBankMoney() < amount)
         return false;
-
     SetBankMoney(GetGuildBankMoney()-amount);
-
     if (MoneyWithDrawRight < WITHDRAW_MONEY_UNLIMITED)
     {
         MemberList::iterator itr = members.find(LowGuid);
@@ -1290,26 +1070,20 @@ bool Guild::MemberMoneyWithdraw(uint32 amount, uint32 LowGuid)
     }
     return true;
 }
-
 void Guild::SetBankMoney(int64 money)
 {
     if (money < 0)                                          // I don't know how this happens, it does!!
         money = 0;
     m_GuildBankMoney = money;
-
     CharacterDatabase.PExecute("UPDATE guild SET BankMoney='" UI64FMTD "' WHERE guildid='%u'", money, m_Id);
 }
-
 // *************************************************
 // Item per day and money per day related
-
 bool Guild::MemberItemWithdraw(uint8 TabId, uint32 LowGuid)
 {
     uint32 SlotsWithDrawRight = GetMemberSlotWithdrawRem(LowGuid, TabId);
-
     if (SlotsWithDrawRight == 0)
         return false;
-
     if (SlotsWithDrawRight < WITHDRAW_SLOT_UNLIMITED)
     {
         MemberList::iterator itr = members.find(LowGuid);
@@ -1321,31 +1095,24 @@ bool Guild::MemberItemWithdraw(uint8 TabId, uint32 LowGuid)
     }
     return true;
 }
-
 bool Guild::IsMemberHaveRights(uint32 LowGuid, uint8 TabId, uint32 rights) const
 {
     MemberList::const_iterator itr = members.find(LowGuid);
     if (itr == members.end())
         return false;
-
     if (itr->second.RankId == GR_GUILDMASTER)
         return true;
-
     return (GetBankRights(itr->second.RankId,TabId) & rights) == rights;
 }
-
 uint32 Guild::GetMemberSlotWithdrawRem(uint32 LowGuid, uint8 TabId)
 {
     MemberList::iterator itr = members.find(LowGuid);
     if (itr == members.end())
         return 0;
-
     if (itr->second.RankId == GR_GUILDMASTER)
         return WITHDRAW_SLOT_UNLIMITED;
-
     if ((GetBankRights(itr->second.RankId,TabId) & GUILD_BANK_RIGHT_VIEW_TAB) != GUILD_BANK_RIGHT_VIEW_TAB)
         return 0;
-
     uint32 curTime = uint32(time(NULL)/MINUTE);
     if (curTime - itr->second.BankResetTimeTab[TabId] >= 24*HOUR/MINUTE)
     {
@@ -1356,16 +1123,13 @@ uint32 Guild::GetMemberSlotWithdrawRem(uint32 LowGuid, uint8 TabId)
     }
     return itr->second.BankRemSlotsTab[TabId];
 }
-
 uint32 Guild::GetMemberMoneyWithdrawRem(uint32 LowGuid)
 {
     MemberList::iterator itr = members.find(LowGuid);
     if (itr == members.end())
         return 0;
-
     if (itr->second.RankId == GR_GUILDMASTER)
         return WITHDRAW_MONEY_UNLIMITED;
-
     uint32 curTime = uint32(time(NULL)/MINUTE);             // minutes
                                                             // 24 hours
     if (curTime > itr->second.BankResetTimeMoney + 24*HOUR/MINUTE)
@@ -1377,86 +1141,68 @@ uint32 Guild::GetMemberMoneyWithdrawRem(uint32 LowGuid)
     }
     return itr->second.BankRemMoney;
 }
-
 void Guild::SetBankMoneyPerDay(uint32 rankId, uint32 money)
 {
     if (rankId >= m_Ranks.size())
         return;
-
     if (rankId == GR_GUILDMASTER)
         money = WITHDRAW_MONEY_UNLIMITED;
-
     m_Ranks[rankId].BankMoneyPerDay = money;
-
     for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
         if (itr->second.RankId == rankId)
             itr->second.BankResetTimeMoney = 0;
-
     CharacterDatabase.PExecute("UPDATE guild_rank SET BankMoneyPerDay='%u' WHERE rid='%u' AND guildid='%u'", money, rankId, m_Id);
     CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeMoney='0' WHERE guildid='%u' AND rank='%u'", m_Id, rankId);
 }
-
 void Guild::SetBankRightsAndSlots(uint32 rankId, uint8 TabId, uint32 right, uint32 nbSlots, bool db)
 {
     if (rankId >= m_Ranks.size() ||
         TabId >= GUILD_BANK_MAX_TABS ||
         TabId >= m_PurchasedTabs)
         return;
-
     if (rankId == GR_GUILDMASTER)
     {
         nbSlots = WITHDRAW_SLOT_UNLIMITED;
         right = GUILD_BANK_RIGHT_FULL;
     }
-
     m_Ranks[rankId].TabSlotPerDay[TabId] = nbSlots;
     m_Ranks[rankId].TabRight[TabId] = right;
-
     if (db)
     {
         for (MemberList::iterator itr = members.begin(); itr != members.end(); ++itr)
             if (itr->second.RankId == rankId)
                 for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
                     itr->second.BankResetTimeTab[i] = 0;
-
         CharacterDatabase.PExecute("DELETE FROM guild_bank_right WHERE guildid='%u' AND TabId='%u' AND rid='%u'", m_Id, uint32(TabId), rankId);
         CharacterDatabase.PExecute("INSERT INTO guild_bank_right (guildid,TabId,rid,gbright,SlotPerDay) VALUES "
             "('%u','%u','%u','%u','%u')", m_Id, uint32(TabId), rankId, m_Ranks[rankId].TabRight[TabId], m_Ranks[rankId].TabSlotPerDay[TabId]);
         CharacterDatabase.PExecute("UPDATE guild_member SET BankResetTimeTab%u='0' WHERE guildid='%u' AND rank='%u'", uint32(TabId), m_Id, rankId);
     }
 }
-
 uint32 Guild::GetBankMoneyPerDay(uint32 rankId)
 {
     if (rankId >= m_Ranks.size())
         return 0;
-
     if (rankId == GR_GUILDMASTER)
         return WITHDRAW_MONEY_UNLIMITED;
     return m_Ranks[rankId].BankMoneyPerDay;
 }
-
 uint32 Guild::GetBankSlotPerDay(uint32 rankId, uint8 TabId)
 {
     if (rankId >= m_Ranks.size() || TabId >= GUILD_BANK_MAX_TABS)
         return 0;
-
     if (rankId == GR_GUILDMASTER)
         return WITHDRAW_SLOT_UNLIMITED;
     return m_Ranks[rankId].TabSlotPerDay[TabId];
 }
-
 // *************************************************
 // Rights per day related
-
 void Guild::LoadBankRightsFromDB(uint32 GuildId)
 {
     //                                                     0      1    2        3
     QueryResult *result = CharacterDatabase.PQuery("SELECT TabId, rid, gbright, SlotPerDay FROM guild_bank_right WHERE guildid = '%u' ORDER BY TabId", GuildId);
-
     if (!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
@@ -1464,22 +1210,16 @@ void Guild::LoadBankRightsFromDB(uint32 GuildId)
         uint32 rankId = fields[1].GetUInt32();
         uint16 right = fields[2].GetUInt16();
         uint16 SlotPerDay = fields[3].GetUInt16();
-
         SetBankRightsAndSlots(rankId, TabId, right, SlotPerDay, false);
-
     }while (result->NextRow());
     delete result;
-
     return;
 }
-
 // *************************************************
 // Bank log related
-
 void Guild::LoadGuildBankEventLogFromDB()
 {
     // Money log is in TabId = GUILD_BANK_MONEY_LOGS_TAB
-
     //uint32 configCount = sWorld.getConfig(CONFIG_GUILD_BANK_EVENT_LOG_COUNT);
     //cycle through all purchased guild bank item tabs
     for (uint32 tabId = 0; tabId < m_PurchasedTabs; tabId++)
@@ -1488,12 +1228,10 @@ void Guild::LoadGuildBankEventLogFromDB()
         QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, tabId, GUILD_BANK_MAX_LOGS);
         if (!result)
             continue;
-
         bool isNextLogGuidSet = false;
         do
         {
             Field *fields = result->Fetch();
-
             GuildBankEventLogEntry NewEvent;
             NewEvent.EventType = fields[1].GetUInt8();
             NewEvent.PlayerGuid = fields[2].GetUInt32();
@@ -1501,7 +1239,6 @@ void Guild::LoadGuildBankEventLogFromDB()
             NewEvent.ItemStackCount = fields[4].GetUInt8();
             NewEvent.DestTabId = fields[5].GetUInt8();
             NewEvent.TimeStamp = fields[6].GetUInt64();
-
             //if newEvent is moneyEvent, move it to moneyEventTab in DB and report error
             if (NewEvent.isMoneyEvent())
             {
@@ -1514,7 +1251,6 @@ void Guild::LoadGuildBankEventLogFromDB()
                 //add event to list
                 //events are ordered from oldest (in beginning) to latest (in the end)
                 m_GuildBankEventLog_Item[tabId].push_front(NewEvent);
-
             if (!isNextLogGuidSet)
             {
                 m_GuildBankEventLogNextGuid_Item[tabId] = fields[0].GetUInt32();
@@ -1524,13 +1260,11 @@ void Guild::LoadGuildBankEventLogFromDB()
         } while (result->NextRow());
         delete result;
     }
-
     //special handle for guild bank money log
     //                                                     0        1          2           3            4               5          6
     QueryResult *result = CharacterDatabase.PQuery("SELECT LogGuid, EventType, PlayerGuid, ItemOrMoney, ItemStackCount, DestTabId, TimeStamp FROM guild_bank_eventlog WHERE guildid='%u' AND TabId='%u' ORDER BY TimeStamp DESC,LogGuid DESC LIMIT %u", m_Id, GUILD_BANK_MONEY_LOGS_TAB, GUILD_BANK_MAX_LOGS);
     if (!result)
         return;
-
     bool isNextMoneyLogGuidSet = false;
     do
     {
@@ -1542,14 +1276,12 @@ void Guild::LoadGuildBankEventLogFromDB()
             isNextMoneyLogGuidSet = true;
         }
         GuildBankEventLogEntry NewEvent;
-
         NewEvent.EventType = fields[1].GetUInt8();
         NewEvent.PlayerGuid = fields[2].GetUInt32();
         NewEvent.ItemOrMoney = fields[3].GetUInt32();
         NewEvent.ItemStackCount = fields[4].GetUInt8();
         NewEvent.DestTabId = fields[5].GetUInt8();
         NewEvent.TimeStamp = fields[6].GetUInt64();
-
         //if newEvent is not moneyEvent, then report error
         if (!NewEvent.isMoneyEvent())
             sLog.outError("GuildBankEventLog ERROR: MoneyEvent LogGuid %u for Guild %u is not MoneyEvent - ignoring...", fields[0].GetUInt32(), m_Id);
@@ -1557,24 +1289,19 @@ void Guild::LoadGuildBankEventLogFromDB()
             //add event to list
             //events are ordered from oldest (in beginning) to latest (in the end)
             m_GuildBankEventLog_Money.push_front(NewEvent);
-
     } while (result->NextRow());
     delete result;
 }
-
 void Guild::UnloadGuildBankEventLog()
 {
     m_GuildBankEventLog_Money.clear();
-
     for (uint8 i = 0; i < GUILD_BANK_MAX_TABS; ++i)
         m_GuildBankEventLog_Item[i].clear();
 }
-
 void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
 {
     if (TabId > GUILD_BANK_MAX_TABS)
         return;
-
     if (TabId == GUILD_BANK_MAX_TABS)
     {
         // Here we display money logs
@@ -1636,7 +1363,6 @@ void Guild::DisplayGuildBankLogs(WorldSession *session, uint8 TabId)
     }
     sLog.outDebug("WORLD: Sent (MSG_GUILD_BANK_LOG_QUERY)");
 }
-
 void Guild::LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uint32 ItemOrMoney, uint8 ItemStackCount, uint8 DestTabId)
 {
     //create Event
@@ -1647,7 +1373,6 @@ void Guild::LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uin
     NewEvent.ItemStackCount = ItemStackCount;
     NewEvent.DestTabId = DestTabId;
     NewEvent.TimeStamp = uint32(time(NULL));
-
     //add new event to the end of event list
     uint32 currentTabId = TabId;
     uint32 currentLogGuid = 0;
@@ -1658,7 +1383,6 @@ void Guild::LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uin
         currentTabId = GUILD_BANK_MONEY_LOGS_TAB;
         if (m_GuildBankEventLog_Money.size() >= GUILD_BANK_MAX_LOGS)
             m_GuildBankEventLog_Money.pop_front();
-
         m_GuildBankEventLog_Money.push_back(NewEvent);
     }
     else
@@ -1667,17 +1391,13 @@ void Guild::LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uin
         currentLogGuid = m_GuildBankEventLogNextGuid_Item[TabId];
         if (m_GuildBankEventLog_Item[TabId].size() >= GUILD_BANK_MAX_LOGS)
             m_GuildBankEventLog_Item[TabId].pop_front();
-
         m_GuildBankEventLog_Item[TabId].push_back(NewEvent);
     }
-
     //save event to database
     CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE guildid='%u' AND LogGuid='%u' AND TabId='%u'", m_Id, currentLogGuid, currentTabId);
-
     CharacterDatabase.PExecute("INSERT INTO guild_bank_eventlog (guildid,LogGuid,TabId,EventType,PlayerGuid,ItemOrMoney,ItemStackCount,DestTabId,TimeStamp) VALUES ('%u','%u','%u','%u','%u','%u','%u','%u','" UI64FMTD "')",
         m_Id, currentLogGuid, currentTabId, uint32(NewEvent.EventType), NewEvent.PlayerGuid, NewEvent.ItemOrMoney, uint32(NewEvent.ItemStackCount), uint32(NewEvent.DestTabId), NewEvent.TimeStamp);
 }
-
 bool Guild::AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry )
 {
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid = '%u' AND TabId = '%u'AND SlotId = '%u'", GuildId, BankTab, BankTabSlot);
@@ -1685,12 +1405,10 @@ bool Guild::AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot
         "VALUES ('%u', '%u', '%u', '%u', '%u')", GuildId, BankTab, BankTabSlot, GUIDLow, Entry);
     return true;
 }
-
 void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *tab, int slot )
 {
     Item *pItem = tab->Slots[slot];
     uint32 entry = pItem ? pItem->GetEntry() : 0;
-
     data << uint8(slot);
     data << uint32(entry);
     if (entry)
@@ -1698,7 +1416,6 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t
         data << (uint32) pItem->GetItemRandomPropertyId();  // random item property id +8
         if (pItem->GetItemRandomPropertyId())
             data << (uint32) pItem->GetItemSuffixFactor();  // SuffixFactor +4
-        
         data << uint32(pItem->GetCount());                  // +12 // ITEM_FIELD_STACK_COUNT
         data << uint32(0);                                  // +16 // Unknown value
         data << uint8(abs(pItem->GetSpellCharges()));       // spell charges
@@ -1712,61 +1429,46 @@ void Guild::AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *t
             data << uint8(0);                               // no enchantments (0)
     }
 }
-
 Item* Guild::StoreItem(uint8 tabId, GuildItemPosCountVec const& dest, Item* pItem )
 {
     if (!pItem)
         return NULL;
-
     Item* lastItem = pItem;
-
     for(GuildItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); )
     {
         uint8 slot = itr->Slot;
         uint32 count = itr->Count;
-
         ++itr;
-
         if (itr == dest.end())
         {
             lastItem = _StoreItem(tabId,slot,pItem,count,false);
             break;
         }
-
         lastItem = _StoreItem(tabId,slot,pItem,count,true);
     }
-
     return lastItem;
 }
-
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
 Item* Guild::_StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool clone )
 {
     if (!pItem)
         return NULL;
-
     sLog.outDebug( "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
-
     Item* pItem2 = m_TabListMap[tab]->Slots[slot];
-
     if (!pItem2)
     {
         if (clone)
             pItem = pItem->CloneItem(count);
         else
             pItem->SetCount(count);
-
         if (!pItem)
             return NULL;
-
         m_TabListMap[tab]->Slots[slot] = pItem;
-
         pItem->SetUInt64Value(ITEM_FIELD_CONTAINED, 0);
         pItem->SetUInt64Value(ITEM_FIELD_OWNER, 0);
         AddGBankItemToDB(GetId(), tab, slot, pItem->GetGUIDLow(), pItem->GetEntry());
         pItem->FSetState(ITEM_NEW);
         pItem->SaveToDB();                                  // not in onventory and can be save standalone
-
         return pItem;
     }
     else
@@ -1774,35 +1476,28 @@ Item* Guild::_StoreItem( uint8 tab, uint8 slot, Item *pItem, uint32 count, bool
         pItem2->SetCount( pItem2->GetCount() + count );
         pItem2->FSetState(ITEM_CHANGED);
         pItem2->SaveToDB();                                 // not in onventory and can be save standalone
-
         if (!clone)
         {
             pItem->RemoveFromWorld();
             pItem->DeleteFromDB();
             delete pItem;
         }
-
         return pItem2;
     }
 }
-
 void Guild::RemoveItem(uint8 tab, uint8 slot )
 {
     m_TabListMap[tab]->Slots[slot] = NULL;
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE guildid='%u' AND TabId='%u' AND SlotId='%u'",
         GetId(), uint32(tab), uint32(slot));
 }
-
 uint8 Guild::_CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCountVec &dest, uint32& count, bool swap, Item* pSrcItem ) const
 {
     Item* pItem2 = m_TabListMap[tab]->Slots[slot];
-
     // ignore move item (this slot will be empty at move)
     if (pItem2 == pSrcItem)
         pItem2 = NULL;
-
     uint32 need_space;
-
     // empty specific slot - check item fit to slot
     if (!pItem2 || swap)
     {
@@ -1815,27 +1510,21 @@ uint8 Guild::_CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCo
         // check item type
         if (pItem2->GetEntry() != pSrcItem->GetEntry())
             return EQUIP_ERR_ITEM_CANT_STACK;
-
         // check free space
         if (pItem2->GetCount() >= pSrcItem->GetMaxStackCount())
             return EQUIP_ERR_ITEM_CANT_STACK;
-
         need_space = pSrcItem->GetMaxStackCount() - pItem2->GetCount();
     }
-
     if (need_space > count)
         need_space = count;
-
     GuildItemPosCount newPosition = GuildItemPosCount(slot,need_space);
     if (!newPosition.isContainedIn(dest))
     {
         dest.push_back(newPosition);
         count -= need_space;
     }
-
     return EQUIP_ERR_OK;
 }
-
 uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32& count, bool merge, Item* pSrcItem, uint8 skip_slot ) const
 {
     for(uint32 j = 0; j < GUILD_BANK_MAX_SLOTS; j++)
@@ -1843,17 +1532,13 @@ uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32&
         // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot
         if (j == skip_slot)
             continue;
-
         Item* pItem2 = m_TabListMap[tab]->Slots[j];
-
         // ignore move item (this slot will be empty at move)
         if (pItem2 == pSrcItem)
             pItem2 = NULL;
-
         // if merge skip empty, if !merge skip non-empty
         if ((pItem2 != NULL) != merge)
             continue;
-
         if (pItem2)
         {
             if (pItem2->GetEntry() == pSrcItem->GetEntry() && pItem2->GetCount() < pSrcItem->GetMaxStackCount())
@@ -1861,13 +1546,11 @@ uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32&
                 uint32 need_space = pSrcItem->GetMaxStackCount() - pItem2->GetCount();
                 if (need_space > count)
                     need_space = count;
-
                 GuildItemPosCount newPosition = GuildItemPosCount(j,need_space);
                 if (!newPosition.isContainedIn(dest))
                 {
                     dest.push_back(newPosition);
                     count -= need_space;
-
                     if (count == 0)
                         return EQUIP_ERR_OK;
                 }
@@ -1878,13 +1561,11 @@ uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32&
             uint32 need_space = pSrcItem->GetMaxStackCount();
             if (need_space > count)
                 need_space = count;
-
             GuildItemPosCount newPosition = GuildItemPosCount(j,need_space);
             if (!newPosition.isContainedIn(dest))
             {
                 dest.push_back(newPosition);
                 count -= need_space;
-
                 if (count == 0)
                     return EQUIP_ERR_OK;
             }
@@ -1892,52 +1573,40 @@ uint8 Guild::_CanStoreItem_InTab( uint8 tab, GuildItemPosCountVec &dest, uint32&
     }
     return EQUIP_ERR_OK;
 }
-
 uint8 Guild::CanStoreItem( uint8 tab, uint8 slot, GuildItemPosCountVec &dest, uint32 count, Item *pItem, bool swap ) const
 {
     sLog.outDebug( "GUILD STORAGE: CanStoreItem tab = %u, slot = %u, item = %u, count = %u", tab, slot, pItem->GetEntry(), count);
-
     if (count > pItem->GetCount())
         return EQUIP_ERR_COULDNT_SPLIT_ITEMS;
-
     if (pItem->IsSoulBound())
         return EQUIP_ERR_CANT_DROP_SOULBOUND;
-
     // in specific slot
     if (slot != NULL_SLOT)
     {
         uint8 res = _CanStoreItem_InSpecificSlot(tab,slot,dest,count,swap,pItem);
         if (res != EQUIP_ERR_OK)
             return res;
-
         if (count == 0)
             return EQUIP_ERR_OK;
     }
-
     // not specific slot or have spece for partly store only in specific slot
-
     // search stack in tab for merge to
     if (pItem->GetMaxStackCount() > 1)
     {
         uint8 res = _CanStoreItem_InTab(tab,dest,count,true,pItem,slot);
         if (res != EQUIP_ERR_OK)
             return res;
-
         if (count == 0)
             return EQUIP_ERR_OK;
     }
-
     // search free slot in bag for place to
     uint8 res = _CanStoreItem_InTab(tab,dest,count,false,pItem,slot);
     if (res != EQUIP_ERR_OK)
         return res;
-
     if (count == 0)
         return EQUIP_ERR_OK;
-
     return EQUIP_ERR_BANK_FULL;
 }
-
 void Guild::SetGuildBankTabText(uint8 TabId, std::string text)
 {
     if (TabId >= GUILD_BANK_MAX_TABS)
@@ -1946,69 +1615,53 @@ void Guild::SetGuildBankTabText(uint8 TabId, std::string text)
         return;
     if (!m_TabListMap[TabId])
         return;
-
     if (m_TabListMap[TabId]->Text == text)
         return;
-
     utf8truncate(text,500);                                 // DB and client size limitation
-
     m_TabListMap[TabId]->Text = text;
-
     CharacterDatabase.escape_string(text);
     CharacterDatabase.PExecute("UPDATE guild_bank_tab SET TabText='%s' WHERE guildid='%u' AND TabId='%u'", text.c_str(), m_Id, uint32(TabId));
-
     // announce
     SendGuildBankTabText(NULL,TabId);
 }
-
 void Guild::SendGuildBankTabText(WorldSession *session, uint8 TabId)
 {
     if (TabId > GUILD_BANK_MAX_TABS)
         return;
-
     GuildBankTab const *tab = GetBankTab(TabId);
     if (!tab)
         return;
-
     WorldPacket data(MSG_QUERY_GUILD_BANK_TEXT, 1+tab->Text.size()+1);
     data << uint8(TabId);
     data << tab->Text;
-
     if (session)
         session->SendPacket(&data);
     else
         BroadcastPacket(&data);
 }
-
 void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount )
 {
     // empty operation
     if (BankTab == BankTabDst && BankTabSlot == BankTabSlotDst)
         return;
-
     Item *pItemSrc = GetItem(BankTab, BankTabSlot);
     if (!pItemSrc)                                      // may prevent crash
         return;
-
     if (SplitedAmount > pItemSrc->GetCount())
         return;                                         // cheating?
     else if (SplitedAmount == pItemSrc->GetCount())
         SplitedAmount = 0;                              // no split
-
     Item *pItemDst = GetItem(BankTabDst, BankTabSlotDst);
-
     if (BankTab != BankTabDst)
     {
         // check dest pos rights (if different tabs)
         if (!IsMemberHaveRights(pl->GetGUIDLow(), BankTabDst, GUILD_BANK_RIGHT_DEPOSIT_ITEM))
             return;
-
         // check source pos rights (if different tabs)
         uint32 remRight = GetMemberSlotWithdrawRem(pl->GetGUIDLow(), BankTab);
         if (remRight <= 0)
             return;
     }
-
     if (SplitedAmount)
     {                                                   // Bank -> Bank item split (in empty or non empty slot
         GuildItemPosCountVec dest;
@@ -2018,17 +1671,14 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
             pl->SendEquipError(msg, pItemSrc, NULL);
             return;
         }
-
         Item *pNewItem = pItemSrc->CloneItem(SplitedAmount);
         if (!pNewItem)
         {
             pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemSrc, NULL);
             return;
         }
-
         CharacterDatabase.BeginTransaction();
         LogBankEvent(GUILD_BANK_LOG_MOVE_ITEM, BankTab, pl->GetGUIDLow(), pItemSrc->GetEntry(), SplitedAmount, BankTabDst);
-
         pl->ItemRemovedQuestCheck(pItemSrc->GetEntry(), SplitedAmount);
         pItemSrc->SetCount(pItemSrc->GetCount() - SplitedAmount);
         pItemSrc->FSetState(ITEM_CHANGED);
@@ -2044,7 +1694,6 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
         {
             CharacterDatabase.BeginTransaction();
             LogBankEvent(GUILD_BANK_LOG_MOVE_ITEM, BankTab, pl->GetGUIDLow(), pItemSrc->GetEntry(), pItemSrc->GetCount(), BankTabDst);
-
             RemoveItem(BankTab, BankTabSlot);
             StoreItem(BankTabDst, gDest, pItemSrc);
             CharacterDatabase.CommitTransaction();
@@ -2058,7 +1707,6 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
                 pl->SendEquipError(msg, pItemSrc, NULL);
                 return;
             }
-
             GuildItemPosCountVec gSrc;
             msg = CanStoreItem(BankTab,BankTabSlot,gSrc,pItemDst->GetCount(),pItemDst,true);
             if (msg != EQUIP_ERR_OK)
@@ -2066,23 +1714,19 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
                 pl->SendEquipError(msg, pItemDst, NULL);
                 return;
             }
-
             if (BankTab != BankTabDst)
             {
                 // check source pos rights (item swapped to src)
                 if (!IsMemberHaveRights(pl->GetGUIDLow(), BankTab, GUILD_BANK_RIGHT_DEPOSIT_ITEM))
                     return;
-
                 // check dest pos rights (item swapped to src)
                 uint32 remRightDst = GetMemberSlotWithdrawRem(pl->GetGUIDLow(), BankTabDst);
                 if (remRightDst <= 0)
                     return;
             }
-
             CharacterDatabase.BeginTransaction();
             LogBankEvent(GUILD_BANK_LOG_MOVE_ITEM, BankTab,    pl->GetGUIDLow(), pItemSrc->GetEntry(), pItemSrc->GetCount(), BankTabDst);
             LogBankEvent(GUILD_BANK_LOG_MOVE_ITEM, BankTabDst, pl->GetGUIDLow(), pItemDst->GetEntry(), pItemDst->GetCount(), BankTab);
-
             RemoveItem(BankTab, BankTabSlot);
             RemoveItem(BankTabDst, BankTabSlotDst);
             StoreItem(BankTab, gSrc, pItemDst);
@@ -2095,20 +1739,16 @@ void Guild::SwapItems(Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankT
         DisplayGuildBankContentUpdate(BankTabDst,BankTabSlotDst);
 }
 
-
 void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount)
 {
     Item *pItemBank = GetItem(BankTab, BankTabSlot);
     Item *pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
-
     if (!pItemBank)                                     // Problem to get bank item
         return;
-
     if (SplitedAmount > pItemBank->GetCount())
         return;                                         // cheating?
     else if (SplitedAmount == pItemBank->GetCount())
         SplitedAmount = 0;                              // no split
-
     if (SplitedAmount)
     {                                                   // Bank -> Char split to slot (patly move)
         Item *pNewItem = pItemBank->CloneItem(SplitedAmount);
@@ -2117,7 +1757,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemBank, NULL);
             return;
         }
-
         ItemPosCountVec dest;
         uint8 msg = pl->CanStoreItem(PlayerBag, PlayerSlot, dest, pNewItem, false);
         if (msg != EQUIP_ERR_OK)
@@ -2126,7 +1765,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             delete pNewItem;
             return;
         }
-
         // check source pos rights (item moved to inventory)
         uint32 remRight = GetMemberSlotWithdrawRem(pl->GetGUIDLow(), BankTab);
         if (remRight <= 0)
@@ -2134,16 +1772,13 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             delete pNewItem;
             return;
         }
-
         CharacterDatabase.BeginTransaction();
         LogBankEvent(GUILD_BANK_LOG_WITHDRAW_ITEM, BankTab, pl->GetGUIDLow(), pItemBank->GetEntry(), SplitedAmount);
-
         pItemBank->SetCount(pItemBank->GetCount()-SplitedAmount);
         pItemBank->FSetState(ITEM_CHANGED);
         pItemBank->SaveToDB();                          // not in inventory and can be save standalone
         pl->MoveItemToInventory(dest,pNewItem,true);
         pl->SaveInventoryAndGoldToDB();
-
         MemberItemWithdraw(BankTab, pl->GetGUIDLow());
         CharacterDatabase.CommitTransaction();
     }
@@ -2157,14 +1792,11 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             uint32 remRight = GetMemberSlotWithdrawRem(pl->GetGUIDLow(), BankTab);
             if (remRight <= 0)
                 return;
-
             CharacterDatabase.BeginTransaction();
             LogBankEvent(GUILD_BANK_LOG_WITHDRAW_ITEM, BankTab, pl->GetGUIDLow(), pItemBank->GetEntry(), pItemBank->GetCount());
-
             RemoveItem(BankTab, BankTabSlot);
             pl->MoveItemToInventory(dest,pItemBank,true);
             pl->SaveInventoryAndGoldToDB();
-
             MemberItemWithdraw(BankTab, pl->GetGUIDLow());
             CharacterDatabase.CommitTransaction();
         }
@@ -2173,7 +1805,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
             // check source pos rights (item swapped to bank)
             if (!IsMemberHaveRights(pl->GetGUIDLow(), BankTab, GUILD_BANK_RIGHT_DEPOSIT_ITEM))
                 return;
-
             if (pItemChar)
             {
                 if (!pItemChar->CanBeTraded())
@@ -2182,7 +1813,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
                     return;
                 }
             }
-
             ItemPosCountVec iDest;
             msg = pl->CanStoreItem(PlayerBag, PlayerSlot, iDest, pItemBank, true);
             if (msg != EQUIP_ERR_OK)
@@ -2190,7 +1820,6 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
                 pl->SendEquipError(msg, pItemBank, NULL);
                 return;
             }
-
             GuildItemPosCountVec gDest;
             if (pItemChar)
             {
@@ -2201,12 +1830,10 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
                     return;
                 }
             }
-
             // check source pos rights (item moved to inventory)
             uint32 remRight = GetMemberSlotWithdrawRem(pl->GetGUIDLow(), BankTab);
             if (remRight <= 0)
                 return;
-
             if (pItemChar)
             {
                 // logging item move to bank
@@ -2218,24 +1845,20 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
                         m_Id);
                 }
             }
-
             CharacterDatabase.BeginTransaction();
             LogBankEvent(GUILD_BANK_LOG_WITHDRAW_ITEM, BankTab, pl->GetGUIDLow(), pItemBank->GetEntry(), pItemBank->GetCount());
             if (pItemChar)
                 LogBankEvent(GUILD_BANK_LOG_DEPOSIT_ITEM, BankTab, pl->GetGUIDLow(), pItemChar->GetEntry(), pItemChar->GetCount());
-
             RemoveItem(BankTab, BankTabSlot);
             if (pItemChar)
             {
                 pl->MoveItemFromInventory(PlayerBag, PlayerSlot, true);
                 pItemChar->DeleteFromInventoryDB();
             }
-
             if (pItemChar)
                 StoreItem(BankTab, gDest, pItemChar);
             pl->MoveItemToInventory(iDest,pItemBank,true);
             pl->SaveInventoryAndGoldToDB();
-
             MemberItemWithdraw(BankTab, pl->GetGUIDLow());
             CharacterDatabase.CommitTransaction();
         }
@@ -2243,30 +1866,24 @@ void Guild::MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, u
     DisplayGuildBankContentUpdate(BankTab,BankTabSlot);
 }
 
-
 void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount )
 {
     Item *pItemBank = GetItem(BankTab, BankTabSlot);
     Item *pItemChar = pl->GetItemByPos(PlayerBag, PlayerSlot);
-
     if (!pItemChar)                                         // Problem to get item from player
         return;
-
     if (!pItemChar->CanBeTraded())
     {
         pl->SendEquipError( EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pItemChar, NULL );
         return;
     }
-
     // check source pos rights (item moved to bank)
     if (!IsMemberHaveRights(pl->GetGUIDLow(), BankTab, GUILD_BANK_RIGHT_DEPOSIT_ITEM))
         return;
-
     if (SplitedAmount > pItemChar->GetCount())
         return;                                             // cheating?
     else if (SplitedAmount == pItemChar->GetCount())
         SplitedAmount = 0;                                  // no split
-
     if (SplitedAmount)
     {                                                       // Char -> Bank split to empty or non-empty slot (partly move)
         GuildItemPosCountVec dest;
@@ -2276,14 +1893,12 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
             pl->SendEquipError(msg, pItemChar, NULL);
             return;
         }
-
         Item *pNewItem = pItemChar->CloneItem( SplitedAmount );
         if (!pNewItem)
         {
             pl->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItemChar, NULL);
             return;
         }
-
         // logging item move to bank (before items merge
         if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
         {
@@ -2291,17 +1906,14 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                 pl->GetName(),pl->GetSession()->GetAccountId(),
                 pItemChar->GetProto()->Name1,pItemChar->GetEntry(),SplitedAmount,m_Id);
         }
-
         CharacterDatabase.BeginTransaction();
         LogBankEvent(GUILD_BANK_LOG_DEPOSIT_ITEM, BankTab, pl->GetGUIDLow(), pItemChar->GetEntry(), SplitedAmount);
-
         pl->ItemRemovedQuestCheck( pItemChar->GetEntry(), SplitedAmount );
         pItemChar->SetCount(pItemChar->GetCount()-SplitedAmount);
         pItemChar->SetState(ITEM_CHANGED);
         pl->SaveInventoryAndGoldToDB();
         StoreItem(BankTab, dest, pNewItem);
         CharacterDatabase.CommitTransaction();
-
         DisplayGuildBankContentUpdate(BankTab,dest);
     }
     else                                                    // Char -> Bank swap with empty or non-empty (move)
@@ -2318,17 +1930,13 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                     pItemChar->GetProto()->Name1,pItemChar->GetEntry(),pItemChar->GetCount(),
                     m_Id);
             }
-
             CharacterDatabase.BeginTransaction();
             LogBankEvent(GUILD_BANK_LOG_DEPOSIT_ITEM, BankTab, pl->GetGUIDLow(), pItemChar->GetEntry(), pItemChar->GetCount());
-
             pl->MoveItemFromInventory(PlayerBag, PlayerSlot, true);
             pItemChar->DeleteFromInventoryDB();
-
             StoreItem(BankTab,dest,pItemChar);
             pl->SaveInventoryAndGoldToDB();
             CharacterDatabase.CommitTransaction();
-
             DisplayGuildBankContentUpdate(BankTab,dest);
         }
         else                                                // Char <-> Bank swap items (posible NULL bank item)
@@ -2343,7 +1951,6 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                     return;
                 }
             }
-
             GuildItemPosCountVec gDest;
             msg = CanStoreItem(BankTab,BankTabSlot,gDest,pItemChar->GetCount(),pItemChar,true);
             if (msg != EQUIP_ERR_OK)
@@ -2351,7 +1958,6 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                 pl->SendEquipError(msg, pItemChar, NULL);
                 return;
             }
-
             if (pItemBank)
             {
                 // check bank pos rights (item swapped with inventory)
@@ -2359,7 +1965,6 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                 if (remRight <= 0)
                     return;
             }
-
             // logging item move to bank
             if (pl->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
             {
@@ -2368,17 +1973,14 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
                     pItemChar->GetProto()->Name1,pItemChar->GetEntry(),pItemChar->GetCount(),
                     m_Id);
             }
-
             CharacterDatabase.BeginTransaction();
             if (pItemBank)
                 LogBankEvent(GUILD_BANK_LOG_WITHDRAW_ITEM, BankTab, pl->GetGUIDLow(), pItemBank->GetEntry(), pItemBank->GetCount());
             LogBankEvent(GUILD_BANK_LOG_DEPOSIT_ITEM, BankTab, pl->GetGUIDLow(), pItemChar->GetEntry(), pItemChar->GetCount());
-
             pl->MoveItemFromInventory(PlayerBag, PlayerSlot, true);
             pItemChar->DeleteFromInventoryDB();
             if (pItemBank)
                 RemoveItem(BankTab, BankTabSlot);
-
             StoreItem(BankTab,gDest,pItemChar);
             if (pItemBank)
                 pl->MoveItemToInventory(iDest,pItemBank,true);
@@ -2386,17 +1988,14 @@ void Guild::MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot,
             if (pItemBank)
                 MemberItemWithdraw(BankTab, pl->GetGUIDLow());
             CharacterDatabase.CommitTransaction();
-
             DisplayGuildBankContentUpdate(BankTab,gDest);
         }
     }
 }
-
 bool GuildItemPosCount::isContainedIn(GuildItemPosCountVec const &vec) const
 {
     for (GuildItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end(); ++itr)
         if (itr->Slot == this->Slot)
             return true;
-
     return false;
 }
diff --git a/src/game/Guild.h b/src/game/Guild.h
index 8df8d01d264..94edb4465ac 100644
--- a/src/game/Guild.h
+++ b/src/game/Guild.h
@@ -17,20 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_GUILD_H
 #define TRINITYCORE_GUILD_H
-
 #define WITHDRAW_MONEY_UNLIMITED    0xFFFFFFFF
 #define WITHDRAW_SLOT_UNLIMITED     0xFFFFFFFF
-
 #include "Item.h"
-
 class Item;
-
 #define GUILD_RANKS_MIN_COUNT   5
 #define GUILD_RANKS_MAX_COUNT   10
-
 enum GuildDefaultRanks
 {
     //these ranks can be modified, but they cannot be deleted
@@ -42,7 +36,6 @@ enum GuildDefaultRanks
     //When promoting member server does: rank--;!
     //When demoting member server does: rank++;!
 };
-
 enum GuildRankRights
 {
     GR_RIGHT_EMPTY              = 0x00000040,
@@ -65,7 +58,6 @@ enum GuildRankRights
     GR_RIGHT_CREATE_GUILD_EVENT = 0x00100000,               // wotlk
     GR_RIGHT_ALL                = 0x001DF1FF
 };
-
 enum Typecommand
 {
     GUILD_CREATE_S  = 0x00,
@@ -76,7 +68,6 @@ enum Typecommand
     GUILD_BANK_S    = 0x15,
     GUILD_UNK3      = 0x16
 };
-
 enum CommandErrors
 {
     GUILD_PLAYER_NO_MORE_IN_GUILD   = 0x00,
@@ -104,7 +95,6 @@ enum CommandErrors
     GUILD_BANK_TAB_IS_FULL          = 0x1B,
     GUILD_BANK_ITEM_NOT_FOUND       = 0x1C
 };
-
 enum GuildEvents
 {
     GE_PROMOTION        = 0x00,
@@ -127,14 +117,12 @@ enum GuildEvents
     GE_UNK6             = 0x11,                             // string 0000000000002710 is 1 gold
     GE_UNK7             = 0x12
 };
-
 enum PetitionTurns
 {
     PETITION_TURN_OK                    = 0,
     PETITION_TURN_ALREADY_IN_GUILD      = 2,
     PETITION_TURN_NEED_MORE_SIGNATURES  = 4,
 };
-
 enum PetitionSigns
 {
     PETITION_SIGN_OK                = 0,
@@ -143,17 +131,14 @@ enum PetitionSigns
     PETITION_SIGN_CANT_SIGN_OWN     = 3,
     PETITION_SIGN_NOT_SERVER        = 4,
 };
-
 enum GuildBankRights
 {
     GUILD_BANK_RIGHT_VIEW_TAB       = 0x01,
     GUILD_BANK_RIGHT_PUT_ITEM       = 0x02,
     GUILD_BANK_RIGHT_UPDATE_TEXT    = 0x04,
-
     GUILD_BANK_RIGHT_DEPOSIT_ITEM   = GUILD_BANK_RIGHT_VIEW_TAB | GUILD_BANK_RIGHT_PUT_ITEM,
     GUILD_BANK_RIGHT_FULL           = 0xFF,
 };
-
 enum GuildBankEventLogTypes
 {
     GUILD_BANK_LOG_DEPOSIT_ITEM     = 1,
@@ -166,7 +151,6 @@ enum GuildBankEventLogTypes
     GUILD_BANK_LOG_UNK1             = 8,
     GUILD_BANK_LOG_UNK2             = 9,
 };
-
 enum GuildEventLogTypes
 {
     GUILD_EVENT_LOG_INVITE_PLAYER     = 1,
@@ -176,7 +160,6 @@ enum GuildEventLogTypes
     GUILD_EVENT_LOG_UNINVITE_PLAYER   = 5,
     GUILD_EVENT_LOG_LEAVE_GUILD       = 6,
 };
-
 enum GuildEmblem
 {
     ERR_GUILDEMBLEM_SUCCESS               = 0,
@@ -186,7 +169,6 @@ enum GuildEmblem
     ERR_GUILDEMBLEM_NOTENOUGHMONEY        = 4,
     ERR_GUILDEMBLEM_INVALIDVENDOR         = 5
 };
-
 inline uint32 GetGuildBankTabPrice(uint8 Index)
 {
     switch(Index)
@@ -202,7 +184,6 @@ inline uint32 GetGuildBankTabPrice(uint8 Index)
     }
     return 0;
 }
-
 struct GuildEventLogEntry
 {
     uint8  EventType;
@@ -211,7 +192,6 @@ struct GuildEventLogEntry
     uint8  NewRank;
     uint64 TimeStamp;
 };
-
 struct GuildBankEventLogEntry
 {
     uint8  EventType;
@@ -220,7 +200,6 @@ struct GuildBankEventLogEntry
     uint8  ItemStackCount;
     uint8  DestTabId;
     uint64 TimeStamp;
-
     const bool isMoneyEvent()
     {
         return EventType == GUILD_BANK_LOG_DEPOSIT_MONEY ||
@@ -228,7 +207,6 @@ struct GuildBankEventLogEntry
             EventType == GUILD_BANK_LOG_REPAIR_MONEY;
     }
 };
-
 struct GuildBankTab
 {
     Item* Slots[GUILD_BANK_MAX_SLOTS];
@@ -236,18 +214,14 @@ struct GuildBankTab
     std::string Icon;
     std::string Text;
 };
-
 struct GuildItemPosCount
 {
     GuildItemPosCount(uint8 _slot, uint32 _count) : Slot(_slot), Count(_count) {}
-
     bool isContainedIn(std::vector<GuildItemPosCount> const& vec) const;
-
     uint8 Slot;
     uint32 Count;
 };
 typedef std::vector<GuildItemPosCount> GuildItemPosCountVec;
-
 struct MemberSlot
 {
     uint64 LogoutTime;
@@ -263,7 +237,6 @@ struct MemberSlot
     uint32 BankResetTimeTab[GUILD_BANK_MAX_TABS];
     uint32 BankRemSlotsTab[GUILD_BANK_MAX_TABS];
 };
-
 struct RankInfo
 {
     RankInfo(const std::string& _name, uint32 _rights, uint32 _money) : Name(_name), Rights(_rights), BankMoneyPerDay(_money)
@@ -274,71 +247,57 @@ struct RankInfo
             TabSlotPerDay[i] = 0;
         }
     }
-
     std::string Name;
     uint32 Rights;
     uint32 BankMoneyPerDay;
     uint32 TabRight[GUILD_BANK_MAX_TABS];
     uint32 TabSlotPerDay[GUILD_BANK_MAX_TABS];
 };
-
 class Guild
 {
     public:
         Guild();
         ~Guild();
-
         bool Create(Player* leader, std::string gname);
         void CreateDefaultGuildRanks(int locale_idx);
         void Disband();
-
         typedef std::map<uint32, MemberSlot> MemberList;
         typedef std::vector<RankInfo> RankList;
-
         uint32 GetId(){ return m_Id; }
         const uint64& GetLeader(){ return m_LeaderGuid; }
         std::string const& GetName() const { return m_Name; }
         std::string const& GetMOTD() const { return MOTD; }
         std::string const& GetGINFO() const { return GINFO; }
 
-
         uint32 GetCreatedYear() const { return m_CreatedYear; }
         uint32 GetCreatedMonth() const { return m_CreatedMonth; }
         uint32 GetCreatedDay() const { return m_CreatedDay; }
 
-
         uint32 GetEmblemStyle() const { return m_EmblemStyle; }
         uint32 GetEmblemColor() const { return m_EmblemColor; }
         uint32 GetBorderStyle() const { return m_BorderStyle; }
         uint32 GetBorderColor() const { return m_BorderColor; }
         uint32 GetBackgroundColor() const { return m_BackgroundColor; }
-
         void SetLeader(uint64 guid);
         bool AddMember(uint64 plGuid, uint32 plRank);
         void ChangeRank(uint64 guid, uint32 newRank);
         void DelMember(uint64 guid, bool isDisbanding = false);
         //lowest rank is the count of ranks - 1 (the highest rank_id in table)
         uint32 GetLowestRank() const { return m_Ranks.size() - 1; }
-
         void SetMOTD(std::string motd);
         void SetGINFO(std::string ginfo);
         void SetPNOTE(uint64 guid, std::string pnote);
         void SetOFFNOTE(uint64 guid, std::string offnote);
         void SetEmblem(uint32 emblemStyle, uint32 emblemColor, uint32 borderStyle, uint32 borderColor, uint32 backgroundColor);
-
         uint32 GetMemberSize() const { return members.size(); }
-
         bool LoadGuildFromDB(uint32 GuildId);
         bool LoadRanksFromDB(uint32 GuildId);
         bool LoadMembersFromDB(uint32 GuildId);
-
         void SetMemberStats(uint64 guid);
-
         void BroadcastToGuild(WorldSession *session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
         void BroadcastToOfficers(WorldSession *session, const std::string& msg, uint32 language = LANG_UNIVERSAL);
         void BroadcastPacketToRank(WorldPacket *packet, uint32 rankId);
         void BroadcastPacket(WorldPacket *packet);
-
         template<class Do>
         void BroadcastWorker(Do& _do, Player* except = NULL)
         {
@@ -347,13 +306,11 @@ class Guild
                     if(player != except)
                         _do(player);
         }
-
         void CreateRank(std::string name,uint32 rights);
         void DelRank();
         std::string GetRankName(uint32 rankId);
         uint32 GetRankRights(uint32 rankId);
         uint32 GetRanksSize() const { return m_Ranks.size(); }
-
         void SetRankName(uint32 rankId, std::string name);
         void SetRankRights(uint32 rankId, uint32 rights);
         bool HasRankRight(uint32 rankId, uint32 right)
@@ -377,25 +334,20 @@ class Guild
             }
             return NULL;
         }
-
         void Roster(WorldSession *session = NULL);          // NULL = broadcast
         void Query(WorldSession *session);
-
         void   UpdateLogoutTime(uint64 guid);
         // Guild EventLog
         void   LoadGuildEventLogFromDB();
         void   UnloadGuildEventLog();
         void   DisplayGuildEventLog(WorldSession *session);
         void   LogGuildEvent(uint8 EventType, uint32 PlayerGuid1, uint32 PlayerGuid2, uint8 NewRank);
-
         // ** Guild bank **
         // Content & item deposit/withdraw
         void   DisplayGuildBankContent(WorldSession *session, uint8 TabId);
-
         void   SwapItems( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 BankTabDst, uint8 BankTabSlotDst, uint32 SplitedAmount);
         void   MoveFromBankToChar( Player * pl, uint8 BankTab, uint8 BankTabSlot, uint8 PlayerBag, uint8 PlayerSlot, uint32 SplitedAmount);
         void   MoveFromCharToBank( Player * pl, uint8 PlayerBag, uint8 PlayerSlot, uint8 BankTab, uint8 BankTabSlot, uint32 SplitedAmount);
-
         // Tabs
         void   DisplayGuildBankTabsInfo(WorldSession *session);
         void   CreateNewBankTab();
@@ -432,10 +384,8 @@ class Guild
         void   DisplayGuildBankLogs(WorldSession *session, uint8 TabId);
         void   LogBankEvent(uint8 EventType, uint8 TabId, uint32 PlayerGuidLow, uint32 ItemOrMoney, uint8 ItemStackCount=0, uint8 DestTabId=0);
         bool   AddGBankItemToDB(uint32 GuildId, uint32 BankTab , uint32 BankTabSlot , uint32 GUIDLow, uint32 Entry );
-
     protected:
         void AddRank(const std::string& name,uint32 rights,uint32 money);
-
         uint32 m_Id;
         std::string m_Name;
         uint64 m_LeaderGuid;
@@ -444,37 +394,29 @@ class Guild
         uint32 m_CreatedYear;
         uint32 m_CreatedMonth;
         uint32 m_CreatedDay;
-
         uint32 m_EmblemStyle;
         uint32 m_EmblemColor;
         uint32 m_BorderStyle;
         uint32 m_BorderColor;
         uint32 m_BackgroundColor;
-
         RankList m_Ranks;
-
         MemberList members;
-
         typedef std::vector<GuildBankTab*> TabListMap;
         TabListMap m_TabListMap;
-
         /** These are actually ordered lists. The first element is the oldest entry.*/
         typedef std::list<GuildEventLogEntry> GuildEventLog;
         typedef std::list<GuildBankEventLogEntry> GuildBankEventLog;
         GuildEventLog m_GuildEventLog;
         GuildBankEventLog m_GuildBankEventLog_Money;
         GuildBankEventLog m_GuildBankEventLog_Item[GUILD_BANK_MAX_TABS];
-
         uint32 m_GuildEventLogNextGuid;
         uint32 m_GuildBankEventLogNextGuid_Money;
         uint32 m_GuildBankEventLogNextGuid_Item[GUILD_BANK_MAX_TABS];
-
         bool m_GuildBankLoaded;
         bool m_EventLogLoaded;
         uint32 m_OnlineMembers;
         uint64 m_GuildBankMoney;
         uint8 m_PurchasedTabs;
-
     private:
         // used only from high level Swap/Move functions
         Item*  GetItem(uint8 TabId, uint8 SlotId);
@@ -483,7 +425,6 @@ class Guild
         void   RemoveItem(uint8 tab, uint8 slot );
         void   DisplayGuildBankContentUpdate(uint8 TabId, int32 slot1, int32 slot2 = -1);
         void   DisplayGuildBankContentUpdate(uint8 TabId, GuildItemPosCountVec const& slots);
-
         // internal common parts for CanStore/StoreItem functions
         void AppendDisplayGuildBankSlot( WorldPacket& data, GuildBankTab const *tab, int32 slot );
         uint8 _CanStoreItem_InSpecificSlot( uint8 tab, uint8 slot, GuildItemPosCountVec& dest, uint32& count, bool swap, Item *pSrcItem ) const;
diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp
index c11ad11766b..cc9e514c823 100644
--- a/src/game/GuildHandler.cpp
+++ b/src/game/GuildHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -28,142 +27,108 @@
 #include "Guild.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
-
 void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
 {
     uint32 guildId;
     Guild *guild;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_QUERY");
-
     recvPacket >> guildId;
-
     guild = objmgr.GetGuildById(guildId);
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     guild->Query(this);
 }
-
 void WorldSession::HandleGuildCreateOpcode(WorldPacket& recvPacket)
 {
     std::string gname;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_CREATE");
-
     recvPacket >> gname;
-
     if(GetPlayer()->GetGuildId())
         return;
-
     Guild *guild = new Guild;
     if(!guild->Create(GetPlayer(),gname))
     {
         delete guild;
         return;
     }
-
     objmgr.AddGuild(guild);
 }
-
 void WorldSession::HandleGuildInviteOpcode(WorldPacket& recvPacket)
 {
     std::string Invitedname, plname;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_INVITE");
-
     Player * player = NULL;
-
     recvPacket >> Invitedname;
-
     if(normalizePlayerName(Invitedname))
         player = ObjectAccessor::Instance().FindPlayerByName(Invitedname.c_str());
-
     if(!player)
     {
         SendGuildCommandResult(GUILD_INVITE_S, Invitedname, GUILD_PLAYER_NOT_FOUND);
         return;
     }
-
     Guild *guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     // OK result but not send invite
     if(player->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
         return;
-
     // not let enemies sign guild charter
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != GetPlayer()->GetTeam())
     {
         SendGuildCommandResult(GUILD_INVITE_S, Invitedname, GUILD_NOT_ALLIED);
         return;
     }
-
     if(player->GetGuildId())
     {
         plname = player->GetName();
         SendGuildCommandResult(GUILD_INVITE_S, plname, ALREADY_IN_GUILD);
         return;
     }
-
     if(player->GetGuildIdInvited())
     {
         plname = player->GetName();
         SendGuildCommandResult(GUILD_INVITE_S, plname, ALREADY_INVITED_TO_GUILD);
         return;
     }
-
     if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_INVITE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     sLog.outDebug("Player %s Invited %s to Join his Guild", GetPlayer()->GetName(), Invitedname.c_str());
-
     player->SetGuildIdInvited(GetPlayer()->GetGuildId());
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_INVITE_PLAYER, GetPlayer()->GetGUIDLow(), player->GetGUIDLow(), 0);
-
     WorldPacket data(SMSG_GUILD_INVITE, (8+10));            // guess size
     data << GetPlayer()->GetName();
     data << guild->GetName();
     player->GetSession()->SendPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_INVITE)");
 }
-
 void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
 {
     std::string plName;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_REMOVE");
-
     recvPacket >> plName;
-
     if(!normalizePlayerName(plName))
         return;
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_REMOVE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 plGuid;
     MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
     if(!slot)
@@ -171,24 +136,20 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     if(slot->RankId == GR_GUILDMASTER)
     {
         SendGuildCommandResult(GUILD_QUIT_S, "", GUILD_LEADER_LEAVE);
         return;
     }
-
     //do not allow to kick player with same or higher rights
     if(GetPlayer()->GetRank() >= slot->RankId)
     {
         SendGuildCommandResult(GUILD_QUIT_S, plName, GUILD_RANK_TOO_HIGH_S);
         return;
     }
-
     guild->DelMember(plGuid);
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_UNINVITE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), 0);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+20));             // guess size
     data << (uint8)GE_REMOVED;
     data << (uint8)2;                                       // strings count
@@ -196,56 +157,44 @@ void WorldSession::HandleGuildRemoveOpcode(WorldPacket& recvPacket)
     data << GetPlayer()->GetName();
     guild->BroadcastPacket(&data);
 }
-
 void WorldSession::HandleGuildAcceptOpcode(WorldPacket& /*recvPacket*/)
 {
     Guild *guild;
     Player *player = GetPlayer();
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_ACCEPT");
-
     guild = objmgr.GetGuildById(player->GetGuildIdInvited());
     if(!guild || player->GetGuildId())
         return;
-
     // not let enemies sign guild charter
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && player->GetTeam() != objmgr.GetPlayerTeamByGUID(guild->GetLeader()))
         return;
-
     if(!guild->AddMember(GetPlayer()->GetGUID(),guild->GetLowestRank()))
         return;
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_JOIN_GUILD, GetPlayer()->GetGUIDLow(), 0, 0);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+10));             // guess size
     data << (uint8)GE_JOINED;
     data << (uint8)1;                                       // strings count
     data << player->GetName();
     guild->BroadcastPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_EVENT)");
 }
-
 void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/)
 {
     //sLog.outDebug("WORLD: Received CMSG_GUILD_DECLINE");
-
     GetPlayer()->SetGuildIdInvited(0);
     GetPlayer()->SetInGuild(0);
 }
-
 void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
 {
     Guild *guild;
     //sLog.outDebug("WORLD: Received CMSG_GUILD_INFO");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     WorldPacket data(SMSG_GUILD_INFO, (5*4 + guild->GetName().size() + 1));
     data << guild->GetName();
     data << guild->GetCreatedDay();
@@ -253,32 +202,23 @@ void WorldSession::HandleGuildInfoOpcode(WorldPacket& /*recvPacket*/)
     data << guild->GetCreatedYear();
     data << guild->GetMemberSize();
     data << guild->GetMemberSize();
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleGuildRosterOpcode(WorldPacket& /*recvPacket*/)
 {
     //sLog.outDebug("WORLD: Received CMSG_GUILD_ROSTER");
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
         return;
-
     guild->Roster(this);
 }
-
 void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
 {
     std::string plName;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_PROMOTE");
-
     recvPacket >> plName;
-
     if(!normalizePlayerName(plName))
         return;
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
@@ -290,22 +230,18 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 plGuid;
     MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
-
     if(!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     if(plGuid == GetPlayer()->GetGUID())
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
         return;
     }
-
     //allow to promote only to lower rank than member's rank
     //guildmaster's rank = 0
     //GetPlayer()->GetRank() + 1 is highest rank that current player can promote to
@@ -314,9 +250,7 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_RANK_TOO_HIGH_S);
         return;
     }
-
     uint32 newRankId = slot->RankId - 1;                    //when promoting player, rank is decreased
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+30));             // guess size
     data << (uint8)GE_PROMOTION;
     data << (uint8)3;                                       // strings count
@@ -324,72 +258,56 @@ void WorldSession::HandleGuildPromoteOpcode(WorldPacket& recvPacket)
     data << plName;
     data << guild->GetRankName(newRankId);
     guild->BroadcastPacket(&data);
-    
     guild->ChangeRank(plGuid, newRankId);
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_PROMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), newRankId);
 }
-
 void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
 {
     std::string plName;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_DEMOTE");
-
     recvPacket >> plName;
-
     if(!normalizePlayerName(plName))
         return;
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
-
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_DEMOTE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 plGuid;
     MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
-
     if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     if(plGuid == GetPlayer()->GetGUID())
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_NAME_INVALID);
         return;
     }
-
     //do not allow to demote same or higher rank
     if(GetPlayer()->GetRank() >= slot->RankId)
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_RANK_TOO_HIGH_S);
         return;
     }
-
     //do not allow to demote lowest rank
     if(slot->RankId >= guild->GetLowestRank())
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_ALREADY_LOWEST_RANK_S);
         return;
     }
-
     uint32 newRankId = slot->RankId + 1;                    //when demoting player, rank is increased
-
     guild->ChangeRank(plGuid, newRankId);
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_DEMOTE_PLAYER, GetPlayer()->GetGUIDLow(), GUID_LOPART(plGuid), newRankId);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+30));             // guess size
     data << (uint8)GE_DEMOTION;
     data << (uint8)3;                                       // strings count
@@ -398,14 +316,11 @@ void WorldSession::HandleGuildDemoteOpcode(WorldPacket& recvPacket)
     data << guild->GetRankName(slot->RankId);
     guild->BroadcastPacket(&data);
 }
-
 void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/)
 {
     std::string plName;
     Guild *guild;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_LEAVE");
-
     guild = objmgr.GetGuildById(_player->GetGuildId());
     if(!guild)
     {
@@ -417,37 +332,28 @@ void WorldSession::HandleGuildLeaveOpcode(WorldPacket& /*recvPacket*/)
         SendGuildCommandResult(GUILD_QUIT_S, "", GUILD_LEADER_LEAVE);
         return;
     }
-
     if(_player->GetGUID() == guild->GetLeader())
     {
         guild->Disband();
         return;
     }
-
     plName = _player->GetName();
-
     guild->DelMember(_player->GetGUID());
     // Put record into guildlog
     guild->LogGuildEvent(GUILD_EVENT_LOG_LEAVE_GUILD, _player->GetGUIDLow(), 0, 0);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+10));             // guess size
     data << (uint8)GE_LEFT;
     data << (uint8)1;                                       // strings count
     data << plName;
     guild->BroadcastPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_EVENT)");
-
     SendGuildCommandResult(GUILD_QUIT_S, guild->GetName(), GUILD_PLAYER_NO_MORE_IN_GUILD);
 }
-
 void WorldSession::HandleGuildDisbandOpcode(WorldPacket& /*recvPacket*/)
 {
     std::string name;
     Guild *guild;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_DISBAND");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
@@ -459,68 +365,51 @@ void WorldSession::HandleGuildDisbandOpcode(WorldPacket& /*recvPacket*/)
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     guild->Disband();
-
     //sLog.outDebug("WORLD: Guild Sucefully Disbanded");
 }
-
 void WorldSession::HandleGuildLeaderOpcode(WorldPacket& recvPacket)
 {
     std::string name;
     Player *oldLeader = GetPlayer();
     Guild *guild;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_LEADER");
-
     recvPacket >> name;
-
     if(!normalizePlayerName(name))
         return;
-
     guild = objmgr.GetGuildById(oldLeader->GetGuildId());
-
     if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if( oldLeader->GetGUID() != guild->GetLeader())
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 newLeaderGUID;
     MemberSlot* slot = guild->GetMemberSlot(name, newLeaderGUID);
-
     if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     guild->SetLeader(newLeaderGUID);
     guild->ChangeRank(oldLeader->GetGUID(), GR_OFFICER);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+20));             // guess size
     data << (uint8)GE_LEADER_CHANGED;
     data << (uint8)2;                                       // strings count
     data << oldLeader->GetName();
     data << name.c_str();
     guild->BroadcastPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_EVENT)");
 }
-
 void WorldSession::HandleGuildMOTDOpcode(WorldPacket& recvPacket)
 {
     Guild *guild;
     std::string MOTD;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_MOTD");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
@@ -532,73 +421,54 @@ void WorldSession::HandleGuildMOTDOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     if(!recvPacket.empty())
         recvPacket >> MOTD;
     else
         MOTD = "";
-
     guild->SetMOTD(MOTD);
-
     WorldPacket data(SMSG_GUILD_EVENT, (2+MOTD.size()+1));
     data << (uint8)GE_MOTD;
     data << (uint8)1;                                       // strings count
     data << MOTD;
     guild->BroadcastPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_EVENT)");
 }
-
 void WorldSession::HandleGuildSetPublicNoteOpcode(WorldPacket& recvPacket)
 {
     std::string name,PNOTE;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_SET_PUBLIC_NOTE");
-
     recvPacket >> name;
-
     if(!normalizePlayerName(name))
         return;
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if (!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if (!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_EPNOTE))
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 plGuid;
     MemberSlot* slot = guild->GetMemberSlot(name, plGuid);
-
     if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, name, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     recvPacket >> PNOTE;
     guild->SetPNOTE(plGuid, PNOTE);
-
     guild->Roster(this);
 }
-
 void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket)
 {
     std::string plName, OFFNOTE;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_SET_OFFICER_NOTE");
-
     recvPacket >> plName;
-
     if(!normalizePlayerName(plName))
         return;
-
     Guild* guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if (!guild)
     {
@@ -610,33 +480,25 @@ void WorldSession::HandleGuildSetOfficerNoteOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     uint64 plGuid;
     MemberSlot* slot = guild->GetMemberSlot(plName, plGuid);
-
     if (!slot)
     {
         SendGuildCommandResult(GUILD_INVITE_S, plName, GUILD_PLAYER_NOT_IN_GUILD_S);
         return;
     }
-
     recvPacket >> OFFNOTE;
     guild->SetOFFNOTE(plGuid, OFFNOTE);
-
     guild->Roster(this);
 }
-
 void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket)
 {
     //recvPacket.hexlike();
-
     Guild *guild;
     std::string rankname;
     uint32 rankId;
     uint32 rights, MoneyPerDay;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_RANK");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
@@ -644,100 +506,76 @@ void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket)
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     else if(GetPlayer()->GetGUID() != guild->GetLeader())
     {
         recvPacket.rpos(recvPacket.wpos());                 // set to end to avoid warnings spam
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     recvPacket >> rankId;
     recvPacket >> rights;
     recvPacket >> rankname;
     recvPacket >> MoneyPerDay;
-
     for (int i = 0; i < GUILD_BANK_MAX_TABS; ++i)
     {
         uint32 BankRights;
         uint32 BankSlotPerDay;
-
         recvPacket >> BankRights;
         recvPacket >> BankSlotPerDay;
         guild->SetBankRightsAndSlots(rankId, uint8(i), uint16(BankRights & 0xFF), uint16(BankSlotPerDay), true);
     }
-
     sLog.outDebug("WORLD: Changed RankName to %s , Rights to 0x%.4X", rankname.c_str(), rights);
-
     guild->SetBankMoneyPerDay(rankId, MoneyPerDay);
     guild->SetRankName(rankId, rankname);
-
     if (rankId == GR_GUILDMASTER)                           // prevent loss leader rights
         rights = GR_RIGHT_ALL;
-
     guild->SetRankRights(rankId, rights);
-
     guild->Query(this);
     guild->Roster();                                        // broadcast for tab rights update
 }
-
 void WorldSession::HandleGuildAddRankOpcode(WorldPacket& recvPacket)
 {
     Guild *guild;
     std::string rankname;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_ADD_RANK");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if(GetPlayer()->GetGUID() != guild->GetLeader())
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     if(guild->GetRanksSize() >= GUILD_RANKS_MAX_COUNT)      // client not let create more 10 than ranks
         return;
-
     recvPacket >> rankname;
-
     guild->CreateRank(rankname, GR_RIGHT_GCHATLISTEN | GR_RIGHT_GCHATSPEAK);
-
     guild->Query(this);
     guild->Roster();                                        // broadcast for tab rights update
 }
-
 void WorldSession::HandleGuildDelRankOpcode(WorldPacket& /*recvPacket*/)
 {
     Guild *guild;
     std::string rankname;
-
     //sLog.outDebug("WORLD: Received CMSG_GUILD_DEL_RANK");
-
     guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     else if(GetPlayer()->GetGUID() != guild->GetLeader())
     {
         SendGuildCommandResult(GUILD_INVITE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     guild->DelRank();
-
     guild->Query(this);
     guild->Roster();                                        // broadcast for tab rights update
 }
-
 void WorldSession::SendGuildCommandResult(uint32 typecmd, const std::string& str,uint32 cmdresult)
 {
     WorldPacket data(SMSG_GUILD_COMMAND_RESULT, (8+str.size()+1));
@@ -745,48 +583,36 @@ void WorldSession::SendGuildCommandResult(uint32 typecmd, const std::string& str
     data << str;
     data << cmdresult;
     SendPacket(&data);
-
     //sLog.outDebug("WORLD: Sent (SMSG_GUILD_COMMAND_RESULT)");
 }
-
 void WorldSession::HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket)
 {
     //sLog.outDebug("WORLD: Received CMSG_GUILD_INFO_TEXT");
-
     std::string GINFO;
-
     recvPacket >> GINFO;
-
     Guild *guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PLAYER_NOT_IN_GUILD);
         return;
     }
-
     if(!guild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_MODIFY_GUILD_INFO))
     {
         SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_PERMISSIONS);
         return;
     }
-
     guild->SetGINFO(GINFO);
 }
-
 void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
 {
     //sLog.outDebug("WORLD: Received MSG_SAVE_GUILD_EMBLEM");
-
     uint64 vendorGuid;
-
     uint32 EmblemStyle;
     uint32 EmblemColor;
     uint32 BorderStyle;
     uint32 BorderColor;
     uint32 BackgroundColor;
-
     recvPacket >> vendorGuid;
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorGuid,UNIT_NPC_FLAG_TABARDDESIGNER);
     if (!pCreature)
     {
@@ -795,17 +621,14 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
         sLog.outDebug("WORLD: HandleSaveGuildEmblemOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(vendorGuid));
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     recvPacket >> EmblemStyle;
     recvPacket >> EmblemColor;
     recvPacket >> BorderStyle;
     recvPacket >> BorderColor;
     recvPacket >> BackgroundColor;
-
     Guild *guild = objmgr.GetGuildById(GetPlayer()->GetGuildId());
     if(!guild)
     {
@@ -813,79 +636,60 @@ void WorldSession::HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket)
         SendSaveGuildEmblem(ERR_GUILDEMBLEM_NOGUILD);
         return;
     }
-
     if (guild->GetLeader() != GetPlayer()->GetGUID())
     {
         //"Only guild leaders can create emblems."
         SendSaveGuildEmblem(ERR_GUILDEMBLEM_NOTGUILDMASTER);
         return;
     }
-
     if(GetPlayer()->GetMoney() < 10*GOLD)
     {
         //"You can't afford to do that."
         SendSaveGuildEmblem(ERR_GUILDEMBLEM_NOTENOUGHMONEY);
         return;
     }
-
     GetPlayer()->ModifyMoney(-10*GOLD);
     guild->SetEmblem(EmblemStyle, EmblemColor, BorderStyle, BorderColor, BackgroundColor);
-
     //"Guild Emblem saved."
     SendSaveGuildEmblem(ERR_GUILDEMBLEM_SUCCESS);
-
     guild->Query(this);
 }
-
 void WorldSession::HandleGuildEventLogQueryOpcode(WorldPacket& /* recvPacket */)
 {
                                                             // empty
     sLog.outDebug("WORLD: Received (MSG_GUILD_EVENT_LOG_QUERY)");
     //recvPacket.hexlike();
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     pGuild->DisplayGuildEventLog(this);
 }
-
 /******  GUILD BANK  *******/
-
 void WorldSession::HandleGuildBankMoneyWithdrawn( WorldPacket & /* recv_data */ )
 {
     sLog.outDebug("WORLD: Received (MSG_GUILD_BANK_MONEY_WITHDRAWN)");
     //recv_data.hexlike();
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow());
 }
-
 void WorldSession::HandleGuildPermissions( WorldPacket& /* recv_data */ )
 {
     sLog.outDebug("WORLD: Received (MSG_GUILD_PERMISSIONS)");
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     uint32 rankId = GetPlayer()->GetRank();
-
     WorldPacket data(MSG_GUILD_PERMISSIONS, 4*15+1);
     data << uint32(rankId);                                 // guild rank id
     data << uint32(pGuild->GetRankRights(rankId));          // rank rights
@@ -901,7 +705,6 @@ void WorldSession::HandleGuildPermissions( WorldPacket& /* recv_data */ )
     SendPacket(&data);
     sLog.outDebug("WORLD: Sent (MSG_GUILD_PERMISSIONS)");
 }
-
 /* Called when clicking on Guild bank gameobject */
 void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
 {
@@ -909,10 +712,8 @@ void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
     uint64 GoGuid;
     uint8  unk;
     recv_data >> GoGuid >> unk;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     if (uint32 GuildId = GetPlayer()->GetGuildId())
     {
         if(Guild *pGuild = objmgr.GetGuildById(GuildId))
@@ -921,10 +722,8 @@ void WorldSession::HandleGuildBankerActivate( WorldPacket & recv_data )
             return;
         }
     }
-
     SendGuildCommandResult(GUILD_BANK_S, "", GUILD_PLAYER_NOT_IN_GUILD);
 }
-
 /* Called when opening guild bank tab only (first one) */
 void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
 {
@@ -932,127 +731,94 @@ void WorldSession::HandleGuildBankQueryTab( WorldPacket & recv_data )
     uint64 GoGuid;
     uint8 TabId,unk1;
     recv_data >> GoGuid >> TabId >> unk1;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     // Let's update the amount of gold the player can withdraw before displaying the content
     // This is usefull if money withdraw right has changed
     pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow());
-
     pGuild->DisplayGuildBankContent(this, TabId);
 }
-
 void WorldSession::HandleGuildBankDepositMoney( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (CMSG_GUILD_BANK_DEPOSIT_MONEY)");
     uint64 GoGuid;
     uint32 money;
     recv_data >> GoGuid >> money;
-
     if (!money)
         return;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     if (GetPlayer()->GetMoney() < money)
         return;
-
     CharacterDatabase.BeginTransaction();
-
     pGuild->SetBankMoney(pGuild->GetGuildBankMoney()+money);
     GetPlayer()->ModifyMoney(-int(money));
     GetPlayer()->SaveGoldToDB();
-
     CharacterDatabase.CommitTransaction();
-
     // logging money
     if(_player->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
     {
         sLog.outCommand(_player->GetSession()->GetAccountId(),"GM %s (Account: %u) deposit money (Amount: %u) to guild bank (Guild ID %u)",
             _player->GetName(),_player->GetSession()->GetAccountId(),money,GuildId);
     }
-
     // log
     pGuild->LogBankEvent(GUILD_BANK_LOG_DEPOSIT_MONEY, uint8(0), GetPlayer()->GetGUIDLow(), money);
-
     pGuild->DisplayGuildBankTabsInfo(this);
     pGuild->DisplayGuildBankContent(this, 0);
 }
-
 void WorldSession::HandleGuildBankWithdrawMoney( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (CMSG_GUILD_BANK_WITHDRAW_MONEY)");
     uint64 GoGuid;
     uint32 money;
     recv_data >> GoGuid >> money;
-
     if (!money)
         return;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     if (pGuild->GetGuildBankMoney()<money)                  // not enough money in bank
         return;
-
     if (!pGuild->HasRankRight(GetPlayer()->GetRank(), GR_RIGHT_WITHDRAW_GOLD))
         return;
-
     CharacterDatabase.BeginTransaction();
-
     if (!pGuild->MemberMoneyWithdraw(money, GetPlayer()->GetGUIDLow()))
     {
         CharacterDatabase.RollbackTransaction();
         return;
     }
-
     GetPlayer()->ModifyMoney(money);
     GetPlayer()->SaveGoldToDB();
-
     CharacterDatabase.CommitTransaction();
-
     // Log
     pGuild->LogBankEvent(GUILD_BANK_LOG_WITHDRAW_MONEY, uint8(0), GetPlayer()->GetGUIDLow(), money);
-
     pGuild->SendMoneyInfo(this, GetPlayer()->GetGUIDLow());
     pGuild->DisplayGuildBankTabsInfo(this);
     pGuild->DisplayGuildBankContent(this,0);
 }
-
 void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (CMSG_GUILD_BANK_SWAP_ITEMS)");
     //recv_data.hexlike();
-
     uint64 GoGuid;
     uint8 BankToBank;
-
     uint8 BankTab, BankTabSlot, AutoStore;
     uint8 PlayerSlot = NULL_SLOT;
     uint8 PlayerBag = NULL_BAG;
@@ -1061,7 +827,6 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
     uint32 ItemEntry, unk1;
     uint32 AutoStoreCount = 0;
     uint32 SplitedAmount = 0;
-
     recv_data >> GoGuid >> BankToBank;
     if (BankToBank)
     {
@@ -1073,7 +838,6 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
         recv_data >> ItemEntry;
         recv_data >> unk2;                                  // always 0
         recv_data >> SplitedAmount;
-
         if (BankTabSlotDst >= GUILD_BANK_MAX_SLOTS || (BankTabDst == BankTab && BankTabSlotDst == BankTabSlot))
         {
             recv_data.rpos(recv_data.wpos());               // prevent additional spam at rejected packet
@@ -1099,87 +863,68 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
             recv_data >> ToChar;
             recv_data >> SplitedAmount;
         }
-
         if (BankTabSlot >= GUILD_BANK_MAX_SLOTS && BankTabSlot != 0xFF)
         {
             recv_data.rpos(recv_data.wpos());               // prevent additional spam at rejected packet
             return;
         }
     }
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     Player *pl = GetPlayer();
-
     // Bank <-> Bank
     if (BankToBank)
     {
         pGuild->SwapItems(pl, BankTab, BankTabSlot, BankTabDst, BankTabSlotDst, SplitedAmount);
         return;
     }
-
     // Player <-> Bank
-
     // allow work with inventory only
     if(!Player::IsInventoryPos(PlayerBag,PlayerSlot) && !(PlayerBag == NULL_BAG && PlayerSlot == NULL_SLOT) )
     {
         _player->SendEquipError( EQUIP_ERR_NONE, NULL, NULL );
         return;
     }
-
     // BankToChar swap or char to bank remaining
     if (ToChar)                                             // Bank -> Char cases
         pGuild->MoveFromBankToChar(pl, BankTab, BankTabSlot, PlayerBag, PlayerSlot, SplitedAmount);
     else                                                    // Char -> Bank cases
         pGuild->MoveFromCharToBank(pl, PlayerBag, PlayerSlot, BankTab, BankTabSlot, SplitedAmount);
 }
-
 void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (CMSG_GUILD_BANK_BUY_TAB)");
     //recv_data.hexlike();
     uint64 GoGuid;
     uint8 TabId;
-
     recv_data >> GoGuid;
     recv_data >> TabId;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId==0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     uint32 TabCost = GetGuildBankTabPrice(TabId) * GOLD;
     if (!TabCost)
         return;
-
     if (pGuild->GetPurchasedTabs() >= GUILD_BANK_MAX_TABS)
         return;
-
     if (TabId != pGuild->GetPurchasedTabs())                // m_PurchasedTabs = 0 when buying Tab 0, that is why this check can be made
     {
         sLog.outError("Error: trying to buy a tab non contigous to owned ones");
         return;
     }
-
     if (GetPlayer()->GetMoney() < TabCost)                  // Should not happen, this is checked by client
         return;
-
     // Go on with creating tab
     pGuild->CreateNewBankTab();
     GetPlayer()->ModifyMoney(-int(TabCost));
@@ -1188,7 +933,6 @@ void WorldSession::HandleGuildBankBuyTab( WorldPacket & recv_data )
     pGuild->Roster();                                       // broadcast for tab rights update
     pGuild->DisplayGuildBankTabsInfo(this);
 }
-
 void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (CMSG_GUILD_BANK_UPDATE_TAB)");
@@ -1197,89 +941,67 @@ void WorldSession::HandleGuildBankUpdateTab( WorldPacket & recv_data )
     uint8 TabId;
     std::string Name;
     std::string IconIndex;
-
     recv_data >> GoGuid;
     recv_data >> TabId;
     recv_data >> Name;
     recv_data >> IconIndex;
-
     if(Name.empty())
         return;
-
     if(IconIndex.empty())
         return;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(GoGuid, GAMEOBJECT_TYPE_GUILD_BANK))
         return;
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId==0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     pGuild->SetGuildBankTabInfo(TabId, Name, IconIndex);
     pGuild->DisplayGuildBankTabsInfo(this);
     pGuild->DisplayGuildBankContent(this, TabId);
 }
-
 void WorldSession::HandleGuildBankLogQuery( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Received (MSG_GUILD_BANK_LOG_QUERY)");
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     uint8 TabId;
     recv_data >> TabId;
-
     pGuild->DisplayGuildBankLogs(this, TabId);
 }
-
 void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Received MSG_QUERY_GUILD_BANK_TEXT");
-
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     uint8 TabId;
     recv_data >> TabId;
-
     pGuild->SendGuildBankTabText(this, TabId);
 }
-
 void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Received CMSG_SET_GUILD_BANK_TEXT");
     uint32 GuildId = GetPlayer()->GetGuildId();
     if (GuildId == 0)
         return;
-
     Guild *pGuild = objmgr.GetGuildById(GuildId);
     if(!pGuild)
         return;
-
     uint8 TabId;
     std::string Text;
     recv_data >> TabId;
     recv_data >> Text;
-
     pGuild->SetGuildBankTabText(TabId, Text);
 }
-
 void WorldSession::SendSaveGuildEmblem( uint32 msg )
 {
     WorldPacket data(MSG_SAVE_GUILD_EMBLEM, 4);
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
index e2fc9b1e0ec..435d1be1ab2 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/HomeMovementGenerator.cpp
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "HomeMovementGenerator.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Traveller.h"
 #include "DestinationHolderImp.h"
 #include "WorldPacket.h"
-
 void
 HomeMovementGenerator<Creature>::Initialize(Creature & owner)
 {
@@ -34,41 +32,32 @@ HomeMovementGenerator<Creature>::Initialize(Creature & owner)
     owner.addUnitState(UNIT_STAT_EVADE);
     _setTargetLocation(owner);
 }
-
 void
 HomeMovementGenerator<Creature>::Reset(Creature &)
 {
 }
-
 void
 HomeMovementGenerator<Creature>::_setTargetLocation(Creature & owner)
 {
     if( !&owner )
         return;
-
     if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) )
         return;
-
     float x, y, z;
     owner.GetHomePosition(x, y, z, ori);
-
     CreatureTraveller traveller(owner);
-
     uint32 travel_time = i_destinationHolder.SetDestination(traveller, x, y, z);
     modifyTravelTime(travel_time);
     owner.clearUnitState(UNIT_STAT_ALL_STATE);
 }
-
 bool
 HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff)
 {
     CreatureTraveller traveller( owner);
     i_destinationHolder.UpdateTraveller(traveller, time_diff);
-
     if (time_diff > i_travel_timer)
     {
         owner.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-
         // restore orientation of not moving creature at returning to home
         if(owner.GetDefaultMovementType()==IDLE_MOTION_TYPE)
         {
@@ -78,14 +67,11 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
             owner.BuildHeartBeatMsg(&packet);
             owner.SendMessageToSet(&packet, false);
         }
-
         owner.clearUnitState(UNIT_STAT_EVADE);
         owner.AI()->JustReachedHome();
         return false;
     }
-
     i_travel_timer -= time_diff;
-
     return true;
 }
 
diff --git a/src/game/HomeMovementGenerator.h b/src/game/HomeMovementGenerator.h
index 964b5c3e801..76be5747733 100644
--- a/src/game/HomeMovementGenerator.h
+++ b/src/game/HomeMovementGenerator.h
@@ -17,41 +17,31 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_HOMEMOVEMENTGENERATOR_H
 #define TRINITY_HOMEMOVEMENTGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-
 class Creature;
-
 template < class T >
 class TRINITY_DLL_SPEC HomeMovementGenerator;
-
 template <>
 class TRINITY_DLL_SPEC HomeMovementGenerator<Creature>
 : public MovementGeneratorMedium< Creature, HomeMovementGenerator<Creature> >
 {
     public:
-
         HomeMovementGenerator() {}
         ~HomeMovementGenerator() {}
-
         void Initialize(Creature &);
         void Finalize(Creature &) {}
         void Reset(Creature &);
         bool Update(Creature &, const uint32 &);
         void modifyTravelTime(uint32 travel_time) { i_travel_timer = travel_time; }
         MovementGeneratorType GetMovementGeneratorType() { return HOME_MOTION_TYPE; }
-
         bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
-    
     private:
         void _setTargetLocation(Creature &);
         DestinationHolder< Traveller<Creature> > i_destinationHolder;
-
         float ori;
         uint32 i_travel_timer;
 };
diff --git a/src/game/HostilRefManager.cpp b/src/game/HostilRefManager.cpp
index 4a51d54248d..567ec634cd4 100644
--- a/src/game/HostilRefManager.cpp
+++ b/src/game/HostilRefManager.cpp
@@ -17,27 +17,22 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "HostilRefManager.h"
 #include "ThreatManager.h"
 #include "Unit.h"
 #include "DBCStructure.h"
 #include "SpellMgr.h"
-
 HostilRefManager::~HostilRefManager()
 {
     deleteReferences();
 }
-
 //=================================================
 // send threat to all my hateres for the pVictim
 // The pVictim is hated than by them as well
 // use for buffs and healing threat functionality
-
 void HostilRefManager::threatAssist(Unit *pVictim, float pThreat, SpellEntry const *pThreatSpell, bool pSingleTarget)
 {
     HostilReference* ref;
-
     uint32 size = pSingleTarget ? 1 : getSize();            // if pSingleTarget do not devide threat
     ref = getFirst();
     while(ref != NULL)
@@ -50,13 +45,10 @@ void HostilRefManager::threatAssist(Unit *pVictim, float pThreat, SpellEntry con
         ref = ref->next();
     }
 }
-
 //=================================================
-
 void HostilRefManager::addThreatPercent(int32 pValue)
 {
     HostilReference* ref;
-
     ref = getFirst();
     while(ref != NULL)
     {
@@ -64,14 +56,11 @@ void HostilRefManager::addThreatPercent(int32 pValue)
         ref = ref->next();
     }
 }
-
 //=================================================
 // The online / offline status is given to the method. The calculation has to be done before
-
 void HostilRefManager::setOnlineOfflineState(bool pIsOnline)
 {
     HostilReference* ref;
-
     ref = getFirst();
     while(ref != NULL)
     {
@@ -79,10 +68,8 @@ void HostilRefManager::setOnlineOfflineState(bool pIsOnline)
         ref = ref->next();
     }
 }
-
 //=================================================
 // The online / offline status is calculated and set
-
 void HostilRefManager::updateThreatTables()
 {
     HostilReference* ref = getFirst();
@@ -92,11 +79,9 @@ void HostilRefManager::updateThreatTables()
         ref = ref->next();
     }
 }
-
 //=================================================
 // The references are not needed anymore
 // tell the source to remove them from the list and free the mem
-
 void HostilRefManager::deleteReferences()
 {
     HostilReference* ref = getFirst();
@@ -108,10 +93,8 @@ void HostilRefManager::deleteReferences()
         ref = nextRef;
     }
 }
-
 //=================================================
 // delete one reference, defined by Unit
-
 void HostilRefManager::deleteReference(Unit *pCreature)
 {
     HostilReference* ref = getFirst();
@@ -127,10 +110,8 @@ void HostilRefManager::deleteReference(Unit *pCreature)
         ref = nextRef;
     }
 }
-
 //=================================================
 // set state for one reference, defined by Unit
-
 void HostilRefManager::setOnlineOfflineState(Unit *pCreature,bool pIsOnline)
 {
     HostilReference* ref = getFirst();
@@ -145,6 +126,5 @@ void HostilRefManager::setOnlineOfflineState(Unit *pCreature,bool pIsOnline)
         ref = nextRef;
     }
 }
-
 //=================================================
 
diff --git a/src/game/HostilRefManager.h b/src/game/HostilRefManager.h
index 316509e3908..2964cad24bf 100644
--- a/src/game/HostilRefManager.h
+++ b/src/game/HostilRefManager.h
@@ -17,20 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _HOSTILEREFMANAGER
 #define _HOSTILEREFMANAGER
-
 #include "Common.h"
 #include "Utilities/LinkedReference/RefManager.h"
-
 class Unit;
 class ThreatManager;
 class HostilReference;
 struct SpellEntry;
-
 //=================================================
-
 class HostilRefManager : public RefManager<Unit, ThreatManager>
 {
     private:
@@ -38,29 +33,20 @@ class HostilRefManager : public RefManager<Unit, ThreatManager>
     public:
         explicit HostilRefManager(Unit *pOwner) { iOwner = pOwner; }
         ~HostilRefManager();
-
         Unit* getOwner() { return iOwner; }
-
         // send threat to all my hateres for the pVictim
         // The pVictim is hated than by them as well
         // use for buffs and healing threat functionality
         void threatAssist(Unit *pVictim, float threat, SpellEntry const *threatSpell = 0, bool pSingleTarget=false);
-
         void addThreatPercent(int32 pValue);
-
         // The references are not needed anymore
         // tell the source to remove them from the list and free the mem
         void deleteReferences();
-
         HostilReference* getFirst() { return ((HostilReference* ) RefManager<Unit, ThreatManager>::getFirst()); }
-
         void updateThreatTables();
-
         void setOnlineOfflineState(bool pIsOnline);
-
         // set state for one reference, defined by Unit
         void setOnlineOfflineState(Unit *pCreature,bool pIsOnline);
-
         // delete one reference, defined by Unit
         void deleteReference(Unit *pCreature);
 };
diff --git a/src/game/IdleMovementGenerator.cpp b/src/game/IdleMovementGenerator.cpp
index 7c68e3c09f5..770020205c4 100644
--- a/src/game/IdleMovementGenerator.cpp
+++ b/src/game/IdleMovementGenerator.cpp
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "IdleMovementGenerator.h"
 #include "CreatureAI.h"
 #include "Creature.h"
-
 IdleMovementGenerator si_idleMovement;
-
 // StopMoving is needed to make unit stop if its last movement generator expires
 // But it should not be sent otherwise there are many redundent packets
 void IdleMovementGenerator::Initialize(Unit &owner)
@@ -31,27 +28,21 @@ void IdleMovementGenerator::Initialize(Unit &owner)
     if(owner.hasUnitState(UNIT_STAT_MOVE))
         owner.StopMoving();
 }
-
 void
 IdleMovementGenerator::Reset(Unit& owner)
 {
     if(owner.hasUnitState(UNIT_STAT_MOVE))
         owner.StopMoving();
 }
-
 void RotateMovementGenerator::Initialize(Unit& owner)
 {
     if(owner.hasUnitState(UNIT_STAT_MOVE))
         owner.StopMoving();
-
     if(owner.getVictim())
         owner.SetInFront(owner.getVictim());
-
     owner.addUnitState(UNIT_STAT_ROTATING);
-
-    owner.AttackStop(); 
+    owner.AttackStop();
 }
-
 bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff)
 {
     float angle = owner.GetOrientation();
@@ -67,44 +58,36 @@ bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff)
     }
     owner.SetOrientation(angle);
     owner.SendMovementFlagUpdate(); // this is a hack. we do not have anything correct to send in the beginning
-
     if(m_duration > diff)
         m_duration -= diff;
     else
         return false;
-
     return true;
 }
-
 void RotateMovementGenerator::Finalize(Unit &unit)
 {
     unit.clearUnitState(UNIT_STAT_ROTATING);
     if(unit.GetTypeId() == TYPEID_UNIT)
         ((Creature*)&unit)->AI()->MovementInform(ROTATE_MOTION_TYPE, 0);
 }
-
 void
 DistractMovementGenerator::Initialize(Unit& owner)
 {
     owner.addUnitState(UNIT_STAT_DISTRACTED);
 }
-
 void
 DistractMovementGenerator::Finalize(Unit& owner)
 {
     owner.clearUnitState(UNIT_STAT_DISTRACTED);
 }
-
 bool
 DistractMovementGenerator::Update(Unit& owner, const uint32& time_diff)
 {
     if(time_diff > m_timer)
         return false;
-
     m_timer -= time_diff;
     return true;
 }
-
 void
 AssistanceDistractMovementGenerator::Finalize(Unit &unit)
 {
diff --git a/src/game/IdleMovementGenerator.h b/src/game/IdleMovementGenerator.h
index 7251e8b011f..3ba04a08e39 100644
--- a/src/game/IdleMovementGenerator.h
+++ b/src/game/IdleMovementGenerator.h
@@ -17,65 +17,51 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_IDLEMOVEMENTGENERATOR_H
 #define TRINITY_IDLEMOVEMENTGENERATOR_H
-
 #include "MovementGenerator.h"
-
 class TRINITY_DLL_SPEC IdleMovementGenerator : public MovementGenerator
 {
     public:
-
         void Initialize(Unit &);
         void Finalize(Unit &) {  }
         void Reset(Unit &);
         bool Update(Unit &, const uint32 &) { return true; }
         MovementGeneratorType GetMovementGeneratorType() { return IDLE_MOTION_TYPE; }
 };
-
 extern IdleMovementGenerator si_idleMovement;
-
 class TRINITY_DLL_SPEC RotateMovementGenerator : public MovementGenerator
 {
     public:
         explicit RotateMovementGenerator(uint32 time, RotateDirection direction) : m_duration(time), m_maxDuration(time), m_direction(direction) {}
-
         void Initialize(Unit& owner);
         void Finalize(Unit& owner);
         void Reset(Unit& owner) { Initialize(owner); }
         bool Update(Unit& owner, const uint32& time_diff);
         MovementGeneratorType GetMovementGeneratorType() { return ROTATE_MOTION_TYPE; }
-
     private:
         uint32 m_duration, m_maxDuration;
         RotateDirection m_direction;
 };
-
 class TRINITY_DLL_SPEC DistractMovementGenerator : public MovementGenerator
 {
     public:
         explicit DistractMovementGenerator(uint32 timer) : m_timer(timer) {}
-
         void Initialize(Unit& owner);
         void Finalize(Unit& owner);
         void Reset(Unit& owner) { Initialize(owner); }
         bool Update(Unit& owner, const uint32& time_diff);
         MovementGeneratorType GetMovementGeneratorType() { return DISTRACT_MOTION_TYPE; }
-
     private:
         uint32 m_timer;
 };
-
 class MANGOS_DLL_SPEC AssistanceDistractMovementGenerator : public DistractMovementGenerator
 {
     public:
         AssistanceDistractMovementGenerator(uint32 timer) :
             DistractMovementGenerator(timer) {}
-
         MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_DISTRACT_MOTION_TYPE; }
         void Finalize(Unit& unit);
 };
-
 #endif
 
diff --git a/src/game/InstanceData.cpp b/src/game/InstanceData.cpp
index 1398038d724..00738a72a94 100644
--- a/src/game/InstanceData.cpp
+++ b/src/game/InstanceData.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "InstanceData.h"
 #include "Database/DatabaseEnv.h"
 #include "Map.h"
@@ -25,7 +24,6 @@
 #include "GameObject.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-
 void InstanceData::SaveToDB()
 {
     std::string data = GetSaveData();
@@ -34,7 +32,6 @@ void InstanceData::SaveToDB()
     CharacterDatabase.escape_string(data);
     CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId());
 }
-
 void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
 {
     if(!go)
@@ -44,40 +41,33 @@ void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
     else
         debug_log("TSCR: InstanceData: HandleGameObject failed");
 }
-
 bool InstanceData::IsEncounterInProgress() const
 {
     for(std::vector<BossInfo>::const_iterator itr = bosses.begin(); itr != bosses.end(); ++itr)
         if(itr->state == IN_PROGRESS)
             return true;
-
     return false;
 }
-
 void InstanceData::LoadMinionData(const MinionData *data)
 {
     while(data->entry)
     {
         if(data->bossId < bosses.size())
             minions.insert(std::make_pair(data->entry, MinionInfo(&bosses[data->bossId])));
-
         ++data;
     }
     sLog.outDebug("InstanceData::LoadMinionData: %u minions loaded.", doors.size());
 }
-
 void InstanceData::LoadDoorData(const DoorData *data)
 {
     while(data->entry)
     {
         if(data->bossId < bosses.size())
             doors.insert(std::make_pair(data->entry, DoorInfo(&bosses[data->bossId], data->type, BoundaryType(data->boundary))));
-
         ++data;
     }
     sLog.outDebug("InstanceData::LoadDoorData: %u doors loaded.", doors.size());
 }
-
 void InstanceData::UpdateMinionState(Creature *minion, EncounterState state)
 {
     switch(state)
@@ -96,14 +86,12 @@ void InstanceData::UpdateMinionState(Creature *minion, EncounterState state)
             break;
     }
 }
-
 void InstanceData::UpdateDoorState(GameObject *door)
 {
     DoorInfoMap::iterator lower = doors.lower_bound(door->GetEntry());
     DoorInfoMap::iterator upper = doors.upper_bound(door->GetEntry());
     if(lower == upper)
         return;
-
     bool open = true;
     for(DoorInfoMap::iterator itr = lower; itr != upper; ++itr)
     {
@@ -124,18 +112,15 @@ void InstanceData::UpdateDoorState(GameObject *door)
             }
         }
     }
-
     door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
     //sLog.outError("Door %u is %s.", door->GetEntry(), open ? "opened" : "closed");
 }
-
 void InstanceData::AddDoor(GameObject *door, bool add)
 {
     DoorInfoMap::iterator lower = doors.lower_bound(door->GetEntry());
     DoorInfoMap::iterator upper = doors.upper_bound(door->GetEntry());
     if(lower == upper)
         return;
-
     for(DoorInfoMap::iterator itr = lower; itr != upper; ++itr)
     {
         if(add)
@@ -167,23 +152,19 @@ void InstanceData::AddDoor(GameObject *door, bool add)
         else
             itr->second.bossInfo->door[itr->second.type].erase(door);
     }
-
     if(add)
         UpdateDoorState(door);
 }
-
 void InstanceData::AddMinion(Creature *minion, bool add)
 {
     MinionInfoMap::iterator itr = minions.find(minion->GetEntry());
     if(itr == minions.end())
         return;
-
     if(add)
         itr->second.bossInfo->minion.insert(minion);
     else
         itr->second.bossInfo->minion.erase(minion);
 }
-
 bool InstanceData::SetBossState(uint32 id, EncounterState state)
 {
     if(id < bosses.size())
@@ -199,28 +180,22 @@ bool InstanceData::SetBossState(uint32 id, EncounterState state)
         {
             if(bossInfo->state == state)
                 return false;
-
             if(state == DONE)
                 for(MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i)
                     if((*i)->isWorldBoss() && (*i)->isAlive())
                         return false;
-
             bossInfo->state = state;
             SaveToDB();
         }
-        
         for(uint32 type = 0; type < MAX_DOOR_TYPES; ++type)
             for(DoorSet::iterator i = bossInfo->door[type].begin(); i != bossInfo->door[type].end(); ++i)
                 UpdateDoorState(*i);
-
         for(MinionSet::iterator i = bossInfo->minion.begin(); i != bossInfo->minion.end(); ++i)
             UpdateMinionState(*i, state);
-
         return true;
     }
     return false;
 }
-
 std::string InstanceData::LoadBossState(const char * data)
 {
     if(!data) return NULL;
@@ -235,22 +210,18 @@ std::string InstanceData::LoadBossState(const char * data)
     }
     return loadStream.str();
 }
-
 std::string InstanceData::GetBossSaveData()
 {
     std::ostringstream saveStream;
     for(std::vector<BossInfo>::iterator i = bosses.begin(); i != bosses.end(); ++i)
         saveStream << (uint32)i->state << " ";
     return saveStream.str();
-}   
-
+}
 void InstanceData::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, bool bUseAlternativeState)
 {
     if (!uiGuid)
         return;
-
     GameObject* pGo = instance->GetGameObject(uiGuid);
-
     if (pGo)
     {
         if (pGo->GetGoType() == GAMEOBJECT_TYPE_DOOR || pGo->GetGoType() == GAMEOBJECT_TYPE_BUTTON)
@@ -264,7 +235,6 @@ void InstanceData::DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime, bo
             error_log("SD2: Script call DoUseDoorOrButton, but gameobject entry %u is type %u.",pGo->GetEntry(),pGo->GetGoType());
     }
 }
-
 void InstanceData::DoRespawnGameObject(uint64 uiGuid, uint32 uiTimeToDespawn)
 {
     if (GameObject* pGo = instance->GetGameObject(uiGuid))
@@ -273,18 +243,14 @@ void InstanceData::DoRespawnGameObject(uint64 uiGuid, uint32 uiTimeToDespawn)
         if (pGo->GetGoType()==GAMEOBJECT_TYPE_FISHINGNODE || pGo->GetGoType()==GAMEOBJECT_TYPE_DOOR ||
             pGo->GetGoType()==GAMEOBJECT_TYPE_BUTTON || pGo->GetGoType()==GAMEOBJECT_TYPE_TRAP)
             return;
-
         if (pGo->isSpawned())
             return;
-
         pGo->SetRespawnTime(uiTimeToDespawn);
     }
 }
-
 void InstanceData::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
 {
     Map::PlayerList const& lPlayers = instance->GetPlayers();
-
     if (!lPlayers.isEmpty())
     {
         for(Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr)
@@ -296,38 +262,32 @@ void InstanceData::DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData)
     else
         debug_log("TSCR: DoUpdateWorldState attempt send data but no players in map.");
 }
-
 /* Not used anywhere yet, not sure if they're needed:
 // Send Notify to all players in instance
 void InstanceData::DoSendNotifyToInstance(const char *format, ...)
 {
     InstanceMap::PlayerList const &PlayerList = instance->GetPlayers();
     InstanceMap::PlayerList::const_iterator i;
-
     if (!PlayerList.isEmpty())
         for (i = PlayerList.begin(); i != PlayerList.end(); ++i)
             if ((*i).getSource() && (*i).getSource()->GetSession())
                 (*i).getSource()->GetSession()->SendNotification(format);
 }
-
 // Complete Achievement for all players in instance
 void InstanceData::DoCompleteAchievement(uint32 achievement)
 {
     AchievementEntry const* AE = GetAchievementStore()->LookupEntry(achievement);
     Map::PlayerList const &PlayerList = instance->GetPlayers();
-
     if (!PlayerList.isEmpty())
         for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             if (i->getSource())
                 i->getSource()->CompletedAchievement(AE);
 }
 */
-
 // Remove Auras due to Spell on all players in instance
 void InstanceData::DoRemoveAurasDueToSpellOnPlayers(uint32 spell)
 {
     Map::PlayerList const &PlayerList = instance->GetPlayers();
-
     if (!PlayerList.isEmpty())
         for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
             if (i->getSource() && i->getSource()->HasAura(spell)) i->getSource()->RemoveAurasDueToSpell(spell);
diff --git a/src/game/InstanceData.h b/src/game/InstanceData.h
index 010a3d44d42..29bae24436b 100644
--- a/src/game/InstanceData.h
+++ b/src/game/InstanceData.h
@@ -17,23 +17,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_INSTANCE_DATA_H
 #define TRINITY_INSTANCE_DATA_H
-
 #include "ZoneScript.h"
 //#include "GameObject.h"
 //#include "Map.h"
-
 class Map;
 class Unit;
 class Player;
 class GameObject;
 class Creature;
-
 typedef std::set<GameObject*> DoorSet;
 typedef std::set<Creature*> MinionSet;
-
 enum EncounterState
 {
     NOT_STARTED   = 0,
@@ -43,14 +38,12 @@ enum EncounterState
     SPECIAL       = 4,
     TO_BE_DECIDED = 5,
 };
-
 enum DoorType
 {
     DOOR_TYPE_ROOM = 0,
     DOOR_TYPE_PASSAGE,
     MAX_DOOR_TYPES,
 };
-
 enum BoundaryType
 {
     BOUNDARY_NONE = 0,
@@ -67,21 +60,17 @@ enum BoundaryType
     BOUNDARY_MAX_Y = BOUNDARY_W,
     BOUNDARY_MIN_Y = BOUNDARY_E,
 };
-
 typedef std::map<BoundaryType, float> BossBoundaryMap;
-
 struct DoorData
 {
     uint32 entry, bossId;
     DoorType type;
     uint32 boundary;
 };
-
 struct MinionData
 {
     uint32 entry, bossId;
 };
-
 struct BossInfo
 {
     BossInfo() : state(TO_BE_DECIDED) {}
@@ -90,7 +79,6 @@ struct BossInfo
     MinionSet minion;
     BossBoundaryMap boundary;
 };
-
 struct DoorInfo
 {
     explicit DoorInfo(BossInfo *_bossInfo, DoorType _type, BoundaryType _boundary)
@@ -99,70 +87,50 @@ struct DoorInfo
     DoorType type;
     BoundaryType boundary;
 };
-
 struct MinionInfo
 {
     explicit MinionInfo(BossInfo *_bossInfo) : bossInfo(_bossInfo) {}
     BossInfo *bossInfo;
 };
-
 typedef std::multimap<uint32 /*entry*/, DoorInfo> DoorInfoMap;
 typedef std::map<uint32 /*entry*/, MinionInfo> MinionInfoMap;
-
 class TRINITY_DLL_SPEC InstanceData : public ZoneScript
 {
     public:
-
         explicit InstanceData(Map *map) : instance(map) {}
         virtual ~InstanceData() {}
-
         Map *instance;
-
         //On creation, NOT load.
         virtual void Initialize() {}
-
         //On load
         virtual void Load(const char * data) { LoadBossState(data); }
-
         //When save is needed, this function generates the data
         virtual std::string GetSaveData() { return GetBossSaveData(); }
-
         void SaveToDB();
-
         virtual void Update(uint32 diff) {}
-
         //Used by the map's CanEnter function.
         //This is to prevent players from entering during boss encounters.
         virtual bool IsEncounterInProgress() const;
-
         //Called when a player successfully enters the instance.
         virtual void OnPlayerEnter(Player *) {}
-
         //Handle open / close objects
         //use HandleGameObject(NULL,boolen,GO); in OnObjectCreate in instance scripts
         //use HandleGameObject(GUID,boolen,NULL); in any other script
         void HandleGameObject(uint64 GUID, bool open, GameObject *go = NULL);
-
         //change active state of doors or buttons
         void DoUseDoorOrButton(uint64 uiGuid, uint32 uiWithRestoreTime = 0, bool bUseAlternativeState = false);
-
         //Respawns a GO having negative spawntimesecs in gameobject-table
         void DoRespawnGameObject(uint64 uiGuid, uint32 uiTimeToDespawn = MINUTE);
-
         //sends world state update to all players in instance
         void DoUpdateWorldState(uint32 uiStateId, uint32 uiStateData);
-
         /* Not used anywhere yet, not sure if they're needed:
         // Send Notify to all players in instance
         void DoSendNotifyToInstance(const char *format,...);
-
         // Complete Achievement for all players in instance
         void DoCompleteAchievement(uint32 achievement);
         */
-
         // Remove Auras due to Spell on all players in instance
         void DoRemoveAurasDueToSpellOnPlayers(uint32 spell);
-
         virtual bool SetBossState(uint32 id, EncounterState state);
         EncounterState GetBossState(uint32 id) const { return id < bosses.size() ? bosses[id].state : TO_BE_DECIDED; }
         const BossBoundaryMap * GetBossBoundary(uint32 id) const { return id < bosses.size() ? &bosses[id].boundary : NULL; }
@@ -170,13 +138,10 @@ class TRINITY_DLL_SPEC InstanceData : public ZoneScript
         void SetBossNumber(uint32 number) { bosses.resize(number); }
         void LoadDoorData(const DoorData *data);
         void LoadMinionData(const MinionData *data);
-
         void AddDoor(GameObject *door, bool add);
         void AddMinion(Creature *minion, bool add);
-
         void UpdateDoorState(GameObject *door);
         void UpdateMinionState(Creature *minion, EncounterState state);
-
         std::string LoadBossState(const char * data);
         std::string GetBossSaveData();
     private:
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp
index 90714356fc1..ae66f2489ca 100644
--- a/src/game/InstanceSaveMgr.cpp
+++ b/src/game/InstanceSaveMgr.cpp
@@ -18,10 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Database/SQLStorage.h"
-
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
@@ -42,13 +40,10 @@
 #include "ProgressBar.h"
 #include "Policies/Singleton.h"
 #include "Policies/SingletonImp.h"
-
 INSTANTIATE_SINGLETON_1( InstanceSaveManager );
-
 InstanceSaveManager::InstanceSaveManager() : lock_instLists(false)
 {
 }
-
 InstanceSaveManager::~InstanceSaveManager()
 {
     // it is undefined whether this or objectmgr will be unloaded first
@@ -72,7 +67,6 @@ InstanceSaveManager::~InstanceSaveManager()
         delete save;
     }
 }
-
 /*
 - adding instance into manager
 - called from InstanceMap::Add, _LoadBoundInstances, LoadGroups
@@ -81,14 +75,12 @@ InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instance
 {
     InstanceSave *save = GetInstanceSave(instanceId);
     if(save) return save;
-
     const MapEntry* entry = sMapStore.LookupEntry(mapId);
     if(!entry || instanceId == 0)
     {
         sLog.outError("InstanceSaveManager::AddInstanceSave: mapid = %d, instanceid = %d!", mapId, instanceId);
         return NULL;
     }
-
     if(!resetTime)
     {
         // initialize reset time
@@ -102,22 +94,17 @@ InstanceSave* InstanceSaveManager::AddInstanceSave(uint32 mapId, uint32 instance
             ScheduleReset(true, resetTime, InstResetEvent(0, mapId, instanceId));
         }
     }
-
     sLog.outDebug("InstanceSaveManager::AddInstanceSave: mapid = %d, instanceid = %d", mapId, instanceId);
-
     save = new InstanceSave(mapId, instanceId, difficulty, resetTime, canReset);
     if(!load) save->SaveToDB();
-
     m_instanceSaveById[instanceId] = save;
     return save;
 }
-
 InstanceSave *InstanceSaveManager::GetInstanceSave(uint32 InstanceId)
 {
     InstanceSaveHashMap::iterator itr = m_instanceSaveById.find(InstanceId);
     return itr != m_instanceSaveById.end() ? itr->second : NULL;
 }
-
 void InstanceSaveManager::DeleteInstanceFromDB(uint32 instanceid)
 {
     CharacterDatabase.BeginTransaction();
@@ -127,7 +114,6 @@ void InstanceSaveManager::DeleteInstanceFromDB(uint32 instanceid)
     CharacterDatabase.CommitTransaction();
     // respawn times should be deleted only when the map gets unloaded
 }
-
 void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId)
 {
     InstanceSaveHashMap::iterator itr = m_instanceSaveById.find( InstanceId );
@@ -140,19 +126,16 @@ void InstanceSaveManager::RemoveInstanceSave(uint32 InstanceId)
         m_instanceSaveById.erase(itr);
     }
 }
-
 InstanceSave::InstanceSave(uint16 MapId, uint32 InstanceId, uint8 difficulty, time_t resetTime, bool canReset)
 : m_resetTime(resetTime), m_instanceid(InstanceId), m_mapid(MapId),
   m_difficulty(difficulty), m_canReset(canReset)
 {
 }
-
 InstanceSave::~InstanceSave()
 {
     // the players and groups must be unbound before deleting the save
     assert(m_playerList.empty() && m_groupList.empty());
 }
-
 /*
     Called from AddInstanceSave
 */
@@ -160,7 +143,6 @@ void InstanceSave::SaveToDB()
 {
     // save instance data too
     std::string data;
-
     Map *map = MapManager::Instance().FindMap(GetMapId(),m_instanceid);
     if(map)
     {
@@ -172,10 +154,8 @@ void InstanceSave::SaveToDB()
                 CharacterDatabase.escape_string(data);
         }
     }
-
     CharacterDatabase.PExecute("INSERT INTO instance VALUES ('%u', '%u', '"UI64FMTD"', '%u', '%s')", m_instanceid, GetMapId(), (uint64)GetResetTimeForDB(), GetDifficulty(), data.c_str());
 }
-
 time_t InstanceSave::GetResetTimeForDB()
 {
     // only save the reset time for normal instances
@@ -185,23 +165,19 @@ time_t InstanceSave::GetResetTimeForDB()
     else
         return GetResetTime();
 }
-
 // to cache or not to cache, that is the question
 InstanceTemplate const* InstanceSave::GetTemplate()
 {
     return objmgr.GetInstanceTemplate(m_mapid);
 }
-
 MapEntry const* InstanceSave::GetMapEntry()
 {
     return sMapStore.LookupEntry(m_mapid);
 }
-
 void InstanceSave::DeleteFromDB()
 {
     InstanceSaveManager::DeleteInstanceFromDB(GetInstanceId());
 }
-
 /* true if the instance save is still valid */
 bool InstanceSave::UnloadIfEmpty()
 {
@@ -214,18 +190,15 @@ bool InstanceSave::UnloadIfEmpty()
     else
         return true;
 }
-
 void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const char *table, const char *queryTail,...)
 {
     Tokens fieldTokens = StrSplit(fields, ", ");
     assert(fieldTokens.size() != 0);
-
     va_list ap;
     char szQueryTail [MAX_QUERY_LEN];
     va_start(ap, queryTail);
     int res = vsnprintf( szQueryTail, MAX_QUERY_LEN, queryTail, ap );
     va_end(ap);
-
     QueryResult *result = db.PQuery("SELECT %s FROM %s %s", fields, table, szQueryTail);
     if(result)
     {
@@ -244,28 +217,21 @@ void InstanceSaveManager::_DelHelper(DatabaseType &db, const char *fields, const
         delete result;
     }
 }
-
 void InstanceSaveManager::CleanupInstances()
 {
     uint64 now = (uint64)time(NULL);
-
     barGoLink bar(2);
     bar.step();
-
     // load reset times and clean expired instances
     sInstanceSaveManager.LoadResetTimes();
-
     // clean character/group - instance binds with invalid group/characters
     _DelHelper(CharacterDatabase, "character_instance.guid, instance", "character_instance", "LEFT JOIN characters ON character_instance.guid = characters.guid WHERE characters.guid IS NULL");
     _DelHelper(CharacterDatabase, "group_instance.leaderGuid, instance", "group_instance", "LEFT JOIN characters ON group_instance.leaderGuid = characters.guid LEFT JOIN groups ON group_instance.leaderGuid = groups.leaderGuid WHERE characters.guid IS NULL OR groups.leaderGuid IS NULL");
-
     // clean instances that do not have any players or groups bound to them
     _DelHelper(CharacterDatabase, "id, map, difficulty", "instance", "LEFT JOIN character_instance ON character_instance.instance = id LEFT JOIN group_instance ON group_instance.instance = id WHERE character_instance.instance IS NULL AND group_instance.instance IS NULL");
-
     // clean invalid instance references in other tables
     _DelHelper(CharacterDatabase, "character_instance.guid, instance", "character_instance", "LEFT JOIN instance ON character_instance.instance = instance.id WHERE instance.id IS NULL");
     _DelHelper(CharacterDatabase, "group_instance.leaderGuid, instance", "group_instance", "LEFT JOIN instance ON group_instance.instance = instance.id WHERE instance.id IS NULL");
-
     // creature_respawn and gameobject_respawn are in another database
     // first, obtain total instance set
     std::set<uint32> InstanceSet;
@@ -280,7 +246,6 @@ void InstanceSaveManager::CleanupInstances()
         while (result->NextRow());
         delete result;
     }
-
     // creature_respawn
     result = WorldDatabase.Query("SELECT DISTINCT(instance) FROM creature_respawn WHERE instance <> 0");
     if( result )
@@ -294,7 +259,6 @@ void InstanceSaveManager::CleanupInstances()
         while (result->NextRow());
         delete result;
     }
-
     // gameobject_respawn
     result = WorldDatabase.Query("SELECT DISTINCT(instance) FROM gameobject_respawn WHERE instance <> 0");
     if( result )
@@ -308,7 +272,6 @@ void InstanceSaveManager::CleanupInstances()
         while (result->NextRow());
         delete result;
     }
-
     // characters
     result = CharacterDatabase.Query("SELECT DISTINCT(instance_id) FROM characters WHERE instance_id <> 0");
     if( result )
@@ -322,7 +285,6 @@ void InstanceSaveManager::CleanupInstances()
         while (result->NextRow());
         delete result;
     }
-
     // corpse
     result = CharacterDatabase.Query("SELECT DISTINCT(instance) FROM corpse WHERE instance <> 0");
     if( result )
@@ -336,20 +298,16 @@ void InstanceSaveManager::CleanupInstances()
         while (result->NextRow());
         delete result;
     }
-
     bar.step();
     sLog.outString();
     sLog.outString( ">> Initialized %u instances", (uint32)InstanceSet.size());
 }
-
 void InstanceSaveManager::PackInstances()
 {
     // this routine renumbers player instance associations in such a way so they start from 1 and go up
     // TODO: this can be done a LOT more efficiently
-
     // obtain set of all associations
     std::set<uint32> InstanceSet;
-
     // all valid ids are in the instance table
     // any associations to ids not in this table are assumed to be
     // cleaned already in CleanupInstances
@@ -364,10 +322,8 @@ void InstanceSaveManager::PackInstances()
         while (result->NextRow());
         delete result;
     }
-
     barGoLink bar( InstanceSet.size() + 1);
     bar.step();
-
     uint32 InstanceNumber = 1;
     // we do assume std::set is sorted properly on integer value
     for (std::set<uint32>::iterator i = InstanceSet.begin(); i != InstanceSet.end(); ++i)
@@ -383,22 +339,17 @@ void InstanceSaveManager::PackInstances()
             CharacterDatabase.PExecute("UPDATE instance SET id = '%u' WHERE id = '%u'", InstanceNumber, *i);
             CharacterDatabase.PExecute("UPDATE group_instance SET instance = '%u' WHERE instance = '%u'", InstanceNumber, *i);
         }
-
         ++InstanceNumber;
         bar.step();
     }
-
     sLog.outString( ">> Instance numbers remapped, next instance id is %u", InstanceNumber );
     sLog.outString();
 }
-
 void InstanceSaveManager::LoadResetTimes()
 {
     time_t now = time(NULL);
     time_t today = (now / DAY) * DAY;
-
     // NOTE: Use DirectPExecute for tables that will be queried later
-
     // get the current reset times for normal instances (these may need to be updated)
     // these are only kept in memory for InstanceSaves that are loaded later
     // resettime = 0 in the DB for raid/heroic instances so those are skipped
@@ -418,7 +369,6 @@ void InstanceSaveManager::LoadResetTimes()
         }
         while (result->NextRow());
         delete result;
-
         // update reset time for normal instances with the max creature respawn time + X hours
         result = WorldDatabase.Query("SELECT MAX(respawntime), instance FROM creature_respawn WHERE instance > 0 GROUP BY instance");
         if( result )
@@ -438,13 +388,11 @@ void InstanceSaveManager::LoadResetTimes()
             while (result->NextRow());
             delete result;
         }
-
         // schedule the reset times
         for(ResetTimeMapType::iterator itr = InstResetTime.begin(); itr != InstResetTime.end(); ++itr)
             if(itr->second.second > now)
                 ScheduleReset(true, itr->second.second, InstResetEvent(0, itr->second.first, itr->first));
     }
-
     // load the global respawn times for raid/heroic instances
     uint32 diff = sWorld.getConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR;
     m_resetTimeByMapId.resize(sMapStore.GetNumRows()+1);
@@ -461,22 +409,18 @@ void InstanceSaveManager::LoadResetTimes()
                 CharacterDatabase.DirectPExecute("DELETE FROM instance_reset WHERE mapid = '%u'", mapid);
                 continue;
             }
-
             // update the reset time if the hour in the configs changes
             uint64 oldresettime = fields[1].GetUInt64();
             uint64 newresettime = (oldresettime / DAY) * DAY + diff;
             if(oldresettime != newresettime)
                 CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u'", newresettime, mapid);
-
             m_resetTimeByMapId[mapid] = newresettime;
         } while(result->NextRow());
         delete result;
     }
-
     // clean expired instances, references to them will be deleted in CleanupInstances
     // must be done before calculating new reset times
     _DelHelper(CharacterDatabase, "id, map, difficulty", "instance", "LEFT JOIN instance_reset ON mapid = map WHERE (instance.resettime < '"UI64FMTD"' AND instance.resettime > '0') OR (NOT instance_reset.resettime IS NULL AND instance_reset.resettime < '"UI64FMTD"')",  (uint64)now, (uint64)now);
-
     // calculate new global reset times for expired instances and those that have never been reset yet
     // add the global reset times to the priority queue
     for(uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++)
@@ -487,7 +431,6 @@ void InstanceSaveManager::LoadResetTimes()
         const MapEntry* entry = sMapStore.LookupEntry(temp->map);
         if(!entry || !entry->HasResetTime())
             continue;
-
         uint32 period = temp->reset_delay * DAY;
         assert(period != 0);
         time_t t = m_resetTimeByMapId[temp->map];
@@ -497,7 +440,6 @@ void InstanceSaveManager::LoadResetTimes()
             t = today + period + diff;
             CharacterDatabase.DirectPExecute("INSERT INTO instance_reset VALUES ('%u','"UI64FMTD"')", i, (uint64)t);
         }
-
         if(t < now)
         {
             // assume that expired instances have already been cleaned
@@ -506,9 +448,7 @@ void InstanceSaveManager::LoadResetTimes()
             t += ((today - t) / period + 1) * period + diff;
             CharacterDatabase.DirectPExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%u'", (uint64)t, i);
         }
-
         m_resetTimeByMapId[temp->map] = t;
-
         // schedule the global reset/warning
         uint8 type = 1;
         static int tim[4] = {3600, 900, 300, 60};
@@ -517,7 +457,6 @@ void InstanceSaveManager::LoadResetTimes()
         ScheduleReset(true, t - tim[type-1], InstResetEvent(type, i));
     }
 }
-
 void InstanceSaveManager::ScheduleReset(bool add, time_t time, InstResetEvent event)
 {
     if(add) m_resetTimeQueue.insert(std::pair<time_t, InstResetEvent>(time, event));
@@ -539,7 +478,6 @@ void InstanceSaveManager::ScheduleReset(bool add, time_t time, InstResetEvent ev
         }
     }
 }
-
 void InstanceSaveManager::Update()
 {
     time_t now = time(NULL), t;
@@ -568,7 +506,6 @@ void InstanceSaveManager::Update()
         }
     }
 }
-
 void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr)
 {
     // unbind all players bound to the instance
@@ -590,23 +527,19 @@ void InstanceSaveManager::_ResetSave(InstanceSaveHashMap::iterator &itr)
     m_instanceSaveById.erase(itr++);
     lock_instLists = false;
 }
-
 void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId)
 {
     sLog.outDebug("InstanceSaveMgr::_ResetInstance %u, %u", mapid, instanceId);
     Map *map = (MapInstanced*)MapManager::Instance().CreateBaseMap(mapid);
     if(!map->Instanceable())
         return;
-
     InstanceSaveHashMap::iterator itr = m_instanceSaveById.find(instanceId);
     if(itr != m_instanceSaveById.end()) _ResetSave(itr);
     DeleteInstanceFromDB(instanceId);                       // even if save not loaded
-
     Map* iMap = ((MapInstanced*)map)->FindMap(instanceId);
     if(iMap && iMap->IsDungeon()) ((InstanceMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY);
     else objmgr.DeleteRespawnTimeForInstance(instanceId);   // even if map is not loaded
 }
-
 void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLeft)
 {
     // global reset for all instances of the given map
@@ -615,7 +548,6 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe
     if(!map->Instanceable())
         return;
     uint64 now = (uint64)time(NULL);
-
     if(!warn)
     {
         // this is called one minute before the reset time
@@ -625,7 +557,6 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe
             sLog.outError("InstanceSaveManager::ResetOrWarnAll: no instance template or reset delay for map %d", mapid);
             return;
         }
-
         // remove all binds to instances of the given map
         for(InstanceSaveHashMap::iterator itr = m_instanceSaveById.begin(); itr != m_instanceSaveById.end();)
         {
@@ -634,26 +565,22 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe
             else
                 ++itr;
         }
-
         // delete them from the DB, even if not loaded
         CharacterDatabase.BeginTransaction();
         CharacterDatabase.PExecute("DELETE FROM character_instance USING character_instance LEFT JOIN instance ON character_instance.instance = id WHERE map = '%u'", mapid);
         CharacterDatabase.PExecute("DELETE FROM group_instance USING group_instance LEFT JOIN instance ON group_instance.instance = id WHERE map = '%u'", mapid);
         CharacterDatabase.PExecute("DELETE FROM instance WHERE map = '%u'", mapid);
         CharacterDatabase.CommitTransaction();
-
         // calculate the next reset time
         uint32 diff = sWorld.getConfig(CONFIG_INSTANCE_RESET_TIME_HOUR) * HOUR;
         uint32 period = temp->reset_delay * DAY;
         uint64 next_reset = ((now + timeLeft + MINUTE) / DAY * DAY) + period + diff;
         // update it in the DB
         CharacterDatabase.PExecute("UPDATE instance_reset SET resettime = '"UI64FMTD"' WHERE mapid = '%d'", next_reset, mapid);
-
         // schedule next reset.
         m_resetTimeByMapId[mapid] = (time_t) next_reset;
         ScheduleReset(true, (time_t) (next_reset-3600), InstResetEvent(1, mapid));
     }
-
     MapInstanced::InstancedMaps &instMaps = ((MapInstanced*)map)->GetInstancedMaps();
     MapInstanced::InstancedMaps::iterator mitr;
     for(mitr = instMaps.begin(); mitr != instMaps.end(); ++mitr)
@@ -663,10 +590,8 @@ void InstanceSaveManager::_ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeLe
         if(warn) ((InstanceMap*)map2)->SendResetWarnings(timeLeft);
         else ((InstanceMap*)map2)->Reset(INSTANCE_RESET_GLOBAL);
     }
-
     // TODO: delete creature/gameobject respawn times even if the maps are not loaded
 }
-
 uint32 InstanceSaveManager::GetNumBoundPlayersTotal()
 {
     uint32 ret = 0;
@@ -674,7 +599,6 @@ uint32 InstanceSaveManager::GetNumBoundPlayersTotal()
         ret += itr->second->GetPlayerCount();
     return ret;
 }
-
 uint32 InstanceSaveManager::GetNumBoundGroupsTotal()
 {
     uint32 ret = 0;
diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h
index 29972210f3d..39e12f1e8b3 100644
--- a/src/game/InstanceSaveMgr.h
+++ b/src/game/InstanceSaveMgr.h
@@ -18,10 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __InstanceSaveMgr_H
 #define __InstanceSaveMgr_H
-
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
@@ -29,12 +27,10 @@
 #include <map>
 #include "Utilities/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
-
 struct InstanceTemplate;
 struct MapEntry;
 class Player;
 class Group;
-
 /*
     Holds the information necessary for creating a new map for an existing instance
     Is referenced in three cases:
@@ -51,34 +47,27 @@ class InstanceSave
            - the first time a player bound to InstanceId logs in
            - when a group bound to the instance is loaded */
         InstanceSave(uint16 MapId, uint32 InstanceId, uint8 difficulty, time_t resetTime, bool canReset);
-
         /* Unloaded when m_playerList and m_groupList become empty
            or when the instance is reset */
         ~InstanceSave();
-
         uint8 GetPlayerCount() { return m_playerList.size(); }
         uint8 GetGroupCount() { return m_groupList.size(); }
-
         /* A map corresponding to the InstanceId/MapId does not always exist.
         InstanceSave objects may be created on player logon but the maps are
         created and loaded only when a player actually enters the instance. */
         uint32 GetInstanceId() { return m_instanceid; }
         uint32 GetMapId() { return m_mapid; }
-
         /* Saved when the instance is generated for the first time */
         void SaveToDB();
         /* When the instance is being reset (permanently deleted) */
         void DeleteFromDB();
-
         /* for normal instances this corresponds to max(creature respawn time) + X hours
            for raid/heroic instances this caches the global respawn time for the map */
         time_t GetResetTime() { return m_resetTime; }
         void SetResetTime(time_t resetTime) { m_resetTime = resetTime; }
         time_t GetResetTimeForDB();
-
         InstanceTemplate const* GetTemplate();
         MapEntry const* GetMapEntry();
-
         /* online players bound to the instance (perm/solo)
            does not include the members of the group unless they have permanent saves */
         void AddPlayer(Player *player) { m_playerList.push_back(player); }
@@ -86,17 +75,14 @@ class InstanceSave
         /* all groups bound to the instance */
         void AddGroup(Group *group) { m_groupList.push_back(group); }
         bool RemoveGroup(Group *group) { m_groupList.remove(group); return UnloadIfEmpty(); }
-
         /* instances cannot be reset (except at the global reset time)
            if there are players permanently bound to it
            this is cached for the case when those players are offline */
         bool CanReset() { return m_canReset; }
         void SetCanReset(bool canReset) { m_canReset = canReset; }
-
         /* currently it is possible to omit this information from this structure
            but that would depend on a lot of things that can easily change in future */
         uint8 GetDifficulty() { return m_difficulty; }
-
         typedef std::list<Player*> PlayerListType;
         typedef std::list<Group*> GroupListType;
     private:
@@ -112,18 +98,15 @@ class InstanceSave
         uint8 m_difficulty;
         bool m_canReset;
 };
-
 class MANGOS_DLL_DECL InstanceSaveManager : public MaNGOS::Singleton<InstanceSaveManager, MaNGOS::ClassLevelLockable<InstanceSaveManager, ACE_Thread_Mutex> >
 {
     friend class InstanceSave;
     public:
         InstanceSaveManager();
         ~InstanceSaveManager();
-
         typedef std::map<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveMap;
         typedef UNORDERED_MAP<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap;
         typedef std::map<uint32 /*mapId*/, InstanceSaveMap> InstanceSaveMapMap;
-
         /* resetTime is a global propery of each (raid/heroic) map
            all instances of that map reset at the same time */
         struct InstResetEvent
@@ -136,27 +119,20 @@ class MANGOS_DLL_DECL InstanceSaveManager : public MaNGOS::Singleton<InstanceSav
         };
         typedef std::multimap<time_t /*resetTime*/, InstResetEvent> ResetTimeQueue;
         typedef std::vector<time_t /*resetTime*/> ResetTimeVector;
-
         void CleanupInstances();
         void PackInstances();
-
         void LoadResetTimes();
         time_t GetResetTimeFor(uint32 mapid) { return m_resetTimeByMapId[mapid]; }
         void ScheduleReset(bool add, time_t time, InstResetEvent event);
-
         void Update();
-
         InstanceSave* AddInstanceSave(uint32 mapId, uint32 instanceId, uint8 difficulty, time_t resetTime, bool canReset, bool load = false);
         void RemoveInstanceSave(uint32 InstanceId);
         static void DeleteInstanceFromDB(uint32 instanceid);
-
         InstanceSave *GetInstanceSave(uint32 InstanceId);
-
         /* statistics */
         uint32 GetNumInstanceSaves() { return m_instanceSaveById.size(); }
         uint32 GetNumBoundPlayersTotal();
         uint32 GetNumBoundGroupsTotal();
-
     private:
         void _ResetOrWarnAll(uint32 mapid, bool warn, uint32 timeleft);
         void _ResetInstance(uint32 mapid, uint32 instanceId);
@@ -170,7 +146,6 @@ class MANGOS_DLL_DECL InstanceSaveManager : public MaNGOS::Singleton<InstanceSav
         ResetTimeVector m_resetTimeByMapId;
         ResetTimeQueue m_resetTimeQueue;
 };
-
 #define sInstanceSaveManager Trinity::Singleton<InstanceSaveManager>::Instance()
 #endif
 
diff --git a/src/game/Item.cpp b/src/game/Item.cpp
index 2d39b016623..ed91c888451 100644
--- a/src/game/Item.cpp
+++ b/src/game/Item.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Item.h"
 #include "ObjectMgr.h"
@@ -26,25 +25,19 @@
 #include "ItemEnchantmentMgr.h"
 #include "SpellMgr.h"
 #include "ScriptCalls.h"
-
 void AddItemsSetItem(Player*player,Item *item)
 {
     ItemPrototype const *proto = item->GetProto();
     uint32 setid = proto->ItemSet;
-
     ItemSetEntry const *set = sItemSetStore.LookupEntry(setid);
-
     if(!set)
     {
         sLog.outErrorDb("Item set %u for item (id %u) not found, mods not applied.",setid,proto->ItemId);
         return;
     }
-
     if( set->required_skill_id && player->GetSkillValue(set->required_skill_id) < set->required_skill_value )
         return;
-
     ItemSetEffect *eff = NULL;
-
     for(size_t x = 0; x < player->ItemSetEff.size(); ++x)
     {
         if(player->ItemSetEff[x] && player->ItemSetEff[x]->setid == setid)
@@ -53,26 +46,21 @@ void AddItemsSetItem(Player*player,Item *item)
             break;
         }
     }
-
     if(!eff)
     {
         eff = new ItemSetEffect;
         memset(eff,0,sizeof(ItemSetEffect));
         eff->setid = setid;
-
         size_t x = 0;
         for(; x < player->ItemSetEff.size(); x++)
             if(!player->ItemSetEff[x])
                 break;
-
         if(x < player->ItemSetEff.size())
             player->ItemSetEff[x]=eff;
         else
             player->ItemSetEff.push_back(eff);
     }
-
     ++eff->item_count;
-
     for(uint32 x=0;x<8;x++)
     {
         if(!set->spells [x])
@@ -80,15 +68,12 @@ void AddItemsSetItem(Player*player,Item *item)
         //not enough for  spell
         if(set->items_to_triggerspell[x] > eff->item_count)
             continue;
-
         uint32 z=0;
         for(;z<8;z++)
             if(eff->spells[z] && eff->spells[z]->Id==set->spells[x])
                 break;
-
         if(z < 8)
             continue;
-
         //new spell
         for(uint32 y=0;y<8;y++)
         {
@@ -100,7 +85,6 @@ void AddItemsSetItem(Player*player,Item *item)
                     sLog.outError("WORLD: unknown spell id %u in items set %u effects", set->spells[x],setid);
                     break;
                 }
-
                 // spell casted only if fit form requirement, in other case will casted at form change
                 player->ApplyEquipSpell(spellInfo,NULL,true);
                 eff->spells[y] = spellInfo;
@@ -109,19 +93,15 @@ void AddItemsSetItem(Player*player,Item *item)
         }
     }
 }
-
 void RemoveItemsSetItem(Player*player,ItemPrototype const *proto)
 {
     uint32 setid = proto->ItemSet;
-
     ItemSetEntry const *set = sItemSetStore.LookupEntry(setid);
-
     if(!set)
     {
         sLog.outErrorDb("Item set #%u for item #%u not found, mods not removed.",setid,proto->ItemId);
         return;
     }
-
     ItemSetEffect *eff = NULL;
     size_t setindex = 0;
     for(;setindex < player->ItemSetEff.size(); setindex++)
@@ -132,22 +112,17 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto)
             break;
         }
     }
-
     // can be in case now enough skill requirement for set appling but set has been appliend when skill requirement not enough
     if(!eff)
         return;
-
     --eff->item_count;
-
     for(uint32 x=0;x<8;x++)
     {
         if(!set->spells[x])
             continue;
-
         // enough for spell
         if(set->items_to_triggerspell[x] <= eff->item_count)
             continue;
-
         for(uint32 z=0;z<8;z++)
         {
             if(eff->spells[z] && eff->spells[z]->Id==set->spells[x])
@@ -159,7 +134,6 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto)
             }
         }
     }
-
     if(!eff->item_count)                                    //all items of a set were removed
     {
         assert(eff == player->ItemSetEff[setindex]);
@@ -167,12 +141,10 @@ void RemoveItemsSetItem(Player*player,ItemPrototype const *proto)
         player->ItemSetEff[setindex] = NULL;
     }
 }
-
 bool ItemCanGoIntoBag(ItemPrototype const *pProto, ItemPrototype const *pBagProto)
 {
     if(!pProto || !pBagProto)
         return false;
-
     switch(pBagProto->Class)
     {
         case ITEM_CLASS_CONTAINER:
@@ -232,14 +204,11 @@ bool ItemCanGoIntoBag(ItemPrototype const *pProto, ItemPrototype const *pBagProt
     }
     return false;
 }
-
 Item::Item( )
 {
     m_objectType |= TYPEMASK_ITEM;
     m_objectTypeId = TYPEID_ITEM;
-
     m_updateFlag = UPDATEFLAG_HIGHGUID;
-
     m_valuesCount = ITEM_END;
     m_slot = 0;
     uState = ITEM_NEW;
@@ -248,52 +217,39 @@ Item::Item( )
     m_lootGenerated = false;
     mb_in_trade = false;
 }
-
 bool Item::Create( uint32 guidlow, uint32 itemid, Player const* owner)
 {
     Object::_Create( guidlow, 0, HIGHGUID_ITEM );
-
     SetEntry(itemid);
     SetFloatValue(OBJECT_FIELD_SCALE_X, 1.0f);
-
     SetUInt64Value(ITEM_FIELD_OWNER, owner ? owner->GetGUID() : 0);
     SetUInt64Value(ITEM_FIELD_CONTAINED, owner ? owner->GetGUID() : 0);
-
     ItemPrototype const *itemProto = objmgr.GetItemPrototype(itemid);
     if(!itemProto)
         return false;
-
     SetUInt32Value(ITEM_FIELD_STACK_COUNT, 1);
     SetUInt32Value(ITEM_FIELD_MAXDURABILITY, itemProto->MaxDurability);
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
-
     for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
         SetSpellCharges(i,itemProto->Spells[i].SpellCharges);
-
     SetUInt32Value(ITEM_FIELD_FLAGS, itemProto->Flags);
     SetUInt32Value(ITEM_FIELD_DURATION, abs(itemProto->Duration));
-
     return true;
 }
-
 void Item::UpdateDuration(Player* owner, uint32 diff)
 {
     if (!GetUInt32Value(ITEM_FIELD_DURATION))
         return;
-
     sLog.outDebug("Item::UpdateDuration Item (Entry: %u Duration %u Diff %u)",GetEntry(),GetUInt32Value(ITEM_FIELD_DURATION),diff);
-
     if (GetUInt32Value(ITEM_FIELD_DURATION)<=diff)
     {
         Script->ItemExpire(owner, GetProto());
-        owner->DestroyItem(GetBagSlot(), GetSlot(), true);           
+        owner->DestroyItem(GetBagSlot(), GetSlot(), true);
         return;
     }
-
     SetUInt32Value(ITEM_FIELD_DURATION, GetUInt32Value(ITEM_FIELD_DURATION) - diff);
     SetState(ITEM_CHANGED, owner);                          // save new time in database
 }
-
 void Item::SaveToDB()
 {
     uint32 guid = GetGUIDLow();
@@ -316,9 +272,7 @@ void Item::SaveToDB()
             for(uint16 i = 0; i < m_valuesCount; ++i )
                 ss << GetUInt32Value(i) << " ";
             ss << "', owner_guid = '" << GUID_LOPART(GetOwnerGUID()) << "' WHERE guid = '" << guid << "'";
-
             CharacterDatabase.Execute( ss.str().c_str() );
-
             if(HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))
                 CharacterDatabase.PExecute("UPDATE character_gifts SET guid = '%u' WHERE item_guid = '%u'", GUID_LOPART(GetOwnerGUID()),GetGUIDLow());
         } break;
@@ -337,37 +291,30 @@ void Item::SaveToDB()
     }
     SetState(ITEM_UNCHANGED);
 }
-
 bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
 {
     // create item before any checks for store correct guid
     // and allow use "FSetState(ITEM_REMOVED); SaveToDB();" for deleting item from DB
     Object::_Create(guid, 0, HIGHGUID_ITEM);
-
     bool delete_result = false;
     if(!result)
     {
         result = CharacterDatabase.PQuery("SELECT data FROM item_instance WHERE guid = '%u'", guid);
         delete_result = true;
     }
-
     if (!result)
     {
         sLog.outError("Item (GUID: %u owner: %u) not found in table `item_instance`, can't load. ",guid,GUID_LOPART(owner_guid));
         return false;
     }
-
     Field *fields = result->Fetch();
-
     if(!LoadValues(fields[0].GetString()))
     {
         sLog.outError("Item #%d have broken data in `data` field. Can't be loaded.",guid);
         if (delete_result) delete result;
         return false;
     }
-
     bool need_save = false;                                 // need explicit save data at load fixes
-
     // overwrite possible wrong/corrupted guid
     uint64 new_item_guid = MAKE_NEW_GUID(guid,0, HIGHGUID_ITEM);
     if(GetUInt64Value(OBJECT_FIELD_GUID) != new_item_guid)
@@ -375,51 +322,42 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
         SetUInt64Value(OBJECT_FIELD_GUID, MAKE_NEW_GUID(guid,0, HIGHGUID_ITEM));
         need_save = true;
     }
-
     if (delete_result) delete result;
-
     ItemPrototype const* proto = GetProto();
     if(!proto)
         return false;
-
     // update max durability (and durability) if need
     if(proto->MaxDurability!= GetUInt32Value(ITEM_FIELD_MAXDURABILITY))
     {
         SetUInt32Value(ITEM_FIELD_MAXDURABILITY,proto->MaxDurability);
         if(GetUInt32Value(ITEM_FIELD_DURABILITY) > proto->MaxDurability)
             SetUInt32Value(ITEM_FIELD_DURABILITY,proto->MaxDurability);
-
         need_save = true;
     }
-
     // recalculate suffix factor
     if(GetItemRandomPropertyId() < 0)
     {
         if(UpdateItemSuffixFactor())
             need_save = true;
     }
-
     // Remove bind flag for items vs NO_BIND set
     if (IsSoulBound() && proto->Bonding == NO_BIND)
     {
         ApplyModFlag(ITEM_FIELD_FLAGS,ITEM_FLAGS_BINDED, false);
         need_save = true;
     }
-
     // update duration if need, and remove if not need
     if((proto->Duration==0) != (GetUInt32Value(ITEM_FIELD_DURATION)==0))
     {
         SetUInt32Value(ITEM_FIELD_DURATION,abs(proto->Duration));
         need_save = true;
     }
-
     // set correct owner
     if(owner_guid != 0 && GetOwnerGUID() != owner_guid)
     {
         SetOwnerGUID(owner_guid);
         need_save = true;
     }
-
     if(need_save)                                           // normal item changed state set not work at loading
     {
         std::ostringstream ss;
@@ -427,33 +365,26 @@ bool Item::LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result)
         for(uint16 i = 0; i < m_valuesCount; ++i )
             ss << GetUInt32Value(i) << " ";
         ss << "', owner_guid = '" << GUID_LOPART(GetOwnerGUID()) << "' WHERE guid = '" << guid << "'";
-
         CharacterDatabase.Execute( ss.str().c_str() );
     }
-
     return true;
 }
-
 void Item::DeleteFromDB()
 {
     CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'",GetGUIDLow());
 }
-
 void Item::DeleteFromInventoryDB()
 {
     CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'",GetGUIDLow());
 }
-
 ItemPrototype const *Item::GetProto() const
 {
     return objmgr.GetItemPrototype(GetEntry());
 }
-
 Player* Item::GetOwner()const
 {
     return objmgr.GetPlayer(GetOwnerGUID());
 }
-
 uint32 Item::GetSkill()
 {
     const static uint32 item_weapon_skills[MAX_ITEM_SUBCLASS_WEAPON] =
@@ -464,14 +395,11 @@ uint32 Item::GetSkill()
         SKILL_DAGGERS,  SKILL_THROWN,   SKILL_ASSASSINATION, SKILL_CROSSBOWS, SKILL_WANDS,
         SKILL_FISHING
     };
-
     const static uint32 item_armor_skills[MAX_ITEM_SUBCLASS_ARMOR] =
     {
         0,SKILL_CLOTH,SKILL_LEATHER,SKILL_MAIL,SKILL_PLATE_MAIL,0,SKILL_SHIELD,0,0,0,0
     };
-
     ItemPrototype const* proto = GetProto();
-
     switch (proto->Class)
     {
         case ITEM_CLASS_WEAPON:
@@ -479,22 +407,18 @@ uint32 Item::GetSkill()
                 return 0;
             else
                 return item_weapon_skills[proto->SubClass];
-
         case ITEM_CLASS_ARMOR:
             if( proto->SubClass >= MAX_ITEM_SUBCLASS_ARMOR )
                 return 0;
             else
                 return item_armor_skills[proto->SubClass];
-
         default:
             return 0;
     }
 }
-
 uint32 Item::GetSpell()
 {
     ItemPrototype const* proto = GetProto();
-
     switch (proto->Class)
     {
         case ITEM_CLASS_WEAPON:
@@ -530,25 +454,20 @@ uint32 Item::GetSpell()
     }
     return 0;
 }
-
 int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
 {
     ItemPrototype const *itemProto = sItemStorage.LookupEntry<ItemPrototype>(item_id);
-
     if(!itemProto)
         return 0;
-
     // item must have one from this field values not null if it can have random enchantments
     if((!itemProto->RandomProperty) && (!itemProto->RandomSuffix))
         return 0;
-
     // item can have not null only one from field values
     if((itemProto->RandomProperty) && (itemProto->RandomSuffix))
     {
         sLog.outErrorDb("Item template %u have RandomProperty==%u and RandomSuffix==%u, but must have one from field =0",itemProto->ItemId,itemProto->RandomProperty,itemProto->RandomSuffix);
         return 0;
     }
-
     // RandomProperty case
     if(itemProto->RandomProperty)
     {
@@ -559,7 +478,6 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
             sLog.outErrorDb("Enchantment id #%u used but it doesn't have records in 'ItemRandomProperties.dbc'",randomPropId);
             return 0;
         }
-
         return random_id->ID;
     }
     // RandomSuffix case
@@ -572,16 +490,13 @@ int32 Item::GenerateItemRandomPropertyId(uint32 item_id)
             sLog.outErrorDb("Enchantment id #%u used but it doesn't have records in sItemRandomSuffixStore.",randomPropId);
             return 0;
         }
-
         return -int32(random_id->ID);
     }
 }
-
 void Item::SetItemRandomProperties(int32 randomPropId)
 {
     if(!randomPropId)
         return;
-
     if(randomPropId > 0)
     {
         ItemRandomPropertiesEntry const *item_rand = sItemRandomPropertiesStore.LookupEntry(randomPropId);
@@ -608,13 +523,11 @@ void Item::SetItemRandomProperties(int32 randomPropId)
                 UpdateItemSuffixFactor();
                 SetState(ITEM_CHANGED);
             }
-
             for(uint32 i = PROP_ENCHANTMENT_SLOT_0; i < PROP_ENCHANTMENT_SLOT_0 + 3; ++i)
                 SetEnchantment(EnchantmentSlot(i),item_rand->enchant_id[i - PROP_ENCHANTMENT_SLOT_0],0,0);
         }
     }
 }
-
 bool Item::UpdateItemSuffixFactor()
 {
     uint32 suffixFactor = GenerateEnchSuffixFactor(GetEntry());
@@ -623,7 +536,6 @@ bool Item::UpdateItemSuffixFactor()
     SetUInt32Value(ITEM_FIELD_PROPERTY_SEED,suffixFactor);
     return true;
 }
-
 void Item::SetState(ItemUpdateState state, Player *forplayer)
 {
     if (uState == ITEM_NEW && state == ITEM_REMOVED)
@@ -633,7 +545,6 @@ void Item::SetState(ItemUpdateState state, Player *forplayer)
         delete this;
         return;
     }
-
     if (state != ITEM_UNCHANGED)
     {
         // new items must stay in new state until saved
@@ -648,11 +559,9 @@ void Item::SetState(ItemUpdateState state, Player *forplayer)
         uState = ITEM_UNCHANGED;
     }
 }
-
 void Item::AddToUpdateQueueOf(Player *player)
 {
     if (IsInUpdateQueue()) return;
-
     if (!player)
     {
         player = GetOwner();
@@ -662,23 +571,18 @@ void Item::AddToUpdateQueueOf(Player *player)
             return;
         }
     }
-
     if (player->GetGUID() != GetOwnerGUID())
     {
         sLog.outDebug("Item::AddToUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow());
         return;
     }
-
     if (player->m_itemUpdateQueueBlocked) return;
-
     player->m_itemUpdateQueue.push_back(this);
     uQueuePos = player->m_itemUpdateQueue.size()-1;
 }
-
 void Item::RemoveFromUpdateQueueOf(Player *player)
 {
     if (!IsInUpdateQueue()) return;
-
     if (!player)
     {
         player = GetOwner();
@@ -688,37 +592,29 @@ void Item::RemoveFromUpdateQueueOf(Player *player)
             return;
         }
     }
-
     if (player->GetGUID() != GetOwnerGUID())
     {
         sLog.outDebug("Item::RemoveFromUpdateQueueOf - Owner's guid (%u) and player's guid (%u) don't match!", GUID_LOPART(GetOwnerGUID()), player->GetGUIDLow());
         return;
     }
-
     if (player->m_itemUpdateQueueBlocked) return;
-
     player->m_itemUpdateQueue[uQueuePos] = NULL;
     uQueuePos = -1;
 }
-
 uint8 Item::GetBagSlot() const
 {
     return m_container ? m_container->GetSlot() : uint8(INVENTORY_SLOT_BAG_0);
 }
-
 bool Item::IsEquipped() const
 {
     return !IsInBag() && m_slot < EQUIPMENT_SLOT_END;
 }
-
 bool Item::CanBeTraded(bool mail) const
 {
     if ((!mail || !IsBoundAccountWide()) && IsSoulBound())
         return false;
-
     if (IsBag() && (Player::IsBagPos(GetPos()) || !((Bag const*)this)->IsEmpty()) )
         return false;
-
     if (Player* owner = GetOwner())
     {
         if (owner->CanUnequipItem(GetPos(),false) !=  EQUIP_ERR_OK )
@@ -726,13 +622,10 @@ bool Item::CanBeTraded(bool mail) const
         if (owner->GetLootGUID()==GetGUID())
             return false;
     }
-
     if (IsBoundByEnchant())
         return false;
-
     return true;
 }
-
 bool Item::IsBoundByEnchant() const
 {
     // Check all enchants for soulbound
@@ -741,21 +634,17 @@ bool Item::IsBoundByEnchant() const
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if(!enchant_id)
             continue;
-
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!enchantEntry)
             continue;
-
         if(enchantEntry->slot & ENCHANTMENT_CAN_SOULBOUND)
             return true;
     }
     return false;
 }
-
 bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
 {
     ItemPrototype const* proto = GetProto();
-
     if (spellInfo->EquippedItemClass != -1)                 // -1 == any item class
     {
         // Special case - accept vellum for armor/weapon requirements
@@ -763,17 +652,14 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
             ||( spellInfo->EquippedItemClass==ITEM_CLASS_WEAPON && proto->IsWeaponVellum()))
             if (spellmgr.IsSkillTypeSpell(spellInfo->Id, SKILL_ENCHANTING)) // only for enchanting spells
                 return true;
-
         if(spellInfo->EquippedItemClass != int32(proto->Class))
             return false;                                   //  wrong item class
-
         if(spellInfo->EquippedItemSubClassMask != 0)        // 0 == any subclass
         {
             if((spellInfo->EquippedItemSubClassMask & (1 << proto->SubClass)) == 0)
                 return false;                               // subclass not present in mask
         }
     }
-
     if(spellInfo->EquippedItemInventoryTypeMask != 0)       // 0 == any inventory type
     {
         // Special case - accept weapon type for main and offhand requirements
@@ -784,90 +670,71 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
         else if ((spellInfo->EquippedItemInventoryTypeMask & (1 << proto->InventoryType)) == 0)
             return false;                                   // inventory type not present in mask
     }
-
     return true;
 }
-
 bool Item::IsTargetValidForItemUse(Unit* pUnitTarget)
 {
     ItemRequiredTargetMapBounds bounds = objmgr.GetItemRequiredTargetMapBounds(GetProto()->ItemId);
-
     if (bounds.first == bounds.second)
         return true;
-
     if (!pUnitTarget)
         return false;
-
     for(ItemRequiredTargetMap::const_iterator itr = bounds.first; itr != bounds.second; ++itr)
         if(itr->second.IsFitToRequirements(pUnitTarget))
             return true;
-
     return false;
 }
-
 void Item::SetEnchantment(EnchantmentSlot slot, uint32 id, uint32 duration, uint32 charges)
 {
     // Better lost small time at check in comparison lost time at item save to DB.
     if((GetEnchantmentId(slot) == id) && (GetEnchantmentDuration(slot) == duration) && (GetEnchantmentCharges(slot) == charges))
         return;
-
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_ID_OFFSET,id);
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET,duration);
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET,charges);
     SetState(ITEM_CHANGED);
 }
-
 void Item::SetEnchantmentDuration(EnchantmentSlot slot, uint32 duration)
 {
     if(GetEnchantmentDuration(slot) == duration)
         return;
-
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET,duration);
     SetState(ITEM_CHANGED);
 }
-
 void Item::SetEnchantmentCharges(EnchantmentSlot slot, uint32 charges)
 {
     if(GetEnchantmentCharges(slot) == charges)
         return;
-
     SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET,charges);
     SetState(ITEM_CHANGED);
 }
-
 void Item::ClearEnchantment(EnchantmentSlot slot)
 {
     if(!GetEnchantmentId(slot))
         return;
-
     for(uint8 x = 0; x < 3; ++x)
         SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + x, 0);
     SetState(ITEM_CHANGED);
 }
-
 bool Item::GemsFitSockets() const
 {
     bool fits = true;
     for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot)
     {
         uint8 SocketColor = GetProto()->Socket[enchant_slot-SOCK_ENCHANTMENT_SLOT].Color;
-
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if(!enchant_id)
         {
             if(SocketColor) fits &= false;
             continue;
         }
-
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!enchantEntry)
         {
             if(SocketColor) fits &= false;
             continue;
         }
-
         uint8 GemColor = 0;
-
         uint32 gemid = enchantEntry->GemID;
         if(gemid)
         {
@@ -879,12 +746,10 @@ bool Item::GemsFitSockets() const
                     GemColor = gemProperty->color;
             }
         }
-
         fits &= (GemColor & SocketColor) ? true : false;
     }
     return fits;
 }
-
 uint8 Item::GetGemCountWithID(uint32 GemID) const
 {
     uint8 count = 0;
@@ -893,17 +758,14 @@ uint8 Item::GetGemCountWithID(uint32 GemID) const
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if(!enchant_id)
             continue;
-
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!enchantEntry)
             continue;
-
         if(GemID == enchantEntry->GemID)
             ++count;
     }
     return count;
 }
-
 uint8 Item::GetGemCountWithLimitCategory(uint32 limitCategory) const
 {
     uint8 count = 0;
@@ -912,27 +774,22 @@ uint8 Item::GetGemCountWithLimitCategory(uint32 limitCategory) const
         uint32 enchant_id = GetEnchantmentId(EnchantmentSlot(enchant_slot));
         if(!enchant_id)
             continue;
-
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!enchantEntry)
             continue;
-
         ItemPrototype const* gemProto = ObjectMgr::GetItemPrototype(enchantEntry->GemID);
         if(!gemProto)
             continue;
-
         if(gemProto->ItemLimitCategory==limitCategory)
             ++count;
     }
     return count;
 }
-
 bool Item::IsLimitedToAnotherMapOrZone( uint32 cur_mapId, uint32 cur_zoneId) const
 {
     ItemPrototype const* proto = GetProto();
     return proto && (proto->Map && proto->Map != cur_mapId || proto->Area && proto->Area != cur_zoneId );
 }
-
 // Though the client has the information in the item's data field,
 // we have to send SMSG_ITEM_TIME_UPDATE to display the remaining
 // time.
@@ -940,26 +797,21 @@ void Item::SendTimeUpdate(Player* owner)
 {
     if (!GetUInt32Value(ITEM_FIELD_DURATION))
         return;
-
     WorldPacket data(SMSG_ITEM_TIME_UPDATE, (8+4));
     data << (uint64)GetGUID();
     data << (uint32)GetUInt32Value(ITEM_FIELD_DURATION);
     owner->GetSession()->SendPacket(&data);
 }
-
 Item* Item::CreateItem( uint32 item, uint32 count, Player const* player )
 {
     if ( count < 1 )
         return NULL;                                        //don't create item at zero count
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype( item );
     if( pProto )
     {
         if ( count > pProto->GetMaxStackSize())
             count = pProto->GetMaxStackSize();
-
         assert(count !=0 && "pProto->Stackable==0 but checked at loading already");
-
         Item *pItem = NewItemOrBag( pProto );
         if( pItem->Create(objmgr.GenerateLowGuid(HIGHGUID_ITEM), item, player) )
         {
@@ -973,13 +825,11 @@ Item* Item::CreateItem( uint32 item, uint32 count, Player const* player )
         assert(false);
     return NULL;
 }
-
 Item* Item::CloneItem( uint32 count, Player const* player ) const
 {
     Item* newItem = CreateItem( GetEntry(), count, player );
     if(!newItem)
         return NULL;
-
     newItem->SetUInt32Value( ITEM_FIELD_CREATOR,      GetUInt32Value( ITEM_FIELD_CREATOR ) );
     newItem->SetUInt32Value( ITEM_FIELD_GIFTCREATOR,  GetUInt32Value( ITEM_FIELD_GIFTCREATOR ) );
     newItem->SetUInt32Value( ITEM_FIELD_FLAGS,        GetUInt32Value( ITEM_FIELD_FLAGS ) );
@@ -987,21 +837,17 @@ Item* Item::CloneItem( uint32 count, Player const* player ) const
     newItem->SetItemRandomProperties(GetItemRandomPropertyId());
     return newItem;
 }
-
 bool Item::IsBindedNotWith( Player const* player ) const
 {
     // not binded item
     if(!IsSoulBound())
         return false;
-
     // own item
     if(GetOwnerGUID()== player->GetGUID())
         return false;
-
     // not BOA item case
     if(!IsBoundAccountWide())
         return true;
-
     // online
     if(Player* owner = objmgr.GetPlayer(GetOwnerGUID()))
     {
@@ -1013,15 +859,12 @@ bool Item::IsBindedNotWith( Player const* player ) const
         return objmgr.GetPlayerAccountIdByGUID(GetOwnerGUID()) != player->GetSession()->GetAccountId();
     }
 }
-
 bool ItemRequiredTarget::IsFitToRequirements( Unit* pUnitTarget ) const
 {
     if(pUnitTarget->GetTypeId() != TYPEID_UNIT)
         return false;
-
     if(pUnitTarget->GetEntry() != m_uiTargetEntry)
         return false;
-
     switch(m_uiType)
     {
         case ITEM_TARGET_TYPE_CREATURE:
diff --git a/src/game/Item.h b/src/game/Item.h
index b70134fbb63..1c4e1c490f6 100644
--- a/src/game/Item.h
+++ b/src/game/Item.h
@@ -17,27 +17,22 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITYCORE_ITEM_H
 #define TRINITYCORE_ITEM_H
-
 #include "Common.h"
 #include "Object.h"
 #include "LootMgr.h"
 #include "ItemPrototype.h"
-
 struct SpellEntry;
 class Bag;
 class QueryResult;
 class Unit;
-
 struct ItemSetEffect
 {
     uint32 setid;
     uint32 item_count;
     SpellEntry const *spells[8];
 };
-
 enum InventoryChangeFailure
 {
     EQUIP_ERR_OK                                 = 0,
@@ -125,7 +120,6 @@ enum InventoryChangeFailure
     // no output                                 = 83,
     // crash client                              = 84,
 };
-
 enum BuyFailure
 {
     BUY_ERR_CANT_FIND_ITEM                      = 0,
@@ -138,7 +132,6 @@ enum BuyFailure
     BUY_ERR_RANK_REQUIRE                        = 11,
     BUY_ERR_REPUTATION_REQUIRE                  = 12
 };
-
 enum SellFailure
 {
     SELL_ERR_CANT_FIND_ITEM                      = 1,
@@ -148,7 +141,6 @@ enum SellFailure
     SELL_ERR_UNK                                 = 5,       // nothing appears...
     SELL_ERR_ONLY_EMPTY_BAG                      = 6        // can only do with empty bags
 };
-
 // -1 from client enchantment slot number
 enum EnchantmentSlot
 {
@@ -160,7 +152,6 @@ enum EnchantmentSlot
     BONUS_ENCHANTMENT_SLOT          = 5,
     PRISMATIC_ENCHANTMENT_SLOT      = 6,                    // added at apply special permanent enchantment
     MAX_INSPECTED_ENCHANTMENT_SLOT  = 7,
-
     PROP_ENCHANTMENT_SLOT_0         = 7,                    // used with RandomSuffix
     PROP_ENCHANTMENT_SLOT_1         = 8,                    // used with RandomSuffix
     PROP_ENCHANTMENT_SLOT_2         = 9,                    // used with RandomSuffix and RandomProperty
@@ -168,20 +159,15 @@ enum EnchantmentSlot
     PROP_ENCHANTMENT_SLOT_4         = 11,                   // used with RandomProperty
     MAX_ENCHANTMENT_SLOT            = 12
 };
-
 #define MAX_VISIBLE_ITEM_OFFSET       2                     // 2 fields per visible item (entry+enchantment)
-
 #define MAX_GEM_SOCKETS               MAX_ITEM_PROTO_SOCKETS// (BONUS_ENCHANTMENT_SLOT-SOCK_ENCHANTMENT_SLOT) and item proto size, equal value expected
-
 enum EnchantmentOffset
 {
     ENCHANTMENT_ID_OFFSET       = 0,
     ENCHANTMENT_DURATION_OFFSET = 1,
     ENCHANTMENT_CHARGES_OFFSET  = 2                         // now here not only charges, but something new in wotlk
 };
-
 #define MAX_ENCHANTMENT_OFFSET    3
-
 enum EnchantmentSlotMask
 {
     ENCHANTMENT_CAN_SOULBOUND  = 0x01,
@@ -189,7 +175,6 @@ enum EnchantmentSlotMask
     ENCHANTMENT_UNK2           = 0x04,
     ENCHANTMENT_UNK3           = 0x08
 };
-
 enum ItemUpdateState
 {
     ITEM_UNCHANGED                               = 0,
@@ -197,43 +182,32 @@ enum ItemUpdateState
     ITEM_NEW                                     = 2,
     ITEM_REMOVED                                 = 3
 };
-
 enum ItemRequiredTargetType
 {
     ITEM_TARGET_TYPE_CREATURE   = 1,
     ITEM_TARGET_TYPE_DEAD       = 2
 };
-
 #define MAX_ITEM_REQ_TARGET_TYPE 2
-
 struct ItemRequiredTarget
 {
     ItemRequiredTarget(ItemRequiredTargetType uiType, uint32 uiTargetEntry) : m_uiType(uiType), m_uiTargetEntry(uiTargetEntry) {}
     ItemRequiredTargetType m_uiType;
     uint32 m_uiTargetEntry;
-
     // helpers
     bool IsFitToRequirements(Unit* pUnitTarget) const;
 };
-
 bool ItemCanGoIntoBag(ItemPrototype const *proto, ItemPrototype const *pBagProto);
-
 class TRINITY_DLL_SPEC Item : public Object
 {
     public:
         static Item* CreateItem( uint32 item, uint32 count, Player const* player = NULL );
         Item* CloneItem( uint32 count, Player const* player = NULL ) const;
-
         Item ( );
-
         virtual bool Create( uint32 guidlow, uint32 itemid, Player const* owner);
-
         ItemPrototype const* GetProto() const;
-
         uint64 const& GetOwnerGUID()    const { return GetUInt64Value(ITEM_FIELD_OWNER); }
         void SetOwnerGUID(uint64 guid) { SetUInt64Value(ITEM_FIELD_OWNER, guid); }
         Player* GetOwner()const;
-
         void SetBinding(bool val) { ApplyModFlag(ITEM_FIELD_FLAGS,ITEM_FLAGS_BINDED,val); }
         bool IsSoulBound() const { return HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_BINDED); }
         bool IsBoundAccountWide() const { return HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_BOA); }
@@ -243,37 +217,30 @@ class TRINITY_DLL_SPEC Item : public Object
         virtual bool LoadFromDB(uint32 guid, uint64 owner_guid, QueryResult *result = NULL);
         virtual void DeleteFromDB();
         void DeleteFromInventoryDB();
-
         bool IsBag() const { return GetProto()->InventoryType == INVTYPE_BAG; }
         bool IsBroken() const { return GetUInt32Value(ITEM_FIELD_MAXDURABILITY) > 0 && GetUInt32Value(ITEM_FIELD_DURABILITY) == 0; }
         bool CanBeTraded(bool mail = false) const;
         void SetInTrade(bool b = true) { mb_in_trade = b; }
         bool IsInTrade() const { return mb_in_trade; }
-
         bool IsFitToSpellRequirements(SpellEntry const* spellInfo) const;
         bool IsTargetValidForItemUse(Unit* pUnitTarget);
         bool IsLimitedToAnotherMapOrZone( uint32 cur_mapId, uint32 cur_zoneId) const;
         bool GemsFitSockets() const;
-
         uint32 GetCount() const { return GetUInt32Value (ITEM_FIELD_STACK_COUNT); }
         void SetCount(uint32 value) { SetUInt32Value (ITEM_FIELD_STACK_COUNT, value); }
         uint32 GetMaxStackCount() const { return GetProto()->GetMaxStackSize(); }
         uint8 GetGemCountWithID(uint32 GemID) const;
         uint8 GetGemCountWithLimitCategory(uint32 limitCategory) const;
-
         uint8 GetSlot() const {return m_slot;}
         Bag *GetContainer() { return m_container; }
         uint8 GetBagSlot() const;
         void SetSlot(uint8 slot) {m_slot = slot;}
         uint16 GetPos() const { return uint16(GetBagSlot()) << 8 | GetSlot(); }
         void SetContainer(Bag *container) { m_container = container; }
-
         bool IsInBag() const { return m_container != NULL; }
         bool IsEquipped() const;
-
         uint32 GetSkill();
         uint32 GetSpell();
-
         // RandomPropertyId (signed but stored as unsigned)
         int32 GetItemRandomPropertyId() const { return GetInt32Value(ITEM_FIELD_RANDOM_PROPERTIES_ID); }
         uint32 GetItemSuffixFactor() const { return GetUInt32Value(ITEM_FIELD_PROPERTY_SEED); }
@@ -287,17 +254,13 @@ class TRINITY_DLL_SPEC Item : public Object
         uint32 GetEnchantmentId(EnchantmentSlot slot)       const { return GetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_ID_OFFSET);}
         uint32 GetEnchantmentDuration(EnchantmentSlot slot) const { return GetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_DURATION_OFFSET);}
         uint32 GetEnchantmentCharges(EnchantmentSlot slot)  const { return GetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1 + slot*MAX_ENCHANTMENT_OFFSET + ENCHANTMENT_CHARGES_OFFSET);}
-
         void SendTimeUpdate(Player* owner);
         void UpdateDuration(Player* owner, uint32 diff);
-
         // spell charges (signed but stored as unsigned)
         int32 GetSpellCharges(uint8 index/*0..5*/ = 0) const { return GetInt32Value(ITEM_FIELD_SPELL_CHARGES + index); }
         void  SetSpellCharges(uint8 index/*0..5*/, int32 value) { SetInt32Value(ITEM_FIELD_SPELL_CHARGES + index,value); }
-
         Loot loot;
         bool m_lootGenerated;
-
         // Update States
         ItemUpdateState GetState() const { return uState; }
         void SetState(ItemUpdateState state, Player *forplayer = NULL);
@@ -309,14 +272,12 @@ class TRINITY_DLL_SPEC Item : public Object
         {
             uState = state;
         }
-
         bool hasQuest(uint32 quest_id) const { return GetProto()->StartQuest == quest_id; }
         bool hasInvolvedQuest(uint32 /*quest_id*/) const { return false; }
         bool IsPotion() const { return GetProto()->IsPotion(); }
         bool IsWeaponVellum() const { return GetProto()->IsWeaponVellum(); }
         bool IsArmorVellum() const { return GetProto()->IsArmorVellum(); }
         bool IsConjuredConsumable() const { return GetProto()->IsConjuredConsumable(); }
-
     private:
         uint8 m_slot;
         Bag *m_container;
diff --git a/src/game/ItemEnchantmentMgr.cpp b/src/game/ItemEnchantmentMgr.cpp
index b40a398a782..0f62d1d8d52 100644
--- a/src/game/ItemEnchantmentMgr.cpp
+++ b/src/game/ItemEnchantmentMgr.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include <stdlib.h>
 #include <functional>
 #include "ItemEnchantmentMgr.h"
@@ -28,56 +27,41 @@
 #include <list>
 #include <vector>
 #include "Util.h"
-
 struct EnchStoreItem
 {
     uint32  ench;
     float   chance;
-
     EnchStoreItem()
         : ench(0), chance(0) {}
-
     EnchStoreItem(uint32 _ench, float _chance)
         : ench(_ench), chance(_chance) {}
 };
-
 typedef std::vector<EnchStoreItem> EnchStoreList;
 typedef UNORDERED_MAP<uint32, EnchStoreList> EnchantmentStore;
-
 static EnchantmentStore RandomItemEnch;
-
 void LoadRandomEnchantmentsTable()
 {
     RandomItemEnch.clear();                                 // for reload case
-
     EnchantmentStore::const_iterator tab;
     uint32 entry, ench;
     float chance;
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.Query("SELECT entry, ench, chance FROM item_enchantment_template");
-
     if (result)
     {
         barGoLink bar(result->GetRowCount());
-
         do
         {
             Field *fields = result->Fetch();
             bar.step();
-
             entry = fields[0].GetUInt32();
             ench = fields[1].GetUInt32();
             chance = fields[2].GetFloat();
-
             if (chance > 0.000001f && chance <= 100.0f)
                 RandomItemEnch[entry].push_back( EnchStoreItem(ench, chance) );
-
             ++count;
         } while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u Item Enchantment definitions", count );
     }
@@ -87,56 +71,42 @@ void LoadRandomEnchantmentsTable()
         sLog.outErrorDb( ">> Loaded 0 Item Enchantment definitions. DB table `item_enchantment_template` is empty.");
     }
 }
-
 uint32 GetItemEnchantMod(uint32 entry)
 {
     if (!entry) return 0;
-
     EnchantmentStore::const_iterator tab = RandomItemEnch.find(entry);
-
     if (tab == RandomItemEnch.end())
     {
         sLog.outErrorDb("Item RandomProperty / RandomSuffix id #%u used in `item_template` but it doesn't have records in `item_enchantment_template` table.",entry);
         return 0;
     }
-
     double dRoll = rand_chance();
     float fCount = 0;
-
     for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
     {
         fCount += ench_iter->chance;
-
         if (fCount > dRoll) return ench_iter->ench;
     }
-
     //we could get here only if sum of all enchantment chances is lower than 100%
     dRoll =  (irand(0, (int)floor(fCount * 100) + 1)) / 100;
     fCount = 0;
-
     for(EnchStoreList::const_iterator ench_iter = tab->second.begin(); ench_iter != tab->second.end(); ++ench_iter)
     {
         fCount += ench_iter->chance;
-
         if (fCount > dRoll) return ench_iter->ench;
     }
-
     return 0;
 }
-
 uint32 GenerateEnchSuffixFactor(uint32 item_id)
 {
     ItemPrototype const *itemProto = objmgr.GetItemPrototype(item_id);
-
     if(!itemProto)
         return 0;
     if(!itemProto->RandomSuffix)
         return 0;
-
     RandomPropertiesPointsEntry const *randomProperty = sRandomPropertiesPointsStore.LookupEntry(itemProto->ItemLevel);
     if(!randomProperty)
         return 0;
-
     uint32 suffixFactor;
     switch(itemProto->InventoryType)
     {
diff --git a/src/game/ItemEnchantmentMgr.h b/src/game/ItemEnchantmentMgr.h
index ce627515aee..65c66855bf4 100644
--- a/src/game/ItemEnchantmentMgr.h
+++ b/src/game/ItemEnchantmentMgr.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _ITEM_ENCHANTMENT_MGR_H
 #define _ITEM_ENCHANTMENT_MGR_H
-
 #include "Common.h"
-
 void LoadRandomEnchantmentsTable();
 uint32 GetItemEnchantMod(uint32 entry);
 uint32 GenerateEnchSuffixFactor(uint32 item_id);
diff --git a/src/game/ItemHandler.cpp b/src/game/ItemHandler.cpp
index 129766b35f0..434d298b00c 100644
--- a/src/game/ItemHandler.cpp
+++ b/src/game/ItemHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -28,138 +27,106 @@
 #include "Item.h"
 #include "UpdateData.h"
 #include "ObjectAccessor.h"
-
 void WorldSession::HandleSplitItemOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_SPLIT_ITEM");
     uint8 srcbag, srcslot, dstbag, dstslot;
     uint32 count;
-
     recv_data >> srcbag >> srcslot >> dstbag >> dstslot >> count;
     //sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u, count = %u", srcbag, srcslot, dstbag, dstslot, count);
-
     uint16 src = ( (srcbag << 8) | srcslot );
     uint16 dst = ( (dstbag << 8) | dstslot );
-
     if(src==dst)
         return;
-
     if (count==0)
         return;                                             //check count - if zero it's fake packet
-
     if(!_player->IsValidPos(srcbag,srcslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     if(!_player->IsValidPos(dstbag,dstslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
         return;
     }
-
     _player->SplitItem( src, dst, count );
 }
-
 void WorldSession::HandleSwapInvItemOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_SWAP_INV_ITEM");
     uint8 srcslot, dstslot;
-
     recv_data >> srcslot >> dstslot;
     //sLog.outDebug("STORAGE: receive srcslot = %u, dstslot = %u", srcslot, dstslot);
-
     // prevent attempt swap same item to current position generated by client at special checting sequence
     if(srcslot==dstslot)
         return;
-
     if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,srcslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     if(!_player->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
         return;
     }
-
     uint16 src = ( (INVENTORY_SLOT_BAG_0 << 8) | srcslot );
     uint16 dst = ( (INVENTORY_SLOT_BAG_0 << 8) | dstslot );
-
     _player->SwapItem( src, dst );
 }
-
 void WorldSession::HandleAutoEquipItemSlotOpcode( WorldPacket & recv_data )
 {
     uint64 itemguid;
     uint8 dstslot;
     recv_data >> itemguid >> dstslot;
-
     // cheating attempt, client should never send opcode in that case
     if(!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0, dstslot))
         return;
-
     Item* item = _player->GetItemByGuid(itemguid);
     uint16 dstpos = dstslot | (INVENTORY_SLOT_BAG_0 << 8);
-
     if(!item || item->GetPos() == dstpos)
         return;
-
     _player->SwapItem(item->GetPos(), dstpos);
 }
-
 void WorldSession::HandleSwapItem( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_SWAP_ITEM");
     uint8 dstbag, dstslot, srcbag, srcslot;
-
     recv_data >> dstbag >> dstslot >> srcbag >> srcslot ;
     //sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u, dstslot = %u", srcbag, srcslot, dstbag, dstslot);
-
     uint16 src = ( (srcbag << 8) | srcslot );
     uint16 dst = ( (dstbag << 8) | dstslot );
-
     // prevent attempt swap same item to current position generated by client at special checting sequence
     if(src==dst)
         return;
-
     if(!_player->IsValidPos(srcbag,srcslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     if(!_player->IsValidPos(dstbag,dstslot))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
         return;
     }
-
     _player->SwapItem( src, dst );
 }
-
 void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_AUTOEQUIP_ITEM");
     uint8 srcbag, srcslot;
-
     recv_data >> srcbag >> srcslot;
     //sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
-
     Item *pSrcItem  = _player->GetItemByPos( srcbag, srcslot );
     if( !pSrcItem )
         return;                                             // only at cheat
-
     if(pSrcItem->m_lootGenerated)                           // prevent swap looting item
     {
         //best error message found for attempting to swap while looting
         _player->SendEquipError( EQUIP_ERR_CANT_DO_RIGHT_NOW, pSrcItem, NULL );
         return;
     }
-
     uint16 dest;
     uint8 msg = _player->CanEquipItem( NULL_SLOT, dest, pSrcItem, !pSrcItem->IsBag() );
     if( msg != EQUIP_ERR_OK )
@@ -167,11 +134,9 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
         _player->SendEquipError( msg, pSrcItem, NULL );
         return;
     }
-
     uint16 src = pSrcItem->GetPos();
     if(dest==src)                                           // prevent equip in same slot, only at cheat
         return;
-
     Item *pDstItem = _player->GetItemByPos( dest );
     if( !pDstItem )                                         // empty slot, simple case
     {
@@ -183,14 +148,12 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
     {
         uint8 dstbag = pDstItem->GetBagSlot();
         uint8 dstslot = pDstItem->GetSlot();
-
         msg = _player->CanUnequipItem( dest, !pSrcItem->IsBag() );
         if( msg != EQUIP_ERR_OK )
         {
             _player->SendEquipError( msg, pDstItem, NULL );
             return;
         }
-
         // check dest->src move possibility
         ItemPosCountVec sSrc;
         uint16 eSrc = 0;
@@ -216,20 +179,16 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
             if( msg == EQUIP_ERR_OK )
                 msg = _player->CanUnequipItem( eSrc, true);
         }
-
         if( msg != EQUIP_ERR_OK )
         {
             _player->SendEquipError( msg, pDstItem, pSrcItem );
             return;
         }
-
         // now do moves, remove...
         _player->RemoveItem(dstbag, dstslot, false);
         _player->RemoveItem(srcbag, srcslot, false);
-
         // add to dest
         _player->EquipItem(dest, pSrcItem, true);
-
         // add to src
         if( _player->IsInventoryPos( src ) )
             _player->StoreItem(sSrc, pDstItem, true);
@@ -237,21 +196,16 @@ void WorldSession::HandleAutoEquipItemOpcode( WorldPacket & recv_data )
             _player->BankItem(sSrc, pDstItem, true);
         else if( _player->IsEquipmentPos( src ) )
             _player->EquipItem(eSrc, pDstItem, true);
-
         _player->AutoUnequipOffhandIfNeed();
     }
 }
-
 void WorldSession::HandleDestroyItemOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_DESTROYITEM");
     uint8 bag, slot, count, data1, data2, data3;
-
     recv_data >> bag >> slot >> count >> data1 >> data2 >> data3;
     //sLog.outDebug("STORAGE: receive bag = %u, slot = %u, count = %u", bag, slot, count);
-
     uint16 pos = (bag << 8) | slot;
-
     // prevent drop unequipable items (in combat, for example) and non-empty bags
     if(_player->IsEquipmentPos(pos) || _player->IsBagPos(pos))
     {
@@ -262,14 +216,12 @@ void WorldSession::HandleDestroyItemOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     Item *pItem  = _player->GetItemByPos( bag, slot );
     if(!pItem)
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     if(count)
     {
         uint32 i_count = count;
@@ -278,22 +230,18 @@ void WorldSession::HandleDestroyItemOpcode( WorldPacket & recv_data )
     else
         _player->DestroyItem( bag, slot, true );
 }
-
 // Only _static_ data send in this packet !!!
 void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_ITEM_QUERY_SINGLE");
     uint32 item;
     recv_data >> item;
-
     sLog.outDetail("STORAGE: Item Query = %u", item);
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype( item );
     if( pProto )
     {
         std::string Name        = pProto->Name1;
         std::string Description = pProto->Description;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if ( loc_idx >= 0 )
         {
@@ -350,7 +298,6 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
             data << pProto->Damage[i].DamageMax;
             data << pProto->Damage[i].DamageType;
         }
-
         // resistances (7)
         data << pProto->Armor;
         data << pProto->HolyRes;
@@ -359,11 +306,9 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         data << pProto->FrostRes;
         data << pProto->ShadowRes;
         data << pProto->ArcaneRes;
-
         data << pProto->Delay;
         data << pProto->AmmoType;
         data << pProto->RangedModRange;
-
         for(int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
         {
             // send DBC data for cooldowns in same way as it used in Spell::SendSpellCooldown
@@ -372,11 +317,9 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
             if(spell)
             {
                 bool db_data = pProto->Spells[s].SpellCooldown >= 0 || pProto->Spells[s].SpellCategoryCooldown >= 0;
-
                 data << pProto->Spells[s].SpellId;
                 data << pProto->Spells[s].SpellTrigger;
                 data << uint32(-abs(pProto->Spells[s].SpellCharges));
-
                 if(db_data)
                 {
                     data << uint32(pProto->Spells[s].SpellCooldown);
@@ -440,21 +383,16 @@ void WorldSession::HandleItemQuerySingleOpcode( WorldPacket & recv_data )
         SendPacket( &data );
     }
 }
-
 void WorldSession::HandleReadItem( WorldPacket & recv_data )
 {
     //sLog.outDebug( "WORLD: CMSG_READ_ITEM");
-
     uint8 bag, slot;
     recv_data >> bag >> slot;
-
     //sLog.outDetail("STORAGE: Read bag = %u, slot = %u", bag, slot);
     Item *pItem = _player->GetItemByPos( bag, slot );
-
     if( pItem && pItem->GetProto()->PageText )
     {
         WorldPacket data;
-
         uint8 msg = _player->CanUseItem( pItem );
         if( msg == EQUIP_ERR_OK )
         {
@@ -473,31 +411,23 @@ void WorldSession::HandleReadItem( WorldPacket & recv_data )
     else
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
 }
-
 void WorldSession::HandlePageQuerySkippedOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug(  "WORLD: Received CMSG_PAGE_TEXT_QUERY" );
-
     uint32 itemid;
     uint64 guid;
-
     recv_data >> itemid >> guid;
-
     sLog.outDetail( "Packet Info: itemid: %u guidlow: %u guidentry: %u guidhigh: %u",
         itemid, GUID_LOPART(guid), GUID_ENPART(guid), GUID_HIPART(guid));
 }
-
 void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug(  "WORLD: Received CMSG_SELL_ITEM" );
     uint64 vendorguid, itemguid;
     uint32 count;
-
     recv_data >> vendorguid >> itemguid >> count;
-
     if(!itemguid)
         return;
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
@@ -505,11 +435,9 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
         _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, itemguid, 0);
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     Item *pItem = _player->GetItemByGuid( itemguid );
     if( pItem )
     {
@@ -519,21 +447,18 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
             _player->SendSellError( SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0);
             return;
         }
-
         // prevent sell non empty bag by drag-and-drop at vendor's item list
         if(pItem->IsBag() && !((Bag*)pItem)->IsEmpty())
         {
             _player->SendSellError( SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0);
             return;
         }
-
         // prevent sell currently looted item
         if(_player->GetLootGUID()==pItem->GetGUID())
         {
             _player->SendSellError( SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0);
             return;
         }
-
         // special case at auto sell (sell all)
         if(count==0)
         {
@@ -548,7 +473,6 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
                 return;
             }
         }
-
         ItemPrototype const *pProto = pItem->GetProto();
         if( pProto )
         {
@@ -563,13 +487,11 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
                         _player->SendSellError( SELL_ERR_CANT_SELL_ITEM, pCreature, itemguid, 0);
                         return;
                     }
-
                     pItem->SetCount( pItem->GetCount() - count );
                     _player->ItemRemovedQuestCheck( pItem->GetEntry(), count );
                     if( _player->IsInWorld() )
                         pItem->SendUpdateToPlayer( _player );
                     pItem->SetState(ITEM_CHANGED, _player);
-
                     _player->AddItemToBuyBackSlot( pNewItem );
                     if( _player->IsInWorld() )
                         pNewItem->SendUpdateToPlayer( _player );
@@ -581,7 +503,6 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
                     pItem->RemoveFromUpdateQueueOf(_player);
                     _player->AddItemToBuyBackSlot( pItem );
                 }
-
                 _player->ModifyMoney( pProto->SellPrice * count );
             }
             else
@@ -592,15 +513,12 @@ void WorldSession::HandleSellItemOpcode( WorldPacket & recv_data )
     _player->SendSellError( SELL_ERR_CANT_FIND_ITEM, pCreature, itemguid, 0);
     return;
 }
-
 void WorldSession::HandleBuybackItem(WorldPacket & recv_data)
 {
     sLog.outDebug(  "WORLD: Received CMSG_BUYBACK_ITEM" );
     uint64 vendorguid;
     uint32 slot;
-
     recv_data >> vendorguid >> slot;
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
@@ -608,11 +526,9 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data)
         _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     Item *pItem = _player->GetItemFromBuyBackSlot( slot );
     if( pItem )
     {
@@ -622,7 +538,6 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data)
             _player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, pItem->GetEntry(), 0);
             return;
         }
-
         ItemPosCountVec dest;
         uint8 msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
         if( msg == EQUIP_ERR_OK )
@@ -639,18 +554,14 @@ void WorldSession::HandleBuybackItem(WorldPacket & recv_data)
     else
         _player->SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, 0, 0);
 }
-
 void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug(  "WORLD: Received CMSG_BUY_ITEM_IN_SLOT" );
     uint64 vendorguid, bagguid;
     uint32 item, slot, count;
     uint8 bagslot;
-
     recv_data >> vendorguid >> item  >> slot >> bagguid >> bagslot >> count;
-
     uint8 bag = NULL_BAG;                                   // init for case invalid bagGUID
-
     // find bag slot by bag guid
     if (bagguid == _player->GetGUID())
         bag = INVENTORY_SLOT_BAG_0;
@@ -668,44 +579,32 @@ void WorldSession::HandleBuyItemInSlotOpcode( WorldPacket & recv_data )
             }
         }
     }
-
     // bag not found, cheating?
     if (bag == NULL_BAG)
         return;
-
     GetPlayer()->BuyItemFromVendor(vendorguid,item,count,bag,bagslot);
 }
-
 void WorldSession::HandleBuyItemOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug(  "WORLD: Received CMSG_BUY_ITEM" );
     uint64 vendorguid;
     uint32 item, slot, count;
     uint8 unk1;
-
     recv_data >> vendorguid >> item >> slot >> count >> unk1;
-
     GetPlayer()->BuyItemFromVendor(vendorguid,item,count,NULL_BAG,NULL_SLOT);
 }
-
 void WorldSession::HandleListInventoryOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
-
     recv_data >> guid;
-
     if(!GetPlayer()->isAlive())
         return;
-
     sLog.outDebug(  "WORLD: Recvd CMSG_LIST_INVENTORY" );
-
     SendListInventory( guid );
 }
-
 void WorldSession::SendListInventory( uint64 vendorguid )
 {
     sLog.outDebug(  "WORLD: Sent SMSG_LIST_INVENTORY" );
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
@@ -713,30 +612,23 @@ void WorldSession::SendListInventory( uint64 vendorguid )
         _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     // Stop the npc if moving
     pCreature->StopMoving();
-
     VendorItemData const* vItems = pCreature->GetVendorItems();
     if(!vItems)
     {
         _player->SendSellError( SELL_ERR_CANT_FIND_VENDOR, NULL, 0, 0);
         return;
     }
-
     uint8 numitems = vItems->GetItemCount();
     uint8 count = 0;
-
     WorldPacket data( SMSG_LIST_INVENTORY, (8+1+numitems*8*4) );
     data << uint64(vendorguid);
     data << uint8(numitems);
-
     float discountMod = _player->GetReputationPriceDiscount(pCreature);
-
     for(int i = 0; i < numitems; ++i )
     {
         if(VendorItem const* crItem = vItems->GetItem(i))
@@ -745,12 +637,9 @@ void WorldSession::SendListInventory( uint64 vendorguid )
             {
                 if((pProto->AllowableClass & _player->getClassMask()) == 0 && pProto->Bonding == BIND_WHEN_PICKED_UP && !_player->isGameMaster())
                     continue;
-
                 ++count;
-
                 // reputation discount
                 uint32 price = uint32(floor(pProto->BuyPrice * discountMod));
-
                 data << uint32(count);
                 data << uint32(crItem->item);
                 data << uint32(pProto->DisplayInfoID);
@@ -762,34 +651,26 @@ void WorldSession::SendListInventory( uint64 vendorguid )
             }
         }
     }
-
     if ( count == 0 || data.size() != 8 + 1 + size_t(count) * 8 * 4 )
         return;
-
     data.put<uint8>(8, count);
     SendPacket( &data );
 }
-
 void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
 {
     //sLog.outDebug("WORLD: CMSG_AUTOSTORE_BAG_ITEM");
     uint8 srcbag, srcslot, dstbag;
-
     recv_data >> srcbag >> srcslot >> dstbag;
     //sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u, dstbag = %u", srcbag, srcslot, dstbag);
-
     Item *pItem = _player->GetItemByPos( srcbag, srcslot );
     if( !pItem )
         return;
-
     if(!_player->IsValidPos(dstbag,NULL_SLOT))
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
         return;
     }
-
     uint16 src = pItem->GetPos();
-
     // check unequip potability for equipped items and bank bags
     if(_player->IsEquipmentPos ( src ) || _player->IsBagPos ( src ))
     {
@@ -800,7 +681,6 @@ void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     ItemPosCountVec dest;
     uint8 msg = _player->CanStoreItem( dstbag, NULL_SLOT, dest, pItem, false );
     if( msg != EQUIP_ERR_OK )
@@ -808,7 +688,6 @@ void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
         _player->SendEquipError( msg, pItem, NULL );
         return;
     }
-
     // no-op: placed in same slot
     if(dest.size()==1 && dest[0].pos==src)
     {
@@ -816,18 +695,14 @@ void WorldSession::HandleAutoStoreBagItemOpcode( WorldPacket & recv_data )
         _player->SendEquipError( EQUIP_ERR_NONE, pItem, NULL );
         return;
     }
-
     _player->RemoveItem(srcbag, srcslot, true );
     _player->StoreItem( dest, pItem, true );
 }
-
 void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
 {
     sLog.outDebug("WORLD: CMSG_BUY_BANK_SLOT");
-
     uint64 guid;
     recvPacket >> guid;
-
     // cheating protection
     /* not critical if "cheated", and check skip allow by slots in bank windows open by .bank command.
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_BANKER);
@@ -837,42 +712,29 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPacket& recvPacket)
         return;
     }
     */
-
     uint32 slot = _player->GetBankBagSlotCount();
-
     // next slot
     ++slot;
-
     sLog.outDetail("PLAYER: Buy bank bag slot, slot number = %u", slot);
-
     BankBagSlotPricesEntry const* slotEntry = sBankBagSlotPricesStore.LookupEntry(slot);
-
     if(!slotEntry)
         return;
-
     uint32 price = slotEntry->price;
-
     if (_player->GetMoney() < price)
         return;
-
     _player->SetBankBagSlotCount(slot);
     _player->ModifyMoney(-int32(price));
-
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BUY_BANK_SLOT);
 }
-
 void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket)
 {
     sLog.outDebug("WORLD: CMSG_AUTOBANK_ITEM");
     uint8 srcbag, srcslot;
-
     recvPacket >> srcbag >> srcslot;
     sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
-
     Item *pItem = _player->GetItemByPos( srcbag, srcslot );
     if( !pItem )
         return;
-
     ItemPosCountVec dest;
     uint8 msg = _player->CanBankItem( NULL_BAG, NULL_SLOT, dest, pItem, false );
     if( msg != EQUIP_ERR_OK )
@@ -880,23 +742,18 @@ void WorldSession::HandleAutoBankItemOpcode(WorldPacket& recvPacket)
         _player->SendEquipError( msg, pItem, NULL );
         return;
     }
-
     _player->RemoveItem(srcbag, srcslot, true);
     _player->BankItem( dest, pItem, true );
 }
-
 void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
 {
     sLog.outDebug("WORLD: CMSG_AUTOSTORE_BANK_ITEM");
     uint8 srcbag, srcslot;
-
     recvPacket >> srcbag >> srcslot;
     sLog.outDebug("STORAGE: receive srcbag = %u, srcslot = %u", srcbag, srcslot);
-
     Item *pItem = _player->GetItemByPos( srcbag, srcslot );
     if( !pItem )
         return;
-
     if(_player->IsBankPos(srcbag, srcslot))                 // moving from bank to inventory
     {
         ItemPosCountVec dest;
@@ -906,7 +763,6 @@ void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
             _player->SendEquipError( msg, pItem, NULL );
             return;
         }
-
         _player->RemoveItem(srcbag, srcslot, true);
         _player->StoreItem( dest, pItem, true );
     }
@@ -919,12 +775,10 @@ void WorldSession::HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket)
             _player->SendEquipError( msg, pItem, NULL );
             return;
         }
-
         _player->RemoveItem(srcbag, srcslot, true);
         _player->BankItem( dest, pItem, true );
     }
 }
-
 void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data)
 {
     if(!GetPlayer()->isAlive())
@@ -932,18 +786,14 @@ void WorldSession::HandleSetAmmoOpcode(WorldPacket & recv_data)
         GetPlayer()->SendEquipError( EQUIP_ERR_YOU_ARE_DEAD, NULL, NULL );
         return;
     }
-
     sLog.outDebug("WORLD: CMSG_SET_AMMO");
     uint32 item;
-
     recv_data >> item;
-
     if(!item)
         GetPlayer()->RemoveAmmo();
     else
         GetPlayer()->SetAmmo(item);
 }
-
 void WorldSession::SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID,uint32 SpellID)
 {
     WorldPacket data(SMSG_ENCHANTMENTLOG, (8+8+4+4+1));     // last check 2.0.10
@@ -954,7 +804,6 @@ void WorldSession::SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID
     data << uint8(0);
     SendPacket(&data);
 }
-
 void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,uint32 slot,uint32 Duration)
 {
                                                             // last check 2.0.10
@@ -965,20 +814,17 @@ void WorldSession::SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,
     data << uint64(Playerguid);
     SendPacket(&data);
 }
-
 void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
 {
     uint32 itemid;
     recv_data >> itemid;
     recv_data.read_skip<uint64>();                          // guid
-
     sLog.outDebug("WORLD: CMSG_ITEM_NAME_QUERY %u", itemid);
     ItemPrototype const *pProto = objmgr.GetItemPrototype( itemid );
     if( pProto )
     {
         std::string Name;
         Name = pProto->Name1;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -1006,87 +852,70 @@ void WorldSession::HandleItemNameQueryOpcode(WorldPacket & recv_data)
             sLog.outError("WORLD: CMSG_ITEM_NAME_QUERY for item %u failed (unknown item, not listed in Item.dbc)", itemid);
     }
 }
-
 void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
 {
     sLog.outDebug("Received opcode CMSG_WRAP_ITEM");
-
     uint8 gift_bag, gift_slot, item_bag, item_slot;
     //recv_data.hexlike();
-
     recv_data >> gift_bag >> gift_slot;                     // paper
     recv_data >> item_bag >> item_slot;                     // item
-
     sLog.outDebug("WRAP: receive gift_bag = %u, gift_slot = %u, item_bag = %u, item_slot = %u", gift_bag, gift_slot, item_bag, item_slot);
-
     Item *gift = _player->GetItemByPos( gift_bag, gift_slot );
     if(!gift)
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
         return;
     }
-
     if(!gift->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPER))// cheating: non-wrapper wrapper
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, gift, NULL );
         return;
     }
-
     Item *item = _player->GetItemByPos( item_bag, item_slot );
-
     if( !item )
     {
         _player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, item, NULL );
         return;
     }
-
     if(item==gift)                                          // not possable with pacjket from real client
     {
         _player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     if(item->IsEquipped())
     {
         _player->SendEquipError( EQUIP_ERR_EQUIPPED_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     if(item->GetUInt64Value(ITEM_FIELD_GIFTCREATOR))        // HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED);
     {
         _player->SendEquipError( EQUIP_ERR_WRAPPED_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     if(item->IsBag())
     {
         _player->SendEquipError( EQUIP_ERR_BAGS_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     if(item->IsSoulBound())
     {
         _player->SendEquipError( EQUIP_ERR_BOUND_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     if(item->GetMaxStackCount() != 1)
     {
         _player->SendEquipError( EQUIP_ERR_STACKABLE_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     // maybe not correct check  (it is better than nothing)
     if(item->GetProto()->MaxCount>0)
     {
         _player->SendEquipError( EQUIP_ERR_UNIQUE_CANT_BE_WRAPPED, item, NULL );
         return;
     }
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("INSERT INTO character_gifts VALUES ('%u', '%u', '%u', '%u')", GUID_LOPART(item->GetOwnerGUID()), item->GetGUIDLow(), item->GetEntry(), item->GetUInt32Value(ITEM_FIELD_FLAGS));
     item->SetEntry(gift->GetEntry());
-
     switch (item->GetEntry())
     {
         case 5042:  item->SetEntry( 5043); break;
@@ -1099,7 +928,6 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
     item->SetUInt64Value(ITEM_FIELD_GIFTCREATOR, _player->GetGUID());
     item->SetUInt32Value(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED);
     item->SetState(ITEM_CHANGED, _player);
-
     if(item->GetState()==ITEM_NEW)                          // save new item, to have alway for `character_gifts` record in `item_instance`
     {
         // after save it will be impossible to remove the item from the queue
@@ -1107,77 +935,59 @@ void WorldSession::HandleWrapItemOpcode(WorldPacket& recv_data)
         item->SaveToDB();                                   // item gave inventory record unchanged and can be save standalone
     }
     CharacterDatabase.CommitTransaction();
-
     uint32 count = 1;
     _player->DestroyItemCount(gift, count, true);
 }
-
 void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
 {
     sLog.outDebug("WORLD: CMSG_SOCKET_GEMS");
-
     uint64 item_guid;
     uint64 gem_guids[MAX_GEM_SOCKETS];
-
     recv_data >> item_guid;
     if(!item_guid)
         return;
-
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
         recv_data >> gem_guids[i];
-
     //cheat -> tried to socket same gem multiple times
     if ((gem_guids[0] && (gem_guids[0] == gem_guids[1] || gem_guids[0] == gem_guids[2])) ||
         (gem_guids[1] && (gem_guids[1] == gem_guids[2])))
         return;
-
     Item *itemTarget = _player->GetItemByGuid(item_guid);
     if(!itemTarget)                                         //missing item to socket
         return;
-
     ItemPrototype const* itemProto = itemTarget->GetProto();
     if(!itemProto)
         return;
-
     //this slot is excepted when applying / removing meta gem bonus
     uint8 slot = itemTarget->IsEquipped() ? itemTarget->GetSlot() : uint8(NULL_SLOT);
-
     Item *Gems[MAX_GEM_SOCKETS];
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
         Gems[i] = gem_guids[i] ? _player->GetItemByGuid(gem_guids[i]) : NULL;
-
     GemPropertiesEntry const *GemProps[MAX_GEM_SOCKETS];
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //get geminfo from dbc storage
         GemProps[i] = (Gems[i]) ? sGemPropertiesStore.LookupEntry(Gems[i]->GetProto()->GemProperties) : NULL;
-
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //check for hack maybe
     {
         if (!GemProps[i])
             continue;
-
         // tried to put gem in socket where no socket exists (take care about prismatic sockets)
         if (!itemProto->Socket[i].Color)
         {
             // no prismatic socket
             if(!itemTarget->GetEnchantmentId(PRISMATIC_ENCHANTMENT_SLOT))
                 return;
-
             // not first not-colored (not normaly used) socket
             if(i!=0 && !itemProto->Socket[i-1].Color && (i+1 >= MAX_GEM_SOCKETS || itemProto->Socket[i+1].Color))
                 return;
-
             // ok, this is first not colored socket for item with prismatic socket
         }
-
         // tried to put normal gem in meta socket
         if (itemProto->Socket[i].Color == SOCKET_COLOR_META && GemProps[i]->color != SOCKET_COLOR_META)
             return;
-
         // tried to put meta gem in normal socket
         if (itemProto->Socket[i].Color != SOCKET_COLOR_META && GemProps[i]->color == SOCKET_COLOR_META)
             return;
     }
-
     uint32 GemEnchants[MAX_GEM_SOCKETS];
     uint32 OldEnchants[MAX_GEM_SOCKETS];
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)                //get new and old enchantments
@@ -1185,16 +995,13 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         GemEnchants[i] = (GemProps[i]) ? GemProps[i]->spellitemenchantement : 0;
         OldEnchants[i] = itemTarget->GetEnchantmentId(EnchantmentSlot(SOCK_ENCHANTMENT_SLOT+i));
     }
-
     // check unique-equipped conditions
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
     {
         if(!Gems[i])
             continue;
-
         // continue check for case when attempt add 2 similar unique equipped gems in one item.
         ItemPrototype const* iGemProto = Gems[i]->GetProto();
-
         // unique item (for new and already placed bit removed enchantments
         if (iGemProto->Flags & ITEM_FLAGS_UNIQUE_EQUIPPED)
         {
@@ -1202,7 +1009,6 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
             {
                 if(i==j)                                    // skip self
                     continue;
-
                 if (Gems[j])
                 {
                     if (iGemProto->ItemId == Gems[j]->GetEntry())
@@ -1222,10 +1028,8 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                         }
                     }
                 }
-
             }
         }
-
         // unique limit type item
         int32 limit_newcount = 0;
         if (iGemProto->ItemLimitCategory)
@@ -1244,7 +1048,6 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                                     if (iGemProto->ItemLimitCategory == jProto->ItemLimitCategory)
                                         --limit_newcount;
                         }
-
                         // new gem
                         if (iGemProto->ItemLimitCategory == Gems[j]->GetProto()->ItemLimitCategory)
                             ++limit_newcount;
@@ -1258,7 +1061,6 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                                     ++limit_newcount;
                     }
                 }
-
                 if(limit_newcount > 0 && uint32(limit_newcount) > limitEntry->maxCount)
                 {
                     _player->SendEquipError( EQUIP_ERR_ITEM_UNIQUE_EQUIPPABLE_SOCKETED, itemTarget, NULL );
@@ -1266,7 +1068,6 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                 }
             }
         }
-
         // for equipped item check all equipment for duplicate equipped gems
         if(itemTarget->IsEquipped())
         {
@@ -1277,16 +1078,12 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
             }
         }
     }
-
     bool SocketBonusActivated = itemTarget->GemsFitSockets();    //save state of socketbonus
     _player->ToggleMetaGemsActive(slot, false);             //turn off all metagems (except for the target item)
-
     //if a meta gem is being equipped, all information has to be written to the item before testing if the conditions for the gem are met
-
     //remove ALL enchants
     for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot)
         _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),false);
-
     for(int i = 0; i < MAX_GEM_SOCKETS; ++i)
     {
         if(GemEnchants[i])
@@ -1296,10 +1093,8 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
                 _player->DestroyItem(guidItem->GetBagSlot(), guidItem->GetSlot(), true );
         }
     }
-
     for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+MAX_GEM_SOCKETS; ++enchant_slot)
         _player->ApplyEnchantment(itemTarget,EnchantmentSlot(enchant_slot),true);
-
     bool SocketBonusToBeActivated = itemTarget->GemsFitSockets();//current socketbonus state
     if(SocketBonusActivated ^ SocketBonusToBeActivated)     //if there was a change...
     {
@@ -1308,30 +1103,21 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         _player->ApplyEnchantment(itemTarget,BONUS_ENCHANTMENT_SLOT,true);
         //it is not displayed, client has an inbuilt system to determine if the bonus is activated
     }
-
     _player->ToggleMetaGemsActive(slot, true);              //turn on all metagems (except for target item)
 }
-
 void WorldSession::HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data)
 {
     sLog.outDebug("WORLD: CMSG_CANCEL_TEMP_ENCHANTMENT");
-
     uint32 eslot;
-
     recv_data >> eslot;
-
     // apply only to equipped item
     if(!Player::IsEquipmentPos(INVENTORY_SLOT_BAG_0,eslot))
         return;
-
     Item* item = GetPlayer()->GetItemByPos(INVENTORY_SLOT_BAG_0, eslot);
-
     if(!item)
         return;
-
     if(!item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
         return;
-
     GetPlayer()->ApplyEnchantment(item,TEMP_ENCHANTMENT_SLOT,false);
     item->ClearEnchantment(TEMP_ENCHANTMENT_SLOT);
 }
diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h
index a6daf47cb48..613d6aeaf5b 100644
--- a/src/game/ItemPrototype.h
+++ b/src/game/ItemPrototype.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _ITEMPROTOTYPE_H
 #define _ITEMPROTOTYPE_H
-
 #include "Common.h"
-
 enum ItemModType
 {
     ITEM_MOD_MANA                     = 0,
@@ -67,9 +64,7 @@ enum ItemModType
     ITEM_MOD_ARMOR_PENETRATION_RATING = 44,
     ITEM_MOD_SPELL_POWER              = 45
 };
-
 #define MAX_ITEM_MOD                    46
-
 enum ItemSpelltriggerType
 {
     ITEM_SPELLTRIGGER_ON_USE          = 0,                  // use after equip cooldown
@@ -85,9 +80,7 @@ enum ItemSpelltriggerType
     ITEM_SPELLTRIGGER_ON_NO_DELAY_USE = 5,                  // no equip cooldown
     ITEM_SPELLTRIGGER_LEARN_SPELL_ID  = 6                   // used in item_template.spell_2 with spell_id with SPELL_GENERIC_LEARN in spell_1
 };
-
 #define MAX_ITEM_SPELLTRIGGER           7
-
 enum ItemBondingType
 {
     NO_BIND                                     = 0,
@@ -97,9 +90,7 @@ enum ItemBondingType
     BIND_QUEST_ITEM                             = 4,
     BIND_QUEST_ITEM1                            = 5         // not used in game
 };
-
 #define MAX_BIND_TYPE                             6
-
 // masks for ITEM_FIELD_FLAGS field
 enum ITEM_FLAGS
 {
@@ -120,7 +111,6 @@ enum ITEM_FLAGS
     ITEM_FLAGS_TRIGGERED_CAST                 = 0x10000000, // used by enchanting scrolls made with vellum
     ITEM_FLAGS_MILLABLE                       = 0x20000000
 };
-
 enum BAG_FAMILY_MASK
 {
     BAG_FAMILY_MASK_NONE                      = 0x00000000,
@@ -140,7 +130,6 @@ enum BAG_FAMILY_MASK
     BAG_FAMILY_MASK_CURRENCY_TOKENS           = 0x00002000,
     BAG_FAMILY_MASK_QUEST_ITEMS               = 0x00004000
 };
-
 enum SocketColor
 {
     SOCKET_COLOR_META                           = 1,
@@ -148,9 +137,7 @@ enum SocketColor
     SOCKET_COLOR_YELLOW                         = 4,
     SOCKET_COLOR_BLUE                           = 8
 };
-
 #define SOCKET_COLOR_ALL (SOCKET_COLOR_META | SOCKET_COLOR_RED | SOCKET_COLOR_YELLOW | SOCKET_COLOR_BLUE)
-
 enum InventoryType
 {
     INVTYPE_NON_EQUIP                           = 0,
@@ -183,9 +170,7 @@ enum InventoryType
     INVTYPE_QUIVER                              = 27,
     INVTYPE_RELIC                               = 28
 };
-
 #define MAX_INVTYPE                               29
-
 enum ItemClass
 {
     ITEM_CLASS_CONSUMABLE                       = 0,
@@ -206,9 +191,7 @@ enum ItemClass
     ITEM_CLASS_MISC                             = 15,
     ITEM_CLASS_GLYPH                            = 16
 };
-
 #define MAX_ITEM_CLASS                            17
-
 enum ItemSubclassConsumable
 {
     ITEM_SUBCLASS_CONSUMABLE                    = 0,
@@ -221,9 +204,7 @@ enum ItemSubclassConsumable
     ITEM_SUBCLASS_BANDAGE                       = 7,
     ITEM_SUBCLASS_CONSUMABLE_OTHER              = 8
 };
-
 #define MAX_ITEM_SUBCLASS_CONSUMABLE              9
-
 enum ItemSubclassContainer
 {
     ITEM_SUBCLASS_CONTAINER                     = 0,
@@ -236,9 +217,7 @@ enum ItemSubclassContainer
     ITEM_SUBCLASS_LEATHERWORKING_CONTAINER      = 7,
     ITEM_SUBCLASS_INSCRIPTION_CONTAINER         = 8
 };
-
 #define MAX_ITEM_SUBCLASS_CONTAINER               9
-
 enum ItemSubclassWeapon
 {
     ITEM_SUBCLASS_WEAPON_AXE                    = 0,
@@ -263,13 +242,10 @@ enum ItemSubclassWeapon
     ITEM_SUBCLASS_WEAPON_WAND                   = 19,
     ITEM_SUBCLASS_WEAPON_FISHING_POLE           = 20
 };
-
 #define ITEM_SUBCLASS_MASK_WEAPON_RANGED (\
     (1 << ITEM_SUBCLASS_WEAPON_BOW) | (1 << ITEM_SUBCLASS_WEAPON_GUN) |\
     (1 << ITEM_SUBCLASS_WEAPON_CROSSBOW) | (1 << ITEM_SUBCLASS_WEAPON_THROWN))
-
 #define MAX_ITEM_SUBCLASS_WEAPON                  21
-
 enum ItemSubclassGem
 {
     ITEM_SUBCLASS_GEM_RED                       = 0,
@@ -282,9 +258,7 @@ enum ItemSubclassGem
     ITEM_SUBCLASS_GEM_SIMPLE                    = 7,
     ITEM_SUBCLASS_GEM_PRISMATIC                 = 8
 };
-
 #define MAX_ITEM_SUBCLASS_GEM                     9
-
 enum ItemSubclassArmor
 {
     ITEM_SUBCLASS_ARMOR_MISC                    = 0,
@@ -299,16 +273,12 @@ enum ItemSubclassArmor
     ITEM_SUBCLASS_ARMOR_TOTEM                   = 9,
     ITEM_SUBCLASS_ARMOR_SIGIL                   = 10
 };
-
 #define MAX_ITEM_SUBCLASS_ARMOR                   11
-
 enum ItemSubclassReagent
 {
     ITEM_SUBCLASS_REAGENT                       = 0
 };
-
 #define MAX_ITEM_SUBCLASS_REAGENT                 1
-
 enum ItemSubclassProjectile
 {
     ITEM_SUBCLASS_WAND                          = 0,        // ABS
@@ -317,9 +287,7 @@ enum ItemSubclassProjectile
     ITEM_SUBCLASS_BULLET                        = 3,
     ITEM_SUBCLASS_THROWN                        = 4         // ABS
 };
-
 #define MAX_ITEM_SUBCLASS_PROJECTILE              5
-
 enum ItemSubclassTradeGoods
 {
     ITEM_SUBCLASS_TRADE_GOODS                   = 0,
@@ -339,16 +307,12 @@ enum ItemSubclassTradeGoods
     ITEM_SUBCLASS_ARMOR_ENCHANTMENT             = 14,
     ITEM_SUBCLASS_WEAPON_ENCHANTMENT            = 15
 };
-
 #define MAX_ITEM_SUBCLASS_TRADE_GOODS             16
-
 enum ItemSubclassGeneric
 {
     ITEM_SUBCLASS_GENERIC                       = 0
 };
-
 #define MAX_ITEM_SUBCLASS_GENERIC                 1
-
 enum ItemSubclassRecipe
 {
     ITEM_SUBCLASS_BOOK                          = 0,
@@ -363,16 +327,12 @@ enum ItemSubclassRecipe
     ITEM_SUBCLASS_FISHING_MANUAL                = 9,
     ITEM_SUBCLASS_JEWELCRAFTING_RECIPE          = 10
 };
-
 #define MAX_ITEM_SUBCLASS_RECIPE                  11
-
 enum ItemSubclassMoney
 {
     ITEM_SUBCLASS_MONEY                         = 0
 };
-
 #define MAX_ITEM_SUBCLASS_MONEY                   1
-
 enum ItemSubclassQuiver
 {
     ITEM_SUBCLASS_QUIVER0                       = 0,        // ABS
@@ -380,31 +340,23 @@ enum ItemSubclassQuiver
     ITEM_SUBCLASS_QUIVER                        = 2,
     ITEM_SUBCLASS_AMMO_POUCH                    = 3
 };
-
 #define MAX_ITEM_SUBCLASS_QUIVER                  4
-
 enum ItemSubclassQuest
 {
     ITEM_SUBCLASS_QUEST                         = 0
 };
-
 #define MAX_ITEM_SUBCLASS_QUEST                   1
-
 enum ItemSubclassKey
 {
     ITEM_SUBCLASS_KEY                           = 0,
     ITEM_SUBCLASS_LOCKPICK                      = 1
 };
-
 #define MAX_ITEM_SUBCLASS_KEY                     2
-
 enum ItemSubclassPermanent
 {
     ITEM_SUBCLASS_PERMANENT                     = 0
 };
-
 #define MAX_ITEM_SUBCLASS_PERMANENT               1
-
 enum ItemSubclassJunk
 {
     ITEM_SUBCLASS_JUNK                          = 0,
@@ -414,9 +366,7 @@ enum ItemSubclassJunk
     ITEM_SUBCLASS_JUNK_OTHER                    = 4,
     ITEM_SUBCLASS_JUNK_MOUNT                    = 5
 };
-
 #define MAX_ITEM_SUBCLASS_JUNK                    6
-
 enum ItemSubclassGlyph
 {
     ITEM_SUBCLASS_GLYPH_WARRIOR                 = 1,
@@ -430,9 +380,7 @@ enum ItemSubclassGlyph
     ITEM_SUBCLASS_GLYPH_WARLOCK                 = 9,
     ITEM_SUBCLASS_GLYPH_DRUID                   = 11
 };
-
 #define MAX_ITEM_SUBCLASS_GLYPH                   12
-
 const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
 {
     MAX_ITEM_SUBCLASS_CONSUMABLE,
@@ -453,7 +401,6 @@ const uint32 MaxItemSubclassValues[MAX_ITEM_CLASS] =
     MAX_ITEM_SUBCLASS_JUNK,
     MAX_ITEM_SUBCLASS_GLYPH
 };
-
 inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemSubClass)
 {
     switch(ItemClass)
@@ -463,21 +410,18 @@ inline uint8 ItemSubClassToDurabilityMultiplierId(uint32 ItemClass, uint32 ItemS
     }
     return 0;
 }
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 struct _Damage
 {
     float   DamageMin;
     float   DamageMax;
     uint32  DamageType;                                     // id from Resistances.dbc
 };
-
 struct _ItemStat
 {
     uint32  ItemStatType;
@@ -493,18 +437,15 @@ struct _Spell
     uint32 SpellCategory;                                   // id from SpellCategory.dbc
     int32  SpellCategoryCooldown;
 };
-
 struct _Socket
 {
     uint32 Color;
     uint32 Content;
 };
-
 #define MAX_ITEM_PROTO_DAMAGES 2                            // changed in 3.1.0
 #define MAX_ITEM_PROTO_SOCKETS 3
 #define MAX_ITEM_PROTO_SPELLS  5
 #define MAX_ITEM_PROTO_STATS  10
-
 struct ItemPrototype
 {
     uint32 ItemId;
@@ -580,7 +521,6 @@ struct ItemPrototype
     uint32 FoodType;
     uint32 MinMoneyLoot;
     uint32 MaxMoneyLoot;
-
     // helpers
     bool CanChangeEquipStateInCombat() const
     {
@@ -591,22 +531,18 @@ struct ItemPrototype
             case INVTYPE_HOLDABLE:
                 return true;
         }
-
         switch(Class)
         {
             case ITEM_CLASS_WEAPON:
             case ITEM_CLASS_PROJECTILE:
                 return true;
         }
-
         return false;
     }
-
     uint32 GetMaxStackSize() const
     {
         return (Stackable == 2147483647 || Stackable <= 0) ? uint32(0x7FFFFFFF-1) : uint32(Stackable);
     }
-
     float getDPS() const
     {
         if (Delay == 0)
@@ -616,7 +552,6 @@ struct ItemPrototype
             temp+=Damage[i].DamageMin + Damage[i].DamageMax;
         return temp*500/Delay;
     }
-
     int32 getFeralBonus(int32 extraDPS = 0) const
     {
         // 0x02A5F3 - is mask for Melee weapon from ItemSubClassMask.dbc
@@ -629,19 +564,16 @@ struct ItemPrototype
         }
         return 0;
     }
-
     bool IsPotion() const { return Class==ITEM_CLASS_CONSUMABLE && SubClass==ITEM_SUBCLASS_POTION; }
     bool IsWeaponVellum() const { return Class==ITEM_CLASS_TRADE_GOODS && SubClass==ITEM_SUBCLASS_WEAPON_ENCHANTMENT; }
     bool IsArmorVellum() const { return Class==ITEM_CLASS_TRADE_GOODS && SubClass==ITEM_SUBCLASS_ARMOR_ENCHANTMENT; }
     bool IsConjuredConsumable() const { return Class == ITEM_CLASS_CONSUMABLE && (Flags & ITEM_FLAGS_CONJURED); }
 };
-
 struct ItemLocale
 {
     std::vector<std::string> Name;
     std::vector<std::string> Description;
 };
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
diff --git a/src/game/LFGHandler.cpp b/src/game/LFGHandler.cpp
index ae0baf1b15b..a182e879f93 100644
--- a/src/game/LFGHandler.cpp
+++ b/src/game/LFGHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "WorldSession.h"
 #include "Log.h"
 #include "Database/DatabaseEnv.h"
@@ -25,35 +24,28 @@
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "World.h"
-
 static void AttemptJoin(Player* _player)
 {
     // skip not can autojoin cases and player group case
     if(!_player->m_lookingForGroup.canAutoJoin() || _player->GetGroup())
         return;
-
     //TODO: Guard Player Map
     HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
     {
         Player *plr = iter->second;
-
         // skip enemies and self
         if(!plr || plr==_player || plr->GetTeam() != _player->GetTeam())
             continue;
-
         //skip players not in world
         if(!plr->IsInWorld())
             continue;
-
         // skip not auto add, not group leader cases
         if(!plr->GetSession()->LookingForGroup_auto_add || plr->GetGroup() && plr->GetGroup()->GetLeaderGUID()!=plr->GetGUID())
             continue;
-
         // skip non auto-join or empty slots, or non compatible slots
         if(!plr->m_lookingForGroup.more.canAutoJoin() || !_player->m_lookingForGroup.HaveInSlot(plr->m_lookingForGroup.more))
             continue;
-
         // attempt create group, or skip
         if(!plr->GetGroup())
         {
@@ -63,10 +55,8 @@ static void AttemptJoin(Player* _player)
                 delete group;
                 continue;
             }
-
             objmgr.AddGroup(group);
         }
-
         // stop at success join
         if(plr->GetGroup()->AddMember(_player->GetGUID(), _player->GetName()))
         {
@@ -82,36 +72,28 @@ static void AttemptJoin(Player* _player)
         }
     }
 }
-
 static void AttemptAddMore(Player* _player)
 {
     // skip not group leader case
     if(_player->GetGroup() && _player->GetGroup()->GetLeaderGUID()!=_player->GetGUID())
         return;
-
     if(!_player->m_lookingForGroup.more.canAutoJoin())
         return;
-
     //TODO: Guard Player map
     HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
     {
         Player *plr = iter->second;
-
         // skip enemies and self
         if(!plr || plr==_player || plr->GetTeam() != _player->GetTeam())
             continue;
-
         if(!plr->IsInWorld())
             continue;
-
         // skip not auto join or in group
         if(!plr->GetSession()->LookingForGroup_auto_join || plr->GetGroup() )
             continue;
-
         if(!plr->m_lookingForGroup.HaveInSlot(_player->m_lookingForGroup.more))
             continue;
-
         // attempt create group if need, or stop attempts
         if(!_player->GetGroup())
         {
@@ -121,90 +103,69 @@ static void AttemptAddMore(Player* _player)
                 delete group;
                 return;                                     // can't create group (??)
             }
-
             objmgr.AddGroup(group);
         }
-
         // stop at join fail (full)
         if(!_player->GetGroup()->AddMember(plr->GetGUID(), plr->GetName()) )
         {
             if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER )
                 _player->LeaveLFGChannel();
-
             break;
         }
-
         // joined
         if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && plr->GetSession()->GetSecurity() == SEC_PLAYER )
             plr->LeaveLFGChannel();
-
         // and group full
         if(_player->GetGroup()->IsFull() )
         {
             if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER )
                 _player->LeaveLFGChannel();
-
             break;
         }
     }
 }
-
 void WorldSession::HandleLfgSetAutoJoinOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("CMSG_LFG_SET_AUTOJOIN");
     LookingForGroup_auto_join = true;
-
     if(!_player)                                            // needed because STATUS_AUTHED
         return;
-
     AttemptJoin(_player);
 }
-
 void WorldSession::HandleLfgClearAutoJoinOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("CMSG_LFG_CLEAR_AUTOJOIN");
     LookingForGroup_auto_join = false;
 }
-
 void WorldSession::HandleLfmSetAutoFillOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("CMSG_LFM_SET_AUTOFILL");
     LookingForGroup_auto_add = true;
-
     if(!_player)                                            // needed because STATUS_AUTHED
         return;
-
     AttemptAddMore(_player);
 }
-
 void WorldSession::HandleLfmClearAutoFillOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("CMSG_LFM_CLEAR_AUTOFILL");
     LookingForGroup_auto_add = false;
 }
-
 void WorldSession::HandleLfgClearOpcode( WorldPacket & /*recv_data */ )
 {
     // empty packet
     sLog.outDebug("CMSG_CLEAR_LOOKING_FOR_GROUP");
-
     for(int i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i)
         _player->m_lookingForGroup.slots[i].Clear();
-
     if( sWorld.getConfig(CONFIG_RESTRICTED_LFG_CHANNEL) && _player->GetSession()->GetSecurity() == SEC_PLAYER )
         _player->LeaveLFGChannel();
-
     SendLfgUpdate(0, 0, 0);
 }
-
 void WorldSession::HandleLfmClearOpcode( WorldPacket & /*recv_data */)
 {
     // empty packet
     sLog.outDebug("CMSG_CLEAR_LOOKING_FOR_MORE");
-
     _player->m_lookingForGroup.more.Clear();
 }
-
 void WorldSession::HandleSetLfmOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_SET_LOOKING_FOR_MORE");
@@ -212,60 +173,44 @@ void WorldSession::HandleSetLfmOpcode( WorldPacket & recv_data )
     uint32 temp, entry, type;
     uint8 unk1;
     uint8 unk2[3];
-
     recv_data >> temp >> unk1 >> unk2[0] >> unk2[1] >> unk2[2];
-
     entry = ( temp & 0x00FFFFFF);
     type = ( (temp >> 24) & 0x000000FF);
-
     _player->m_lookingForGroup.more.Set(entry,type);
     sLog.outDebug("LFM set: temp %u, zone %u, type %u", temp, entry, type);
-
     if(LookingForGroup_auto_add)
         AttemptAddMore(_player);
-
     SendLfgResult(type, entry, 1);
 }
-
 void WorldSession::HandleSetLfgCommentOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_SET_LFG_COMMENT");
     //recv_data.hexlike();
-
     std::string comment;
     recv_data >> comment;
     sLog.outDebug("LFG comment %s", comment.c_str());
-
     _player->m_lookingForGroup.comment = comment;
 }
-
 void WorldSession::HandleLookingForGroup(WorldPacket& recv_data)
 {
     sLog.outDebug("MSG_LOOKING_FOR_GROUP");
     //recv_data.hexlike();
     uint32 type, entry, unk;
-
     recv_data >> type >> entry >> unk;
     sLog.outDebug("MSG_LOOKING_FOR_GROUP: type %u, entry %u, unk %u", type, entry, unk);
-
     if(LookingForGroup_auto_add)
         AttemptAddMore(_player);
-
     if(LookingForGroup_auto_join)
         AttemptJoin(_player);
-
     SendLfgResult(type, entry, 0);
     SendLfgUpdate(0, 1, 0);
 }
-
 void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
 {
     uint32 number = 0;
-
     WorldPacket data(MSG_LOOKING_FOR_GROUP);
     data << uint32(type);                                   // type
     data << uint32(entry);                                  // entry from LFGDungeons.dbc
-
     data << uint8(0);
     /*if(uint8)
     {
@@ -275,7 +220,6 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
             uint64; // player guid
         }
     }*/
-
     data << uint32(0);                                      // count2
     data << uint32(0);
     /*for(count2)
@@ -298,42 +242,31 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
             }
         }
     }*/
-
     size_t count3_pos = data.wpos();
     data << uint32(0);                                      // count3
     data << uint32(0);                                      // unk
-
     //TODO: Guard Player map
     HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
     {
         Player *plr = iter->second;
-
         if(!plr || plr->GetTeam() != _player->GetTeam())
             continue;
-
         if(!plr->IsInWorld())
             continue;
-
         if(!plr->m_lookingForGroup.HaveInSlot(entry, type))
             continue;
-
         ++number;
-
         data << uint64(plr->GetGUID());                     // guid
-
         uint32 flags = 0x1FF;
         data << uint32(flags);                              // flags
-
         if(flags & 0x1)
         {
             data << uint8(plr->getLevel());
             data << uint8(plr->getClass());
             data << uint8(plr->getRace());
-
             for(int i = 0; i < 3; ++i)
                 data << uint8(0);                           // spent talents count in specific tab
-
             data << uint32(0);                              // resistances1
             data << uint32(0);                              // spd/heal
             data << uint32(0);                              // spd/heal
@@ -355,28 +288,20 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
             data << uint32(0);                              // combat_rating20
             data << uint32(0);                              // unk
         }
-
         if(flags & 0x2)
             data << plr->m_lookingForGroup.comment;         // comment
-
         if(flags & 0x4)
             data << uint8(0);                               // unk
-
         if(flags & 0x8)
             data << uint64(0);                              // guid from count2 block, not player guid
-
         if(flags & 0x10)
             data << uint8(0);                               // unk
-
         if(flags & 0x20)
             data << uint8(plr->m_lookingForGroup.roles);    // roles
-
         if(flags & 0x40)
             data << uint32(plr->GetZoneId());               // areaid
-
         if(flags & 0x100)
             data << uint8(0);                               // LFG/LFM flag?
-
         if(flags & 0x80)
         {
             for(uint8 j = 0; j < MAX_LOOKING_FOR_GROUP_SLOT; ++j)
@@ -385,48 +310,35 @@ void WorldSession::SendLfgResult(uint32 type, uint32 entry, uint8 lfg_type)
             }
         }
     }
-
     data.put<uint32>(count3_pos, number);                   // fill count placeholder
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleSetLfgOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_SET_LOOKING_FOR_GROUP");
     recv_data.hexlike();
     uint32 slot, temp, entry, type;
     uint8 roles, unk1;
-
     recv_data >> slot >> temp >> roles >> unk1;
-
     entry = ( temp & 0x00FFFFFF);
     type = ( (temp >> 24) & 0x000000FF);
-
     if(slot >= MAX_LOOKING_FOR_GROUP_SLOT)
         return;
-
     _player->m_lookingForGroup.slots[slot].Set(entry, type);
     _player->m_lookingForGroup.roles = roles;
     sLog.outDebug("LFG set: looknumber %u, temp %X, type %u, entry %u", slot, temp, type, entry);
-
     if(LookingForGroup_auto_join)
         AttemptJoin(_player);
-
     //SendLfgResult(type, entry, 0);
     SendLfgUpdate(0, 1, 0);
 }
-
 void WorldSession::HandleLfgSetRoles(WorldPacket &recv_data)
 {
     sLog.outDebug("CMSG_LFG_SET_ROLES");
-
     uint8 roles;
     recv_data >> roles;
-
     _player->m_lookingForGroup.roles = roles;
 }
-
 void WorldSession::SendLfgUpdate(uint8 unk1, uint8 unk2, uint8 unk3)
 {
     WorldPacket data(SMSG_LFG_UPDATE, 3);
diff --git a/src/game/Language.h b/src/game/Language.h
index e38d58f109e..dd16debdaee 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -17,16 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __TRINITY_LANGUAGE_H
 #define __TRINITY_LANGUAGE_H
-
 enum TrinityStrings
 {
     // for chat commands
     LANG_SELECT_CHAR_OR_CREATURE        = 1,
     LANG_SELECT_CREATURE                = 2,
-
     // level 0 chat
     LANG_SYSTEMMESSAGE                  = 3,
     LANG_EVENTMESSAGE                   = 4,
@@ -88,7 +85,6 @@ enum TrinityStrings
     LANG_CONNECTED_PLAYERS              = 60,
     LANG_ACCOUNT_ADDON                  = 61,
     // Room for more level 0              62-99 not used
-
     // level 1 chat
     LANG_GLOBAL_NOTIFY                  = 100,
     LANG_MAP_POSITION                   = 101,
@@ -108,14 +104,12 @@ enum TrinityStrings
     LANG_BAD_VALUE                      = 115,
     LANG_NO_CHAR_SELECTED               = 116,
     LANG_NOT_IN_GROUP                   = 117,
-
     LANG_YOU_CHANGE_HP                  = 118,
     LANG_YOURS_HP_CHANGED               = 119,
     LANG_YOU_CHANGE_MANA                = 120,
     LANG_YOURS_MANA_CHANGED             = 121,
     LANG_YOU_CHANGE_ENERGY              = 122,
     LANG_YOURS_ENERGY_CHANGED           = 123,
-
     LANG_CURRENT_ENERGY                 = 124,              //log
     LANG_YOU_CHANGE_RAGE                = 125,
     LANG_YOURS_RAGE_CHANGED             = 126,
@@ -129,7 +123,6 @@ enum TrinityStrings
     LANG_YOU_REMOVE_TAXIS               = 134,
     LANG_YOURS_TAXIS_ADDED              = 135,
     LANG_YOURS_TAXIS_REMOVED            = 136,
-
     LANG_YOU_CHANGE_ASPEED              = 137,
     LANG_YOURS_ASPEED_CHANGED           = 138,
     LANG_YOU_CHANGE_SPEED               = 139,
@@ -140,13 +133,11 @@ enum TrinityStrings
     LANG_YOURS_BACK_SPEED_CHANGED       = 144,
     LANG_YOU_CHANGE_FLY_SPEED           = 145,
     LANG_YOURS_FLY_SPEED_CHANGED        = 146,
-
     LANG_YOU_CHANGE_SIZE                = 147,
     LANG_YOURS_SIZE_CHANGED             = 148,
     LANG_NO_MOUNT                       = 149,
     LANG_YOU_GIVE_MOUNT                 = 150,
     LANG_MOUNT_GIVED                    = 151,
-
     LANG_CURRENT_MONEY                  = 152,
     LANG_YOU_TAKE_ALL_MONEY             = 153,
     LANG_YOURS_ALL_MONEY_GONE           = 154,
@@ -155,9 +146,7 @@ enum TrinityStrings
     LANG_YOU_GIVE_MONEY                 = 157,
     LANG_YOURS_MONEY_GIVEN              = 158,
     LANG_YOU_HEAR_SOUND                 = 159,
-
     LANG_NEW_MONEY                      = 160,              // Log
-
     LANG_REMOVE_BIT                     = 161,
     LANG_SET_BIT                        = 162,
     LANG_COMMAND_TELE_TABLEEMPTY        = 163,
@@ -166,7 +155,6 @@ enum TrinityStrings
     LANG_COMMAND_TELE_NOLOCATION        = 166,
     //                                    167               // not used
     LANG_COMMAND_TELE_LOCATION          = 168,
-
     LANG_MAIL_SENT                      = 169,
     LANG_SOUND_NOT_EXIST                = 170,
     LANG_CANT_TELEPORT_SELF             = 171,
@@ -175,7 +163,6 @@ enum TrinityStrings
     LANG_YOURS_RUNIC_POWER_CHANGED      = 174,
     LANG_LIQUID_STATUS                  = 175,
     // Room for more level 1              176-199 not used
-
     // level 2 chat
     LANG_NO_SELECTION                   = 200,
     LANG_OBJECT_GUID                    = 201,
@@ -183,24 +170,20 @@ enum TrinityStrings
     LANG_CHARS_ONLY                     = 203,
     LANG_TOO_LONG_SUBNAME               = 204,
     LANG_NOT_IMPLEMENTED                = 205,
-
     LANG_ITEM_ADDED_TO_LIST             = 206,
     LANG_ITEM_NOT_FOUND                 = 207,
     LANG_ITEM_DELETED_FROM_LIST         = 208,
     LANG_ITEM_NOT_IN_LIST               = 209,
     LANG_ITEM_ALREADY_IN_LIST           = 210,
-
     LANG_RESET_SPELLS_ONLINE            = 211,
     LANG_RESET_SPELLS_OFFLINE           = 212,
     LANG_RESET_TALENTS_ONLINE           = 213,
     LANG_RESET_TALENTS_OFFLINE          = 214,
     LANG_RESET_SPELLS                   = 215,
     LANG_RESET_TALENTS                  = 216,
-
     LANG_RESETALL_UNKNOWN_CASE          = 217,
     LANG_RESETALL_SPELLS                = 218,
     LANG_RESETALL_TALENTS               = 219,
-
     LANG_WAYPOINT_NOTFOUND              = 220,
     LANG_WAYPOINT_NOTFOUNDLAST          = 221,
     LANG_WAYPOINT_NOTFOUNDSEARCH        = 222,
@@ -234,19 +217,15 @@ enum TrinityStrings
     LANG_WAYPOINT_INFO_SPELL            = 250,
     LANG_WAYPOINT_INFO_TEXT             = 251,
     LANG_WAYPOINT_INFO_AISCRIPT         = 252,
-
     LANG_RENAME_PLAYER                  = 253,
     LANG_RENAME_PLAYER_GUID             = 254,
-
     LANG_WAYPOINT_WPCREATNOTFOUND       = 255,
     LANG_WAYPOINT_NPCNOTFOUND           = 256,
-
     LANG_MOVE_TYPE_SET                  = 257,
     LANG_MOVE_TYPE_SET_NODEL            = 258,
     LANG_USE_BOL                        = 259,
     LANG_VALUE_SAVED                    = 260,
     LANG_VALUE_SAVED_REJOIN             = 261,
-
     LANG_COMMAND_GOAREATRNOTFOUND       = 262,
     LANG_INVALID_TARGET_COORD           = 263,
     LANG_INVALID_ZONE_COORD             = 264,
@@ -274,18 +253,15 @@ enum TrinityStrings
     LANG_COMMAND_WHISPEROFF             = 286,
     LANG_COMMAND_CREATGUIDNOTFOUND      = 287,
       // TICKET STRINGS NEED REWRITE // 288-296 FREE
-
       // END
     LANG_COMMAND_SPAWNDIST              = 297,
     LANG_COMMAND_SPAWNTIME              = 298,
     LANG_COMMAND_MODIFY_HONOR           = 299,
-
     LANG_YOUR_CHAT_DISABLED             = 300,
     LANG_YOU_DISABLE_CHAT               = 301,
     LANG_CHAT_ALREADY_ENABLED           = 302,
     LANG_YOUR_CHAT_ENABLED              = 303,
     LANG_YOU_ENABLE_CHAT                = 304,
-
     LANG_COMMAND_MODIFY_REP             = 305,
     LANG_COMMAND_MODIFY_ARENA           = 306,
     LANG_COMMAND_FACTION_NOTFOUND       = 307,
@@ -331,7 +307,6 @@ enum TrinityStrings
     LANG_COMMAND_GOTAXINODENOTFOUND     = 347,
     LANG_GAMEOBJECT_HAVE_INVALID_DATA   = 348,
     // Room for more level 2              349-399 not used
-
     // level 3 chat
     LANG_SCRIPTS_RELOADED               = 400,
     LANG_YOU_CHANGE_SECURITY            = 401,
@@ -341,16 +316,12 @@ enum TrinityStrings
     LANG_CREATURE_MOVE_ENABLED          = 405,
     LANG_NO_WEATHER                     = 406,
     LANG_WEATHER_DISABLED               = 407,
-
     LANG_BAN_YOUBANNED                  = 408,
     LANG_BAN_YOUPERMBANNED              = 409,
     LANG_BAN_NOTFOUND                   = 410,
-
     LANG_UNBAN_UNBANNED                 = 411,
     LANG_UNBAN_ERROR                    = 412,
-
     LANG_ACCOUNT_NOT_EXIST              = 413,
-
     LANG_BANINFO_NOCHARACTER            = 414,
     LANG_BANINFO_NOIP                   = 415,
     LANG_BANINFO_NOACCOUNTBAN           = 416,
@@ -361,13 +332,11 @@ enum TrinityStrings
     LANG_BANINFO_YES                    = 421,
     LANG_BANINFO_NO                     = 422,
     LANG_BANINFO_IPENTRY                = 423,
-
     LANG_BANLIST_NOIP                   = 424,
     LANG_BANLIST_NOACCOUNT              = 425,
     LANG_BANLIST_NOCHARACTER            = 426,
     LANG_BANLIST_MATCHINGIP             = 427,
     LANG_BANLIST_MATCHINGACCOUNT        = 428,
-
     LANG_COMMAND_LEARN_MANY_SPELLS      = 429,
     LANG_COMMAND_LEARN_CLASS_SPELLS     = 430,
     LANG_COMMAND_LEARN_CLASS_TALENTS    = 431,
@@ -410,28 +379,21 @@ enum TrinityStrings
     LANG_COMMAND_TARGET_AURADETAIL      = 468,
     LANG_COMMAND_TARGET_LISTAURATYPE    = 469,
     LANG_COMMAND_TARGET_AURASIMPLE      = 470,
-
     LANG_COMMAND_QUEST_NOTFOUND         = 471,
     LANG_COMMAND_QUEST_STARTFROMITEM    = 472,
     LANG_COMMAND_QUEST_REMOVED          = 473,
     LANG_COMMAND_QUEST_REWARDED         = 474,
     LANG_COMMAND_QUEST_COMPLETE         = 475,
     LANG_COMMAND_QUEST_ACTIVE           = 476,
-
     LANG_COMMAND_FLYMODE_STATUS         = 477,
-
     LANG_COMMAND_OPCODESENT             = 478,
-
     LANG_COMMAND_IMPORT_SUCCESS         = 479,
     LANG_COMMAND_IMPORT_FAILED          = 480,
     LANG_COMMAND_EXPORT_SUCCESS         = 481,
     LANG_COMMAND_EXPORT_FAILED          = 482,
-
     LANG_COMMAND_SPELL_BROKEN           = 483,
-
     LANG_SET_SKILL                      = 484,
     LANG_SET_SKILL_ERROR                = 485,
-
     LANG_INVALID_SKILL_ID               = 486,
     LANG_LEARNING_GM_SKILLS             = 487,
     LANG_YOU_KNOWN_SPELL                = 488,
@@ -440,7 +402,6 @@ enum TrinityStrings
     LANG_FORGET_SPELL                   = 491,
     LANG_REMOVEALL_COOLDOWN             = 492,
     LANG_REMOVE_COOLDOWN                = 493,
-
     LANG_ADDITEM                        = 494,              //log
     LANG_ADDITEMSET                     = 495,              //log
     LANG_REMOVEITEM                     = 496,
@@ -450,9 +411,7 @@ enum TrinityStrings
     LANG_PLAYER_IN_GUILD                = 500,
     LANG_GUILD_NOT_CREATED              = 501,
     LANG_NO_ITEMS_FROM_ITEMSET_FOUND    = 502,
-
     LANG_DISTANCE                       = 503,
-
     LANG_ITEM_SLOT                      = 504,
     LANG_ITEM_SLOT_NOT_EXIST            = 505,
     LANG_ITEM_ADDED_TO_SLOT             = 506,
@@ -460,7 +419,6 @@ enum TrinityStrings
     LANG_ITEMLIST_SLOT                  = 508,
     LANG_ITEMLIST_MAIL                  = 509,
     LANG_ITEMLIST_AUCTION               = 510,
-
     LANG_WRONG_LINK_TYPE                = 511,
     LANG_ITEM_LIST_CHAT                 = 512,
     LANG_QUEST_LIST_CHAT                = 513,
@@ -472,13 +430,10 @@ enum TrinityStrings
     LANG_TELE_LIST                      = 519,
     LANG_SPELL_LIST                     = 520,
     LANG_SKILL_LIST_CHAT                = 521,
-
     LANG_GAMEOBJECT_NOT_EXIST           = 522,
-
     LANG_GAMEOBJECT_CURRENT             = 523,              //log
     LANG_GAMEOBJECT_DETAIL              = 524,
     LANG_GAMEOBJECT_ADD                 = 525,
-
     LANG_MOVEGENS_LIST                  = 526,
     LANG_MOVEGENS_IDLE                  = 527,
     LANG_MOVEGENS_RANDOM                = 528,
@@ -492,7 +447,6 @@ enum TrinityStrings
     LANG_MOVEGENS_HOME_PLAYER           = 536,
     LANG_MOVEGENS_FLIGHT                = 537,
     LANG_MOVEGENS_UNKNOWN               = 538,
-
     LANG_NPCINFO_CHAR                   = 539,
     LANG_NPCINFO_LEVEL                  = 540,
     LANG_NPCINFO_HEALTH                 = 541,
@@ -502,16 +456,13 @@ enum TrinityStrings
     LANG_NPCINFO_VENDOR                 = 545,
     LANG_NPCINFO_TRAINER                = 546,
     LANG_NPCINFO_DUNGEON_ID             = 547,
-
     LANG_PINFO_ACCOUNT                  = 548,
     LANG_PINFO_LEVEL                    = 549,
     LANG_PINFO_NO_REP                   = 550,
-
     LANG_YOU_SET_EXPLORE_ALL            = 551,
     LANG_YOU_SET_EXPLORE_NOTHING        = 552,
     LANG_YOURS_EXPLORE_SET_ALL          = 553,
     LANG_YOURS_EXPLORE_SET_NOTHING      = 554,
-
     LANG_HOVER_ENABLED                  = 555,
     LANG_HOVER_DISABLED                 = 556,
     LANG_YOURS_LEVEL_UP                 = 557,
@@ -519,7 +470,6 @@ enum TrinityStrings
     LANG_YOURS_LEVEL_PROGRESS_RESET     = 559,
     LANG_EXPLORE_AREA                   = 560,
     LANG_UNEXPLORE_AREA                 = 561,
-
     LANG_UPDATE                         = 562,
     LANG_UPDATE_CHANGE                  = 563,
     LANG_TOO_BIG_INDEX                  = 564,
@@ -535,26 +485,21 @@ enum TrinityStrings
     LANG_SET_32BIT_FIELD                = 574,
     LANG_CHANGE_32BIT                   = 575,              //log
     LANG_CHANGE_32BIT_FIELD             = 576,
-
     LANG_INVISIBLE_INVISIBLE              = 577,
     LANG_INVISIBLE_VISIBLE                = 578,
     LANG_SELECTED_TARGET_NOT_HAVE_VICTIM  = 579,
-
     LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST = 580,
     LANG_COMMAND_NEAROBJMESSAGE         = 581,
     LANG_COMMAND_RAWPAWNTIMES           = 582,
-
     LANG_EVENT_ENTRY_LIST_CHAT          = 583,
     LANG_NOEVENTFOUND                   = 584,
     LANG_EVENT_NOT_EXIST                = 585,
     LANG_EVENT_INFO                     = 586,
     LANG_EVENT_ALREADY_ACTIVE           = 587,
     LANG_EVENT_NOT_ACTIVE               = 588,
-
     LANG_MOVEGENS_POINT                 = 589,
     LANG_MOVEGENS_FEAR                  = 590,
     LANG_MOVEGENS_DISTRACT              = 591,
-
     LANG_COMMAND_LEARN_ALL_RECIPES      = 592,
     LANG_BANLIST_ACCOUNTS               = 593,
     LANG_BANLIST_ACCOUNTS_HEADER        = 594,
@@ -564,16 +509,13 @@ enum TrinityStrings
     LANG_GMLIST_HEADER                  = 598,
     LANG_GMLIST_EMPTY                   = 599,
     // End Level 3 list, continued at 1100
-
     // Battleground
     LANG_BG_A_WINS                      = 600,
     LANG_BG_H_WINS                      = 601,
-
     LANG_BG_WS_START_TWO_MINUTES        = 753,
     LANG_BG_WS_START_ONE_MINUTE         = 602,
     LANG_BG_WS_START_HALF_MINUTE        = 603,
     LANG_BG_WS_HAS_BEGUN                = 604,
-
     LANG_BG_WS_CAPTURED_HF              = 605,
     LANG_BG_WS_CAPTURED_AF              = 606,
     LANG_BG_WS_DROPPED_HF               = 607,
@@ -585,12 +527,10 @@ enum TrinityStrings
     LANG_BG_WS_F_PLACED                 = 613,
     LANG_BG_WS_ALLIANCE_FLAG_RESPAWNED  = 614,
     LANG_BG_WS_HORDE_FLAG_RESPAWNED     = 615,
-
     LANG_BG_EY_START_TWO_MINUTES        = 755,
     LANG_BG_EY_START_ONE_MINUTE         = 636,
     LANG_BG_EY_START_HALF_MINUTE        = 637,
     LANG_BG_EY_HAS_BEGUN                = 638,
-
     LANG_BG_AB_ALLY                     = 650,
     LANG_BG_AB_HORDE                    = 651,
     LANG_BG_AB_NODE_STABLES             = 652,
@@ -602,7 +542,6 @@ enum TrinityStrings
     LANG_BG_AB_NODE_DEFENDED            = 658,
     LANG_BG_AB_NODE_ASSAULTED           = 659,
     LANG_BG_AB_NODE_CLAIMED             = 660,
-
     LANG_BG_AB_START_TWO_MINUTES        = 754,
     LANG_BG_AB_START_ONE_MINUTE         = 661,
     LANG_BG_AB_START_HALF_MINUTE        = 662,
@@ -610,7 +549,6 @@ enum TrinityStrings
     LANG_BG_AB_A_NEAR_VICTORY           = 664,
     LANG_BG_AB_H_NEAR_VICTORY           = 665,
     LANG_BG_MARK_BY_MAIL                = 666,
-
     LANG_BG_EY_HAS_TAKEN_A_M_TOWER      = 667,
     LANG_BG_EY_HAS_TAKEN_H_M_TOWER      = 668,
     LANG_BG_EY_HAS_TAKEN_A_D_RUINS      = 669,
@@ -632,20 +570,17 @@ enum TrinityStrings
     LANG_BG_EY_CAPTURED_FLAG_H          = 685,
     LANG_BG_EY_DROPPED_FLAG             = 686,
     LANG_BG_EY_RESETED_FLAG             = 687,
-
     LANG_ARENA_ONE_TOOLOW               = 700,
     LANG_ARENA_ONE_MINUTE               = 701,
     LANG_ARENA_THIRTY_SECONDS           = 702,
     LANG_ARENA_FIFTEEN_SECONDS          = 703,
     LANG_ARENA_HAS_BEGUN                = 704,
-
     LANG_WAIT_BEFORE_SPEAKING           = 705,
     LANG_NOT_EQUIPPED_ITEM              = 706,
     LANG_PLAYER_DND                     = 707,
     LANG_PLAYER_AFK                     = 708,
     LANG_PLAYER_DND_DEFAULT             = 709,
     LANG_PLAYER_AFK_DEFAULT             = 710,
-
     LANG_BG_QUEUE_ANNOUNCE_SELF         = 711,
     LANG_BG_QUEUE_ANNOUNCE_WORLD        = 712,
     LANG_YOUR_ARENA_LEVEL_REQ_ERROR     = 713,
@@ -655,7 +590,6 @@ enum TrinityStrings
     LANG_BG_STARTED_ANNOUNCE_WORLD      = 717,
     LANG_ARENA_QUEUE_ANNOUNCE_WORLD_JOIN= 718,
     LANG_ARENA_QUEUE_ANNOUNCE_WORLD_EXIT= 719,
-
     LANG_BG_GROUP_TOO_LARGE             = 720,              // "Your group is too large for this battleground. Please regroup to join."
     LANG_ARENA_GROUP_TOO_LARGE          = 721,              // "Your group is too large for this arena. Please regroup to join."
     LANG_ARENA_YOUR_TEAM_ONLY           = 722,              // "Your group has members not in your arena team. Please regroup to join."
@@ -669,7 +603,6 @@ enum TrinityStrings
     LANG_BG_GROUP_MEMBER_ALREADY_IN_QUEUE = 730,            // "Someone in your party is already in this battleground queue. (S)he must leave it before joining as group."
     LANG_BG_GROUP_MEMBER_DESERTER       = 731,              // "Someone in your party is Deserter. You can't join as group."
     LANG_BG_GROUP_MEMBER_NO_FREE_QUEUE_SLOTS = 732,         // "Someone in your party is already in three battleground queues. You cannot join as group."
-
     LANG_CANNOT_TELE_TO_BG              = 733,              // "You cannot teleport to a battleground or arena map."
     LANG_CANNOT_SUMMON_TO_BG            = 734,              // "You cannot summon players to a battleground or arena map."
     LANG_CANNOT_GO_TO_BG_GM             = 735,              // "You must be in GM mode to teleport to a player in a battleground."
@@ -694,12 +627,10 @@ enum TrinityStrings
 //  LANG_BG_AB_START_TWO_MINUTES        = 754, - defined above
 //  LANG_BG_EY_START_TWO_MINUTES        = 755, - defined above
     // Room for batleground/arena strings 756-799 not used
-
     // Room for BG/ARENA                  751-769 not used
     LANG_ARENA_TESTING                  = 785,
     LANG_AUTO_ANN                       = 786,
     LANG_ANNOUNCE_COLOR                 = 787,
-
     // in game strings
     LANG_PET_INVALID_NAME               = 800,
     LANG_NOT_ENOUGH_GOLD                = 801,
@@ -718,7 +649,6 @@ enum TrinityStrings
     LANG_GUILD_MEMBER                   = 814,
     LANG_GUILD_INITIATE                 = 815,
     // Room for in-game strings           816-999 not used
-
     // Level 4 (CLI only commands)
     LANG_COMMAND_EXIT                   = 1000,
     LANG_ACCOUNT_DELETED                = 1001,
@@ -736,7 +666,6 @@ enum TrinityStrings
     LANG_ACCOUNT_LIST_LINE              = 1013,
     LANG_ACCOUNT_LIST_EMPTY             = 1014,
     // Room for more level 4              1015-1099 not used
-
     // Level 3 (continue)
     LANG_ACCOUNT_SETADDON               = 1100,
     LANG_MOTD_NEW                       = 1101,
@@ -769,14 +698,11 @@ enum TrinityStrings
     LANG_TAXINODE_ENTRY_LIST_CHAT       = 1128,
     LANG_TAXINODE_ENTRY_LIST_CONSOLE    = 1129,
     // Room for more level 3              1130-1199 not used
-
     // Debug commands
     LANG_CINEMATIC_NOT_EXIST            = 1200,
     LANG_MOVIE_NOT_EXIST                = 1201,
     // Room for more debug                1202-1299 not used
-
     // FREE IDS                           1300-9999
-
     // AV
     LANG_BG_AV_ALLY                     = 1300,
     LANG_BG_AV_HORDE                    = 1301,
@@ -786,11 +712,9 @@ enum TrinityStrings
     LANG_BG_AV_GRAVE_TAKEN              = 1305,
     LANG_BG_AV_GRAVE_DEFENDED           = 1306,
     LANG_BG_AV_GRAVE_ASSAULTED          = 1307,
-
     LANG_BG_AV_MINE_TAKEN               = 1308,
     LANG_BG_AV_MINE_NORTH               = 1309,
     LANG_BG_AV_MINE_SOUTH               = 1310,
-
     LANG_BG_AV_NODE_GRAVE_STORM_AID     = 1311,
     LANG_BG_AV_NODE_TOWER_DUN_S         = 1312,
     LANG_BG_AV_NODE_TOWER_DUN_N         = 1313,
@@ -806,7 +730,6 @@ enum TrinityStrings
     LANG_BG_AV_NODE_TOWER_FROST_E       = 1323,
     LANG_BG_AV_NODE_TOWER_FROST_W       = 1324,
     LANG_BG_AV_NODE_GRAVE_FROST_HUT     = 1325,
-
     LANG_BG_AV_START_ONE_MINUTE         = 1326,
     LANG_BG_AV_START_HALF_MINUTE        = 1327,
     LANG_BG_AV_HAS_BEGUN                = 1328,
@@ -816,7 +739,6 @@ enum TrinityStrings
     LANG_BG_AV_A_CAPTAIN_DEAD           = 1332,
     LANG_BG_AV_START_TWO_MINUTES        = 1333,
     // FREE IDS                           1334-1999
-
     // Ticket Strings 2000-2029
     LANG_COMMAND_TICKETNEW              = 2000,
     LANG_COMMAND_TICKETUPDATED          = 2001,
@@ -844,7 +766,6 @@ enum TrinityStrings
     LANG_COMMAND_TICKETLISTCOMMENT      = 2023,
     LANG_COMMAND_TICKETLISTADDCOMMENT   = 2024,
     LANG_COMMAND_TICKETLISTAGECREATE    = 2025,
-
     // Trinity strings                    5000-9999
     LANG_COMMAND_FREEZE                 = 5000,
     LANG_COMMAND_FREEZE_ERROR           = 5001,
@@ -872,13 +793,10 @@ enum TrinityStrings
     LANG_GM_BROADCAST                    = 6613,
     LANG_GM_NOTIFY                       = 6614,
     LANG_GM_ANNOUNCE_COLOR               = 6615,
-
     LANG_GM_SILENCE                      = 6616,              // "Silence is ON for %s" - Spell 1852
-
     LANG_WORLD_CLOSED                    = 7523,
     LANG_WORLD_OPENED                    = 7524,
 
-
     // Use for not-in-offcial-sources patches
     //                                    10000-10999
     // opvp hp
@@ -943,10 +861,8 @@ enum TrinityStrings
     LANG_OPVP_EP_FLIGHT_CGT             = 10053,
     LANG_OPVP_ZM_GOSSIP_ALLIANCE        = 10054,
     LANG_OPVP_ZM_GOSSIP_HORDE           = 10055,
-
     // Use for custom patches             11000-11999
     LANG_AUTO_BROADCAST                 = 11000,
-
     // NOT RESERVED IDS                   12000-1999999999
     // `db_script_string` table index     2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
     // For other tables maybe             2000010000-2147483647 (max index)
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp
index 890e8a9c3c9..258440bd41a 100644
--- a/src/game/Level0.cpp
+++ b/src/game/Level0.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "World.h"
@@ -30,7 +29,6 @@
 #include "SystemConfig.h"
 #include "revision.h"
 #include "Util.h"
-
 bool ChatHandler::HandleHelpCommand(const char* args)
 {
     char* cmd = strtok((char*)args, " ");
@@ -44,53 +42,44 @@ bool ChatHandler::HandleHelpCommand(const char* args)
         if(!ShowHelpForCommand(getCommandTable(), cmd))
             SendSysMessage(LANG_NO_HELP_CMD);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleCommandsCommand(const char* args)
 {
     ShowHelpForCommand(getCommandTable(), "");
     return true;
 }
-
 bool ChatHandler::HandleAccountCommand(const char* /*args*/)
 {
     AccountTypes gmlevel = m_session->GetSecurity();
     PSendSysMessage(LANG_ACCOUNT_LEVEL, uint32(gmlevel));
     return true;
 }
-
 bool ChatHandler::HandleStartCommand(const char* /*args*/)
 {
     Player *chr = m_session->GetPlayer();
-
     if(chr->isInFlight())
     {
         SendSysMessage(LANG_YOU_IN_FLIGHT);
         SetSentErrorMessage(true);
         return false;
     }
-
     if(chr->isInCombat())
     {
         SendSysMessage(LANG_YOU_IN_COMBAT);
         SetSentErrorMessage(true);
         return false;
     }
-    
     if((chr->isDead()) || (chr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST)))
     {
     // if player is dead and stuck, send ghost to graveyard
     chr->RepopAtGraveyard();
     return true;
     }
-
     // cast spell Stuck
     chr->CastSpell(chr,7355,false);
     return true;
 }
-
 bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
 {
     uint32 PlayersNum = sWorld.GetPlayerCount();
@@ -101,13 +90,11 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
     uint32 maxQueuedClientsNum = sWorld.GetMaxQueuedSessionCount();
     std::string uptime = secsToTimeString(sWorld.GetUptime());
     uint32 updateTime = sWorld.GetUpdateTime();
-
     PSendSysMessage(_FULLVERSION);
     //if(m_session)
     //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,"|cffffffff|Hurl:" REVISION_ID "|h" REVISION_ID "|h|r");
     //else
     //    full = _FULLVERSION(REVISION_DATE,REVISION_TIME,REVISION_ID);
-
     //SendSysMessage(full);
     //PSendSysMessage(LANG_USING_SCRIPT_LIB,sWorld.GetScriptsVersion());
     //PSendSysMessage(LANG_USING_WORLD_DB,sWorld.GetDBVersion());
@@ -116,10 +103,8 @@ bool ChatHandler::HandleServerInfoCommand(const char* /*args*/)
     PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
     PSendSysMessage(LANG_UPTIME, uptime.c_str());
     PSendSysMessage("Update time diff: %u.", updateTime);
-
     return true;
 }
-
 bool ChatHandler::HandleDismountCommand(const char* /*args*/)
 {
     //If player is not mounted, so go out :)
@@ -129,23 +114,19 @@ bool ChatHandler::HandleDismountCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(m_session->GetPlayer( )->isInFlight())
     {
         SendSysMessage(LANG_YOU_IN_FLIGHT);
         SetSentErrorMessage(true);
         return false;
     }
-
     m_session->GetPlayer()->Unmount();
     m_session->GetPlayer()->RemoveAurasByType(SPELL_AURA_MOUNTED);
     return true;
 }
-
 bool ChatHandler::HandleSaveCommand(const char* /*args*/)
 {
     Player *player=m_session->GetPlayer();
-
     // save GM account without delay and output message (testing, etc)
     if(m_session->GetSecurity() > SEC_PLAYER)
     {
@@ -153,19 +134,15 @@ bool ChatHandler::HandleSaveCommand(const char* /*args*/)
         SendSysMessage(LANG_PLAYER_SAVED);
         return true;
     }
-
     // save or plan save after 20 sec (logout delay) if current next save time more this value and _not_ output any messages to prevent cheat planning
     uint32 save_interval = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
     if ((save_interval==0 || save_interval > 20*IN_MILISECONDS && player->GetSaveTimer() <= save_interval - 20*IN_MILISECONDS))
         player->SaveToDB();
-
     return true;
 }
-
 bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
 {
     bool first = true;
-
     HashMapHolder<Player>::MapType &m = HashMapHolder<Player>::GetContainer();
     HashMapHolder<Player>::MapType::const_iterator itr = m.begin();
     for(; itr != m.end(); ++itr)
@@ -179,49 +156,38 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
                 SendSysMessage(LANG_GMS_ON_SRV);
                 first = false;
             }
-
             SendSysMessage(GetNameLink(itr->second).c_str());
         }
     }
-
     if(first)
         SendSysMessage(LANG_GMS_NOT_LOGGED);
-
     return true;
 }
-
 bool ChatHandler::HandleAccountPasswordCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char *old_pass = strtok ((char*)args, " ");
     char *new_pass = strtok (NULL, " ");
     char *new_pass_c  = strtok (NULL, " ");
-
     if (!old_pass || !new_pass || !new_pass_c)
         return false;
-
     std::string password_old = old_pass;
     std::string password_new = new_pass;
     std::string password_new_c = new_pass_c;
-
     if (strcmp(new_pass, new_pass_c) != 0)
     {
         SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
         SetSentErrorMessage (true);
         return false;
     }
-
     if (!accmgr.CheckPassword (m_session->GetAccountId(), password_old))
     {
         SendSysMessage (LANG_COMMAND_WRONGOLDPASSWORD);
         SetSentErrorMessage (true);
         return false;
     }
-
     AccountOpResult result = accmgr.ChangePassword(m_session->GetAccountId(), password_new);
-
     switch(result)
     {
         case AOR_OK:
@@ -237,29 +203,22 @@ bool ChatHandler::HandleAccountPasswordCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleAccountAddonCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char *szExp = strtok((char*)args," ");
-
     uint32 account_id = m_session->GetAccountId();
-
     int expansion=atoi(szExp);                                    //get int anyway (0 if error)
     if(expansion < 0 || expansion > sWorld.getConfig(CONFIG_EXPANSION))
          return false;
-
     // No SQL injection
     loginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'", expansion, account_id);
     PSendSysMessage(LANG_ACCOUNT_ADDON, expansion);
     return true;
 }
-
 bool ChatHandler::HandleAccountLockCommand(const char* args)
 {
     if (!*args)
@@ -267,7 +226,6 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
         SendSysMessage(LANG_USE_BOL);
         return true;
     }
-
     std::string argstr = (char*)args;
     if (argstr == "on")
     {
@@ -275,18 +233,15 @@ bool ChatHandler::HandleAccountLockCommand(const char* args)
         PSendSysMessage(LANG_COMMAND_ACCLOCKLOCKED);
         return true;
     }
-
     if (argstr == "off")
     {
         loginDatabase.PExecute( "UPDATE account SET locked = '0' WHERE id = '%d'",m_session->GetAccountId());
         PSendSysMessage(LANG_COMMAND_ACCLOCKUNLOCKED);
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     return true;
 }
-
 /// Display the 'Message of the day' for the realm
 bool ChatHandler::HandleServerMotdCommand(const char* /*args*/)
 {
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 160d65cd5cf..1108e9e1240 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -34,17 +33,14 @@
 #include "CellImpl.h"
 #include "InstanceSaveMgr.h"
 #include "Util.h"
-
 #ifdef _DEBUG_VMAPS
 #include "VMapFactory.h"
 #endif
-
 //-----------------------Npc Commands-----------------------
 bool ChatHandler::HandleNpcSayCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Creature* pCreature = getSelectedCreature();
     if(!pCreature)
     {
@@ -52,9 +48,7 @@ bool ChatHandler::HandleNpcSayCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->MonsterSay(args, LANG_UNIVERSAL, 0);
-
     // make some emotes
     char lastchar = args[strlen(args) - 1];
     switch(lastchar)
@@ -63,15 +57,12 @@ bool ChatHandler::HandleNpcSayCommand(const char* args)
         case '!':   pCreature->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION);   break;
         default:    pCreature->HandleEmoteCommand(EMOTE_ONESHOT_TALK);          break;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleNpcYellCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Creature* pCreature = getSelectedCreature();
     if(!pCreature)
     {
@@ -79,136 +70,103 @@ bool ChatHandler::HandleNpcYellCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->MonsterYell(args, LANG_UNIVERSAL, 0);
-
     // make an emote
     pCreature->HandleEmoteCommand(EMOTE_ONESHOT_SHOUT);
-
     return true;
 }
-
 //show text emote by creature in chat
 bool ChatHandler::HandleNpcTextEmoteCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Creature* pCreature = getSelectedCreature();
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->MonsterTextEmote(args, 0);
-
     return true;
 }
-
 // make npc whisper to player
 bool ChatHandler::HandleNpcWhisperCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* receiver_str = strtok((char*)args, " ");
     char* text = strtok(NULL, "");
-
     uint64 guid = m_session->GetPlayer()->GetSelection();
     Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(guid);
-
     if(!pCreature || !receiver_str || !text)
     {
         return false;
     }
-
     uint64 receiver_guid= atol(receiver_str);
-
     // check online security
     if (HasLowerSecurity(objmgr.GetPlayer(receiver_guid), 0))
         return false;
-
     pCreature->MonsterWhisper(text,receiver_guid);
-
     return true;
 }
 //----------------------------------------------------------
-
 bool ChatHandler::HandleNameAnnounceCommand(const char* args)
 {
     WorldPacket data;
     if(!*args)
         return false;
-
     sWorld.SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args);
     return true;
 }
-
 bool ChatHandler::HandleGMNameAnnounceCommand(const char* args)
 {
     WorldPacket data;
     if(!*args)
         return false;
-
     sWorld.SendGMText(LANG_GM_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args);
     return true;
 }
-
 // global announce
 bool ChatHandler::HandleAnnounceCommand(const char* args)
 {
     if(!*args)
         return false;
-
     sWorld.SendWorldText(LANG_SYSTEMMESSAGE,args);
     return true;
 }
-
 // announce to logged in GMs
 bool ChatHandler::HandleGMAnnounceCommand(const char* args)
 {
     if(!*args)
         return false;
-
     sWorld.SendGMText(LANG_GM_BROADCAST,args);
     return true;
 }
-
 //notification player at the screen
 bool ChatHandler::HandleNotifyCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string str = GetTrinityString(LANG_GLOBAL_NOTIFY);
     str += args;
-
     WorldPacket data(SMSG_NOTIFICATION, (str.size()+1));
     data << str;
     sWorld.SendGlobalMessage(&data);
-
     return true;
 }
-
 //notification GM at the screen
 bool ChatHandler::HandleGMNotifyCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string str = GetTrinityString(LANG_GM_NOTIFY);
     str += args;
-
     WorldPacket data(SMSG_NOTIFICATION, (str.size()+1));
     data << str;
     sWorld.SendGlobalGMMessage(&data);
-
     return true;
 }
-
 //Enable\Dissable GM Mode
 bool ChatHandler::HandleGMCommand(const char* args)
 {
@@ -220,9 +178,7 @@ bool ChatHandler::HandleGMCommand(const char* args)
             m_session->SendNotification(LANG_GM_OFF);
         return true;
     }
-
     std::string argstr = (char*)args;
-
     if (argstr == "on")
     {
         m_session->GetPlayer()->SetGameMaster(true);
@@ -233,7 +189,6 @@ bool ChatHandler::HandleGMCommand(const char* args)
         #endif
         return true;
     }
-
     if (argstr == "off")
     {
         m_session->GetPlayer()->SetGameMaster(false);
@@ -244,12 +199,10 @@ bool ChatHandler::HandleGMCommand(const char* args)
         #endif
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
-
 // Enables or disables hiding of the staff badge
 bool ChatHandler::HandleGMChatCommand(const char* args)
 {
@@ -261,28 +214,23 @@ bool ChatHandler::HandleGMChatCommand(const char* args)
             m_session->SendNotification(LANG_GM_CHAT_OFF);
         return true;
     }
-
     std::string argstr = (char*)args;
-
     if (argstr == "on")
     {
         m_session->GetPlayer()->SetGMChat(true);
         m_session->SendNotification(LANG_GM_CHAT_ON);
         return true;
     }
-
     if (argstr == "off")
     {
         m_session->GetPlayer()->SetGMChat(false);
         m_session->SendNotification(LANG_GM_CHAT_OFF);
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
-
 std::string ChatHandler::PGetParseString(int32 entry, ...)
 {
         const char *format = GetTrinityString(entry);
@@ -293,7 +241,6 @@ std::string ChatHandler::PGetParseString(int32 entry, ...)
         va_end(ap);
         return (std::string)str;
 }
-
 bool ChatHandler::HandleGMTicketListCommand(const char* args)
 {
     SendSysMessage(LANG_COMMAND_TICKETSHOWLIST);
@@ -316,7 +263,6 @@ bool ChatHandler::HandleGMTicketListCommand(const char* args)
     return true;
 }
 
-
 bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args)
 {
     SendSysMessage(LANG_COMMAND_TICKETSHOWONLINELIST);
@@ -324,7 +270,6 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args)
     {
         if((*itr)->closed != 0 || !objmgr.GetPlayer((*itr)->playerGuid))
             continue;
-
         std::string gmname;
         std::stringstream ss;
         ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, (*itr)->guid);
@@ -339,7 +284,6 @@ bool ChatHandler::HandleGMTicketListOnlineCommand(const char* args)
     }
     return true;
 }
-
 bool ChatHandler::HandleGMTicketListClosedCommand(const char* args)
 {
     SendSysMessage(LANG_COMMAND_TICKETSHOWCLOSEDLIST);
@@ -347,7 +291,6 @@ bool ChatHandler::HandleGMTicketListClosedCommand(const char* args)
     {
         if((*itr)->closed == 0)
             continue;
-
         std::string gmname;
         std::stringstream ss;
         ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, (*itr)->guid);
@@ -362,12 +305,10 @@ bool ChatHandler::HandleGMTicketListClosedCommand(const char* args)
     }
     return true;
 }
-
 bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint64 tguid = atoi(args);
     GM_Ticket *ticket = objmgr.GetGMTicket(tguid);
     if(!ticket || ticket->closed != 0)
@@ -375,7 +316,6 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args)
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
         return true;
     }
-
     std::string gmname;
     std::stringstream ss;
     ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
@@ -394,29 +334,24 @@ bool ChatHandler::HandleGMTicketGetByIdCommand(const char* args)
     SendSysMessage(ss.str().c_str());
     return true;
 }
-
 bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string name = (char*)args;
     normalizePlayerName(name);
-
     Player *plr = objmgr.GetPlayer(name.c_str());
     if(!plr)
     {
         SendSysMessage(LANG_NO_PLAYERS_FOUND);
         return true;
     }
-    
     GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(plr->GetGUID());
     if(!ticket)
     {
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
         return true;
     }
-
     std::string gmname;
     std::stringstream ss;
     ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
@@ -435,12 +370,10 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
     SendSysMessage(ss.str().c_str());
     return true;
 }
-
 bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint64 tguid = atoi(args);
     GM_Ticket *ticket = objmgr.GetGMTicket(tguid);
     if(!ticket || ticket->closed != 0)
@@ -460,38 +393,29 @@ bool ChatHandler::HandleGMTicketCloseByIdCommand(const char* args)
     SendGlobalGMSysMessage(ss.str().c_str());
     Player *plr = objmgr.GetPlayer(ticket->playerGuid);
     objmgr.RemoveGMTicket(ticket, m_session->GetPlayer()->GetGUID());
-
     if(!plr || !plr->IsInWorld())
         return true;
-
     // send abandon ticket
     WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
     data << uint32(9);
     plr->GetSession()->SendPacket( &data );
     return true;
 }
-
 bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* tguid = strtok((char*)args, " ");
     uint64 ticketGuid = atoi(tguid);
     char* targetgm = strtok( NULL, " ");
-
     if(!targetgm)
         return false;
-
     std::string targm = targetgm;
-
     if(!normalizePlayerName(targm))
         return true;
-
     Player *cplr = m_session->GetPlayer();
     std::string gmname;
     GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
-
     if(!ticket || ticket->closed != 0)
     {
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -516,7 +440,6 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
         PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->guid, gmname.c_str());
         return true;
     }
-
     ticket->assignedToGM = tarGUID;
     objmgr.AddOrUpdateGMTicket(*ticket);
     std::stringstream ss;
@@ -526,16 +449,13 @@ bool ChatHandler::HandleGMTicketAssignToCommand(const char* args)
     SendGlobalGMSysMessage(ss.str().c_str());
     return true;
 }
-
 bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint64 ticketGuid = atoi(args);
     Player *cplr = m_session->GetPlayer();
     GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
-
     if(!ticket|| ticket->closed != 0)
     {
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -546,7 +466,6 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
         PSendSysMessage(LANG_COMMAND_TICKETNOTASSIGNED, ticket->guid);
         return true;
     }
-
     std::string gmname;
     objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
     Player *plr = objmgr.GetPlayer(ticket->assignedToGM);
@@ -555,7 +474,6 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
         SendSysMessage(LANG_COMMAND_TICKETUNASSIGNSECURITY);
         return true;
     }
-
     std::stringstream ss;
     ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
     ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
@@ -566,22 +484,17 @@ bool ChatHandler::HandleGMTicketUnAssignCommand(const char* args)
     objmgr.AddOrUpdateGMTicket(*ticket);
     return true;
 }
-
 bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* tguid = strtok((char*)args, " ");
     uint64 ticketGuid = atoi(tguid);
     char* comment = strtok( NULL, "\n");
-
     if(!comment)
         return false;
-
     Player *cplr = m_session->GetPlayer();
     GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
-
     if(!ticket || ticket->closed != 0)
     {
         PSendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -592,7 +505,6 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
         PSendSysMessage(LANG_COMMAND_TICKETALREADYASSIGNED, ticket->guid);
         return true;
     }
-
     std::string gmname;
     objmgr.GetPlayerNameByGUID(ticket->assignedToGM, gmname);
     ticket->comment = comment;
@@ -608,14 +520,12 @@ bool ChatHandler::HandleGMTicketCommentCommand(const char* args)
     SendGlobalGMSysMessage(ss.str().c_str());
     return true;
 }
-
 bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
 {
     if(!*args)
         return false;
     uint64 ticketGuid = atoi(args);
     GM_Ticket *ticket = objmgr.GetGMTicket(ticketGuid);
-
     if(!ticket)
     {
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
@@ -626,7 +536,6 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
         SendSysMessage(LANG_COMMAND_TICKETCLOSEFIRST);
         return true;
     }
-
     std::stringstream ss;
     ss << PGetParseString(LANG_COMMAND_TICKETLISTGUID, ticket->guid);
     ss << PGetParseString(LANG_COMMAND_TICKETLISTNAME, ticket->name.c_str());
@@ -641,17 +550,14 @@ bool ChatHandler::HandleGMTicketDeleteByIdCommand(const char* args)
         data << uint32(9);
         plr->GetSession()->SendPacket( &data );
     }
-
     ticket = NULL;
     return true;
 }
-
 bool ChatHandler::HandleGMTicketReloadCommand(const char*)
 {
     objmgr.LoadGMTickets();
     return true;
 }
-
 //Enable\Dissable Invisible mode
 bool ChatHandler::HandleGMVisibleCommand(const char* args)
 {
@@ -660,30 +566,24 @@ bool ChatHandler::HandleGMVisibleCommand(const char* args)
         PSendSysMessage(LANG_YOU_ARE, m_session->GetPlayer()->isGMVisible() ?  GetTrinityString(LANG_VISIBLE) : GetTrinityString(LANG_INVISIBLE));
         return true;
     }
-
     std::string argstr = (char*)args;
-
     if (argstr == "on")
     {
         m_session->GetPlayer()->SetGMVisible(true);
         m_session->SendNotification(LANG_INVISIBLE_VISIBLE);
         return true;
     }
-
     if (argstr == "off")
     {
         m_session->SendNotification(LANG_INVISIBLE_INVISIBLE);
         m_session->GetPlayer()->SetGMVisible(false);
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
 
-
-
 bool ChatHandler::HandleGPSCommand(const char* args)
 {
     WorldObject *obj = NULL;
@@ -692,7 +592,6 @@ bool ChatHandler::HandleGPSCommand(const char* args)
         uint64 guid = extractGuidFromLink((char*)args);
         if(guid)
             obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
-
         if(!obj)
         {
             SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -703,7 +602,6 @@ bool ChatHandler::HandleGPSCommand(const char* args)
     else
     {
         obj = getSelectedUnit();
-
         if(!obj)
         {
             SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
@@ -713,31 +611,22 @@ bool ChatHandler::HandleGPSCommand(const char* args)
     }
     CellPair cell_val = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     Cell cell(cell_val);
-
     uint32 zone_id, area_id;
     obj->GetZoneAndAreaId(zone_id,area_id);
-
     MapEntry const* mapEntry = sMapStore.LookupEntry(obj->GetMapId());
     AreaTableEntry const* zoneEntry = GetAreaEntryByAreaID(zone_id);
     AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(area_id);
-
     float zone_x = obj->GetPositionX();
     float zone_y = obj->GetPositionY();
-
     Map2ZoneCoordinates(zone_x,zone_y,zone_id);
-
     Map const *map = obj->GetMap();
     float ground_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), MAX_HEIGHT);
     float floor_z = map->GetHeight(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ());
-
     GridPair p = Trinity::ComputeGridPair(obj->GetPositionX(), obj->GetPositionY());
-
     int gx=63-p.x_coord;
     int gy=63-p.y_coord;
-
     uint32 have_map = Map::ExistMap(obj->GetMapId(),gx,gy) ? 1 : 0;
     uint32 have_vmap = Map::ExistVMap(obj->GetMapId(),gx,gy) ? 1 : 0;
-
     PSendSysMessage(LANG_MAP_POSITION,
         obj->GetMapId(), (mapEntry ? mapEntry->name[GetSessionDbcLocale()] : "<unknown>" ),
         zone_id, (zoneEntry ? zoneEntry->area_name[GetSessionDbcLocale()] : "<unknown>" ),
@@ -746,7 +635,6 @@ bool ChatHandler::HandleGPSCommand(const char* args)
         obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
         cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
         zone_x, zone_y, ground_z, floor_z, have_map, have_vmap );
-
     sLog.outDebug("Player %s GPS call for %s '%s' (%s: %u):",
         m_session ? GetNameLink().c_str() : GetMangosString(LANG_CONSOLE_COMMAND),
         (obj->GetTypeId() == TYPEID_PLAYER ? "player" : "creature"), obj->GetName(),
@@ -759,7 +647,6 @@ bool ChatHandler::HandleGPSCommand(const char* args)
         obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), obj->GetOrientation(),
         cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), obj->GetInstanceId(),
         zone_x, zone_y, ground_z, floor_z, have_map, have_vmap );
-
     LiquidData liquid_status;
     ZLiquidStatus res = map->getLiquidStatus(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), MAP_ALL_LIQUIDS, &liquid_status);
     if (res)
@@ -768,7 +655,6 @@ bool ChatHandler::HandleGPSCommand(const char* args)
     }
     return true;
 }
-
 //Summon Player
 bool ChatHandler::HandleNamegoCommand(const char* args)
 {
@@ -777,7 +663,6 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
     std::string target_name;
     if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     Player* _player = m_session->GetPlayer();
     if (target == _player || target_guid == _player->GetGUID())
     {
@@ -785,23 +670,19 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (target)
     {
         std::string nameLink = playerLink(target_name);
         // check online security
         if (HasLowerSecurity(target, 0))
             return false;
-
         if (target->IsBeingTeleported())
         {
             PSendSysMessage(LANG_IS_TELEPORTED, nameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
-
         Map* pMap = m_session->GetPlayer()->GetMap();
-
         if (pMap->IsBattleGroundOrArena())
         {
             // only allow if gm mode is on
@@ -836,7 +717,6 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
                 //SetSentErrorMessage(true);
                 //return false;
             }
-
             // we are in instance, and can summon only player in our group with us as lead
             if (!m_session->GetPlayer()->GetGroup() || !target->GetGroup() ||
                 (target->GetGroup()->GetLeaderGUID() != m_session->GetPlayer()->GetGUID()) ||
@@ -848,11 +728,9 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
                 return false;
             }
         }
-
         PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),"");
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, playerLink(_player->GetName()).c_str());
-
         // stop flight if need
         if (target->isInFlight())
         {
@@ -862,7 +740,6 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
         // save only in non-flight case
         else
             target->SaveRecallPosition();
-
         // before GM
         float x,y,z;
         m_session->GetPlayer()->GetClosePoint(x,y,z,target->GetObjectSize());
@@ -874,11 +751,8 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
         // check offline security
         if (HasLowerSecurity(NULL, target_guid))
             return false;
-
         std::string nameLink = playerLink(target_name);
-
         PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),GetTrinityString(LANG_OFFLINE));
-
         // in point where GM stay
         Player::SavePositionInDB(m_session->GetPlayer()->GetMapId(),
             m_session->GetPlayer()->GetPositionX(),
@@ -888,10 +762,8 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
             m_session->GetPlayer()->GetZoneId(),
             target_guid);
     }
-
     return true;
 }
-
 //Teleport to Player
 bool ChatHandler::HandleGonameCommand(const char* args)
 {
@@ -900,7 +772,6 @@ bool ChatHandler::HandleGonameCommand(const char* args)
     std::string target_name;
     if (!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     Player* _player = m_session->GetPlayer();
     if (target == _player || target_guid == _player->GetGUID())
     {
@@ -909,15 +780,12 @@ bool ChatHandler::HandleGonameCommand(const char* args)
         return false;
     }
 
-
     if (target)
     {
         // check online security
         if (HasLowerSecurity(target, 0))
             return false;
-
         std::string chrNameLink = playerLink(target_name);
-
         Map* cMap = target->GetMap();
         if (cMap->IsBattleGroundOrArena())
         {
@@ -945,7 +813,6 @@ bool ChatHandler::HandleGonameCommand(const char* args)
         else if(cMap->IsDungeon())
         {
             Map* pMap = _player->GetMap();
-
             // we have to go to instance, and can go to player only if:
             //   1) we are in his group (either as leader or as member)
             //   2) we are not bound to any group and have GM mode on
@@ -969,7 +836,6 @@ bool ChatHandler::HandleGonameCommand(const char* args)
                     return false;
                 }
             }
-
             // if the player or the player's group is bound to another instance
             // the player will not be bound to another one
             InstancePlayerBind *pBind = _player->GetBoundInstance(target->GetMapId(), target->GetDifficulty());
@@ -983,14 +849,11 @@ bool ChatHandler::HandleGonameCommand(const char* args)
                     if (InstanceSave *save = sInstanceSaveManager.GetInstanceSave(target->GetInstanceId()))
                         _player->BindToInstance(save, !save->CanReset());
             }
-
             _player->SetDifficulty(target->GetDifficulty());
         }
-
         PSendSysMessage(LANG_APPEARING_AT, chrNameLink.c_str());
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_APPEARING_TO, GetNameLink().c_str());
-
         // stop flight if need
         if (_player->isInFlight())
         {
@@ -1000,11 +863,9 @@ bool ChatHandler::HandleGonameCommand(const char* args)
         // save only in non-flight case
         else
             _player->SaveRecallPosition();
-
         // to point to see at target with same orientation
         float x,y,z;
         target->GetContactPoint(_player,x,y,z);
-
         _player->TeleportTo(target->GetMapId(), x, y, z, _player->GetAngle(target), TELE_TO_GM_MODE);
         _player->SetPhaseMask(target->GetPhaseMask(), true);
     }
@@ -1013,18 +874,14 @@ bool ChatHandler::HandleGonameCommand(const char* args)
         // check offline security
         if (HasLowerSecurity(NULL, target_guid))
             return false;
-
         std::string nameLink = playerLink(target_name);
-
         PSendSysMessage(LANG_APPEARING_AT, nameLink.c_str());
-
         // to point where player stay (if loaded)
         float x,y,z,o;
         uint32 map;
         bool in_flight;
         if (!Player::LoadPositionFromDB(map,x,y,z,o,in_flight,target_guid))
             return false;
-
         // stop flight if need
         if (_player->isInFlight())
         {
@@ -1034,52 +891,41 @@ bool ChatHandler::HandleGonameCommand(const char* args)
         // save only in non-flight case
         else
             _player->SaveRecallPosition();
-
         _player->TeleportTo(map, x, y, z,_player->GetOrientation());
     }
-
     return true;
 }
-
 // Teleport player to last position
 bool ChatHandler::HandleRecallCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     if (target->IsBeingTeleported())
     {
         PSendSysMessage(LANG_IS_TELEPORTED, GetNameLink(target).c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(target->isInFlight())
     {
         target->GetMotionMaster()->MovementExpired();
         target->CleanupAfterTaxiFlight();
     }
-
     target->TeleportTo(target->m_recallMap, target->m_recallX, target->m_recallY, target->m_recallZ, target->m_recallO);
     return true;
 }
-
 //Edit Player KnownTitles
 bool ChatHandler::HandleModifyKnownTitlesCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint64 titles = 0;
-
     sscanf((char*)args, UI64FMTD, &titles);
-
     Player *chr = getSelectedPlayer();
     if (!chr)
     {
@@ -1087,52 +933,39 @@ bool ChatHandler::HandleModifyKnownTitlesCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     uint64 titles2 = titles;
-
     for(uint32 i = 1; i < sCharTitlesStore.GetNumRows(); ++i)
         if(CharTitlesEntry const* tEntry = sCharTitlesStore.LookupEntry(i))
             titles2 &= ~(uint64(1) << tEntry->bit_index);
-
     titles &= ~titles2;                                     // remove not existed titles
-
     chr->SetUInt64Value(PLAYER__FIELD_KNOWN_TITLES, titles);
     SendSysMessage(LANG_DONE);
-
     return true;
 }
-
 //Edit Player HP
 bool ChatHandler::HandleModifyHPCommand(const char* args)
 {
     if(!*args)
         return false;
-
     //    char* pHp = strtok((char*)args, " ");
     //    if (!pHp)
     //        return false;
-
     //    char* pHpMax = strtok(NULL, " ");
     //    if (!pHpMax)
     //        return false;
-
     //    int32 hpm = atoi(pHpMax);
     //    int32 hp = atoi(pHp);
-
     int32 hp = atoi((char*)args);
     int32 hpm = atoi((char*)args);
-
     if (hp <= 0 || hpm <= 0 || hpm < hp)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Unit *chr = getSelectedUnit();
     if (chr == NULL)
     {
@@ -1140,47 +973,37 @@ bool ChatHandler::HandleModifyHPCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (chr->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_HP, GetNameLink((Player*)chr).c_str(), hp, hpm);
     if (chr->GetTypeId() == TYPEID_PLAYER && needReportToTarget((Player*)chr))
         ChatHandler((Player*)chr).PSendSysMessage(LANG_YOURS_HP_CHANGED, GetNameLink().c_str(), hp, hpm);
-
     chr->SetMaxHealth( hpm );
     chr->SetHealth( hp );
-
     return true;
 }
-
 //Edit Player Mana
 bool ChatHandler::HandleModifyManaCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // char* pmana = strtok((char*)args, " ");
     // if (!pmana)
     //     return false;
-
     // char* pmanaMax = strtok(NULL, " ");
     // if (!pmanaMax)
     //     return false;
-
     // int32 manam = atoi(pmanaMax);
     // int32 mana = atoi(pmana);
     int32 mana = atoi((char*)args);
     int32 manam = atoi((char*)args);
-
     if (mana <= 0 || manam <= 0 || manam < mana)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1188,48 +1011,37 @@ bool ChatHandler::HandleModifyManaCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_MANA, GetNameLink(chr).c_str(), mana, manam);
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_MANA_CHANGED, GetNameLink().c_str(), mana, manam);
-
     chr->SetMaxPower(POWER_MANA,manam );
     chr->SetPower(POWER_MANA, mana );
-
     return true;
 }
-
 //Edit Player Energy
 bool ChatHandler::HandleModifyEnergyCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // char* pmana = strtok((char*)args, " ");
     // if (!pmana)
     //     return false;
-
     // char* pmanaMax = strtok(NULL, " ");
     // if (!pmanaMax)
     //     return false;
-
     // int32 manam = atoi(pmanaMax);
     // int32 mana = atoi(pmana);
-
     int32 energy = atoi((char*)args)*10;
     int32 energym = atoi((char*)args)*10;
-
     if (energy <= 0 || energym <= 0 || energym < energy)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (!chr)
     {
@@ -1237,50 +1049,38 @@ bool ChatHandler::HandleModifyEnergyCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_ENERGY, GetNameLink(chr).c_str(), energy/10, energym/10);
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_ENERGY_CHANGED, GetNameLink().c_str(), energy/10, energym/10);
-
     chr->SetMaxPower(POWER_ENERGY,energym );
     chr->SetPower(POWER_ENERGY, energy );
-
     sLog.outDetail(GetTrinityString(LANG_CURRENT_ENERGY),chr->GetMaxPower(POWER_ENERGY));
-
     return true;
 }
-
 //Edit Player Rage
 bool ChatHandler::HandleModifyRageCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // char* pmana = strtok((char*)args, " ");
     // if (!pmana)
     //     return false;
-
     // char* pmanaMax = strtok(NULL, " ");
     // if (!pmanaMax)
     //     return false;
-
     // int32 manam = atoi(pmanaMax);
     // int32 mana = atoi(pmana);
-
     int32 rage = atoi((char*)args)*10;
     int32 ragem = atoi((char*)args)*10;
-
     if (rage <= 0 || ragem <= 0 || ragem < rage)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1288,37 +1088,29 @@ bool ChatHandler::HandleModifyRageCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_RAGE, GetNameLink(chr).c_str(), rage/10, ragem/10);
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_RAGE_CHANGED, GetNameLink().c_str(), rage/10, ragem/10);
-
     chr->SetMaxPower(POWER_RAGE,ragem );
     chr->SetPower(POWER_RAGE, rage );
-
     return true;
 }
-
 // Edit Player Runic Power
 bool ChatHandler::HandleModifyRunicPowerCommand(const char* args)
 {
     if(!*args)
         return false;
-
     int32 rune = atoi((char*)args)*10;
     int32 runem = atoi((char*)args)*10;
-
     if (rune <= 0 || runem <= 0 || runem < rune)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1326,25 +1118,19 @@ bool ChatHandler::HandleModifyRunicPowerCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_RUNIC_POWER, GetNameLink(chr).c_str(), rune/10, runem/10);
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_RUNIC_POWER_CHANGED, GetNameLink().c_str(), rune/10, runem/10);
-
     chr->SetMaxPower(POWER_RUNIC_POWER,runem );
     chr->SetPower(POWER_RUNIC_POWER, rune );
-
     return true;
 }
-
 //Edit Player Faction
 bool ChatHandler::HandleModifyFactionCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* pfactionid = extractKeyFromLink((char*)args,"Hfaction");
-
     Creature* chr = getSelectedCreature();
     if(!chr)
     {
@@ -1352,7 +1138,6 @@ bool ChatHandler::HandleModifyFactionCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!pfactionid)
     {
         if(chr)
@@ -1365,56 +1150,44 @@ bool ChatHandler::HandleModifyFactionCommand(const char* args)
         }
         return true;
     }
-
     if( !chr )
     {
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 factionid = atoi(pfactionid);
     uint32 flag;
-
     char *pflag = strtok(NULL, " ");
     if (!pflag)
         flag = chr->GetUInt32Value(UNIT_FIELD_FLAGS);
     else
         flag = atoi(pflag);
-
     char* pnpcflag = strtok(NULL, " ");
-
     uint32 npcflag;
     if(!pnpcflag)
         npcflag   = chr->GetUInt32Value(UNIT_NPC_FLAGS);
     else
         npcflag = atoi(pnpcflag);
-
     char* pdyflag = strtok(NULL, " ");
-
     uint32  dyflag;
     if(!pdyflag)
         dyflag   = chr->GetUInt32Value(UNIT_DYNAMIC_FLAGS);
     else
         dyflag = atoi(pdyflag);
-
     if(!sFactionTemplateStore.LookupEntry(factionid))
     {
         PSendSysMessage(LANG_WRONG_FACTION, factionid);
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_FACTION, chr->GetGUIDLow(),factionid,flag,npcflag,dyflag);
-
     chr->setFaction(factionid);
     chr->SetUInt32Value(UNIT_FIELD_FLAGS,flag);
     chr->SetUInt32Value(UNIT_NPC_FLAGS,npcflag);
     chr->SetUInt32Value(UNIT_DYNAMIC_FLAGS,dyflag);
-
     return true;
 }
-
 //Edit Player Spell
 bool ChatHandler::HandleModifySpellCommand(const char* args)
 {
@@ -1422,19 +1195,14 @@ bool ChatHandler::HandleModifySpellCommand(const char* args)
     char* pspellflatid = strtok((char*)args, " ");
     if (!pspellflatid)
         return false;
-
     char* pop = strtok(NULL, " ");
     if (!pop)
         return false;
-
     char* pval = strtok(NULL, " ");
     if (!pval)
         return false;
-
     uint16 mark;
-
     char* pmark = strtok(NULL, " ");
-
     uint8 spellflatid = atoi(pspellflatid);
     uint8 op   = atoi(pop);
     uint16 val = atoi(pval);
@@ -1442,7 +1210,6 @@ bool ChatHandler::HandleModifySpellCommand(const char* args)
         mark = 65535;
     else
         mark = atoi(pmark);
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1450,35 +1217,28 @@ bool ChatHandler::HandleModifySpellCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_SPELLFLATID, spellflatid, val, mark, GetNameLink(chr).c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_SPELLFLATID_CHANGED, GetNameLink().c_str(), spellflatid, val, mark);
-
     WorldPacket data(SMSG_SET_FLAT_SPELL_MODIFIER, (1+1+2+2));
     data << uint8(spellflatid);
     data << uint8(op);
     data << uint16(val);
     data << uint16(mark);
     chr->GetSession()->SendPacket(&data);
-
     return true;
 }
-
 //Edit Player TP
 bool ChatHandler::HandleModifyTalentCommand (const char* args)
 {
     if (!*args)
         return false;
-
     int tp = atoi((char*)args);
     if (tp < 0)
         return false;
-
     Unit* target = getSelectedUnit();
     if(!target)
     {
@@ -1486,7 +1246,6 @@ bool ChatHandler::HandleModifyTalentCommand (const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(target->GetTypeId()==TYPEID_PLAYER)
     {
         // check online security
@@ -1509,12 +1268,10 @@ bool ChatHandler::HandleModifyTalentCommand (const char* args)
             return true;
         }
     }
-
     SendSysMessage(LANG_NO_CHAR_SELECTED);
     SetSentErrorMessage(true);
     return false;
 }
-
 //Enable On\OFF all taxi paths
 bool ChatHandler::HandleTaxiCheatCommand(const char* args)
 {
@@ -1524,19 +1281,15 @@ bool ChatHandler::HandleTaxiCheatCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     std::string argstr = (char*)args;
-
     Player *chr = getSelectedPlayer();
     if (!chr)
     {
         chr=m_session->GetPlayer();
     }
-
     // check online security
     else if (HasLowerSecurity(chr, 0))
         return false;
-
     if (argstr == "on")
     {
         chr->SetTaxiCheater(true);
@@ -1545,37 +1298,30 @@ bool ChatHandler::HandleTaxiCheatCommand(const char* args)
             ChatHandler(chr).PSendSysMessage(LANG_YOURS_TAXIS_ADDED, GetNameLink().c_str());
         return true;
     }
-
     if (argstr == "off")
     {
         chr->SetTaxiCheater(false);
         PSendSysMessage(LANG_YOU_REMOVE_TAXIS, GetNameLink(chr).c_str());
         if (needReportToTarget(chr))
             ChatHandler(chr).PSendSysMessage(LANG_YOURS_TAXIS_REMOVED, GetNameLink().c_str());
-
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
-
 //Edit Player Aspeed
 bool ChatHandler::HandleModifyASpeedCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float ASpeed = (float)atof((char*)args);
-
     if (ASpeed > 50.0f || ASpeed < 0.1f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1583,24 +1329,19 @@ bool ChatHandler::HandleModifyASpeedCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     std::string chrNameLink = GetNameLink(chr);
-
     if(chr->isInFlight())
     {
         PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_ASPEED, ASpeed, chrNameLink.c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_ASPEED_CHANGED, GetNameLink().c_str(), ASpeed);
-
     chr->SetSpeed(MOVE_WALK,    ASpeed,true);
     chr->SetSpeed(MOVE_RUN,     ASpeed,true);
     chr->SetSpeed(MOVE_SWIM,    ASpeed,true);
@@ -1608,22 +1349,18 @@ bool ChatHandler::HandleModifyASpeedCommand(const char* args)
     chr->SetSpeed(MOVE_FLIGHT,     ASpeed,true);
     return true;
 }
-
 //Edit Player Speed
 bool ChatHandler::HandleModifySpeedCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float Speed = (float)atof((char*)args);
-
     if (Speed > 50.0f || Speed < 0.1f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1631,44 +1368,34 @@ bool ChatHandler::HandleModifySpeedCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     std::string chrNameLink = GetNameLink(chr);
-
     if(chr->isInFlight())
     {
         PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_SPEED, Speed, chrNameLink.c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_SPEED_CHANGED, GetNameLink().c_str(), Speed);
-
     chr->SetSpeed(MOVE_RUN,Speed,true);
-
     return true;
 }
-
 //Edit Player Swim Speed
 bool ChatHandler::HandleModifySwimCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float Swim = (float)atof((char*)args);
-
     if (Swim > 50.0f || Swim < 0.1f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1676,44 +1403,34 @@ bool ChatHandler::HandleModifySwimCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     std::string chrNameLink = GetNameLink(chr);
-
     if(chr->isInFlight())
     {
         PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_SWIM_SPEED, Swim, chrNameLink.c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_SWIM_SPEED_CHANGED, GetNameLink().c_str(), Swim);
-
     chr->SetSpeed(MOVE_SWIM,Swim,true);
-
     return true;
 }
-
 //Edit Player Walk Speed
 bool ChatHandler::HandleModifyBWalkCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float BSpeed = (float)atof((char*)args);
-
     if (BSpeed > 50.0f || BSpeed < 0.1f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1721,44 +1438,34 @@ bool ChatHandler::HandleModifyBWalkCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     std::string chrNameLink = GetNameLink(chr);
-
     if(chr->isInFlight())
     {
         PSendSysMessage(LANG_CHAR_IN_FLIGHT,chrNameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_CHANGE_BACK_SPEED, BSpeed, chrNameLink.c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_BACK_SPEED_CHANGED, GetNameLink().c_str(), BSpeed);
-
     chr->SetSpeed(MOVE_RUN_BACK,BSpeed,true);
-
     return true;
 }
-
 //Edit Player Fly
 bool ChatHandler::HandleModifyFlyCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float FSpeed = (float)atof((char*)args);
-
     if (FSpeed > 50.0f || FSpeed < 0.1f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1766,26 +1473,20 @@ bool ChatHandler::HandleModifyFlyCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_FLY_SPEED, FSpeed, GetNameLink(chr).c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_FLY_SPEED_CHANGED, GetNameLink().c_str(), FSpeed);
-
     chr->SetSpeed(MOVE_FLIGHT,FSpeed,true);
-
     return true;
 }
-
 //Edit Player Scale
 bool ChatHandler::HandleModifyScaleCommand(const char* args)
 {
     if (!*args)
         return false;
-
     float Scale = (float)atof((char*)args);
     if (Scale > 10.0f || Scale <= 0.1f)
     {
@@ -1793,7 +1494,6 @@ bool ChatHandler::HandleModifyScaleCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -1801,30 +1501,23 @@ bool ChatHandler::HandleModifyScaleCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_CHANGE_SIZE, Scale, GetNameLink(chr).c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_YOURS_SIZE_CHANGED, GetNameLink().c_str(), Scale);
-
     chr->SetFloatValue(OBJECT_FIELD_SCALE_X, Scale);
-
     return true;
 }
-
 //Enable Player mount
 bool ChatHandler::HandleModifyMountCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint16 mId = 1147;
     float speed = (float)15;
     uint32 num = 0;
-
     num = atoi((char*)args);
     switch(num)
     {
@@ -2040,7 +1733,6 @@ bool ChatHandler::HandleModifyMountCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
     }
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -2048,40 +1740,32 @@ bool ChatHandler::HandleModifyMountCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     PSendSysMessage(LANG_YOU_GIVE_MOUNT, GetNameLink(chr).c_str());
     if (needReportToTarget(chr))
         ChatHandler(chr).PSendSysMessage(LANG_MOUNT_GIVED, GetNameLink().c_str());
-
     chr->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP);
     chr->Mount(mId);
-
     WorldPacket data( SMSG_FORCE_RUN_SPEED_CHANGE, (8+4+1+4) );
     data.append(chr->GetPackGUID());
     data << (uint32)0;
     data << (uint8)0;                                       //new 2.1.0
     data << float(speed);
     chr->SendMessageToSet( &data, true );
-
     data.Initialize( SMSG_FORCE_SWIM_SPEED_CHANGE, (8+4+4) );
     data.append(chr->GetPackGUID());
     data << (uint32)0;
     data << float(speed);
     chr->SendMessageToSet( &data, true );
-
     return true;
 }
-
 //Edit Player money
 bool ChatHandler::HandleModifyMoneyCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -2089,33 +1773,26 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(chr, 0))
         return false;
-
     int32 addmoney = atoi((char*)args);
-
     uint32 moneyuser = chr->GetMoney();
-
     if (addmoney < 0)
     {
         int32 newmoney = int32(moneyuser) + addmoney;
-
         sLog.outDetail(GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney);
         if (newmoney <= 0 )
         {
             PSendSysMessage(LANG_YOU_TAKE_ALL_MONEY, GetNameLink(chr).c_str());
             if (needReportToTarget(chr))
                 ChatHandler(chr).PSendSysMessage(LANG_YOURS_ALL_MONEY_GONE, GetNameLink().c_str());
-
             chr->SetMoney(0);
         }
         else
         {
             if (newmoney > MAX_MONEY_AMOUNT)
                 newmoney = MAX_MONEY_AMOUNT;
-
             PSendSysMessage(LANG_YOU_TAKE_MONEY, abs(addmoney), GetNameLink(chr).c_str());
             if (needReportToTarget(chr))
                 ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_TAKEN, GetNameLink().c_str(), abs(addmoney));
@@ -2127,24 +1804,19 @@ bool ChatHandler::HandleModifyMoneyCommand(const char* args)
         PSendSysMessage(LANG_YOU_GIVE_MONEY, addmoney, GetNameLink(chr).c_str());
         if (needReportToTarget(chr))
             ChatHandler(chr).PSendSysMessage(LANG_YOURS_MONEY_GIVEN, GetNameLink().c_str(), addmoney);
-
         if (addmoney >=MAX_MONEY_AMOUNT)
             chr->SetMoney(MAX_MONEY_AMOUNT);
         else
             chr->ModifyMoney( addmoney );
     }
-
     sLog.outDetail(GetTrinityString(LANG_NEW_MONEY), moneyuser, addmoney, chr->GetMoney() );
-
     return true;
 }
-
 //Edit Unit field
 bool ChatHandler::HandleModifyBitCommand(const char* args)
 {
     if( !*args )
         return false;
-
     Unit *unit = getSelectedUnit();
     if (!unit)
     {
@@ -2152,22 +1824,17 @@ bool ChatHandler::HandleModifyBitCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (unit->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player *)unit, 0))
         return false;
-
     char* pField = strtok((char*)args, " ");
     if (!pField)
         return false;
-
     char* pBit = strtok(NULL, " ");
     if (!pBit)
         return false;
-
     uint16 field = atoi(pField);
     uint32 bit   = atoi(pBit);
-
     if (field < OBJECT_END || field >= unit->GetValuesCount())
     {
         SendSysMessage(LANG_BAD_VALUE);
@@ -2180,7 +1847,6 @@ bool ChatHandler::HandleModifyBitCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if ( unit->HasFlag( field, (1<<(bit-1)) ) )
     {
         unit->RemoveFlag( field, (1<<(bit-1)) );
@@ -2193,12 +1859,10 @@ bool ChatHandler::HandleModifyBitCommand(const char* args)
     }
     return true;
 }
-
 bool ChatHandler::HandleModifyHonorCommand (const char* args)
 {
     if (!*args)
         return false;
-
     Player *target = getSelectedPlayer();
     if(!target)
     {
@@ -2206,37 +1870,27 @@ bool ChatHandler::HandleModifyHonorCommand (const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     int32 amount = (uint32)atoi(args);
-
     target->ModifyHonorPoints(amount);
-
     PSendSysMessage(LANG_COMMAND_MODIFY_HONOR, GetNameLink(target).c_str(), target->GetHonorPoints());
-
     return true;
 }
-
 bool ChatHandler::HandleTeleCommand(const char * args)
 {
     if(!*args)
         return false;
-
     Player* _player = m_session->GetPlayer();
-
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
     GameTele const* tele = extractGameTeleFromLink((char*)args);
-
     if (!tele)
     {
         SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
     if(!me || me->IsBattleGroundOrArena())
     {
@@ -2244,7 +1898,6 @@ bool ChatHandler::HandleTeleCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -2254,27 +1907,20 @@ bool ChatHandler::HandleTeleCommand(const char * args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
     return true;
 }
-
 bool ChatHandler::HandleLookupAreaCommand(const char* args)
 {
     if (!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if (!Utf8toWStr (namepart,wnamepart))
         return false;
-
     bool found = false;
-
     // converting string that we try to find to lower case
     wstrToLower (wnamepart);
-
     // Search in AreaTable.dbc
     for (uint32 areaflag = 0; areaflag < sAreaStore.GetNumRows (); ++areaflag)
     {
@@ -2285,7 +1931,6 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args)
             std::string name = areaEntry->area_name[loc];
             if (name.empty())
                 continue;
-
             if (!Utf8FitTo (name, wnamepart))
             {
                 loc = 0;
@@ -2293,16 +1938,13 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args)
                 {
                     if (loc==GetSessionDbcLocale ())
                         continue;
-
                     name = areaEntry->area_name[loc];
                     if (name.empty ())
                         continue;
-
                     if (Utf8FitTo (name, wnamepart))
                         break;
                 }
             }
-
             if (loc < MAX_LOCALE)
             {
                 // send area in "id - [name]" format
@@ -2311,21 +1953,16 @@ bool ChatHandler::HandleLookupAreaCommand(const char* args)
                     ss << areaEntry->ID << " - |cffffffff|Harea:" << areaEntry->ID << "|h[" << name << " " << localeNames[loc]<< "]|h|r";
                 else
                     ss << areaEntry->ID << " - " << name << " " << localeNames[loc];
-
                 SendSysMessage (ss.str ().c_str());
-
                 if(!found)
                     found = true;
             }
         }
     }
-
     if (!found)
         SendSysMessage (LANG_COMMAND_NOAREAFOUND);
-
     return true;
 }
-
 //Find tele in game_tele order by name
 bool ChatHandler::HandleLookupTeleCommand(const char * args)
 {
@@ -2335,44 +1972,33 @@ bool ChatHandler::HandleLookupTeleCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char const* str = strtok((char*)args, " ");
     if(!str)
         return false;
-
     std::string namepart = str;
     std::wstring wnamepart;
-
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-
     std::ostringstream reply;
-
     GameTeleMap const & teleMap = objmgr.GetGameTeleMap();
     for(GameTeleMap::const_iterator itr = teleMap.begin(); itr != teleMap.end(); ++itr)
     {
         GameTele const* tele = &itr->second;
-
         if(tele->wnameLow.find(wnamepart) == std::wstring::npos)
             continue;
-
         if (m_session)
             reply << "  |cffffffff|Htele:" << itr->first << "|h[" << tele->name << "]|h|r\n";
         else
             reply << "  " << itr->first << " " << tele->name << "\n";
     }
-
     if(reply.str().empty())
         SendSysMessage(LANG_COMMAND_TELE_NOLOCATION);
     else
         PSendSysMessage(LANG_COMMAND_TELE_LOCATION,reply.str().c_str());
-
     return true;
 }
-
 //Enable\Dissable accept whispers (for GM)
 bool ChatHandler::HandleWhispersCommand(const char* args)
 {
@@ -2381,7 +2007,6 @@ bool ChatHandler::HandleWhispersCommand(const char* args)
         PSendSysMessage(LANG_COMMAND_WHISPERACCEPTING, m_session->GetPlayer()->isAcceptWhispers() ?  GetTrinityString(LANG_ON) : GetTrinityString(LANG_OFF));
         return true;
     }
-
     std::string argstr = (char*)args;
     // whisper on
     if (argstr == "on")
@@ -2390,7 +2015,6 @@ bool ChatHandler::HandleWhispersCommand(const char* args)
         SendSysMessage(LANG_COMMAND_WHISPERON);
         return true;
     }
-
     // whisper off
     if (argstr == "off")
     {
@@ -2398,12 +2022,10 @@ bool ChatHandler::HandleWhispersCommand(const char* args)
         SendSysMessage(LANG_COMMAND_WHISPEROFF);
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
-
 //Save all players in the world
 bool ChatHandler::HandleSaveAllCommand(const char* /*args*/)
 {
@@ -2411,7 +2033,6 @@ bool ChatHandler::HandleSaveAllCommand(const char* /*args*/)
     SendSysMessage(LANG_PLAYERS_SAVED);
     return true;
 }
-
 //Send mail by command
 bool ChatHandler::HandleSendMailCommand(const char* args)
 {
@@ -2421,41 +2042,31 @@ bool ChatHandler::HandleSendMailCommand(const char* args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     char* tail1 = strtok(NULL, "");
     if(!tail1)
         return false;
-
     char* msgSubject = extractQuotedArg(tail1);
     if (!msgSubject)
         return false;
-
     char* tail2 = strtok(NULL, "");
     if(!tail2)
         return false;
-
     char* msgText = extractQuotedArg(tail2);
     if (!msgText)
         return false;
-
     // msgSubject, msgText isn't NUL after prev. check
     std::string subject = msgSubject;
     std::string text    = msgText;
-
     // from console show not existed sender
     uint32 sender_guidlo = m_session ? m_session->GetPlayer()->GetGUIDLow() : 0;
-
     uint32 messagetype = MAIL_NORMAL;
     uint32 stationery = MAIL_STATIONERY_GM;
     uint32 itemTextId = !text.empty() ? objmgr.CreateItemText( text ) : 0;
-
     WorldSession::SendMailTo(target,messagetype, stationery, sender_guidlo, GUID_LOPART(target_guid), subject, itemTextId, NULL, 0, 0, MAIL_CHECK_MASK_NONE);
-
     std::string nameLink = playerLink(target_name);
     PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
     return true;
 }
-
 // teleport player to given game_tele.entry
 bool ChatHandler::HandleTeleNameCommand(const char * args)
 {
@@ -2464,13 +2075,11 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
     extractOptFirstArg((char*)args,&nameStr,&teleStr);
     if(!teleStr)
         return false;
-
     Player* target;
     uint64 target_guid;
     std::string target_name;
     if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
         return false;
-
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
     GameTele const* tele = extractGameTeleFromLink(teleStr);
     if(!tele)
@@ -2479,7 +2088,6 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
 /*    MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
     if(!me || me->IsBattleGroundOrArena())
     {
@@ -2487,28 +2095,22 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = objmgr.GetPlayer(name.c_str());*/
-
     if (target)
     {
         // check online security
         if (HasLowerSecurity(target, 0))
             return false;
-
         std::string chrNameLink = playerLink(target_name);
-
         if(target->IsBeingTeleported()==true)
         {
             PSendSysMessage(LANG_IS_TELEPORTED, chrNameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
-
         PSendSysMessage(LANG_TELEPORTING_TO, chrNameLink.c_str(),"", tele->name.c_str());
         if (needReportToTarget(target))
             ChatHandler(target).PSendSysMessage(LANG_TELEPORTED_TO_BY, GetNameLink().c_str());
-
         // stop flight if need
         if(target->isInFlight())
         {
@@ -2518,7 +2120,6 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
         // save only in non-flight case
         else
             target->SaveRecallPosition();
-
         target->TeleportTo(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation);
     }
     else
@@ -2526,23 +2127,18 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
         // check offline security
         if (HasLowerSecurity(NULL, target_guid))
             return false;
-
         std::string nameLink = playerLink(target_name);
-
         PSendSysMessage(LANG_TELEPORTING_TO, nameLink.c_str(), GetMangosString(LANG_OFFLINE), tele->name.c_str());
         Player::SavePositionInDB(tele->mapId,tele->position_x,tele->position_y,tele->position_z,tele->orientation,
             MapManager::Instance().GetZoneId(tele->mapId,tele->position_x,tele->position_y,tele->position_z),target_guid);
     }
-
     return true;
 }
-
 //Teleport group to given game_tele.entry
 bool ChatHandler::HandleTeleGroupCommand(const char * args)
 {
     if(!*args)
         return false;
-
     Player *player = getSelectedPlayer();
     if (!player)
     {
@@ -2550,11 +2146,9 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(player, 0))
         return false;
-
     // id, or string, or [name] Shift-click form |color|Htele:id|h[name]|h|r
     GameTele const* tele = extractGameTeleFromLink((char*)args);
     if(!tele)
@@ -2563,7 +2157,6 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     MapEntry const * me = sMapStore.LookupEntry(tele->mapId);
     if(!me || me->IsBattleGroundOrArena())
     {
@@ -2571,9 +2164,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     std::string nameLink = GetNameLink(player);
-
     Group *grp = player->GetGroup();
     if(!grp)
     {
@@ -2581,30 +2172,23 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player *pl = itr->getSource();
-
         if(!pl || !pl->GetSession() )
             continue;
-
         // check online security
         if (HasLowerSecurity(pl, 0))
             return false;
-
         std::string plNameLink = GetNameLink(pl);
-
         if(pl->IsBeingTeleported())
         {
             PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
             continue;
         }
-
         PSendSysMessage(LANG_TELEPORTING_TO, plNameLink.c_str(),"", tele->name.c_str());
         if (needReportToTarget(pl))
             ChatHandler(pl).PSendSysMessage(LANG_TELEPORTED_TO_BY, nameLink.c_str());
-
         // stop flight if need
         if(pl->isInFlight())
         {
@@ -2614,38 +2198,29 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
         // save only in non-flight case
         else
             pl->SaveRecallPosition();
-
         pl->TeleportTo(tele->mapId, tele->position_x, tele->position_y, tele->position_z, tele->orientation);
     }
-
     return true;
 }
-
 //Summon group of player
 bool ChatHandler::HandleGroupgoCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     Group *grp = target->GetGroup();
-
     std::string nameLink = GetNameLink(target);
-
     if(!grp)
     {
         PSendSysMessage(LANG_NOT_IN_GROUP,nameLink.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     Map* gmMap = m_session->GetPlayer()->GetMap();
     bool to_instance =  gmMap->Instanceable();
-
     // we are in instance, and can summon only player in our group with us as lead
     if ( to_instance && (
         !m_session->GetPlayer()->GetGroup() || (grp->GetLeaderGUID() != m_session->GetPlayer()->GetGUID()) ||
@@ -2656,31 +2231,24 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player *pl = itr->getSource();
-
         if(!pl || pl==m_session->GetPlayer() || !pl->GetSession() )
             continue;
-
         // check online security
         if (HasLowerSecurity(pl, 0))
             return false;
-
         std::string plNameLink = GetNameLink(pl);
-
         if(pl->IsBeingTeleported()==true)
         {
             PSendSysMessage(LANG_IS_TELEPORTED, plNameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
-
         if (to_instance)
         {
             Map* plMap = pl->GetMap();
-
             if ( plMap->Instanceable() && plMap->GetInstanceId() != gmMap->GetInstanceId() )
             {
                 // cannot summon from instance to instance
@@ -2689,11 +2257,9 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
                 return false;
             }
         }
-
         PSendSysMessage(LANG_SUMMONING, plNameLink.c_str(),"");
         if (needReportToTarget(pl))
             ChatHandler(pl).PSendSysMessage(LANG_SUMMONED_BY, GetNameLink().c_str());
-
         // stop flight if need
         if(pl->isInFlight())
         {
@@ -2703,31 +2269,24 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
         // save only in non-flight case
         else
             pl->SaveRecallPosition();
-
         // before GM
         float x,y,z;
         m_session->GetPlayer()->GetClosePoint(x,y,z,pl->GetObjectSize());
         pl->TeleportTo(m_session->GetPlayer()->GetMapId(),x,y,z,pl->GetOrientation());
     }
-
     return true;
 }
-
 bool ChatHandler::HandleGoTaxinodeCommand(const char* args)
 {
     Player* _player = m_session->GetPlayer();
-
     if (!*args)
         return false;
-
     char* cNodeId = extractKeyFromLink((char*)args,"Htaxinode");
     if (!cNodeId)
         return false;
-
     int32 i_nodeId = atoi(cNodeId);
     if (!i_nodeId)
         return false;
-
     TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i_nodeId);
     if (!node)
     {
@@ -2735,7 +2294,6 @@ bool ChatHandler::HandleGoTaxinodeCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if ((node->x == 0.0f && node->y == 0.0f && node->z == 0.0f) ||
         !MapManager::IsValidMapCoord(node->map_id,node->x,node->y,node->z))
     {
@@ -2743,7 +2301,6 @@ bool ChatHandler::HandleGoTaxinodeCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if (_player->isInFlight())
     {
@@ -2753,40 +2310,32 @@ bool ChatHandler::HandleGoTaxinodeCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(node->map_id, node->x, node->y, node->z, _player->GetOrientation());
     return true;
 }
-
 //teleport at coordinates
 bool ChatHandler::HandleGoXYCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player* _player = m_session->GetPlayer();
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
     char* pmapid = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     float x = (float)atof(px);
     float y = (float)atof(py);
     uint32 mapid;
     if (pmapid)
         mapid = (uint32)atoi(pmapid);
     else mapid = _player->GetMapId();
-
     if(!MapManager::IsValidMapCoord(mapid,x,y))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -2796,31 +2345,23 @@ bool ChatHandler::HandleGoXYCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     Map const *map = MapManager::Instance().CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
-
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
-
     return true;
 }
-
 //teleport at coordinates, including Z
 bool ChatHandler::HandleGoXYZCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player* _player = m_session->GetPlayer();
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
     char* pz = strtok(NULL, " ");
     char* pmapid = strtok(NULL, " ");
-
     if (!px || !py || !pz)
         return false;
-
     float x = (float)atof(px);
     float y = (float)atof(py);
     float z = (float)atof(pz);
@@ -2829,14 +2370,12 @@ bool ChatHandler::HandleGoXYZCommand(const char* args)
         mapid = (uint32)atoi(pmapid);
     else
         mapid = _player->GetMapId();
-
     if(!MapManager::IsValidMapCoord(mapid,x,y,z))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -2846,68 +2385,50 @@ bool ChatHandler::HandleGoXYZCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
-
     return true;
 }
-
 //teleport at coordinates
 bool ChatHandler::HandleGoZoneXYCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player* _player = m_session->GetPlayer();
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
     char* tail = strtok(NULL,"");
-
     char* cAreaId = extractKeyFromLink(tail,"Harea");       // string or [name] Shift-click form |color|Harea:area_id|h[name]|h|r
-
     if (!px || !py)
         return false;
-
     float x = (float)atof(px);
     float y = (float)atof(py);
-
     // prevent accept wrong numeric args
     if ((x==0.0f && *px!='0') || (y==0.0f && *py!='0'))
         return false;
-
     uint32 areaid = cAreaId ? (uint32)atoi(cAreaId) : _player->GetZoneId();
-
     AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(areaid);
-
     if( x<0 || x>100 || y<0 || y>100 || !areaEntry )
     {
         PSendSysMessage(LANG_INVALID_ZONE_COORD,x,y,areaid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // update to parent zone if exist (client map show only zones without parents)
     AreaTableEntry const* zoneEntry = areaEntry->zone ? GetAreaEntryByAreaID(areaEntry->zone) : areaEntry;
-
     Map const *map = MapManager::Instance().CreateBaseMap(zoneEntry->mapid);
-
     if(map->Instanceable())
     {
         PSendSysMessage(LANG_INVALID_ZONE_MAP,areaEntry->ID,areaEntry->area_name[GetSessionDbcLocale()],map->GetId(),map->GetMapName());
         SetSentErrorMessage(true);
         return false;
     }
-
     Zone2MapCoordinates(x,y,zoneEntry->ID);
-
     if(!MapManager::IsValidMapCoord(zoneEntry->mapid,x,y))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,zoneEntry->mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -2917,44 +2438,35 @@ bool ChatHandler::HandleGoZoneXYCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
     _player->TeleportTo(zoneEntry->mapid, x, y, z, _player->GetOrientation());
-
     return true;
 }
-
 //teleport to grid
 bool ChatHandler::HandleGoGridCommand(const char* args)
 {
     if(!*args)    return false;
     Player* _player = m_session->GetPlayer();
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
     char* pmapid = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     float grid_x = (float)atof(px);
     float grid_y = (float)atof(py);
     uint32 mapid;
     if (pmapid)
         mapid = (uint32)atoi(pmapid);
     else mapid = _player->GetMapId();
-
     // center of grid
     float x = (grid_x-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS;
     float y = (grid_y-CENTER_GRID_ID+0.5f)*SIZE_OF_GRIDS;
-
     if(!MapManager::IsValidMapCoord(mapid,x,y))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -2964,26 +2476,19 @@ bool ChatHandler::HandleGoGridCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     Map const *map = MapManager::Instance().CreateBaseMap(mapid);
     float z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
     _player->TeleportTo(mapid, x, y, z, _player->GetOrientation());
-
     return true;
 }
-
 bool ChatHandler::HandleModifyDrunkCommand(const char* args)
 {
     if(!*args)    return false;
-
     uint32 drunklevel = (uint32)atoi(args);
     if(drunklevel > 100)
         drunklevel = 100;
-
     uint16 drunkMod = drunklevel * 0xFFFF / 100;
-
     m_session->GetPlayer()->SetDrunkValue(drunkMod);
-
     return true;
 }
 
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index b6cf14402c6..f390eea6a16 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectMgr.h"
@@ -40,10 +39,8 @@
 #include <fstream>
 #include <map>
 #include "GlobalEvents.h"
-
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
 #include "CreatureGroups.h"
-
 //mute player for some times
 bool ChatHandler::HandleMuteCommand(const char* args)
 {
@@ -52,50 +49,36 @@ bool ChatHandler::HandleMuteCommand(const char* args)
     extractOptFirstArg((char*)args,&nameStr,&delayStr);
     if(!delayStr)
         return false;
-
     char *mutereason = strtok(NULL, "\r");
     std::string mutereasonstr = "No reason";
     if(mutereason != NULL)
          mutereasonstr = mutereason;
-         
     Player* target;
     uint64 target_guid;
     std::string target_name;
     if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
         return false;
-
     uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
-
     // find only player from same account if any
     if(!target)
     {
         if(WorldSession* session = sWorld.FindSession(account_id))
             target = session->GetPlayer();
     }
-
     uint32 notspeaktime = (uint32) atoi(delayStr);
-
     // must have strong lesser security level
     if(HasLowerSecurity (target,target_guid,true))
         return false;
-
     time_t mutetime = time(NULL) + notspeaktime*60;
-
     if (target)
         target->GetSession()->m_muteTime = mutetime;
-
     loginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id );
-
     if(target)
         ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str());
-
     std::string nameLink = playerLink(target_name);
-
     PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink.c_str(), notspeaktime, mutereasonstr.c_str());
-
     return true;
 }
-
 //unmute player
 bool ChatHandler::HandleUnmuteCommand(const char* args)
 {
@@ -104,20 +87,16 @@ bool ChatHandler::HandleUnmuteCommand(const char* args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
-
     // find only player from same account if any
     if(!target)
     {
         if(WorldSession* session = sWorld.FindSession(account_id))
             target = session->GetPlayer();
     }
-
     // must have strong lesser security level
     if(HasLowerSecurity (target,target_guid,true))
         return false;
-
     if (target)
     {
         if(target->CanSpeak())
@@ -126,50 +105,37 @@ bool ChatHandler::HandleUnmuteCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         target->GetSession()->m_muteTime = 0;
     }
-
     loginDatabase.PExecute("UPDATE account SET mutetime = '0' WHERE id = '%u'", account_id );
-
     if(target)
         ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_ENABLED);
-
     std::string nameLink = playerLink(target_name);
-
     PSendSysMessage(LANG_YOU_ENABLE_CHAT, nameLink.c_str());
     return true;
 }
-
 bool ChatHandler::HandleGoTicketCommand(const char * args)
 {
     if(!*args)
         return false;
-
     char *cstrticket_id = strtok((char*)args, " ");
-
     if(!cstrticket_id)
         return false;
-
     uint64 ticket_id = atoi(cstrticket_id);
     if(!ticket_id)
         return false;
-
     GM_Ticket *ticket = objmgr.GetGMTicket(ticket_id);
     if(!ticket)
     {
         SendSysMessage(LANG_COMMAND_TICKETNOTEXIST);
         return true;
     }
-
     float x, y, z;
     int mapid;
-
     x = ticket->pos_x;
     y = ticket->pos_y;
     z = ticket->pos_z;
     mapid = ticket->map;
-
     Player* _player = m_session->GetPlayer();
     if(_player->isInFlight())
     {
@@ -178,27 +144,20 @@ bool ChatHandler::HandleGoTicketCommand(const char * args)
     }
      else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(mapid, x, y, z, 1, 0);
     return true;
 }
-
 bool ChatHandler::HandleGoTriggerCommand(const char* args)
 {
     Player* _player = m_session->GetPlayer();
-
     if (!*args)
         return false;
-
     char *atId = strtok((char*)args, " ");
     if (!atId)
         return false;
-
     int32 i_atId = atoi(atId);
-
     if(!i_atId)
         return false;
-
     AreaTriggerEntry const* at = sAreaTriggerStore.LookupEntry(i_atId);
     if (!at)
     {
@@ -206,14 +165,12 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!MapManager::IsValidMapCoord(at->mapid,at->x,at->y,at->z))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,at->x,at->y,at->mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -223,27 +180,20 @@ bool ChatHandler::HandleGoTriggerCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(at->mapid, at->x, at->y, at->z, _player->GetOrientation());
     return true;
 }
-
 bool ChatHandler::HandleGoGraveyardCommand(const char* args)
 {
     Player* _player = m_session->GetPlayer();
-
     if (!*args)
         return false;
-
     char *gyId = strtok((char*)args, " ");
     if (!gyId)
         return false;
-
     int32 i_gyId = atoi(gyId);
-
     if(!i_gyId)
         return false;
-
     WorldSafeLocsEntry const* gy = sWorldSafeLocsStore.LookupEntry(i_gyId);
     if (!gy)
     {
@@ -251,14 +201,12 @@ bool ChatHandler::HandleGoGraveyardCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!MapManager::IsValidMapCoord(gy->map_id,gy->x,gy->y,gy->z))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,gy->x,gy->y,gy->map_id);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -268,11 +216,9 @@ bool ChatHandler::HandleGoGraveyardCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(gy->map_id, gy->x, gy->y, gy->z, _player->GetOrientation());
     return true;
 }
-
 /** \brief Teleport the GM to the specified creature
 *
 * .gocreature <GUID>      --> TP using creature.guid
@@ -289,19 +235,15 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args)
     if(!*args)
         return false;
     Player* _player = m_session->GetPlayer();
-
     // "id" or number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
     char* pParam1 = extractKeyFromLink((char*)args,"Hcreature");
     if (!pParam1)
         return false;
-
     std::ostringstream whereClause;
-
     // User wants to teleport to the NPC's template entry
     if( strcmp(pParam1, "id") == 0 )
     {
         //sLog.outError("DEBUG: ID found");
-
         // Get the "creature_template.entry"
         // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
         char* tail = strtok(NULL,"");
@@ -310,20 +252,16 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args)
         char* cId = extractKeyFromLink(tail,"Hcreature_entry");
         if(!cId)
             return false;
-
         int32 tEntry = atoi(cId);
         //sLog.outError("DEBUG: ID value: %d", tEntry);
         if(!tEntry)
             return false;
-
         whereClause << "WHERE id = '" << tEntry << "'";
     }
     else
     {
         //sLog.outError("DEBUG: ID *not found*");
-
         int32 guid = atoi(pParam1);
-
         // Number is invalid - maybe the user specified the mob's name
         if(!guid)
         {
@@ -337,7 +275,6 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args)
         }
     }
     //sLog.outError("DEBUG: %s", whereClause.c_str());
-
     QueryResult *result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map FROM creature %s", whereClause.str().c_str() );
     if (!result)
     {
@@ -349,23 +286,19 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args)
     {
         SendSysMessage(LANG_COMMAND_GOCREATMULTIPLE);
     }
-
     Field *fields = result->Fetch();
     float x = fields[0].GetFloat();
     float y = fields[1].GetFloat();
     float z = fields[2].GetFloat();
     float ort = fields[3].GetFloat();
     int mapid = fields[4].GetUInt16();
-
     delete result;
-
     if(!MapManager::IsValidMapCoord(mapid,x,y,z,ort))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -375,31 +308,24 @@ bool ChatHandler::HandleGoCreatureCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(mapid, x, y, z, ort);
     return true;
 }
-
 //teleport to gameobject
 bool ChatHandler::HandleGoObjectCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player* _player = m_session->GetPlayer();
-
     // number or [name] Shift-click form |color|Hgameobject:go_guid|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     int32 guid = atoi(cId);
     if(!guid)
         return false;
-
     float x, y, z, ort;
     int mapid;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(guid))
     {
@@ -415,14 +341,12 @@ bool ChatHandler::HandleGoObjectCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!MapManager::IsValidMapCoord(mapid,x,y,z,ort))
     {
         PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,mapid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // stop flight if need
     if(_player->isInFlight())
     {
@@ -432,11 +356,9 @@ bool ChatHandler::HandleGoObjectCommand(const char* args)
     // save only in non-flight case
     else
         _player->SaveRecallPosition();
-
     _player->TeleportTo(mapid, x, y, z, ort);
     return true;
 }
-
 bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
 {
     Player* pl = m_session->GetPlayer();
@@ -448,9 +370,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
         char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry");
         if(!cId)
             return false;
-
         uint32 id = atol(cId);
-
         if(id)
             result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, orientation, map, (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ FROM gameobject WHERE map = '%i' AND id = '%u' ORDER BY order_ ASC LIMIT 1",
                 pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(), pl->GetMapId(),id);
@@ -469,7 +389,6 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
         std::ostringstream eventFilter;
         eventFilter << " AND (event IS NULL ";
         bool initString = true;
-
         for (GameEventMgr::ActiveEvents::const_iterator itr = activeEventsList.begin(); itr != activeEventsList.end(); ++itr)
         {
             if (initString)
@@ -480,29 +399,24 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
             else
                 eventFilter << "," << *itr;
         }
-
         if (!initString)
             eventFilter << "))";
         else
             eventFilter << ")";
-
         result = WorldDatabase.PQuery("SELECT gameobject.guid, id, position_x, position_y, position_z, orientation, map, "
             "(POW(position_x - %f, 2) + POW(position_y - %f, 2) + POW(position_z - %f, 2)) AS order_ FROM gameobject "
             "LEFT OUTER JOIN game_event_gameobject on gameobject.guid=game_event_gameobject.guid WHERE map = '%i' %s ORDER BY order_ ASC LIMIT 10",
             m_session->GetPlayer()->GetPositionX(), m_session->GetPlayer()->GetPositionY(), m_session->GetPlayer()->GetPositionZ(), m_session->GetPlayer()->GetMapId(),eventFilter.str().c_str());
     }
-
     if (!result)
     {
         SendSysMessage(LANG_COMMAND_TARGETOBJNOTFOUND);
         return true;
     }
-
     bool found = false;
     float x, y, z, o;
     uint32 lowguid, id;
     uint16 mapid, pool_id;
-
     do
     {
         Field *fields = result->Fetch();
@@ -517,41 +431,31 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
         if (!pool_id || (pool_id && poolhandler.IsSpawnedObject(pool_id, lowguid, TYPEID_GAMEOBJECT)))
             found = true;
     } while( result->NextRow() && (!found) );
-
     delete result;
-
     if (!found)
     {
         PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id);
         return false;
     }
-
     GameObjectInfo const* goI = objmgr.GetGameObjectInfo(id);
-
     if (!goI)
     {
         PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id);
         return false;
     }
-
     GameObject* target = m_session->GetPlayer()->GetMap()->GetGameObject(MAKE_NEW_GUID(lowguid,id,HIGHGUID_GAMEOBJECT));
-
     PSendSysMessage(LANG_GAMEOBJECT_DETAIL, lowguid, goI->name, lowguid, id, x, y, z, mapid, o);
-
     if(target)
     {
         int32 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
         if(curRespawnDelay < 0)
             curRespawnDelay = 0;
-
         std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true);
         std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true);
-
         PSendSysMessage(LANG_COMMAND_RAWPAWNTIMES, defRespawnDelayStr.c_str(),curRespawnDelayStr.c_str());
     }
     return true;
 }
-
 //delete object by selection or guid
 bool ChatHandler::HandleGameObjectDeleteCommand(const char* args)
 {
@@ -559,24 +463,19 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args)
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* obj = NULL;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
         obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
-
     if(!obj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint64 owner_guid = obj->GetOwnerGUID();
     if(owner_guid)
     {
@@ -587,19 +486,14 @@ bool ChatHandler::HandleGameObjectDeleteCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         owner->RemoveGameObject(obj,false);
     }
-
     obj->SetRespawnTime(0);                                 // not save respawn time
     obj->Delete();
     obj->DeleteFromDB();
-
     PSendSysMessage(LANG_COMMAND_DELOBJMESSAGE, obj->GetGUIDLow());
-
     return true;
 }
-
 //turn selected object
 bool ChatHandler::HandleGameObjectTurnCommand(const char* args)
 {
@@ -607,27 +501,21 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args)
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* obj = NULL;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
         obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
-
     if(!obj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     char* po = strtok(NULL, " ");
     float o;
-
     if (po)
     {
         o = (float)atof(po);
@@ -637,20 +525,15 @@ bool ChatHandler::HandleGameObjectTurnCommand(const char* args)
         Player *chr = m_session->GetPlayer();
         o = chr->GetOrientation();
     }
-
     obj->Relocate(obj->GetPositionX(), obj->GetPositionY(), obj->GetPositionZ(), o);
     obj->UpdateRotationFields();
     obj->DestroyForNearbyPlayers();
     ObjectAccessor::UpdateObjectVisibility(obj);
-
     obj->SaveToDB();
     obj->Refresh();
-
     PSendSysMessage(LANG_COMMAND_TURNOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow(), o);
-
     return true;
 }
-
 //move selected object
 bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
 {
@@ -658,28 +541,22 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* obj = NULL;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
         obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
-
     if(!obj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     char* px = strtok(NULL, " ");
     char* py = strtok(NULL, " ");
     char* pz = strtok(NULL, " ");
-
     if (!px)
     {
         Player *chr = m_session->GetPlayer();
@@ -691,57 +568,44 @@ bool ChatHandler::HandleGameObjectMoveCommand(const char* args)
     {
         if(!py || !pz)
             return false;
-
         float x = (float)atof(px);
         float y = (float)atof(py);
         float z = (float)atof(pz);
-
         if(!MapManager::IsValidMapCoord(obj->GetMapId(),x,y,z))
         {
             PSendSysMessage(LANG_INVALID_TARGET_COORD,x,y,obj->GetMapId());
             SetSentErrorMessage(true);
             return false;
         }
-
         obj->Relocate(x, y, z, obj->GetOrientation());
         obj->DestroyForNearbyPlayers();
         ObjectAccessor::UpdateObjectVisibility(obj);
     }
-
     obj->SaveToDB();
     obj->Refresh();
-
     PSendSysMessage(LANG_COMMAND_MOVEOBJMESSAGE, obj->GetGUIDLow(), obj->GetGOInfo()->name, obj->GetGUIDLow());
-
     return true;
 }
-
 //spawn go
 bool ChatHandler::HandleGameObjectAddCommand(const char* args)
 {
     if (!*args)
         return false;
-
     // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry");
     if(!cId)
         return false;
-
     uint32 id = atol(cId);
     if(!id)
         return false;
-
     char* spawntimeSecs = strtok(NULL, " ");
-
     const GameObjectInfo *gInfo = objmgr.GetGameObjectInfo(id);
-
     if (!gInfo)
     {
         PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST,id);
         SetSentErrorMessage(true);
         return false;
     }
-
     if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId))
     {
         // report to DB errors log as in loading case
@@ -750,51 +614,40 @@ bool ChatHandler::HandleGameObjectAddCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Player *chr = m_session->GetPlayer();
     float x = float(chr->GetPositionX());
     float y = float(chr->GetPositionY());
     float z = float(chr->GetPositionZ());
     float o = float(chr->GetOrientation());
     Map *map = chr->GetMap();
-
     GameObject* pGameObj = new GameObject;
     uint32 db_lowGUID = objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT);
-
     if(!pGameObj->Create(db_lowGUID, gInfo->id, map, chr->GetPhaseMaskForSpawn(), x, y, z, o, 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY))
     {
         delete pGameObj;
         return false;
     }
-
     if( spawntimeSecs )
     {
         uint32 value = atoi((char*)spawntimeSecs);
         pGameObj->SetRespawnTime(value);
         //sLog.outDebug("*** spawntimeSecs: %d", value);
     }
-
     // fill the gameobject data and save to the db
     pGameObj->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()),chr->GetPhaseMaskForSpawn());
-
     // this will generate a new guid if the object is in an instance
     if(!pGameObj->LoadFromDB(db_lowGUID, map))
     {
         delete pGameObj;
         return false;
     }
-
     sLog.outDebug(GetMangosString(LANG_GAMEOBJECT_CURRENT), gInfo->name, db_lowGUID, x, y, z, o);
-
     map->Add(pGameObj);
-
     // TODO: is it really necessary to add both the real and DB table guid here ?
     objmgr.AddGameobjectToGrid(db_lowGUID, objmgr.GetGOData(db_lowGUID));
-
     PSendSysMessage(LANG_GAMEOBJECT_ADD,id,gInfo->name,db_lowGUID,x,y,z);
     return true;
 }
-
 //set pahsemask for selected object
 bool ChatHandler::HandleGameObjectPhaseCommand(const char* args)
 {
@@ -802,24 +655,19 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args)
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* obj = NULL;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
         obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
-
     if(!obj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     char* phaseStr = strtok (NULL, " ");
     uint32 phasemask = phaseStr? atoi(phaseStr) : 0;
     if ( phasemask == 0 )
@@ -828,24 +676,20 @@ bool ChatHandler::HandleGameObjectPhaseCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     obj->SetPhaseMask(phasemask,true);
     obj->SaveToDB();
     return true;
 }
-
 bool ChatHandler::HandleGameObjectNearCommand(const char* args)
 {
     float distance = (!*args) ? 10 : atol(args);
     uint32 count = 0;
-
     Player* pl = m_session->GetPlayer();
     QueryResult *result = WorldDatabase.PQuery("SELECT guid, id, position_x, position_y, position_z, map, "
         "(POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) AS order_ "
         "FROM gameobject WHERE map='%u' AND (POW(position_x - '%f', 2) + POW(position_y - '%f', 2) + POW(position_z - '%f', 2)) <= '%f' ORDER BY order_",
         pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),
         pl->GetMapId(),pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ(),distance*distance);
-
     if (result)
     {
         do
@@ -857,68 +701,51 @@ bool ChatHandler::HandleGameObjectNearCommand(const char* args)
             float y = fields[3].GetFloat();
             float z = fields[4].GetFloat();
             int mapid = fields[5].GetUInt16();
-
             GameObjectInfo const * gInfo = objmgr.GetGameObjectInfo(entry);
-
             if(!gInfo)
                 continue;
-
             PSendSysMessage(LANG_GO_LIST_CHAT, guid, guid, gInfo->name, x, y, z, mapid);
-
             ++count;
         } while (result->NextRow());
-
         delete result;
     }
-
     PSendSysMessage(LANG_COMMAND_NEAROBJMESSAGE,distance,count);
     return true;
 }
-
 bool ChatHandler::HandleGUIDCommand(const char* /*args*/)
 {
     uint64 guid = m_session->GetPlayer()->GetSelection();
-
     if (guid == 0)
     {
         SendSysMessage(LANG_NO_SELECTION);
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_OBJECT_GUID, GUID_LOPART(guid), GUID_HIPART(guid));
     return true;
 }
-
 bool ChatHandler::HandleModifyRepCommand(const char * args)
 {
     if (!*args) return false;
-
     Player* target = NULL;
     target = getSelectedPlayer();
-
     if(!target)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     char* factionTxt = extractKeyFromLink((char*)args,"Hfaction");
     if(!factionTxt)
         return false;
-
     uint32 factionId = atoi(factionTxt);
-
     int32 amount = 0;
     char *rankTxt = strtok(NULL, " ");
     if (!factionTxt || !rankTxt)
         return false;
-
     amount = atoi(rankTxt);
     if ((amount == 0) && (rankTxt[0] != '-') && !isdigit(rankTxt[0]))
     {
@@ -927,7 +754,6 @@ bool ChatHandler::HandleModifyRepCommand(const char * args)
         if(!Utf8toWStr(rankStr,wrankStr))
             return false;
         wstrToLower( wrankStr );
-
         int r = 0;
         amount = -42000;
         for (; r < MAX_REPUTATION_RANK; ++r)
@@ -935,13 +761,10 @@ bool ChatHandler::HandleModifyRepCommand(const char * args)
             std::string rank = GetTrinityString(ReputationRankStrIndex[r]);
             if(rank.empty())
                 continue;
-
             std::wstring wrank;
             if(!Utf8toWStr(rank,wrank))
                 continue;
-
             wstrToLower(wrank);
-
             if(wrank.substr(0,wrankStr.size())==wrankStr)
             {
                 char *deltaTxt = strtok(NULL, " ");
@@ -967,29 +790,24 @@ bool ChatHandler::HandleModifyRepCommand(const char * args)
             return false;
         }
     }
-
     FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionId);
-
     if (!factionEntry)
     {
         PSendSysMessage(LANG_COMMAND_FACTION_UNKNOWN, factionId);
         SetSentErrorMessage(true);
         return false;
     }
-
     if (factionEntry->reputationListID < 0)
     {
         PSendSysMessage(LANG_COMMAND_FACTION_NOREP_ERROR, factionEntry->name[GetSessionDbcLocale()], factionId);
         SetSentErrorMessage(true);
         return false;
     }
-
     target->GetReputationMgr().SetReputation(factionEntry,amount);
     PSendSysMessage(LANG_COMMAND_MODIFY_REP, factionEntry->name[GetSessionDbcLocale()], factionId,
         GetNameLink(target).c_str(), target->GetReputationMgr().GetReputation(factionEntry));
     return true;
 }
-
 //-----------------------Npc Commands-----------------------
 //add spawn of creature
 bool ChatHandler::HandleNpcAddCommand(const char* args)
@@ -999,46 +817,36 @@ bool ChatHandler::HandleNpcAddCommand(const char* args)
     char* charID = extractKeyFromLink((char*)args,"Hcreature_entry");
     if(!charID)
         return false;
-
     char* team = strtok(NULL, " ");
     int32 teamval = 0;
     if (team) { teamval = atoi(team); }
     if (teamval < 0) { teamval = 0; }
-
     uint32 id  = atoi(charID);
-
     Player *chr = m_session->GetPlayer();
     float x = chr->GetPositionX();
     float y = chr->GetPositionY();
     float z = chr->GetPositionZ();
     float o = chr->GetOrientation();
     Map *map = chr->GetMap();
-
     Creature* pCreature = new Creature;
     if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
     {
         delete pCreature;
         return false;
     }
-
     pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
-
     uint32 db_guid = pCreature->GetDBTableGUIDLow();
-
     // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
     pCreature->LoadFromDB(db_guid, map);
-
     map->Add(pCreature);
     objmgr.AddCreatureToGrid(db_guid, objmgr.GetCreatureData(db_guid));
     return true;
 }
-
 //add item in vendorlist
 bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* pitem  = extractKeyFromLink((char*)args,"Hitem");
     if (!pitem)
     {
@@ -1046,46 +854,34 @@ bool ChatHandler::HandleNpcAddVendorItemCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 itemId = atol(pitem);
-
     char* fmaxcount = strtok(NULL, " ");                    //add maxcount, default: 0
     uint32 maxcount = 0;
     if (fmaxcount)
         maxcount = atol(fmaxcount);
-
     char* fincrtime = strtok(NULL, " ");                    //add incrtime, default: 0
     uint32 incrtime = 0;
     if (fincrtime)
         incrtime = atol(fincrtime);
-
     char* fextendedcost = strtok(NULL, " ");                //add ExtendedCost, default: 0
     uint32 extendedcost = fextendedcost ? atol(fextendedcost) : 0;
-
     Creature* vendor = getSelectedCreature();
-
     uint32 vendor_entry = vendor ? vendor->GetEntry() : 0;
-
     if(!objmgr.IsVendorItemValid(vendor_entry,itemId,maxcount,incrtime,extendedcost,m_session->GetPlayer()))
     {
         SetSentErrorMessage(true);
         return false;
     }
-
     objmgr.AddVendorItem(vendor_entry,itemId,maxcount,incrtime,extendedcost);
-
     ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
-
     PSendSysMessage(LANG_ITEM_ADDED_TO_LIST,itemId,pProto->Name1,maxcount,incrtime,extendedcost);
     return true;
 }
-
 //del item from vendor list
 bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Creature* vendor = getSelectedCreature();
     if (!vendor || !vendor->isVendor())
     {
@@ -1093,7 +889,6 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char* pitem  = extractKeyFromLink((char*)args,"Hitem");
     if (!pitem)
     {
@@ -1102,38 +897,29 @@ bool ChatHandler::HandleNpcDelVendorItemCommand(const char* args)
         return false;
     }
     uint32 itemId = atol(pitem);
-
     if(!objmgr.RemoveVendorItem(vendor->GetEntry(),itemId))
     {
         PSendSysMessage(LANG_ITEM_NOT_IN_LIST,itemId);
         SetSentErrorMessage(true);
         return false;
     }
-
     ItemPrototype const* pProto = objmgr.GetItemPrototype(itemId);
-
     PSendSysMessage(LANG_ITEM_DELETED_FROM_LIST,itemId,pProto->Name1);
     return true;
 }
-
 //add move for creature
 bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* guid_str = strtok((char*)args, " ");
     char* wait_str = strtok((char*)NULL, " ");
-
     uint32 lowguid = atoi((char*)guid_str);
-
     Creature* pCreature = NULL;
-
     /* FIXME: impossible without entry
     if(lowguid)
         pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT));
     */
-
     // attempt check creature existence by DB data
     if(!pCreature)
     {
@@ -1150,16 +936,11 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
         // obtain real GUID for DB operations
         lowguid = pCreature->GetDBTableGUIDLow();
     }
-
     int wait = wait_str ? atoi(wait_str) : 0;
-
     if(wait < 0)
         wait = 0;
-
     Player* player = m_session->GetPlayer();
-
     //WaypointMgr.AddLastNode(lowguid, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetOrientation(), wait, 0);
-
     // update movement type
     WorldDatabase.PExecuteLog("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE,lowguid);
     if(pCreature && pCreature->GetWaypointPath())
@@ -1173,18 +954,14 @@ bool ChatHandler::HandleNpcAddMoveCommand(const char* args)
         }
         pCreature->SaveToDB();
     }
-
     SendSysMessage(LANG_WAYPOINT_ADDED);
-
     return true;
 }
-
 //change level of creature or pet
 bool ChatHandler::HandleNpcChangeLevelCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint8 lvl = (uint8) atoi((char*)args);
     if ( lvl < 1 || lvl > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) + 3)
     {
@@ -1192,7 +969,6 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Creature* pCreature = getSelectedCreature();
     if(!pCreature)
     {
@@ -1200,7 +976,6 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(pCreature->isPet())
     {
         if(((Pet*)pCreature)->getPetType()==HUNTER_PET)
@@ -1217,95 +992,72 @@ bool ChatHandler::HandleNpcChangeLevelCommand(const char* args)
         pCreature->SetLevel( lvl);
         pCreature->SaveToDB();
     }
-
     return true;
 }
-
 //set npcflag of creature
 bool ChatHandler::HandleNpcFlagCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 npcFlags = (uint32) atoi((char*)args);
-
     Creature* pCreature = getSelectedCreature();
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->SetUInt32Value(UNIT_NPC_FLAGS, npcFlags);
-
     WorldDatabase.PExecuteLog("UPDATE creature_template SET npcflag = '%u' WHERE entry = '%u'", npcFlags, pCreature->GetEntry());
-
     SendSysMessage(LANG_VALUE_SAVED_REJOIN);
-
     return true;
 }
-
 bool ChatHandler::HandleNpcDeleteCommand(const char* args)
 {
     Creature* unit = NULL;
-
     if(*args)
     {
         // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r
         char* cId = extractKeyFromLink((char*)args,"Hcreature");
         if(!cId)
             return false;
-
         uint32 lowguid = atoi(cId);
         if(!lowguid)
             return false;
-
         if (CreatureData const* cr_data = objmgr.GetCreatureData(lowguid))
             unit = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(lowguid, cr_data->id, HIGHGUID_UNIT));
     }
     else
         unit = getSelectedCreature();
-
     if(!unit || unit->isPet() || unit->isTotem())
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     // Delete the creature
     unit->CombatStop();
     unit->DeleteFromDB();
     unit->AddObjectToRemoveList();
-
     SendSysMessage(LANG_COMMAND_DELCREATMESSAGE);
-
     return true;
 }
-
 //move selected creature
 bool ChatHandler::HandleNpcMoveCommand(const char* args)
 {
     uint32 lowguid = 0;
-
     Creature* pCreature = getSelectedCreature();
-
     if(!pCreature)
     {
         // number or [name] Shift-click form |color|Hcreature:creature_guid|h[name]|h|r
         char* cId = extractKeyFromLink((char*)args,"Hcreature");
         if(!cId)
             return false;
-
         lowguid = atoi(cId);
-
         /* FIXME: impossibel without entry
         if(lowguid)
             pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT));
         */
-
         // Attempting creature load from DB data
         if(!pCreature)
         {
@@ -1316,9 +1068,7 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args)
                 SetSentErrorMessage(true);
                 return false;
             }
-
             uint32 map_id = data->mapid;
-
             if(m_session->GetPlayer()->GetMapId()!=map_id)
             {
                 PSendSysMessage(LANG_COMMAND_CREATUREATSAMEMAP, lowguid);
@@ -1335,12 +1085,10 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args)
     {
         lowguid = pCreature->GetDBTableGUIDLow();
     }
-
     float x = m_session->GetPlayer()->GetPositionX();
     float y = m_session->GetPlayer()->GetPositionY();
     float z = m_session->GetPlayer()->GetPositionZ();
     float o = m_session->GetPlayer()->GetOrientation();
-
     if (pCreature)
     {
         if(CreatureData const* data = objmgr.GetCreatureData(pCreature->GetDBTableGUIDLow()))
@@ -1358,12 +1106,10 @@ bool ChatHandler::HandleNpcMoveCommand(const char* args)
             pCreature->Respawn();
         }
     }
-
     WorldDatabase.PExecuteLog("UPDATE creature SET position_x = '%f', position_y = '%f', position_z = '%f', orientation = '%f' WHERE guid = '%u'", x, y, z, o, lowguid);
     PSendSysMessage(LANG_COMMAND_CREATUREMOVED);
     return true;
 }
-
 /**HandleNpcSetMoveTypeCommand
  * Set the movement type for an NPC.<br/>
  * <br/>
@@ -1380,7 +1126,6 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // 3 arguments:
     // GUID (optional - you can also select the creature)
     // stay|random|way (determines the kind of movement)
@@ -1391,19 +1136,14 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
     char* guid_str = strtok((char*)args, " ");
     char* type_str = strtok((char*)NULL, " ");
     char* dontdel_str = strtok((char*)NULL, " ");
-
     bool doNotDelete = false;
-
     if(!guid_str)
         return false;
-
     uint32 lowguid = 0;
     Creature* pCreature = NULL;
-
     if( dontdel_str )
     {
         //sLog.outError("DEBUG: All 3 params are set");
-
         // All 3 params are set
         // GUID
         // type
@@ -1428,7 +1168,6 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
             }
         }
     }
-
     if(!type_str)                                           // case .setmovetype $move_type (with selected creature)
     {
         type_str = guid_str;
@@ -1440,12 +1179,10 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
     else                                                    // case .setmovetype #creature_guid $move_type (with selected creature)
     {
         lowguid = atoi((char*)guid_str);
-
         /* impossible without entry
         if(lowguid)
             pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT));
         */
-
         // attempt check creature existence by DB data
         if(!pCreature)
         {
@@ -1462,14 +1199,10 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
             lowguid = pCreature->GetDBTableGUIDLow();
         }
     }
-
     // now lowguid is low guid really existed creature
     // and pCreature point (maybe) to this creature or NULL
-
     MovementGeneratorType move_type;
-
     std::string type = type_str;
-
     if(type == "stay")
         move_type = IDLE_MOTION_TYPE;
     else if(type == "random")
@@ -1478,17 +1211,14 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
         move_type = WAYPOINT_MOTION_TYPE;
     else
         return false;
-
     // update movement type
     //if(doNotDelete == false)
     //    WaypointMgr.DeletePath(lowguid);
-
     if(pCreature)
     {
         // update movement type
         if(doNotDelete == false)
             pCreature->LoadPath(0);
-
         pCreature->SetDefaultMovementType(move_type);
         pCreature->GetMotionMaster()->Initialize();
         if(pCreature->isAlive())                            // dead creature will reset movement generator at respawn
@@ -1506,32 +1236,24 @@ bool ChatHandler::HandleNpcSetMoveTypeCommand(const char* args)
     {
         PSendSysMessage(LANG_MOVE_TYPE_SET_NODEL,type_str);
     }
-
     return true;
 }
-
 //set model of creature
 bool ChatHandler::HandleNpcSetModelCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 displayId = (uint32) atoi((char*)args);
-
     Creature *pCreature = getSelectedCreature();
-
     if(!pCreature || pCreature->isPet())
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->SetDisplayId(displayId);
     pCreature->SetNativeDisplayId(displayId);
-
     pCreature->SaveToDB();
-
     return true;
 }
 //set faction of creature
@@ -1539,39 +1261,30 @@ bool ChatHandler::HandleNpcFactionIdCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 factionId = (uint32) atoi((char*)args);
-
     if (!sFactionTemplateStore.LookupEntry(factionId))
     {
         PSendSysMessage(LANG_WRONG_FACTION, factionId);
         SetSentErrorMessage(true);
         return false;
     }
-
     Creature* pCreature = getSelectedCreature();
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->setFaction(factionId);
-
     // faction is set in creature_template - not inside creature
-
     // update in memory
     if(CreatureInfo const *cinfo = pCreature->GetCreatureInfo())
     {
         const_cast<CreatureInfo*>(cinfo)->faction_A = factionId;
         const_cast<CreatureInfo*>(cinfo)->faction_H = factionId;
     }
-
     // and DB
     WorldDatabase.PExecuteLog("UPDATE creature_template SET faction_A = '%u', faction_H = '%u' WHERE entry = '%u'", factionId, factionId, pCreature->GetEntry());
-
     return true;
 }
 //set spawn dist of creature
@@ -1579,26 +1292,21 @@ bool ChatHandler::HandleNpcSpawnDistCommand(const char* args)
 {
     if(!*args)
         return false;
-
     float option = atof((char*)args);
     if (option < 0.0f)
     {
         SendSysMessage(LANG_BAD_VALUE);
         return false;
     }
-
     MovementGeneratorType mtype = IDLE_MOTION_TYPE;
     if (option >0.0f)
         mtype = RANDOM_MOTION_TYPE;
-
     Creature *pCreature = getSelectedCreature();
     uint32 u_guidlow = 0;
-
     if (pCreature)
         u_guidlow = pCreature->GetDBTableGUIDLow();
     else
         return false;
-
     pCreature->SetRespawnRadius((float)option);
     pCreature->SetDefaultMovementType(mtype);
     pCreature->GetMotionMaster()->Initialize();
@@ -1607,7 +1315,6 @@ bool ChatHandler::HandleNpcSpawnDistCommand(const char* args)
         pCreature->setDeathState(JUST_DIED);
         pCreature->Respawn();
     }
-
     WorldDatabase.PExecuteLog("UPDATE creature SET spawndist=%f, MovementType=%i WHERE guid=%u",option,mtype,u_guidlow);
     PSendSysMessage(LANG_COMMAND_SPAWNDIST,option);
     return true;
@@ -1617,33 +1324,25 @@ bool ChatHandler::HandleNpcSpawnTimeCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* stime = strtok((char*)args, " ");
-
     if (!stime)
         return false;
-
     int i_stime = atoi((char*)stime);
-
     if (i_stime < 0)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     Creature *pCreature = getSelectedCreature();
     uint32 u_guidlow = 0;
-
     if (pCreature)
         u_guidlow = pCreature->GetDBTableGUIDLow();
     else
         return false;
-
     WorldDatabase.PExecuteLog("UPDATE creature SET spawntimesecs=%i WHERE guid=%u",i_stime,u_guidlow);
     pCreature->SetRespawnDelay((uint32)i_stime);
     PSendSysMessage(LANG_COMMAND_SPAWNTIME,i_stime);
-
     return true;
 }
 //npc follow handling
@@ -1651,17 +1350,14 @@ bool ChatHandler::HandleNpcFollowCommand(const char* /*args*/)
 {
     Player *player = m_session->GetPlayer();
     Creature *creature = getSelectedCreature();
-
     if(!creature)
     {
         PSendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     // Follow player - Using pet's default dist and angle
     creature->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, creature->GetFollowAngle());
-
     PSendSysMessage(LANG_CREATURE_FOLLOW_YOU_NOW, creature->GetName());
     return true;
 }
@@ -1670,14 +1366,12 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/)
 {
     Player *player = m_session->GetPlayer();
     Creature *creature = getSelectedCreature();
-
     if(!creature)
     {
         PSendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if (/*creature->GetMotionMaster()->empty() ||*/
         creature->GetMotionMaster()->GetCurrentMovementGeneratorType ()!=TARGETED_MOTION_TYPE)
     {
@@ -1685,20 +1379,16 @@ bool ChatHandler::HandleNpcUnFollowCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     TargetedMovementGenerator<Creature> const* mgen
         = static_cast<TargetedMovementGenerator<Creature> const*>((creature->GetMotionMaster()->top()));
-
     if(mgen->GetTarget()!=player)
     {
         PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU);
         SetSentErrorMessage(true);
         return false;
     }
-
     // reset movement
     creature->GetMotionMaster()->MovementExpired(true);
-
     PSendSysMessage(LANG_CREATURE_NOT_FOLLOW_YOU_NOW, creature->GetName());
     return true;
 }
@@ -1712,25 +1402,20 @@ bool ChatHandler::HandleNpcTameCommand(const char* /*args*/)
         SetSentErrorMessage (true);
         return false;
     }
-
     Player *player = m_session->GetPlayer ();
-
     if(player->GetPetGUID ())
     {
         SendSysMessage (LANG_YOU_ALREADY_HAVE_PET);
         SetSentErrorMessage (true);
         return false;
     }
-
     CreatureInfo const* cInfo = creatureTarget->GetCreatureInfo();
-
     if (!cInfo->isTameable (player->CanTameExoticPets()))
     {
         PSendSysMessage (LANG_CREATURE_NON_TAMEABLE,cInfo->Entry);
         SetSentErrorMessage (true);
         return false;
     }
-
     // Everything looks OK, create new pet
     Pet* pet = player->CreateTamedPetFrom (creatureTarget);
     if (!pet)
@@ -1739,33 +1424,24 @@ bool ChatHandler::HandleNpcTameCommand(const char* /*args*/)
         SetSentErrorMessage (true);
         return false;
     }
-
     // place pet before player
     float x,y,z;
     player->GetClosePoint (x,y,z,creatureTarget->GetObjectSize (),CONTACT_DISTANCE);
     pet->Relocate (x,y,z,M_PI-player->GetOrientation ());
-
     // set pet to defensive mode by default (some classes can't control controlled pets in fact).
     pet->SetReactState(REACT_DEFENSIVE);
-
     // calculate proper level
     uint32 level = (creatureTarget->getLevel() < (player->getLevel() - 5)) ? (player->getLevel() - 5) : creatureTarget->getLevel();
-
     // prepare visual effect for levelup
     pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1);
-
     // add to world
     pet->GetMap()->Add((Creature*)pet);
-
     // visual effect for levelup
     pet->SetUInt32Value(UNIT_FIELD_LEVEL, level);
-
     // caster have pet now
     player->SetMinion(pet, true);
-
     pet->SavePetToDB(PET_SAVE_AS_CURRENT);
     player->PetSpellInitialize();
-
     return true;
 }
 //npc phasemask handling
@@ -1774,7 +1450,6 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 phasemask = (uint32) atoi((char*)args);
     if ( phasemask == 0 )
     {
@@ -1782,7 +1457,6 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Creature* pCreature = getSelectedCreature();
     if(!pCreature)
     {
@@ -1790,12 +1464,9 @@ bool ChatHandler::HandleNpcSetPhaseCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->SetPhaseMask(phasemask,true);
-
     if(!pCreature->isPet())
         pCreature->SaveToDB();
-
     return true;
 }
 //npc deathstate handling
@@ -1803,7 +1474,6 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Creature* pCreature = getSelectedCreature();
     if(!pCreature || pCreature->isPet())
     {
@@ -1811,7 +1481,6 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (strncmp(args, "on", 3) == 0)
         pCreature->SetDeadByDefault(true);
     else if (strncmp(args, "off", 4) == 0)
@@ -1822,27 +1491,21 @@ bool ChatHandler::HandleNpcSetDeathStateCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     pCreature->SaveToDB();
     pCreature->Respawn();
-
     return true;
 }
-
 //TODO: NpcCommands that need to be fixed :
-
 bool ChatHandler::HandleNpcNameCommand(const char* /*args*/)
 {
     /* Temp. disabled
     if(!*args)
         return false;
-
     if(strlen((char*)args)>75)
     {
         PSendSysMessage(LANG_TOO_LONG_NAME, strlen((char*)args)-75);
         return true;
     }
-
     for (uint8 i = 0; i < strlen(args); ++i)
     {
         if(!isalpha(args[i]) && args[i]!=' ')
@@ -1851,7 +1514,6 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/)
             return false;
         }
     }
-
     uint64 guid;
     guid = m_session->GetPlayer()->GetSelection();
     if (guid == 0)
@@ -1859,39 +1521,29 @@ bool ChatHandler::HandleNpcNameCommand(const char* /*args*/)
         SendSysMessage(LANG_NO_SELECTION);
         return true;
     }
-
     Creature* pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid);
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         return true;
     }
-
     pCreature->SetName(args);
     uint32 idname = objmgr.AddCreatureTemplate(pCreature->GetName());
     pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
-
     pCreature->SaveToDB();
     */
-
     return true;
 }
-
 bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/)
 {
     /* Temp. disabled
-
     if(!*args)
         args = "";
-
     if(strlen((char*)args)>75)
     {
-
         PSendSysMessage(LANG_TOO_LONG_SUBNAME, strlen((char*)args)-75);
         return true;
     }
-
     for (uint8 i = 0; i < strlen(args); i++)
     {
         if(!isalpha(args[i]) && args[i]!=' ')
@@ -1907,58 +1559,43 @@ bool ChatHandler::HandleNpcSubNameCommand(const char* /*args*/)
         SendSysMessage(LANG_NO_SELECTION);
         return true;
     }
-
     Creature* pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid);
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         return true;
     }
-
     uint32 idname = objmgr.AddCreatureSubName(pCreature->GetName(),args,pCreature->GetUInt32Value(UNIT_FIELD_DISPLAYID));
     pCreature->SetUInt32Value(OBJECT_FIELD_ENTRY, idname);
-
     pCreature->SaveToDB();
     */
     return true;
 }
-
 //move item to other slot
 bool ChatHandler::HandleItemMoveCommand(const char* args)
 {
     if(!*args)
         return false;
     uint8 srcslot, dstslot;
-
     char* pParam1 = strtok((char*)args, " ");
     if (!pParam1)
         return false;
-
     char* pParam2 = strtok(NULL, " ");
     if (!pParam2)
         return false;
-
     srcslot = (uint8)atoi(pParam1);
     dstslot = (uint8)atoi(pParam2);
-
     if(srcslot==dstslot)
         return true;
-
     if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0,srcslot))
         return false;
-
     if(!m_session->GetPlayer()->IsValidPos(INVENTORY_SLOT_BAG_0,dstslot))
         return false;
-
     uint16 src = ((INVENTORY_SLOT_BAG_0 << 8) | srcslot);
     uint16 dst = ((INVENTORY_SLOT_BAG_0 << 8) | dstslot);
-
     m_session->GetPlayer()->SwapItem( src, dst );
-
     return true;
 }
-
 //demorph player or unit
 bool ChatHandler::HandleDeMorphCommand(const char* /*args*/)
 {
@@ -1966,37 +1603,27 @@ bool ChatHandler::HandleDeMorphCommand(const char* /*args*/)
     if(!target)
         target = m_session->GetPlayer();
 
-
     // check online security
     else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0))
         return false;
-
     target->DeMorph();
-
     return true;
 }
-
 //morph creature or player
 bool ChatHandler::HandleModifyMorphCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint16 display_id = (uint16)atoi((char*)args);
-
     Unit *target = getSelectedUnit();
     if(!target)
         target = m_session->GetPlayer();
-
     // check online security
     else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0))
         return false;
-
     target->SetDisplayId(display_id);
-
     return true;
 }
-
 //kick player
 bool ChatHandler::HandleKickPlayerCommand(const char *args)
 {
@@ -2008,7 +1635,6 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
         reason = kickReason;
     if(m_session)
         kicker = m_session->GetPlayer()->GetName();
-
     if(!kickName)
     {
         Player* player = getSelectedPlayer();
@@ -2018,18 +1644,15 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         if(player==m_session->GetPlayer())
         {
             SendSysMessage(LANG_COMMAND_KICKSELF);
             SetSentErrorMessage(true);
             return false;
         }
-
         // check online security
         if (HasLowerSecurity(player, 0))
             return false;
-
         if(sWorld.getConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1)
         {
             sWorld.SendWorldText(LANG_COMMAND_KICKMESSAGE, player->GetName(), kicker.c_str(), reason.c_str());
@@ -2038,7 +1661,6 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
         {
             PSendSysMessage(LANG_COMMAND_KICKMESSAGE, player->GetName(), kicker.c_str(), reason.c_str());
         }
-
         player->GetSession()->KickPlayer();
     }
     else
@@ -2050,14 +1672,12 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         if(m_session && name==m_session->GetPlayer()->GetName())
         {
             SendSysMessage(LANG_COMMAND_KICKSELF);
             SetSentErrorMessage(true);
             return false;
         }
-
         Player* player = objmgr.GetPlayer(kickName);
         if(!player)
         {
@@ -2065,16 +1685,13 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         if(HasLowerSecurity(player, 0))
         {
             SendSysMessage(LANG_YOURS_SECURITY_IS_LOW); //maybe replacement string for this later on
             SetSentErrorMessage(true);
             return false;
         }
-
         std::string nameLink = playerLink(name);
-    
         if(sWorld.KickPlayer(name))
         {
             if(sWorld.getConfig(CONFIG_SHOW_KICK_IN_WORLD) == 1)
@@ -2095,45 +1712,35 @@ bool ChatHandler::HandleKickPlayerCommand(const char *args)
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     if (m_session && target==m_session->GetPlayer())
     {
         SendSysMessage(LANG_COMMAND_KICKSELF);
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     // send before target pointer invalidate
     PSendSysMessage(LANG_COMMAND_KICKMESSAGE,GetNameLink(target).c_str());
     target->GetSession()->KickPlayer();
     return true;
 }
-
 //set temporary phase mask for player
 bool ChatHandler::HandleModifyPhaseCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 phasemask = (uint32)atoi((char*)args);
-
     Unit *target = getSelectedUnit();
     if(!target)
         target = m_session->GetPlayer();
-
     // check online security
     else if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0))
         return false;
-
     target->SetPhaseMask(phasemask,true);
-
     return true;
 }
-
 //show info of player
 bool ChatHandler::HandlePInfoCommand(const char* args)
 {
@@ -2142,7 +1749,6 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     uint32 accId = 0;
     uint32 money = 0;
     uint32 total_player_time = 0;
@@ -2150,14 +1756,12 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
     uint32 latency = 0;
     uint8 race;
     uint8 Class;
-
     // get additional information from Player object
     if(target)
     {
         // check online security
         if (HasLowerSecurity(target, 0))
             return false;
-
         accId = target->GetSession()->GetAccountId();
         money = target->GetMoney();
         total_player_time = target->GetTotalPlayedTime();
@@ -2172,12 +1776,10 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
         // check offline security
         if (HasLowerSecurity(NULL, target_guid))
             return false;
-
         //                                                     0          1      2      3        4     5
         QueryResult *result = CharacterDatabase.PQuery("SELECT totaltime, level, money, account, race, class FROM characters WHERE guid = '%u'", GUID_LOPART(target_guid));
         if (!result)
             return false;
-
         Field *fields = result->Fetch();
         total_player_time = fields[0].GetUInt32();
         level = fields[1].GetUInt32();
@@ -2187,13 +1789,11 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
         Class = fields[5].GetUInt8();
         delete result;
     }
-
     std::string username = GetTrinityString(LANG_ERROR);
     std::string email = GetTrinityString(LANG_ERROR);
     std::string last_ip = GetTrinityString(LANG_ERROR);
     uint32 security = 0;
     std::string last_login = GetTrinityString(LANG_ERROR);
-
     QueryResult* result = loginDatabase.PQuery("SELECT username,gmlevel,email,last_ip,last_login FROM account WHERE id = '%u'",accId);
     if(result)
     {
@@ -2201,10 +1801,8 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
         username = fields[0].GetCppString();
         security = fields[1].GetUInt32();
         email = fields[2].GetCppString();
-
         if(email.empty())
             email = "-";
-
         if(!m_session || m_session->GetSecurity() >= security)
         {
             last_ip = fields[3].GetCppString();
@@ -2215,14 +1813,10 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
             last_ip = "-";
             last_login = "-";
         }
-
         delete result;
     }
-
     std::string nameLink = playerLink(target_name);
-
     PSendSysMessage(LANG_PINFO_ACCOUNT, (target?"":GetTrinityString(LANG_OFFLINE)), nameLink.c_str(), GUID_LOPART(target_guid), username.c_str(), accId, email.c_str(), security, last_ip.c_str(), last_login.c_str(), latency);
-
     std::string race_s, Class_s;
     switch(race)
     {
@@ -2250,18 +1844,14 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
         case CLASS_WARLOCK:         Class_s = "Warlock";        break;
         case CLASS_DRUID:           Class_s = "Druid";          break;
     }
-
     std::string timeStr = secsToTimeString(total_player_time,true,true);
     uint32 gold = money /GOLD;
     uint32 silv = (money % GOLD) / SILVER;
     uint32 copp = (money % GOLD) % SILVER;
     PSendSysMessage(LANG_PINFO_LEVEL, race_s.c_str(), Class_s.c_str(), timeStr.c_str(), level, gold, silv, copp);
-
     return true;
 }
-
 /////WAYPOINT COMMANDS
-
 /**
  * Add a waypoint to a creature.
  *
@@ -2286,17 +1876,13 @@ bool ChatHandler::HandlePInfoCommand(const char* args)
 bool ChatHandler::HandleWpAddCommand(const char* args)
 {
     sLog.outDebug("DEBUG: HandleWpAddCommand");
-
     // optional
     char* path_number = NULL;
     uint32 pathid = 0;
-
     if(*args)
         path_number = strtok((char*)args, " ");
-
     uint32 point = 0;
     Creature* target = getSelectedCreature();
-
     if (!path_number)
     {
         if(target)
@@ -2312,81 +1898,62 @@ bool ChatHandler::HandleWpAddCommand(const char* args)
     }
     else
         pathid = atoi(path_number);
-
     // path_id -> ID of the Path
     // point   -> number of the waypoint (if not 0)
-
     if(!pathid)
     {
         sLog.outDebug("DEBUG: HandleWpAddCommand - Current creature haven't loaded path.");
         PSendSysMessage("%s%s|r", "|cffff33ff", "Current creature haven't loaded path.");
         return true;
     }
-
     sLog.outDebug("DEBUG: HandleWpAddCommand - point == 0");
-
     QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid);
-
     if( result )
     {
         point = (*result)[0].GetUInt32();
         delete result;
     }
-
     Player* player = m_session->GetPlayer();
     Map *map = player->GetMap();
-
     WorldDatabase.PExecuteLog("INSERT INTO waypoint_data (id, point, position_x, position_y, position_z) VALUES ('%u','%u','%f', '%f', '%f')",
         pathid, point+1, player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
-
     PSendSysMessage("%s%s%u%s%u%s|r", "|cff00ff00", "PathID: |r|cff00ffff", pathid, "|r|cff00ff00: Waypoint |r|cff00ffff", point,"|r|cff00ff00 created. ");
     return true;
 }                                                           // HandleWpAddCommand
-
 bool ChatHandler::HandleWpLoadPathCommand(const char *args)
 {
     if(!*args)
         return false;
-
     // optional
     char* path_number = NULL;
-
     if(*args)
         path_number = strtok((char*)args, " ");
-
     uint32 pathid = 0;
     uint32 guidlow = 0;
     Creature* target = getSelectedCreature();
-
     // Did player provide a path_id?
     if (!path_number)
         sLog.outDebug("DEBUG: HandleWpLoadPathCommand - No path number provided");
-
     if(!target)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if(target->GetEntry() == 1)
     {
         PSendSysMessage("%s%s|r", "|cffff33ff", "You want to load path to a waypoint? Aren't you?");
         SetSentErrorMessage(true);
         return false;
     }
-
     pathid = atoi(path_number);
-
     if(!pathid)
     {
         PSendSysMessage("%s%s|r", "|cffff33ff", "No vallid path number provided.");
         return true;
     }
-
     guidlow = target->GetDBTableGUIDLow();
     QueryResult *result = WorldDatabase.PQuery( "SELECT guid FROM creature_addon WHERE guid = '%u'",guidlow);
-
     if( result )
     {
         WorldDatabase.PExecute("UPDATE creature_addon SET path_id = '%u' WHERE guid = '%u'", pathid, guidlow);
@@ -2394,43 +1961,33 @@ bool ChatHandler::HandleWpLoadPathCommand(const char *args)
     }
     else
         WorldDatabase.PExecute("INSERT INTO creature_addon(guid,path_id) VALUES ('%u','%u')", guidlow, pathid);
-
     WorldDatabase.PExecute("UPDATE creature SET MovementType = '%u' WHERE guid = '%u'", WAYPOINT_MOTION_TYPE, guidlow);
-
     target->LoadPath(pathid);
     target->SetDefaultMovementType(WAYPOINT_MOTION_TYPE);
     target->GetMotionMaster()->Initialize();
     target->MonsterSay("Path loaded.",0,0);
-
     return true;
 }
-
 bool ChatHandler::HandleReloadAllPaths(const char* args)
 {
     if(!*args)
         return false;
-
     uint32 id = atoi(args);
-
     if(!id)
         return false;
-
     PSendSysMessage("%s%s|r|cff00ffff%u|r", "|cff00ff00", "Loading Path: ", id);
     WaypointMgr.UpdatePath(id);
     return true;
 }
-
 bool ChatHandler::HandleWpUnLoadPathCommand(const char *args)
 {
     uint32 guidlow = 0;
     Creature* target = getSelectedCreature();
-
     if(!target)
     {
         PSendSysMessage("%s%s|r", "|cff33ffff", "You must select target.");
         return true;
     }
-
     if(target->GetCreatureAddon())
     {
         if(target->GetCreatureAddon()->path_id != 0)
@@ -2449,30 +2006,23 @@ bool ChatHandler::HandleWpUnLoadPathCommand(const char *args)
     }
     return true;
 }
-
 bool ChatHandler::HandleWpEventCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* show_str = strtok((char*)args, " ");
     std::string show = show_str;
-
     // Check
     if( (show != "add") && (show != "mod") && (show != "del") && (show != "listid")) return false;
-
     char* arg_id = strtok(NULL, " ");
     uint32 id = 0;
-    
     if(show == "add")
     {
         if(arg_id)
             id = atoi(arg_id);
-
         if(id)
         {
             QueryResult *result = WorldDatabase.PQuery( "SELECT id FROM waypoint_scripts WHERE guid = %u", id);
-
             if( !result )
             {
                 WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id);
@@ -2491,10 +2041,8 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
             WorldDatabase.PExecute("INSERT INTO waypoint_scripts(guid)VALUES(%u)", id+1);
             PSendSysMessage("%s%s%u|r", "|cff00ff00","Wp Event: New waypoint event added: |r|cff00ffff", id+1);
         }
-
         return true;
     }
-
     if(show == "listid")
     {
         if(!arg_id)
@@ -2502,23 +2050,17 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
             PSendSysMessage("%s%s|r", "|cff33ffff","Wp Event: You must provide waypoint script id.");
             return true;
         }
-
         id = atoi(arg_id);
-
         uint32 a2, a3, a4, a5, a6;
         float a8, a9, a10, a11;
         char const* a7;
-
         QueryResult *result = WorldDatabase.PQuery( "SELECT guid, delay, command, datalong, datalong2, dataint, x, y, z, o FROM waypoint_scripts WHERE id = %u", id);
-
         if( !result )
         {
             PSendSysMessage("%s%s%u|r", "|cff33ffff", "Wp Event: No waypoint scripts found on id: ", id);
             return true;
         }
-
         Field *fields;
-
         do
         {
             fields = result->Fetch();
@@ -2532,20 +2074,15 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
             a9 = fields[7].GetFloat();
             a10 = fields[8].GetFloat();
             a11 = fields[9].GetFloat();
-
             PSendSysMessage("|cffff33ffid:|r|cff00ffff %u|r|cff00ff00, guid: |r|cff00ffff%u|r|cff00ff00, delay: |r|cff00ffff%u|r|cff00ff00, command: |r|cff00ffff%u|r|cff00ff00, datalong: |r|cff00ffff%u|r|cff00ff00, datalong2: |r|cff00ffff%u|r|cff00ff00, datatext: |r|cff00ffff%s|r|cff00ff00, posx: |r|cff00ffff%f|r|cff00ff00, posy: |r|cff00ffff%f|r|cff00ff00, posz: |r|cff00ffff%f|r|cff00ff00, orientation: |r|cff00ffff%f|r", id, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
         }
         while(result->NextRow());
-
         delete result;
     }
-
     if(show == "del")
     {
         id = atoi(arg_id);
-
         QueryResult *result = WorldDatabase.PQuery( "SELECT guid FROM waypoint_scripts WHERE guid = %u", id);
-
         if( result )
         {
            WorldDatabase.PExecuteLog("DELETE FROM waypoint_scripts WHERE guid = %u", id);
@@ -2554,10 +2091,8 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
         }
         else
             PSendSysMessage("|cffff33ffWp Event: ERROR: you have selected a non existing script: %u|r", id);
-
         return true;
     }
-
     if(show == "mod")
     {
         if(!arg_id)
@@ -2565,25 +2100,19 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
             SendSysMessage("|cffff33ffERROR: Waypoint script guid not present.|r");
             return true;
         }
-
         id = atoi(arg_id);
-
         if(!id)
         {
             SendSysMessage("|cffff33ffERROR: No vallid waypoint script id not present.|r");
             return true;
         }
-
         char* arg_2 = strtok(NULL," ");
-
         if(!arg_2)
         {
             SendSysMessage("|cffff33ffERROR: No argument present.|r");
             return true;
         }
-        
         std::string arg_string  = arg_2;
-
         if( (arg_string != "setid") && (arg_string != "delay") && (arg_string != "command")
         && (arg_string != "datalong") && (arg_string != "datalong2") && (arg_string != "dataint") && (arg_string != "posx")
         && (arg_string != "posy") && (arg_string != "posz") && (arg_string != "orientation"))
@@ -2591,19 +2120,15 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
             SendSysMessage("|cffff33ffERROR: No valid argument present.|r");
             return true;
         }
-
         char* arg_3;
         std::string arg_str_2 = arg_2;
         arg_3 = strtok(NULL," ");
-
         if(!arg_3)
         {
             SendSysMessage("|cffff33ffERROR: No additional argument present.|r");
             return true;
         }
-
         float coord;
-
         if(arg_str_2 == "setid")
         {
             uint32 newid = atoi(arg_3);
@@ -2614,15 +2139,12 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
         else
         {
             QueryResult *result = WorldDatabase.PQuery("SELECT id FROM waypoint_scripts WHERE guid='%u'",id);
-
             if(!result)
             {
                 SendSysMessage("|cffff33ffERROR: You have selected an non existing waypoint script guid.|r");
                 return true;
             }
-
             delete result;
-
             if(arg_str_2 == "posx")
             {
                 coord = atof(arg_3);
@@ -2674,21 +2196,17 @@ bool ChatHandler::HandleWpEventCommand(const char* args)
     }
     return true;
 }
-
 bool ChatHandler::HandleWpModifyCommand(const char* args)
 {
     sLog.outDebug("DEBUG: HandleWpModifyCommand");
-
     if(!*args)
         return false;
-
     // first arg: add del text emote spell waittime move
     char* show_str = strtok((char*)args, " ");
     if (!show_str)
     {
         return false;
     }
-
     std::string show = show_str;
     // Check
     // Remember: "show" must also be the name of a column!
@@ -2698,10 +2216,8 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
     {
         return false;
     }
-
     // Next arg is: <PATHID> <WPNUM> <ARGUMENT>
     char* arg_str = NULL;
-
     // Did user provide a GUID
     // or did the user select a creature?
     // -> variable lowguid is filled with the GUID of the NPC
@@ -2709,18 +2225,15 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
     uint32 point = 0;
     uint32 wpGuid = 0;
     Creature* target = getSelectedCreature();
-
     if(!target || target->GetEntry() != VISUAL_WAYPOINT)
     {
         SendSysMessage("|cffff33ffERROR: You must select a waypoint.|r");
         return false;
     }
-
     sLog.outDebug("DEBUG: HandleWpModifyCommand - User did select an NPC");
     // The visual waypoint
     Creature* wpCreature = NULL;
     wpGuid = target->GetGUIDLow();
-
     // Did the user select a visual spawnpoint?
     if(wpGuid)
         wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpGuid, VISUAL_WAYPOINT, HIGHGUID_UNIT));
@@ -2736,11 +2249,9 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
     {
         QueryResult *result =
         WorldDatabase.PQuery( "SELECT id, point FROM waypoint_data WHERE wpguid = %u", wpGuid);
-
         if(!result)
         {
             sLog.outDebug("DEBUG: HandleWpModifyCommand - No waypoint found - used 'wpguid'");
-
             PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetGUIDLow());
             // Select waypoint number from database
             // Since we compare float values, we have to deal with
@@ -2758,7 +2269,6 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
             }
         }
         sLog.outDebug("DEBUG: HandleWpModifyCommand - After getting wpGuid");
-
         do
         {
             Field *fields = result->Fetch();
@@ -2766,7 +2276,6 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
             point  = fields[1].GetUInt32();
         }
         while( result->NextRow() );
-
         // Cleanup memory
         sLog.outDebug("DEBUG: HandleWpModifyCommand - Cleanup memory");
         delete result;
@@ -2774,23 +2283,18 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
         // Text is enclosed in "<>", all other arguments not
         arg_str = strtok((char*)NULL, " ");
     }
-
     sLog.outDebug("DEBUG: HandleWpModifyCommand - Parameters parsed - now execute the command");
-
     // Check for argument
     if(show != "del" && show != "move" && arg_str == NULL)
     {
         PSendSysMessage(LANG_WAYPOINT_ARGUMENTREQ, show_str);
         return false;
     }
-
     if(show == "del" && target)
     {
         PSendSysMessage("|cff00ff00DEBUG: wp modify del, PathID: |r|cff00ffff%u|r", pathid);
-
         // wpCreature
         Creature* wpCreature = NULL;
-
         if( wpGuid != 0 )
         {
             wpCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpGuid, VISUAL_WAYPOINT, HIGHGUID_UNIT));
@@ -2798,20 +2302,16 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
             wpCreature->DeleteFromDB();
             wpCreature->AddObjectToRemoveList();
         }
-
         WorldDatabase.PExecuteLog("DELETE FROM waypoint_data WHERE id='%u' AND point='%u'",
             pathid, point);
         WorldDatabase.PExecuteLog("UPDATE waypoint_data SET point=point-1 WHERE id='%u' AND point>'%u'",
             pathid, point);
-
         PSendSysMessage(LANG_WAYPOINT_REMOVED);
         return true;
     }                                                       // del
-
     if(show == "move" && target)
     {
         PSendSysMessage("|cff00ff00DEBUG: wp move, PathID: |r|cff00ffff%u|r", pathid);
-
         Player *chr = m_session->GetPlayer();
         Map *map = chr->GetMap();
         {
@@ -2834,25 +2334,20 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
                     delete wpCreature2;
                     return false;
                 }
-
                 wpCreature2->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
                 // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                 wpCreature2->LoadFromDB(wpCreature2->GetDBTableGUIDLow(), map);
                 map->Add(wpCreature2);
                 //MapManager::Instance().GetMap(npcCreature->GetMapId())->Add(wpCreature2);
             }
-
             WorldDatabase.PExecuteLog("UPDATE waypoint_data SET position_x = '%f',position_y = '%f',position_z = '%f' where id = '%u' AND point='%u'",
                 chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), pathid, point );
-
             PSendSysMessage(LANG_WAYPOINT_CHANGED);
         }
         return true;
     }                                                       // move
 
-
     const char *text = arg_str;
-
     if( text == 0 )
     {
         // show_str check for present in list of correct values, no sql injection possible
@@ -2867,46 +2362,36 @@ bool ChatHandler::HandleWpModifyCommand(const char* args)
         WorldDatabase.PExecuteLog("UPDATE waypoint_data SET %s='%s' WHERE id='%u' AND point='%u'",
             show_str, text2.c_str(), pathid, point);
     }
-
     PSendSysMessage(LANG_WAYPOINT_CHANGED_NO, show_str);
     return true;
 }
 
-
 bool ChatHandler::HandleWpShowCommand(const char* args)
 {
     sLog.outDebug("DEBUG: HandleWpShowCommand");
-
     if(!*args)
         return false;
-
     // first arg: on, off, first, last
     char* show_str = strtok((char*)args, " ");
     if (!show_str)
         return false;
-
     // second arg: GUID (optional, if a creature is selected)
     char* guid_str = strtok((char*)NULL, " ");
     sLog.outDebug("DEBUG: HandleWpShowCommand: show_str: %s guid_str: %s", show_str, guid_str);
-
     uint32 pathid = 0;
     Creature* target = getSelectedCreature();
-
     // Did player provide a PathID?
-
     if (!guid_str)
     {
         sLog.outDebug("DEBUG: HandleWpShowCommand: !guid_str");
         // No PathID provided
         // -> Player must have selected a creature
-
         if(!target)
         {
             SendSysMessage(LANG_SELECT_CREATURE);
             SetSentErrorMessage(true);
             return false;
         }
-
         pathid = target->GetWaypointPath();
     }
     else
@@ -2917,19 +2402,13 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
         // -> Creature selection is ignored <-
         if(target)
             SendSysMessage(LANG_WAYPOINT_CREATSELECTED);
-
         pathid = atoi((char*)guid_str);
     }
-
     sLog.outDebug("DEBUG: HandleWpShowCommand: danach");
-
     std::string show = show_str;
     uint32 Maxpoint;
-
     sLog.outDebug("DEBUG: HandleWpShowCommand: PathID: %u", pathid);
-
     //PSendSysMessage("wpshow - show: %s", show);
-
     // Show info for the selected waypoint
     if(show == "info")
     {
@@ -2940,15 +2419,12 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         QueryResult *result = WorldDatabase.PQuery( "SELECT id, point, delay, move_flag, action, action_chance FROM waypoint_data WHERE wpguid = %u", target->GetGUIDLow());
-
         if(!result)
         {
             SendSysMessage(LANG_WAYPOINT_NOTFOUNDDBPROBLEM);
             return true;
         }
-
         SendSysMessage("|cff00ffffDEBUG: wp show info:|r");
         do
         {
@@ -2959,7 +2435,6 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             uint32 flag             = fields[3].GetUInt32();
             uint32 ev_id            = fields[4].GetUInt32();
             uint32 ev_chance        = fields[5].GetUInt32();
-
             PSendSysMessage("|cff00ff00Show info: for current point: |r|cff00ffff%u|r|cff00ff00, Path ID: |r|cff00ffff%u|r", point, pathid);
             PSendSysMessage("|cff00ff00Show info: delay: |r|cff00ffff%u|r", delay);
             PSendSysMessage("|cff00ff00Show info: Move flag: |r|cff00ffff%u|r", flag);
@@ -2967,28 +2442,22 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             PSendSysMessage("|cff00ff00Show info: Event chance: |r|cff00ffff%u|r", ev_chance);
             }
             while( result->NextRow() );
-
         // Cleanup memory
         delete result;
         return true;
     }
-
     if(show == "on")
     {
         QueryResult *result = WorldDatabase.PQuery( "SELECT point, position_x,position_y,position_z FROM waypoint_data WHERE id = '%u'", pathid);
-
         if(!result)
         {
             SendSysMessage("|cffff33ffPath no found.|r");
             SetSentErrorMessage(true);
             return false;
         }
-
         PSendSysMessage("|cff00ff00DEBUG: wp on, PathID: |cff00ffff%u|r", pathid);
-
         // Delete all visuals for this NPC
         QueryResult *result2 = WorldDatabase.PQuery( "SELECT wpguid FROM waypoint_data WHERE id = '%u' and wpguid <> 0", pathid);
-
         if(result2)
         {
             bool hasError = false;
@@ -2997,7 +2466,6 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
                 Field *fields = result2->Fetch();
                 uint32 wpguid = fields[0].GetUInt32();
                 Creature* pCreature = m_session->GetPlayer()->GetMap()->GetCreature(MAKE_NEW_GUID(wpguid,VISUAL_WAYPOINT,HIGHGUID_UNIT));
-
                 if(!pCreature)
                 {
                     PSendSysMessage(LANG_WAYPOINT_NOTREMOVED, wpguid);
@@ -3010,12 +2478,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
                     pCreature->DeleteFromDB();
                     pCreature->AddObjectToRemoveList();
                 }
-
             }
             while( result2->NextRow() );
-
             delete result2;
-
             if( hasError )
             {
                 PSendSysMessage(LANG_WAYPOINT_TOOFAR1);
@@ -3023,7 +2488,6 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
                 PSendSysMessage(LANG_WAYPOINT_TOOFAR3);
             }
         }
-
         do
         {
             Field *fields = result->Fetch();
@@ -3031,13 +2495,10 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             float x         = fields[1].GetFloat();
             float y         = fields[2].GetFloat();
             float z         = fields[3].GetFloat();
-
             uint32 id = VISUAL_WAYPOINT;
-
             Player *chr = m_session->GetPlayer();
             Map *map = chr->GetMap();
             float o = chr->GetOrientation();
-
             Creature* wpCreature = new Creature;
             if (!wpCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
             {
@@ -3046,16 +2507,13 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
                 delete result;
                 return false;
             }
-
             sLog.outDebug("DEBUG: UPDATE waypoint_data SET wpguid = '%u");
             // set "wpguid" column to the visual waypoint
             WorldDatabase.PExecuteLog("UPDATE waypoint_data SET wpguid = '%u' WHERE id = '%u' and point = '%u'", wpCreature->GetGUIDLow(), pathid, point);
-
             wpCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
             // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
             wpCreature->LoadFromDB(wpCreature->GetDBTableGUIDLow(),map);
             map->Add(wpCreature);
-
             if(target)
             {
                 wpCreature->SetDisplayId(target->GetDisplayId());
@@ -3063,17 +2521,14 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             }
         }
         while( result->NextRow() );
-
         SendSysMessage("|cff00ff00Showing the current creature's path.|r");
         // Cleanup memory
         delete result;
         return true;
     }
-
     if(show == "first")
     {
         PSendSysMessage("|cff00ff00DEBUG: wp first, GUID: %u|r", pathid);
-
         QueryResult *result = WorldDatabase.PQuery( "SELECT position_x,position_y,position_z FROM waypoint_data WHERE point='1' AND id = '%u'",pathid);
         if(!result)
         {
@@ -3081,17 +2536,14 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         Field *fields = result->Fetch();
         float x         = fields[0].GetFloat();
         float y         = fields[1].GetFloat();
         float z         = fields[2].GetFloat();
         uint32 id = VISUAL_WAYPOINT;
-
         Player *chr = m_session->GetPlayer();
         float o = chr->GetOrientation();
         Map *map = chr->GetMap();
-
         Creature* pCreature = new Creature;
         if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT),map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
         {
@@ -3100,36 +2552,29 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             delete result;
             return false;
         }
-
         pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
         pCreature->LoadFromDB(pCreature->GetDBTableGUIDLow(), map);
         map->Add(pCreature);
-
         if(target)
         {
             pCreature->SetDisplayId(target->GetDisplayId());
             pCreature->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.5);
         }
-
         // Cleanup memory
         delete result;
         return true;
     }
-
     if(show == "last")
     {
         PSendSysMessage("|cff00ff00DEBUG: wp last, PathID: |r|cff00ffff%u|r", pathid);
-
         QueryResult *result = WorldDatabase.PQuery( "SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid);
         if( result )
         {
             Maxpoint = (*result)[0].GetUInt32();
-
             delete result;
         }
         else
             Maxpoint = 0;
-
         result = WorldDatabase.PQuery( "SELECT position_x,position_y,position_z FROM waypoint_data WHERE point ='%u' AND id = '%u'",Maxpoint, pathid);
         if(!result)
         {
@@ -3142,11 +2587,9 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
         float y         = fields[1].GetFloat();
         float z         = fields[2].GetFloat();
         uint32 id = VISUAL_WAYPOINT;
-
         Player *chr = m_session->GetPlayer();
         float o = chr->GetOrientation();
         Map *map = chr->GetMap();
-
         Creature* pCreature = new Creature;
         if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
         {
@@ -3155,22 +2598,18 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
             delete result;
             return false;
         }
-
         pCreature->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
         pCreature->LoadFromDB(pCreature->GetDBTableGUIDLow(), map);
         map->Add(pCreature);
-
         if(target)
         {
             pCreature->SetDisplayId(target->GetDisplayId());
             pCreature->SetFloatValue(OBJECT_FIELD_SCALE_X, 0.5);
         }
-
         // Cleanup memory
         delete result;
         return true;
     }
-
     if(show == "off")
     {
         QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature WHERE id = '%u'", 1);
@@ -3203,26 +2642,21 @@ bool ChatHandler::HandleWpShowCommand(const char* args)
         // set "wpguid" column to "empty" - no visual waypoint spawned
         WorldDatabase.PExecuteLog("UPDATE waypoint_data SET wpguid = '0'");
         //WorldDatabase.PExecuteLog("UPDATE creature_movement SET wpguid = '0' WHERE wpguid <> '0'");
-
         if( hasError )
         {
             PSendSysMessage(LANG_WAYPOINT_TOOFAR1);
             PSendSysMessage(LANG_WAYPOINT_TOOFAR2);
             PSendSysMessage(LANG_WAYPOINT_TOOFAR3);
         }
-
         SendSysMessage(LANG_WAYPOINT_VP_ALLREMOVED);
         // Cleanup memory
         delete result;
         return true;
     }
-
     PSendSysMessage("|cffff33ffDEBUG: wpshow - no valid command found|r");
     return true;
 }
-
 //////////// WAYPOINT COMMANDS //
-
 //rename characters
 bool ChatHandler::HandleCharacterRenameCommand(const char* args)
 {
@@ -3231,13 +2665,11 @@ bool ChatHandler::HandleCharacterRenameCommand(const char* args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     if(target)
     {
         // check online security
         if (HasLowerSecurity(target, 0))
             return false;
-
         PSendSysMessage(LANG_RENAME_PLAYER, GetNameLink(target).c_str());
         target->SetAtLoginFlag(AT_LOGIN_RENAME);
     }
@@ -3246,16 +2678,12 @@ bool ChatHandler::HandleCharacterRenameCommand(const char* args)
         // check offline security
         if (HasLowerSecurity(NULL, target_guid))
             return false;
-
         std::string oldNameLink = playerLink(target_name);
-
         PSendSysMessage(LANG_RENAME_PLAYER_GUID, oldNameLink.c_str(), GUID_LOPART(target_guid));
         CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '1' WHERE guid = '%u'", GUID_LOPART(target_guid));
     }
-
     return true;
 }
-
 // customize characters
 bool ChatHandler::HandleCharacterCustomizeCommand(const char* args)
 {
@@ -3264,7 +2692,6 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     if(target)
     {
         PSendSysMessage(LANG_CUSTOMIZE_PLAYER, GetNameLink(target).c_str());
@@ -3274,22 +2701,17 @@ bool ChatHandler::HandleCharacterCustomizeCommand(const char* args)
     else
     {
         std::string oldNameLink = playerLink(target_name);
-
         PSendSysMessage(LANG_CUSTOMIZE_PLAYER_GUID, oldNameLink.c_str(), GUID_LOPART(target_guid));
         CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '8' WHERE guid = '%u'", GUID_LOPART(target_guid));
     }
-
     return true;
 }
-
 bool ChatHandler::HandleCharacterReputationCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     LocaleConstant loc = GetSessionDbcLocale();
-
     FactionStateList const& targetFSL = target->GetReputationMgr().GetStateList();
     for(FactionStateList::const_iterator itr = targetFSL.begin(); itr != targetFSL.end(); ++itr)
     {
@@ -3302,9 +2724,7 @@ bool ChatHandler::HandleCharacterReputationCommand(const char* args)
             ss << itr->second.ID << " - |cffffffff|Hfaction:" << itr->second.ID << "|h[" << factionName << " " << localeNames[loc] << "]|h|r";
         else
             ss << itr->second.ID << " - " << factionName << " " << localeNames[loc];
-
         ss << " " << rankName << " (" << target->GetReputationMgr().GetReputation(factionEntry) << ")";
-
         if(itr->second.Flags & FACTION_FLAG_VISIBLE)
             ss << GetMangosString(LANG_FACTION_VISIBLE);
         if(itr->second.Flags & FACTION_FLAG_AT_WAR)
@@ -3317,29 +2737,23 @@ bool ChatHandler::HandleCharacterReputationCommand(const char* args)
             ss << GetMangosString(LANG_FACTION_INVISIBLE_FORCED);
         if(itr->second.Flags & FACTION_FLAG_INACTIVE)
             ss << GetMangosString(LANG_FACTION_INACTIVE);
-
         SendSysMessage(ss.str().c_str());
     }
     return true;
 }
-
 //change standstate
 bool ChatHandler::HandleModifyStandStateCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 anim_id = atoi((char*)args);
     m_session->GetPlayer( )->SetUInt32Value( UNIT_NPC_EMOTESTATE , anim_id );
-
     return true;
 }
-
 bool ChatHandler::HandleHonorAddCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *target = getSelectedPlayer();
     if(!target)
     {
@@ -3347,16 +2761,13 @@ bool ChatHandler::HandleHonorAddCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     uint32 amount = (uint32)atoi(args);
     target->RewardHonor(NULL, 1, amount);
     return true;
 }
-
 bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/)
 {
     Unit *target = getSelectedUnit();
@@ -3366,15 +2777,12 @@ bool ChatHandler::HandleHonorAddKillCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (target->GetTypeId() == TYPEID_PLAYER && HasLowerSecurity((Player*)target, 0))
         return false;
-
     m_session->GetPlayer()->RewardHonor(target, 1);
     return true;
 }
-
 bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/)
 {
     Player *target = getSelectedPlayer();
@@ -3384,111 +2792,82 @@ bool ChatHandler::HandleHonorUpdateCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     target->UpdateHonorFields();
     return true;
 }
-
 bool ChatHandler::HandleLookupEventCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     wstrToLower(wnamepart);
-
     bool found = false;
-
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
     GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
-
     for(uint32 id = 0; id < events.size(); ++id )
     {
         GameEventData const& eventData = events[id];
-
         std::string descr = eventData.description;
         if(descr.empty())
             continue;
-
         if (Utf8FitTo(descr, wnamepart))
         {
             char const* active = activeEvents.find(id) != activeEvents.end() ? GetTrinityString(LANG_ACTIVE) : "";
-
             if(m_session)
                 PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,id,id,eventData.description.c_str(),active );
             else
                 PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,id,eventData.description.c_str(),active );
-
             if(!found)
                 found = true;
         }
     }
-
     if (!found)
         SendSysMessage(LANG_NOEVENTFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleEventActiveListCommand(const char* args)
 {
     uint32 counter = 0;
-
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
     GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
-
     char const* active = GetTrinityString(LANG_ACTIVE);
-
     for(GameEventMgr::ActiveEvents::const_iterator itr = activeEvents.begin(); itr != activeEvents.end(); ++itr )
     {
         uint32 event_id = *itr;
         GameEventData const& eventData = events[event_id];
-
         if(m_session)
             PSendSysMessage(LANG_EVENT_ENTRY_LIST_CHAT,event_id,event_id,eventData.description.c_str(),active );
         else
             PSendSysMessage(LANG_EVENT_ENTRY_LIST_CONSOLE,event_id,eventData.description.c_str(),active );
-
         ++counter;
     }
-
     if (counter==0)
         SendSysMessage(LANG_NOEVENTFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleEventInfoCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameevent");
     if(!cId)
         return false;
-
     uint32 event_id = atoi(cId);
-
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
-
     if(event_id >=events.size())
     {
         SendSysMessage(LANG_EVENT_NOT_EXIST);
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventData const& eventData = events[event_id];
     if(!eventData.isValid())
     {
@@ -3496,48 +2875,37 @@ bool ChatHandler::HandleEventInfoCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
     bool active = activeEvents.find(event_id) != activeEvents.end();
     char const* activeStr = active ? GetTrinityString(LANG_ACTIVE) : "";
-
     std::string startTimeStr = TimeToTimestampStr(eventData.start);
     std::string endTimeStr = TimeToTimestampStr(eventData.end);
-
     uint32 delay = gameeventmgr.NextCheck(event_id);
     time_t nextTime = time(NULL)+delay;
     std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-";
-
     std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE);
     std::string lengthStr = secsToTimeString(eventData.length * MINUTE);
-
     PSendSysMessage(LANG_EVENT_INFO,event_id,eventData.description.c_str(),activeStr,
         startTimeStr.c_str(),endTimeStr.c_str(),occurenceStr.c_str(),lengthStr.c_str(),
         nextStr.c_str());
     return true;
 }
-
 bool ChatHandler::HandleEventStartCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameevent");
     if(!cId)
         return false;
-
     int32 event_id = atoi(cId);
-
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
-
     if(event_id < 1 || event_id >=events.size())
     {
         SendSysMessage(LANG_EVENT_NOT_EXIST);
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventData const& eventData = events[event_id];
     if(!eventData.isValid())
     {
@@ -3545,7 +2913,6 @@ bool ChatHandler::HandleEventStartCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
     if(activeEvents.find(event_id) != activeEvents.end())
     {
@@ -3553,32 +2920,25 @@ bool ChatHandler::HandleEventStartCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     gameeventmgr.StartEvent(event_id,true);
     return true;
 }
-
 bool ChatHandler::HandleEventStopCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameevent");
     if(!cId)
         return false;
-
     int32 event_id = atoi(cId);
-
     GameEventMgr::GameEventDataMap const& events = gameeventmgr.GetEventMap();
-
     if(event_id < 1 || event_id >=events.size())
     {
         SendSysMessage(LANG_EVENT_NOT_EXIST);
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventData const& eventData = events[event_id];
     if(!eventData.isValid())
     {
@@ -3586,134 +2946,104 @@ bool ChatHandler::HandleEventStopCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     GameEventMgr::ActiveEvents const& activeEvents = gameeventmgr.GetActiveEventList();
-
     if(activeEvents.find(event_id) == activeEvents.end())
     {
         PSendSysMessage(LANG_EVENT_NOT_ACTIVE,event_id);
         SetSentErrorMessage(true);
         return false;
     }
-
     gameeventmgr.StopEvent(event_id,true);
     return true;
 }
-
 bool ChatHandler::HandleCombatStopCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     target->CombatStop();
     target->getHostilRefManager().deleteReferences();
     return true;
 }
-
 void ChatHandler::HandleLearnSkillRecipesHelper(Player* player,uint32 skill_id)
 {
     uint32 classmask = player->getClassMask();
-
     for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
     {
         SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(j);
         if (!skillLine)
             continue;
-
         // wrong skill
         if( skillLine->skillId != skill_id)
             continue;
-
         // not high rank
         if(skillLine->forward_spellid )
             continue;
-
         // skip racial skills
         if (skillLine->racemask != 0)
             continue;
-
         // skip wrong class skills
         if( skillLine->classmask && (skillLine->classmask & classmask) == 0)
             continue;
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(skillLine->spellId);
         if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,player,false))
             continue;
-
         player->learnSpell(skillLine->spellId,false);
     }
 }
-
 bool ChatHandler::HandleLearnAllCraftsCommand(const char* /*args*/)
-{   
-
+{
     for (uint32 i = 0; i < sSkillLineStore.GetNumRows(); ++i)
     {
         SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(i);
         if( !skillInfo )
             continue;
-
         if ((skillInfo->categoryId == SKILL_CATEGORY_PROFESSION || skillInfo->categoryId == SKILL_CATEGORY_SECONDARY) &&
             skillInfo->canLink)                             // only prof. with recipes have
         {
             HandleLearnSkillRecipesHelper(m_session->GetPlayer(),skillInfo->id);
         }
     }
-
     SendSysMessage(LANG_COMMAND_LEARN_ALL_CRAFT);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllRecipesCommand(const char* args)
 {
     //  Learns all recipes of specified profession and sets skill to max
     //  Example: .learn all_recipes enchanting
-
     Player* target = getSelectedPlayer();
     if( !target )
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         return false;
     }
-
     if (!*args)
         return false;
-
     std::wstring wnamepart;
-
     if(!Utf8toWStr(args,wnamepart))
         return false;
-
     uint32 counter = 0;                                     // Counter for figure out that we found smth.
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-    
 
     std::string name;
-
     SkillLineEntry const *targetSkillInfo = NULL;
     for (uint32 i = 1; i < sSkillLineStore.GetNumRows(); ++i)
     {
         SkillLineEntry const *skillInfo = sSkillLineStore.LookupEntry(i);
         if (!skillInfo)
             continue;
-
         if ((skillInfo->categoryId != SKILL_CATEGORY_PROFESSION &&
             skillInfo->categoryId != SKILL_CATEGORY_SECONDARY) ||
             !skillInfo->canLink)                            // only prof with recipes have set
             continue;
-
         int loc = GetSessionDbcLocale();
         name = skillInfo->name[loc];
         if(name.empty())
             continue;
-
         if (!Utf8FitTo(name, wnamepart))
         {
             loc = 0;
@@ -3721,87 +3051,62 @@ bool ChatHandler::HandleLearnAllRecipesCommand(const char* args)
             {
                 if(loc==GetSessionDbcLocale())
                     continue;
-
                 name = skillInfo->name[loc];
                 if(name.empty())
                     continue;
-
                 if (Utf8FitTo(name, wnamepart))
                     break;
             }
         }
-
         if(loc < MAX_LOCALE)
         {
             targetSkillInfo = skillInfo;
             break;
         }
     }
-
     if(!targetSkillInfo)
         return false;
-
     HandleLearnSkillRecipesHelper(target,targetSkillInfo->id);
-
     uint16 maxLevel = target->GetPureMaxSkillValue(targetSkillInfo->id);
     target->SetSkill(targetSkillInfo->id, maxLevel, maxLevel);
     PSendSysMessage(LANG_COMMAND_LEARN_ALL_RECIPES, name.c_str());
     return true;
 }
-
 bool ChatHandler::HandleLookupPlayerIpCommand(const char* args)
 {
-
     if (!*args)
         return false;
-
     std::string ip = strtok ((char*)args, " ");
     char* limit_str = strtok (NULL, " ");
     int32 limit = limit_str ? atoi (limit_str) : -1;
-
     loginDatabase.escape_string (ip);
-
     QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE last_ip = '%s'", ip.c_str ());
-
     return LookupPlayerSearchCommand (result,limit);
 }
-
 bool ChatHandler::HandleLookupPlayerAccountCommand(const char* args)
 {
     if (!*args)
         return false;
-
     std::string account = strtok ((char*)args, " ");
     char* limit_str = strtok (NULL, " ");
     int32 limit = limit_str ? atoi (limit_str) : -1;
-
     if (!AccountMgr::normalizeString (account))
         return false;
-
     loginDatabase.escape_string (account);
-
     QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE username = '%s'", account.c_str ());
-
     return LookupPlayerSearchCommand (result,limit);
 }
-
 bool ChatHandler::HandleLookupPlayerEmailCommand(const char* args)
 {
-
     if (!*args)
         return false;
-
     std::string email = strtok ((char*)args, " ");
     char* limit_str = strtok (NULL, " ");
     int32 limit = limit_str ? atoi (limit_str) : -1;
-
     loginDatabase.escape_string (email);
-
     QueryResult* result = loginDatabase.PQuery ("SELECT id,username FROM account WHERE email = '%s'", email.c_str ());
-
     return LookupPlayerSearchCommand (result,limit);
 }
-
 bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, int32 limit)
 {
     if(!result)
@@ -3810,93 +3115,73 @@ bool ChatHandler::LookupPlayerSearchCommand(QueryResult* result, int32 limit)
         SetSentErrorMessage(true);
         return false;
     }
-
     int i =0;
     do
     {
         Field* fields = result->Fetch();
         uint32 acc_id = fields[0].GetUInt32();
         std::string acc_name = fields[1].GetCppString();
-
         QueryResult* chars = CharacterDatabase.PQuery("SELECT guid,name FROM characters WHERE account = '%u'", acc_id);
         if(chars)
         {
             PSendSysMessage(LANG_LOOKUP_PLAYER_ACCOUNT,acc_name.c_str(),acc_id);
-
             uint64 guid = 0;
             std::string name;
-
             do
             {
                 Field* charfields = chars->Fetch();
                 guid = charfields[0].GetUInt64();
                 name = charfields[1].GetCppString();
-
                 PSendSysMessage(LANG_LOOKUP_PLAYER_CHARACTER,name.c_str(),guid);
                 ++i;
-
             } while( chars->NextRow() && ( limit == -1 || i < limit ) );
-
             delete chars;
         }
     } while(result->NextRow());
-
     delete result;
-
     if(i==0)                                                // empty accounts only
     {
         PSendSysMessage(LANG_NO_PLAYERS_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     return true;
 }
-
 /// Triggering corpses expire check in world
 bool ChatHandler::HandleServerCorpsesCommand(const char* /*args*/)
 {
     CorpsesErase();
     return true;
 }
-
 bool ChatHandler::HandleRepairitemsCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     // check online security
     if (HasLowerSecurity(target, 0))
         return false;
-
     // Repair items
     target->DurabilityRepairAll(false, 0, false);
-
     PSendSysMessage(LANG_YOU_REPAIR_ITEMS, GetNameLink(target).c_str());
     if(needReportToTarget(target))
         ChatHandler(target).PSendSysMessage(LANG_YOUR_ITEMS_REPAIRED, GetNameLink().c_str());
     return true;
 }
-
 bool ChatHandler::HandleWaterwalkCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player *player = getSelectedPlayer();
-
     if(!player)
     {
         PSendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
         return false;
     }
-
     // check online security
     if (HasLowerSecurity(player, 0))
         return false;
-
     if (strncmp(args, "on", 3) == 0)
         player->SetMovement(MOVE_WATER_WALK);               // ON
     else if (strncmp(args, "off", 4) == 0)
@@ -3906,25 +3191,21 @@ bool ChatHandler::HandleWaterwalkCommand(const char* args)
         SendSysMessage(LANG_USE_BOL);
         return false;
     }
-
     PSendSysMessage(LANG_YOU_SET_WATERWALK, args, GetNameLink(player).c_str());
     if(needReportToTarget(player))
         ChatHandler(player).PSendSysMessage(LANG_YOUR_WATERWALK_SET, args, GetNameLink().c_str());
     return true;
 }
-
 bool ChatHandler::HandleCreatePetCommand(const char* args)
 {
     Player *player = m_session->GetPlayer();
     Creature *creatureTarget = getSelectedCreature();
-
     if(!creatureTarget || creatureTarget->isPet() || creatureTarget->GetTypeId() == TYPEID_PLAYER)
     {
         PSendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(creatureTarget->GetEntry());
     // Creatures with family 0 crashes the server
     if(cInfo->family == 0)
@@ -3933,34 +3214,27 @@ bool ChatHandler::HandleCreatePetCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(player->GetPetGUID())
     {
         PSendSysMessage("You already have a pet");
         SetSentErrorMessage(true);
         return false;
     }
-
     // Everything looks OK, create new pet
     Pet* pet = new Pet(player, HUNTER_PET);
-
     if(!pet)
       return false;
-    
     if(!pet->CreateBaseAtCreature(creatureTarget))
     {
         delete pet;
         PSendSysMessage("Error 1");
         return false;
     }
-
     creatureTarget->setDeathState(JUST_DIED);
     creatureTarget->RemoveCorpse();
     creatureTarget->SetHealth(0); // just for nice GM-mode view
-
     pet->SetUInt64Value(UNIT_FIELD_CREATEDBY, player->GetGUID());
     pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, player->getFaction());
-
     if(!pet->InitStatsForLevel(creatureTarget->getLevel()))
     {
         sLog.outError("ERROR: InitStatsForLevel() in EffectTameCreature failed! Pet deleted.");
@@ -3968,47 +3242,35 @@ bool ChatHandler::HandleCreatePetCommand(const char* args)
         delete pet;
         return false;
     }
-
     // prepare visual effect for levelup
     pet->SetUInt32Value(UNIT_FIELD_LEVEL,creatureTarget->getLevel()-1);
-
      pet->GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
      // this enables pet details window (Shift+P)
      pet->InitPetCreateSpells();
      pet->SetHealth(pet->GetMaxHealth());
-
      pet->GetMap()->Add((Creature*)pet);
-
      // visual effect for levelup
      pet->SetUInt32Value(UNIT_FIELD_LEVEL,creatureTarget->getLevel());
-
      player->SetMinion(pet, true);
      pet->SavePetToDB(PET_SAVE_AS_CURRENT);
      player->PetSpellInitialize();
-
     return true;
 }
-
 bool ChatHandler::HandlePetLearnCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Player *plr = m_session->GetPlayer();
     Pet *pet = plr->GetPet();
-
     if(!pet)
     {
         PSendSysMessage("You have no pet");
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 spellId = extractSpellIdFromLink((char*)args);
-
     if(!spellId || !sSpellStore.LookupEntry(spellId))
         return false;
-
     // Check if pet already has it
     if(pet->HasSpell(spellId))
     {
@@ -4016,7 +3278,6 @@ bool ChatHandler::HandlePetLearnCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // Check if spell is valid
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo))
@@ -4025,96 +3286,72 @@ bool ChatHandler::HandlePetLearnCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     pet->learnSpell(spellId);
-
     PSendSysMessage("Pet has learned spell %u", spellId);
     return true;
 }
-
 bool ChatHandler::HandlePetUnlearnCommand(const char *args)
 {
     if(!*args)
         return false;
-
     Player *plr = m_session->GetPlayer();
     Pet *pet = plr->GetPet();
-
     if(!pet)
     {
         PSendSysMessage("You have no pet");
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 spellId = extractSpellIdFromLink((char*)args);
-
     if(pet->HasSpell(spellId))
         pet->removeSpell(spellId, false);
     else
         PSendSysMessage("Pet doesn't have that spell");
-
     return true;
 }
-
 bool ChatHandler::HandlePetTpCommand(const char *args)
 {
     if(!*args)
         return false;
-
     Player *plr = m_session->GetPlayer();
     Pet *pet = plr->GetPet();
-
     if(!pet)
     {
         PSendSysMessage("You have no pet");
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 tp = atol(args);
-
     //pet->SetTP(tp);
-
     PSendSysMessage("Pet's tp changed to %u", tp);
     return true;
 }
-
 bool ChatHandler::HandleActivateObjectCommand(const char *args)
 {
     if(!*args)
         return false;
-
     char* cId = extractKeyFromLink((char*)args,"Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* obj = NULL;
-
     // by DB guid
     if (GameObjectData const* go_data = objmgr.GetGOData(lowguid))
         obj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid,go_data->id);
-
     if(!obj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     // Activate
     obj->SetLootState(GO_READY);
     obj->UseDoorOrButton(10000);
-
     PSendSysMessage("Object activated!");
-
     return true;
 }
-
 // add creature, temp only
 bool ChatHandler::HandleTempAddSpwCommand(const char* args)
 {
@@ -4123,18 +3360,13 @@ bool ChatHandler::HandleTempAddSpwCommand(const char* args)
     char* charID = strtok((char*)args, " ");
     if (!charID)
         return false;
-
     Player *chr = m_session->GetPlayer();
-
     uint32 id = atoi(charID);
     if(!id)
         return false;
-
     chr->SummonCreature(id, *chr, TEMPSUMMON_CORPSE_DESPAWN, 120);
-
     return true;
 }
-
 // add go, temp only
 bool ChatHandler::HandleTempGameObjectCommand(const char* args)
 {
@@ -4143,105 +3375,79 @@ bool ChatHandler::HandleTempGameObjectCommand(const char* args)
     char* charID = strtok((char*)args, " ");
     if (!charID)
         return false;
-
     Player *chr = m_session->GetPlayer();
-
     char* spawntime = strtok(NULL, " ");
     uint32 spawntm = 300;
-
     if( spawntime )
         spawntm = atoi((char*)spawntime);
-   
     float x = chr->GetPositionX();
     float y = chr->GetPositionY();
     float z = chr->GetPositionZ();
     float ang = chr->GetOrientation();
-
     float rot2 = sin(ang/2);
     float rot3 = cos(ang/2);
-
     uint32 id = atoi(charID);
-
     chr->SummonGameObject(id,x,y,z,ang,0,0,rot2,rot3,spawntm);
-
     return true;
 }
-
 bool ChatHandler::HandleNpcAddFormationCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 leaderGUID = (uint32) atoi((char*)args);
     Creature *pCreature = getSelectedCreature();
-
     if(!pCreature || !pCreature->GetDBTableGUIDLow())
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 lowguid = pCreature->GetDBTableGUIDLow();
     if(pCreature->GetFormation())
     {
         PSendSysMessage("Selected creature is already member of group %u", pCreature->GetFormation()->GetId());
         return false;
     }
-
     if (!lowguid)
         return false;
-
     Player *chr = m_session->GetPlayer();
     FormationInfo *group_member;
-
     group_member                 = new FormationInfo;
     group_member->follow_angle   = (pCreature->GetAngle(chr) - chr->GetOrientation()) * 180 / M_PI;
     group_member->follow_dist    = sqrtf(pow(chr->GetPositionX() - pCreature->GetPositionX(),int(2))+pow(chr->GetPositionY()-pCreature->GetPositionY(),int(2)));
     group_member->leaderGUID     = leaderGUID;
     group_member->groupAI        = 0;
-
     CreatureGroupMap[lowguid] = group_member;
     pCreature->SearchFormation();
-
     WorldDatabase.PExecuteLog("INSERT INTO creature_formations (leaderGUID, memberGUID, dist, angle, groupAI) VALUES ('%u','%u','%f', '%f', '%u')",
         leaderGUID, lowguid, group_member->follow_dist, group_member->follow_angle, group_member->groupAI);
-
     PSendSysMessage("Creature %u added to formation with leader %u", lowguid, leaderGUID);
-
     return true;
  }
-
 bool ChatHandler::HandleNpcSetLinkCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 linkguid = (uint32) atoi((char*)args);
-
     Creature* pCreature = getSelectedCreature();
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!pCreature->GetDBTableGUIDLow())
     {
         PSendSysMessage("Selected creature isn't in creature table", pCreature->GetGUIDLow());
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!objmgr.SetCreatureLinkedRespawn(pCreature->GetDBTableGUIDLow(), linkguid))
     {
         PSendSysMessage("Selected creature can't link with guid '%u'", linkguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage("LinkGUID '%u' added to creature with DBTableGUID: '%u'", linkguid, pCreature->GetDBTableGUIDLow());
     return true;
 }
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index 21f3c995dce..d77d5424bd0 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -17,7 +17,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -54,7 +53,6 @@
 #include "InstanceData.h"
 #include "AuctionHouseBot.h"
 #include "CreatureEventAIMgr.h"
-
 bool ChatHandler::HandleAHBotOptionsCommand(const char* args)
 {
     uint32 ahMapID = 0;
@@ -81,7 +79,6 @@ bool ChatHandler::HandleAHBotOptionsCommand(const char* args)
         return false;
     }
     int l = strlen(opt);
-
     if (strncmp(opt,"help",l) == 0)
     {
         PSendSysMessage("AHBot commands:");
@@ -542,12 +539,10 @@ bool ChatHandler::HandleAHBotOptionsCommand(const char* args)
     }
     return true;
 }
-
 //reload commands
 bool ChatHandler::HandleReloadAllCommand(const char*)
 {
     HandleReloadSkillFishingBaseLevelCommand("");
-
     HandleReloadAllAchievementCommand("");
     HandleReloadAllAreaCommand("");
     HandleReloadAllEventAICommand("");
@@ -557,24 +552,20 @@ bool ChatHandler::HandleReloadAllCommand(const char*)
     HandleReloadAllSpellCommand("");
     HandleReloadAllItemCommand("");
     HandleReloadAllLocalesCommand("");
-
     HandleReloadAccessRequirementCommand("");
     HandleReloadCommandCommand("");
     HandleReloadReservedNameCommand("");
     HandleReloadTrinityStringCommand("");
     HandleReloadGameTeleCommand("");
-
     HandleReloadAutobroadcastCommand("");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllAchievementCommand(const char*)
 {
     HandleReloadAchievementCriteriaDataCommand("");
     HandleReloadAchievementRewardCommand("");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllAreaCommand(const char*)
 {
     //HandleReloadQuestAreaTriggersCommand(""); -- reloaded in HandleReloadAllQuestCommand
@@ -583,7 +574,6 @@ bool ChatHandler::HandleReloadAllAreaCommand(const char*)
     HandleReloadGameGraveyardZoneCommand("");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllLootCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables..." );
@@ -591,7 +581,6 @@ bool ChatHandler::HandleReloadAllLootCommand(const char*)
     SendGlobalGMSysMessage("DB tables `*_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllNpcCommand(const char* /*args*/)
 {
     HandleReloadNpcGossipCommand("a");
@@ -602,18 +591,15 @@ bool ChatHandler::HandleReloadAllNpcCommand(const char* /*args*/)
     HandleReloadSpellClickSpellsCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllQuestCommand(const char* /*args*/)
 {
     HandleReloadQuestAreaTriggersCommand("a");
     HandleReloadQuestTemplateCommand("a");
-
     sLog.outString( "Re-Loading Quests Relations..." );
     objmgr.LoadQuestRelations();
     SendGlobalGMSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllScriptsCommand(const char*)
 {
     if(sWorld.IsScriptScheduled())
@@ -622,7 +608,6 @@ bool ChatHandler::HandleReloadAllScriptsCommand(const char*)
         SetSentErrorMessage(true);
         return false;
     }
-
     sLog.outString( "Re-Loading Scripts..." );
     HandleReloadGameObjectScriptsCommand("a");
     HandleReloadEventScriptsCommand("a");
@@ -634,7 +619,6 @@ bool ChatHandler::HandleReloadAllScriptsCommand(const char*)
     HandleReloadWpScriptsCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllEventAICommand(const char*)
 {
     HandleReloadEventAITextsCommand("a");
@@ -642,7 +626,6 @@ bool ChatHandler::HandleReloadAllEventAICommand(const char*)
     HandleReloadEventAIScriptsCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllSpellCommand(const char*)
 {
     HandleReloadSkillDiscoveryTemplateCommand("a");
@@ -661,7 +644,6 @@ bool ChatHandler::HandleReloadAllSpellCommand(const char*)
     HandleReloadSpellDisabledCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllItemCommand(const char*)
 {
     HandleReloadPageTextsCommand("a");
@@ -669,7 +651,6 @@ bool ChatHandler::HandleReloadAllItemCommand(const char*)
     HandleReloadItemRequiredTragetCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/)
 {
     HandleReloadLocalesAchievementRewardCommand("a");
@@ -682,7 +663,6 @@ bool ChatHandler::HandleReloadAllLocalesCommand(const char* /*args*/)
     HandleReloadLocalesQuestCommand("a");
     return true;
 }
-
 bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
 {
     sLog.outString( "Re-Loading config settings..." );
@@ -691,7 +671,6 @@ bool ChatHandler::HandleReloadConfigCommand(const char* /*args*/)
     SendGlobalGMSysMessage("World config settings reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAccessRequirementCommand(const char*)
 {
     sLog.outString( "Re-Loading Access Requirement definitions..." );
@@ -699,7 +678,6 @@ bool ChatHandler::HandleReloadAccessRequirementCommand(const char*)
     SendGlobalGMSysMessage("DB table `access_requirement` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*)
 {
     sLog.outString( "Re-Loading Additional Achievement Criteria Data..." );
@@ -707,7 +685,6 @@ bool ChatHandler::HandleReloadAchievementCriteriaDataCommand(const char*)
     SendGlobalGMSysMessage("DB table `achievement_criteria_data` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAchievementRewardCommand(const char*)
 {
     sLog.outString( "Re-Loading Achievement Reward Data..." );
@@ -715,7 +692,6 @@ bool ChatHandler::HandleReloadAchievementRewardCommand(const char*)
     SendGlobalGMSysMessage("DB table `achievement_reward` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*)
 {
     sLog.outString( "Re-Loading Tavern Area Triggers..." );
@@ -723,7 +699,6 @@ bool ChatHandler::HandleReloadAreaTriggerTavernCommand(const char*)
     SendGlobalGMSysMessage("DB table `areatrigger_tavern` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*)
 {
     sLog.outString( "Re-Loading AreaTrigger teleport definitions..." );
@@ -731,7 +706,6 @@ bool ChatHandler::HandleReloadAreaTriggerTeleportCommand(const char*)
     SendGlobalGMSysMessage("DB table `areatrigger_teleport` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadAutobroadcastCommand(const char*)
 {
     sLog.outString("Re-Loading Autobroadcast...");
@@ -739,14 +713,12 @@ bool ChatHandler::HandleReloadAutobroadcastCommand(const char*)
     SendGlobalGMSysMessage("DB table `autobroadcast` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadCommandCommand(const char*)
 {
     load_command_table = true;
     SendGlobalGMSysMessage("DB table `command` will be reloaded at next chat command use.");
     return true;
 }
-
 bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*)
 {
     sLog.outString( "Loading Quests Relations... (`creature_questrelation`)" );
@@ -754,7 +726,6 @@ bool ChatHandler::HandleReloadCreatureQuestRelationsCommand(const char*)
     SendGlobalGMSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char* args)
 {
     sLog.outString( "Loading Linked Respawns... (`creature_linked_respawn`)" );
@@ -762,7 +733,6 @@ bool ChatHandler::HandleReloadCreatureLinkedRespawnCommand(const char* args)
     SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*)
 {
     sLog.outString( "Loading Quests Relations... (`creature_involvedrelation`)" );
@@ -770,7 +740,6 @@ bool ChatHandler::HandleReloadCreatureQuestInvRelationsCommand(const char*)
     SendGlobalGMSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*)
 {
     sLog.outString( "Loading Quests Relations... (`gameobject_questrelation`)" );
@@ -778,7 +747,6 @@ bool ChatHandler::HandleReloadGOQuestRelationsCommand(const char*)
     SendGlobalGMSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*)
 {
     sLog.outString( "Loading Quests Relations... (`gameobject_involvedrelation`)" );
@@ -786,7 +754,6 @@ bool ChatHandler::HandleReloadGOQuestInvRelationsCommand(const char*)
     SendGlobalGMSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*)
 {
     sLog.outString( "Re-Loading Quest Area Triggers..." );
@@ -794,20 +761,17 @@ bool ChatHandler::HandleReloadQuestAreaTriggersCommand(const char*)
     SendGlobalGMSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadQuestTemplateCommand(const char*)
 {
     sLog.outString( "Re-Loading Quest Templates..." );
     objmgr.LoadQuests();
     SendGlobalGMSysMessage("DB table `quest_template` (quest definitions) reloaded.");
-
     /// dependent also from `gameobject` but this table not reloaded anyway
     sLog.outString( "Re-Loading GameObjects for quests..." );
     objmgr.LoadGameObjectForQuests();
     SendGlobalGMSysMessage("Data GameObjects for quests reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`creature_loot_template`)" );
@@ -816,7 +780,6 @@ bool ChatHandler::HandleReloadLootTemplatesCreatureCommand(const char*)
     SendGlobalGMSysMessage("DB table `creature_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`disenchant_loot_template`)" );
@@ -825,7 +788,6 @@ bool ChatHandler::HandleReloadLootTemplatesDisenchantCommand(const char*)
     SendGlobalGMSysMessage("DB table `disenchant_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`fishing_loot_template`)" );
@@ -834,7 +796,6 @@ bool ChatHandler::HandleReloadLootTemplatesFishingCommand(const char*)
     SendGlobalGMSysMessage("DB table `fishing_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`gameobject_loot_template`)" );
@@ -843,7 +804,6 @@ bool ChatHandler::HandleReloadLootTemplatesGameobjectCommand(const char*)
     SendGlobalGMSysMessage("DB table `gameobject_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`item_loot_template`)" );
@@ -852,7 +812,6 @@ bool ChatHandler::HandleReloadLootTemplatesItemCommand(const char*)
     SendGlobalGMSysMessage("DB table `item_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`milling_loot_template`)" );
@@ -861,7 +820,6 @@ bool ChatHandler::HandleReloadLootTemplatesMillingCommand(const char*)
     SendGlobalGMSysMessage("DB table `milling_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`pickpocketing_loot_template`)" );
@@ -870,7 +828,6 @@ bool ChatHandler::HandleReloadLootTemplatesPickpocketingCommand(const char*)
     SendGlobalGMSysMessage("DB table `pickpocketing_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`prospecting_loot_template`)" );
@@ -879,7 +836,6 @@ bool ChatHandler::HandleReloadLootTemplatesProspectingCommand(const char*)
     SendGlobalGMSysMessage("DB table `prospecting_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesQuestMailCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`quest_mail_loot_template`)" );
@@ -888,7 +844,6 @@ bool ChatHandler::HandleReloadLootTemplatesQuestMailCommand(const char*)
     SendGlobalGMSysMessage("DB table `quest_mail_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`reference_loot_template`)" );
@@ -896,7 +851,6 @@ bool ChatHandler::HandleReloadLootTemplatesReferenceCommand(const char*)
     SendGlobalGMSysMessage("DB table `reference_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`skinning_loot_template`)" );
@@ -905,7 +859,6 @@ bool ChatHandler::HandleReloadLootTemplatesSkinningCommand(const char*)
     SendGlobalGMSysMessage("DB table `skinning_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*)
 {
     sLog.outString( "Re-Loading Loot Tables... (`spell_loot_template`)" );
@@ -914,7 +867,6 @@ bool ChatHandler::HandleReloadLootTemplatesSpellCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_loot_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadTrinityStringCommand(const char*)
 {
     sLog.outString( "Re-Loading trinity_string Table!" );
@@ -922,7 +874,6 @@ bool ChatHandler::HandleReloadTrinityStringCommand(const char*)
     SendGlobalGMSysMessage("DB table `trinity_string` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadNpcOptionCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_option` Table!" );
@@ -930,7 +881,6 @@ bool ChatHandler::HandleReloadNpcOptionCommand(const char*)
     SendGlobalGMSysMessage("DB table `npc_option` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_gossip` Table!" );
@@ -938,7 +888,6 @@ bool ChatHandler::HandleReloadNpcGossipCommand(const char*)
     SendGlobalGMSysMessage("DB table `npc_gossip` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadNpcTrainerCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_trainer` Table!" );
@@ -946,7 +895,6 @@ bool ChatHandler::HandleReloadNpcTrainerCommand(const char*)
     SendGlobalGMSysMessage("DB table `npc_trainer` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadNpcVendorCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_vendor` Table!" );
@@ -954,7 +902,6 @@ bool ChatHandler::HandleReloadNpcVendorCommand(const char*)
     SendGlobalGMSysMessage("DB table `npc_vendor` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*)
 {
     sLog.outString( "Re-Loading `points_of_interest` Table!" );
@@ -962,7 +909,6 @@ bool ChatHandler::HandleReloadPointsOfInterestCommand(const char*)
     SendGlobalGMSysMessage("DB table `points_of_interest` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*)
 {
     sLog.outString( "Re-Loading `npc_spellclick_spells` Table!" );
@@ -970,7 +916,6 @@ bool ChatHandler::HandleReloadSpellClickSpellsCommand(const char*)
     SendGlobalGMSysMessage("DB table `npc_spellclick_spells` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadReservedNameCommand(const char*)
 {
     sLog.outString( "Loading ReservedNames... (`reserved_name`)" );
@@ -978,7 +923,6 @@ bool ChatHandler::HandleReloadReservedNameCommand(const char*)
     SendGlobalGMSysMessage("DB table `reserved_name` (player reserved names) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/)
 {
     sLog.outString( "Re-Loading Skill Discovery Table..." );
@@ -986,7 +930,6 @@ bool ChatHandler::HandleReloadSkillDiscoveryTemplateCommand(const char* /*args*/
     SendGlobalGMSysMessage("DB table `skill_discovery_template` (recipes discovered at crafting) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/)
 {
     sLog.outString( "Re-Loading Skill Extra Item Table..." );
@@ -994,7 +937,6 @@ bool ChatHandler::HandleReloadSkillExtraItemTemplateCommand(const char* /*args*/
     SendGlobalGMSysMessage("DB table `skill_extra_item_template` (extra item creation when crafting) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/)
 {
     sLog.outString( "Re-Loading Skill Fishing base level requirements..." );
@@ -1002,7 +944,6 @@ bool ChatHandler::HandleReloadSkillFishingBaseLevelCommand(const char* /*args*/)
     SendGlobalGMSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellAreaCommand(const char*)
 {
     sLog.outString( "Re-Loading SpellArea Data..." );
@@ -1010,7 +951,6 @@ bool ChatHandler::HandleReloadSpellAreaCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellRequiredCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Required Data... " );
@@ -1018,7 +958,6 @@ bool ChatHandler::HandleReloadSpellRequiredCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_required` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellElixirCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Elixir types..." );
@@ -1026,7 +965,6 @@ bool ChatHandler::HandleReloadSpellElixirCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_elixir` (spell elixir types) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Learn Spells..." );
@@ -1034,7 +972,6 @@ bool ChatHandler::HandleReloadSpellLearnSpellCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_learn_spell` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Linked Spells..." );
@@ -1042,7 +979,6 @@ bool ChatHandler::HandleReloadSpellLinkedSpellCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_linked_spell` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellProcEventCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Proc Event conditions..." );
@@ -1050,7 +986,6 @@ bool ChatHandler::HandleReloadSpellProcEventCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellBonusesCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell Bonus Data..." );
@@ -1058,7 +993,6 @@ bool ChatHandler::HandleReloadSpellBonusesCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*)
 {
     sLog.outString( "Re-Loading SpellsScriptTarget..." );
@@ -1066,7 +1000,6 @@ bool ChatHandler::HandleReloadSpellScriptTargetCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_script_target` (spell targets selection in case specific creature/GO requirements) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell target coordinates..." );
@@ -1074,7 +1007,6 @@ bool ChatHandler::HandleReloadSpellTargetPositionCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellThreatsCommand(const char*)
 {
     sLog.outString( "Re-Loading Aggro Spells Definitions...");
@@ -1082,7 +1014,6 @@ bool ChatHandler::HandleReloadSpellThreatsCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*)
 {
     sLog.outString( "Re-Loading Spell pet auras...");
@@ -1090,7 +1021,6 @@ bool ChatHandler::HandleReloadSpellPetAurasCommand(const char*)
     SendGlobalGMSysMessage("DB table `spell_pet_auras` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadPageTextsCommand(const char*)
 {
     sLog.outString( "Re-Loading Page Texts..." );
@@ -1098,7 +1028,6 @@ bool ChatHandler::HandleReloadPageTextsCommand(const char*)
     SendGlobalGMSysMessage("DB table `page_texts` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*)
 {
     sLog.outString( "Re-Loading Item Random Enchantments Table..." );
@@ -1106,7 +1035,6 @@ bool ChatHandler::HandleReloadItemEnchantementsCommand(const char*)
     SendGlobalGMSysMessage("DB table `item_enchantment_template` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*)
 {
     sLog.outString( "Re-Loading Item Required Targets Table..." );
@@ -1114,7 +1042,6 @@ bool ChatHandler::HandleReloadItemRequiredTragetCommand(const char*)
     SendGlobalGMSysMessage("DB table `item_required_target` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1123,18 +1050,13 @@ bool ChatHandler::HandleReloadGameObjectScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `gameobject_scripts`...");
-
     objmgr.LoadGameObjectScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `gameobject_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1143,18 +1065,13 @@ bool ChatHandler::HandleReloadEventScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `event_scripts`...");
-
     objmgr.LoadEventScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `event_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1163,27 +1080,20 @@ bool ChatHandler::HandleReloadWpScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `waypoint_scripts`...");
-
     objmgr.LoadWaypointScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `waypoint_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadEventAITextsCommand(const char* arg)
 {
-
     sLog.outString( "Re-Loading Texts from `creature_ai_texts`...");
     CreatureEAI_Mgr.LoadCreatureEventAI_Texts();
     SendGlobalGMSysMessage("DB table `creature_ai_texts` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg)
 {
     sLog.outString( "Re-Loading Summons from `creature_ai_summons`...");
@@ -1191,7 +1101,6 @@ bool ChatHandler::HandleReloadEventAISummonsCommand(const char* arg)
     SendGlobalGMSysMessage("DB table `creature_ai_summons` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg)
 {
     sLog.outString( "Re-Loading Scripts from `creature_ai_scripts`...");
@@ -1199,7 +1108,6 @@ bool ChatHandler::HandleReloadEventAIScriptsCommand(const char* arg)
     SendGlobalGMSysMessage("DB table `creature_ai_scripts` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1208,18 +1116,13 @@ bool ChatHandler::HandleReloadQuestEndScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `quest_end_scripts`...");
-
     objmgr.LoadQuestEndScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `quest_end_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1228,18 +1131,13 @@ bool ChatHandler::HandleReloadQuestStartScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `quest_start_scripts`...");
-
     objmgr.LoadQuestStartScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `quest_start_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg)
 {
     if(sWorld.IsScriptScheduled())
@@ -1248,18 +1146,13 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(*arg!='a')
         sLog.outString( "Re-Loading Scripts from `spell_scripts`...");
-
     objmgr.LoadSpellScripts();
-
     if(*arg!='a')
         SendGlobalGMSysMessage("DB table `spell_scripts` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Script strings from `db_script_string`...");
@@ -1267,40 +1160,27 @@ bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `db_script_string` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadGameGraveyardZoneCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Graveyard-zone links...");
-
     objmgr.LoadGraveyardZones();
-
     SendGlobalGMSysMessage("DB table `game_graveyard_zone` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadGameTeleCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Game Tele coordinates...");
-
     objmgr.LoadGameTele();
-
     SendGlobalGMSysMessage("DB table `game_tele` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadSpellDisabledCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading spell disabled table...");
-
     objmgr.LoadSpellDisabledEntrys();
-
     SendGlobalGMSysMessage("DB table `spell_disabled` reloaded.");
-
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*)
 {
     sLog.outString( "Re-Loading Locales Achievement Reward Data..." );
@@ -1308,7 +1188,6 @@ bool ChatHandler::HandleReloadLocalesAchievementRewardCommand(const char*)
     SendGlobalGMSysMessage("DB table `locales_achievement_reward` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Creature ...");
@@ -1316,7 +1195,6 @@ bool ChatHandler::HandleReloadLocalesCreatureCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_creature` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Gameobject ... ");
@@ -1324,7 +1202,6 @@ bool ChatHandler::HandleReloadLocalesGameobjectCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_gameobject` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Item ... ");
@@ -1332,7 +1209,6 @@ bool ChatHandler::HandleReloadLocalesItemCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_item` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales NPC Text ... ");
@@ -1340,7 +1216,6 @@ bool ChatHandler::HandleReloadLocalesNpcTextCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_npc_text` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Page Text ... ");
@@ -1348,7 +1223,6 @@ bool ChatHandler::HandleReloadLocalesPageTextCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_page_text` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Points Of Interest ... ");
@@ -1356,7 +1230,6 @@ bool ChatHandler::HandleReloadLocalesPointsOfInterestCommand(const char* /*arg*/
     SendGlobalGMSysMessage("DB table `locales_points_of_interest` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/)
 {
     sLog.outString( "Re-Loading Locales Quest ... ");
@@ -1364,15 +1237,12 @@ bool ChatHandler::HandleReloadLocalesQuestCommand(const char* /*arg*/)
     SendGlobalGMSysMessage("DB table `locales_quest` reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleLoadScriptsCommand(const char* args)
 {
     if(!LoadScriptingModule(args)) return true;
-
     sWorld.SendGMText(LANG_SCRIPTS_RELOADED);
     return true;
 }
-
 bool ChatHandler::HandleReloadAuctionsCommand(const char* args)
 {
     ///- Reload dynamic data tables from the database
@@ -1382,26 +1252,22 @@ bool ChatHandler::HandleReloadAuctionsCommand(const char* args)
     SendGlobalGMSysMessage("Auctions reloaded.");
     return true;
 }
-
 bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string targetAccountName;
     uint32 targetAccountId = 0;
     uint32 targetSecurity = 0;
     uint32 gm = 0;
     char* arg1 = strtok((char*)args, " ");
     char* arg2 = strtok(NULL, " ");
-
     if (getSelectedPlayer() && arg1 && !arg2)
     {
         targetAccountId = getSelectedPlayer()->GetSession()->GetAccountId();
         accmgr.GetName(targetAccountId, targetAccountName);
         Player* targetPlayer = getSelectedPlayer();
         gm = atoi(arg1);
-
         // Check for invalid specified GM level.
         if (gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR)
         {
@@ -1409,7 +1275,6 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         // Check if targets GM level and specified GM level is not higher than current gm level
         targetSecurity = targetPlayer->GetSession()->GetSecurity();
         if (targetSecurity >= m_session->GetSecurity() || gm >= m_session->GetSecurity())
@@ -1418,13 +1283,11 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         // Decide which string to show
         if (m_session->GetPlayer() != targetPlayer)
             PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm);
         else
             PSendSysMessage(LANG_YOURS_SECURITY_CHANGED, m_session->GetPlayer()->GetName(), gm);
-
         loginDatabase.PExecute("UPDATE account SET gmlevel = '%d' WHERE id = '%u'", gm, targetAccountId);
         return true;
     }
@@ -1433,7 +1296,6 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
         // Check for second parameter
         if (!arg2)
             return false;
-
         // Check for account
         targetAccountName = arg1;
         if (!AccountMgr::normalizeString(targetAccountName))
@@ -1442,7 +1304,6 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         // Check for invalid specified GM level.
         gm = atoi(arg2);
         if (gm < SEC_PLAYER || gm > SEC_ADMINISTRATOR)
@@ -1451,11 +1312,9 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         targetAccountId = accmgr.GetId(arg1);
         /// m_session==NULL only for console
         uint32 plSecurity = m_session ? m_session->GetSecurity() : SEC_CONSOLE;
-
         /// can set security level only for target with less security and to less security that we have
         /// This is also reject self apply in fact
         targetSecurity = accmgr.GetSecurity(targetAccountId);
@@ -1465,27 +1324,22 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm);
         loginDatabase.PExecute("UPDATE account SET gmlevel = '%d' WHERE id = '%u'", gm, targetAccountId);
         return true;
     }
 }
-
 /// Set password for account
 bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
 {
     if(!*args)
         return false;
-
     ///- Get the command line arguments
     char *szAccount = strtok ((char*)args," ");
     char *szPassword1 =  strtok (NULL," ");
     char *szPassword2 =  strtok (NULL," ");
-
     if (!szAccount||!szPassword1 || !szPassword2)
         return false;
-
     std::string account_name = szAccount;
     if (!AccountMgr::normalizeString(account_name))
     {
@@ -1493,7 +1347,6 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 targetAccountId = accmgr.GetId(account_name);
     if (!targetAccountId)
     {
@@ -1501,21 +1354,17 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     /// can set password only for target with less security
     /// This is also reject self apply in fact
     if (HasLowerSecurityAccount (NULL,targetAccountId,true))
         return false;
-
     if (strcmp(szPassword1,szPassword2))
     {
         SendSysMessage (LANG_NEW_PASSWORDS_NOT_MATCH);
         SetSentErrorMessage (true);
         return false;
     }
-
     AccountOpResult result = accmgr.ChangePassword(targetAccountId, szPassword1);
-
     switch (result)
     {
         case AOR_OK:
@@ -1534,10 +1383,8 @@ bool ChatHandler::HandleAccountSetPasswordCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/)
 {
     Player* SelectedPlayer = getSelectedPlayer();
@@ -1547,26 +1394,20 @@ bool ChatHandler::HandleMaxSkillCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     // each skills that have max skill value dependent from level seted to current level max skill value
     SelectedPlayer->UpdateSkillsToMaxSkillsForLevel();
     return true;
 }
-
 bool ChatHandler::HandleSetSkillCommand(const char* args)
 {
     // number or [name] Shift-click form |color|Hskill:skill_id|h[name]|h|r
     char* skill_p = extractKeyFromLink((char*)args,"Hskill");
     if (!skill_p)
         return false;
-
     char *level_p = strtok (NULL, " ");
-
     if (!level_p)
         return false;
-
     char *max_p   = strtok (NULL, " ");
-
     int32 skill = atoi(skill_p);
     if (skill <= 0)
     {
@@ -1574,9 +1415,7 @@ bool ChatHandler::HandleSetSkillCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     int32 level = atol (level_p);
-
     Player * target = getSelectedPlayer();
     if (!target)
     {
@@ -1584,7 +1423,6 @@ bool ChatHandler::HandleSetSkillCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     SkillLineEntry const* sl = sSkillLineStore.LookupEntry(skill);
     if (!sl)
     {
@@ -1592,40 +1430,30 @@ bool ChatHandler::HandleSetSkillCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     std::string tNameLink = GetNameLink(target);
-
     if (!target->GetSkillValue(skill))
     {
         PSendSysMessage(LANG_SET_SKILL_ERROR, tNameLink.c_str(), skill, sl->name[0]);
         SetSentErrorMessage(true);
         return false;
     }
-
     int32 max   = max_p ? atol (max_p) : target->GetPureMaxSkillValue(skill);
-
     if (level <= 0 || level > max || max <= 0)
         return false;
-
     target->SetSkill(skill, level, max);
     PSendSysMessage(LANG_SET_SKILL, skill, sl->name[0], tNameLink.c_str(), level, max);
-
     return true;
 }
-
 bool ChatHandler::HandleUnLearnCommand(const char* args)
 {
     if (!*args)
         return false;
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r
     uint32 spell_id = extractSpellIdFromLink((char*)args);
     if (!spell_id)
         return false;
-
     char const* allStr = strtok(NULL," ");
     bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false;
-
     Player* target = getSelectedPlayer();
     if (!target)
     {
@@ -1633,21 +1461,16 @@ bool ChatHandler::HandleUnLearnCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (allRanks)
         spell_id = spellmgr.GetFirstSpellInChain (spell_id);
-
     if (target->HasSpell(spell_id))
         target->removeSpell(spell_id,false,!allRanks);
     else
         SendSysMessage(LANG_FORGET_SPELL);
-
     if (GetTalentSpellCost(spell_id))
         target->SendTalentsInfoData(false);
-
     return true;
 }
-
 bool ChatHandler::HandleCooldownCommand(const char* args)
 {
     Player* target = getSelectedPlayer();
@@ -1657,9 +1480,7 @@ bool ChatHandler::HandleCooldownCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     std::string tNameLink = GetNameLink(target);
-
     if (!*args)
     {
         target->RemoveAllSpellCooldown();
@@ -1671,20 +1492,17 @@ bool ChatHandler::HandleCooldownCommand(const char* args)
         uint32 spell_id = extractSpellIdFromLink((char*)args);
         if (!spell_id)
             return false;
-
         if (!sSpellStore.LookupEntry(spell_id))
         {
             PSendSysMessage(LANG_UNKNOWN_SPELL, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
             SetSentErrorMessage(true);
             return false;
         }
-
         target->RemoveSpellCooldown(spell_id,true);
         PSendSysMessage(LANG_REMOVE_COOLDOWN, spell_id, target==m_session->GetPlayer() ? GetMangosString(LANG_YOU) : tNameLink.c_str());
    }
     return true;
 }
-
 bool ChatHandler::HandleLearnAllCommand(const char* /*args*/)
 {
     static const char *allSpellList[] =
@@ -2287,30 +2105,23 @@ bool ChatHandler::HandleLearnAllCommand(const char* /*args*/)
         "202",
         "0"
     };
-
     int loop = 0;
     while(strcmp(allSpellList[loop], "0"))
     {
         uint32 spell = atol((char*)allSpellList[loop++]);
-
         if (m_session->GetPlayer()->HasSpell(spell))
             continue;
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
         if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
         {
             PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
             continue;
         }
-
         m_session->GetPlayer()->learnSpell(spell,false);
     }
-
     SendSysMessage(LANG_COMMAND_LEARN_MANY_SPELLS);
-
     return true;
 }
-
 bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/)
 {
     static const char *gmSpellList[] =
@@ -2325,97 +2136,77 @@ bool ChatHandler::HandleLearnAllGMCommand(const char* /*args*/)
         "31924",                                            // Kill
         "29878",                                            // Kill My Self
         "26644",                                            // More Kill
-
         "28550",                                            //Invisible 24
         "23452",                                            //Invisible + Target
         "0"
     };
-
     uint16 gmSpellIter = 0;
     while( strcmp(gmSpellList[gmSpellIter], "0") )
     {
         uint32 spell = atol((char*)gmSpellList[gmSpellIter++]);
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
         if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
         {
             PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
             continue;
         }
-
         m_session->GetPlayer()->learnSpell(spell,false);
     }
-
     SendSysMessage(LANG_LEARNING_GM_SKILLS);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllMyClassCommand(const char* /*args*/)
 {
     HandleLearnAllMySpellsCommand("");
     HandleLearnAllMyTalentsCommand("");
     return true;
 }
-
 bool ChatHandler::HandleLearnAllMySpellsCommand(const char* /*args*/)
 {
     ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(m_session->GetPlayer()->getClass());
     if(!clsEntry)
         return true;
     uint32 family = clsEntry->spellfamily;
-
     for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i)
     {
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(i);
         if(!spellInfo)
             continue;
-
         // skip server-side/triggered spells
         if(spellInfo->spellLevel==0)
             continue;
-
         // skip wrong class/race skills
         if(!m_session->GetPlayer()->IsSpellFitByClassAndRace(spellInfo->Id))
             continue;
-
         // skip other spell families
         if( spellInfo->SpellFamilyName != family)
             continue;
-
         // skip spells with first rank learned as talent (and all talents then also)
         uint32 first_rank = spellmgr.GetFirstSpellInChain(spellInfo->Id);
         if(GetTalentSpellCost(first_rank) > 0 )
             continue;
-
         // skip broken spells
         if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
             continue;
-
         m_session->GetPlayer()->learnSpell(i,false);
     }
-
     SendSysMessage(LANG_COMMAND_LEARN_CLASS_SPELLS);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/)
 {
     Player* player = m_session->GetPlayer();
     uint32 classMask = player->getClassMask();
-
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
         TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
         if(!talentInfo)
             continue;
-
         TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
         if(!talentTabInfo)
             continue;
-
         if( (classMask & talentTabInfo->ClassMask) == 0 )
             continue;
-
         // search highest talent rank
         uint32 spellId = 0;
         for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
@@ -2426,26 +2217,20 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/)
                 break;
             }
         }
-
         if(!spellId)                                        // ??? none spells in talent
             continue;
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
         if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
             continue;
-
         // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
         player->learnSpellHighRank(spellId);
     }
-
     SendSysMessage(LANG_COMMAND_LEARN_CLASS_TALENTS);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/)
 {
     Player* player = m_session->GetPlayer();
-
     Pet* pet = player->GetPet();
     if(!pet)
     {
@@ -2453,7 +2238,6 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     CreatureInfo const *ci = pet->GetCreatureInfo();
     if(!ci)
     {
@@ -2461,7 +2245,6 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
     if(!pet_family)
     {
@@ -2469,31 +2252,25 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(pet_family->petTalentType < 0)                       // not hunter pet
     {
         SendSysMessage(LANG_WRONG_PET_TYPE);
         SetSentErrorMessage(true);
         return false;
     }
-
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
         TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
         if(!talentInfo)
             continue;
-
         TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
         if(!talentTabInfo)
             continue;
-
         // prevent learn talent for different family (cheating)
         if(((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask)==0)
             continue;
-
         // search highest talent rank
         uint32 spellid = 0;
-
         for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
         {
             if(talentInfo->RankID[rank]!=0)
@@ -2502,64 +2279,50 @@ bool ChatHandler::HandleLearnAllMyPetTalentsCommand(const char* /*args*/)
                 break;
             }
         }
-
         if(!spellid)                                        // ??? none spells in talent
             continue;
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid);
         if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer(),false))
             continue;
-
         // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
         pet->learnSpellHighRank(spellid);
     }
-
     SendSysMessage(LANG_COMMAND_LEARN_PET_TALENTS);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllLangCommand(const char* /*args*/)
 {
     // skipping UNIVERSAL language (0)
     for(uint8 i = 1; i < LANGUAGES_COUNT; ++i)
         m_session->GetPlayer()->learnSpell(lang_description[i].spell_id,false);
-
     SendSysMessage(LANG_COMMAND_LEARN_ALL_LANG);
     return true;
 }
-
 bool ChatHandler::HandleLearnAllDefaultCommand(const char* args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     target->learnDefaultSpells();
     target->learnQuestRewardedSpells();
-
     PSendSysMessage(LANG_COMMAND_LEARN_ALL_DEFAULT_AND_QUEST,GetNameLink(target).c_str());
     return true;
 }
-
 bool ChatHandler::HandleLearnCommand(const char* args)
 {
     Player* targetPlayer = getSelectedPlayer();
-
     if(!targetPlayer)
     {
         SendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell || !sSpellStore.LookupEntry(spell))
         return false;
-
     char const* allStr = strtok(NULL," ");
     bool allRanks = allStr ? (strncmp(allStr, "all", strlen(allStr)) == 0) : false;
-
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
     if(!spellInfo || !SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
     {
@@ -2567,7 +2330,6 @@ bool ChatHandler::HandleLearnCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (!allRanks && targetPlayer->HasSpell(spell))
     {
         if(targetPlayer == m_session->GetPlayer())
@@ -2577,30 +2339,23 @@ bool ChatHandler::HandleLearnCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(allRanks)
         targetPlayer->learnSpellHighRank(spell);
     else
         targetPlayer->learnSpell(spell,false);
-
     uint32 first_spell = spellmgr.GetFirstSpellInChain(spell);
     if(GetTalentSpellCost(first_spell))
         targetPlayer->SendTalentsInfoData(false);
-
     return true;
 }
-
 bool ChatHandler::HandleAddItemCommand(const char* args)
 {
     if (!*args)
         return false;
-
     uint32 itemId = 0;
-
     if(args[0]=='[')                                        // [name] manual form
     {
         char* citemName = strtok((char*)args, "]");
-
         if(citemName && citemName[0])
         {
             std::string itemName = citemName+1;
@@ -2625,24 +2380,17 @@ bool ChatHandler::HandleAddItemCommand(const char* args)
             return false;
         itemId = atol(cId);
     }
-
     char* ccount = strtok(NULL, " ");
-
     int32 count = 1;
-
     if (ccount)
         count = strtol(ccount, NULL, 10);
-
     if (count == 0)
         count = 1;
-
     Player* pl = m_session->GetPlayer();
     Player* plTarget = getSelectedPlayer();
     if(!plTarget)
         plTarget = pl;
-
     sLog.outDetail(GetTrinityString(LANG_ADDITEM), itemId, count);
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype(itemId);
     if(!pProto)
     {
@@ -2650,7 +2398,6 @@ bool ChatHandler::HandleAddItemCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     //Subtract
     if (count < 0)
     {
@@ -2658,55 +2405,43 @@ bool ChatHandler::HandleAddItemCommand(const char* args)
         PSendSysMessage(LANG_REMOVEITEM, itemId, -count, GetNameLink(plTarget).c_str());
         return true;
     }
-
     //Adding items
     uint32 noSpaceForCount = 0;
-
     // check space and find places
     ItemPosCountVec dest;
     uint8 msg = plTarget->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount );
     if( msg != EQUIP_ERR_OK )                               // convert to possible store amount
         count -= noSpaceForCount;
-
     if( count == 0 || dest.empty())                         // can't add any
     {
         PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount );
         SetSentErrorMessage(true);
         return false;
     }
-
     Item* item = plTarget->StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
-
     // remove binding (let GM give it to another player later)
     if(pl==plTarget)
         for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
             if(Item* item1 = pl->GetItemByPos(itr->pos))
                 item1->SetBinding( false );
-
     if(count > 0 && item)
     {
         pl->SendNewItem(item,count,false,true);
         if(pl!=plTarget)
             plTarget->SendNewItem(item,count,true,false);
     }
-
     if(noSpaceForCount > 0)
         PSendSysMessage(LANG_ITEM_CANNOT_CREATE, itemId, noSpaceForCount);
-
     return true;
 }
-
 bool ChatHandler::HandleAddItemSetCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* cId = extractKeyFromLink((char*)args,"Hitemset"); // number or [name] Shift-click form |color|Hitemset:itemset_id|h[name]|h|r
     if (!cId)
         return false;
-
     uint32 itemsetId = atol(cId);
-
     // prevent generation all items with itemset field value '0'
     if (itemsetId == 0)
     {
@@ -2714,21 +2449,17 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     Player* pl = m_session->GetPlayer();
     Player* plTarget = getSelectedPlayer();
     if(!plTarget)
         plTarget = pl;
-
     sLog.outDetail(GetTrinityString(LANG_ADDITEMSET), itemsetId);
-
     bool found = false;
     for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
     {
         ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
         if (!pProto)
             continue;
-
         if (pProto->ItemSet == itemsetId)
         {
             found = true;
@@ -2737,11 +2468,9 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args)
             if (msg == EQUIP_ERR_OK)
             {
                 Item* item = plTarget->StoreNewItem( dest, pProto->ItemId, true);
-
                 // remove binding (let GM give it to another player later)
                 if (pl==plTarget)
                     item->SetBinding( false );
-
                 pl->SendNewItem(item,1,false,true);
                 if (pl!=plTarget)
                     plTarget->SendNewItem(item,1,true,false);
@@ -2753,27 +2482,21 @@ bool ChatHandler::HandleAddItemSetCommand(const char* args)
             }
         }
     }
-
     if (!found)
     {
         PSendSysMessage(LANG_NO_ITEMS_FROM_ITEMSET_FOUND,itemsetId);
-
         SetSentErrorMessage(true);
         return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleListItemCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* cId = extractKeyFromLink((char*)args,"Hitem");
     if(!cId)
         return false;
-
     uint32 item_id = atol(cId);
     if(!item_id)
     {
@@ -2781,7 +2504,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     ItemPrototype const* itemProto = objmgr.GetItemPrototype(item_id);
     if(!itemProto)
     {
@@ -2789,15 +2511,11 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char* c_count = strtok(NULL, " ");
     int count = c_count ? atol(c_count) : 10;
-
     if(count < 0)
         return false;
-
     QueryResult *result;
-
     // inventory case
     uint32 inv_count = 0;
     result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM character_inventory WHERE item_template='%u'",item_id);
@@ -2806,14 +2524,12 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         inv_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     result=CharacterDatabase.PQuery(
     //          0        1             2             3        4                  5
         "SELECT ci.item, cibag.slot AS bag, ci.slot, ci.guid, characters.account,characters.name "
         "FROM character_inventory AS ci LEFT JOIN character_inventory AS cibag ON (cibag.item=ci.bag),characters "
         "WHERE ci.item_template='%u' AND ci.guid = characters.guid LIMIT %u ",
         item_id,uint32(count));
-
     if(result)
     {
         do
@@ -2825,7 +2541,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
             uint32 owner_guid = fields[3].GetUInt32();
             uint32 owner_acc = fields[4].GetUInt32();
             std::string owner_name = fields[5].GetCppString();
-
             char const* item_pos = 0;
             if(Player::IsEquipmentPos(item_bag,item_slot))
                 item_pos = "[equipped]";
@@ -2835,21 +2550,16 @@ bool ChatHandler::HandleListItemCommand(const char* args)
                 item_pos = "[in bank]";
             else
                 item_pos = "";
-
             PSendSysMessage(LANG_ITEMLIST_SLOT,
                 item_guid,owner_name.c_str(),owner_guid,owner_acc,item_pos);
         } while (result->NextRow());
-
         int64 res_count = result->GetRowCount();
-
         delete result;
-
         if(count > res_count)
             count-=res_count;
         else if(count)
             count = 0;
     }
-
     // mail case
     uint32 mail_count = 0;
     result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM mail_items WHERE item_template='%u'", item_id);
@@ -2858,7 +2568,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         mail_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     if(count > 0)
     {
         result=CharacterDatabase.PQuery(
@@ -2870,7 +2579,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
     }
     else
         result = NULL;
-
     if(result)
     {
         do
@@ -2883,23 +2591,17 @@ bool ChatHandler::HandleListItemCommand(const char* args)
             std::string item_s_name = fields[4].GetCppString();
             uint32 item_r_acc       = fields[5].GetUInt32();
             std::string item_r_name = fields[6].GetCppString();
-
             char const* item_pos = "[in mail]";
-
             PSendSysMessage(LANG_ITEMLIST_MAIL,
                 item_guid,item_s_name.c_str(),item_s,item_s_acc,item_r_name.c_str(),item_r,item_r_acc,item_pos);
         } while (result->NextRow());
-
         int64 res_count = result->GetRowCount();
-
         delete result;
-
         if(count > res_count)
             count-=res_count;
         else if(count)
             count = 0;
     }
-
     // auction case
     uint32 auc_count = 0;
     result=CharacterDatabase.PQuery("SELECT COUNT(item_template) FROM auctionhouse WHERE item_template='%u'",item_id);
@@ -2908,7 +2610,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         auc_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     if(count > 0)
     {
         result=CharacterDatabase.PQuery(
@@ -2919,7 +2620,6 @@ bool ChatHandler::HandleListItemCommand(const char* args)
     }
     else
         result = NULL;
-
     if(result)
     {
         do
@@ -2929,15 +2629,11 @@ bool ChatHandler::HandleListItemCommand(const char* args)
             uint32 owner           = fields[1].GetUInt32();
             uint32 owner_acc       = fields[2].GetUInt32();
             std::string owner_name = fields[3].GetCppString();
-
             char const* item_pos = "[in auction]";
-
             PSendSysMessage(LANG_ITEMLIST_AUCTION, item_guid, owner_name.c_str(), owner, owner_acc,item_pos);
         } while (result->NextRow());
-
         delete result;
     }
-
     // guild bank case
     uint32 guild_count = 0;
     result=CharacterDatabase.PQuery("SELECT COUNT(item_entry) FROM guild_bank_item WHERE item_entry='%u'",item_id);
@@ -2946,13 +2642,11 @@ bool ChatHandler::HandleListItemCommand(const char* args)
         guild_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     result=CharacterDatabase.PQuery(
         //      0             1           2
         "SELECT gi.item_guid, gi.guildid, guild.name "
         "FROM guild_bank_item AS gi, guild WHERE gi.item_entry='%u' AND gi.guildid = guild.guildid LIMIT %u ",
         item_id,uint32(count));
-
     if(result)
     {
         do
@@ -2961,44 +2655,33 @@ bool ChatHandler::HandleListItemCommand(const char* args)
             uint32 item_guid = fields[0].GetUInt32();
             uint32 guild_guid = fields[1].GetUInt32();
             std::string guild_name = fields[2].GetCppString();
-
             char const* item_pos = "[in guild bank]";
-
             PSendSysMessage(LANG_ITEMLIST_GUILD,item_guid,guild_name.c_str(),guild_guid,item_pos);
         } while (result->NextRow());
-
         int64 res_count = result->GetRowCount();
-
         delete result;
-
         if(count > res_count)
             count-=res_count;
         else if(count)
             count = 0;
     }
-
     if(inv_count+mail_count+auc_count+guild_count == 0)
     {
         SendSysMessage(LANG_COMMAND_NOITEMFOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_COMMAND_LISTITEMMESSAGE,item_id,inv_count+mail_count+auc_count+guild_count,inv_count,mail_count,auc_count,guild_count);
-
     return true;
 }
-
 bool ChatHandler::HandleListObjectCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // number or [name] Shift-click form |color|Hgameobject_entry:go_id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hgameobject_entry");
     if(!cId)
         return false;
-
     uint32 go_id = atol(cId);
     if(!go_id)
     {
@@ -3006,7 +2689,6 @@ bool ChatHandler::HandleListObjectCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     GameObjectInfo const * gInfo = objmgr.GetGameObjectInfo(go_id);
     if(!gInfo)
     {
@@ -3014,15 +2696,11 @@ bool ChatHandler::HandleListObjectCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char* c_count = strtok(NULL, " ");
     int count = c_count ? atol(c_count) : 10;
-
     if(count < 0)
         return false;
-
     QueryResult *result;
-
     uint32 obj_count = 0;
     result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM gameobject WHERE id='%u'",go_id);
     if(result)
@@ -3030,7 +2708,6 @@ bool ChatHandler::HandleListObjectCommand(const char* args)
         obj_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     if(m_session)
     {
         Player* pl = m_session->GetPlayer();
@@ -3040,7 +2717,6 @@ bool ChatHandler::HandleListObjectCommand(const char* args)
     else
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM gameobject WHERE id = '%u' LIMIT %u",
             go_id,uint32(count));
-
     if (result)
     {
         do
@@ -3051,47 +2727,37 @@ bool ChatHandler::HandleListObjectCommand(const char* args)
             float y = fields[2].GetFloat();
             float z = fields[3].GetFloat();
             int mapid = fields[4].GetUInt16();
-
             if (m_session)
                 PSendSysMessage(LANG_GO_LIST_CHAT, guid, guid, gInfo->name, x, y, z, mapid);
             else
                 PSendSysMessage(LANG_GO_LIST_CONSOLE, guid, gInfo->name, x, y, z, mapid);
         } while (result->NextRow());
-
         delete result;
     }
-
     PSendSysMessage(LANG_COMMAND_LISTOBJMESSAGE,go_id,obj_count);
     return true;
 }
-
 bool ChatHandler::HandleGameObjectStateCommand(const char* args)
 {
     // number or [name] Shift-click form |color|Hgameobject:go_id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args, "Hgameobject");
     if(!cId)
         return false;
-
     uint32 lowguid = atoi(cId);
     if(!lowguid)
         return false;
-
     GameObject* gobj = NULL;
-
     if(GameObjectData const* goData = objmgr.GetGOData(lowguid))
         gobj = GetObjectGlobalyWithGuidOrNearWithDbGuid(lowguid, goData->id);
-
     if(!gobj)
     {
         PSendSysMessage(LANG_COMMAND_OBJNOTFOUND, lowguid);
         SetSentErrorMessage(true);
         return false;
     }
-
     char* ctype = strtok(NULL, " ");
     if(!ctype)
         return false;
-
     int32 type = atoi(ctype);
     if(type < 0)
     {
@@ -3105,13 +2771,10 @@ bool ChatHandler::HandleGameObjectStateCommand(const char* args)
         }
         return true;
     }
-
     char* cstate = strtok(NULL, " ");
     if(!cstate)
         return false;
-
     int32 state = atoi(cstate);
-
     if(type < 4)
         gobj->SetByteValue(GAMEOBJECT_BYTES_1, type, state);
     else if(type == 4)
@@ -3122,20 +2785,16 @@ bool ChatHandler::HandleGameObjectStateCommand(const char* args)
         gobj->SendMessageToSet(&data, true);
     }
     PSendSysMessage("Set gobject type %d state %d", type, state);
-
     return true;
 }
-
 bool ChatHandler::HandleListCreatureCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hcreature_entry");
     if(!cId)
         return false;
-
     uint32 cr_id = atol(cId);
     if(!cr_id)
     {
@@ -3143,7 +2802,6 @@ bool ChatHandler::HandleListCreatureCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     CreatureInfo const* cInfo = objmgr.GetCreatureTemplate(cr_id);
     if(!cInfo)
     {
@@ -3151,15 +2809,11 @@ bool ChatHandler::HandleListCreatureCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char* c_count = strtok(NULL, " ");
     int count = c_count ? atol(c_count) : 10;
-
     if(count < 0)
         return false;
-
     QueryResult *result;
-
     uint32 cr_count = 0;
     result=WorldDatabase.PQuery("SELECT COUNT(guid) FROM creature WHERE id='%u'",cr_id);
     if(result)
@@ -3167,7 +2821,6 @@ bool ChatHandler::HandleListCreatureCommand(const char* args)
         cr_count = (*result)[0].GetUInt32();
         delete result;
     }
-
     if(m_session)
     {
         Player* pl = m_session->GetPlayer();
@@ -3177,7 +2830,6 @@ bool ChatHandler::HandleListCreatureCommand(const char* args)
     else
         result = WorldDatabase.PQuery("SELECT guid, position_x, position_y, position_z, map FROM creature WHERE id = '%u' LIMIT %u",
             cr_id,uint32(count));
-
     if (result)
     {
         do
@@ -3188,43 +2840,33 @@ bool ChatHandler::HandleListCreatureCommand(const char* args)
             float y = fields[2].GetFloat();
             float z = fields[3].GetFloat();
             int mapid = fields[4].GetUInt16();
-
             if  (m_session)
                 PSendSysMessage(LANG_CREATURE_LIST_CHAT, guid, guid, cInfo->Name, x, y, z, mapid);
             else
                 PSendSysMessage(LANG_CREATURE_LIST_CONSOLE, guid, cInfo->Name, x, y, z, mapid);
         } while (result->NextRow());
-
         delete result;
     }
-
     PSendSysMessage(LANG_COMMAND_LISTCREATUREMESSAGE,cr_id,cr_count);
     return true;
 }
-
 bool ChatHandler::HandleLookupItemCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     wstrToLower(wnamepart);
-
     bool found = false;
-
     // Search in `item_template`
     for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
     {
         ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype >(id);
         if(!pProto)
             continue;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if ( loc_idx >= 0 )
         {
@@ -3234,61 +2876,47 @@ bool ChatHandler::HandleLookupItemCommand(const char* args)
                 if (il->Name.size() > loc_idx && !il->Name[loc_idx].empty())
                 {
                     std::string name = il->Name[loc_idx];
-
                     if (Utf8FitTo(name, wnamepart))
                     {
                         if (m_session)
                             PSendSysMessage(LANG_ITEM_LIST_CHAT, id, id, name.c_str());
                         else
                             PSendSysMessage(LANG_ITEM_LIST_CONSOLE, id, name.c_str());
-
                         if(!found)
                             found = true;
-
                         continue;
                     }
                 }
             }
         }
-
         std::string name = pProto->Name1;
         if(name.empty())
             continue;
-
         if (Utf8FitTo(name, wnamepart))
         {
             if (m_session)
                 PSendSysMessage(LANG_ITEM_LIST_CHAT, id, id, name.c_str());
             else
                 PSendSysMessage(LANG_ITEM_LIST_CONSOLE, id, name.c_str());
-
             if(!found)
                 found = true;
         }
     }
-
     if (!found)
         SendSysMessage(LANG_COMMAND_NOITEMFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleLookupItemSetCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-
     bool found = false;
-
     // Search in ItemSet.dbc
     for (uint32 id = 0; id < sItemSetStore.GetNumRows(); id++)
     {
@@ -3299,7 +2927,6 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args)
             std::string name = set->name[loc];
             if(name.empty())
                 continue;
-
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
@@ -3307,16 +2934,13 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args)
                 {
                     if(loc==GetSessionDbcLocale())
                         continue;
-
                     name = set->name[loc];
                     if(name.empty())
                         continue;
-
                     if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 // send item set in "id - [namedlink locale]" format
@@ -3324,7 +2948,6 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args)
                     PSendSysMessage(LANG_ITEMSET_LIST_CHAT,id,id,name.c_str(),localeNames[loc]);
                 else
                     PSendSysMessage(LANG_ITEMSET_LIST_CONSOLE,id,name.c_str(),localeNames[loc]);
-
                 if(!found)
                     found = true;
             }
@@ -3334,26 +2957,19 @@ bool ChatHandler::HandleLookupItemSetCommand(const char* args)
         SendSysMessage(LANG_COMMAND_NOITEMSETFOUND);
     return true;
 }
-
 bool ChatHandler::HandleLookupSkillCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // can be NULL in console call
     Player* target = getSelectedPlayer();
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-
     bool found = false;
-
     // Search in SkillLine.dbc
     for (uint32 id = 0; id < sSkillLineStore.GetNumRows(); id++)
     {
@@ -3364,7 +2980,6 @@ bool ChatHandler::HandleLookupSkillCommand(const char* args)
             std::string name = skillInfo->name[loc];
             if(name.empty())
                 continue;
-
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
@@ -3372,16 +2987,13 @@ bool ChatHandler::HandleLookupSkillCommand(const char* args)
                 {
                     if(loc==GetSessionDbcLocale())
                         continue;
-
                     name = skillInfo->name[loc];
                     if(name.empty())
                         continue;
-
                     if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 char valStr[50] = "";
@@ -3393,17 +3005,14 @@ bool ChatHandler::HandleLookupSkillCommand(const char* args)
                     uint32 maxValue  = target->GetPureMaxSkillValue(id);
                     uint32 permValue = target->GetSkillPermBonusValue(id);
                     uint32 tempValue = target->GetSkillTempBonusValue(id);
-
                     char const* valFormat = GetTrinityString(LANG_SKILL_VALUES);
                     snprintf(valStr,50,valFormat,curValue,maxValue,permValue,tempValue);
                 }
-
                 // send skill in "id - [namedlink locale]" format
                 if (m_session)
                     PSendSysMessage(LANG_SKILL_LIST_CHAT,id,id,name.c_str(),localeNames[loc],knownStr,valStr);
                 else
                     PSendSysMessage(LANG_SKILL_LIST_CONSOLE,id,name.c_str(),localeNames[loc],knownStr,valStr);
-
                 if(!found)
                     found = true;
             }
@@ -3413,26 +3022,19 @@ bool ChatHandler::HandleLookupSkillCommand(const char* args)
         SendSysMessage(LANG_COMMAND_NOSKILLFOUND);
     return true;
 }
-
 bool ChatHandler::HandleLookupSpellCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // can be NULL at console call
     Player* target = getSelectedPlayer();
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-
     bool found = false;
-
     // Search in Spell.dbc
     for (uint32 id = 0; id < sSpellStore.GetNumRows(); id++)
     {
@@ -3443,7 +3045,6 @@ bool ChatHandler::HandleLookupSpellCommand(const char* args)
             std::string name = spellInfo->SpellName[loc];
             if(name.empty())
                 continue;
-
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
@@ -3451,47 +3052,37 @@ bool ChatHandler::HandleLookupSpellCommand(const char* args)
                 {
                     if(loc==GetSessionDbcLocale())
                         continue;
-
                     name = spellInfo->SpellName[loc];
                     if(name.empty())
                         continue;
-
                     if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 bool known = target && target->HasSpell(id);
                 bool learn = (spellInfo->Effect[0] == SPELL_EFFECT_LEARN_SPELL);
-
                 uint32 talentCost = GetTalentSpellCost(id);
-
                 bool talent = (talentCost > 0);
                 bool passive = IsPassiveSpell(id);
                 bool active = target && target->HasAura(id);
-
                 // unit32 used to prevent interpreting uint8 as char at output
                 // find rank of learned spell for learning spell, or talent rank
                 uint32 rank = talentCost ? talentCost : spellmgr.GetSpellRank(learn ? spellInfo->EffectTriggerSpell[0] : id);
-
                 // send spell in "id - [name, rank N] [talent] [passive] [learn] [known]" format
                 std::ostringstream ss;
                 if (m_session)
                     ss << id << " - |cffffffff|Hspell:" << id << "|h[" << name;
                 else
                     ss << id << " - " << name;
-
                 // include rank in link name
                 if(rank)
                     ss << GetTrinityString(LANG_SPELL_RANK) << rank;
-
                 if (m_session)
                     ss << " " << localeNames[loc] << "]|h|r";
                 else
                     ss << " " << localeNames[loc];
-
                 if(talent)
                     ss << GetTrinityString(LANG_TALENT);
                 if(passive)
@@ -3502,9 +3093,7 @@ bool ChatHandler::HandleLookupSpellCommand(const char* args)
                     ss << GetTrinityString(LANG_KNOWN);
                 if(active)
                     ss << GetTrinityString(LANG_ACTIVE);
-
                 SendSysMessage(ss.str().c_str());
-
                 if(!found)
                     found = true;
             }
@@ -3514,31 +3103,23 @@ bool ChatHandler::HandleLookupSpellCommand(const char* args)
         SendSysMessage(LANG_COMMAND_NOSPELLFOUND);
     return true;
 }
-
 bool ChatHandler::HandleLookupQuestCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // can be NULL at console call
     Player* target = getSelectedPlayer();
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     wstrToLower(wnamepart);
-
     bool found = false;
-
     ObjectMgr::QuestMap const& qTemplates = objmgr.GetQuestTemplates();
     for (ObjectMgr::QuestMap::const_iterator iter = qTemplates.begin(); iter != qTemplates.end(); ++iter)
     {
         Quest * qinfo = iter->second;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if ( loc_idx >= 0 )
         {
@@ -3548,15 +3129,12 @@ bool ChatHandler::HandleLookupQuestCommand(const char* args)
                 if (il->Title.size() > loc_idx && !il->Title[loc_idx].empty())
                 {
                     std::string title = il->Title[loc_idx];
-
                     if (Utf8FitTo(title, wnamepart))
                     {
                         char const* statusStr = "";
-
                         if(target)
                         {
                             QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId());
-
                             if(status == QUEST_STATUS_COMPLETE)
                             {
                                 if(target->GetQuestRewardStatus(qinfo->GetQuestId()))
@@ -3567,33 +3145,26 @@ bool ChatHandler::HandleLookupQuestCommand(const char* args)
                             else if(status == QUEST_STATUS_INCOMPLETE)
                                 statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
                         }
-
                         if (m_session)
                             PSendSysMessage(LANG_QUEST_LIST_CHAT,qinfo->GetQuestId(),qinfo->GetQuestId(),qinfo->GetQuestLevel(),title.c_str(),statusStr);
                         else
                             PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr);
-
                         if(!found)
                             found = true;
-
                         continue;
                     }
                 }
             }
         }
-
         std::string title = qinfo->GetTitle();
         if(title.empty())
             continue;
-
         if (Utf8FitTo(title, wnamepart))
         {
             char const* statusStr = "";
-
             if(target)
             {
                 QuestStatus status = target->GetQuestStatus(qinfo->GetQuestId());
-
                 if(status == QUEST_STATUS_COMPLETE)
                 {
                     if(target->GetQuestRewardStatus(qinfo->GetQuestId()))
@@ -3604,45 +3175,34 @@ bool ChatHandler::HandleLookupQuestCommand(const char* args)
                 else if(status == QUEST_STATUS_INCOMPLETE)
                     statusStr = GetTrinityString(LANG_COMMAND_QUEST_ACTIVE);
             }
-
             if (m_session)
                 PSendSysMessage(LANG_QUEST_LIST_CHAT,qinfo->GetQuestId(),qinfo->GetQuestId(),qinfo->GetQuestLevel(),title.c_str(),statusStr);
             else
                 PSendSysMessage(LANG_QUEST_LIST_CONSOLE,qinfo->GetQuestId(),title.c_str(),statusStr);
-
             if(!found)
                 found = true;
         }
     }
-
     if (!found)
         SendSysMessage(LANG_COMMAND_NOQUESTFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleLookupCreatureCommand(const char* args)
 {
     if (!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if (!Utf8toWStr (namepart,wnamepart))
         return false;
-
     wstrToLower (wnamepart);
-
     bool found = false;
-
     for (uint32 id = 0; id< sCreatureStorage.MaxEntry; ++id)
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo> (id);
         if(!cInfo)
             continue;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -3652,67 +3212,52 @@ bool ChatHandler::HandleLookupCreatureCommand(const char* args)
                 if (cl->Name.size() > loc_idx && !cl->Name[loc_idx].empty ())
                 {
                     std::string name = cl->Name[loc_idx];
-
                     if (Utf8FitTo (name, wnamepart))
                     {
                         if (m_session)
                             PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name.c_str ());
                         else
                             PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str ());
-
                         if(!found)
                             found = true;
- 
                         continue;
                     }
                 }
             }
         }
-
         std::string name = cInfo->Name;
         if (name.empty ())
             continue;
-
         if (Utf8FitTo(name, wnamepart))
         {
             if (m_session)
                 PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CHAT, id, id, name.c_str ());
             else
                 PSendSysMessage (LANG_CREATURE_ENTRY_LIST_CONSOLE, id, name.c_str ());
-
             if(!found)
                 found = true;
         }
     }
-
     if (!found)
         SendSysMessage (LANG_COMMAND_NOCREATUREFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleLookupObjectCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     wstrToLower(wnamepart);
-
     bool found = false;
-
     for (uint32 id = 0; id< sGOStorage.MaxEntry; id++ )
     {
         GameObjectInfo const* gInfo = sGOStorage.LookupEntry<GameObjectInfo>(id);
         if(!gInfo)
             continue;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if ( loc_idx >= 0 )
         {
@@ -3722,76 +3267,59 @@ bool ChatHandler::HandleLookupObjectCommand(const char* args)
                 if (gl->Name.size() > loc_idx && !gl->Name[loc_idx].empty())
                 {
                     std::string name = gl->Name[loc_idx];
-
                     if (Utf8FitTo(name, wnamepart))
                     {
                         if (m_session)
                             PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str());
                         else
                             PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str());
- 
                         if(!found)
                             found = true;
-
                         continue;
                     }
                 }
             }
         }
-
         std::string name = gInfo->name;
         if(name.empty())
             continue;
-
         if(Utf8FitTo(name, wnamepart))
         {
             if (m_session)
                 PSendSysMessage(LANG_GO_ENTRY_LIST_CHAT, id, id, name.c_str());
             else
                 PSendSysMessage(LANG_GO_ENTRY_LIST_CONSOLE, id, name.c_str());
-
             if(!found)
                 found = true;
         }
     }
-
     if(!found)
         SendSysMessage(LANG_COMMAND_NOGAMEOBJECTFOUND);
-
     return true;
 }
-
 bool ChatHandler::HandleLookupFactionCommand(const char* args)
 {
     if (!*args)
         return false;
-
     // Can be NULL at console call
     Player *target = getSelectedPlayer ();
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if (!Utf8toWStr (namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower (wnamepart);
-
     bool found = false;
-
     for (uint32 id = 0; id < sFactionStore.GetNumRows(); ++id)
     {
         FactionEntry const *factionEntry = sFactionStore.LookupEntry (id);
         if (factionEntry)
         {
             FactionState const* repState = target ? target->GetReputationMgr().GetState(factionEntry) : NULL;
-
             int loc = GetSessionDbcLocale();
             std::string name = factionEntry->name[loc];
             if(name.empty())
                 continue;
-
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
@@ -3799,16 +3327,13 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args)
                 {
                     if(loc==GetSessionDbcLocale())
                         continue;
-
                     name = factionEntry->name[loc];
                     if(name.empty())
                         continue;
-
                     if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 // send faction in "id - [faction] rank reputation [visible] [at war] [own team] [unknown] [invisible] [inactive]" format
@@ -3818,14 +3343,11 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args)
                     ss << id << " - |cffffffff|Hfaction:" << id << "|h[" << name << " " << localeNames[loc] << "]|h|r";
                 else
                     ss << id << " - " << name << " " << localeNames[loc];
-
                 if (repState)                               // and then target!=NULL also
                 {
                     ReputationRank rank = target->GetReputationMgr().GetRank(factionEntry);
                     std::string rankName = GetMangosString(ReputationRankStrIndex[rank]);
-
                     ss << " " << rankName << "|h|r (" << target->GetReputationMgr().GetReputation(factionEntry) << ")";
-
                     if(repState->Flags & FACTION_FLAG_VISIBLE)
                         ss << GetTrinityString(LANG_FACTION_VISIBLE);
                     if(repState->Flags & FACTION_FLAG_AT_WAR)
@@ -3841,36 +3363,27 @@ bool ChatHandler::HandleLookupFactionCommand(const char* args)
                 }
                 else
                     ss << GetTrinityString(LANG_FACTION_NOREPUTATION);
-
                 SendSysMessage(ss.str().c_str());
-
                 if(!found)
                     found = true;
             }
         }
     }
-
     if (!found)
         SendSysMessage(LANG_COMMAND_FACTION_NOTFOUND);
     return true;
 }
-
 bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     if(!Utf8toWStr(namepart,wnamepart))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wnamepart );
-
     bool found = false;
-
     // Search in TaxiNodes.dbc
     for (uint32 id = 0; id < sTaxiNodesStore.GetNumRows(); id++)
     {
@@ -3881,7 +3394,6 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
             std::string name = nodeEntry->name[loc];
             if(name.empty())
                 continue;
-
             if (!Utf8FitTo(name, wnamepart))
             {
                 loc = 0;
@@ -3889,16 +3401,13 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
                 {
                     if(loc==GetSessionDbcLocale())
                         continue;
-
                     name = nodeEntry->name[loc];
                     if(name.empty())
                         continue;
-
                     if (Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 // send taxinode in "id - [name] (Map:m X:x Y:y Z:z)" format
@@ -3908,7 +3417,6 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
                 else
                     PSendSysMessage (LANG_TAXINODE_ENTRY_LIST_CONSOLE, id, name.c_str(), localeNames[loc],
                         nodeEntry->map_id,nodeEntry->x,nodeEntry->y,nodeEntry->z);
-
                 if(!found)
                     found = true;
             }
@@ -3918,23 +3426,17 @@ bool ChatHandler::HandleLookupTaxiNodeCommand(const char * args)
         SendSysMessage(LANG_COMMAND_NOTAXINODEFOUND);
     return true;
 }
-
 bool ChatHandler::HandleLookupMapCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string namepart = args;
     std::wstring wnamepart;
-
     // converting string that we try to find to lower case
     if(!Utf8toWStr(namepart, wnamepart))
         return false;
-
     wstrToLower(wnamepart);
-
     bool found = false;
-
     // search in Map.dbc
     for(uint32 id = 0; id < sMapStore.GetNumRows(); id++)
     {
@@ -3942,11 +3444,9 @@ bool ChatHandler::HandleLookupMapCommand(const char* args)
         if(MapInfo)
         {
             uint8 loc = m_session ? m_session->GetSessionDbcLocale() : sWorld.GetDefaultDbcLocale();
-
             std::string name = MapInfo->name[loc];
             if(name.empty())
                 continue;
-
             if(!Utf8FitTo(name, wnamepart))
             {
                 loc = LOCALE_enUS;
@@ -3954,55 +3454,43 @@ bool ChatHandler::HandleLookupMapCommand(const char* args)
                 {
                     if(m_session && loc == m_session->GetSessionDbcLocale())
                         continue;
-
                     name = MapInfo->name[loc];
                     if(name.empty())
                         continue;
-
                     if(Utf8FitTo(name, wnamepart))
                         break;
                 }
             }
-
             if(loc < MAX_LOCALE)
             {
                 // send map in "id - [name][Continent][Instance/Battleground/Arena][Raid reset time:][Heroic reset time:][Mountable]" format
                 std::ostringstream ss;
-
                 if(m_session)
                     ss << id << " - |cffffffff|Hmap:" << id << "|h[" << name << "]";
                 else // console
                     ss << id << " - [" << name << "]";
-
                 if(MapInfo->IsContinent())
                     ss << GetTrinityString(LANG_CONTINENT);
-
                 switch(MapInfo->map_type)
                 {
                     case MAP_INSTANCE:      ss << GetTrinityString(LANG_INSTANCE);      break;
                     case MAP_BATTLEGROUND:  ss << GetTrinityString(LANG_BATTLEGROUND);  break;
                     case MAP_ARENA:         ss << GetTrinityString(LANG_ARENA);         break;
                 }
-
                 if(MapInfo->IsRaid())
                     ss << GetTrinityString(LANG_RAID);
-
                 if(MapInfo->SupportsHeroicMode())
                     ss << GetTrinityString(LANG_HEROIC);
-
                 uint32 ResetTimeRaid = MapInfo->resetTimeRaid;
                 std::string ResetTimeRaidStr;
                 if(ResetTimeRaid)
                     ResetTimeRaidStr = secsToTimeString(ResetTimeRaid, true, false);
-
                 uint32 ResetTimeHeroic = MapInfo->resetTimeHeroic;
                 std::string ResetTimeHeroicStr;
                 if(ResetTimeHeroic)
                     ResetTimeHeroicStr = secsToTimeString(ResetTimeHeroic, true, false);
-
                 if(MapInfo->IsMountAllowed())
                     ss << GetTrinityString(LANG_MOUNTABLE);
-
                 if(ResetTimeRaid && !ResetTimeHeroic)
                     PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str());
                 else if(!ResetTimeRaid && ResetTimeHeroic)
@@ -4011,19 +3499,15 @@ bool ChatHandler::HandleLookupMapCommand(const char* args)
                     PSendSysMessage(ss.str().c_str(), ResetTimeRaidStr.c_str(), ResetTimeHeroicStr.c_str());
                 else
                     SendSysMessage(ss.str().c_str());
-
                 if(!found)
                     found = true;
             }
         }
     }
-
     if(!found)
         SendSysMessage(LANG_COMMAND_NOMAPFOUND);
-
     return true;
 }
-
 /** \brief GM command level 3 - Create a guild.
  *
  * This command allows a GM (level 3) to create a guild.
@@ -4036,28 +3520,22 @@ bool ChatHandler::HandleGuildCreateCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // if not guild name only (in "") then player name
     Player* target;
     if(!extractPlayerTarget(*args!='"' ? (char*)args : NULL, &target))
         return false;
-
     char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args;
     if(!tailStr)
         return false;
-
     char* guildStr = extractQuotedArg(tailStr);
     if(!guildStr)
         return false;
-
     std::string guildname = guildStr;
-
     if (target->GetGuildId())
     {
         SendSysMessage (LANG_PLAYER_IN_GUILD);
         return true;
     }
-
     Guild *guild = new Guild;
     if (!guild->Create (target,guildname))
     {
@@ -4066,60 +3544,47 @@ bool ChatHandler::HandleGuildCreateCommand(const char* args)
         SetSentErrorMessage (true);
         return false;
     }
-
     objmgr.AddGuild (guild);
     return true;
 }
-
 bool ChatHandler::HandleGuildInviteCommand(const char *args)
 {
     if(!*args)
         return false;
-
     // if not guild name only (in "") then player name
     uint64 target_guid;
     if(!extractPlayerTarget(*args!='"' ? (char*)args : NULL, NULL, &target_guid))
         return false;
-
     char* tailStr = *args!='"' ? strtok(NULL, "") : (char*)args;
     if(!tailStr)
         return false;
-
     char* guildStr = extractQuotedArg(tailStr);
     if(!guildStr)
         return false;
-
     std::string glName = guildStr;
     Guild* targetGuild = objmgr.GetGuildByName (glName);
     if (!targetGuild)
         return false;
-
     // player's guild membership checked in AddMember before add
     if (!targetGuild->AddMember (target_guid,targetGuild->GetLowestRank ()))
         return false;
-
     return true;
 }
-
 bool ChatHandler::HandleGuildUninviteCommand(const char *args)
 {
     Player* target;
     uint64 target_guid;
     if(!extractPlayerTarget((char*)args,&target,&target_guid))
         return false;
-
     uint32 glId   = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid);
     if (!glId)
         return false;
-
     Guild* targetGuild = objmgr.GetGuildById (glId);
     if (!targetGuild)
         return false;
-
     targetGuild->DelMember (target_guid);
     return true;
 }
-
 bool ChatHandler::HandleGuildRankCommand(const char *args)
 {
     char* nameStr;
@@ -4127,59 +3592,45 @@ bool ChatHandler::HandleGuildRankCommand(const char *args)
     extractOptFirstArg((char*)args,&nameStr,&rankStr);
     if(!rankStr)
         return false;
-
     Player* target;
     uint64 target_guid;
     std::string target_name;
     if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
         return false;
-
     uint32 glId   = target ? target->GetGuildId () : Player::GetGuildIdFromDB (target_guid);
     if (!glId)
         return false;
-
     Guild* targetGuild = objmgr.GetGuildById (glId);
     if (!targetGuild)
         return false;
-
     uint32 newrank = uint32 (atoi (rankStr));
     if (newrank > targetGuild->GetLowestRank ())
         return false;
-
     targetGuild->ChangeRank (target_guid,newrank);
     return true;
 }
-
 bool ChatHandler::HandleGuildDeleteCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* guildStr = extractQuotedArg((char*)args);
     if(!guildStr)
         return false;
-
     std::string gld = guildStr;
-
     Guild* targetGuild = objmgr.GetGuildByName (gld);
     if (!targetGuild)
         return false;
-
     targetGuild->Disband ();
-
     return true;
 }
-
 bool ChatHandler::HandleGetDistanceCommand(const char* args)
 {
     WorldObject* obj = NULL;
-
     if (*args)
     {
         uint64 guid = extractGuidFromLink((char*)args);
         if(guid)
             obj = (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*m_session->GetPlayer(),guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
-
         if(!obj)
         {
             SendSysMessage(LANG_PLAYER_NOT_FOUND);
@@ -4190,7 +3641,6 @@ bool ChatHandler::HandleGetDistanceCommand(const char* args)
     else
     {
         obj = getSelectedUnit();
-
         if(!obj)
         {
             SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
@@ -4198,29 +3648,23 @@ bool ChatHandler::HandleGetDistanceCommand(const char* args)
             return false;
         }
     }
-
     PSendSysMessage(LANG_DISTANCE, m_session->GetPlayer()->GetDistance(obj),m_session->GetPlayer()->GetDistance2d(obj));
-
     return true;
 }
-
 bool ChatHandler::HandleDieCommand(const char* /*args*/)
 {
     Unit* target = getSelectedUnit();
-
     if(!target || !m_session->GetPlayer()->GetSelection())
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if(target->GetTypeId()==TYPEID_PLAYER)
     {
         if(HasLowerSecurity((Player*)target,0,false))
             return false;
     }
-
     if( target->isAlive() )
     {
         if(sWorld.getConfig(CONFIG_DIE_COMMAND_MODE))
@@ -4228,39 +3672,29 @@ bool ChatHandler::HandleDieCommand(const char* /*args*/)
         else
             m_session->GetPlayer()->DealDamage(target, target->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleDamageCommand(const char * args)
 {
     if (!*args)
         return false;
-
     Unit* target = getSelectedUnit();
-
     if (!target || !m_session->GetPlayer()->GetSelection())
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if (!target->isAlive())
         return true;
-
     char* damageStr = strtok((char*)args, " ");
     if (!damageStr)
         return false;
-
     int32 damage_int = atoi((char*)damageStr);
     if(damage_int <=0)
         return true;
-
     uint32 damage = damage_int;
-
     char* schoolStr = strtok((char*)NULL, " ");
-
     // flat melee damage without resistence/etc reduction
     if (!schoolStr)
     {
@@ -4269,53 +3703,39 @@ bool ChatHandler::HandleDamageCommand(const char * args)
             m_session->GetPlayer()->SendAttackStateUpdate (HITINFO_NORMALSWING2, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_NORMAL, 0);
         return true;
     }
-
     uint32 school = schoolStr ? atoi((char*)schoolStr) : SPELL_SCHOOL_NORMAL;
     if(school >= MAX_SPELL_SCHOOL)
         return false;
-
     SpellSchoolMask schoolmask = SpellSchoolMask(1 << school);
-
     if ( schoolmask & SPELL_SCHOOL_MASK_NORMAL )
         damage = m_session->GetPlayer()->CalcArmorReducedDamage(target, damage, NULL, BASE_ATTACK);
-
     char* spellStr = strtok((char*)NULL, " ");
-
     // melee damage by specific school
     if (!spellStr)
     {
         uint32 absorb = 0;
         uint32 resist = 0;
-
         m_session->GetPlayer()->CalcAbsorbResist(target,schoolmask, SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
-
         if (damage <= absorb + resist)
             return true;
-
         damage -= absorb + resist;
-
         m_session->GetPlayer()->DealDamageMods(target,damage,&absorb);
         m_session->GetPlayer()->DealDamage(target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false);
         m_session->GetPlayer()->SendAttackStateUpdate (HITINFO_NORMALSWING2, target, 1, schoolmask, damage, absorb, resist, VICTIMSTATE_NORMAL, 0);
         return true;
     }
-
     // non-melee damage
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spellid = extractSpellIdFromLink((char*)args);
     if (!spellid || !sSpellStore.LookupEntry(spellid))
         return false;
-
     m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage);
     return true;
 }
-
 bool ChatHandler::HandleModifyArenaCommand(const char * args)
 {
     if (!*args)
         return false;
-
     Player *target = getSelectedPlayer();
     if(!target)
     {
@@ -4323,23 +3743,17 @@ bool ChatHandler::HandleModifyArenaCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     int32 amount = (uint32)atoi(args);
-
     target->ModifyArenaPoints(amount);
-
     PSendSysMessage(LANG_COMMAND_MODIFY_ARENA, GetNameLink(target).c_str(), target->GetArenaPoints());
-
     return true;
 }
-
 bool ChatHandler::HandleReviveCommand(const char* args)
 {
     Player* target;
     uint64 target_guid;
     if(!extractPlayerTarget((char*)args,&target,&target_guid))
         return false;
-
     if (target)
     {
         target->ResurrectPlayer(0.5f);
@@ -4349,10 +3763,8 @@ bool ChatHandler::HandleReviveCommand(const char* args)
     else
         // will resurrected at login without corpse
         ObjectAccessor::Instance().ConvertCorpseForPlayer(target_guid);
-
     return true;
 }
-
 bool ChatHandler::HandleAuraCommand(const char* args)
 {
     Unit *target = getSelectedUnit();
@@ -4362,10 +3774,8 @@ bool ChatHandler::HandleAuraCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spellID = extractSpellIdFromLink((char*)args);
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellID );
     uint8 eff_mask=0;
     if(spellInfo)
@@ -4385,10 +3795,8 @@ bool ChatHandler::HandleAuraCommand(const char* args)
         Aura *Aur = new Aura(spellInfo, eff_mask, target, target, target);
         target->AddAura(Aur);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleUnAuraCommand(const char* args)
 {
     Unit *target = getSelectedUnit();
@@ -4398,39 +3806,29 @@ bool ChatHandler::HandleUnAuraCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     std::string argstr = args;
     if (argstr == "all")
     {
         target->RemoveAllAuras();
         return true;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spellID = extractSpellIdFromLink((char*)args);
     if(!spellID)
         return false;
-
     target->RemoveAurasDueToSpell(spellID);
-
     return true;
 }
-
 bool ChatHandler::HandleLinkGraveCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* px = strtok((char*)args, " ");
     if (!px)
         return false;
-
     uint32 g_id = (uint32)atoi(px);
-
     uint32 g_team;
-
     char* px2 = strtok(NULL, " ");
-
     if (!px2)
         g_team = 0;
     else if (strncmp(px2,"horde",6)==0)
@@ -4439,20 +3837,15 @@ bool ChatHandler::HandleLinkGraveCommand(const char* args)
         g_team = ALLIANCE;
     else
         return false;
-
     WorldSafeLocsEntry const* graveyard =  sWorldSafeLocsStore.LookupEntry(g_id);
-
     if(!graveyard )
     {
         PSendSysMessage(LANG_COMMAND_GRAVEYARDNOEXIST, g_id);
         SetSentErrorMessage(true);
         return false;
     }
-
     Player* player = m_session->GetPlayer();
-
     uint32 zoneId = player->GetZoneId();
-
     AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId);
     if(!areaEntry || areaEntry->zone !=0 )
     {
@@ -4460,21 +3853,16 @@ bool ChatHandler::HandleLinkGraveCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if(objmgr.AddGraveYardLink(g_id,zoneId,g_team))
         PSendSysMessage(LANG_COMMAND_GRAVEYARDLINKED, g_id,zoneId);
     else
         PSendSysMessage(LANG_COMMAND_GRAVEYARDALRLINKED, g_id,zoneId);
-
     return true;
 }
-
 bool ChatHandler::HandleNearGraveCommand(const char* args)
 {
     uint32 g_team;
-
     size_t argslen = strlen(args);
-
     if(!*args)
         g_team = 0;
     else if (strncmp((char*)args,"horde",argslen)==0)
@@ -4483,17 +3871,13 @@ bool ChatHandler::HandleNearGraveCommand(const char* args)
         g_team = ALLIANCE;
     else
         return false;
-
     Player* player = m_session->GetPlayer();
     uint32 zone_id = player->GetZoneId();
-
     WorldSafeLocsEntry const* graveyard = objmgr.GetClosestGraveYard(
         player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(),player->GetMapId(),g_team);
-
     if(graveyard)
     {
         uint32 g_id = graveyard->ID;
-
         GraveYardData const* data = objmgr.FindGraveYardData(g_id,zone_id);
         if (!data)
         {
@@ -4501,40 +3885,32 @@ bool ChatHandler::HandleNearGraveCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         g_team = data->team;
-
         std::string team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_NOTEAM);
-
         if(g_team == 0)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY);
         else if(g_team == HORDE)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE);
         else if(g_team == ALLIANCE)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
-
         PSendSysMessage(LANG_COMMAND_GRAVEYARDNEAREST, g_id,team_name.c_str(),zone_id);
     }
     else
     {
         std::string team_name;
-
         if(g_team == 0)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ANY);
         else if(g_team == HORDE)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_HORDE);
         else if(g_team == ALLIANCE)
             team_name = GetTrinityString(LANG_COMMAND_GRAVEYARD_ALLIANCE);
-
         if(g_team == ~uint32(0))
             PSendSysMessage(LANG_COMMAND_ZONENOGRAVEYARDS, zone_id);
         else
             PSendSysMessage(LANG_COMMAND_ZONENOGRAFACTION, zone_id,team_name.c_str());
     }
-
     return true;
 }
-
 //-----------------------Npc Commands-----------------------
 bool ChatHandler::HandleNpcAllowMovementCommand(const char* /*args*/)
 {
@@ -4550,16 +3926,13 @@ bool ChatHandler::HandleNpcAllowMovementCommand(const char* /*args*/)
     }
     return true;
 }
-
 bool ChatHandler::HandleNpcChangeEntryCommand(const char *args)
 {
     if (!*args)
         return false;
-
     uint32 newEntryNum = atoi(args);
     if(!newEntryNum)
         return false;
-
     Unit* unit = getSelectedUnit();
     if(!unit || unit->GetTypeId() != TYPEID_UNIT)
     {
@@ -4574,31 +3947,26 @@ bool ChatHandler::HandleNpcChangeEntryCommand(const char *args)
         SendSysMessage(LANG_ERROR);
     return true;
 }
-
 bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
 {
     Creature* target = getSelectedCreature();
-
     if(!target)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 faction = target->getFaction();
     uint32 npcflags = target->GetUInt32Value(UNIT_NPC_FLAGS);
     uint32 displayid = target->GetDisplayId();
     uint32 nativeid = target->GetNativeDisplayId();
     uint32 Entry = target->GetEntry();
     CreatureInfo const* cInfo = target->GetCreatureInfo();
-
     int32 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
     if(curRespawnDelay < 0)
         curRespawnDelay = 0;
     std::string curRespawnDelayStr = secsToTimeString(curRespawnDelay,true);
     std::string defRespawnDelayStr = secsToTimeString(target->GetRespawnDelay(),true);
-
     PSendSysMessage(LANG_NPCINFO_CHAR,  target->GetDBTableGUIDLow(), faction, npcflags, Entry, displayid, nativeid);
     PSendSysMessage(LANG_NPCINFO_LEVEL, target->getLevel());
     PSendSysMessage(LANG_NPCINFO_HEALTH,target->GetCreateHealth(), target->GetMaxHealth(), target->GetHealth());
@@ -4610,7 +3978,6 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
     if(const CreatureData* const linked = target->GetLinkedRespawnCreatureData())
         if(CreatureInfo const *master = GetCreatureInfo(linked->id))
             PSendSysMessage(LANG_NPCINFO_LINKGUID, objmgr.GetLinkedRespawnGuid(target->GetDBTableGUIDLow()), linked->id, master->Name);
-
     if ((npcflags & UNIT_NPC_FLAG_VENDOR) )
     {
         SendSysMessage(LANG_NPCINFO_VENDOR);
@@ -4619,15 +3986,12 @@ bool ChatHandler::HandleNpcInfoCommand(const char* /*args*/)
     {
         SendSysMessage(LANG_NPCINFO_TRAINER);
     }
-
     return true;
 }
-
 //play npc emote
 bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args)
 {
     uint32 emote = atoi((char*)args);
-
     Creature* target = getSelectedCreature();
     if(!target)
     {
@@ -4635,47 +3999,35 @@ bool ChatHandler::HandleNpcPlayEmoteCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     target->SetUInt32Value(UNIT_NPC_EMOTESTATE,emote);
-
     return true;
 }
-
 //TODO: NpcCommands that needs to be fixed :
-
 bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/)
 {
     /*if (!*args)
     return false;
-
     uint64 guid = m_session->GetPlayer()->GetSelection();
     if (guid == 0)
     {
         SendSysMessage(LANG_NO_SELECTION);
         return true;
     }
-
     Creature *pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(), guid);
-
     if(!pCreature)
     {
         SendSysMessage(LANG_SELECT_CREATURE);
         return true;
     }
-
     char* pSlotID = strtok((char*)args, " ");
     if (!pSlotID)
         return false;
-
     char* pItemID = strtok(NULL, " ");
     if (!pItemID)
         return false;
-
     uint32 ItemID = atoi(pItemID);
     uint32 SlotID = atoi(pSlotID);
-
     ItemPrototype* tmpItem = objmgr.GetItemPrototype(ItemID);
-
     bool added = false;
     if(tmpItem)
     {
@@ -4698,7 +4050,6 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/)
                 added = false;
                 break;
         }
-
         if(added)
             PSendSysMessage(LANG_ITEM_ADDED_TO_SLOT,ItemID,tmpItem->Name1,SlotID);
     }
@@ -4711,14 +4062,11 @@ bool ChatHandler::HandleNpcAddWeaponCommand(const char* /*args*/)
     return true;
 }
 //----------------------------------------------------------
-
 bool ChatHandler::HandleExploreCheatCommand(const char* args)
 {
     if (!*args)
         return false;
-
     int flag = atoi((char*)args);
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -4726,7 +4074,6 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (flag != 0)
     {
         PSendSysMessage(LANG_YOU_SET_EXPLORE_ALL, GetNameLink(chr).c_str());
@@ -4739,7 +4086,6 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args)
         if (needReportToTarget(chr))
             ChatHandler(chr).PSendSysMessage(LANG_YOURS_EXPLORE_SET_NOTHING,GetNameLink().c_str());
     }
-
     for (uint8 i=0; i<128; ++i)
     {
         if (flag != 0)
@@ -4751,10 +4097,8 @@ bool ChatHandler::HandleExploreCheatCommand(const char* args)
             m_session->GetPlayer()->SetFlag(PLAYER_EXPLORED_ZONES_1+i,0);
         }
     }
-
     return true;
 }
-
 bool ChatHandler::HandleHoverCommand(const char* args)
 {
     char* px = strtok((char*)args, " ");
@@ -4763,17 +4107,13 @@ bool ChatHandler::HandleHoverCommand(const char* args)
         flag = 1;
     else
         flag = atoi(px);
-
     m_session->GetPlayer()->SetHover(flag);
-
     if (flag)
         SendSysMessage(LANG_HOVER_ENABLED);
     else
         SendSysMessage(LANG_HOVER_DISABLED);
-
     return true;
 }
-
 void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint32 oldlevel, uint32 newlevel)
 {
     if(player)
@@ -4781,7 +4121,6 @@ void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint3
         player->GiveLevel(newlevel);
         player->InitTalentForLevel();
         player->SetUInt32Value(PLAYER_XP,0);
-
         if(needReportToTarget(player))
         {
             if(oldlevel == newlevel)
@@ -4798,7 +4137,6 @@ void ChatHandler::HandleCharacterLevel(Player* player, uint64 player_guid, uint3
         CharacterDatabase.PExecute("UPDATE characters SET level = '%u', xp = 0 WHERE guid = '%u'", newlevel, GUID_LOPART(player_guid));
     }
 }
-
 bool ChatHandler::HandleCharacterLevelCommand(const char* args)
 {
     char* nameStr;
@@ -4806,85 +4144,66 @@ bool ChatHandler::HandleCharacterLevelCommand(const char* args)
     extractOptFirstArg((char*)args,&nameStr,&levelStr);
     if(!levelStr)
         return false;
-
     // exception opt second arg: .character level $name
     if(isalpha(levelStr[0]))
     {
         nameStr = levelStr;
         levelStr = NULL;                                    // current level will used
     }
-
     Player* target;
     uint64 target_guid;
     std::string target_name;
     if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
         return false;
-
     int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid);
     int32 newlevel = levelStr ? atoi(levelStr) : oldlevel;
-
     if(newlevel < 1)
         return false;                                       // invalid level
-
     if(newlevel > STRONG_MAX_LEVEL)                         // hardcoded maximum level
         newlevel = STRONG_MAX_LEVEL;
-
     HandleCharacterLevel(target,target_guid,oldlevel,newlevel);
-
     if(!m_session || m_session->GetPlayer() != target)      // including player==NULL
     {
         std::string nameLink = playerLink(target_name);
         PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleLevelUpCommand(const char* args)
 {
     char* nameStr;
     char* levelStr;
     extractOptFirstArg((char*)args,&nameStr,&levelStr);
-
     // exception opt second arg: .character level $name
     if(levelStr && isalpha(levelStr[0]))
     {
         nameStr = levelStr;
         levelStr = NULL;                                    // current level will used
     }
-
     Player* target;
     uint64 target_guid;
     std::string target_name;
     if(!extractPlayerTarget(nameStr,&target,&target_guid,&target_name))
         return false;
-
     int32 oldlevel = target ? target->getLevel() : Player::GetLevelFromDB(target_guid);
     int32 addlevel = levelStr ? atoi(levelStr) : 1;
     int32 newlevel = oldlevel + addlevel;
-
     if(newlevel < 1)
         newlevel = 1;
-
     if(newlevel > STRONG_MAX_LEVEL)                         // hardcoded maximum level
         newlevel = STRONG_MAX_LEVEL;
-
     HandleCharacterLevel(target,target_guid,oldlevel,newlevel);
-
     if(!m_session || m_session->GetPlayer() != target)      // including chr==NULL
     {
         std::string nameLink = playerLink(target_name);
         PSendSysMessage(LANG_YOU_CHANGE_LVL,nameLink.c_str(),newlevel);
     }
-
     return true;
 }
-
 bool ChatHandler::HandleShowAreaCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -4892,30 +4211,24 @@ bool ChatHandler::HandleShowAreaCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     int area = GetAreaFlagByAreaID(atoi((char*)args));
     int offset = area / 32;
     uint32 val = (uint32)(1 << (area % 32));
-
     if(area<0 || offset >= 128)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 currFields = chr->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset);
     chr->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, (uint32)(currFields | val));
-
     SendSysMessage(LANG_EXPLORE_AREA);
     return true;
 }
-
 bool ChatHandler::HandleHideAreaCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *chr = getSelectedPlayer();
     if (chr == NULL)
     {
@@ -4923,37 +4236,29 @@ bool ChatHandler::HandleHideAreaCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     int area = GetAreaFlagByAreaID(atoi((char*)args));
     int offset = area / 32;
     uint32 val = (uint32)(1 << (area % 32));
-
     if(area<0 || offset >= 128)
     {
         SendSysMessage(LANG_BAD_VALUE);
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 currFields = chr->GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset);
     chr->SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, (uint32)(currFields ^ val));
-
     SendSysMessage(LANG_UNEXPLORE_AREA);
     return true;
 }
-
 bool ChatHandler::HandleBankCommand(const char* /*args*/)
 {
     m_session->SendShowBank( m_session->GetPlayer()->GetGUID() );
-
     return true;
 }
-
 bool ChatHandler::HandleChangeWeather(const char* args)
 {
     if(!*args)
         return false;
-
     //Weather is OFF
     if (!sWorld.getConfig(CONFIG_WEATHER))
     {
@@ -4961,22 +4266,16 @@ bool ChatHandler::HandleChangeWeather(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     //*Change the weather of a cell
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     uint32 type = (uint32)atoi(px);                         //0 to 3, 0: fine, 1: rain, 2: snow, 3: sand
     float grade = (float)atof(py);                          //0 to 1, sending -1 is instand good weather
-
     Player *player = m_session->GetPlayer();
     uint32 zoneid = player->GetZoneId();
-
     Weather* wth = sWorld.FindWeather(zoneid);
-
     if(!wth)
         wth = sWorld.AddWeather(zoneid);
     if(!wth)
@@ -4985,17 +4284,13 @@ bool ChatHandler::HandleChangeWeather(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     wth->SetWeather(WeatherType(type), grade);
-
     return true;
 }
-
 bool ChatHandler::HandleDebugSet32Bit(const char* args)
 {
     if(!*args)
         return false;
-
     WorldObject* target = getSelectedObject();
     if(!target)
     {
@@ -5003,45 +4298,34 @@ bool ChatHandler::HandleDebugSet32Bit(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     char* px = strtok((char*)args, " ");
     char* py = strtok(NULL, " ");
-
     if (!px || !py)
         return false;
-
     uint32 Opcode = (uint32)atoi(px);
     uint32 Value = (uint32)atoi(py);
     if (Value > 32)                                         //uint32 = 32 bits
         return false;
-
     sLog.outDebug(GetTrinityString(LANG_SET_32BIT), Opcode, Value);
-
     uint32 iValue = Value ? 1 << (Value - 1) : 0;
     target->SetUInt32Value( Opcode ,  iValue);
-
     PSendSysMessage(LANG_SET_32BIT_FIELD, Opcode, iValue);
     return true;
 }
-
 bool ChatHandler::HandleTeleAddCommand(const char * args)
 {
     if(!*args)
         return false;
-
     Player *player=m_session->GetPlayer();
     if (!player)
         return false;
-
     std::string name = args;
-
     if(objmgr.GetGameTele(name))
     {
         SendSysMessage(LANG_COMMAND_TP_ALREADYEXIST);
         SetSentErrorMessage(true);
         return false;
     }
-
     GameTele tele;
     tele.position_x  = player->GetPositionX();
     tele.position_y  = player->GetPositionY();
@@ -5049,7 +4333,6 @@ bool ChatHandler::HandleTeleAddCommand(const char * args)
     tele.orientation = player->GetOrientation();
     tele.mapId       = player->GetMapId();
     tele.name        = name;
-
     if(objmgr.AddGameTele(tele))
     {
         SendSysMessage(LANG_COMMAND_TP_ADDED);
@@ -5060,28 +4343,22 @@ bool ChatHandler::HandleTeleAddCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleTeleDelCommand(const char * args)
 {
     if(!*args)
         return false;
-
     std::string name = args;
-
     if(!objmgr.DeleteGameTele(name))
     {
         SendSysMessage(LANG_COMMAND_TELE_NOTFOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     SendSysMessage(LANG_COMMAND_TP_DELETED);
     return true;
 }
-
 bool ChatHandler::HandleListAurasCommand (const char * /*args*/)
 {
     Unit *unit = getSelectedUnit();
@@ -5091,23 +4368,18 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     char const* talentStr = GetTrinityString(LANG_TALENT);
     char const* passiveStr = GetTrinityString(LANG_PASSIVE);
-
     Unit::AuraMap const& uAuras = unit->GetAuras();
     PSendSysMessage(LANG_COMMAND_TARGET_LISTAURAS, uAuras.size());
     for (Unit::AuraMap::const_iterator itr = uAuras.begin(); itr != uAuras.end(); ++itr)
     {
         bool talent = GetTalentSpellCost(itr->second->GetId()) > 0;
-
         char const* name = itr->second->GetSpellProto()->SpellName[GetSessionDbcLocale()];
-
         if (m_session)
         {
             std::ostringstream ss_name;
             ss_name << "|cffffffff|Hspell:" << itr->second->GetId() << "|h[" << name << "]|h|r";
-
             PSendSysMessage(LANG_COMMAND_TARGET_AURADETAIL, itr->second->GetId(), itr->second->GetEffectMask(),
                 itr->second->GetAuraCharges(), itr->second->GetStackAmount(),itr->second->GetAuraSlot(),
                 itr->second->GetAuraDuration(), itr->second->GetAuraMaxDuration(),
@@ -5133,50 +4405,40 @@ bool ChatHandler::HandleListAurasCommand (const char * /*args*/)
         for (Unit::AuraEffectList::const_iterator itr = uAuraList.begin(); itr != uAuraList.end(); ++itr)
         {
             bool talent = GetTalentSpellCost((*itr)->GetId()) > 0;
-
             char const* name = (*itr)->GetSpellProto()->SpellName[GetSessionDbcLocale()];
-
             std::ostringstream ss_name;
             ss_name << "|cffffffff|Hspell:" << (*itr)->GetId() << "|h[" << name << "]|h|r";
-
             PSendSysMessage(LANG_COMMAND_TARGET_AURASIMPLE, (*itr)->GetId(), (*itr)->GetEffIndex(),
                 (*itr)->GetAmount());
         }
     }
     return true;
 }
-
 bool ChatHandler::HandleResetAchievementsCommand (const char * args)
 {
     Player* target;
     uint64 target_guid;
     if (!extractPlayerTarget((char*)args,&target,&target_guid))
         return false;
-
     if(target)
         target->GetAchievementMgr().Reset();
     else
         AchievementMgr::DeleteFromDB(GUID_LOPART(target_guid));
-
     return true;
 }
-
 bool ChatHandler::HandleResetHonorCommand (const char * args)
 {
     Player* target;
     if (!extractPlayerTarget((char*)args,&target))
         return false;
-
     target->SetUInt32Value(PLAYER_FIELD_KILLS, 0);
     target->SetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0);
     target->SetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY, 0);
     target->SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0);
     target->SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0);
     target->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EARN_HONORABLE_KILL);
-
     return true;
 }
-
 static bool HandleResetStatsOrLevelHelper(Player* player)
 {
     ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(player->getClass());
@@ -5185,52 +4447,37 @@ static bool HandleResetStatsOrLevelHelper(Player* player)
         sLog.outError("Class %u not found in DBC (Wrong DBC files?)",player->getClass());
         return false;
     }
-
     uint8 powertype = cEntry->powerType;
-
     // reset m_form if no aura
     if(!player->HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
         player->m_form = FORM_NONE;
-
     player->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE );
     player->SetFloatValue(UNIT_FIELD_COMBATREACH, DEFAULT_COMBAT_REACH );
-
     player->setFactionForRace(player->getRace());
-
     player->SetUInt32Value(UNIT_FIELD_BYTES_0, ( ( player->getRace() ) | ( player->getClass() << 8 ) | ( player->getGender() << 16 ) | ( powertype << 24 ) ) );
-
     // reset only if player not in some form;
     if(player->m_form==FORM_NONE)
         player->InitDisplayIds();
-
     player->SetByteValue(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP );
     player->SetByteValue(UNIT_FIELD_BYTES_2, 3, player->m_form);
-
     player->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
-
     //-1 is default value
     player->SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1));
-
     //player->SetUInt32Value(PLAYER_FIELD_BYTES, 0xEEE00000 );
     return true;
 }
-
 bool ChatHandler::HandleResetLevelCommand(const char * args)
 {
     Player* target;
     if(!extractPlayerTarget((char*)args,&target))
         return false;
-
     if(!HandleResetStatsOrLevelHelper(target))
         return false;
-
     // set starting level
     uint32 start_level = target->getClass() != CLASS_DEATH_KNIGHT
         ? sWorld.getConfig(CONFIG_START_PLAYER_LEVEL)
         : sWorld.getConfig(CONFIG_START_HEROIC_PLAYER_LEVEL);
-
     target->_ApplyAllLevelScaleItemMods(false);
-
     target->SetLevel(start_level);
     target->InitRunes();
     target->InitStatsForLevel(true);
@@ -5238,34 +4485,26 @@ bool ChatHandler::HandleResetLevelCommand(const char * args)
     target->InitGlyphsForLevel();
     target->InitTalentForLevel();
     target->SetUInt32Value(PLAYER_XP,0);
-
     target->_ApplyAllLevelScaleItemMods(true);
-
     // reset level for pet
     if(Pet* pet = target->GetPet())
         pet->SynchronizeLevelWithOwner();
-
     return true;
 }
-
 bool ChatHandler::HandleResetStatsCommand(const char * args)
 {
     Player* target;
     if (!extractPlayerTarget((char*)args,&target))
         return false;
-
     if (!HandleResetStatsOrLevelHelper(target))
         return false;
-
     target->InitRunes();
     target->InitStatsForLevel(true);
     target->InitTaxiNodesForLevel();
     target->InitGlyphsForLevel();
     target->InitTalentForLevel();
-
     return true;
 }
-
 bool ChatHandler::HandleResetSpellsCommand(const char * args)
 {
     Player* target;
@@ -5273,11 +4512,9 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args)
     std::string target_name;
     if(!extractPlayerTarget((char*)args,&target,&target_guid,&target_name))
         return false;
-
     if(target)
     {
         target->resetSpells(/* bool myClassOnly */);
-
         ChatHandler(target).SendSysMessage(LANG_RESET_SPELLS);
         if(!m_session || m_session->GetPlayer() != target)
             PSendSysMessage(LANG_RESET_SPELLS_ONLINE,GetNameLink(target).c_str());
@@ -5287,10 +4524,8 @@ bool ChatHandler::HandleResetSpellsCommand(const char * args)
         CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid = '%u'",uint32(AT_LOGIN_RESET_SPELLS), GUID_LOPART(target_guid));
         PSendSysMessage(LANG_RESET_SPELLS_OFFLINE,target_name.c_str());
     }
-
     return true;
 }
-
 bool ChatHandler::HandleResetTalentsCommand(const char * args)
 {
     Player* target;
@@ -5307,19 +4542,16 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args)
             {
                 ((Pet *)creature)->resetTalents(true);
                 ((Player*)owner)->SendTalentsInfoData(true);
-
                 ChatHandler((Player*)owner).SendSysMessage(LANG_RESET_PET_TALENTS);
                 if(!m_session || m_session->GetPlayer()!=((Player*)owner))
                     PSendSysMessage(LANG_RESET_PET_TALENTS_ONLINE,GetNameLink((Player*)owner).c_str());
             }
             return true;
         }
-
         SendSysMessage(LANG_NO_CHAR_SELECTED);
         SetSentErrorMessage(true);
         return false;
     }
-
     if (target)
     {
         target->resetTalents(true);
@@ -5327,7 +4559,6 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args)
         ChatHandler(target).SendSysMessage(LANG_RESET_TALENTS);
         if (!m_session || m_session->GetPlayer()!=target)
             PSendSysMessage(LANG_RESET_TALENTS_ONLINE,GetNameLink(target).c_str());
-
         Pet* pet = target->GetPet();
         Pet::resetTalentsForAllPetsOf(target,pet);
         if(pet)
@@ -5342,21 +4573,16 @@ bool ChatHandler::HandleResetTalentsCommand(const char * args)
         PSendSysMessage(LANG_RESET_TALENTS_OFFLINE,nameLink.c_str());
         return true;
     }
-
     SendSysMessage(LANG_NO_CHAR_SELECTED);
     SetSentErrorMessage(true);
     return false;
 }
-
 bool ChatHandler::HandleResetAllCommand(const char * args)
 {
     if(!*args)
         return false;
-
     std::string casename = args;
-
     AtLoginFlags atLogin;
-
     // Command specially created as single command to prevent using short case names
     if(casename=="spells")
     {
@@ -5378,161 +4604,125 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
         SetSentErrorMessage(true);
         return false;
     }
-
     CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin);
     HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
         itr->second->SetAtLoginFlag(atLogin);
-
     return true;
 }
-
 bool ChatHandler::HandleServerShutDownCancelCommand(const char* /*args*/)
 {
     sWorld.ShutdownCancel();
     return true;
 }
-
 bool ChatHandler::HandleServerShutDownCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* time_str = strtok ((char*) args, " ");
     char* exitcode_str = strtok (NULL, "");
-
     int32 time = atoi (time_str);
-
     ///- Prevent interpret wrong arg value as 0 secs shutdown time
     if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0)
         return false;
-
     if (exitcode_str)
     {
         int32 exitcode = atoi (exitcode_str);
-
         // Handle atoi() errors
         if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0'))
             return false;
-
         // Exit code should be in range of 0-125, 126-255 is used
         // in many shells for their own return codes and code > 255
         // is not supported in many others
         if (exitcode < 0 || exitcode > 125)
             return false;
-
         sWorld.ShutdownServ (time, 0, exitcode);
     }
     else
         sWorld.ShutdownServ(time,0,SHUTDOWN_EXIT_CODE);
     return true;
 }
-
 bool ChatHandler::HandleServerRestartCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* time_str = strtok ((char*) args, " ");
     char* exitcode_str = strtok (NULL, "");
-
     int32 time = atoi (time_str);
-
     ///- Prevent interpret wrong arg value as 0 secs shutdown time
     if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0))
         return false;
-
     if (exitcode_str)
     {
         int32 exitcode = atoi (exitcode_str);
-
         // Handle atoi() errors
         if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0'))
             return false;
-
         // Exit code should be in range of 0-125, 126-255 is used
         // in many shells for their own return codes and code > 255
         // is not supported in many others
         if (exitcode < 0 || exitcode > 125)
             return false;
-
         sWorld.ShutdownServ (time, SHUTDOWN_MASK_RESTART, exitcode);
     }
     else
         sWorld.ShutdownServ(time, SHUTDOWN_MASK_RESTART, RESTART_EXIT_CODE);
     return true;
 }
-
 bool ChatHandler::HandleServerIdleRestartCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* time_str = strtok ((char*) args, " ");
     char* exitcode_str = strtok (NULL, "");
-
     int32 time = atoi (time_str);
-
     ///- Prevent interpret wrong arg value as 0 secs shutdown time
     if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0))
         return false;
-
     if (exitcode_str)
     {
         int32 exitcode = atoi (exitcode_str);
-
         // Handle atoi() errors
         if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0'))
             return false;
-
         // Exit code should be in range of 0-125, 126-255 is used
         // in many shells for their own return codes and code > 255
         // is not supported in many others
         if (exitcode < 0 || exitcode > 125)
             return false;
-
         sWorld.ShutdownServ (time, SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE, exitcode);
     }
     else
         sWorld.ShutdownServ(time,SHUTDOWN_MASK_RESTART|SHUTDOWN_MASK_IDLE,RESTART_EXIT_CODE);
     return true;
 }
-
 bool ChatHandler::HandleServerIdleShutDownCommand(const char* args)
 {
     if(!*args)
         return false;
-
     char* time_str = strtok ((char*) args, " ");
     char* exitcode_str = strtok (NULL, "");
-
     int32 time = atoi (time_str);
-
     ///- Prevent interpret wrong arg value as 0 secs shutdown time
     if(time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0)
         return false;
-
     if (exitcode_str)
     {
         int32 exitcode = atoi (exitcode_str);
-
         // Handle atoi() errors
         if (exitcode == 0 && (exitcode_str[0] != '0' || exitcode_str[1] != '\0'))
             return false;
-
         // Exit code should be in range of 0-125, 126-255 is used
         // in many shells for their own return codes and code > 255
         // is not supported in many others
         if (exitcode < 0 || exitcode > 125)
             return false;
-
         sWorld.ShutdownServ (time, SHUTDOWN_MASK_IDLE, exitcode);
     }
     else
         sWorld.ShutdownServ(time,SHUTDOWN_MASK_IDLE,SHUTDOWN_EXIT_CODE);
     return true;
 }
-
 bool ChatHandler::HandleQuestAdd(const char* args)
 {
     Player* player = getSelectedPlayer();
@@ -5542,31 +4732,25 @@ bool ChatHandler::HandleQuestAdd(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // .addquest #entry'
     // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hquest");
     if(!cId)
         return false;
-
     uint32 entry = atol(cId);
-
     Quest const* pQuest = objmgr.GetQuestTemplate(entry);
-
     if(!pQuest)
     {
         PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND,entry);
         SetSentErrorMessage(true);
         return false;
     }
-
     // check item starting quest (it can work incorrectly if added without item in inventory)
     for (uint32 id = 0; id < sItemStorage.MaxEntry; id++)
     {
         ItemPrototype const *pProto = sItemStorage.LookupEntry<ItemPrototype>(id);
         if (!pProto)
             continue;
-
         if (pProto->StartQuest == entry)
         {
             PSendSysMessage(LANG_COMMAND_QUEST_STARTFROMITEM, entry, pProto->ItemId);
@@ -5574,19 +4758,15 @@ bool ChatHandler::HandleQuestAdd(const char* args)
             return false;
         }
     }
-
     // ok, normal (creature/GO starting) quest
     if( player->CanAddQuest( pQuest, true ) )
     {
         player->AddQuest( pQuest, NULL );
-
         if ( player->CanCompleteQuest( entry ) )
             player->CompleteQuest( entry );
     }
-
     return true;
 }
-
 bool ChatHandler::HandleQuestRemove(const char* args)
 {
     Player* player = getSelectedPlayer();
@@ -5596,24 +4776,19 @@ bool ChatHandler::HandleQuestRemove(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // .removequest #entry'
     // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hquest");
     if(!cId)
         return false;
-
     uint32 entry = atol(cId);
-
     Quest const* pQuest = objmgr.GetQuestTemplate(entry);
-
     if(!pQuest)
     {
         PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry);
         SetSentErrorMessage(true);
         return false;
     }
-
     // remove all quest entries for 'entry' from quest log
     for(uint8 slot = 0; slot < MAX_QUEST_LOG_SIZE; ++slot )
     {
@@ -5621,22 +4796,17 @@ bool ChatHandler::HandleQuestRemove(const char* args)
         if(quest==entry)
         {
             player->SetQuestSlot(slot,0);
-
             // we ignore unequippable quest items in this case, its' still be equipped
             player->TakeQuestSourceItem( quest, false );
         }
     }
-
     // set quest status to not started (will updated in DB at next save)
     player->SetQuestStatus( entry, QUEST_STATUS_NONE);
-
     // reset rewarded for restart repeatable quest
     player->getQuestStatusMap()[entry].m_rewarded = false;
-
     SendSysMessage(LANG_COMMAND_QUEST_REMOVED);
     return true;
 }
-
 bool ChatHandler::HandleQuestComplete(const char* args)
 {
     Player* player = getSelectedPlayer();
@@ -5646,17 +4816,13 @@ bool ChatHandler::HandleQuestComplete(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // .quest complete #entry
     // number or [name] Shift-click form |color|Hquest:quest_id:quest_level|h[name]|h|r
     char* cId = extractKeyFromLink((char*)args,"Hquest");
     if(!cId)
         return false;
-
     uint32 entry = atol(cId);
-
     Quest const* pQuest = objmgr.GetQuestTemplate(entry);
-
     // If player doesn't have the quest
     if(!pQuest || player->GetQuestStatus(entry) == QUEST_STATUS_NONE)
     {
@@ -5664,7 +4830,6 @@ bool ChatHandler::HandleQuestComplete(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // Add quest items for quests that require items
     for(uint8 x = 0; x < QUEST_OBJECTIVES_COUNT; ++x)
     {
@@ -5672,9 +4837,7 @@ bool ChatHandler::HandleQuestComplete(const char* args)
         uint32 count = pQuest->ReqItemCount[x];
         if(!id || !count)
             continue;
-
         uint32 curItemCount = player->GetItemCount(id,true);
-
         ItemPosCountVec dest;
         uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, id, count-curItemCount );
         if( msg == EQUIP_ERR_OK )
@@ -5683,13 +4846,11 @@ bool ChatHandler::HandleQuestComplete(const char* args)
             player->SendNewItem(item,count-curItemCount,true,false);
         }
     }
-
     // All creature/GO slain/casted (not required, but otherwise it will display "Creature slain 0/10")
     for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
     {
         uint32 creature = pQuest->ReqCreatureOrGOId[i];
         uint32 creaturecount = pQuest->ReqCreatureOrGOCount[i];
-
         if(uint32 spell_id = pQuest->ReqSpell[i])
         {
             for(uint16 z = 0; z < creaturecount; ++z)
@@ -5707,7 +4868,6 @@ bool ChatHandler::HandleQuestComplete(const char* args)
                 player->CastedCreatureOrGO(creature,0,0);
         }
     }
-
     // If the quest requires reputation to complete
     if(uint32 repFaction = pQuest->GetRepObjectiveFaction())
     {
@@ -5717,50 +4877,39 @@ bool ChatHandler::HandleQuestComplete(const char* args)
             if(FactionEntry const *factionEntry = sFactionStore.LookupEntry(repFaction))
                 player->GetReputationMgr().SetReputation(factionEntry,repValue);
     }
-
     // If the quest requires money
     int32 ReqOrRewMoney = pQuest->GetRewOrReqMoney();
     if(ReqOrRewMoney < 0)
         player->ModifyMoney(-ReqOrRewMoney);
-
     player->CompleteQuest(entry);
     return true;
 }
-
 bool ChatHandler::HandleBanAccountCommand(const char* args)
 {
     return HandleBanHelper(BAN_ACCOUNT,args);
 }
-
 bool ChatHandler::HandleBanCharacterCommand(const char* args)
 {
     return HandleBanHelper(BAN_CHARACTER,args);
 }
-
 bool ChatHandler::HandleBanIPCommand(const char* args)
 {
     return HandleBanHelper(BAN_IP,args);
 }
-
 bool ChatHandler::HandleBanHelper(BanMode mode, const char* args)
 {
     if (!*args)
         return false;
-
     char* cnameOrIP = strtok ((char*)args, " ");
     if (!cnameOrIP)
         return false;
-
     std::string nameOrIP = cnameOrIP;
-
     char* duration = strtok (NULL," ");
     if(!duration || !atoi(duration))
         return false;
-
     char* reason = strtok (NULL,"");
     if(!reason)
         return false;
-
     switch(mode)
     {
         case BAN_ACCOUNT:
@@ -5784,7 +4933,6 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char* args)
                 return false;
             break;
     }
-
     switch(sWorld.BanAccount(mode, nameOrIP, duration, reason,m_session ? m_session->GetPlayerName() : ""))
     {
         case BAN_SUCCESS:
@@ -5811,36 +4959,28 @@ bool ChatHandler::HandleBanHelper(BanMode mode, const char* args)
             SetSentErrorMessage(true);
             return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleUnBanAccountCommand(const char* args)
 {
     return HandleUnBanHelper(BAN_ACCOUNT,args);
 }
-
 bool ChatHandler::HandleUnBanCharacterCommand(const char* args)
 {
     return HandleUnBanHelper(BAN_CHARACTER,args);
 }
-
 bool ChatHandler::HandleUnBanIPCommand(const char* args)
 {
     return HandleUnBanHelper(BAN_IP,args);
 }
-
 bool ChatHandler::HandleUnBanHelper(BanMode mode, const char* args)
 {
     if (!*args)
         return false;
-
     char* cnameOrIP = strtok ((char*)args, " ");
     if(!cnameOrIP)
         return false;
-
     std::string nameOrIP = cnameOrIP;
-
     switch(mode)
     {
         case BAN_ACCOUNT:
@@ -5864,24 +5004,19 @@ bool ChatHandler::HandleUnBanHelper(BanMode mode, const char* args)
                 return false;
             break;
     }
-
     if(sWorld.RemoveBanAccount(mode,nameOrIP))
         PSendSysMessage(LANG_UNBAN_UNBANNED,nameOrIP.c_str());
     else
         PSendSysMessage(LANG_UNBAN_ERROR,nameOrIP.c_str());
-
     return true;
 }
-
 bool ChatHandler::HandleBanInfoAccountCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* cname = strtok((char*)args, "");
     if(!cname)
         return false;
-
     std::string account_name = cname;
     if(!AccountMgr::normalizeString(account_name))
     {
@@ -5889,36 +5024,29 @@ bool ChatHandler::HandleBanInfoAccountCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 accountid = accmgr.GetId(account_name);
     if(!accountid)
     {
         PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
         return true;
     }
-
     return HandleBanInfoHelper(accountid,account_name.c_str());
 }
-
 bool ChatHandler::HandleBanInfoCharacterCommand(const char* args)
 {
     Player* target;
     uint64 target_guid;
     if(!extractPlayerTarget((char*)args,&target,&target_guid))
         return false;
-
     uint32 accountid = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
-
     std::string accountname;
     if(!accmgr.GetName(accountid,accountname))
     {
         PSendSysMessage(LANG_BANINFO_NOCHARACTER);
         return true;
     }
-
     return HandleBanInfoHelper(accountid,accountname.c_str());
 }
-
 bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname)
 {
     QueryResult *result = loginDatabase.PQuery("SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate,banreason,bannedby FROM account_banned WHERE id = '%u' ORDER BY bandate ASC",accountid);
@@ -5927,12 +5055,10 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname)
         PSendSysMessage(LANG_BANINFO_NOACCOUNTBAN, accountname);
         return true;
     }
-
     PSendSysMessage(LANG_BANINFO_BANHISTORY,accountname);
     do
     {
         Field* fields = result->Fetch();
-
         time_t unbandate = time_t(fields[3].GetUInt64());
         bool active = false;
         if(fields[2].GetBool() && (fields[1].GetUInt64() == (uint64)0 ||unbandate >= time(NULL)) )
@@ -5942,25 +5068,19 @@ bool ChatHandler::HandleBanInfoHelper(uint32 accountid, char const* accountname)
         PSendSysMessage(LANG_BANINFO_HISTORYENTRY,
             fields[0].GetString(), bantime.c_str(), active ? GetTrinityString(LANG_BANINFO_YES):GetTrinityString(LANG_BANINFO_NO), fields[4].GetString(), fields[5].GetString());
     }while (result->NextRow());
-
     delete result;
     return true;
 }
-
 bool ChatHandler::HandleBanInfoIPCommand(const char* args)
 {
     if (!*args)
         return false;
-
     char* cIP = strtok ((char*)args, "");
     if(!cIP)
         return false;
-
     if (!IsIPAddress(cIP))
         return false;
-
     std::string IP = cIP;
-
     loginDatabase.escape_string(IP);
     QueryResult *result = loginDatabase.PQuery("SELECT ip, FROM_UNIXTIME(bandate), FROM_UNIXTIME(unbandate), unbandate-UNIX_TIMESTAMP(), banreason,bannedby,unbandate-bandate FROM ip_banned WHERE ip = '%s'",IP.c_str());
     if(!result)
@@ -5968,7 +5088,6 @@ bool ChatHandler::HandleBanInfoIPCommand(const char* args)
         PSendSysMessage(LANG_BANINFO_NOIP);
         return true;
     }
-
     Field *fields = result->Fetch();
     bool permanent = !fields[6].GetUInt64();
     PSendSysMessage(LANG_BANINFO_IPENTRY,
@@ -5977,15 +5096,12 @@ bool ChatHandler::HandleBanInfoIPCommand(const char* args)
     delete result;
     return true;
 }
-
 bool ChatHandler::HandleBanListCharacterCommand(const char* args)
 {
     loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-
     char* cFilter = strtok ((char*)args, " ");
     if(!cFilter)
         return false;
-
     std::string filter = cFilter;
     loginDatabase.escape_string(filter);
     QueryResult* result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'"),filter.c_str());
@@ -5994,20 +5110,15 @@ bool ChatHandler::HandleBanListCharacterCommand(const char* args)
         PSendSysMessage(LANG_BANLIST_NOCHARACTER);
         return true;
     }
-
     return HandleBanListHelper(result);
 }
-
 bool ChatHandler::HandleBanListAccountCommand(const char* args)
 {
     loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-
     char* cFilter = strtok((char*)args, " ");
     std::string filter = cFilter ? cFilter : "";
     loginDatabase.escape_string(filter);
-
     QueryResult* result;
-
     if(filter.empty())
     {
         result = loginDatabase.Query("SELECT account.id, username FROM account, account_banned"
@@ -6019,20 +5130,16 @@ bool ChatHandler::HandleBanListAccountCommand(const char* args)
             " WHERE account.id = account_banned.id AND active = 1 AND username "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")" GROUP BY account.id",
             filter.c_str());
     }
-
     if (!result)
     {
         PSendSysMessage(LANG_BANLIST_NOACCOUNT);
         return true;
     }
-
     return HandleBanListHelper(result);
 }
-
 bool ChatHandler::HandleBanListHelper(QueryResult* result)
 {
     PSendSysMessage(LANG_BANLIST_MATCHINGACCOUNT);
-
     // Chat short output
     if(m_session)
     {
@@ -6040,7 +5147,6 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
         {
             Field* fields = result->Fetch();
             uint32 accountid = fields[0].GetUInt32();
-
             QueryResult* banresult = loginDatabase.PQuery("SELECT account.username FROM account,account_banned WHERE account_banned.id='%u' AND account_banned.id=account.id",accountid);
             if(banresult)
             {
@@ -6061,16 +5167,13 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
             SendSysMessage("-------------------------------------------------------------------------------");
             Field *fields = result->Fetch();
             uint32 account_id = fields[0].GetUInt32 ();
-
             std::string account_name;
-
             // "account" case, name can be get in same query
             if(result->GetFieldCount() > 1)
                 account_name = fields[1].GetCppString();
             // "character" case, name need extract from another DB
             else
                 accmgr.GetName (account_id,account_name);
-
             // No SQL injection. id is uint32.
             QueryResult *banInfo = loginDatabase.PQuery("SELECT bandate,unbandate,bannedby,banreason FROM account_banned WHERE id = %u ORDER BY unbandate", account_id);
             if (banInfo)
@@ -6080,7 +5183,6 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
                 {
                     time_t t_ban = fields2[0].GetUInt64();
                     tm* aTm_ban = localtime(&t_ban);
-
                     if (fields2[0].GetUInt64() == fields2[1].GetUInt64())
                     {
                         PSendSysMessage("|%-15.15s|%02d-%02d-%02d %02d:%02d|   permanent  |%-15.15s|%-15.15s|",
@@ -6102,21 +5204,16 @@ bool ChatHandler::HandleBanListHelper(QueryResult* result)
         }while( result->NextRow() );
         SendSysMessage("===============================================================================");
     }
-
     delete result;
     return true;
 }
-
 bool ChatHandler::HandleBanListIPCommand(const char* args)
 {
     loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-
     char* cFilter = strtok((char*)args, " ");
     std::string filter = cFilter ? cFilter : "";
     loginDatabase.escape_string(filter);
-
     QueryResult* result;
-
     if(filter.empty())
     {
         result = loginDatabase.Query ("SELECT ip,bandate,unbandate,bannedby,banreason FROM ip_banned"
@@ -6129,13 +5226,11 @@ bool ChatHandler::HandleBanListIPCommand(const char* args)
             " WHERE (bandate=unbandate OR unbandate>UNIX_TIMESTAMP()) AND ip "_LIKE_" "_CONCAT3_("'%%'","'%s'","'%%'")
             " ORDER BY unbandate",filter.c_str() );
     }
-
     if(!result)
     {
         PSendSysMessage(LANG_BANLIST_NOIP);
         return true;
     }
-
     PSendSysMessage(LANG_BANLIST_MATCHINGIP);
     // Chat short output
     if(m_session)
@@ -6176,15 +5271,12 @@ bool ChatHandler::HandleBanListIPCommand(const char* args)
         }while( result->NextRow() );
         SendSysMessage("===============================================================================");
     }
-
     delete result;
     return true;
 }
-
 bool ChatHandler::HandleRespawnCommand(const char* /*args*/)
 {
     Player* pl = m_session->GetPlayer();
-
     // accept only explicitly selected target (not implicitly self targeting case)
     Unit* target = getSelectedUnit();
     if(pl->GetSelection() && target)
@@ -6195,36 +5287,28 @@ bool ChatHandler::HandleRespawnCommand(const char* /*args*/)
             SetSentErrorMessage(true);
             return false;
         }
-
         if(target->isDead())
             ((Creature*)target)->Respawn();
         return true;
     }
-
     CellPair p(Trinity::ComputeCellPair(pl->GetPositionX(), pl->GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::RespawnDo u_do;
     MaNGOS::WorldObjectWorker<MaNGOS::RespawnDo> worker(pl,u_do);
-
     TypeContainerVisitor<Trinity::WorldObjectWorker<Trinity::RespawnDo>, GridTypeMapContainer > obj_worker(worker);
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, obj_worker, *pl->GetMap());
-
     return true;
 }
-
 bool ChatHandler::HandleGMFlyCommand(const char* args)
 {
     if (!*args)
         return false;
-
     Player *target = getSelectedPlayer();
     if (!target)
         target = m_session->GetPlayer();
-
     WorldPacket data(12);
     if (strncmp(args, "on", 3) == 0)
         data.SetOpcode(SMSG_MOVE_SET_CAN_FLY);
@@ -6241,20 +5325,16 @@ bool ChatHandler::HandleGMFlyCommand(const char* args)
     PSendSysMessage(LANG_COMMAND_FLYMODE_STATUS, GetNameLink(target).c_str(), args);
     return true;
 }
-
 bool ChatHandler::HandlePDumpLoadCommand(const char *args)
 {
     if (!*args)
         return false;
-
     char * file = strtok((char*)args, " ");
     if(!file)
         return false;
-
     char * account = strtok(NULL, " ");
     if(!account)
         return false;
-
     std::string account_name = account;
     if(!AccountMgr::normalizeString(account_name))
     {
@@ -6262,7 +5342,6 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
         SetSentErrorMessage(true);
         return false;
     }
-
     uint32 account_id = accmgr.GetId(account_name);
     if(!account_id)
     {
@@ -6274,17 +5353,14 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
             return false;
         }
     }
-
     if(!accmgr.GetName(account_id,account_name))
     {
         PSendSysMessage(LANG_ACCOUNT_NOT_EXIST,account_name.c_str());
         SetSentErrorMessage(true);
         return false;
     }
-
     char* guid_str = NULL;
     char* name_str = strtok(NULL, " ");
-
     std::string name;
     if (name_str)
     {
@@ -6296,19 +5372,15 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         if (ObjectMgr::CheckPlayerName(name,true) != CHAR_NAME_SUCCESS)
         {
             PSendSysMessage(LANG_INVALID_CHARACTER_NAME);
             SetSentErrorMessage(true);
             return false;
         }
-
         guid_str = strtok(NULL, " ");
     }
-
     uint32 guid = 0;
-
     if (guid_str)
     {
         guid = atoi(guid_str);
@@ -6318,7 +5390,6 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         if (objmgr.GetPlayerAccountIdByGUID(guid))
         {
             PSendSysMessage(LANG_CHARACTER_GUID_IN_USE,guid);
@@ -6326,7 +5397,6 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
             return false;
         }
     }
-
     switch(PlayerDumpReader().LoadDump(file, account_id, name, guid))
     {
         case DUMP_SUCCESS:
@@ -6349,21 +5419,16 @@ bool ChatHandler::HandlePDumpLoadCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandlePDumpWriteCommand(const char *args)
 {
     if (!*args)
         return false;
-
     char* file = strtok((char*)args, " ");
     char* p2 = strtok(NULL, " ");
-
     if(!file || !p2)
         return false;
-
     uint32 guid;
     // character name can't start from number
     if (isNumeric(p2[0]))
@@ -6377,17 +5442,14 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
         }
-
         guid = objmgr.GetPlayerGUIDByName(name);
     }
-
     if(!objmgr.GetPlayerAccountIdByGUID(guid))
     {
         PSendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     switch(PlayerDumpWriter().WriteDump(file, guid))
     {
         case DUMP_SUCCESS:
@@ -6402,10 +5464,8 @@ bool ChatHandler::HandlePDumpWriteCommand(const char *args)
             SetSentErrorMessage(true);
             return false;
     }
-
     return true;
 }
-
 bool ChatHandler::HandleMovegensCommand(const char* /*args*/)
 {
     Unit* unit = getSelectedUnit();
@@ -6415,9 +5475,7 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     PSendSysMessage(LANG_MOVEGENS_LIST,(unit->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature" ),unit->GetGUIDLow());
-
     MotionMaster* mm = unit->GetMotionMaster();
     for(uint8 i = 0; i < MAX_MOTION_SLOT; ++i)
     {
@@ -6483,7 +5541,6 @@ bool ChatHandler::HandleMovegensCommand(const char* /*args*/)
     }
     return true;
 }
-
 bool ChatHandler::HandleServerPLimitCommand(const char *args)
 {
     if(*args)
@@ -6491,9 +5548,7 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args)
         char* param = strtok((char*)args, " ");
         if(!param)
             return false;
-
         int l = strlen(param);
-
         if(     strncmp(param,"player",l) == 0 )
             sWorld.SetPlayerLimit(-SEC_PLAYER);
         else if(strncmp(param,"moderator",l) == 0 )
@@ -6508,15 +5563,12 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args)
         {
             int val = atoi(param);
             if(val < -SEC_ADMINISTRATOR) val = -SEC_ADMINISTRATOR;
-
             sWorld.SetPlayerLimit(val);
         }
-
         // kick all low security level players
         if(sWorld.GetPlayerAmountLimit() > SEC_PLAYER)
             sWorld.KickAllLess(sWorld.GetPlayerSecurityLimit());
     }
-
     uint32 pLimit = sWorld.GetPlayerAmountLimit();
     AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit();
     char const* secName = "";
@@ -6528,42 +5580,33 @@ bool ChatHandler::HandleServerPLimitCommand(const char *args)
         case SEC_ADMINISTRATOR: secName = "Administrator"; break;
         default:                secName = "<unknown>";     break;
     }
-
     PSendSysMessage("Player limits: amount %u, min. security level %s.",pLimit,secName);
-
     return true;
 }
-
 bool ChatHandler::HandleCastCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Unit* target = getSelectedUnit();
-
     if(!target)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell)
         return false;
-
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
     if(!spellInfo)
         return false;
-
     if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
     {
         PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
         SetSentErrorMessage(true);
         return false;
     }
-
     char* trig_str = strtok(NULL, " ");
     if(trig_str)
     {
@@ -6571,31 +5614,24 @@ bool ChatHandler::HandleCastCommand(const char* args)
         if(strncmp(trig_str,"triggered",l) != 0 )
             return false;
     }
-
     bool triggered = (trig_str != NULL);
-
     m_session->GetPlayer()->CastSpell(target,spell,triggered);
-
     return true;
 }
-
 bool ChatHandler::HandleCastBackCommand(const char* args)
 {
     Creature* caster = getSelectedCreature();
-
     if(!caster)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell || !sSpellStore.LookupEntry(spell))
         return false;
-
     char* trig_str = strtok(NULL, " ");
     if(trig_str)
     {
@@ -6603,50 +5639,37 @@ bool ChatHandler::HandleCastBackCommand(const char* args)
         if(strncmp(trig_str,"triggered",l) != 0 )
             return false;
     }
-
     bool triggered = (trig_str != NULL);
-
     // update orientation at server
     caster->SetOrientation(caster->GetAngle(m_session->GetPlayer()));
-
     // and client
     WorldPacket data;
     caster->BuildHeartBeatMsg(&data);
     caster->SendMessageToSet(&data,true);
-
     caster->CastSpell(m_session->GetPlayer(),spell,triggered);
-
     return true;
 }
-
 bool ChatHandler::HandleCastDistCommand(const char* args)
 {
     if(!*args)
         return false;
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell)
         return false;
-
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
     if(!spellInfo)
         return false;
-
     if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
     {
         PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
         SetSentErrorMessage(true);
         return false;
     }
-
     char *distStr = strtok(NULL, " ");
-
     float dist = 0;
-
     if(distStr)
         sscanf(distStr, "%f", &dist);
-
     char* trig_str = strtok(NULL, " ");
     if(trig_str)
     {
@@ -6654,39 +5677,31 @@ bool ChatHandler::HandleCastDistCommand(const char* args)
         if(strncmp(trig_str,"triggered",l) != 0 )
             return false;
     }
-
     bool triggered = (trig_str != NULL);
-
     float x,y,z;
     m_session->GetPlayer()->GetClosePoint(x,y,z,dist);
-
     m_session->GetPlayer()->CastSpell(x,y,z,spell,triggered);
     return true;
 }
-
 bool ChatHandler::HandleCastTargetCommand(const char* args)
 {
     Creature* caster = getSelectedCreature();
-
     if(!caster)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     if(!caster->getVictim())
     {
         SendSysMessage(LANG_SELECTED_TARGET_NOT_HAVE_VICTIM);
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell || !sSpellStore.LookupEntry(spell))
         return false;
-
     char* trig_str = strtok(NULL, " ");
     if(trig_str)
     {
@@ -6694,22 +5709,16 @@ bool ChatHandler::HandleCastTargetCommand(const char* args)
         if(strncmp(trig_str,"triggered",l) != 0 )
             return false;
     }
-
     bool triggered = (trig_str != NULL);
-
     // update orientation at server
     caster->SetOrientation(caster->GetAngle(m_session->GetPlayer()));
-
     // and client
     WorldPacket data;
     caster->BuildHeartBeatMsg(&data);
     caster->SendMessageToSet(&data,true);
-
     caster->CastSpell(caster->getVictim(),spell,triggered);
-
     return true;
 }
-
 /*
 ComeToMe command REQUIRED for 3rd party scripting library to have access to PointMovementGenerator
 Without this function 3rd party scripting library will get linking errors (unresolved external)
@@ -6718,12 +5727,9 @@ when attempting to use the PointMovementGenerator
 bool ChatHandler::HandleComeToMeCommand(const char *args)
 {
     char* newFlagStr = strtok((char*)args, " ");
-
     if(!newFlagStr)
         return false;
-
     uint32 newFlags = (uint32)strtoul(newFlagStr, NULL, 0);
-
     Creature* caster = getSelectedCreature();
     if(!caster)
     {
@@ -6732,50 +5738,38 @@ bool ChatHandler::HandleComeToMeCommand(const char *args)
         SetSentErrorMessage(true);
         return false;
     }
-
     caster->SetUnitMovementFlags(newFlags);
-
     Player* pl = m_session->GetPlayer();
-
     caster->GetMotionMaster()->MovePoint(0, pl->GetPositionX(), pl->GetPositionY(), pl->GetPositionZ());
     return true;
 }
-
 bool ChatHandler::HandleCastSelfCommand(const char* args)
 {
     if(!*args)
         return false;
-
     Unit* target = getSelectedUnit();
-
     if(!target)
     {
         SendSysMessage(LANG_SELECT_CHAR_OR_CREATURE);
         SetSentErrorMessage(true);
         return false;
     }
-
     // number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
     uint32 spell = extractSpellIdFromLink((char*)args);
     if(!spell)
         return false;
-
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(spell);
     if(!spellInfo)
         return false;
-
     if(!SpellMgr::IsSpellValid(spellInfo,m_session->GetPlayer()))
     {
         PSendSysMessage(LANG_COMMAND_SPELL_BROKEN,spell);
         SetSentErrorMessage(true);
         return false;
     }
-
     target->CastSpell(target,spell,false);
-
     return true;
 }
-
 std::string GetTimeString(uint32 time)
 {
     uint16 days = time / DAY, hours = (time % DAY) / HOUR, minute = (time % HOUR) / MINUTE;
@@ -6785,7 +5779,6 @@ std::string GetTimeString(uint32 time)
     ss << minute << "m";
     return ss.str();
 }
-
 bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/)
 {
     Player* player = getSelectedPlayer();
@@ -6820,15 +5813,12 @@ bool ChatHandler::HandleInstanceListBindsCommand(const char* /*args*/)
         }
     }
     PSendSysMessage("group binds: %d", counter);
-
     return true;
 }
-
 bool ChatHandler::HandleInstanceUnbindCommand(const char* args)
 {
     if(!*args)
         return false;
-
     std::string cmd = args;
     if(cmd == "all")
     {
@@ -6856,7 +5846,6 @@ bool ChatHandler::HandleInstanceUnbindCommand(const char* args)
     }
     return true;
 }
-
 bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
 {
     PSendSysMessage("instances loaded: %d", MapManager::Instance().GetNumInstances());
@@ -6866,11 +5855,9 @@ bool ChatHandler::HandleInstanceStatsCommand(const char* /*args*/)
     PSendSysMessage("groups bound: %d", sInstanceSaveManager.GetNumBoundGroupsTotal());
     return true;
 }
-
 bool ChatHandler::HandleInstanceSaveDataCommand(const char * /*args*/)
 {
     Player* pl = m_session->GetPlayer();
-
     Map* map = pl->GetMap();
     if (!map->IsDungeon())
     {
@@ -6878,18 +5865,15 @@ bool ChatHandler::HandleInstanceSaveDataCommand(const char * /*args*/)
         SetSentErrorMessage(true);
         return false;
     }
-
     if (!((InstanceMap*)map)->GetInstanceData())
     {
         PSendSysMessage("Map has no instance data.");
         SetSentErrorMessage(true);
         return false;
     }
-
     ((InstanceMap*)map)->GetInstanceData()->SaveToDB();
     return true;
 }
-
 /// Display the list of GMs
 bool ChatHandler::HandleGMListFullCommand(const char* /*args*/)
 {
@@ -6901,14 +5885,12 @@ bool ChatHandler::HandleGMListFullCommand(const char* /*args*/)
         SendSysMessage("========================");
         SendSysMessage(LANG_GMLIST_HEADER);
         SendSysMessage("========================");
-
         ///- Circle through them. Display username and GM level
         do
         {
             Field *fields = result->Fetch();
             PSendSysMessage("|%15s|%6s|", fields[0].GetString(),fields[1].GetString());
         }while( result->NextRow() );
-
         PSendSysMessage("========================");
         delete result;
     }
@@ -6916,7 +5898,6 @@ bool ChatHandler::HandleGMListFullCommand(const char* /*args*/)
         PSendSysMessage(LANG_GMLIST_EMPTY);
     return true;
 }
-
 /// Define the 'Message of the day' for the realm
 bool ChatHandler::HandleServerSetMotdCommand(const char* args)
 {
@@ -6924,12 +5905,10 @@ bool ChatHandler::HandleServerSetMotdCommand(const char* args)
     PSendSysMessage(LANG_MOTD_NEW, args);
     return true;
 }
-
 /// Set whether we accept new clients
 bool ChatHandler::HandleServerSetClosedCommand(const char* args)
 {
     std::string arg = args;
-
     if(args == "on")
     {
         SendSysMessage(LANG_WORLD_CLOSED);
@@ -6942,31 +5921,25 @@ bool ChatHandler::HandleServerSetClosedCommand(const char* args)
         sWorld.SetClosed(false);
         return true;
     }
-
     SendSysMessage(LANG_USE_BOL);
     SetSentErrorMessage(true);
     return false;
 }
-
 /// Set/Unset the expansion level for an account
 bool ChatHandler::HandleAccountSetAddonCommand(const char* args)
 {
     ///- Get the command line arguments
     char *szAcc = strtok((char*)args," ");
     char *szExp = strtok(NULL," ");
-
     if(!szAcc)
         return false;
-
     std::string account_name;
     uint32 account_id;
-
     if(!szExp)
     {
         Player* player = getSelectedPlayer();
         if(!player)
             return false;
-
         account_id = player->GetSession()->GetAccountId();
         accmgr.GetName(account_id,account_name);
         szExp = szAcc;
@@ -6981,7 +5954,6 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         account_id = accmgr.GetId(account_name);
         if(!account_id)
         {
@@ -6989,25 +5961,20 @@ bool ChatHandler::HandleAccountSetAddonCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
     }
-
     // Let set addon state only for lesser (strong) security level
     // or to self account
     if (m_session && m_session->GetAccountId () != account_id &&
         HasLowerSecurityAccount (NULL,account_id,true))
         return false;
-
     int expansion = atoi(szExp);                                    //get int anyway (0 if error)
     if(expansion < 0 || expansion > sWorld.getConfig(CONFIG_EXPANSION))
          return false;
-
     // No SQL injection
     loginDatabase.PExecute("UPDATE account SET expansion = '%d' WHERE id = '%u'",expansion,account_id);
     PSendSysMessage(LANG_ACCOUNT_SETADDON,account_name.c_str(),account_id,expansion);
     return true;
 }
-
 //Send items by mail
 bool ChatHandler::HandleSendItemsCommand(const char* args)
 {
@@ -7017,49 +5984,38 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
     std::string receiver_name;
     if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name))
         return false;
-
     char* tail1 = strtok(NULL, "");
     if(!tail1)
         return false;
-
     char* msgSubject = extractQuotedArg(tail1);
     if (!msgSubject)
         return false;
-
     char* tail2 = strtok(NULL, "");
     if(!tail2)
         return false;
-
     char* msgText = extractQuotedArg(tail2);
     if (!msgText)
         return false;
-
     // msgSubject, msgText isn't NUL after prev. check
     std::string subject = msgSubject;
     std::string text    = msgText;
-
     // extract items
     typedef std::pair<uint32,uint32> ItemPair;
     typedef std::list< ItemPair > ItemPairs;
     ItemPairs items;
-
     // get all tail string
     char* tail = strtok(NULL, "");
-
     // get from tail next item str
     while(char* itemStr = strtok(tail, " "))
     {
         // and get new tail
         tail = strtok(NULL, "");
-
         // parse item str
         char* itemIdStr = strtok(itemStr, ":");
         char* itemCountStr = strtok(NULL, " ");
-
         uint32 item_id = atoi(itemIdStr);
         if(!item_id)
             return false;
-
         ItemPrototype const* item_proto = objmgr.GetItemPrototype(item_id);
         if(!item_proto)
         {
@@ -7067,7 +6023,6 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         uint32 item_count = itemCountStr ? atoi(itemCountStr) : 1;
         if (item_count < 1 || (item_proto->MaxCount > 0 && item_count > uint32(item_proto->MaxCount)))
         {
@@ -7075,15 +6030,12 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
             SetSentErrorMessage(true);
             return false;
         }
-
         while(item_count > item_proto->GetMaxStackSize())
         {
             items.push_back(ItemPair(item_id,item_proto->GetMaxStackSize()));
             item_count -= item_proto->GetMaxStackSize();
         }
-
         items.push_back(ItemPair(item_id,item_count));
-
         if(items.size() > MAX_MAIL_ITEMS)
         {
             PSendSysMessage(LANG_COMMAND_MAIL_ITEMS_LIMIT, MAX_MAIL_ITEMS);
@@ -7091,17 +6043,13 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
             return false;
         }
     }
-
     // from console show not existed sender
     uint32 sender_guidlo = m_session ? m_session->GetPlayer()->GetGUIDLow() : 0;
-
     uint32 messagetype = MAIL_NORMAL;
     uint32 stationery = MAIL_STATIONERY_GM;
     uint32 itemTextId = !text.empty() ? objmgr.CreateItemText( text ) : 0;
-
     // fill mail
     MailItemsInfo mi;                                       // item list preparing
-
     for(ItemPairs::const_iterator itr = items.begin(); itr != items.end(); ++itr)
     {
         if(Item* item = Item::CreateItem(itr->first,itr->second,m_session ? m_session->GetPlayer() : 0))
@@ -7110,64 +6058,49 @@ bool ChatHandler::HandleSendItemsCommand(const char* args)
             mi.AddItem(item->GetGUIDLow(), item->GetEntry(), item);
         }
     }
-
     WorldSession::SendMailTo(receiver,messagetype, stationery, sender_guidlo, GUID_LOPART(receiver_guid), subject, itemTextId, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
-
     std::string nameLink = playerLink(receiver_name);
     PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
     return true;
 }
-
 ///Send money by mail
 bool ChatHandler::HandleSendMoneyCommand(const char* args)
 {
     /// format: name "subject text" "mail text" money
-
     Player* receiver;
     uint64 receiver_guid;
     std::string receiver_name;
     if(!extractPlayerTarget((char*)args,&receiver,&receiver_guid,&receiver_name))
         return false;
-
     char* tail1 = strtok(NULL, "");
     if (!tail1)
         return false;
-
     char* msgSubject = extractQuotedArg(tail1);
     if (!msgSubject)
         return false;
-
     char* tail2 = strtok(NULL, "");
     if (!tail2)
         return false;
-
     char* msgText = extractQuotedArg(tail2);
     if (!msgText)
         return false;
-
     char* money_str = strtok(NULL, "");
     int32 money = money_str ? atoi(money_str) : 0;
     if (money <= 0)
         return false;
-
     // msgSubject, msgText isn't NUL after prev. check
     std::string subject = msgSubject;
     std::string text    = msgText;
-
     // from console show not existed sender
     uint32 sender_guidlo = m_session ? m_session->GetPlayer()->GetGUIDLow() : 0;
-
     uint32 messagetype = MAIL_NORMAL;
     uint32 stationery = MAIL_STATIONERY_GM;
     uint32 itemTextId = !text.empty() ? objmgr.CreateItemText( text ) : 0;
-
     WorldSession::SendMailTo(receiver,messagetype, stationery, sender_guidlo, GUID_LOPART(receiver_guid), subject, itemTextId, NULL, money, 0, MAIL_CHECK_MASK_NONE);
-
     std::string nameLink = playerLink(receiver_name);
     PSendSysMessage(LANG_MAIL_SENT, nameLink.c_str());
     return true;
 }
-
 /// Send a message to a player in game
 bool ChatHandler::HandleSendMessageCommand(const char* args)
 {
@@ -7175,11 +6108,9 @@ bool ChatHandler::HandleSendMessageCommand(const char* args)
     Player *rPlayer;
     if(!extractPlayerTarget((char*)args,&rPlayer))
         return false;
-
     char* msg_str = strtok(NULL, "");
     if(!msg_str)
         return false;
-
     ///- Check that he is not logging out.
     if(rPlayer->GetSession()->isLogingOut())
     {
@@ -7187,59 +6118,47 @@ bool ChatHandler::HandleSendMessageCommand(const char* args)
         SetSentErrorMessage(true);
         return false;
     }
-
     ///- Send the message
     //Use SendAreaTriggerMessage for fastest delivery.
     rPlayer->GetSession()->SendAreaTriggerMessage("%s", msg_str);
     rPlayer->GetSession()->SendAreaTriggerMessage("|cffff0000[Message from administrator]:|r");
-
     //Confirmation message
     std::string nameLink = GetNameLink(rPlayer);
     PSendSysMessage(LANG_SENDMESSAGE,nameLink.c_str(),msg_str);
     return true;
 }
-
 bool ChatHandler::HandleFlushArenaPointsCommand(const char * /*args*/)
 {
     sBattleGroundMgr.DistributeArenaPoints();
     return true;
 }
-
 bool ChatHandler::HandleModifyGenderCommand(const char *args)
 {
     if(!*args)
         return false;
-
     Player *player = getSelectedPlayer();
-
     if(!player)
     {
         PSendSysMessage(LANG_PLAYER_NOT_FOUND);
         SetSentErrorMessage(true);
         return false;
     }
-
     PlayerInfo const* info = objmgr.GetPlayerInfo(player->getRace(), player->getClass());
     if(!info)
         return false;
-
     char const* gender_str = (char*)args;
     int gender_len = strlen(gender_str);
-
     Gender gender;
-
     if(!strncmp(gender_str, "male", gender_len))            // MALE
     {
         if(player->getGender() == GENDER_MALE)
             return true;
-
         gender = GENDER_MALE;
     }
     else if (!strncmp(gender_str, "female", gender_len))    // FEMALE
     {
         if(player->getGender() == GENDER_FEMALE)
             return true;
-
         gender = GENDER_FEMALE;
     }
     else
@@ -7248,50 +6167,37 @@ bool ChatHandler::HandleModifyGenderCommand(const char *args)
         SetSentErrorMessage(true);
         return false;
     }
-
     // Set gender
     player->SetByteValue(UNIT_FIELD_BYTES_0, 2, gender);
     player->SetByteValue(PLAYER_BYTES_3, 0, gender);
-
     // Change display ID
     player->InitDisplayIds();
-
     char const* gender_full = gender ? "female" : "male";
-
     PSendSysMessage(LANG_YOU_CHANGE_GENDER, GetNameLink(player).c_str(), gender_full);
-
     if (needReportToTarget(player))
         ChatHandler(player).PSendSysMessage(LANG_YOUR_GENDER_CHANGED, gender_full, GetNameLink().c_str());
-
     return true;
 }
-
 /*------------------------------------------
  *-------------TRINITY----------------------
  *-------------------------------------*/
-
 bool ChatHandler::HandlePlayAllCommand(const char* args)
 {
     if(!*args)
         return false;
-
     uint32 soundId = atoi((char*)args);
-
     if(!sSoundEntriesStore.LookupEntry(soundId))
     {
         PSendSysMessage(LANG_SOUND_NOT_EXIST, soundId);
         SetSentErrorMessage(true);
         return false;
     }
-
     WorldPacket data(SMSG_PLAY_SOUND, 4);
     data << uint32(soundId) << m_session->GetPlayer()->GetGUID();
     sWorld.SendGlobalMessage(&data);
-
     PSendSysMessage(LANG_COMMAND_PLAYED_TO_ALL, soundId);
     return true;
 }
-
 bool ChatHandler::HandleFreezeCommand(const char *args)
 {
     std::string name;
@@ -7312,24 +6218,20 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
         normalizePlayerName(name);
         player = objmgr.GetPlayer(name.c_str()); //get player by name
     }
-
     if (!player)
     {
         SendSysMessage(LANG_COMMAND_FREEZE_WRONG);
         return true;
     }
-
     if (player==m_session->GetPlayer())
     {
         SendSysMessage(LANG_COMMAND_FREEZE_ERROR);
         return true;
     }
-
     //effect
     if ((player) && (!(player==m_session->GetPlayer())))
     {
         PSendSysMessage(LANG_COMMAND_FREEZE,name.c_str());
-
         //stop combat + make player unattackable + duel stop + stop some spells
         player->setFaction(35);
         player->CombatStop();
@@ -7337,7 +6239,6 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
             player->InterruptNonMeleeSpells(true);
         player->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
         player->SetUInt32Value(PLAYER_DUEL_TEAM, 1);
-
         //if player class = hunter || warlock remove pet if alive
         if((player->getClass() == CLASS_HUNTER) || (player->getClass() == CLASS_WARLOCK))
         {
@@ -7349,18 +6250,15 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
                     player->RemovePet(pet,PET_SAVE_NOT_IN_SLOT);
             }
         }
-
         //m_session->GetPlayer()->CastSpell(player,spellID,false);
         SpellEntry const *spellInfo = sSpellStore.LookupEntry( 9454 );
         Aura *Aur = new Aura(spellInfo, 1, player, player, player);
         player->AddAura(Aur);
-
         //save player
         player->SaveToDB();
     }
     return true;
 }
-
 bool ChatHandler::HandleUnFreezeCommand(const char *args)
 {
     std::string name;
@@ -7374,30 +6272,24 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
             name = player->GetName();
         }
     }
-
     else // if name entered
     {
         name = TargetName;
         normalizePlayerName(name);
         player = objmgr.GetPlayer(name.c_str()); //get player by name
     }
-
     //effect
     if (player)
     {
         PSendSysMessage(LANG_COMMAND_UNFREEZE,name.c_str());
-
         //Reset player faction + allow combat + allow duels
         player->setFactionForRace(player->getRace());
         player->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-
         //allow movement and spells
         player->RemoveAurasDueToSpell(9454);
-
         //save player
         player->SaveToDB();
     }
-
     if (!player)
     {
         if (TargetName)
@@ -7423,10 +6315,8 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
             return true;
         }
     }
-
     return true;
 }
-
 bool ChatHandler::HandleListFreezeCommand(const char* args)
 {
     //Get names from DB
@@ -7438,7 +6328,6 @@ bool ChatHandler::HandleListFreezeCommand(const char* args)
     }
     //Header of the names
     PSendSysMessage(LANG_COMMAND_LIST_FREEZE);
-
     //Output of the results
     do
     {
@@ -7446,88 +6335,69 @@ bool ChatHandler::HandleListFreezeCommand(const char* args)
         std::string fplayers = fields[0].GetCppString();
         PSendSysMessage(LANG_COMMAND_FROZEN_PLAYERS,fplayers.c_str());
     } while (result->NextRow());
-
     delete result;
     return true;
 }
-
 bool ChatHandler::HandleGroupLeaderCommand(const char* args)
 {
     Player* plr  = NULL;
     Group* group = NULL;
     uint64 guid  = 0;
     char* cname  = strtok((char*)args, " ");
-
     if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid))
         if(group && group->GetLeaderGUID() != guid)
             group->ChangeLeader(guid);
-
     return true;
 }
-
 bool ChatHandler::HandleGroupDisbandCommand(const char* args)
 {
     Player* plr  = NULL;
     Group* group = NULL;
     uint64 guid  = 0;
     char* cname  = strtok((char*)args, " ");
-
     if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid))
         if(group)
             group->Disband();
-
     return true;
 }
-
 bool ChatHandler::HandleGroupRemoveCommand(const char* args)
 {
     Player* plr  = NULL;
     Group* group = NULL;
     uint64 guid  = 0;
     char* cname  = strtok((char*)args, " ");
-
     if(GetPlayerGroupAndGUIDByName(cname, plr, group, guid, true))
         if(group)
             group->RemoveMember(guid, 0);
-
     return true;
 }
-
 bool ChatHandler::HandlePossessCommand(const char* args)
 {
     Unit* pUnit = getSelectedUnit();
     if(!pUnit)
         return false;
-
     m_session->GetPlayer()->CastSpell(pUnit, 530, true);
     return true;
 }
-
 bool ChatHandler::HandleUnPossessCommand(const char* args)
 {
     Unit* pUnit = getSelectedUnit();
     if(!pUnit) pUnit = m_session->GetPlayer();
-
     pUnit->RemoveCharmAuras();
-
     return true;
 }
-
 bool ChatHandler::HandleBindSightCommand(const char* args)
 {
     Unit* pUnit = getSelectedUnit();
     if (!pUnit)
         return false;
-
     m_session->GetPlayer()->CastSpell(pUnit, 6277, true);
     return true;
 }
-
 bool ChatHandler::HandleUnbindSightCommand(const char* args)
 {
     if (m_session->GetPlayer()->isPossessing())
         return false;
-
     m_session->GetPlayer()->StopCastingBindSight();
     return true;
 }
diff --git a/src/game/LootHandler.cpp b/src/game/LootHandler.cpp
index e4ee8bffc6f..c1bfcfe3fe0 100644
--- a/src/game/LootHandler.cpp
+++ b/src/game/LootHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "Log.h"
@@ -31,7 +30,6 @@
 #include "Group.h"
 #include "World.h"
 #include "Util.h"
-
 void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_AUTOSTORE_LOOT_ITEM");
@@ -39,32 +37,26 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
     uint64   lguid =    player->GetLootGUID();
     Loot    *loot;
     uint8    lootSlot;
-
     recv_data >> lootSlot;
-
     if (IS_GAMEOBJECT_GUID(lguid))
     {
         GameObject *go = player->GetMap()->GetGameObject(lguid);
-
         // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO
         if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE)))
         {
             player->SendLootRelease(lguid);
             return;
         }
-
         loot = &go->loot;
     }
     else if (IS_ITEM_GUID(lguid))
     {
         Item *pItem = player->GetItemByGuid( lguid );
-
         if (!pItem)
         {
             player->SendLootRelease(lguid);
             return;
         }
-
         loot = &pItem->loot;
     }
     else if (IS_CORPSE_GUID(lguid))
@@ -80,43 +72,34 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
     else
     {
         Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid);
-
         bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
-
         if( !ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
         {
             player->SendLootRelease(lguid);
             return;
         }
-
         loot = &pCreature->loot;
     }
-
     QuestItem *qitem = NULL;
     QuestItem *ffaitem = NULL;
     QuestItem *conditem = NULL;
-
     LootItem *item = loot->LootItemInSlot(lootSlot,player,&qitem,&ffaitem,&conditem);
-
     if(!item)
     {
         player->SendEquipError( EQUIP_ERR_ALREADY_LOOTED, NULL, NULL );
         return;
     }
-
     // questitems use the blocked field for other purposes
     if (!qitem && item->is_blocked)
     {
         player->SendLootRelease(lguid);
         return;
     }
-
     ItemPosCountVec dest;
     uint8 msg = player->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item->itemid, item->count );
     if ( msg == EQUIP_ERR_OK )
     {
         Item * newitem = player->StoreNewItem( dest, item->itemid, true, item->randomPropertyId);
-
         if (qitem)
         {
             qitem->is_looted = true;
@@ -142,13 +125,10 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
                 loot->NotifyItemRemoved(lootSlot);
             }
         }
-
         //if only one person is supposed to loot the item, then set it to looted
         if (!item->freeforall)
             item->is_looted = true;
-
         --loot->unlootedCount;
-
         player->SendNewItem(newitem, uint32(item->count), false, false, true);
         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, item->itemid, item->count);
         player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, loot->loot_type, item->count);
@@ -156,37 +136,29 @@ void WorldSession::HandleAutostoreLootItemOpcode( WorldPacket & recv_data )
     else
         player->SendEquipError( msg, NULL, NULL );
 }
-
 void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("WORLD: CMSG_LOOT_MONEY");
-
     Player *player = GetPlayer();
     uint64 guid = player->GetLootGUID();
     if(!guid)
         return;
-
     Loot *pLoot = NULL;
-
     switch(GUID_HIPART(guid))
     {
         case HIGHGUID_GAMEOBJECT:
         {
             GameObject *pGameObject = GetPlayer()->GetMap()->GetGameObject(guid);
-
             // not check distance for GO in case owned GO (fishing bobber case, for example)
             if (pGameObject && ((pGameObject->GetOwnerGUID()==_player->GetGUID() || pGameObject->IsWithinDistInMap(_player,INTERACTION_DISTANCE))))
                 pLoot = &pGameObject->loot;
-
             break;
         }
         case HIGHGUID_CORPSE:                               // remove insignia ONLY in BG
         {
             Corpse *bones = ObjectAccessor::GetCorpse(*GetPlayer(), guid);
-
             if (bones && bones->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
                 pLoot = &bones->loot;
-
             break;
         }
         case HIGHGUID_ITEM:
@@ -198,24 +170,19 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
         case HIGHGUID_UNIT:
         {
             Creature* pCreature = GetPlayer()->GetMap()->GetCreature(guid);
-
             bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
-
             if ( ok_loot && pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
                 pLoot = &pCreature->loot ;
-
             break;
         }
         default:
             return;                                         // unlootable type
     }
-
     if( pLoot )
     {
         if (!IS_ITEM_GUID(guid) && player->GetGroup())      //item can be looted only single player
         {
             Group *group = player->GetGroup();
-
             std::vector<Player*> playersNear;
             for(GroupReference *itr = group->GetFirstMember(); itr != NULL; itr = itr->next())
             {
@@ -225,9 +192,7 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
                 if (player->IsWithinDist(playerGroup,sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE),false))
                     playersNear.push_back(playerGroup);
             }
-
             uint32 money_per_player = uint32((pLoot->gold)/(playersNear.size()));
-
             for (std::vector<Player*>::const_iterator i = playersNear.begin(); i != playersNear.end(); ++i)
             {
                 (*i)->ModifyMoney( money_per_player );
@@ -247,56 +212,41 @@ void WorldSession::HandleLootMoneyOpcode( WorldPacket & /*recv_data*/ )
         pLoot->NotifyMoneyRemoved();
     }
 }
-
 void WorldSession::HandleLootOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_LOOT");
-
     uint64 guid;
     recv_data >> guid;
-
     // Check possible cheat
     if(!_player->isAlive())
         return;
-
     GetPlayer()->SendLoot(guid, LOOT_CORPSE);
 }
-
 void WorldSession::HandleLootReleaseOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_LOOT_RELEASE");
-
     // cheaters can modify lguid to prevent correct apply loot release code and re-loot
     // use internal stored guid
     recv_data.read_skip<uint64>();                          // guid;
-
     if(uint64 lguid = GetPlayer()->GetLootGUID())
         DoLootRelease(lguid);
 }
-
 void WorldSession::DoLootRelease( uint64 lguid )
 {
     Player  *player = GetPlayer();
     Loot    *loot;
-
     player->SetLootGUID(0);
     player->SendLootRelease(lguid);
-
     player->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_LOOTING);
-
     if(!player->IsInWorld())
         return;
-
     if (IS_GAMEOBJECT_GUID(lguid))
     {
         GameObject *go = GetPlayer()->GetMap()->GetGameObject(lguid);
-
         // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO
         if (!go || ((go->GetOwnerGUID() != _player->GetGUID() && go->GetGoType() != GAMEOBJECT_TYPE_FISHINGHOLE) && !go->IsWithinDistInMap(_player,INTERACTION_DISTANCE)))
             return;
-
         loot = &go->loot;
-
         if (go->GetGoType() == GAMEOBJECT_TYPE_DOOR)
         {
             // locked doors are opened with spelleffect openlock, prevent remove its as looted
@@ -309,23 +259,19 @@ void WorldSession::DoLootRelease( uint64 lguid )
             {
                 uint32 go_min = go->GetGOInfo()->chest.minSuccessOpens;
                 uint32 go_max = go->GetGOInfo()->chest.maxSuccessOpens;
-
                 // only vein pass this check
                 if(go_min != 0 && go_max > go_min)
                 {
                     float amount_rate = sWorld.getRate(RATE_MINING_AMOUNT);
                     float min_amount = go_min*amount_rate;
                     float max_amount = go_max*amount_rate;
-
                     go->AddUse();
                     float uses = float(go->GetUseCount());
-
                     if(uses < max_amount)
                     {
                         if(uses >= min_amount)
                         {
                             float chance_rate = sWorld.getRate(RATE_MINING_NEXT);
-
                             int32 ReqValue = 175;
                             LockEntry const *lockInfo = sLockStore.LookupEntry(go->GetGOInfo()->chest.lockId);
                             if(lockInfo)
@@ -360,7 +306,6 @@ void WorldSession::DoLootRelease( uint64 lguid )
             }
             else // not chest (or vein/herb/etc)
                 go->SetLootState(GO_JUST_DEACTIVATED);
-
             loot->clear();
         }
         else
@@ -372,9 +317,7 @@ void WorldSession::DoLootRelease( uint64 lguid )
         Corpse *corpse = ObjectAccessor::GetCorpse(*player, lguid);
         if (!corpse || !corpse->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
             return;
-
         loot = &corpse->loot;
-
         if (loot->isLooted())
         {
             loot->clear();
@@ -386,22 +329,17 @@ void WorldSession::DoLootRelease( uint64 lguid )
         Item *pItem = player->GetItemByGuid(lguid );
         if(!pItem)
             return;
-
         ItemPrototype const* proto = pItem->GetProto();
-
         // destroy only 5 items from stack in case prospecting and milling
         if( (proto->BagFamily & (BAG_FAMILY_MASK_MINING_SUPP|BAG_FAMILY_MASK_HERBS)) &&
             proto->Class == ITEM_CLASS_TRADE_GOODS)
         {
             pItem->m_lootGenerated = false;
             pItem->loot.clear();
-
             uint32 count = pItem->GetCount();
-
             // >=5 checked in spell code, but will work for cheating cases also with removing from another stacks.
             if(count > 5)
                 count = 5;
-
             player->DestroyItemCount(pItem, count, true);
         }
         else
@@ -412,64 +350,49 @@ void WorldSession::DoLootRelease( uint64 lguid )
     else
     {
         Creature* pCreature = GetPlayer()->GetMap()->GetCreature(lguid);
-
         bool ok_loot = pCreature && pCreature->isAlive() == (player->getClass()==CLASS_ROGUE && pCreature->lootForPickPocketed);
         if ( !ok_loot || !pCreature->IsWithinDistInMap(_player,INTERACTION_DISTANCE) )
             return;
-
         loot = &pCreature->loot;
-
         // update next looter
         if(Player *recipient = pCreature->GetLootRecipient())
             if(Group* group = recipient->GetGroup())
                 if (group->GetLooterGuid() == player->GetGUID())
                     group->UpdateLooterGuid(pCreature);
-
         if (loot->isLooted())
         {
             // skip pickpocketing loot for speed, skinning timer redunction is no-op in fact
             if(!pCreature->isAlive())
                 pCreature->AllLootRemovedFromCorpse();
-
             pCreature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
             loot->clear();
         }
     }
-
     //Player is not looking at loot list, he doesn't need to see updates on the loot list
     loot->RemoveLooter(player->GetGUID());
 }
-
 void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
 {
     uint8 slotid;
     uint64 lootguid, target_playerguid;
-
     recv_data >> lootguid >> slotid >> target_playerguid;
-
     if(!_player->GetGroup() || _player->GetGroup()->GetLooterGuid() != _player->GetGUID())
     {
         _player->SendLootRelease(GetPlayer()->GetLootGUID());
         return;
     }
-
     Player *target = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(target_playerguid, 0, HIGHGUID_PLAYER));
     if(!target)
         return;
-
     sLog.outDebug("WorldSession::HandleLootMasterGiveOpcode (CMSG_LOOT_MASTER_GIVE, 0x02A3) Target = [%s].", target->GetName());
-
     if(_player->GetLootGUID() != lootguid)
         return;
-
     Loot *pLoot = NULL;
-
     if(IS_CRE_OR_VEH_GUID(GetPlayer()->GetLootGUID()))
     {
         Creature *pCreature = GetPlayer()->GetMap()->GetCreature(lootguid);
         if(!pCreature)
             return;
-
         pLoot = &pCreature->loot;
     }
     else if(IS_GAMEOBJECT_GUID(GetPlayer()->GetLootGUID()))
@@ -477,21 +400,16 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
         GameObject *pGO = GetPlayer()->GetMap()->GetGameObject(lootguid);
         if(!pGO)
             return;
-
         pLoot = &pGO->loot;
     }
-
     if(!pLoot)
         return;
-
     if (slotid > pLoot->items.size())
     {
         sLog.outDebug("AutoLootItem: Player %s might be using a hack! (slot %d, size %lu)",GetPlayer()->GetName(), slotid, (unsigned long)pLoot->items.size());
         return;
     }
-
     LootItem& item = pLoot->items[slotid];
-
     ItemPosCountVec dest;
     uint8 msg = target->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, item.itemid, item.count );
     if ( msg != EQUIP_ERR_OK )
@@ -500,18 +418,15 @@ void WorldSession::HandleLootMasterGiveOpcode( WorldPacket & recv_data )
         _player->SendEquipError( msg, NULL, NULL );         // send duplicate of error massage to master looter
         return;
     }
-
     // not move item from loot to target inventory
     Item * newitem = target->StoreNewItem( dest, item.itemid, true, item.randomPropertyId );
     target->SendNewItem(newitem, uint32(item.count), false, false, true );
     target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_ITEM, item.itemid, item.count);
     target->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOOT_TYPE, pLoot->loot_type, item.count);
-
     // mark as looted
     item.count=0;
     item.is_looted=true;
 
-
     pLoot->NotifyItemRemoved(slotid);
     --pLoot->unlootedCount;
 }
diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp
index df11d909dd0..e43ab44c184 100644
--- a/src/game/LootMgr.cpp
+++ b/src/game/LootMgr.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "LootMgr.h"
 #include "Log.h"
 #include "ObjectMgr.h"
@@ -26,7 +25,6 @@
 #include "Util.h"
 #include "SharedDefines.h"
 #include "SpellMgr.h"
-
 static Rates const qualityToRate[MAX_ITEM_QUALITY] = {
     RATE_DROP_ITEM_POOR,                                    // ITEM_QUALITY_POOR
     RATE_DROP_ITEM_NORMAL,                                  // ITEM_QUALITY_NORMAL
@@ -36,7 +34,6 @@ static Rates const qualityToRate[MAX_ITEM_QUALITY] = {
     RATE_DROP_ITEM_LEGENDARY,                               // ITEM_QUALITY_LEGENDARY
     RATE_DROP_ITEM_ARTIFACT,                                // ITEM_QUALITY_ARTIFACT
 };
-
 LootStore LootTemplates_Creature(     "creature_loot_template",     "creature entry",               true);
 LootStore LootTemplates_Disenchant(   "disenchant_loot_template",   "item disenchant id",           true);
 LootStore LootTemplates_Fishing(      "fishing_loot_template",      "area id",                      true);
@@ -50,7 +47,6 @@ LootStore LootTemplates_Reference(    "reference_loot_template",    "reference i
 LootStore LootTemplates_Skinning(     "skinning_loot_template",     "creature skinning id",         true);
 LootStore LootTemplates_Spell(        "spell_loot_template",        "spell id (random item creating)",false);
 
-
 class LootTemplate::LootGroup                               // A set of loot definitions for items (refs are not allowed)
 {
     public:
@@ -61,17 +57,14 @@ class LootTemplate::LootGroup                               // A set of loot def
         void Process(Loot& loot) const;                     // Rolls an item from the group (if any) and adds the item to the loot
         float RawTotalChance() const;                       // Overall chance for the group (without equal chanced items)
         float TotalChance() const;                          // Overall chance for the group
-
         void Verify(LootStore const& lootstore, uint32 id, uint32 group_id) const;
         void CollectLootIds(LootIdSet& set) const;
         void CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const;
     private:
         LootStoreItemList ExplicitlyChanced;                // Entries with chances defined in DB
         LootStoreItemList EqualChanced;                     // Zero chances - every entry takes the same chance
-
         LootStoreItem const * Roll() const;                 // Rolls an item from the group, returns NULL if all miss their chances
 };
-
 //Remove all data and free all memory
 void LootStore::Clear()
 {
@@ -79,7 +72,6 @@ void LootStore::Clear()
         delete itr->second;
     m_LootTemplates.clear();
 }
-
 // Checks validity of the loot store
 // Actual checks are done within LootTemplate::Verify() which is called for every template
 void LootStore::Verify() const
@@ -87,31 +79,24 @@ void LootStore::Verify() const
     for (LootTemplateMap::const_iterator i = m_LootTemplates.begin(); i != m_LootTemplates.end(); ++i )
         i->second->Verify(*this, i->first);
 }
-
 // Loads a *_loot_template DB table into loot store
 // All checks of the loaded template are called from here, no error reports at loot generation required
 void LootStore::LoadLootTable()
 {
     LootTemplateMap::const_iterator tab;
     uint32 count = 0;
-
     // Clearing store (for reloading case)
     Clear();
-
     sLog.outString( "%s :", GetName());
-
     //                                                 0      1     2                    3        4              5         6              7                 8
     QueryResult *result = WorldDatabase.PQuery("SELECT entry, item, ChanceOrQuestChance, groupid, mincountOrRef, maxcount, lootcondition, condition_value1, condition_value2 FROM %s",GetName());
-
     if (result)
     {
         barGoLink bar(result->GetRowCount());
-
         do
         {
             Field *fields = result->Fetch();
             bar.step();
-
             uint32 entry               = fields[0].GetUInt32();
             uint32 item                = fields[1].GetUInt32();
             float  chanceOrQuestChance = fields[2].GetFloat();
@@ -121,28 +106,22 @@ void LootStore::LoadLootTable()
             ConditionType condition    = (ConditionType)fields[6].GetUInt8();
             uint32 cond_value1         = fields[7].GetUInt32();
             uint32 cond_value2         = fields[8].GetUInt32();
-
             if(maxcount > std::numeric_limits<uint8>::max())
             {
                 sLog.outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount,std::numeric_limits<uint8>::max());
                 continue;                                   // error already printed to log/console.
             }
 
-
             if(!PlayerCondition::IsValid(condition,cond_value1, cond_value2))
             {
                 sLog.outErrorDb("... in table '%s' entry %u item %u", GetName(), entry, item);
                 continue;                                   // error already printed to log/console.
             }
-
             // (condition + cond_value1/2) are converted into single conditionId
             uint16 conditionId = objmgr.GetConditionId(condition, cond_value1, cond_value2);
-
             LootStoreItem storeitem = LootStoreItem(item, chanceOrQuestChance, group, conditionId, mincountOrRef, maxcount);
-
             if (!storeitem.IsValid(*this,entry))            // Validity checks
                 continue;
-
             // Looking for the template of the entry
                                                             // often entries are put together
             if (m_LootTemplates.empty() || tab->first != entry)
@@ -157,17 +136,12 @@ void LootStore::LoadLootTable()
             }
             // else is empty - template Id and iter are the same
             // finally iter refers to already existed or just created <entry, LootTemplate>
-
             // Adds current row to the template
             tab->second->AddEntry(storeitem);
             ++count;
-
         } while (result->NextRow());
-
         delete result;
-
         Verify();                                           // Checks validity of the loot store
-
         sLog.outString();
         sLog.outString( ">> Loaded %u loot definitions (%lu templates)", count, (unsigned long)m_LootTemplates.size());
     }
@@ -177,84 +151,65 @@ void LootStore::LoadLootTable()
         sLog.outErrorDb( ">> Loaded 0 loot definitions. DB table `%s` is empty.",GetName() );
     }
 }
-
 bool LootStore::HaveQuestLootFor(uint32 loot_id) const
 {
     LootTemplateMap::const_iterator itr = m_LootTemplates.find(loot_id);
     if(itr == m_LootTemplates.end())
         return false;
-
     // scan loot for quest items
     return itr->second->HasQuestDrop(m_LootTemplates);
 }
-
 bool LootStore::HaveQuestLootForPlayer(uint32 loot_id,Player* player) const
 {
     LootTemplateMap::const_iterator tab = m_LootTemplates.find(loot_id);
     if (tab != m_LootTemplates.end())
         if (tab->second->HasQuestDropForPlayer(m_LootTemplates, player))
             return true;
-
     return false;
 }
-
 LootTemplate const* LootStore::GetLootFor(uint32 loot_id) const
 {
     LootTemplateMap::const_iterator tab = m_LootTemplates.find(loot_id);
-
     if (tab == m_LootTemplates.end())
         return NULL;
-
     return tab->second;
 }
-
 void LootStore::LoadAndCollectLootIds(LootIdSet& ids_set)
 {
     LoadLootTable();
-
     for(LootTemplateMap::const_iterator tab = m_LootTemplates.begin(); tab != m_LootTemplates.end(); ++tab)
         ids_set.insert(tab->first);
 }
-
 void LootStore::CheckLootRefs(LootIdSet* ref_set) const
 {
     for(LootTemplateMap::const_iterator ltItr = m_LootTemplates.begin(); ltItr != m_LootTemplates.end(); ++ltItr)
         ltItr->second->CheckLootRefs(m_LootTemplates,ref_set);
 }
-
 void LootStore::ReportUnusedIds(LootIdSet const& ids_set) const
 {
     // all still listed ids isn't referenced
     for(LootIdSet::const_iterator itr = ids_set.begin(); itr != ids_set.end(); ++itr)
         sLog.outErrorDb("Table '%s' entry %d isn't %s and not referenced from loot, and then useless.", GetName(), *itr,GetEntryName());
 }
-
 void LootStore::ReportNotExistedId(uint32 id) const
 {
     sLog.outErrorDb("Table '%s' entry %d (%s) not exist but used as loot id in DB.", GetName(), id,GetEntryName());
 }
-
 //
 // --------- LootStoreItem ---------
 //
-
 // Checks if the entry (quest, non-quest, reference) takes it's chance (at loot generation)
 // RATE_DROP_ITEMS is no longer used for all types of entries
 bool LootStoreItem::Roll(bool rate) const
 {
     if(chance>=100.0f)
         return true;
-
     if(mincountOrRef < 0)                                   // reference case
         return roll_chance_f(chance* (rate ? sWorld.getRate(RATE_DROP_ITEM_REFERENCED) : 1.0f));
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype(itemid);
-
     float qualityModifier = pProto && rate ? sWorld.getRate(qualityToRate[pProto->Quality]) : 1.0f;
-
     return roll_chance_f(chance*qualityModifier);
 }
-
 // Checks correctness of values
 bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
 {
@@ -263,13 +218,11 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
         sLog.outErrorDb("Table '%s' entry %d item %d: group (%u) must be less %u - skipped", store.GetName(), entry, itemid, group, 1 << 7);
         return false;
     }
-
     if (mincountOrRef == 0)
     {
         sLog.outErrorDb("Table '%s' entry %d item %d: wrong mincountOrRef (%d) - skipped", store.GetName(), entry, itemid, mincountOrRef);
         return false;
     }
-
     if( mincountOrRef > 0 )                                 // item (quest or non-quest) entry, maybe grouped
     {
         ItemPrototype const *proto = objmgr.GetItemPrototype(itemid);
@@ -278,26 +231,22 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
             sLog.outErrorDb("Table '%s' entry %d item %d: item entry not listed in `item_template` - skipped", store.GetName(), entry, itemid);
             return false;
         }
-
         if( chance == 0 && group == 0)                      // Zero chance is allowed for grouped entries only
         {
             sLog.outErrorDb("Table '%s' entry %d item %d: equal-chanced grouped entry, but group not defined - skipped", store.GetName(), entry, itemid);
             return false;
         }
-
         if( chance != 0 && chance < 0.000001f )             // loot with low chance
         {
             sLog.outErrorDb("Table '%s' entry %d item %d: low chance (%f) - skipped",
                 store.GetName(), entry, itemid, chance);
             return false;
         }
-
         if( maxcount < mincountOrRef)                       // wrong max count
         {
             sLog.outErrorDb("Table '%s' entry %d item %d: max count (%u) less that min count (%i) - skipped", store.GetName(), entry, itemid, uint32(maxcount), mincountOrRef);
             return false;
         }
-
     }
     else                                                    // mincountOrRef < 0
     {
@@ -311,22 +260,17 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
     }
     return true;                                            // Referenced template existence is checked at whole store level
 }
-
 //
 // --------- LootItem ---------
 //
-
 // Constructor, copies most fields from LootStoreItem and generates random count
 LootItem::LootItem(LootStoreItem const& li)
 {
     itemid      = li.itemid;
     conditionId = li.conditionId;
-
     ItemPrototype const* proto = objmgr.GetItemPrototype(itemid);
     freeforall  = proto && (proto->Flags & ITEM_FLAGS_PARTY_LOOT);
-
     needs_quest = li.needs_quest;
-
     count       = urand(li.mincountOrRef, li.maxcount);     // constructor called for mincountOrRef > 0 only
     randomSuffix = GenerateEnchSuffixFactor(itemid);
     randomPropertyId = Item::GenerateItemRandomPropertyId(itemid);
@@ -335,14 +279,12 @@ LootItem::LootItem(LootStoreItem const& li)
     is_underthreshold = 0;
     is_counted = 0;
 }
-
 // Basic checks for player/item compatibility - if false no chance to see the item in the loot
 bool LootItem::AllowedForPlayer(Player const * player) const
 {
     // DB conditions check
     if ( !objmgr.IsPlayerMeetToCondition(player,conditionId) )
         return false;
-
     if ( needs_quest )
     {
         // Checking quests for quest-only drop (check only quests requirements in this case)
@@ -356,14 +298,11 @@ bool LootItem::AllowedForPlayer(Player const * player) const
         if (pProto && pProto->StartQuest && player->GetQuestStatus(pProto->StartQuest) != QUEST_STATUS_NONE && !player->HasQuestForItem(itemid))
             return false;
     }
-
     return true;
 }
-
 //
 // --------- Loot ---------
 //
-
 // Inserts the item into the loot (called by LootTemplate processors)
 void Loot::AddItem(LootStoreItem const & item)
 {
@@ -375,7 +314,6 @@ void Loot::AddItem(LootStoreItem const & item)
     else if (items.size() < MAX_NR_LOOT_ITEMS)              // Non-quest drop
     {
         items.push_back(LootItem(item));
-
         // non-conditional one-player only items are counted here,
         // free for all items are counted in FillFFALoot(),
         // non-ffa conditionals are counted in FillNonQuestNonFFAConditionalLoot()
@@ -387,27 +325,21 @@ void Loot::AddItem(LootStoreItem const & item)
         }
     }
 }
-
 // Calls processor of corresponding LootTemplate (which handles everything including references)
 void Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool personal)
 {
     // Must be provided
     if(!loot_owner)
         return;
-
     LootTemplate const* tab = store.GetLootFor(loot_id);
-
     if (!tab)
     {
         sLog.outErrorDb("Table '%s' loot id #%u used but it doesn't have records.",store.GetName(),loot_id);
         return;
     }
-
     items.reserve(MAX_NR_LOOT_ITEMS);
     quest_items.reserve(MAX_NR_QUEST_ITEMS);
-
     tab->Process(*this, store,store.IsRatesAllowed ());     // Processing is done there, callback via Loot::AddItem()
-
     // Setting access rights for group loot case
     Group * pGroup=loot_owner->GetGroup();
     if(!personal && pGroup)
@@ -420,28 +352,22 @@ void Loot::FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner,
     else
         FillNotNormalLootFor(loot_owner);
 }
-
 void Loot::FillNotNormalLootFor(Player* pl)
 {
     uint32 plguid = pl->GetGUIDLow();
-
     QuestItemMap::const_iterator qmapitr = PlayerQuestItems.find(plguid);
     if (qmapitr == PlayerQuestItems.end())
         FillQuestLoot(pl);
-
     qmapitr = PlayerFFAItems.find(plguid);
     if (qmapitr == PlayerFFAItems.end())
         FillFFALoot(pl);
-
     qmapitr = PlayerNonQuestNonFFAConditionalItems.find(plguid);
     if (qmapitr == PlayerNonQuestNonFFAConditionalItems.end())
         FillNonQuestNonFFAConditionalLoot(pl);
 }
-
 QuestItemList* Loot::FillFFALoot(Player* player)
 {
     QuestItemList *ql = new QuestItemList();
-
     for(uint8 i = 0; i < items.size(); ++i)
     {
         LootItem &item = items[i];
@@ -456,32 +382,26 @@ QuestItemList* Loot::FillFFALoot(Player* player)
         delete ql;
         return NULL;
     }
-
     PlayerFFAItems[player->GetGUIDLow()] = ql;
     return ql;
 }
-
 QuestItemList* Loot::FillQuestLoot(Player* player)
 {
     if (items.size() == MAX_NR_LOOT_ITEMS) return NULL;
     QuestItemList *ql = new QuestItemList();
-
     for(uint8 i = 0; i < quest_items.size(); ++i)
     {
         LootItem &item = quest_items[i];
         if(!item.is_looted && item.AllowedForPlayer(player) )
         {
             ql->push_back(QuestItem(i));
-
             // questitems get blocked when they first apper in a
             // player's quest vector
             //
             // increase once if one looter only, looter-times if free for all
             if (item.freeforall || !item.is_blocked)
                 ++unlootedCount;
-
             item.is_blocked = true;
-
             if (items.size() + ql->size() == MAX_NR_LOOT_ITEMS)
                 break;
         }
@@ -491,15 +411,12 @@ QuestItemList* Loot::FillQuestLoot(Player* player)
         delete ql;
         return NULL;
     }
-
     PlayerQuestItems[player->GetGUIDLow()] = ql;
     return ql;
 }
-
 QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player* player)
 {
     QuestItemList *ql = new QuestItemList();
-
     for(uint8 i = 0; i < items.size(); ++i)
     {
         LootItem &item = items[i];
@@ -518,13 +435,10 @@ QuestItemList* Loot::FillNonQuestNonFFAConditionalLoot(Player* player)
         delete ql;
         return NULL;
     }
-
     PlayerNonQuestNonFFAConditionalItems[player->GetGUIDLow()] = ql;
     return ql;
 }
-
 //===================================================
-
 void Loot::NotifyItemRemoved(uint8 lootIndex)
 {
     // notify all players that are looting this that the item was removed
@@ -540,7 +454,6 @@ void Loot::NotifyItemRemoved(uint8 lootIndex)
             PlayersLooting.erase(i);
     }
 }
-
 void Loot::NotifyMoneyRemoved()
 {
     // notify all players that are looting this that the money was removed
@@ -555,14 +468,12 @@ void Loot::NotifyMoneyRemoved()
             PlayersLooting.erase(i);
     }
 }
-
 void Loot::NotifyQuestItemRemoved(uint8 questIndex)
 {
     // when a free for all questitem is looted
     // all players will get notified of it being removed
     // (other questitems can be looted by each group member)
     // bit inefficient but isn't called often
-
     std::set<uint64>::iterator i_next;
     for(std::set<uint64>::iterator i = PlayersLooting.begin(); i != PlayersLooting.end(); i = i_next)
     {
@@ -575,12 +486,10 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex)
             {
                 // find where/if the player has the given item in it's vector
                 QuestItemList& pql = *pq->second;
-
                 uint8 j;
                 for (j = 0; j < pql.size(); ++j)
                     if (pql[j].index == questIndex)
                         break;
-
                 if (j < pql.size())
                     pl->SendNotifyLootItemRemoved(items.size()+j);
             }
@@ -589,7 +498,6 @@ void Loot::NotifyQuestItemRemoved(uint8 questIndex)
             PlayersLooting.erase(i);
     }
 }
-
 void Loot::generateMoneyLoot( uint32 minAmount, uint32 maxAmount )
 {
     if (maxAmount > 0)
@@ -602,7 +510,6 @@ void Loot::generateMoneyLoot( uint32 minAmount, uint32 maxAmount )
             gold = uint32(urand(minAmount >> 8, maxAmount >> 8) * sWorld.getRate(RATE_DROP_MONEY)) << 8;
     }
 }
-
 LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qitem, QuestItem **ffaitem, QuestItem **conditem)
 {
     LootItem* item = NULL;
@@ -659,19 +566,15 @@ LootItem* Loot::LootItemInSlot(uint32 lootSlot, Player* player, QuestItem **qite
             }
         }
     }
-
     if(is_looted)
         return NULL;
-
     return item;
 }
-
 uint32 Loot::GetMaxSlotInLootFor(Player* player) const
 {
     QuestItemMap::const_iterator itr = PlayerQuestItems.find(player->GetGUIDLow());
     return items.size() + (itr != PlayerQuestItems.end() ?  itr->second->size() : 0);
 }
-
 ByteBuffer& operator<<(ByteBuffer& b, LootItem const& li)
 {
     b << uint32(li.itemid);
@@ -682,7 +585,6 @@ ByteBuffer& operator<<(ByteBuffer& b, LootItem const& li)
     //b << uint8(0);                                        // slot type - will send after this function call
     return b;
 }
-
 ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
 {
     if (lv.permission == NONE_PERMISSION)
@@ -691,17 +593,12 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
         b << uint8(0);                                      // item count
         return b;                                           // nothing output more
     }
-
     Loot &l = lv.loot;
-
     uint8 itemsShown = 0;
-
     //gold
     b << uint32(l.gold);
-
     size_t count_pos = b.wpos();                            // pos of item count byte
     b << uint8(0);                                          // item count placeholder
-
     switch (lv.permission)
     {
         case GROUP_PERMISSION:
@@ -713,7 +610,6 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
                 if (!l.items[i].is_looted && !l.items[i].freeforall && !l.items[i].conditionId && l.items[i].AllowedForPlayer(lv.viewer))
                 {
                     uint8 slot_type = (l.items[i].is_blocked || l.items[i].is_underthreshold) ? 0 : 1;
-
                     b << uint8(i) << l.items[i];            //send the index and the item if it's not looted, and blocked or under threshold, free for all items will be sent later, only one-player loots here
                     b << uint8(slot_type);                  // 0 - get 1 - look only
                     ++itemsShown;
@@ -739,7 +635,6 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
         default:
             return b;                                       // nothing output more
     }
-
     QuestItemMap const& lootPlayerQuestItems = l.GetPlayerQuestItems();
     QuestItemMap::const_iterator q_itr = lootPlayerQuestItems.find(lv.viewer->GetGUIDLow());
     if (q_itr != lootPlayerQuestItems.end())
@@ -757,7 +652,6 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
             }
         }
     }
-
     QuestItemMap const& lootPlayerFFAItems = l.GetPlayerFFAItems();
     QuestItemMap::const_iterator ffa_itr = lootPlayerFFAItems.find(lv.viewer->GetGUIDLow());
     if (ffa_itr != lootPlayerFFAItems.end())
@@ -774,7 +668,6 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
             }
         }
     }
-
     QuestItemMap const& lootPlayerNonQuestNonFFAConditionalItems = l.GetPlayerNonQuestNonFFAConditionalItems();
     QuestItemMap::const_iterator nn_itr = lootPlayerNonQuestNonFFAConditionalItems.find(lv.viewer->GetGUIDLow());
     if (nn_itr != lootPlayerNonQuestNonFFAConditionalItems.end())
@@ -791,17 +684,13 @@ ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv)
             }
         }
     }
-
     //update number of items shown
     b.put<uint8>(count_pos,itemsShown);
-
     return b;
 }
-
 //
 // --------- LootTemplate::LootGroup ---------
 //
-
 // Adds an entry to the group (at loading stage)
 void LootTemplate::LootGroup::AddEntry(LootStoreItem& item)
 {
@@ -810,19 +699,16 @@ void LootTemplate::LootGroup::AddEntry(LootStoreItem& item)
     else
         EqualChanced.push_back(item);
 }
-
 // Rolls an item from the group, returns NULL if all miss their chances
 LootStoreItem const * LootTemplate::LootGroup::Roll() const
 {
     if (!ExplicitlyChanced.empty())                         // First explicitly chanced entries are checked
     {
         float Roll = rand_chance();
-
         for (uint32 i=0; i<ExplicitlyChanced.size(); ++i)    //check each explicitly chanced entry in the template and modify its chance based on quality.
         {
             if(ExplicitlyChanced[i].chance>=100.0f)
                 return &ExplicitlyChanced[i];
-
             Roll -= ExplicitlyChanced[i].chance;
             if (Roll < 0)
                 return &ExplicitlyChanced[i];
@@ -830,10 +716,8 @@ LootStoreItem const * LootTemplate::LootGroup::Roll() const
     }
     if (!EqualChanced.empty())                              // If nothing selected yet - an item is taken from equal-chanced part
         return &EqualChanced[irand(0, EqualChanced.size()-1)];
-
     return NULL;                                            // Empty drop from the group
 }
-
 // True if group includes at least 1 quest drop entry
 bool LootTemplate::LootGroup::HasQuestDrop() const
 {
@@ -845,7 +729,6 @@ bool LootTemplate::LootGroup::HasQuestDrop() const
             return true;
     return false;
 }
-
 // True if group includes at least 1 quest drop entry for active quests of the player
 bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const * player) const
 {
@@ -857,7 +740,6 @@ bool LootTemplate::LootGroup::HasQuestDropForPlayer(Player const * player) const
             return true;
     return false;
 }
-
 // Rolls an item from the group (if any takes its chance) and adds the item to the loot
 void LootTemplate::LootGroup::Process(Loot& loot) const
 {
@@ -865,30 +747,23 @@ void LootTemplate::LootGroup::Process(Loot& loot) const
     if (item != NULL)
         loot.AddItem(*item);
 }
-
 // Overall chance for the group without equal chanced items
 float LootTemplate::LootGroup::RawTotalChance() const
 {
     float result = 0;
-
     for (LootStoreItemList::const_iterator i=ExplicitlyChanced.begin(); i != ExplicitlyChanced.end(); ++i)
         if ( !i->needs_quest )
             result += i->chance;
-
     return result;
 }
-
 // Overall chance for the group
 float LootTemplate::LootGroup::TotalChance() const
 {
     float result = RawTotalChance();
-
     if (!EqualChanced.empty() && result < 100.0f)
         return 100.0f;
-
     return result;
 }
-
 void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint32 group_id) const
 {
     float chance = RawTotalChance();
@@ -896,13 +771,11 @@ void LootTemplate::LootGroup::Verify(LootStore const& lootstore, uint32 id, uint
     {
         sLog.outErrorDb("Table '%s' entry %u group %d has total chance > 100%% (%f)", lootstore.GetName(), id, group_id, chance);
     }
-
     if(chance >= 100.0f && !EqualChanced.empty())
     {
         sLog.outErrorDb("Table '%s' entry %u group %d has items with chance=0%% but group total chance >= 100%% (%f)", lootstore.GetName(), id, group_id, chance);
     }
 }
-
 void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const
 {
     for (LootStoreItemList::const_iterator ieItr=ExplicitlyChanced.begin(); ieItr != ExplicitlyChanced.end(); ++ieItr)
@@ -915,7 +788,6 @@ void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& store, LootId
                 ref_set->erase(-ieItr->mincountOrRef);
         }
     }
-
     for (LootStoreItemList::const_iterator ieItr=EqualChanced.begin(); ieItr != EqualChanced.end(); ++ieItr)
     {
         if(ieItr->mincountOrRef < 0)
@@ -927,11 +799,9 @@ void LootTemplate::LootGroup::CheckLootRefs(LootTemplateMap const& store, LootId
         }
     }
 }
-
 //
 // --------- LootTemplate ---------
 //
-
 // Adds an entry to the group (at loading stage)
 void LootTemplate::AddEntry(LootStoreItem& item)
 {
@@ -944,7 +814,6 @@ void LootTemplate::AddEntry(LootStoreItem& item)
     else                                                    // Non-grouped entries and references are stored together
         Entries.push_back(item);
 }
-
 // Rolls for every item in the template and adds the rolled items the the loot
 void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint8 groupId) const
 {
@@ -952,36 +821,29 @@ void LootTemplate::Process(Loot& loot, LootStore const& store, bool rate, uint8
     {
         if (groupId > Groups.size())
             return;                                         // Error message already printed at loading stage
-
         Groups[groupId-1].Process(loot);
         return;
     }
-
     // Rolling non-grouped items
     for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i )
     {
         if (!i->Roll(rate))
             continue;                                       // Bad luck for the entry
-
         if (i->mincountOrRef < 0)                           // References processing
         {
             LootTemplate const* Referenced = LootTemplates_Reference.GetLootFor(-i->mincountOrRef);
-
             if(!Referenced)
                 continue;                                   // Error message already printed at loading stage
-
             for (uint32 loop=0; loop < i->maxcount; ++loop )// Ref multiplicator
                 Referenced->Process(loot, store, rate, i->group);
         }
         else                                                // Plain entries (not a reference, not grouped)
             loot.AddItem(*i);                               // Chance is already checked, just add
     }
-
     // Now processing groups
     for (LootGroups::const_iterator i = Groups.begin( ) ; i != Groups.end( ) ; ++i )
         i->Process(loot);
 }
-
 // True if template includes at least 1 quest drop entry
 bool LootTemplate::HasQuestDrop(LootTemplateMap const& store, uint8 groupId) const
 {
@@ -991,7 +853,6 @@ bool LootTemplate::HasQuestDrop(LootTemplateMap const& store, uint8 groupId) con
             return false;                                   // Error message [should be] already printed at loading stage
         return Groups[groupId-1].HasQuestDrop();
     }
-
     for (LootStoreItemList::const_iterator i = Entries.begin(); i != Entries.end(); ++i )
     {
         if (i->mincountOrRef < 0)                           // References
@@ -1005,15 +866,12 @@ bool LootTemplate::HasQuestDrop(LootTemplateMap const& store, uint8 groupId) con
         else if ( i->needs_quest )
             return true;                                    // quest drop found
     }
-
     // Now processing groups
     for (LootGroups::const_iterator i = Groups.begin() ; i != Groups.end() ; ++i )
         if (i->HasQuestDrop())
             return true;
-
     return false;
 }
-
 // True if template includes at least 1 quest drop for an active quest of the player
 bool LootTemplate::HasQuestDropForPlayer(LootTemplateMap const& store, Player const* player, uint8 groupId) const
 {
@@ -1023,7 +881,6 @@ bool LootTemplate::HasQuestDropForPlayer(LootTemplateMap const& store, Player co
             return false;                                   // Error message already printed at loading stage
         return Groups[groupId-1].HasQuestDropForPlayer(player);
     }
-
     // Checking non-grouped entries
     for (LootStoreItemList::const_iterator i = Entries.begin() ; i != Entries.end() ; ++i )
     {
@@ -1038,25 +895,20 @@ bool LootTemplate::HasQuestDropForPlayer(LootTemplateMap const& store, Player co
         else if ( player->HasQuestForItem(i->itemid) )
             return true;                                    // active quest drop found
     }
-
     // Now checking groups
     for (LootGroups::const_iterator i = Groups.begin(); i != Groups.end(); ++i )
         if (i->HasQuestDropForPlayer(player))
             return true;
-
     return false;
 }
-
 // Checks integrity of the template
 void LootTemplate::Verify(LootStore const& lootstore, uint32 id) const
 {
     // Checking group chances
     for (uint32 i=0; i < Groups.size(); ++i)
         Groups[i].Verify(lootstore,id,i+1);
-
     // TODO: References validity checks
 }
-
 void LootTemplate::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const
 {
     for(LootStoreItemList::const_iterator ieItr = Entries.begin(); ieItr != Entries.end(); ++ieItr)
@@ -1069,16 +921,13 @@ void LootTemplate::CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_se
                 ref_set->erase(-ieItr->mincountOrRef);
         }
     }
-
     for(LootGroups::const_iterator grItr = Groups.begin(); grItr != Groups.end(); ++grItr)
         grItr->CheckLootRefs(store,ref_set);
 }
-
 void LoadLootTemplates_Creature()
 {
     LootIdSet ids_set, ids_setUsed;
     LootTemplates_Creature.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
     {
@@ -1095,16 +944,13 @@ void LoadLootTemplates_Creature()
     }
     for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Creature.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Disenchant()
 {
     LootIdSet ids_set, ids_setUsed;
     LootTemplates_Disenchant.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
     {
@@ -1124,12 +970,10 @@ void LoadLootTemplates_Disenchant()
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Disenchant.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Fishing()
 {
     LootIdSet ids_set;
     LootTemplates_Fishing.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sAreaStore.GetNumRows(); ++i )
     {
@@ -1137,16 +981,13 @@ void LoadLootTemplates_Fishing()
             if(ids_set.count(areaEntry->ID))
                 ids_set.erase(areaEntry->ID);
     }
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Fishing.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Gameobject()
 {
     LootIdSet ids_set, ids_setUsed;
     LootTemplates_Gameobject.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i )
     {
@@ -1163,54 +1004,43 @@ void LoadLootTemplates_Gameobject()
     }
     for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Gameobject.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Item()
 {
     LootIdSet ids_set;
     LootTemplates_Item.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
         if(ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i))
             if(ids_set.count(proto->ItemId))
                 ids_set.erase(proto->ItemId);
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Item.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Milling()
 {
     LootIdSet ids_set;
     LootTemplates_Milling.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
     {
         ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i);
         if(!proto)
             continue;
-
         if((proto->BagFamily & BAG_FAMILY_MASK_HERBS)==0)
             continue;
-
         if(ids_set.count(proto->ItemId))
             ids_set.erase(proto->ItemId);
     }
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Milling.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Pickpocketing()
 {
     LootIdSet ids_set, ids_setUsed;
     LootTemplates_Pickpocketing.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
     {
@@ -1227,46 +1057,37 @@ void LoadLootTemplates_Pickpocketing()
     }
     for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Pickpocketing.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Prospecting()
 {
     LootIdSet ids_set;
     LootTemplates_Prospecting.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i )
     {
         ItemPrototype const* proto = sItemStorage.LookupEntry<ItemPrototype>(i);
         if(!proto)
             continue;
-
         if((proto->BagFamily & BAG_FAMILY_MASK_MINING_SUPP)==0)
             continue;
-
         if(ids_set.count(proto->ItemId))
             ids_set.erase(proto->ItemId);
     }
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Prospecting.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_QuestMail()
 {
     LootIdSet ids_set;
     LootTemplates_QuestMail.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     ObjectMgr::QuestMap const& questMap = objmgr.GetQuestTemplates();
     for(ObjectMgr::QuestMap::const_iterator itr = questMap.begin(); itr != questMap.end(); ++itr )
     {
         if(!itr->second->GetRewMailTemplateId())
             continue;
-
         if(ids_set.count(itr->first))
             ids_set.erase(itr->first);
         /* disabled reporting: some quest mails not include items
@@ -1274,16 +1095,13 @@ void LoadLootTemplates_QuestMail()
             LootTemplates_QuestMail.ReportNotExistedId(itr->first);
         */
     }
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_QuestMail.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Skinning()
 {
     LootIdSet ids_set, ids_setUsed;
     LootTemplates_Skinning.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i )
     {
@@ -1300,27 +1118,22 @@ void LoadLootTemplates_Skinning()
     }
     for(LootIdSet::const_iterator itr = ids_setUsed.begin(); itr != ids_setUsed.end(); ++itr)
         ids_set.erase(*itr);
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Skinning.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Spell()
 {
     LootIdSet ids_set;
     LootTemplates_Spell.LoadAndCollectLootIds(ids_set);
-
     // remove real entries and check existence loot
     for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
     {
         SpellEntry const* spellInfo = sSpellStore.LookupEntry (spell_id);
         if(!spellInfo)
             continue;
-
         // possible cases
         if( !IsLootCraftingSpell(spellInfo))
             continue;
-
         if(!ids_set.count(spell_id))
         {
             // not report about not trainable spells (optionally supported by DB)
@@ -1333,16 +1146,13 @@ void LoadLootTemplates_Spell()
         else
             ids_set.erase(spell_id);
     }
-
     // output error for any still listed (not referenced from appropriate table) ids
     LootTemplates_Spell.ReportUnusedIds(ids_set);
 }
-
 void LoadLootTemplates_Reference()
 {
     LootIdSet ids_set;
     LootTemplates_Reference.LoadAndCollectLootIds(ids_set);
-
     // check references and remove used
     LootTemplates_Creature.CheckLootRefs(&ids_set);
     LootTemplates_Fishing.CheckLootRefs(&ids_set);
@@ -1355,7 +1165,6 @@ void LoadLootTemplates_Reference()
     LootTemplates_Prospecting.CheckLootRefs(&ids_set);
     LootTemplates_QuestMail.CheckLootRefs(&ids_set);
     LootTemplates_Reference.CheckLootRefs(&ids_set);
-
     // output error for any still listed ids (not referenced from any loot table)
     LootTemplates_Reference.ReportUnusedIds(ids_set);
 }
diff --git a/src/game/LootMgr.h b/src/game/LootMgr.h
index c629977ea67..e7fb4daed36 100644
--- a/src/game/LootMgr.h
+++ b/src/game/LootMgr.h
@@ -17,29 +17,23 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_LOOTMGR_H
 #define TRINITY_LOOTMGR_H
-
 #include "ItemEnchantmentMgr.h"
 #include "ByteBuffer.h"
 #include "Utilities/LinkedReference/RefManager.h"
-
 #include <map>
 #include <vector>
-
 enum RollType
 {
     ROLL_PASS         = 0,
     ROLL_NEED         = 1,
     ROLL_GREED        = 2
 };
-
 #define MAX_NR_LOOT_ITEMS 16
 // note: the client cannot show more than 16 items total
 #define MAX_NR_QUEST_ITEMS 32
 // unrelated to the number of quest items shown, just for reserve
-
 enum LootMethod
 {
     FREE_FOR_ALL      = 0,
@@ -48,7 +42,6 @@ enum LootMethod
     GROUP_LOOT        = 3,
     NEED_BEFORE_GREED = 4
 };
-
 enum PermissionTypes
 {
     ALL_PERMISSION    = 0,
@@ -56,7 +49,6 @@ enum PermissionTypes
     MASTER_PERMISSION = 2,
     NONE_PERMISSION   = 3
 };
-
 enum LootType
 {
     LOOT_CORPSE                 = 1,
@@ -67,14 +59,11 @@ enum LootType
     LOOT_SKINNING               = 6,
     LOOT_PROSPECTING            = 7,
     LOOT_MILLING                = 8,
-
     LOOT_FISHINGHOLE            = 20,                       // unsupported by client, sending LOOT_FISHING instead
     LOOT_INSIGNIA               = 21                        // unsupported by client, sending LOOT_CORPSE instead
 };
-
 class Player;
 class LootStore;
-
 struct LootStoreItem
 {
     uint32  itemid;                                         // id of the item
@@ -84,19 +73,16 @@ struct LootStoreItem
     bool    needs_quest :1;                                 // quest drop (negative ChanceOrQuestChance in DB)
     uint8   maxcount    :8;                                 // max drop count for the item (mincountOrRef positive) or Ref multiplicator (mincountOrRef negative)
     uint16  conditionId :16;                                // additional loot condition Id
-
     // Constructor, converting ChanceOrQuestChance -> (chance, needs_quest)
     // displayid is filled in IsValid() which must be called after
     LootStoreItem(uint32 _itemid, float _chanceOrQuestChance, int8 _group, uint8 _conditionId, int32 _mincountOrRef, uint8 _maxcount)
         : itemid(_itemid), chance(fabs(_chanceOrQuestChance)), mincountOrRef(_mincountOrRef),
         group(_group), needs_quest(_chanceOrQuestChance < 0), maxcount(_maxcount), conditionId(_conditionId)
          {}
-
     bool Roll(bool rate) const;                             // Checks if the entry takes it's chance (at loot generation)
     bool IsValid(LootStore const& store, uint32 entry) const;
                                                             // Checks correctness of values
 };
-
 struct LootItem
 {
     uint32  itemid;
@@ -110,57 +96,43 @@ struct LootItem
     bool    is_underthreshold : 1;
     bool    is_counted        : 1;
     bool    needs_quest       : 1;                          // quest drop
-
     // Constructor, copies most fields from LootStoreItem, generates random count and random suffixes/properties
     // Should be called for non-reference LootStoreItem entries only (mincountOrRef > 0)
     explicit LootItem(LootStoreItem const& li);
-
     // Basic checks for player/item compatibility - if false no chance to see the item in the loot
     bool AllowedForPlayer(Player const * player) const;
 };
-
 struct QuestItem
 {
     uint8   index;                                          // position in quest_items;
     bool    is_looted;
-
     QuestItem()
         : index(0), is_looted(false) {}
-
     QuestItem(uint8 _index, bool _islooted = false)
         : index(_index), is_looted(_islooted) {}
 };
-
 struct Loot;
 class LootTemplate;
-
 typedef std::vector<QuestItem> QuestItemList;
 typedef std::map<uint32, QuestItemList *> QuestItemMap;
 typedef std::vector<LootStoreItem> LootStoreItemList;
 typedef UNORDERED_MAP<uint32, LootTemplate*> LootTemplateMap;
-
 typedef std::set<uint32> LootIdSet;
-
 class LootStore
 {
     public:
         explicit LootStore(char const* name, char const* entryName, bool ratesAllowed)
             : m_name(name), m_entryName(entryName), m_ratesAllowed(ratesAllowed) {}
         virtual ~LootStore() { Clear(); }
-
         void Verify() const;
-
         void LoadAndCollectLootIds(LootIdSet& ids_set);
         void CheckLootRefs(LootIdSet* ref_set = NULL) const;// check existence reference and remove it from ref_set
         void ReportUnusedIds(LootIdSet const& ids_set) const;
         void ReportNotExistedId(uint32 id) const;
-
         bool HaveLootFor(uint32 loot_id) const { return m_LootTemplates.find(loot_id) != m_LootTemplates.end(); }
         bool HaveQuestLootFor(uint32 loot_id) const;
         bool HaveQuestLootForPlayer(uint32 loot_id,Player* player) const;
-
         LootTemplate const* GetLootFor(uint32 loot_id) const;
-
         char const* GetName() const { return m_name; }
         char const* GetEntryName() const { return m_entryName; }
         bool IsRatesAllowed() const { return m_ratesAllowed; }
@@ -173,23 +145,19 @@ class LootStore
         char const* m_entryName;
         bool m_ratesAllowed;
 };
-
 class LootTemplate
 {
     class  LootGroup;                                       // A set of loot definitions for items (refs are not allowed inside)
     typedef std::vector<LootGroup> LootGroups;
-
     public:
         // Adds an entry to the group (at loading stage)
         void AddEntry(LootStoreItem& item);
         // Rolls for every item in the template and adds the rolled items the the loot
         void Process(Loot& loot, LootStore const& store, bool rate, uint8 GroupId = 0) const;
-
         // True if template includes at least 1 quest drop entry
         bool HasQuestDrop(LootTemplateMap const& store, uint8 GroupId = 0) const;
         // True if template includes at least 1 quest drop for an active quest of the player
         bool HasQuestDropForPlayer(LootTemplateMap const& store, Player const * player, uint8 GroupId = 0) const;
-
         // Checks integrity of the template
         void Verify(LootStore const& store, uint32 Id) const;
         void CheckLootRefs(LootTemplateMap const& store, LootIdSet* ref_set) const;
@@ -197,9 +165,7 @@ class LootTemplate
         LootStoreItemList Entries;                          // not grouped only
         LootGroups        Groups;                           // groups have own (optimised) processing, grouped entries go there
 };
-
 //=====================================================
-
 class LootValidatorRef :  public Reference<Loot, LootValidatorRef>
 {
     public:
@@ -207,66 +173,51 @@ class LootValidatorRef :  public Reference<Loot, LootValidatorRef>
         void targetObjectDestroyLink() {}
         void sourceObjectDestroyLink() {}
 };
-
 //=====================================================
-
 class LootValidatorRefManager : public RefManager<Loot, LootValidatorRef>
 {
     public:
         typedef LinkedListHead::Iterator< LootValidatorRef > iterator;
-
         LootValidatorRef* getFirst() { return (LootValidatorRef*)RefManager<Loot, LootValidatorRef>::getFirst(); }
         LootValidatorRef* getLast() { return (LootValidatorRef*)RefManager<Loot, LootValidatorRef>::getLast(); }
-
         iterator begin() { return iterator(getFirst()); }
         iterator end() { return iterator(NULL); }
         iterator rbegin() { return iterator(getLast()); }
         iterator rend() { return iterator(NULL); }
 };
-
 //=====================================================
 struct LootView;
-
 ByteBuffer& operator<<(ByteBuffer& b, LootItem const& li);
 ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv);
-
 struct Loot
 {
     friend ByteBuffer& operator<<(ByteBuffer& b, LootView const& lv);
-
     QuestItemMap const& GetPlayerQuestItems() const { return PlayerQuestItems; }
     QuestItemMap const& GetPlayerFFAItems() const { return PlayerFFAItems; }
     QuestItemMap const& GetPlayerNonQuestNonFFAConditionalItems() const { return PlayerNonQuestNonFFAConditionalItems; }
-
     std::vector<LootItem> items;
     uint32 gold;
     uint8 unlootedCount;
     LootType loot_type;                                     // required for achievement system
-
     Loot(uint32 _gold = 0) : gold(_gold), unlootedCount(0), loot_type(LOOT_CORPSE) {}
     ~Loot() { clear(); }
-
     // if loot becomes invalid this reference is used to inform the listener
     void addLootValidatorRef(LootValidatorRef* pLootValidatorRef)
     {
         i_LootValidatorRefManager.insertFirst(pLootValidatorRef);
     }
-
     // void clear();
     void clear()
     {
         for (QuestItemMap::const_iterator itr = PlayerQuestItems.begin(); itr != PlayerQuestItems.end(); ++itr)
             delete itr->second;
         PlayerQuestItems.clear();
-
         for (QuestItemMap::const_iterator itr = PlayerFFAItems.begin(); itr != PlayerFFAItems.end(); ++itr)
             delete itr->second;
         PlayerFFAItems.clear();
-
         for (QuestItemMap::const_iterator itr = PlayerNonQuestNonFFAConditionalItems.begin(); itr != PlayerNonQuestNonFFAConditionalItems.end(); ++itr)
             delete itr->second;
         PlayerNonQuestNonFFAConditionalItems.clear();
-
         PlayersLooting.clear();
         items.clear();
         quest_items.clear();
@@ -274,41 +225,32 @@ struct Loot
         unlootedCount = 0;
         i_LootValidatorRefManager.clearReferences();
     }
-
     bool empty() const { return items.empty() && gold == 0; }
     bool isLooted() const { return gold == 0 && unlootedCount == 0; }
-
     void NotifyItemRemoved(uint8 lootIndex);
     void NotifyQuestItemRemoved(uint8 questIndex);
     void NotifyMoneyRemoved();
     void AddLooter(uint64 GUID) { PlayersLooting.insert(GUID); }
     void RemoveLooter(uint64 GUID) { PlayersLooting.erase(GUID); }
-
     void generateMoneyLoot(uint32 minAmount, uint32 maxAmount);
     void FillLoot(uint32 loot_id, LootStore const& store, Player* loot_owner, bool personal);
-
     // Inserts the item into the loot (called by LootTemplate processors)
     void AddItem(LootStoreItem const & item);
-
     LootItem* LootItemInSlot(uint32 lootslot, Player* player, QuestItem** qitem = NULL, QuestItem** ffaitem = NULL, QuestItem** conditem = NULL);
     uint32 GetMaxSlotInLootFor(Player* player) const;
-
     private:
         void FillNotNormalLootFor(Player* player);
         QuestItemList* FillFFALoot(Player* player);
         QuestItemList* FillQuestLoot(Player* player);
         QuestItemList* FillNonQuestNonFFAConditionalLoot(Player* player);
-
         std::vector<LootItem> quest_items;
         std::set<uint64> PlayersLooting;
         QuestItemMap PlayerQuestItems;
         QuestItemMap PlayerFFAItems;
         QuestItemMap PlayerNonQuestNonFFAConditionalItems;
-
         // All rolls are registered here. They need to know, when the loot is not valid anymore
         LootValidatorRefManager i_LootValidatorRefManager;
 };
-
 struct LootView
 {
     Loot &loot;
@@ -317,7 +259,6 @@ struct LootView
     LootView(Loot &_loot, Player *_viewer,PermissionTypes _permission = ALL_PERMISSION)
         : loot(_loot), viewer(_viewer), permission(_permission) {}
 };
-
 extern LootStore LootTemplates_Creature;
 extern LootStore LootTemplates_Fishing;
 extern LootStore LootTemplates_Gameobject;
@@ -329,7 +270,6 @@ extern LootStore LootTemplates_Disenchant;
 extern LootStore LootTemplates_Prospecting;
 extern LootStore LootTemplates_QuestMail;
 extern LootStore LootTemplates_Spell;
-
 void LoadLootTemplates_Creature();
 void LoadLootTemplates_Fishing();
 void LoadLootTemplates_Gameobject();
@@ -340,10 +280,8 @@ void LoadLootTemplates_Skinning();
 void LoadLootTemplates_Disenchant();
 void LoadLootTemplates_Prospecting();
 void LoadLootTemplates_QuestMail();
-
 void LoadLootTemplates_Spell();
 void LoadLootTemplates_Reference();
-
 inline void LoadLootTables()
 {
     LoadLootTemplates_Creature();
@@ -357,9 +295,7 @@ inline void LoadLootTables()
     LoadLootTemplates_Prospecting();
     LoadLootTemplates_QuestMail();
     LoadLootTemplates_Spell();
-
     LoadLootTemplates_Reference();
 }
-
 #endif
 
diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index c50b16104f2..e52006b9c37 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Mail.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -31,7 +30,6 @@
 #include "Language.h"
 #include "AuctionHouseBot.h"
 #include "DBCStores.h"
-
 enum MailShowFlags
 {
     MAIL_SHOW_UNK0    = 0x0001,
@@ -40,19 +38,16 @@ enum MailShowFlags
     MAIL_SHOW_UNK2    = 0x0008,                             // unknown, COD will be shown even without that flag
     MAIL_SHOW_RETURN  = 0x0010,
 };
-
 void MailItem::deleteItem( bool inDB )
 {
     if(item)
     {
         if(inDB)
             CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid='%u'", item->GetGUIDLow());
-
         delete item;
         item=NULL;
     }
 }
-
 void WorldSession::HandleSendMail(WorldPacket & recv_data )
 {
     uint64 mailbox, unk3;
@@ -61,28 +56,20 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
     uint8 unk4;
     recv_data >> mailbox;
     recv_data >> receiver;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     recv_data >> subject;
-
     recv_data >> body;
-
     recv_data >> unk1;                                      // stationery?
     recv_data >> unk2;                                      // 0x00000000
-
     MailItemsInfo mi;
-
     uint8 items_count;
     recv_data >> items_count;                               // attached items count
-
     if(items_count > 12)                                    // client limit
     {
         GetPlayer()->SendMailResult(0, MAIL_SEND, MAIL_ERR_TOO_MANY_ATTACHMENTS);
         return;
     }
-
     if(items_count)
     {
         for(uint8 i = 0; i < items_count; ++i)
@@ -94,22 +81,16 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
             mi.AddItem(GUID_LOPART(item_guid), item_slot);
         }
     }
-
     recv_data >> money >> COD;                              // money and cod
     recv_data >> unk3;                                      // const 0
     recv_data >> unk4;                                      // const 0
-
     items_count = mi.size();                                // this is the real size after the duplicates have been removed
-
     if (receiver.empty())
         return;
-
     Player* pl = _player;
-
     uint64 rc = 0;
     if(normalizePlayerName(receiver))
         rc = objmgr.GetPlayerGUIDByName(receiver);
-
     if (!rc)
     {
         sLog.outDetail("Player %u is sending mail to %s (GUID: not existed!) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u",
@@ -117,30 +98,22 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
         pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_RECIPIENT_NOT_FOUND);
         return;
     }
-
     sLog.outDetail("Player %u is sending mail to %s (GUID: %u) with subject %s and body %s includes %u items, %u copper and %u COD copper with unk1 = %u, unk2 = %u", pl->GetGUIDLow(), receiver.c_str(), GUID_LOPART(rc), subject.c_str(), body.c_str(), items_count, money, COD, unk1, unk2);
-
     if(pl->GetGUID() == rc)
     {
         pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_CANNOT_SEND_TO_SELF);
         return;
     }
-
     uint32 cost = items_count ? 30 * items_count : 30;  // price hardcoded in client
-
     uint32 reqmoney = cost + money;
-
     if (pl->GetMoney() < reqmoney)
     {
         pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_NOT_ENOUGH_MONEY);
         return;
     }
-
     Player *receive = objmgr.GetPlayer(rc);
-
     uint32 rc_team = 0;
     uint8 mails_count = 0;                                  //do not allow to send to one player more than 100 mails
-
     if(receive)
     {
         rc_team = receive->GetTeam();
@@ -169,25 +142,21 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
         pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_NOT_YOUR_TEAM);
         return;
     }
-
     uint32 rc_account = 0;
     if(receive)
         rc_account = receive->GetSession()->GetAccountId();
     else
         rc_account = objmgr.GetPlayerAccountIdByGUID(rc);
-
     if (items_count)
     {
         for(MailItemMap::iterator mailItemIter = mi.begin(); mailItemIter != mi.end(); ++mailItemIter)
         {
             MailItem& mailItem = mailItemIter->second;
-
             if(!mailItem.item_guidlow)
             {
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_MAIL_ATTACHMENT_INVALID);
                 return;
             }
-
             mailItem.item = pl->GetItemByGuid(MAKE_NEW_GUID(mailItem.item_guidlow, 0, HIGHGUID_ITEM));
             // prevent sending bag with items (cheat: can be placed in bag after adding equipped empty bag to mail)
             if(!mailItem.item)
@@ -195,25 +164,21 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_MAIL_ATTACHMENT_INVALID);
                 return;
             }
-
             if(!mailItem.item->CanBeTraded(true))
             {
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_EQUIP_ERROR, EQUIP_ERR_MAIL_BOUND_ITEM);
                 return;
             }
-
             if(mailItem.item->IsBoundAccountWide() && mailItem.item->IsSoulBound() && pl->GetSession()->GetAccountId() != rc_account)
             {
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_EQUIP_ERROR, EQUIP_ERR_ARTEFACTS_ONLY_FOR_OWN_CHARACTERS);
                 return;
             }
-
             if (mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED) || mailItem.item->GetUInt32Value(ITEM_FIELD_DURATION))
             {
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_EQUIP_ERROR, EQUIP_ERR_MAIL_BOUND_ITEM);
                 return;
             }
-
             if(COD && mailItem.item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))
             {
                 pl->SendMailResult(0, MAIL_SEND, MAIL_ERR_CANT_SEND_WRAPPED_COD);
@@ -222,18 +187,14 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
         }
     }
     pl->SendMailResult(0, MAIL_SEND, MAIL_OK);
-
     uint32 itemTextId = 0;
     if (!body.empty())
     {
         itemTextId = objmgr.CreateItemText( body );
     }
-
     pl->ModifyMoney( -int32(reqmoney) );
     pl->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_MAIL, cost);
-
     bool needItemDelay = false;
-
     if(items_count > 0 || money > 0)
     {
         if (items_count > 0)
@@ -243,15 +204,12 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
                 MailItem& mailItem = mailItemIter->second;
                 if(!mailItem.item)
                     continue;
-
                 mailItem.item_template = mailItem.item ? mailItem.item->GetEntry() : 0;
-
                 if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
                 {
                     sLog.outCommand(GetAccountId(), "GM %s (Account: %u) mail item: %s (Entry: %u Count: %u) to player: %s (Account: %u)",
                         GetPlayerName(), GetAccountId(), mailItem.item->GetProto()->Name1, mailItem.item->GetEntry(), mailItem.item->GetCount(), receiver.c_str(), rc_account);
                 }
-
                 pl->MoveItemFromInventory(mailItem.item->GetBagSlot(), mailItem.item->GetSlot(), true);
                 CharacterDatabase.BeginTransaction();
                 mailItem.item->DeleteFromInventoryDB();     //deletes item from character's inventory
@@ -260,39 +218,31 @@ void WorldSession::HandleSendMail(WorldPacket & recv_data )
                 CharacterDatabase.PExecute("UPDATE item_instance SET owner_guid = '%u' WHERE guid='%u'", GUID_LOPART(rc), mailItem.item->GetGUIDLow());
                 CharacterDatabase.CommitTransaction();
             }
-
             // if item send to character at another account, then apply item delivery delay
             needItemDelay = pl->GetSession()->GetAccountId() != rc_account;
         }
-
         if(money > 0 &&  GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE))
         {
             sLog.outCommand(GetAccountId(),"GM %s (Account: %u) mail money: %u to player: %s (Account: %u)",
                 GetPlayerName(), GetAccountId(), money, receiver.c_str(), rc_account);
         }
     }
-
     // If theres is an item, there is a one hour delivery delay if sent to another account's character.
     uint32 deliver_delay = needItemDelay ? sWorld.getConfig(CONFIG_MAIL_DELIVERY_DELAY) : 0;
-
     // will delete item or place to receiver mail list
     WorldSession::SendMailTo(receive, MAIL_NORMAL, MAIL_STATIONERY_NORMAL, pl->GetGUIDLow(), GUID_LOPART(rc), subject, itemTextId, &mi, money, COD, MAIL_CHECK_MASK_NONE, deliver_delay);
-
     CharacterDatabase.BeginTransaction();
     pl->SaveInventoryAndGoldToDB();
     CharacterDatabase.CommitTransaction();
 }
-
 //called when mail is read
 void WorldSession::HandleMailMarkAsRead(WorldPacket & recv_data )
 {
     uint64 mailbox;
     uint32 mailId;
     recv_data >> mailbox;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     recv_data >> mailId;
     Player *pl = _player;
     Mail *m = pl->GetMail(mailId);
@@ -306,7 +256,6 @@ void WorldSession::HandleMailMarkAsRead(WorldPacket & recv_data )
         m->state = MAIL_STATE_CHANGED;
     }
 }
-
 //called when client deletes mail
 void WorldSession::HandleMailDelete(WorldPacket & recv_data )
 {
@@ -314,10 +263,8 @@ void WorldSession::HandleMailDelete(WorldPacket & recv_data )
     uint32 mailId;
     recv_data >> mailbox;
     recv_data >> mailId;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     Mail *m = _player->GetMail(mailId);
     Player* pl = _player;
     pl->m_mailsUpdated = true;
@@ -329,21 +276,17 @@ void WorldSession::HandleMailDelete(WorldPacket & recv_data )
             pl->SendMailResult(mailId, MAIL_DELETED, MAIL_ERR_INTERNAL_ERROR);
             return;
         }
-
         m->state = MAIL_STATE_DELETED;
     }
     pl->SendMailResult(mailId, MAIL_DELETED, MAIL_OK);
 }
-
 void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
 {
     uint64 mailbox;
     uint32 mailId;
     recv_data >> mailbox;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     recv_data >> mailId;
     Player *pl = _player;
     Mail *m = pl->GetMail(mailId);
@@ -360,9 +303,7 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
     CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mailId);
     CharacterDatabase.CommitTransaction();
     pl->RemoveMail(mailId);
-
     MailItemsInfo mi;
-
     if(m->HasItems())
     {
         for(std::vector<MailItemInfo>::iterator itr2 = m->items.begin(); itr2 != m->items.end(); ++itr2)
@@ -374,11 +315,9 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
             {
                 //WTF?
             }
-
             pl->RemoveMItem(itr2->item_guid);
         }
     }
-
     if (m->sender == auctionbot.GetAHBplayerGUID())
     {
         SendReturnToSender(MAIL_CREATURE, GetAccountId(), m->receiver, m->sender, m->subject, m->itemTextId, &mi, m->money, m->mailTemplateId);
@@ -387,11 +326,9 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data )
     {
         SendReturnToSender(MAIL_NORMAL, GetAccountId(), m->receiver, m->sender, m->subject, m->itemTextId, &mi, m->money, m->mailTemplateId);
     }
-
     delete m;                                               //we can deallocate old mail
     pl->SendMailResult(mailId, MAIL_RETURNED_TO_SENDER, MAIL_OK);
 }
-
 void WorldSession::SendReturnToSender(uint8 messageType, uint32 sender_acc, uint32 sender_guid, uint32 receiver_guid, const std::string& subject, uint32 itemTextId, MailItemsInfo *mi, uint32 money, uint16 mailTemplateId )
 {
     if(messageType != MAIL_NORMAL)                          // return only to players
@@ -399,27 +336,21 @@ void WorldSession::SendReturnToSender(uint8 messageType, uint32 sender_acc, uint
         mi->deleteIncludedItems(true);
         return;
     }
-
     Player *receiver = objmgr.GetPlayer(MAKE_NEW_GUID(receiver_guid, 0, HIGHGUID_PLAYER));
-
     uint32 rc_account = 0;
     if(!receiver)
         rc_account = objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(receiver_guid, 0, HIGHGUID_PLAYER));
-
     if(!receiver && !rc_account)                            // sender not exist
     {
         mi->deleteIncludedItems(true);
         return;
     }
-
     // prepare mail and send in other case
     bool needItemDelay = false;
-
     if(mi && !mi->empty())
     {
         // if item send to character at another account, then apply item delivery delay
         needItemDelay = sender_acc != rc_account;
-
         // set owner to new receiver (to prevent delete item with sender char deleting)
         CharacterDatabase.BeginTransaction();
         for(MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter)
@@ -431,14 +362,11 @@ void WorldSession::SendReturnToSender(uint8 messageType, uint32 sender_acc, uint
         }
         CharacterDatabase.CommitTransaction();
     }
-
     // If theres is an item, there is a one hour delivery delay.
     uint32 deliver_delay = needItemDelay ? sWorld.getConfig(CONFIG_MAIL_DELIVERY_DELAY) : 0;
-
     // will delete item or place to receiver mail list
     WorldSession::SendMailTo(receiver, MAIL_NORMAL, MAIL_STATIONERY_NORMAL, sender_guid, receiver_guid, subject, itemTextId, mi, money, 0, MAIL_CHECK_MASK_RETURNED,deliver_delay,mailTemplateId);
 }
-
 //called when player takes item attached in mail
 void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
 {
@@ -446,44 +374,35 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
     uint32 mailId;
     uint32 itemId;
     recv_data >> mailbox;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     recv_data >> mailId;
     recv_data >> itemId;                                    // item guid low?
     Player* pl = _player;
-
     Mail* m = pl->GetMail(mailId);
     if(!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_INTERNAL_ERROR);
         return;
     }
-
     // prevent cheating with skip client money check
     if(pl->GetMoney() < m->COD)
     {
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_NOT_ENOUGH_MONEY);
         return;
     }
-
     Item *it = pl->GetMItem(itemId);
-
     ItemPosCountVec dest;
     uint8 msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, it, false );
     if( msg == EQUIP_ERR_OK )
     {
         m->RemoveItem(itemId);
         m->removedItems.push_back(itemId);
-
         if (m->COD > 0)                                     //if there is COD, take COD money from player and send them to sender by mail
         {
             uint64 sender_guid = MAKE_NEW_GUID(m->sender, 0, HIGHGUID_PLAYER);
             Player *receive = objmgr.GetPlayer(sender_guid);
-
             uint32 sender_accId = 0;
-
             if( GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
             {
                 std::string sender_name;
@@ -496,7 +415,6 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
                 {
                     // can be calculated early
                     sender_accId = objmgr.GetPlayerAccountIdByGUID(sender_guid);
-
                     if(!objmgr.GetPlayerNameByGUID(sender_guid,sender_name))
                         sender_name = objmgr.GetTrinityStringForDBCLocale(LANG_UNKNOWN);
                 }
@@ -505,104 +423,80 @@ void WorldSession::HandleMailTakeItem(WorldPacket & recv_data )
             }
             else if(!receive)
                 sender_accId = objmgr.GetPlayerAccountIdByGUID(sender_guid);
-
             // check player existence
             if(receive || sender_accId)
             {
                 WorldSession::SendMailTo(receive, MAIL_NORMAL, MAIL_STATIONERY_NORMAL, m->receiver, m->sender, m->subject, 0, NULL, m->COD, 0, MAIL_CHECK_MASK_COD_PAYMENT);
             }
-
             pl->ModifyMoney( -int32(m->COD) );
         }
         m->COD = 0;
         m->state = MAIL_STATE_CHANGED;
         pl->m_mailsUpdated = true;
         pl->RemoveMItem(it->GetGUIDLow());
-
         uint32 count = it->GetCount();                      // save counts before store and possible merge with deleting
         pl->MoveItemToInventory(dest,it,true);
-
         CharacterDatabase.BeginTransaction();
         pl->SaveInventoryAndGoldToDB();
         pl->_SaveMail();
         CharacterDatabase.CommitTransaction();
-
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_OK, 0, itemId, count);
     }
     else
         pl->SendMailResult(mailId, MAIL_ITEM_TAKEN, MAIL_ERR_EQUIP_ERROR, msg);
 }
-
 void WorldSession::HandleMailTakeMoney(WorldPacket & recv_data )
 {
     uint64 mailbox;
     uint32 mailId;
     recv_data >> mailbox;
     recv_data >> mailId;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     Player *pl = _player;
-
     Mail* m = pl->GetMail(mailId);
     if(!m || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_MONEY_TAKEN, MAIL_ERR_INTERNAL_ERROR);
         return;
     }
-
     pl->SendMailResult(mailId, MAIL_MONEY_TAKEN, MAIL_OK);
-
     pl->ModifyMoney(m->money);
     m->money = 0;
     m->state = MAIL_STATE_CHANGED;
     pl->m_mailsUpdated = true;
-
     // save money and mail to prevent cheating
     CharacterDatabase.BeginTransaction();
     pl->SaveGoldToDB();
     pl->_SaveMail();
     CharacterDatabase.CommitTransaction();
 }
-
 //called when player lists his received mails
 void WorldSession::HandleGetMailList(WorldPacket & recv_data )
 {
     uint64 mailbox;
     recv_data >> mailbox;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     Player* pl = _player;
-
     //load players mails, and mailed items
     if(!pl->m_mailsLoaded)
         pl ->_LoadMail();
-
     // client can't work with packets > max int16 value
     const uint32 maxPacketSize = 32767;
-
     uint32 mails_count = 0;                                 // real send to client mails amount
-
     WorldPacket data(SMSG_MAIL_LIST_RESULT, (200));         // guess size
     data << uint8(0);                                       // mail's count
     time_t cur_time = time(NULL);
-
     for(PlayerMails::iterator itr = pl->GetmailBegin(); itr != pl->GetmailEnd(); ++itr)
     {
         // skip deleted or not delivered (deliver delay not expired) mails
         if ((*itr)->state == MAIL_STATE_DELETED || cur_time < (*itr)->deliver_time)
             continue;
-
         uint8 item_count = (*itr)->items.size();            // max count is MAX_MAIL_ITEMS (12)
-
         size_t next_mail_size = 2+4+1+8+4*8+((*itr)->subject.size()+1)+1+item_count*(1+4+4+6*3*4+4+4+1+4+4+4);
-
         if(data.wpos()+next_mail_size > maxPacketSize)
             break;
-
         uint32 show_flags = 0;
         if ((*itr)->messageType != MAIL_NORMAL)
             show_flags |= MAIL_SHOW_DELETE;
@@ -610,11 +504,9 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
             show_flags |= MAIL_SHOW_AUCTION;
         if ((*itr)->HasItems() && (*itr)->messageType == MAIL_NORMAL)
             show_flags |= MAIL_SHOW_RETURN;
-
         data << (uint16) 0x0040;                            // unknown 2.3.0, different values
         data << (uint32) (*itr)->messageID;                 // Message ID
         data << (uint8) (*itr)->messageType;                // Message Type
-
         switch((*itr)->messageType)
         {
             case MAIL_NORMAL:                               // sender guid
@@ -628,7 +520,6 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
             case MAIL_ITEM:                                 // item entry (?) sender = "Unknown", NYI
                 break;
         }
-
         data << (uint32) (*itr)->COD;                       // COD
         data << (uint32) (*itr)->itemTextId;                // sure about this
         data << (uint32) 0;                                 // unknown
@@ -639,9 +530,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
         data << (float)  ((*itr)->expire_time-time(NULL))/DAY;
         data << (uint32) (*itr)->mailTemplateId;            // mail template (MailTemplate.dbc)
         data << (*itr)->subject;                            // Subject string - once 00, when mail type = 3
-
         data << (uint8) item_count;                         // client limit is 0x10
-
         for(uint8 i = 0; i < item_count; ++i)
         {
             Item *item = pl->GetMItem((*itr)->items[i].item_guid);
@@ -675,68 +564,51 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data )
             // unknown wotlk
             data << (uint8)  0;
         }
-
         mails_count += 1;
     }
-
     data.put<uint8>(0, mails_count);                        // set real send mails to client
     SendPacket(&data);
-
     // recalculate m_nextMailDelivereTime and unReadMails
     _player->UpdateNextMailTimeAndUnreads();
 }
-
 ///this function is called when client needs mail message body, or when player clicks on item which has ITEM_FIELD_ITEM_TEXT_ID > 0
 void WorldSession::HandleItemTextQuery(WorldPacket & recv_data )
 {
     uint32 itemTextId;
     uint32 mailId;                                          //this value can be item id in bag, but it is also mail id
     uint32 unk;                                             //maybe something like state - 0x70000000
-
     recv_data >> itemTextId >> mailId >> unk;
-
     //some check needed, if player has item with guid mailId, or has mail with id mailId
-
     sLog.outDebug("CMSG_ITEM_TEXT_QUERY itemguid: %u, mailId: %u, unk: %u", itemTextId, mailId, unk);
-
     WorldPacket data(SMSG_ITEM_TEXT_QUERY_RESPONSE, (4+10));// guess size
     data << itemTextId;
     data << objmgr.GetItemText( itemTextId );
     SendPacket(&data);
 }
-
 //used when player copies mail body to his inventory
 void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
 {
     uint64 mailbox;
     uint32 mailId;
-
     recv_data >> mailbox >> mailId;
-
     if (!GetPlayer()->GetGameObjectIfCanInteractWith(mailbox, GAMEOBJECT_TYPE_MAILBOX))
         return;
-
     Player *pl = _player;
-
     Mail* m = pl->GetMail(mailId);
     if(!m || !m->itemTextId || m->state == MAIL_STATE_DELETED || m->deliver_time > time(NULL))
     {
         pl->SendMailResult(mailId, MAIL_MADE_PERMANENT, MAIL_ERR_INTERNAL_ERROR);
         return;
     }
-
     Item *bodyItem = new Item;                              // This is not bag and then can be used new Item.
     if(!bodyItem->Create(objmgr.GenerateLowGuid(HIGHGUID_ITEM), MAIL_BODY_ITEM_TEMPLATE, pl))
     {
         delete bodyItem;
         return;
     }
-
     bodyItem->SetUInt32Value( ITEM_FIELD_ITEM_TEXT_ID , m->itemTextId );
     bodyItem->SetUInt32Value( ITEM_FIELD_CREATOR, m->sender);
-
     sLog.outDetail("HandleMailCreateTextItem mailid=%u",mailId);
-
     ItemPosCountVec dest;
     uint8 msg = _player->CanStoreItem( NULL_BAG, NULL_SLOT, dest, bodyItem, false );
     if( msg == EQUIP_ERR_OK )
@@ -744,7 +616,6 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
         m->itemTextId = 0;
         m->state = MAIL_STATE_CHANGED;
         pl->m_mailsUpdated = true;
-
         pl->StoreItem(dest, bodyItem, true);
         //bodyItem->SetState(ITEM_NEW, pl); is set automatically
         pl->SendMailResult(mailId, MAIL_MADE_PERMANENT, MAIL_OK);
@@ -755,20 +626,16 @@ void WorldSession::HandleMailCreateTextItem(WorldPacket & recv_data )
         delete bodyItem;
     }
 }
-
 //TODO Fix me! ... this void has probably bad condition, but good data are sent
 void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ )
 {
     WorldPacket data(MSG_QUERY_NEXT_MAIL_TIME, 8);
-
     if(!_player->m_mailsLoaded)
         _player->_LoadMail();
-
     if( _player->unReadMails > 0 )
     {
         data << (uint32) 0;                                 // float
         data << (uint32) 0;                                 // count
-
         uint32 count = 0;
         time_t now = time(NULL);
         for(PlayerMails::iterator itr = _player->GetmailBegin(); itr != _player->GetmailEnd(); ++itr)
@@ -777,13 +644,10 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ )
             // must be not checked yet
             if(m->checked & MAIL_CHECK_MASK_READ)
                 continue;
-
             // and already delivered
             if(now < m->deliver_time)
                 continue;
-
             data << (uint64) m->sender;                     // sender guid
-
             switch(m->messageType)
             {
                 case MAIL_AUCTION:
@@ -798,7 +662,6 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ )
                     break;
             }
             data << (uint32) 0xC6000000;                    // float unk, time or something
-
             ++count;
             if(count == 2)                                  // do not display more than 2 mails
                 break;
@@ -812,7 +675,6 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ )
     }
     SendPacket(&data);
 }
-
 void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 stationery, uint32 sender_guidlow_or_entry, uint32 receiver_guidlow, std::string subject, uint32 itemTextId, MailItemsInfo* mi, uint32 money, uint32 COD, uint32 checked, uint32 deliver_delay, uint16 mailTemplateId)
 {
     if (receiver_guidlow == auctionbot.GetAHBplayerGUID())
@@ -824,28 +686,22 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station
         return;
     }
     uint32 mailId = objmgr.GenerateMailID();
-
     time_t deliver_time = time(NULL) + deliver_delay;
-
     //expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour
     uint32 expire_delay;
     if(messageType == MAIL_AUCTION && !mi && !money)        // auction mail without any items and money
         expire_delay = sWorld.getConfig(CONFIG_MAIL_DELIVERY_DELAY);
     else
         expire_delay = (COD > 0) ? 3*DAY : 30*DAY;
-
     time_t expire_time = deliver_time + expire_delay;
-
     if(mailTemplateId && !sMailTemplateStore.LookupEntry(mailTemplateId))
     {
         sLog.outError( "WorldSession::SendMailTo - Mail have not existed MailTemplateId (%u), remove at send", mailTemplateId);
         mailTemplateId = 0;
     }
-
     if(receiver)
     {
         receiver->AddNewMailDeliverTime(deliver_time);
-
         if ( receiver->IsMailsLoaded() )
         {
             Mail * m = new Mail;
@@ -857,19 +713,15 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station
             m->receiver = receiver->GetGUIDLow();
             m->subject = subject;
             m->itemTextId = itemTextId;
-
             if(mi)
                 m->AddAllItems(*mi);
-
             m->expire_time = expire_time;
             m->deliver_time = deliver_time;
             m->money = money;
             m->COD = COD;
             m->checked = checked;
             m->state = MAIL_STATE_UNCHANGED;
-
             receiver->AddMail(m);                           //to insert new mail to beginning of maillist
-
             if(mi)
             {
                 for(MailItemMap::iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter)
@@ -885,13 +737,11 @@ void WorldSession::SendMailTo(Player* receiver, uint8 messageType, uint8 station
     }
     else if(mi)
         mi->deleteIncludedItems();
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.escape_string(subject);
     CharacterDatabase.PExecute("INSERT INTO mail (id,messageType,stationery,mailTemplateId,sender,receiver,subject,itemTextId,has_items,expire_time,deliver_time,money,cod,checked) "
         "VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '%s', '%u', '%u', '" UI64FMTD "','" UI64FMTD "', '%u', '%u', '%d')",
         mailId, messageType, stationery, mailTemplateId, sender_guidlow_or_entry, receiver_guidlow, subject.c_str(), itemTextId, (mi && !mi->empty() ? 1 : 0), (uint64)expire_time, (uint64)deliver_time, money, COD, checked);
-
     if(mi)
     {
         for(MailItemMap::const_iterator mailItemIter = mi->begin(); mailItemIter != mi->end(); ++mailItemIter)
diff --git a/src/game/Mail.h b/src/game/Mail.h
index 8cbe46e6396..5dc8cb5fd3d 100644
--- a/src/game/Mail.h
+++ b/src/game/Mail.h
@@ -19,15 +19,11 @@
  */
 #ifndef TRINITY_MAIL_H
 #define TRINITY_MAIL_H
-
 #include "Common.h"
 #include <map>
-
 class Item;
-
 #define MAIL_BODY_ITEM_TEMPLATE 8383                        // - plain letter, A Dusty Unsent Letter: 889
 #define MAX_MAIL_ITEMS 12
-
 enum MailCheckMask
 {
     MAIL_CHECK_MASK_NONE        = 0,
@@ -36,7 +32,6 @@ enum MailCheckMask
     MAIL_CHECK_MASK_COD_PAYMENT = 8,
     MAIL_CHECK_MASK_RETURNED    = 16
 };
-
 enum MailMessageType
 {
     MAIL_NORMAL         = 0,
@@ -45,14 +40,12 @@ enum MailMessageType
     MAIL_GAMEOBJECT     = 4,                                // client send CMSG_GAMEOBJECT_QUERY on this mailmessagetype
     MAIL_ITEM           = 5,                                // client send CMSG_ITEM_QUERY on this mailmessagetype
 };
-
 enum MailState
 {
     MAIL_STATE_UNCHANGED = 1,
     MAIL_STATE_CHANGED   = 2,
     MAIL_STATE_DELETED   = 3
 };
-
 enum MailAuctionAnswers
 {
     AUCTION_OUTBIDDED           = 0,
@@ -63,7 +56,6 @@ enum MailAuctionAnswers
     AUCTION_CANCELED            = 5,
     AUCTION_SALE_PENDING        = 6
 };
-
 // gathered from Stationery.dbc
 enum MailStationery
 {
@@ -74,27 +66,21 @@ enum MailStationery
     MAIL_STATIONERY_VAL     = 0x40,
     MAIL_STATIONERY_CHR     = 0x41
 };
-
 struct MailItemInfo
 {
     uint32 item_guid;
     uint32 item_template;
 };
-
 struct MailItem
 {
     MailItem() : item_slot(0), item_guidlow(0), item_template(0), item(NULL) {}
-
     uint8 item_slot;                                        // slot in mail
     uint32 item_guidlow;                                    // item guid (low part)
     uint32 item_template;                                   // item entry
     Item *item;                                             // item pointer
-
     void deleteItem(bool inDB = false);
 };
-
 typedef std::map<uint32, MailItem> MailItemMap;
-
 class MailItemsInfo
 {
     public:
@@ -102,7 +88,6 @@ class MailItemsInfo
         MailItemMap::const_iterator end() const { return i_MailItemMap.end(); }
         MailItemMap::iterator begin() { return i_MailItemMap.begin(); }
         MailItemMap::iterator end() { return i_MailItemMap.end(); }
-
         void AddItem(uint32 guidlow, uint32 _template, Item *item, uint8 slot = 0)
         {
             MailItem mailItem;
@@ -112,7 +97,6 @@ class MailItemsInfo
             mailItem.item = item;
             i_MailItemMap[guidlow] = mailItem;
         }
-
         void AddItem(uint32 guidlow, uint8 slot = 0)
         {
             MailItem mailItem;
@@ -120,10 +104,8 @@ class MailItemsInfo
             mailItem.item_slot = slot;
             i_MailItemMap[guidlow] = mailItem;
         }
-
         uint8 size() const { return i_MailItemMap.size(); }
         bool empty() const { return i_MailItemMap.empty(); }
-
         void deleteIncludedItems(bool inDB = false)
         {
             for(MailItemMap::iterator mailItemIter = begin(); mailItemIter != end(); ++mailItemIter)
@@ -135,7 +117,6 @@ class MailItemsInfo
     private:
         MailItemMap i_MailItemMap;                          // Keep the items in a map to avoid duplicate guids (which can happen), store only low part of guid
 };
-
 struct Mail
 {
     uint32 messageID;
@@ -154,7 +135,6 @@ struct Mail
     uint32 COD;
     uint32 checked;
     MailState state;
-
     void AddItem(uint32 itemGuidLow, uint32 item_template)
     {
         MailItemInfo mii;
@@ -162,7 +142,6 @@ struct Mail
         mii.item_template = item_template;
         items.push_back(mii);
     }
-
     void AddAllItems(MailItemsInfo& pMailItemsInfo)
     {
         for(MailItemMap::iterator mailItemIter = pMailItemsInfo.begin(); mailItemIter != pMailItemsInfo.end(); ++mailItemIter)
@@ -171,7 +150,6 @@ struct Mail
             AddItem(mailItem.item_guidlow, mailItem.item_template);
         }
     }
-
     bool RemoveItem(uint32 item_guid)
     {
         for(std::vector<MailItemInfo>::iterator itr = items.begin(); itr != items.end(); ++itr)
@@ -184,7 +162,6 @@ struct Mail
         }
         return false;
     }
-
     bool HasItems() const { return !items.empty(); }
 };
 #endif
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 2f8c4d0e152..ca139c13d2d 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "MapManager.h"
 #include "Player.h"
 #include "Vehicle.h"
@@ -38,17 +37,13 @@
 #include "MapRefManager.h"
 #include "Vehicle.h"
 #include "WaypointManager.h"
-
 #include "MapInstanced.h"
 #include "InstanceSaveMgr.h"
 #include "VMapFactory.h"
-
 #define DEFAULT_GRID_EXPIRY     300
 #define MAX_GRID_LOAD_TIME      50
 #define MAX_CREATURE_ATTACK_RADIUS  (45.0f * sWorld.getRate(RATE_CREATURE_AGGRO))
-
 GridState* si_GridStates[MAX_GRID_STATE];
-
 struct ScriptAction
 {
     uint64 sourceGUID;
@@ -56,11 +51,9 @@ struct ScriptAction
     uint64 ownerGUID;                                       // owner of source if source is item
     ScriptInfo const* script;                               // pointer to static script data
 };
-
 Map::~Map()
 {
     UnloadAll();
-
     while(!i_worldObjects.empty())
     {
         WorldObject *obj = *i_worldObjects.begin();
@@ -69,26 +62,21 @@ Map::~Map()
         obj->RemoveFromWorld();
         obj->ResetMap();
     }
-
     if(!m_scriptSchedule.empty())
         sWorld.DecreaseScheduledScriptCount(m_scriptSchedule.size());
 }
-
 bool Map::ExistMap(uint32 mapid,int gx,int gy)
 {
     int len = sWorld.GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1;
     char* tmp = new char[len];
     snprintf(tmp, len, (char *)(sWorld.GetDataPath()+"maps/%03u%02u%02u.map").c_str(),mapid,gx,gy);
-
     FILE *pf=fopen(tmp,"rb");
-
     if(!pf)
     {
         sLog.outError("Check existing of map file '%s': not exist!",tmp);
         delete[] tmp;
         return false;
     }
-
     map_fileheader header;
     fread(&header, sizeof(header), 1, pf);
     if (header.mapMagic     != uint32(MAP_MAGIC) ||
@@ -99,12 +87,10 @@ bool Map::ExistMap(uint32 mapid,int gx,int gy)
         fclose(pf);                                         //close file before return
         return false;
     }
-
     delete [] tmp;
     fclose(pf);
     return true;
 }
-
 bool Map::ExistVMap(uint32 mapid,int gx,int gy)
 {
     if(VMAP::IVMapManager* vmgr = VMAP::VMapFactory::createOrGetVMapManager())
@@ -121,10 +107,8 @@ bool Map::ExistVMap(uint32 mapid,int gx,int gy)
             }
         }
     }
-
     return true;
 }
-
 void Map::LoadVMap(int gx,int gy)
 {
                                                             // x and y are swapped !!
@@ -142,26 +126,21 @@ void Map::LoadVMap(int gx,int gy)
             break;
     }
 }
-
 void Map::LoadMap(int gx,int gy, bool reload)
 {
     if( i_InstanceId != 0 )
     {
         if(GridMaps[gx][gy])
             return;
-
         // load grid map for base map
         if (!m_parentMap->GridMaps[gx][gy])
             m_parentMap->EnsureGridCreated(GridPair(63-gx,63-gy));
-
         ((MapInstanced*)(m_parentMap))->AddGridMapReference(GridPair(gx,gy));
         GridMaps[gx][gy] = m_parentMap->GridMaps[gx][gy];
         return;
     }
-
     if(GridMaps[gx][gy] && !reload)
         return;
-
     //map already load, delete it before reloading (Is it necessary? Do we really need the ability the reload maps during runtime?)
     if(GridMaps[gx][gy])
     {
@@ -169,7 +148,6 @@ void Map::LoadMap(int gx,int gy, bool reload)
         delete (GridMaps[gx][gy]);
         GridMaps[gx][gy]=NULL;
     }
-
     // map file name
     char *tmp=NULL;
     int len = sWorld.GetDataPath().length()+strlen("maps/%03u%02u%02u.map")+1;
@@ -184,14 +162,12 @@ void Map::LoadMap(int gx,int gy, bool reload)
     }
     delete [] tmp;
 }
-
 void Map::LoadMapAndVMap(int gx,int gy)
 {
     LoadMap(gx,gy);
     if(i_InstanceId == 0)
         LoadVMap(gx, gy);                                   // Only load the data for the base map
 }
-
 void Map::InitStateMachine()
 {
     si_GridStates[GRID_STATE_INVALID] = new InvalidState;
@@ -199,7 +175,6 @@ void Map::InitStateMachine()
     si_GridStates[GRID_STATE_IDLE] = new IdleState;
     si_GridStates[GRID_STATE_REMOVAL] = new RemovalState;
 }
-
 void Map::DeleteStateMachine()
 {
     delete si_GridStates[GRID_STATE_INVALID];
@@ -207,7 +182,6 @@ void Map::DeleteStateMachine()
     delete si_GridStates[GRID_STATE_IDLE];
     delete si_GridStates[GRID_STATE_REMOVAL];
 }
-
 Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _parent)
   : i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode), i_InstanceId(InstanceId), m_unloadTimer(0),
   m_activeNonPlayersIter(m_activeNonPlayers.end()),
@@ -216,7 +190,6 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par
    , i_notifyLock(false), i_scriptLock(false)
 {
     m_notifyTimer.SetInterval(IN_MILISECONDS/2);
-
     for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
     {
         for(unsigned int j=0; j < MAX_NUMBER_OF_GRIDS; ++j)
@@ -226,17 +199,14 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par
             setNGrid(NULL, idx, j);
         }
     }
- 
     //lets initialize visibility distance for map
     Map::InitVisibilityDistance();
 }
- 
 void Map::InitVisibilityDistance()
 {
     //init visibility for continents
     m_VisibleDistance = sWorld.GetMaxVisibleDistanceOnContinents();
 }
-
 // Template specialization of utility methods
 template<class T>
 void Map::AddToGrid(T* obj, NGridType *grid, Cell const& cell)
@@ -246,7 +216,6 @@ void Map::AddToGrid(T* obj, NGridType *grid, Cell const& cell)
     else
         (*grid)(cell.CellX(), cell.CellY()).template AddGridObject<T>(obj, obj->GetGUID());
 }
-
 template<>
 void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
 {
@@ -254,10 +223,8 @@ void Map::AddToGrid(Creature* obj, NGridType *grid, Cell const& cell)
         (*grid)(cell.CellX(), cell.CellY()).AddWorldObject(obj, obj->GetGUID());
     else
         (*grid)(cell.CellX(), cell.CellY()).AddGridObject(obj, obj->GetGUID());
-
     obj->SetCurrentCell(cell);
 }
-
 template<class T>
 void Map::RemoveFromGrid(T* obj, NGridType *grid, Cell const& cell)
 {
@@ -266,7 +233,6 @@ void Map::RemoveFromGrid(T* obj, NGridType *grid, Cell const& cell)
     else
         (*grid)(cell.CellX(), cell.CellY()).template RemoveGridObject<T>(obj, obj->GetGUID());
 }
-
 template<class T>
 void Map::SwitchGridContainers(T* obj, bool on)
 {
@@ -276,17 +242,13 @@ void Map::SwitchGridContainers(T* obj, bool on)
         sLog.outError("Map::SwitchGridContainers: Object " I64FMT " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
-
     Cell cell(p);
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
-
     DEBUG_LOG("Switch object " I64FMT " from grid[%u,%u] %u", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y, on);
     NGridType *ngrid = getNGrid(cell.GridX(), cell.GridY());
     assert( ngrid != NULL );
-
     GridType &grid = (*ngrid)(cell.CellX(), cell.CellY());
-
     if(on)
     {
         grid.RemoveGridObject<T>(obj, obj->GetGUID());
@@ -309,29 +271,24 @@ void Map::SwitchGridContainers(T* obj, bool on)
     }
     obj->m_isWorldObject = on;
 }
-
 template void Map::SwitchGridContainers(Creature *, bool);
 //template void Map::SwitchGridContainers(DynamicObject *, bool);
-
 template<class T>
 void Map::DeleteFromWorld(T* obj)
 {
     // Note: In case resurrectable corpse and pet its removed from global lists in own destructor
     delete obj;
 }
-
 template<>
 void Map::DeleteFromWorld(Player* pl)
 {
     ObjectAccessor::Instance().RemoveObject(pl);
     delete pl;
 }
-
 template<class T>
 void Map::AddNotifier(T*)
 {
 }
-
 template<>
 void Map::AddNotifier(Player* obj)
 {
@@ -339,7 +296,6 @@ void Map::AddNotifier(Player* obj)
     //obj->m_IsInNotifyList = false;
     AddUnitToNotify(obj);
 }
-
 template<>
 void Map::AddNotifier(Creature* obj)
 {
@@ -347,7 +303,6 @@ void Map::AddNotifier(Creature* obj)
     //obj->m_IsInNotifyList = false;
     AddUnitToNotify(obj);
 }
-
 void
 Map::EnsureGridCreated(const GridPair &p)
 {
@@ -357,34 +312,26 @@ Map::EnsureGridCreated(const GridPair &p)
         if(!getNGrid(p.x_coord, p.y_coord))
         {
             sLog.outDebug("Creating grid[%u,%u] for map %u instance %u", p.x_coord, p.y_coord, GetId(), i_InstanceId);
-
             setNGrid(new NGridType(p.x_coord*MAX_NUMBER_OF_GRIDS + p.y_coord, p.x_coord, p.y_coord, i_gridExpiry, sWorld.getConfig(CONFIG_GRID_UNLOAD)),
                 p.x_coord, p.y_coord);
-
             // build a linkage between this map and NGridType
             buildNGridLinkage(getNGrid(p.x_coord, p.y_coord));
-
             getNGrid(p.x_coord, p.y_coord)->SetGridState(GRID_STATE_IDLE);
-
             //z coord
             int gx = (MAX_NUMBER_OF_GRIDS - 1) - p.x_coord;
             int gy = (MAX_NUMBER_OF_GRIDS - 1) - p.y_coord;
-
             if(!GridMaps[gx][gy])
                 LoadMapAndVMap(gx,gy);
         }
     }
 }
-
 void
 Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
 {
     NGridType *grid;
-
     if(EnsureGridLoaded(cell))
     {
         grid = getNGrid(cell.GridX(), cell.GridY());
-
         if (player)
         {
             player->SendDelayResponse(MAX_GRID_LOAD_TIME);
@@ -394,47 +341,37 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
         {
             DEBUG_LOG("Active object nearby triggers of loading grid [%u,%u] on map %u", cell.GridX(), cell.GridY(), GetId());
         }
-
         ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 0.1f);
         grid->SetGridState(GRID_STATE_ACTIVE);
     }
     else
         grid = getNGrid(cell.GridX(), cell.GridY());
-
     if (player)
         AddToGrid(player,grid,cell);
 }
-
 bool Map::EnsureGridLoaded(const Cell &cell)
 {
     EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
     NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
-
     assert(grid != NULL);
     if( !isGridObjectDataLoaded(cell.GridX(), cell.GridY()) )
     {
         sLog.outDebug("Loading grid[%u,%u] for map %u instance %u", cell.GridX(), cell.GridY(), GetId(), i_InstanceId);
-
         ObjectGridLoader loader(*grid, this, cell);
         loader.LoadN();
-
         // Add resurrectable corpses to world object list in grid
         ObjectAccessor::Instance().AddCorpsesToGrid(GridPair(cell.GridX(),cell.GridY()),(*grid)(cell.CellX(), cell.CellY()), this);
-
         setGridObjectDataLoaded(true,cell.GridX(), cell.GridY());
         return true;
     }
-
     return false;
 }
-
 void Map::LoadGrid(float x, float y)
 {
     CellPair pair = Trinity::ComputeCellPair(x, y);
     Cell cell(pair);
     EnsureGridLoaded(cell);
 }
-
 bool Map::Add(Player *player)
 {
     // Check if we are adding to correct map
@@ -444,16 +381,12 @@ bool Map::Add(Player *player)
     Cell cell(p);
     EnsureGridLoadedAtEnter(cell, player);
     player->AddToWorld();
-
     SendInitSelf(player);
     SendInitTransports(player);
-
     player->m_clientGUIDs.clear();
     //AddNotifier(player);
-
     return true;
 }
-
 template<class T>
 void
 Map::Add(T *obj)
@@ -464,7 +397,6 @@ Map::Add(T *obj)
         sLog.outError("Map::Add: Object " UI64FMTD " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
-
     Cell cell(p);
     if(obj->IsInWorld()) // need some clean up later
     {
@@ -472,72 +404,56 @@ Map::Add(T *obj)
         AddNotifier(obj);
         return;
     }
-
     if(obj->isActiveObject())
         EnsureGridLoadedAtEnter(cell);
     else
         EnsureGridCreated(GridPair(cell.GridX(), cell.GridY()));
-
     NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
     assert( grid != NULL );
-
     AddToGrid(obj,grid,cell);
     //obj->SetMap(this);
     obj->AddToWorld();
-
     if(obj->isActiveObject())
         AddToActive(obj);
-
     DEBUG_LOG("Object %u enters grid[%u,%u]", GUID_LOPART(obj->GetGUID()), cell.GridX(), cell.GridY());
-
     //something, such as vehicle, needs to be update immediately
     //also, trigger needs to cast spell, if not update, cannot see visual
     //if(obj->GetTypeId() != TYPEID_UNIT)
         UpdateObjectVisibility(obj,cell,p);
     AddNotifier(obj);
 }
-
 /*
 void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
 {
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
- 
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
         sLog.outError("Map::MessageBroadcast: Player (GUID: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", player->GetGUIDLow(), player->GetPositionX(), player->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
- 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
- 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
- 
     MaNGOS::MessageDeliverer post_man(*player, msg, to_self);
     TypeContainerVisitor<MaNGOS::MessageDeliverer, WorldTypeMapContainer > message(post_man);
     CellLock<ReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *this, *player, GetVisibilityDistance());
 }
- 
 void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg)
 {
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
- 
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
         sLog.outError("Map::MessageBroadcast: Object (GUID: %u TypeId: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
- 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
- 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
- 
     //TODO: currently on continents when Visibility.Distance.InFlight > Visibility.Distance.Continents
     //we have alot of blinking mobs because monster move packet send is broken...
     MaNGOS::ObjectMessageDeliverer post_man(*obj,msg);
@@ -545,77 +461,60 @@ void Map::MessageBroadcast(WorldObject *obj, WorldPacket *msg)
     CellLock<ReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *this, *obj, GetVisibilityDistance());
 }
-
 void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, bool to_self, bool own_team_only)
 {
     CellPair p = MaNGOS::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
- 
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
         sLog.outError("Map::MessageBroadcast: Player (GUID: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", player->GetGUIDLow(), player->GetPositionX(), player->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
- 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
- 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
- 
     MaNGOS::MessageDistDeliverer post_man(*player, msg, dist, to_self, own_team_only);
     TypeContainerVisitor<MaNGOS::MessageDistDeliverer , WorldTypeMapContainer > message(post_man);
     CellLock<ReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *this, *player, dist);
 }
- 
 void Map::MessageDistBroadcast(WorldObject *obj, WorldPacket *msg, float dist)
 {
     CellPair p = MaNGOS::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
- 
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
     {
         sLog.outError("Map::MessageBroadcast: Object (GUID: %u TypeId: %u) have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
         return;
     }
- 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
- 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
- 
     MaNGOS::ObjectMessageDistDeliverer post_man(*obj, msg, dist);
     TypeContainerVisitor<MaNGOS::ObjectMessageDistDeliverer, WorldTypeMapContainer > message(post_man);
     CellLock<ReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *this, *obj, dist);
 }
 */
-
 bool Map::loaded(const GridPair &p) const
 {
     return ( getNGrid(p.x_coord, p.y_coord) && isGridObjectDataLoaded(p.x_coord, p.y_coord) );
 }
-
 void Map::RelocationNotify()
 {
     i_notifyLock = true;
-
     //Notify
     for(std::vector<Unit*>::iterator iter = i_unitsToNotify.begin(); iter != i_unitsToNotify.end(); ++iter)
     {
         Unit *unit = *iter;
         if(!unit)
             continue;
-
         unit->m_NotifyListPos = -1;
-
         if(unit->m_Notified)
             continue;
-
         unit->m_Notified = true;
-
         float dist = abs(unit->GetPositionX() - unit->oldX) + abs(unit->GetPositionY() - unit->oldY);
         if(dist > 10.0f)
         {
@@ -623,7 +522,6 @@ void Map::RelocationNotify()
             VisitWorld(unit->oldX, unit->oldY, GetVisibilityDistance(), notifier);
             dist = 0;
         }
-
         if(unit->GetTypeId() == TYPEID_PLAYER)
         {
             Trinity::PlayerRelocationNotifier notifier(*((Player*)unit));
@@ -643,23 +541,19 @@ void Map::RelocationNotify()
         if(*iter)
             (*iter)->m_Notified = false;
     i_unitsToNotify.clear();
-
     i_notifyLock = false;
-
     if(!i_unitsToNotifyBacklog.empty())
     {
         i_unitsToNotify.insert(i_unitsToNotify.end(), i_unitsToNotifyBacklog.begin(), i_unitsToNotifyBacklog.end());
         i_unitsToNotifyBacklog.clear();
     }
 }
-
 void Map::AddUnitToNotify(Unit* u)
 {
     if(u->m_NotifyListPos < 0 && u->IsInWorld())
     {
         u->oldX = u->GetPositionX();
         u->oldY = u->GetPositionY();
-
         if(i_notifyLock)
         {
             u->m_NotifyListPos = i_unitsToNotifyBacklog.size();
@@ -672,7 +566,6 @@ void Map::AddUnitToNotify(Unit* u)
         }
     }
 }
-
 void Map::RemoveUnitFromNotify(Unit *unit)
 {
     int32 slot = unit->m_NotifyListPos;
@@ -690,10 +583,8 @@ void Map::RemoveUnitFromNotify(Unit *unit)
         assert(slot < i_unitsToNotify.size());
         i_unitsToNotify[slot] = NULL;
     }
-
     unit->m_NotifyListPos = -1;
 }
-
 void Map::Update(const uint32 &t_diff)
 {
     /// update players at tick
@@ -703,45 +594,36 @@ void Map::Update(const uint32 &t_diff)
         if(plr && plr->IsInWorld())
             plr->Update(t_diff);
     }
-
     m_notifyTimer.Update(t_diff);
     if(m_notifyTimer.Passed())
     {
         m_notifyTimer.Reset();
         RelocationNotify();
     }
-
     /// update active cells around players and active objects
     resetMarkedCells();
-
     Trinity::ObjectUpdater updater(t_diff);
     // for creature
     TypeContainerVisitor<Trinity::ObjectUpdater, GridTypeMapContainer  > grid_object_update(updater);
     // for pets
     TypeContainerVisitor<Trinity::ObjectUpdater, WorldTypeMapContainer > world_object_update(updater);
-
     // the player iterator is stored in the map object
     // to make sure calls to Map::Remove don't invalidate it
     for(m_mapRefIter = m_mapRefManager.begin(); m_mapRefIter != m_mapRefManager.end(); ++m_mapRefIter)
     {
         Player* plr = m_mapRefIter->getSource();
-
         if(!plr->IsInWorld())
             continue;
-
         CellPair standing_cell(Trinity::ComputeCellPair(plr->GetPositionX(), plr->GetPositionY()));
-
         // Check for correctness of standing_cell, it also avoids problems with update_cell
         if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
             continue;
-
         // the overloaded operators handle range checking
         // so ther's no need for range checking inside the loop
         CellPair begin_cell(standing_cell), end_cell(standing_cell);
         //lets update mobs/objects in ALL visible cells around player!
         CellArea area = Cell::CalculateCellArea(*plr, GetVisibilityDistance());
         area.ResizeBorders(begin_cell, end_cell);
-
         for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x)
         {
             for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
@@ -762,11 +644,9 @@ void Map::Update(const uint32 &t_diff)
                 }
             }
         }
-
         if(plr->m_seer != plr && !plr->GetVehicle())
             AddUnitToNotify(plr);
     }
-
     // non-player active objects
     if(!m_activeNonPlayers.empty())
     {
@@ -774,26 +654,20 @@ void Map::Update(const uint32 &t_diff)
         {
             // skip not in world
             WorldObject* obj = *m_activeNonPlayersIter;
-
             // step before processing, in this case if Map::Remove remove next object we correctly
             // step to next-next, and if we step to end() then newly added objects can wait next update.
             ++m_activeNonPlayersIter;
-
             if(!obj->IsInWorld())
                 continue;
-
             CellPair standing_cell(Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY()));
-
             // Check for correctness of standing_cell, it also avoids problems with update_cell
             if (standing_cell.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || standing_cell.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
                 continue;
-
             // the overloaded operators handle range checking
             // so ther's no need for range checking inside the loop
             CellPair begin_cell(standing_cell), end_cell(standing_cell);
             begin_cell << 1; begin_cell -= 1;               // upper left
             end_cell >> 1; end_cell += 1;                   // lower right
-
             for(uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x)
             {
                 for(uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y)
@@ -816,7 +690,6 @@ void Map::Update(const uint32 &t_diff)
             }
         }
     }
-
     ///- Process necessary scripts
     if (!m_scriptSchedule.empty())
     {
@@ -824,15 +697,12 @@ void Map::Update(const uint32 &t_diff)
         ScriptsProcess();
         i_scriptLock = false;
     }
-
     MoveAllCreaturesInMoveList();
 }
-
 void Map::Remove(Player *player, bool remove)
 {
     player->RemoveFromWorld();
     SendRemoveTransports(player);
-
     CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP)
         sLog.outCrash("Map::Remove: Player is in invalid cell!");
@@ -846,16 +716,13 @@ void Map::Remove(Player *player, bool remove)
             DEBUG_LOG("Remove player %s from grid[%u,%u]", player->GetName(), cell.GridX(), cell.GridY());
             NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
             assert(grid != NULL);
-
             RemoveFromGrid(player,grid,cell);
             UpdateObjectVisibility(player,cell,p);
         }
     }
-
     if( remove )
         DeleteFromWorld(player);
 }
-
 bool Map::RemoveBones(uint64 guid, float x, float y)
 {
     if (IsRemovalGrid(x, y))
@@ -868,7 +735,6 @@ bool Map::RemoveBones(uint64 guid, float x, float y)
     }
     return true;
 }
-
 template<class T>
 void
 Map::Remove(T *obj, bool remove)
@@ -876,7 +742,6 @@ Map::Remove(T *obj, bool remove)
     obj->RemoveFromWorld();
     if(obj->isActiveObject())
         RemoveFromActive(obj);
-
     CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
         sLog.outError("Map::Remove: Object " I64FMT " have invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUID(), obj->GetPositionX(), obj->GetPositionY(), p.x_coord, p.y_coord);
@@ -888,14 +753,11 @@ Map::Remove(T *obj, bool remove)
             DEBUG_LOG("Remove object " I64FMT " from grid[%u,%u]", obj->GetGUID(), cell.data.Part.grid_x, cell.data.Part.grid_y);
             NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
             assert( grid != NULL );
-
             RemoveFromGrid(obj,grid,cell);
             UpdateObjectVisibility(obj,cell,p);
         }
     }
-
     obj->ResetMap();
-
     if( remove )
     {
         // if option set then object already saved at this moment
@@ -904,30 +766,23 @@ Map::Remove(T *obj, bool remove)
         DeleteFromWorld(obj);
     }
 }
-
 void
 Map::PlayerRelocation(Player *player, float x, float y, float z, float orientation)
 {
     assert(player);
-
     CellPair old_val = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
     CellPair new_val = Trinity::ComputeCellPair(x, y);
-
     Cell old_cell(old_val);
     Cell new_cell(new_val);
     new_cell |= old_cell;
     bool same_cell = (new_cell == old_cell);
-
     player->Relocate(x, y, z, orientation);
-
     if( old_cell.DiffGrid(new_cell) || old_cell.DiffCell(new_cell) )
     {
         DEBUG_LOG("Player %s relocation grid[%u,%u]cell[%u,%u]->grid[%u,%u]cell[%u,%u]", player->GetName(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY());
-
         // update player position for group at taxi flight
         if(player->GetGroup() && player->isInFlight())
             player->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
-
         NGridType* oldGrid = getNGrid(old_cell.GridX(), old_cell.GridY());
         RemoveFromGrid(player, oldGrid,old_cell);
         if( !old_cell.DiffGrid(new_cell) )
@@ -935,9 +790,7 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati
         else
             EnsureGridLoadedAtEnter(new_cell, player);
     }
-
     AddUnitToNotify(player);
-
     NGridType* newGrid = getNGrid(new_cell.GridX(), new_cell.GridY());
     if( !same_cell && newGrid->GetGridState()!= GRID_STATE_ACTIVE )
     {
@@ -945,17 +798,13 @@ Map::PlayerRelocation(Player *player, float x, float y, float z, float orientati
         newGrid->SetGridState(GRID_STATE_ACTIVE);
     }
 }
-
 void
 Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang)
 {
     assert(CheckGridIntegrity(creature,false));
-
     Cell old_cell = creature->GetCurrentCell();
-
     CellPair new_val = Trinity::ComputeCellPair(x, y);
     Cell new_cell(new_val);
-
     // delay creature move for grid/cell to grid/cell moves
     if( old_cell.DiffCell(new_cell) || old_cell.DiffGrid(new_cell) )
     {
@@ -971,7 +820,6 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang
         creature->Relocate(x, y, z, ang);
         AddUnitToNotify(creature);
     }
-
     if(creature->IsVehicle())
     {
         for(SeatMap::iterator itr = creature->GetVehicleKit()->m_Seats.begin(); itr != creature->GetVehicleKit()->m_Seats.end(); ++itr)
@@ -991,18 +839,14 @@ Map::CreatureRelocation(Creature *creature, float x, float y, float z, float ang
                     ang + passenger->m_movementInfo.t_o);
             }
     }
-
     assert(CheckGridIntegrity(creature,true));
 }
-
 void Map::AddCreatureToMoveList(Creature *c, float x, float y, float z, float ang)
 {
     if(!c)
         return;
-
     i_creaturesToMove[c] = CreatureMover(x,y,z,ang);
 }
-
 void Map::MoveAllCreaturesInMoveList()
 {
     while(!i_creaturesToMove.empty())
@@ -1012,11 +856,9 @@ void Map::MoveAllCreaturesInMoveList()
         Creature* c = iter->first;
         CreatureMover cm = iter->second;
         i_creaturesToMove.erase(iter);
-
         // calculate cells
         CellPair new_val = Trinity::ComputeCellPair(cm.x, cm.y);
         Cell new_cell(new_val);
-
         // do move or do move to respawn or remove creature if previous all fail
         if(CreatureCellRelocation(c,new_cell))
         {
@@ -1041,7 +883,6 @@ void Map::MoveAllCreaturesInMoveList()
         }
     }
 }
-
 bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
 {
     Cell const& old_cell = c->GetCurrentCell();
@@ -1054,7 +895,6 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
             if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
                 sLog.outDebug("Creature (GUID: %u Entry: %u) moved in grid[%u,%u] from cell[%u,%u] to cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.CellX(), new_cell.CellY());
             #endif
-
             RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
             AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
         }
@@ -1065,26 +905,20 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
                 sLog.outDebug("Creature (GUID: %u Entry: %u) move in same grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY());
             #endif
         }
-
         return true;
     }
-
     // in diff. grids but active creature
     if(c->isActiveObject())
     {
         EnsureGridLoadedAtEnter(new_cell);
-
         #ifdef TRINITY_DEBUG
         if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
             sLog.outDebug("Active creature (GUID: %u Entry: %u) moved from grid[%u,%u]cell[%u,%u] to grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY());
         #endif
-
         RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
         AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
-
         return true;
     }
-
     // in diff. loaded grid normal creature
     if(loaded(GridPair(new_cell.GridX(), new_cell.GridY())))
     {
@@ -1092,14 +926,11 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
         if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
             sLog.outDebug("Creature (GUID: %u Entry: %u) moved from grid[%u,%u]cell[%u,%u] to grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), old_cell.GridX(), old_cell.GridY(), old_cell.CellX(), old_cell.CellY(), new_cell.GridX(), new_cell.GridY(), new_cell.CellX(), new_cell.CellY());
         #endif
-
         RemoveFromGrid(c,getNGrid(old_cell.GridX(), old_cell.GridY()),old_cell);
         EnsureGridCreated(GridPair(new_cell.GridX(), new_cell.GridY()));
         AddToGrid(c,getNGrid(new_cell.GridX(), new_cell.GridY()),new_cell);
-
         return true;
     }
-
     // fail to move: normal creature attempt move to unloaded grid
     #ifdef TRINITY_DEBUG
     if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
@@ -1107,23 +938,18 @@ bool Map::CreatureCellRelocation(Creature *c, Cell new_cell)
     #endif
     return false;
 }
-
 bool Map::CreatureRespawnRelocation(Creature *c)
 {
     float resp_x, resp_y, resp_z, resp_o;
     c->GetRespawnCoord(resp_x, resp_y, resp_z, &resp_o);
-
     CellPair resp_val = Trinity::ComputeCellPair(resp_x, resp_y);
     Cell resp_cell(resp_val);
-
     c->CombatStop();
     c->GetMotionMaster()->Clear();
-
     #ifdef TRINITY_DEBUG
     if((sLog.getLogFilter() & LOG_FILTER_CREATURE_MOVES)==0)
         sLog.outDebug("Creature (GUID: %u Entry: %u) will moved from grid[%u,%u]cell[%u,%u] to respawn grid[%u,%u]cell[%u,%u].", c->GetGUIDLow(), c->GetEntry(), c->GetCurrentCell().GridX(), c->GetCurrentCell().GridY(), c->GetCurrentCell().CellX(), c->GetCurrentCell().CellY(), resp_cell.GridX(), resp_cell.GridY(), resp_cell.CellX(), resp_cell.CellY());
     #endif
-
     // teleport it to respawn point (like normal respawn if player see)
     if(CreatureCellRelocation(c,resp_cell))
     {
@@ -1136,48 +962,35 @@ bool Map::CreatureRespawnRelocation(Creature *c)
     else
         return false;
 }
-
 bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
 {
     NGridType *grid = getNGrid(x, y);
     assert( grid != NULL);
-
     {
         if(!unloadAll && ActiveObjectsNearGrid(x, y) )
              return false;
-
         sLog.outDebug("Unloading grid[%u,%u] for map %u", x,y, GetId());
-
         ObjectGridUnloader unloader(*grid);
-
         if(!unloadAll)
         {
             // Finish creature moves, remove and delete all creatures with delayed remove before moving to respawn grids
             // Must know real mob position before move
             MoveAllCreaturesInMoveList();
-
             // move creatures to respawn grids if this is diff.grid or to remove list
             unloader.MoveToRespawnN();
-
             // Finish creature moves, remove and delete all creatures with delayed remove before unload
             MoveAllCreaturesInMoveList();
         }
-
         ObjectGridCleaner cleaner(*grid);
         cleaner.CleanN();
-
         RemoveAllObjectsInRemoveList();
-
         unloader.UnloadN();
-
         assert(i_objectsToRemove.empty());
-
         delete grid;
         setNGrid(NULL, x, y);
     }
     int gx = (MAX_NUMBER_OF_GRIDS - 1) - x;
     int gy = (MAX_NUMBER_OF_GRIDS - 1) - y;
-
     // delete grid map, but don't delete if it is from parent map (and thus only reference)
     //+++if (GridMaps[gx][gy]) don't check for GridMaps[gx][gy], we might have to unload vmaps
     {
@@ -1193,13 +1006,11 @@ bool Map::UnloadGrid(const uint32 &x, const uint32 &y, bool unloadAll)
         }
         else
             ((MapInstanced*)m_parentMap)->RemoveGridMapReference(GridPair(gx, gy));
-
         GridMaps[gx][gy] = NULL;
     }
     DEBUG_LOG("Unloading grid[%u,%u] for map %u finished", x,y, GetId());
     return true;
 }
-
 void Map::RemoveAllPlayers()
 {
     if(HavePlayers())
@@ -1216,12 +1027,10 @@ void Map::RemoveAllPlayers()
         }
     }
 }
-
 void Map::UnloadAll()
 {
     // clear all delayed moves, useless anyway do this moves before map unload.
     i_creaturesToMove.clear();
-
     for (GridRefManager<NGridType>::iterator i = GridRefManager<NGridType>::begin(); i != GridRefManager<NGridType>::end(); )
     {
         NGridType &grid(*i->getSource());
@@ -1229,7 +1038,6 @@ void Map::UnloadAll()
         UnloadGrid(grid.getX(), grid.getY(), true);       // deletes the grid and removes it from the GridRefManager
     }
 }
-
 //*****************************
 // Grid function
 //*****************************
@@ -1254,17 +1062,14 @@ GridMap::GridMap()
     m_liquid_type = NULL;
     m_liquid_map  = NULL;
 }
-
 GridMap::~GridMap()
 {
     unloadData();
 }
-
 bool GridMap::loadData(char *filename)
 {
     // Unload old data if exist
     unloadData();
-
     map_fileheader header;
     // Not return error if file not found
     FILE *in = fopen(filename, "rb");
@@ -1302,7 +1107,6 @@ bool GridMap::loadData(char *filename)
     fclose(in);
     return false;
 }
-
 void GridMap::unloadData()
 {
     if (m_area_map) delete[] m_area_map;
@@ -1317,7 +1121,6 @@ void GridMap::unloadData()
     m_liquid_map  = NULL;
     m_gridGetHeight = &GridMap::getHeightFromFlat;
 }
-
 bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size)
 {
     map_areaHeader header;
@@ -1325,7 +1128,6 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size)
     fread(&header, sizeof(header), 1, in);
     if (header.fourcc != uint32(MAP_AREA_MAGIC))
         return false;
-
     m_gridArea = header.gridArea;
     if (!(header.flags & MAP_AREA_NO_AREA))
     {
@@ -1334,7 +1136,6 @@ bool GridMap::loadAreaData(FILE *in, uint32 offset, uint32 size)
     }
     return true;
 }
-
 bool  GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
 {
     map_heightHeader header;
@@ -1342,7 +1143,6 @@ bool  GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
     fread(&header, sizeof(header), 1, in);
     if (header.fourcc != uint32(MAP_HEIGHT_MAGIC))
         return false;
-
     m_gridHeight = header.gridHeight;
     if (!(header.flags & MAP_HEIGHT_NO_HEIGHT))
     {
@@ -1377,7 +1177,6 @@ bool  GridMap::loadHeihgtData(FILE *in, uint32 offset, uint32 size)
         m_gridGetHeight = &GridMap::getHeightFromFlat;
     return true;
 }
-
 bool  GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size)
 {
     map_liquidHeader header;
@@ -1385,14 +1184,12 @@ bool  GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size)
     fread(&header, sizeof(header), 1, in);
     if (header.fourcc != uint32(MAP_LIQUID_MAGIC))
         return false;
-
     m_liquidType   = header.liquidType;
     m_liquid_offX  = header.offsetX;
     m_liquid_offY  = header.offsetY;
     m_liquid_width = header.width;
     m_liquid_height= header.height;
     m_liquidLevel  = header.liquidLevel;
-
     if (!(header.flags & MAP_LIQUID_NO_TYPE))
     {
         m_liquid_type = new uint8 [16*16];
@@ -1405,39 +1202,32 @@ bool  GridMap::loadLiquidData(FILE *in, uint32 offset, uint32 size)
     }
     return true;
 }
-
 uint16 GridMap::getArea(float x, float y)
 {
     if (!m_area_map)
         return m_gridArea;
-
     x = 16 * (32 - x/SIZE_OF_GRIDS);
     y = 16 * (32 - y/SIZE_OF_GRIDS);
     int lx = (int)x & 15;
     int ly = (int)y & 15;
     return m_area_map[lx*16 + ly];
 }
-
 float  GridMap::getHeightFromFlat(float /*x*/, float /*y*/) const
 {
     return m_gridHeight;
 }
-
 float  GridMap::getHeightFromFloat(float x, float y) const
 {
     if (!m_V8 || !m_V9)
         return m_gridHeight;
-
     x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
     y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
-
     int x_int = (int)x;
     int y_int = (int)y;
     x -= x_int;
     y -= y_int;
     x_int&=(MAP_RESOLUTION - 1);
     y_int&=(MAP_RESOLUTION - 1);
-
     // Height stored as: h5 - its v8 grid, h1-h4 - its v9 grid
     // +--------------> X
     // | h1-------h2     Coordinates is:
@@ -1452,7 +1242,6 @@ float  GridMap::getHeightFromFloat(float x, float y) const
     // 1 - detect triangle
     // 2 - solve linear equation from triangle points
     // Calculate coefficients for solve h = a*x + b*y + c
-
     float a,b,c;
     // Select triangle:
     if (x+y < 1)
@@ -1504,22 +1293,18 @@ float  GridMap::getHeightFromFloat(float x, float y) const
     // Calculate height
     return a * x + b * y + c;
 }
-
 float  GridMap::getHeightFromUint8(float x, float y) const
 {
     if (!m_uint8_V8 || !m_uint8_V9)
         return m_gridHeight;
-
     x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
     y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
-
     int x_int = (int)x;
     int y_int = (int)y;
     x -= x_int;
     y -= y_int;
     x_int&=(MAP_RESOLUTION - 1);
     y_int&=(MAP_RESOLUTION - 1);
-
     int32 a, b, c;
     uint8 *V9_h1_ptr = &m_uint8_V9[x_int*128 + x_int + y_int];
     if (x+y < 1)
@@ -1571,22 +1356,18 @@ float  GridMap::getHeightFromUint8(float x, float y) const
     // Calculate height
     return (float)((a * x) + (b * y) + c)*m_gridIntHeightMultiplier + m_gridHeight;
 }
-
 float  GridMap::getHeightFromUint16(float x, float y) const
 {
     if (!m_uint16_V8 || !m_uint16_V9)
         return m_gridHeight;
-
     x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
     y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
-
     int x_int = (int)x;
     int y_int = (int)y;
     x -= x_int;
     y -= y_int;
     x_int&=(MAP_RESOLUTION - 1);
     y_int&=(MAP_RESOLUTION - 1);
-
     int32 a, b, c;
     uint16 *V9_h1_ptr = &m_uint16_V9[x_int*128 + x_int + y_int];
     if (x+y < 1)
@@ -1638,61 +1419,48 @@ float  GridMap::getHeightFromUint16(float x, float y) const
     // Calculate height
     return (float)((a * x) + (b * y) + c)*m_gridIntHeightMultiplier + m_gridHeight;
 }
-
 float  GridMap::getLiquidLevel(float x, float y)
 {
     if (!m_liquid_map)
         return m_liquidLevel;
-
     x = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
     y = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
-
     int cx_int = ((int)x & (MAP_RESOLUTION-1)) - m_liquid_offY;
     int cy_int = ((int)y & (MAP_RESOLUTION-1)) - m_liquid_offX;
-
     if (cx_int < 0 || cx_int >=m_liquid_height)
         return INVALID_HEIGHT;
     if (cy_int < 0 || cy_int >=m_liquid_width )
         return INVALID_HEIGHT;
-
     return m_liquid_map[cx_int*m_liquid_width + cy_int];
 }
-
 uint8  GridMap::getTerrainType(float x, float y)
 {
     if (!m_liquid_type)
         return m_liquidType;
-
     x = 16 * (32 - x/SIZE_OF_GRIDS);
     y = 16 * (32 - y/SIZE_OF_GRIDS);
     int lx = (int)x & 15;
     int ly = (int)y & 15;
     return m_liquid_type[lx*16 + ly];
 }
-
 // Get water state on map
 inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData *data)
 {
     // Check water type (if no water return)
     if (!m_liquid_type && !m_liquidType)
         return LIQUID_MAP_NO_WATER;
-
     // Get cell
     float cx = MAP_RESOLUTION * (32 - x/SIZE_OF_GRIDS);
     float cy = MAP_RESOLUTION * (32 - y/SIZE_OF_GRIDS);
-
     int x_int = (int)cx & (MAP_RESOLUTION-1);
     int y_int = (int)cy & (MAP_RESOLUTION-1);
-
     // Check water type in cell
     uint8 type = m_liquid_type ? m_liquid_type[(x_int>>3)*16 + (y_int>>3)] : m_liquidType;
     if (type == 0)
         return LIQUID_MAP_NO_WATER;
-
     // Check req liquid type mask
     if (ReqLiquidType && !(ReqLiquidType&type))
         return LIQUID_MAP_NO_WATER;
-
     // Check water level:
     // Check water height map
     int lx_int = x_int - m_liquid_offY;
@@ -1701,16 +1469,13 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
         return LIQUID_MAP_NO_WATER;
     if (ly_int < 0 || ly_int >=m_liquid_width )
         return LIQUID_MAP_NO_WATER;
-
     // Get water level
     float liquid_level = m_liquid_map ? m_liquid_map[lx_int*m_liquid_width + ly_int] : m_liquidLevel;
     // Get ground level (sub 0.2 for fix some errors)
     float ground_level = getHeight(x, y);
-
     // Check water level and ground level
     if (liquid_level < ground_level || z < ground_level - 2)
         return LIQUID_MAP_NO_WATER;
-
     // All ok in water -> store data
     if (data)
     {
@@ -1718,10 +1483,8 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
         data->level = liquid_level;
         data->depth_level = ground_level;
     }
-
     // For speed check as int values
     int delta = int((liquid_level - z) * 10);
-
     // Get position delta
     if (delta > 20)                   // Under water
         return LIQUID_MAP_UNDER_WATER;
@@ -1732,19 +1495,15 @@ inline ZLiquidStatus GridMap::getLiquidStatus(float x, float y, float z, uint8 R
                                       // Above water
     return LIQUID_MAP_ABOVE_WATER;
 }
-
 inline GridMap *Map::GetGrid(float x, float y)
 {
     // half opt method
     int gx=(int)(32-x/SIZE_OF_GRIDS);                       //grid x
     int gy=(int)(32-y/SIZE_OF_GRIDS);                       //grid y
-
     // ensure GridMap is loaded
     EnsureGridCreated(GridPair(63-gx,63-gy));
-
     return GridMaps[gx][gy];
 }
-
 float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
 {
     // find raw .map surface under Z coordinates
@@ -1752,7 +1511,6 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
     if(GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y))
     {
         float _mapheight = gmap->getHeight(x,y);
-
         // look from a bit higher pos to find the floor, ignore under surface case
         if(z + 2.0f > _mapheight)
             mapHeight = _mapheight;
@@ -1761,7 +1519,6 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
     }
     else
         mapHeight = VMAP_INVALID_HEIGHT_VALUE;
-
     float vmapHeight;
     if(pUseVmaps)
     {
@@ -1776,23 +1533,19 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
     }
     else
         vmapHeight = VMAP_INVALID_HEIGHT_VALUE;
-
     // mapHeight set for any above raw ground Z or <= INVALID_HEIGHT
     // vmapheight set for any under Z value or <= INVALID_HEIGHT
-
     if( vmapHeight > INVALID_HEIGHT )
     {
         if( mapHeight > INVALID_HEIGHT )
         {
             // we have mapheight and vmapheight and must select more appropriate
-
             // we are already under the surface or vmap height above map heigt
             // or if the distance of the vmap height is less the land height distance
             if( z < mapHeight || vmapHeight > mapHeight || fabs(mapHeight-z) > fabs(vmapHeight-z) )
                 return vmapHeight;
             else
                 return mapHeight;                           // better use .map surface height
-
         }
         else
             return vmapHeight;                              // we have only vmapHeight (if have)
@@ -1807,7 +1560,6 @@ float Map::GetHeight(float x, float y, float z, bool pUseVmaps) const
             return VMAP_INVALID_HEIGHT_VALUE;               // we not have any height
     }
 }
-
 float Map::GetVmapHeight(float x, float y, float z, bool useMaps) const
 {
     float mapHeight;
@@ -1827,7 +1579,6 @@ float Map::GetVmapHeight(float x, float y, float z, bool useMaps) const
         return INVALID_HEIGHT;
     return vmapHeight;
 }
-
 uint16 Map::GetAreaFlag(float x, float y, float z) const
 {
     uint16 areaflag;
@@ -1836,7 +1587,6 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
     // this used while not all *.map files generated (instances)
     else
         areaflag = GetAreaFlagByMapId(GetId());
-
     //FIXME: some hacks for areas above or underground for ground area
     //       required for area specific spells/etc, until map/vmap data
     //       not provided correct areaflag with this hacks
@@ -1865,14 +1615,12 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
                         break;
                     }
                 }
-
                 // The Violet Hold (Dalaran), fast check
                 if (x < 5791.0f && y > 404.0f && y < 595.0f)
                 {
                     areaflag = 2540;
                     break;
                 }
-
                 // Dalaran
                 areaflag = 2153;
             }
@@ -1893,21 +1641,18 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
                         break;
                     }
                 }
-
                 // The Eventide (Dalaran), fast check against diagonal box with lower limit
                 if (z > 635.0f && x+y < 6375.0f && x+y > 6295.0f && x-y < 5106.0f && x-y > 4972.0f)
                 {
                     areaflag = 2543;
                     break;
                 }
-
                 // The Violet Hold (Dalaran), fast check
                 if (x < 5791.0f && y > 404.0f && y < 595.0f)
                 {
                     areaflag = 2540;
                     break;
                 }
-
                 // Dalaran
                 areaflag = 2153;
             }
@@ -1926,7 +1671,6 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
                         areaflag = 2748;
                         break;
                     }
-
                     // The Violet Citadel (Dalaran)
                     if ((x-5803.0f)*(x-5803.0f)+(y-846.18f)*(y-846.18f) < 6690.0f)
                     {
@@ -1934,7 +1678,6 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
                         break;
                     }
                 }
-
                 // Dalaran
                 areaflag = 2153;
             }
@@ -1999,10 +1742,8 @@ uint16 Map::GetAreaFlag(float x, float y, float z) const
             }
             break;
     }
-
     return areaflag;
 }
-
 uint8 Map::GetTerrainType(float x, float y ) const
 {
     if(GridMap *gmap = const_cast<Map*>(this)->GetGrid(x, y))
@@ -2010,7 +1751,6 @@ uint8 Map::GetTerrainType(float x, float y ) const
     else
         return 0;
 }
-
 ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData *data) const
 {
     if(GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y))
@@ -2018,7 +1758,6 @@ ZLiquidStatus Map::getLiquidStatus(float x, float y, float z, uint8 ReqLiquidTyp
     else
         return LIQUID_MAP_NO_WATER;
 }
-
 float Map::GetWaterLevel(float x, float y ) const
 {
     if(GridMap* gmap = const_cast<Map*>(this)->GetGrid(x, y))
@@ -2026,35 +1765,28 @@ float Map::GetWaterLevel(float x, float y ) const
     else
         return 0;
 }
-
 uint32 Map::GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id)
 {
     AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
-
     if (entry)
         return entry->ID;
     else
         return 0;
 }
-
 uint32 Map::GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id)
 {
     AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
-
     if( entry )
         return ( entry->zone != 0 ) ? entry->zone : entry->ID;
     else
         return 0;
 }
-
 void Map::GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag,uint32 map_id)
 {
     AreaTableEntry const *entry = GetAreaEntryByAreaFlagAndMap(areaflag,map_id);
-
     areaid = entry ? entry->ID : 0;
     zoneid = entry ? (( entry->zone != 0 ) ? entry->zone : entry->ID) : 0;
 }
-
 bool Map::IsInWater(float x, float y, float pZ, float min_depth) const
 {
     // Check surface in x, y point for liquid
@@ -2069,7 +1801,6 @@ bool Map::IsInWater(float x, float y, float pZ, float min_depth) const
     }
     return false;
 }
-
 bool Map::IsUnderWater(float x, float y, float z) const
 {
     if (const_cast<Map*>(this)->GetGrid(x, y))
@@ -2079,11 +1810,9 @@ bool Map::IsUnderWater(float x, float y, float z) const
     }
     return false;
 }
-
 bool Map::CheckGridIntegrity(Creature* c, bool moved) const
 {
     Cell const& cur_cell = c->GetCurrentCell();
-
     CellPair xy_val = Trinity::ComputeCellPair(c->GetPositionX(), c->GetPositionY());
     Cell xy_cell(xy_val);
     if(xy_cell != cur_cell)
@@ -2095,15 +1824,12 @@ bool Map::CheckGridIntegrity(Creature* c, bool moved) const
             xy_cell.GridX(),  xy_cell.GridY(),  xy_cell.CellX(),  xy_cell.CellY());
         return true;                                        // not crash at error, just output error in debug mode
     }
-
     return true;
 }
-
 const char* Map::GetMapName() const
 {
     return i_mapEntry ? i_mapEntry->name[sWorld.GetDefaultDbcLocale()] : "UNNAMEDMAP\x0";
 }
-
 void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair)
 {
     cell.data.Part.reserved = ALL_DISTRICT;
@@ -2113,23 +1839,18 @@ void Map::UpdateObjectVisibility( WorldObject* obj, Cell cell, CellPair cellpair
     CellLock<GridReadGuard> cell_lock(cell, cellpair);
     cell_lock->Visit(cell_lock, player_notifier, *this, *obj, GetVisibilityDistance());
 }
-
 /*
 void Map::UpdatePlayerVisibility( Player* player, Cell cell, CellPair cellpair )
 {
     cell.data.Part.reserved = ALL_DISTRICT;
- 
     MaNGOS::PlayerNotifier pl_notifier(*player);
     TypeContainerVisitor<MaNGOS::PlayerNotifier, WorldTypeMapContainer > player_notifier(pl_notifier);
- 
     CellLock<ReadGuard> cell_lock(cell, cellpair);
     cell_lock->Visit(cell_lock, player_notifier, *this, *player, GetVisibilityDistance());
 }
-
 void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpair )
 {
     MaNGOS::VisibleNotifier notifier(*player);
- 
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
     TypeContainerVisitor<MaNGOS::VisibleNotifier, WorldTypeMapContainer > world_notifier(notifier);
@@ -2137,54 +1858,42 @@ void Map::UpdateObjectsVisibilityFor( Player* player, Cell cell, CellPair cellpa
     CellLock<GridReadGuard> cell_lock(cell, cellpair);
     cell_lock->Visit(cell_lock, world_notifier, *this, *player, GetVisibilityDistance());
     cell_lock->Visit(cell_lock, grid_notifier,  *this, *player, GetVisibilityDistance());
- 
     // send data
     notifier.Notify();
 }
- 
 void Map::PlayerRelocationNotify( Player* player, Cell cell, CellPair cellpair )
 {
     CellLock<ReadGuard> cell_lock(cell, cellpair);
     MaNGOS::PlayerRelocationNotifier relocationNotifier(*player);
     cell.data.Part.reserved = ALL_DISTRICT;
- 
     TypeContainerVisitor<MaNGOS::PlayerRelocationNotifier, GridTypeMapContainer >  p2grid_relocation(relocationNotifier);
     TypeContainerVisitor<MaNGOS::PlayerRelocationNotifier, WorldTypeMapContainer > p2world_relocation(relocationNotifier);
- 
     cell_lock->Visit(cell_lock, p2grid_relocation, *this, *player, MAX_CREATURE_ATTACK_RADIUS);
     cell_lock->Visit(cell_lock, p2world_relocation, *this, *player, MAX_CREATURE_ATTACK_RADIUS);
 }
- 
 void Map::CreatureRelocationNotify(Creature *creature, Cell cell, CellPair cellpair)
 {
     CellLock<ReadGuard> cell_lock(cell, cellpair);
     MaNGOS::CreatureRelocationNotifier relocationNotifier(*creature);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();                                     // not trigger load unloaded grids at notifier call
- 
     TypeContainerVisitor<MaNGOS::CreatureRelocationNotifier, WorldTypeMapContainer > c2world_relocation(relocationNotifier);
     TypeContainerVisitor<MaNGOS::CreatureRelocationNotifier, GridTypeMapContainer >  c2grid_relocation(relocationNotifier);
- 
     cell_lock->Visit(cell_lock, c2world_relocation, *this, *creature, MAX_CREATURE_ATTACK_RADIUS);
     cell_lock->Visit(cell_lock, c2grid_relocation, *this, *creature, MAX_CREATURE_ATTACK_RADIUS);
 }
 */
-
 void Map::SendInitSelf( Player * player )
 {
     sLog.outDetail("Creating player data for himself %u", player->GetGUIDLow());
-
     UpdateData data;
-
     // attach to player data current transport data
     if(Transport* transport = player->GetTransport())
     {
         transport->BuildCreateUpdateBlockForPlayer(&data, player);
     }
-
     // build data for self presence in world at own client (one time for map)
     player->BuildCreateUpdateBlockForPlayer(&data, player);
-
     // build other passengers at transport also (they always visible and marked as visible and will not send at visibility update at add to map
     if(Transport* transport = player->GetTransport())
     {
@@ -2196,25 +1905,19 @@ void Map::SendInitSelf( Player * player )
             }
         }
     }
-
     WorldPacket packet;
     data.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
-
 void Map::SendInitTransports( Player * player )
 {
     // Hack to send out transports
     MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
-
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
         return;
-
     UpdateData transData;
-
     MapManager::TransportSet& tset = tmap[player->GetMapId()];
-
     for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i)
     {
         // send data for current transport in other place
@@ -2223,35 +1926,27 @@ void Map::SendInitTransports( Player * player )
             (*i)->BuildCreateUpdateBlockForPlayer(&transData, player);
         }
     }
-
     WorldPacket packet;
     transData.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
-
 void Map::SendRemoveTransports( Player * player )
 {
     // Hack to send out transports
     MapManager::TransportMap& tmap = MapManager::Instance().m_TransportsByMap;
-
     // no transports at map
     if (tmap.find(player->GetMapId()) == tmap.end())
         return;
-
     UpdateData transData;
-
     MapManager::TransportSet& tset = tmap[player->GetMapId()];
-
     // except used transport
     for (MapManager::TransportSet::const_iterator i = tset.begin(); i != tset.end(); ++i)
         if((*i) != player->GetTransport() && (*i)->GetMapId()!=GetId())
             (*i)->BuildOutOfRangeUpdateBlock(&transData);
-
     WorldPacket packet;
     transData.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
-
 inline void Map::setNGrid(NGridType *grid, uint32 x, uint32 y)
 {
     if(x >= MAX_NUMBER_OF_GRIDS || y >= MAX_NUMBER_OF_GRIDS)
@@ -2261,11 +1956,9 @@ inline void Map::setNGrid(NGridType *grid, uint32 x, uint32 y)
     }
     i_grids[x][y] = grid;
 }
-
 void Map::DelayedUpdate(const uint32 t_diff)
 {
     RemoveAllObjectsInRemoveList();
-
     // Don't unload grids if it's battleground, since we may have manually added GOs,creatures, those doesn't load from DB at grid re-load !
     // This isn't really bother us, since as soon as we have instanced BG-s, the whole map unloads as the BG gets ended
     if (!IsBattleGroundOrArena())
@@ -2280,21 +1973,16 @@ void Map::DelayedUpdate(const uint32 t_diff)
         }
     }
 }
-
 void Map::AddObjectToRemoveList(WorldObject *obj)
 {
     assert(obj->GetMapId()==GetId() && obj->GetInstanceId()==GetInstanceId());
-
     obj->CleanupsBeforeDelete();                            // remove or simplify at least cross referenced links
-
     i_objectsToRemove.insert(obj);
     //sLog.outDebug("Object (GUID: %u TypeId: %u ) added to removing list.",obj->GetGUIDLow(),obj->GetTypeId());
 }
-
 void Map::AddObjectToSwitchList(WorldObject *obj, bool on)
 {
     assert(obj->GetMapId()==GetId() && obj->GetInstanceId()==GetInstanceId());
-
     std::map<WorldObject*, bool>::iterator itr = i_objectsToSwitch.find(obj);
     if(itr == i_objectsToSwitch.end())
         i_objectsToSwitch.insert(itr, std::make_pair(obj, on));
@@ -2303,7 +1991,6 @@ void Map::AddObjectToSwitchList(WorldObject *obj, bool on)
     else
         assert(false);
 }
-
 void Map::RemoveAllObjectsInRemoveList()
 {
     while(!i_objectsToSwitch.empty())
@@ -2312,7 +1999,6 @@ void Map::RemoveAllObjectsInRemoveList()
         WorldObject *obj = itr->first;
         bool on = itr->second;
         i_objectsToSwitch.erase(itr);
-
         switch(obj->GetTypeId())
         {
         case TYPEID_UNIT:
@@ -2321,13 +2007,11 @@ void Map::RemoveAllObjectsInRemoveList()
             break;
         }
     }
-
     //sLog.outDebug("Object remover 1 check.");
     while(!i_objectsToRemove.empty())
     {
         std::set<WorldObject*>::iterator itr = i_objectsToRemove.begin();
         WorldObject* obj = *itr;
-
         switch(obj->GetTypeId())
         {
             case TYPEID_CORPSE:
@@ -2355,12 +2039,10 @@ void Map::RemoveAllObjectsInRemoveList()
             sLog.outError("Non-grid object (TypeId: %u) in grid object removing list, ignored.",obj->GetTypeId());
             break;
         }
-
         i_objectsToRemove.erase(itr);
     }
     //sLog.outDebug("Object remover 2 check.");
 }
-
 uint32 Map::GetPlayersCountExceptGMs() const
 {
     uint32 count = 0;
@@ -2369,57 +2051,45 @@ uint32 Map::GetPlayersCountExceptGMs() const
             ++count;
     return count;
 }
-
 void Map::SendToPlayers(WorldPacket const* data) const
 {
     for(MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
         itr->getSource()->GetSession()->SendPacket(data);
 }
-
 bool Map::ActiveObjectsNearGrid(uint32 x, uint32 y) const
 {
     ASSERT(x < MAX_NUMBER_OF_GRIDS);
     ASSERT(y < MAX_NUMBER_OF_GRIDS);
- 
     CellPair cell_min(x*MAX_NUMBER_OF_CELLS, y*MAX_NUMBER_OF_CELLS);
     CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS);
- 
     //we must find visible range in cells so we unload only non-visible cells...
     float viewDist = GetVisibilityDistance();
     int cell_range = (int)ceilf(viewDist / SIZE_OF_GRID_CELL) + 1;
- 
     cell_min << cell_range;
     cell_min -= cell_range;
     cell_max >> cell_range;
     cell_max += cell_range;
-
     for(MapRefManager::const_iterator iter = m_mapRefManager.begin(); iter != m_mapRefManager.end(); ++iter)
     {
         Player* plr = iter->getSource();
-
         CellPair p = Trinity::ComputeCellPair(plr->GetPositionX(), plr->GetPositionY());
         if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) &&
             (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) )
             return true;
     }
-
     for(ActiveNonPlayers::const_iterator iter = m_activeNonPlayers.begin(); iter != m_activeNonPlayers.end(); ++iter)
     {
         WorldObject* obj = *iter;
-
         CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
         if( (cell_min.x_coord <= p.x_coord && p.x_coord <= cell_max.x_coord) &&
             (cell_min.y_coord <= p.y_coord && p.y_coord <= cell_max.y_coord) )
             return true;
     }
-
     return false;
 }
-
 void Map::AddToActive( Creature* c )
 {
     AddToActiveHelper(c);
-
     // also not allow unloading spawn grid to prevent creating creature clone at load
     if(!c->isPet() && c->GetDBTableGUIDLow())
     {
@@ -2436,11 +2106,9 @@ void Map::AddToActive( Creature* c )
         }
     }
 }
-
 void Map::RemoveFromActive( Creature* c )
 {
     RemoveFromActiveHelper(c);
-
     // also allow unloading spawn grid
     if(!c->isPet() && c->GetDBTableGUIDLow())
     {
@@ -2457,19 +2125,15 @@ void Map::RemoveFromActive( Creature* c )
         }
     }
 }
-
 template void Map::Add(Corpse *);
 template void Map::Add(Creature *);
 template void Map::Add(GameObject *);
 template void Map::Add(DynamicObject *);
-
 template void Map::Remove(Corpse *,bool);
 template void Map::Remove(Creature *,bool);
 template void Map::Remove(GameObject *, bool);
 template void Map::Remove(DynamicObject *, bool);
-
 /* ******* Dungeon Instance Maps ******* */
-
 InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _parent)
   : Map(id, expiry, InstanceId, SpawnMode, _parent),
     m_resetAfterUnload(false), m_unloadWhenEmpty(false),
@@ -2477,12 +2141,10 @@ InstanceMap::InstanceMap(uint32 id, time_t expiry, uint32 InstanceId, uint8 Spaw
 {
     //lets initialize visibility distance for dungeons
     InstanceMap::InitVisibilityDistance();
-
     // the timer is started by default, and stopped when the first player joins
     // this make sure it gets unloaded if for some reason no player joins
     m_unloadTimer = std::max(sWorld.getConfig(CONFIG_INSTANCE_UNLOAD_DELAY), (uint32)MIN_UNLOAD_DELAY);
 }
-
 InstanceMap::~InstanceMap()
 {
     if(i_data)
@@ -2491,13 +2153,11 @@ InstanceMap::~InstanceMap()
         i_data = NULL;
     }
 }
-
 void InstanceMap::InitVisibilityDistance()
 {
     //init visibility distance for instances
     m_VisibleDistance = sWorld.GetMaxVisibleDistanceInInstances();
 }
-
 /*
     Do map specific checks to see if the player can enter
 */
@@ -2509,7 +2169,6 @@ bool InstanceMap::CanEnter(Player *player)
         assert(false);
         return false;
     }
-
     // cannot enter if the instance is full (player cap), GMs don't count
     uint32 maxPlayers = GetMaxPlayers();
     if (!player->isGameMaster() && GetPlayersCountExceptGMs() >= maxPlayers)
@@ -2518,7 +2177,6 @@ bool InstanceMap::CanEnter(Player *player)
         player->SendTransferAborted(GetId(), TRANSFER_ABORT_MAX_PLAYERS);
         return false;
     }
-
     // cannot enter while players in the instance are in combat
     Group *pGroup = player->GetGroup();
     if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())
@@ -2526,10 +2184,8 @@ bool InstanceMap::CanEnter(Player *player)
         player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
         return false;
     }
-
     return Map::CanEnter(player);
 }
-
 /*
     Do map specific checks and add the player to the map if successful.
 */
@@ -2538,13 +2194,11 @@ bool InstanceMap::Add(Player *player)
     // TODO: Not sure about checking player level: already done in HandleAreaTriggerOpcode
     // GMs still can teleport player in instance.
     // Is it needed?
-
     {
         Guard guard(*this);
         // Check moved to void WorldSession::HandleMoveWorldportAckOpcode()
         //if(!CanEnter(player))
             //return false;
-
         // Dungeon only code
         if(IsDungeon())
         {
@@ -2555,7 +2209,6 @@ bool InstanceMap::Add(Player *player)
                 sLog.outDetail("InstanceMap::Add: creating instance save for map %d spawnmode %d with instance id %d", GetId(), GetSpawnMode(), GetInstanceId());
                 mapSave = sInstanceSaveManager.AddInstanceSave(GetId(), GetInstanceId(), GetSpawnMode(), 0, true);
             }
-
             // check for existing instance binds
             InstancePlayerBind *playerBind = player->GetBoundInstance(GetId(), GetSpawnMode());
             if(playerBind && playerBind->perm)
@@ -2622,32 +2275,26 @@ bool InstanceMap::Add(Player *player)
                 }
             }
         }
-
         if(i_data) i_data->OnPlayerEnter(player);
         // for normal instances cancel the reset schedule when the
         // first player enters (no players yet)
         SetResetSchedule(false);
-
         sLog.outDetail("MAP: Player '%s' entered the instance '%u' of map '%s'", player->GetName(), GetInstanceId(), GetMapName());
         // initialize unload state
         m_unloadTimer = 0;
         m_resetAfterUnload = false;
         m_unloadWhenEmpty = false;
     }
-
     // this will acquire the same mutex so it cannot be in the previous block
     Map::Add(player);
     return true;
 }
-
 void InstanceMap::Update(const uint32& t_diff)
 {
     Map::Update(t_diff);
-
     if(i_data)
         i_data->Update(t_diff);
 }
-
 void InstanceMap::Remove(Player *player, bool remove)
 {
     sLog.outDetail("MAP: Removing player '%s' from instance '%u' of map '%s' before relocating to other map", player->GetName(), GetInstanceId(), GetMapName());
@@ -2658,24 +2305,19 @@ void InstanceMap::Remove(Player *player, bool remove)
     // for normal instances schedule the reset after all players have left
     SetResetSchedule(true);
 }
-
 void InstanceMap::CreateInstanceData(bool load)
 {
     if(i_data != NULL)
         return;
-
     InstanceTemplate const* mInstance = objmgr.GetInstanceTemplate(GetId());
     if (mInstance)
     {
         i_script_id = mInstance->script_id;
         i_data = Script->CreateInstanceData(this);
     }
-
     if(!i_data)
         return;
-
     i_data->Initialize();
-
     if(load)
     {
         // TODO: make a global storage for this
@@ -2693,7 +2335,6 @@ void InstanceMap::CreateInstanceData(bool load)
         }
     }
 }
-
 /*
     Returns true if there are no players in the instance
 */
@@ -2701,7 +2342,6 @@ bool InstanceMap::Reset(uint8 method)
 {
     // note: since the map may not be loaded when the instance needs to be reset
     // the instance must be deleted from the DB by InstanceSaveManager
-
     if(HavePlayers())
     {
         if(method == INSTANCE_RESET_ALL)
@@ -2718,7 +2358,6 @@ bool InstanceMap::Reset(uint8 method)
                 for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
                     itr->getSource()->m_InstanceValid = false;
             }
-
             // the unload timer is not started
             // instead the map will unload immediately after the players have left
             m_unloadWhenEmpty = true;
@@ -2731,22 +2370,18 @@ bool InstanceMap::Reset(uint8 method)
         m_unloadTimer = MIN_UNLOAD_DELAY;
         m_resetAfterUnload = true;
     }
-
     return m_mapRefManager.isEmpty();
 }
-
 void InstanceMap::PermBindAllPlayers(Player *player)
 {
     if(!IsDungeon())
         return;
-
     InstanceSave *save = sInstanceSaveManager.GetInstanceSave(GetInstanceId());
     if(!save)
     {
         sLog.outError("Cannot bind players, no instance save available for map!");
         return;
     }
-
     Group *group = player->GetGroup();
     // group members outside the instance group don't get bound
     for(MapRefManager::iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
@@ -2762,29 +2397,23 @@ void InstanceMap::PermBindAllPlayers(Player *player)
             data << uint32(0);
             plr->GetSession()->SendPacket(&data);
         }
-
         // if the leader is not in the instance the group will not get a perm bind
         if(group && group->GetLeaderGUID() == plr->GetGUID())
             group->BindToInstance(save, true);
     }
 }
-
 void InstanceMap::UnloadAll()
 {
     assert(!HavePlayers());
-
     if(m_resetAfterUnload == true)
         objmgr.DeleteRespawnTimeForInstance(GetInstanceId());
-
     Map::UnloadAll();
 }
-
 void InstanceMap::SendResetWarnings(uint32 timeLeft) const
 {
     for(MapRefManager::const_iterator itr = m_mapRefManager.begin(); itr != m_mapRefManager.end(); ++itr)
         itr->getSource()->SendInstanceResetWarning(GetId(), itr->getSource()->GetDifficulty(), timeLeft);
 }
-
 void InstanceMap::SetResetSchedule(bool on)
 {
     // only for normal instances
@@ -2797,7 +2426,6 @@ void InstanceMap::SetResetSchedule(bool on)
         else sInstanceSaveManager.ScheduleReset(on, save->GetResetTime(), InstanceSaveManager::InstResetEvent(0, GetId(), GetInstanceId()));
     }
 }
-
 uint32 InstanceMap::GetMaxPlayers() const
 {
     InstanceTemplate const* iTemplate = objmgr.GetInstanceTemplate(GetId());
@@ -2805,26 +2433,21 @@ uint32 InstanceMap::GetMaxPlayers() const
         return 0;
     return IsHeroic() ? iTemplate->maxPlayersHeroic : iTemplate->maxPlayers;
 }
-
 /* ******* Battleground Instance Maps ******* */
-
 BattleGroundMap::BattleGroundMap(uint32 id, time_t expiry, uint32 InstanceId, Map* _parent)
   : Map(id, expiry, InstanceId, DIFFICULTY_NORMAL, _parent)
 {
     //lets initialize visibility distance for BG/Arenas
     BattleGroundMap::InitVisibilityDistance();
 }
-
 BattleGroundMap::~BattleGroundMap()
 {
 }
-
 void BattleGroundMap::InitVisibilityDistance()
 {
     //init visibility distance for BG/Arenas
     m_VisibleDistance = sWorld.GetMaxVisibleDistanceInBGArenas();
 }
-
 bool BattleGroundMap::CanEnter(Player * player)
 {
     if(player->GetMapRef().getTarget() == this)
@@ -2833,15 +2456,11 @@ bool BattleGroundMap::CanEnter(Player * player)
         assert(false);
         return false;
     }
-
     if(player->GetBattleGroundId() != GetInstanceId())
         return false;
-
     // player number limit is checked in bgmgr, no need to do it here
-
     return Map::CanEnter(player);
 }
-
 bool BattleGroundMap::Add(Player * player)
 {
     {
@@ -2854,18 +2473,15 @@ bool BattleGroundMap::Add(Player * player)
     }
     return Map::Add(player);
 }
-
 void BattleGroundMap::Remove(Player *player, bool remove)
 {
     sLog.outDetail("MAP: Removing player '%s' from bg '%u' of map '%s' before relocating to other map", player->GetName(), GetInstanceId(), GetMapName());
     Map::Remove(player, remove);
 }
-
 void BattleGroundMap::SetUnload()
 {
     m_unloadTimer = MIN_UNLOAD_DELAY;
 }
-
 void BattleGroundMap::RemoveAllPlayers()
 {
     if(HavePlayers())
@@ -2878,7 +2494,6 @@ void BattleGroundMap::RemoveAllPlayers()
         }
     }
 }
-
 /// Put scripts in the execution queue
 void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, Object* target)
 {
@@ -2886,12 +2501,10 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O
     ScriptMapMap::const_iterator s = scripts.find(id);
     if (s == scripts.end())
         return;
-
     // prepare static data
     uint64 sourceGUID = source ? source->GetGUID() : (uint64)0; //some script commands doesn't have source
     uint64 targetGUID = target ? target->GetGUID() : (uint64)0;
     uint64 ownerGUID  = (source->GetTypeId()==TYPEID_ITEM) ? ((Item*)source)->GetOwnerGUID() : (uint64)0;
-
     ///- Schedule script execution for all scripts in the script map
     ScriptMap const *s2 = &(s->second);
     bool immedScript = false;
@@ -2901,12 +2514,10 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O
         sa.sourceGUID = sourceGUID;
         sa.targetGUID = targetGUID;
         sa.ownerGUID  = ownerGUID;
-
         sa.script = &iter->second;
         m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sWorld.GetGameTime() + iter->first), sa));
         if (iter->first == 0)
             immedScript = true;
-
         sWorld.IncreaseScheduledScriptsCount();
     }
     ///- If one of the effects should be immediate, launch the script execution
@@ -2917,26 +2528,20 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O
         i_scriptLock = false;
     }
 }
-
 void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* source, Object* target)
 {
     // NOTE: script record _must_ exist until command executed
-
     // prepare static data
     uint64 sourceGUID = source ? source->GetGUID() : (uint64)0;
     uint64 targetGUID = target ? target->GetGUID() : (uint64)0;
     uint64 ownerGUID  = (source->GetTypeId()==TYPEID_ITEM) ? ((Item*)source)->GetOwnerGUID() : (uint64)0;
-
     ScriptAction sa;
     sa.sourceGUID = sourceGUID;
     sa.targetGUID = targetGUID;
     sa.ownerGUID  = ownerGUID;
-
     sa.script = &script;
     m_scriptSchedule.insert(std::pair<time_t, ScriptAction>(time_t(sWorld.GetGameTime() + delay), sa));
-
     sWorld.IncreaseScheduledScriptsCount();
-
     ///- If effects should be immediate, launch the script execution
     if(delay == 0 && !i_scriptLock)
     {
@@ -2945,22 +2550,18 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou
         i_scriptLock = false;
     }
 }
-
 /// Process queued scripts
 void Map::ScriptsProcess()
 {
     if (m_scriptSchedule.empty())
         return;
-
     ///- Process overdue queued scripts
     std::multimap<time_t, ScriptAction>::iterator iter = m_scriptSchedule.begin();
     // ok as multimap is a *sorted* associative container
     while (!m_scriptSchedule.empty() && (iter->first <= sWorld.GetGameTime()))
     {
         ScriptAction const& step = iter->second;
-
         Object* source = NULL;
-
         if(step.sourceGUID)
         {
             switch(GUID_HIPART(step.sourceGUID))
@@ -3006,11 +2607,8 @@ void Map::ScriptsProcess()
                     break;
             }
         }
-
         //if(source && !source->IsInWorld()) source = NULL;
-
         Object* target = NULL;
-
         if(step.targetGUID)
         {
             switch(GUID_HIPART(step.targetGUID))
@@ -3038,9 +2636,7 @@ void Map::ScriptsProcess()
                     break;
             }
         }
-
         //if(target && !target->IsInWorld()) target = NULL;
-
         switch (step.script->command)
         {
             case SCRIPT_COMMAND_TALK:
@@ -3050,7 +2646,6 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_TALK call for NULL creature.");
                     break;
                 }
-
                 if(source->GetTypeId()!=TYPEID_UNIT)
                 {
                     sLog.outError("SCRIPT_COMMAND_TALK call for non-creature (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
@@ -3061,9 +2656,7 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_TALK invalid chat type (%u), skipping.",step.script->datalong);
                     break;
                 }
-
                 uint64 unit_target = target ? target->GetGUID() : 0;
-
                 //datalong 0=normal say, 1=whisper, 2=yell, 3=emote text, 4=boss emote text
                 switch(step.script->datalong)
                 {
@@ -3092,20 +2685,17 @@ void Map::ScriptsProcess()
                 }
                 break;
             }
-
             case SCRIPT_COMMAND_EMOTE:
                 if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_EMOTE call for NULL creature.");
                     break;
                 }
-
                 if(source->GetTypeId()!=TYPEID_UNIT)
                 {
                     sLog.outError("SCRIPT_COMMAND_EMOTE call for non-creature (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 ((Creature *)source)->HandleEmoteCommand(step.script->datalong);
                 break;
             case SCRIPT_COMMAND_FIELD_SET:
@@ -3120,7 +2710,6 @@ void Map::ScriptsProcess()
                         step.script->datalong,source->GetValuesCount(),source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 source->SetUInt32Value(step.script->datalong, step.script->datalong2);
                 break;
             case SCRIPT_COMMAND_MOVE_TO:
@@ -3129,7 +2718,6 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_MOVE_TO call for NULL creature.");
                     break;
                 }
-
                 if(source->GetTypeId()!=TYPEID_UNIT)
                 {
                     sLog.outError("SCRIPT_COMMAND_MOVE_TO call for non-creature (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
@@ -3150,7 +2738,6 @@ void Map::ScriptsProcess()
                         step.script->datalong,source->GetValuesCount(),source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 source->SetFlag(step.script->datalong, step.script->datalong2);
                 break;
             case SCRIPT_COMMAND_FLAG_REMOVE:
@@ -3165,10 +2752,8 @@ void Map::ScriptsProcess()
                         step.script->datalong,source->GetValuesCount(),source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 source->RemoveFlag(step.script->datalong, step.script->datalong2);
                 break;
-
             case SCRIPT_COMMAND_TELEPORT_TO:
             {
                 // accept player in any one from target/source arg
@@ -3177,20 +2762,16 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_TELEPORT_TO call for NULL object.");
                     break;
                 }
-
                 // must be only Player
                 if((!target || target->GetTypeId() != TYPEID_PLAYER) && (!source || source->GetTypeId() != TYPEID_PLAYER))
                 {
                     sLog.outError("SCRIPT_COMMAND_TELEPORT_TO call for non-player (TypeIdSource: %u)(TypeIdTarget: %u), skipping.", source ? source->GetTypeId() : 0, target ? target->GetTypeId() : 0);
                     break;
                 }
-
                 Player* pSource = target && target->GetTypeId() == TYPEID_PLAYER ? (Player*)target : (Player*)source;
-
                 pSource->TeleportTo(step.script->datalong, step.script->x, step.script->y, step.script->z, step.script->o);
                 break;
             }
-
             case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE:
             {
                 if(!step.script->datalong)                  // creature not specified
@@ -3198,36 +2779,29 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for NULL creature.");
                     break;
                 }
-
                 if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for NULL world object.");
                     break;
                 }
-
                 WorldObject* summoner = dynamic_cast<WorldObject*>(source);
-
                 if(!summoner)
                 {
                     sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON_CREATURE call for non-WorldObject (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 float x = step.script->x;
                 float y = step.script->y;
                 float z = step.script->z;
                 float o = step.script->o;
-
                 Creature* pCreature = summoner->SummonCreature(step.script->datalong, x, y, z, o,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,step.script->datalong2);
                 if (!pCreature)
                 {
                     sLog.outError("SCRIPT_COMMAND_TEMP_SUMMON failed for creature (entry: %u).",step.script->datalong);
                     break;
                 }
-
                 break;
             }
-
             case SCRIPT_COMMAND_RESPAWN_GAMEOBJECT:
             {
                 if(!step.script->datalong)                  // gameobject not specified
@@ -3235,41 +2809,32 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for NULL gameobject.");
                     break;
                 }
-
                 if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for NULL world object.");
                     break;
                 }
-
                 WorldObject* summoner = dynamic_cast<WorldObject*>(source);
-
                 if(!summoner)
                 {
                     sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT call for non-WorldObject (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 GameObject *go = NULL;
                 int32 time_to_despawn = step.script->datalong2<5 ? 5 : (int32)step.script->datalong2;
-
                 CellPair p(MaNGOS::ComputeCellPair(summoner->GetPositionX(), summoner->GetPositionY()));
                 Cell cell(p);
                 cell.data.Part.reserved = ALL_DISTRICT;
-
                 MaNGOS::GameObjectWithDbGUIDCheck go_check(*summoner,step.script->datalong);
                 MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(summoner, go,go_check);
-
                 TypeContainerVisitor<MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
                 CellLock<GridReadGuard> cell_lock(cell, p);
                 cell_lock->Visit(cell_lock, object_checker, *summoner->GetMap());
-
                 if ( !go )
                 {
                     sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT failed for gameobject(guid: %u).", step.script->datalong);
                     break;
                 }
-
                 if( go->GetGoType()==GAMEOBJECT_TYPE_FISHINGNODE ||
                     go->GetGoType()==GAMEOBJECT_TYPE_DOOR        ||
                     go->GetGoType()==GAMEOBJECT_TYPE_BUTTON      ||
@@ -3278,13 +2843,10 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_RESPAWN_GAMEOBJECT can not be used with gameobject of type %u (guid: %u).", uint32(go->GetGoType()), step.script->datalong);
                     break;
                 }
-
                 if( go->isSpawned() )
                     break;                                  //gameobject already spawned
-
                 go->SetLootState(GO_READY);
                 go->SetRespawnTime(time_to_despawn);        //despawn object in ? seconds
-
                 go->GetMap()->Add(go);
                 break;
             }
@@ -3295,35 +2857,27 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for NULL door.");
                     break;
                 }
-
                 if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for NULL unit.");
                     break;
                 }
-
                 if(!source->isType(TYPEMASK_UNIT))          // must be any Unit (creature or player)
                 {
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR call for non-unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 Unit* caster = (Unit*)source;
-
                 GameObject *door = NULL;
                 int32 time_to_close = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2;
-
                 CellPair p(MaNGOS::ComputeCellPair(caster->GetPositionX(), caster->GetPositionY()));
                 Cell cell(p);
                 cell.data.Part.reserved = ALL_DISTRICT;
-
                 MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster,step.script->datalong);
                 MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster,door,go_check);
-
                 TypeContainerVisitor<MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
                 CellLock<GridReadGuard> cell_lock(cell, p);
                 cell_lock->Visit(cell_lock, object_checker, *caster->GetMap());
-
                 if (!door)
                 {
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for gameobject(guid: %u).", step.script->datalong);
@@ -3334,12 +2888,9 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_OPEN_DOOR failed for non-door(GoType: %u, Entry: %u, GUID: %u).", door->GetGoType(),door->GetEntry(),door->GetGUIDLow());
                     break;
                 }
-
                 if (door->GetGoState() != GO_STATE_READY)
                     break;                                  //door already  open
-
                 door->UseDoorOrButton(time_to_close);
-
                 if(target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON)
                     ((GameObject*)target)->UseDoorOrButton(time_to_close);
                 break;
@@ -3351,35 +2902,27 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for NULL door.");
                     break;
                 }
-
                 if(!source)
                 {
                     sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for NULL unit.");
                     break;
                 }
-
                 if(!source->isType(TYPEMASK_UNIT))          // must be any Unit (creature or player)
                 {
                     sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR call for non-unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 Unit* caster = (Unit*)source;
-
                 GameObject *door = NULL;
                 int32 time_to_open = step.script->datalong2 < 15 ? 15 : (int32)step.script->datalong2;
-
                 CellPair p(MaNGOS::ComputeCellPair(caster->GetPositionX(), caster->GetPositionY()));
                 Cell cell(p);
                 cell.data.Part.reserved = ALL_DISTRICT;
-
                 MaNGOS::GameObjectWithDbGUIDCheck go_check(*caster,step.script->datalong);
                 MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck> checker(caster,door,go_check);
-
                 TypeContainerVisitor<MaNGOS::GameObjectSearcher<MaNGOS::GameObjectWithDbGUIDCheck>, GridTypeMapContainer > object_checker(checker);
                 CellLock<GridReadGuard> cell_lock(cell, p);
                 cell_lock->Visit(cell_lock, object_checker, *caster->GetMap());
-
                 if ( !door )
                 {
                     sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR failed for gameobject(guid: %u).", step.script->datalong);
@@ -3390,15 +2933,11 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_CLOSE_DOOR failed for non-door(GoType: %u, Entry: %u, GUID: %u).", door->GetGoType(),door->GetEntry(),door->GetGUIDLow());
                     break;
                 }
-
                 if( door->GetGoState() == GO_STATE_READY )
                     break;                                  //door already closed
-
                 door->UseDoorOrButton(time_to_open);
-
                 if(target && target->isType(TYPEMASK_GAMEOBJECT) && ((GameObject*)target)->GetGoType()==GAMEOBJECT_TYPE_BUTTON)
                     ((GameObject*)target)->UseDoorOrButton(time_to_open);
-
                 break;
             }
             case SCRIPT_COMMAND_QUEST_EXPLORED:
@@ -3408,17 +2947,14 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED call for NULL source.");
                     break;
                 }
-
                 if(!target)
                 {
                     sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED call for NULL target.");
                     break;
                 }
-
                 // when script called for item spell casting then target == (unit or GO) and source is player
                 WorldObject* worldObject;
                 Player* player;
-
                 if(target->GetTypeId()==TYPEID_PLAYER)
                 {
                     if(source->GetTypeId()!=TYPEID_UNIT && source->GetTypeId()!=TYPEID_GAMEOBJECT)
@@ -3426,7 +2962,6 @@ void Map::ScriptsProcess()
                         sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED call for non-creature and non-gameobject (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                         break;
                     }
-
                     worldObject = (WorldObject*)source;
                     player = (Player*)target;
                 }
@@ -3437,27 +2972,22 @@ void Map::ScriptsProcess()
                         sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED call for non-creature and non-gameobject (TypeId: %u, Entry: %u, GUID: %u), skipping.",target->GetTypeId(),target->GetEntry(),target->GetGUIDLow());
                         break;
                     }
-
                     if(source->GetTypeId()!=TYPEID_PLAYER)
                     {
                         sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED call for non-player(TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                         break;
                     }
-
                     worldObject = (WorldObject*)target;
                     player = (Player*)source;
                 }
-
                 // quest id and flags checked at script loading
                 if( (worldObject->GetTypeId()!=TYPEID_UNIT || ((Unit*)worldObject)->isAlive()) &&
                     (step.script->datalong2==0 || worldObject->IsWithinDistInMap(player,float(step.script->datalong2))) )
                     player->AreaExploredOrEventHappens(step.script->datalong);
                 else
                     player->FailQuest(step.script->datalong);
-
                 break;
             }
-
             case SCRIPT_COMMAND_ACTIVATE_OBJECT:
             {
                 if(!source)
@@ -3465,53 +2995,42 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT must have source caster.");
                     break;
                 }
-
                 if(!source->isType(TYPEMASK_UNIT))
                 {
                     sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT source caster isn't unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 if(!target)
                 {
                     sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for NULL gameobject.");
                     break;
                 }
-
                 if(target->GetTypeId()!=TYPEID_GAMEOBJECT)
                 {
                     sLog.outError("SCRIPT_COMMAND_ACTIVATE_OBJECT call for non-gameobject (TypeId: %u, Entry: %u, GUID: %u), skipping.",target->GetTypeId(),target->GetEntry(),target->GetGUIDLow());
                     break;
                 }
-
                 Unit* caster = (Unit*)source;
-
                 GameObject *go = (GameObject*)target;
-
                 go->Use(caster);
                 break;
             }
-
             case SCRIPT_COMMAND_REMOVE_AURA:
             {
                 Object* cmdTarget = step.script->datalong2 ? source : target;
-
                 if(!cmdTarget)
                 {
                     sLog.outError("SCRIPT_COMMAND_REMOVE_AURA call for NULL %s.",step.script->datalong2 ? "source" : "target");
                     break;
                 }
-
                 if(!cmdTarget->isType(TYPEMASK_UNIT))
                 {
                     sLog.outError("SCRIPT_COMMAND_REMOVE_AURA %s isn't unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",step.script->datalong2 ? "source" : "target",cmdTarget->GetTypeId(),cmdTarget->GetEntry(),cmdTarget->GetGUIDLow());
                     break;
                 }
-
                 ((Unit*)cmdTarget)->RemoveAurasDueToSpell(step.script->datalong);
                 break;
             }
-
             case SCRIPT_COMMAND_CAST_SPELL:
             {
                 if(!source)
@@ -3519,39 +3038,29 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_CAST_SPELL must have source caster.");
                     break;
                 }
-
                 Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target;
-
                 if(cmdTarget && !cmdTarget->isType(TYPEMASK_UNIT))
                 {
                     sLog.outError("SCRIPT_COMMAND_CAST_SPELL %s isn't unit (TypeId: %u, Entry: %u. GUID: %u), skipping.",step.script->datalong2 & 0x01 ? "source" : "target",cmdTarget->GetTypeId(),cmdTarget->GetEntry(),cmdTarget->GetGUIDLow());
                     break;
                 }
-
                 Unit* spellTarget = (Unit*)cmdTarget;
-
                 Object* cmdSource = step.script->datalong2 & 0x02 ? target : source;
-
                 if(!cmdSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_CAST_SPELL %u call for NULL %s.", step.script->datalong, step.script->datalong2 & 0x02 ? "target" : "source");
                     break;
                 }
-
                 if(!cmdSource->isType(TYPEMASK_UNIT))
                 {
                     sLog.outError("SCRIPT_COMMAND_CAST_SPELL %s isn't unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",step.script->datalong2 & 0x02 ? "target" : "source", cmdSource->GetTypeId(),cmdSource->GetEntry(),cmdSource->GetGUIDLow());
                     break;
                 }
-
                 Unit* spellSource = (Unit*)cmdSource;
-
                 //TODO: when GO cast implemented, code below must be updated accordingly to also allow GO spell cast
                 spellSource->CastSpell(spellTarget,step.script->datalong,false);
-
                 break;
             }
-
             case SCRIPT_COMMAND_LOAD_PATH:
             {
                 if(!source)
@@ -3559,23 +3068,19 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_START_MOVE is tried to apply to NON-existing unit.");
                     break;
                 }
-
                 if(!source->isType(TYPEMASK_UNIT))
                 {
                     sLog.outError("SCRIPT_COMMAND_START_MOVE source mover isn't unit (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 if(!WaypointMgr.GetPath(step.script->datalong))
                 {
                     sLog.outError("SCRIPT_COMMAND_START_MOVE source mover has an invallid path, skipping.", step.script->datalong2);
                     break;
                 }
-
                 dynamic_cast<Unit*>(source)->GetMotionMaster()->MovePath(step.script->datalong, step.script->datalong2);
                 break;
             }
-
             case SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT:
             {
                 if(!step.script->datalong || !step.script->datalong2)
@@ -3585,17 +3090,14 @@ void Map::ScriptsProcess()
                 }
                 //our target
                 Creature* target = NULL;
-
                 if(source) //using grid searcher
                 {
                     CellPair p(Trinity::ComputeCellPair(((Unit*)source)->GetPositionX(), ((Unit*)source)->GetPositionY()));
                     Cell cell(p);
                     cell.data.Part.reserved = ALL_DISTRICT;
-
                     //sLog.outDebug("Attempting to find Creature: Db GUID: %i", step.script->datalong);
                     Trinity::CreatureWithDbGUIDCheck target_check(((Unit*)source), step.script->datalong);
                     Trinity::CreatureSearcher<Trinity::CreatureWithDbGUIDCheck> checker(((Unit*)source), target, target_check);
-
                     TypeContainerVisitor<Trinity::CreatureSearcher <Trinity::CreatureWithDbGUIDCheck>, GridTypeMapContainer > unit_checker(checker);
                     CellLock<GridReadGuard> cell_lock(cell, p);
                     cell_lock->Visit(cell_lock, unit_checker, *(((Unit*)source)->GetMap()));
@@ -3638,20 +3140,16 @@ void Map::ScriptsProcess()
                 //if no scriptmap present...
                 if(!datamap)
                     break;
-
                 uint32 script_id = step.script->datalong2;
                 //insert script into schedule but do not start it
                 ScriptsStart(*datamap, script_id, target, NULL/*, false*/);
                 break;
             }
-
             case SCRIPT_COMMAND_KILL:
             {
                 if(!source || ((Creature*)source)->isDead())
                     break;
-
                 ((Creature*)source)->DealDamage(((Creature*)source), ((Creature*)source)->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-
                 switch(step.script->dataint)
                 {
                 case 0: break; //return false not remove corpse
@@ -3659,7 +3157,6 @@ void Map::ScriptsProcess()
                 }
                 break;
             }
-
             case SCRIPT_COMMAND_PLAY_SOUND:
             {
                 if(!source)
@@ -3667,14 +3164,12 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_PLAY_SOUND call for NULL creature.");
                     break;
                 }
-
                 WorldObject* pSource = dynamic_cast<WorldObject*>(source);
                 if(!pSource)
                 {
                     sLog.outError("SCRIPT_COMMAND_PLAY_SOUND call for non-world object (TypeId: %u, Entry: %u, GUID: %u), skipping.",source->GetTypeId(),source->GetEntry(),source->GetGUIDLow());
                     break;
                 }
-
                 // bitmask: 0/1=anyone/target, 0/2=with distance dependent
                 Player* pTarget = NULL;
                 if(step.script->datalong2 & 1)
@@ -3684,16 +3179,13 @@ void Map::ScriptsProcess()
                         sLog.outError("SCRIPT_COMMAND_PLAY_SOUND in targeted mode call for NULL target.");
                         break;
                     }
-
                     if(target->GetTypeId()!=TYPEID_PLAYER)
                     {
                         sLog.outError("SCRIPT_COMMAND_PLAY_SOUND in targeted mode call for non-player (TypeId: %u, Entry: %u, GUID: %u), skipping.",target->GetTypeId(),target->GetEntry(),target->GetGUIDLow());
                         break;
                     }
-
                     pTarget = (Player*)target;
                 }
-
                 // bitmask: 0/1=anyone/target, 0/2=with distance dependent
                 if(step.script->datalong2 & 2)
                     pSource->PlayDistanceSound(step.script->datalong,pTarget);
@@ -3705,33 +3197,25 @@ void Map::ScriptsProcess()
                 sLog.outError("Unknown script command %u called.",step.script->command);
                 break;
         }
-
         m_scriptSchedule.erase(iter);
         sWorld.DecreaseScheduledScriptCount();
-
         iter = m_scriptSchedule.begin();
     }
 }
-
 Creature*
 Map::GetCreature(uint64 guid)
 {
     Creature * ret = NULL;
     if(IS_CRE_OR_VEH_GUID(guid))
         ret = ObjectAccessor::GetObjectInWorld(guid, (Creature*)NULL);
-
     if(!ret)
         return NULL;
-
     if(ret->GetMapId() != GetId())
         return NULL;
-
     if(ret->GetInstanceId() != GetInstanceId())
         return NULL;
-
     return ret;
 }
-
 GameObject*
 Map::GetGameObject(uint64 guid)
 {
@@ -3744,7 +3228,6 @@ Map::GetGameObject(uint64 guid)
         return NULL;
     return ret;
 }
-
 DynamicObject*
 Map::GetDynamicObject(uint64 guid)
 {
@@ -3757,7 +3240,6 @@ Map::GetDynamicObject(uint64 guid)
         return NULL;
     return ret;
 }
-
 void Map::UpdateIteratorBack(Player *player)
 {
     if(m_mapRefIter == player->GetMapRef())
diff --git a/src/game/Map.h b/src/game/Map.h
index a8d94d350e7..8ab318cc2c4 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_MAP_H
 #define TRINITY_MAP_H
-
 #include "Platform/Define.h"
 #include "Policies/ThreadingModel.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Thread_Mutex.h"
-
 #include "DBCStructure.h"
 #include "GridDefines.h"
 #include "Cell.h"
@@ -34,10 +31,8 @@
 #include "GameSystem/GridRefManager.h"
 #include "MapRefManager.h"
 #include "mersennetwister/MersenneTwister.h"
-
 #include <bitset>
 #include <list>
-
 class Unit;
 class WorldPacket;
 class InstanceData;
@@ -52,27 +47,22 @@ struct ScriptInfo;
 struct ScriptAction;
 struct Position;
 
-
 typedef ACE_RW_Thread_Mutex GridRWLock;
-
 template<class MUTEX, class LOCK_TYPE>
 struct RGuard
 {
     RGuard(MUTEX &l) : i_lock(l.getReadLock()) {}
     Trinity::GeneralLock<LOCK_TYPE> i_lock;
 };
-
 template<class MUTEX, class LOCK_TYPE>
 struct WGuard
 {
     WGuard(MUTEX &l) : i_lock(l.getWriteLock()) {}
     Trinity::GeneralLock<LOCK_TYPE> i_lock;
 };
-
 typedef RGuard<GridRWLock, ACE_Thread_Mutex> GridReadGuard;
 typedef WGuard<GridRWLock, ACE_Thread_Mutex> GridWriteGuard;
 typedef MaNGOS::SingleThreaded<GridRWLock>::Lock NullGuard;
-
 //******************************************
 // Map file format defines
 //******************************************
@@ -81,7 +71,6 @@ typedef MaNGOS::SingleThreaded<GridRWLock>::Lock NullGuard;
 #define MAP_AREA_MAGIC        'AERA'
 #define MAP_HEIGHT_MAGIC      'TGHM'
 #define MAP_LIQUID_MAGIC      'QILM'
-
 struct map_fileheader
 {
     uint32 mapMagic;
@@ -93,20 +82,16 @@ struct map_fileheader
     uint32 liquidMapOffset;
     uint32 liquidMapSize;
 };
-
 #define MAP_AREA_NO_AREA      0x0001
-
 struct map_areaHeader
 {
     uint32 fourcc;
     uint16 flags;
     uint16 gridArea;
 };
-
 #define MAP_HEIGHT_NO_HEIGHT  0x0001
 #define MAP_HEIGHT_AS_INT16   0x0002
 #define MAP_HEIGHT_AS_INT8    0x0004
-
 struct map_heightHeader
 {
     uint32 fourcc;
@@ -114,10 +99,8 @@ struct map_heightHeader
     float  gridHeight;
     float  gridMaxHeight;
 };
-
 #define MAP_LIQUID_NO_TYPE    0x0001
 #define MAP_LIQUID_NO_HEIGHT  0x0002
-
 struct map_liquidHeader
 {
     uint32 fourcc;
@@ -129,7 +112,6 @@ struct map_liquidHeader
     uint8  height;
     float  liquidLevel;
 };
-
 enum ZLiquidStatus
 {
     LIQUID_MAP_NO_WATER     = 0x00000000,
@@ -138,25 +120,20 @@ enum ZLiquidStatus
     LIQUID_MAP_IN_WATER     = 0x00000004,
     LIQUID_MAP_UNDER_WATER  = 0x00000008
 };
-
 #define MAP_LIQUID_TYPE_NO_WATER    0x00
 #define MAP_LIQUID_TYPE_WATER       0x01
 #define MAP_LIQUID_TYPE_OCEAN       0x02
 #define MAP_LIQUID_TYPE_MAGMA       0x04
 #define MAP_LIQUID_TYPE_SLIME       0x08
-
 #define MAP_ALL_LIQUIDS   (MAP_LIQUID_TYPE_WATER | MAP_LIQUID_TYPE_OCEAN | MAP_LIQUID_TYPE_MAGMA | MAP_LIQUID_TYPE_SLIME)
-
 #define MAP_LIQUID_TYPE_DARK_WATER  0x10
 #define MAP_LIQUID_TYPE_WMO_WATER   0x20
-
 struct LiquidData
 {
     uint32 type;
     float  level;
     float  depth_level;
 };
-
 class GridMap
 {
     uint32  m_flags;
@@ -185,11 +162,9 @@ class GridMap
     float   m_liquidLevel;
     uint8  *m_liquid_type;
     float  *m_liquid_map;
-
     bool  loadAreaData(FILE *in, uint32 offset, uint32 size);
     bool  loadHeihgtData(FILE *in, uint32 offset, uint32 size);
     bool  loadLiquidData(FILE *in, uint32 offset, uint32 size);
-
     // Get height functions and pointers
     typedef float (GridMap::*pGetHeightPtr) (float x, float y) const;
     pGetHeightPtr m_gridGetHeight;
@@ -197,35 +172,29 @@ class GridMap
     float  getHeightFromUint16(float x, float y) const;
     float  getHeightFromUint8(float x, float y) const;
     float  getHeightFromFlat(float x, float y) const;
-
 public:
     GridMap();
     ~GridMap();
     bool  loadData(char *filaname);
     void  unloadData();
-
     uint16 getArea(float x, float y);
     inline float getHeight(float x, float y) {return (this->*m_gridGetHeight)(x, y);}
     float  getLiquidLevel(float x, float y);
     uint8  getTerrainType(float x, float y);
     ZLiquidStatus getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData *data = 0);
 };
-
 struct CreatureMover
 {
     CreatureMover() : x(0), y(0), z(0), ang(0) {}
     CreatureMover(float _x, float _y, float _z, float _ang) : x(_x), y(_y), z(_z), ang(_ang) {}
-
     float x, y, z, ang;
 };
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 struct InstanceTemplate
 {
     uint32 map;
@@ -240,33 +209,26 @@ struct InstanceTemplate
     float startLocO;
     uint32 script_id;
 };
-
 enum LevelRequirementVsMode
 {
     LEVELREQUIREMENT_HEROIC = 70
 };
-
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList;
-
 #define MAX_HEIGHT            100000.0f                     // can be use for find ground height at surface
 #define INVALID_HEIGHT       -100000.0f                     // for check, must be equal to VMAP_INVALID_HEIGHT, real value for unknown height is VMAP_INVALID_HEIGHT_VALUE
 #define MIN_UNLOAD_DELAY      1                             // immediate unload
-
 typedef std::map<uint32/*leaderDBGUID*/, CreatureGroup*>        CreatureGroupHolderType;
-
 class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::ObjectLevelLockable<Map, ACE_Thread_Mutex>
 {
     friend class MapReference;
     public:
         Map(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent = NULL);
         virtual ~Map();
-
         // currently unused for normal maps
         bool CanUnload(uint32 diff)
         {
@@ -275,105 +237,80 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
             m_unloadTimer -= diff;
             return false;
         }
-
         virtual bool Add(Player *);
         virtual void Remove(Player *, bool);
         template<class T> void Add(T *);
         template<class T> void Remove(T *, bool);
-
         virtual void Update(const uint32&);
-
         /*
         void MessageBroadcast(Player *, WorldPacket *, bool to_self);
         void MessageBroadcast(WorldObject *, WorldPacket *);
         void MessageDistBroadcast(Player *, WorldPacket *, float dist, bool to_self, bool own_team_only = false);
         void MessageDistBroadcast(WorldObject *, WorldPacket *, float dist);
         */
- 
         float GetVisibilityDistance() const { return m_VisibleDistance; }
         //function for setting up visibility distance for maps on per-type/per-Id basis
         virtual void InitVisibilityDistance();
-
         void PlayerRelocation(Player *, float x, float y, float z, float angl);
         void CreatureRelocation(Creature *creature, float x, float y, float, float);
-
         template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &cell, TypeContainerVisitor<T, CONTAINER> &visitor);
-
         bool IsRemovalGrid(float x, float y) const
         {
             GridPair p = Trinity::ComputeGridPair(x, y);
             return( !getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL );
         }
-
         bool GetUnloadLock(const GridPair &p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadLock(); }
         void SetUnloadLock(const GridPair &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadExplicitLock(on); }
         void LoadGrid(float x, float y);
         bool UnloadGrid(const uint32 &x, const uint32 &y, bool pForce);
         virtual void UnloadAll();
-
         void ResetGridExpiry(NGridType &grid, float factor = 1) const
         {
             grid.ResetTimeTracker((time_t)((float)i_gridExpiry*factor));
         }
-
         time_t GetGridExpiry(void) const { return i_gridExpiry; }
         uint32 GetId(void) const { return i_mapEntry->MapID; }
-
         static bool ExistMap(uint32 mapid, int gx, int gy);
         static bool ExistVMap(uint32 mapid, int gx, int gy);
-
         static void InitStateMachine();
         static void DeleteStateMachine();
-
         Map const * GetParent() const { return m_parentMap; }
-
         // some calls like isInWater should not use vmaps due to processor power
         // can return INVALID_HEIGHT if under z+2 z coord not found height
         float GetHeight(float x, float y, float z, bool pCheckVMap=true) const;
         float GetVmapHeight(float x, float y, float z, bool useMaps) const;
         bool IsInWater(float x, float y, float z, float min_depth = 2.0f) const;
-
         ZLiquidStatus getLiquidStatus(float x, float y, float z, uint8 ReqLiquidType, LiquidData *data = 0) const;
-
         uint16 GetAreaFlag(float x, float y, float z) const;
         uint8 GetTerrainType(float x, float y ) const;
         float GetWaterLevel(float x, float y ) const;
         bool IsUnderWater(float x, float y, float z) const;
-
         static uint32 GetAreaIdByAreaFlag(uint16 areaflag,uint32 map_id);
         static uint32 GetZoneIdByAreaFlag(uint16 areaflag,uint32 map_id);
         static void GetZoneAndAreaIdByAreaFlag(uint32& zoneid, uint32& areaid, uint16 areaflag,uint32 map_id);
-
         uint32 GetAreaId(float x, float y, float z) const
         {
             return GetAreaIdByAreaFlag(GetAreaFlag(x,y,z),GetId());
         }
-
         uint32 GetZoneId(float x, float y, float z) const
         {
             return GetZoneIdByAreaFlag(GetAreaFlag(x,y,z),GetId());
         }
-
         void GetZoneAndAreaId(uint32& zoneid, uint32& areaid, float x, float y, float z) const
         {
             GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(x,y,z),GetId());
         }
-
         void MoveAllCreaturesInMoveList();
         void RemoveAllObjectsInRemoveList();
         void RelocationNotify();
         virtual void RemoveAllPlayers();
-
         bool CreatureRespawnRelocation(Creature *c);        // used only in MoveAllCreaturesInMoveList and ObjectGridUnloader
-
         // assert print helper
         bool CheckGridIntegrity(Creature* c, bool moved) const;
-
         uint32 GetInstanceId() const { return i_InstanceId; }
         uint8 GetSpawnMode() const { return (i_spawnMode); }
         virtual bool CanEnter(Player* /*player*/) { return true; }
         const char* GetMapName() const;
-
         bool Instanceable() const { return i_mapEntry && i_mapEntry->Instanceable(); }
         // NOTE: this duplicate of Instanceable(), but Instanceable() can be changed when BG also will be instanceable
         bool IsDungeon() const { return i_mapEntry && i_mapEntry->IsDungeon(); }
@@ -393,57 +330,41 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
             y = i_mapEntry->entrance_y;
             return true;
         }
-
         void AddObjectToRemoveList(WorldObject *obj);
         void AddObjectToSwitchList(WorldObject *obj, bool on);
         virtual void DelayedUpdate(const uint32 diff);
-
         virtual bool RemoveBones(uint64 guid, float x, float y);
-
         void UpdateObjectVisibility(WorldObject* obj, Cell cell, CellPair cellpair);
-
         void resetMarkedCells() { marked_cells.reset(); }
         bool isCellMarked(uint32 pCellId) { return marked_cells.test(pCellId); }
         void markCell(uint32 pCellId) { marked_cells.set(pCellId); }
-
         bool HavePlayers() const { return !m_mapRefManager.isEmpty(); }
         uint32 GetPlayersCountExceptGMs() const;
         bool ActiveObjectsNearGrid(uint32 x, uint32 y) const;
-
         void AddUnitToNotify(Unit* unit);
         void RemoveUnitFromNotify(Unit *unit);
         void AddWorldObject(WorldObject *obj) { i_worldObjects.insert(obj); }
         void RemoveWorldObject(WorldObject *obj) { i_worldObjects.erase(obj); }
-
         void SendToPlayers(WorldPacket const* data) const;
-
         typedef MapRefManager PlayerList;
         PlayerList const& GetPlayers() const { return m_mapRefManager; }
-
         //per-map script storage
         void ScriptsStart(std::map<uint32, std::multimap<uint32, ScriptInfo> > const& scripts, uint32 id, Object* source, Object* target);
         void ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* source, Object* target);
-
         // must called with AddToWorld
         template<class T>
         void AddToActive(T* obj) { AddToActiveHelper(obj); }
-
         void AddToActive(Creature* obj);
-
         // must called with RemoveFromWorld
         template<class T>
         void RemoveFromActive(T* obj) { RemoveFromActiveHelper(obj); }
-
         void RemoveFromActive(Creature* obj);
-
         template<class T> void SwitchGridContainers(T* obj, bool active);
         template<class NOTIFIER> void VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier);
         template<class NOTIFIER> void VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier);
         template<class NOTIFIER> void VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier);
         CreatureGroupHolderType CreatureGroupHolder;
-
         void UpdateIteratorBack(Player *player);
-
 #ifdef MAP_BASED_RAND_GEN
         MTRand mtRand;
         int32 irand(int32 min, int32 max)       { return int32 (mtRand.randInt(max - min)) + min; }
@@ -452,7 +373,6 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
         double rand_norm()                      { return mtRand.randExc(); }
         double rand_chance()                    { return mtRand.randExc(100.0); }
 #endif
-
         TempSummon *SummonCreature(uint32 entry, const Position &pos, SummonPropertiesEntry const *properties = NULL, uint32 duration = 0, Unit *summoner = NULL, uint32 vehId = 0);
         Creature* GetCreature(uint64 guid);
         GameObject* GetGameObject(uint64 guid);
@@ -462,78 +382,56 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
         void LoadVMap(int gx, int gy);
         void LoadMap(int gx,int gy, bool reload = false);
         GridMap *GetGrid(float x, float y);
-
         void SetTimer(uint32 t) { i_gridExpiry = t < MIN_GRID_DELAY ? MIN_GRID_DELAY : t; }
-
         void SendInitSelf( Player * player );
-
         void SendInitTransports( Player * player );
         void SendRemoveTransports( Player * player );
-
         bool CreatureCellRelocation(Creature *creature, Cell new_cell);
-
         void AddCreatureToMoveList(Creature *c, float x, float y, float z, float ang);
         CreatureMoveList i_creaturesToMove;
-
         bool loaded(const GridPair &) const;
         void EnsureGridCreated(const GridPair &);
         bool EnsureGridLoaded(Cell const&);
         void EnsureGridLoadedAtEnter(Cell const&, Player* player = NULL);
-
         void buildNGridLinkage(NGridType* pNGridType) { pNGridType->link(this); }
-
         template<class T> void AddType(T *obj);
         template<class T> void RemoveType(T *obj, bool);
-
         NGridType* getNGrid(uint32 x, uint32 y) const
         {
             ASSERT(x < MAX_NUMBER_OF_GRIDS);
             ASSERT(y < MAX_NUMBER_OF_GRIDS);
             return i_grids[x][y];
         }
-
         bool isGridObjectDataLoaded(uint32 x, uint32 y) const { return getNGrid(x,y)->isGridObjectDataLoaded(); }
         void setGridObjectDataLoaded(bool pLoaded, uint32 x, uint32 y) { getNGrid(x,y)->setGridObjectDataLoaded(pLoaded); }
-
         void setNGrid(NGridType* grid, uint32 x, uint32 y);
         void ScriptsProcess();
-
         void UpdateActiveCells(const float &x, const float &y, const uint32 &t_diff);
     protected:
         void SetUnloadReferenceLock(const GridPair &p, bool on) { getNGrid(p.x_coord, p.y_coord)->setUnloadReferenceLock(on); }
-
         typedef MaNGOS::ObjectLevelLockable<Map, ACE_Thread_Mutex>::Lock Guard;
-
         MapEntry const* i_mapEntry;
         uint8 i_spawnMode;
         uint32 i_InstanceId;
         uint32 m_unloadTimer;
         float m_VisibleDistance;
-
         MapRefManager m_mapRefManager;
         MapRefManager::iterator m_mapRefIter;
-
         typedef std::set<WorldObject*> ActiveNonPlayers;
         ActiveNonPlayers m_activeNonPlayers;
         ActiveNonPlayers::iterator m_activeNonPlayersIter;
 
-
     private:
         time_t i_gridExpiry;
-
         //used for fast base_map (e.g. MapInstanced class object) search for
         //InstanceMaps and BattleGroundMaps...
         Map* m_parentMap;
-
         typedef GridReadGuard ReadGuard;
         typedef GridWriteGuard WriteGuard;
-
         NGridType* i_grids[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
         GridMap *GridMaps[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
         std::bitset<TOTAL_NUMBER_OF_CELLS_PER_MAP*TOTAL_NUMBER_OF_CELLS_PER_MAP> marked_cells;
-
         IntervalTimer m_notifyTimer;
-
         bool i_notifyLock, i_scriptLock;
         std::vector<Unit*> i_unitsToNotifyBacklog;
         std::vector<Unit*> i_unitsToNotify;
@@ -541,26 +439,20 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
         std::map<WorldObject*, bool> i_objectsToSwitch;
         std::set<WorldObject*> i_worldObjects;
         std::multimap<time_t, ScriptAction> m_scriptSchedule;
-
         // Type specific code for add/remove to/from grid
         template<class T>
             void AddToGrid(T*, NGridType *, Cell const&);
-
         template<class T>
             void AddNotifier(T*);
-
         template<class T>
             void RemoveFromGrid(T*, NGridType *, Cell const&);
-
         template<class T>
             void DeleteFromWorld(T*);
-
         template<class T>
         void AddToActiveHelper(T* obj)
         {
             m_activeNonPlayers.insert(obj);
         }
-
         template<class T>
         void RemoveFromActiveHelper(T* obj)
         {
@@ -578,7 +470,6 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
                 m_activeNonPlayers.erase(obj);
         }
 };
-
 enum InstanceResetMethod
 {
     INSTANCE_RESET_ALL,
@@ -588,7 +479,6 @@ enum InstanceResetMethod
     INSTANCE_RESET_GROUP_JOIN,
     INSTANCE_RESET_RESPAWN_DELAY
 };
-
 class TRINITY_DLL_SPEC InstanceMap : public Map
 {
     public:
@@ -607,7 +497,6 @@ class TRINITY_DLL_SPEC InstanceMap : public Map
         void SendResetWarnings(uint32 timeLeft) const;
         void SetResetSchedule(bool on);
         uint32 GetMaxPlayers() const;
-
         virtual void InitVisibilityDistance();
     private:
         bool m_resetAfterUnload;
@@ -615,23 +504,19 @@ class TRINITY_DLL_SPEC InstanceMap : public Map
         InstanceData* i_data;
         uint32 i_script_id;
 };
-
 class TRINITY_DLL_SPEC BattleGroundMap : public Map
 {
     public:
         BattleGroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent);
         ~BattleGroundMap();
-
         bool Add(Player *);
         void Remove(Player *, bool);
         bool CanEnter(Player* player);
         void SetUnload();
         //void UnloadAll(bool pForce);
         void RemoveAllPlayers();
-
         virtual void InitVisibilityDistance();
 };
-
 /*inline
 uint64
 Map::CalculateGridMask(const uint32 &y) const
@@ -641,7 +526,6 @@ Map::CalculateGridMask(const uint32 &y) const
     return mask;
 }
 */
-
 template<class LOCK_TYPE, class T, class CONTAINER>
 inline void
 Map::Visit(const CellLock<LOCK_TYPE> &cell, TypeContainerVisitor<T, CONTAINER> &visitor)
@@ -650,7 +534,6 @@ Map::Visit(const CellLock<LOCK_TYPE> &cell, TypeContainerVisitor<T, CONTAINER> &
     const uint32 y = cell->GridY();
     const uint32 cell_x = cell->CellX();
     const uint32 cell_y = cell->CellY();
-
     if( !cell->NoCreate() || loaded(GridPair(x,y)) )
     {
         EnsureGridLoaded(cell);
@@ -658,7 +541,6 @@ Map::Visit(const CellLock<LOCK_TYPE> &cell, TypeContainerVisitor<T, CONTAINER> &
         getNGrid(x, y)->Visit(cell_x, cell_y, visitor);
     }
 }
-
 template<class NOTIFIER>
 inline void
 Map::VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier)
@@ -669,13 +551,11 @@ Map::VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier)
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
     CellLock<GridReadGuard> cell_lock(cell, p);
-
     TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
     cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x_off, y_off);
     TypeContainerVisitor<NOTIFIER, GridTypeMapContainer >  grid_object_notifier(notifier);
     cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off);
 }
-
 template<class NOTIFIER>
 inline void
 Map::VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier)
@@ -686,11 +566,9 @@ Map::VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
     CellLock<GridReadGuard> cell_lock(cell, p);
-
     TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
     cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x_off, y_off);
 }
-
 template<class NOTIFIER>
 inline void
 Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier)
@@ -701,7 +579,6 @@ Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier)
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
     CellLock<GridReadGuard> cell_lock(cell, p);
-
     TypeContainerVisitor<NOTIFIER, GridTypeMapContainer >  grid_object_notifier(notifier);
     cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off);
 }
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 28faf52bf19..22ea5ecef2c 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "MapInstanced.h"
 #include "ObjectMgr.h"
 #include "MapManager.h"
@@ -25,7 +24,6 @@
 #include "VMapFactory.h"
 #include "InstanceSaveMgr.h"
 #include "World.h"
-
 MapInstanced::MapInstanced(uint32 id, time_t expiry) : Map(id, expiry, 0, 0)
 {
     // initialize instanced maps list
@@ -33,7 +31,6 @@ MapInstanced::MapInstanced(uint32 id, time_t expiry) : Map(id, expiry, 0, 0)
     // fill with zero
     memset(&GridMapReference, 0, MAX_NUMBER_OF_GRIDS*MAX_NUMBER_OF_GRIDS*sizeof(uint16));
 }
-
 void MapInstanced::InitVisibilityDistance()
 {
     if(m_InstancedMaps.empty())
@@ -44,15 +41,12 @@ void MapInstanced::InitVisibilityDistance()
         (*i).second->InitVisibilityDistance();
     }
 }
-
 void MapInstanced::Update(const uint32& t)
 {
     // take care of loaded GridMaps (when unused, unload it!)
     Map::Update(t);
-
     // update the instanced maps
     InstancedMaps::iterator i = m_InstancedMaps.begin();
-
     while (i != m_InstancedMaps.end())
     {
         if(i->second->CanUnload(t))
@@ -70,15 +64,12 @@ void MapInstanced::Update(const uint32& t)
         }
     }
 }
-
 void MapInstanced::DelayedUpdate(const uint32 diff)
 {
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
         i->second->DelayedUpdate(diff);
-
     Map::DelayedUpdate(diff); // this may be removed
 }
-
 /*
 void MapInstanced::RelocationNotify()
 {
@@ -86,35 +77,27 @@ void MapInstanced::RelocationNotify()
         i->second->RelocationNotify();
 }
 */
-
 bool MapInstanced::RemoveBones(uint64 guid, float x, float y)
 {
     bool remove_result = false;
-
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
     {
         remove_result = remove_result || i->second->RemoveBones(guid, x, y);
     }
-
     return remove_result || Map::RemoveBones(guid,x,y);
 }
-
 void MapInstanced::UnloadAll()
 {
     // Unload instanced maps
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
         i->second->UnloadAll();
-
     // Delete the maps only after everything is unloaded to prevent crashes
     for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
         delete i->second;
-
     m_InstancedMaps.clear();
-
     // Unload own grids (just dummy(placeholder) grids, neccesary to unload GridMaps!)
     Map::UnloadAll();
 }
-
 /*
 - return the right instance for the object, based on its InstanceId
 - create the instance if it's not created already
@@ -125,7 +108,6 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player, uint32 in
     if(instanceId)
         if(Map *map = _FindMap(instanceId))
             return map;
-
     if(IsBattleGroundOrArena())
     {
         instanceId = player->GetBattleGroundId();
@@ -145,25 +127,20 @@ Map* MapInstanced::CreateInstance(const uint32 mapId, Player * player, uint32 in
         else if(instanceId != pSave->GetInstanceId()) // cannot go from one instance to another
             return NULL;
         // else log in at a saved instance
-
         return CreateInstance(instanceId, pSave, pSave->GetDifficulty());
     }
     else if(!player->GetSession()->PlayerLoading())
     {
         if(!instanceId)
             instanceId = MapManager::Instance().GenerateInstanceId();
-
         return CreateInstance(instanceId, NULL, player->GetDifficulty());
     }
-
     return NULL;
 }
-
 InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save, uint8 difficulty)
 {
     // load/create a map
     Guard guard(*this);
-
     // make sure we have a valid map id
     const MapEntry* entry = sMapStore.LookupEntry(GetId());
     if(!entry)
@@ -177,36 +154,26 @@ InstanceMap* MapInstanced::CreateInstance(uint32 InstanceId, InstanceSave *save,
         sLog.outError("CreateInstance: no instance template for map %d", GetId());
         assert(false);
     }
-
     // some instances only have one difficulty
     if (entry && !entry->SupportsHeroicMode()) difficulty = DIFFICULTY_NORMAL;
-
     sLog.outDebug("MapInstanced::CreateInstance: %s map instance %d for %d created with difficulty %s", save?"":"new ", InstanceId, GetId(), difficulty?"heroic":"normal");
-
     InstanceMap *map = new InstanceMap(GetId(), GetGridExpiry(), InstanceId, difficulty, this);
     ASSERT(map->IsDungeon());
-
     bool load_data = save != NULL;
     map->CreateInstanceData(load_data);
-
     m_InstancedMaps[InstanceId] = map;
     return map;
 }
-
 BattleGroundMap* MapInstanced::CreateBattleGround(uint32 InstanceId)
 {
     // load/create a map
     Guard guard(*this);
-
     sLog.outDebug("MapInstanced::CreateBattleGround: map bg %d for %d created.", InstanceId, GetId());
-
     BattleGroundMap *map = new BattleGroundMap(GetId(), GetGridExpiry(), InstanceId, this);
     ASSERT(map->IsBattleGroundOrArena());
-
     m_InstancedMaps[InstanceId] = map;
     return map;
 }
-
 // increments the iterator after erase
 bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr)
 {
@@ -216,7 +183,6 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr)
         ++itr;
         return false;
     }
-
     itr->second->UnloadAll();
     // should only unload VMaps if this is the last instance and grid unloading is enabled
     if(m_InstancedMaps.size() <= 1 && sWorld.getConfig(CONFIG_GRID_UNLOAD))
@@ -231,7 +197,6 @@ bool MapInstanced::DestroyInstance(InstancedMaps::iterator &itr)
     m_InstancedMaps.erase(itr++);
     return true;
 }
-
 bool MapInstanced::CanEnter(Player *player)
 {
     //assert(false);
diff --git a/src/game/MapInstanced.h b/src/game/MapInstanced.h
index 22622d362ce..80501b8a747 100644
--- a/src/game/MapInstanced.h
+++ b/src/game/MapInstanced.h
@@ -17,22 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_MAP_INSTANCED_H
 #define TRINITY_MAP_INSTANCED_H
-
 #include "Map.h"
 #include "InstanceSaveMgr.h"
-
 class TRINITY_DLL_DECL MapInstanced : public Map
 {
     friend class MapManager;
     public:
         typedef UNORDERED_MAP< uint32, Map* > InstancedMaps;
-
         MapInstanced(uint32 id, time_t expiry);
         ~MapInstanced() {}
-
         // functions overwrite Map versions
         void Update(const uint32&);
         void DelayedUpdate(const uint32 diff);
@@ -40,40 +35,31 @@ class TRINITY_DLL_DECL MapInstanced : public Map
         bool RemoveBones(uint64 guid, float x, float y);
         void UnloadAll();
         bool CanEnter(Player* player);
-
         Map* CreateInstance(const uint32 mapId, Player * player, uint32 instanceId);
         Map* FindMap(uint32 InstanceId) const { return _FindMap(InstanceId); }
         bool DestroyInstance(InstancedMaps::iterator &itr);
-
         void AddGridMapReference(const GridPair &p)
         {
             ++GridMapReference[p.x_coord][p.y_coord];
             SetUnloadReferenceLock(GridPair(63-p.x_coord, 63-p.y_coord), true);
         }
-
         void RemoveGridMapReference(GridPair const& p)
         {
             --GridMapReference[p.x_coord][p.y_coord];
             if (!GridMapReference[p.x_coord][p.y_coord])
                 SetUnloadReferenceLock(GridPair(63-p.x_coord, 63-p.y_coord), false);
         }
-
         InstancedMaps &GetInstancedMaps() { return m_InstancedMaps; }
         virtual void InitVisibilityDistance();
-
     private:
-
         InstanceMap* CreateInstance(uint32 InstanceId, InstanceSave *save, uint8 difficulty);
         BattleGroundMap* CreateBattleGround(uint32 InstanceId);
-
         InstancedMaps m_InstancedMaps;
-
         Map* _FindMap(uint32 InstanceId) const
         {
             InstancedMaps::const_iterator i = m_InstancedMaps.find(InstanceId);
             return(i == m_InstancedMaps.end() ? NULL : i->second);
         }
-
         uint16 GridMapReference[MAX_NUMBER_OF_GRIDS][MAX_NUMBER_OF_GRIDS];
 };
 #endif
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 0da5b19eb93..c6ece7c426e 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifdef MULTI_THREAD_MAP
 #include <omp.h>
 #endif
@@ -36,34 +35,26 @@
 #include "Corpse.h"
 #include "ObjectMgr.h"
 #include "Language.h"
-
 #define CLASS_LOCK MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex>
 INSTANTIATE_SINGLETON_2(MapManager, CLASS_LOCK);
 INSTANTIATE_CLASS_MUTEX(MapManager, ACE_Thread_Mutex);
-
 extern GridState* si_GridStates[];                          // debugging code, should be deleted some day
-
 MapManager::MapManager() : i_gridCleanUpDelay(sWorld.getConfig(CONFIG_INTERVAL_GRIDCLEAN))
 {
     i_timer.SetInterval(sWorld.getConfig(CONFIG_INTERVAL_MAPUPDATE));
 }
-
 MapManager::~MapManager()
 {
     for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
         delete iter->second;
-
     for(TransportSet::iterator i = m_Transports.begin(); i != m_Transports.end(); ++i)
         delete *i;
-
     Map::DeleteStateMachine();
 }
-
 void
 MapManager::Initialize()
 {
     Map::InitStateMachine();
-
     // debugging code, should be deleted some day
     {
         for(int i=0;i<MAX_GRID_STATE; i++)
@@ -72,16 +63,13 @@ MapManager::Initialize()
         }
         i_GridStateErrorCount = 0;
     }
-
     InitMaxInstanceId();
 }
-
 void MapManager::InitializeVisibilityDistanceInfo()
 {
     for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
         (*iter).second->InitVisibilityDistance();
 }
-
 // debugging code, should be deleted some day
 void MapManager::checkAndCorrectGridStatesArray()
 {
@@ -108,16 +96,13 @@ void MapManager::checkAndCorrectGridStatesArray()
     if(i_GridStateErrorCount > 2)
         assert(false);                                      // force a crash. Too many errors
 }
-
 Map*
 MapManager::_createBaseMap(uint32 id)
 {
     Map *m = _findMap(id);
-
     if( m == NULL )
     {
         Guard guard(*this);
-
         const MapEntry* entry = sMapStore.LookupEntry(id);
         if (entry && entry->Instanceable())
         {
@@ -133,34 +118,26 @@ MapManager::_createBaseMap(uint32 id)
         }
         i_maps[id] = m;
     }
-
     assert(m != NULL);
     return m;
 }
-
 Map* MapManager::CreateMap(uint32 id, const WorldObject* obj, uint32 instanceId)
 {
     ASSERT(obj);
     //if(!obj->IsInWorld()) sLog.outError("GetMap: called for map %d with object (typeid %d, guid %d, mapid %d, instanceid %d) who is not in world!", id, obj->GetTypeId(), obj->GetGUIDLow(), obj->GetMapId(), obj->GetInstanceId());
     Map *m = _createBaseMap(id);
-
     if (m && (obj->GetTypeId() == TYPEID_PLAYER) && m->Instanceable()) m = ((MapInstanced*)m)->CreateInstance(id, (Player*)obj, instanceId);
-
     return m;
 }
-
 Map* MapManager::FindMap(uint32 mapid, uint32 instanceId) const
 {
     Map *map = _findMap(mapid);
     if(!map)
         return NULL;
-
     if(!map->Instanceable())
         return instanceId == 0 ? map : NULL;
-
     return ((MapInstanced*)map)->FindMap(instanceId);
 }
-
 /*
     checks that do not require a map to be created
     will send transfer error messages on fail
@@ -170,7 +147,6 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
     const MapEntry *entry = sMapStore.LookupEntry(mapid);
     if(!entry) return false;
     const char *mapName = entry->name[player->GetSession()->GetSessionDbcLocale()];
-
     if(entry->map_type == MAP_INSTANCE || entry->map_type == MAP_RAID)
     {
         if (entry->map_type == MAP_RAID)
@@ -190,7 +166,6 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
                 }
             }
         }
-
         //The player has a heroic mode and tries to enter into instance which has no a heroic mode
         if (!entry->SupportsHeroicMode() && player->GetDifficulty() == DIFFICULTY_HEROIC)
         {
@@ -198,7 +173,6 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
             player->SendTransferAborted(mapid, TRANSFER_ABORT_DIFFICULTY, DIFFICULTY_HEROIC);
             return false;
         }
-
         if (!player->isAlive())
         {
             if(Corpse *corpse = player->GetCorpse())
@@ -209,12 +183,10 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
                 {
                     if(instance_map==mapid)
                         break;
-
                     InstanceTemplate const* instance = objmgr.GetInstanceTemplate(instance_map);
                     instance_map = instance ? instance->parent : 0;
                 }
                 while (instance_map);
-
                 if (!instance_map)
                 {
                     player->GetSession()->SendAreaTriggerMessage(player->GetSession()->GetTrinityString(811), mapName);
@@ -228,35 +200,29 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
                 sLog.outDebug("Map::CanEnter - player '%s' is dead but doesn't have a corpse!", player->GetName());
             }
         }
-
         // Requirements
         InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid);
         if(!instance)
             return false;
-
         return player->Satisfy(objmgr.GetAccessRequirement(instance->access_id), mapid, true);
     }
     else
         return true;
 }
-
 void MapManager::RemoveBonesFromMap(uint32 mapid, uint64 guid, float x, float y)
 {
     bool remove_result = _createBaseMap(mapid)->RemoveBones(guid, x, y);
-
     if (!remove_result)
     {
         sLog.outDebug("Bones %u not found in world. Delete from DB also.", GUID_LOPART(guid));
     }
 }
-
 void
 MapManager::Update(uint32 diff)
 {
     i_timer.Update(diff);
     if( !i_timer.Passed() )
         return;
-
 #ifdef MULTI_THREAD_MAP
     uint32 i=0;
     MapMapType::iterator iter;
@@ -283,19 +249,15 @@ MapManager::Update(uint32 diff)
         sWorld.RecordTimeDiff("UpdateMap %u", iter->second->GetId());
     }
 #endif
-
     for(MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter)
         iter->second->DelayedUpdate(i_timer.GetCurrent());
-
     ObjectAccessor::Instance().Update(i_timer.GetCurrent());
     sWorld.RecordTimeDiff("UpdateObjectAccessor");
     for (TransportSet::iterator iter = m_Transports.begin(); iter != m_Transports.end(); ++iter)
         (*iter)->Update(i_timer.GetCurrent());
     sWorld.RecordTimeDiff("UpdateTransports");
-
     i_timer.SetCurrent(0);
 }
-
 void MapManager::DoDelayedMovesAndRemoves()
 {
     /*
@@ -304,48 +266,38 @@ void MapManager::DoDelayedMovesAndRemoves()
     MapMapType::iterator iter;
     for(iter = i_maps.begin();iter != i_maps.end(); ++iter, i++)
     update_queue[i] = iter->second;
-
     omp_set_num_threads(sWorld.getConfig(CONFIG_NUMTHREADS));
-    
 #pragma omp parallel for schedule(dynamic) private(i) shared(update_queue)
     for(i=0;i<i_maps.size();i++)
     update_queue[i]->DoDelayedMovesAndRemoves();
     */
 }
-
 bool MapManager::ExistMapAndVMap(uint32 mapid, float x,float y)
 {
     GridPair p = Trinity::ComputeGridPair(x,y);
-
     int gx=63-p.x_coord;
     int gy=63-p.y_coord;
-
     return Map::ExistMap(mapid,gx,gy) && Map::ExistVMap(mapid,gx,gy);
 }
-
 bool MapManager::IsValidMAP(uint32 mapid)
 {
     MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
     return mEntry && (!mEntry->IsDungeon() || objmgr.GetInstanceTemplate(mapid));
     // TODO: add check for battleground template
 }
-
 void MapManager::UnloadAll()
 {
     for(MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
         iter->second->UnloadAll();
-
     while(!i_maps.empty())
     {
         delete i_maps.begin()->second;
         i_maps.erase(i_maps.begin());
     }
 }
-
 void MapManager::InitMaxInstanceId()
 {
     i_MaxInstanceId = 0;
-
     QueryResult *result = CharacterDatabase.Query( "SELECT MAX(id) FROM instance" );
     if( result )
     {
@@ -353,7 +305,6 @@ void MapManager::InitMaxInstanceId()
         delete result;
     }
 }
-
 uint32 MapManager::GetNumInstances()
 {
     uint32 ret = 0;
@@ -367,7 +318,6 @@ uint32 MapManager::GetNumInstances()
     }
     return ret;
 }
-
 uint32 MapManager::GetNumPlayersInInstances()
 {
     uint32 ret = 0;
diff --git a/src/game/MapManager.h b/src/game/MapManager.h
index f9e64240686..5e7db0e4263 100644
--- a/src/game/MapManager.h
+++ b/src/game/MapManager.h
@@ -17,32 +17,24 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_MAPMANAGER_H
 #define TRINITY_MAPMANAGER_H
-
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "ace/Thread_Mutex.h"
 #include "Common.h"
 #include "Map.h"
 #include "GridStates.h"
-
 class Transport;
-
 class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex> >
 {
-
     friend class Trinity::OperatorNew<MapManager>;
     typedef UNORDERED_MAP<uint32, Map*> MapMapType;
     typedef std::pair<UNORDERED_MAP<uint32, Map*>::iterator, bool>  MapMapPair;
-
     public:
-
         Map* CreateMap(uint32, const WorldObject* obj, uint32 instanceId);
         Map const* CreateBaseMap(uint32 id) const { return const_cast<MapManager*>(this)->_createBaseMap(id); }
         Map* FindMap(uint32 mapid, uint32 instanceId = 0) const;
-
         uint16 GetAreaFlag(uint32 mapid, float x, float y, float z) const
         {
             Map const* m = CreateBaseMap(mapid);
@@ -60,10 +52,8 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
         {
             Map::GetZoneAndAreaIdByAreaFlag(zoneid,areaid,GetAreaFlag(mapid, x, y, z),mapid);
         }
-
         void Initialize(void);
         void Update(uint32);
-
         void SetGridCleanUpDelay(uint32 t)
         {
             if( t < MIN_GRID_DELAY )
@@ -71,62 +61,47 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
             else
                 i_gridCleanUpDelay = t;
         }
-
         void SetMapUpdateInterval(uint32 t)
         {
             if( t > MIN_MAP_UPDATE_DELAY )
                 t = MIN_MAP_UPDATE_DELAY;
-
             i_timer.SetInterval(t);
             i_timer.Reset();
         }
-
         //void LoadGrid(int mapid, int instId, float x, float y, const WorldObject* obj, bool no_unload = false);
         void UnloadAll();
-
         static bool ExistMapAndVMap(uint32 mapid, float x, float y);
         static bool IsValidMAP(uint32 mapid);
-
         static bool IsValidMapCoord(uint32 mapid, float x,float y)
         {
             return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x,y);
         }
-
         static bool IsValidMapCoord(uint32 mapid, float x,float y,float z)
         {
             return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x,y,z);
         }
-
         static bool IsValidMapCoord(uint32 mapid, float x,float y,float z,float o)
         {
             return IsValidMAP(mapid) && Trinity::IsValidMapCoord(x,y,z,o);
         }
-
         static bool IsValidMapCoord(WorldLocation const& loc)
         {
             return IsValidMapCoord(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ(), loc.GetOrientation());
         }
-
         void DoDelayedMovesAndRemoves();
-
         void LoadTransports();
-
         typedef std::set<Transport *> TransportSet;
         TransportSet m_Transports;
-
         typedef std::map<uint32, TransportSet> TransportMap;
         TransportMap m_TransportsByMap;
-
         bool CanPlayerEnter(uint32 mapid, Player* player);
         void RemoveBonesFromMap(uint32 mapid, uint64 guid, float x, float y);
         uint32 GenerateInstanceId() { return ++i_MaxInstanceId; }
         void InitMaxInstanceId();
         void InitializeVisibilityDistanceInfo();
-
         /* statistics */
         uint32 GetNumInstances();
         uint32 GetNumPlayersInInstances();
-
     private:
         // debugging code, should be deleted some day
         void checkAndCorrectGridStatesArray();              // just for debugging to find some memory overwrites
@@ -135,22 +110,18 @@ class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::
     private:
         MapManager();
         ~MapManager();
-
         MapManager(const MapManager &);
         MapManager& operator=(const MapManager &);
-
         Map* _createBaseMap(uint32 id);
         Map* _findMap(uint32 id) const
         {
             MapMapType::const_iterator iter = i_maps.find(id);
             return (iter == i_maps.end() ? NULL : iter->second);
         }
-
         typedef MaNGOS::ClassLevelLockable<MapManager, ACE_Thread_Mutex>::Lock Guard;
         uint32 i_gridCleanUpDelay;
         MapMapType i_maps;
         IntervalTimer i_timer;
-
         uint32 i_MaxInstanceId;
 };
 #endif
diff --git a/src/game/MapRefManager.h b/src/game/MapRefManager.h
index 4337aa75fd9..8f94412fb34 100644
--- a/src/game/MapRefManager.h
+++ b/src/game/MapRefManager.h
@@ -15,25 +15,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _MAPREFMANAGER
 #define _MAPREFMANAGER
-
 #include "Utilities/LinkedReference/RefManager.h"
-
 class MapReference;
-
 class MapRefManager : public RefManager<Map, Player>
 {
     public:
         typedef LinkedListHead::Iterator< MapReference > iterator;
         typedef LinkedListHead::Iterator< MapReference const > const_iterator;
-
         MapReference* getFirst() { return (MapReference*)RefManager<Map, Player>::getFirst(); }
         MapReference const* getFirst() const { return (MapReference const*)RefManager<Map, Player>::getFirst(); }
         MapReference* getLast() { return (MapReference*)RefManager<Map, Player>::getLast(); }
         MapReference const* getLast() const { return (MapReference const*)RefManager<Map, Player>::getLast(); }
-
         iterator begin() { return iterator(getFirst()); }
         iterator end() { return iterator(NULL); }
         iterator rbegin() { return iterator(getLast()); }
diff --git a/src/game/MapReference.h b/src/game/MapReference.h
index ae485af7487..f997d852331 100644
--- a/src/game/MapReference.h
+++ b/src/game/MapReference.h
@@ -15,13 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _MAPREFERENCE_H
 #define _MAPREFERENCE_H
-
 #include "Utilities/LinkedReference/Reference.h"
 #include "Map.h"
-
 class TRINITY_DLL_SPEC MapReference : public Reference<Map, Player>
 {
     protected:
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 56070f27e19..72c47eb5a1f 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Language.h"
 #include "Database/DatabaseEnv.h"
@@ -47,16 +46,12 @@
 #include "AccountMgr.h"
 #include "Vehicle.h"
 #include "CreatureAI.h"
-
 void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_REPOP_REQUEST Message" );
-
     recv_data.read_skip<uint8>();
-
     if(GetPlayer()->isAlive()||GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         return;
-
     // the world update order is sessions, players, creatures
     // the netcode runs in parallel with all of these
     // creatures can kill players
@@ -67,24 +62,19 @@ void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
         sLog.outDebug("HandleRepopRequestOpcode: got request after player %s(%d) was killed and before he was updated", GetPlayer()->GetName(), GetPlayer()->GetGUIDLow());
         GetPlayer()->KillPlayer();
     }
-
     //this is spirit release confirm?
     GetPlayer()->RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true);
     GetPlayer()->BuildPlayerRepop();
     GetPlayer()->RepopAtGraveyard();
 }
-
 void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_GOSSIP_SELECT_OPTION");
-
     uint32 option;
     uint32 unk;
     uint64 guid;
     std::string code = "";
-
     recv_data >> guid >> unk >> option;
-
     if(_player->PlayerTalkClass->GossipOptionCoded( option ))
     {
         // recheck
@@ -92,7 +82,6 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
         recv_data >> code;
         sLog.outBasic("string read: %s", code.c_str());
     }
-
     Creature *unit = NULL;
     GameObject *go = NULL;
     if(IS_CRE_OR_VEH_GUID(guid))
@@ -118,11 +107,9 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
         sLog.outDebug( "WORLD: HandleGossipSelectOptionOpcode - unsupported GUID type for highguid %u. lowpart %u.", uint32(GUID_HIPART(guid)), uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     if(!code.empty())
     {
         if(unit)
@@ -144,31 +131,23 @@ void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
             Script->GOSelect( _player, go, _player->PlayerTalkClass->GossipOptionSender( option ), _player->PlayerTalkClass->GossipOptionAction( option ));
     }
 }
-
 void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_WHO Message" );
     //recv_data.hexlike();
-
     uint32 clientcount = 0;
-
     uint32 level_min, level_max, racemask, classmask, zones_count, str_count;
     uint32 zoneids[10];                                     // 10 is client limit
     std::string player_name, guild_name;
-
     recv_data >> level_min;                                 // maximal player level, default 0
     recv_data >> level_max;                                 // minimal player level, default 100 (MAX_LEVEL)
     recv_data >> player_name;                               // player name, case sensitive...
-
     recv_data >> guild_name;                                // guild name, case sensitive...
-
     recv_data >> racemask;                                  // race mask
     recv_data >> classmask;                                 // class mask
     recv_data >> zones_count;                               // zones count, client limit=10 (2.0.10)
-
     if(zones_count > 10)
         return;                                             // can't be received from real client or broken packet
-
     for(uint32 i = 0; i < zones_count; ++i)
     {
         uint32 temp;
@@ -176,49 +155,37 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
         zoneids[i] = temp;
         sLog.outDebug("Zone %u: %u", i, zoneids[i]);
     }
-
     recv_data >> str_count;                                 // user entered strings count, client limit=4 (checked on 2.0.10)
-
     if(str_count > 4)
         return;                                             // can't be received from real client or broken packet
-
     sLog.outDebug("Minlvl %u, maxlvl %u, name %s, guild %s, racemask %u, classmask %u, zones %u, strings %u", level_min, level_max, player_name.c_str(), guild_name.c_str(), racemask, classmask, zones_count, str_count);
-
     std::wstring str[4];                                    // 4 is client limit
     for(uint32 i = 0; i < str_count; ++i)
     {
         std::string temp;
         recv_data >> temp;                                  // user entered string, it used as universal search pattern(guild+player name)?
-
         if(!Utf8toWStr(temp,str[i]))
             continue;
-
         wstrToLower(str[i]);
-
         sLog.outDebug("String %u: %s", i, temp.c_str());
     }
-
     std::wstring wplayer_name;
     std::wstring wguild_name;
     if(!(Utf8toWStr(player_name, wplayer_name) && Utf8toWStr(guild_name, wguild_name)))
         return;
     wstrToLower(wplayer_name);
     wstrToLower(wguild_name);
-
     // client send in case not set max level value 100 but mangos support 255 max level,
     // update it to show GMs with characters after 100 level
     if(level_max >= MAX_LEVEL)
         level_max = STRONG_MAX_LEVEL;
-
     uint32 team = _player->GetTeam();
     uint32 security = GetSecurity();
     bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST);
     uint32 gmLevelInWhoList  = sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST);
-
     WorldPacket data( SMSG_WHO, 50 );                       // guess size
     data << clientcount;                                    // clientcount place holder
     data << clientcount;                                    // clientcount place holder
-
     //TODO: Guard Player map
     HashMapHolder<Player>::MapType& m = ObjectAccessor::Instance().GetPlayers();
     for(HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
@@ -228,37 +195,29 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
             // player can see member of other team only if CONFIG_ALLOW_TWO_SIDE_WHO_LIST
             if (itr->second->GetTeam() != team && !allowTwoSideWhoList )
                 continue;
-
             // player can see MODERATOR, GAME MASTER, ADMINISTRATOR only if CONFIG_GM_IN_WHO_LIST
             if ((itr->second->GetSession()->GetSecurity() > gmLevelInWhoList))
                 continue;
         }
-
         //do not process players which are not in world
         if(!(itr->second->IsInWorld()))
             continue;
-
         // check if target is globally visible for player
         if (!(itr->second->IsVisibleGloballyFor(_player)))
             continue;
-
         // check if target's level is in level range
         uint32 lvl = itr->second->getLevel();
         if (lvl < level_min || lvl > level_max)
             continue;
-
         // check if class matches classmask
         uint32 class_ = itr->second->getClass();
         if (!(classmask & (1 << class_)))
             continue;
-
         // check if race matches racemask
         uint32 race = itr->second->getRace();
         if (!(racemask & (1 << race)))
             continue;
-
         uint32 pzoneid = itr->second->GetZoneId();
-
         bool z_show = true;
         for(uint32 i = 0; i < zones_count; ++i)
         {
@@ -267,34 +226,27 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
                 z_show = true;
                 break;
             }
-
             z_show = false;
         }
         if (!z_show)
             continue;
-
         std::string pname = itr->second->GetName();
         std::wstring wpname;
         if(!Utf8toWStr(pname,wpname))
             continue;
         wstrToLower(wpname);
-
         if (!(wplayer_name.empty() || wpname.find(wplayer_name) != std::wstring::npos))
             continue;
-
         std::string gname = objmgr.GetGuildNameById(itr->second->GetGuildId());
         std::wstring wgname;
         if(!Utf8toWStr(gname,wgname))
             continue;
         wstrToLower(wgname);
-
         if (!(wguild_name.empty() || wgname.find(wguild_name) != std::wstring::npos))
             continue;
-
         std::string aname;
         if(AreaTableEntry const* areaEntry = GetAreaEntryByAreaID(itr->second->GetZoneId()))
             aname = areaEntry->area_name[GetSessionDbcLocale()];
-
         bool s_show = true;
         for(uint32 i = 0; i < str_count; ++i)
         {
@@ -312,7 +264,6 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
         }
         if (!s_show)
             continue;
-
         data << pname;                                      // player name
         data << gname;                                      // guild name
         data << uint32( lvl );                              // player level
@@ -320,27 +271,21 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
         data << uint32( race );                             // player race
         data << uint8(0);                                   // new 2.4.0
         data << uint32( pzoneid );                          // player zone id
-
         // 49 is maximum player count sent to client - can be overridden
         // through config, but is unstable
         if ((++clientcount) == sWorld.getConfig(CONFIG_MAX_WHO))
             break;
     }
-
     data.put( 0,              clientcount );                //insert right count
     data.put( sizeof(uint32), clientcount );                //insert right count
-
     SendPacket(&data);
     sLog.outDebug( "WORLD: Send SMSG_WHO Message" );
 }
-
 void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_LOGOUT_REQUEST Message, security - %u", GetSecurity() );
-
     if (uint64 lguid = GetPlayer()->GetLootGUID())
         DoLootRelease(lguid);
-
     //Can not logout if...
     if( GetPlayer()->isInCombat() ||                        //...is in combat
         GetPlayer()->duel         ||                        //...is in Duel
@@ -356,7 +301,6 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
         LogoutRequest(0);
         return;
     }
-
     //instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in mangosd.conf
     if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() ||
         GetSecurity() >= sWorld.getConfig(CONFIG_INSTANT_LOGOUT))
@@ -364,40 +308,32 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
         LogoutPlayer(true);
         return;
     }
-
     // not set flags if player can't free move to prevent lost state at logout cancel
     if(GetPlayer()->CanFreeMove())
     {
         GetPlayer()->SetStandState(UNIT_STAND_STATE_SIT);
-
         WorldPacket data( SMSG_FORCE_MOVE_ROOT, (8+4) );    // guess size
         data.append(GetPlayer()->GetPackGUID());
         data << (uint32)2;
         SendPacket( &data );
         GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
     }
-
     WorldPacket data( SMSG_LOGOUT_RESPONSE, 5 );
     data << uint32(0);
     data << uint8(0);
     SendPacket( &data );
     LogoutRequest(time(NULL));
 }
-
 void WorldSession::HandlePlayerLogoutOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_PLAYER_LOGOUT Message" );
 }
-
 void WorldSession::HandleLogoutCancelOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Recvd CMSG_LOGOUT_CANCEL Message" );
-
     LogoutRequest(0);
-
     WorldPacket data( SMSG_LOGOUT_CANCEL_ACK, 0 );
     SendPacket( &data );
-
     // not remove flags if can't free move - its not set in Logout request code.
     if(GetPlayer()->CanFreeMove())
     {
@@ -406,17 +342,13 @@ void WorldSession::HandleLogoutCancelOpcode( WorldPacket & /*recv_data*/ )
         data.append(GetPlayer()->GetPackGUID());
         data << uint32(0);
         SendPacket( &data );
-
         //! Stand Up
         GetPlayer()->SetStandState(UNIT_STAND_STATE_STAND);
-
         //! DISABLE_ROTATE
         GetPlayer()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
     }
-
     sLog.outDebug( "WORLD: sent SMSG_LOGOUT_CANCEL_ACK Message" );
 }
-
 void WorldSession::HandleTogglePvP( WorldPacket & recv_data )
 {
     // this opcode can be used in two ways: Either set explicit new status or toggle old status
@@ -432,7 +364,6 @@ void WorldSession::HandleTogglePvP( WorldPacket & recv_data )
         GetPlayer()->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP);
         GetPlayer()->ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_PVP_TIMER);
     }
-
     if(GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_IN_PVP))
     {
         if(!GetPlayer()->IsPvP() || GetPlayer()->pvpInfo.endTimer != 0)
@@ -443,67 +374,52 @@ void WorldSession::HandleTogglePvP( WorldPacket & recv_data )
         if(!GetPlayer()->pvpInfo.inHostileArea && GetPlayer()->IsPvP())
             GetPlayer()->pvpInfo.endTimer = time(NULL);     // start toggle-off
     }
-
     //if(OutdoorPvP * pvp = _player->GetOutdoorPvP())
     //    pvp->HandlePlayerActivityChanged(_player);
 }
-
 void WorldSession::HandleZoneUpdateOpcode( WorldPacket & recv_data )
 {
     uint32 newZone;
     recv_data >> newZone;
-
     sLog.outDetail("WORLD: Recvd ZONE_UPDATE: %u", newZone);
-
     // use server size data
     uint32 newzone, newarea;
     GetPlayer()->GetZoneAndAreaId(newzone,newarea);
     GetPlayer()->UpdateZone(newzone,newarea);
     //GetPlayer()->SendInitWorldStates(true,newZone);
 }
-
 void WorldSession::HandleSetTargetOpcode( WorldPacket & recv_data )
 {
     // When this packet send?
     uint64 guid ;
     recv_data >> guid;
-
     _player->SetUInt32Value(UNIT_FIELD_TARGET,guid);
-
     // update reputation list if need
     Unit* unit = ObjectAccessor::GetUnit(*_player, guid );
     if(!unit)
         return;
-
     if(FactionTemplateEntry const* factionTemplateEntry = sFactionTemplateStore.LookupEntry(unit->getFaction()))
         _player->GetReputationMgr().SetVisible(factionTemplateEntry);
 }
-
 void WorldSession::HandleSetSelectionOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     _player->SetSelection(guid);
-
     // update reputation list if need
     Unit* unit = ObjectAccessor::GetUnit(*_player, guid );
     if(!unit)
         return;
-
     if(FactionTemplateEntry const* factionTemplateEntry = sFactionTemplateStore.LookupEntry(unit->getFaction()))
         _player->GetReputationMgr().SetVisible(factionTemplateEntry);
 }
-
 void WorldSession::HandleStandStateChangeOpcode( WorldPacket & recv_data )
 {
     // sLog.outDebug( "WORLD: Received CMSG_STANDSTATECHANGE"  ); -- too many spam in log at lags/debug stop
     uint32 animstate;
     recv_data >> animstate;
-
     _player->SetStandState(animstate);
 }
-
 void WorldSession::HandleContactListOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_CONTACT_LIST" );
@@ -512,52 +428,37 @@ void WorldSession::HandleContactListOpcode( WorldPacket & recv_data )
     sLog.outDebug("unk value is %u", unk);
     _player->GetSocial()->SendSocialList();
 }
-
 void WorldSession::HandleAddFriendOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_ADD_FRIEND" );
-
     std::string friendName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN);
     std::string friendNote;
-
     recv_data >> friendName;
-
     recv_data >> friendNote;
-
     if(!normalizePlayerName(friendName))
         return;
-
     CharacterDatabase.escape_string(friendName);            // prevent SQL injection - normal name don't must changed by this call
-
     sLog.outDebug( "WORLD: %s asked to add friend : '%s'",
         GetPlayer()->GetName(), friendName.c_str() );
-
     CharacterDatabase.AsyncPQuery(&WorldSession::HandleAddFriendOpcodeCallBack, GetAccountId(), friendNote, "SELECT guid, race, account FROM characters WHERE name = '%s'", friendName.c_str());
 }
-
 void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult *result, uint32 accountId, std::string friendNote)
 {
     uint64 friendGuid;
     uint64 friendAcctid;
     uint32 team;
     FriendsResult friendResult;
-
     WorldSession * session = sWorld.FindSession(accountId);
-
     if(!session || !session->GetPlayer())
         return;
-
     friendResult = FRIEND_NOT_FOUND;
     friendGuid = 0;
-
     if(result)
     {
         friendGuid = MAKE_NEW_GUID((*result)[0].GetUInt32(), 0, HIGHGUID_PLAYER);
         team = Player::TeamForRace((*result)[1].GetUInt8());
         friendAcctid = (*result)[2].GetUInt32();
-
         delete result;
-
         if ( session->GetSecurity() >= SEC_MODERATOR || sWorld.getConfig(CONFIG_ALLOW_GM_FRIEND) || accmgr.GetSecurity(friendAcctid) < SEC_MODERATOR)
         {
             if(friendGuid)
@@ -585,65 +486,43 @@ void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult *result, uint32 acc
             }
         }
     }
-
     sSocialMgr.SendFriendStatus(session->GetPlayer(), friendResult, GUID_LOPART(friendGuid), false);
-
     sLog.outDebug( "WORLD: Sent (SMSG_FRIEND_STATUS)" );
 }
-
 void WorldSession::HandleDelFriendOpcode( WorldPacket & recv_data )
 {
     uint64 FriendGUID;
-
     sLog.outDebug( "WORLD: Received CMSG_DEL_FRIEND" );
-
     recv_data >> FriendGUID;
-
     _player->GetSocial()->RemoveFromSocialList(GUID_LOPART(FriendGUID), false);
-
     sSocialMgr.SendFriendStatus(GetPlayer(), FRIEND_REMOVED, GUID_LOPART(FriendGUID), false);
-
     sLog.outDebug( "WORLD: Sent motd (SMSG_FRIEND_STATUS)" );
 }
-
 void WorldSession::HandleAddIgnoreOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_ADD_IGNORE" );
-
     std::string IgnoreName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN);
-
     recv_data >> IgnoreName;
-
     if(!normalizePlayerName(IgnoreName))
         return;
-
     CharacterDatabase.escape_string(IgnoreName);            // prevent SQL injection - normal name don't must changed by this call
-
     sLog.outDebug( "WORLD: %s asked to Ignore: '%s'",
         GetPlayer()->GetName(), IgnoreName.c_str() );
-
     CharacterDatabase.AsyncPQuery(&WorldSession::HandleAddIgnoreOpcodeCallBack, GetAccountId(), "SELECT guid FROM characters WHERE name = '%s'", IgnoreName.c_str());
 }
-
 void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 accountId)
 {
     uint64 IgnoreGuid;
     FriendsResult ignoreResult;
-
     WorldSession * session = sWorld.FindSession(accountId);
-
     if(!session || !session->GetPlayer())
         return;
-
     ignoreResult = FRIEND_IGNORE_NOT_FOUND;
     IgnoreGuid = 0;
-
     if(result)
     {
         IgnoreGuid = MAKE_NEW_GUID((*result)[0].GetUInt32(), 0, HIGHGUID_PLAYER);
-
         delete result;
-
         if(IgnoreGuid)
         {
             if(IgnoreGuid==session->GetPlayer()->GetGUID())              //not add yourself
@@ -653,34 +532,24 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 acc
             else
             {
                 ignoreResult = FRIEND_IGNORE_ADDED;
-
                 // ignore list full
                 if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true))
                     ignoreResult = FRIEND_IGNORE_FULL;
             }
         }
     }
-
     sSocialMgr.SendFriendStatus(session->GetPlayer(), ignoreResult, GUID_LOPART(IgnoreGuid), false);
-
     sLog.outDebug( "WORLD: Sent (SMSG_FRIEND_STATUS)" );
 }
-
 void WorldSession::HandleDelIgnoreOpcode( WorldPacket & recv_data )
 {
     uint64 IgnoreGUID;
-
     sLog.outDebug( "WORLD: Received CMSG_DEL_IGNORE" );
-
     recv_data >> IgnoreGUID;
-
     _player->GetSocial()->RemoveFromSocialList(GUID_LOPART(IgnoreGUID), true);
-
     sSocialMgr.SendFriendStatus(GetPlayer(), FRIEND_IGNORE_REMOVED, GUID_LOPART(IgnoreGUID), false);
-
     sLog.outDebug( "WORLD: Sent motd (SMSG_FRIEND_STATUS)" );
 }
-
 void WorldSession::HandleSetContactNotesOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_SET_CONTACT_NOTES");
@@ -689,127 +558,96 @@ void WorldSession::HandleSetContactNotesOpcode( WorldPacket & recv_data )
     recv_data >> guid >> note;
     _player->GetSocial()->SetFriendNote(guid, note);
 }
-
 void WorldSession::HandleBugOpcode( WorldPacket & recv_data )
 {
     uint32 suggestion, contentlen;
     std::string content;
     uint32 typelen;
     std::string type;
-
     recv_data >> suggestion >> contentlen >> content;
-
     recv_data >> typelen >> type;
-
     if( suggestion == 0 )
         sLog.outDebug( "WORLD: Received CMSG_BUG [Bug Report]" );
     else
         sLog.outDebug( "WORLD: Received CMSG_BUG [Suggestion]" );
-
     sLog.outDebug("%s", type.c_str() );
     sLog.outDebug("%s", content.c_str() );
-
     CharacterDatabase.escape_string(type);
     CharacterDatabase.escape_string(content);
     CharacterDatabase.PExecute ("INSERT INTO bugreport (type,content) VALUES('%s', '%s')", type.c_str( ), content.c_str( ));
 }
-
 void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data)
 {
     sLog.outDetail("WORLD: Received CMSG_RECLAIM_CORPSE");
     if (GetPlayer()->isAlive())
         return;
-
     // do not allow corpse reclaim in arena
     if (GetPlayer()->InArena())
         return;
-
     // body not released yet
     if(!GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         return;
-
     Corpse *corpse = GetPlayer()->GetCorpse();
-
     if (!corpse )
         return;
-
     // prevent resurrect before 30-sec delay after body release not finished
     if(corpse->GetGhostTime() + GetPlayer()->GetCorpseReclaimDelay(corpse->GetType()==CORPSE_RESURRECTABLE_PVP) > time(NULL))
         return;
-
     if (!corpse->IsWithinDist(GetPlayer(), CORPSE_RECLAIM_RADIUS, true))
         return;
-
     uint64 guid;
     recv_data >> guid;
-
     // resurrect
     GetPlayer()->ResurrectPlayer(GetPlayer()->InBattleGround() ? 1.0f : 0.5f);
-
     // spawn bones
     GetPlayer()->SpawnCorpseBones();
-
     GetPlayer()->SaveToDB();
 }
-
 void WorldSession::HandleResurrectResponseOpcode(WorldPacket & recv_data)
 {
     sLog.outDetail("WORLD: Received CMSG_RESURRECT_RESPONSE");
-
     if(GetPlayer()->isAlive())
         return;
-
     uint64 guid;
     uint8 status;
     recv_data >> guid;
     recv_data >> status;
-
     if(status == 0)
     {
         GetPlayer()->clearResurrectRequestData();           // reject
         return;
     }
-
     if(!GetPlayer()->isRessurectRequestedBy(guid))
         return;
-
     GetPlayer()->ResurectUsingRequestData();
     GetPlayer()->SaveToDB();
 }
-
 void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("WORLD: Received CMSG_AREATRIGGER");
-
     uint32 Trigger_ID;
-
     recv_data >> Trigger_ID;
     sLog.outDebug("Trigger ID:%u",Trigger_ID);
-
     if(GetPlayer()->isInFlight())
     {
         sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID);
         return;
     }
-
     AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
     if(!atEntry)
     {
         sLog.outDebug("Player '%s' (GUID: %u) send unknown (by DBC) Area Trigger ID:%u",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow(), Trigger_ID);
         return;
     }
-
     if (GetPlayer()->GetMapId()!=atEntry->mapid)
     {
         sLog.outDebug("Player '%s' (GUID: %u) too far (trigger map: %u player map: %u), ignore Area Trigger ID: %u", GetPlayer()->GetName(), atEntry->mapid, GetPlayer()->GetMapId(), GetPlayer()->GetGUIDLow(), Trigger_ID);
         return;
     }
-
     // delta is safe radius
     const float delta = 5.0f;
     // check if player in the range of areatrigger
     Player* pl = GetPlayer();
-
     if (atEntry->radius > 0)
     {
         // if we have radius check it
@@ -824,21 +662,16 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
     else
     {
         // we have only extent
-
         // rotate the players position instead of rotating the whole cube, that way we can make a simplified
         // is-in-cube check and we have to calculate only one point instead of 4
-
         // 2PI = 360°, keep in mind that ingame orientation is counter-clockwise
         double rotation = 2*M_PI-atEntry->box_orientation;
         double sinVal = sin(rotation);
         double cosVal = cos(rotation);
-
         float playerBoxDistX = pl->GetPositionX() - atEntry->x;
         float playerBoxDistY = pl->GetPositionY() - atEntry->y;
-
         float rotPlayerX = atEntry->x + playerBoxDistX * cosVal - playerBoxDistY*sinVal;
         float rotPlayerY = atEntry->y + playerBoxDistY * cosVal + playerBoxDistX*sinVal;
-
         // box edges are parallel to coordiante axis, so we can treat every dimension independently :D
         float dz = pl->GetPositionZ() - atEntry->z;
         float dx = rotPlayerX - atEntry->x;
@@ -852,10 +685,8 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     if(Script->scriptAreaTrigger(GetPlayer(), atEntry))
         return;
-
     uint32 quest_id = objmgr.GetQuestForAreaTrigger( Trigger_ID );
     if( quest_id && GetPlayer()->isAlive() && GetPlayer()->IsActiveQuest(quest_id) )
     {
@@ -866,81 +697,62 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
                 GetPlayer()->AreaExploredOrEventHappens( quest_id );
         }
     }
-
     if(objmgr.IsTavernAreaTrigger(Trigger_ID))
     {
         // set resting flag we are in the inn
         GetPlayer()->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
         GetPlayer()->InnEnter(time(NULL), atEntry->mapid, atEntry->x, atEntry->y, atEntry->z);
         GetPlayer()->SetRestType(REST_TYPE_IN_TAVERN);
-
         if(sWorld.IsFFAPvPRealm())
             GetPlayer()->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
-
         return;
     }
-
     if(GetPlayer()->InBattleGround())
     {
         BattleGround* bg = GetPlayer()->GetBattleGround();
         if(bg)
             if(bg->GetStatus() == STATUS_IN_PROGRESS)
                 bg->HandleAreaTrigger(GetPlayer(), Trigger_ID);
-
         return;
     }
-
     if(OutdoorPvP * pvp = GetPlayer()->GetOutdoorPvP())
     {
         if(pvp->HandleAreaTrigger(_player, Trigger_ID))
             return;
     }
-
     // NULL if all values default (non teleport trigger)
     AreaTrigger const* at = objmgr.GetAreaTrigger(Trigger_ID);
     if(!at)
         return;
-
     if(!GetPlayer()->Satisfy(objmgr.GetAccessRequirement(at->access_id), at->target_mapId, true))
         return;
-
     GetPlayer()->TeleportTo(at->target_mapId,at->target_X,at->target_Y,at->target_Z,at->target_Orientation,TELE_TO_NOT_LEAVE_TRANSPORT);
 }
-
 void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
 {
     sLog.outDetail("WORLD: Received CMSG_UPDATE_ACCOUNT_DATA");
-
     uint32 type, timestamp, decompressedSize;
     recv_data >> type >> timestamp >> decompressedSize;
-
     sLog.outDebug("UAD: type %u, time %u, decompressedSize %u", type, timestamp, decompressedSize);
-
     if(type > NUM_ACCOUNT_DATA_TYPES)
         return;
-
     if(decompressedSize == 0)                               // erase
     {
         SetAccountData(AccountDataType(type), 0, "");
-
         WorldPacket data(SMSG_UPDATE_ACCOUNT_DATA_COMPLETE, 4+4);
         data << uint32(type);
         data << uint32(0);
         SendPacket(&data);
-
         return;
     }
-
     if(decompressedSize > 0xFFFF)
     {
         recv_data.rpos(recv_data.wpos());                   // unnneded warning spam in this case
         sLog.outError("UAD: Account data packet too big, size %u", decompressedSize);
         return;
     }
-
     ByteBuffer dest;
     dest.resize(decompressedSize);
-
     uLongf realSize = decompressedSize;
     if(uncompress(const_cast<uint8*>(dest.contents()), &realSize, const_cast<uint8*>(recv_data.contents() + recv_data.rpos()), recv_data.size() - recv_data.rpos()) != Z_OK)
     {
@@ -948,49 +760,34 @@ void WorldSession::HandleUpdateAccountData(WorldPacket &recv_data)
         sLog.outError("UAD: Failed to decompress account data");
         return;
     }
-
     recv_data.rpos(recv_data.wpos());                       // uncompress read (recv_data.size() - recv_data.rpos())
-
     std::string adata;
     dest >> adata;
-
     SetAccountData(AccountDataType(type), timestamp, adata);
-
     WorldPacket data(SMSG_UPDATE_ACCOUNT_DATA_COMPLETE, 4+4);
     data << uint32(type);
     data << uint32(0);
     SendPacket(&data);
 }
-
 void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
 {
     sLog.outDetail("WORLD: Received CMSG_REQUEST_ACCOUNT_DATA");
-
     uint32 type;
     recv_data >> type;
-
     sLog.outDebug("RAD: type %u", type);
-
     if(type > NUM_ACCOUNT_DATA_TYPES)
         return;
-
     AccountData *adata = GetAccountData(AccountDataType(type));
-
     uint32 size = adata->Data.size();
-
     uLongf destSize = compressBound(size);
-
     ByteBuffer dest;
     dest.resize(destSize);
-
     if(size && compress(const_cast<uint8*>(dest.contents()), &destSize, (uint8*)adata->Data.c_str(), size) != Z_OK)
     {
         sLog.outDebug("RAD: Failed to compress account data");
         return;
     }
-
     dest.resize(destSize);
-
     WorldPacket data (SMSG_UPDATE_ACCOUNT_DATA, 8+4+4+4+destSize);
     data << uint64(_player->GetGUID());                     // player guid
     data << uint32(type);                                   // type (0-7)
@@ -999,17 +796,14 @@ void WorldSession::HandleRequestAccountData(WorldPacket& recv_data)
     data.append(dest);                                      // compressed data
     SendPacket(&data);
 }
-
 void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
 {
     sLog.outDebug(  "WORLD: Received CMSG_SET_ACTION_BUTTON" );
     uint8 button;
     uint32 packetData;
     recv_data >> button >> packetData;
-
     uint32 action = ACTION_BUTTON_ACTION(packetData);
     uint8  type   = ACTION_BUTTON_TYPE(packetData);
-
     sLog.outDetail( "BUTTON: %u ACTION: %u TYPE: %u", button, action, type );
     if (!packetData)
     {
@@ -1040,22 +834,18 @@ void WorldSession::HandleSetActionButtonOpcode(WorldPacket& recv_data)
         GetPlayer()->addActionButton(button,action,type);
     }
 }
-
 void WorldSession::HandleCompleteCinematic( WorldPacket & /*recv_data*/ )
 {
     DEBUG_LOG( "WORLD: Player is watching cinema" );
 }
-
 void WorldSession::HandleNextCinematicCamera( WorldPacket & /*recv_data*/ )
 {
     DEBUG_LOG( "WORLD: Which movie to play" );
 }
-
 void WorldSession::HandleMoveTimeSkippedOpcode( WorldPacket & recv_data )
 {
     /*  WorldSession::Update( getMSTime() );*/
     DEBUG_LOG( "WORLD: Time Lag/Synchronization Resent/Update" );
-
     recv_data.read_skip<uint64>();
     recv_data.read_skip<uint32>();
     /*
@@ -1064,7 +854,6 @@ void WorldSession::HandleMoveTimeSkippedOpcode( WorldPacket & recv_data )
         recv_data >> guid;
         recv_data >> time_skipped;
         sLog.outDebug( "WORLD: CMSG_MOVE_TIME_SKIPPED" );
-
         /// TODO
         must be need use in Trinity
         We substract server Lags to move time ( AntiLags )
@@ -1072,12 +861,10 @@ void WorldSession::HandleMoveTimeSkippedOpcode( WorldPacket & recv_data )
         GetPlayer()->ModifyLastMoveTime( -int32(time_skipped) );
     */
 }
-
 void WorldSession::HandleFeatherFallAck(WorldPacket &/*recv_data*/)
 {
     DEBUG_LOG("WORLD: CMSG_MOVE_FEATHER_FALL_ACK");
 }
-
 void WorldSession::HandleMoveUnRootAck(WorldPacket& recv_data)
 {
     // no used
@@ -1085,23 +872,18 @@ void WorldSession::HandleMoveUnRootAck(WorldPacket& recv_data)
 /*
     uint64 guid;
     recv_data >> guid;
-
     // now can skip not our packet
     if(_player->GetGUID() != guid)
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     sLog.outDebug( "WORLD: CMSG_FORCE_MOVE_UNROOT_ACK" );
-
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
 */
 }
-
 void WorldSession::HandleMoveRootAck(WorldPacket& recv_data)
 {
     // no used
@@ -1109,39 +891,30 @@ void WorldSession::HandleMoveRootAck(WorldPacket& recv_data)
 /*
     uint64 guid;
     recv_data >> guid;
-
     // now can skip not our packet
     if(_player->GetGUID() != guid)
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     sLog.outDebug( "WORLD: CMSG_FORCE_MOVE_ROOT_ACK" );
-
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
 */
 }
-
 void WorldSession::HandleSetActionBarToggles(WorldPacket& recv_data)
 {
     uint8 ActionBar;
-
     recv_data >> ActionBar;
-
     if(!GetPlayer())                                        // ignore until not logged (check needed because STATUS_AUTHED)
     {
         if(ActionBar!=0)
             sLog.outError("WorldSession::HandleSetActionBarToggles in not logged state with value: %u, ignored",uint32(ActionBar));
         return;
     }
-
     GetPlayer()->SetByteValue(PLAYER_FIELD_BYTES, 2, ActionBar);
 }
-
 void WorldSession::HandleWardenDataOpcode(WorldPacket& recv_data)
 {
     recv_data.read_skip<uint8>();
@@ -1151,36 +924,29 @@ void WorldSession::HandleWardenDataOpcode(WorldPacket& recv_data)
         sLog.outDebug("Received opcode CMSG_WARDEN_DATA, not resolve.uint8 = %u",tmp);
     */
 }
-
 void WorldSession::HandlePlayedTime(WorldPacket& recv_data)
 {
     uint8 unk1;
     recv_data >> unk1;                                      // 0 or 1 expected
-
     WorldPacket data(SMSG_PLAYED_TIME, 4 + 4 + 1);
     data << uint32(_player->GetTotalPlayedTime());
     data << uint32(_player->GetLevelPlayedTime());
     data << uint8(unk1);                                    // 0 - will not show in chat frame
     SendPacket(&data);
 }
-
 void WorldSession::HandleInspectOpcode(WorldPacket& recv_data)
 {
     uint64 guid;
     recv_data >> guid;
     DEBUG_LOG("Inspected guid is " UI64FMTD, guid);
-
     _player->SetSelection(guid);
-
     Player *plr = objmgr.GetPlayer(guid);
     if(!plr)                                                // wrong player
         return;
-
     uint32 talent_points = 0x47;
-    uint32 guid_size = plr->GetPackGUID().wpos(); 
-    WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points); 
+    uint32 guid_size = plr->GetPackGUID().wpos();
+    WorldPacket data(SMSG_INSPECT_TALENT, guid_size+4+talent_points);
     data.append(plr->GetPackGUID());
-
     if(sWorld.getConfig(CONFIG_TALENTS_INSPECTING) || _player->isGameMaster())
     {
         plr->BuildPlayerTalentsInfoData(&data);
@@ -1192,24 +958,19 @@ void WorldSession::HandleInspectOpcode(WorldPacket& recv_data)
         data << uint8(0);                                   // talentGroupIndex
         data << uint32(0);                                  // slotUsedMask
     }
-
     plr->BuildEnchantmentsInfoData(&data);
     SendPacket(&data);
 }
-
 void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recv_data)
 {
     uint64 guid;
     recv_data >> guid;
-
     Player *player = objmgr.GetPlayer(guid);
-
     if(!player)
     {
         sLog.outError("InspectHonorStats: WTF, player not found...");
         return;
     }
-
     WorldPacket data(MSG_INSPECT_HONOR_STATS, 8+1+4*4);
     data << uint64(player->GetGUID());
     data << uint8(player->GetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY));
@@ -1219,28 +980,23 @@ void WorldSession::HandleInspectHonorStatsOpcode(WorldPacket& recv_data)
     data << uint32(player->GetUInt32Value(PLAYER_FIELD_LIFETIME_HONORABLE_KILLS));
     SendPacket(&data);
 }
-
 void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recv_data)
 {
     // write in client console: worldport 469 452 6454 2536 180 or /console worldport 469 452 6454 2536 180
     // Received opcode CMSG_WORLD_TELEPORT
     // Time is ***, map=469, x=452.000000, y=6454.000000, z=2536.000000, orient=3.141593
-
     //sLog.outDebug("Received opcode CMSG_WORLD_TELEPORT");
-
     if(GetPlayer()->isInFlight())
     {
         sLog.outDebug("Player '%s' (GUID: %u) in flight, ignore worldport command.",GetPlayer()->GetName(),GetPlayer()->GetGUIDLow());
         return;
     }
-
     uint32 time;
     uint32 mapid;
     float PositionX;
     float PositionY;
     float PositionZ;
     float Orientation;
-
     recv_data >> time;                                      // time in m.sec.
     recv_data >> mapid;
     recv_data >> PositionX;
@@ -1248,49 +1004,40 @@ void WorldSession::HandleWorldTeleportOpcode(WorldPacket& recv_data)
     recv_data >> PositionZ;
     recv_data >> Orientation;                               // o (3.141593 = 180 degrees)
     DEBUG_LOG("Time %u sec, map=%u, x=%f, y=%f, z=%f, orient=%f", time/1000, mapid, PositionX, PositionY, PositionZ, Orientation);
-
     if (GetSecurity() >= SEC_ADMINISTRATOR)
         GetPlayer()->TeleportTo(mapid,PositionX,PositionY,PositionZ,Orientation);
     else
         SendNotification(LANG_YOU_NOT_HAVE_PERMISSION);
     sLog.outDebug("Received worldport command from player %s", GetPlayer()->GetName());
 }
-
 void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data)
 {
     sLog.outDebug("Received opcode CMSG_WHOIS");
     std::string charname;
     recv_data >> charname;
-
     if (GetSecurity() < SEC_ADMINISTRATOR)
     {
         SendNotification(LANG_YOU_NOT_HAVE_PERMISSION);
         return;
     }
-
     if(charname.empty() || !normalizePlayerName (charname))
     {
         SendNotification(LANG_NEED_CHARACTER_NAME);
         return;
     }
-
     Player *plr = objmgr.GetPlayer(charname.c_str());
-
     if(!plr)
     {
         SendNotification(LANG_PLAYER_NOT_EXIST_OR_OFFLINE, charname.c_str());
         return;
     }
-
     uint32 accid = plr->GetSession()->GetAccountId();
-
     QueryResult *result = loginDatabase.PQuery("SELECT username,email,last_ip FROM account WHERE id=%u", accid);
     if(!result)
     {
         SendNotification(LANG_ACCOUNT_FOR_PLAYER_NOT_FOUND, charname.c_str());
         return;
     }
-
     Field *fields = result->Fetch();
     std::string acc = fields[0].GetCppString();
     if(acc.empty())
@@ -1301,23 +1048,17 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recv_data)
     std::string lastip = fields[2].GetCppString();
     if(lastip.empty())
         lastip = "Unknown";
-
     std::string msg = charname + "'s " + "account is " + acc + ", e-mail: " + email + ", last ip: " + lastip;
-
     WorldPacket data(SMSG_WHOIS, msg.size()+1);
     data << msg;
     _player->GetSession()->SendPacket(&data);
-
     delete result;
-
     sLog.outDebug("Received whois command from player %s for character %s", GetPlayer()->GetName(), charname.c_str());
 }
-
 void WorldSession::HandleComplainOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_COMPLAIN");
     recv_data.hexlike();
-
     uint8 spam_type;                                        // 0 - mail, 1 - chat
     uint64 spammer_guid;
     uint32 unk1 = 0;
@@ -1342,26 +1083,20 @@ void WorldSession::HandleComplainOpcode( WorldPacket & recv_data )
             recv_data >> description;                       // spam description string (messagetype, channel name, player name, message)
             break;
     }
-
     // NOTE: all chat messages from this spammer automatically ignored by spam reporter until logout in case chat spam.
     // if it's mail spam - ALL mails from this spammer automatically removed by client
-
     // Complaint Received message
     WorldPacket data(SMSG_COMPLAIN_RESULT, 1);
     data << uint8(0);
     SendPacket(&data);
-
     sLog.outDebug("REPORT SPAM: type %u, guid %u, unk1 %u, unk2 %u, unk3 %u, unk4 %u, message %s", spam_type, GUID_LOPART(spammer_guid), unk1, unk2, unk3, unk4, description.c_str());
 }
-
 void WorldSession::HandleRealmSplitOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_REALM_SPLIT");
-
     uint32 unk;
     std::string split_date = "01/01/01";
     recv_data >> unk;
-
     WorldPacket data(SMSG_REALM_SPLIT, 4+4+split_date.size()+1);
     data << unk;
     data << uint32(0x00000000);                             // realm split state
@@ -1373,15 +1108,12 @@ void WorldSession::HandleRealmSplitOpcode( WorldPacket & recv_data )
     SendPacket(&data);
     //sLog.outDebug("response sent %u", unk);
 }
-
 void WorldSession::HandleFarSightOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_FAR_SIGHT");
     //recv_data.hexlike();
-
     uint8 apply;
     recv_data >> apply;
-
     switch(apply)
     {
         case 0:
@@ -1404,14 +1136,11 @@ void WorldSession::HandleFarSightOpcode( WorldPacket & recv_data )
     //GetPlayer()->GetMap()->UpdateObjectsVisibilityFor(_player, cell, pair);
     GetPlayer()->SetToNotify();
 }
-
 void WorldSession::HandleSetTitleOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_SET_TITLE");
-
     int32 title;
     recv_data >> title;
-
     // -1 at none
     if(title > 0 && title < MAX_TITLE_INDEX)
     {
@@ -1420,23 +1149,17 @@ void WorldSession::HandleSetTitleOpcode( WorldPacket & recv_data )
     }
     else
         title = 0;
-
     GetPlayer()->SetUInt32Value(PLAYER_CHOSEN_TITLE, title);
 }
-
 void WorldSession::HandleTimeSyncResp( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_TIME_SYNC_RESP");
-
     uint32 counter, time_;
     recv_data >> counter >> time_;
-
     // time_ seems always more than getMSTime()
     uint32 diff = getMSTimeDiff(getMSTime(),time_);
-
     sLog.outDebug("response sent: counter %u, time %u (HEX: %X), ms. time %u, diff %u", counter, time_, time_, getMSTime(), diff);
 }
-
 void WorldSession::HandleResetInstancesOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("WORLD: CMSG_RESET_INSTANCES");
@@ -1449,23 +1172,18 @@ void WorldSession::HandleResetInstancesOpcode( WorldPacket & /*recv_data*/ )
     else
         _player->ResetInstances(INSTANCE_RESET_ALL);
 }
-
 void WorldSession::HandleSetDungeonDifficultyOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("MSG_SET_DUNGEON_DIFFICULTY");
-
     uint32 mode;
     recv_data >> mode;
-
     if(mode == _player->GetDifficulty())
         return;
-
     if(mode > DIFFICULTY_HEROIC)
     {
         sLog.outError("WorldSession::HandleSetDungeonDifficultyOpcode: player %d sent an invalid instance mode %d!", _player->GetGUIDLow(), mode);
         return;
     }
-
     // cannot reset while in an instance
     Map *map = _player->GetMap();
     if(map && map->IsDungeon())
@@ -1473,7 +1191,6 @@ void WorldSession::HandleSetDungeonDifficultyOpcode( WorldPacket & recv_data )
         sLog.outError("WorldSession::HandleSetDungeonDifficultyOpcode: player %d tried to reset the instance while inside!", _player->GetGUIDLow());
         return;
     }
-
     if(_player->getLevel() < LEVELREQUIREMENT_HEROIC)
         return;
     Group *pGroup = _player->GetGroup();
@@ -1493,46 +1210,36 @@ void WorldSession::HandleSetDungeonDifficultyOpcode( WorldPacket & recv_data )
         _player->SetDifficulty(mode);
     }
 }
-
 void WorldSession::HandleCancelMountAuraOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("WORLD: CMSG_CANCEL_MOUNT_AURA");
     //recv_data.hexlike();
-
     //If player is not mounted, so go out :)
     if (!_player->IsMounted())                              // not blizz like; no any messages on blizz
     {
         ChatHandler(this).SendSysMessage(LANG_CHAR_NON_MOUNTED);
         return;
     }
-
     if(_player->isInFlight())                               // not blizz like; no any messages on blizz
     {
         ChatHandler(this).SendSysMessage(LANG_YOU_IN_FLIGHT);
         return;
     }
-
     _player->Unmount();
     _player->RemoveAurasByType(SPELL_AURA_MOUNTED);
 }
-
 void WorldSession::HandleMoveSetCanFlyAckOpcode( WorldPacket & recv_data )
 {
     // fly mode on/off
     sLog.outDebug("WORLD: CMSG_MOVE_SET_CAN_FLY_ACK");
     //recv_data.hexlike();
-
     recv_data.read_skip<uint64>();                          // guid
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
-
     recv_data.read_skip<uint32>();                          // unk2
-
     _player->m_mover->m_movementInfo.flags = movementInfo.GetMovementFlags();
 }
-
 void WorldSession::HandleRequestPetInfoOpcode( WorldPacket & /*recv_data */)
 {
     /*
@@ -1540,24 +1247,19 @@ void WorldSession::HandleRequestPetInfoOpcode( WorldPacket & /*recv_data */)
         recv_data.hexlike();
     */
 }
-
 void WorldSession::HandleSetTaxiBenchmarkOpcode( WorldPacket & recv_data )
 {
     uint8 mode;
     recv_data >> mode;
-
     sLog.outDebug("Client used \"/timetest %d\" command", mode);
 }
-
 void WorldSession::HandleQueryInspectAchievements( WorldPacket & recv_data )
 {
     uint64 guid;
     if(!recv_data.readPackGUID(guid))
         return;
-
     Player *player = objmgr.GetPlayer(guid);
     if(!player)
         return;
-
     player->GetAchievementMgr().SendRespondInspectAchievements(_player);
 }
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index e32fffaa8ac..1b0b57219b8 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "MotionMaster.h"
 #include "CreatureAISelector.h"
 #include "Creature.h"
 #include "Traveller.h"
-
 #include "ConfusedMovementGenerator.h"
 #include "FleeingMovementGenerator.h"
 #include "HomeMovementGenerator.h"
@@ -31,14 +29,11 @@
 #include "TargetedMovementGenerator.h"
 #include "WaypointMovementGenerator.h"
 #include "RandomMovementGenerator.h"
-
 #include <cassert>
-
 inline bool isStatic(MovementGenerator *mv)
 {
     return (mv == &si_idleMovement);
 }
-
 void
 MotionMaster::Initialize()
 {
@@ -49,10 +44,8 @@ MotionMaster::Initialize()
         pop();
         if(curr) DirectDelete(curr);
     }
-
     InitDefault();
 }
-
 // set new default movement generator
 void MotionMaster::InitDefault()
 {
@@ -66,7 +59,6 @@ void MotionMaster::InitDefault()
         Mutate(&si_idleMovement, MOTION_SLOT_IDLE);
     }
 }
-
 MotionMaster::~MotionMaster()
 {
     // clear ALL movement generators (including default)
@@ -77,7 +69,6 @@ MotionMaster::~MotionMaster()
         if(curr) DirectDelete(curr);
     }
 }
-
 void
 MotionMaster::UpdateMotion(uint32 diff)
 {
@@ -92,7 +83,6 @@ MotionMaster::UpdateMotion(uint32 diff)
     }
     else
         m_cleanFlag &= ~MMCF_UPDATE;
-
     if (m_expList)
     {
         for (size_t i = 0; i < m_expList->size(); ++i)
@@ -100,21 +90,17 @@ MotionMaster::UpdateMotion(uint32 diff)
             MovementGenerator* mg = (*m_expList)[i];
             DirectDelete(mg);
         }
-
         delete m_expList;
         m_expList = NULL;
-
         if(empty())
             Initialize();
         else if(needInitTop())
             InitTop();
         else if (m_cleanFlag & MMCF_RESET)
             top()->Reset(*i_owner);
-
         m_cleanFlag &= ~MMCF_RESET;
     }
 }
-
 void
 MotionMaster::DirectClean(bool reset)
 {
@@ -124,13 +110,11 @@ MotionMaster::DirectClean(bool reset)
         pop();
         if(curr) DirectDelete(curr);
     }
-
     if(needInitTop())
         InitTop();
     else if(reset)
         top()->Reset(*i_owner);
 }
-
 void
 MotionMaster::DelayedClean()
 {
@@ -141,7 +125,6 @@ MotionMaster::DelayedClean()
         if(curr) DelayedDelete(curr);
     }
 }
-
 void
 MotionMaster::DirectExpire(bool reset)
 {
@@ -151,10 +134,8 @@ MotionMaster::DirectExpire(bool reset)
         pop();
         DirectDelete(curr);
     }
-
     while(!top())
         --i_top;
-
     if(empty())
         Initialize();
     else if(needInitTop())
@@ -162,7 +143,6 @@ MotionMaster::DirectExpire(bool reset)
     else if(reset)
         top()->Reset(*i_owner);
 }
-
 void
 MotionMaster::DelayedExpire()
 {
@@ -172,11 +152,9 @@ MotionMaster::DelayedExpire()
         pop();
         DelayedDelete(curr);
     }
-
     while(!top())
         --i_top;
 }
-
 void MotionMaster::MoveIdle(MovementSlot slot)
 {
     //if( empty() || !isStatic( top() ) )
@@ -184,7 +162,6 @@ void MotionMaster::MoveIdle(MovementSlot slot)
     if(!isStatic(Impl[slot]))
         Mutate(&si_idleMovement, slot);
 }
-
 void
 MotionMaster::MoveRandom(float spawndist)
 {
@@ -194,15 +171,12 @@ MotionMaster::MoveRandom(float spawndist)
         Mutate(new RandomMovementGenerator<Creature>(spawndist), MOTION_SLOT_IDLE);
     }
 }
-
 void
 MotionMaster::MoveTargetedHome()
 {
     //if(i_owner->hasUnitState(UNIT_STAT_FLEEING))
     //    return;
-
     Clear(false);
-
     if(i_owner->GetTypeId() == TYPEID_UNIT)
     {
         DEBUG_LOG("Creature (Entry: %u GUID: %u) targeted home", i_owner->GetEntry(), i_owner->GetGUIDLow());
@@ -213,7 +187,6 @@ MotionMaster::MoveTargetedHome()
         sLog.outError("Player (GUID: %u) attempt targeted home", i_owner->GetGUIDLow() );
     }
 }
-
 void
 MotionMaster::MoveConfused()
 {
@@ -229,14 +202,12 @@ MotionMaster::MoveConfused()
         Mutate(new ConfusedMovementGenerator<Creature>(), MOTION_SLOT_CONTROLLED);
     }
 }
-
 void
 MotionMaster::MoveChase(Unit* target, float dist, float angle)
 {
     // ignore movement request if target not exist
     if(!target || target == i_owner)
         return;
-
     i_owner->clearUnitState(UNIT_STAT_FOLLOW);
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
     {
@@ -255,14 +226,12 @@ MotionMaster::MoveChase(Unit* target, float dist, float angle)
         Mutate(new TargetedMovementGenerator<Creature>(*target,dist,angle), MOTION_SLOT_ACTIVE);
     }
 }
-
 void
 MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slot)
 {
     // ignore movement request if target not exist
     if(!target || target == i_owner)
         return;
-
     i_owner->addUnitState(UNIT_STAT_FOLLOW);
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
     {
@@ -280,7 +249,6 @@ MotionMaster::MoveFollow(Unit* target, float dist, float angle, MovementSlot slo
         Mutate(new TargetedMovementGenerator<Creature>(*target,dist,angle), slot);
     }
 }
-
 void
 MotionMaster::MovePoint(uint32 id, float x, float y, float z)
 {
@@ -296,36 +264,30 @@ MotionMaster::MovePoint(uint32 id, float x, float y, float z)
         Mutate(new PointMovementGenerator<Creature>(id,x,y,z), MOTION_SLOT_ACTIVE);
     }
 }
-
 void MotionMaster::MoveKnockbackFrom(float srcX, float srcY, float speedXY, float speedZ)
 {
     //this function may make players fall below map
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
         return;
-
     float x, y, z;
     float dist = speedXY * speedZ * 0.1f;
     i_owner->GetNearPoint(i_owner, x, y, z, i_owner->GetObjectSize(), dist, i_owner->GetAngle(srcX, srcY) + M_PI);
     MoveJump(x, y, z, speedXY, speedZ);
 }
-
 void MotionMaster::MoveJumpTo(float angle, float speedXY, float speedZ)
 {
     //this function may make players fall below map
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
         return;
-
     float x, y, z;
     float dist = speedXY * speedZ * 0.1f;
     i_owner->GetClosePoint(x, y, z, i_owner->GetObjectSize(), dist, angle);
     MoveJump(x, y, z, speedXY, speedZ);
 }
-
 void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float speedZ)
 {
     uint32 moveFlag = MOVEFLAG_JUMP | MOVEFLAG_WALK;
     uint32 time = speedZ * 100;
-
     i_owner->addUnitState(UNIT_STAT_CHARGING | UNIT_STAT_JUMPING);
     i_owner->m_TempSpeed = speedXY;
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
@@ -339,16 +301,13 @@ void MotionMaster::MoveJump(float x, float y, float z, float speedXY, float spee
             i_owner->GetEntry(), i_owner->GetGUIDLow(), x, y, z );
         Mutate(new PointMovementGenerator<Creature>(0,x,y,z), MOTION_SLOT_CONTROLLED);
     }
-
     i_owner->SendMonsterMove(x, y, z, moveFlag, time, speedZ);
 }
-
 void
 MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id)
 {
     if(Impl[MOTION_SLOT_CONTROLLED] && Impl[MOTION_SLOT_CONTROLLED]->GetMovementGeneratorType() != DISTRACT_MOTION_TYPE)
         return;
-
     i_owner->addUnitState(UNIT_STAT_CHARGING);
     i_owner->m_TempSpeed = speed;
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
@@ -363,7 +322,6 @@ MotionMaster::MoveCharge(float x, float y, float z, float speed, uint32 id)
         Mutate(new PointMovementGenerator<Creature>(id,x,y,z), MOTION_SLOT_CONTROLLED);
     }
 }
-
 void MotionMaster::MoveFall(float z, uint32 id)
 {
     i_owner->SetFlying(false);
@@ -371,7 +329,6 @@ void MotionMaster::MoveFall(float z, uint32 id)
     //AddUnitMovementFlag(MOVEMENTFLAG_FALLING);
     MoveCharge(i_owner->GetPositionX(), i_owner->GetPositionY(), z, SPEED_CHARGE, id);
 }
-
 void
 MotionMaster::MoveSeekAssistance(float x, float y, float z)
 {
@@ -388,7 +345,6 @@ MotionMaster::MoveSeekAssistance(float x, float y, float z)
         Mutate(new AssistanceMovementGenerator(x,y,z), MOTION_SLOT_ACTIVE);
     }
 }
-
 void
 MotionMaster::MoveSeekAssistanceDistract(uint32 time)
 {
@@ -403,16 +359,13 @@ MotionMaster::MoveSeekAssistanceDistract(uint32 time)
         Mutate(new AssistanceDistractMovementGenerator(time), MOTION_SLOT_ACTIVE);
     }
 }
-
 void
 MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
 {
     if(!enemy)
         return;
-
     if(i_owner->HasAuraType(SPELL_AURA_PREVENTS_FLEEING))
         return;
-
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
     {
         DEBUG_LOG("Player (GUID: %u) flee from %s (GUID: %u)", i_owner->GetGUIDLow(),
@@ -433,7 +386,6 @@ MotionMaster::MoveFleeing(Unit* enemy, uint32 time)
             Mutate(new FleeingMovementGenerator<Creature>(enemy->GetGUID()), MOTION_SLOT_CONTROLLED);
     }
 }
-
 void
 MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
 {
@@ -449,13 +401,11 @@ MotionMaster::MoveTaxiFlight(uint32 path, uint32 pathnode)
             i_owner->GetEntry(), i_owner->GetGUIDLow(), path, pathnode );
     }
 }
-
 void
 MotionMaster::MoveDistract(uint32 timer)
 {
     if(Impl[MOTION_SLOT_CONTROLLED])
         return;
-
     if(i_owner->GetTypeId()==TYPEID_PLAYER)
     {
         DEBUG_LOG("Player (GUID: %u) distracted (timer: %u)", i_owner->GetGUIDLow(), timer);
@@ -465,11 +415,9 @@ MotionMaster::MoveDistract(uint32 timer)
         DEBUG_LOG("Creature (Entry: %u GUID: %u) (timer: %u)",
             i_owner->GetEntry(), i_owner->GetGUIDLow(), timer);
     }
-
     DistractMovementGenerator* mgen = new DistractMovementGenerator(timer);
     Mutate(mgen, MOTION_SLOT_CONTROLLED);
 }
-
 void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
 {
     if(MovementGenerator *curr = Impl[slot])
@@ -484,7 +432,6 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
     {
         i_top = slot;
     }
-
     if(i_top > slot)
         needInit[slot] = true;
     else
@@ -494,7 +441,6 @@ void MotionMaster::Mutate(MovementGenerator *m, MovementSlot slot)
     }
     Impl[slot] = m;
 }
-
 void MotionMaster::MovePath(uint32 path_id, bool repeatable)
 {
     if(!path_id)
@@ -509,24 +455,19 @@ void MotionMaster::MovePath(uint32 path_id, bool repeatable)
         if( !isStatic( curr ) )
             delete curr;
     }*/
-
     //i_owner->GetTypeId()==TYPEID_PLAYER ?
         //Mutate(new WaypointMovementGenerator<Player>(path_id, repeatable)):
         Mutate(new WaypointMovementGenerator<Creature>(path_id, repeatable), MOTION_SLOT_IDLE);
-
     DEBUG_LOG("%s (GUID: %u) start moving over path(Id:%u, repeatable: %s)",
         i_owner->GetTypeId()==TYPEID_PLAYER ? "Player" : "Creature",
         i_owner->GetGUIDLow(), path_id, repeatable ? "YES" : "NO" );
 }
-
 void MotionMaster::MoveRotate(uint32 time, RotateDirection direction)
 {
     if(!time)
         return;
-
     Mutate(new RotateMovementGenerator(time, direction), MOTION_SLOT_ACTIVE);
 }
-
 void MotionMaster::propagateSpeedChange()
 {
     /*Impl::container_type::iterator it = Impl::c.begin();
@@ -540,15 +481,12 @@ void MotionMaster::propagateSpeedChange()
             Impl[i]->unitSpeedChanged();
     }
 }
-
 MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
 {
    if(empty())
        return IDLE_MOTION_TYPE;
-
    return top()->GetMovementGeneratorType();
 }
-
 MovementGeneratorType MotionMaster::GetMotionSlotType(int slot) const
 {
     if(!Impl[slot])
@@ -556,13 +494,11 @@ MovementGeneratorType MotionMaster::GetMotionSlotType(int slot) const
     else
         return Impl[slot]->GetMovementGeneratorType();
 }
-
 void MotionMaster::InitTop()
 {
     top()->Initialize(*i_owner);
     needInit[i_top] = false;
 }
-
 void MotionMaster::DirectDelete(_Ty curr)
 {
     if(isStatic(curr))
@@ -570,7 +506,6 @@ void MotionMaster::DirectDelete(_Ty curr)
     curr->Finalize(*i_owner);
     delete curr;
 }
-
 void MotionMaster::DelayedDelete(_Ty curr)
 {
     sLog.outCrash("Unit (Entry %u) is trying to delete its updating MG (Type %u)!", i_owner->GetEntry(), curr->GetMovementGeneratorType());
@@ -580,12 +515,10 @@ void MotionMaster::DelayedDelete(_Ty curr)
         m_expList = new ExpireList();
     m_expList->push_back(curr);
 }
-
 bool MotionMaster::GetDestination(float &x, float &y, float &z)
 {
     if(empty())
        return false;
-    
     return top()->GetDestination(x,y,z);
 }
 
diff --git a/src/game/MotionMaster.h b/src/game/MotionMaster.h
index c6755bfa167..554defe6b7e 100644
--- a/src/game/MotionMaster.h
+++ b/src/game/MotionMaster.h
@@ -17,21 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_MOTIONMASTER_H
 #define TRINITY_MOTIONMASTER_H
-
 #include "Common.h"
 #include <vector>
 #include "SharedDefines.h"
 #include "Object.h"
-
 class MovementGenerator;
 class Unit;
-
 // Creature Entry ID used for waypoints show, visible only for GMs
 #define VISUAL_WAYPOINT 1
-
 // values 0 ... MAX_DB_MOTION_TYPE-1 used in DB
 enum MovementGeneratorType
 {
@@ -53,7 +48,6 @@ enum MovementGeneratorType
     ROTATE_MOTION_TYPE    = 14,
     NULL_MOTION_TYPE      = 15,
 };
-
 enum MovementSlot
 {
     MOTION_SLOT_IDLE,
@@ -61,23 +55,19 @@ enum MovementSlot
     MOTION_SLOT_CONTROLLED,
     MAX_MOTION_SLOT,
 };
-
 enum MMCleanFlag
 {
     MMCF_NONE   = 0,
     MMCF_UPDATE = 1, // Clear or Expire called from update
     MMCF_RESET  = 2  // Flag if need top()->Reset()
 };
-
 enum RotateDirection
 {
     ROTATE_DIRECTION_LEFT,
     ROTATE_DIRECTION_RIGHT,
 };
-
 // assume it is 25 yard per 0.6 second
 #define SPEED_CHARGE    42.0f
-
 class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
 {
     private:
@@ -87,15 +77,12 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
         bool needInit[MAX_MOTION_SLOT];
         typedef std::vector<_Ty> ExpireList;
         int i_top;
-
         bool empty() const { return (i_top < 0); }
         void pop() { Impl[i_top] = NULL; --i_top; }
         void push(_Ty _Val) { ++i_top; Impl[i_top] = _Val; }
-
         bool needInitTop() const { return needInit[i_top]; }
         void InitTop();
     public:
-
         explicit MotionMaster(Unit *unit) : i_owner(unit), m_expList(NULL), m_cleanFlag(MMCF_NONE), i_top(-1)
         {
             for(uint8 i = 0; i < MAX_MOTION_SLOT; ++i)
@@ -105,17 +92,13 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
             }
         }
         ~MotionMaster();
-
         void Initialize();
         void InitDefault();
-
         int size() const { return i_top + 1; }
         _Ty top() const { return Impl[i_top]; }
         _Ty GetMotionSlot(int slot) const { return Impl[slot]; }
-
         void DirectDelete(_Ty curr);
         void DelayedDelete(_Ty curr);
-
         void UpdateMotion(uint32 diff);
         void Clear(bool reset = true)
         {
@@ -143,7 +126,6 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
             else
                 DirectExpire(reset);
         }
-
         void MoveIdle(MovementSlot slot = MOTION_SLOT_ACTIVE);
         void MoveTargetedHome();
         void MoveRandom(float spawndist = 0.0f);
@@ -165,22 +147,16 @@ class TRINITY_DLL_SPEC MotionMaster //: private std::stack<MovementGenerator *>
         void MoveDistract(uint32 time);
         void MovePath(uint32 path_id, bool repeatable);
         void MoveRotate(uint32 time, RotateDirection direction);
-
         MovementGeneratorType GetCurrentMovementGeneratorType() const;
         MovementGeneratorType GetMotionSlotType(int slot) const;
-
         void propagateSpeedChange();
-
         bool GetDestination(float &x, float &y, float &z);
     private:
         void Mutate(MovementGenerator *m, MovementSlot slot);                  // use Move* functions instead
-
         void DirectClean(bool reset);
         void DelayedClean();
-
         void DirectExpire(bool reset);
         void DelayedExpire();
-
         Unit       *i_owner;
         ExpireList *m_expList;
         uint8       m_cleanFlag;
diff --git a/src/game/MovementGenerator.cpp b/src/game/MovementGenerator.cpp
index 7784df315c9..76efd901019 100644
--- a/src/game/MovementGenerator.cpp
+++ b/src/game/MovementGenerator.cpp
@@ -17,9 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "MovementGenerator.h"
-
 MovementGenerator::~MovementGenerator()
 {
 }
diff --git a/src/game/MovementGenerator.h b/src/game/MovementGenerator.h
index cb352b7f1c6..270479bfa29 100644
--- a/src/game/MovementGenerator.h
+++ b/src/game/MovementGenerator.h
@@ -17,38 +17,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_MOVEMENTGENERATOR_H
 #define TRINITY_MOVEMENTGENERATOR_H
-
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
 #include "Common.h"
 #include "MotionMaster.h"
-
 class Unit;
-
 class TRINITY_DLL_SPEC MovementGenerator
 {
     public:
         virtual ~MovementGenerator();
-
         virtual void Initialize(Unit &) = 0;
         virtual void Finalize(Unit &) = 0;
-
         virtual void Reset(Unit &) = 0;
-
         virtual bool Update(Unit &, const uint32 &time_diff) = 0;
-
         virtual MovementGeneratorType GetMovementGeneratorType() = 0;
-
         virtual void unitSpeedChanged() { }
-
         virtual bool GetDestination(float& /*x*/, float& /*y*/, float& /*z*/) const { return false; }
 };
-
 template<class T, class D>
 class TRINITY_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
 {
@@ -80,20 +69,16 @@ class TRINITY_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
         void Reset(T &u);
         bool Update(T &u, const uint32 &time_diff);
 };
-
 struct SelectableMovement : public FactoryHolder<MovementGenerator,MovementGeneratorType>
 {
     SelectableMovement(MovementGeneratorType mgt) : FactoryHolder<MovementGenerator,MovementGeneratorType>(mgt) {}
 };
-
 template<class REAL_MOVEMENT>
 struct MovementGeneratorFactory : public SelectableMovement
 {
     MovementGeneratorFactory(MovementGeneratorType mgt) : SelectableMovement(mgt) {}
-
     MovementGenerator* Create(void *) const;
 };
-
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType> MovementGeneratorCreator;
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRegistry MovementGeneratorRegistry;
 typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository;
diff --git a/src/game/MovementHandler.cpp b/src/game/MovementHandler.cpp
index e3cc490adb4..822818273ed 100644
--- a/src/game/MovementHandler.cpp
+++ b/src/game/MovementHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -33,39 +32,31 @@
 #include "WaypointMovementGenerator.h"
 #include "InstanceSaveMgr.h"
 #include "ObjectMgr.h"
-
 void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: got MSG_MOVE_WORLDPORT_ACK." );
     HandleMoveWorldportAckOpcode();
 }
-
 void WorldSession::HandleMoveWorldportAckOpcode()
 {
     // ignore unexpected far teleports
     if(!GetPlayer()->IsBeingTeleportedFar())
         return;
-
     // get the teleport destination
     WorldLocation &loc = GetPlayer()->GetTeleportDest();
-
     // possible errors in the coordinate validity check
     if(!MapManager::IsValidMapCoord(loc))
     {
         LogoutPlayer(false);
         return;
     }
-
     // get the destination map entry, not the current one, this will fix homebind and reset greeting
     MapEntry const* mEntry = sMapStore.LookupEntry(loc.GetMapId());
     InstanceTemplate const* mInstance = objmgr.GetInstanceTemplate(loc.GetMapId());
-
     // reset instance validity, except if going to an instance inside an instance
     if(GetPlayer()->m_InstanceValid == false && !mInstance)
         GetPlayer()->m_InstanceValid = true;
-
     GetPlayer()->SetSemaphoreTeleportFar(false);
-
     Map * oldMap = GetPlayer()->GetMap();
     assert(oldMap);
     if(GetPlayer()->IsInWorld())
@@ -73,7 +64,6 @@ void WorldSession::HandleMoveWorldportAckOpcode()
         sLog.outCrash("Player is still in world when teleported out of map %u! to new map %u", oldMap->GetId(), loc.GetMapId());
         oldMap->Remove(GetPlayer(), false);
     }
-
     // relocate the player to the teleport destination
     Map * newMap = MapManager::Instance().CreateMap(loc.GetMapId(), GetPlayer(), 0);
     // the CanEnter checks are done in TeleporTo but conditions may change
@@ -86,10 +76,8 @@ void WorldSession::HandleMoveWorldportAckOpcode()
     }
     else
         GetPlayer()->Relocate(&loc);
-
     GetPlayer()->ResetMap();
     GetPlayer()->SetMap(newMap);
-
     GetPlayer()->SendInitialPacketsBeforeAddToMap();
     if(!GetPlayer()->GetMap()->Add(GetPlayer()))
     {
@@ -99,7 +87,6 @@ void WorldSession::HandleMoveWorldportAckOpcode()
         GetPlayer()->TeleportTo(GetPlayer()->m_homebindMapId, GetPlayer()->m_homebindX, GetPlayer()->m_homebindY, GetPlayer()->m_homebindZ, GetPlayer()->GetOrientation());
         return;
     }
-
     // battleground state prepare (in case join to BG), at relogin/tele player not invited
     // only add to bg group and object, if the player was invited (else he entered through command)
     if(_player->InBattleGround())
@@ -119,9 +106,7 @@ void WorldSession::HandleMoveWorldportAckOpcode()
                 bg->AddPlayer(_player);
         }
     }
-
     GetPlayer()->SendInitialPacketsAfterAddToMap();
-
     // flight fast teleport case
     if(GetPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE)
     {
@@ -132,12 +117,10 @@ void WorldSession::HandleMoveWorldportAckOpcode()
             flight->Initialize(*GetPlayer());
             return;
         }
-
         // battleground state prepare, stop flight
         GetPlayer()->GetMotionMaster()->MovementExpired();
         GetPlayer()->m_taxi.ClearTaxiDestinations();
     }
-
     // resurrect character at enter into instance where his corpse exist after add to map
     Corpse *corpse = GetPlayer()->GetCorpse();
     if (corpse && corpse->GetType() != CORPSE_BONES && corpse->GetMapId() == GetPlayer()->GetMapId())
@@ -149,65 +132,48 @@ void WorldSession::HandleMoveWorldportAckOpcode()
             GetPlayer()->SaveToDB();
         }
     }
-
     if((mEntry->IsRaid() || (mEntry->IsNonRaidDungeon() && mEntry->SupportsHeroicMode() && GetPlayer()->IsHeroic())) && mInstance)
     {
         uint32 timeleft = sInstanceSaveManager.GetResetTimeFor(GetPlayer()->GetMapId()) - time(NULL);
         GetPlayer()->SendInstanceResetWarning(GetPlayer()->GetMapId(), GetPlayer()->GetDifficulty(), timeleft);
     }
-
     // mount allow check
     if(!mEntry->IsMountAllowed())
         _player->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
     // update zone immediately, otherwise leave channel will cause crash in mtmap
     uint32 newzone, newarea;
     GetPlayer()->GetZoneAndAreaId(newzone, newarea);
     GetPlayer()->UpdateZone(newzone, newarea);
-
     // honorless target
     if(GetPlayer()->pvpInfo.inHostileArea)
         GetPlayer()->CastSpell(GetPlayer(), SPELL_ID_HONORLESS_TARGET, true);
-
     // resummon pet
     GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
-
     //lets process all delayed operations on successful teleport
     GetPlayer()->ProcessDelayedOperations();
 }
-
 void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
 {
     sLog.outDebug("MSG_MOVE_TELEPORT_ACK");
     uint64 guid;
     uint32 flags, time;
-
     recv_data >> guid;
     recv_data >> flags >> time;
     DEBUG_LOG("Guid " UI64FMTD, guid);
     DEBUG_LOG("Flags %u, time %u", flags, time/IN_MILISECONDS);
-
     Unit *mover = _player->m_mover;
     Player *plMover = mover->GetTypeId() == TYPEID_PLAYER ? (Player*)mover : NULL;
-
     if(!plMover || !plMover->IsBeingTeleportedNear())
         return;
-
     if(guid != plMover->GetGUID())
         return;
-
     plMover->SetSemaphoreTeleportNear(false);
-
     uint32 old_zone = plMover->GetZoneId();
-
     WorldLocation const& dest = plMover->GetTeleportDest();
-
     plMover->SetPosition(dest, true);
-
     uint32 newzone, newarea;
     plMover->GetZoneAndAreaId(newzone, newarea);
     plMover->UpdateZone(newzone, newarea);
-
     // new zone
     if(old_zone != newzone)
     {
@@ -215,34 +181,27 @@ void WorldSession::HandleMoveTeleportAck(WorldPacket& recv_data)
         if(plMover->pvpInfo.inHostileArea)
             plMover->CastSpell(plMover, SPELL_ID_HONORLESS_TARGET, true);
     }
-
     // resummon pet
     GetPlayer()->ResummonPetTemporaryUnSummonedIfAny();
-
     //lets process all delayed operations on successful teleport
     GetPlayer()->ProcessDelayedOperations();
 }
-
 void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
 {
     uint32 opcode = recv_data.GetOpcode();
     //sLog.outDebug("WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(opcode), opcode, opcode);
-
     Unit *mover = _player->m_mover;
     Player *plMover = mover->GetTypeId()==TYPEID_PLAYER ? (Player*)mover : NULL;
-
     // ignore, waiting processing in WorldSession::HandleMoveWorldportAckOpcode and WorldSession::HandleMoveTeleportAck
     if(plMover && plMover->IsBeingTeleported())
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     /* extract packet */
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
     /*----------------*/
-
     if(recv_data.size() != recv_data.rpos())
     {
         sLog.outError("MovementHandler: player %s (guid %d, account %u) sent a packet (opcode %u) that is " SIZEFMTD " bytes larger than it should be. Kicked as cheater.", _player->GetName(), _player->GetGUIDLow(), _player->GetSession()->GetAccountId(), recv_data.GetOpcode(), recv_data.size() - recv_data.rpos());
@@ -250,13 +209,11 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     if (!MaNGOS::IsValidMapCoord(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o))
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     /* handle special cases */
     if (movementInfo.flags & MOVEMENTFLAG_ONTRANSPORT)
     {
@@ -267,14 +224,12 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
             recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
             return;
         }
-
         if( !MaNGOS::IsValidMapCoord(movementInfo.x+movementInfo.t_x, movementInfo.y + movementInfo.t_y,
             movementInfo.z + movementInfo.t_z, movementInfo.o + movementInfo.t_o) )
         {
             recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
             return;
         }
-
         // if we boarded a transport, add us to it
         if (plMover && !plMover->m_transport)
         {
@@ -289,7 +244,6 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
                 }
             }
         }
-
         if(!mover->GetTransport() && !mover->GetVehicle())
             movementInfo.flags &= ~MOVEMENTFLAG_ONTRANSPORT;
     }
@@ -304,39 +258,31 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
         movementInfo.t_time = 0;
         movementInfo.t_seat = -1;
     }
-
     // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map).
     if (opcode == MSG_MOVE_FALL_LAND && plMover && !plMover->isInFlight())
         plMover->HandleFall(movementInfo);
-
     if (plMover && ((movementInfo.flags & MOVEMENTFLAG_SWIMMING) != 0) != plMover->IsInWater())
     {
         // now client not include swimming flag in case jumping under water
         plMover->SetInWater( !plMover->IsInWater() || plMover->GetBaseMap()->IsUnderWater(movementInfo.x, movementInfo.y, movementInfo.z) );
     }
-
     /*----------------------*/
-
     /* process position-change */
     recv_data.put<uint32>(6, getMSTime());                  // fix time, offset flags(4) + unk(2)
     WorldPacket data(recv_data.GetOpcode(), (mover->GetPackGUID().size()+recv_data.size()));
     data.append(mover->GetPackGUID());                      // use mover guid
     data.append(recv_data.contents(), recv_data.size());
     GetPlayer()->SendMessageToSet(&data, false);
-
     mover->m_movementInfo = movementInfo;
-
     if(mover->GetVehicle())
     {
         mover->SetOrientation(movementInfo.o);
         return;
     }
-
     if(plMover)                                             // nothing is charmed, or player charmed
     {
         plMover->SetPosition(movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
         plMover->UpdateFallInformationIfNeed(movementInfo, recv_data.GetOpcode());
-
         if(movementInfo.z < -500.0f)
         {
             if(plMover->InBattleGround()
@@ -362,7 +308,6 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
                         plMover->BuildPlayerRepop();
                     }
                 }
-
                 // cancel the death timer here if started
                 plMover->RepopAtGraveyard();
             }
@@ -371,7 +316,6 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
     else                                                    // creature charmed
     {
         mover->GetMap()->CreatureRelocation((Creature*)mover, movementInfo.x, movementInfo.y, movementInfo.z, movementInfo.o);
-
         /*if(mover->canFly())
         {
             bool flying = mover->IsFlying();
@@ -379,46 +323,34 @@ void WorldSession::HandleMovementOpcodes( WorldPacket & recv_data )
                 mover->SetFlying(flying);
         }*/
     }
-
     //sLog.outString("Receive Movement Packet %s:", opcodeTable[recv_data.GetOpcode()]);
     //mover->OutMovementInfo();
 }
-
 void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
 {
     //sLog.outDebug("WORLD: Recvd %s (%u, 0x%X) opcode", LookupOpcodeName(recv_data.GetOpcode()), recv_data.GetOpcode(), recv_data.GetOpcode());
-
     /* extract packet */
     uint64 guid;
     uint32 unk1;
     float  newspeed;
-
     recv_data >> guid;
-
     // now can skip not our packet
     if(_player->GetGUID() != guid)
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     // continue parse packet
-
     recv_data >> unk1;                                      // counter or moveEvent
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
-
     recv_data >> newspeed;
     /*----------------*/
-
     // client ACK send one packet for mounted/run case and need skip all except last from its
     // in other cases anti-cheat check can be fail in false case
     UnitMoveType move_type;
     UnitMoveType force_move_type;
-
     static char const* move_type_name[MAX_MOVE_TYPE] = {  "Walk", "Run", "RunBack", "Swim", "SwimBack", "TurnRate", "Flight", "FlightBack", "PitchRate" };
-
     uint16 opcode = recv_data.GetOpcode();
     switch(opcode)
     {
@@ -435,7 +367,6 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
             sLog.outError("WorldSession::HandleForceSpeedChangeAck: Unknown move type opcode: %u", opcode);
             return;
     }
-
     // skip all forced speed changes except last and unexpected
     // in run/mounted case used one ACK and it must be skipped.m_forced_speed_changes[MOVE_RUN} store both.
     if(_player->m_forced_speed_changes[force_move_type] > 0)
@@ -444,7 +375,6 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
         if(_player->m_forced_speed_changes[force_move_type] > 0)
             return;
     }
-
     if (!_player->GetTransport() && fabs(_player->GetSpeed(move_type) - newspeed) > 0.01f)
     {
         if(_player->GetSpeed(move_type) > newspeed)         // must be greater - just correct
@@ -461,17 +391,13 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
         }
     }
 }
-
 void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Recvd CMSG_SET_ACTIVE_MOVER");
-
     uint64 guid;
     recv_data >> guid;
-
     if(guid == GetPlayer()->m_mover->GetGUID())
         return;
-
     if(Unit *mover = ObjectAccessor::GetUnit(*GetPlayer(), guid))
     {
         GetPlayer()->SetMover(mover);
@@ -486,52 +412,41 @@ void WorldSession::HandleSetActiveMoverOpcode(WorldPacket &recv_data)
     else
     {
         sLog.outError("HandleSetActiveMoverOpcode: incorrect mover guid: mover is " UI64FMTD " and should be " UI64FMTD, guid, _player->m_mover->GetGUID());
-        GetPlayer()->SetMover(GetPlayer());        
+        GetPlayer()->SetMover(GetPlayer());
     }
 }
-
 void WorldSession::HandleMoveNotActiveMover(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Recvd CMSG_MOVE_NOT_ACTIVE_MOVER");
-
     uint64 old_mover_guid;
     recv_data >> old_mover_guid;
-
     /*if(_player->m_mover->GetGUID() == old_mover_guid)
     {
         sLog.outError("HandleMoveNotActiveMover: incorrect mover guid: mover is " I64FMT " and should be " I64FMT " instead of " I64FMT, _player->m_mover->GetGUID(), _player->GetGUID(), old_mover_guid);
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }*/
-
     ReadMovementInfo(recv_data, &_player->m_mover->m_movementInfo);
 }
-
 void WorldSession::HandleDismissControlledVehicle(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Recvd CMSG_DISMISS_CONTROLLED_VEHICLE");
     recv_data.hexlike();
-
     uint64 vehicleGUID = _player->GetCharmGUID();
-
     if(!vehicleGUID)                                        // something wrong here...
     {
         recv_data.rpos(recv_data.wpos());                   // prevent warnings spam
         return;
     }
-
     ReadMovementInfo(recv_data, &_player->m_mover->m_movementInfo);
     _player->ExitVehicle();
 }
-
 void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Recvd CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE");
     recv_data.hexlike();
-
     if(!GetPlayer()->GetVehicle())
         return;
-
     if(recv_data.GetOpcode() == CMSG_REQUEST_VEHICLE_PREV_SEAT)
     {
         GetPlayer()->ChangeSeat(-1, false);
@@ -544,14 +459,11 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
     }
     else if(recv_data.GetOpcode() == CMSG_CHANGE_SEATS_ON_CONTROLLED_VEHICLE)
         ReadMovementInfo(recv_data, &GetPlayer()->GetVehicleBase()->m_movementInfo);
-
     uint64 guid;
     if(!recv_data.readPackGUID(guid))
         return;
-
     int8 seatId;
     recv_data >> seatId;
-
     if(!guid)
         GetPlayer()->ChangeSeat(-1, seatId > 0); // prev/next
     else if(Unit *vehUnit = ObjectAccessor::GetUnit(*GetPlayer(), guid))
@@ -559,71 +471,53 @@ void WorldSession::HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data)
             if(vehicle->HasEmptySeat(seatId))
                 GetPlayer()->EnterVehicle(vehicle, seatId);
 }
-
 void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
 {
     sLog.outDebug("WORLD: Recvd CMSG_REQUEST_VEHICLE_EXIT");
     recv_data.hexlike();
     GetPlayer()->ExitVehicle();
 }
-
 void WorldSession::HandleMountSpecialAnimOpcode(WorldPacket& /*recvdata*/)
 {
     //sLog.outDebug("WORLD: Recvd CMSG_MOUNTSPECIAL_ANIM");
-
     WorldPacket data(SMSG_MOUNTSPECIAL_ANIM, 8);
     data << uint64(GetPlayer()->GetGUID());
-
     GetPlayer()->SendMessageToSet(&data, false);
 }
-
 void WorldSession::HandleMoveKnockBackAck( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_MOVE_KNOCK_BACK_ACK");
-
     recv_data.read_skip<uint64>();                          // guid
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
 }
-
 void WorldSession::HandleMoveHoverAck( WorldPacket& recv_data )
 {
     sLog.outDebug("CMSG_MOVE_HOVER_ACK");
-
     recv_data.read_skip<uint64>();                          // guid
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
-
     recv_data.read_skip<uint32>();                          // unk2
 }
-
 void WorldSession::HandleMoveWaterWalkAck(WorldPacket& recv_data)
 {
     sLog.outDebug("CMSG_MOVE_WATER_WALK_ACK");
-
     recv_data.read_skip<uint64>();                          // guid
     recv_data.read_skip<uint32>();                          // unk
-
     MovementInfo movementInfo;
     ReadMovementInfo(recv_data, &movementInfo);
-
     recv_data.read_skip<uint32>();                          // unk2
 }
-
 void WorldSession::HandleSummonResponseOpcode(WorldPacket& recv_data)
 {
     if(!_player->isAlive() || _player->isInCombat() )
         return;
-
     uint64 summoner_guid;
     bool agree;
     recv_data >> summoner_guid;
     recv_data >> agree;
-
     _player->SummonIfPossible(agree);
 }
 
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 4e15fd77595..81729a0c78b 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Language.h"
 #include "Database/DatabaseEnv.h"
@@ -37,103 +36,81 @@
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
 #include "Guild.h"
-
 void WorldSession::HandleTabardVendorActivateOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TABARDDESIGNER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleTabardVendorActivateOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     SendTabardVendorActivate(guid);
 }
-
 void WorldSession::SendTabardVendorActivate( uint64 guid )
 {
     WorldPacket data( MSG_TABARDVENDOR_ACTIVATE, 8 );
     data << guid;
     SendPacket( &data );
 }
-
 void WorldSession::HandleBankerActivateOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
-
     sLog.outDebug(  "WORLD: Received CMSG_BANKER_ACTIVATE" );
-
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_BANKER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleBankerActivateOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     SendShowBank(guid);
 }
-
 void WorldSession::SendShowBank( uint64 guid )
 {
     WorldPacket data( SMSG_SHOW_BANK, 8 );
     data << guid;
     SendPacket( &data );
 }
-
 void WorldSession::HandleTrainerListOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
-
     recv_data >> guid;
     SendTrainerList( guid );
 }
-
 void WorldSession::SendTrainerList( uint64 guid )
 {
     std::string str = GetTrinityString(LANG_NPC_TAINER_HELLO);
     SendTrainerList( guid, str );
 }
-
 void WorldSession::SendTrainerList( uint64 guid, const std::string& strTitle )
 {
     sLog.outDebug( "WORLD: SendTrainerList" );
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TRAINER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: SendTrainerList - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     // trainer list loaded at check;
     if(!unit->isCanTrainingOf(_player,true))
         return;
-
     CreatureInfo const *ci = unit->GetCreatureInfo();
-
     if (!ci)
     {
         sLog.outDebug( "WORLD: SendTrainerList - (GUID: %u) NO CREATUREINFO!",GUID_LOPART(guid) );
         return;
     }
-
     TrainerSpellData const* trainer_spells = unit->GetTrainerSpells();
     if(!trainer_spells)
     {
@@ -141,35 +118,27 @@ void WorldSession::SendTrainerList( uint64 guid, const std::string& strTitle )
             GUID_LOPART(guid), unit->GetEntry());
         return;
     }
-
     WorldPacket data( SMSG_TRAINER_LIST, 8+4+4+trainer_spells->spellList.size()*38 + strTitle.size()+1);
     data << guid;
     data << uint32(trainer_spells->trainerType);
-
     size_t count_pos = data.wpos();
     data << uint32(trainer_spells->spellList.size());
-
     // reputation discount
     float fDiscountMod = _player->GetReputationPriceDiscount(unit);
     bool can_learn_primary_prof = GetPlayer()->GetFreePrimaryProfessionPoints() > 0;
-
     uint32 count = 0;
     for(TrainerSpellMap::const_iterator itr = trainer_spells->spellList.begin(); itr != trainer_spells->spellList.end(); ++itr)
     {
         TrainerSpell const* tSpell = &itr->second;
-
         if(!_player->IsSpellFitByClassAndRace(tSpell->learnedSpell))
             continue;
-
         bool primary_prof_first_rank = spellmgr.IsPrimaryProfessionFirstRankSpell(tSpell->learnedSpell);
         SpellChainNode const* chain_node = spellmgr.GetSpellChainNode(tSpell->learnedSpell);
         uint32 req_spell = spellmgr.GetSpellRequired(tSpell->spell);
         TrainerSpellState state = _player->GetTrainerSpellState(tSpell);
-
         data << uint32(tSpell->spell);                      // learned spell (or cast-spell in profession case)
         data << uint8(state==TRAINER_SPELL_GREEN_DISABLED ? TRAINER_SPELL_GREEN : state);
         data << uint32(floor(tSpell->spellCost * fDiscountMod));
-
         data << uint32(primary_prof_first_rank && can_learn_primary_prof ? 1 : 0);
                                                             // primary prof. learn confirmation dialog
         data << uint32(primary_prof_first_rank ? 1 : 0);    // must be equal prev. field to have learn button in enabled state
@@ -180,105 +149,81 @@ void WorldSession::SendTrainerList( uint64 guid, const std::string& strTitle )
         data << uint32(!tSpell->IsCastable() && chain_node && chain_node->prev ? chain_node->prev : req_spell);
         data << uint32(!tSpell->IsCastable() && chain_node && chain_node->prev ? req_spell : 0);
         data << uint32(0);
-
         ++count;
     }
-
     data << strTitle;
-
     data.put<uint32>(count_pos,count);
     SendPacket( &data );
 }
-
 void WorldSession::HandleTrainerBuySpellOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     uint32 spellId = 0;
-
     recv_data >> guid >> spellId;
     sLog.outDebug( "WORLD: Received CMSG_TRAINER_BUY_SPELL NpcGUID=%u, learn spell id is: %u",uint32(GUID_LOPART(guid)), spellId );
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_TRAINER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleTrainerBuySpellOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     if(!unit->isCanTrainingOf(_player,true))
         return;
-
     // check present spell in trainer spell list
     TrainerSpellData const* trainer_spells = unit->GetTrainerSpells();
     if(!trainer_spells)
         return;
-
     // not found, cheat?
     TrainerSpell const* trainer_spell = trainer_spells->Find(spellId);
     if(!trainer_spell)
         return;
-
     // can't be learn, cheat? Or double learn with lags...
     if(_player->GetTrainerSpellState(trainer_spell) != TRAINER_SPELL_GREEN)
         return;
-
     // apply reputation discount
     uint32 nSpellCost = uint32(floor(trainer_spell->spellCost * _player->GetReputationPriceDiscount(unit)));
-
     // check money requirement
     if(_player->GetMoney() < nSpellCost )
         return;
-
     _player->ModifyMoney( -int32(nSpellCost) );
-
     WorldPacket data(SMSG_PLAY_SPELL_VISUAL, 12);           // visual effect on trainer
     data << uint64(guid) << uint32(0xB3);
     SendPacket(&data);
-
     data.Initialize(SMSG_PLAY_SPELL_IMPACT, 12);            // visual effect on player
     data << uint64(_player->GetGUID()) << uint32(0x016A);
     SendPacket(&data);
-
     // learn explicitly or cast explicitly
     if(trainer_spell->IsCastable ())
         //FIXME: prof. spell entry in trainer list not marked gray until list re-open.
         _player->CastSpell(_player,trainer_spell->spell,true);
     else
         _player->learnSpell(spellId,false);
-
     data.Initialize(SMSG_TRAINER_BUY_SUCCEEDED, 12);
     data << uint64(guid) << uint32(trainer_spell->spell);
     SendPacket(&data);
 }
-
 void WorldSession::HandleGossipHelloOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug(  "WORLD: Received CMSG_GOSSIP_HELLO" );
-
     uint64 guid;
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleGossipHelloOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     GetPlayer()->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK);
     // remove fake death
     //if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
     //    GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     if( unit->isArmorer() || unit->isCivilian() || unit->isQuestGiver() || unit->isServiceProvider())
     {
         unit->StopMoving();
     }
-
     // If spiritguide, no need for gossip menu, just put player into resurrect queue
     if (unit->isSpiritGuide())
     {
@@ -290,7 +235,6 @@ void WorldSession::HandleGossipHelloOpcode( WorldPacket & recv_data )
             return;
         }
     }
-
     if(!Script->GossipHello( _player, unit ))
     {
         _player->TalkedToCreature(unit->GetEntry(),unit->GetGUID());
@@ -298,36 +242,29 @@ void WorldSession::HandleGossipHelloOpcode( WorldPacket & recv_data )
         unit->sendPreparedGossip(_player);
     }
 }
-
 /*void WorldSession::HandleGossipSelectOptionOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_GOSSIP_SELECT_OPTION");
-
     uint32 option;
     uint32 unk;
     uint64 guid;
     std::string code = "";
-
     recv_data >> guid >> unk >> option;
-
     if(_player->PlayerTalkClass->GossipOptionCoded( option ))
     {
         sLog.outDebug("reading string");
         recv_data >> code;
         sLog.outDebug("string read: %s", code.c_str());
     }
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_NONE);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleGossipSelectOptionOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     if(!code.empty())
     {
         if (!Script->GossipSelectWithCode(_player, unit, _player->PlayerTalkClass->GossipOptionSender (option), _player->PlayerTalkClass->GossipOptionAction( option ), code.c_str()))
@@ -339,51 +276,39 @@ void WorldSession::HandleGossipHelloOpcode( WorldPacket & recv_data )
            unit->OnGossipSelect (_player, option);
     }
 }*/
-
 void WorldSession::HandleSpiritHealerActivateOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_SPIRIT_HEALER_ACTIVATE");
-
     uint64 guid;
-
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_SPIRITHEALER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleSpiritHealerActivateOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     SendSpiritResurrect();
 }
-
 void WorldSession::SendSpiritResurrect()
 {
     _player->ResurrectPlayer(0.5f, true);
-
     _player->DurabilityLossAll(0.25f,true);
-
     // get corpse nearest graveyard
     WorldSafeLocsEntry const *corpseGrave = NULL;
     Corpse *corpse = _player->GetCorpse();
     if(corpse)
         corpseGrave = objmgr.GetClosestGraveYard(
             corpse->GetPositionX(), corpse->GetPositionY(), corpse->GetPositionZ(), corpse->GetMapId(), _player->GetTeam() );
-
     // now can spawn bones
     _player->SpawnCorpseBones();
-
     // teleport to nearest from corpse graveyard, if different from nearest to player ghost
     if(corpseGrave)
     {
         WorldSafeLocsEntry const *ghostGrave = objmgr.GetClosestGraveYard(
             _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetMapId(), _player->GetTeam() );
-
         if(corpseGrave != ghostGrave)
             _player->TeleportTo(corpseGrave->map_id, corpseGrave->x, corpseGrave->y, corpseGrave->z, _player->GetOrientation());
         // or update at original position
@@ -395,41 +320,32 @@ void WorldSession::SendSpiritResurrect()
     else
         //ObjectAccessor::UpdateVisibilityForPlayer(_player);
         _player->SetToNotify();
-
     _player->SaveToDB();
 }
-
 void WorldSession::HandleBinderActivateOpcode( WorldPacket & recv_data )
 {
     uint64 npcGUID;
     recv_data >> npcGUID;
-
     if(!GetPlayer()->IsInWorld() || !GetPlayer()->isAlive())
         return;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID,UNIT_NPC_FLAG_INNKEEPER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleBinderActivateOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     SendBindPoint(unit);
 }
-
 void WorldSession::SendBindPoint(Creature *npc)
 {
     // prevent set homebind to instances in any case
     if(GetPlayer()->GetMap()->Instanceable())
         return;
-
     uint32 bindspell = 3286;
     uint32 zone_id = _player->GetZoneId();
-
     // update sql homebind
     CharacterDatabase.PExecute("UPDATE character_homebind SET map = '%u', zone = '%u', position_x = '%f', position_y = '%f', position_z = '%f' WHERE guid = '%u'", _player->GetMapId(), zone_id, _player->GetPositionX(), _player->GetPositionY(), _player->GetPositionZ(), _player->GetGUIDLow());
     _player->m_homebindMapId = _player->GetMapId();
@@ -437,15 +353,12 @@ void WorldSession::SendBindPoint(Creature *npc)
     _player->m_homebindX = _player->GetPositionX();
     _player->m_homebindY = _player->GetPositionY();
     _player->m_homebindZ = _player->GetPositionZ();
-
     // send spell for bind 3286 bind magic
     _player->CastSpell(_player, bindspell, true);
-
     WorldPacket data( SMSG_TRAINER_BUY_SUCCEEDED, (8+4));
     data << npc->GetGUID();
     data << bindspell;
     SendPacket( &data );
-
     // binding
     data.Initialize( SMSG_BINDPOINTUPDATE, (4+4+4+4+4) );
     data << float(_player->GetPositionX());
@@ -454,63 +367,47 @@ void WorldSession::SendBindPoint(Creature *npc)
     data << uint32(_player->GetMapId());
     data << uint32(zone_id);
     SendPacket( &data );
-
     DEBUG_LOG("New Home Position X is %f",_player->GetPositionX());
     DEBUG_LOG("New Home Position Y is %f",_player->GetPositionY());
     DEBUG_LOG("New Home Position Z is %f",_player->GetPositionZ());
     DEBUG_LOG("New Home MapId is %u",_player->GetMapId());
     DEBUG_LOG("New Home ZoneId is %u",zone_id);
-
     // zone update
     data.Initialize( SMSG_PLAYERBOUND, 8+4 );
     data << uint64(_player->GetGUID());
     data << uint32(zone_id);
     SendPacket( &data );
-
     _player->PlayerTalkClass->CloseGossip();
 }
-
 void WorldSession::HandleListStabledPetsOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Recv MSG_LIST_STABLED_PETS");
     uint64 npcGUID;
-
     recv_data >> npcGUID;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_STABLEMASTER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleListStabledPetsOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     // remove mounts this fix bug where getting pet from stable while mounted deletes pet.
     if(GetPlayer()->IsMounted())
         GetPlayer()->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
     SendStablePet(npcGUID);
 }
-
 void WorldSession::SendStablePet(uint64 guid )
 {
     sLog.outDebug("WORLD: Recv MSG_LIST_STABLED_PETS Send.");
-
     WorldPacket data(MSG_LIST_STABLED_PETS, 200);           // guess size
     data << uint64 ( guid );
-
     Pet *pet = _player->GetPet();
-
     size_t wpos = data.wpos();
     data << uint8(0);                                       // place holder for slot show number
-
     data << uint8(GetPlayer()->m_stableSlots);
-
     uint8 num = 0;                                          // counter for place holder
-
     // not let move dead pet in slot
     if(pet && pet->isAlive() && pet->getPetType()==HUNTER_PET)
     {
@@ -521,56 +418,43 @@ void WorldSession::SendStablePet(uint64 guid )
         data << uint8(1);                                   // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show)
         ++num;
     }
-
     //                                                     0      1   2      3      4
     QueryResult* result = CharacterDatabase.PQuery("SELECT owner, id, entry, level, name 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);
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             data << uint32(fields[1].GetUInt32());          // petnumber
             data << uint32(fields[2].GetUInt32());          // creature entry
             data << uint32(fields[3].GetUInt32());          // level
             data << fields[4].GetString();                  // name
             data << uint8(2);                               // 1 = current, 2/3 = in stable (any from 4,5,... create problems with proper show)
-
             ++num;
         }while( result->NextRow() );
-
         delete result;
     }
-
     data.put<uint8>(wpos, num);                             // set real data to placeholder
     SendPacket(&data);
 }
-
 void WorldSession::HandleStablePet( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Recv CMSG_STABLE_PET");
     uint64 npcGUID;
-
     recv_data >> npcGUID;
-
     if(!GetPlayer()->isAlive())
         return;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_STABLEMASTER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleStablePet - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     Pet *pet = _player->GetPet();
-
     // can't place in stable dead pet
     if(!pet||!pet->isAlive()||pet->getPetType()!=HUNTER_PET)
     {
@@ -579,9 +463,7 @@ void WorldSession::HandleStablePet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     uint32 free_slot = 1;
-
     QueryResult *result = CharacterDatabase.PQuery("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);
     if(result)
@@ -589,20 +471,15 @@ void WorldSession::HandleStablePet( WorldPacket & recv_data )
         do
         {
             Field *fields = result->Fetch();
-
             uint32 slot = fields[1].GetUInt32();
-
             // slots ordered in query, and if not equal then free
             if(slot!=free_slot)
                 break;
-
             // this slot not free, skip
             ++free_slot;
         }while( result->NextRow() );
-
         delete result;
     }
-
     WorldPacket data(SMSG_STABLE_RESULT, 1);
     if( free_slot > 0 && free_slot <= GetPlayer()->m_stableSlots)
     {
@@ -611,31 +488,24 @@ void WorldSession::HandleStablePet( WorldPacket & recv_data )
     }
     else
         data << uint8(0x06);
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Recv CMSG_UNSTABLE_PET.");
     uint64 npcGUID;
     uint32 petnumber;
-
     recv_data >> npcGUID >> petnumber;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_STABLEMASTER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleUnstablePet - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     uint32 creature_id = 0;
-
     {
         QueryResult *result = CharacterDatabase.PQuery("SELECT entry FROM character_pet WHERE owner = '%u' AND id = '%u' AND slot >='%u' AND slot <= '%u'",
             _player->GetGUIDLow(),petnumber,PET_SAVE_FIRST_STABLE_SLOT,PET_SAVE_LAST_STABLE_SLOT);
@@ -646,7 +516,6 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
             delete result;
         }
     }
-
     if(!creature_id)
     {
         WorldPacket data(SMSG_STABLE_RESULT, 1);
@@ -654,7 +523,6 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     CreatureInfo const* creatureInfo = objmgr.GetCreatureTemplate(creature_id);
     if(!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets()))
     {
@@ -663,7 +531,6 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     Pet* pet = _player->GetPet();
     if(pet && pet->isAlive())
     {
@@ -672,11 +539,9 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     // delete dead pet
     if(pet)
         _player->RemovePet(pet,PET_SAVE_AS_DELETED);
-
     Pet *newpet = new Pet(_player, HUNTER_PET);
     if(!newpet->LoadPetFromDB(_player,creature_id,petnumber))
     {
@@ -687,32 +552,25 @@ void WorldSession::HandleUnstablePet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     WorldPacket data(SMSG_STABLE_RESULT, 1);
     data << uint8(0x09);
     SendPacket(&data);
 }
-
 void WorldSession::HandleBuyStableSlot( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Recv CMSG_BUY_STABLE_SLOT.");
     uint64 npcGUID;
-
     recv_data >> npcGUID;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_STABLEMASTER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleBuyStableSlot - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     WorldPacket data(SMSG_STABLE_RESULT, 200);
-
     if(GetPlayer()->m_stableSlots < MAX_PET_STABLES)
     {
         StableSlotPricesEntry const *SlotPrice = sStableSlotPricesStore.LookupEntry(GetPlayer()->m_stableSlots+1);
@@ -727,53 +585,40 @@ void WorldSession::HandleBuyStableSlot( WorldPacket & recv_data )
     }
     else
         data << uint8(0x06);
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleStableRevivePet( WorldPacket &/* recv_data */)
 {
     sLog.outDebug("HandleStableRevivePet: Not implemented");
 }
-
 void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: Recv CMSG_STABLE_SWAP_PET.");
     uint64 npcGUID;
     uint32 pet_number;
-
     recv_data >> npcGUID >> pet_number;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_STABLEMASTER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleStableSwapPet - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     WorldPacket data(SMSG_STABLE_RESULT, 200);              // guess size
-
     Pet* pet = _player->GetPet();
-
     if(!pet || pet->getPetType()!=HUNTER_PET)
         return;
-
     // find swapped pet slot in stable
     QueryResult *result = CharacterDatabase.PQuery("SELECT slot,entry FROM character_pet WHERE owner = '%u' AND id = '%u'",
         _player->GetGUIDLow(),pet_number);
     if(!result)
         return;
-
     Field *fields = result->Fetch();
-
     uint32 slot        = fields[0].GetUInt32();
     uint32 creature_id = fields[1].GetUInt32();
     delete result;
-
     if(!creature_id)
     {
         WorldPacket data(SMSG_STABLE_RESULT, 1);
@@ -781,7 +626,6 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     CreatureInfo const* creatureInfo = objmgr.GetCreatureTemplate(creature_id);
     if(!creatureInfo || !creatureInfo->isTameable(_player->CanTameExoticPets()))
     {
@@ -790,10 +634,8 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
         SendPacket(&data);
         return;
     }
-
     // move alive pet to slot or delete dead pet
     _player->RemovePet(pet,pet->isAlive() ? PetSaveMode(slot) : PET_SAVE_AS_DELETED);
-
     // summon unstabled pet
     Pet *newpet = new Pet(_player);
     if(!newpet->LoadPetFromDB(_player,creature_id,pet_number))
@@ -803,47 +645,36 @@ void WorldSession::HandleStableSwapPet( WorldPacket & recv_data )
     }
     else
         data << uint8(0x09);
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleRepairItemOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_REPAIR_ITEM");
-
     uint64 npcGUID, itemGUID;
     uint8 guildBank;                                        // new in 2.3.2, bool that means from guild bank money
-
     recv_data >> npcGUID >> itemGUID >> guildBank;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(npcGUID, UNIT_NPC_FLAG_REPAIR);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleRepairItemOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(npcGUID)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     // reputation discount
     float discountMod = _player->GetReputationPriceDiscount(unit);
-
     uint32 TotalCost = 0;
     if (itemGUID)
     {
         sLog.outDebug("ITEM: Repair item, itemGUID = %u, npcGUID = %u", GUID_LOPART(itemGUID), GUID_LOPART(npcGUID));
-
         Item* item = _player->GetItemByGuid(itemGUID);
-
         if(item)
             TotalCost= _player->DurabilityRepair(item->GetPos(),true,discountMod,guildBank>0?true:false);
     }
     else
     {
         sLog.outDebug("ITEM: Repair all items, npcGUID = %u", GUID_LOPART(npcGUID));
-
         TotalCost = _player->DurabilityRepairAll(true,discountMod,guildBank>0?true:false);
     }
     if (guildBank)
diff --git a/src/game/NPCHandler.h b/src/game/NPCHandler.h
index 4d0395a0c87..c959e9957e2 100644
--- a/src/game/NPCHandler.h
+++ b/src/game/NPCHandler.h
@@ -17,38 +17,31 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __NPCHANDLER_H
 #define __NPCHANDLER_H
-
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 struct PageText
 {
     uint32 Page_ID;
     char * Text;
-
     uint32 Next_Page;
 };
-
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 struct QEmote
 {
     uint32 _Emote;
     uint32 _Delay;
 };
-
 struct GossipTextOption
 {
     std::string Text_0;
@@ -57,21 +50,17 @@ struct GossipTextOption
     float Probability;
     QEmote Emotes[3];
 };
-
 struct GossipText
 {
     GossipTextOption Options[8];
 };
-
 struct PageTextLocale
 {
     std::vector<std::string> Text;
 };
-
 struct NpcTextLocale
 {
     NpcTextLocale() { Text_0.resize(8); Text_1.resize(8); }
-
     std::vector<std::vector<std::string> > Text_0;
     std::vector<std::vector<std::string> > Text_1;
 };
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 6c892ff1d5d..cb28fd40df5 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "WorldPacket.h"
@@ -42,11 +41,9 @@
 #include "CellImpl.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
-
 #include "TemporarySummon.h"
 #include "Totem.h"
 #include "OutdoorPvPMgr.h"
-
 uint32 GuidHigh2TypeId(uint32 guid_hi)
 {
     switch(guid_hi)
@@ -64,22 +61,17 @@ uint32 GuidHigh2TypeId(uint32 guid_hi)
     }
     return NUM_CLIENT_OBJECT_TYPES;                         // unknown
 }
-
 Object::Object( ) : m_PackGUID(sizeof(uint64)+1)
 {
     m_objectTypeId      = TYPEID_OBJECT;
     m_objectType        = TYPEMASK_OBJECT;
-
     m_uint32Values      = 0;
     m_uint32Values_mirror = 0;
     m_valuesCount       = 0;
-
     m_inWorld           = false;
     m_objectUpdated     = false;
-
     m_PackGUID.appendPackGUID(0);
 }
-
 WorldObject::~WorldObject()
 {
     // this may happen because there are many !create/delete
@@ -93,7 +85,6 @@ WorldObject::~WorldObject()
         ResetMap();
     }
 }
-
 Object::~Object( )
 {
     if(IsInWorld())
@@ -104,14 +95,12 @@ Object::~Object( )
         assert(false);
         RemoveFromWorld();
     }
-
     if(m_objectUpdated)
     {
         sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in update list!!", GetGUID(), GetTypeId(), GetEntry());
         assert(false);
         ObjectAccessor::Instance().RemoveUpdateObject(this);
     }
-
     if(m_uint32Values)
     {
         //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this);
@@ -120,22 +109,17 @@ Object::~Object( )
         //DEBUG_LOG("Object desctr 2 check (%p)",(void*)this);
     }
 }
-
 void Object::_InitValues()
 {
     m_uint32Values = new uint32[ m_valuesCount ];
     memset(m_uint32Values, 0, m_valuesCount*sizeof(uint32));
-
     m_uint32Values_mirror = new uint32[ m_valuesCount ];
     memset(m_uint32Values_mirror, 0, m_valuesCount*sizeof(uint32));
-
     m_objectUpdated = false;
 }
-
 void Object::_Create( uint32 guidlow, uint32 entry, HighGuid guidhigh )
 {
     if(!m_uint32Values) _InitValues();
-
     uint64 guid = MAKE_NEW_GUID(guidlow, entry, guidhigh);
     SetUInt64Value( OBJECT_FIELD_GUID, guid );
     uint32 type = 0;
@@ -155,41 +139,31 @@ void Object::_Create( uint32 guidlow, uint32 entry, HighGuid guidhigh )
     m_PackGUID.wpos(0);
     m_PackGUID.appendPackGUID(GetGUID());
 }
-
 void Object::BuildMovementUpdateBlock(UpdateData * data, uint32 flags ) const
 {
     ByteBuffer buf(500);
-
     buf << uint8( UPDATETYPE_MOVEMENT );
     buf.append(GetPackGUID());
-
     _BuildMovementUpdate(&buf, flags);
-
     data->AddUpdateBlock(buf);
 }
-
 void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) const
 {
     if(!target)
         return;
-
     uint8  updatetype = UPDATETYPE_CREATE_OBJECT;
     uint16 flags      = m_updateFlag;
-
     /** lower flag1 **/
     if(target == this)                                      // building packet for yourself
         flags |= UPDATEFLAG_SELF;
-
     if(flags & UPDATEFLAG_HAS_POSITION)
     {
         // UPDATETYPE_CREATE_OBJECT2 dynamic objects, corpses...
         if(isType(TYPEMASK_DYNAMICOBJECT) || isType(TYPEMASK_CORPSE) || isType(TYPEMASK_PLAYER))
             updatetype = UPDATETYPE_CREATE_OBJECT2;
-
         // UPDATETYPE_CREATE_OBJECT2 for pets...
         if(target->GetPetGUID() == GetGUID())
             updatetype = UPDATETYPE_CREATE_OBJECT2;
-
         // UPDATETYPE_CREATE_OBJECT2 for some gameobject types...
         if(isType(TYPEMASK_GAMEOBJECT))
         {
@@ -208,90 +182,70 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c
                     break;
             }
         }
-
         if(isType(TYPEMASK_UNIT))
         {
             if(((Unit*)this)->getVictim())
                 flags |= UPDATEFLAG_HAS_TARGET;
         }
     }
-
     //sLog.outDebug("BuildCreateUpdate: update-type: %u, object-type: %u got flags: %X, flags2: %X", updatetype, m_objectTypeId, flags, flags2);
-
     ByteBuffer buf(500);
     buf << (uint8)updatetype;
     buf.append(GetPackGUID());
     buf << (uint8)m_objectTypeId;
-
     _BuildMovementUpdate(&buf, flags);
-
     UpdateMask updateMask;
     updateMask.SetCount( m_valuesCount );
     _SetCreateBits( &updateMask, target );
     _BuildValuesUpdate(updatetype, &buf, &updateMask, target);
     data->AddUpdateBlock(buf);
 }
-
 void Object::BuildUpdate(UpdateDataMapType &update_players)
 {
     ObjectAccessor::_buildUpdateObject(this,update_players);
     ClearUpdateMask(true);
 }
-
 void Object::SendUpdateToPlayer(Player* player)
 {
     // send update to another players
     SendUpdateObjectToAllExcept(player);
-
     // send create update to player
     UpdateData upd;
     WorldPacket packet;
-
     BuildCreateUpdateBlockForPlayer(&upd, player);
     upd.BuildPacket(&packet);
     player->GetSession()->SendPacket(&packet);
 }
-
 void Object::BuildValuesUpdateBlockForPlayer(UpdateData *data, Player *target) const
 {
     ByteBuffer buf(500);
-
     buf << (uint8) UPDATETYPE_VALUES;
     buf.append(GetPackGUID());
-
     UpdateMask updateMask;
     updateMask.SetCount( m_valuesCount );
-
     _SetUpdateBits( &updateMask, target );
     _BuildValuesUpdate(UPDATETYPE_VALUES, &buf, &updateMask, target);
-
     data->AddUpdateBlock(buf);
 }
-
 void Object::BuildOutOfRangeUpdateBlock(UpdateData * data) const
 {
     data->AddOutOfRangeGUID(GetGUID());
 }
-
 void Object::DestroyForPlayer( Player *target, bool anim ) const
 {
     ASSERT(target);
-
     WorldPacket data(SMSG_DESTROY_OBJECT, 8);
     data << uint64(GetGUID());
     data << uint8(anim ? 1 : 0);                            // WotLK (bool), may be despawn animation
     target->GetSession()->SendPacket( &data );
 }
-
 void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
 {
     *data << (uint16)flags;                                  // update flags
-
     // 0x20
     if (flags & UPDATEFLAG_LIVING)
     {
         ((Unit*)this)->BuildMovementPacket(data);
-
         *data << ((Unit*)this)->GetSpeed( MOVE_WALK );
         *data << ((Unit*)this)->GetSpeed( MOVE_RUN );
         *data << ((Unit*)this)->GetSpeed( MOVE_SWIM_BACK );
@@ -301,18 +255,13 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
         *data << ((Unit*)this)->GetSpeed( MOVE_FLIGHT_BACK );
         *data << ((Unit*)this)->GetSpeed( MOVE_TURN_RATE );
         *data << ((Unit*)this)->GetSpeed( MOVE_PITCH_RATE );
-
         // 0x08000000
         if(GetTypeId() == TYPEID_PLAYER && ((Player*)this)->isInFlight())
         {
             WPAssert(((Player*)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == FLIGHT_MOTION_TYPE);
-
             FlightPathMovementGenerator *fmg = (FlightPathMovementGenerator*)(((Player*)this)->GetMotionMaster()->top());
-
             uint32 flags3 = MOVEFLAG_GLIDE;
-
             *data << uint32(flags3);                        // splines flag?
-
             if(flags3 & 0x20000)                            // may be orientation
             {
                 *data << (float)0;
@@ -325,43 +274,32 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
                     *data << (float)0;
                     *data << (float)0;
                 }
-
                 if(flags3 & 0x10000)                        // probably guid there
                 {
                     *data << uint64(0);
                 }
             }
-
             Path &path = fmg->GetPath();
-
             float x, y, z;
             ((Player*)this)->GetPosition(x, y, z);
-
             uint32 inflighttime = uint32(path.GetPassedLength(fmg->GetCurrentNode(), x, y, z) * 32);
             uint32 traveltime = uint32(path.GetTotalLength() * 32);
-
             *data << uint32(inflighttime);                  // passed move time?
             *data << uint32(traveltime);                    // full move time?
             *data << uint32(0);                             // ticks count?
-
             *data << float(0);                              // added in 3.1
             *data << float(0);                              // added in 3.1
             *data << float(0);                              // added in 3.1
-
             *data << uint32(0);                             // added in 3.1
-
             uint32 poscount = uint32(path.Size());
             *data << uint32(poscount);                      // points count
-
             for(uint32 i = 0; i < poscount; ++i)
             {
                 *data << path.GetNodes()[i].x;
                 *data << path.GetNodes()[i].y;
                 *data << path.GetNodes()[i].z;
             }
-
             *data << uint8(0);                              // added in 3.0.8
-
             *data << path.GetNodes()[poscount-1].x;
             *data << path.GetNodes()[poscount-1].y;
             *data << path.GetNodes()[poscount-1].z;
@@ -379,7 +317,6 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
             *data << ((WorldObject*)this)->GetPositionY();
             *data << ((WorldObject*)this)->GetPositionZ();
             *data << ((WorldObject*)this)->GetOrientation();
-
             if(GetTypeId() == TYPEID_CORPSE)
                 *data << float(((WorldObject*)this)->GetOrientation());
             else
@@ -408,7 +345,6 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
             }
         }
     }
-
     // 0x8
     if(flags & UPDATEFLAG_LOWGUID)
     {
@@ -436,14 +372,12 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
                 break;
         }
     }
-
     // 0x10
     if(flags & UPDATEFLAG_HIGHGUID)
     {
         // not high guid
         *data << uint32(0x00000000);                // unk
     }
-
     // 0x4
     if(flags & UPDATEFLAG_HAS_TARGET)                       // packed guid (current target guid)
     {
@@ -452,32 +386,27 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
         else
             *data << uint8(0);
     }
-
     // 0x2
     if(flags & UPDATEFLAG_TRANSPORT)
     {
         *data << uint32(getMSTime());                       // ms time
     }
-
     // 0x80
     if(flags & UPDATEFLAG_VEHICLE)                          // unused for now
     {
         *data << uint32(((Unit*)this)->GetVehicleKit()->GetVehicleInfo()->m_ID);  // vehicle id
         *data << float(0);                                  // facing adjustment
     }
-
     // 0x200
     if(flags & UPDATEFLAG_ROTATION)
     {
         *data << uint64(((GameObject*)this)->GetRotation());
     }
 }
-
 void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask *updateMask, Player *target) const
 {
     if(!target)
         return;
-
     bool IsActivateToQuest = false;
     if (updatetype == UPDATETYPE_CREATE_OBJECT || updatetype == UPDATETYPE_CREATE_OBJECT2)
     {
@@ -485,9 +414,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
         {
             if ( ((GameObject*)this)->ActivateToQuest(target) || target->isGameMaster())
                 IsActivateToQuest = true;
-
             updateMask->SetBit(GAMEOBJECT_DYNAMIC);
-
             if (((GameObject*)this)->GetGoArtKit())
                 updateMask->SetBit(GAMEOBJECT_BYTES_1);
         }
@@ -518,12 +445,9 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
             }
         }
     }
-
     WPAssert(updateMask && updateMask->GetCount() == m_valuesCount);
-
     *data << (uint8)updateMask->GetBlockCount();
     data->append( updateMask->GetMask(), updateMask->GetLength() );
-
     // 2 specialized loops for speed optimization in non-unit case
     if(isType(TYPEMASK_UNIT))                               // unit (creature/player) case
     {
@@ -535,10 +459,8 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
                 {
                     // remove custom flag before sending
                     uint32 appendValue = m_uint32Values[ index ] & ~(UNIT_NPC_FLAG_GUARD + UNIT_NPC_FLAG_OUTDOORPVP);
-
                     if (GetTypeId() == TYPEID_UNIT && !target->canSeeSpellClickOn((Creature*)this))
                         appendValue &= ~UNIT_NPC_FLAG_SPELLCLICK;
-
                     *data << uint32(appendValue);
                 }
                 else if (index == UNIT_FIELD_AURASTATE)
@@ -639,7 +561,7 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
                     }
                     else
                         *data << m_uint32Values[ index ];
-                }                    
+                }
                 else
                 {
                     // send in current format (float as float, uint32 as uint32)
@@ -701,11 +623,9 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
         }
     }
 }
-
 void Object::ClearUpdateMask(bool remove)
 {
     memcpy(m_uint32Values_mirror, m_uint32Values, m_valuesCount*sizeof(uint32));
-
     if(m_objectUpdated)
     {
         if(remove)
@@ -713,71 +633,56 @@ void Object::ClearUpdateMask(bool remove)
         m_objectUpdated = false;
     }
 }
-
 // Send current value fields changes to all viewers
 void Object::SendUpdateObjectToAllExcept(Player* exceptPlayer)
 {
     // changes will be send in create packet
     if(!IsInWorld())
         return;
-
     // nothing do
     if(!m_objectUpdated)
         return;
-
     ObjectAccessor::UpdateObject(this,exceptPlayer);
 }
-
 bool Object::LoadValues(const char* data)
 {
     if(!m_uint32Values) _InitValues();
-
     Tokens tokens = StrSplit(data, " ");
-
     if(tokens.size() != m_valuesCount)
         return false;
-
     Tokens::iterator iter;
     int index;
     for (iter = tokens.begin(), index = 0; index < m_valuesCount; ++iter, ++index)
     {
         m_uint32Values[index] = atol((*iter).c_str());
     }
-
     return true;
 }
-
 void Object::_SetUpdateBits(UpdateMask *updateMask, Player* /*target*/) const
 {
     uint32 *value = m_uint32Values;
     uint32 *mirror = m_uint32Values_mirror;
-
     for(uint16 index = 0; index < m_valuesCount; ++index, ++value, ++mirror)
     {
         if(*mirror != *value)
             updateMask->SetBit(index);
     }
 }
-
 void Object::_SetCreateBits(UpdateMask *updateMask, Player* /*target*/) const
 {
     uint32 *value = m_uint32Values;
-
     for(uint16 index = 0; index < m_valuesCount; ++index, ++value)
     {
         if(*value)
             updateMask->SetBit(index);
     }
 }
-
 void Object::SetInt32Value( uint16 index, int32 value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(m_int32Values[ index ] != value)
     {
         m_int32Values[ index ] = value;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -788,15 +693,12 @@ void Object::SetInt32Value( uint16 index, int32 value )
         }
     }
 }
-
 void Object::SetUInt32Value( uint16 index, uint32 value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(m_uint32Values[ index ] != value)
     {
         m_uint32Values[ index ] = value;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -807,14 +709,11 @@ void Object::SetUInt32Value( uint16 index, uint32 value )
         }
     }
 }
-
 void Object::UpdateUInt32Value( uint16 index, uint32 value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     m_uint32Values[ index ] = value;
 }
-
 void Object::SetUInt64Value( uint16 index, const uint64 &value )
 {
     ASSERT( index + 1 < m_valuesCount || PrintIndexError( index, true ) );
@@ -822,7 +721,6 @@ void Object::SetUInt64Value( uint16 index, const uint64 &value )
     {
         m_uint32Values[ index ] = *((uint32*)&value);
         m_uint32Values[ index + 1 ] = *(((uint32*)&value) + 1);
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -833,7 +731,6 @@ void Object::SetUInt64Value( uint16 index, const uint64 &value )
         }
     }
 }
-
 bool Object::AddUInt64Value(uint16 index, const uint64 &value)
 {
     ASSERT( index + 1 < m_valuesCount || PrintIndexError( index , true ) );
@@ -841,7 +738,6 @@ bool Object::AddUInt64Value(uint16 index, const uint64 &value)
     {
         m_uint32Values[ index ] = *((uint32*)&value);
         m_uint32Values[ index + 1 ] = *(((uint32*)&value) + 1);
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -854,7 +750,6 @@ bool Object::AddUInt64Value(uint16 index, const uint64 &value)
     }
     return false;
 }
-
 bool Object::RemoveUInt64Value(uint16 index, const uint64 &value)
 {
     ASSERT( index + 1 < m_valuesCount || PrintIndexError( index , true ) );
@@ -862,7 +757,6 @@ bool Object::RemoveUInt64Value(uint16 index, const uint64 &value)
     {
         m_uint32Values[ index ] = 0;
         m_uint32Values[ index + 1 ] = 0;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -875,15 +769,12 @@ bool Object::RemoveUInt64Value(uint16 index, const uint64 &value)
     }
     return false;
 }
-
 void Object::SetFloatValue( uint16 index, float value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(m_floatValues[ index ] != value)
     {
         m_floatValues[ index ] = value;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -894,22 +785,18 @@ void Object::SetFloatValue( uint16 index, float value )
         }
     }
 }
-
 void Object::SetByteValue( uint16 index, uint8 offset, uint8 value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(offset > 4)
     {
         sLog.outError("Object::SetByteValue: wrong offset %u", offset);
         return;
     }
-
     if(uint8(m_uint32Values[ index ] >> (offset * 8)) != value)
     {
         m_uint32Values[ index ] &= ~uint32(uint32(0xFF) << (offset * 8));
         m_uint32Values[ index ] |= uint32(uint32(value) << (offset * 8));
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -920,22 +807,18 @@ void Object::SetByteValue( uint16 index, uint8 offset, uint8 value )
         }
     }
 }
-
 void Object::SetUInt16Value( uint16 index, uint8 offset, uint16 value )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(offset > 2)
     {
         sLog.outError("Object::SetUInt16Value: wrong offset %u", offset);
         return;
     }
-
     if(uint16(m_uint32Values[ index ] >> (offset * 16)) != value)
     {
         m_uint32Values[ index ] &= ~uint32(uint32(0xFFFF) << (offset * 16));
         m_uint32Values[ index ] |= uint32(uint32(value) << (offset * 16));
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -946,23 +829,18 @@ void Object::SetUInt16Value( uint16 index, uint8 offset, uint16 value )
         }
     }
 }
-
 void Object::SetStatFloatValue( uint16 index, float value)
 {
     if(value < 0)
         value = 0.0f;
-
     SetFloatValue(index, value);
 }
-
 void Object::SetStatInt32Value( uint16 index, int32 value)
 {
     if(value < 0)
         value = 0;
-
     SetUInt32Value(index, uint32(value));
 }
-
 void Object::ApplyModUInt32Value(uint16 index, int32 val, bool apply)
 {
     int32 cur = GetUInt32Value(index);
@@ -971,21 +849,18 @@ void Object::ApplyModUInt32Value(uint16 index, int32 val, bool apply)
         cur = 0;
     SetUInt32Value(index, cur);
 }
-
 void Object::ApplyModInt32Value(uint16 index, int32 val, bool apply)
 {
     int32 cur = GetInt32Value(index);
     cur += (apply ? val : -val);
     SetInt32Value(index, cur);
 }
-
 void Object::ApplyModSignedFloatValue(uint16 index, float  val, bool apply)
 {
     float cur = GetFloatValue(index);
     cur += (apply ? val : -val);
     SetFloatValue(index, cur);
 }
-
 void Object::ApplyModPositiveFloatValue(uint16 index, float  val, bool apply)
 {
     float cur = GetFloatValue(index);
@@ -994,17 +869,14 @@ void Object::ApplyModPositiveFloatValue(uint16 index, float  val, bool apply)
         cur = 0;
     SetFloatValue(index, cur);
 }
-
 void Object::SetFlag( uint16 index, uint32 newFlag )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
     uint32 oldval = m_uint32Values[ index ];
     uint32 newval = oldval | newFlag;
-
     if(oldval != newval)
     {
         m_uint32Values[ index ] = newval;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -1015,17 +887,14 @@ void Object::SetFlag( uint16 index, uint32 newFlag )
         }
     }
 }
-
 void Object::RemoveFlag( uint16 index, uint32 oldFlag )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
     uint32 oldval = m_uint32Values[ index ];
     uint32 newval = oldval & ~oldFlag;
-
     if(oldval != newval)
     {
         m_uint32Values[ index ] = newval;
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -1036,21 +905,17 @@ void Object::RemoveFlag( uint16 index, uint32 oldFlag )
         }
     }
 }
-
 void Object::SetByteFlag( uint16 index, uint8 offset, uint8 newFlag )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(offset > 4)
     {
         sLog.outError("Object::SetByteFlag: wrong offset %u", offset);
         return;
     }
-
     if(!(uint8(m_uint32Values[ index ] >> (offset * 8)) & newFlag))
     {
         m_uint32Values[ index ] |= uint32(uint32(newFlag) << (offset * 8));
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -1061,21 +926,17 @@ void Object::SetByteFlag( uint16 index, uint8 offset, uint8 newFlag )
         }
     }
 }
-
 void Object::RemoveByteFlag( uint16 index, uint8 offset, uint8 oldFlag )
 {
     ASSERT( index < m_valuesCount || PrintIndexError( index, true ) );
-
     if(offset > 4)
     {
         sLog.outError("Object::RemoveByteFlag: wrong offset %u", offset);
         return;
     }
-
     if(uint8(m_uint32Values[ index ] >> (offset * 8)) & oldFlag)
     {
         m_uint32Values[ index ] &= ~uint32(uint32(oldFlag) << (offset * 8));
-
         if(m_inWorld)
         {
             if(!m_objectUpdated)
@@ -1086,15 +947,12 @@ void Object::RemoveByteFlag( uint16 index, uint8 offset, uint8 oldFlag )
         }
     }
 }
-
 bool Object::PrintIndexError(uint32 index, bool set) const
 {
     sLog.outError("Attempt %s non-existed value field: %u (count: %u) for object typeid: %u type mask: %u",(set ? "set value to" : "get value from"),index,m_valuesCount,GetTypeId(),m_objectType);
-
     // assert must fail after function call
     return false;
 }
-
 bool Position::HasInLine(const Unit * const target, float distance, float width) const
 {
     if(!HasInArc(M_PI, target) || !target->IsWithinDist3d(m_positionX, m_positionY, m_positionZ, distance)) return false;
@@ -1102,7 +960,6 @@ bool Position::HasInLine(const Unit * const target, float distance, float width)
     float angle = GetRelativeAngle(target);
     return abs(sin(angle)) * GetExactDist2d(target->GetPositionX(), target->GetPositionY()) < width;
 }
-
 WorldObject::WorldObject()
     : WorldLocation(), m_InstanceId(0), m_phaseMask(PHASEMASK_NORMAL), m_currMap(NULL)
     , m_zoneScript(NULL)
@@ -1110,32 +967,24 @@ WorldObject::WorldObject()
     , m_name("")
 {
 }
-
 void WorldObject::SetWorldObject(bool on)
 {
     if(!IsInWorld())
         return;
-
     GetMap()->AddObjectToSwitchList(this, on);
 }
-
 void WorldObject::setActive( bool on )
 {
     if(m_isActive == on)
         return;
-
     if(GetTypeId() == TYPEID_PLAYER)
         return;
-
     m_isActive = on;
-
     if(!IsInWorld())
         return;
-
     Map *map = FindMap();
     if(!map)
         return;
-
     if(on)
     {
         if(GetTypeId() == TYPEID_UNIT)
@@ -1151,38 +1000,31 @@ void WorldObject::setActive( bool on )
             map->RemoveFromActive((DynamicObject*)this);
     }
 }
-
 void WorldObject::CleanupsBeforeDelete()
 {
 }
-
 void WorldObject::_Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask )
 {
     Object::_Create(guidlow, 0, guidhigh);
     m_phaseMask = phaseMask;
 }
-
 uint32 WorldObject::GetZoneId() const
 {
     return GetBaseMap()->GetZoneId(m_positionX, m_positionY, m_positionZ);
 }
-
 uint32 WorldObject::GetAreaId() const
 {
     return GetBaseMap()->GetAreaId(m_positionX, m_positionY, m_positionZ);
 }
-
 void WorldObject::GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const
 {
     GetBaseMap()->GetZoneAndAreaId(zoneid, areaid, m_positionX, m_positionY, m_positionZ);
 }
-
 InstanceData* WorldObject::GetInstanceData()
 {
     Map *map = GetMap();
     return map->IsDungeon() ? ((InstanceMap*)map)->GetInstanceData() : NULL;
 }
-
 float WorldObject::GetDistanceZ(const WorldObject* obj) const
 {
     float dz = fabs(GetPositionZ() - obj->GetPositionZ());
@@ -1190,7 +1032,6 @@ float WorldObject::GetDistanceZ(const WorldObject* obj) const
     float dist = dz - sizefactor;
     return ( dist > 0 ? dist : 0);
 }
-
 bool WorldObject::_IsWithinDist(WorldObject const* obj, float dist2compare, bool is3D) const
 {
     float dx = GetPositionX() - obj->GetPositionX();
@@ -1203,10 +1044,8 @@ bool WorldObject::_IsWithinDist(WorldObject const* obj, float dist2compare, bool
     }
     float sizefactor = GetObjectSize() + obj->GetObjectSize();
     float maxdist = dist2compare + sizefactor;
-
     return distsq < maxdist * maxdist;
 }
-
 bool WorldObject::IsWithinLOSInMap(const WorldObject* obj) const
 {
     if (!IsInMap(obj)) return false;
@@ -1214,7 +1053,6 @@ bool WorldObject::IsWithinLOSInMap(const WorldObject* obj) const
     obj->GetPosition(ox,oy,oz);
     return(IsWithinLOS(ox, oy, oz ));
 }
-
 bool WorldObject::IsWithinLOS(float ox, float oy, float oz) const
 {
     float x,y,z;
@@ -1222,7 +1060,6 @@ bool WorldObject::IsWithinLOS(float ox, float oy, float oz) const
     VMAP::IVMapManager *vMapManager = VMAP::VMapFactory::createOrGetVMapManager();
     return vMapManager->isInLineOfSight(GetMapId(), x, y, z+2.0f, ox, oy, oz+2.0f);
 }
-
 bool WorldObject::GetDistanceOrder(WorldObject const* obj1, WorldObject const* obj2, bool is3D /* = true */) const
 {
     float dx1 = GetPositionX() - obj1->GetPositionX();
@@ -1233,7 +1070,6 @@ bool WorldObject::GetDistanceOrder(WorldObject const* obj1, WorldObject const* o
         float dz1 = GetPositionZ() - obj1->GetPositionZ();
         distsq1 += dz1*dz1;
     }
-
     float dx2 = GetPositionX() - obj2->GetPositionX();
     float dy2 = GetPositionY() - obj2->GetPositionY();
     float distsq2 = dx2*dx2 + dy2*dy2;
@@ -1242,10 +1078,8 @@ bool WorldObject::GetDistanceOrder(WorldObject const* obj1, WorldObject const* o
         float dz2 = GetPositionZ() - obj2->GetPositionZ();
         distsq2 += dz2*dz2;
     }
-
     return distsq1 < distsq2;
 }
-
 bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRange, bool is3D /* = true */) const
 {
     float dx = GetPositionX() - obj->GetPositionX();
@@ -1256,9 +1090,7 @@ bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRan
         float dz = GetPositionZ() - obj->GetPositionZ();
         distsq += dz*dz;
     }
-
     float sizefactor = GetObjectSize() + obj->GetObjectSize();
-
     // check only for real range
     if(minRange > 0.0f)
     {
@@ -1266,19 +1098,15 @@ bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRan
         if(distsq < mindist * mindist)
             return false;
     }
-
     float maxdist = maxRange + sizefactor;
     return distsq < maxdist * maxdist;
 }
-
 bool WorldObject::IsInRange2d(float x, float y, float minRange, float maxRange) const
 {
     float dx = GetPositionX() - x;
     float dy = GetPositionY() - y;
     float distsq = dx*dx + dy*dy;
-
     float sizefactor = GetObjectSize();
-
     // check only for real range
     if(minRange > 0.0f)
     {
@@ -1286,20 +1114,16 @@ bool WorldObject::IsInRange2d(float x, float y, float minRange, float maxRange)
         if(distsq < mindist * mindist)
             return false;
     }
-
     float maxdist = maxRange + sizefactor;
     return distsq < maxdist * maxdist;
 }
-
 bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float maxRange) const
 {
     float dx = GetPositionX() - x;
     float dy = GetPositionY() - y;
     float dz = GetPositionZ() - z;
     float distsq = dx*dx + dy*dy + dz*dz;
-
     float sizefactor = GetObjectSize();
-
     // check only for real range
     if(minRange > 0.0f)
     {
@@ -1307,33 +1131,27 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
         if(distsq < mindist * mindist)
             return false;
     }
-
     float maxdist = maxRange + sizefactor;
     return distsq < maxdist * maxdist;
 }
-
 float Position::GetAngle(const Position *obj) const
 {
     if(!obj) return 0;
     return GetAngle( obj->GetPositionX(), obj->GetPositionY() );
 }
-
 // Return angle in range 0..2*pi
 float Position::GetAngle( const float x, const float y ) const
 {
     float dx = x - GetPositionX();
     float dy = y - GetPositionY();
-
     float ang = atan2(dy, dx);
     ang = (ang >= 0) ? ang : 2 * M_PI + ang;
     return ang;
 }
-
 void Position::GetSinCos(const float x, const float y, float &vsin, float &vcos) const
 {
     float dx = GetPositionX() - x;
     float dy = GetPositionY() - y;
-
     if(dx < 0.001f && dy < 0.001f)
     {
         float angle = rand_norm()*2*M_PI;
@@ -1347,22 +1165,18 @@ void Position::GetSinCos(const float x, const float y, float &vsin, float &vcos)
         vsin = dy / dist;
     }
 }
-
 bool Position::HasInArc(float arc, const Position *obj) const
 {
     // always have self in arc
     if(obj == this)
         return true;
-
     // move arc to range 0.. 2*pi
     while( arc >= 2.0f * M_PI )
         arc -=  2.0f * M_PI;
     while( arc < 0 )
         arc +=  2.0f * M_PI;
-
     float angle = GetAngle( obj );
     angle -= m_orientation;
-
     //if(angle > 100 || angle < -100)
     //{
     //    sLog.outCrash("Invalid Angle %f: this %u %u %f %f %f %f, that %u %u %f %f %f %f", angle,
@@ -1371,18 +1185,15 @@ bool Position::HasInArc(float arc, const Position *obj) const
     //    assert(false);
     //    return false;
     //}
-
     // move angle to range -pi ... +pi
     while( angle > M_PI)
         angle -= 2.0f * M_PI;
     while(angle < -M_PI)
         angle += 2.0f * M_PI;
-
     float lborder =  -1 * (arc/2.0f);                       // in range -pi..0
     float rborder = (arc/2.0f);                             // in range 0..pi
     return (( angle >= lborder ) && ( angle <= rborder ));
 }
-
 bool WorldObject::IsInBetween(const WorldObject *obj1, const WorldObject *obj2, float size) const
 {
     if(GetPositionX() > std::max(obj1->GetPositionX(), obj2->GetPositionX())
@@ -1390,14 +1201,11 @@ bool WorldObject::IsInBetween(const WorldObject *obj1, const WorldObject *obj2,
         || GetPositionY() > std::max(obj1->GetPositionY(), obj2->GetPositionY())
         || GetPositionY() < std::min(obj1->GetPositionY(), obj2->GetPositionY()))
         return false;
-
     if(!size)
         size = GetObjectSize() / 2;
-
     float angle = obj1->GetAngle(this) - obj1->GetAngle(obj2);
     return abs(sin(angle)) * GetExactDist2d(obj1->GetPositionX(), obj1->GetPositionY()) < size;
 }
-
 void WorldObject::GetRandomPoint(const Position &pos, float distance, float &rand_x, float &rand_y, float &rand_z) const
 {
     if(!distance)
@@ -1405,65 +1213,53 @@ void WorldObject::GetRandomPoint(const Position &pos, float distance, float &ran
         pos.GetPosition(rand_x, rand_y, rand_z);
         return;
     }
-
     // angle to face `obj` to `this`
     float angle = rand_norm()*2*M_PI;
     float new_dist = rand_norm()*distance;
-
     rand_x = pos.m_positionX + new_dist * cos(angle);
     rand_y = pos.m_positionY + new_dist * sin(angle);
     rand_z = pos.m_positionZ;
-
     Trinity::NormalizeMapCoord(rand_x);
     Trinity::NormalizeMapCoord(rand_y);
     UpdateGroundPositionZ(rand_x,rand_y,rand_z);            // update to LOS height if available
 }
-
 void WorldObject::UpdateGroundPositionZ(float x, float y, float &z) const
 {
     float new_z = GetBaseMap()->GetHeight(x,y,z,true);
     if(new_z > INVALID_HEIGHT)
         z = new_z+ 0.05f;                                   // just to be sure that we are not a few pixel under the surface
 }
-
 bool Position::IsPositionValid() const
 {
     return Trinity::IsValidMapCoord(m_positionX,m_positionY,m_positionZ,m_orientation);
 }
-
 void WorldObject::MonsterSay(const char* text, uint32 language, uint64 TargetGuid)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data,CHAT_MSG_MONSTER_SAY,text,language,GetName(),TargetGuid);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY),true);
 }
-
 void WorldObject::MonsterYell(const char* text, uint32 language, uint64 TargetGuid)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,text,language,GetName(),TargetGuid);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_YELL),true);
 }
-
 void WorldObject::MonsterTextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data,IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE,text,LANG_UNIVERSAL,GetName(),TargetGuid);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true);
 }
-
 void WorldObject::MonsterWhisper(const char* text, uint64 receiver, bool IsBossWhisper)
 {
     Player *player = objmgr.GetPlayer(receiver);
     if(!player || !player->GetSession())
         return;
-
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data,IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER,text,LANG_UNIVERSAL,GetName(),receiver);
-
     player->GetSession()->SendPacket(&data);
 }
-
 void WorldObject::SendPlaySound(uint32 Sound, bool OnlySelf)
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
@@ -1473,7 +1269,6 @@ void WorldObject::SendPlaySound(uint32 Sound, bool OnlySelf)
     else
         SendMessageToSet( &data, true ); // ToSelf ignored in this case
 }
-
 void Object::ForceValuesUpdateAtIndex(uint32 i)
 {
     m_uint32Values_mirror[i] = GetUInt32Value(i) + 1; // makes server think the field changed
@@ -1486,7 +1281,6 @@ void Object::ForceValuesUpdateAtIndex(uint32 i)
         }
     }
 }
-
 namespace Trinity
 {
     class MonsterChatBuilder
@@ -1497,11 +1291,9 @@ namespace Trinity
             void operator()(WorldPacket& data, int32 loc_idx)
             {
                 char const* text = objmgr.GetMangosString(i_textId,loc_idx);
-
                 // TODO: i_object.GetName() also must be localized?
                 i_object.BuildMonsterChat(&data,i_msgtype,text,i_language,i_object.GetNameForLocaleIdx(loc_idx),i_targetGUID);
             }
-
         private:
             WorldObject const& i_object;
             ChatMsg i_msgtype;
@@ -1510,15 +1302,12 @@ namespace Trinity
             uint64 i_targetGUID;
     };
 }                                                           // namespace Trinity
-
 void WorldObject::MonsterSay(int32 textId, uint32 language, uint64 TargetGuid)
 {
     CellPair p = Trinity::ComputeCellPair(GetPositionX(), GetPositionY());
-
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_SAY, textId,language,TargetGuid);
     MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
     MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this,sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY),say_do);
@@ -1526,15 +1315,12 @@ void WorldObject::MonsterSay(int32 textId, uint32 language, uint64 TargetGuid)
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *GetMap(), *this, sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY));
 }
-
 void WorldObject::MonsterYell(int32 textId, uint32 language, uint64 TargetGuid)
 {
     CellPair p = Trinity::ComputeCellPair(GetPositionX(), GetPositionY());
-
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId,language,TargetGuid);
     MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
     MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this,sWorld.getConfig(CONFIG_LISTEN_RANGE_YELL),say_do);
@@ -1542,28 +1328,22 @@ void WorldObject::MonsterYell(int32 textId, uint32 language, uint64 TargetGuid)
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *GetMap(), *this, sWorld.getConfig(CONFIG_LISTEN_RANGE_YELL));
 }
-
 void WorldObject::MonsterYellToZone(int32 textId, uint32 language, uint64 TargetGuid)
 {
     MaNGOS::MonsterChatBuilder say_build(*this, CHAT_MSG_MONSTER_YELL, textId,language,TargetGuid);
     MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
-
     uint32 zoneid = GetZoneId();
-
     Map::PlayerList const& pList = GetMap()->GetPlayers();
     for(Map::PlayerList::const_iterator itr = pList.begin(); itr != pList.end(); ++itr)
         if(itr->getSource()->GetZoneId()==zoneid)
             say_do(itr->getSource());
 }
-
 void WorldObject::MonsterTextEmote(int32 textId, uint64 TargetGuid, bool IsBossEmote)
 {
     CellPair p = Trinity::ComputeCellPair(GetPositionX(), GetPositionY());
-
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     MaNGOS::MonsterChatBuilder say_build(*this, IsBossEmote ? CHAT_MSG_RAID_BOSS_EMOTE : CHAT_MSG_MONSTER_EMOTE, textId,LANG_UNIVERSAL,TargetGuid);
     MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> say_do(say_build);
     MaNGOS::PlayerDistWorker<MaNGOS::LocalizedPacketDo<MaNGOS::MonsterChatBuilder> > say_worker(this,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),say_do);
@@ -1571,22 +1351,17 @@ void WorldObject::MonsterTextEmote(int32 textId, uint64 TargetGuid, bool IsBossE
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, message, *GetMap(), *this, sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE));
 }
-
 void WorldObject::MonsterWhisper(int32 textId, uint64 receiver, bool IsBossWhisper)
 {
     Player *player = objmgr.GetPlayer(receiver);
     if(!player || !player->GetSession())
         return;
-
     uint32 loc_idx = player->GetSession()->GetSessionDbLocaleIndex();
     char const* text = objmgr.GetTrinityString(textId,loc_idx);
-
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildMonsterChat(&data,IsBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER,text,LANG_UNIVERSAL,GetNameForLocaleIdx(loc_idx),receiver);
-
     player->GetSession()->SendPacket(&data);
 }
-
 void WorldObject::BuildMonsterChat(WorldPacket *data, uint8 msgtype, char const* text, uint32 language, char const* name, uint64 targetGuid) const
 {
     *data << (uint8)msgtype;
@@ -1605,33 +1380,28 @@ void WorldObject::BuildMonsterChat(WorldPacket *data, uint8 msgtype, char const*
     *data << text;
     *data << (uint8)0;                                      // ChatTag
 }
-
 void Unit::BuildHeartBeatMsg(WorldPacket *data) const
 {
     data->Initialize(MSG_MOVE_HEARTBEAT, 32);
     data->append(GetPackGUID());
     BuildMovementPacket(data);
 }
-
 void WorldObject::SendMessageToSet(WorldPacket *data, bool /*fake*/)
 {
     Trinity::MessageDistDeliverer notifier(this, data, GetMap()->GetVisibilityDistance());
     VisitNearbyWorldObject(GetMap()->GetVisibilityDistance(), notifier);
 }
-
 void WorldObject::SendMessageToSetInRange(WorldPacket *data, float dist, bool /*bToSelf*/)
 {
     Trinity::MessageDistDeliverer notifier(this, data, dist);
     VisitNearbyWorldObject(dist, notifier);
 }
-
 void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
 {
     WorldPacket data(SMSG_GAMEOBJECT_DESPAWN_ANIM, 8);
     data << uint64(guid);
     SendMessageToSet(&data, true);
 }
-
 void WorldObject::SetMap(Map * map)
 {
     ASSERT(map);
@@ -1649,7 +1419,6 @@ void WorldObject::SetMap(Map * map)
     if(m_isWorldObject)
         m_currMap->AddWorldObject(this);
 }
-
 void WorldObject::ResetMap()
 {
     ASSERT(m_currMap);
@@ -1661,27 +1430,22 @@ void WorldObject::ResetMap()
     //m_mapId = 0;
     //m_InstanceId = 0;
 }
-
 Map const* WorldObject::GetBaseMap() const
 {
     ASSERT(m_currMap);
     return m_currMap->GetParent();
 }
-
 void WorldObject::AddObjectToRemoveList()
 {
     assert(m_uint32Values);
-
     Map* map = FindMap();
     if(!map)
     {
         sLog.outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());
         return;
     }
-
     map->AddObjectToRemoveList(this);
 }
-
 TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropertiesEntry const *properties, uint32 duration, Unit *summoner, uint32 vehId)
 {
     uint32 mask = UNIT_MASK_SUMMON;
@@ -1713,7 +1477,6 @@ TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropert
                 break;
         }
     }
-
     uint32 phase = PHASEMASK_NORMAL, team = 0;
     if(summoner)
     {
@@ -1721,7 +1484,6 @@ TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropert
         if(summoner->GetTypeId() == TYPEID_PLAYER)
             team = ((Player*)summoner)->GetTeam();
     }
-
     TempSummon *summon = NULL;
     switch(mask)
     {
@@ -1732,24 +1494,18 @@ TempSummon *Map::SummonCreature(uint32 entry, const Position &pos, SummonPropert
         case UNIT_MASK_MINION:    summon = new Minion     (properties, summoner);  break;
         default:    return NULL;
     }
-
     if(!summon->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), this, phase, entry, vehId, team, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation()))
     {
         delete summon;
         return NULL;
     }
-
     summon->SetHomePosition(pos);
-
     summon->InitStats(duration);
     Add((Creature*)summon);
     summon->InitSummon();
-
     //ObjectAccessor::UpdateObjectVisibility(summon);
-
     return summon;
 }
-
 void WorldObject::SetZoneScript()
 {
     if(Map *map = FindMap())
@@ -1760,7 +1516,6 @@ void WorldObject::SetZoneScript()
             m_zoneScript = sOutdoorPvPMgr.GetZoneScript(GetZoneId());
     }
 }
-
 TempSummon* WorldObject::SummonCreature(uint32 entry, const Position &pos, TempSummonType spwtype, uint32 duration, uint32 vehId) const
 {
     if(Map *map = FindMap())
@@ -1771,14 +1526,11 @@ TempSummon* WorldObject::SummonCreature(uint32 entry, const Position &pos, TempS
             return summon;
         }
     }
-
     return NULL;
 }
-
 Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetType petType, uint32 duration)
 {
     Pet* pet = new Pet(this, petType);
-
     if(petType == SUMMON_PET && pet->LoadPetFromDB(this, entry))
     {
         // Remove Demonic Sacrifice auras (known pet)
@@ -1793,20 +1545,16 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
             else
                 ++itr;
         }
-
         if(duration > 0)
             pet->SetDuration(duration);
-
         return NULL;
     }
-
     // petentry==0 for hunter "call pet" (current pet summoned if any)
     if(!entry)
     {
         delete pet;
         return NULL;
     }
-
     pet->Relocate(x, y, z, ang);
     if(!pet->IsPositionValid())
     {
@@ -1814,7 +1562,6 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
         delete pet;
         return NULL;
     }
-
     Map *map = GetMap();
     uint32 pet_number = objmgr.GeneratePetNumber();
     if(!pet->Create(objmgr.GenerateLowGuid(HIGHGUID_PET), map, GetPhaseMask(), entry, pet_number))
@@ -1823,17 +1570,13 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
         delete pet;
         return NULL;
     }
-
     pet->SetCreatorGUID(GetGUID());
     pet->SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, getFaction());
-
     pet->setPowerType(POWER_MANA);
     pet->SetUInt32Value(UNIT_NPC_FLAGS , 0);
     pet->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
     pet->InitStatsForLevel(getLevel());
-
     SetMinion(pet, true);
-
     switch(petType)
     {
         case SUMMON_PET:
@@ -1847,9 +1590,7 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
             pet->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
             break;
     }
-
     map->Add((Creature*)pet);
-
     switch(petType)
     {
         case SUMMON_PET:
@@ -1859,7 +1600,6 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
             PetSpellInitialize();
             break;
     }
-
     if(petType == SUMMON_PET)
     {
         // Remove Demonic Sacrifice auras (known pet)
@@ -1875,20 +1615,15 @@ Pet* Player::SummonPet(uint32 entry, float x, float y, float z, float ang, PetTy
                 ++itr;
         }
     }
-
     if(duration > 0)
         pet->SetDuration(duration);
-
     //ObjectAccessor::UpdateObjectVisibility(pet);
-
     return pet;
 }
-
 GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime)
 {
     if(!IsInWorld())
         return NULL;
-
     GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(entry);
     if(!goinfo)
     {
@@ -1908,29 +1643,24 @@ GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float
     else
         go->SetSpawnedByDefault(false);
     map->Add(go);
-
     return go;
 }
-
 Creature* WorldObject::SummonTrigger(float x, float y, float z, float ang, uint32 duration, CreatureAI* (*GetAI)(Creature*))
 {
     TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN;
     Creature* summon = SummonCreature(WORLD_TRIGGER, x, y, z, ang, summonType, duration);
     if(!summon)
         return NULL;
-
     //summon->SetName(GetName());
     if(GetTypeId()==TYPEID_PLAYER || GetTypeId()==TYPEID_UNIT)
     {
         summon->setFaction(((Unit*)this)->getFaction());
         summon->SetLevel(((Unit*)this)->getLevel());
     }
-
     if(GetAI)
         summon->AIM_Initialize(GetAI(summon));
     return summon;
 }
-
 Creature* WorldObject::FindNearestCreature(uint32 entry, float range, bool alive)
 {
     Creature *creature = NULL;
@@ -1939,7 +1669,6 @@ Creature* WorldObject::FindNearestCreature(uint32 entry, float range, bool alive
     VisitNearbyObject(range, searcher);
     return creature;
 }
-
 GameObject* WorldObject::FindNearestGameObject(uint32 entry, float range)
 {
     GameObject *go = NULL;
@@ -1948,37 +1677,30 @@ GameObject* WorldObject::FindNearestGameObject(uint32 entry, float range)
     VisitNearbyGridObject(range, searcher);
     return go;
 }
-
 void WorldObject::GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList, uint32 uiEntry, float fMaxSearchRange)
 {
     CellPair pair(Trinity::ComputeCellPair(this->GetPositionX(), this->GetPositionY()));
     Cell cell(pair);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     Trinity::AllGameObjectsWithEntryInRange check(this, uiEntry, fMaxSearchRange);
     Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInRange> searcher(this, lList, check);
     TypeContainerVisitor<Trinity::GameObjectListSearcher<Trinity::AllGameObjectsWithEntryInRange>, GridTypeMapContainer> visitor(searcher);
-
     CellLock<GridReadGuard> cell_lock(cell, pair);
     cell_lock->Visit(cell_lock, visitor, *(this->GetMap()));
 }
-
 void WorldObject::GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, uint32 uiEntry, float fMaxSearchRange)
 {
     CellPair pair(Trinity::ComputeCellPair(this->GetPositionX(), this->GetPositionY()));
     Cell cell(pair);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     Trinity::AllCreaturesOfEntryInRange check(this, uiEntry, fMaxSearchRange);
     Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange> searcher(this, lList, check);
     TypeContainerVisitor<Trinity::CreatureListSearcher<Trinity::AllCreaturesOfEntryInRange>, GridTypeMapContainer> visitor(searcher);
-
     CellLock<GridReadGuard> cell_lock(cell, pair);
     cell_lock->Visit(cell_lock, visitor, *(this->GetMap()));
 }
-
 /*
 namespace MaNGOS
 {
@@ -1987,58 +1709,45 @@ namespace MaNGOS
         public:
             NearUsedPosDo(WorldObject const& obj, WorldObject const* searcher, float angle, ObjectPosSelector& selector)
                 : i_object(obj), i_searcher(searcher), i_angle(angle), i_selector(selector) {}
-
             void operator()(Corpse*) const {}
             void operator()(DynamicObject*) const {}
-
             void operator()(Creature* c) const
             {
                 // skip self or target
                 if(c==i_searcher || c==&i_object)
                     return;
-
                 float x,y,z;
-
                 if( !c->isAlive() || c->hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) ||
                     !c->GetMotionMaster()->GetDestination(x,y,z) )
                 {
                     x = c->GetPositionX();
                     y = c->GetPositionY();
                 }
-
                 add(c,x,y);
             }
-
             template<class T>
                 void operator()(T* u) const
             {
                 // skip self or target
                 if(u==i_searcher || u==&i_object)
                     return;
-
                 float x,y;
-
                 x = u->GetPositionX();
                 y = u->GetPositionY();
-
                 add(u,x,y);
             }
-
             // we must add used pos that can fill places around center
             void add(WorldObject* u, float x, float y) const
             {
                 // u is too nearest/far away to i_object
                 if(!i_object.IsInRange2d(x,y,i_selector.m_dist - i_selector.m_size,i_selector.m_dist + i_selector.m_size))
                     return;
-
                 float angle = i_object.GetAngle(u)-i_angle;
-
                 // move angle to range -pi ... +pi
                 while( angle > M_PI)
                     angle -= 2.0f * M_PI;
                 while(angle < -M_PI)
                     angle += 2.0f * M_PI;
-
                 // dist include size of u
                 float dist2d = i_object.GetDistance2d(x,y);
                 i_selector.AddUsedPos(u->GetObjectSize(),angle,dist2d + i_object.GetObjectSize());
@@ -2051,24 +1760,19 @@ namespace MaNGOS
     };
 }                                                           // namespace MaNGOS
 */
-
 //===================================================================================================
-
 void WorldObject::GetNearPoint2D(float &x, float &y, float distance2d, float absAngle ) const
 {
     x = GetPositionX() + (GetObjectSize() + distance2d) * cos(absAngle);
     y = GetPositionY() + (GetObjectSize() + distance2d) * sin(absAngle);
-
     Trinity::NormalizeMapCoord(x);
     Trinity::NormalizeMapCoord(y);
 }
-
 void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d, float absAngle ) const
 {
     GetNearPoint2D(x,y,distance2d+searcher_size,absAngle);
     z = GetPositionZ();
     UpdateGroundPositionZ(x,y,z);
-
     /*
     // if detection disabled, return first point
     if(!sWorld.getConfig(CONFIG_DETECT_POS_COLLISION))
@@ -2076,83 +1780,64 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
         return;
     }
-
     // or remember first point
     float first_x = x;
     float first_y = y;
     bool first_los_conflict = false;                        // first point LOS problems
-
     // prepare selector for work
     ObjectPosSelector selector(GetPositionX(),GetPositionY(),GetObjectSize(),distance2d+searcher_size);
-
     // adding used positions around object
     {
         CellPair p(MaNGOS::ComputeCellPair(GetPositionX(), GetPositionY()));
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
         cell.SetNoCreate();
-
         MaNGOS::NearUsedPosDo u_do(*this,searcher,absAngle,selector);
         MaNGOS::WorldObjectWorker<MaNGOS::NearUsedPosDo> worker(this,u_do);
-
         TypeContainerVisitor<MaNGOS::WorldObjectWorker<MaNGOS::NearUsedPosDo>, GridTypeMapContainer  > grid_obj_worker(worker);
         TypeContainerVisitor<MaNGOS::WorldObjectWorker<MaNGOS::NearUsedPosDo>, WorldTypeMapContainer > world_obj_worker(worker);
-
         CellLock<GridReadGuard> cell_lock(cell, p);
         cell_lock->Visit(cell_lock, grid_obj_worker,  *GetMap(), *this, distance2d);
         cell_lock->Visit(cell_lock, world_obj_worker, *GetMap(), *this, distance2d);
     }
-
     // maybe can just place in primary position
     if( selector.CheckOriginal() )
     {
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
-
         if(IsWithinLOS(x,y,z))
             return;
-
         first_los_conflict = true;                          // first point have LOS problems
     }
-
     float angle;                                            // candidate of angle for free pos
-
     // special case when one from list empty and then empty side preferred
     if(selector.FirstAngle(angle))
     {
         GetNearPoint2D(x,y,distance2d,absAngle+angle);
         z = GetPositionZ();
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
-
         if(IsWithinLOS(x,y,z))
             return;
     }
-
     // set first used pos in lists
     selector.InitializeAngle();
-
     // select in positions after current nodes (selection one by one)
     while(selector.NextAngle(angle))                        // angle for free pos
     {
         GetNearPoint2D(x,y,distance2d,absAngle+angle);
         z = GetPositionZ();
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
-
         if(IsWithinLOS(x,y,z))
             return;
     }
-
     // BAD NEWS: not free pos (or used or have LOS problems)
     // Attempt find _used_ pos without LOS problem
-
     if(!first_los_conflict)
     {
         x = first_x;
         y = first_y;
-
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
         return;
     }
-
     // special case when one from list empty and then empty side preferred
     if( selector.IsNonBalanced() )
     {
@@ -2161,34 +1846,27 @@ void WorldObject::GetNearPoint(WorldObject const* searcher, float &x, float &y,
             GetNearPoint2D(x,y,distance2d,absAngle+angle);
             z = GetPositionZ();
             UpdateGroundPositionZ(x,y,z);                   // update to LOS height if available
-
             if(IsWithinLOS(x,y,z))
                 return;
         }
     }
-
     // set first used pos in lists
     selector.InitializeAngle();
-
     // select in positions after current nodes (selection one by one)
     while(selector.NextUsedAngle(angle))                    // angle for used pos but maybe without LOS problem
     {
         GetNearPoint2D(x,y,distance2d,absAngle+angle);
         z = GetPositionZ();
         UpdateGroundPositionZ(x,y,z);                       // update to LOS height if available
-
         if(IsWithinLOS(x,y,z))
             return;
     }
-
     // BAD BAD NEWS: all found pos (free and used) have LOS problem :(
     x = first_x;
     y = first_y;
-
     UpdateGroundPositionZ(x,y,z);                           // update to LOS height if available
     */
 }
-
 void WorldObject::MovePosition(Position &pos, float dist, float angle)
 {
     angle += m_orientation;
@@ -2199,15 +1877,12 @@ void WorldObject::MovePosition(Position &pos, float dist, float angle)
     UpdateGroundPositionZ(pos.m_positionX, pos.m_positionY, pos.m_positionZ);
     pos.m_orientation = m_orientation;
 }
-
 void WorldObject::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
     m_phaseMask = newPhaseMask;
-
     if(update && IsInWorld())
         ObjectAccessor::UpdateObjectVisibility(this);
 }
-
 void WorldObject::PlayDistanceSound( uint32 sound_id, Player* target /*= NULL*/ )
 {
     WorldPacket data(SMSG_PLAY_OBJECT_SOUND,4+8);
@@ -2218,7 +1893,6 @@ void WorldObject::PlayDistanceSound( uint32 sound_id, Player* target /*= NULL*/
     else
         SendMessageToSet( &data, true );
 }
-
 void WorldObject::PlayDirectSound( uint32 sound_id, Player* target /*= NULL*/ )
 {
     WorldPacket data(SMSG_PLAY_SOUND, 4);
@@ -2228,12 +1902,10 @@ void WorldObject::PlayDirectSound( uint32 sound_id, Player* target /*= NULL*/ )
     else
         SendMessageToSet( &data, true );
 }
-
 void WorldObject::DestroyForNearbyPlayers()
 {
     if(!IsInWorld())
         return;
-
     std::list<Unit*> targets;
     Trinity::AnyUnitInObjectRangeCheck check(this, GetMap()->GetVisibilityDistance());
     Trinity::UnitListSearcher<Trinity::AnyUnitInObjectRangeCheck> searcher(this, targets, check);
@@ -2243,17 +1915,13 @@ void WorldObject::DestroyForNearbyPlayers()
         Player *plr = dynamic_cast<Player*>(*iter);
         if(!plr)
             continue;
-
         if(plr == this)
             continue;
-
         if(!plr->HaveAtClient(this))
             continue;
-
         if(isType(TYPEMASK_UNIT) && ((Unit*)this)->GetCharmerGUID() == plr->GetGUID()) // TODO: this is for puppet
             continue;
-         
-        DestroyForPlayer(plr);            
-        plr->m_clientGUIDs.erase(GetGUID());       
+        DestroyForPlayer(plr);
+        plr->m_clientGUIDs.erase(GetGUID());
     }
 }
diff --git a/src/game/Object.h b/src/game/Object.h
index 9845ba10dce..96d3252dc5d 100644
--- a/src/game/Object.h
+++ b/src/game/Object.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _OBJECT_H
 #define _OBJECT_H
-
 #include "Common.h"
 #include "UpdateFields.h"
 #include "UpdateData.h"
@@ -28,10 +26,8 @@
 #include "ObjectDefines.h"
 #include "GridDefines.h"
 #include "Map.h"
-
 #include <set>
 #include <string>
-
 #define CONTACT_DISTANCE            0.5f
 #define INTERACTION_DISTANCE        5.0f
 #define ATTACK_DISTANCE             5.0f
@@ -39,13 +35,11 @@
 #define DEFAULT_VISIBILITY_DISTANCE 90.0f // default visible distance, 90 yards on continents
 #define DEFAULT_VISIBILITY_INSTANCE 120.0f // default visible distance in instances, 120 yards
 #define DEFAULT_VISIBILITY_BGARENAS 180.0f // default visible distance in BG/Arenas, 180 yards
-
 #define DEFAULT_WORLD_OBJECT_SIZE   0.388999998569489f      // player size, also currently used (correctly?) for any non Unit world objects
 #define DEFAULT_COMBAT_REACH        1.5f
 #define MIN_MELEE_REACH             2.0f
 #define NOMINAL_MELEE_RANGE         5.0f
 #define MELEE_RANGE                 (NOMINAL_MELEE_RANGE - MIN_MELEE_REACH * 2) //center to center for players
-
 enum TypeMask
 {
     TYPEMASK_OBJECT         = 0x0001,
@@ -58,7 +52,6 @@ enum TypeMask
     TYPEMASK_CORPSE         = 0x0080,
     TYPEMASK_SEER           = TYPEMASK_UNIT | TYPEMASK_DYNAMICOBJECT
 };
-
 enum TypeID
 {
     TYPEID_OBJECT        = 0,
@@ -70,11 +63,8 @@ enum TypeID
     TYPEID_DYNAMICOBJECT = 6,
     TYPEID_CORPSE        = 7
 };
-
 #define NUM_CLIENT_OBJECT_TYPES             8
-
 uint32 GuidHigh2TypeId(uint32 guid_hi);
-
 enum TempSummonType
 {
     TEMPSUMMON_TIMED_OR_DEAD_DESPAWN       = 1,             // despawns after a specified time OR when the creature disappears
@@ -86,13 +76,11 @@ enum TempSummonType
     TEMPSUMMON_DEAD_DESPAWN                = 7,             // despawns when the creature disappears
     TEMPSUMMON_MANUAL_DESPAWN              = 8              // despawns when UnSummon() is called
 };
-
 enum PhaseMasks
 {
     PHASEMASK_NORMAL   = 0x00000001,
     PHASEMASK_ANYWHERE = 0xFFFFFFFF
 };
-
 class WorldPacket;
 class UpdateData;
 class ByteBuffer;
@@ -107,24 +95,18 @@ class Vehicle;
 class CreatureAI;
 class ZoneScript;
 class Unit;
-
 typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType;
-
 class TRINITY_DLL_SPEC Object
 {
     public:
         virtual ~Object ( );
-
         const bool IsInWorld() const { return m_inWorld; }
         virtual void AddToWorld()
         {
             if(m_inWorld)
                 return;
-
             assert(m_uint32Values);
-
             m_inWorld = true;
-
             // synchronize values mirror with values array (changes will send in updatecreate opcode any way
             ClearUpdateMask(true);
         }
@@ -132,13 +114,10 @@ class TRINITY_DLL_SPEC Object
         {
             if(!m_inWorld)
                 return;
-
             m_inWorld = false;
-
             // if we remove from world then sending changes not required
             ClearUpdateMask(true);
         }
-
         const uint64& GetGUID() const { return GetUInt64Value(0); }
         uint32 GetGUIDLow() const { return GUID_LOPART(GetUInt64Value(0)); }
         uint32 GetGUIDMid() const { return GUID_ENPART(GetUInt64Value(0)); }
@@ -146,58 +125,47 @@ class TRINITY_DLL_SPEC Object
         const ByteBuffer& GetPackGUID() const { return m_PackGUID; }
         uint32 GetEntry() const { return GetUInt32Value(OBJECT_FIELD_ENTRY); }
         void SetEntry(uint32 entry) { SetUInt32Value(OBJECT_FIELD_ENTRY, entry); }
-
         TypeID GetTypeId() const { return m_objectTypeId; }
         bool isType(uint16 mask) const { return (mask & m_objectType); }
-
         virtual void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
         void SendUpdateToPlayer(Player* player);
-
         void BuildValuesUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
         void BuildOutOfRangeUpdateBlock( UpdateData *data ) const;
         void BuildMovementUpdateBlock( UpdateData * data, uint32 flags = 0 ) const;
         void BuildUpdate(UpdateDataMapType &);
-
         virtual void DestroyForPlayer( Player *target, bool anim = false ) const;
-
         const int32& GetInt32Value( uint16 index ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false) );
             return m_int32Values[ index ];
         }
-
         const uint32& GetUInt32Value( uint16 index ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false) );
             return m_uint32Values[ index ];
         }
-
         const uint64& GetUInt64Value( uint16 index ) const
         {
             ASSERT( index + 1 < m_valuesCount || PrintIndexError( index , false) );
             return *((uint64*)&(m_uint32Values[ index ]));
         }
-
         const float& GetFloatValue( uint16 index ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false ) );
             return m_floatValues[ index ];
         }
-
         uint8 GetByteValue( uint16 index, uint8 offset) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false) );
             ASSERT( offset < 4 );
             return *(((uint8*)&m_uint32Values[ index ])+offset);
         }
-
         uint16 GetUInt16Value( uint16 index, uint8 offset) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false) );
             ASSERT( offset < 2 );
             return *(((uint16*)&m_uint32Values[ index ])+offset);
         }
-
         void SetInt32Value(  uint16 index,        int32  value );
         void SetUInt32Value( uint16 index,       uint32  value );
         void UpdateUInt32Value( uint16 index,       uint32  value );
@@ -208,25 +176,20 @@ class TRINITY_DLL_SPEC Object
         void SetInt16Value(  uint16 index, uint8 offset, int16 value ) { SetUInt16Value(index,offset,(uint16)value); }
         void SetStatFloatValue( uint16 index, float value);
         void SetStatInt32Value( uint16 index, int32 value);
-
         bool AddUInt64Value( uint16 index, const uint64 &value );
         bool RemoveUInt64Value( uint16 index, const uint64 &value );
-
         void ApplyModUInt32Value(uint16 index, int32 val, bool apply);
         void ApplyModInt32Value(uint16 index, int32 val, bool apply);
         void ApplyModUInt64Value(uint16 index, int32 val, bool apply);
         void ApplyModPositiveFloatValue( uint16 index, float val, bool apply);
         void ApplyModSignedFloatValue( uint16 index, float val, bool apply);
-
         void ApplyPercentModFloatValue(uint16 index, float val, bool apply)
         {
             val = val != -100.0f ? val : -99.9f ;
             SetFloatValue(index, GetFloatValue(index) * (apply?(100.0f+val)/100.0f : 100.0f / (100.0f+val)) );
         }
-
         void SetFlag( uint16 index, uint32 newFlag );
         void RemoveFlag( uint16 index, uint32 oldFlag );
-
         void ToggleFlag( uint16 index, uint32 flag)
         {
             if(HasFlag(index, flag))
@@ -234,16 +197,13 @@ class TRINITY_DLL_SPEC Object
             else
                 SetFlag(index, flag);
         }
-
         bool HasFlag( uint16 index, uint32 flag ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false ) );
             return (m_uint32Values[ index ] & flag) != 0;
         }
-
         void SetByteFlag( uint16 index, uint8 offset, uint8 newFlag );
         void RemoveByteFlag( uint16 index, uint8 offset, uint8 newFlag );
-
         void ToggleFlag( uint16 index, uint8 offset, uint8 flag )
         {
             if(HasByteFlag(index, offset, flag))
@@ -251,33 +211,28 @@ class TRINITY_DLL_SPEC Object
             else
                 SetByteFlag(index, offset, flag);
         }
-
         bool HasByteFlag( uint16 index, uint8 offset, uint8 flag ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false ) );
             ASSERT( offset < 4 );
             return (((uint8*)&m_uint32Values[index])[offset] & flag) != 0;
         }
-
         void ApplyModFlag( uint16 index, uint32 flag, bool apply)
         {
             if(apply) SetFlag(index,flag); else RemoveFlag(index,flag);
         }
-
         void SetFlag64( uint16 index, uint64 newFlag )
         {
             uint64 oldval = GetUInt64Value(index);
             uint64 newval = oldval | newFlag;
             SetUInt64Value(index,newval);
         }
-
         void RemoveFlag64( uint16 index, uint64 oldFlag )
         {
             uint64 oldval = GetUInt64Value(index);
             uint64 newval = oldval & ~oldFlag;
             SetUInt64Value(index,newval);
         }
-
         void ToggleFlag64( uint16 index, uint64 flag)
         {
             if(HasFlag64(index, flag))
@@ -285,80 +240,57 @@ class TRINITY_DLL_SPEC Object
             else
                 SetFlag64(index, flag);
         }
-
         bool HasFlag64( uint16 index, uint64 flag ) const
         {
             ASSERT( index < m_valuesCount || PrintIndexError( index , false ) );
             return (GetUInt64Value( index ) & flag) != 0;
         }
-
         void ApplyModFlag64( uint16 index, uint64 flag, bool apply)
         {
             if(apply) SetFlag64(index,flag); else RemoveFlag64(index,flag);
         }
-
         void ClearUpdateMask(bool remove);
         void SendUpdateObjectToAllExcept(Player* exceptPlayer);
-
         bool LoadValues(const char* data);
-
         uint16 GetValuesCount() const { return m_valuesCount; }
-
         virtual bool hasQuest(uint32 /* quest_id */) const { return false; }
         virtual bool hasInvolvedQuest(uint32 /* quest_id */) const { return false; }
-
         // FG: some hacky helpers
         void ForceValuesUpdateAtIndex(uint32);
-
     protected:
-
         Object ( );
-
         void _InitValues();
         void _Create (uint32 guidlow, uint32 entry, HighGuid guidhigh);
-
         virtual void _SetUpdateBits(UpdateMask *updateMask, Player *target) const;
-
         virtual void _SetCreateBits(UpdateMask *updateMask, Player *target) const;
         void _BuildMovementUpdate(ByteBuffer * data, uint16 flags) const;
         void _BuildValuesUpdate(uint8 updatetype, ByteBuffer *data, UpdateMask *updateMask, Player *target ) const;
-
         uint16 m_objectType;
-
         TypeID m_objectTypeId;
         uint16 m_updateFlag;
-
         union
         {
             int32  *m_int32Values;
             uint32 *m_uint32Values;
             float  *m_floatValues;
         };
-
         uint32 *m_uint32Values_mirror;
-
         uint16 m_valuesCount;
-
         bool m_objectUpdated;
-
     private:
         bool m_inWorld;
-
         ByteBuffer m_PackGUID;
-
         // for output helpfull error messages from asserts
         bool PrintIndexError(uint32 index, bool set) const;
         Object(const Object&);                              // prevent generation copy constructor
         Object& operator=(Object const&);                   // prevent generation assigment operator
 };
-
 struct TRINITY_DLL_SPEC Position
 {
     float m_positionX;
     float m_positionY;
     float m_positionZ;
     float m_orientation;
-
     void Relocate(float x, float y)
         { m_positionX = x; m_positionY = y;}
     void Relocate(float x, float y, float z)
@@ -371,12 +303,10 @@ struct TRINITY_DLL_SPEC Position
         { m_positionX = pos->m_positionX; m_positionY = pos->m_positionY; m_positionZ = pos->m_positionZ; m_orientation = pos->m_orientation; }
     void SetOrientation(float orientation)
         { m_orientation = orientation; }
-
     float GetPositionX() const { return m_positionX; }
     float GetPositionY() const { return m_positionY; }
     float GetPositionZ() const { return m_positionZ; }
     float GetOrientation() const { return m_orientation; }
-
     void GetPosition(float &x, float &y) const
         { x = m_positionX; y = m_positionY; }
     void GetPosition(float &x, float &y, float &z) const
@@ -385,9 +315,7 @@ struct TRINITY_DLL_SPEC Position
         { x = m_positionX; y = m_positionY; z = m_positionZ; o = m_orientation; }
     void GetPosition(Position *pos) const
         { pos->Relocate(m_positionX, m_positionY, m_positionZ, m_orientation); }
-
     bool IsPositionValid() const;
-
     float GetExactDist2dSq(float x, float y) const
         { float dx = m_positionX - x; float dy = m_positionY - y; return dx*dx + dy*dy; }
     float GetExactDist2d(const float x, const float y) const
@@ -404,12 +332,10 @@ struct TRINITY_DLL_SPEC Position
         { float dx = m_positionX - pos->m_positionX; float dy = m_positionY - pos->m_positionY; float dz = m_positionZ - pos->m_positionZ; return dx*dx + dy*dy + dz*dz; }
     float GetExactDist(const Position *pos) const
         { return sqrt(GetExactDistSq(pos)); }
-
     float GetAngle(const Position *pos) const;
     float GetAngle(float x, float y) const;
     float GetRelativeAngle(const Position *pos) const { return GetAngle(pos) - m_orientation; }
     void GetSinCos(float x, float y, float &vsin, float &vcos) const;
-
     bool IsInDist2d(float x, float y, float dist) const
         { return GetExactDist2dSq(x, y) < dist * dist; }
     bool IsInDist2d(const Position *pos, float dist) const
@@ -421,32 +347,24 @@ struct TRINITY_DLL_SPEC Position
     bool HasInArc(float arcangle, const Position *pos) const;
     bool HasInLine(const Unit *target, float distance, float width) const;
 };
-
 #define MAPID_INVALID 0xFFFFFFFF
-
 class WorldLocation : public Position
 {
     public:
         explicit WorldLocation(uint32 _mapid = MAPID_INVALID, float _x = 0, float _y = 0, float _z = 0, float _o = 0)
             : m_mapId(_mapid) { Relocate(_x, _y, _z, _o); }
         WorldLocation(const WorldLocation &loc) { WorldRelocate(loc); }
-
         void WorldRelocate(const WorldLocation &loc)
             { m_mapId = loc.GetMapId(); Relocate(loc); }
         uint32 GetMapId() const { return m_mapId; }
-
         uint32 m_mapId;
 };
-
 class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
 {
     public:
         virtual ~WorldObject();
-
         virtual void Update ( uint32 /*time_diff*/ ) { }
-
         void _Create( uint32 guidlow, HighGuid guidhigh, uint32 phaseMask);
-
         void GetNearPoint2D( float &x, float &y, float distance, float absAngle) const;
         void GetNearPoint( WorldObject const* searcher, float &x, float &y, float &z, float searcher_size, float distance2d,float absAngle) const;
         void GetClosePoint(float &x, float &y, float &z, float size, float distance2d = 0, float angle = 0) const
@@ -465,19 +383,16 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
             GetPosition(&pos);
             MovePosition(pos, radius * rand_norm(), rand_norm() * 2 * M_PI);
         }
-
         void GetContactPoint( const WorldObject* obj, float &x, float &y, float &z, float distance2d = CONTACT_DISTANCE) const
         {
             // angle to face `obj` to `this` using distance includes size of `obj`
             GetNearPoint(obj,x,y,z,obj->GetObjectSize(),distance2d,GetAngle( obj ));
         }
-
         float GetObjectSize() const
         {
             return ( m_valuesCount > UNIT_FIELD_COMBATREACH ) ? m_floatValues[UNIT_FIELD_COMBATREACH] : DEFAULT_WORLD_OBJECT_SIZE;
         }
         void UpdateGroundPositionZ(float x, float y, float &z) const;
-
         void GetRandomPoint(const Position &srcPos, float distance, float &rand_x, float &rand_y, float &rand_z) const;
         void GetRandomPoint(const Position &srcPos, float distance, Position &pos) const
         {
@@ -485,25 +400,18 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
             GetRandomPoint(srcPos, distance, x, y, z);
             pos.Relocate(x, y, z, GetOrientation());
         }
-
         uint32 GetInstanceId() const { return m_InstanceId; }
-
         virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
         uint32 GetPhaseMask() const { return m_phaseMask; }
         bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
         bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
-
         uint32 GetZoneId() const;
         uint32 GetAreaId() const;
         void GetZoneAndAreaId(uint32& zoneid, uint32& areaid) const;
-
         InstanceData* GetInstanceData();
-
         const char* GetName() const { return m_name.c_str(); }
         void SetName(const std::string& newname) { m_name=newname; }
-
         virtual const char* GetNameForLocaleIdx(int32 /*locale_idx*/) const { return GetName(); }
-
         float GetDistance(const WorldObject *obj) const
             { return GetExactDist(obj) + GetObjectSize() + obj->GetObjectSize(); }
         float GetDistance(const Position &pos) const
@@ -515,7 +423,6 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
         float GetDistance2d(float x, float y) const
             { return GetExactDist2d(x, y) + GetObjectSize(); }
         float GetDistanceZ(const WorldObject* obj) const;
-
         bool IsInMap(const WorldObject* obj) const
         {
             return IsInWorld() && obj->IsInWorld() && (GetMap() == obj->GetMap()) && InSamePhase(obj);
@@ -544,14 +451,10 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
         bool IsInRange(WorldObject const* obj, float minRange, float maxRange, bool is3D = true) const;
         bool IsInRange2d(float x, float y, float minRange, float maxRange) const;
         bool IsInRange3d(float x, float y, float z, float minRange, float maxRange) const;
-
         bool IsInBetween(const WorldObject *obj1, const WorldObject *obj2, float size = 0) const;
-
         virtual void CleanupsBeforeDelete();                // used in destructor or explicitly before mass creature delete to remove cross-references to already deleted units
-
         virtual void SendMessageToSet(WorldPacket *data, bool self);
         virtual void SendMessageToSetInRange(WorldPacket *data, float dist, bool self);
-
         void MonsterSay(const char* text, uint32 language, uint64 TargetGuid);
         void MonsterYell(const char* text, uint32 language, uint64 TargetGuid);
         void MonsterTextEmote(const char* text, uint64 TargetGuid, bool IsBossEmote = false);
@@ -562,36 +465,26 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
         void MonsterWhisper(int32 textId, uint64 receiver, bool IsBossWhisper = false);
         void MonsterYellToZone(int32 textId, uint32 language, uint64 TargetGuid);
         void BuildMonsterChat(WorldPacket *data, uint8 msgtype, char const* text, uint32 language, char const* name, uint64 TargetGuid) const;
-
         void PlayDistanceSound(uint32 sound_id, Player* target = NULL);
         void PlayDirectSound(uint32 sound_id, Player* target = NULL);
-
         void SendObjectDeSpawnAnim(uint64 guid);
-
         virtual void SaveRespawnTime() {}
         void AddObjectToRemoveList();
-
         // main visibility check function in normal case (ignore grey zone distance check)
         bool isVisibleFor(Player const* u) const { return isVisibleForInState(u,false); }
-
         // low level function for visibility change code, must be define in all main world object subclasses
         virtual bool isVisibleForInState(Player const* u, bool inVisibleList) const = 0;
-
         // Low Level Packets
         void SendPlaySound(uint32 Sound, bool OnlySelf);
-
         virtual void SetMap(Map * map);
         virtual void ResetMap();
         Map * GetMap() const { ASSERT(m_currMap); return m_currMap; }
         Map * FindMap() const { return m_currMap; }
         //used to check all object's GetMap() calls when object is not in world!
-
         //this function should be removed in nearest time...
         Map const* GetBaseMap() const;
-
         void SetZoneScript();
         ZoneScript * GetZoneScript() const { return m_zoneScript; }
-
         TempSummon* SummonCreature(uint32 id, const Position &pos, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0, uint32 vehId = 0) const;
         TempSummon* SummonCreature(uint32 id, float x, float y, float z, float ang = 0, TempSummonType spwtype = TEMPSUMMON_MANUAL_DESPAWN, uint32 despwtime = 0)
         {
@@ -605,22 +498,17 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
         }
         GameObject* SummonGameObject(uint32 entry, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime);
         Creature*   SummonTrigger(float x, float y, float z, float ang, uint32 dur, CreatureAI* (*GetAI)(Creature*) = NULL);
-
         Creature*   FindNearestCreature(uint32 entry, float range, bool alive = true);
         GameObject* FindNearestGameObject(uint32 entry, float range);
-
         void GetGameObjectListWithEntryInGrid(std::list<GameObject*>& lList, uint32 uiEntry, float fMaxSearchRange);
         void GetCreatureListWithEntryInGrid(std::list<Creature*>& lList, uint32 uiEntry, float fMaxSearchRange);
-
         void DestroyForNearbyPlayers();
-
         bool isActiveObject() const { return m_isActive; }
         void setActive(bool isActiveObject);
         void SetWorldObject(bool apply);
         template<class NOTIFIER> void VisitNearbyObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitAll(GetPositionX(), GetPositionY(), radius, notifier); }
         template<class NOTIFIER> void VisitNearbyGridObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitGrid(GetPositionX(), GetPositionY(), radius, notifier); }
         template<class NOTIFIER> void VisitNearbyWorldObject(const float &radius, NOTIFIER &notifier) const { GetMap()->VisitWorld(GetPositionX(), GetPositionY(), radius, notifier); }
-
 #ifdef MAP_BASED_RAND_GEN
         int32 irand(int32 min, int32 max) const     { return int32 (GetMap()->mtRand.randInt(max - min)) + min; }
         uint32 urand(uint32 min, uint32 max) const  { return GetMap()->mtRand.randInt(max - min) + min;}
@@ -628,23 +516,19 @@ class TRINITY_DLL_SPEC WorldObject : public Object, public WorldLocation
         double rand_norm() const                    { return GetMap()->mtRand.randExc();}
         double rand_chance() const                  { return GetMap()->mtRand.randExc(100.0);}
 #endif
-
         bool m_isWorldObject;
     protected:
         explicit WorldObject();
         std::string m_name;
         bool m_isActive;
         ZoneScript *m_zoneScript;
-
         //these functions are used mostly for Relocate() and Corpse/Player specific stuff...
         //use them ONLY in LoadFromDB()/Create() funcs and nowhere else!
         //mapId/instanceId should be set in SetMap() function!
         void SetLocationMapId(uint32 _mapId) { m_mapId = _mapId; }
         void SetLocationInstanceId(uint32 _instanceId) { m_InstanceId = _instanceId; }
-
     private:
         Map * m_currMap;                                    //current object's Map location
-
         //uint32 m_mapId;                                     // object at map with map_id
         uint32 m_InstanceId;                                // in map copy with instance id
         uint32 m_phaseMask;                                 // in area phase state
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 7a12b4784e4..2603431d513 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Policies/SingletonImp.h"
@@ -38,46 +37,36 @@
 #include "ObjectDefines.h"
 #include "MapInstanced.h"
 #include "World.h"
-
 #include <cmath>
-
 #define CLASS_LOCK MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex>
 INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
 INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
-
 ObjectAccessor::ObjectAccessor() {}
 ObjectAccessor::~ObjectAccessor()
 {
     for(Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr)
         delete itr->second;
 }
-
 Creature*
 ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid)
 {
     if(IS_PLAYER_GUID(guid))
         return NULL;
-
     if(IS_PET_GUID(guid))
         return GetPet(guid);
-
     return u.IsInWorld() ? u.GetMap()->GetCreature(guid) : NULL;
 }
-
 /*
 Unit*
 ObjectAccessor::GetUnit(WorldObject const &u, uint64 guid)
 {
     if(!guid)
         return NULL;
-
     if(IS_PLAYER_GUID(guid))
         return FindPlayer(guid);
-
     return GetCreatureOrPetOrVehicle(u, guid);
 }
 */
-
 Corpse*
 ObjectAccessor::GetCorpse(WorldObject const &u, uint64 guid)
 {
@@ -90,7 +79,6 @@ ObjectAccessor::GetCorpse(WorldObject const &u, uint64 guid)
         return NULL;
     return ret;
 }
-
 WorldObject* ObjectAccessor::GetWorldObject(WorldObject const &p, uint64 guid)
 {
     switch(GUID_HIPART(guid))
@@ -106,10 +94,8 @@ WorldObject* ObjectAccessor::GetWorldObject(WorldObject const &p, uint64 guid)
         case HIGHGUID_MO_TRANSPORT: return NULL;
         default: break;
     }
-
     return NULL;
 }
-
 Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const &p, uint64 guid, uint32 typemask)
 {
     switch(GUID_HIPART(guid))
@@ -144,20 +130,16 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const &p, uint64 guid, u
         case HIGHGUID_MO_TRANSPORT:
             break;
     }
-
     return NULL;
 }
-
 Player*
 ObjectAccessor::FindPlayer(uint64 guid)
 {
     Player * plr = GetObjectInWorld(guid, (Player*)NULL);
     if(!plr || !plr->IsInWorld())
         return NULL;
-
     return plr;
 }
-
 Player*
 ObjectAccessor::FindPlayerByName(const char *name)
 {
@@ -169,7 +151,6 @@ ObjectAccessor::FindPlayerByName(const char *name)
             return iter->second;
     return NULL;
 }
-
 void
 ObjectAccessor::SaveAllPlayers()
 {
@@ -179,25 +160,21 @@ ObjectAccessor::SaveAllPlayers()
     for(; itr != m.end(); ++itr)
         itr->second->SaveToDB();
 }
-
 void
 ObjectAccessor::UpdateObject(Object* obj, Player* exceptPlayer)
 {
     UpdateDataMapType update_players;
     obj->BuildUpdate(update_players);
-
     WorldPacket packet;
     for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter)
     {
         if(iter->first == exceptPlayer)
             continue;
-
         iter->second.BuildPacket(&packet);
         iter->first->GetSession()->SendPacket(&packet);
         packet.clear();
     }
 }
-
 void
 ObjectAccessor::_buildUpdateObject(Object *obj, UpdateDataMapType &update_players)
 {
@@ -209,22 +186,18 @@ ObjectAccessor::_buildUpdateObject(Object *obj, UpdateDataMapType &update_player
     else
         _buildChangeObjectForPlayer((WorldObject*)obj, update_players);
 }
-
 void
 ObjectAccessor::_buildPacket(Player *pl, Object *obj, UpdateDataMapType &update_players)
 {
     UpdateDataMapType::iterator iter = update_players.find(pl);
-
     if( iter == update_players.end() )
     {
         std::pair<UpdateDataMapType::iterator, bool> p = update_players.insert( UpdateDataValueType(pl, UpdateData()) );
         assert(p.second);
         iter = p.first;
     }
-
     obj->BuildValuesUpdateBlockForPlayer(&iter->second, iter->first);
 }
-
 void
 ObjectAccessor::_buildChangeObjectForPlayer(WorldObject *obj, UpdateDataMapType &update_players)
 {
@@ -239,66 +212,50 @@ ObjectAccessor::_buildChangeObjectForPlayer(WorldObject *obj, UpdateDataMapType
     //we must build packets for all visible players
     cell_lock->Visit(cell_lock, player_notifier, map, *obj, map.GetVisibilityDistance());
 }
-
 Pet*
 ObjectAccessor::GetPet(uint64 guid)
 {
     return GetObjectInWorld(guid, (Pet*)NULL);
 }
-
 Corpse*
 ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid)
 {
     Guard guard(i_corpseGuard);
-
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid);
     if( iter == i_player2corpse.end() ) return NULL;
-
     assert(iter->second->GetType() != CORPSE_BONES);
-
     return iter->second;
 }
-
 void
 ObjectAccessor::RemoveCorpse(Corpse *corpse)
 {
     assert(corpse && corpse->GetType() != CORPSE_BONES);
-
     if(corpse->FindMap())
         corpse->FindMap()->Remove(corpse, false);
     else
         corpse->RemoveFromWorld();
-
     Guard guard(i_corpseGuard);
     Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID());
     if( iter == i_player2corpse.end() ) // i do not know when it happens but it happens
         return;
-
     // build mapid*cellid -> guid_set map
     CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY());
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
     objmgr.DeleteCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID());
-
     i_player2corpse.erase(iter);
 }
-
 void
 ObjectAccessor::AddCorpse(Corpse *corpse)
 {
     assert(corpse && corpse->GetType() != CORPSE_BONES);
-
     Guard guard(i_corpseGuard);
     assert(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end());
     i_player2corpse[corpse->GetOwnerGUID()] = corpse;
-
     // build mapid*cellid -> guid_set map
     CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY());
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
     objmgr.AddCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID(), corpse->GetInstanceId());
 }
-
 void
 ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map)
 {
@@ -320,7 +277,6 @@ ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* ma
         }
     }
 }
-
 Corpse*
 ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
 {
@@ -332,24 +288,18 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
         //sLog.outError("Try remove corpse that not in map for GUID %ul", player_guid);
         return NULL;
     }
-
     DEBUG_LOG("Deleting Corpse and spawning bones.");
-
     Map *map = corpse->FindMap();
-
     // remove corpse from player_guid -> corpse map
     RemoveCorpse(corpse);
-
     // done in removecorpse
     // remove resurrectable corpse from grid object registry (loaded state checked into call)
     // do not load the map if it's not loaded
     //Map *map = MapManager::Instance().FindMap(corpse->GetMapId(), corpse->GetInstanceId());
     //if(map)
     //    map->Remove(corpse, false);
-
     // remove corpse from DB
     corpse->DeleteFromDB();
-
     Corpse *bones = NULL;
     // create the bones only if the map and the grid is loaded at the corpse's location
     // ignore bones creating option in case insignia
@@ -360,36 +310,28 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
         // Create bones, don't change Corpse
         bones = new Corpse;
         bones->Create(corpse->GetGUIDLow(), map);
-
         for (int i = 3; i < CORPSE_END; ++i)                    // don't overwrite guid and object type
             bones->SetUInt32Value(i, corpse->GetUInt32Value(i));
-
         bones->SetGrid(corpse->GetGrid());
         // bones->m_time = m_time;                              // don't overwrite time
         // bones->m_inWorld = m_inWorld;                        // don't overwrite world state
         // bones->m_type = m_type;                              // don't overwrite type
         bones->Relocate(corpse->GetPositionX(), corpse->GetPositionY(), corpse->GetPositionZ(), corpse->GetOrientation());
         bones->SetPhaseMask(corpse->GetPhaseMask(), false);
-
         bones->SetUInt32Value(CORPSE_FIELD_FLAGS, CORPSE_FLAG_UNK2 | CORPSE_FLAG_BONES);
         bones->SetUInt64Value(CORPSE_FIELD_OWNER, 0);
-
         for (int i = 0; i < EQUIPMENT_SLOT_END; ++i)
         {
             if(corpse->GetUInt32Value(CORPSE_FIELD_ITEM + i))
                 bones->SetUInt32Value(CORPSE_FIELD_ITEM + i, 0);
         }
-
         // add bones in grid store if grid loaded where corpse placed
         map->Add(bones);
     }
-
     // all references to the corpse should be removed at this point
     delete corpse;
-
     return bones;
 }
-
 void
 ObjectAccessor::Update(uint32 diff)
 {
@@ -405,7 +347,6 @@ ObjectAccessor::Update(uint32 diff)
             obj->ClearUpdateMask(false);
         }
     }
-
     WorldPacket packet;                                     // here we allocate a std::vector with a size of 0x10000
     for(UpdateDataMapType::iterator iter = update_players.begin(); iter != update_players.end(); ++iter)
     {
@@ -414,7 +355,6 @@ ObjectAccessor::Update(uint32 diff)
         packet.clear();                                     // clean the string
     }
 }
-
 void
 ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m)
 {
@@ -429,7 +369,6 @@ ObjectAccessor::WorldObjectChangeAccumulator::Visit(PlayerMapType &m)
         }
     }
 }
-
 void
 ObjectAccessor::WorldObjectChangeAccumulator::Visit(CreatureMapType &m)
 {
@@ -443,7 +382,6 @@ ObjectAccessor::WorldObjectChangeAccumulator::Visit(CreatureMapType &m)
         }
     }
 }
-
 void
 ObjectAccessor::WorldObjectChangeAccumulator::Visit(DynamicObjectMapType &m)
 {
@@ -459,7 +397,6 @@ ObjectAccessor::WorldObjectChangeAccumulator::Visit(DynamicObjectMapType &m)
         }
     }
 }
-
 void
 ObjectAccessor::WorldObjectChangeAccumulator::BuildPacket(Player* plr)
 {
@@ -470,50 +407,39 @@ ObjectAccessor::WorldObjectChangeAccumulator::BuildPacket(Player* plr)
         plr_list.insert(plr->GetGUID());
     }
 }
-
 void
 ObjectAccessor::UpdateObjectVisibility(WorldObject *obj)
 {
     CellPair p = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
     Cell cell(p);
-
     obj->GetMap()->UpdateObjectVisibility(obj, cell, p);
 }
-
 /*void ObjectAccessor::UpdateVisibilityForPlayer( Player* player )
 {
     WorldObject const* viewPoint = player->GetViewPoint();
     Map* m = player->GetMap();
-
     CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
     Cell cell(p);
-
     m->UpdatePlayerVisibility(player, cell, p);
     if (player!=viewPoint)
     {
         CellPair pView(Trinity::ComputeCellPair(viewPoint->GetPositionX(), viewPoint->GetPositionY()));
         Cell cellView(pView);
-
         m->UpdateObjectsVisibilityFor(player, cellView, pView);
     }
     else
         m->UpdateObjectsVisibilityFor(player, cell, p);
 }*/
-
 /// Define the static member of HashMapHolder
-
 template <class T> UNORDERED_MAP< uint64, T* > HashMapHolder<T>::m_objectMap;
 template <class T> ACE_Thread_Mutex HashMapHolder<T>::i_lock;
-
 /// Global definitions for the hashmap storage
-
 template class HashMapHolder<Player>;
 template class HashMapHolder<Pet>;
 template class HashMapHolder<GameObject>;
 template class HashMapHolder<DynamicObject>;
 template class HashMapHolder<Creature>;
 template class HashMapHolder<Corpse>;
-
 template Player* ObjectAccessor::GetObjectInWorld<Player>(uint32 mapid, float x, float y, uint64 guid, Player* /*fake*/);
 template Pet* ObjectAccessor::GetObjectInWorld<Pet>(uint32 mapid, float x, float y, uint64 guid, Pet* /*fake*/);
 template Creature* ObjectAccessor::GetObjectInWorld<Creature>(uint32 mapid, float x, float y, uint64 guid, Creature* /*fake*/);
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index 655b44b98f2..fb465e7d2ba 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -17,24 +17,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef TRINITY_OBJECTACCESSOR_H
 #define TRINITY_OBJECTACCESSOR_H
-
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include <ace/Thread_Mutex.h>
 #include "Utilities/UnorderedMap.h"
 #include "Policies/ThreadingModel.h"
-
 #include "UpdateData.h"
-
 #include "GridDefines.h"
 #include "Object.h"
 #include "Player.h"
-
 #include <set>
-
 class Creature;
 class Corpse;
 class Unit;
@@ -42,124 +36,97 @@ class GameObject;
 class DynamicObject;
 class WorldObject;
 class Map;
-
 template <class T>
 class HashMapHolder
 {
     public:
-
         typedef UNORDERED_MAP< uint64, T* >   MapType;
         typedef ACE_Thread_Mutex LockType;
         typedef MaNGOS::GeneralLock<LockType > Guard;
-
         static void Insert(T* o) { m_objectMap[o->GetGUID()] = o; }
-
         static void Remove(T* o)
         {
             Guard guard(i_lock);
             m_objectMap.erase(o->GetGUID());
         }
-
         static T* Find(uint64 guid)
         {
             typename MapType::iterator itr = m_objectMap.find(guid);
             return (itr != m_objectMap.end()) ? itr->second : NULL;
         }
-
         static MapType& GetContainer() { return m_objectMap; }
-
         static LockType* GetLock() { return &i_lock; }
     private:
-
         //Non instanceable only static
         HashMapHolder() {}
-
         static LockType i_lock;
         static MapType  m_objectMap;
 };
-
 class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
 {
-
     friend class Trinity::OperatorNew<ObjectAccessor>;
     ObjectAccessor();
     ~ObjectAccessor();
     ObjectAccessor(const ObjectAccessor &);
     ObjectAccessor& operator=(const ObjectAccessor &);
-
     public:
         typedef UNORDERED_MAP<uint64, Corpse* >      Player2CorpsesMapType;
         typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType;
-
         template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/)
         {
             return HashMapHolder<T>::Find(guid);
         }
-
         static Unit* GetObjectInWorld(uint64 guid, Unit* /*fake*/)
         {
             if(!guid)
                 return NULL;
-
             if (IS_PLAYER_GUID(guid))
             {
                 Unit * u = (Unit*)HashMapHolder<Player>::Find(guid);
                 if(!u || !u->IsInWorld())
                     return NULL;
-
                 return u;
             }
-
             if(IS_PET_GUID(guid))
                 return (Unit*)HashMapHolder<Pet>::Find(guid);
-
             return (Unit*)HashMapHolder<Creature>::Find(guid);
         }
-
         static Unit* GetUnitInOrOutOfWorld(uint64 guid, Unit* /*fake*/)
         {
             if(!guid)
                 return NULL;
-
             if (IS_PLAYER_GUID(guid))
             {
                 Unit * u = (Unit*)HashMapHolder<Player>::Find(guid);
                 if(!u)
                     return NULL;
-
                 return u;
             }
             // Other object types than player are unloaded while out of world
             return GetObjectInWorld(guid, ((Unit*)NULL));
         }
 
-
         template<class T> static T* GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/)
         {
             T* obj = HashMapHolder<T>::Find(guid);
             if(!obj || obj->GetMapId() != mapid) return NULL;
-
             CellPair p = Trinity::ComputeCellPair(x,y);
             if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
             {
                 sLog.outError("ObjectAccessor::GetObjectInWorld: invalid coordinates supplied X:%f Y:%f grid cell [%u:%u]", x, y, p.x_coord, p.y_coord);
                 return NULL;
             }
-
             CellPair q = Trinity::ComputeCellPair(obj->GetPositionX(),obj->GetPositionY());
             if(q.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || q.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
             {
                 sLog.outError("ObjectAccessor::GetObjecInWorld: object (GUID: %u TypeId: %u) has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), q.x_coord, q.y_coord);
                 return NULL;
             }
-
             int32 dx = int32(p.x_coord) - int32(q.x_coord);
             int32 dy = int32(p.y_coord) - int32(q.y_coord);
-
             if (dx > -2 && dx < 2 && dy > -2 && dy < 2) return obj;
             else return NULL;
         }
-
         static WorldObject* GetWorldObject(WorldObject const &, uint64);
         static Object*   GetObjectByTypeMask(WorldObject const &, uint64, uint32 typemask);
         static Creature* GetCreatureOrPetOrVehicle(WorldObject const &, uint64);
@@ -170,67 +137,52 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
         static Corpse* GetCorpse(WorldObject const &u, uint64 guid);
         static Pet* GetPet(uint64 guid);
         static Player* FindPlayer(uint64);
-
         Player* FindPlayerByName(const char *name) ;
-
         HashMapHolder<Player>::MapType& GetPlayers()
         {
             return HashMapHolder<Player>::GetContainer();
         }
-
         HashMapHolder<Creature>::MapType& GetCreatures()
         {
             return HashMapHolder<Creature>::GetContainer();
         }
-
         HashMapHolder<GameObject>::MapType& GetGameObjects()
         {
             return HashMapHolder<GameObject>::GetContainer();
         }
-
         template<class T> void AddObject(T *object)
         {
             HashMapHolder<T>::Insert(object);
         }
-
         template<class T> void RemoveObject(T *object)
         {
             HashMapHolder<T>::Remove(object);
         }
-
         void RemoveObject(Player *pl)
         {
             HashMapHolder<Player>::Remove(pl);
-
             Guard guard(i_updateGuard);
             i_objects.erase((Object *)pl);
         }
-
         void SaveAllPlayers();
-
         void AddUpdateObject(Object *obj)
         {
             Guard guard(i_updateGuard);
             i_objects.insert(obj);
         }
-
         void RemoveUpdateObject(Object *obj)
         {
             Guard guard(i_updateGuard);
             i_objects.erase( obj );
         }
-
         void Update(uint32 diff);
-
         Corpse* GetCorpseForPlayerGUID(uint64 guid);
         void RemoveCorpse(Corpse *corpse);
         void AddCorpse(Corpse *corpse);
         void AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map);
         Corpse* ConvertCorpseForPlayer(uint64 player_guid, bool insignia = false);
-
         static void UpdateObject(Object* obj, Player* exceptPlayer);
         static void _buildUpdateObject(Object* obj, UpdateDataMapType &);
-
         static void UpdateObjectVisibility(WorldObject* obj);
         //static void UpdateVisibilityForPlayer(Player* player);
     private:
@@ -246,13 +198,10 @@ class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor,
             void BuildPacket(Player* plr);
             template<class SKIP> void Visit(GridRefManager<SKIP> &) {}
         };
-
         friend struct WorldObjectChangeAccumulator;
         Player2CorpsesMapType   i_player2corpse;
-
         typedef ACE_Thread_Mutex LockType;
         typedef MaNGOS::GeneralLock<LockType > Guard;
-
         static void _buildChangeObjectForPlayer(WorldObject *, UpdateDataMapType &);
         static void _buildPacket(Player *, Object *, UpdateDataMapType &);
         void _update(void);
diff --git a/src/game/ObjectDefines.h b/src/game/ObjectDefines.h
index 6a2eb7906eb..be6bd7ce369 100644
--- a/src/game/ObjectDefines.h
+++ b/src/game/ObjectDefines.h
@@ -17,21 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_OBJECTDEFINES_H
 #define TRINITY_OBJECTDEFINES_H
-
 #include "Platform/Define.h"
-
 // used for creating values for respawn for example
 #define MAKE_PAIR64(l, h)  uint64( uint32(l) | ( uint64(h) << 32 ) )
 #define PAIR64_HIPART(x)   (uint32)((uint64(x) >> 32) & UI64LIT(0x00000000FFFFFFFF))
 #define PAIR64_LOPART(x)   (uint32)(uint64(x)         & UI64LIT(0x00000000FFFFFFFF))
-
 #define MAKE_PAIR32(l, h)  uint32( uint16(l) | ( uint32(h) << 16 ) )
 #define PAIR32_HIPART(x)   (uint16)((uint32(x) >> 16) & 0x0000FFFF)
 #define PAIR32_LOPART(x)   (uint16)(uint32(x)         & 0x0000FFFF)
-
 enum HighGuid
 {
     HIGHGUID_ITEM           = 0x4000,                       // blizz 4000
@@ -46,9 +41,7 @@ enum HighGuid
     HIGHGUID_CORPSE         = 0xF101,                       // blizz F100
     HIGHGUID_MO_TRANSPORT   = 0x1FC0,                       // blizz 1FC0 (for GAMEOBJECT_TYPE_MO_TRANSPORT)
 };
-
 #define IS_EMPTY_GUID(Guid)          ( Guid == 0 )
-
 #define IS_CREATURE_GUID(Guid)       ( GUID_HIPART(Guid) == HIGHGUID_UNIT )
 #define IS_PET_GUID(Guid)            ( GUID_HIPART(Guid) == HIGHGUID_PET )
 #define IS_VEHICLE_GUID(Guid)        ( GUID_HIPART(Guid) == HIGHGUID_VEHICLE )
@@ -63,20 +56,16 @@ enum HighGuid
 #define IS_CORPSE_GUID(Guid)         ( GUID_HIPART(Guid) == HIGHGUID_CORPSE )
 #define IS_TRANSPORT(Guid)           ( GUID_HIPART(Guid) == HIGHGUID_TRANSPORT )
 #define IS_MO_TRANSPORT(Guid)        ( GUID_HIPART(Guid) == HIGHGUID_MO_TRANSPORT )
-
 // l - OBJECT_FIELD_GUID
 // e - OBJECT_FIELD_ENTRY for GO (except GAMEOBJECT_TYPE_MO_TRANSPORT) and creatures or UNIT_FIELD_PETNUMBER for pets
 // h - OBJECT_FIELD_GUID + 1
 #define MAKE_NEW_GUID(l, e, h)   uint64( uint64(l) | ( uint64(e) << 24 ) | ( uint64(h) << 48 ) )
-
 #define GUID_HIPART(x)   (uint32)((uint64(x) >> 48) & 0x0000FFFF)
-
 // We have different low and middle part size for different guid types
 #define _GUID_ENPART_2(x) 0
 #define _GUID_ENPART_3(x) (uint32)((uint64(x) >> 24) & UI64LIT(0x0000000000FFFFFF))
 #define _GUID_LOPART_2(x) (uint32)(uint64(x)         & UI64LIT(0x00000000FFFFFFFF))
 #define _GUID_LOPART_3(x) (uint32)(uint64(x)         & UI64LIT(0x0000000000FFFFFF))
-
 inline bool IsGuidHaveEnPart(uint64 const& guid)
 {
     switch(GUID_HIPART(guid))
@@ -96,10 +85,8 @@ inline bool IsGuidHaveEnPart(uint64 const& guid)
             return true;
     }
 }
-
 #define GUID_ENPART(x) (IsGuidHaveEnPart(x) ? _GUID_ENPART_3(x) : _GUID_ENPART_2(x))
 #define GUID_LOPART(x) (IsGuidHaveEnPart(x) ? _GUID_LOPART_3(x) : _GUID_LOPART_2(x))
-
 inline char const* GetLogNameForGuid(uint64 guid)
 {
     switch(GUID_HIPART(guid))
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp
index 6a11fe44f86..32b0a08e409 100644
--- a/src/game/ObjectGridLoader.cpp
+++ b/src/game/ObjectGridLoader.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ObjectGridLoader.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
@@ -29,25 +28,20 @@
 #include "World.h"
 #include "CellImpl.h"
 #include "CreatureAI.h"
-
 class TRINITY_DLL_DECL ObjectGridRespawnMover
 {
     public:
         ObjectGridRespawnMover() {}
-
         void Move(GridType &grid);
-
         template<class T> void Visit(GridRefManager<T> &) {}
         void Visit(CreatureMapType &m);
 };
-
 void
 ObjectGridRespawnMover::Move(GridType &grid)
 {
     TypeContainerVisitor<ObjectGridRespawnMover, GridTypeMapContainer > mover(*this);
     grid.Visit(mover);
 }
-
 void
 ObjectGridRespawnMover::Visit(CreatureMapType &m)
 {
@@ -58,16 +52,12 @@ ObjectGridRespawnMover::Visit(CreatureMapType &m)
     {
         Creature * c = iter->getSource();
         ++iter;
-
         assert(!c->isPet() && "ObjectGridRespawnMover don't must be called for pets");
-
         Cell const& cur_cell  = c->GetCurrentCell();
-
         float resp_x, resp_y, resp_z;
         c->GetRespawnCoord(resp_x, resp_y, resp_z);
         CellPair resp_val = Trinity::ComputeCellPair(resp_x, resp_y);
         Cell resp_cell(resp_val);
-
         if(cur_cell.DiffGrid(resp_cell))
         {
             c->GetMap()->CreatureRespawnRelocation(c);
@@ -75,7 +65,6 @@ ObjectGridRespawnMover::Visit(CreatureMapType &m)
         }
     }
 }
-
 // for loading world object at grid loading (Corpses)
 class ObjectWorldLoader
 {
@@ -83,11 +72,8 @@ class ObjectWorldLoader
         explicit ObjectWorldLoader(ObjectGridLoader& gloader)
             : i_cell(gloader.i_cell), i_grid(gloader.i_grid), i_map(gloader.i_map), i_corpses (0)
             {}
-
         void Visit(CorpseMapType &m);
-
         template<class T> void Visit(GridRefManager<T>&) { }
-
     private:
         Cell i_cell;
         NGridType &i_grid;
@@ -95,20 +81,16 @@ class ObjectWorldLoader
     public:
         uint32 i_corpses;
 };
-
 template<class T> void addUnitState(T* /*obj*/, CellPair const& /*cell_pair*/)
 {
 }
-
 template<> void addUnitState(Creature *obj, CellPair const& cell_pair)
 {
     Cell cell(cell_pair);
-
     obj->SetCurrentCell(cell);
     if(obj->isSpiritService())
         obj->setDeathState(DEAD);
 }
-
 template <class T>
 void AddObjectHelper(CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* map, T *obj)
 {
@@ -117,10 +99,8 @@ void AddObjectHelper(CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* m
     obj->AddToWorld();
     if(obj->isActiveObject())
         map->AddToActive(obj);
-
     ++count;
 }
-
 template <class T>
 void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> &m, uint32 &count, Map* map)
 {
@@ -134,37 +114,29 @@ void LoadHelper(CellGuidSet const& guid_set, CellPair &cell, GridRefManager<T> &
             delete obj;
             continue;
         }
-
         AddObjectHelper(cell, m, count, map, obj);
     }
 }
-
 void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType &m, uint32 &count, Map* map)
 {
     if(cell_corpses.empty())
         return;
-
     for(CellCorpseSet::const_iterator itr = cell_corpses.begin(); itr != cell_corpses.end(); ++itr)
     {
         if(itr->second != map->GetInstanceId())
             continue;
-
         uint32 player_guid = itr->first;
-
         Corpse *obj = ObjectAccessor::Instance().GetCorpseForPlayerGUID(player_guid);
         if(!obj)
             continue;
-
         // TODO: this is a hack
         // corpse's map should be reset when the map is unloaded
         // but it may still exist when the grid is unloaded but map is not
         // in that case map == currMap
         obj->SetMap(map);
-
         AddObjectHelper(cell, m, count, map, obj);
     }
 }
-
 void
 ObjectGridLoader::Visit(GameObjectMapType &m)
 {
@@ -172,12 +144,9 @@ ObjectGridLoader::Visit(GameObjectMapType &m)
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
     CellPair cell_pair(x,y);
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
     CellObjectGuids const& cell_guids = objmgr.GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id);
-
     LoadHelper(cell_guids.gameobjects, cell_pair, m, i_gameObjects, i_map);
 }
-
 void
 ObjectGridLoader::Visit(CreatureMapType &m)
 {
@@ -185,12 +154,9 @@ ObjectGridLoader::Visit(CreatureMapType &m)
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
     CellPair cell_pair(x,y);
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
     CellObjectGuids const& cell_guids = objmgr.GetCellObjectGuids(i_map->GetId(), i_map->GetSpawnMode(), cell_id);
-
     LoadHelper(cell_guids.creatures, cell_pair, m, i_creatures, i_map);
 }
-
 void
 ObjectWorldLoader::Visit(CorpseMapType &m)
 {
@@ -198,12 +164,10 @@ ObjectWorldLoader::Visit(CorpseMapType &m)
     uint32 y = (i_cell.GridY()*MAX_NUMBER_OF_CELLS) + i_cell.CellY();
     CellPair cell_pair(x,y);
     uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
     // corpses are always added to spawn mode 0 and they are spawned by their instance id
     CellObjectGuids const& cell_guids = objmgr.GetCellObjectGuids(i_map->GetId(), 0, cell_id);
     LoadHelper(cell_guids.corpses, cell_pair, m, i_corpses, i_map);
 }
-
 void
 ObjectGridLoader::Load(GridType &grid)
 {
@@ -211,7 +175,6 @@ ObjectGridLoader::Load(GridType &grid)
         TypeContainerVisitor<ObjectGridLoader, GridTypeMapContainer > loader(*this);
         grid.Visit(loader);
     }
-
     {
         ObjectWorldLoader wloader(*this);
         TypeContainerVisitor<ObjectWorldLoader, WorldTypeMapContainer > loader(wloader);
@@ -219,7 +182,6 @@ ObjectGridLoader::Load(GridType &grid)
         i_corpses = wloader.i_corpses;
     }
 }
-
 void ObjectGridLoader::LoadN(void)
 {
     i_gameObjects = 0; i_creatures = 0; i_corpses = 0;
@@ -236,7 +198,6 @@ void ObjectGridLoader::LoadN(void)
     }
     sLog.outDebug("%u GameObjects, %u Creatures, and %u Corpses/Bones loaded for grid %u on map %u", i_gameObjects, i_creatures, i_corpses,i_grid.GetGridId(), i_map->GetId());
 }
-
 void ObjectGridUnloader::MoveToRespawnN()
 {
     for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
@@ -248,14 +209,12 @@ void ObjectGridUnloader::MoveToRespawnN()
         }
     }
 }
-
 void
 ObjectGridUnloader::Unload(GridType &grid)
 {
     TypeContainerVisitor<ObjectGridUnloader, GridTypeMapContainer > unloader(*this);
     grid.Visit(unloader);
 }
-
 template<class T>
 void
 ObjectGridUnloader::Visit(GridRefManager<T> &m)
@@ -270,14 +229,12 @@ ObjectGridUnloader::Visit(GridRefManager<T> &m)
         delete obj;
     }
 }
-
 void
 ObjectGridStoper::Stop(GridType &grid)
 {
     TypeContainerVisitor<ObjectGridStoper, GridTypeMapContainer > stoper(*this);
     grid.Visit(stoper);
 }
-
 void
 ObjectGridStoper::Visit(CreatureMapType &m)
 {
@@ -293,21 +250,18 @@ ObjectGridStoper::Visit(CreatureMapType &m)
         }
     }
 }
-
 void
 ObjectGridCleaner::Stop(GridType &grid)
 {
     TypeContainerVisitor<ObjectGridCleaner, GridTypeMapContainer > stoper(*this);
     grid.Visit(stoper);
 }
-
 void
 ObjectGridCleaner::Visit(CreatureMapType &m)
 {
     for(CreatureMapType::iterator iter=m.begin(); iter != m.end(); ++iter)
         iter->getSource()->CleanupsBeforeDelete();
 }
-
 template<class T>
 void
 ObjectGridCleaner::Visit(GridRefManager<T> &m)
@@ -315,7 +269,6 @@ ObjectGridCleaner::Visit(GridRefManager<T> &m)
     for(typename GridRefManager<T>::iterator iter = m.begin(); iter != m.end(); ++iter)
         iter->getSource()->RemoveFromWorld();
 }
-
 template void ObjectGridUnloader::Visit(CreatureMapType &);
 template void ObjectGridUnloader::Visit(GameObjectMapType &);
 template void ObjectGridUnloader::Visit(DynamicObjectMapType &);
diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h
index 768f1f994db..f4d6eea1967 100644
--- a/src/game/ObjectGridLoader.h
+++ b/src/game/ObjectGridLoader.h
@@ -17,36 +17,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_OBJECTGRIDLOADER_H
 #define TRINITY_OBJECTGRIDLOADER_H
-
 #include "Utilities/TypeList.h"
 #include "Platform/Define.h"
 #include "GameSystem/GridLoader.h"
 #include "GridDefines.h"
 #include "Cell.h"
-
 class ObjectWorldLoader;
-
 class TRINITY_DLL_DECL ObjectGridLoader
 {
     friend class ObjectWorldLoader;
-
     public:
         ObjectGridLoader(NGridType &grid, Map* map, const Cell &cell)
             : i_cell(cell), i_grid(grid), i_map(map), i_gameObjects(0), i_creatures(0), i_corpses (0)
             {}
-
         void Load(GridType &grid);
         void Visit(GameObjectMapType &m);
         void Visit(CreatureMapType &m);
         void Visit(CorpseMapType &) {}
-
         void Visit(DynamicObjectMapType&) { }
-
         void LoadN(void);
-
     private:
         Cell i_cell;
         NGridType &i_grid;
@@ -55,12 +46,10 @@ class TRINITY_DLL_DECL ObjectGridLoader
         uint32 i_creatures;
         uint32 i_corpses;
 };
-
 class TRINITY_DLL_DECL ObjectGridUnloader
 {
     public:
         ObjectGridUnloader(NGridType &grid) : i_grid(grid) {}
-
         void MoveToRespawnN();
         void UnloadN()
         {
@@ -73,18 +62,15 @@ class TRINITY_DLL_DECL ObjectGridUnloader
                 }
             }
         }
-
         void Unload(GridType &grid);
         template<class T> void Visit(GridRefManager<T> &m);
     private:
         NGridType &i_grid;
 };
-
 class TRINITY_DLL_DECL ObjectGridStoper
 {
     public:
         ObjectGridStoper(NGridType &grid) : i_grid(grid) {}
-
         void StopN()
         {
             for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
@@ -96,20 +82,16 @@ class TRINITY_DLL_DECL ObjectGridStoper
                 }
             }
         }
-
         void Stop(GridType &grid);
         void Visit(CreatureMapType &m);
-
         template<class NONACTIVE> void Visit(GridRefManager<NONACTIVE> &) {}
     private:
         NGridType &i_grid;
 };
-
 class TRINITY_DLL_DECL ObjectGridCleaner
 {
     public:
         ObjectGridCleaner(NGridType &grid) : i_grid(grid) {}
-
         void CleanN()
         {
             for(unsigned int x=0; x < MAX_NUMBER_OF_CELLS; ++x)
@@ -121,14 +103,12 @@ class TRINITY_DLL_DECL ObjectGridCleaner
                 }
             }
         }
-
         void Stop(GridType &grid);
         void Visit(CreatureMapType &m);
         template<class T> void Visit(GridRefManager<T> &);
     private:
         NGridType &i_grid;
 };
-
 typedef GridLoader<Player, AllWorldObjectTypes, AllGridObjectTypes> GridLoaderType;
 #endif
 
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 588722213cb..3c6a361ff9e 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
 #include "Database/SQLStorageImpl.h"
 #include "Policies/SingletonImp.h"
-
 #include "Log.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
@@ -45,37 +43,28 @@
 #include "Util.h"
 #include "WaypointManager.h"
 #include "InstanceData.h" //for condition_instance_data
-
 INSTANTIATE_SINGLETON_1(ObjectMgr);
-
 ScriptMapMap sQuestEndScripts;
 ScriptMapMap sQuestStartScripts;
 ScriptMapMap sSpellScripts;
 ScriptMapMap sGameObjectScripts;
 ScriptMapMap sEventScripts;
 ScriptMapMap sWaypointScripts;
-
 bool normalizePlayerName(std::string& name)
 {
     if(name.empty())
         return false;
-
     wchar_t wstr_buf[MAX_INTERNAL_PLAYER_NAME+1];
     size_t wstr_len = MAX_INTERNAL_PLAYER_NAME;
-
     if(!Utf8toWStr(name,&wstr_buf[0],wstr_len))
         return false;
-
     wstr_buf[0] = wcharToUpper(wstr_buf[0]);
     for(size_t i = 1; i < wstr_len; ++i)
         wstr_buf[i] = wcharToLower(wstr_buf[i]);
-
     if(!WStrToUtf8(wstr_buf,wstr_len,name))
         return false;
-
     return true;
 }
-
 LanguageDesc lang_description[LANGUAGES_COUNT] =
 {
     { LANG_ADDON,           0, 0                       },
@@ -98,7 +87,6 @@ LanguageDesc lang_description[LANGUAGES_COUNT] =
     { LANG_GNOMISH_BINARY,  0, 0                       },
     { LANG_GOBLIN_BINARY,   0, 0                       }
 };
-
 LanguageDesc const* GetLanguageDescByID(uint32 lang)
 {
     for(uint8 i = 0; i < LANGUAGES_COUNT; ++i)
@@ -106,10 +94,8 @@ LanguageDesc const* GetLanguageDescByID(uint32 lang)
         if(uint32(lang_description[i].lang_id) == lang)
             return &lang_description[i];
     }
-
     return NULL;
 }
-
 bool SpellClickInfo::IsFitToRequirements(Player const* player, Creature const * clickNpc) const
 {
     if(questStart)
@@ -118,29 +104,24 @@ bool SpellClickInfo::IsFitToRequirements(Player const* player, Creature const *
         if (!player || ((!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart)))
             return false;
     }
-
     if(questEnd)
     {
         // not in expected forbidden quest state
         if(!player || player->GetQuestRewardStatus(questEnd))
             return false;
     }
-
     if (auraRequired)
         if (!player->HasAura(auraRequired))
             return false;
-
     if (auraForbidden)
         if (player->HasAura(auraForbidden))
             return false;
-
     Unit const * summoner = NULL;
     // Check summoners for party
     if (clickNpc->isSummon())
         summoner = ((TempSummon*)clickNpc)->GetSummoner();
     if (!summoner)
         summoner = clickNpc;
-
     switch (userType)
     {
         case SPELL_CLICK_USER_FRIEND:
@@ -156,10 +137,8 @@ bool SpellClickInfo::IsFitToRequirements(Player const* player, Creature const *
                 return false;
             break;
     }
-
     return true;
 }
-
 ObjectMgr::ObjectMgr()
 {
     m_hiCharGuid        = 1;
@@ -177,48 +156,36 @@ ObjectMgr::ObjectMgr()
     m_guildId           = 1;
     m_arenaTeamId       = 1;
     m_auctionid         = 1;
-
     // Only zero condition left, others will be added while loading DB tables
     mConditions.resize(1);
 }
-
 ObjectMgr::~ObjectMgr()
 {
     for( QuestMap::iterator i = mQuestTemplates.begin( ); i != mQuestTemplates.end( ); ++i )
         delete i->second;
-
     for(PetLevelInfoMap::iterator i = petInfo.begin( ); i != petInfo.end( ); ++i )
         delete[] i->second;
-
     // free only if loaded
     for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
         delete[] playerClassInfo[class_].levelInfo;
-
     for (int race = 0; race < MAX_RACES; ++race)
         for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
             delete[] playerInfo[race][class_].levelInfo;
-
     // free group and guild objects
     for (GroupSet::iterator itr = mGroupSet.begin(); itr != mGroupSet.end(); ++itr)
         delete (*itr);
-
     for (GuildMap::iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
         delete itr->second;
     mGuildMap.clear();
-
     for (CachePlayerInfoMap::iterator itr = m_mPlayerInfoMap.begin(); itr != m_mPlayerInfoMap.end(); ++itr)
         delete itr->second;
-
     for (ArenaTeamMap::iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr)
         delete itr->second;
-
     for (CacheVendorItemMap::iterator itr = m_mCacheVendorItemMap.begin(); itr != m_mCacheVendorItemMap.end(); ++itr)
         itr->second.Clear();
-
     for (CacheTrainerSpellMap::iterator itr = m_mCacheTrainerSpellMap.begin(); itr != m_mCacheTrainerSpellMap.end(); ++itr)
         itr->second.Clear();
 }
-
 void ObjectMgr::LoadPlayerInfoInCache()
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT guid, name, data, class FROM characters");
@@ -227,7 +194,6 @@ void ObjectMgr::LoadPlayerInfoInCache()
         sLog.outError( "Loading Player Cache failed.");
         return;
     }
-
     PCachePlayerInfo pPPlayerInfo = NULL;
     Field *fields = NULL;
     Tokens tdata;
@@ -237,33 +203,25 @@ void ObjectMgr::LoadPlayerInfoInCache()
         bar.step();
         fields = result->Fetch();
         pPPlayerInfo = new CachePlayerInfo();
-
         pPPlayerInfo->sPlayerName = fields[1].GetString();
-
         tdata.clear();
         tdata = StrSplit(fields[2].GetCppString(), " ");
-
         pPPlayerInfo->unLevel = Player::GetUInt32ValueFromArray(tdata,UNIT_FIELD_LEVEL);
         pPPlayerInfo->unfield = Player::GetUInt32ValueFromArray(tdata,UNIT_FIELD_BYTES_0);
-
         pPPlayerInfo->unArenaInfoId0 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 0 * 6);
         pPPlayerInfo->unArenaInfoId1 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 * 6);
         pPPlayerInfo->unArenaInfoId2 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 2 * 6);
-
         pPPlayerInfo->unArenaInfoSlot0 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 0 * 6 + 5);
         pPPlayerInfo->unArenaInfoSlot1 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 * 6 + 5);
         pPPlayerInfo->unArenaInfoSlot2 = Player::GetUInt32ValueFromArray(tdata,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 2 * 6 + 5);
-
         pPPlayerInfo->unClass = (uint32)fields[3].GetUInt32();
         m_mPlayerInfoMap[fields[0].GetUInt32()] = pPPlayerInfo;
     }
     while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded info about %d players", m_mPlayerInfoMap.size());
 }
-
 PCachePlayerInfo ObjectMgr::GetPlayerInfoFromCache(uint32 unPlayerGuid) const
 {
     //Now m_mPlayerInfoMap is using only for search, but when dinamic inserting/removing
@@ -273,132 +231,101 @@ PCachePlayerInfo ObjectMgr::GetPlayerInfoFromCache(uint32 unPlayerGuid) const
     CachePlayerInfoMap::const_iterator ipos = m_mPlayerInfoMap.find(unPlayerGuid);
     return ipos == m_mPlayerInfoMap.end() ? NULL : ipos->second;
 }
-
 Group * ObjectMgr::GetGroupByLeader(const uint64 &guid) const
 {
     for(GroupSet::const_iterator itr = mGroupSet.begin(); itr != mGroupSet.end(); ++itr)
         if ((*itr)->GetLeaderGUID() == guid)
             return *itr;
-
     return NULL;
 }
-
 Guild * ObjectMgr::GetGuildById(uint32 GuildId) const
 {
     GuildMap::const_iterator itr = mGuildMap.find(GuildId);
     if (itr != mGuildMap.end())
         return itr->second;
-
     return NULL;
 }
-
 Guild * ObjectMgr::GetGuildByName(const std::string& guildname) const
 {
     for(GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
         if (itr->second->GetName() == guildname)
             return itr->second;
-
     return NULL;
 }
-
 std::string ObjectMgr::GetGuildNameById(uint32 GuildId) const
 {
     GuildMap::const_iterator itr = mGuildMap.find(GuildId);
     if (itr != mGuildMap.end())
         return itr->second->GetName();
-
     return "";
 }
-
 Guild* ObjectMgr::GetGuildByLeader(const uint64 &guid) const
 {
     for(GuildMap::const_iterator itr = mGuildMap.begin(); itr != mGuildMap.end(); ++itr)
         if (itr->second->GetLeader() == guid)
             return itr->second;
-
     return NULL;
 }
-
 void ObjectMgr::AddGuild(Guild* guild)
 {
     mGuildMap[guild->GetId()] = guild;
 }
-
 void ObjectMgr::RemoveGuild(uint32 Id)
 {
     mGuildMap.erase(Id);
 }
-
 ArenaTeam* ObjectMgr::GetArenaTeamById(uint32 arenateamid) const
 {
     ArenaTeamMap::const_iterator itr = mArenaTeamMap.find(arenateamid);
     if (itr != mArenaTeamMap.end())
         return itr->second;
-
     return NULL;
 }
-
 ArenaTeam* ObjectMgr::GetArenaTeamByName(const std::string& arenateamname) const
 {
     for(ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr)
         if (itr->second->GetName() == arenateamname)
             return itr->second;
-
     return NULL;
 }
-
 ArenaTeam* ObjectMgr::GetArenaTeamByCaptain(uint64 const& guid) const
 {
     for(ArenaTeamMap::const_iterator itr = mArenaTeamMap.begin(); itr != mArenaTeamMap.end(); ++itr)
         if (itr->second->GetCaptain() == guid)
             return itr->second;
-
     return NULL;
 }
-
 void ObjectMgr::AddArenaTeam(ArenaTeam* arenaTeam)
 {
     mArenaTeamMap[arenaTeam->GetId()] = arenaTeam;
 }
-
 void ObjectMgr::RemoveArenaTeam(uint32 Id)
 {
     mArenaTeamMap.erase(Id);
 }
-
 CreatureInfo const* ObjectMgr::GetCreatureTemplate(uint32 id)
 {
     return sCreatureStorage.LookupEntry<CreatureInfo>(id);
 }
-
 void ObjectMgr::LoadCreatureLocales()
 {
     mCreatureLocaleMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,name_loc1,subname_loc1,name_loc2,subname_loc2,name_loc3,subname_loc3,name_loc4,subname_loc4,name_loc5,subname_loc5,name_loc6,subname_loc6,name_loc7,subname_loc7,name_loc8,subname_loc8 FROM locales_creature");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 creature locale strings. DB table `locales_creature` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         CreatureLocale& data = mCreatureLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[1+2*(i-1)].GetCppString();
@@ -409,7 +336,6 @@ void ObjectMgr::LoadCreatureLocales()
                 {
                     if(data.Name.size() <= idx)
                         data.Name.resize(idx+1);
-
                     data.Name[idx] = str;
                 }
             }
@@ -421,52 +347,39 @@ void ObjectMgr::LoadCreatureLocales()
                 {
                     if(data.SubName.size() <= idx)
                         data.SubName.resize(idx+1);
-
                     data.SubName[idx] = str;
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu creature locale strings", (unsigned long)mCreatureLocaleMap.size() );
 }
-
 void ObjectMgr::LoadNpcOptionLocales()
 {
     mNpcOptionLocaleMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,"
         "option_text_loc1,box_text_loc1,option_text_loc2,box_text_loc2,"
         "option_text_loc3,box_text_loc3,option_text_loc4,box_text_loc4,"
         "option_text_loc5,box_text_loc5,option_text_loc6,box_text_loc6,"
         "option_text_loc7,box_text_loc7,option_text_loc8,box_text_loc8 "
         "FROM locales_npc_option");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 npc_option locale strings. DB table `locales_npc_option` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         NpcOptionLocale& data = mNpcOptionLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[1+2*(i-1)].GetCppString();
@@ -477,7 +390,6 @@ void ObjectMgr::LoadNpcOptionLocales()
                 {
                     if(data.OptionText.size() <= idx)
                         data.OptionText.resize(idx+1);
-
                     data.OptionText[idx] = str;
                 }
             }
@@ -489,70 +401,52 @@ void ObjectMgr::LoadNpcOptionLocales()
                 {
                     if(data.BoxText.size() <= idx)
                         data.BoxText.resize(idx+1);
-
                     data.BoxText[idx] = str;
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu npc_option locale strings", (unsigned long)mNpcOptionLocaleMap.size() );
 }
-
 void ObjectMgr::LoadPointOfInterestLocales()
 {
     mPointOfInterestLocaleMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,icon_name_loc1,icon_name_loc2,icon_name_loc3,icon_name_loc4,icon_name_loc5,icon_name_loc6,icon_name_loc7,icon_name_loc8 FROM locales_points_of_interest");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 points_of_interest locale strings. DB table `locales_points_of_interest` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         PointOfInterestLocale& data = mPointOfInterestLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[i].GetCppString();
             if(str.empty())
                 continue;
-
             int idx = GetOrNewIndexForLocale(LocaleConstant(i));
             if(idx >= 0)
             {
                 if(data.IconName.size() <= idx)
                     data.IconName.resize(idx+1);
-
                 data.IconName[idx] = str;
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu points_of_interest locale strings", (unsigned long)mPointOfInterestLocaleMap.size() );
 }
-
 struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader>
 {
     template<class D>
@@ -561,25 +455,20 @@ struct SQLCreatureLoader : public SQLStorageLoaderBase<SQLCreatureLoader>
         dst = D(objmgr.GetScriptId(src));
     }
 };
-
 void ObjectMgr::LoadCreatureTemplates()
 {
     SQLCreatureLoader loader;
     loader.Load(sCreatureStorage);
-
     sLog.outString( ">> Loaded %u creature definitions", sCreatureStorage.RecordCount );
     sLog.outString();
-
     std::set<uint32> heroicEntries;                         // already loaded heroic value in creatures
     std::set<uint32> hasHeroicEntries;                      // already loaded creatures with heroic entry values
-
     // check data correctness
     for(uint32 i = 1; i < sCreatureStorage.MaxEntry; ++i)
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i);
         if (!cInfo)
             continue;
-
         if (cInfo->HeroicEntry)
         {
             CreatureInfo const* heroicInfo = GetCreatureTemplate(cInfo->HeroicEntry);
@@ -588,88 +477,72 @@ void ObjectMgr::LoadCreatureTemplates()
                 sLog.outErrorDb("Creature (Entry: %u) have `heroic_entry`=%u but creature entry %u not exist.", i, cInfo->HeroicEntry, cInfo->HeroicEntry);
                 continue;
             }
-
             if (heroicEntries.find(i)!=heroicEntries.end())
             {
                 sLog.outErrorDb("Creature (Entry: %u) listed as heroic but have value in `heroic_entry`.",i);
                 continue;
             }
-
             if (heroicEntries.find(cInfo->HeroicEntry)!=heroicEntries.end())
             {
                 sLog.outErrorDb("Creature (Entry: %u) already listed as heroic for another entry.",cInfo->HeroicEntry);
                 continue;
             }
-
             if (hasHeroicEntries.find(cInfo->HeroicEntry)!=hasHeroicEntries.end())
             {
                 sLog.outErrorDb("Creature (Entry: %u) have `heroic_entry`=%u but creature entry %u have heroic entry also.",i,cInfo->HeroicEntry,cInfo->HeroicEntry);
                 continue;
             }
-
             if (cInfo->unit_class != heroicInfo->unit_class)
             {
                 sLog.outErrorDb("Creature (Entry: %u, class %u) has different `unit_class` in heroic mode (Entry: %u, class %u).",i, cInfo->unit_class, cInfo->HeroicEntry, heroicInfo->unit_class);
                 continue;
             }
-
             if (cInfo->npcflag != heroicInfo->npcflag)
             {
                 sLog.outErrorDb("Creature (Entry: %u) listed in `creature_template_substitution` has different `npcflag` in heroic mode.",i);
                 continue;
             }
-
             if (cInfo->trainer_class != heroicInfo->trainer_class)
             {
                 sLog.outErrorDb("Creature (Entry: %u) has different `trainer_class` in heroic mode (Entry: %u).",i,cInfo->HeroicEntry);
                 continue;
             }
-
             if (cInfo->trainer_race != heroicInfo->trainer_race)
             {
                 sLog.outErrorDb("Creature (Entry: %u) has different `trainer_race` in heroic mode (Entry: %u).",i,cInfo->HeroicEntry);
                 continue;
             }
-
             if (cInfo->trainer_type != heroicInfo->trainer_type)
             {
                 sLog.outErrorDb("Creature (Entry: %u) listed in `creature_template_substitution` has different `trainer_type` in heroic mode.",i);
                 continue;
             }
-
             if (cInfo->trainer_spell != heroicInfo->trainer_spell)
             {
                 sLog.outErrorDb("Creature (Entry: %u) listed in `creature_template_substitution` has different `trainer_spell` in heroic mode.",i);
                 continue;
             }
-
             if (heroicInfo->AIName && *heroicInfo->AIName)
             {
                 sLog.outErrorDb("Heroic mode creature (Entry: %u) has `AIName`, but in any case will used normal mode creature (Entry: %u) AIName.",cInfo->HeroicEntry,i);
                 continue;
             }
-
             if (heroicInfo->ScriptID)
             {
                 sLog.outErrorDb("Heroic mode creature (Entry: %u) has `ScriptName`, but in any case will used normal mode creature (Entry: %u) ScriptName.",cInfo->HeroicEntry,i);
                 continue;
             }
-
             hasHeroicEntries.insert(i);
             heroicEntries.insert(cInfo->HeroicEntry);
         }
-
         FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_A);
         if (!factionTemplate)
             sLog.outErrorDb("Creature (Entry: %u) has non-existing faction_A template (%u)", cInfo->Entry, cInfo->faction_A);
-
         factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction_H);
         if (!factionTemplate)
             sLog.outErrorDb("Creature (Entry: %u) has non-existing faction_H template (%u)", cInfo->Entry, cInfo->faction_H);
-
         // used later for scale
         CreatureDisplayInfoEntry const* displayScaleEntry = NULL;
-
         if (cInfo->Modelid1)
         {
             CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->Modelid1);
@@ -680,12 +553,10 @@ void ObjectMgr::LoadCreatureTemplates()
             }
             else if(!displayScaleEntry)
                 displayScaleEntry = displayEntry;
-
             CreatureModelInfo const* minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid1);
             if (!minfo)
                 sLog.outErrorDb("Creature (Entry: %u) not has model data for Modelid1 (%u)", cInfo->Entry, cInfo->Modelid1);
         }
-
         if (cInfo->Modelid2)
         {
             CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->Modelid2);
@@ -696,12 +567,10 @@ void ObjectMgr::LoadCreatureTemplates()
             }
             else if(!displayScaleEntry)
                 displayScaleEntry = displayEntry;
-
             CreatureModelInfo const* minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid2);
             if (!minfo)
                 sLog.outErrorDb("Creature (Entry: %u) not has model data for Modelid2 (%u)", cInfo->Entry, cInfo->Modelid2);
         }
-
         if (cInfo->Modelid3)
         {
             CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->Modelid3);
@@ -712,12 +581,10 @@ void ObjectMgr::LoadCreatureTemplates()
             }
             else if(!displayScaleEntry)
                 displayScaleEntry = displayEntry;
-
             CreatureModelInfo const* minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid3);
             if (!minfo)
                 sLog.outErrorDb("Creature (Entry: %u) not has model data for Modelid3 (%u)", cInfo->Entry, cInfo->Modelid3);
         }
-
         if (cInfo->Modelid4)
         {
             CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->Modelid4);
@@ -728,15 +595,12 @@ void ObjectMgr::LoadCreatureTemplates()
             }
             else if(!displayScaleEntry)
                 displayScaleEntry = displayEntry;
-
             CreatureModelInfo const* minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid4);
             if (!minfo)
                 sLog.outErrorDb("Creature (Entry: %u) not has model data for Modelid4 (%u)", cInfo->Entry, cInfo->Modelid4);
         }
-
         if (!displayScaleEntry)
             sLog.outErrorDb("Creature (Entry: %u) not has any existed display id in Modelid1/Modelid2/Modelid3/Modelid4", cInfo->Entry);
-
         for(int k = 0; k < MAX_KILL_CREDIT; ++k)
         {
             if(cInfo->KillCredit[k])
@@ -748,57 +612,46 @@ void ObjectMgr::LoadCreatureTemplates()
                 }
             }
         }
-
         if (cInfo->unit_class && ((1 << (cInfo->unit_class-1)) & CLASSMASK_ALL_CREATURES) == 0)
             sLog.outErrorDb("Creature (Entry: %u) has invalid unit_class(%u) for creature_template", cInfo->Entry, cInfo->unit_class);
-
         if(cInfo->dmgschool >= MAX_SPELL_SCHOOL)
         {
             sLog.outErrorDb("Creature (Entry: %u) has invalid spell school value (%u) in `dmgschool`",cInfo->Entry,cInfo->dmgschool);
             const_cast<CreatureInfo*>(cInfo)->dmgschool = SPELL_SCHOOL_NORMAL;
         }
-
         if(cInfo->baseattacktime == 0)
             const_cast<CreatureInfo*>(cInfo)->baseattacktime  = BASE_ATTACK_TIME;
-
         if(cInfo->rangeattacktime == 0)
             const_cast<CreatureInfo*>(cInfo)->rangeattacktime = BASE_ATTACK_TIME;
-
         if(cInfo->npcflag & UNIT_NPC_FLAG_SPELLCLICK)
         {
             sLog.outErrorDb("Creature (Entry: %u) has dynamic flag UNIT_NPC_FLAG_SPELLCLICK (%u) set, it expect to be set by code base at `npc_spellclick_spells` content.",cInfo->Entry,UNIT_NPC_FLAG_SPELLCLICK);
             const_cast<CreatureInfo*>(cInfo)->npcflag &= ~UNIT_NPC_FLAG_SPELLCLICK;
         }
-
         if((cInfo->npcflag & UNIT_NPC_FLAG_TRAINER) && cInfo->trainer_type >= MAX_TRAINER_TYPE)
             sLog.outErrorDb("Creature (Entry: %u) has wrong trainer type %u",cInfo->Entry,cInfo->trainer_type);
-
         if(cInfo->type && !sCreatureTypeStore.LookupEntry(cInfo->type))
         {
             sLog.outErrorDb("Creature (Entry: %u) has invalid creature type (%u) in `type`",cInfo->Entry,cInfo->type);
             const_cast<CreatureInfo*>(cInfo)->type = CREATURE_TYPE_HUMANOID;
         }
-
         // must exist or used hidden but used in data horse case
         if(cInfo->family && !sCreatureFamilyStore.LookupEntry(cInfo->family) && cInfo->family != CREATURE_FAMILY_HORSE_CUSTOM )
         {
             sLog.outErrorDb("Creature (Entry: %u) has invalid creature family (%u) in `family`",cInfo->Entry,cInfo->family);
             const_cast<CreatureInfo*>(cInfo)->family = 0;
         }
-
         if(cInfo->InhabitType <= 0 || cInfo->InhabitType > INHABIT_ANYWHERE)
         {
             sLog.outErrorDb("Creature (Entry: %u) has wrong value (%u) in `InhabitType`, creature will not correctly walk/swim/fly",cInfo->Entry,cInfo->InhabitType);
             const_cast<CreatureInfo*>(cInfo)->InhabitType = INHABIT_ANYWHERE;
         }
-
         if(cInfo->PetSpellDataId)
         {
             CreatureSpellDataEntry const* spellDataId = sCreatureSpellDataStore.LookupEntry(cInfo->PetSpellDataId);
             if(!spellDataId)
                 sLog.outErrorDb("Creature (Entry: %u) has non-existing PetSpellDataId (%u)", cInfo->Entry, cInfo->PetSpellDataId);
         }
-
         for(uint8 j = 0; j < CREATURE_MAX_SPELLS; ++j)
         {
             if(cInfo->spells[j] && !sSpellStore.LookupEntry(cInfo->spells[j]))
@@ -807,13 +660,11 @@ void ObjectMgr::LoadCreatureTemplates()
                 const_cast<CreatureInfo*>(cInfo)->spells[j] = 0;
             }
         }
-
         if(cInfo->MovementType >= MAX_DB_MOTION_TYPE)
         {
             sLog.outErrorDb("Creature (Entry: %u) has wrong movement generator type (%u), ignore and set to IDLE.",cInfo->Entry,cInfo->MovementType);
             const_cast<CreatureInfo*>(cInfo)->MovementType = IDLE_MOTION_TYPE;
         }
-
         if(cInfo->equipmentId > 0)                          // 0 no equipment
         {
             if(!GetEquipmentInfo(cInfo->equipmentId))
@@ -822,7 +673,6 @@ void ObjectMgr::LoadCreatureTemplates()
                 const_cast<CreatureInfo*>(cInfo)->equipmentId = 0;
             }
         }
-
         /// if not set custom creature scale then load scale from CreatureDisplayInfo.dbc
         if(cInfo->scale <= 0.0f)
         {
@@ -831,11 +681,9 @@ void ObjectMgr::LoadCreatureTemplates()
             else
                 const_cast<CreatureInfo*>(cInfo)->scale = 1.0f;
         }
-
         const_cast<CreatureInfo*>(cInfo)->dmg_multiplier *= Creature::_GetDamageMod(cInfo->rank);
     }
 }
-
 void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* table, char const* guidEntryStr)
 {
     // Now add the auras, format "spellid effectindex spellid effectindex..."
@@ -855,10 +703,8 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const*
         }
         if (p!=s)
             val.push_back(atoi(s));
-
         // free char* loaded memory
         delete[] (char*)reinterpret_cast<char const*>(addon->auras);
-
         // wrong list
         if (val.size()%2)
         {
@@ -867,17 +713,14 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const*
             return;
         }
     }
-
     // empty list
     if(val.empty())
     {
         addon->auras = NULL;
         return;
     }
-
     // replace by new structures array
     const_cast<CreatureDataAddonAura*&>(addon->auras) = new CreatureDataAddonAura[val.size()/2+1];
-
     uint32 i=0;
     for(uint32 j = 0; j < val.size()/2;++j)
     {
@@ -895,36 +738,29 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const*
             sLog.outErrorDb("Creature (%s: %u) has wrong spell %u defined in `auras` field in `%s`.",guidEntryStr,addon->guidOrEntry,cAura.spell_id,table);
             continue;
         }
-
         if (!AdditionalSpellInfo->Effect[cAura.effect_idx] || !AdditionalSpellInfo->EffectApplyAuraName[cAura.effect_idx])
         {
             sLog.outErrorDb("Creature (%s: %u) has not aura effect %u of spell %u defined in `auras` field in `%s`.",guidEntryStr,addon->guidOrEntry,cAura.effect_idx,cAura.spell_id,table);
             continue;
         }
-
         ++i;
     }
-
     // fill terminator element (after last added)
     CreatureDataAddonAura& endAura = const_cast<CreatureDataAddonAura&>(addon->auras[i]);
     endAura.spell_id   = 0;
     endAura.effect_idx = 0;
 }
-
 void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entryName, char const* comment)
 {
     creatureaddons.Load();
-
     sLog.outString(">> Loaded %u %s", creatureaddons.RecordCount, comment);
     sLog.outString();
-
     // check data correctness and convert 'auras'
     for(uint32 i = 1; i < creatureaddons.MaxEntry; ++i)
     {
         CreatureDataAddon const* addon = creatureaddons.LookupEntry<CreatureDataAddon>(i);
         if(!addon)
             continue;
-
         if (addon->mount)
         {
             if (!sCreatureDisplayInfoStore.LookupEntry(addon->mount))
@@ -933,69 +769,54 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry
                 const_cast<CreatureDataAddon*>(addon)->mount = 0;
             }
         }
-
         if (!sEmotesStore.LookupEntry(addon->emote))
             sLog.outErrorDb("Creature (%s %u) have invalid emote (%u) defined in `%s`.", entryName, addon->guidOrEntry, addon->emote, creatureaddons.GetTableName());
-
         /*if (addon->move_flags & (MONSTER_MOVE_UNK1|MONSTER_MOVE_UNK4))
         {
             sLog.outErrorDb("Creature (%s %u) movement flags mask defined in `%s` include forbidden  flags (" I32FMT ") that can crash client, cleanup at load.", entryName, addon->guidOrEntry, creatureaddons.GetTableName(), (MONSTER_MOVE_UNK1|MONSTER_MOVE_UNK4));
             const_cast<CreatureDataAddon*>(addon)->move_flags &= ~(MONSTER_MOVE_UNK1|MONSTER_MOVE_UNK4);
         }*/
-
         ConvertCreatureAddonAuras(const_cast<CreatureDataAddon*>(addon), creatureaddons.GetTableName(), entryName);
     }
 }
-
 void ObjectMgr::LoadCreatureAddons()
 {
     LoadCreatureAddons(sCreatureInfoAddonStorage,"Entry","creature template addons");
-
     // check entry ids
     for(uint32 i = 1; i < sCreatureInfoAddonStorage.MaxEntry; ++i)
         if(CreatureDataAddon const* addon = sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(i))
             if(!sCreatureStorage.LookupEntry<CreatureInfo>(addon->guidOrEntry))
                 sLog.outErrorDb("Creature (Entry: %u) does not exist but has a record in `%s`",addon->guidOrEntry, sCreatureInfoAddonStorage.GetTableName());
-
     LoadCreatureAddons(sCreatureDataAddonStorage,"GUID","creature addons");
-
     // check entry ids
     for(uint32 i = 1; i < sCreatureDataAddonStorage.MaxEntry; ++i)
         if(CreatureDataAddon const* addon = sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(i))
             if(mCreatureDataMap.find(addon->guidOrEntry)==mCreatureDataMap.end())
                 sLog.outErrorDb("Creature (GUID: %u) does not exist but has a record in `creature_addon`",addon->guidOrEntry);
 }
-
 EquipmentInfo const* ObjectMgr::GetEquipmentInfo(uint32 entry)
 {
     return sEquipmentStorage.LookupEntry<EquipmentInfo>(entry);
 }
-
 void ObjectMgr::LoadEquipmentTemplates()
 {
     sEquipmentStorage.Load();
-
     for(uint32 i=0; i< sEquipmentStorage.MaxEntry; ++i)
     {
         EquipmentInfo const* eqInfo = sEquipmentStorage.LookupEntry<EquipmentInfo>(i);
-
         if(!eqInfo)
             continue;
-
         for(uint8 j=0; j<3; j++)
         {
             if(!eqInfo->equipentry[j])
                continue;
-
             ItemEntry const *dbcitem = sItemStore.LookupEntry(eqInfo->equipentry[j]);
-
             if(!dbcitem)
             {
                 sLog.outErrorDb("Unknown item (entry=%u) in creature_equip_template.equipentry%u for entry = %u, forced to 0.", eqInfo->equipentry[j], j+1, i);
                 const_cast<EquipmentInfo*>(eqInfo)->equipentry[j] = 0;
                 continue;
             }
-
             if(dbcitem->InventoryType != INVTYPE_WEAPON &&
                     dbcitem->InventoryType != INVTYPE_SHIELD &&
                     dbcitem->InventoryType != INVTYPE_RANGED &&
@@ -1014,24 +835,20 @@ void ObjectMgr::LoadEquipmentTemplates()
     sLog.outString( ">> Loaded %u equipment template", sEquipmentStorage.RecordCount );
     sLog.outString();
 }
-
 CreatureModelInfo const* ObjectMgr::GetCreatureModelInfo(uint32 modelid)
 {
     return sCreatureModelStorage.LookupEntry<CreatureModelInfo>(modelid);
 }
-
 uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const CreatureData *data /*= NULL*/)
 {
     // Load creature model (display id)
     uint32 display_id = 0;
-
     if (!data || data->displayid == 0)
     {
         display_id = cinfo->GetRandomValidModelId();
     }
     else
         return data->displayid;
-
     /*if(!team)
     {
         switch(cinfo->Entry)
@@ -1049,16 +866,13 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const
                 return cinfo->GetRandomValidModelId();
         }
     }*/
-
     return display_id;
 }
-
 CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 display_id)
 {
     CreatureModelInfo const *minfo = GetCreatureModelInfo(display_id);
     if(!minfo)
         return NULL;
-
     // If a model for another gender exists, 50% chance to use it
     if(minfo->modelid_other_gender != 0 && urand(0,1) == 0)
     {
@@ -1074,44 +888,36 @@ CreatureModelInfo const* ObjectMgr::GetCreatureModelRandomGender(uint32 display_
     else
         return minfo;
 }
-
 void ObjectMgr::LoadCreatureModelInfo()
 {
     sCreatureModelStorage.Load();
-
     // post processing
     for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i)
     {
         CreatureModelInfo const *minfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(i);
         if (!minfo)
             continue;
-
         if (!sCreatureDisplayInfoStore.LookupEntry(minfo->modelid))
             sLog.outErrorDb("Table `creature_model_info` has model for not existed display id (%u).", minfo->modelid);
-
         if (minfo->gender > GENDER_NONE)
         {
             sLog.outErrorDb("Table `creature_model_info` has wrong gender (%u) for display id (%u).", uint32(minfo->gender), minfo->modelid);
             const_cast<CreatureModelInfo*>(minfo)->gender = GENDER_MALE;
         }
-
         if (minfo->modelid_other_gender && !sCreatureDisplayInfoStore.LookupEntry(minfo->modelid_other_gender))
         {
             sLog.outErrorDb("Table `creature_model_info` has not existed alt.gender model (%u) for existed display id (%u).", minfo->modelid_other_gender, minfo->modelid);
             const_cast<CreatureModelInfo*>(minfo)->modelid_other_gender = 0;
         }
     }
-
     sLog.outString( ">> Loaded %u creature model based info", sCreatureModelStorage.RecordCount );
     sLog.outString();
-
     // check if combat_reach is valid
     for(uint32 i = 1; i < sCreatureModelStorage.MaxEntry; ++i)
     {
         CreatureModelInfo const* mInfo = sCreatureModelStorage.LookupEntry<CreatureModelInfo>(i);
         if(!mInfo)
             continue;
-
         if(mInfo->combat_reach < 0.1f)
         {
             //sLog.outErrorDb("Creature model (Entry: %u) has invalid combat reach (%f), setting it to 0.5", mInfo->modelid, mInfo->combat_reach);
@@ -1119,86 +925,66 @@ void ObjectMgr::LoadCreatureModelInfo()
         }
     }
 }
-
 bool ObjectMgr::CheckCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid) const
 {
     const CreatureData* const slave = GetCreatureData(guid);
     const CreatureData* const master = GetCreatureData(linkedGuid);
-    
     if(!slave || !master) // they must have a corresponding entry in db
     {
         sLog.outError("LinkedRespawn: Creature '%u' linking to '%u' which doesn't exist",guid,linkedGuid);
         return false;
     }
-
     const MapEntry* const map = sMapStore.LookupEntry(master->mapid);
-        
     if(master->mapid != slave->mapid        // link only to same map
         && (!map || map->Instanceable()))   // or to unistanced world
     {
         sLog.outError("LinkedRespawn: Creature '%u' linking to '%u' on an unpermitted map",guid,linkedGuid);
         return false;
     }
-
     if(!(master->spawnMask & slave->spawnMask)  // they must have a possibility to meet (normal/heroic difficulty)
         && (!map || map->Instanceable()))
     {
         sLog.outError("LinkedRespawn: Creature '%u' linking to '%u' with not corresponding spawnMask",guid,linkedGuid);
         return false;
     }
-
     return true;
 }
-
 void ObjectMgr::LoadCreatureLinkedRespawn()
 {
     mCreatureLinkedRespawnMap.clear();
     QueryResult *result = WorldDatabase.Query("SELECT guid, linkedGuid FROM creature_linked_respawn ORDER BY guid ASC");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString("");
         sLog.outErrorDb(">> Loaded 0 linked respawns. DB table `creature_linked_respawn` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 guid = fields[0].GetUInt32();
         uint32 linkedGuid = fields[1].GetUInt32();
-
         if(CheckCreatureLinkedRespawn(guid,linkedGuid))
             mCreatureLinkedRespawnMap[guid] = linkedGuid;
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u linked respawns", mCreatureLinkedRespawnMap.size() );
 }
-
 bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid)
 {
     if(!guid)
         return false;
-
     if(!linkedGuid) // we're removing the linking
     {
         mCreatureLinkedRespawnMap.erase(guid);
         WorldDatabase.DirectPExecute("DELETE FROM creature_linked_respawn WHERE guid = '%u'",guid);
         return true;
     }
-
     if(CheckCreatureLinkedRespawn(guid,linkedGuid)) // we add/change linking
     {
         mCreatureLinkedRespawnMap[guid] = linkedGuid;
@@ -1207,7 +993,6 @@ bool ObjectMgr::SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid)
     }
     return false;
 }
-
 void ObjectMgr::LoadCreatures()
 {
     uint32 count = 0;
@@ -1219,47 +1004,36 @@ void ObjectMgr::LoadCreatures()
         "curhealth, curmana, DeathState, MovementType, spawnMask, phaseMask, event, pool_entry "
         "FROM creature LEFT OUTER JOIN game_event_creature ON creature.guid = game_event_creature.guid "
         "LEFT OUTER JOIN pool_creature ON creature.guid = pool_creature.guid");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 creature. DB table `creature` is empty.");
         return;
     }
-
     // build single time for check creature data
     std::set<uint32> heroicCreatures;
     for(uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i)
         if(CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i))
             if(cInfo->HeroicEntry)
                 heroicCreatures.insert(cInfo->HeroicEntry);
-
     //TODO: remove this
     //gameeventmgr.mGameEventCreatureGuids.resize(52*2-1);
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 guid         = fields[ 0].GetUInt32();
         uint32 entry        = fields[ 1].GetUInt32();
-
         CreatureInfo const* cInfo = GetCreatureTemplate(entry);
         if(!cInfo)
         {
             sLog.outErrorDb("Table `creature` has creature (GUID: %u) with non existing creature entry %u, skipped.", guid, entry);
             continue;
         }
-
         CreatureData& data = mCreatureDataMap[guid];
-
         data.id             = entry;
         data.mapid          = fields[ 2].GetUInt32();
         data.displayid      = fields[ 3].GetUInt32();
@@ -1279,13 +1053,11 @@ void ObjectMgr::LoadCreatures()
         data.phaseMask      = fields[17].GetUInt16();
         int16 gameEvent     = fields[18].GetInt16();
         int16 PoolId        = fields[19].GetInt16();
-
         if(heroicCreatures.find(data.id)!=heroicCreatures.end())
         {
             sLog.outErrorDb("Table `creature` have creature (GUID: %u) that listed as heroic template (entry: %u) in `creature_template_substitution`, skipped.",guid,data.id );
             continue;
         }
-
         // I do not know why but in db most display id are not zero
         /*if(data.displayid == 11686 || data.displayid == 24719)
         {
@@ -1295,7 +1067,6 @@ void ObjectMgr::LoadCreatures()
             || data.displayid == cInfo->DisplayID_H || data.displayid == cInfo->DisplayID_H2)
             data.displayid = 0;
             */
-
         if(data.equipmentId > 0)                            // -1 no equipment, 0 use default
         {
             if(!GetEquipmentInfo(data.equipmentId))
@@ -1304,26 +1075,22 @@ void ObjectMgr::LoadCreatures()
                 data.equipmentId = -1;
             }
         }
-
         if(cInfo->RegenHealth && data.curhealth < cInfo->minhealth)
         {
             sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`RegenHealth`=1 and low current health (%u), `creature_template`.`minhealth`=%u.",guid,data.id,data.curhealth, cInfo->minhealth );
             data.curhealth = cInfo->minhealth;
         }
-
         if(cInfo->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)
         {
             MapEntry const* map = sMapStore.LookupEntry(data.mapid);
             if(!map || !map->IsDungeon())
                 sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `creature_template`.`flags_extra` including CREATURE_FLAG_EXTRA_INSTANCE_BIND but creature are not in instance.",guid,data.id);
         }
-
         if(data.curmana < cInfo->minmana)
         {
             sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with low current mana (%u), `creature_template`.`minmana`=%u.",guid,data.id,data.curmana, cInfo->minmana );
             data.curmana = cInfo->minmana;
         }
-
         if(data.spawndist < 0.0f)
         {
             sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `spawndist`< 0, set to 0.",guid,data.id );
@@ -1347,13 +1114,11 @@ void ObjectMgr::LoadCreatures()
                 data.spawndist = 0.0f;
             }
         }
-
         if(data.phaseMask==0)
         {
             sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.",guid,data.id );
             data.phaseMask = 1;
         }
-
         //if(entry == 32307 || entry == 32308)
         /*if(entry == 30739 || entry == 30740)
         {
@@ -1367,20 +1132,14 @@ void ObjectMgr::LoadCreatures()
             gameeventmgr.mGameEventCreatureGuids[51+51].push_back(guid);
             gameeventmgr.mGameEventCreatureGuids[51+50].push_back(guid2);
         }*/
-
         if (gameEvent==0 && PoolId==0)                      // if not this is to be managed by GameEvent System or Pool system
             AddCreatureToGrid(guid, &data);
-
         ++count;
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu creatures", (unsigned long)mCreatureDataMap.size() );
 }
-
 void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data)
 {
     uint8 mask = data->spawnMask;
@@ -1390,13 +1149,11 @@ void ObjectMgr::AddCreatureToGrid(uint32 guid, CreatureData const* data)
         {
             CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY);
             uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
             CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
             cell_guids.creatures.insert(guid);
         }
     }
 }
-
 void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data)
 {
     uint8 mask = data->spawnMask;
@@ -1406,23 +1163,19 @@ void ObjectMgr::RemoveCreatureFromGrid(uint32 guid, CreatureData const* data)
         {
             CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY);
             uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
             CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
             cell_guids.creatures.erase(guid);
         }
     }
 }
-
 uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay, float rotation0, float rotation1, float rotation2, float rotation3)
 {
     GameObjectInfo const* goinfo = GetGameObjectInfo(entry);
     if (!goinfo)
         return 0;
-
     Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId));
     if(!map)
         return 0;
-
     uint32 guid = GenerateLowGuid(HIGHGUID_GAMEOBJECT);
     GameObjectData& data = NewGOData(guid);
     data.id             = entry;
@@ -1442,9 +1195,7 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
     data.phaseMask      = PHASEMASK_NORMAL;
     data.artKit         = goinfo->type == GAMEOBJECT_TYPE_CAPTURE_POINT ? 21 : 0;
     data.dbData = false;
-
     AddGameobjectToGrid(guid, &data);
-
     // Spawn if necessary (loaded grids only)
     // We use spawn coords to spawn
     if(!map->Instanceable() && !map->IsRemovalGrid(x, y))
@@ -1458,18 +1209,14 @@ uint32 ObjectMgr::AddGOData(uint32 entry, uint32 mapId, float x, float y, float
         }
         map->Add(go);
     }
-
     sLog.outDebug("AddGOData: dbguid %u entry %u map %u x %f y %f z %f o %f", guid, entry, mapId, x, y, z, o);
-
     return guid;
 }
-
 uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, float y, float z, float o, uint32 spawntimedelay)
 {
     CreatureInfo const *cInfo = GetCreatureTemplate(entry);
     if(!cInfo)
         return 0;
-
     uint32 guid = GenerateLowGuid(HIGHGUID_UNIT);
     CreatureData& data = NewOrExistCreatureData(guid);
     data.id = entry;
@@ -1490,9 +1237,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, f
     data.spawnMask = 1;
     data.phaseMask = PHASEMASK_NORMAL;
     data.dbData = false;
-
     AddCreatureToGrid(guid, &data);
-
     // Spawn if necessary (loaded grids only)
     if(Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(mapId)))
     {
@@ -1509,57 +1254,44 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, f
             map->Add(creature);
         }
     }
-
-    return guid;    
+    return guid;
 }
-
 void ObjectMgr::LoadGameobjects()
 {
     uint32 count = 0;
-
     //                                                0                1   2    3           4           5           6
     QueryResult *result = WorldDatabase.Query("SELECT gameobject.guid, id, map, position_x, position_y, position_z, orientation,"
     //   7          8          9          10         11             12            13     14         15         16     17
         "rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state, spawnMask, phaseMask, event, pool_entry "
         "FROM gameobject LEFT OUTER JOIN game_event_gameobject ON gameobject.guid = game_event_gameobject.guid "
         "LEFT OUTER JOIN pool_gameobject ON gameobject.guid = pool_gameobject.guid");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 gameobjects. DB table `gameobject` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 guid         = fields[ 0].GetUInt32();
         uint32 entry        = fields[ 1].GetUInt32();
-
         GameObjectInfo const* gInfo = GetGameObjectInfo(entry);
         if (!gInfo)
         {
             sLog.outErrorDb("Table `gameobject` has gameobject (GUID: %u) with non existing gameobject entry %u, skipped.", guid, entry);
             continue;
         }
-
         if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId))
         {
             sLog.outErrorDb("Gameobject (GUID: %u Entry %u GoType: %u) have invalid displayId (%u), not loaded.",guid, entry, gInfo->type, gInfo->displayId);
             continue;
         }
-
         GameObjectData& data = mGameObjectDataMap[guid];
-
         data.id             = entry;
         data.mapid          = fields[ 2].GetUInt32();
         data.posX           = fields[ 3].GetFloat();
@@ -1571,15 +1303,12 @@ void ObjectMgr::LoadGameobjects()
         data.rotation2      = fields[ 9].GetFloat();
         data.rotation3      = fields[10].GetFloat();
         data.spawntimesecs  = fields[11].GetInt32();
-
         if (data.spawntimesecs==0 && gInfo->IsDespawnAtAction())
         {
             sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) with `spawntimesecs` (0) value, but gameobejct marked as despawnable at action.",guid,data.id);
         }
-
         data.animprogress   = fields[12].GetUInt32();
         data.artKit         = 0;
-
         uint32 go_state     = fields[13].GetUInt32();
         if (go_state >= MAX_GO_STATE)
         {
@@ -1587,48 +1316,38 @@ void ObjectMgr::LoadGameobjects()
             continue;
         }
         data.go_state       = GOState(go_state);
-
         data.spawnMask      = fields[14].GetUInt8();
         data.phaseMask      = fields[15].GetUInt16();
         int16 gameEvent     = fields[16].GetInt16();
         int16 PoolId        = fields[17].GetInt16();
-
         if (data.rotation2 < -1.0f || data.rotation2 > 1.0f)
         {
             sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) with invalid rotation2 (%f) value, skip",guid,data.id,data.rotation2 );
             continue;
         }
-
         if (data.rotation3 < -1.0f || data.rotation3 > 1.0f)
         {
             sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) with invalid rotation3 (%f) value, skip",guid,data.id,data.rotation3 );
             continue;
         }
-
         if (!MapManager::IsValidMapCoord(data.mapid,data.posX,data.posY,data.posZ,data.orientation))
         {
             sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) with invalid coordinates, skip",guid,data.id );
             continue;
         }
-
         if (data.phaseMask==0)
         {
             sLog.outErrorDb("Table `gameobject` have gameobject (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.",guid,data.id );
             data.phaseMask = 1;
         }
-
         if (gameEvent==0 && PoolId==0)                      // if not this is to be managed by GameEvent System or Pool system
             AddGameobjectToGrid(guid, &data);
         ++count;
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu gameobjects", (unsigned long)mGameObjectDataMap.size());
 }
-
 void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data)
 {
     uint8 mask = data->spawnMask;
@@ -1638,13 +1357,11 @@ void ObjectMgr::AddGameobjectToGrid(uint32 guid, GameObjectData const* data)
         {
             CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY);
             uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
             CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
             cell_guids.gameobjects.insert(guid);
         }
     }
 }
-
 void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data)
 {
     uint8 mask = data->spawnMask;
@@ -1654,113 +1371,81 @@ void ObjectMgr::RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data
         {
             CellPair cell_pair = Trinity::ComputeCellPair(data->posX, data->posY);
             uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
-
             CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(data->mapid,i)][cell_id];
             cell_guids.gameobjects.erase(guid);
         }
     }
 }
-
 void ObjectMgr::LoadCreatureRespawnTimes()
 {
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.Query("SELECT guid,respawntime,instance FROM creature_respawn");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 creature respawn time.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 loguid       = fields[0].GetUInt32();
         uint64 respawn_time = fields[1].GetUInt64();
         uint32 instance     = fields[2].GetUInt32();
-
         mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)] = time_t(respawn_time);
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString( ">> Loaded %lu creature respawn times", (unsigned long)mCreatureRespawnTimes.size() );
     sLog.outString();
 }
-
 void ObjectMgr::LoadGameobjectRespawnTimes()
 {
     // remove outdated data
     WorldDatabase.DirectExecute("DELETE FROM gameobject_respawn WHERE respawntime <= UNIX_TIMESTAMP(NOW())");
-
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.Query("SELECT guid,respawntime,instance FROM gameobject_respawn");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 gameobject respawn time.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 loguid       = fields[0].GetUInt32();
         uint64 respawn_time = fields[1].GetUInt64();
         uint32 instance     = fields[2].GetUInt32();
-
         mGORespawnTimes[MAKE_PAIR64(loguid,instance)] = time_t(respawn_time);
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString( ">> Loaded %lu gameobject respawn times", (unsigned long)mGORespawnTimes.size() );
     sLog.outString();
 }
-
 // name must be checked to correctness (if received) before call this function
 uint64 ObjectMgr::GetPlayerGUIDByName(std::string name) const
 {
     uint64 guid = 0;
-
     CharacterDatabase.escape_string(name);
-
     // Player name safe to sending to DB (checked at login) and this function using
     QueryResult *result = CharacterDatabase.PQuery("SELECT guid FROM characters WHERE name = '%s'", name.c_str());
     if(result)
     {
         guid = MAKE_NEW_GUID((*result)[0].GetUInt32(), 0, HIGHGUID_PLAYER);
-
         delete result;
     }
-
     return guid;
 }
-
 bool ObjectMgr::GetPlayerNameByGUID(const uint64 &guid, std::string &name) const
 {
     // prevent DB access for online player
@@ -1769,40 +1454,32 @@ bool ObjectMgr::GetPlayerNameByGUID(const uint64 &guid, std::string &name) const
         name = player->GetName();
         return true;
     }
-
     PCachePlayerInfo pInfo = GetPlayerInfoFromCache(GUID_LOPART(guid));
     if(pInfo)
     {
         name = pInfo->sPlayerName.c_str();
         return true;
     }
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT name FROM characters WHERE guid = '%u'", GUID_LOPART(guid));
-
     if(result)
     {
         name = (*result)[0].GetCppString();
         delete result;
         return true;
     }
-
     return false;
 }
-
 uint32 ObjectMgr::GetPlayerTeamByGUID(const uint64 &guid) const
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT race FROM characters WHERE guid = '%u'", GUID_LOPART(guid));
-
     if(result)
     {
         uint8 race = (*result)[0].GetUInt8();
         delete result;
         return Player::TeamForRace(race);
     }
-
     return 0;
 }
-
 uint32 ObjectMgr::GetPlayerAccountIdByGUID(const uint64 &guid) const
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE guid = '%u'", GUID_LOPART(guid));
@@ -1812,10 +1489,8 @@ uint32 ObjectMgr::GetPlayerAccountIdByGUID(const uint64 &guid) const
         delete result;
         return acc;
     }
-
     return 0;
 }
-
 uint32 ObjectMgr::GetPlayerAccountIdByPlayerName(const std::string& name) const
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT account FROM characters WHERE name = '%s'", name.c_str());
@@ -1825,38 +1500,27 @@ uint32 ObjectMgr::GetPlayerAccountIdByPlayerName(const std::string& name) const
         delete result;
         return acc;
     }
-
     return 0;
 }
-
 void ObjectMgr::LoadItemLocales()
 {
     mItemLocaleMap.clear();                                 // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,name_loc1,description_loc1,name_loc2,description_loc2,name_loc3,description_loc3,name_loc4,description_loc4,name_loc5,description_loc5,name_loc6,description_loc6,name_loc7,description_loc7,name_loc8,description_loc8 FROM locales_item");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 Item locale strings. DB table `locales_item` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         ItemLocale& data = mItemLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[1+2*(i-1)].GetCppString();
@@ -1867,11 +1531,9 @@ void ObjectMgr::LoadItemLocales()
                 {
                     if(data.Name.size() <= idx)
                         data.Name.resize(idx+1);
-
                     data.Name[idx] = str;
                 }
             }
-
             str = fields[1+2*(i-1)+1].GetCppString();
             if(!str.empty())
             {
@@ -1880,19 +1542,15 @@ void ObjectMgr::LoadItemLocales()
                 {
                     if(data.Description.size() <= idx)
                         data.Description.resize(idx+1);
-
                     data.Description[idx] = str;
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu Item locale strings", (unsigned long)mItemLocaleMap.size() );
 }
-
 struct SQLItemLoader : public SQLStorageLoaderBase<SQLItemLoader>
 {
     template<class D>
@@ -1901,14 +1559,12 @@ struct SQLItemLoader : public SQLStorageLoaderBase<SQLItemLoader>
         dst = D(objmgr.GetScriptId(src));
     }
 };
-
 void ObjectMgr::LoadItemPrototypes()
 {
     SQLItemLoader loader;
     loader.Load(sItemStorage);
     sLog.outString( ">> Loaded %u item prototypes", sItemStorage.RecordCount );
     sLog.outString();
-
     // check data correctness
     for(uint32 i = 1; i < sItemStorage.MaxEntry; ++i)
     {
@@ -1922,7 +1578,6 @@ void ObjectMgr::LoadItemPrototypes()
             */
             continue;
         }
-
         if(dbcitem)
         {
             if(proto->Class != dbcitem->Class)
@@ -1938,25 +1593,21 @@ void ObjectMgr::LoadItemPrototypes()
                 // It safe let use Subclass from DB
             }
             */
-
             if(proto->Unk0 != dbcitem->Unk0)
             {
                 sLog.outErrorDb("Item (Entry: %u) not correct %i Unk0, must be %i (still using DB value).",i,proto->Unk0,dbcitem->Unk0);
                 // It safe let use Unk0 from DB
             }
-
             if(proto->Material != dbcitem->Material)
             {
                 sLog.outErrorDb("Item (Entry: %u) not correct %i material, must be %i (still using DB value).",i,proto->Material,dbcitem->Material);
                 // It safe let use Material from DB
             }
-
             if(proto->InventoryType != dbcitem->InventoryType)
             {
                 sLog.outErrorDb("Item (Entry: %u) not correct %u inventory type, must be %u (still using DB value).",i,proto->InventoryType,dbcitem->InventoryType);
                 // It safe let use InventoryType from DB
             }
-
             if(proto->DisplayInfoID != dbcitem->DisplayId)
             {
                 sLog.outErrorDb("Item (Entry: %u) not correct %u display id, must be %u (using it).",i,proto->DisplayInfoID,dbcitem->DisplayId);
@@ -1972,43 +1623,36 @@ void ObjectMgr::LoadItemPrototypes()
         {
             sLog.outErrorDb("Item (Entry: %u) not correct (not listed in list of existed items).",i);
         }
-
         if(proto->Class >= MAX_ITEM_CLASS)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong Class value (%u)",i,proto->Class);
             const_cast<ItemPrototype*>(proto)->Class = ITEM_CLASS_MISC;
         }
-
         if(proto->SubClass >= MaxItemSubclassValues[proto->Class])
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong Subclass value (%u) for class %u",i,proto->SubClass,proto->Class);
             const_cast<ItemPrototype*>(proto)->SubClass = 0;// exist for all item classes
         }
-
         if(proto->Quality >= MAX_ITEM_QUALITY)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong Quality value (%u)",i,proto->Quality);
             const_cast<ItemPrototype*>(proto)->Quality = ITEM_QUALITY_NORMAL;
         }
-
         if(proto->BuyCount <= 0)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong BuyCount value (%u), set to default(1).",i,proto->BuyCount);
             const_cast<ItemPrototype*>(proto)->BuyCount = 1;
         }
-
         if(proto->InventoryType >= MAX_INVTYPE)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong InventoryType value (%u)",i,proto->InventoryType);
             const_cast<ItemPrototype*>(proto)->InventoryType = INVTYPE_NON_EQUIP;
         }
-
         if(proto->RequiredSkill >= MAX_SKILL_TYPE)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong RequiredSkill value (%u)",i,proto->RequiredSkill);
             const_cast<ItemPrototype*>(proto)->RequiredSkill = 0;
         }
-
         {
             // can be used in equip slot, as page read use in inventory, or spell casting at use
             bool req = proto->InventoryType!=INVTYPE_NON_EQUIP || proto->PageText;
@@ -2023,26 +1667,21 @@ void ObjectMgr::LoadItemPrototypes()
                     }
                 }
             }
-
             if(req)
             {
                 if(!(proto->AllowableClass & CLASSMASK_ALL_PLAYABLE))
                     sLog.outErrorDb("Item (Entry: %u) not have in `AllowableClass` any playable classes (%u) and can't be equipped or use.",i,proto->AllowableClass);
-
                 if(!(proto->AllowableRace & RACEMASK_ALL_PLAYABLE))
                     sLog.outErrorDb("Item (Entry: %u) not have in `AllowableRace` any playable races (%u) and can't be equipped or use.",i,proto->AllowableRace);
             }
         }
-
         if(proto->RequiredSpell && !sSpellStore.LookupEntry(proto->RequiredSpell))
         {
             sLog.outErrorDb("Item (Entry: %u) have wrong (non-existed) spell in RequiredSpell (%u)",i,proto->RequiredSpell);
             const_cast<ItemPrototype*>(proto)->RequiredSpell = 0;
         }
-
         if(proto->RequiredReputationRank >= MAX_REPUTATION_RANK)
             sLog.outErrorDb("Item (Entry: %u) has wrong reputation rank in RequiredReputationRank (%u), item can't be used.",i,proto->RequiredReputationRank);
-
         if(proto->RequiredReputationFaction)
         {
             if(!sFactionStore.LookupEntry(proto->RequiredReputationFaction))
@@ -2050,17 +1689,14 @@ void ObjectMgr::LoadItemPrototypes()
                 sLog.outErrorDb("Item (Entry: %u) has wrong (not existing) faction in RequiredReputationFaction (%u)",i,proto->RequiredReputationFaction);
                 const_cast<ItemPrototype*>(proto)->RequiredReputationFaction = 0;
             }
-
             if(proto->RequiredReputationRank == MIN_REPUTATION_RANK)
                 sLog.outErrorDb("Item (Entry: %u) has min. reputation rank in RequiredReputationRank (0) but RequiredReputationFaction > 0, faction setting is useless.",i);
         }
-
         if(proto->MaxCount < -1)
         {
             sLog.outErrorDb("Item (Entry: %u) has too large negative in maxcount (%i), replace by value (-1) no storing limits.",i,proto->MaxCount);
             const_cast<ItemPrototype*>(proto)->MaxCount = -1;
         }
-
         if(proto->Stackable == 0)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong value in stackable (%i), replace by default 1.",i,proto->Stackable);
@@ -2076,19 +1712,16 @@ void ObjectMgr::LoadItemPrototypes()
             sLog.outErrorDb("Item (Entry: %u) has too large value in stackable (%u), replace by hardcoded upper limit (1000).",i,proto->Stackable);
             const_cast<ItemPrototype*>(proto)->Stackable = 1000;
         }
-
         if(proto->ContainerSlots > MAX_BAG_SIZE)
         {
             sLog.outErrorDb("Item (Entry: %u) has too large value in ContainerSlots (%u), replace by hardcoded limit (%u).",i,proto->ContainerSlots,MAX_BAG_SIZE);
             const_cast<ItemPrototype*>(proto)->ContainerSlots = MAX_BAG_SIZE;
         }
-
         if(proto->StatsCount > MAX_ITEM_PROTO_STATS)
         {
             sLog.outErrorDb("Item (Entry: %u) has too large value in statscount (%u), replace by hardcoded limit (%u).",i,proto->StatsCount,MAX_ITEM_PROTO_STATS);
             const_cast<ItemPrototype*>(proto)->StatsCount = MAX_ITEM_PROTO_STATS;
         }
-
         for (int j = 0; j < MAX_ITEM_PROTO_STATS; ++j)
         {
             // for ItemStatValue != 0
@@ -2097,7 +1730,6 @@ void ObjectMgr::LoadItemPrototypes()
                 sLog.outErrorDb("Item (Entry: %u) has wrong stat_type%d (%u)",i,j+1,proto->ItemStat[j].ItemStatType);
                 const_cast<ItemPrototype*>(proto)->ItemStat[j].ItemStatType = 0;
             }
-
             switch(proto->ItemStat[j].ItemStatType)
             {
                 case ITEM_MOD_SPELL_HEALING_DONE:
@@ -2108,7 +1740,6 @@ void ObjectMgr::LoadItemPrototypes()
                     break;
             }
         }
-
         for (int j = 0; j < MAX_ITEM_PROTO_DAMAGES; ++j)
         {
             if(proto->Damage[j].DamageType >= MAX_SPELL_SCHOOL)
@@ -2117,7 +1748,6 @@ void ObjectMgr::LoadItemPrototypes()
                 const_cast<ItemPrototype*>(proto)->Damage[j].DamageType = 0;
             }
         }
-
         // special format
         if((proto->Spells[0].SpellId == SPELL_ID_GENERIC_LEARN) || (proto->Spells[0].SpellId == SPELL_ID_GENERIC_LEARN_PET))
         {
@@ -2130,7 +1760,6 @@ void ObjectMgr::LoadItemPrototypes()
                 const_cast<ItemPrototype*>(proto)->Spells[1].SpellId = 0;
                 const_cast<ItemPrototype*>(proto)->Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE;
             }
-
             // spell_2 have learning spell
             if(proto->Spells[1].SpellTrigger != ITEM_SPELLTRIGGER_LEARN_SPELL_ID)
             {
@@ -2164,7 +1793,6 @@ void ObjectMgr::LoadItemPrototypes()
                     const_cast<ItemPrototype*>(proto)->Spells[1].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE;
                 }
             }
-
             // spell_3*,spell_4*,spell_5* is empty
             for (int j = 2; j < MAX_ITEM_PROTO_SPELLS; ++j)
             {
@@ -2192,7 +1820,6 @@ void ObjectMgr::LoadItemPrototypes()
                     const_cast<ItemPrototype*>(proto)->Spells[j].SpellId = 0;
                     const_cast<ItemPrototype*>(proto)->Spells[j].SpellTrigger = ITEM_SPELLTRIGGER_ON_USE;
                 }
-
                 if(proto->Spells[j].SpellId)
                 {
                     SpellEntry const* spellInfo = sSpellStore.LookupEntry(proto->Spells[j].SpellId);
@@ -2210,46 +1837,36 @@ void ObjectMgr::LoadItemPrototypes()
                 }
             }
         }
-
         if(proto->Bonding >= MAX_BIND_TYPE)
             sLog.outErrorDb("Item (Entry: %u) has wrong Bonding value (%u)",i,proto->Bonding);
-
         if(proto->PageText && !sPageTextStore.LookupEntry<PageText>(proto->PageText))
             sLog.outErrorDb("Item (Entry: %u) has non existing first page (Id:%u)", i,proto->PageText);
-
         if(proto->LockID && !sLockStore.LookupEntry(proto->LockID))
             sLog.outErrorDb("Item (Entry: %u) has wrong LockID (%u)",i,proto->LockID);
-
         if(proto->Sheath >= MAX_SHEATHETYPE)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong Sheath (%u)",i,proto->Sheath);
             const_cast<ItemPrototype*>(proto)->Sheath = SHEATHETYPE_NONE;
         }
-
         if(proto->RandomProperty && !sItemRandomPropertiesStore.LookupEntry(GetItemEnchantMod(proto->RandomProperty)))
         {
             sLog.outErrorDb("Item (Entry: %u) has unknown (wrong or not listed in `item_enchantment_template`) RandomProperty (%u)",i,proto->RandomProperty);
             const_cast<ItemPrototype*>(proto)->RandomProperty = 0;
         }
-
         if(proto->RandomSuffix && !sItemRandomSuffixStore.LookupEntry(GetItemEnchantMod(proto->RandomSuffix)))
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong RandomSuffix (%u)",i,proto->RandomSuffix);
             const_cast<ItemPrototype*>(proto)->RandomSuffix = 0;
         }
-
         if(proto->ItemSet && !sItemSetStore.LookupEntry(proto->ItemSet))
         {
             sLog.outErrorDb("Item (Entry: %u) have wrong ItemSet (%u)",i,proto->ItemSet);
             const_cast<ItemPrototype*>(proto)->ItemSet = 0;
         }
-
         if(proto->Area && !GetAreaEntryByAreaID(proto->Area))
             sLog.outErrorDb("Item (Entry: %u) has wrong Area (%u)",i,proto->Area);
-
         if(proto->Map && !sMapStore.LookupEntry(proto->Map))
             sLog.outErrorDb("Item (Entry: %u) has wrong Map (%u)",i,proto->Map);
-
         if(proto->BagFamily)
         {
             // check bits
@@ -2258,7 +1875,6 @@ void ObjectMgr::LoadItemPrototypes()
                 uint32 mask = 1 << j;
                 if((proto->BagFamily & mask)==0)
                     continue;
-
                 ItemBagFamilyEntry const* bf = sItemBagFamilyStore.LookupEntry(j+1);
                 if(!bf)
                 {
@@ -2266,7 +1882,6 @@ void ObjectMgr::LoadItemPrototypes()
                     const_cast<ItemPrototype*>(proto)->BagFamily &= ~mask;
                     continue;
                 }
-
                 if(BAG_FAMILY_MASK_CURRENCY_TOKENS & mask)
                 {
                     CurrencyTypesEntry const* ctEntry = sCurrencyTypesStore.LookupEntry(proto->ItemId);
@@ -2278,10 +1893,8 @@ void ObjectMgr::LoadItemPrototypes()
                 }
             }
         }
-
         if(proto->TotemCategory && !sTotemCategoryStore.LookupEntry(proto->TotemCategory))
             sLog.outErrorDb("Item (Entry: %u) has wrong TotemCategory (%u)",i,proto->TotemCategory);
-
         for (int j = 0; j < MAX_ITEM_PROTO_SOCKETS; ++j)
         {
             if(proto->Socket[j].Color && (proto->Socket[j].Color & SOCKET_COLOR_ALL) != proto->Socket[j].Color)
@@ -2290,22 +1903,18 @@ void ObjectMgr::LoadItemPrototypes()
                 const_cast<ItemPrototype*>(proto)->Socket[j].Color = 0;
             }
         }
-
         if(proto->GemProperties && !sGemPropertiesStore.LookupEntry(proto->GemProperties))
             sLog.outErrorDb("Item (Entry: %u) has wrong GemProperties (%u)",i,proto->GemProperties);
-
         if(proto->FoodType >= MAX_PET_DIET)
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong FoodType value (%u)",i,proto->FoodType);
             const_cast<ItemPrototype*>(proto)->FoodType = 0;
         }
-
         if(proto->ItemLimitCategory && !sItemLimitCategoryStore.LookupEntry(proto->ItemLimitCategory))
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong LimitCategory value (%u)",i,proto->ItemLimitCategory);
             const_cast<ItemPrototype*>(proto)->ItemLimitCategory = 0;
         }
-
         if(proto->HolidayId && !sHolidaysStore.LookupEntry(proto->HolidayId))
         {
             sLog.outErrorDb("Item (Entry: %u) has wrong HolidayId value (%u)", i, proto->HolidayId);
@@ -2313,47 +1922,34 @@ void ObjectMgr::LoadItemPrototypes()
         }
     }
 }
-
 void ObjectMgr::LoadItemRequiredTarget()
 {
     m_ItemRequiredTarget.clear();                           // needed for reload case
-
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,type,targetEntry FROM item_required_target");
-
     if (!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 ItemRequiredTarget. DB table `item_required_target` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 uiItemId      = fields[0].GetUInt32();
         uint32 uiType        = fields[1].GetUInt32();
         uint32 uiTargetEntry = fields[2].GetUInt32();
-
         ItemPrototype const* pItemProto = sItemStorage.LookupEntry<ItemPrototype>(uiItemId);
-
         if (!pItemProto)
         {
             sLog.outErrorDb("Table `item_required_target`: Entry %u listed for TargetEntry %u does not exist in `item_template`.",uiItemId,uiTargetEntry);
             continue;
         }
-
         bool bIsItemSpellValid = false;
-
         for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
         {
             if (SpellEntry const* pSpellInfo = sSpellStore.LookupEntry(pItemProto->Spells[i].SpellId))
@@ -2364,7 +1960,6 @@ void ObjectMgr::LoadItemRequiredTarget()
                     SpellScriptTargetBounds bounds = spellmgr.GetSpellScriptTargetBounds(pSpellInfo->Id);
                     if (bounds.first != bounds.second)
                         break;
-
                     for (int j = 0; j < 3; ++j)
                     {
                         if (pSpellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_TARGET_ENEMY ||
@@ -2381,74 +1976,58 @@ void ObjectMgr::LoadItemRequiredTarget()
                 }
             }
         }
-
         if (!bIsItemSpellValid)
         {
             sLog.outErrorDb("Table `item_required_target`: Spell used by item %u does not have implicit target TARGET_CHAIN_DAMAGE(6), TARGET_DUELVSPLAYER(25), already listed in `spell_script_target` or doesn't have item spelltrigger.",uiItemId);
             continue;
         }
-
         if (!uiType || uiType > MAX_ITEM_REQ_TARGET_TYPE)
         {
             sLog.outErrorDb("Table `item_required_target`: Type %u for TargetEntry %u is incorrect.",uiType,uiTargetEntry);
             continue;
         }
-
         if (!uiTargetEntry)
         {
             sLog.outErrorDb("Table `item_required_target`: TargetEntry == 0 for Type (%u).",uiType);
             continue;
         }
-
         if (!sCreatureStorage.LookupEntry<CreatureInfo>(uiTargetEntry))
         {
             sLog.outErrorDb("Table `item_required_target`: creature template entry %u does not exist.",uiTargetEntry);
             continue;
         }
-
         m_ItemRequiredTarget.insert(ItemRequiredTargetMap::value_type(uiItemId,ItemRequiredTarget(ItemRequiredTargetType(uiType),uiTargetEntry)));
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u Item required targets", count);
 }
-
 void ObjectMgr::LoadPetLevelInfo()
 {
     // Loading levels data
     {
         //                                                 0               1      2   3     4    5    6    7     8    9
         QueryResult *result  = WorldDatabase.Query("SELECT creature_entry, level, hp, mana, str, agi, sta, inte, spi, armor FROM pet_levelstats");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u level pet stats definitions", count );
             sLog.outErrorDb( "Error loading `pet_levelstats` table or empty table.");
             return;
         }
-
         barGoLink bar( result->GetRowCount() );
-
         do
         {
             Field* fields = result->Fetch();
-
             uint32 creature_id = fields[0].GetUInt32();
             if(!sCreatureStorage.LookupEntry<CreatureInfo>(creature_id))
             {
                 sLog.outErrorDb("Wrong creature id %u in `pet_levelstats` table, ignoring.",creature_id);
                 continue;
             }
-
             uint32 current_level = fields[1].GetUInt32();
             if(current_level > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
             {
@@ -2466,47 +2045,36 @@ void ObjectMgr::LoadPetLevelInfo()
                 sLog.outErrorDb("Wrong (<1) level %u in `pet_levelstats` table, ignoring.",current_level);
                 continue;
             }
-
             PetLevelInfo*& pInfoMapEntry = petInfo[creature_id];
-
             if(pInfoMapEntry==NULL)
                 pInfoMapEntry =  new PetLevelInfo[sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)];
-
             // data for level 1 stored in [0] array element, ...
             PetLevelInfo* pLevelInfo = &pInfoMapEntry[current_level-1];
-
             pLevelInfo->health = fields[2].GetUInt16();
             pLevelInfo->mana   = fields[3].GetUInt16();
             pLevelInfo->armor  = fields[9].GetUInt16();
-
             for (int i = 0; i < MAX_STATS; i++)
             {
                 pLevelInfo->stats[i] = fields[i+4].GetUInt16();
             }
-
             bar.step();
             ++count;
         }
         while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u level pet stats definitions", count );
     }
-
     // Fill gaps and check integrity
     for (PetLevelInfoMap::iterator itr = petInfo.begin(); itr != petInfo.end(); ++itr)
     {
         PetLevelInfo* pInfo = itr->second;
-
         // fatal error if no level 1 data
         if(!pInfo || pInfo[0].health == 0 )
         {
             sLog.outErrorDb("Creature %u does not have pet stats data for Level 1!",itr->first);
             exit(1);
         }
-
         // fill level gaps
         for (uint32 level = 1; level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL); ++level)
         {
@@ -2518,44 +2086,34 @@ void ObjectMgr::LoadPetLevelInfo()
         }
     }
 }
-
 PetLevelInfo const* ObjectMgr::GetPetLevelInfo(uint32 creature_id, uint32 level) const
 {
     if(level > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         level = sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL);
-
     PetLevelInfoMap::const_iterator itr = petInfo.find(creature_id);
     if(itr == petInfo.end())
         return NULL;
-
     return &itr->second[level-1];                           // data for level 1 stored in [0] array element, ...
 }
-
 void ObjectMgr::LoadPlayerInfo()
 {
     // Load playercreate
     {
         //                                                0     1      2    3     4           5           6
         QueryResult *result = WorldDatabase.Query("SELECT race, class, map, zone, position_x, position_y, position_z FROM playercreateinfo");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u player create definitions", count );
             sLog.outErrorDb( "Error loading `playercreateinfo` table or empty table.");
             exit(1);
         }
-
         barGoLink bar( result->GetRowCount() );
-
         do
         {
             Field* fields = result->Fetch();
-
             uint32 current_race = fields[0].GetUInt32();
             uint32 current_class = fields[1].GetUInt32();
             uint32 mapId     = fields[2].GetUInt32();
@@ -2563,152 +2121,118 @@ void ObjectMgr::LoadPlayerInfo()
             float  positionX = fields[4].GetFloat();
             float  positionY = fields[5].GetFloat();
             float  positionZ = fields[6].GetFloat();
-
             if(current_race >= MAX_RACES)
             {
                 sLog.outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race);
                 continue;
             }
-
             ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(current_race);
             if(!rEntry)
             {
                 sLog.outErrorDb("Wrong race %u in `playercreateinfo` table, ignoring.",current_race);
                 continue;
             }
-
             if(current_class >= MAX_CLASSES)
             {
                 sLog.outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class);
                 continue;
             }
-
             if(!sChrClassesStore.LookupEntry(current_class))
             {
                 sLog.outErrorDb("Wrong class %u in `playercreateinfo` table, ignoring.",current_class);
                 continue;
             }
-
             // accept DB data only for valid position (and non instanceable)
             if( !MapManager::IsValidMapCoord(mapId,positionX,positionY,positionZ) )
             {
                 sLog.outErrorDb("Wrong home position for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
                 continue;
             }
-
             if( sMapStore.LookupEntry(mapId)->Instanceable() )
             {
                 sLog.outErrorDb("Home position in instanceable map for class %u race %u pair in `playercreateinfo` table, ignoring.",current_class,current_race);
                 continue;
             }
-
             PlayerInfo* pInfo = &playerInfo[current_race][current_class];
-
             pInfo->mapId     = mapId;
             pInfo->zoneId    = zoneId;
             pInfo->positionX = positionX;
             pInfo->positionY = positionY;
             pInfo->positionZ = positionZ;
-
             pInfo->displayId_m = rEntry->model_m;
             pInfo->displayId_f = rEntry->model_f;
-
             bar.step();
             ++count;
         }
         while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u player create definitions", count );
     }
-
     // Load playercreate items
     {
         //                                                0     1      2       3
         QueryResult *result = WorldDatabase.Query("SELECT race, class, itemid, amount FROM playercreateinfo_item");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             bar.step();
-
             sLog.outString();
             sLog.outString( ">> Loaded %u custom player create items", count );
         }
         else
         {
             barGoLink bar( result->GetRowCount() );
-
             do
             {
                 Field* fields = result->Fetch();
-
                 uint32 current_race = fields[0].GetUInt32();
                 if(current_race >= MAX_RACES)
                 {
                     sLog.outErrorDb("Wrong race %u in `playercreateinfo_item` table, ignoring.",current_race);
                     continue;
                 }
-
                 uint32 current_class = fields[1].GetUInt32();
                 if(current_class >= MAX_CLASSES)
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_item` table, ignoring.",current_class);
                     continue;
                 }
-
                 PlayerInfo* pInfo = &playerInfo[current_race][current_class];
-
                 uint32 item_id = fields[2].GetUInt32();
-
                 if(!GetItemPrototype(item_id))
                 {
                     sLog.outErrorDb("Item id %u (race %u class %u) in `playercreateinfo_item` table but not listed in `item_template`, ignoring.",item_id,current_race,current_class);
                     continue;
                 }
-
                 uint32 amount  = fields[3].GetUInt32();
-
                 if(!amount)
                 {
                     sLog.outErrorDb("Item id %u (class %u race %u) have amount==0 in `playercreateinfo_item` table, ignoring.",item_id,current_race,current_class);
                     continue;
                 }
-
                 pInfo->item.push_back(PlayerCreateInfoItem( item_id, amount));
-
                 bar.step();
                 ++count;
             }
             while(result->NextRow());
-
             delete result;
-
             sLog.outString();
             sLog.outString( ">> Loaded %u custom player create items", count );
         }
     }
-
     // Load playercreate spells
     {
-
         QueryResult *result = NULL;
         if(sWorld.getConfig(CONFIG_START_ALL_SPELLS))
             result = WorldDatabase.Query("SELECT race, class, Spell, Active FROM playercreateinfo_spell_custom");
         else
             result = WorldDatabase.Query("SELECT race, class, Spell FROM playercreateinfo_spell");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u player create spells", count );
             sLog.outErrorDb( "Error loading player starting spells or empty table.");
@@ -2716,25 +2240,21 @@ void ObjectMgr::LoadPlayerInfo()
         else
         {
             barGoLink bar( result->GetRowCount() );
-
             do
             {
                 Field* fields = result->Fetch();
-
                 uint32 current_race = fields[0].GetUInt32();
                 if(current_race >= MAX_RACES)
                 {
                     sLog.outErrorDb("Wrong race %u in `playercreateinfo_spell` table, ignoring.",current_race);
                     continue;
                 }
-
                 uint32 current_class = fields[1].GetUInt32();
                 if(current_class >= MAX_CLASSES)
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_spell` table, ignoring.",current_class);
                     continue;
                 }
-
                 if(!current_race || !current_class)
                 {
                     uint32 min_race = current_race ? current_race : 1;
@@ -2747,30 +2267,23 @@ void ObjectMgr::LoadPlayerInfo()
                 }
                 else
                     playerInfo[current_race][current_class].spell.push_back(fields[2].GetUInt32());
-
                 bar.step();
                 ++count;
             }
             while( result->NextRow() );
-
             delete result;
-
             sLog.outString();
             sLog.outString( ">> Loaded %u player create spells", count );
         }
     }
-
     // Load playercreate actions
     {
         //                                                0     1      2       3       4
         QueryResult *result = WorldDatabase.Query("SELECT race, class, button, action, type FROM playercreateinfo_action");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u player create actions", count );
             sLog.outErrorDb( "Error loading `playercreateinfo_action` table or empty table.");
@@ -2778,70 +2291,55 @@ void ObjectMgr::LoadPlayerInfo()
         else
         {
             barGoLink bar( result->GetRowCount() );
-
             do
             {
                 Field* fields = result->Fetch();
-
                 uint32 current_race = fields[0].GetUInt32();
                 if(current_race >= MAX_RACES)
                 {
                     sLog.outErrorDb("Wrong race %u in `playercreateinfo_action` table, ignoring.",current_race);
                     continue;
                 }
-
                 uint32 current_class = fields[1].GetUInt32();
                 if(current_class >= MAX_CLASSES)
                 {
                     sLog.outErrorDb("Wrong class %u in `playercreateinfo_action` table, ignoring.",current_class);
                     continue;
                 }
-
                 PlayerInfo* pInfo = &playerInfo[current_race][current_class];
                 pInfo->action.push_back(PlayerCreateInfoAction(fields[2].GetUInt8(),fields[3].GetUInt32(),fields[4].GetUInt8()));
-
                 bar.step();
                 ++count;
             }
             while( result->NextRow() );
-
             delete result;
-
             sLog.outString();
             sLog.outString( ">> Loaded %u player create actions", count );
         }
     }
-
     // Loading levels data (class only dependent)
     {
         //                                                 0      1      2       3
         QueryResult *result  = WorldDatabase.Query("SELECT class, level, basehp, basemana FROM player_classlevelstats");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u level health/mana definitions", count );
             sLog.outErrorDb( "Error loading `player_classlevelstats` table or empty table.");
             exit(1);
         }
-
         barGoLink bar( result->GetRowCount() );
-
         do
         {
             Field* fields = result->Fetch();
-
             uint32 current_class = fields[0].GetUInt32();
             if(current_class >= MAX_CLASSES)
             {
                 sLog.outErrorDb("Wrong class %u in `player_classlevelstats` table, ignoring.",current_class);
                 continue;
             }
-
             uint32 current_level = fields[1].GetUInt32();
             if(current_level > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
             {
@@ -2854,44 +2352,33 @@ void ObjectMgr::LoadPlayerInfo()
                 }
                 continue;
             }
-
             PlayerClassInfo* pClassInfo = &playerClassInfo[current_class];
-
             if(!pClassInfo->levelInfo)
                 pClassInfo->levelInfo = new PlayerClassLevelInfo[sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)];
-
             PlayerClassLevelInfo* pClassLevelInfo = &pClassInfo->levelInfo[current_level-1];
-
             pClassLevelInfo->basehealth = fields[2].GetUInt16();
             pClassLevelInfo->basemana   = fields[3].GetUInt16();
-
             bar.step();
             ++count;
         }
         while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u level health/mana definitions", count );
     }
-
     // Fill gaps and check integrity
     for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
     {
         // skip non existed classes
         if(!sChrClassesStore.LookupEntry(class_))
             continue;
-
         PlayerClassInfo* pClassInfo = &playerClassInfo[class_];
-
         // fatal error if no level 1 data
         if(!pClassInfo->levelInfo || pClassInfo->levelInfo[0].basehealth == 0 )
         {
             sLog.outErrorDb("Class %i Level 1 does not have health/mana data!",class_);
             exit(1);
         }
-
         // fill level gaps
         for (uint32 level = 1; level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL); ++level)
         {
@@ -2902,44 +2389,35 @@ void ObjectMgr::LoadPlayerInfo()
             }
         }
     }
-
     // Loading levels data (class/race dependent)
     {
         //                                                 0     1      2      3    4    5    6    7
         QueryResult *result  = WorldDatabase.Query("SELECT race, class, level, str, agi, sta, inte, spi FROM player_levelstats");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u level stats definitions", count );
             sLog.outErrorDb( "Error loading `player_levelstats` table or empty table.");
             exit(1);
         }
-
         barGoLink bar( result->GetRowCount() );
-
         do
         {
             Field* fields = result->Fetch();
-
             uint32 current_race = fields[0].GetUInt32();
             if(current_race >= MAX_RACES)
             {
                 sLog.outErrorDb("Wrong race %u in `player_levelstats` table, ignoring.",current_race);
                 continue;
             }
-
             uint32 current_class = fields[1].GetUInt32();
             if(current_class >= MAX_CLASSES)
             {
                 sLog.outErrorDb("Wrong class %u in `player_levelstats` table, ignoring.",current_class);
                 continue;
             }
-
             uint32 current_level = fields[2].GetUInt32();
             if(current_level > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
             {
@@ -2952,64 +2430,49 @@ void ObjectMgr::LoadPlayerInfo()
                 }
                 continue;
             }
-
             PlayerInfo* pInfo = &playerInfo[current_race][current_class];
-
             if(!pInfo->levelInfo)
                 pInfo->levelInfo = new PlayerLevelInfo[sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)];
-
             PlayerLevelInfo* pLevelInfo = &pInfo->levelInfo[current_level-1];
-
             for (int i = 0; i < MAX_STATS; i++)
             {
                 pLevelInfo->stats[i] = fields[i+3].GetUInt8();
             }
-
             bar.step();
             ++count;
         }
         while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u level stats definitions", count );
     }
-
     // Fill gaps and check integrity
     for (int race = 0; race < MAX_RACES; ++race)
     {
         // skip non existed races
         if(!sChrRacesStore.LookupEntry(race))
             continue;
-
         for (int class_ = 0; class_ < MAX_CLASSES; ++class_)
         {
             // skip non existed classes
             if(!sChrClassesStore.LookupEntry(class_))
                 continue;
-
             PlayerInfo* pInfo = &playerInfo[race][class_];
-
             // skip non loaded combinations
             if(!pInfo->displayId_m || !pInfo->displayId_f)
                 continue;
-
             // skip expansion races if not playing with expansion
             if (sWorld.getConfig(CONFIG_EXPANSION) < 1 && (race == RACE_BLOODELF || race == RACE_DRAENEI))
                 continue;
-
             // skip expansion classes if not playing with expansion
             if (sWorld.getConfig(CONFIG_EXPANSION) < 2 && class_ == CLASS_DEATH_KNIGHT)
                 continue;
-
             // fatal error if no level 1 data
             if(!pInfo->levelInfo || pInfo->levelInfo[0].stats[0] == 0 )
             {
                 sLog.outErrorDb("Race %i Class %i Level 1 does not have stats data!",race,class_);
                 exit(1);
             }
-
             // fill level gaps
             for (uint32 level = 1; level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL); ++level)
             {
@@ -3021,37 +2484,28 @@ void ObjectMgr::LoadPlayerInfo()
             }
         }
     }
-
     // Loading xp per level data
     {
         mPlayerXPperLevel.resize(sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL));
         for (uint32 level = 0; level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL); ++level)
             mPlayerXPperLevel[level] = 0;
-
         //                                                 0    1
         QueryResult *result  = WorldDatabase.Query("SELECT lvl, xp_for_next_level FROM player_xp_for_level");
-
         uint32 count = 0;
-
         if (!result)
         {
             barGoLink bar( 1 );
-
             sLog.outString();
             sLog.outString( ">> Loaded %u xp for level definitions", count );
             sLog.outErrorDb( "Error loading `player_xp_for_level` table or empty table.");
             exit(1);
         }
-
         barGoLink bar( result->GetRowCount() );
-
         do
         {
             Field* fields = result->Fetch();
-
             uint32 current_level = fields[0].GetUInt32();
             uint32 current_xp    = fields[1].GetUInt32();
-
             if(current_level >= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
             {
                 if(current_level > STRONG_MAX_LEVEL)        // hardcoded level maximum
@@ -3069,13 +2523,10 @@ void ObjectMgr::LoadPlayerInfo()
             ++count;
         }
         while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u xp for level definitions", count );
     }
-
     // fill level gaps
     for (uint32 level = 1; level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL); ++level)
     {
@@ -3086,40 +2537,31 @@ void ObjectMgr::LoadPlayerInfo()
         }
     }
 }
-
 void ObjectMgr::GetPlayerClassLevelInfo(uint32 class_, uint32 level, PlayerClassLevelInfo* info) const
 {
     if(level < 1 || class_ >= MAX_CLASSES)
         return;
-
     PlayerClassInfo const* pInfo = &playerClassInfo[class_];
-
     if(level > sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         level = sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL);
-
     *info = pInfo->levelInfo[level-1];
 }
-
 void ObjectMgr::GetPlayerLevelInfo(uint32 race, uint32 class_, uint32 level, PlayerLevelInfo* info) const
 {
     if(level < 1 || race   >= MAX_RACES || class_ >= MAX_CLASSES)
         return;
-
     PlayerInfo const* pInfo = &playerInfo[race][class_];
     if(pInfo->displayId_m==0 || pInfo->displayId_f==0)
         return;
-
     if(level <= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         *info = pInfo->levelInfo[level-1];
     else
         BuildPlayerLevelInfo(race,class_,level,info);
 }
-
 void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, PlayerLevelInfo* info) const
 {
     // base data (last known level)
     *info = playerInfo[race][_class].levelInfo[sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)-1];
-
     // if conversion from uint32 to uint8 causes unexpected behaviour, change lvl to uint32
     for(uint8 lvl = sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL)-1; lvl < level; ++lvl)
     {
@@ -3190,35 +2632,25 @@ void ObjectMgr::BuildPlayerLevelInfo(uint8 race, uint8 _class, uint8 level, Play
         }
     }
 }
-
 void ObjectMgr::LoadGuilds()
 {
     Guild *newguild;
     uint32 count = 0;
-
     QueryResult *result = CharacterDatabase.Query( "SELECT guildid FROM guild" );
-
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u guild definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
         ++count;
-
         newguild = new Guild;
         if(!newguild->LoadGuildFromDB(fields[0].GetUInt32()))
         {
@@ -3227,47 +2659,33 @@ void ObjectMgr::LoadGuilds()
             continue;
         }
         AddGuild(newguild);
-
     }while( result->NextRow() );
-
     delete result;
-
     //delete unused LogGuid records in guild_eventlog and guild_bank_eventlog table
     //you can comment these lines if you don't plan to change CONFIG_GUILD_EVENT_LOG_COUNT and CONFIG_GUILD_BANK_EVENT_LOG_COUNT
     CharacterDatabase.PQuery("DELETE FROM guild_eventlog WHERE LogGuid > '%u'", sWorld.getConfig(CONFIG_GUILD_EVENT_LOG_COUNT));
     CharacterDatabase.PQuery("DELETE FROM guild_bank_eventlog WHERE LogGuid > '%u'", sWorld.getConfig(CONFIG_GUILD_BANK_EVENT_LOG_COUNT));
-
     sLog.outString();
     sLog.outString( ">> Loaded %u guild definitions", count );
 }
-
 void ObjectMgr::LoadArenaTeams()
 {
     uint32 count = 0;
-
     QueryResult *result = CharacterDatabase.Query( "SELECT arenateamid FROM arena_team" );
-
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u arenateam definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
         ++count;
-
         ArenaTeam *newarenateam = new ArenaTeam;
         if(!newarenateam->LoadArenaTeamFromDB(fields[0].GetUInt32()))
         {
@@ -3276,13 +2694,10 @@ void ObjectMgr::LoadArenaTeams()
         }
         AddArenaTeam(newarenateam);
     }while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u arenateam definitions", count );
 }
-
 void ObjectMgr::LoadGroups()
 {
     // -- loading groups --
@@ -3291,27 +2706,21 @@ void ObjectMgr::LoadGroups()
     uint32 count = 0;
     //                                                     0         1              2           3           4              5      6      7      8      9      10     11     12     13      14          15
     QueryResult *result = CharacterDatabase.Query("SELECT mainTank, mainAssistant, lootMethod, looterGuid, lootThreshold, icon1, icon2, icon3, icon4, icon5, icon6, icon7, icon8, isRaid, difficulty, leaderGuid FROM groups");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u group definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
         Field *fields = result->Fetch();
         ++count;
         leaderGuid = MAKE_NEW_GUID(fields[15].GetUInt32(),0,HIGHGUID_PLAYER);
-
         group = new Group;
         if(!group->LoadGroupFromDB(leaderGuid, result, false))
         {
@@ -3321,12 +2730,9 @@ void ObjectMgr::LoadGroups()
         }
         AddGroup(group);
     }while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u group definitions", count );
-
     // -- loading members --
     count = 0;
     group = NULL;
@@ -3357,7 +2763,6 @@ void ObjectMgr::LoadGroups()
                     continue;
                 }
             }
-
             if(!group->LoadMemberFromDB(fields[0].GetUInt32(), fields[2].GetUInt8(), fields[1].GetBool()))
             {
                 sLog.outErrorDb("Incorrect entry in group_member table : member %d cannot be added to player %d's group!", fields[0].GetUInt32(), fields[3].GetUInt32());
@@ -3366,7 +2771,6 @@ void ObjectMgr::LoadGroups()
         }while( result->NextRow() );
         delete result;
     }
-
     // clean groups
     // TODO: maybe delete from the DB before loading in this case
     for(GroupSet::iterator itr = mGroupSet.begin(); itr != mGroupSet.end();)
@@ -3380,7 +2784,6 @@ void ObjectMgr::LoadGroups()
         else
             ++itr;
     }
-
     // -- loading instances --
     count = 0;
     group = NULL;
@@ -3392,7 +2795,6 @@ void ObjectMgr::LoadGroups()
         "(SELECT COUNT(*) FROM character_instance WHERE guid = leaderGuid AND instance = group_instance.instance AND permanent = 1 LIMIT 1) "
         "FROM group_instance LEFT JOIN instance ON instance = id ORDER BY leaderGuid"
     );
-
     if(!result)
     {
         barGoLink bar2( 1 );
@@ -3416,36 +2818,29 @@ void ObjectMgr::LoadGroups()
                     continue;
                 }
             }
-
             MapEntry const* mapEntry = sMapStore.LookupEntry(fields[1].GetUInt32());
             if(!mapEntry || !mapEntry->IsDungeon())
             {
                 sLog.outErrorDb("Incorrect entry in group_instance table : no dungeon map %d", fields[1].GetUInt32());
                 continue;
             }
-
             InstanceSave *save = sInstanceSaveManager.AddInstanceSave(mapEntry->MapID, fields[2].GetUInt32(), fields[4].GetUInt8(), (time_t)fields[5].GetUInt64(), (fields[6].GetUInt32() == 0), true);
             group->BindToInstance(save, fields[3].GetBool(), true);
         }while( result->NextRow() );
         delete result;
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %u group-instance binds total", count );
-
     sLog.outString();
     sLog.outString( ">> Loaded %u group members total", count );
 }
-
 void ObjectMgr::LoadQuests()
 {
     // For reload case
     for(QuestMap::const_iterator itr=mQuestTemplates.begin(); itr != mQuestTemplates.end(); ++itr)
         delete itr->second;
     mQuestTemplates.clear();
-
     mExclusiveQuestGroups.clear();
-
     //                                                0      1       2           3             4         5           6     7              8
     QueryResult *result = WorldDatabase.Query("SELECT entry, Method, ZoneOrSort, SkillOrClass, MinLevel, QuestLevel, Type, RequiredRaces, RequiredSkillValue,"
     //   9                    10                 11                     12                   13                     14                   15                16
@@ -3485,13 +2880,11 @@ void ObjectMgr::LoadQuests()
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded 0 quests definitions" );
         sLog.outErrorDb("`quest_template` table is empty!");
         return;
     }
-
     // create multimap previous quest for each existed quest
     // some quests can have many previous maps set by NextQuestId in previous quest
     // for example set of race quests can lead to single not race specific quest
@@ -3500,32 +2893,25 @@ void ObjectMgr::LoadQuests()
     {
         bar.step();
         Field *fields = result->Fetch();
-
         Quest * newQuest = new Quest(fields);
         mQuestTemplates[newQuest->GetQuestId()] = newQuest;
     } while( result->NextRow() );
-
     delete result;
-
     // Post processing
     for (QuestMap::iterator iter = mQuestTemplates.begin(); iter != mQuestTemplates.end(); ++iter)
     {
         Quest * qinfo = iter->second;
-
         // additional quest integrity checks (GO, creature_template and item_template must be loaded already)
-
         if( qinfo->GetQuestMethod() >= 3 )
         {
             sLog.outErrorDb("Quest %u has `Method` = %u, expected values are 0, 1 or 2.",qinfo->GetQuestId(),qinfo->GetQuestMethod());
         }
-
         if (qinfo->QuestFlags & ~QUEST_TRINITY_FLAGS_DB_ALLOWED)
         {
             sLog.outErrorDb("Quest %u has `SpecialFlags` = %u > max allowed value. Correct `SpecialFlags` to value <= %u",
                 qinfo->GetQuestId(),qinfo->QuestFlags,QUEST_TRINITY_FLAGS_DB_ALLOWED >> 16);
             qinfo->QuestFlags &= QUEST_TRINITY_FLAGS_DB_ALLOWED;
         }
-
         if(qinfo->QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY))
         {
             if(!(qinfo->QuestFlags & QUEST_TRINITY_FLAGS_REPEATABLE))
@@ -3534,7 +2920,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->QuestFlags |= QUEST_TRINITY_FLAGS_REPEATABLE;
             }
         }
-
         if(qinfo->QuestFlags & QUEST_FLAGS_AUTO_REWARDED)
         {
             // at auto-reward can be rewarded only RewChoiceItemId[0]
@@ -3548,7 +2933,6 @@ void ObjectMgr::LoadQuests()
                 }
             }
         }
-
         // client quest log visual (area case)
         if( qinfo->ZoneOrSort > 0 )
         {
@@ -3591,7 +2975,6 @@ void ObjectMgr::LoadQuests()
                 }
             }
         }
-
         // SkillOrClass (class case)
         if( qinfo->SkillOrClass < 0 )
         {
@@ -3610,7 +2993,6 @@ void ObjectMgr::LoadQuests()
                     qinfo->GetQuestId(),qinfo->SkillOrClass,qinfo->SkillOrClass);
             }
         }
-
         if( qinfo->RequiredSkillValue )
         {
             if( qinfo->RequiredSkillValue > sWorld.GetConfigMaxSkillValue() )
@@ -3619,7 +3001,6 @@ void ObjectMgr::LoadQuests()
                     qinfo->GetQuestId(),qinfo->RequiredSkillValue,sWorld.GetConfigMaxSkillValue());
                 // no changes, quest can't be done for this requirement
             }
-
             if( qinfo->SkillOrClass <= 0 )
             {
                 sLog.outErrorDb("Quest %u has `RequiredSkillValue` = %u but `SkillOrClass` = %i (class case), value ignored.",
@@ -3628,63 +3009,54 @@ void ObjectMgr::LoadQuests()
             }
         }
         // else Skill quests can have 0 skill level, this is ok
-
         if(qinfo->RepObjectiveFaction && !sFactionStore.LookupEntry(qinfo->RepObjectiveFaction))
         {
             sLog.outErrorDb("Quest %u has `RepObjectiveFaction` = %u but faction template %u does not exist, quest can't be done.",
                 qinfo->GetQuestId(),qinfo->RepObjectiveFaction,qinfo->RepObjectiveFaction);
             // no changes, quest can't be done for this requirement
         }
-
         if(qinfo->RequiredMinRepFaction && !sFactionStore.LookupEntry(qinfo->RequiredMinRepFaction))
         {
             sLog.outErrorDb("Quest %u has `RequiredMinRepFaction` = %u but faction template %u does not exist, quest can't be done.",
                 qinfo->GetQuestId(),qinfo->RequiredMinRepFaction,qinfo->RequiredMinRepFaction);
             // no changes, quest can't be done for this requirement
         }
-
         if(qinfo->RequiredMaxRepFaction && !sFactionStore.LookupEntry(qinfo->RequiredMaxRepFaction))
         {
             sLog.outErrorDb("Quest %u has `RequiredMaxRepFaction` = %u but faction template %u does not exist, quest can't be done.",
                 qinfo->GetQuestId(),qinfo->RequiredMaxRepFaction,qinfo->RequiredMaxRepFaction);
             // no changes, quest can't be done for this requirement
         }
-
         if(qinfo->RequiredMinRepValue && qinfo->RequiredMinRepValue > ReputationMgr::Reputation_Cap)
         {
             sLog.outErrorDb("Quest %u has `RequiredMinRepValue` = %d but max reputation is %u, quest can't be done.",
                 qinfo->GetQuestId(),qinfo->RequiredMinRepValue,ReputationMgr::Reputation_Cap);
             // no changes, quest can't be done for this requirement
         }
-
         if(qinfo->RequiredMinRepValue && qinfo->RequiredMaxRepValue && qinfo->RequiredMaxRepValue <= qinfo->RequiredMinRepValue)
         {
             sLog.outErrorDb("Quest %u has `RequiredMaxRepValue` = %d and `RequiredMinRepValue` = %d, quest can't be done.",
                 qinfo->GetQuestId(),qinfo->RequiredMaxRepValue,qinfo->RequiredMinRepValue);
             // no changes, quest can't be done for this requirement
         }
-
         if(!qinfo->RepObjectiveFaction && qinfo->RepObjectiveValue > 0 )
         {
             sLog.outErrorDb("Quest %u has `RepObjectiveValue` = %d but `RepObjectiveFaction` is 0, value has no effect",
                 qinfo->GetQuestId(),qinfo->RepObjectiveValue);
             // warning
         }
-
         if(!qinfo->RequiredMinRepFaction && qinfo->RequiredMinRepValue > 0 )
         {
             sLog.outErrorDb("Quest %u has `RequiredMinRepValue` = %d but `RequiredMinRepFaction` is 0, value has no effect",
                 qinfo->GetQuestId(),qinfo->RequiredMinRepValue);
             // warning
         }
-
         if(!qinfo->RequiredMaxRepFaction && qinfo->RequiredMaxRepValue > 0 )
         {
             sLog.outErrorDb("Quest %u has `RequiredMaxRepValue` = %d but `RequiredMaxRepFaction` is 0, value has no effect",
                 qinfo->GetQuestId(),qinfo->RequiredMaxRepValue);
             // warning
         }
-
         if(qinfo->CharTitleId && !sCharTitlesStore.LookupEntry(qinfo->CharTitleId))
         {
             sLog.outErrorDb("Quest %u has `CharTitleId` = %u but CharTitle Id %u does not exist, quest can't be rewarded with title.",
@@ -3692,7 +3064,6 @@ void ObjectMgr::LoadQuests()
             qinfo->CharTitleId = 0;
             // quest can't reward this title
         }
-
         if(qinfo->SrcItemId)
         {
             if(!sItemStorage.LookupEntry<ItemPrototype>(qinfo->SrcItemId))
@@ -3714,7 +3085,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->GetQuestId(),qinfo->SrcItemCount);
             qinfo->SrcItemCount=0;                          // no quest work changes in fact
         }
-
         if(qinfo->SrcSpell)
         {
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(qinfo->SrcSpell);
@@ -3731,7 +3101,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->SrcSpell = 0;                        // quest can't be done for this requirement
             }
         }
-
         for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j )
         {
             uint32 id = qinfo->ReqItemId[j];
@@ -3743,9 +3112,7 @@ void ObjectMgr::LoadQuests()
                         qinfo->GetQuestId(),j+1,id,j+1);
                     // no changes, quest can't be done for this requirement
                 }
-
                 qinfo->SetFlag(QUEST_TRINITY_FLAGS_DELIVER);
-
                 if(!sItemStorage.LookupEntry<ItemPrototype>(id))
                 {
                     sLog.outErrorDb("Quest %u has `ReqItemId%d` = %u but item with entry %u does not exist, quest can't be done.",
@@ -3760,7 +3127,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->ReqItemCount[j] = 0;                 // prevent incorrect work of quest
             }
         }
-
         for(uint8 j = 0; j < QUEST_SOURCE_ITEM_IDS_COUNT; ++j )
         {
             uint32 id = qinfo->ReqSourceId[j];
@@ -3783,7 +3149,6 @@ void ObjectMgr::LoadQuests()
                 }
             }
         }
-
         for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j )
         {
             uint32 id = qinfo->ReqSpell[j];
@@ -3796,7 +3161,6 @@ void ObjectMgr::LoadQuests()
                         qinfo->GetQuestId(),j+1,id,id);
                     continue;
                 }
-
                 if(!qinfo->ReqCreatureOrGOId[j])
                 {
                     bool found = false;
@@ -3809,13 +3173,11 @@ void ObjectMgr::LoadQuests()
                             break;
                         }
                     }
-
                     if(found)
                     {
                         if(!qinfo->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT))
                         {
                             sLog.outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE or SPELL_EFFECT_SEND_EVENT for quest %u and ReqCreatureOrGOId%d = 0, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags or ReqCreatureOrGOId%d must be fixed, quest modified to enable objective.",spellInfo->Id,qinfo->QuestId,j+1,j+1);
-
                             // this will prevent quest completing without objective
                             const_cast<Quest*>(qinfo)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
                         }
@@ -3829,7 +3191,6 @@ void ObjectMgr::LoadQuests()
                 }
             }
         }
-
         for(uint8 j = 0; j < QUEST_OBJECTIVES_COUNT; ++j )
         {
             int32 id = qinfo->ReqCreatureOrGOId[j];
@@ -3839,20 +3200,16 @@ void ObjectMgr::LoadQuests()
                     qinfo->GetQuestId(),j+1,id,uint32(-id));
                 qinfo->ReqCreatureOrGOId[j] = 0;            // quest can't be done for this requirement
             }
-
             if(id > 0 && !sCreatureStorage.LookupEntry<CreatureInfo>(id))
             {
                 sLog.outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = %i but creature with entry %u does not exist, quest can't be done.",
                     qinfo->GetQuestId(),j+1,id,uint32(id));
                 qinfo->ReqCreatureOrGOId[j] = 0;            // quest can't be done for this requirement
             }
-
             if(id)
             {
                 // In fact SpeakTo and Kill are quite same: either you can speak to mob:SpeakTo or you can't:Kill/Cast
-
                 qinfo->SetFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO);
-
                 if(!qinfo->ReqCreatureOrGOCount[j])
                 {
                     sLog.outErrorDb("Quest %u has `ReqCreatureOrGOId%d` = %u but `ReqCreatureOrGOCount%d` = 0, quest can't be done.",
@@ -3867,7 +3224,6 @@ void ObjectMgr::LoadQuests()
                 // no changes, quest ignore this data
             }
         }
-
         for(uint8 j = 0; j < QUEST_REWARD_CHOICES_COUNT; ++j )
         {
             uint32 id = qinfo->RewChoiceItemId[j];
@@ -3879,7 +3235,6 @@ void ObjectMgr::LoadQuests()
                         qinfo->GetQuestId(),j+1,id,id);
                     qinfo->RewChoiceItemId[j] = 0;          // no changes, quest will not reward this
                 }
-
                 if(!qinfo->RewChoiceItemCount[j])
                 {
                     sLog.outErrorDb("Quest %u has `RewChoiceItemId%d` = %u but `RewChoiceItemCount%d` = 0, quest can't be done.",
@@ -3894,7 +3249,6 @@ void ObjectMgr::LoadQuests()
                 // no changes, quest ignore this data
             }
         }
-
         for(uint8 j = 0; j < QUEST_REWARDS_COUNT; ++j )
         {
             uint32 id = qinfo->RewItemId[j];
@@ -3906,7 +3260,6 @@ void ObjectMgr::LoadQuests()
                         qinfo->GetQuestId(),j+1,id,id);
                     qinfo->RewItemId[j] = 0;                // no changes, quest will not reward this item
                 }
-
                 if(!qinfo->RewItemCount[j])
                 {
                     sLog.outErrorDb("Quest %u has `RewItemId%d` = %u but `RewItemCount%d` = 0, quest will not reward this item.",
@@ -3921,7 +3274,6 @@ void ObjectMgr::LoadQuests()
                 // no changes, quest ignore this data
             }
         }
-
         for(uint8 j = 0; j < QUEST_REPUTATIONS_COUNT; ++j)
         {
             if(qinfo->RewRepFaction[j])
@@ -3932,7 +3284,6 @@ void ObjectMgr::LoadQuests()
                         qinfo->GetQuestId(),j+1,qinfo->RewRepValue[j],j+1);
                     // no changes
                 }
-
                 if(!sFactionStore.LookupEntry(qinfo->RewRepFaction[j]))
                 {
                     sLog.outErrorDb("Quest %u has `RewRepFaction%d` = %u but raw faction (faction.dbc) %u does not exist, quest will not reward reputation for this faction.",
@@ -3947,25 +3298,21 @@ void ObjectMgr::LoadQuests()
                 // no changes, quest ignore this data
             }
         }
-
         if(qinfo->RewSpell)
         {
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(qinfo->RewSpell);
-
             if(!spellInfo)
             {
                 sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u does not exist, spell removed as display reward.",
                     qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell);
                 qinfo->RewSpell = 0;                        // no spell reward will display for this quest
             }
-
             else if(!SpellMgr::IsSpellValid(spellInfo))
             {
                 sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is broken, quest will not have a spell reward.",
                     qinfo->GetQuestId(),qinfo->RewSpell,qinfo->RewSpell);
                 qinfo->RewSpell = 0;                        // no spell reward will display for this quest
             }
-
             else if(GetTalentSpellCost(qinfo->RewSpell))
             {
                 sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.",
@@ -3973,25 +3320,21 @@ void ObjectMgr::LoadQuests()
                 qinfo->RewSpell = 0;                        // no spell reward will display for this quest
             }
         }
-
         if(qinfo->RewSpellCast)
         {
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(qinfo->RewSpellCast);
-
             if(!spellInfo)
             {
                 sLog.outErrorDb("Quest %u has `RewSpellCast` = %u but spell %u does not exist, quest will not have a spell reward.",
                     qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast);
                 qinfo->RewSpellCast = 0;                    // no spell will be casted on player
             }
-
             else if(!SpellMgr::IsSpellValid(spellInfo))
             {
                 sLog.outErrorDb("Quest %u has `RewSpellCast` = %u but spell %u is broken, quest will not have a spell reward.",
                     qinfo->GetQuestId(),qinfo->RewSpellCast,qinfo->RewSpellCast);
                 qinfo->RewSpellCast = 0;                    // no spell will be casted on player
             }
-
             else if(GetTalentSpellCost(qinfo->RewSpellCast))
             {
                 sLog.outErrorDb("Quest %u has `RewSpell` = %u but spell %u is talent, quest will not have a spell reward.",
@@ -3999,7 +3342,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->RewSpellCast = 0;                    // no spell will be casted on player
             }
         }
-
         if(qinfo->RewMailTemplateId)
         {
             if(!sMailTemplateStore.LookupEntry(qinfo->RewMailTemplateId))
@@ -4010,7 +3352,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->RewMailDelaySecs = 0;                // no mail will send to player
             }
         }
-
         if(qinfo->NextQuestInChain)
         {
             QuestMap::iterator qNextItr = mQuestTemplates.find(qinfo->NextQuestInChain);
@@ -4023,7 +3364,6 @@ void ObjectMgr::LoadQuests()
             else
                 qNextItr->second->prevChainQuests.push_back(qinfo->GetQuestId());
         }
-
         // fill additional data stores
         if(qinfo->PrevQuestId)
         {
@@ -4036,7 +3376,6 @@ void ObjectMgr::LoadQuests()
                 qinfo->prevQuests.push_back(qinfo->PrevQuestId);
             }
         }
-
         if(qinfo->NextQuestId)
         {
             QuestMap::iterator qNextItr = mQuestTemplates.find(abs(qinfo->GetNextQuestId()));
@@ -4050,51 +3389,40 @@ void ObjectMgr::LoadQuests()
                 qNextItr->second->prevQuests.push_back(signedQuestId);
             }
         }
-
         if(qinfo->ExclusiveGroup)
             mExclusiveQuestGroups.insert(std::pair<int32, uint32>(qinfo->ExclusiveGroup, qinfo->GetQuestId()));
         if(qinfo->LimitTime)
             qinfo->SetFlag(QUEST_TRINITY_FLAGS_TIMED);
     }
-
     // check QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT for spell with SPELL_EFFECT_QUEST_COMPLETE
     for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i)
     {
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(i);
         if(!spellInfo)
             continue;
-
         for(uint8 j = 0; j < 3; ++j)
         {
             if(spellInfo->Effect[j] != SPELL_EFFECT_QUEST_COMPLETE)
                 continue;
-
             uint32 quest_id = spellInfo->EffectMiscValue[j];
-
             Quest const* quest = GetQuestTemplate(quest_id);
-
             // some quest referenced in spells not exist (outdated spells)
             if(!quest)
                 continue;
-
             if(!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT))
             {
                 sLog.outErrorDb("Spell (id: %u) have SPELL_EFFECT_QUEST_COMPLETE for quest %u , but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Quest flags must be fixed, quest modified to enable objective.",spellInfo->Id,quest_id);
-
                 // this will prevent quest completing without objective
                 const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
             }
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu quests definitions", (unsigned long)mQuestTemplates.size() );
 }
-
 void ObjectMgr::LoadQuestLocales()
 {
     mQuestLocaleMap.clear();                                // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,"
         "Title_loc1,Details_loc1,Objectives_loc1,OfferRewardText_loc1,RequestItemsText_loc1,EndText_loc1,ObjectiveText1_loc1,ObjectiveText2_loc1,ObjectiveText3_loc1,ObjectiveText4_loc1,"
         "Title_loc2,Details_loc2,Objectives_loc2,OfferRewardText_loc2,RequestItemsText_loc2,EndText_loc2,ObjectiveText1_loc2,ObjectiveText2_loc2,ObjectiveText3_loc2,ObjectiveText4_loc2,"
@@ -4106,29 +3434,21 @@ void ObjectMgr::LoadQuestLocales()
         "Title_loc8,Details_loc8,Objectives_loc8,OfferRewardText_loc8,RequestItemsText_loc8,EndText_loc8,ObjectiveText1_loc8,ObjectiveText2_loc8,ObjectiveText3_loc8,ObjectiveText4_loc8"
         " FROM locales_quest"
         );
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 Quest locale strings. DB table `locales_quest` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         QuestLocale& data = mQuestLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[1+10*(i-1)].GetCppString();
@@ -4139,7 +3459,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.Title.size() <= idx)
                         data.Title.resize(idx+1);
-
                     data.Title[idx] = str;
                 }
             }
@@ -4151,7 +3470,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.Details.size() <= idx)
                         data.Details.resize(idx+1);
-
                     data.Details[idx] = str;
                 }
             }
@@ -4163,7 +3481,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.Objectives.size() <= idx)
                         data.Objectives.resize(idx+1);
-
                     data.Objectives[idx] = str;
                 }
             }
@@ -4175,7 +3492,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.OfferRewardText.size() <= idx)
                         data.OfferRewardText.resize(idx+1);
-
                     data.OfferRewardText[idx] = str;
                 }
             }
@@ -4187,7 +3503,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.RequestItemsText.size() <= idx)
                         data.RequestItemsText.resize(idx+1);
-
                     data.RequestItemsText[idx] = str;
                 }
             }
@@ -4199,7 +3514,6 @@ void ObjectMgr::LoadQuestLocales()
                 {
                     if(data.EndText.size() <= idx)
                         data.EndText.resize(idx+1);
-
                     data.EndText[idx] = str;
                 }
             }
@@ -4213,49 +3527,36 @@ void ObjectMgr::LoadQuestLocales()
                     {
                         if(data.ObjectiveText[k].size() <= idx)
                             data.ObjectiveText[k].resize(idx+1);
-
                         data.ObjectiveText[k][idx] = str;
                     }
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu Quest locale strings", (unsigned long)mQuestLocaleMap.size() );
 }
-
 void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
 {
     if(sWorld.IsScriptScheduled())                          // function don't must be called in time scripts use.
         return;
-
     sLog.outString( "%s :", tablename);
-
     scripts.clear();                                        // need for reload support
-
     QueryResult *result = WorldDatabase.PQuery( "SELECT id,delay,command,datalong,datalong2,dataint, x, y, z, o FROM %s", tablename );
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u script definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
         ScriptInfo tmp;
         tmp.id        = fields[0].GetUInt32();
@@ -4268,7 +3569,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
         tmp.y         = fields[7].GetFloat();
         tmp.z         = fields[8].GetFloat();
         tmp.o         = fields[9].GetFloat();
-
         // generic command args check
         switch(tmp.command)
         {
@@ -4289,11 +3589,9 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has out of range text id (dataint = %i expected %u-%u) in SCRIPT_COMMAND_TALK for script id %u",tablename,tmp.dataint,MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID,tmp.id);
                     continue;
                 }
-
                 // if(!objmgr.GetMangosStringLocale(tmp.dataint)) will checked after db_script_string loading
                 break;
             }
-
             case SCRIPT_COMMAND_EMOTE:
             {
                 if(!sEmotesStore.LookupEntry(tmp.datalong))
@@ -4303,7 +3601,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                 }
                 break;
             }
-
             case SCRIPT_COMMAND_TELEPORT_TO:
             {
                 if(!sMapStore.LookupEntry(tmp.datalong))
@@ -4311,7 +3608,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has invalid map (Id: %u) in SCRIPT_COMMAND_TELEPORT_TO for script id %u",tablename,tmp.datalong,tmp.id);
                     continue;
                 }
-
                 if(!Trinity::IsValidMapCoord(tmp.x,tmp.y,tmp.z,tmp.o))
                 {
                     sLog.outErrorDb("Table `%s` has invalid coordinates (X: %f Y: %f) in SCRIPT_COMMAND_TELEPORT_TO for script id %u",tablename,tmp.x,tmp.y,tmp.id);
@@ -4319,7 +3615,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                 }
                 break;
             }
-
             case SCRIPT_COMMAND_TEMP_SUMMON_CREATURE:
             {
                 if(!Trinity::IsValidMapCoord(tmp.x,tmp.y,tmp.z,tmp.o))
@@ -4327,7 +3622,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has invalid coordinates (X: %f Y: %f) in SCRIPT_COMMAND_TEMP_SUMMON_CREATURE for script id %u",tablename,tmp.x,tmp.y,tmp.id);
                     continue;
                 }
-
                 if(!GetCreatureTemplate(tmp.datalong))
                 {
                     sLog.outErrorDb("Table `%s` has invalid creature (Entry: %u) in SCRIPT_COMMAND_TEMP_SUMMON_CREATURE for script id %u",tablename,tmp.datalong,tmp.id);
@@ -4335,7 +3629,6 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                 }
                 break;
             }
-
             case SCRIPT_COMMAND_RESPAWN_GAMEOBJECT:
             {
                 GameObjectData const* data = GetGOData(tmp.datalong);
@@ -4344,14 +3637,12 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has invalid gameobject (GUID: %u) in SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u",tablename,tmp.datalong,tmp.id);
                     continue;
                 }
-
                 GameObjectInfo const* info = GetGameObjectInfo(data->id);
                 if(!info)
                 {
                     sLog.outErrorDb("Table `%s` has gameobject with invalid entry (GUID: %u Entry: %u) in SCRIPT_COMMAND_RESPAWN_GAMEOBJECT for script id %u",tablename,tmp.datalong,data->id,tmp.id);
                     continue;
                 }
-
                 if( info->type==GAMEOBJECT_TYPE_FISHINGNODE ||
                     info->type==GAMEOBJECT_TYPE_FISHINGHOLE ||
                     info->type==GAMEOBJECT_TYPE_DOOR        ||
@@ -4372,20 +3663,17 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has invalid gameobject (GUID: %u) in %s for script id %u",tablename,tmp.datalong,(tmp.command==SCRIPT_COMMAND_OPEN_DOOR ? "SCRIPT_COMMAND_OPEN_DOOR" : "SCRIPT_COMMAND_CLOSE_DOOR"),tmp.id);
                     continue;
                 }
-
                 GameObjectInfo const* info = GetGameObjectInfo(data->id);
                 if(!info)
                 {
                     sLog.outErrorDb("Table `%s` has gameobject with invalid entry (GUID: %u Entry: %u) in %s for script id %u",tablename,tmp.datalong,data->id,(tmp.command==SCRIPT_COMMAND_OPEN_DOOR ? "SCRIPT_COMMAND_OPEN_DOOR" : "SCRIPT_COMMAND_CLOSE_DOOR"),tmp.id);
                     continue;
                 }
-
                 if( info->type!=GAMEOBJECT_TYPE_DOOR)
                 {
                     sLog.outErrorDb("Table `%s` has gameobject type (%u) non supported by command %s for script id %u",tablename,info->id,(tmp.command==SCRIPT_COMMAND_OPEN_DOOR ? "SCRIPT_COMMAND_OPEN_DOOR" : "SCRIPT_COMMAND_CLOSE_DOOR"),tmp.id);
                     continue;
                 }
-
                 break;
             }
             case SCRIPT_COMMAND_QUEST_EXPLORED:
@@ -4396,41 +3684,33 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                     sLog.outErrorDb("Table `%s` has invalid quest (ID: %u) in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u",tablename,tmp.datalong,tmp.id);
                     continue;
                 }
-
                 if(!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT))
                 {
                     sLog.outErrorDb("Table `%s` has quest (ID: %u) in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT in quest flags. Script command or quest flags wrong. Quest modified to require objective.",tablename,tmp.datalong,tmp.id);
-
                     // this will prevent quest completing without objective
                     const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
-
                     // continue; - quest objective requirement set and command can be allowed
                 }
-
                 if(float(tmp.datalong2) > DEFAULT_VISIBILITY_DISTANCE)
                 {
                     sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u",
                         tablename,tmp.datalong2,tmp.id);
                     continue;
                 }
-
                 if(tmp.datalong2 && float(tmp.datalong2) > DEFAULT_VISIBILITY_DISTANCE)
                 {
                     sLog.outErrorDb("Table `%s` has too large distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, max distance is %f or 0 for disable distance check",
                         tablename,tmp.datalong2,tmp.id,DEFAULT_VISIBILITY_DISTANCE);
                     continue;
                 }
-
                 if(tmp.datalong2 && float(tmp.datalong2) < INTERACTION_DISTANCE)
                 {
                     sLog.outErrorDb("Table `%s` has too small distance (%u) for exploring objective complete in `datalong2` in SCRIPT_COMMAND_QUEST_EXPLORED in `datalong` for script id %u, min distance is %f or 0 for disable distance check",
                         tablename,tmp.datalong2,tmp.id,INTERACTION_DISTANCE);
                     continue;
                 }
-
                 break;
             }
-
             case SCRIPT_COMMAND_REMOVE_AURA:
             {
                 if(!sSpellStore.LookupEntry(tmp.datalong))
@@ -4464,27 +3744,21 @@ void ObjectMgr::LoadScripts(ScriptMapMap& scripts, char const* tablename)
                 break;
             }
         }
-
         if (scripts.find(tmp.id) == scripts.end())
         {
             ScriptMap emptyMap;
             scripts[tmp.id] = emptyMap;
         }
         scripts[tmp.id].insert(std::pair<uint32, ScriptInfo>(tmp.delay, tmp));
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u script definitions", count );
 }
-
 void ObjectMgr::LoadGameObjectScripts()
 {
     LoadScripts(sGameObjectScripts,    "gameobject_scripts");
-
     // check ids
     for(ScriptMapMap::const_iterator itr = sGameObjectScripts.begin(); itr != sGameObjectScripts.end(); ++itr)
     {
@@ -4492,11 +3766,9 @@ void ObjectMgr::LoadGameObjectScripts()
             sLog.outErrorDb("Table `gameobject_scripts` has not existing gameobject (GUID: %u) as script id",itr->first);
     }
 }
-
 void ObjectMgr::LoadQuestEndScripts()
 {
     LoadScripts(sQuestEndScripts,  "quest_end_scripts");
-
     // check ids
     for(ScriptMapMap::const_iterator itr = sQuestEndScripts.begin(); itr != sQuestEndScripts.end(); ++itr)
     {
@@ -4504,11 +3776,9 @@ void ObjectMgr::LoadQuestEndScripts()
             sLog.outErrorDb("Table `quest_end_scripts` has not existing quest (Id: %u) as script id",itr->first);
     }
 }
-
 void ObjectMgr::LoadQuestStartScripts()
 {
     LoadScripts(sQuestStartScripts,"quest_start_scripts");
-
     // check ids
     for(ScriptMapMap::const_iterator itr = sQuestStartScripts.begin(); itr != sQuestStartScripts.end(); ++itr)
     {
@@ -4516,22 +3786,18 @@ void ObjectMgr::LoadQuestStartScripts()
             sLog.outErrorDb("Table `quest_start_scripts` has not existing quest (Id: %u) as script id",itr->first);
     }
 }
-
 void ObjectMgr::LoadSpellScripts()
 {
     LoadScripts(sSpellScripts, "spell_scripts");
-
     // check ids
     for(ScriptMapMap::const_iterator itr = sSpellScripts.begin(); itr != sSpellScripts.end(); ++itr)
     {
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(itr->first);
-
         if(!spellInfo)
         {
             sLog.outErrorDb("Table `spell_scripts` has not existing spell (Id: %u) as script id",itr->first);
             continue;
         }
-
         //check for correct spellEffect
         bool found = false;
         for(uint8 i=0; i<3; ++i)
@@ -4539,23 +3805,19 @@ void ObjectMgr::LoadSpellScripts()
             // skip empty effects
             if( !spellInfo->Effect[i] )
                 continue;
-
             if( spellInfo->Effect[i] == SPELL_EFFECT_SCRIPT_EFFECT )
             {
                 found =  true;
                 break;
             }
         }
-
         if(!found)
             sLog.outErrorDb("Table `spell_scripts` has unsupported spell (Id: %u) without SPELL_EFFECT_SCRIPT_EFFECT (%u) spell effect",itr->first,SPELL_EFFECT_SCRIPT_EFFECT);
     }
 }
-
 void ObjectMgr::LoadEventScripts()
 {
     LoadScripts(sEventScripts, "event_scripts");
-
     std::set<uint32> evt_scripts;
     // Load all possible script entries from gameobjects
     for(uint32 i = 1; i < sGOStorage.MaxEntry; ++i)
@@ -4606,12 +3868,10 @@ void ObjectMgr::LoadEventScripts()
                 itr->first, SPELL_EFFECT_SEND_EVENT);
     }
 }
-
 //Load WP Scripts
 void ObjectMgr::LoadWaypointScripts()
 {
     LoadScripts(sWaypointScripts, "waypoint_scripts");
-
     for(ScriptMapMap::const_iterator itr = sWaypointScripts.begin(); itr != sWaypointScripts.end(); ++itr)
     {
         QueryResult *query = WorldDatabase.PQuery("SELECT * FROM waypoint_scripts WHERE id = %u", itr->first);
@@ -4619,65 +3879,48 @@ void ObjectMgr::LoadWaypointScripts()
             sLog.outErrorDb("There is no waypoint which links to the waypoint script %u", itr->first);
     }
 }
-
 void ObjectMgr::LoadItemTexts()
 {
     QueryResult *result = CharacterDatabase.Query("SELECT id, text FROM item_text");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u item pages", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     Field* fields;
     do
     {
         bar.step();
-
         fields = result->Fetch();
-
         mItemTexts[ fields[0].GetUInt32() ] = fields[1].GetCppString();
-
         ++count;
-
     } while ( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u item texts", count );
 }
-
 void ObjectMgr::LoadPageTexts()
 {
     sPageTextStore.Free();                                  // for reload case
-
     sPageTextStore.Load();
     sLog.outString( ">> Loaded %u page texts", sPageTextStore.RecordCount );
     sLog.outString();
-
     for(uint32 i = 1; i < sPageTextStore.MaxEntry; ++i)
     {
         // check data correctness
         PageText const* page = sPageTextStore.LookupEntry<PageText>(i);
         if(!page)
             continue;
-
         if(page->Next_Page && !sPageTextStore.LookupEntry<PageText>(page->Next_Page))
         {
             sLog.outErrorDb("Page text (Id: %u) has not existing next page (Id:%u)", i,page->Next_Page);
             continue;
         }
-
         // detect circular reference
         std::set<uint32> checkedPages;
         for(PageText const* pageItr = page; pageItr; pageItr = sPageTextStore.LookupEntry<PageText>(pageItr->Next_Page))
@@ -4700,59 +3943,43 @@ void ObjectMgr::LoadPageTexts()
         }
     }
 }
-
 void ObjectMgr::LoadPageTextLocales()
 {
     mPageTextLocaleMap.clear();                             // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,text_loc1,text_loc2,text_loc3,text_loc4,text_loc5,text_loc6,text_loc7,text_loc8 FROM locales_page_text");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 PageText locale strings. DB table `locales_page_text` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         PageTextLocale& data = mPageTextLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[i].GetCppString();
             if(str.empty())
                 continue;
-
             int idx = GetOrNewIndexForLocale(LocaleConstant(i));
             if(idx >= 0)
             {
                 if(data.Text.size() <= idx)
                     data.Text.resize(idx+1);
-
                 data.Text[idx] = str;
             }
         }
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu PageText locale strings", (unsigned long)mPageTextLocaleMap.size() );
 }
-
 struct SQLInstanceLoader : public SQLStorageLoaderBase<SQLInstanceLoader>
 {
     template<class D>
@@ -4761,12 +3988,10 @@ struct SQLInstanceLoader : public SQLStorageLoaderBase<SQLInstanceLoader>
         dst = D(objmgr.GetScriptId(src));
     }
 };
-
 void ObjectMgr::LoadInstanceTemplate()
 {
     SQLInstanceLoader loader;
     loader.Load(sInstanceTemplate);
-
     for(uint32 i = 0; i < sInstanceTemplate.MaxEntry; i++)
     {
         InstanceTemplate* temp = (InstanceTemplate*)GetInstanceTemplate(i);
@@ -4779,7 +4004,6 @@ void ObjectMgr::LoadInstanceTemplate()
         }
         else if(!entry->HasResetTime())
             continue;
-
         //FIXME: now exist heroic instance, normal/heroic raid instances
         // entry->resetTimeHeroic store reset time for both heroic mode instance (raid and non-raid)
         // entry->resetTimeRaid   store reset time for normal raid only
@@ -4798,15 +4022,12 @@ void ObjectMgr::LoadInstanceTemplate()
                 temp->reset_delay = entry->resetTimeRaid / DAY;
             }
         }
-
         // the reset_delay must be at least one day
         temp->reset_delay = std::max((uint32)1, (uint32)(temp->reset_delay * sWorld.getRate(RATE_INSTANCE_RESET_TIME)));
     }
-
     sLog.outString( ">> Loaded %u Instance Template definitions", sInstanceTemplate.RecordCount );
     sLog.outString();
 }
-
 GossipText const *ObjectMgr::GetGossipText(uint32 Text_ID) const
 {
     GossipTextMap::const_iterator itr = mGossipText.find(Text_ID);
@@ -4814,52 +4035,39 @@ GossipText const *ObjectMgr::GetGossipText(uint32 Text_ID) const
         return &itr->second;
     return NULL;
 }
-
 void ObjectMgr::LoadGossipText()
 {
     QueryResult *result = WorldDatabase.Query( "SELECT * FROM npc_text" );
-
     int count = 0;
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u npc texts", count );
         return;
     }
-
     int cic;
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         cic = 0;
-
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 Text_ID    = fields[cic++].GetUInt32();
         if(!Text_ID)
         {
             sLog.outErrorDb("Table `npc_text` has record wit reserved id 0, ignore.");
             continue;
         }
-
         GossipText& gText = mGossipText[Text_ID];
-
         for (int i=0; i< 8; i++)
         {
             gText.Options[i].Text_0           = fields[cic++].GetCppString();
             gText.Options[i].Text_1           = fields[cic++].GetCppString();
-
             gText.Options[i].Language         = fields[cic++].GetUInt32();
             gText.Options[i].Probability      = fields[cic++].GetFloat();
-
             for(uint8 j=0; j < 3; ++j)
             {
                 gText.Options[i].Emotes[j]._Delay  = fields[cic++].GetUInt32();
@@ -4867,16 +4075,13 @@ void ObjectMgr::LoadGossipText()
             }
         }
     } while( result->NextRow() );
-
     sLog.outString();
     sLog.outString( ">> Loaded %u npc texts", count );
     delete result;
 }
-
 void ObjectMgr::LoadNpcTextLocales()
 {
     mNpcTextLocaleMap.clear();                              // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,"
         "Text0_0_loc1,Text0_1_loc1,Text1_0_loc1,Text1_1_loc1,Text2_0_loc1,Text2_1_loc1,Text3_0_loc1,Text3_1_loc1,Text4_0_loc1,Text4_1_loc1,Text5_0_loc1,Text5_1_loc1,Text6_0_loc1,Text6_1_loc1,Text7_0_loc1,Text7_1_loc1,"
         "Text0_0_loc2,Text0_1_loc2,Text1_0_loc2,Text1_1_loc2,Text2_0_loc2,Text2_1_loc2,Text3_0_loc2,Text3_1_loc1,Text4_0_loc2,Text4_1_loc2,Text5_0_loc2,Text5_1_loc2,Text6_0_loc2,Text6_1_loc2,Text7_0_loc2,Text7_1_loc2,"
@@ -4887,29 +4092,21 @@ void ObjectMgr::LoadNpcTextLocales()
         "Text0_0_loc7,Text0_1_loc7,Text1_0_loc7,Text1_1_loc7,Text2_0_loc7,Text2_1_loc7,Text3_0_loc7,Text3_1_loc1,Text4_0_loc7,Text4_1_loc7,Text5_0_loc7,Text5_1_loc7,Text6_0_loc7,Text6_1_loc7,Text7_0_loc7,Text7_1_loc7, "
         "Text0_0_loc8,Text0_1_loc8,Text1_0_loc8,Text1_1_loc8,Text2_0_loc8,Text2_1_loc8,Text3_0_loc8,Text3_1_loc1,Text4_0_loc8,Text4_1_loc8,Text5_0_loc8,Text5_1_loc8,Text6_0_loc8,Text6_1_loc8,Text7_0_loc8,Text7_1_loc8 "
         " FROM locales_npc_text");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 NpcText locale strings. DB table `locales_npc_text` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         NpcTextLocale& data = mNpcTextLocaleMap[entry];
-
         for(uint8 i=1; i<MAX_LOCALE; ++i)
         {
             for(uint8 j=0; j<8; ++j)
@@ -4922,7 +4119,6 @@ void ObjectMgr::LoadNpcTextLocales()
                     {
                         if(data.Text_0[j].size() <= idx)
                             data.Text_0[j].resize(idx+1);
-
                         data.Text_0[j][idx] = str0;
                     }
                 }
@@ -4934,20 +4130,16 @@ void ObjectMgr::LoadNpcTextLocales()
                     {
                         if(data.Text_1[j].size() <= idx)
                             data.Text_1[j].resize(idx+1);
-
                         data.Text_1[j][idx] = str1;
                     }
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu NpcText locale strings", (unsigned long)mNpcTextLocaleMap.size() );
 }
-
 //not very fast function but it is called only once a day, or on starting-up
 void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
 {
@@ -4966,20 +4158,16 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
         sLog.outString(">> Only expired mails (need to be return or delete) or DB table `mail` is empty.");
         return;                                             // any mails need to be returned or deleted
     }
-
     //std::ostringstream delitems, delmails; //will be here for optimization
     //bool deletemail = false, deleteitem = false;
     //delitems << "DELETE FROM item_instance WHERE guid IN ( ";
     //delmails << "DELETE FROM mail WHERE id IN ( "
-
     barGoLink bar( result->GetRowCount() );
     uint32 count = 0;
     Field *fields;
-
     do
     {
         bar.step();
-
         fields = result->Fetch();
         Mail *m = new Mail;
         m->messageID = fields[0].GetUInt32();
@@ -4993,7 +4181,6 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
         m->COD = fields[7].GetUInt32();
         m->checked = fields[8].GetUInt32();
         m->mailTemplateId = fields[9].GetInt16();
-
         Player *pl = 0;
         if (serverUp)
             pl = GetPlayer((uint64)m->receiver);
@@ -5012,14 +4199,11 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
                 do
                 {
                     Field *fields2 = resultItems->Fetch();
-
                     uint32 item_guid_low = fields2[0].GetUInt32();
                     uint32 item_template = fields2[1].GetUInt32();
-
                     m->AddItem(item_guid_low, item_template);
                 }
                 while (resultItems->NextRow());
-
                 delete resultItems;
             }
             //if it is mail from AH, it shouldn't be returned, but deleted
@@ -5037,10 +4221,8 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
                 continue;
             }
         }
-
         if (m->itemTextId)
             CharacterDatabase.PExecute("DELETE FROM item_text WHERE id = '%u'", m->itemTextId);
-
         //deletemail = true;
         //delmails << m->messageID << ", ";
         CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", m->messageID);
@@ -5048,150 +4230,108 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp)
         ++count;
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u mails", count );
 }
-
 void ObjectMgr::LoadQuestAreaTriggers()
 {
     mQuestAreaTriggerMap.clear();                           // need for reload case
-
     QueryResult *result = WorldDatabase.Query( "SELECT id,quest FROM areatrigger_involvedrelation" );
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u quest trigger points", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 trigger_ID = fields[0].GetUInt32();
         uint32 quest_ID   = fields[1].GetUInt32();
-
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(trigger_ID);
         if(!atEntry)
         {
             sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",trigger_ID);
             continue;
         }
-
         Quest const* quest = GetQuestTemplate(quest_ID);
-
         if(!quest)
         {
             sLog.outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not existing quest %u",trigger_ID,quest_ID);
             continue;
         }
-
         if(!quest->HasFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT))
         {
             sLog.outErrorDb("Table `areatrigger_involvedrelation` has record (id: %u) for not quest %u, but quest not have flag QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT. Trigger or quest flags must be fixed, quest modified to require objective.",trigger_ID,quest_ID);
-
             // this will prevent quest completing without objective
             const_cast<Quest*>(quest)->SetFlag(QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT);
-
             // continue; - quest modified to required objective and trigger can be allowed.
         }
-
         mQuestAreaTriggerMap[trigger_ID] = quest_ID;
-
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u quest trigger points", count );
 }
-
 void ObjectMgr::LoadTavernAreaTriggers()
 {
     mTavernAreaTriggerSet.clear();                          // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT id FROM areatrigger_tavern");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u tavern triggers", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 Trigger_ID      = fields[0].GetUInt32();
-
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
         if(!atEntry)
         {
             sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
             continue;
         }
-
         mTavernAreaTriggerSet.insert(Trigger_ID);
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u tavern triggers", count );
 }
-
 void ObjectMgr::LoadAreaTriggerScripts()
 {
     mAreaTriggerScripts.clear();                            // need for reload case
     QueryResult *result = WorldDatabase.Query("SELECT entry, ScriptName FROM areatrigger_scripts");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u areatrigger scripts", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 Trigger_ID      = fields[0].GetUInt32();
         const char *scriptName = fields[1].GetString();
-
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
         if(!atEntry)
         {
@@ -5200,32 +4340,25 @@ void ObjectMgr::LoadAreaTriggerScripts()
         }
         mAreaTriggerScripts[Trigger_ID] = GetScriptId(scriptName);
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u areatrigger scripts", count );
 }
-
 uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, uint32 team )
 {
     bool found = false;
     float dist;
     uint32 id = 0;
-
     for(uint32 i = 1; i < sTaxiNodesStore.GetNumRows(); ++i)
     {
         TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(i);
         if(!node || node->map_id != mapid || !node->MountCreatureID[team == ALLIANCE ? 1 : 0] && node->MountCreatureID[0] != 32981) // dk flight
             continue;
-
         uint8  field   = (uint8)((i - 1) / 32);
         uint32 submask = 1<<((i-1)%32);
-
         // skip not taxi network nodes
         if((sTaxiNodesMask[field] & submask)==0)
             continue;
-
         float dist2 = (node->x - x)*(node->x - x)+(node->y - y)*(node->y - y)+(node->z - z)*(node->z - z);
         if(found)
         {
@@ -5242,10 +4375,8 @@ uint32 ObjectMgr::GetNearestTaxiNode( float x, float y, float z, uint32 mapid, u
             id = i;
         }
     }
-
     return id;
 }
-
 void ObjectMgr::GetTaxiPath( uint32 source, uint32 destination, uint32 &path, uint32 &cost)
 {
     TaxiPathSetBySource::iterator src_i = sTaxiPathSetBySource.find(source);
@@ -5255,9 +4386,7 @@ void ObjectMgr::GetTaxiPath( uint32 source, uint32 destination, uint32 &path, ui
         cost = 0;
         return;
     }
-
     TaxiPathSetForSource& pathSet = src_i->second;
-
     TaxiPathSetForSource::iterator dest_i = pathSet.find(destination);
     if(dest_i==pathSet.end())
     {
@@ -5265,16 +4394,13 @@ void ObjectMgr::GetTaxiPath( uint32 source, uint32 destination, uint32 &path, ui
         cost = 0;
         return;
     }
-
     cost = dest_i->second.price;
     path = dest_i->second.ID;
 }
-
 uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_alt_team /* = false */)
 {
     uint32 mount_entry = 0;
     uint32 mount_id = 0;
-
     // select mount creature id
     TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(id);
     if(node)
@@ -5283,7 +4409,6 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al
             mount_entry = node->MountCreatureID[1];
         else
             mount_entry = node->MountCreatureID[0];
-
     	// Fix for Alliance not being able to use Acherus taxi
     	// only one mount type for both sides
     	if (mount_entry == 0 && allowed_alt_team)
@@ -5292,7 +4417,6 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al
     		//  have a valid mount ID to choose
     		mount_entry = (team == ALLIANCE) ? node->MountCreatureID[0] : node->MountCreatureID[1];
     	}
-
         CreatureInfo const *mount_info = GetCreatureTemplate(mount_entry);
         if (mount_info)
         {
@@ -5303,43 +4427,32 @@ uint32 ObjectMgr::GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_al
             }
         }
     }
-
     CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(mount_id);
     if (minfo)
         mount_id = minfo->modelid;
-
     return mount_id;
 }
-
 void ObjectMgr::GetTaxiPathNodes( uint32 path, Path &pathnodes, std::vector<uint32>& mapIds)
 {
     if(path >= sTaxiPathNodesByPath.size())
         return;
-
     TaxiPathNodeList& nodeList = sTaxiPathNodesByPath[path];
-
     pathnodes.Resize(nodeList.size());
     mapIds.resize(nodeList.size());
-
     for(size_t i = 0; i < nodeList.size(); ++i)
     {
         pathnodes[ i ].x = nodeList[i].x;
         pathnodes[ i ].y = nodeList[i].y;
         pathnodes[ i ].z = nodeList[i].z;
-
         mapIds[i] = nodeList[i].mapid;
     }
 }
-
 void ObjectMgr::GetTransportPathNodes( uint32 path, TransportPath &pathnodes )
 {
     if(path >= sTaxiPathNodesByPath.size())
         return;
-
     TaxiPathNodeList& nodeList = sTaxiPathNodesByPath[path];
-
     pathnodes.Resize(nodeList.size());
-
     for(size_t i = 0; i < nodeList.size(); ++i)
     {
         pathnodes[ i ].mapid = nodeList[i].mapid;
@@ -5350,79 +4463,61 @@ void ObjectMgr::GetTransportPathNodes( uint32 path, TransportPath &pathnodes )
         pathnodes[ i ].delay = nodeList[i].delay;
     }
 }
-
 void ObjectMgr::LoadGraveyardZones()
 {
     mGraveYardMap.clear();                                  // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT id,ghost_zone,faction FROM game_graveyard_zone");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u graveyard-zone links", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         ++count;
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 safeLocId = fields[0].GetUInt32();
         uint32 zoneId = fields[1].GetUInt32();
         uint32 team   = fields[2].GetUInt32();
-
         WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(safeLocId);
         if(!entry)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.",safeLocId);
             continue;
         }
-
         AreaTableEntry const *areaEntry = GetAreaEntryByAreaID(zoneId);
         if(!areaEntry)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record for not existing zone id (%u), skipped.",zoneId);
             continue;
         }
-
         if(areaEntry->zone != 0)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record subzone id (%u) instead of zone, skipped.",zoneId);
             continue;
         }
-
         if(team!=0 && team!=HORDE && team!=ALLIANCE)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record for non player faction (%u), skipped.",team);
             continue;
         }
-
         if(!AddGraveYardLink(safeLocId,zoneId,team,false))
             sLog.outErrorDb("Table `game_graveyard_zone` has a duplicate record for Graveyard (ID: %u) and Zone (ID: %u), skipped.",safeLocId,zoneId);
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u graveyard-zone links", count );
 }
-
 WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team)
 {
     // search for zone associated closest graveyard
     uint32 zoneId = MapManager::Instance().GetZoneId(MapId,x,y,z);
-
     // Simulate std. algorithm:
     //   found some graveyard associated to (ghost_zone,ghost_map)
     //
@@ -5434,44 +4529,35 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
     GraveYardMap::const_iterator graveUp   = mGraveYardMap.upper_bound(zoneId);
     MapEntry const* map = sMapStore.LookupEntry(MapId);
     // not need to check validity of map object; MapId _MUST_ be valid here
-
     if(graveLow==graveUp && !map->IsBattleArena())
     {
         sLog.outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team);
         return NULL;
     }
-
     // at corpse map
     bool foundNear = false;
     float distNear;
     WorldSafeLocsEntry const* entryNear = NULL;
-
     // at entrance map for corpse map
     bool foundEntr = false;
     float distEntr;
     WorldSafeLocsEntry const* entryEntr = NULL;
-
     // some where other
     WorldSafeLocsEntry const* entryFar = NULL;
-
     MapEntry const* mapEntry = sMapStore.LookupEntry(MapId);
-
     for(GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr)
     {
         GraveYardData const& data = itr->second;
-
         WorldSafeLocsEntry const* entry = sWorldSafeLocsStore.LookupEntry(data.safeLocId);
         if(!entry)
         {
             sLog.outErrorDb("Table `game_graveyard_zone` has record for not existing graveyard (WorldSafeLocs.dbc id) %u, skipped.",data.safeLocId);
             continue;
         }
-
         // skip enemy faction graveyard
         // team == 0 case can be at call from .neargrave
         if(data.team != 0 && team != 0 && data.team != team)
             continue;
-
         // find now nearest graveyard at other map
         if(MapId != entry->map_id)
         {
@@ -5485,7 +4571,6 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
                 entryFar = entry;
                 continue;
             }
-
             // at entrance map calculate distance (2D);
             float dist2 = (entry->x - mapEntry->entrance_x)*(entry->x - mapEntry->entrance_x)
                 +(entry->y - mapEntry->entrance_y)*(entry->y - mapEntry->entrance_y);
@@ -5524,52 +4609,40 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
             }
         }
     }
-
     if(entryNear)
         return entryNear;
-
     if(entryEntr)
         return entryEntr;
-
     return entryFar;
 }
-
 GraveYardData const* ObjectMgr::FindGraveYardData(uint32 id, uint32 zoneId)
 {
     GraveYardMap::const_iterator graveLow  = mGraveYardMap.lower_bound(zoneId);
     GraveYardMap::const_iterator graveUp   = mGraveYardMap.upper_bound(zoneId);
-
     for(GraveYardMap::const_iterator itr = graveLow; itr != graveUp; ++itr)
     {
         if(itr->second.safeLocId==id)
             return &itr->second;
     }
-
     return NULL;
 }
-
 bool ObjectMgr::AddGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool inDB)
 {
     if(FindGraveYardData(id,zoneId))
         return false;
-
     // add link to loaded data
     GraveYardData data;
     data.safeLocId = id;
     data.team = team;
-
     mGraveYardMap.insert(GraveYardMap::value_type(zoneId,data));
-
     // add link to DB
     if(inDB)
     {
         WorldDatabase.PExecuteLog("INSERT INTO game_graveyard_zone ( id,ghost_zone,faction) "
             "VALUES ('%u', '%u','%u')",id,zoneId,team);
     }
-
     return true;
 }
-
 void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool inDB)
 {
     GraveYardMap::iterator graveLow  = mGraveYardMap.lower_bound(zoneId);
@@ -5579,150 +4652,107 @@ void ObjectMgr::RemoveGraveYardLink(uint32 id, uint32 zoneId, uint32 team, bool
         //sLog.outErrorDb("Table `game_graveyard_zone` incomplete: Zone %u Team %u does not have a linked graveyard.",zoneId,team);
         return;
     }
-
     bool found = false;
-
     GraveYardMap::iterator itr;
-
     for(itr = graveLow; itr != graveUp; ++itr)
     {
         GraveYardData & data = itr->second;
-
         // skip not matching safezone id
         if(data.safeLocId != id)
             continue;
-
         // skip enemy faction graveyard at same map (normal area, city, or battleground)
         // team == 0 case can be at call from .neargrave
         if(data.team != 0 && team != 0 && data.team != team)
             continue;
-
         found = true;
         break;
     }
-
     // no match, return
     if(!found)
         return;
-
     // remove from links
     mGraveYardMap.erase(itr);
-
     // remove link from DB
     if(inDB)
     {
         WorldDatabase.PExecute("DELETE FROM game_graveyard_zone WHERE id = '%u' AND ghost_zone = '%u' AND faction = '%u'",id,zoneId,team);
     }
-
     return;
 }
 
-
 void ObjectMgr::LoadAreaTriggerTeleports()
 {
     mAreaTriggers.clear();                                  // need for reload case
-
     uint32 count = 0;
-
     //                                                0       1           2              3               4                   5                   6
     QueryResult *result = WorldDatabase.Query("SELECT id, access_id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u area trigger teleport definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         ++count;
-
         uint32 Trigger_ID = fields[0].GetUInt32();
-
         AreaTrigger at;
-
         at.access_id                = fields[1].GetUInt32();
         at.target_mapId             = fields[2].GetUInt32();
         at.target_X                 = fields[3].GetFloat();
         at.target_Y                 = fields[4].GetFloat();
         at.target_Z                 = fields[5].GetFloat();
         at.target_Orientation       = fields[6].GetFloat();
-
         AreaTriggerEntry const* atEntry = sAreaTriggerStore.LookupEntry(Trigger_ID);
         if(!atEntry)
         {
             sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
             continue;
         }
-
         MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
         if(!mapEntry)
         {
             sLog.outErrorDb("Area trigger (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Trigger_ID,at.target_mapId);
             continue;
         }
-
         if(at.target_X==0 && at.target_Y==0 && at.target_Z==0)
         {
             sLog.outErrorDb("Area trigger (ID:%u) target coordinates not provided.",Trigger_ID);
             continue;
         }
-
         mAreaTriggers[Trigger_ID] = at;
-
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u area trigger teleport definitions", count );
 }
-
 void ObjectMgr::LoadAccessRequirements()
 {
     mAccessRequirements.clear();                                  // need for reload case
-
     uint32 count = 0;
-
     //                                                0       1          2       3      4        5           6             7              8                   9                  10                         11
     QueryResult *result = WorldDatabase.Query("SELECT id, level_min, level_max, item, item2, heroic_key, heroic_key2, quest_done, quest_failed_text, heroic_quest_done, heroic_quest_failed_text, heroic_level_min FROM access_requirement");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u access requirement definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         ++count;
-
         uint32 requiremt_ID = fields[0].GetUInt32();
-
         AccessRequirement ar;
-
         ar.levelMin                 = fields[1].GetUInt8();
         ar.levelMax                 = fields[2].GetUInt8();
         ar.heroicLevelMin           = fields[11].GetUInt8();
@@ -5734,7 +4764,6 @@ void ObjectMgr::LoadAccessRequirements()
         ar.questFailedText          = fields[8].GetCppString();
         ar.heroicQuest              = fields[9].GetUInt32();
         ar.heroicQuestFailedText    = fields[10].GetCppString();
-
         if(ar.item)
         {
             ItemPrototype const *pProto = GetItemPrototype(ar.item);
@@ -5744,7 +4773,6 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.item = 0;
             }
         }
-
         if(ar.item2)
         {
             ItemPrototype const *pProto = GetItemPrototype(ar.item2);
@@ -5754,7 +4782,6 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.item2 = 0;
             }
         }
-
         if(ar.heroicKey)
         {
             ItemPrototype const *pProto = GetItemPrototype(ar.heroicKey);
@@ -5764,7 +4791,6 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.heroicKey = 0;
             }
         }
-
         if(ar.heroicKey2)
         {
             ItemPrototype const *pProto = GetItemPrototype(ar.heroicKey2);
@@ -5774,7 +4800,6 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.heroicKey2 = 0;
             }
         }
-
         if(ar.heroicQuest)
         {
             QuestMap::iterator qReqItr = mQuestTemplates.find(ar.heroicQuest);
@@ -5784,7 +4809,6 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.heroicQuest = 0;
             }
         }
-
         if(ar.quest)
         {
             QuestMap::iterator qReqItr = mQuestTemplates.find(ar.quest);
@@ -5794,17 +4818,12 @@ void ObjectMgr::LoadAccessRequirements()
                 ar.quest = 0;
             }
         }
-
         mAccessRequirements[requiremt_ID] = ar;
-
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u access requirement definitions", count );
 }
-
 /*
  * Searches for the areatrigger which teleports players out of the given map
  */
@@ -5823,7 +4842,6 @@ AreaTrigger const* ObjectMgr::GetGoBackTrigger(uint32 Map) const
     }
     return NULL;
 }
-
 /**
  * Searches for the areatrigger which teleports players to the given map
  */
@@ -5840,7 +4858,6 @@ AreaTrigger const* ObjectMgr::GetMapEntranceTrigger(uint32 Map) const
     }
     return NULL;
 }
-
 void ObjectMgr::SetHighestGuids()
 {
     QueryResult *result = CharacterDatabase.Query( "SELECT MAX(guid) FROM characters" );
@@ -5849,76 +4866,65 @@ void ObjectMgr::SetHighestGuids()
         m_hiCharGuid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = WorldDatabase.Query( "SELECT MAX(guid) FROM creature" );
     if( result )
     {
         m_hiCreatureGuid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query( "SELECT MAX(guid) FROM item_instance" );
     if( result )
     {
         m_hiItemGuid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     // Cleanup other tables from not existed guids (>=m_hiItemGuid)
     CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item >= '%u'", m_hiItemGuid);
     CharacterDatabase.PExecute("DELETE FROM mail_items WHERE item_guid >= '%u'", m_hiItemGuid);
     CharacterDatabase.PExecute("DELETE FROM auctionhouse WHERE itemguid >= '%u'", m_hiItemGuid);
     CharacterDatabase.PExecute("DELETE FROM guild_bank_item WHERE item_guid >= '%u'", m_hiItemGuid);
-
     result = WorldDatabase.Query("SELECT MAX(guid) FROM gameobject" );
     if( result )
     {
         m_hiGoGuid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query("SELECT MAX(id) FROM auctionhouse" );
     if( result )
     {
         m_auctionid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query( "SELECT MAX(id) FROM mail" );
     if( result )
     {
         m_mailid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query( "SELECT MAX(id) FROM item_text" );
     if( result )
     {
         m_ItemTextId = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query( "SELECT MAX(guid) FROM corpse" );
     if( result )
     {
         m_hiCorpseGuid = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query("SELECT MAX(arenateamid) FROM arena_team");
     if (result)
     {
         m_arenaTeamId = (*result)[0].GetUInt32()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query("SELECT MAX(setguid) FROM character_equipmentsets");
     if (result)
     {
         m_equipmentSetGuid = (*result)[0].GetUInt64()+1;
         delete result;
     }
-
     result = CharacterDatabase.Query( "SELECT MAX(guildid) FROM guild" );
     if (result)
     {
@@ -5926,7 +4932,6 @@ void ObjectMgr::SetHighestGuids()
         delete result;
     }
 }
-
 uint32 ObjectMgr::GenerateArenaTeamId()
 {
     if(m_arenaTeamId>=0xFFFFFFFE)
@@ -5936,7 +4941,6 @@ uint32 ObjectMgr::GenerateArenaTeamId()
     }
     return m_arenaTeamId++;
 }
-
 uint32 ObjectMgr::GenerateAuctionID()
 {
     if(m_auctionid>=0xFFFFFFFE)
@@ -5946,7 +4950,6 @@ uint32 ObjectMgr::GenerateAuctionID()
     }
     return m_auctionid++;
 }
-
 uint64 ObjectMgr::GenerateEquipmentSetGuid()
 {
     if(m_equipmentSetGuid>=0xFFFFFFFFFFFFFFFEll)
@@ -5956,7 +4959,6 @@ uint64 ObjectMgr::GenerateEquipmentSetGuid()
     }
     return m_equipmentSetGuid++;
 }
-
 uint32 ObjectMgr::GenerateGuildId()
 {
     if(m_guildId>=0xFFFFFFFE)
@@ -5966,7 +4968,6 @@ uint32 ObjectMgr::GenerateGuildId()
     }
     return m_guildId++;
 }
-
 uint32 ObjectMgr::GenerateMailID()
 {
     if(m_mailid>=0xFFFFFFFE)
@@ -5976,7 +4977,6 @@ uint32 ObjectMgr::GenerateMailID()
     }
     return m_mailid++;
 }
-
 uint32 ObjectMgr::GenerateItemTextID()
 {
     if(m_ItemTextId>=0xFFFFFFFE)
@@ -5986,7 +4986,6 @@ uint32 ObjectMgr::GenerateItemTextID()
     }
     return m_ItemTextId++;
 }
-
 uint32 ObjectMgr::CreateItemText(std::string text)
 {
     uint32 newItemTextId = GenerateItemTextID();
@@ -6000,7 +4999,6 @@ uint32 ObjectMgr::CreateItemText(std::string text)
     CharacterDatabase.Execute(query.str().c_str());         //needs to be run this way, because mail body may be more than 1024 characters
     return newItemTextId;
 }
-
 uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh)
 {
     switch(guidhigh)
@@ -6064,42 +5062,31 @@ uint32 ObjectMgr::GenerateLowGuid(HighGuid guidhigh)
         default:
             ASSERT(0);
     }
-
     ASSERT(0);
     return 0;
 }
-
 void ObjectMgr::LoadGameObjectLocales()
 {
     mGameObjectLocaleMap.clear();                           // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,"
         "name_loc1,name_loc2,name_loc3,name_loc4,name_loc5,name_loc6,name_loc7,name_loc8,"
         "castbarcaption_loc1,castbarcaption_loc2,castbarcaption_loc3,castbarcaption_loc4,"
         "castbarcaption_loc5,castbarcaption_loc6,castbarcaption_loc7,castbarcaption_loc8 FROM locales_gameobject");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 gameobject locale strings. DB table `locales_gameobject` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         GameObjectLocale& data = mGameObjectLocaleMap[entry];
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[i].GetCppString();
@@ -6110,12 +5097,10 @@ void ObjectMgr::LoadGameObjectLocales()
                 {
                     if(data.Name.size() <= idx)
                         data.Name.resize(idx+1);
-
                     data.Name[idx] = str;
                 }
             }
         }
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[i+(MAX_LOCALE-1)].GetCppString();
@@ -6126,20 +5111,15 @@ void ObjectMgr::LoadGameObjectLocales()
                 {
                     if(data.CastBarCaption.size() <= idx)
                         data.CastBarCaption.resize(idx+1);
-
                     data.CastBarCaption[idx] = str;
                 }
             }
         }
-
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %lu gameobject locale strings", (unsigned long)mGameObjectLocaleMap.size() );
 }
-
 struct SQLGameObjectLoader : public SQLStorageLoaderBase<SQLGameObjectLoader>
 {
     template<class D>
@@ -6148,16 +5128,13 @@ struct SQLGameObjectLoader : public SQLStorageLoaderBase<SQLGameObjectLoader>
         dst = D(objmgr.GetScriptId(src));
     }
 };
-
 inline void CheckGOLockId(GameObjectInfo const* goInfo,uint32 dataN,uint32 N)
 {
     if (sLockStore.LookupEntry(dataN))
         return;
-
     sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but lock (Id: %u) not found.",
         goInfo->id,goInfo->type,N,goInfo->door.lockId,goInfo->door.lockId);
 }
-
 inline void CheckGOLinkedTrapId(GameObjectInfo const* goInfo,uint32 dataN,uint32 N)
 {
     if (GameObjectInfo const* trapInfo = sGOStorage.LookupEntry<GameObjectInfo>(dataN))
@@ -6172,62 +5149,49 @@ inline void CheckGOLinkedTrapId(GameObjectInfo const* goInfo,uint32 dataN,uint32
             goInfo->id,goInfo->type,N,dataN,dataN);
     */
 }
-
 inline void CheckGOSpellId(GameObjectInfo const* goInfo,uint32 dataN,uint32 N)
 {
     if (sSpellStore.LookupEntry(dataN))
         return;
-
     sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but Spell (Entry %u) not exist.",
         goInfo->id,goInfo->type,N,dataN,dataN);
 }
-
 inline void CheckAndFixGOChairHeightId(GameObjectInfo const* goInfo,uint32 const& dataN,uint32 N)
 {
     if (dataN <= (UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR) )
         return;
-
     sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but correct chair height in range 0..%i.",
         goInfo->id,goInfo->type,N,dataN,UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR);
-
     // prevent client and server unexpected work
     const_cast<uint32&>(dataN) = 0;
 }
-
 inline void CheckGONoDamageImmuneId(GameObjectInfo const* goInfo,uint32 dataN,uint32 N)
 {
     // 0/1 correct values
     if (dataN <= 1)
         return;
-
     sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but expected boolean (0/1) noDamageImmune field value.",
         goInfo->id,goInfo->type,N,dataN);
 }
-
 inline void CheckGOConsumable(GameObjectInfo const* goInfo,uint32 dataN,uint32 N)
 {
     // 0/1 correct values
     if (dataN <= 1)
         return;
-
     sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data%d=%u but expected boolean (0/1) consumable field value.",
         goInfo->id,goInfo->type,N,dataN);
 }
-
 void ObjectMgr::LoadGameobjectInfo()
 {
     SQLGameObjectLoader loader;
     loader.Load(sGOStorage);
-
     // some checks
     for(uint32 id = 1; id < sGOStorage.MaxEntry; id++)
     {
         GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(id);
         if (!goInfo)
             continue;
-
         // some GO types have unused go template, check goInfo->displayId at GO spawn data loading or ignore
-
         switch(goInfo->type)
         {
             case GAMEOBJECT_TYPE_DOOR:                      //0
@@ -6255,9 +5219,7 @@ void ObjectMgr::LoadGameobjectInfo()
             {
                 if (goInfo->chest.lockId)
                     CheckGOLockId(goInfo,goInfo->chest.lockId,0);
-
                 CheckGOConsumable(goInfo,goInfo->chest.consumable,3);
-
                 if (goInfo->chest.linkedTrapId)              // linked trap
                     CheckGOLinkedTrapId(goInfo,goInfo->chest.linkedTrapId,7);
                 break;
@@ -6283,7 +5245,6 @@ void ObjectMgr::LoadGameobjectInfo()
                         sLog.outErrorDb("Gameobject (Entry: %u GoType: %u) have data0=%u but SpellFocus (Id: %u) not exist.",
                             id,goInfo->type,goInfo->spellFocus.focusId,goInfo->spellFocus.focusId);
                 }
-
                 if (goInfo->spellFocus.linkedTrapId)        // linked trap
                     CheckGOLinkedTrapId(goInfo,goInfo->spellFocus.linkedTrapId,2);
                 break;
@@ -6292,9 +5253,7 @@ void ObjectMgr::LoadGameobjectInfo()
             {
                 if (goInfo->goober.lockId)
                     CheckGOLockId(goInfo,goInfo->goober.lockId,0);
-
                 CheckGOConsumable(goInfo,goInfo->goober.consumable,3);
-
                 if (goInfo->goober.pageId)                  // pageId
                 {
                     if (!sPageTextStore.LookupEntry<PageText>(goInfo->goober.pageId))
@@ -6371,33 +5330,25 @@ void ObjectMgr::LoadGameobjectInfo()
                 break;
         }
     }
-
     sLog.outString( ">> Loaded %u game object templates", sGOStorage.RecordCount );
     sLog.outString();
 }
-
 void ObjectMgr::LoadExplorationBaseXP()
 {
     uint32 count = 0;
     QueryResult *result = WorldDatabase.Query("SELECT level,basexp FROM exploration_basexp");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u BaseXP definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
         uint32 level  = fields[0].GetUInt32();
         uint32 basexp = fields[1].GetUInt32();
@@ -6405,47 +5356,36 @@ void ObjectMgr::LoadExplorationBaseXP()
         ++count;
     }
     while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u BaseXP definitions", count );
 }
-
 uint32 ObjectMgr::GetBaseXP(uint32 level)
 {
     return mBaseXPTable[level] ? mBaseXPTable[level] : 0;
 }
-
 uint32 ObjectMgr::GetXPForLevel(uint32 level)
 {
     if (level < mPlayerXPperLevel.size())
         return mPlayerXPperLevel[level];
     return 0;
 }
-
 void ObjectMgr::LoadPetNames()
 {
     uint32 count = 0;
     QueryResult *result = WorldDatabase.Query("SELECT word,entry,half FROM pet_name_generation");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u pet name parts", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
         std::string word = fields[0].GetString();
         uint32 entry     = fields[1].GetUInt32();
@@ -6458,11 +5398,9 @@ void ObjectMgr::LoadPetNames()
     }
     while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u pet name parts", count );
 }
-
 void ObjectMgr::LoadPetNumber()
 {
     QueryResult* result = CharacterDatabase.Query("SELECT MAX(id) FROM character_pet");
@@ -6472,19 +5410,15 @@ void ObjectMgr::LoadPetNumber()
         m_hiPetNumber = fields[0].GetUInt32()+1;
         delete result;
     }
-
     barGoLink bar( 1 );
     bar.step();
-
     sLog.outString();
     sLog.outString( ">> Loaded the max pet number: %d", m_hiPetNumber-1);
 }
-
 std::string ObjectMgr::GeneratePetName(uint32 entry)
 {
     std::vector<std::string> & list0 = PetHalfName0[entry];
     std::vector<std::string> & list1 = PetHalfName1[entry];
-
     if(list0.empty() || list1.empty())
     {
         CreatureInfo const *cinfo = GetCreatureTemplate(entry);
@@ -6493,90 +5427,67 @@ std::string ObjectMgr::GeneratePetName(uint32 entry)
             petname = cinfo->Name;
         return std::string(petname);
     }
-
     return *(list0.begin()+urand(0, list0.size()-1)) + *(list1.begin()+urand(0, list1.size()-1));
 }
-
 uint32 ObjectMgr::GeneratePetNumber()
 {
     return ++m_hiPetNumber;
 }
-
 void ObjectMgr::LoadCorpses()
 {
     uint32 count = 0;
     //                                                     0           1           2           3            4    5     6     7            8         10
     QueryResult *result = CharacterDatabase.Query("SELECT position_x, position_y, position_z, orientation, map, data, time, corpse_type, instance, guid FROM corpse WHERE corpse_type <> 0");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u corpses", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 guid = fields[result->GetFieldCount()-1].GetUInt32();
-
         Corpse *corpse = new Corpse;
         if(!corpse->LoadFromDB(guid,fields))
         {
             delete corpse;
             continue;
         }
-
         ObjectAccessor::Instance().AddCorpse(corpse);
-
         ++count;
     }
     while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u corpses", count );
 }
-
 void ObjectMgr::LoadReputationOnKill()
 {
     uint32 count = 0;
-
     //                                                0            1                     2
     QueryResult *result = WorldDatabase.Query("SELECT creature_id, RewOnKillRepFaction1, RewOnKillRepFaction2,"
     //   3             4             5                   6             7             8                   9
         "IsTeamAward1, MaxStanding1, RewOnKillRepValue1, IsTeamAward2, MaxStanding2, RewOnKillRepValue2, TeamDependent "
         "FROM creature_onkill_reputation");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 creature award reputation definitions. DB table `creature_onkill_reputation` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 creature_id = fields[0].GetUInt32();
-
         ReputationOnKillEntry repOnKill;
         repOnKill.repfaction1          = fields[1].GetUInt32();
         repOnKill.repfaction2          = fields[2].GetUInt32();
@@ -6587,13 +5498,11 @@ void ObjectMgr::LoadReputationOnKill()
         repOnKill.reputation_max_cap2  = fields[7].GetUInt32();
         repOnKill.repvalue2            = fields[8].GetInt32();
         repOnKill.team_dependent       = fields[9].GetUInt8();
-
         if(!GetCreatureTemplate(creature_id))
         {
             sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped",creature_id);
             continue;
         }
-
         if(repOnKill.repfaction1)
         {
             FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1);
@@ -6603,7 +5512,6 @@ void ObjectMgr::LoadReputationOnKill()
                 continue;
             }
         }
-
         if(repOnKill.repfaction2)
         {
             FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2);
@@ -6613,45 +5521,32 @@ void ObjectMgr::LoadReputationOnKill()
                 continue;
             }
         }
-
         mRepOnKill[creature_id] = repOnKill;
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u creature award reputation definitions", count);
 }
-
 void ObjectMgr::LoadPointsOfInterest()
 {
     uint32 count = 0;
-
     //                                                0      1  2  3      4     5
     QueryResult *result = WorldDatabase.Query("SELECT entry, x, y, icon, flags, data, icon_name FROM points_of_interest");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 Points of Interest definitions. DB table `points_of_interest` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 point_id = fields[0].GetUInt32();
-
         PointOfInterest POI;
         POI.x                    = fields[1].GetFloat();
         POI.y                    = fields[2].GetFloat();
@@ -6659,50 +5554,37 @@ void ObjectMgr::LoadPointsOfInterest()
         POI.flags                = fields[4].GetUInt32();
         POI.data                 = fields[5].GetUInt32();
         POI.icon_name            = fields[6].GetCppString();
-
         if(!MaNGOS::IsValidMapCoord(POI.x,POI.y))
         {
             sLog.outErrorDb("Table `points_of_interest` (Entry: %u) have invalid coordinates (X: %f Y: %f), ignored.",point_id,POI.x,POI.y);
             continue;
         }
-
         mPointsOfInterest[point_id] = POI;
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u Points of Interest definitions", count);
 }
-
 void ObjectMgr::LoadNPCSpellClickSpells()
 {
     uint32 count = 0;
-
     mSpellClickInfoMap.clear();
     //                                                0          1         2            3                   4          5           6              7               8
     QueryResult *result = WorldDatabase.Query("SELECT npc_entry, spell_id, quest_start, quest_start_active, quest_end, cast_flags, aura_required, aura_forbidden, user_type FROM npc_spellclick_spells");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 spellclick spells. DB table `npc_spellclick_spells` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 npc_entry = fields[0].GetUInt32();
         CreatureInfo const* cInfo = GetCreatureTemplate(npc_entry);
         if (!cInfo)
@@ -6710,10 +5592,8 @@ void ObjectMgr::LoadNPCSpellClickSpells()
             sLog.outErrorDb("Table npc_spellclick_spells references unknown creature_template %u. Skipping entry.", npc_entry);
             continue;
         }
-
         if(!(cInfo->npcflag & UNIT_NPC_FLAG_SPELLCLICK))
             const_cast<CreatureInfo*>(cInfo)->npcflag |= UNIT_NPC_FLAG_SPELLCLICK;
-
         uint32 spellid = fields[1].GetUInt32();
         SpellEntry const *spellinfo = sSpellStore.LookupEntry(spellid);
         if (!spellinfo)
@@ -6721,7 +5601,6 @@ void ObjectMgr::LoadNPCSpellClickSpells()
             sLog.outErrorDb("Table npc_spellclick_spells references unknown spellid %u. Skipping entry.", spellid);
             continue;
         }
-
         uint32 auraRequired = fields[6].GetUInt32();
         if (auraRequired)
         {
@@ -6732,7 +5611,6 @@ void ObjectMgr::LoadNPCSpellClickSpells()
                 continue;
             }
         }
-
         uint32 auraForbidden = fields[7].GetUInt32();
         if (auraForbidden)
         {
@@ -6743,9 +5621,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
                 continue;
             }
         }
-
         uint32 quest_start = fields[2].GetUInt32();
-
         // quest might be 0 to enable spellclick independent of any quest
         if (quest_start)
         {
@@ -6755,9 +5631,7 @@ void ObjectMgr::LoadNPCSpellClickSpells()
                 continue;
             }
         }
-
         bool quest_start_active = fields[3].GetBool();
-
         uint32 quest_end = fields[4].GetUInt32();
         // quest might be 0 to enable spellclick active infinity after start quest
         if (quest_end)
@@ -6768,11 +5642,9 @@ void ObjectMgr::LoadNPCSpellClickSpells()
                 continue;
             }
         }
-
         uint8 userType = fields[8].GetUInt8();
         if (userType >= SPELL_CLICK_USER_MAX)
             sLog.outErrorDb("Table npc_spellclick_spells references unknown user type %u. Skipping entry.", uint32(userType));
-
         uint8 castFlags = fields[5].GetUInt8();
         SpellClickInfo info;
         info.spellId = spellid;
@@ -6784,82 +5656,61 @@ void ObjectMgr::LoadNPCSpellClickSpells()
         info.auraForbidden = auraForbidden;
         info.userType = SpellClickUserTypes(userType);
         mSpellClickInfoMap.insert(SpellClickInfoMap::value_type(npc_entry, info));
-
         // mark creature template as spell clickable
         const_cast<CreatureInfo*>(cInfo)->npcflag |= UNIT_NPC_FLAG_SPELLCLICK;
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u spellclick definitions", count);
 }
-
 void ObjectMgr::LoadWeatherZoneChances()
 {
     uint32 count = 0;
-
     //                                                0     1                   2                   3                    4                   5                   6                    7                 8                 9                  10                  11                  12
     QueryResult *result = WorldDatabase.Query("SELECT zone, spring_rain_chance, spring_snow_chance, spring_storm_chance, summer_rain_chance, summer_snow_chance, summer_storm_chance, fall_rain_chance, fall_snow_chance, fall_storm_chance, winter_rain_chance, winter_snow_chance, winter_storm_chance FROM game_weather");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 weather definitions. DB table `game_weather` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 zone_id = fields[0].GetUInt32();
-
         WeatherZoneChances& wzc = mWeatherZoneMap[zone_id];
-
         for(uint8 season = 0; season < WEATHER_SEASONS; ++season)
         {
             wzc.data[season].rainChance  = fields[season * (MAX_WEATHER_TYPE-1) + 1].GetUInt32();
             wzc.data[season].snowChance  = fields[season * (MAX_WEATHER_TYPE-1) + 2].GetUInt32();
             wzc.data[season].stormChance = fields[season * (MAX_WEATHER_TYPE-1) + 3].GetUInt32();
-
             if(wzc.data[season].rainChance > 100)
             {
                 wzc.data[season].rainChance = 25;
                 sLog.outErrorDb("Weather for zone %u season %u has wrong rain chance > 100%%",zone_id,season);
             }
-
             if(wzc.data[season].snowChance > 100)
             {
                 wzc.data[season].snowChance = 25;
                 sLog.outErrorDb("Weather for zone %u season %u has wrong snow chance > 100%%",zone_id,season);
             }
-
             if(wzc.data[season].stormChance > 100)
             {
                 wzc.data[season].stormChance = 25;
                 sLog.outErrorDb("Weather for zone %u season %u has wrong storm chance > 100%%",zone_id,season);
             }
         }
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u weather definitions", count);
 }
-
 void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t)
 {
     mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)] = t;
@@ -6867,17 +5718,14 @@ void ObjectMgr::SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t
     if(t)
         WorldDatabase.PExecute("INSERT INTO creature_respawn VALUES ( '%u', '" UI64FMTD "', '%u' )", loguid, uint64(t), instance);
 }
-
 void ObjectMgr::DeleteCreatureData(uint32 guid)
 {
     // remove mapid*cellid -> guid_set map
     CreatureData const* data = GetCreatureData(guid);
     if(data)
         RemoveCreatureFromGrid(guid, data);
-
     mCreatureDataMap.erase(guid);
 }
-
 void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t)
 {
     mGORespawnTimes[MAKE_PAIR64(loguid,instance)] = t;
@@ -6885,107 +5733,81 @@ void ObjectMgr::SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t)
     if(t)
         WorldDatabase.PExecute("INSERT INTO gameobject_respawn VALUES ( '%u', '" UI64FMTD "', '%u' )", loguid, uint64(t), instance);
 }
-
 void ObjectMgr::DeleteRespawnTimeForInstance(uint32 instance)
 {
     RespawnTimes::iterator next;
-
     for(RespawnTimes::iterator itr = mGORespawnTimes.begin(); itr != mGORespawnTimes.end(); itr = next)
     {
         next = itr;
         ++next;
-
         if(GUID_HIPART(itr->first)==instance)
             mGORespawnTimes.erase(itr);
     }
-
     for(RespawnTimes::iterator itr = mCreatureRespawnTimes.begin(); itr != mCreatureRespawnTimes.end(); itr = next)
     {
         next = itr;
         ++next;
-
         if(GUID_HIPART(itr->first)==instance)
             mCreatureRespawnTimes.erase(itr);
     }
-
     WorldDatabase.PExecute("DELETE FROM creature_respawn WHERE instance = '%u'", instance);
     WorldDatabase.PExecute("DELETE FROM gameobject_respawn WHERE instance = '%u'", instance);
 }
-
 void ObjectMgr::DeleteGOData(uint32 guid)
 {
     // remove mapid*cellid -> guid_set map
     GameObjectData const* data = GetGOData(guid);
     if(data)
         RemoveGameobjectFromGrid(guid, data);
-
     mGameObjectDataMap.erase(guid);
 }
-
 void ObjectMgr::AddCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid, uint32 instance)
 {
     // corpses are always added to spawn mode 0 and they are spawned by their instance id
     CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid,0)][cellid];
     cell_guids.corpses[player_guid] = instance;
 }
-
 void ObjectMgr::DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid)
 {
     // corpses are always added to spawn mode 0 and they are spawned by their instance id
     CellObjectGuids& cell_guids = mMapObjectGuids[MAKE_PAIR32(mapid,0)][cellid];
     cell_guids.corpses.erase(player_guid);
 }
-
 void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map,char const* table)
 {
     map.clear();                                            // need for reload case
-
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.PQuery("SELECT id,quest FROM %s",table);
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 quest relations from %s. DB table `%s` is empty.",table,table);
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 id    = fields[0].GetUInt32();
         uint32 quest = fields[1].GetUInt32();
-
         if(mQuestTemplates.find(quest) == mQuestTemplates.end())
         {
             sLog.outErrorDb("Table `%s: Quest %u listed for entry %u does not exist.",table,quest,id);
             continue;
         }
-
         map.insert(QuestRelations::value_type(id,quest));
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u quest relations from %s", count,table);
 }
-
 void ObjectMgr::LoadGameobjectQuestRelations()
 {
     LoadQuestRelationsHelper(mGOQuestRelations,"gameobject_questrelation");
-
     for(QuestRelations::iterator itr = mGOQuestRelations.begin(); itr != mGOQuestRelations.end(); ++itr)
     {
         GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first);
@@ -6995,11 +5817,9 @@ void ObjectMgr::LoadGameobjectQuestRelations()
             sLog.outErrorDb("Table `gameobject_questrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second);
     }
 }
-
 void ObjectMgr::LoadGameobjectInvolvedRelations()
 {
     LoadQuestRelationsHelper(mGOQuestInvolvedRelations,"gameobject_involvedrelation");
-
     for(QuestRelations::iterator itr = mGOQuestInvolvedRelations.begin(); itr != mGOQuestInvolvedRelations.end(); ++itr)
     {
         GameObjectInfo const* goInfo = GetGameObjectInfo(itr->first);
@@ -7009,11 +5829,9 @@ void ObjectMgr::LoadGameobjectInvolvedRelations()
             sLog.outErrorDb("Table `gameobject_involvedrelation` have data gameobject entry (%u) for quest %u, but GO is not GAMEOBJECT_TYPE_QUESTGIVER",itr->first,itr->second);
     }
 }
-
 void ObjectMgr::LoadCreatureQuestRelations()
 {
     LoadQuestRelationsHelper(mCreatureQuestRelations,"creature_questrelation");
-
     for(QuestRelations::iterator itr = mCreatureQuestRelations.begin(); itr != mCreatureQuestRelations.end(); ++itr)
     {
         CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
@@ -7023,11 +5841,9 @@ void ObjectMgr::LoadCreatureQuestRelations()
             sLog.outErrorDb("Table `creature_questrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
     }
 }
-
 void ObjectMgr::LoadCreatureInvolvedRelations()
 {
     LoadQuestRelationsHelper(mCreatureQuestInvolvedRelations,"creature_involvedrelation");
-
     for(QuestRelations::iterator itr = mCreatureQuestInvolvedRelations.begin(); itr != mCreatureQuestInvolvedRelations.end(); ++itr)
     {
         CreatureInfo const* cInfo = GetCreatureTemplate(itr->first);
@@ -7037,64 +5853,48 @@ void ObjectMgr::LoadCreatureInvolvedRelations()
             sLog.outErrorDb("Table `creature_involvedrelation` has creature entry (%u) for quest %u, but npcflag does not include UNIT_NPC_FLAG_QUESTGIVER",itr->first,itr->second);
     }
 }
-
 void ObjectMgr::LoadReservedPlayersNames()
 {
     m_ReservedNames.clear();                                // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT name FROM reserved_name");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u reserved player names", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     Field* fields;
     do
     {
         bar.step();
         fields = result->Fetch();
         std::string name= fields[0].GetCppString();
-
         std::wstring wstr;
         if(!Utf8toWStr (name,wstr))
         {
             sLog.outError("Table `reserved_name` have invalid name: %s", name.c_str() );
             continue;
         }
-
         wstrToLower(wstr);
-
         m_ReservedNames.insert(wstr);
         ++count;
     } while ( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u reserved player names", count );
 }
-
 bool ObjectMgr::IsReservedName( const std::string& name ) const
 {
     std::wstring wstr;
     if(!Utf8toWStr (name,wstr))
         return false;
-
     wstrToLower(wstr);
-
     return m_ReservedNames.find(wstr) != m_ReservedNames.end();
 }
-
 enum LanguageType
 {
     LT_BASIC_LATIN    = 0x0000,
@@ -7103,7 +5903,6 @@ enum LanguageType
     LT_EAST_ASIA      = 0x0004,
     LT_ANY            = 0xFFFF
 };
-
 static LanguageType GetRealmLanguageType(bool create)
 {
     switch(sWorld.getConfig(CONFIG_REALM_ZONE))
@@ -7131,7 +5930,6 @@ static LanguageType GetRealmLanguageType(bool create)
             return create ? LT_BASIC_LATIN : LT_ANY;        // basic-Latin at create, any at login
     }
 }
-
 bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bool create = false)
 {
     if(strictMask==0)                                       // any language, ignore realm
@@ -7144,7 +5942,6 @@ bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bo
             return true;
         return false;
     }
-
     if(strictMask & 0x2)                                    // realm zone specific
     {
         LanguageType lt = GetRealmLanguageType(create);
@@ -7158,111 +5955,84 @@ bool isValidString(std::wstring wstr, uint32 strictMask, bool numericOrSpace, bo
             if(isEastAsianString(wstr,numericOrSpace))
                 return true;
     }
-
     if(strictMask & 0x1)                                    // basic Latin
     {
         if(isBasicLatinString(wstr,numericOrSpace))
             return true;
     }
-
     return false;
 }
-
 uint8 ObjectMgr::CheckPlayerName( const std::string& name, bool create )
 {
     std::wstring wname;
     if(!Utf8toWStr(name,wname))
         return CHAR_NAME_INVALID_CHARACTER;
-
     if(wname.size() > MAX_PLAYER_NAME)
         return CHAR_NAME_TOO_LONG;
-
     uint32 minName = sWorld.getConfig(CONFIG_MIN_PLAYER_NAME);
     if(wname.size() < minName)
         return CHAR_NAME_TOO_SHORT;
-
     uint32 strictMask = sWorld.getConfig(CONFIG_STRICT_PLAYER_NAMES);
     if(!isValidString(wname,strictMask,false,create))
         return CHAR_NAME_MIXED_LANGUAGES;
-
     return CHAR_NAME_SUCCESS;
 }
-
 bool ObjectMgr::IsValidCharterName( const std::string& name )
 {
     std::wstring wname;
     if(!Utf8toWStr(name,wname))
         return false;
-
     if(wname.size() > MAX_CHARTER_NAME)
         return false;
-
     uint32 minName = sWorld.getConfig(CONFIG_MIN_CHARTER_NAME);
     if(wname.size() < minName)
         return false;
-
     uint32 strictMask = sWorld.getConfig(CONFIG_STRICT_CHARTER_NAMES);
-
     return isValidString(wname,strictMask,true);
 }
-
 PetNameInvalidReason ObjectMgr::CheckPetName( const std::string& name )
 {
     std::wstring wname;
     if(!Utf8toWStr(name,wname))
         return PET_NAME_INVALID;
-
     if(wname.size() > MAX_PET_NAME)
         return PET_NAME_TOO_LONG;
-
     uint32 minName = sWorld.getConfig(CONFIG_MIN_PET_NAME);
     if(wname.size() < minName)
         return PET_NAME_TOO_SHORT;
-
     uint32 strictMask = sWorld.getConfig(CONFIG_STRICT_PET_NAMES);
     if(!isValidString(wname,strictMask,false))
         return PET_NAME_MIXED_LANGUAGES;
-
     return PET_NAME_SUCCESS;
 }
-
 int ObjectMgr::GetIndexForLocale( LocaleConstant loc )
 {
     if(loc==LOCALE_enUS)
         return -1;
-
     for(size_t i=0;i < m_LocalForIndex.size(); ++i)
         if(m_LocalForIndex[i]==loc)
             return i;
-
     return -1;
 }
-
 LocaleConstant ObjectMgr::GetLocaleForIndex(int i)
 {
     if (i<0 || i>=m_LocalForIndex.size())
         return LOCALE_enUS;
-
     return m_LocalForIndex[i];
 }
-
 int ObjectMgr::GetOrNewIndexForLocale( LocaleConstant loc )
 {
     if(loc==LOCALE_enUS)
         return -1;
-
     for(size_t i=0;i < m_LocalForIndex.size(); ++i)
         if(m_LocalForIndex[i]==loc)
             return i;
-
     m_LocalForIndex.push_back(loc);
     return m_LocalForIndex.size()-1;
 }
-
 void ObjectMgr::LoadGameObjectForQuests()
 {
     mGameObjectForQuestSet.clear();                         // need for reload case
-
     if( !sGOStorage.MaxEntry )
     {
         barGoLink bar( 1 );
@@ -7271,10 +6041,8 @@ void ObjectMgr::LoadGameObjectForQuests()
         sLog.outString( ">> Loaded 0 GameObjects for quests" );
         return;
     }
-
     barGoLink bar( sGOStorage.MaxEntry - 1 );
     uint32 count = 0;
-
     // collect GO entries for GO that must activated
     for(uint32 go_entry = 1; go_entry < sGOStorage.MaxEntry; ++go_entry)
     {
@@ -7282,14 +6050,12 @@ void ObjectMgr::LoadGameObjectForQuests()
         GameObjectInfo const* goInfo = sGOStorage.LookupEntry<GameObjectInfo>(go_entry);
         if(!goInfo)
             continue;
-
         switch(goInfo->type)
         {
             // scan GO chest with loot including quest items
             case GAMEOBJECT_TYPE_CHEST:
             {
                 uint32 loot_id = goInfo->GetLootId();
-
                 // find quest loot for GO
                 if(LootTemplates_Gameobject.HaveQuestLootFor(loot_id))
                 {
@@ -7311,11 +6077,9 @@ void ObjectMgr::LoadGameObjectForQuests()
                 break;
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %u GameObjects for quests", count );
 }
-
 bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value)
 {
     int32 start_value = min_value;
@@ -7328,7 +6092,6 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
             sLog.outErrorDb("Table '%s' attempt loaded with invalid range (%d - %d), strings not loaded.",table,min_value,max_value);
             return false;
         }
-
         // real range (max+1,min+1) exaple: (-10,-1000) -> -999...-10+1
         std::swap(start_value,end_value);
         ++start_value;
@@ -7342,7 +6105,6 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
             return false;
         }
     }
-
     // cleanup affected map part for reloading case
     for(TrinityStringLocaleMap::iterator itr = mTrinityStringLocaleMap.begin(); itr != mTrinityStringLocaleMap.end();)
     {
@@ -7351,15 +6113,11 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
         else
             ++itr;
     }
-
     QueryResult *result = db.PQuery("SELECT entry,content_default,content_loc1,content_loc2,content_loc3,content_loc4,content_loc5,content_loc6,content_loc7,content_loc8 FROM %s",table);
-
     if (!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         if (min_value == MIN_TRINITY_STRING_ID)              // error only in case internal strings
             sLog.outErrorDb(">> Loaded 0 trinity strings. DB table `%s` is empty. Cannot continue.",table);
@@ -7367,18 +6125,13 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
             sLog.outString(">> Loaded 0 string templates. DB table `%s` is empty.",table);
         return false;
     }
-
     uint32 count = 0;
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         int32 entry = fields[0].GetInt32();
-
         if (entry==0)
         {
             sLog.outErrorDb("Table `%s` contain reserved entry 0, ignored.",table);
@@ -7389,21 +6142,16 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
             sLog.outErrorDb("Table `%s` contain entry %i out of allowed range (%d - %d), ignored.",table,entry,min_value,max_value);
             continue;
         }
-
         TrinityStringLocale& data = mTrinityStringLocaleMap[entry];
-
         if (data.Content.size() > 0)
         {
             sLog.outErrorDb("Table `%s` contain data for already loaded entry  %i (from another table?), ignored.",table,entry);
             continue;
         }
-
         data.Content.resize(1);
         ++count;
-
         // 0 -> default, idx in to idx+1
         data.Content[0] = fields[1].GetCppString();
-
         for(uint8 i = 1; i < MAX_LOCALE; ++i)
         {
             std::string str = fields[i+1].GetCppString();
@@ -7415,24 +6163,19 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
                     // 0 -> default, idx in to idx+1
                     if (data.Content.size() <= idx+1)
                         data.Content.resize(idx+2);
-
                     data.Content[idx+1] = str;
                 }
             }
         }
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     if (min_value == MIN_TRINITY_STRING_ID)
         sLog.outString( ">> Loaded %u Trinity strings from table %s", count,table);
     else
         sLog.outString( ">> Loaded %u string templates from %s", count,table);
-
     return true;
 }
-
 const char *ObjectMgr::GetTrinityString(int32 entry, int locale_idx) const
 {
     // locale_idx==-1 -> default, locale_idx >= 0 in to idx+1
@@ -7444,35 +6187,28 @@ const char *ObjectMgr::GetTrinityString(int32 entry, int locale_idx) const
         else
             return msl->Content[0].c_str();
     }
-
     if(entry > 0)
         sLog.outErrorDb("Entry %i not found in `trinity_string` table.",entry);
     else
         sLog.outErrorDb("Trinity string entry %i not found in DB.",entry);
     return "<error>";
 }
-
 void ObjectMgr::LoadSpellDisabledEntrys()
 {
     m_DisabledPlayerSpells.clear();                                // need for reload case
     m_DisabledCreatureSpells.clear();
     m_DisabledPetSpells.clear();
     QueryResult *result = WorldDatabase.Query("SELECT entry, disable_mask FROM spell_disabled");
-
     uint32 total_count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u disabled spells", total_count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     Field* fields;
     do
     {
@@ -7493,59 +6229,44 @@ void ObjectMgr::LoadSpellDisabledEntrys()
             m_DisabledPetSpells.insert(spellid);
         ++total_count;
    } while ( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u disabled spells from `spell_disabled`", total_count);
 }
-
 void ObjectMgr::LoadFishingBaseSkillLevel()
 {
     mFishingBaseForArea.clear();                            // for reload case
-
     uint32 count = 0;
     QueryResult *result = WorldDatabase.Query("SELECT entry,skill FROM skill_fishing_base_level");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `skill_fishing_base_level`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
         uint32 entry  = fields[0].GetUInt32();
         int32 skill   = fields[1].GetInt32();
-
         AreaTableEntry const* fArea = GetAreaEntryByAreaID(entry);
         if(!fArea)
         {
             sLog.outErrorDb("AreaId %u defined in `skill_fishing_base_level` does not exist",entry);
             continue;
         }
-
         mFishingBaseForArea[entry] = skill;
         ++count;
     }
     while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u areas for fishing base skill level", count );
 }
-
 // Searches for the same condition already in Conditions store
 // Returns Id if found, else adds it to Conditions and returns Id
 uint16 ObjectMgr::GetConditionId( ConditionType condition, uint32 value1, uint32 value2 )
@@ -7556,18 +6277,14 @@ uint16 ObjectMgr::GetConditionId( ConditionType condition, uint32 value1, uint32
         if (lc == mConditions[i])
             return i;
     }
-
     mConditions.push_back(lc);
-
     if(mConditions.size() > 0xFFFF)
     {
         sLog.outError("Conditions store overflow! Current and later loaded conditions will ignored!");
         return 0;
     }
-
     return mConditions.size() - 1;
 }
-
 bool ObjectMgr::CheckDeclinedNames( std::wstring mainpart, DeclinedName const& names )
 {
     for(uint8 i =0; i < MAX_DECLINED_NAME_CASES; ++i)
@@ -7575,13 +6292,11 @@ bool ObjectMgr::CheckDeclinedNames( std::wstring mainpart, DeclinedName const& n
         std::wstring wname;
         if(!Utf8toWStr(names.name[i],wname))
             return false;
-
         if(mainpart!=GetMainPartOfName(wname,i+1))
             return false;
     }
     return true;
 }
-
 uint32 ObjectMgr::GetAreaTriggerScriptId(uint32 trigger_id)
 {
     AreaTriggerScriptMap::const_iterator i = mAreaTriggerScripts.find(trigger_id);
@@ -7589,13 +6304,11 @@ uint32 ObjectMgr::GetAreaTriggerScriptId(uint32 trigger_id)
         return i->second;
     return 0;
 }
-
 // Checks if player meets the condition
 bool PlayerCondition::Meets(Player const * player) const
 {
     if( !player )
         return false;                                       // player not present, return false
-
     switch (condition)
     {
         case CONDITION_NONE:
@@ -7646,7 +6359,6 @@ bool PlayerCondition::Meets(Player const * player) const
             return false;
     }
 }
-
 // Verification of condition values validity
 bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 value2)
 {
@@ -7655,7 +6367,6 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
         sLog.outErrorDb("Condition has bad type of %u, skipped ", condition );
         return false;
     }
-
     switch (condition)
     {
         case CONDITION_AURA:
@@ -7794,7 +6505,6 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
     }
     return true;
 }
-
 SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial)
 {
     switch(pSkill->categoryId)
@@ -7826,79 +6536,59 @@ SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial)
             return SKILL_RANGE_NONE;
     }
 }
-
 void ObjectMgr::LoadGameTele()
 {
     m_GameTeleMap.clear();                                  // for reload case
-
     uint32 count = 0;
     QueryResult *result = WorldDatabase.Query("SELECT id, position_x, position_y, position_z, orientation, map, name FROM game_tele");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `game_tele`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
-
         uint32 id         = fields[0].GetUInt32();
-
         GameTele gt;
-
         gt.position_x     = fields[1].GetFloat();
         gt.position_y     = fields[2].GetFloat();
         gt.position_z     = fields[3].GetFloat();
         gt.orientation    = fields[4].GetFloat();
         gt.mapId          = fields[5].GetUInt32();
         gt.name           = fields[6].GetCppString();
-
         if(!MapManager::IsValidMapCoord(gt.mapId,gt.position_x,gt.position_y,gt.position_z,gt.orientation))
         {
             sLog.outErrorDb("Wrong position for id %u (name: %s) in `game_tele` table, ignoring.",id,gt.name.c_str());
             continue;
         }
-
         if(!Utf8toWStr(gt.name,gt.wnameLow))
         {
             sLog.outErrorDb("Wrong UTF8 name for id %u in `game_tele` table, ignoring.",id);
             continue;
         }
-
         wstrToLower( gt.wnameLow );
-
         m_GameTeleMap[id] = gt;
-
         ++count;
     }
     while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u GameTeleports", count );
 }
-
 GameTele const* ObjectMgr::GetGameTele(const std::string& name) const
 {
     // explicit name case
     std::wstring wname;
     if(!Utf8toWStr(name,wname))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wname );
-
     // Alternative first GameTele what contains wnameLow as substring in case no GameTele location found
     const GameTele* alt = NULL;
     for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
@@ -7908,10 +6598,8 @@ GameTele const* ObjectMgr::GetGameTele(const std::string& name) const
         else if (alt == NULL && itr->second.wnameLow.find(wname) != std::wstring::npos)
             alt = &itr->second;
     }
-
     return alt;
 }
-
 bool ObjectMgr::AddGameTele(GameTele& tele)
 {
     // find max id
@@ -7919,31 +6607,23 @@ bool ObjectMgr::AddGameTele(GameTele& tele)
     for(GameTeleMap::const_iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
         if(itr->first > new_id)
             new_id = itr->first;
-
     // use next
     ++new_id;
-
     if(!Utf8toWStr(tele.name,tele.wnameLow))
         return false;
-
     wstrToLower( tele.wnameLow );
-
     m_GameTeleMap[new_id] = tele;
-
     return WorldDatabase.PExecuteLog("INSERT INTO game_tele (id,position_x,position_y,position_z,orientation,map,name) VALUES (%u,%f,%f,%f,%f,%d,'%s')",
         new_id,tele.position_x,tele.position_y,tele.position_z,tele.orientation,tele.mapId,tele.name.c_str());
 }
-
 bool ObjectMgr::DeleteGameTele(const std::string& name)
 {
     // explicit name case
     std::wstring wname;
     if(!Utf8toWStr(name,wname))
         return false;
-
     // converting string that we try to find to lower case
     wstrToLower( wname );
-
     for(GameTeleMap::iterator itr = m_GameTeleMap.begin(); itr != m_GameTeleMap.end(); ++itr)
     {
         if(itr->second.wnameLow == wname)
@@ -7953,54 +6633,39 @@ bool ObjectMgr::DeleteGameTele(const std::string& name)
             return true;
         }
     }
-
     return false;
 }
-
 void ObjectMgr::LoadTrainerSpell()
 {
     // For reload case
     for (CacheTrainerSpellMap::iterator itr = m_mCacheTrainerSpellMap.begin(); itr != m_mCacheTrainerSpellMap.end(); ++itr)
         itr->second.Clear();
     m_mCacheTrainerSpellMap.clear();
-
     std::set<uint32> skip_trainers;
-
     QueryResult *result = WorldDatabase.Query("SELECT entry, spell,spellcost,reqskill,reqskillvalue,reqlevel FROM npc_trainer");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `npc_trainer`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     std::set<uint32> talentIds;
-
     uint32 count = 0;
     do
     {
         bar.step();
-
         Field* fields = result->Fetch();
-
         uint32 entry  = fields[0].GetUInt32();
         uint32 spell  = fields[1].GetUInt32();
-
         CreatureInfo const* cInfo = GetCreatureTemplate(entry);
-
         if(!cInfo)
         {
             sLog.outErrorDb("Table `npc_trainer` have entry for not existed creature template (Entry: %u), ignore", entry);
             continue;
         }
-
         if(!(cInfo->npcflag & UNIT_NPC_FLAG_TRAINER))
         {
             if(skip_trainers.count(entry) == 0)
@@ -8010,20 +6675,17 @@ void ObjectMgr::LoadTrainerSpell()
             }
             continue;
         }
-
         SpellEntry const *spellinfo = sSpellStore.LookupEntry(spell);
         if(!spellinfo)
         {
             sLog.outErrorDb("Table `npc_trainer` for Trainer (Entry: %u ) has non existing spell %u, ignore", entry,spell);
             continue;
         }
-
         if(!SpellMgr::IsSpellValid(spellinfo))
         {
             sLog.outErrorDb("Table `npc_trainer` for Trainer (Entry: %u) has broken learning spell %u, ignore", entry, spell);
             continue;
         }
-
         if(GetTalentSpellCost(spell))
         {
             if(talentIds.count(spell)==0)
@@ -8033,19 +6695,15 @@ void ObjectMgr::LoadTrainerSpell()
             }
             continue;
         }
-
         TrainerSpellData& data = m_mCacheTrainerSpellMap[entry];
-
         TrainerSpell& trainerSpell = data.spellList[spell];
         trainerSpell.spell         = spell;
         trainerSpell.spellCost     = fields[2].GetUInt32();
         trainerSpell.reqSkill      = fields[3].GetUInt32();
         trainerSpell.reqSkillValue = fields[4].GetUInt32();
         trainerSpell.reqLevel      = fields[5].GetUInt32();
-
         if(!trainerSpell.reqLevel)
             trainerSpell.reqLevel = spellinfo->spellLevel;
-
         // calculate learned spell for profession case when stored cast-spell
         trainerSpell.learnedSpell = spell;
         for(uint8 i = 0; i <3; ++i)
@@ -8058,99 +6716,72 @@ void ObjectMgr::LoadTrainerSpell()
                 break;
             }
         }
-
         if(SpellMgr::IsProfessionSpell(trainerSpell.learnedSpell))
             data.trainerType = 2;
-
         ++count;
-
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %d Trainers", count );
 }
-
 void ObjectMgr::LoadVendors()
 {
     // For reload case
     for (CacheVendorItemMap::iterator itr = m_mCacheVendorItemMap.begin(); itr != m_mCacheVendorItemMap.end(); ++itr)
         itr->second.Clear();
     m_mCacheVendorItemMap.clear();
-
     std::set<uint32> skip_vendors;
-
     QueryResult *result = WorldDatabase.Query("SELECT entry, item, maxcount, incrtime, ExtendedCost FROM npc_vendor");
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `npc_vendor`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     uint32 count = 0;
     do
     {
         bar.step();
         Field* fields = result->Fetch();
-
         uint32 entry        = fields[0].GetUInt32();
         uint32 item_id      = fields[1].GetUInt32();
         uint32 maxcount     = fields[2].GetUInt32();
         uint32 incrtime     = fields[3].GetUInt32();
         uint32 ExtendedCost = fields[4].GetUInt32();
-
         if(!IsVendorItemValid(entry,item_id,maxcount,incrtime,ExtendedCost,NULL,&skip_vendors))
             continue;
-
         VendorItemData& vList = m_mCacheVendorItemMap[entry];
-
         vList.AddItem(item_id,maxcount,incrtime,ExtendedCost);
         ++count;
-
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %d Vendors ", count );
 }
-
 void ObjectMgr::LoadNpcTextId()
 {
-
     m_mCacheNpcTextIdMap.clear();
-
     QueryResult* result = WorldDatabase.Query("SELECT npc_guid, textid FROM npc_gossip");
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `npc_gossip`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     uint32 count = 0;
     uint32 guid,textid;
     do
     {
         bar.step();
-
         Field* fields = result->Fetch();
-
         guid   = fields[0].GetUInt32();
         textid = fields[1].GetUInt32();
-
         if (!GetCreatureData(guid))
         {
             sLog.outErrorDb("Table `npc_gossip` have not existed creature (GUID: %u) entry, ignore. ",guid);
@@ -8161,47 +6792,34 @@ void ObjectMgr::LoadNpcTextId()
             sLog.outErrorDb("Table `npc_gossip` for creature (GUID: %u) have wrong Textid (%u), ignore. ", guid, textid);
             continue;
         }
-
         m_mCacheNpcTextIdMap[guid] = textid ;
         ++count;
-
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %d NpcTextId ", count );
 }
-
 void ObjectMgr::LoadNpcOptions()
 {
     m_mCacheNpcOptionList.clear();                          // For reload case
-
     QueryResult *result = WorldDatabase.Query(
         //      0  1         2       3    4      5         6     7           8
         "SELECT id,gossip_id,npcflag,icon,action,box_money,coded,option_text,box_text "
         "FROM npc_option");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded `npc_option`, table is empty!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     uint32 count = 0;
-
     do
     {
         bar.step();
-
         Field* fields = result->Fetch();
-
         GossipOption go;
         go.Id               = fields[0].GetUInt32();
         go.GossipId         = fields[1].GetUInt32();
@@ -8212,40 +6830,30 @@ void ObjectMgr::LoadNpcOptions()
         go.Coded            = fields[6].GetUInt8()!=0;
         go.OptionText       = fields[7].GetCppString();
         go.BoxText          = fields[8].GetCppString();
-
         m_mCacheNpcOptionList.push_back(go);
-
         ++count;
-
     } while (result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %d npc_option entries", count );
 }
-
 void ObjectMgr::AddVendorItem( uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 extendedcost, bool savetodb)
 {
     VendorItemData& vList = m_mCacheVendorItemMap[entry];
     vList.AddItem(item,maxcount,incrtime,extendedcost);
-
     if(savetodb) WorldDatabase.PExecuteLog("INSERT INTO npc_vendor (entry,item,maxcount,incrtime,extendedcost) VALUES('%u','%u','%u','%u','%u')",entry, item, maxcount,incrtime,extendedcost);
 }
-
 bool ObjectMgr::RemoveVendorItem( uint32 entry,uint32 item, bool savetodb)
 {
     CacheVendorItemMap::iterator  iter = m_mCacheVendorItemMap.find(entry);
     if(iter == m_mCacheVendorItemMap.end())
         return false;
-
     if(!iter->second.FindItem(item))
         return false;
-
     iter->second.RemoveItem(item);
     if(savetodb) WorldDatabase.PExecuteLog("DELETE FROM npc_vendor WHERE entry='%u' AND item='%u'",entry, item);
     return true;
 }
-
 bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost, Player* pl, std::set<uint32>* skip_vendors, uint32 ORnpcflag ) const
 {
     CreatureInfo const* cInfo = GetCreatureTemplate(vendor_entry);
@@ -8257,7 +6865,6 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb("Table `(game_event_)npc_vendor` have data for not existed creature template (Entry: %u), ignore", vendor_entry);
         return false;
     }
-
     if(!((cInfo->npcflag | ORnpcflag) & UNIT_NPC_FLAG_VENDOR))
     {
         if(!skip_vendors || skip_vendors->count(vendor_entry)==0)
@@ -8266,13 +6873,11 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
                 ChatHandler(pl).SendSysMessage(LANG_COMMAND_VENDORSELECTION);
             else
                 sLog.outErrorDb("Table `(game_event_)npc_vendor` have data for not creature template (Entry: %u) without vendor flag, ignore", vendor_entry);
-
             if(skip_vendors)
                 skip_vendors->insert(vendor_entry);
         }
         return false;
     }
-
     if(!GetItemPrototype(item_id))
     {
         if(pl)
@@ -8281,7 +6886,6 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb("Table `(game_event_)npc_vendor` for Vendor (Entry: %u) have in item list non-existed item (%u), ignore",vendor_entry,item_id);
         return false;
     }
-
     if(ExtendedCost && !sItemExtendedCostStore.LookupEntry(ExtendedCost))
     {
         if(pl)
@@ -8290,7 +6894,6 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb("Table `(game_event_)npc_vendor` have Item (Entry: %u) with wrong ExtendedCost (%u) for vendor (%u), ignore",item_id,ExtendedCost,vendor_entry);
         return false;
     }
-
     if(maxcount > 0 && incrtime == 0)
     {
         if(pl)
@@ -8307,11 +6910,9 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb( "Table `(game_event_)npc_vendor` has `maxcount`=0 for item %u of vendor (Entry: %u) but `incrtime`<>0, ignore", item_id, vendor_entry);
         return false;
     }
-
     VendorItemData const* vItems = GetNpcVendorItemList(vendor_entry);
     if(!vItems)
         return true;                                        // later checks for non-empty lists
-
     if(vItems->FindItem(item_id))
     {
         if(pl)
@@ -8320,7 +6921,6 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb( "Table `(game_event_)npc_vendor` has duplicate items %u for vendor (Entry: %u), ignore", item_id, vendor_entry);
         return false;
     }
-
     if(vItems->GetItemCount() >= MAX_VENDOR_ITEMS)
     {
         if(pl)
@@ -8329,10 +6929,8 @@ bool ObjectMgr::IsVendorItemValid( uint32 vendor_entry, uint32 item_id, uint32 m
             sLog.outErrorDb( "Table `npc_vendor` has too many items (%u >= %i) for vendor (Entry: %u), ignore", vItems->GetItemCount(), MAX_VENDOR_ITEMS, vendor_entry);
         return false;
     }
-
     return true;
 }
-
 void ObjectMgr::LoadScriptNames()
 {
     m_scriptNames.push_back("");
@@ -8346,7 +6944,6 @@ void ObjectMgr::LoadScriptNames()
       "SELECT DISTINCT(ScriptName) FROM areatrigger_scripts WHERE ScriptName <> '' "
       "UNION "
       "SELECT DISTINCT(script) FROM instance_template WHERE script <> ''");
-
     if( !result )
     {
         barGoLink bar( 1 );
@@ -8355,13 +6952,10 @@ void ObjectMgr::LoadScriptNames()
         sLog.outErrorDb(">> Loaded empty set of Script Names!");
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     //OnEvent Changes
     m_scriptNames.push_back("scripted_on_events");
     uint32 count = 1;
-
     do
     {
         bar.step();
@@ -8369,12 +6963,10 @@ void ObjectMgr::LoadScriptNames()
         ++count;
     } while (result->NextRow());
     delete result;
-
     std::sort(m_scriptNames.begin(), m_scriptNames.end());
     sLog.outString();
     sLog.outString( ">> Loaded %d Script Names", count );
 }
-
 uint32 ObjectMgr::GetScriptId(const char *name)
 {
     // use binary search to find the script name in the sorted vector
@@ -8385,7 +6977,6 @@ uint32 ObjectMgr::GetScriptId(const char *name)
     if(itr == m_scriptNames.end() || *itr != name) return 0;
     return itr - m_scriptNames.begin();
 }
-
 void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids)
 {
     for(ScriptMapMap::const_iterator itrMM = scripts.begin(); itrMM != scripts.end(); ++itrMM)
@@ -8398,7 +6989,6 @@ void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids)
                 {
                     if(!GetTrinityStringLocale (itrM->second.dataint))
                         sLog.outErrorDb( "Table `db_script_string` not has string id  %u used db script (ID: %u)", itrM->second.dataint, itrMM->first);
-
                     if(ids.count(itrM->second.dataint))
                         ids.erase(itrM->second.dataint);
                 }
@@ -8406,35 +6996,27 @@ void ObjectMgr::CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids)
         }
     }
 }
-
 void ObjectMgr::LoadDbScriptStrings()
 {
     LoadTrinityStrings(WorldDatabase,"db_script_string",MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID);
-
     std::set<int32> ids;
-
     for(int32 i = MIN_DB_SCRIPT_STRING_ID; i < MAX_DB_SCRIPT_STRING_ID; ++i)
         if(GetTrinityStringLocale(i))
             ids.insert(i);
-
     CheckScripts(sQuestEndScripts,ids);
     CheckScripts(sQuestStartScripts,ids);
     CheckScripts(sSpellScripts,ids);
     CheckScripts(sGameObjectScripts,ids);
     CheckScripts(sEventScripts,ids);
-
     CheckScripts(sWaypointScripts,ids);
-
     for(std::set<int32>::const_iterator itr = ids.begin(); itr != ids.end(); ++itr)
         sLog.outErrorDb( "Table `db_script_string` has unused string id  %u", *itr);
 }
-
 // Functions for scripting access
 uint32 GetAreaTriggerScriptId(uint32 trigger_id)
 {
     return objmgr.GetAreaTriggerScriptId(trigger_id);
 }
-
 bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, int32 end_value)
 {
     // MAX_DB_SCRIPT_STRING_ID is max allowed negative value for scripts (scrpts can use only more deep negative values
@@ -8444,35 +7026,27 @@ bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, i
         sLog.outErrorDb("Table '%s' attempt loaded with reserved by mangos range (%d - %d), strings not loaded.",table,start_value,end_value+1);
         return false;
     }
-
     return objmgr.LoadTrinityStrings(db,table,start_value,end_value);
 }
-
 uint32 TRINITY_DLL_SPEC GetScriptId(const char *name)
 {
     return objmgr.GetScriptId(name);
 }
-
 ObjectMgr::ScriptNameMap & GetScriptNames()
 {
     return objmgr.GetScriptNames();
 }
-
 GameObjectInfo const *GetGameObjectInfo(uint32 id)
 {
     return objmgr.GetGameObjectInfo(id);
 }
-
 CreatureInfo const *GetCreatureInfo(uint32 id)
 {
     return objmgr.GetCreatureTemplate(id);
 }
-
 void ObjectMgr::LoadTransportEvents()
 {
-
     QueryResult *result = WorldDatabase.Query("SELECT entry, waypoint_id, event_id FROM transport_events");
-
     if( !result )
     {
         barGoLink bar1( 1 );
@@ -8480,57 +7054,43 @@ void ObjectMgr::LoadTransportEvents()
         sLog.outString( "\n>> Transport events table is empty \n" );
         return;
     }
-
     barGoLink bar1( result->GetRowCount() );
-
     do
     {
         bar1.step();
-
         Field *fields = result->Fetch();
-
         //Load event values
         uint32 entry = fields[0].GetUInt32();
         uint32 waypoint_id = fields[1].GetUInt32();
         uint32 event_id = fields[2].GetUInt32();
-
         uint32 event_count = (entry*100)+waypoint_id;
         TransportEventMap[event_count] = event_id;
     }
     while(result->NextRow());
-
     sLog.outString( "\n>> Loaded %u transport events \n", result->GetRowCount() );
-
     delete result;
 }
-
 CreatureInfo const* GetCreatureTemplateStore(uint32 entry)
 {
     return sCreatureStorage.LookupEntry<CreatureInfo>(entry);
 }
-
 Quest const* GetQuestTemplateStore(uint32 entry)
 {
     return objmgr.GetQuestTemplate(entry);
 }
-
 uint64 ObjectMgr::GenerateGMTicketId()
 {
     return ++m_GMticketid;
 }
-
 void ObjectMgr::LoadGMTickets()
 {
     m_GMTicketList.clear();
-    
     QueryResult *result = CharacterDatabase.Query( "SELECT guid, playerGuid, name, message, createtime, map, posX, posY, posZ, timestamp, closed, assignedto, comment FROM gm_tickets" );
-    
     if(!result)
     {
         sLog.outString(" \n>> GM Tickets table is empty, no tickets were loaded.\n" );
         return;
     }
-
     uint16 count = 0;
     barGoLink bar ((*result).GetRowCount());
     GM_Ticket *ticket;
@@ -8553,29 +7113,22 @@ void ObjectMgr::LoadGMTickets()
         ticket->comment = fields[12].GetCppString();
         ++count;
         bar.step();
-
         m_GMTicketList.push_back(ticket);
-
     } while( result->NextRow() );
-
     result = CharacterDatabase.PQuery("SELECT MAX(guid) from gm_tickets");
-    m_GMticketid = (*result)[0].GetUInt64(); 
-
+    m_GMticketid = (*result)[0].GetUInt64();
     sLog.outString(">>> %u GM Tickets loaded from the database.", count);
     delete result;
 }
-
 void ObjectMgr::AddOrUpdateGMTicket(GM_Ticket &ticket, bool create)
 {
     if(create)
         m_GMTicketList.push_back(&ticket);
-        
-    _AddOrUpdateGMTicket(ticket);    
+    _AddOrUpdateGMTicket(ticket);
 }
-
 void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
 {
-    std::string msg(ticket.message), name(ticket.name), comment(ticket.comment); 
+    std::string msg(ticket.message), name(ticket.name), comment(ticket.comment);
     CharacterDatabase.escape_string(msg);
     CharacterDatabase.escape_string(name);
     CharacterDatabase.escape_string(comment);
@@ -8598,7 +7151,6 @@ void ObjectMgr::_AddOrUpdateGMTicket(GM_Ticket &ticket)
     CharacterDatabase.Execute(ss.str().c_str());
     CharacterDatabase.CommitTransaction();
 }
-
 void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently)
 {
     for(GmTicketList::iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
@@ -8615,35 +7167,28 @@ void ObjectMgr::RemoveGMTicket(GM_Ticket *ticket, int64 source, bool permanently
             _AddOrUpdateGMTicket(*(*i));
         }
 }
-
 void ObjectMgr::RemoveGMTicket(uint64 ticketGuid, int64 source, bool permanently)
 {
     GM_Ticket *ticket = GetGMTicket(ticketGuid);
     assert( ticket );
     RemoveGMTicket(ticket, source, permanently);
 }
-
 bool ObjectMgr::CheckDB() const
 {
     CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(28511);
     if(!cInfo || cInfo->spells[4] != 51890)
         return false;
-
     cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(30068);
     if(!cInfo || cInfo->faction_A != 21)
         return false;
-
     cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(28768); // Dark Rider of Acherus
     if(!cInfo || !cInfo->ScriptID)
         return false;
-
     cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(32627); // Wintergrasp Siege Engine
     if(!cInfo || !cInfo->spells[0] || cInfo->VehicleId != 117)
         return false;
-
     cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(33114); // Flame Leviathan Seat
     if(!cInfo || cInfo->VehicleId != 341)
         return false;
-
     return true;
 }
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index b0e1bce8367..716f4390134 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _OBJECTMGR_H
 #define _OBJECTMGR_H
-
 #include "Log.h"
 #include "Object.h"
 #include "Bag.h"
@@ -40,11 +38,9 @@
 #include "ObjectDefines.h"
 #include "Policies/Singleton.h"
 #include "Database/SQLStorage.h"
-
 #include <string>
 #include <map>
 #include <limits>
-
 extern SQLStorage sCreatureStorage;
 extern SQLStorage sCreatureDataAddonStorage;
 extern SQLStorage sCreatureInfoAddonStorage;
@@ -54,14 +50,12 @@ extern SQLStorage sGOStorage;
 extern SQLStorage sPageTextStore;
 extern SQLStorage sItemStorage;
 extern SQLStorage sInstanceTemplate;
-
 class Group;
 class Guild;
 class ArenaTeam;
 class Path;
 class TransportPath;
 class Item;
-
 struct GameTele
 {
     float  position_x;
@@ -72,10 +66,8 @@ struct GameTele
     std::string name;
     std::wstring wnameLow;
 };
-
 typedef UNORDERED_MAP<uint32, GameTele > GameTeleMap;
 typedef std::list<GossipOption> CacheNpcOptionList;
-
 struct ScriptInfo
 {
     uint32 id;
@@ -89,7 +81,6 @@ struct ScriptInfo
     float z;
     float o;
 };
-
 typedef std::multimap<uint32, ScriptInfo> ScriptMap;
 typedef std::map<uint32, ScriptMap > ScriptMapMap;
 extern ScriptMapMap sQuestEndScripts;
@@ -98,7 +89,6 @@ extern ScriptMapMap sSpellScripts;
 extern ScriptMapMap sGameObjectScripts;
 extern ScriptMapMap sEventScripts;
 extern ScriptMapMap sWaypointScripts;
-
 struct SpellClickInfo
 {
     uint32 spellId;
@@ -109,14 +99,11 @@ struct SpellClickInfo
     uint32 auraRequired;
     uint32 auraForbidden;
     SpellClickUserTypes userType;
-
     // helpers
     bool IsFitToRequirements(Player const* player, Creature const * clickNpc) const;
 };
-
 typedef std::multimap<uint32, SpellClickInfo> SpellClickInfoMap;
 typedef std::pair<SpellClickInfoMap::const_iterator,SpellClickInfoMap::const_iterator> SpellClickInfoMapBounds;
-
 struct AreaTrigger
 {
     uint32 access_id;
@@ -126,7 +113,6 @@ struct AreaTrigger
     float  target_Z;
     float  target_Orientation;
 };
-
 typedef std::set<uint32> CellGuidSet;
 typedef std::map<uint32/*player guid*/,uint32/*instance*/> CellCorpseSet;
 struct CellObjectGuids
@@ -137,10 +123,8 @@ struct CellObjectGuids
 };
 typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap;
 typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids;
-
 typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
 
-
 // mangos string ranges
 #define MIN_TRINITY_STRING_ID           1                    // 'mangos_string'
 #define MAX_TRINITY_STRING_ID           2000000000
@@ -148,12 +132,10 @@ typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
 #define MAX_DB_SCRIPT_STRING_ID        2000010000
 #define MIN_CREATURE_AI_TEXT_STRING_ID (-1)                 // 'creature_ai_texts'
 #define MAX_CREATURE_AI_TEXT_STRING_ID (-1000000)
-
 struct TrinityStringLocale
 {
     std::vector<std::string> Content;                       // 0 -> default, i -> i-1 locale index
 };
-
 typedef std::map<uint32,uint32> CreatureLinkedRespawnMap;
 typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap;
 typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap;
@@ -166,21 +148,17 @@ typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap;
 typedef UNORDERED_MAP<int32,TrinityStringLocale> TrinityStringLocaleMap;
 typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap;
 typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap;
-
 typedef std::multimap<uint32,uint32> QuestRelations;
 typedef std::multimap<uint32,ItemRequiredTarget> ItemRequiredTargetMap;
 typedef std::pair<ItemRequiredTargetMap::const_iterator, ItemRequiredTargetMap::const_iterator>  ItemRequiredTargetMapBounds;
-
 struct PetLevelInfo
 {
     PetLevelInfo() : health(0), mana(0) { for(uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; }
-
     uint16 stats[MAX_STATS];
     uint16 health;
     uint16 mana;
     uint16 armor;
 };
-
 struct ReputationOnKillEntry
 {
     uint32 repfaction1;
@@ -193,7 +171,6 @@ struct ReputationOnKillEntry
     int32 repvalue2;
     bool team_dependent;
 };
-
 struct PointOfInterest
 {
     uint32 entry;
@@ -204,7 +181,6 @@ struct PointOfInterest
     uint32 data;
     std::string icon_name;
 };
-
 #define WEATHER_SEASONS 4
 struct WeatherSeasonChances
 {
@@ -212,19 +188,16 @@ struct WeatherSeasonChances
     uint32 snowChance;
     uint32 stormChance;
 };
-
 struct WeatherZoneChances
 {
     WeatherSeasonChances data[WEATHER_SEASONS];
 };
-
 struct GraveYardData
 {
     uint32 safeLocId;
     uint32 team;
 };
 typedef std::multimap<uint32,GraveYardData> GraveYardMap;
-
 enum ConditionType
 {                                                           // value1       value2  for the Condition enumed
     CONDITION_NONE                  = 0,                    // 0            0
@@ -242,9 +215,7 @@ enum ConditionType
     CONDITION_ACTIVE_EVENT          = 12,                   // event_id
     CONDITION_INSTANCE_DATA         = 13,                   // entry        data
 };
-
 #define MAX_CONDITION                 14                    // maximum value in ConditionType enum
-
 //Player's info
 typedef struct _tagCachePlayerInfo
 {
@@ -261,16 +232,13 @@ typedef struct _tagCachePlayerInfo
     uint32 unArenaInfoSlot2;
 }CachePlayerInfo, *PCachePlayerInfo;
 typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap;
-
 struct PlayerCondition
 {
     ConditionType condition;                                // additional condition type
     uint32  value1;                                         // data for the condition - see ConditionType definition
     uint32  value2;
-
     PlayerCondition(uint8 _condition = 0, uint32 _value1 = 0, uint32 _value2 = 0)
         : condition(ConditionType(_condition)), value1(_value1), value2(_value2) {}
-
     static bool IsValid(ConditionType condition, uint32 value1, uint32 value2);
     // Checks correctness of values
     bool Meets(Player const * APlayer) const;               // Checks if the player meets the condition
@@ -279,14 +247,11 @@ struct PlayerCondition
         return (lc.condition == condition && lc.value1 == value1 && lc.value2 == value2);
     }
 };
-
 // NPC gossip text id
 typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap;
 typedef std::list<GossipOption> CacheNpcOptionList;
-
 typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemMap;
 typedef UNORDERED_MAP<uint32, TrainerSpellData> CacheTrainerSpellMap;
-
 enum SkillRangeType
 {
     SKILL_RANGE_LANGUAGE,                                   // 300..300
@@ -295,7 +260,6 @@ enum SkillRangeType
     SKILL_RANGE_RANK,                                       // 1..skill for known rank
     SKILL_RANGE_NONE,                                       // 0..0 always
 };
-
 struct GM_Ticket
 {
     uint64 guid;
@@ -314,78 +278,53 @@ struct GM_Ticket
 };
 typedef std::list<GM_Ticket*> GmTicketList;
 SkillRangeType GetSkillRangeType(SkillLineEntry const *pSkill, bool racial);
-
 #define MAX_PLAYER_NAME          12                         // max allowed by client name length
 #define MAX_INTERNAL_PLAYER_NAME 15                         // max server internal player name length ( > MAX_PLAYER_NAME for support declined names )
 #define MAX_PET_NAME             12                         // max allowed by client name length
 #define MAX_CHARTER_NAME         24                         // max allowed by client name length
-
 bool normalizePlayerName(std::string& name);
-
 struct TRINITY_DLL_SPEC LanguageDesc
 {
     Language lang_id;
     uint32   spell_id;
     uint32   skill_id;
 };
-
 extern LanguageDesc lang_description[LANGUAGES_COUNT];
 TRINITY_DLL_SPEC LanguageDesc const* GetLanguageDescByID(uint32 lang);
-
 class PlayerDumpReader;
-
 class ObjectMgr
 {
     friend class PlayerDumpReader;
-
     public:
         ObjectMgr();
         ~ObjectMgr();
-
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
-
         typedef std::set< Group * > GroupSet;
-
         typedef UNORDERED_MAP<uint32, Guild *> GuildMap;
-
         typedef UNORDERED_MAP<uint32, ArenaTeam*> ArenaTeamMap;
-
         typedef UNORDERED_MAP<uint32, Quest*> QuestMap;
-
         typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap;
-
         typedef UNORDERED_MAP<uint32, uint32> AreaTriggerScriptMap;
-
         typedef UNORDERED_MAP<uint32, AccessRequirement> AccessRequirementMap;
-
         typedef UNORDERED_MAP<uint32, ReputationOnKillEntry> RepOnKillMap;
         typedef UNORDERED_MAP<uint32, PointOfInterest> PointOfInterestMap;
-
         typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap;
-
         typedef std::vector<std::string> ScriptNameMap;
-
         UNORDERED_MAP<uint32, uint32> TransportEventMap;
-
         Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
         Player* GetPlayer(uint64 guid) const { return ObjectAccessor::FindPlayer(guid); }
-
         static GameObjectInfo const *GetGameObjectInfo(uint32 id) { return sGOStorage.LookupEntry<GameObjectInfo>(id); }
-
         void LoadGameobjectInfo();
         void AddGameobjectInfo(GameObjectInfo *goinfo);
-
         Group * GetGroupByLeader(const uint64 &guid) const;
         void AddGroup(Group* group) { mGroupSet.insert( group ); }
         void RemoveGroup(Group* group) { mGroupSet.erase( group ); }
-
         Guild* GetGuildByLeader(uint64 const&guid) const;
         Guild* GetGuildById(uint32 GuildId) const;
         Guild* GetGuildByName(const std::string& guildname) const;
         std::string GetGuildNameById(uint32 GuildId) const;
         void AddGuild(Guild* guild);
         void RemoveGuild(uint32 Id);
-
         ArenaTeam* GetArenaTeamById(uint32 arenateamid) const;
         ArenaTeam* GetArenaTeamByName(const std::string& arenateamname) const;
         ArenaTeam* GetArenaTeamByCaptain(uint64 const& guid) const;
@@ -393,7 +332,6 @@ class ObjectMgr
         void RemoveArenaTeam(uint32 Id);
         ArenaTeamMap::iterator GetArenaTeamMapBegin() { return mArenaTeamMap.begin(); }
         ArenaTeamMap::iterator GetArenaTeamMapEnd()   { return mArenaTeamMap.end(); }
-
         static CreatureInfo const *GetCreatureTemplate( uint32 id );
         CreatureModelInfo const *GetCreatureModelInfo( uint32 modelid );
         CreatureModelInfo const* GetCreatureModelRandomGender(uint32 display_id);
@@ -403,28 +341,22 @@ class ObjectMgr
         {
             return sCreatureDataAddonStorage.LookupEntry<CreatureDataAddon>(lowguid);
         }
-
         static CreatureDataAddon const *GetCreatureTemplateAddon( uint32 entry )
         {
             return sCreatureInfoAddonStorage.LookupEntry<CreatureDataAddon>(entry);
         }
-
         static ItemPrototype const* GetItemPrototype(uint32 id) { return sItemStorage.LookupEntry<ItemPrototype>(id); }
-
         static InstanceTemplate const* GetInstanceTemplate(uint32 map)
         {
             return sInstanceTemplate.LookupEntry<InstanceTemplate>(map);
         }
-
         PetLevelInfo const* GetPetLevelInfo(uint32 creature_id, uint32 level) const;
-
         PlayerClassInfo const* GetPlayerClassInfo(uint32 class_) const
         {
             if(class_ >= MAX_CLASSES) return NULL;
             return &playerClassInfo[class_];
         }
         void GetPlayerClassLevelInfo(uint32 class_,uint32 level, PlayerClassLevelInfo* info) const;
-
         PlayerInfo const* GetPlayerInfo(uint32 race, uint32 class_) const
         {
             if(race   >= MAX_RACES)   return NULL;
@@ -434,26 +366,22 @@ class ObjectMgr
             return info;
         }
         void GetPlayerLevelInfo(uint32 race, uint32 class_,uint32 level, PlayerLevelInfo* info) const;
-
         uint64 GetPlayerGUIDByName(std::string name) const;
         bool GetPlayerNameByGUID(const uint64 &guid, std::string &name) const;
         uint32 GetPlayerTeamByGUID(const uint64 &guid) const;
         uint32 GetPlayerAccountIdByGUID(const uint64 &guid) const;
         uint32 GetPlayerAccountIdByPlayerName(const std::string& name) const;
-
         uint32 GetNearestTaxiNode( float x, float y, float z, uint32 mapid, uint32 team );
         void GetTaxiPath( uint32 source, uint32 destination, uint32 &path, uint32 &cost);
         uint32 GetTaxiMountDisplayId( uint32 id, uint32 team, bool allowed_alt_team = false);
         void GetTaxiPathNodes( uint32 path, Path &pathnodes, std::vector<uint32>& mapIds );
         void GetTransportPathNodes( uint32 path, TransportPath &pathnodes );
-
         Quest const* GetQuestTemplate(uint32 quest_id) const
         {
             QuestMap::const_iterator itr = mQuestTemplates.find(quest_id);
             return itr != mQuestTemplates.end() ? itr->second : NULL;
         }
         QuestMap const& GetQuestTemplates() const { return mQuestTemplates; }
-
         uint32 GetQuestForAreaTrigger(uint32 Trigger_ID) const
         {
             QuestAreaTriggerMap::const_iterator itr = mQuestAreaTriggerMap.find(Trigger_ID);
@@ -465,20 +393,16 @@ class ObjectMgr
         {
             return mTavernAreaTriggerSet.find(Trigger_ID) != mTavernAreaTriggerSet.end();
         }
-
         bool IsGameObjectForQuests(uint32 entry) const
         {
             return mGameObjectForQuestSet.find(entry) != mGameObjectForQuestSet.end();
         }
-
         GossipText const* GetGossipText(uint32 Text_ID) const;
-
         WorldSafeLocsEntry const *GetClosestGraveYard(float x, float y, float z, uint32 MapId, uint32 team);
         bool AddGraveYardLink(uint32 id, uint32 zone, uint32 team, bool inDB = true);
         void RemoveGraveYardLink(uint32 id, uint32 zone, uint32 team, bool inDB = false);
         void LoadGraveyardZones();
         GraveYardData const* FindGraveYardData(uint32 id, uint32 zone);
-
         AreaTrigger const* GetAreaTrigger(uint32 trigger) const
         {
             AreaTriggerMap::const_iterator itr = mAreaTriggers.find( trigger );
@@ -486,7 +410,6 @@ class ObjectMgr
                 return &itr->second;
             return NULL;
         }
-
         AccessRequirement const* GetAccessRequirement(uint32 requirement) const
         {
             AccessRequirementMap::const_iterator itr = mAccessRequirements.find( requirement );
@@ -494,12 +417,9 @@ class ObjectMgr
                 return &itr->second;
             return NULL;
         }
-
         AreaTrigger const* GetGoBackTrigger(uint32 Map) const;
         AreaTrigger const* GetMapEntranceTrigger(uint32 Map) const;
-
         uint32 GetAreaTriggerScriptId(uint32 trigger_id);
-
         ReputationOnKillEntry const* GetReputationOnKilEntry(uint32 id) const
         {
             RepOnKillMap::const_iterator itr = mRepOnKill.find(id);
@@ -507,7 +427,6 @@ class ObjectMgr
                 return &itr->second;
             return NULL;
         }
-
         PointOfInterest const* GetPointOfInterest(uint32 id) const
         {
             PointOfInterestMap::const_iterator itr = mPointsOfInterest.find(id);
@@ -515,7 +434,6 @@ class ObjectMgr
                 return &itr->second;
             return NULL;
         }
-
         void LoadGuilds();
         void LoadArenaTeams();
         void LoadGroups();
@@ -531,21 +449,17 @@ class ObjectMgr
         void LoadGameobjectInvolvedRelations();
         void LoadCreatureQuestRelations();
         void LoadCreatureInvolvedRelations();
-
         QuestRelations mGOQuestRelations;
         QuestRelations mGOQuestInvolvedRelations;
         QuestRelations mCreatureQuestRelations;
         QuestRelations mCreatureQuestInvolvedRelations;
-
         void LoadGameObjectScripts();
         void LoadQuestEndScripts();
         void LoadQuestStartScripts();
         void LoadEventScripts();
         void LoadSpellScripts();
         void LoadWaypointScripts();
-
         void LoadTransportEvents();
-
         bool LoadTrinityStrings(DatabaseType& db, char const* table, int32 min_value, int32 max_value);
         bool LoadTrinityStrings() { return LoadTrinityStrings(WorldDatabase,"trinity_string",MIN_TRINITY_STRING_ID,MAX_TRINITY_STRING_ID); }
         void LoadDbScriptStrings();
@@ -571,19 +485,15 @@ class ObjectMgr
         void LoadNpcOptionLocales();
         void LoadPointOfInterestLocales();
         void LoadInstanceTemplate();
-
         void LoadGossipText();
-
         void LoadAreaTriggerTeleports();
         void LoadAccessRequirements();
         void LoadQuestAreaTriggers();
         void LoadAreaTriggerScripts();
         void LoadTavernAreaTriggers();
         void LoadGameObjectForQuests();
-
         void LoadItemTexts();
         void LoadPageTexts();
-
         void LoadPlayerInfo();
         void LoadPetLevelInfo();
         void LoadExplorationBaseXP();
@@ -591,33 +501,25 @@ class ObjectMgr
         void LoadPetNumber();
         void LoadCorpses();
         void LoadFishingBaseSkillLevel();
-
         void LoadReputationOnKill();
         void LoadPointsOfInterest();
-
         void LoadNPCSpellClickSpells();
-
         void LoadWeatherZoneChances();
         void LoadGameTele();
-
         void LoadNpcOptions();
         void LoadNpcTextId();
         void LoadVendors();
         void LoadTrainerSpell();
         void LoadGMTickets();
-
         std::string GeneratePetName(uint32 entry);
         uint32 GetBaseXP(uint32 level);
         uint32 GetXPForLevel(uint32 level);
-
         int32 GetFishingBaseSkillLevel(uint32 entry) const
         {
             FishingBaseSkillMap::const_iterator itr = mFishingBaseForArea.find(entry);
             return itr != mFishingBaseForArea.end() ? itr->second : 0;
         }
-
         void ReturnOrDeleteOldMails(bool serverUp);
-
         void SetHighestGuids();
         uint32 GenerateLowGuid(HighGuid guidhigh);
         uint32 GenerateArenaTeamId();
@@ -627,11 +529,9 @@ class ObjectMgr
         uint32 GenerateItemTextID();
         uint32 GenerateMailID();
         uint32 GeneratePetNumber();
-
         void LoadPlayerInfoInCache();
         PCachePlayerInfo GetPlayerInfoFromCache(uint32 unPlayerGuid) const;
         CachePlayerInfoMap m_mPlayerInfoMap;
-
         uint32 CreateItemText(std::string text);
         void AddItemText(uint32 itemTextId, std::string text) { mItemTexts[itemTextId] = text; }
         std::string GetItemText( uint32 id )
@@ -642,10 +542,8 @@ class ObjectMgr
             else
                 return "There is no info for this item";
         }
-
         typedef std::multimap<int32, uint32> ExclusiveQuestGroups;
         ExclusiveQuestGroups mExclusiveQuestGroups;
-
         WeatherZoneChances const* GetWeatherChances(uint32 zone_id) const
         {
             WeatherZoneMap::const_iterator itr = mWeatherZoneMap.find(zone_id);
@@ -654,12 +552,10 @@ class ObjectMgr
             else
                 return NULL;
         }
-
         CellObjectGuids const& GetCellObjectGuids(uint16 mapid, uint8 spawnMode, uint32 cell_id)
         {
             return mMapObjectGuids[MAKE_PAIR32(mapid,spawnMode)][cell_id];
         }
-
         CreatureData const* GetCreatureData(uint32 guid) const
         {
             CreatureDataMap::const_iterator itr = mCreatureDataMap.find(guid);
@@ -722,7 +618,6 @@ class ObjectMgr
             if(itr==mPointOfInterestLocaleMap.end()) return NULL;
             return &itr->second;
         }
-
         GameObjectData const* GetGOData(uint32 guid) const
         {
             GameObjectDataMap::const_iterator itr = mGameObjectDataMap.find(guid);
@@ -731,7 +626,6 @@ class ObjectMgr
         }
         GameObjectData& NewGOData(uint32 guid) { return mGameObjectDataMap[guid]; }
         void DeleteGOData(uint32 guid);
-
         TrinityStringLocale const* GetTrinityStringLocale(int32 entry) const
         {
             TrinityStringLocaleMap::const_iterator itr = mTrinityStringLocaleMap.find(entry);
@@ -742,16 +636,13 @@ class ObjectMgr
         const char *GetTrinityStringForDBCLocale(int32 entry) const { return GetTrinityString(entry,DBCLocaleIndex); }
         int32 GetDBCLocaleIndex() const { return DBCLocaleIndex; }
         void SetDBCLocaleIndex(uint32 lang) { DBCLocaleIndex = GetIndexForLocale(LocaleConstant(lang)); }
-
         void AddCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid, uint32 instance);
         void DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid);
-
         time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance) { return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)]; }
         void SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t);
         time_t GetGORespawnTime(uint32 loguid, uint32 instance) { return mGORespawnTimes[MAKE_PAIR64(loguid,instance)]; }
         void SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t);
         void DeleteRespawnTimeForInstance(uint32 instance);
-
         // grid objects
         void AddCreatureToGrid(uint32 guid, CreatureData const* data);
         void RemoveCreatureFromGrid(uint32 guid, CreatureData const* data);
@@ -759,35 +650,27 @@ class ObjectMgr
         void RemoveGameobjectFromGrid(uint32 guid, GameObjectData const* data);
         uint32 AddGOData(uint32 entry, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0, float rotation0 = 0, float rotation1 = 0, float rotation2 = 0, float rotation3 = 0);
         uint32 AddCreData(uint32 entry, uint32 team, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0);
-
         // reserved names
         void LoadReservedPlayersNames();
         bool IsReservedName(const std::string& name) const;
-
         // name with valid structure and symbols
         static uint8 CheckPlayerName( const std::string& name, bool create = false );
         static PetNameInvalidReason CheckPetName( const std::string& name );
         static bool IsValidCharterName( const std::string& name );
-
         static bool CheckDeclinedNames(std::wstring mainpart, DeclinedName const& names);
-
         void LoadSpellDisabledEntrys();
         bool IsPlayerSpellDisabled(uint32 spellid) { return (m_DisabledPlayerSpells.count(spellid) != 0); }
         bool IsCreatureSpellDisabled(uint32 spellid) { return (m_DisabledCreatureSpells.count(spellid) != 0); }
         bool IsPetSpellDisabled(uint32 spellid) { return (m_DisabledPetSpells.count(spellid) != 0); }
-
         int GetIndexForLocale(LocaleConstant loc);
         LocaleConstant GetLocaleForIndex(int i);
-
         uint16 GetConditionId(ConditionType condition, uint32 value1, uint32 value2);
         bool IsPlayerMeetToCondition(Player const* player, uint16 condition_id) const
         {
             if(condition_id >= mConditions.size())
                 return false;
-
             return mConditions[condition_id].Meets(player);
         }
-
         GameTele const* GetGameTele(uint32 id) const
         {
             GameTeleMap::const_iterator itr = m_GameTeleMap.find(id);
@@ -798,62 +681,49 @@ class ObjectMgr
         GameTeleMap const& GetGameTeleMap() const { return m_GameTeleMap; }
         bool AddGameTele(GameTele& data);
         bool DeleteGameTele(const std::string& name);
-
         CacheNpcOptionList const& GetNpcOptions() const { return m_mCacheNpcOptionList; }
-
         uint32 GetNpcGossip(uint32 entry) const
         {
             CacheNpcTextIdMap::const_iterator iter = m_mCacheNpcTextIdMap.find(entry);
             if(iter == m_mCacheNpcTextIdMap.end())
                 return 0;
-
             return iter->second;
         }
-
         TrainerSpellData const* GetNpcTrainerSpells(uint32 entry) const
         {
             CacheTrainerSpellMap::const_iterator  iter = m_mCacheTrainerSpellMap.find(entry);
             if(iter == m_mCacheTrainerSpellMap.end())
                 return NULL;
-
             return &iter->second;
         }
-
         VendorItemData const* GetNpcVendorItemList(uint32 entry) const
         {
             CacheVendorItemMap::const_iterator  iter = m_mCacheVendorItemMap.find(entry);
             if(iter == m_mCacheVendorItemMap.end())
                 return NULL;
-
             return &iter->second;
         }
         void AddVendorItem(uint32 entry,uint32 item, uint32 maxcount, uint32 incrtime, uint32 ExtendedCost, bool savetodb = true); // for event
         bool RemoveVendorItem(uint32 entry,uint32 item, bool savetodb = true); // for event
         bool IsVendorItemValid( uint32 vendor_entry, uint32 item, uint32 maxcount, uint32 ptime, uint32 ExtendedCost, Player* pl = NULL, std::set<uint32>* skip_vendors = NULL, uint32 ORnpcflag = 0 ) const;
-
         void LoadScriptNames();
         ScriptNameMap &GetScriptNames() { return m_scriptNames; }
         const char * GetScriptName(uint32 id) { return id < m_scriptNames.size() ? m_scriptNames[id].c_str() : ""; }
         uint32 GetScriptId(const char *name);
-
         int GetOrNewIndexForLocale(LocaleConstant loc);
-
         SpellClickInfoMapBounds GetSpellClickInfoMapBounds(uint32 creature_id) const
         {
             return SpellClickInfoMapBounds(mSpellClickInfoMap.lower_bound(creature_id),mSpellClickInfoMap.upper_bound(creature_id));
         }
-
         ItemRequiredTargetMapBounds GetItemRequiredTargetMapBounds(uint32 uiItemEntry) const
         {
             return ItemRequiredTargetMapBounds(m_ItemRequiredTarget.lower_bound(uiItemEntry),m_ItemRequiredTarget.upper_bound(uiItemEntry));
         }
-        
         GM_Ticket *GetGMTicket(uint64 ticketGuid)
         {
             for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
                 if((*i) && (*i)->guid == ticketGuid)
                     return (*i);
-                    
             return NULL;
         }
         GM_Ticket *GetGMTicketByPlayer(uint64 playerGuid)
@@ -861,23 +731,18 @@ class ObjectMgr
             for(GmTicketList::const_iterator i = m_GMTicketList.begin(); i != m_GMTicketList.end(); ++i)
                 if((*i) && (*i)->playerGuid == playerGuid && (*i)->closed == 0)
                     return (*i);
-                    
-            return NULL;        
+            return NULL;
         }
-        
         void AddOrUpdateGMTicket(GM_Ticket &ticket, bool create = false);
         void _AddOrUpdateGMTicket(GM_Ticket &ticket);
         void RemoveGMTicket(uint64 ticketGuid, int64 source = -1, bool permanently = false);
         void RemoveGMTicket(GM_Ticket *ticket, int64 source = -1, bool permanently = false);
         GmTicketList m_GMTicketList;
         uint64 GenerateGMTicketId();
-
         bool CheckDB() const;
-
         // for wintergrasp only
         GraveYardMap        mGraveYardMap;
     protected:
-
         // first free id for selected id type
         uint32 m_arenaTeamId;
         uint32 m_auctionid;
@@ -887,7 +752,6 @@ class ObjectMgr
         uint32 m_mailid;
         uint32 m_hiPetNumber;
         uint64 m_GMticketid;
-
         // first free low guid for seelcted guid type
         uint32 m_hiCharGuid;
         uint32 m_hiCreatureGuid;
@@ -897,21 +761,16 @@ class ObjectMgr
         uint32 m_hiGoGuid;
         uint32 m_hiDoGuid;
         uint32 m_hiCorpseGuid;
-
         QuestMap            mQuestTemplates;
-
         typedef UNORDERED_MAP<uint32, GossipText> GossipTextMap;
         typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap;
         typedef UNORDERED_MAP<uint32, std::string> ItemTextMap;
         typedef std::set<uint32> TavernAreaTriggerSet;
         typedef std::set<uint32> GameObjectForQuestSet;
-
         GroupSet            mGroupSet;
         GuildMap            mGuildMap;
         ArenaTeamMap        mArenaTeamMap;
-
         ItemTextMap         mItemTexts;
-
         QuestAreaTriggerMap mQuestAreaTriggerMap;
         TavernAreaTriggerSet mTavernAreaTriggerSet;
         GameObjectForQuestSet mGameObjectForQuestSet;
@@ -919,65 +778,44 @@ class ObjectMgr
         AreaTriggerMap      mAreaTriggers;
         AreaTriggerScriptMap  mAreaTriggerScripts;
         AccessRequirementMap  mAccessRequirements;
-
         RepOnKillMap        mRepOnKill;
-
         PointOfInterestMap mPointsOfInterest;
-
         WeatherZoneMap      mWeatherZoneMap;
-
         //character reserved names
         typedef std::set<std::wstring> ReservedNamesMap;
         ReservedNamesMap    m_ReservedNames;
-
         std::set<uint32>    m_DisabledPlayerSpells;
         std::set<uint32>    m_DisabledCreatureSpells;
         std::set<uint32>    m_DisabledPetSpells;
-
 //        GraveYardMap        mGraveYardMap;
-
         GameTeleMap         m_GameTeleMap;
-
         ScriptNameMap       m_scriptNames;
-
         SpellClickInfoMap   mSpellClickInfoMap;
-
         ItemRequiredTargetMap m_ItemRequiredTarget;
-
         typedef             std::vector<LocaleConstant> LocalForIndex;
         LocalForIndex        m_LocalForIndex;
-
         int DBCLocaleIndex;
-
     private:
         void LoadScripts(ScriptMapMap& scripts, char const* tablename);
         void CheckScripts(ScriptMapMap const& scripts,std::set<int32>& ids);
         void LoadCreatureAddons(SQLStorage& creatureaddons, char const* entryName, char const* comment);
         void ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const* table, char const* guidEntryStr);
         void LoadQuestRelationsHelper(QuestRelations& map,char const* table);
-
         typedef std::map<uint32,PetLevelInfo*> PetLevelInfoMap;
         // PetLevelInfoMap[creature_id][level]
         PetLevelInfoMap petInfo;                            // [creature_id][level]
-
         PlayerClassInfo playerClassInfo[MAX_CLASSES];
-
         void BuildPlayerLevelInfo(uint8 race, uint8 class_, uint8 level, PlayerLevelInfo* plinfo) const;
         PlayerInfo playerInfo[MAX_RACES][MAX_CLASSES];
-
         typedef std::vector<uint32> PlayerXPperLevel;       // [level]
         PlayerXPperLevel mPlayerXPperLevel;
-
         typedef std::map<uint32,uint32> BaseXPMap;          // [area level][base xp]
         BaseXPMap mBaseXPTable;
-
         typedef std::map<uint32,int32> FishingBaseSkillMap; // [areaId][base skill level]
         FishingBaseSkillMap mFishingBaseForArea;
-
         typedef std::map<uint32,std::vector<std::string> > HalfNameMap;
         HalfNameMap PetHalfName0;
         HalfNameMap PetHalfName1;
-
         MapObjectGuids mMapObjectGuids;
         CreatureDataMap mCreatureDataMap;
         CreatureLinkedRespawnMap mCreatureLinkedRespawnMap;
@@ -993,19 +831,15 @@ class ObjectMgr
         PointOfInterestLocaleMap mPointOfInterestLocaleMap;
         RespawnTimes mCreatureRespawnTimes;
         RespawnTimes mGORespawnTimes;
-
         // Storage for Conditions. First element (index 0) is reserved for zero-condition (nothing required)
         typedef std::vector<PlayerCondition> ConditionStore;
         ConditionStore mConditions;
-
         CacheNpcOptionList m_mCacheNpcOptionList;
         CacheNpcTextIdMap m_mCacheNpcTextIdMap;
         CacheVendorItemMap m_mCacheVendorItemMap;
         CacheTrainerSpellMap m_mCacheTrainerSpellMap;
 };
-
 #define objmgr Trinity::Singleton<ObjectMgr>::Instance()
-
 // scripting access functions
 TRINITY_DLL_SPEC bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min());
 TRINITY_DLL_SPEC uint32 GetAreaTriggerScriptId(uint32 trigger_id);
@@ -1015,5 +849,4 @@ TRINITY_DLL_SPEC GameObjectInfo const *GetGameObjectInfo(uint32 id);
 TRINITY_DLL_SPEC CreatureInfo const *GetCreatureInfo(uint32 id);
 TRINITY_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
 TRINITY_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry);
-
 #endif
diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index ba1deaeff7c..d4547f4ff36 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /** \file
     \ingroup u2w
 */
-
 #include "Opcodes.h"
 #include "WorldSession.h"
-
 /// Correspondence between opcodes and their names
 OpcodeHandler opcodeTable[NUM_MSG_TYPES] =
 {
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index c3371f866b6..e805eea3752 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -17,22 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /// \addtogroup u2w
 /// @{
 /// \file
-
 #ifndef _OPCODES_H
 #define _OPCODES_H
-
 #include "Common.h"
-
 // Note: this include need for be sure have full definition of class WorldSession
 //       if this class definition not complite then VS for x64 release use different size for
 //       struct OpcodeHandler in this header and Opcode.cpp and get totally wrong data from
 //       table opcodeTable in source when Opcode.h included but WorldSession.h not included
 #include "WorldSession.h"
-
 /// List of Opcodes
 enum Opcodes
 {
@@ -1267,7 +1262,6 @@ enum Opcodes
     SMSG_EQUIPMENT_SET_USE_RESULT                   = 0x4CC, // SMSG, UseEquipmentSetResult?
     NUM_MSG_TYPES                                   = 0x4CD
 };
-
 /// Player state
 enum SessionStatus
 {
@@ -1277,18 +1271,14 @@ enum SessionStatus
     STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT,                    ///< _player!= NULL or _player==NULL && m_playerRecentlyLogout, m_GUID store last _player guid)
     STATUS_NEVER                                            ///< Opcode not accepted from client (deprecated or server side only)
 };
-
 class WorldPacket;
-
 struct OpcodeHandler
 {
     char const* name;
     SessionStatus status;
     void (WorldSession::*handler)(WorldPacket& recvPacket);
 };
-
 extern OpcodeHandler opcodeTable[NUM_MSG_TYPES];
-
 /// Lookup opcode name for human understandable logging
 inline const char* LookupOpcodeName(uint16 id)
 {
diff --git a/src/game/OutdoorPvP.cpp b/src/game/OutdoorPvP.cpp
index 75b794c0452..6bb0c94336c 100644
--- a/src/game/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvP.h"
 #include "OutdoorPvPImpl.h"
 #include "OutdoorPvPMgr.h"
@@ -30,14 +29,12 @@
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
-
 OPvPCapturePoint::OPvPCapturePoint(OutdoorPvP * pvp)
 : m_PvP(pvp), m_value(0), m_maxValue(0), m_team(TEAM_NEUTRAL),
 m_State(OBJECTIVESTATE_NEUTRAL), m_OldState(OBJECTIVESTATE_NEUTRAL), m_capturePointGUID(0), m_neutralValuePct(0),
 m_maxSpeed(0), m_capturePoint(NULL)
 {
 }
-
 bool OPvPCapturePoint::HandlePlayerEnter(Player * plr)
 {
     if(m_capturePoint)
@@ -48,19 +45,16 @@ bool OPvPCapturePoint::HandlePlayerEnter(Player * plr)
     }
     return m_activePlayers[plr->GetTeamId()].insert(plr).second;
 }
-
 void OPvPCapturePoint::HandlePlayerLeave(Player * plr)
 {
     if(m_capturePoint)
         plr->SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 0);
     m_activePlayers[plr->GetTeamId()].erase(plr);
 }
-
 void OPvPCapturePoint::SendChangePhase()
 {
     if(!m_capturePoint)
         return;
-
     // send this too, sometimes the slider disappears, dunno why :(
     SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldState1, 1);
     // send these updates to only the ones in this objective
@@ -68,7 +62,6 @@ void OPvPCapturePoint::SendChangePhase()
     // send this too, sometimes it resets :S
     SendUpdateWorldState(m_capturePoint->GetGOInfo()->capturePoint.worldstate3, m_neutralValuePct);
 }
-
 void OPvPCapturePoint::AddGO(uint32 type, uint32 guid, uint32 entry)
 {
     if(!entry)
@@ -81,7 +74,6 @@ void OPvPCapturePoint::AddGO(uint32 type, uint32 guid, uint32 entry)
     m_Objects[type] = MAKE_NEW_GUID(guid, entry, HIGHGUID_GAMEOBJECT);
     m_ObjectTypes[m_Objects[type]]=type;
 }
-
 void OPvPCapturePoint::AddCre(uint32 type, uint32 guid, uint32 entry)
 {
     if(!entry)
@@ -94,7 +86,6 @@ void OPvPCapturePoint::AddCre(uint32 type, uint32 guid, uint32 entry)
     m_Creatures[type] = MAKE_NEW_GUID(guid, entry, HIGHGUID_UNIT);
     m_CreatureTypes[m_Creatures[type]] = type;
 }
-
 bool OPvPCapturePoint::AddObject(uint32 type, uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3)
 {
     if(uint32 guid = objmgr.AddGOData(entry, map, x, y, z, o, 0, rotation0, rotation1, rotation2, rotation3))
@@ -102,10 +93,8 @@ bool OPvPCapturePoint::AddObject(uint32 type, uint32 entry, uint32 map, float x,
         AddGO(type, guid, entry);
         return true;
     }
-
     return false;
 }
-
 bool OPvPCapturePoint::AddCreature(uint32 type, uint32 entry, uint32 team, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay)
 {
     if(uint32 guid = objmgr.AddCreData(entry, team, map, x, y, z, o, spawntimedelay))
@@ -113,14 +102,11 @@ bool OPvPCapturePoint::AddCreature(uint32 type, uint32 entry, uint32 team, uint3
         AddCre(type, guid, entry);
         return true;
     }
-
     return false;
 }
-
 bool OPvPCapturePoint::SetCapturePointData(uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3)
 {
     sLog.outDebug("Creating capture point %u", entry);
-
     // check info existence
     GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(entry);
     if(!goinfo || goinfo->type != GAMEOBJECT_TYPE_CAPTURE_POINT)
@@ -128,20 +114,16 @@ bool OPvPCapturePoint::SetCapturePointData(uint32 entry, uint32 map, float x, fl
         sLog.outError("OutdoorPvP: GO %u is not capture point!", entry);
         return false;
     }
-
     m_capturePointGUID = objmgr.AddGOData(entry, map, x, y, z, o, 0, rotation0, rotation1, rotation2, rotation3);
     if(!m_capturePointGUID)
         return false;
-
     // get the needed values from goinfo
     m_maxValue = goinfo->capturePoint.maxTime;
     m_maxSpeed = m_maxValue / (goinfo->capturePoint.minTime ? goinfo->capturePoint.minTime : 60);
     m_neutralValuePct = goinfo->capturePoint.neutralPercent;
     m_minValue = m_maxValue * goinfo->capturePoint.neutralPercent / 100;
-
     return true;
 }
-
 bool OPvPCapturePoint::DelCreature(uint32 type)
 {
     if(!m_Creatures[type])
@@ -149,7 +131,6 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
         sLog.outDebug("opvp creature type %u was already deleted",type);
         return false;
     }
-
     Creature *cr = HashMapHolder<Creature>::Find(m_Creatures[type]);
     if(!cr)
     {
@@ -175,12 +156,10 @@ bool OPvPCapturePoint::DelCreature(uint32 type)
     m_Creatures[type] = 0;
     return true;
 }
-
 bool OPvPCapturePoint::DelObject(uint32 type)
 {
     if(!m_Objects[type])
         return false;
-
     GameObject *obj = HashMapHolder<GameObject>::Find(m_Objects[type]);
     if(!obj)
     {
@@ -195,21 +174,17 @@ bool OPvPCapturePoint::DelObject(uint32 type)
     m_Objects[type] = 0;
     return true;
 }
-
 bool OPvPCapturePoint::DelCapturePoint()
 {
     objmgr.DeleteGOData(m_capturePointGUID);
     m_capturePointGUID = 0;
-
     if(m_capturePoint)
     {
         m_capturePoint->SetRespawnTime(0);                                 // not save respawn time
         m_capturePoint->Delete();
     }
-
     return true;
 }
-
 void OPvPCapturePoint::DeleteSpawns()
 {
     for(std::map<uint32,uint64>::iterator i = m_Objects.begin(); i != m_Objects.end(); ++i)
@@ -218,27 +193,22 @@ void OPvPCapturePoint::DeleteSpawns()
         DelCreature(i->first);
     DelCapturePoint();
 }
-
 void OutdoorPvP::DeleteSpawns()
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         itr->second->DeleteSpawns();
 }
-
 OutdoorPvP::OutdoorPvP() : m_sendUpdate(true)
 {
 }
-
 OutdoorPvP::~OutdoorPvP()
 {
     DeleteSpawns();
 }
-
 void OutdoorPvP::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     m_players[plr->GetTeamId()].insert(plr);
 }
-
 void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // inform the objectives of the leaving
@@ -250,7 +220,6 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
     m_players[plr->GetTeamId()].erase(plr);
     sLog.outDebug("Player %s left an outdoorpvp zone", plr->GetName());
 }
-
 bool OutdoorPvP::Update(uint32 diff)
 {
     bool objective_changed = false;
@@ -261,14 +230,11 @@ bool OutdoorPvP::Update(uint32 diff)
     }
     return objective_changed;
 }
-
 bool OPvPCapturePoint::Update(uint32 diff)
 {
     if(!m_capturePoint)
         return false;
-
     float radius = m_capturePoint->GetGOInfo()->capturePoint.radius;
-
     for(uint32 team = 0; team < 2; ++team)
     {
         for(PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end();)
@@ -279,12 +245,10 @@ bool OPvPCapturePoint::Update(uint32 diff)
                 HandlePlayerLeave(player);
         }
     }
-
     std::list<Player*> players;
     Trinity::AnyPlayerInObjectRangeCheck checker(m_capturePoint, radius);
     Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(m_capturePoint, players, checker);
     m_capturePoint->VisitNearbyWorldObject(radius, searcher);
-
     for(std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
     {
         if((*itr)->IsOutdoorPvPActive())
@@ -293,24 +257,19 @@ bool OPvPCapturePoint::Update(uint32 diff)
                 HandlePlayerEnter(*itr);
         }
     }
-
     // get the difference of numbers
     float fact_diff = ((float)m_activePlayers[0].size() - (float)m_activePlayers[1].size()) * diff / OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL;
     if(!fact_diff)
         return false;
-
     uint32 Challenger = 0;
     float maxDiff = m_maxSpeed * diff;
-
     if(fact_diff < 0)
     {
         // horde is in majority, but it's already horde-controlled -> no change
         if(m_State == OBJECTIVESTATE_HORDE && m_value <= -m_maxValue)
             return false;
-
         if(fact_diff < -maxDiff)
             fact_diff = -maxDiff;
-
         Challenger = HORDE;
     }
     else
@@ -318,20 +277,14 @@ bool OPvPCapturePoint::Update(uint32 diff)
         // ally is in majority, but it's already ally-controlled -> no change
         if(m_State == OBJECTIVESTATE_ALLIANCE && m_value >= m_maxValue)
             return false;
-
         if(fact_diff > maxDiff)
             fact_diff = maxDiff;
-
         Challenger = ALLIANCE;
     }
-
     float oldValue = m_value;
     TeamId oldTeam = m_team;
-
     m_OldState = m_State;
-
     m_value += fact_diff;
-
     if(m_value < -m_minValue) // red
     {
         if(m_value < -m_maxValue)
@@ -365,10 +318,8 @@ bool OPvPCapturePoint::Update(uint32 diff)
             m_State = OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE;
         m_team = TEAM_NEUTRAL;
     }
-
     if(m_value != oldValue)
         SendChangePhase();
-
     if(m_OldState != m_State)
     {
         //sLog.outError("%u->%u", m_OldState, m_State);
@@ -377,10 +328,8 @@ bool OPvPCapturePoint::Update(uint32 diff)
         ChangeState();
         return true;
     }
-
     return false;
 }
-
 void OutdoorPvP::SendUpdateWorldState(uint32 field, uint32 value)
 {
     if(m_sendUpdate)
@@ -388,7 +337,6 @@ void OutdoorPvP::SendUpdateWorldState(uint32 field, uint32 value)
             for(PlayerSet::iterator itr = m_players[i].begin(); itr != m_players[i].end(); ++itr)
                 (*itr)->SendUpdateWorldState(field, value);
 }
-
 void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value)
 {
     for(uint32 team = 0; team < 2; ++team)
@@ -400,7 +348,6 @@ void OPvPCapturePoint::SendUpdateWorldState(uint32 field, uint32 value)
         }
     }
 }
-
 void OPvPCapturePoint::SendObjectiveComplete(uint32 id,uint64 guid)
 {
     uint32 team;
@@ -415,12 +362,10 @@ void OPvPCapturePoint::SendObjectiveComplete(uint32 id,uint64 guid)
     default:
         return;
     }
-
     // send to all players present in the area
     for(PlayerSet::iterator itr = m_activePlayers[team].begin(); itr != m_activePlayers[team].end(); ++itr)
         (*itr)->KilledMonsterCredit(id, guid);
 }
-
 void OutdoorPvP::HandleKill(Player *killer, Unit * killed)
 {
     if(Group * pGroup = killer->GetGroup())
@@ -428,14 +373,11 @@ void OutdoorPvP::HandleKill(Player *killer, Unit * killed)
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player *pGroupGuy = itr->getSource();
-
             if(!pGroupGuy)
                 continue;
-
             // skip if too far away
             if(!pGroupGuy->IsAtGroupRewardDistance(killed))
                 continue;
-
             // creature kills must be notified, even if not inside objective / not outdoor pvp active
             // player kills only count if active and inside objective
             if(( pGroupGuy->IsOutdoorPvPActive() && IsInsideObjective(pGroupGuy) ) || killed->GetTypeId() == TYPEID_UNIT)
@@ -453,88 +395,70 @@ void OutdoorPvP::HandleKill(Player *killer, Unit * killed)
         }
     }
 }
-
 bool OutdoorPvP::IsInsideObjective(Player *plr) const
 {
     for(OPvPCapturePointMap::const_iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->IsInsideObjective(plr))
             return true;
-
     return false;
 }
-
 bool OPvPCapturePoint::IsInsideObjective(Player *plr) const
 {
     return m_activePlayers[plr->GetTeamId()].find(plr) != m_activePlayers[plr->GetTeamId()].end();
 }
-
 bool OutdoorPvP::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->HandleCustomSpell(plr,spellId,go))
             return true;
-
     return false;
 }
-
 bool OPvPCapturePoint::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
 {
     if(!plr->IsOutdoorPvPActive())
         return false;
     return false;
 }
-
 bool OutdoorPvP::HandleOpenGo(Player *plr, uint64 guid)
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->HandleOpenGo(plr,guid) >= 0)
             return true;
-
     return false;
 }
-
 bool OutdoorPvP::HandleGossipOption(Player * plr, uint64 guid, uint32 id)
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->HandleGossipOption(plr, guid, id))
             return true;
-
     return false;
 }
-
 bool OutdoorPvP::CanTalkTo(Player * plr, Creature * c, GossipOption &gso)
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->CanTalkTo(plr, c, gso))
             return true;
-
     return false;
 }
-
 bool OutdoorPvP::HandleDropFlag(Player * plr, uint32 id)
 {
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if(itr->second->HandleDropFlag(plr, id))
             return true;
-
     return false;
 }
-
 bool OPvPCapturePoint::HandleGossipOption(Player * plr, uint64 guid, uint32 id)
 {
     return false;
 }
-
 bool OPvPCapturePoint::CanTalkTo(Player * plr, Creature * c, GossipOption &gso)
 {
     return false;
 }
-
 bool OPvPCapturePoint::HandleDropFlag(Player * plr, uint32 id)
 {
     return false;
 }
-
 int32 OPvPCapturePoint::HandleOpenGo(Player *plr, uint64 guid)
 {
     std::map<uint64,uint32>::iterator itr = m_ObjectTypes.find(guid);
@@ -544,12 +468,10 @@ int32 OPvPCapturePoint::HandleOpenGo(Player *plr, uint64 guid)
     }
     return -1;
 }
-
 bool OutdoorPvP::HandleAreaTrigger(Player *plr, uint32 trigger)
 {
     return false;
 }
-
 void OutdoorPvP::BroadcastPacket(WorldPacket &data) const
 {
     // This is faster than sWorld.SendZoneMessage
@@ -557,17 +479,14 @@ void OutdoorPvP::BroadcastPacket(WorldPacket &data) const
         for(PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
             (*itr)->GetSession()->SendPacket(&data);
 }
-
 void OutdoorPvP::RegisterZone(uint32 zoneId)
 {
     sOutdoorPvPMgr.AddZone(zoneId, this);
 }
-
 bool OutdoorPvP::HasPlayer(Player *plr) const
 {
     return m_players[plr->GetTeamId()].find(plr) != m_players[plr->GetTeamId()].end();
 }
-
 void OutdoorPvP::TeamCastSpell(TeamId team, int32 spellId)
 {
     if(spellId > 0)
@@ -577,18 +496,15 @@ void OutdoorPvP::TeamCastSpell(TeamId team, int32 spellId)
         for(PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
             (*itr)->RemoveAura((uint32)-spellId); // by stack?
 }
-
 void OutdoorPvP::TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2)
 {
     TeamCastSpell(team, spellId);
     TeamCastSpell(OTHER_TEAM(team), spellId2 ? -(int32)spellId2 : -(int32)spellId);
 }
-
 void OutdoorPvP::OnGameObjectCreate(GameObject *go, bool add)
 {
     if(go->GetGoType() != GAMEOBJECT_TYPE_CAPTURE_POINT)
         return;
-
     if(OPvPCapturePoint *cp = GetCapturePoint(go->GetDBTableGUIDLow()))
         cp->m_capturePoint = add ? go : NULL;
 }
diff --git a/src/game/OutdoorPvP.h b/src/game/OutdoorPvP.h
index e48356633c3..487b923a4d6 100644
--- a/src/game/OutdoorPvP.h
+++ b/src/game/OutdoorPvP.h
@@ -15,16 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_H_
 #define OUTDOOR_PVP_H_
-
 #include "Util.h"
 #include "SharedDefines.h"
 #include "ZoneScript.h"
-
 class GameObject;
-
 enum OutdoorPvPTypes
 {
     OUTDOOR_PVP_HP = 1,
@@ -35,9 +31,7 @@ enum OutdoorPvPTypes
     OUTDOOR_PVP_EP,
     OPVP_WINTERGRASP,
 };
-
 const uint8 CapturePointArtKit[3] = {2, 1, 21};
-
 enum ObjectiveStates
 {
     OBJECTIVESTATE_NEUTRAL = 0,
@@ -48,7 +42,6 @@ enum ObjectiveStates
     OBJECTIVESTATE_ALLIANCE_HORDE_CHALLENGE,
     OBJECTIVESTATE_HORDE_ALLIANCE_CHALLENGE,
 };
-
 // struct for go spawning
 struct go_type{
     uint32 entry;
@@ -62,7 +55,6 @@ struct go_type{
     float rot2;
     float rot3;
 };
-
 // struct for creature spawning
 struct creature_type{
     uint32 entry;
@@ -73,7 +65,6 @@ struct creature_type{
     float z;
     float o;
 };
-
 // some class predefs
 class Player;
 class GameObject;
@@ -81,63 +72,45 @@ class WorldPacket;
 class Creature;
 class Unit;
 struct GossipOption;
-
 typedef std::set<Player*> PlayerSet;
-
 class OutdoorPvP;
 class OPvPCapturePoint
 {
 public:
     OPvPCapturePoint(OutdoorPvP * pvp);
-
     virtual void FillInitialWorldStates(WorldPacket & data) {}
-
     // send world state update to all players present
     void SendUpdateWorldState(uint32 field, uint32 value);
     // send kill notify to players in the controlling faction
     void SendObjectiveComplete(uint32 id, uint64 guid);
-
     // used when player is activated/inactivated in the area
     virtual bool HandlePlayerEnter(Player * plr);
     virtual void HandlePlayerLeave(Player * plr);
     //virtual void HandlePlayerActivityChanged(Player * plr);
-
     // checks if player is in range of a capture credit marker
     bool IsInsideObjective(Player * plr) const;
-
     virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go);
     virtual int32 HandleOpenGo(Player *plr, uint64 guid);
-
     // returns true if the state of the objective has changed, in this case, the OutdoorPvP must send a world state ui update.
     virtual bool Update(uint32 diff);
     virtual void ChangeState() = 0;
     virtual void ChangeTeam(TeamId oldTeam) {}
     virtual void SendChangePhase();
-
     virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid);
-
     virtual bool CanTalkTo(Player * plr, Creature * c, GossipOption &gso);
-
     virtual bool HandleDropFlag(Player * plr, uint32 spellId);
-
     virtual void DeleteSpawns();
-
     uint32 m_capturePointGUID;
     GameObject *m_capturePoint;
-
     void AddGO(uint32 type, uint32 guid, uint32 entry = 0);
     void AddCre(uint32 type, uint32 guid, uint32 entry = 0);
     bool SetCapturePointData(uint32 entry, uint32 map, float x, float y, float z, float o = 0, float rotation0 = 0, float rotation1 = 0, float rotation2 = 0, float rotation3 = 0);
-
 protected:
-
     bool AddObject(uint32 type, uint32 entry, uint32 map, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3);
     bool AddCreature(uint32 type, uint32 entry, uint32 teamval, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0);
-
     bool DelCreature(uint32 type);
     bool DelObject(uint32 type);
     bool DelCapturePoint();
-
 protected:
     // active players in the area of the objective, 0 - alliance, 1 - horde
     PlayerSet m_activePlayers[2];
@@ -154,10 +127,8 @@ protected:
     ObjectiveStates m_State;
     // neutral value on capture bar
     uint32 m_neutralValuePct;
-
     // pointer to the OutdoorPvP this objective belongs to
     OutdoorPvP* m_PvP;
-
     // map to store the various gameobjects and creatures spawned by the objective
     //        type , guid
     std::map<uint32,uint64> m_Objects;
@@ -165,7 +136,6 @@ protected:
     std::map<uint64,uint32> m_ObjectTypes;
     std::map<uint64,uint32> m_CreatureTypes;
 };
-
 // base class for specific outdoor pvp handlers
 class OutdoorPvP : public ZoneScript
 {
@@ -177,9 +147,7 @@ public:
     ~OutdoorPvP();
     // deletes all gos/creatures spawned by the pvp
     void DeleteSpawns();
-
     typedef std::map<uint32/*lowguid*/, OPvPCapturePoint*> OPvPCapturePointMap;
-
     virtual void FillInitialWorldStates(WorldPacket & data) {}
     // called when a player triggers an areatrigger
     virtual bool HandleAreaTrigger(Player * plr, uint32 trigger);
@@ -187,60 +155,41 @@ public:
     virtual bool HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go);
     // called on go use
     virtual bool HandleOpenGo(Player *plr, uint64 guid);
-
     // setup stuff
     virtual bool SetupOutdoorPvP() {return true;}
-
     void OnGameObjectCreate(GameObject *go, bool add);
     void OnCreatureCreate(Creature *, bool add) {}
-
     // send world state update to all players present
     void SendUpdateWorldState(uint32 field, uint32 value);
-
     // called by OutdoorPvPMgr, updates the objectives and if needed, sends new worldstateui information
     virtual bool Update(uint32 diff);
-
     // handle npc/player kill
     virtual void HandleKill(Player * killer, Unit * killed);
     virtual void HandleKillImpl(Player * killer, Unit * killed) {}
-
     // checks if player is in range of a capture credit marker
     bool IsInsideObjective(Player * plr) const;
-
     // awards rewards for player kill
     virtual void AwardKillBonus(Player * plr) {}
-
     uint32 GetTypeId() {return m_TypeId;}
-
     virtual bool HandleDropFlag(Player * plr, uint32 spellId);
-
     virtual bool HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid);
-
     virtual bool CanTalkTo(Player * plr, Creature * c, GossipOption &gso);
-
     void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0);
 protected:
     // the map of the objectives belonging to this outdoorpvp
     OPvPCapturePointMap m_capturePoints;
-
     PlayerSet m_players[2];
     uint32 m_TypeId;
-
     bool m_sendUpdate;
-
     // world state stuff
     virtual void SendRemoveWorldStates(Player * plr) {}
-
     void BroadcastPacket(WorldPacket & data) const;
-
     virtual void HandlePlayerEnterZone(Player * plr, uint32 zone);
     virtual void HandlePlayerLeaveZone(Player * plr, uint32 zone);
-
     void AddCapturePoint(OPvPCapturePoint* cp)
     {
         m_capturePoints[cp->m_capturePointGUID] = cp;
     }
-
     OPvPCapturePoint * GetCapturePoint(uint32 lowguid) const
     {
         OutdoorPvP::OPvPCapturePointMap::const_iterator itr = m_capturePoints.find(lowguid);
@@ -248,11 +197,9 @@ protected:
             return itr->second;
         return NULL;
     }
-
     void RegisterZone(uint32 zoneid);
     bool HasPlayer(Player *plr) const;
     void TeamCastSpell(TeamId team, int32 spellId);
 };
-
 #endif /*OUTDOOR_PVP_H_*/
 
diff --git a/src/game/OutdoorPvPEP.cpp b/src/game/OutdoorPvPEP.cpp
index c108c733f04..b73dc83268c 100644
--- a/src/game/OutdoorPvPEP.cpp
+++ b/src/game/OutdoorPvPEP.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPEP.h"
 #include "WorldPacket.h"
 #include "Player.h"
@@ -27,14 +26,12 @@
 #include "Language.h"
 #include "World.h"
 #include "GossipDef.h"
-
 OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP *pvp)
 : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_UnitsSummonedSide(0)
 {
     SetCapturePointData(EPCapturePoints[EP_EWT].entry,EPCapturePoints[EP_EWT].map,EPCapturePoints[EP_EWT].x,EPCapturePoints[EP_EWT].y,EPCapturePoints[EP_EWT].z,EPCapturePoints[EP_EWT].o,EPCapturePoints[EP_EWT].rot0,EPCapturePoints[EP_EWT].rot1,EPCapturePoints[EP_EWT].rot2,EPCapturePoints[EP_EWT].rot3);
     AddObject(EP_EWT_FLAGS,EPTowerFlags[EP_EWT].entry,EPTowerFlags[EP_EWT].map,EPTowerFlags[EP_EWT].x,EPTowerFlags[EP_EWT].y,EPTowerFlags[EP_EWT].z,EPTowerFlags[EP_EWT].o,EPTowerFlags[EP_EWT].rot0,EPTowerFlags[EP_EWT].rot1,EPTowerFlags[EP_EWT].rot2,EPTowerFlags[EP_EWT].rot3);
 }
-
 void OPvPCapturePointEP_EWT::ChangeState()
 {
     if(fabs(m_value) == m_maxValue)  // state won't change, only phase when maxed out!
@@ -50,9 +47,7 @@ void OPvPCapturePointEP_EWT::ChangeState()
             sWorld.SendZoneText(EP_GraveYardZone,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOOSE_EWT_H));
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_EWT] = 0;
         }
-
         uint32 artkit = 21;
-
         switch(m_State)
         {
         case OBJECTIVESTATE_ALLIANCE:
@@ -87,7 +82,6 @@ void OPvPCapturePointEP_EWT::ChangeState()
             m_TowerState = EP_TS_N_H;
             break;
         }
-
         GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
         GameObject* flag2 = HashMapHolder<GameObject>::Find(m_Objects[EP_EWT_FLAGS]);
         if(flag)
@@ -101,15 +95,12 @@ void OPvPCapturePointEP_EWT::ChangeState()
             flag2->SendUpdateObjectToAllExcept(NULL);
         }
 
-
         UpdateTowerState();
-
         // complete quest objective
         if(m_TowerState == EP_TS_A || m_TowerState == EP_TS_H)
             SendObjectiveComplete(EP_EWT_CM, 0);
     }
 }
-
 void OPvPCapturePointEP_EWT::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -120,7 +111,6 @@ void OPvPCapturePointEP_EWT::SendChangePhase()
     // send this too, sometimes it resets :S
     SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
-
 void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data)
 {
     data << EP_EWT_A << uint32(bool(m_TowerState & EP_TS_A));
@@ -131,7 +121,6 @@ void OPvPCapturePointEP_EWT::FillInitialWorldStates(WorldPacket &data)
     data << EP_EWT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
     data << EP_EWT_N << uint32(bool(m_TowerState & EP_TS_N));
 }
-
 void OPvPCapturePointEP_EWT::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(EP_EWT_A , bool(m_TowerState & EP_TS_A));
@@ -142,7 +131,6 @@ void OPvPCapturePointEP_EWT::UpdateTowerState()
     m_PvP->SendUpdateWorldState(EP_EWT_N_H , bool(m_TowerState & EP_TS_N_H));
     m_PvP->SendUpdateWorldState(EP_EWT_N , bool(m_TowerState & EP_TS_N));
 }
-
 bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -155,13 +143,11 @@ bool OPvPCapturePointEP_EWT::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointEP_EWT::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
 {
     if(m_UnitsSummonedSide != team)
@@ -172,7 +158,6 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
             ct=EP_EWT_Summons_A;
         else
             ct=EP_EWT_Summons_H;
-
         for(int i = 0; i < EP_EWT_NUM_CREATURES; ++i)
         {
             DelCreature(i);
@@ -180,7 +165,6 @@ void OPvPCapturePointEP_EWT::SummonSupportUnitAtNorthpassTower(uint32 team)
         }
     }
 }
-
 // NPT
 OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP *pvp)
 : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_SummonedGOSide(0)
@@ -188,7 +172,6 @@ OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP *pvp)
     SetCapturePointData(EPCapturePoints[EP_NPT].entry,EPCapturePoints[EP_NPT].map,EPCapturePoints[EP_NPT].x,EPCapturePoints[EP_NPT].y,EPCapturePoints[EP_NPT].z,EPCapturePoints[EP_NPT].o,EPCapturePoints[EP_NPT].rot0,EPCapturePoints[EP_NPT].rot1,EPCapturePoints[EP_NPT].rot2,EPCapturePoints[EP_NPT].rot3);
     AddObject(EP_NPT_FLAGS,EPTowerFlags[EP_NPT].entry,EPTowerFlags[EP_NPT].map,EPTowerFlags[EP_NPT].x,EPTowerFlags[EP_NPT].y,EPTowerFlags[EP_NPT].z,EPTowerFlags[EP_NPT].o,EPTowerFlags[EP_NPT].rot0,EPTowerFlags[EP_NPT].rot1,EPTowerFlags[EP_NPT].rot2,EPTowerFlags[EP_NPT].rot3);
 }
-
 void OPvPCapturePointEP_NPT::ChangeState()
 {
     if(fabs(m_value) == m_maxValue)  // state won't change, only phase when maxed out!
@@ -204,9 +187,7 @@ void OPvPCapturePointEP_NPT::ChangeState()
             sWorld.SendZoneText(EP_GraveYardZone,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOOSE_NPT_H));
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_NPT] = 0;
         }
-
         uint32 artkit = 21;
-
         switch(m_State)
         {
         case OBJECTIVESTATE_ALLIANCE:
@@ -243,7 +224,6 @@ void OPvPCapturePointEP_NPT::ChangeState()
             m_TowerState = EP_TS_N_H;
             break;
         }
-
         GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
         GameObject* flag2 = HashMapHolder<GameObject>::Find(m_Objects[EP_NPT_FLAGS]);
         if(flag)
@@ -256,15 +236,12 @@ void OPvPCapturePointEP_NPT::ChangeState()
             flag2->SetGoArtKit(artkit);
             flag2->SendUpdateObjectToAllExcept(NULL);
         }
-
         UpdateTowerState();
-
         // complete quest objective
         if(m_TowerState == EP_TS_A || m_TowerState == EP_TS_H)
             SendObjectiveComplete(EP_NPT_CM, 0);
     }
 }
-
 void OPvPCapturePointEP_NPT::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -275,7 +252,6 @@ void OPvPCapturePointEP_NPT::SendChangePhase()
     // send this too, sometimes it resets :S
     SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
-
 void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data)
 {
     data << EP_NPT_A << uint32(bool(m_TowerState & EP_TS_A));
@@ -286,7 +262,6 @@ void OPvPCapturePointEP_NPT::FillInitialWorldStates(WorldPacket &data)
     data << EP_NPT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
     data << EP_NPT_N << uint32(bool(m_TowerState & EP_TS_N));
 }
-
 void OPvPCapturePointEP_NPT::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(EP_NPT_A , bool(m_TowerState & EP_TS_A));
@@ -297,7 +272,6 @@ void OPvPCapturePointEP_NPT::UpdateTowerState()
     m_PvP->SendUpdateWorldState(EP_NPT_N_H , bool(m_TowerState & EP_TS_N_H));
     m_PvP->SendUpdateWorldState(EP_NPT_N , bool(m_TowerState & EP_TS_N));
 }
-
 bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -310,13 +284,11 @@ bool OPvPCapturePointEP_NPT::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointEP_NPT::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
 {
     if(m_SummonedGOSide != team)
@@ -329,7 +301,6 @@ void OPvPCapturePointEP_NPT::SummonGO(uint32 team)
             go->SetUInt32Value(GAMEOBJECT_FACTION,(team == ALLIANCE ? 84 : 83));
     }
 }
-
 // CGT
 OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP *pvp)
 : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_GraveyardSide(0)
@@ -337,7 +308,6 @@ OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP *pvp)
     SetCapturePointData(EPCapturePoints[EP_CGT].entry,EPCapturePoints[EP_CGT].map,EPCapturePoints[EP_CGT].x,EPCapturePoints[EP_CGT].y,EPCapturePoints[EP_CGT].z,EPCapturePoints[EP_CGT].o,EPCapturePoints[EP_CGT].rot0,EPCapturePoints[EP_CGT].rot1,EPCapturePoints[EP_CGT].rot2,EPCapturePoints[EP_CGT].rot3);
     AddObject(EP_CGT_FLAGS,EPTowerFlags[EP_CGT].entry,EPTowerFlags[EP_CGT].map,EPTowerFlags[EP_CGT].x,EPTowerFlags[EP_CGT].y,EPTowerFlags[EP_CGT].z,EPTowerFlags[EP_CGT].o,EPTowerFlags[EP_CGT].rot0,EPTowerFlags[EP_CGT].rot1,EPTowerFlags[EP_CGT].rot2,EPTowerFlags[EP_CGT].rot3);
 }
-
 void OPvPCapturePointEP_CGT::ChangeState()
 {
     if(fabs(m_value) == m_maxValue)  // state won't change, only phase when maxed out!
@@ -353,9 +323,7 @@ void OPvPCapturePointEP_CGT::ChangeState()
             sWorld.SendZoneText(EP_GraveYardZone,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOOSE_CGT_H));
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_CGT] = 0;
         }
-
         uint32 artkit = 21;
-
         switch(m_State)
         {
         case OBJECTIVESTATE_ALLIANCE:
@@ -390,7 +358,6 @@ void OPvPCapturePointEP_CGT::ChangeState()
             m_TowerState = EP_TS_N_H;
             break;
         }
-
         GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
         GameObject* flag2 = HashMapHolder<GameObject>::Find(m_Objects[EP_CGT_FLAGS]);
         if(flag)
@@ -403,15 +370,12 @@ void OPvPCapturePointEP_CGT::ChangeState()
             flag2->SetGoArtKit(artkit);
             flag2->SendUpdateObjectToAllExcept(NULL);
         }
-
         UpdateTowerState();
-
         // complete quest objective
         if(m_TowerState == EP_TS_A || m_TowerState == EP_TS_H)
             SendObjectiveComplete(EP_CGT_CM, 0);
     }
 }
-
 void OPvPCapturePointEP_CGT::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -422,7 +386,6 @@ void OPvPCapturePointEP_CGT::SendChangePhase()
     // send this too, sometimes it resets :S
     SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
-
 void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data)
 {
     data << EP_CGT_A << uint32(bool(m_TowerState & EP_TS_A));
@@ -433,7 +396,6 @@ void OPvPCapturePointEP_CGT::FillInitialWorldStates(WorldPacket &data)
     data << EP_CGT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
     data << EP_CGT_N << uint32(bool(m_TowerState & EP_TS_N));
 }
-
 void OPvPCapturePointEP_CGT::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(EP_CGT_A , bool(m_TowerState & EP_TS_A));
@@ -444,7 +406,6 @@ void OPvPCapturePointEP_CGT::UpdateTowerState()
     m_PvP->SendUpdateWorldState(EP_CGT_N_H , bool(m_TowerState & EP_TS_N_H));
     m_PvP->SendUpdateWorldState(EP_CGT_N , bool(m_TowerState & EP_TS_N));
 }
-
 bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -457,13 +418,11 @@ bool OPvPCapturePointEP_CGT::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointEP_CGT::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
 {
     if(m_GraveyardSide != team)
@@ -473,7 +432,6 @@ void OPvPCapturePointEP_CGT::LinkGraveYard(uint32 team)
         objmgr.AddGraveYardLink(EP_GraveYardId,EP_GraveYardZone,team,false);
     }
 }
-
 // PWT
 OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP *pvp)
 : OPvPCapturePoint(pvp), m_TowerState(EP_TS_N), m_FlightMasterSpawned(0)
@@ -481,7 +439,6 @@ OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP *pvp)
     SetCapturePointData(EPCapturePoints[EP_PWT].entry,EPCapturePoints[EP_PWT].map,EPCapturePoints[EP_PWT].x,EPCapturePoints[EP_PWT].y,EPCapturePoints[EP_PWT].z,EPCapturePoints[EP_PWT].o,EPCapturePoints[EP_PWT].rot0,EPCapturePoints[EP_PWT].rot1,EPCapturePoints[EP_PWT].rot2,EPCapturePoints[EP_PWT].rot3);
     AddObject(EP_PWT_FLAGS,EPTowerFlags[EP_PWT].entry,EPTowerFlags[EP_PWT].map,EPTowerFlags[EP_PWT].x,EPTowerFlags[EP_PWT].y,EPTowerFlags[EP_PWT].z,EPTowerFlags[EP_PWT].o,EPTowerFlags[EP_PWT].rot0,EPTowerFlags[EP_PWT].rot1,EPTowerFlags[EP_PWT].rot2,EPTowerFlags[EP_PWT].rot3);
 }
-
 void OPvPCapturePointEP_PWT::ChangeState()
 {
     if(fabs(m_value) == m_maxValue)  // state won't change, only phase when maxed out!
@@ -497,9 +454,7 @@ void OPvPCapturePointEP_PWT::ChangeState()
             sWorld.SendZoneText(EP_GraveYardZone,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_LOOSE_PWT_H));
             ((OutdoorPvPEP*)m_PvP)->EP_Controls[EP_PWT] = 0;
         }
-
         uint32 artkit = 21;
-
         switch(m_State)
         {
         case OBJECTIVESTATE_ALLIANCE:
@@ -536,7 +491,6 @@ void OPvPCapturePointEP_PWT::ChangeState()
             m_TowerState = EP_TS_N_H;
             break;
         }
-
         GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
         GameObject* flag2 = HashMapHolder<GameObject>::Find(m_Objects[EP_PWT_FLAGS]);
         if(flag)
@@ -549,15 +503,12 @@ void OPvPCapturePointEP_PWT::ChangeState()
             flag2->SetGoArtKit(artkit);
             flag2->SendUpdateObjectToAllExcept(NULL);
         }
-
         UpdateTowerState();
-
         // complete quest objective
         if(m_TowerState == EP_TS_A || m_TowerState == EP_TS_H)
             SendObjectiveComplete(EP_PWT_CM, 0);
     }
 }
-
 void OPvPCapturePointEP_PWT::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -568,7 +519,6 @@ void OPvPCapturePointEP_PWT::SendChangePhase()
     // send this too, sometimes it resets :S
     SendUpdateWorldState(EP_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
-
 void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data)
 {
     data << EP_PWT_A << uint32(bool(m_TowerState & EP_TS_A));
@@ -579,7 +529,6 @@ void OPvPCapturePointEP_PWT::FillInitialWorldStates(WorldPacket &data)
     data << EP_PWT_N_H << uint32(bool(m_TowerState & EP_TS_N_H));
     data << EP_PWT_N << uint32(bool(m_TowerState & EP_TS_N));
 }
-
 void OPvPCapturePointEP_PWT::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(EP_PWT_A , bool(m_TowerState & EP_TS_A));
@@ -590,7 +539,6 @@ void OPvPCapturePointEP_PWT::UpdateTowerState()
     m_PvP->SendUpdateWorldState(EP_PWT_N_H , bool(m_TowerState & EP_TS_N_H));
     m_PvP->SendUpdateWorldState(EP_PWT_N , bool(m_TowerState & EP_TS_N));
 }
-
 bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -603,13 +551,11 @@ bool OPvPCapturePointEP_PWT::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointEP_PWT::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
 {
     if(m_FlightMasterSpawned != team)
@@ -628,7 +574,6 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
             gso.Icon = 0;
             gso.NpcFlag = 0;
             c->addGossipOption(gso);
-
             gso.Action = GOSSIP_OPTION_OUTDOORPVP;
             gso.GossipId = 0;
             gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_EWT));
@@ -636,7 +581,6 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
             gso.Icon = 0;
             gso.NpcFlag = 0;
             c->addGossipOption(gso);
-
             gso.Action = GOSSIP_OPTION_OUTDOORPVP;
             gso.GossipId = 0;
             gso.OptionText.assign(objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_EP_FLIGHT_CGT));
@@ -647,7 +591,6 @@ void OPvPCapturePointEP_PWT::SummonFlightMaster(uint32 team)
         }
     }
 }
-
 bool OPvPCapturePointEP_PWT::CanTalkTo(Player * p, Creature * c, GossipOption &gso)
 {
     if( p->GetTeam() == m_FlightMasterSpawned &&
@@ -656,7 +599,6 @@ bool OPvPCapturePointEP_PWT::CanTalkTo(Player * p, Creature * c, GossipOption &g
         return true;
     return false;
 }
-
 bool OPvPCapturePointEP_PWT::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid)
 {
     std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
@@ -681,12 +623,10 @@ bool OPvPCapturePointEP_PWT::HandleGossipOption(Player *plr, uint64 guid, uint32
                 dst = EP_CGT_Taxi;
                 break;
             }
-
             std::vector<uint32> nodes;
             nodes.resize(2);
             nodes[0] = src;
             nodes[1] = dst;
-
             plr->PlayerTalkClass->CloseGossip();
             plr->ActivateTaxiPathTo(nodes, cr);
             // leave the opvp, seems like moveinlineofsight isn't called when entering a taxi
@@ -696,7 +636,6 @@ bool OPvPCapturePointEP_PWT::HandleGossipOption(Player *plr, uint64 guid, uint32
     }
     return false;
 }
-
 // ep
 OutdoorPvPEP::OutdoorPvPEP()
 {
@@ -705,19 +644,16 @@ OutdoorPvPEP::OutdoorPvPEP()
     m_AllianceTowersControlled = 0;
     m_HordeTowersControlled = 0;
 }
-
 bool OutdoorPvPEP::SetupOutdoorPvP()
 {
     for(int i = 0; i < EPBuffZonesNum; ++i)
         RegisterZone(EPBuffZones[i]);
-
     AddCapturePoint(new OPvPCapturePointEP_EWT(this));
     AddCapturePoint(new OPvPCapturePointEP_PWT(this));
     AddCapturePoint(new OPvPCapturePointEP_CGT(this));
     AddCapturePoint(new OPvPCapturePointEP_NPT(this));
     return true;
 }
-
 bool OutdoorPvPEP::Update(uint32 diff)
 {
     if(OutdoorPvP::Update(diff))
@@ -738,7 +674,6 @@ bool OutdoorPvPEP::Update(uint32 diff)
     }
     return false;
 }
-
 void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     // add buffs
@@ -754,7 +689,6 @@ void OutdoorPvPEP::HandlePlayerEnterZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
@@ -770,7 +704,6 @@ void OutdoorPvPEP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 void OutdoorPvPEP::BuffTeams()
 {
     for(PlayerSet::iterator itr = m_players[0].begin(); itr != m_players[0].end(); ++itr)
@@ -794,7 +727,6 @@ void OutdoorPvPEP::BuffTeams()
         }
     }
 }
-
 void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data)
 {
     data << EP_UI_TOWER_COUNT_A << m_AllianceTowersControlled;
@@ -807,7 +739,6 @@ void OutdoorPvPEP::FillInitialWorldStates(WorldPacket & data)
         itr->second->FillInitialWorldStates(data);
     }
 }
-
 void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
 {
     plr->SendUpdateWorldState(EP_UI_TOWER_COUNT_A,0);
@@ -815,7 +746,6 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_DISPLAY,0);
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_POS,0);
     plr->SendUpdateWorldState(EP_UI_TOWER_SLIDER_N,0);
-
     plr->SendUpdateWorldState(EP_EWT_A,0);
     plr->SendUpdateWorldState(EP_EWT_H,0);
     plr->SendUpdateWorldState(EP_EWT_N,0);
@@ -823,7 +753,6 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
     plr->SendUpdateWorldState(EP_EWT_H_P,0);
     plr->SendUpdateWorldState(EP_EWT_N_A,0);
     plr->SendUpdateWorldState(EP_EWT_N_H,0);
-
     plr->SendUpdateWorldState(EP_PWT_A,0);
     plr->SendUpdateWorldState(EP_PWT_H,0);
     plr->SendUpdateWorldState(EP_PWT_N,0);
@@ -831,7 +760,6 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
     plr->SendUpdateWorldState(EP_PWT_H_P,0);
     plr->SendUpdateWorldState(EP_PWT_N_A,0);
     plr->SendUpdateWorldState(EP_PWT_N_H,0);
-
     plr->SendUpdateWorldState(EP_NPT_A,0);
     plr->SendUpdateWorldState(EP_NPT_H,0);
     plr->SendUpdateWorldState(EP_NPT_N,0);
@@ -839,7 +767,6 @@ void OutdoorPvPEP::SendRemoveWorldStates(Player *plr)
     plr->SendUpdateWorldState(EP_NPT_H_P,0);
     plr->SendUpdateWorldState(EP_NPT_N_A,0);
     plr->SendUpdateWorldState(EP_NPT_N_H,0);
-
     plr->SendUpdateWorldState(EP_CGT_A,0);
     plr->SendUpdateWorldState(EP_CGT_H,0);
     plr->SendUpdateWorldState(EP_CGT_N,0);
diff --git a/src/game/OutdoorPvPEP.h b/src/game/OutdoorPvPEP.h
index c5cff5c0411..e074650f290 100644
--- a/src/game/OutdoorPvPEP.h
+++ b/src/game/OutdoorPvPEP.h
@@ -15,38 +15,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_EP_
 #define OUTDOOR_PVP_EP_
-
 #include "OutdoorPvPImpl.h"
-
 #include "DBCStructure.h"
-
 const uint32 EP_AllianceBuffs[4] = {11413, 11414, 11415, 1386};
-
 const uint32 EP_HordeBuffs[4] = {30880, 30683, 30682, 29520};
-
 const uint32 EP_GraveYardZone = 139;
-
 const uint32 EP_GraveYardId = 927;
-
 const uint32 EPBuffZonesNum = 3;
-
 const uint32 EP_EWT_CM = 17690;
 const uint32 EP_CGT_CM = 17689;
 const uint32 EP_NPT_CM = 17696;
 const uint32 EP_PWT_CM = 17698;
-
 const uint32 EPBuffZones[EPBuffZonesNum] = {139, 2017, 2057};
-
 enum EP_TaxiNodes {
     EP_CGT_Taxi = 87,
     EP_EWT_Taxi = 86,
     EP_NPT_Taxi = 85,
     EP_PWT_Taxi = 84
 };
-
 enum EP_EastwallTowerWorldStates {
     EP_EWT_A = 2354,
     EP_EWT_H = 2356,
@@ -56,7 +44,6 @@ enum EP_EastwallTowerWorldStates {
     EP_EWT_N_H = 2360,
     EP_EWT_N = 2361
 };
-
 enum EP_NorthpassTowerWorldStates {
     EP_NPT_N = 2352,
     EP_NPT_N_A = 2362,
@@ -66,7 +53,6 @@ enum EP_NorthpassTowerWorldStates {
     EP_NPT_A = 2372,
     EP_NPT_H = 2373
 };
-
 enum EP_PlagewoodTowerWorldStates {
     EP_PWT_N_A = 2366,
     EP_PWT_N_H = 2353, //2367 not present! use neutral!
@@ -76,7 +62,6 @@ enum EP_PlagewoodTowerWorldStates {
     EP_PWT_H = 2371,
     EP_PWT_N = 2353
 };
-
 enum EP_CrownGuardTowerWorldStates {
     EP_CGT_N_A = 2374,
     EP_CGT_N_H = 2375,
@@ -86,16 +71,13 @@ enum EP_CrownGuardTowerWorldStates {
     EP_CGT_H = 2379,
     EP_CGT_N = 2355
 };
-
 enum EP_WorldStates {
     EP_UI_TOWER_SLIDER_DISPLAY = 2426,
     EP_UI_TOWER_SLIDER_POS = 2427,
     EP_UI_TOWER_SLIDER_N = 2428,
-
     EP_UI_TOWER_COUNT_A = 2327,
     EP_UI_TOWER_COUNT_H = 2328
 };
-
 enum EP_Summons {
     EP_EWT_COMMANDER = 0,
     EP_EWT_SOLDIER1,
@@ -104,7 +86,6 @@ enum EP_Summons {
     EP_EWT_SOLDIER4,
     EP_PWT_FLIGHTMASTER,
 };
-
 enum EP_GoSummons {
     EP_NPT_BUFF = 0,
     EP_NPT_FLAGS,
@@ -112,7 +93,6 @@ enum EP_GoSummons {
     EP_CGT_FLAGS,
     EP_PWT_FLAGS
 };
-
 enum EP_Towers {
     EP_EWT = 0, // plaguelands 03
     EP_NPT,// plaguelands 01
@@ -120,28 +100,22 @@ enum EP_Towers {
     EP_CGT,// plaguelands 02
     EP_TOWER_NUM
 };
-
 const go_type EPCapturePoints[EP_TOWER_NUM] = {
     {182097,0,2574.51,-4794.89,144.704,-1.45003,-0.097056,0.095578,-0.656229,0.742165},
     {181899,0,3181.08,-4379.36,174.123,-2.03472,-0.065392,0.119494,-0.842275,0.521553},
     {182098,0,2962.71,-3042.31,154.789,2.08426,-0.074807,-0.113837,0.855928,0.49883},
     {182096,0,1860.85,-3731.23,196.716,-2.53214,0.033967,-0.131914,0.944741,-0.298177}
 };
-
 const go_type EPTowerFlags[EP_TOWER_NUM] = {
     {182106,0,2569.60,-4772.93,115.399,2.72271,0,0,0.978148,0.207912},
     {182106,0,3148.17,-4365.51,145.029,1.53589,0,0,0.694658,0.71934},
     {182106,0,2992.63,-3022.95,125.593,3.03687,0,0,0.99863,0.052336},
     {182106,0,1838.42,-3703.56,167.713,0.890118,0,0,0.430511,0.902585}
 };
-
 const uint32 EPTowerPlayerEnterEvents[EP_TOWER_NUM] = {10691,10699,10701,10705};
-
 const uint32 EPTowerPlayerLeaveEvents[EP_TOWER_NUM] = {10692,10698,10700,10704};
-
 const uint32 EP_NUM_CREATURES = 6;
 const uint32 EP_EWT_NUM_CREATURES = 5;
-
 // one lordaeron commander, 4 soldiers
 // should be spawned at EWT and follow a path, but trans-grid pathing isn't safe, so summon them directly at NPT
 const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] = {
@@ -151,7 +125,6 @@ const creature_type EP_EWT_Summons_A[EP_EWT_NUM_CREATURES] = {
     {17647,469,0, 3164.65,-4350.26,138.22,2.4794},
     {17647,469,0, 3169.91,-4349.68,138.37,0.7444}
 };
-
 const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] = {
     {17995,67,0, 3167.61,-4352.09,138.20,4.5811},
     {17996,67,0, 3172.74,-4352.99,139.14,4.9873},
@@ -159,7 +132,6 @@ const creature_type EP_EWT_Summons_H[EP_EWT_NUM_CREATURES] = {
     {17996,67,0, 3164.65,-4350.26,138.22,2.4794},
     {17996,67,0, 3169.91,-4349.68,138.37,0.7444}
 };
-
 enum EP_TowerStates {
     EP_TS_N = 1,
     EP_TS_N_A = 2,
@@ -169,15 +141,11 @@ enum EP_TowerStates {
     EP_TS_A = 32,
     EP_TS_H = 64
 };
-
 // when spawning, pay attention at setting the faction manually!
 const creature_type EP_PWT_FlightMaster = {17209,0,0,2987.5,-3049.11,120.126,5.75959};
-
 // after spawning, modify the faction so that only the controller will be able to use it with SetUInt32Value(GAMEOBJECT_FACTION, faction_id);
 const go_type EP_NPT_LordaeronShrine = {181682,0,3167.72,-4355.91,138.785,1.69297,0,0,0.748956,0.66262};
-
 class OutdoorPvPEP;
-
 class OPvPCapturePointEP_EWT : public OPvPCapturePoint
 {
 friend class OutdoorPvPEP;
@@ -196,7 +164,6 @@ protected:
     uint32 m_TowerState;
     uint32 m_UnitsSummonedSide;
 };
-
 class OPvPCapturePointEP_NPT : public OPvPCapturePoint
 {
 friend class OutdoorPvPEP;
@@ -215,7 +182,6 @@ protected:
     uint32 m_TowerState;
     uint32 m_SummonedGOSide;
 };
-
 class OPvPCapturePointEP_CGT : public OPvPCapturePoint
 {
 friend class OutdoorPvPEP;
@@ -234,7 +200,6 @@ protected:
     uint32 m_TowerState;
     uint32 m_GraveyardSide;
 };
-
 class OPvPCapturePointEP_PWT : public OPvPCapturePoint
 {
 friend class OutdoorPvPEP;
@@ -255,7 +220,6 @@ protected:
     uint32 m_FlightMasterSpawned;
     uint32 m_TowerState;
 };
-
 class OutdoorPvPEP : public OutdoorPvP
 {
 friend class OPvPCapturePointEP_EWT;
@@ -277,6 +241,5 @@ private:
     uint32 m_AllianceTowersControlled;
     uint32 m_HordeTowersControlled;
 };
-
 #endif
 
diff --git a/src/game/OutdoorPvPHP.cpp b/src/game/OutdoorPvPHP.cpp
index a25cb86dc21..0b5d3bfac6c 100644
--- a/src/game/OutdoorPvPHP.cpp
+++ b/src/game/OutdoorPvPHP.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPHP.h"
 #include "OutdoorPvP.h"
 #include "OutdoorPvPMgr.h"
@@ -24,15 +23,10 @@
 #include "World.h"
 #include "ObjectMgr.h"
 #include "Language.h"
-
 const uint32 HP_LANG_LOOSE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_LOOSE_BROKENHILL_A,LANG_OPVP_HP_LOOSE_OVERLOOK_A,LANG_OPVP_HP_LOOSE_STADIUM_A};
-
 const uint32 HP_LANG_LOOSE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_LOOSE_BROKENHILL_H,LANG_OPVP_HP_LOOSE_OVERLOOK_H,LANG_OPVP_HP_LOOSE_STADIUM_H};
-
 const uint32 HP_LANG_CAPTURE_A[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_A,LANG_OPVP_HP_CAPTURE_OVERLOOK_A,LANG_OPVP_HP_CAPTURE_STADIUM_A};
-
 const uint32 HP_LANG_CAPTURE_H[HP_TOWER_NUM] = {LANG_OPVP_HP_CAPTURE_BROKENHILL_H,LANG_OPVP_HP_CAPTURE_OVERLOOK_H,LANG_OPVP_HP_CAPTURE_STADIUM_H};
-
 OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp,OutdoorPvPHPTowerType type)
 : OPvPCapturePoint(pvp), m_TowerType(type)
 {
@@ -58,12 +52,10 @@ OPvPCapturePointHP::OPvPCapturePointHP(OutdoorPvP *pvp,OutdoorPvPHPTowerType typ
         HPTowerFlags[type].rot2,
         HPTowerFlags[type].rot3);
 }
-
 OutdoorPvPHP::OutdoorPvPHP()
 {
     m_TypeId = OUTDOOR_PVP_HP;
 }
-
 bool OutdoorPvPHP::SetupOutdoorPvP()
 {
     m_AllianceTowersControlled = 0;
@@ -71,16 +63,11 @@ bool OutdoorPvPHP::SetupOutdoorPvP()
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPHPBuffZonesNum; ++i)
         RegisterZone(OutdoorPvPHPBuffZones[i]);
-
     AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_BROKEN_HILL));
-
     AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_OVERLOOK));
-
     AddCapturePoint(new OPvPCapturePointHP(this,HP_TOWER_STADIUM));
-
     return true;
 }
-
 void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     // add buffs
@@ -96,7 +83,6 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
@@ -110,7 +96,6 @@ void OutdoorPvPHP::HandlePlayerLeaveZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 bool OutdoorPvPHP::Update(uint32 diff)
 {
     bool changed = false;
@@ -130,7 +115,6 @@ bool OutdoorPvPHP::Update(uint32 diff)
     }
     return changed;
 }
-
 void OutdoorPvPHP::SendRemoveWorldStates(Player *plr)
 {
     plr->SendUpdateWorldState(HP_UI_TOWER_DISPLAY_A,0);
@@ -147,7 +131,6 @@ void OutdoorPvPHP::SendRemoveWorldStates(Player *plr)
         plr->SendUpdateWorldState(HP_MAP_H[i],0);
     }
 }
-
 void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(HP_UI_TOWER_DISPLAY_A) << uint32(1);
@@ -162,7 +145,6 @@ void OutdoorPvPHP::FillInitialWorldStates(WorldPacket &data)
         itr->second->FillInitialWorldStates(data);
     }
 }
-
 void OPvPCapturePointHP::ChangeState()
 {
     uint32 field = 0;
@@ -196,7 +178,6 @@ void OPvPCapturePointHP::ChangeState()
         field = HP_MAP_H[m_TowerType];
         break;
     }
-
     // send world state update
     if(field)
     {
@@ -243,7 +224,6 @@ void OPvPCapturePointHP::ChangeState()
         artkit2 = HP_TowerArtKit_H[m_TowerType];
         break;
     }
-
     GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
     GameObject* flag2 = HashMapHolder<GameObject>::Find(m_Objects[m_TowerType]);
     if(flag)
@@ -256,16 +236,13 @@ void OPvPCapturePointHP::ChangeState()
         flag2->SetGoArtKit(artkit2);
         flag2->SendUpdateObjectToAllExcept(NULL);
     }
-
     // send world state update
     if(field)
         m_PvP->SendUpdateWorldState(field, 1);
-
     // complete quest objective
     if(m_State == OBJECTIVESTATE_ALLIANCE || m_State == OBJECTIVESTATE_HORDE)
         SendObjectiveComplete(HP_CREDITMARKER[m_TowerType], 0);
 }
-
 void OPvPCapturePointHP::SendChangePhase()
 {
     SendUpdateWorldState(HP_UI_TOWER_SLIDER_N, m_neutralValuePct);
@@ -275,7 +252,6 @@ void OPvPCapturePointHP::SendChangePhase()
     // send this too, sometimes the slider disappears, dunno why :(
     SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 1);
 }
-
 void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data)
 {
     switch(m_State)
@@ -302,7 +278,6 @@ void OPvPCapturePointHP::FillInitialWorldStates(WorldPacket &data)
             break;
     }
 }
-
 bool OPvPCapturePointHP::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -315,18 +290,15 @@ bool OPvPCapturePointHP::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointHP::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(HP_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OutdoorPvPHP::HandleKillImpl(Player *plr, Unit * killed)
 {
     if(killed->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(plr->GetTeam() == ALLIANCE && ((Player*)killed)->GetTeam() != ALLIANCE)
         plr->CastSpell(plr,AlliancePlayerKillReward,true);
     else if(plr->GetTeam() == HORDE && ((Player*)killed)->GetTeam() != HORDE)
diff --git a/src/game/OutdoorPvPHP.h b/src/game/OutdoorPvPHP.h
index 3c9b531630b..44d9305713a 100644
--- a/src/game/OutdoorPvPHP.h
+++ b/src/game/OutdoorPvPHP.h
@@ -15,16 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_HP_
 #define OUTDOOR_PVP_HP_
-
 #include "OutdoorPvPImpl.h"
-
 #define OutdoorPvPHPBuffZonesNum 6
                                                          //  HP, citadel, ramparts, blood furnace, shattered halls, mag's lair
 const uint32 OutdoorPvPHPBuffZones[OutdoorPvPHPBuffZonesNum] = { 3483, 3563, 3562, 3713, 3714, 3836 };
-
 enum OutdoorPvPHPSpells
 {
     AlliancePlayerKillReward = 32155,
@@ -32,56 +28,40 @@ enum OutdoorPvPHPSpells
     AllianceBuff = 32071,
     HordeBuff = 32049
 };
-
 enum OutdoorPvPHPTowerType{
     HP_TOWER_BROKEN_HILL = 0,
     HP_TOWER_OVERLOOK = 1,
     HP_TOWER_STADIUM = 2,
     HP_TOWER_NUM = 3
 };
-
 const uint32 HP_CREDITMARKER[HP_TOWER_NUM] = {19032,19028,19029};
-
 const uint32 HP_CapturePointEvent_Enter[HP_TOWER_NUM] = {11404,11396,11388};
-
 const uint32 HP_CapturePointEvent_Leave[HP_TOWER_NUM] = {11403,11395,11387};
-
 enum OutdoorPvPHPWorldStates{
     HP_UI_TOWER_DISPLAY_A = 0x9ba,
     HP_UI_TOWER_DISPLAY_H = 0x9b9,
-
     HP_UI_TOWER_COUNT_H = 0x9ae,
     HP_UI_TOWER_COUNT_A = 0x9ac,
-
     HP_UI_TOWER_SLIDER_N = 2475,
     HP_UI_TOWER_SLIDER_POS = 2474,
     HP_UI_TOWER_SLIDER_DISPLAY = 2473
 };
-
 const uint32 HP_MAP_N[HP_TOWER_NUM] = {0x9b5,0x9b2,0x9a8};
-
 const uint32 HP_MAP_A[HP_TOWER_NUM] = {0x9b3,0x9b0,0x9a7};
-
 const uint32 HP_MAP_H[HP_TOWER_NUM] = {0x9b4,0x9b1,0x9a6};
-
 const uint32 HP_TowerArtKit_A[HP_TOWER_NUM] = {65,62,67};
-
 const uint32 HP_TowerArtKit_H[HP_TOWER_NUM] = {64,61,68};
-
 const uint32 HP_TowerArtKit_N[HP_TOWER_NUM] = {66,63,69};
-
 const go_type HPCapturePoints[HP_TOWER_NUM] = {
     {182175,530,-471.462,3451.09,34.6432,0.174533,0,0,0.087156,0.996195},      // 0 - Broken Hill
     {182174,530,-184.889,3476.93,38.205,-0.017453,0,0,0.008727,-0.999962},     // 1 - Overlook
     {182173,530,-290.016,3702.42,56.6729,0.034907,0,0,0.017452,0.999848}     // 2 - Stadium
 };
-
 const go_type HPTowerFlags[HP_TOWER_NUM] = {
     {183514,530,-467.078,3528.17,64.7121,3.14159,0,0,1,0},  // 0 broken hill
     {182525,530,-187.887,3459.38,60.0403,-3.12414,0,0,0.999962,-0.008727}, // 1 overlook
     {183515,530,-289.610,3696.83,75.9447,3.12414,0,0,0.999962,0.008727} // 2 stadium
 };
-
 class OPvPCapturePointHP : public OPvPCapturePoint
 {
 public:
@@ -95,7 +75,6 @@ public:
 private:
     OutdoorPvPHPTowerType m_TowerType;
 };
-
 class OutdoorPvPHP : public OutdoorPvP
 {
 friend class OPvPCapturePointHP;
@@ -113,6 +92,5 @@ private:
     uint32 m_AllianceTowersControlled;
     uint32 m_HordeTowersControlled;
 };
-
 #endif
 
diff --git a/src/game/OutdoorPvPImpl.h b/src/game/OutdoorPvPImpl.h
index b79b307c046..2e4f2a0e268 100644
--- a/src/game/OutdoorPvPImpl.h
+++ b/src/game/OutdoorPvPImpl.h
@@ -17,12 +17,9 @@
  */
 #ifndef OUTDOORPVP_IMPL_H
 #define OUTDOORPVP_IMPL_H
-
 #include "SharedDefines.h"
 #include "OutdoorPvP.h"
 #include "Player.h"
 #include "WorldPacket.h"
-
 #define OTHER_TEAM(a) (a == TEAM_ALLIANCE ? TEAM_HORDE : TEAM_ALLIANCE)
-
 #endif
diff --git a/src/game/OutdoorPvPMgr.cpp b/src/game/OutdoorPvPMgr.cpp
index 8a59b438d5b..9ccce15ca2d 100644
--- a/src/game/OutdoorPvPMgr.cpp
+++ b/src/game/OutdoorPvPMgr.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPMgr.h"
 #include "OutdoorPvPHP.h"
 #include "OutdoorPvPNA.h"
@@ -26,15 +25,12 @@
 #include "Wintergrasp.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"
-
 INSTANTIATE_SINGLETON_1( OutdoorPvPMgr );
-
 OutdoorPvPMgr::OutdoorPvPMgr()
 {
     m_UpdateTimer = 0;
     //sLog.outDebug("Instantiating OutdoorPvPMgr");
 }
-
 OutdoorPvPMgr::~OutdoorPvPMgr()
 {
     //sLog.outDebug("Deleting OutdoorPvPMgr");
@@ -43,7 +39,6 @@ OutdoorPvPMgr::~OutdoorPvPMgr()
         (*itr)->DeleteSpawns();
     }
 }
-
 void OutdoorPvPMgr::InitOutdoorPvP()
 {
     // create new opvp
@@ -60,7 +55,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         sLog.outDebug("OutdoorPvP : HP successfully initiated.");
     }
 
-
     pOP = new OutdoorPvPNA;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -74,7 +68,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         sLog.outDebug("OutdoorPvP : NA successfully initiated.");
     }
 
-
     pOP = new OutdoorPvPTF;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -87,7 +80,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         m_OutdoorPvPSet.push_back(pOP);
         sLog.outDebug("OutdoorPvP : TF successfully initiated.");
     }
-
     pOP = new OutdoorPvPZM;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -100,7 +92,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         m_OutdoorPvPSet.push_back(pOP);
         sLog.outDebug("OutdoorPvP : ZM successfully initiated.");
     }
-
     pOP = new OutdoorPvPSI;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -113,7 +104,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         m_OutdoorPvPSet.push_back(pOP);
         sLog.outDebug("OutdoorPvP : SI successfully initiated.");
     }
-
     pOP = new OutdoorPvPEP;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -126,7 +116,6 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         m_OutdoorPvPSet.push_back(pOP);
         sLog.outDebug("OutdoorPvP : EP successfully initiated.");
     }
-
     pOP = new OPvPWintergrasp;
     // respawn, init variables
     if(!pOP->SetupOutdoorPvP())
@@ -140,40 +129,32 @@ void OutdoorPvPMgr::InitOutdoorPvP()
         sLog.outDebug("OutdoorPvP : Wintergrasp successfully initiated.");
     }
 }
-
 void OutdoorPvPMgr::AddZone(uint32 zoneid, OutdoorPvP *handle)
 {
     m_OutdoorPvPMap[zoneid] = handle;
 }
 
-
 void OutdoorPvPMgr::HandlePlayerEnterZone(Player *plr, uint32 zoneid)
 {
     OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid);
     if(itr == m_OutdoorPvPMap.end())
         return;
-
     if(itr->second->HasPlayer(plr))
         return;
-
     itr->second->HandlePlayerEnterZone(plr, zoneid);
     sLog.outDebug("Player %u entered outdoorpvp id %u", plr->GetGUIDLow(), itr->second->GetTypeId());
 }
-
 void OutdoorPvPMgr::HandlePlayerLeaveZone(Player *plr, uint32 zoneid)
 {
     OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid);
     if(itr == m_OutdoorPvPMap.end())
         return;
-
     // teleport: remove once in removefromworld, once in updatezone
     if(!itr->second->HasPlayer(plr))
         return;
-
     itr->second->HandlePlayerLeaveZone(plr, zoneid);
     sLog.outDebug("Player %u left outdoorpvp id %u",plr->GetGUIDLow(), itr->second->GetTypeId());
 }
-
 OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid)
 {
     OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneid);
@@ -184,7 +165,6 @@ OutdoorPvP * OutdoorPvPMgr::GetOutdoorPvPToZoneId(uint32 zoneid)
     }
     return itr->second;
 }
-
 void OutdoorPvPMgr::Update(uint32 diff)
 {
     m_UpdateTimer += diff;
@@ -195,7 +175,6 @@ void OutdoorPvPMgr::Update(uint32 diff)
         m_UpdateTimer = 0;
     }
 }
-
 bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject * go)
 {
     for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
@@ -205,7 +184,6 @@ bool OutdoorPvPMgr::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *
     }
     return false;
 }
-
 ZoneScript * OutdoorPvPMgr::GetZoneScript(uint32 zoneId)
 {
     OutdoorPvPMap::iterator itr = m_OutdoorPvPMap.find(zoneId);
@@ -214,7 +192,6 @@ ZoneScript * OutdoorPvPMgr::GetZoneScript(uint32 zoneId)
     else
         return NULL;
 }
-
 bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid)
 {
     for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
@@ -224,7 +201,6 @@ bool OutdoorPvPMgr::HandleOpenGo(Player *plr, uint64 guid)
     }
     return false;
 }
-
 void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid)
 {
     for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
@@ -233,7 +209,6 @@ void OutdoorPvPMgr::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid
             return;
     }
 }
-
 bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso)
 {
     for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
@@ -243,7 +218,6 @@ bool OutdoorPvPMgr::CanTalkTo(Player * plr, Creature * c, GossipOption & gso)
     }
     return false;
 }
-
 void OutdoorPvPMgr::HandleDropFlag(Player *plr, uint32 spellId)
 {
     for(OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
diff --git a/src/game/OutdoorPvPMgr.h b/src/game/OutdoorPvPMgr.h
index d3b1af92e97..28c949c4bce 100644
--- a/src/game/OutdoorPvPMgr.h
+++ b/src/game/OutdoorPvPMgr.h
@@ -15,21 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_MGR_H_
 #define OUTDOOR_PVP_MGR_H_
-
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000
-
 #include "OutdoorPvP.h"
 #include "Policies/Singleton.h"
-
 class Player;
 class GameObject;
 class Creature;
 class ZoneScript;
 struct GossipOption;
-
 // class to handle player enter / leave / areatrigger / GO use events
 class OutdoorPvPMgr
 {
@@ -38,7 +33,6 @@ public:
     OutdoorPvPMgr();
     // dtor
     ~OutdoorPvPMgr();
-
     // create outdoor pvp events
     void InitOutdoorPvP();
     // called when a player enters an outdoor pvp area
@@ -51,19 +45,12 @@ public:
     bool HandleCustomSpell(Player * plr, uint32 spellId, GameObject* go);
     // handle custom go if registered
     bool HandleOpenGo(Player * plr, uint64 guid);
-    
     ZoneScript * GetZoneScript(uint32 zoneId);
-
     void AddZone(uint32 zoneid, OutdoorPvP * handle);
-
     void Update(uint32 diff);
-
     void HandleGossipOption(Player * player, uint64 guid, uint32 gossipid);
-
     bool CanTalkTo(Player * player, Creature * creature, GossipOption & gso);
-
     void HandleDropFlag(Player * plr, uint32 spellId);
-
     typedef std::vector<OutdoorPvP*> OutdoorPvPSet;
     typedef std::map<uint32 /* zoneid */, OutdoorPvP*> OutdoorPvPMap;
 private:
@@ -76,8 +63,6 @@ private:
     // update interval
     uint32 m_UpdateTimer;
 };
-
 #define sOutdoorPvPMgr Trinity::Singleton<OutdoorPvPMgr>::Instance()
-
 #endif /*OUTDOOR_PVP_MGR_H_*/
 
diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp
index 035d6ce9405..56708550510 100644
--- a/src/game/OutdoorPvPNA.cpp
+++ b/src/game/OutdoorPvPNA.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPNA.h"
 #include "Player.h"
 #include "ObjectMgr.h"
@@ -23,12 +22,10 @@
 #include "WorldPacket.h"
 #include "Language.h"
 #include "World.h"
-
 OutdoorPvPNA::OutdoorPvPNA()
 {
     m_TypeId = OUTDOOR_PVP_NA;
 }
-
 void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed)
 {
     if(killed->GetTypeId() == TYPEID_PLAYER && plr->GetTeam() != ((Player*)killed)->GetTeam())
@@ -40,7 +37,6 @@ void OutdoorPvPNA::HandleKillImpl(Player *plr, Unit * killed)
             plr->CastSpell(plr,NA_KILL_TOKEN_HORDE,true);
     }
 }
-
 uint32 OPvPCapturePointNA::GetAliveGuardsCount()
 {
     uint32 cnt = 0;
@@ -82,7 +78,6 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount()
     }
     return cnt;
 }
-
 void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team)
 {
     const creature_type * creatures = NULL;
@@ -95,13 +90,11 @@ void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team)
     for(int i = 0; i < NA_CONTROL_NPC_NUM; ++i)
         AddCreature(i,creatures[i].entry,creatures[i].teamval,creatures[i].map,creatures[i].x,creatures[i].y,creatures[i].z,creatures[i].o,1000000);
 }
-
 void OPvPCapturePointNA::DeSpawnNPCs()
 {
     for(int i = 0; i < NA_CONTROL_NPC_NUM; ++i)
         DelCreature(i);
 }
-
 void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team)
 {
     const go_type * gos = NULL;
@@ -125,7 +118,6 @@ void OPvPCapturePointNA::SpawnGOsForTeam(uint32 team)
         AddObject(i,gos[i].entry,gos[i].map,gos[i].x,gos[i].y,gos[i].z,gos[i].o,gos[i].rot0,gos[i].rot1,gos[i].rot2,gos[i].rot3);
     }
 }
-
 void OPvPCapturePointNA::DeSpawnGOs()
 {
     for(int i = 0; i < NA_CONTROL_GO_NUM; ++i)
@@ -133,7 +125,6 @@ void OPvPCapturePointNA::DeSpawnGOs()
         DelObject(i);
     }
 }
-
 void OPvPCapturePointNA::FactionTakeOver(uint32 team)
 {
     if(m_ControllingFaction)
@@ -142,7 +133,6 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
         sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOOSE_A));
     else if(m_ControllingFaction == HORDE)
         sWorld.SendZoneText(NA_HALAA_GRAVEYARD_ZONE,objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_NA_LOOSE_H));
-
     m_ControllingFaction = team;
     if(m_ControllingFaction)
         objmgr.AddGraveYardLink(NA_HALAA_GRAVEYARD,NA_HALAA_GRAVEYARD_ZONE,m_ControllingFaction,false);
@@ -182,7 +172,6 @@ void OPvPCapturePointNA::FactionTakeOver(uint32 team)
     UpdateWyvernRoostWorldState(NA_ROOST_W);
     UpdateWyvernRoostWorldState(NA_ROOST_E);
 }
-
 bool OPvPCapturePointNA::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -195,13 +184,11 @@ bool OPvPCapturePointNA::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointNA::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(NA_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 OPvPCapturePointNA::OPvPCapturePointNA(OutdoorPvP *pvp) :
 OPvPCapturePoint(pvp), m_capturable(true), m_GuardsAlive(0), m_ControllingFaction(0),
 m_HalaaState(HALAA_N), m_WyvernStateSouth(0), m_WyvernStateNorth(0), m_WyvernStateWest(0),
@@ -209,22 +196,18 @@ m_WyvernStateEast(0), m_RespawnTimer(NA_RESPAWN_TIME), m_GuardCheckTimer(NA_GUAR
 {
     SetCapturePointData(182210,530,-1572.57,7945.3,-22.475,2.05949,0,0,0.857167,0.515038);
 }
-
 bool OutdoorPvPNA::SetupOutdoorPvP()
 {
 //    m_TypeId = OUTDOOR_PVP_NA; _MUST_ be set in ctor, because of spawns cleanup
     // add the zones affected by the pvp buff
     RegisterZone(NA_BUFF_ZONE);
-
     // halaa
     m_obj = new OPvPCapturePointNA(this);
     if(!m_obj)
         return false;
     AddCapturePoint(m_obj);
-
     return true;
 }
-
 void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     // add buffs
@@ -232,19 +215,16 @@ void OutdoorPvPNA::HandlePlayerEnterZone(Player * plr, uint32 zone)
         plr->CastSpell(plr,NA_CAPTURE_BUFF,true);
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPNA::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
     plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF);
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 void OutdoorPvPNA::FillInitialWorldStates(WorldPacket &data)
 {
     m_obj->FillInitialWorldStates(data);
 }
-
 void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data)
 {
     if(m_ControllingFaction == ALLIANCE)
@@ -262,41 +242,33 @@ void OPvPCapturePointNA::FillInitialWorldStates(WorldPacket &data)
         data << NA_UI_HORDE_GUARDS_SHOW << uint32(0);
         data << NA_UI_ALLIANCE_GUARDS_SHOW << uint32(0);
     }
-
     data << NA_UI_GUARDS_MAX << NA_GUARDS_MAX;
     data << NA_UI_GUARDS_LEFT << uint32(m_GuardsAlive);
-
     data << NA_UI_TOWER_SLIDER_DISPLAY << uint32(0);
     data << NA_UI_TOWER_SLIDER_POS << uint32(50);
     data << NA_UI_TOWER_SLIDER_N << uint32(100);
-
     data << NA_MAP_WYVERN_NORTH_NEU_H << uint32(bool(m_WyvernStateNorth & WYVERN_NEU_HORDE));
     data << NA_MAP_WYVERN_NORTH_NEU_A << uint32(bool(m_WyvernStateNorth & WYVERN_NEU_ALLIANCE));
     data << NA_MAP_WYVERN_NORTH_H << uint32(bool(m_WyvernStateNorth & WYVERN_HORDE));
     data << NA_MAP_WYVERN_NORTH_A << uint32(bool(m_WyvernStateNorth & WYVERN_ALLIANCE));
-
     data << NA_MAP_WYVERN_SOUTH_NEU_H << uint32(bool(m_WyvernStateSouth & WYVERN_NEU_HORDE));
     data << NA_MAP_WYVERN_SOUTH_NEU_A << uint32(bool(m_WyvernStateSouth & WYVERN_NEU_ALLIANCE));
     data << NA_MAP_WYVERN_SOUTH_H << uint32(bool(m_WyvernStateSouth & WYVERN_HORDE));
     data << NA_MAP_WYVERN_SOUTH_A << uint32(bool(m_WyvernStateSouth & WYVERN_ALLIANCE));
-
     data << NA_MAP_WYVERN_WEST_NEU_H << uint32(bool(m_WyvernStateWest & WYVERN_NEU_HORDE));
     data << NA_MAP_WYVERN_WEST_NEU_A << uint32(bool(m_WyvernStateWest & WYVERN_NEU_ALLIANCE));
     data << NA_MAP_WYVERN_WEST_H << uint32(bool(m_WyvernStateWest & WYVERN_HORDE));
     data << NA_MAP_WYVERN_WEST_A << uint32(bool(m_WyvernStateWest & WYVERN_ALLIANCE));
-
     data << NA_MAP_WYVERN_EAST_NEU_H << uint32(bool(m_WyvernStateEast & WYVERN_NEU_HORDE));
     data << NA_MAP_WYVERN_EAST_NEU_A << uint32(bool(m_WyvernStateEast & WYVERN_NEU_ALLIANCE));
     data << NA_MAP_WYVERN_EAST_H << uint32(bool(m_WyvernStateEast & WYVERN_HORDE));
     data << NA_MAP_WYVERN_EAST_A << uint32(bool(m_WyvernStateEast & WYVERN_ALLIANCE));
-
     data << NA_MAP_HALAA_NEUTRAL << uint32(bool(m_HalaaState & HALAA_N));
     data << NA_MAP_HALAA_NEU_A << uint32(bool(m_HalaaState & HALAA_N_A));
     data << NA_MAP_HALAA_NEU_H << uint32(bool(m_HalaaState & HALAA_N_H));
     data << NA_MAP_HALAA_HORDE << uint32(bool(m_HalaaState & HALAA_H));
     data << NA_MAP_HALAA_ALLIANCE << uint32(bool(m_HalaaState & HALAA_A));
 }
-
 void OutdoorPvPNA::SendRemoveWorldStates(Player *plr)
 {
     plr->SendUpdateWorldState(NA_UI_HORDE_GUARDS_SHOW,0);
@@ -328,12 +300,10 @@ void OutdoorPvPNA::SendRemoveWorldStates(Player *plr)
     plr->SendUpdateWorldState(NA_MAP_HALAA_HORDE,0);
     plr->SendUpdateWorldState(NA_MAP_HALAA_ALLIANCE,0);
 }
-
 bool OutdoorPvPNA::Update(uint32 diff)
 {
     return m_obj->Update(diff);
 }
-
 bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObject * go)
 {
     std::vector<uint32> nodes;
@@ -376,39 +346,31 @@ bool OPvPCapturePointNA::HandleCustomSpell(Player * plr, uint32 spellId, GameObj
     default:
         break;
     }
-
     if(retval)
     {
         //Adding items
         uint32 noSpaceForCount = 0;
-
         // check space and find places
         ItemPosCountVec dest;
-
         int32 count = 10;
         uint32 itemid = 24538;
                                                                 // bomb id count
         uint8 msg = plr->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemid, count, &noSpaceForCount );
         if( msg != EQUIP_ERR_OK )                               // convert to possible store amount
             count -= noSpaceForCount;
-
         if( count == 0 || dest.empty())                         // can't add any
         {
             return true;
         }
-
         Item* item = plr->StoreNewItem( dest, itemid, true);
-
         if(count > 0 && item)
         {
             plr->SendNewItem(item,count,true,false);
         }
-
         return true;
     }
     return false;
 }
-
 int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid)
 {
     uint32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
@@ -421,12 +383,10 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid)
             gos=HordeControlGOs;
         else
             return -1;
-
         int32 del = -1;
         int32 del2 = -1;
         int32 add = -1;
         int32 add2 = -1;
-
         switch(retval)
         {
         case NA_DESTROYED_ROOST_S:
@@ -513,24 +473,18 @@ int32 OPvPCapturePointNA::HandleOpenGo(Player *plr, uint64 guid)
             return -1;
             break;
         }
-
         if(del>-1)
             DelObject(del);
-
         if(del2>-1)
             DelObject(del2);
-
         if(add>-1)
             AddObject(add,gos[add].entry,gos[add].map,gos[add].x,gos[add].y,gos[add].z,gos[add].o,gos[add].rot0,gos[add].rot1,gos[add].rot2,gos[add].rot3);
-
         if(add2>-1)
             AddObject(add2,gos[add2].entry,gos[add2].map,gos[add2].x,gos[add2].y,gos[add2].z,gos[add2].o,gos[add2].rot0,gos[add2].rot1,gos[add2].rot2,gos[add2].rot3);
-
         return retval;
     }
     return -1;
 }
-
 bool OPvPCapturePointNA::Update(uint32 diff)
 {
     // let the controlling faction advance in phase
@@ -539,7 +493,6 @@ bool OPvPCapturePointNA::Update(uint32 diff)
         capturable = true;
     else if(m_ControllingFaction == HORDE && m_activePlayers[0].size() < m_activePlayers[1].size())
         capturable = true;
-
     if(m_GuardCheckTimer < diff)
     {
         m_GuardCheckTimer = NA_GUARD_CHECK_TIME;
@@ -553,7 +506,6 @@ bool OPvPCapturePointNA::Update(uint32 diff)
             m_PvP->SendUpdateWorldState(NA_UI_GUARDS_LEFT,m_GuardsAlive);
         }
     } else m_GuardCheckTimer -= diff;
-
     if(m_capturable || capturable)
     {
         if(m_RespawnTimer < diff)
@@ -564,12 +516,10 @@ bool OPvPCapturePointNA::Update(uint32 diff)
                 FactionTakeOver(m_ControllingFaction);
             m_RespawnTimer = NA_RESPAWN_TIME;
         } else m_RespawnTimer -= diff;
-
         return OPvPCapturePoint::Update(diff);
     }
     return false;
 }
-
 void OPvPCapturePointNA::ChangeState()
 {
     uint32 artkit = 21;
@@ -603,17 +553,14 @@ void OPvPCapturePointNA::ChangeState()
             artkit = 1;
         break;
     }
-
     GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
     if(flag)
     {
         flag->SetGoArtKit(artkit);
         flag->SendUpdateObjectToAllExcept(NULL);
     }
-
     UpdateHalaaWorldState();
 }
-
 void OPvPCapturePointNA::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -623,7 +570,6 @@ void OPvPCapturePointNA::SendChangePhase()
     SendUpdateWorldState(NA_UI_TOWER_SLIDER_POS, phase);
     SendUpdateWorldState(NA_UI_TOWER_SLIDER_N, m_neutralValuePct);
 }
-
 void OPvPCapturePointNA::UpdateHalaaWorldState()
 {
     m_PvP->SendUpdateWorldState( NA_MAP_HALAA_NEUTRAL ,uint32(bool(m_HalaaState & HALAA_N)));
@@ -632,7 +578,6 @@ void OPvPCapturePointNA::UpdateHalaaWorldState()
     m_PvP->SendUpdateWorldState( NA_MAP_HALAA_HORDE ,uint32(bool(m_HalaaState & HALAA_H)));
     m_PvP->SendUpdateWorldState( NA_MAP_HALAA_ALLIANCE ,uint32(bool(m_HalaaState & HALAA_A)));
 }
-
 void OPvPCapturePointNA::UpdateWyvernRoostWorldState(uint32 roost)
 {
     switch(roost)
diff --git a/src/game/OutdoorPvPNA.h b/src/game/OutdoorPvPNA.h
index bfafda34340..53d34d87f97 100644
--- a/src/game/OutdoorPvPNA.h
+++ b/src/game/OutdoorPvPNA.h
@@ -15,12 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_NA_
 #define OUTDOOR_PVP_NA_
-
 // TODO: "sometimes" set to neutral
-
 #include "OutdoorPvPImpl.h"
 enum OutdoorPvPNASpells
 {
@@ -31,129 +28,102 @@ enum OutdoorPvPNASpells
 // kill credit for pks
 const uint32 NA_CREDIT_MARKER = 24867;
 const uint32 NA_GUARDS_MAX = 15;
-
 const uint32 NA_BUFF_ZONE = 3518;
-
 const uint32 NA_HALAA_GRAVEYARD = 993;
-
 const uint32 NA_HALAA_GRAVEYARD_ZONE = 3518; // need to add zone id, not area id
-
 const uint32 NA_RESPAWN_TIME = 3600000; // one hour to capture after defeating all guards
-
 const uint32 NA_GUARD_CHECK_TIME = 500; // every half second
-
 enum OutdoorPvPNAWorldStates{
     NA_UI_HORDE_GUARDS_SHOW = 2503,
     NA_UI_ALLIANCE_GUARDS_SHOW = 2502,
     NA_UI_GUARDS_MAX = 2493,
     NA_UI_GUARDS_LEFT = 2491,
-
     NA_UI_TOWER_SLIDER_DISPLAY = 2495,
     NA_UI_TOWER_SLIDER_POS = 2494,
     NA_UI_TOWER_SLIDER_N = 2497,
-
     NA_MAP_WYVERN_NORTH_NEU_H = 2762,
     NA_MAP_WYVERN_NORTH_NEU_A = 2662,
     NA_MAP_WYVERN_NORTH_H = 2663,
     NA_MAP_WYVERN_NORTH_A = 2664,
-
     NA_MAP_WYVERN_SOUTH_NEU_H = 2760,
     NA_MAP_WYVERN_SOUTH_NEU_A = 2670,
     NA_MAP_WYVERN_SOUTH_H = 2668,
     NA_MAP_WYVERN_SOUTH_A = 2669,
-
     NA_MAP_WYVERN_WEST_NEU_H = 2761,
     NA_MAP_WYVERN_WEST_NEU_A = 2667,
     NA_MAP_WYVERN_WEST_H = 2665,
     NA_MAP_WYVERN_WEST_A = 2666,
-
     NA_MAP_WYVERN_EAST_NEU_H = 2763,
     NA_MAP_WYVERN_EAST_NEU_A = 2659,
     NA_MAP_WYVERN_EAST_H = 2660,
     NA_MAP_WYVERN_EAST_A = 2661,
-
     NA_MAP_HALAA_NEUTRAL = 2671,
     NA_MAP_HALAA_NEU_A = 2676,
     NA_MAP_HALAA_NEU_H = 2677,
     NA_MAP_HALAA_HORDE = 2672,
     NA_MAP_HALAA_ALLIANCE = 2673
 };
-
 const uint32 FLIGHT_NODES_NUM = 4;
-
 // used to access the elements of Horde/AllyControlGOs
 enum ControlGOTypes{
     NA_ROOST_S = 0,
     NA_ROOST_W = 1,
     NA_ROOST_N = 2,
     NA_ROOST_E = 3,
-
     NA_BOMB_WAGON_S = 4,
     NA_BOMB_WAGON_W = 5,
     NA_BOMB_WAGON_N = 6,
     NA_BOMB_WAGON_E = 7,
-
     NA_DESTROYED_ROOST_S = 8,
     NA_DESTROYED_ROOST_W = 9,
     NA_DESTROYED_ROOST_N = 10,
     NA_DESTROYED_ROOST_E = 11,
-
     NA_CONTROL_GO_NUM = 12
 };
-
 const uint32 FlightPathStartNodes[FLIGHT_NODES_NUM] = {103,105,107,109};
 const uint32 FlightPathEndNodes[FLIGHT_NODES_NUM] = {104,106,108,110};
-
 enum FlightSpellsNA{
     NA_SPELL_FLY_SOUTH = 32059,
     NA_SPELL_FLY_WEST = 32068,
     NA_SPELL_FLY_NORTH = 32075,
     NA_SPELL_FLY_EAST = 32081
 };
-
 // spawned when the alliance is attacking, horde is in control
 const go_type HordeControlGOs[NA_CONTROL_GO_NUM] = {
     {182267,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //ALLY_ROOST_SOUTH
     {182280,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //ALLY_ROOST_WEST
     {182281,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //ALLY_ROOST_NORTH
     {182282,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //ALLY_ROOST_EAST
-
     {182222,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //HORDE_BOMB_WAGON_SOUTH
     {182272,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //HORDE_BOMB_WAGON_WEST
     {182273,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //HORDE_BOMB_WAGON_NORTH
     {182274,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //HORDE_BOMB_WAGON_EAST
-
     {182266,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_ALLY_ROOST_SOUTH
     {182275,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_ALLY_ROOST_WEST
     {182276,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_ALLY_ROOST_NORTH
     {182277,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}  //DESTROYED_ALLY_ROOST_EAST
 };
-
 // spawned when the horde is attacking, alliance is in control
 const go_type AllianceControlGOs[NA_CONTROL_GO_NUM] = {
     {182301,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //HORDE_ROOST_SOUTH
     {182302,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //HORDE_ROOST_WEST
     {182303,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //HORDE_ROOST_NORTH
     {182304,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}, //HORDE_ROOST_EAST
-
     {182305,530,-1825.4022,8039.2602,-26.08,-2.89725,0,0,0.992546,-0.121869}, //ALLY_BOMB_WAGON_SOUTH
     {182306,530,-1515.37,8136.91,-20.42,-1.3439,0,0,0.622515,-0.782608}, //ALLY_BOMB_WAGON_WEST
     {182307,530,-1377.95,7773.44,-10.31,-0.575959,0,0,0.284015,-0.95882}, //ALLY_BOMB_WAGON_NORTH
     {182308,530,-1659.87,7733.15,-15.75,-2.80998,0,0,0.986286,-0.165048}, //ALLY_BOMB_WAGON_EAST
-
     {182297,530,-1815.8,8036.51,-26.2354,-2.89725,0,0,0.992546,-0.121869}, //DESTROYED_HORDE_ROOST_SOUTH
     {182298,530,-1507.95,8132.1,-19.5585,-1.3439,0,0,0.622515,-0.782608}, //DESTROYED_HORDE_ROOST_WEST
     {182299,530,-1384.52,7779.33,-11.1663,-0.575959,0,0,0.284015,-0.95882}, //DESTROYED_HORDE_ROOST_NORTH
     {182300,530,-1650.11,7732.56,-15.4505,-2.80998,0,0,0.986286,-0.165048}  //DESTROYED_HORDE_ROOST_EAST
 };
-
 enum ControlNPCTypes{
     NA_NPC_RESEARCHER = 0,
     NA_NPC_QUARTERMASTER,
     NA_NPC_BLADE_MERCHANT,
     NA_NPC_FOOD_MERCHANT,
     NA_NPC_AMMO,
-
     NA_NPC_GUARD_01,
     NA_NPC_GUARD_02,
     NA_NPC_GUARD_03,
@@ -169,10 +139,8 @@ enum ControlNPCTypes{
     NA_NPC_GUARD_13,
     NA_NPC_GUARD_14,
     NA_NPC_GUARD_15,
-
     NA_CONTROL_NPC_NUM
 };
-
 const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = {
     {18816,67,530,-1523.92,7951.76,-17.6942,3.51172},
     {18821,67,530,-1527.75,7952.46,-17.6948,3.99317},
@@ -195,7 +163,6 @@ const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] = {
     {18192,67,530,-1545.57,7935.83,-21.13,3.448},
     {18192,67,530,-1550.86,7937.56,-21.7,3.801}
 };
-
 const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = {
     {18817,469,530,-1591.18,8020.39,-22.2042,4.59022},
     {18822,469,530,-1588.0,8019.0,-22.2042,4.06662},
@@ -218,14 +185,12 @@ const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] = {
     {18256,469,530,-1585.73,7994.68,-23.29,4.439},
     {18256,469,530,-1595.5,7991.27,-23.53,4.738}
 };
-
 enum WyvernStates{
     WYVERN_NEU_HORDE = 1,
     WYVERN_NEU_ALLIANCE = 2,
     WYVERN_HORDE = 4,
     WYVERN_ALLIANCE = 8
 };
-
 enum HalaaStates{
     HALAA_N = 1,
     HALAA_N_A = 2,
@@ -233,7 +198,6 @@ enum HalaaStates{
     HALAA_N_H = 8,
     HALAA_H = 16
 };
-
 class Unit;
 class Creature;
 class OutdoorPvPNA;
@@ -255,15 +219,12 @@ public:
 protected:
     // called when a faction takes control
     void FactionTakeOver(uint32 team);
-
     void DeSpawnNPCs();
     void DeSpawnGOs();
     void SpawnNPCsForTeam(uint32 team);
     void SpawnGOsForTeam(uint32 team);
-
     void UpdateWyvernRoostWorldState(uint32 roost);
     void UpdateHalaaWorldState();
-
 private:
     bool m_capturable;
     uint32 m_GuardsAlive;
@@ -276,7 +237,6 @@ private:
     uint32 m_RespawnTimer;
     uint32 m_GuardCheckTimer;
 };
-
 class OutdoorPvPNA : public OutdoorPvP
 {
 friend class OPvPCapturePointNA;
@@ -292,6 +252,5 @@ public:
 private:
     OPvPCapturePointNA * m_obj;
 };
-
 #endif
 
diff --git a/src/game/OutdoorPvPSI.cpp b/src/game/OutdoorPvPSI.cpp
index e60888c7e08..83c3f4fdbd8 100644
--- a/src/game/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvPSI.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPSI.h"
 #include "WorldPacket.h"
 #include "Player.h"
@@ -25,7 +24,6 @@
 #include "OutdoorPvPMgr.h"
 #include "Language.h"
 #include "World.h"
-
 OutdoorPvPSI::OutdoorPvPSI()
 {
     m_TypeId = OUTDOOR_PVP_SI;
@@ -33,54 +31,46 @@ OutdoorPvPSI::OutdoorPvPSI()
     m_Gathered_H = 0;
     m_LastController = 0;
 }
-
 void OutdoorPvPSI::FillInitialWorldStates(WorldPacket &data)
 {
     data << SI_GATHERED_A << m_Gathered_A;
     data << SI_GATHERED_H << m_Gathered_H;
     data << SI_SILITHYST_MAX << SI_MAX_RESOURCES;
 }
-
 void OutdoorPvPSI::SendRemoveWorldStates(Player *plr)
 {
     plr->SendUpdateWorldState(SI_GATHERED_A,0);
     plr->SendUpdateWorldState(SI_GATHERED_H,0);
     plr->SendUpdateWorldState(SI_SILITHYST_MAX,0);
 }
-
 void OutdoorPvPSI::UpdateWorldState()
 {
     SendUpdateWorldState(SI_GATHERED_A,m_Gathered_A);
     SendUpdateWorldState(SI_GATHERED_H,m_Gathered_H);
     SendUpdateWorldState(SI_SILITHYST_MAX,SI_MAX_RESOURCES);
 }
-
 bool OutdoorPvPSI::SetupOutdoorPvP()
 {
     for(int i = 0; i < OutdoorPvPSIBuffZonesNum; ++i)
         RegisterZone(OutdoorPvPSIBuffZones[i]);
     return true;
 }
-
 bool OutdoorPvPSI::Update(uint32 diff)
 {
     return false;
 }
-
 void OutdoorPvPSI::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     if(plr->GetTeam() == m_LastController)
         plr->CastSpell(plr,SI_CENARION_FAVOR,true);
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPSI::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
     plr->RemoveAurasDueToSpell(SI_CENARION_FAVOR);
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
 {
     switch(trigger)
@@ -138,7 +128,6 @@ bool OutdoorPvPSI::HandleAreaTrigger(Player *plr, uint32 trigger)
     }
     return false;
 }
-
 bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
 {
     if(spellId == SI_SILITHYST_FLAG)
@@ -162,7 +151,6 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
                             delete go;
                             return true;
                         }
-                        
                         if(!go->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT),SI_SILITHYST_MOUND, map, plr->GetPhaseMask(), plr->GetPositionX(),plr->GetPositionY(),plr->GetPositionZ(),plr->GetOrientation(),0,0,0,0,100,GO_STATE_READY))
                         {
                             delete go;
@@ -210,7 +198,6 @@ bool OutdoorPvPSI::HandleDropFlag(Player *plr, uint32 spellId)
     }
     return false;
 }
-
 bool OutdoorPvPSI::HandleCustomSpell(Player *plr, uint32 spellId, GameObject *go)
 {
     if(!go || spellId != SI_SILITHYST_FLAG_GO_SPELL)
diff --git a/src/game/OutdoorPvPSI.h b/src/game/OutdoorPvPSI.h
index 569e7c62057..86041c29026 100644
--- a/src/game/OutdoorPvPSI.h
+++ b/src/game/OutdoorPvPSI.h
@@ -15,12 +15,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_SI_
 #define OUTDOOR_PVP_SI_
-
 #include "OutdoorPvPImpl.h"
-
 enum OutdoorPvPSISpells
 {
     SI_SILITHYST_FLAG_GO_SPELL = 29518,
@@ -28,29 +25,19 @@ enum OutdoorPvPSISpells
     SI_TRACES_OF_SILITHYST = 29534,
     SI_CENARION_FAVOR = 30754
 };
-
 const uint32 SI_MAX_RESOURCES = 200;
-
 const uint32 OutdoorPvPSIBuffZonesNum = 3;
-
 const uint32 OutdoorPvPSIBuffZones[OutdoorPvPSIBuffZonesNum] = { 1377, 3428, 3429 };
-
 const uint32 SI_AREATRIGGER_H = 4168;
-
 const uint32 SI_AREATRIGGER_A = 4162;
-
 const uint32 SI_TURNIN_QUEST_CM_A = 17090;
-
 const uint32 SI_TURNIN_QUEST_CM_H = 18199;
-
 const uint32 SI_SILITHYST_MOUND = 181597;
-
 enum SI_WorldStates{
     SI_GATHERED_A = 2313,
     SI_GATHERED_H = 2314,
     SI_SILITHYST_MAX = 2317
 };
-
 class OutdoorPvPSI : public OutdoorPvP
 {
 public:
@@ -70,6 +57,5 @@ private:
     uint32 m_Gathered_H;
     uint32 m_LastController;
 };
-
 #endif
 
diff --git a/src/game/OutdoorPvPTF.cpp b/src/game/OutdoorPvPTF.cpp
index 5a8483a2c11..6ac6067b909 100644
--- a/src/game/OutdoorPvPTF.cpp
+++ b/src/game/OutdoorPvPTF.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPTF.h"
 #include "OutdoorPvPMgr.h"
 #include "WorldPacket.h"
@@ -23,67 +22,54 @@
 #include "ObjectMgr.h"
 #include "Language.h"
 #include "World.h"
-
 OutdoorPvPTF::OutdoorPvPTF()
 {
     m_TypeId = OUTDOOR_PVP_TF;
 }
-
 OPvPCapturePointTF::OPvPCapturePointTF(OutdoorPvP *pvp, OutdoorPvPTF_TowerType type)
 : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(TF_TOWERSTATE_N)
 {
     SetCapturePointData(TFCapturePoints[type].entry,TFCapturePoints[type].map,TFCapturePoints[type].x,TFCapturePoints[type].y,TFCapturePoints[type].z,TFCapturePoints[type].o,TFCapturePoints[type].rot0,TFCapturePoints[type].rot1,TFCapturePoints[type].rot2,TFCapturePoints[type].rot3);
 }
-
 void OPvPCapturePointTF::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(TFTowerWorldStates[m_TowerType].n) << uint32(bool(m_TowerState & TF_TOWERSTATE_N));
     data << uint32(TFTowerWorldStates[m_TowerType].h) << uint32(bool(m_TowerState & TF_TOWERSTATE_H));
     data << uint32(TFTowerWorldStates[m_TowerType].a) << uint32(bool(m_TowerState & TF_TOWERSTATE_A));
 }
-
 void OutdoorPvPTF::FillInitialWorldStates(WorldPacket &data)
 {
     data << TF_UI_TOWER_SLIDER_POS << uint32(50);
     data << TF_UI_TOWER_SLIDER_N << uint32(100);
     data << TF_UI_TOWER_SLIDER_DISPLAY << uint32(0);
-
     data << TF_UI_TOWER_COUNT_H << m_HordeTowersControlled;
     data << TF_UI_TOWER_COUNT_A << m_AllianceTowersControlled;
     data << TF_UI_TOWERS_CONTROLLED_DISPLAY << uint32(!m_IsLocked);
-
     data << TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT << first_digit;
     data << TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT << second_digit;
     data << TF_UI_LOCKED_TIME_HOURS << hours_left;
-
     data << TF_UI_LOCKED_DISPLAY_NEUTRAL << uint32(m_IsLocked && !m_HordeTowersControlled && !m_AllianceTowersControlled);
     data << TF_UI_LOCKED_DISPLAY_HORDE << uint32(m_IsLocked && (m_HordeTowersControlled > m_AllianceTowersControlled));
     data << TF_UI_LOCKED_DISPLAY_ALLIANCE << uint32(m_IsLocked && (m_HordeTowersControlled < m_AllianceTowersControlled));
-
     for(OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
     {
         itr->second->FillInitialWorldStates(data);
     }
 }
-
 void OutdoorPvPTF::SendRemoveWorldStates(Player * plr)
 {
     plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_POS,uint32(0));
     plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_N,uint32(0));
     plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY,uint32(0));
-
     plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_H,uint32(0));
     plr->SendUpdateWorldState(TF_UI_TOWER_COUNT_A,uint32(0));
     plr->SendUpdateWorldState(TF_UI_TOWERS_CONTROLLED_DISPLAY,uint32(0));
-
     plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,uint32(0));
     plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,uint32(0));
     plr->SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,uint32(0));
-
     plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_NEUTRAL,uint32(0));
     plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_HORDE,uint32(0));
     plr->SendUpdateWorldState(TF_UI_LOCKED_DISPLAY_ALLIANCE,uint32(0));
-
     for(int i = 0; i < TF_TOWER_NUM; ++i)
     {
         plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].n),uint32(0));
@@ -91,14 +77,12 @@ void OutdoorPvPTF::SendRemoveWorldStates(Player * plr)
         plr->SendUpdateWorldState(uint32(TFTowerWorldStates[i].a),uint32(0));
     }
 }
-
 void OPvPCapturePointTF::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].n),uint32(bool(m_TowerState & TF_TOWERSTATE_N)));
     m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].h),uint32(bool(m_TowerState & TF_TOWERSTATE_H)));
     m_PvP->SendUpdateWorldState(uint32(TFTowerWorldStates[m_TowerType].a),uint32(bool(m_TowerState & TF_TOWERSTATE_A)));
 }
-
 bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -111,17 +95,14 @@ bool OPvPCapturePointTF::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointTF::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(TF_UI_TOWER_SLIDER_DISPLAY, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 bool OutdoorPvPTF::Update(uint32 diff)
 {
     bool changed = false;
-
     if(changed = OutdoorPvP::Update(diff))
     {
         if(m_AllianceTowersControlled == TF_TOWER_NUM)
@@ -174,7 +155,6 @@ bool OutdoorPvPTF::Update(uint32 diff)
                 minutes_left -= hours_left * 60;
                 second_digit = minutes_left % 10;
                 first_digit = minutes_left / 10;
-
                 SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT,first_digit);
                 SendUpdateWorldState(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT,second_digit);
                 SendUpdateWorldState(TF_UI_LOCKED_TIME_HOURS,hours_left);
@@ -184,7 +164,6 @@ bool OutdoorPvPTF::Update(uint32 diff)
     }
     return changed;
 }
-
 void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     if(plr->GetTeam() == ALLIANCE)
@@ -199,39 +178,32 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPTF::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
     plr->RemoveAurasDueToSpell(TF_CAPTURE_BUFF);
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 bool OutdoorPvPTF::SetupOutdoorPvP()
 {
     m_AllianceTowersControlled = 0;
     m_HordeTowersControlled = 0;
-
     m_IsLocked = false;
     m_LockTimer = TF_LOCK_TIME;
     m_LockTimerUpdate = 0;
     hours_left = 6;
     second_digit = 0;
     first_digit = 0;
-
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPTFBuffZonesNum; ++i)
         RegisterZone(OutdoorPvPTFBuffZones[i]);
-
     AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NW));
     AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_N));
     AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_NE));
     AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_SE));
     AddCapturePoint(new OPvPCapturePointTF(this,TF_TOWER_S));
-
     return true;
 }
-
 bool OPvPCapturePointTF::Update(uint32 diff)
 {
     // can update even in locked state if gathers the controlling faction
@@ -241,7 +213,6 @@ bool OPvPCapturePointTF::Update(uint32 diff)
     canupdate = canupdate || !((OutdoorPvPTF*)m_PvP)->m_IsLocked;
     return canupdate && OPvPCapturePoint::Update(diff);
 }
-
 void OPvPCapturePointTF::ChangeState()
 {
     // if changing from controlling alliance to horde
@@ -258,9 +229,7 @@ void OPvPCapturePointTF::ChangeState()
             ((OutdoorPvPTF*)m_PvP)->m_HordeTowersControlled--;
         sWorld.SendZoneText(OutdoorPvPTFBuffZones[0],objmgr.GetTrinityStringForDBCLocale(LANG_OPVP_TF_LOOSE_H));
     }
-
     uint32 artkit = 21;
-
     switch(m_State)
     {
     case OBJECTIVESTATE_ALLIANCE:
@@ -285,17 +254,14 @@ void OPvPCapturePointTF::ChangeState()
         m_TowerState = TF_TOWERSTATE_N;
         break;
     }
-
     GameObject* flag = HashMapHolder<GameObject>::Find(m_capturePointGUID);
     if(flag)
     {
         flag->SetGoArtKit(artkit);
         flag->SendUpdateObjectToAllExcept(NULL);
     }
-
     UpdateTowerState();
 }
-
 void OPvPCapturePointTF::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
diff --git a/src/game/OutdoorPvPTF.h b/src/game/OutdoorPvPTF.h
index 3a88b7fd309..3d567443563 100644
--- a/src/game/OutdoorPvPTF.h
+++ b/src/game/OutdoorPvPTF.h
@@ -1,23 +1,16 @@
 #ifndef OUTDOOR_PVP_TF_
 #define OUTDOOR_PVP_TF_
-
 #include "OutdoorPvPImpl.h"
-
 const uint32 OutdoorPvPTFBuffZonesNum = 5;
-
 const uint32 OutdoorPvPTFBuffZones[OutdoorPvPTFBuffZonesNum] = { 3519 /*Terokkar Forest*/, 3791 /*Sethekk Halls*/, 3789 /*Shadow Labyrinth*/, 3792 /*Mana-Tombs*/, 3790 /*Auchenai Crypts*/ };
-
 // locked for 6 hours after capture
 const uint32 TF_LOCK_TIME = 3600 * 6 * 1000;
 // update lock timer every 1/4 minute (overkill, but this way it's sure the timer won't "jump" 2 minutes at once.)
 const uint32 TF_LOCK_TIME_UPDATE = 15000;
-
 // blessing of auchindoun
 #define TF_CAPTURE_BUFF 33377
-
 const uint32 TF_ALLY_QUEST = 11505;
 const uint32 TF_HORDE_QUEST = 11506;
-
 enum OutdoorPvPTF_TowerType{
     TF_TOWER_NW = 0,
     TF_TOWER_N,
@@ -26,7 +19,6 @@ enum OutdoorPvPTF_TowerType{
     TF_TOWER_S,
     TF_TOWER_NUM
 };
-
 const go_type TFCapturePoints[TF_TOWER_NUM] = {
     {183104,530,-3081.65,5335.03,17.1853,-2.14675,0,0,0.878817,-0.477159},
     {183411,530,-2939.9,4788.73,18.987,2.77507,0,0,0.983255,0.182236},
@@ -34,13 +26,11 @@ const go_type TFCapturePoints[TF_TOWER_NUM] = {
     {183413,530,-3603.31,4529.15,20.9077,0.994838,0,0,0.477159,0.878817},
     {183414,530,-3812.37,4899.3,17.7249,0.087266,0,0,0.043619,0.999048}
 };
-
 struct tf_tower_world_state{
     uint32 n;
     uint32 h;
     uint32 a;
 };
-
 const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = {
     {0xa79,0xa7a,0xa7b},
     {0xa7e,0xa7d,0xa7c},
@@ -48,20 +38,15 @@ const tf_tower_world_state TFTowerWorldStates[TF_TOWER_NUM] = {
     {0xa88,0xa87,0xa86},
     {0xa85,0xa84,0xa83}
 };
-
 const uint32 TFTowerPlayerEnterEvents[TF_TOWER_NUM] = {12226, 12497, 12486, 12499, 12501};
-
 const uint32 TFTowerPlayerLeaveEvents[TF_TOWER_NUM] = {12225, 12496, 12487, 12498, 12500};
-
 enum TFWorldStates{
     TF_UI_TOWER_SLIDER_POS = 0xa41,
     TF_UI_TOWER_SLIDER_N = 0xa40,
     TF_UI_TOWER_SLIDER_DISPLAY = 0xa3f,
-
     TF_UI_TOWER_COUNT_H = 0xa3e,
     TF_UI_TOWER_COUNT_A = 0xa3d,
     TF_UI_TOWERS_CONTROLLED_DISPLAY = 0xa3c,
-
     TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT = 0x9d0,
     TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT = 0x9ce,
     TF_UI_LOCKED_TIME_HOURS = 0x9cd,
@@ -69,13 +54,11 @@ enum TFWorldStates{
     TF_UI_LOCKED_DISPLAY_HORDE = 0xad0,
     TF_UI_LOCKED_DISPLAY_ALLIANCE = 0xacf
 };
-
 enum TFTowerStates {
     TF_TOWERSTATE_N = 1,
     TF_TOWERSTATE_H = 2,
     TF_TOWERSTATE_A = 4
 };
-
 class OPvPCapturePointTF : public OPvPCapturePoint
 {
 public:
@@ -92,7 +75,6 @@ protected:
     OutdoorPvPTF_TowerType m_TowerType;
     uint32 m_TowerState;
 };
-
 class OutdoorPvPTF : public OutdoorPvP
 {
 friend class OPvPCapturePointTF;
@@ -112,6 +94,5 @@ private:
     uint32 m_HordeTowersControlled;
     uint32 hours_left, second_digit, first_digit;
 };
-
 #endif
 
diff --git a/src/game/OutdoorPvPZM.cpp b/src/game/OutdoorPvPZM.cpp
index 550dbcccdc8..4101b21ac82 100644
--- a/src/game/OutdoorPvPZM.cpp
+++ b/src/game/OutdoorPvPZM.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "OutdoorPvPZM.h"
 #include "ObjectMgr.h"
 #include "OutdoorPvPMgr.h"
@@ -25,13 +24,11 @@
 #include "WorldPacket.h"
 #include "GossipDef.h"
 #include "World.h"
-
 OPvPCapturePointZM_Beacon::OPvPCapturePointZM_Beacon(OutdoorPvP *pvp, ZM_BeaconType type)
 : OPvPCapturePoint(pvp), m_TowerType(type), m_TowerState(ZM_TOWERSTATE_N)
 {
     SetCapturePointData(ZMCapturePoints[type].entry,ZMCapturePoints[type].map,ZMCapturePoints[type].x,ZMCapturePoints[type].y,ZMCapturePoints[type].z,ZMCapturePoints[type].o,ZMCapturePoints[type].rot0,ZMCapturePoints[type].rot1,ZMCapturePoints[type].rot2,ZMCapturePoints[type].rot3);
 }
-
 void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data)
 {
     data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_n) << uint32(bool(m_TowerState & ZM_TOWERSTATE_N));
@@ -41,7 +38,6 @@ void OPvPCapturePointZM_Beacon::FillInitialWorldStates(WorldPacket &data)
     data << uint32(ZMBeaconInfo[m_TowerType].ui_tower_h) << uint32(bool(m_TowerState & ZM_TOWERSTATE_H));
     data << uint32(ZMBeaconInfo[m_TowerType].map_tower_h) << uint32(bool(m_TowerState & ZM_TOWERSTATE_H));
 }
-
 void OPvPCapturePointZM_Beacon::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_n),uint32(bool(m_TowerState & ZM_TOWERSTATE_N)));
@@ -51,7 +47,6 @@ void OPvPCapturePointZM_Beacon::UpdateTowerState()
     m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].ui_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
     m_PvP->SendUpdateWorldState(uint32(ZMBeaconInfo[m_TowerType].map_tower_h),uint32(bool(m_TowerState & ZM_TOWERSTATE_H)));
 }
-
 bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr)
 {
     if(OPvPCapturePoint::HandlePlayerEnter(plr))
@@ -64,13 +59,11 @@ bool OPvPCapturePointZM_Beacon::HandlePlayerEnter(Player *plr)
     }
     return false;
 }
-
 void OPvPCapturePointZM_Beacon::HandlePlayerLeave(Player *plr)
 {
     plr->SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_disp, 0);
     OPvPCapturePoint::HandlePlayerLeave(plr);
 }
-
 void OPvPCapturePointZM_Beacon::ChangeState()
 {
     // if changing from controlling alliance to horde
@@ -87,7 +80,6 @@ void OPvPCapturePointZM_Beacon::ChangeState()
             ((OutdoorPvPZM*)m_PvP)->m_HordeTowersControlled--;
         sWorld.SendZoneText(ZM_GRAVEYARD_ZONE,objmgr.GetTrinityStringForDBCLocale(ZMBeaconLooseH[m_TowerType]));
     }
-
     switch(m_State)
     {
         case OBJECTIVESTATE_ALLIANCE:
@@ -110,10 +102,8 @@ void OPvPCapturePointZM_Beacon::ChangeState()
             m_TowerState = ZM_TOWERSTATE_N;
             break;
     }
-
     UpdateTowerState();
 }
-
 void OPvPCapturePointZM_Beacon::SendChangePhase()
 {
     // send this too, sometimes the slider disappears, dunno why :(
@@ -123,7 +113,6 @@ void OPvPCapturePointZM_Beacon::SendChangePhase()
     SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_pos, phase);
     SendUpdateWorldState(ZMBeaconInfo[m_TowerType].slider_n, m_neutralValuePct);
 }
-
 bool OutdoorPvPZM::Update(uint32 diff)
 {
     bool changed = false;
@@ -138,7 +127,6 @@ bool OutdoorPvPZM::Update(uint32 diff)
     }
     return changed;
 }
-
 void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     if(plr->GetTeam() == ALLIANCE)
@@ -153,7 +141,6 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player * plr, uint32 zone)
     }
     OutdoorPvP::HandlePlayerEnterZone(plr,zone);
 }
-
 void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     // remove buffs
@@ -163,51 +150,41 @@ void OutdoorPvPZM::HandlePlayerLeaveZone(Player * plr, uint32 zone)
     plr->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_H);
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
 }
-
 OutdoorPvPZM::OutdoorPvPZM()
 {
     m_TypeId = OUTDOOR_PVP_ZM;
     m_GraveYard = NULL;
     m_AllianceTowersControlled = 0;
     m_HordeTowersControlled = 0;
-
 }
-
 bool OutdoorPvPZM::SetupOutdoorPvP()
 {
     m_AllianceTowersControlled = 0;
     m_HordeTowersControlled = 0;
-
     // add the zones affected by the pvp buff
     for(int i = 0; i < OutdoorPvPZMBuffZonesNum; ++i)
         RegisterZone(OutdoorPvPZMBuffZones[i]);
-
     AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_WEST));
     AddCapturePoint(new OPvPCapturePointZM_Beacon(this,ZM_BEACON_EAST));
     m_GraveYard = new OPvPCapturePointZM_GraveYard(this);
     AddCapturePoint(m_GraveYard); // though the update function isn't used, the handleusego is!
-
     return true;
 }
-
 void OutdoorPvPZM::HandleKillImpl(Player *plr, Unit * killed)
 {
     if(killed->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(plr->GetTeam() == ALLIANCE && ((Player*)killed)->GetTeam() != ALLIANCE)
         plr->CastSpell(plr,ZM_AlliancePlayerKillReward,true);
     else if(plr->GetTeam() == HORDE && ((Player*)killed)->GetTeam() != HORDE)
         plr->CastSpell(plr,ZM_HordePlayerKillReward,true);
 }
-
 bool OPvPCapturePointZM_GraveYard::Update(uint32 diff)
 {
     bool retval = m_State != m_OldState;
     m_State = m_OldState;
     return retval;
 }
-
 int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid)
 {
     uint32 retval = OPvPCapturePoint::HandleOpenGo(plr, guid);
@@ -243,7 +220,6 @@ int32 OPvPCapturePointZM_GraveYard::HandleOpenGo(Player *plr, uint64 guid)
     }
     return retval;
 }
-
 OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP *pvp)
 : OPvPCapturePoint(pvp)
 {
@@ -256,38 +232,32 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP *pvp)
     // add neutral banner
     AddObject(0,ZM_Banner_N.entry,ZM_Banner_N.map,ZM_Banner_N.x,ZM_Banner_N.y,ZM_Banner_N.z,ZM_Banner_N.o,ZM_Banner_N.rot0,ZM_Banner_N.rot1,ZM_Banner_N.rot2,ZM_Banner_N.rot3);
 }
-
 void OPvPCapturePointZM_GraveYard::UpdateTowerState()
 {
     m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_N,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N)));
     m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_H,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H)));
     m_PvP->SendUpdateWorldState(ZM_MAP_GRAVEYARD_A,uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A)));
-
     m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_READY,uint32(m_BothControllingFaction == ALLIANCE));
     m_PvP->SendUpdateWorldState(ZM_MAP_ALLIANCE_FLAG_NOT_READY,uint32(m_BothControllingFaction != ALLIANCE));
     m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_READY,uint32(m_BothControllingFaction == HORDE));
     m_PvP->SendUpdateWorldState(ZM_MAP_HORDE_FLAG_NOT_READY,uint32(m_BothControllingFaction != HORDE));
 }
-
 void OPvPCapturePointZM_GraveYard::FillInitialWorldStates(WorldPacket &data)
 {
     data << ZM_MAP_GRAVEYARD_N  << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_N));
     data << ZM_MAP_GRAVEYARD_H  << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_H));
     data << ZM_MAP_GRAVEYARD_A  << uint32(bool(m_GraveYardState & ZM_GRAVEYARD_A));
-
     data << ZM_MAP_ALLIANCE_FLAG_READY  << uint32(m_BothControllingFaction == ALLIANCE);
     data << ZM_MAP_ALLIANCE_FLAG_NOT_READY  << uint32(m_BothControllingFaction != ALLIANCE);
     data << ZM_MAP_HORDE_FLAG_READY  << uint32(m_BothControllingFaction == HORDE);
     data << ZM_MAP_HORDE_FLAG_NOT_READY  << uint32(m_BothControllingFaction != HORDE);
 }
-
 void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
 {
     // nothing to do here
     if(m_BothControllingFaction == controlling_faction)
         return;
     m_BothControllingFaction = controlling_faction;
-
     switch(controlling_faction)
     {
     case ALLIANCE:
@@ -325,7 +295,6 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction)
     // send worldstateupdate
     UpdateTowerState();
 }
-
 bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipOption & gso)
 {
     uint64 guid = c->GetGUID();
@@ -345,7 +314,6 @@ bool OPvPCapturePointZM_GraveYard::CanTalkTo(Player * plr, Creature * c, GossipO
     }
     return false;
 }
-
 bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid, uint32 gossipid)
 {
     std::map<uint64,uint32>::iterator itr = m_CreatureTypes.find(guid);
@@ -373,7 +341,6 @@ bool OPvPCapturePointZM_GraveYard::HandleGossipOption(Player *plr, uint64 guid,
     }
     return false;
 }
-
 bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * plr, uint32 spellId)
 {
     switch(spellId)
@@ -387,7 +354,6 @@ bool OPvPCapturePointZM_GraveYard::HandleDropFlag(Player * plr, uint32 spellId)
     }
     return false;
 }
-
 void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data)
 {
     data << ZM_WORLDSTATE_UNK_1 << uint32(1);
@@ -396,7 +362,6 @@ void OutdoorPvPZM::FillInitialWorldStates(WorldPacket &data)
         itr->second->FillInitialWorldStates(data);
     }
 }
-
 void OutdoorPvPZM::SendRemoveWorldStates(Player *plr)
 {
     plr->SendUpdateWorldState(ZM_UI_TOWER_SLIDER_N_W,0);
diff --git a/src/game/OutdoorPvPZM.h b/src/game/OutdoorPvPZM.h
index fc2c48f4eec..374e42bc7a7 100644
--- a/src/game/OutdoorPvPZM.h
+++ b/src/game/OutdoorPvPZM.h
@@ -15,13 +15,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef OUTDOOR_PVP_ZM_
 #define OUTDOOR_PVP_ZM_
-
 #include "OutdoorPvPImpl.h"
 #include "Language.h"
-
 const uint32 OutdoorPvPZMBuffZonesNum = 5;
 // the buff is cast in these zones
 const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3715,3716};
@@ -29,7 +26,6 @@ const uint32 OutdoorPvPZMBuffZones[OutdoorPvPZMBuffZonesNum] = {3521,3607,3717,3
 const uint32 ZM_GRAVEYARD_ZONE = 3521;
 // linked when the central tower is controlled
 const uint32 ZM_GRAVEYARD_ID = 969;
-
 enum OutdoorPvPZMSpells
 {
     // cast on the players of the controlling faction
@@ -43,23 +39,19 @@ enum OutdoorPvPZMSpells
     // token create spell
     ZM_HordePlayerKillReward = 32158
 };
-
 // banners 182527, 182528, 182529, gotta check them ingame
 const go_type ZM_Banner_A = { 182527,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
 const go_type ZM_Banner_H = { 182528,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
 const go_type ZM_Banner_N = { 182529,530,253.54,7083.81,36.7728,-0.017453,0,0,0.008727,-0.999962 };
-
 // horde field scout spawn data
 const creature_type ZM_HordeFieldScout = {18564,67,530,296.625,7818.4,42.6294,5.18363};
 // alliance field scout spawn data
 const creature_type ZM_AllianceFieldScout = {18581,469,530,374.395,6230.08,22.8351,0.593412};
-
 enum ZMCreatureTypes{
     ZM_ALLIANCE_FIELD_SCOUT = 0,
     ZM_HORDE_FIELD_SCOUT,
     ZM_CREATURE_NUM
 };
-
 struct zm_beacon {
     uint32 slider_disp;
     uint32 slider_n;
@@ -73,62 +65,50 @@ struct zm_beacon {
     uint32 event_enter;
     uint32 event_leave;
 };
-
 enum ZM_BeaconType{
     ZM_BEACON_EAST = 0,
     ZM_BEACON_WEST,
     ZM_NUM_BEACONS
 };
-
 const zm_beacon ZMBeaconInfo[ZM_NUM_BEACONS] = {
     {2533,2535,2534,2560,2559,2558,2652,2651,2650,11807,11806},
     {2527,2529,2528,2557,2556,2555,2646,2645,2644,11805,11804}
 };
-
 const uint32 ZMBeaconCaptureA[ZM_NUM_BEACONS] = {
     LANG_OPVP_ZM_CAPTURE_EAST_A,
     LANG_OPVP_ZM_CAPTURE_WEST_A
 };
-
 const uint32 ZMBeaconCaptureH[ZM_NUM_BEACONS] = {
     LANG_OPVP_ZM_CAPTURE_EAST_H,
     LANG_OPVP_ZM_CAPTURE_WEST_H
 };
-
 const uint32 ZMBeaconLooseA[ZM_NUM_BEACONS] = {
     LANG_OPVP_ZM_LOOSE_EAST_A,
     LANG_OPVP_ZM_LOOSE_WEST_A
 };
-
 const uint32 ZMBeaconLooseH[ZM_NUM_BEACONS] = {
     LANG_OPVP_ZM_LOOSE_EAST_H,
     LANG_OPVP_ZM_LOOSE_WEST_H
 };
-
 const go_type ZMCapturePoints[ZM_NUM_BEACONS] = {
     {182523,530,303.243,6841.36,40.1245,-1.58825,0,0,0.71325,-0.700909},
     {182522,530,336.466,7340.26,41.4984,-1.58825,0,0,0.71325,-0.700909}
 };
-
 enum OutdoorPvPZMWorldStates
 {
     ZM_UI_TOWER_SLIDER_N_W = 2529,
     ZM_UI_TOWER_SLIDER_POS_W = 2528,
     ZM_UI_TOWER_SLIDER_DISPLAY_W = 2527,
-
     ZM_UI_TOWER_SLIDER_N_E = 2535,
     ZM_UI_TOWER_SLIDER_POS_E = 2534,
     ZM_UI_TOWER_SLIDER_DISPLAY_E = 2533,
-
     ZM_WORLDSTATE_UNK_1 = 2653,
-
     ZM_UI_TOWER_EAST_N = 2560,
     ZM_UI_TOWER_EAST_H = 2559,
     ZM_UI_TOWER_EAST_A = 2558,
     ZM_UI_TOWER_WEST_N = 2557,
     ZM_UI_TOWER_WEST_H = 2556,
     ZM_UI_TOWER_WEST_A = 2555,
-
     ZM_MAP_TOWER_EAST_N = 2652,
     ZM_MAP_TOWER_EAST_H = 2651,
     ZM_MAP_TOWER_EAST_A = 2650,
@@ -138,19 +118,16 @@ enum OutdoorPvPZMWorldStates
     ZM_MAP_TOWER_WEST_N = 2646,
     ZM_MAP_TOWER_WEST_H = 2645,
     ZM_MAP_TOWER_WEST_A = 2644,
-
     ZM_MAP_HORDE_FLAG_READY = 2658,
     ZM_MAP_HORDE_FLAG_NOT_READY = 2657,
     ZM_MAP_ALLIANCE_FLAG_NOT_READY = 2656,
     ZM_MAP_ALLIANCE_FLAG_READY = 2655
 };
-
 enum ZM_TowerStateMask{
     ZM_TOWERSTATE_N = 1,
     ZM_TOWERSTATE_A = 2,
     ZM_TOWERSTATE_H = 4
 };
-
 class OutdoorPvPZM;
 class OPvPCapturePointZM_Beacon : public OPvPCapturePoint
 {
@@ -168,13 +145,11 @@ protected:
     ZM_BeaconType m_TowerType;
     uint32 m_TowerState;
 };
-
 enum ZM_GraveYardState{
     ZM_GRAVEYARD_N = 1,
     ZM_GRAVEYARD_A = 2,
     ZM_GRAVEYARD_H = 4
 };
-
 class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint
 {
 friend class OutdoorPvPZM;
@@ -195,7 +170,6 @@ protected:
     uint32 m_BothControllingFaction;
     uint64 m_FlagCarrierGUID;
 };
-
 class OutdoorPvPZM : public OutdoorPvP
 {
 friend class OPvPCapturePointZM_Beacon;
@@ -213,7 +187,6 @@ private:
     uint32 m_AllianceTowersControlled;
     uint32 m_HordeTowersControlled;
 };
-
 // todo: flag carrier death/leave/mount/activitychange should give back the gossip options
 #endif
 
diff --git a/src/game/PassiveAI.h b/src/game/PassiveAI.h
index 19ea9938320..4ca0ecb875f 100644
--- a/src/game/PassiveAI.h
+++ b/src/game/PassiveAI.h
@@ -17,70 +17,54 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_PASSIVEAI_H
 #define TRINITY_PASSIVEAI_H
-
 #include "CreatureAI.h"
 //#include "CreatureAIImpl.h"
-
 class TRINITY_DLL_SPEC PassiveAI : public CreatureAI
 {
     public:
         explicit PassiveAI(Creature *c);
-
         void MoveInLineOfSight(Unit *) {}
         void AttackStart(Unit *) {}
         void UpdateAI(const uint32);
-
         static int Permissible(const Creature *) { return PERMIT_BASE_IDLE;  }
 };
-
 class TRINITY_DLL_DECL PossessedAI : public CreatureAI
 {
     public:
         explicit PossessedAI(Creature *c);
-
         void MoveInLineOfSight(Unit *) {}
         void AttackStart(Unit *target);
         void UpdateAI(const uint32);
         void EnterEvadeMode() {}
-
         void JustDied(Unit*);
         void KilledUnit(Unit* victim);
-
         static int Permissible(const Creature *) { return PERMIT_BASE_IDLE;  }
 };
-
 class TRINITY_DLL_SPEC NullCreatureAI : public CreatureAI
 {
     public:
         explicit NullCreatureAI(Creature *c);
-
         void MoveInLineOfSight(Unit *) {}
         void AttackStart(Unit *) {}
         void UpdateAI(const uint32) {}
         void EnterEvadeMode() {}
         void OnCharmed(bool apply) {}
-
         static int Permissible(const Creature *) { return PERMIT_BASE_IDLE;  }
 };
-
 class TRINITY_DLL_DECL CritterAI : public PassiveAI
 {
     public:
         explicit CritterAI(Creature *c) : PassiveAI(c) {}
-
         void DamageTaken(Unit *done_by, uint32 & /*damage*/);
         void EnterEvadeMode();
 };
-
 class TRINITY_DLL_SPEC TriggerAI : public NullCreatureAI
 {
     public:
         explicit TriggerAI(Creature *c) : NullCreatureAI(c) {}
         void IsSummonedBy(Unit *summoner);
 };
-
 #endif
 
diff --git a/src/game/Path.h b/src/game/Path.h
index 2fd6723b01c..8024a03382b 100644
--- a/src/game/Path.h
+++ b/src/game/Path.h
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_PATH_H
 #define TRINITYCORE_PATH_H
-
 #include "Common.h"
 #include <vector>
-
 class Path
 {
     public:
@@ -31,12 +28,10 @@ class Path
         {
             float x,y,z;
         };
-
         void SetLength(const unsigned int sz)
         {
             i_nodes.resize( sz );
         }
-
         unsigned int Size() const { return i_nodes.size(); }
         bool Empty() const { return i_nodes.empty(); }
         void Resize(unsigned int sz) { i_nodes.resize(sz); }
@@ -55,7 +50,6 @@ class Path
             }
             return len;
         }
-
         float GetPassedLength(uint32 curnode, float x, float y, float z)
         {
             float len = 0, xd, yd, zd;
@@ -66,7 +60,6 @@ class Path
                 zd = i_nodes[ idx ].z - i_nodes[ idx-1 ].z;
                 len += sqrtf( xd*xd + yd*yd + zd*zd );
             }
-
             if(curnode > 0)
             {
                 xd = x - i_nodes[curnode-1].x;
@@ -74,13 +67,10 @@ class Path
                 zd = z - i_nodes[curnode-1].z;
                 len += sqrtf( xd*xd + yd*yd + zd*zd );
             }
-
             return len;
         }
-
         PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; }
         const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; }
-
     protected:
         std::vector<PathNode> i_nodes;
 };
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 47d406f6453..29d9ffc34c8 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
@@ -30,7 +29,6 @@
 #include "CreatureAI.h"
 #include "Unit.h"
 #include "Util.h"
-
 char const* petTypeSuffix[MAX_PET_TYPE] =
 {
     "'s Minion",                                            // SUMMON_PET
@@ -38,9 +36,7 @@ char const* petTypeSuffix[MAX_PET_TYPE] =
     "'s Guardian",                                          // GUARDIAN_PET
     "'s Companion"                                          // MINI_PET
 };
-
 #define PET_XP_FACTOR 0.1f
-
 Pet::Pet(Player *owner, PetType type) : Guardian(NULL, owner),
 m_petType(type), m_removed(false), m_happinessTimer(7500), m_duration(0),
 m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0), m_auraRaidUpdateMask(0), m_loading(false),
@@ -49,24 +45,19 @@ m_declinedname(NULL), m_owner(owner)
     m_unitTypeMask |= UNIT_MASK_PET;
     if(type == HUNTER_PET)
         m_unitTypeMask |= UNIT_MASK_HUNTER_PET;
-
     if (!(m_unitTypeMask & UNIT_MASK_CONTROLABLE_GUARDIAN))
     {
         m_unitTypeMask |= UNIT_MASK_CONTROLABLE_GUARDIAN;
         InitCharmInfo();
     }
-
     m_name = "Pet";
     m_regenTimer = 4000;
-
     m_isWorldObject = true;
 }
-
 Pet::~Pet()
 {
     delete m_declinedname;
 }
-
 void Pet::AddToWorld()
 {
     ///- Register the pet for guid lookup
@@ -77,7 +68,6 @@ void Pet::AddToWorld()
         Unit::AddToWorld();
         AIM_Initialize();
     }
-
     // Prevent stuck pets when zoning. Pets default to "follow" when added to world
     // so we'll reset flags and let the AI handle things
     if (this->GetCharmInfo() && this->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
@@ -87,9 +77,7 @@ void Pet::AddToWorld()
         this->GetCharmInfo()->SetIsFollowing(false);
         this->GetCharmInfo()->SetIsReturning(false);
     }
-
 }
-
 void Pet::RemoveFromWorld()
 {
     ///- Remove the pet from the accessor
@@ -100,15 +88,11 @@ void Pet::RemoveFromWorld()
         ObjectAccessor::Instance().RemoveObject(this);
     }
 }
-
 bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool current )
 {
     m_loading = true;
-
     uint32 ownerid = owner->GetGUIDLow();
-
     QueryResult *result;
-
     if (petnumber)
         // known petnumber entry                  0   1      2(?)   3        4      5    6           7     8     9        10         11       12            13      14        15                 16                 17              18
         result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
@@ -131,12 +115,9 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, slot, name, renamed, curhealth, curmana, curhappiness, abdata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType "
             "FROM character_pet WHERE owner = '%u' AND (slot = '%u' OR slot > '%u') ",
             ownerid,PET_SAVE_AS_CURRENT,PET_SAVE_LAST_STABLE_SLOT);
-
     if(!result)
         return false;
-
     Field *fields = result->Fetch();
-
     // update for case of current pet "slot = 0"
     petentry = fields[1].GetUInt32();
     if (!petentry)
@@ -144,19 +125,15 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         delete result;
         return false;
     }
-
     uint32 summon_spell_id = fields[17].GetUInt32();
     SpellEntry const* spellInfo = sSpellStore.LookupEntry(summon_spell_id);
-
     bool is_temporary_summoned = spellInfo && GetSpellDuration(spellInfo) > 0;
-
     // check temporary summoned pets like mage water elemental
     if (current && is_temporary_summoned)
     {
         delete result;
         return false;
     }
-
     PetType pet_type = PetType(fields[18].GetUInt8());
     if(pet_type==HUNTER_PET)
     {
@@ -167,16 +144,13 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
             return false;
         }
     }
-
     uint32 pet_number = fields[0].GetUInt32();
-
     if (current && owner->IsPetNeedBeTemporaryUnsummoned())
     {
         owner->SetTemporaryUnsummonedPetNumber(pet_number);
         delete result;
         return false;
     }
-
     Map *map = owner->GetMap();
     uint32 guid = objmgr.GenerateLowGuid(HIGHGUID_PET);
     if (!Create(guid, map, owner->GetPhaseMask(), petentry, pet_number))
@@ -184,11 +158,9 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         delete result;
         return false;
     }
-
     float px, py, pz;
     owner->GetClosePoint(px, py, pz, GetObjectSize(), PET_FOLLOW_DIST, GetFollowAngle());
     Relocate(px, py, pz, owner->GetOrientation());
-
     if (!IsPositionValid())
     {
         sLog.outError("Pet (guidlow %d, entry %d) not loaded. Suggested coordinates isn't valid (X: %f Y: %f)",
@@ -196,11 +168,9 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         delete result;
         return false;
     }
-
     setPetType(pet_type);
     setFaction(owner->getFaction());
     SetUInt32Value(UNIT_CREATED_BY_SPELL, summon_spell_id);
-
     CreatureInfo const *cinfo = GetCreatureInfo();
     if (cinfo->type == CREATURE_TYPE_CRITTER)
     {
@@ -208,20 +178,16 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         delete result;
         return true;
     }
-
     m_charmInfo->SetPetNumber(pet_number, IsPermanentPetFor(owner));
-
     SetDisplayId(fields[3].GetUInt32());
     SetNativeDisplayId(fields[3].GetUInt32());
     uint32 petlevel = fields[4].GetUInt32();
     SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
     SetName(fields[8].GetString());
-
     switch (getPetType())
     {
         case SUMMON_PET:
             petlevel=owner->getLevel();
-
             SetUInt32Value(UNIT_FIELD_BYTES_0, 0x800); //class=mage
             SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
                                                             // this enables popup window (pet dismiss, cancel)
@@ -230,7 +196,6 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
             SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100); //class=warrior,gender=none,power=focus
             SetSheath(SHEATH_STATE_MELEE);
             SetByteValue(UNIT_FIELD_BYTES_2, 2, fields[9].GetBool() ? UNIT_RENAME_NOT_ALLOWED : UNIT_RENAME_ALLOWED);
-
             SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
                                                             // this enables popup window (pet abandon, cancel)
             SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
@@ -242,16 +207,12 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
                 sLog.outError("Pet have incorrect type (%u) for pet loading.", getPetType());
             break;
     }
-
     SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
     SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, fields[5].GetUInt32());
     SetCreatorGUID(owner->GetGUID());
-
     SetReactState( ReactStates( fields[6].GetUInt8() ));
-
     SetCanModifyStats(true);
     InitStatsForLevel(petlevel);
-
     if(getPetType() == SUMMON_PET && !current)              //all (?) summon pets come with full health when called, but not when they are current
     {
         SetHealth(GetMaxHealth());
@@ -264,7 +225,6 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         SetHealth(savedhealth > GetMaxHealth() ? GetMaxHealth() : savedhealth);
         SetPower(POWER_MANA, savedmana > GetMaxPower(POWER_MANA) ? GetMaxPower(POWER_MANA) : savedmana);
     }
-
     // set current pet as current
     // 0=current
     // 1..MAX_PET_STABLES in stable slot
@@ -278,7 +238,6 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
             PET_SAVE_AS_CURRENT, ownerid, m_charmInfo->GetPetNumber());
         CharacterDatabase.CommitTransaction();
     }
-
     // Send fake summon spell cast - this is needed for correct cooldown application for spells
     // Example: 46584 - without this cooldown (which should be set always when pet is loaded) isn't set clientside
     // TODO: pets should be summoned from real cast instead of just faking it?
@@ -293,50 +252,37 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
         data << uint32(0);
         SendMessageToSet(&data, true);
     }
-
     owner->SetMinion(this, true);
     map->Add((Creature*)this);
-
     m_resetTalentsCost = fields[15].GetUInt32();
     m_resetTalentsTime = fields[16].GetUInt64();
     InitTalentForLevel();                                   // set original talents points before spell loading
-
     uint32 timediff = (time(NULL) - fields[14].GetUInt32());
     _LoadAuras(timediff);
-
     // load action bar, if data broken will fill later by default spells.
     if (!is_temporary_summoned)
     {
         m_charmInfo->LoadPetActionBar(fields[13].GetCppString());
-
         _LoadSpells();
         _LoadSpellCooldowns();
         LearnPetPassives();
         InitLevelupSpellsForLevel();
         CastPetAuras(current);
     }
-
     CleanupActionBar();                                     // remove unknown spells from action bar after load
-
     delete result;
     sLog.outDebug("New Pet has guid %u", GetGUIDLow());
-
     owner->PetSpellInitialize();
-
     if(owner->GetGroup())
         owner->SetGroupUpdateFlag(GROUP_UPDATE_PET);
-
     owner->SendTalentsInfoData(true);
-
     if(getPetType() == HUNTER_PET)
     {
         result = CharacterDatabase.PQuery("SELECT genitive, dative, accusative, instrumental, prepositional FROM character_pet_declinedname WHERE owner = '%u' AND id = '%u'", owner->GetGUIDLow(), GetCharmInfo()->GetPetNumber());
-
         if(result)
         {
             if(m_declinedname)
                 delete m_declinedname;
-
             m_declinedname = new DeclinedName;
             Field *fields2 = result->Fetch();
             for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
@@ -345,34 +291,26 @@ bool Pet::LoadPetFromDB( Player* owner, uint32 petentry, uint32 petnumber, bool
             }
         }
     }
-
 	//set last used pet number (for use in BG's)
     if(owner->GetTypeId() == TYPEID_PLAYER && isControlled() && !isTemporarySummoned() && (getPetType() == SUMMON_PET || getPetType() == HUNTER_PET))
 		((Player*)owner)->SetLastPetNumber(pet_number);
-
     m_loading = false;
-
     SynchronizeLevelWithOwner();
     return true;
 }
-
 void Pet::SavePetToDB(PetSaveMode mode)
 {
     if (!GetEntry())
         return;
-
     // save only fully controlled creature
     if (!isControlled())
         return;
-
     // not save not player pets
     if(!IS_PLAYER_GUID(GetOwnerGUID()))
         return;
-
     Player* pOwner = (Player*)GetOwner();
     if (!pOwner)
         return;
-
     // not save pet as current if another pet temporary unsummoned
     if (mode == PET_SAVE_AS_CURRENT && pOwner->GetTemporaryUnsummonedPetNumber() &&
         pOwner->GetTemporaryUnsummonedPetNumber() != m_charmInfo->GetPetNumber())
@@ -380,24 +318,19 @@ void Pet::SavePetToDB(PetSaveMode mode)
         // pet will lost anyway at restore temporary unsummoned
         if(getPetType()==HUNTER_PET)
             return;
-
         // for warlock case
         mode = PET_SAVE_NOT_IN_SLOT;
     }
-
     uint32 curhealth = GetHealth();
     uint32 curmana = GetPower(POWER_MANA);
-
     // stable and not in slot saves
     if(mode > PET_SAVE_AS_CURRENT)
     {
         RemoveAllAuras();
     }
-
     _SaveSpells();
     _SaveSpellCooldowns();
     _SaveAuras();
-
     // current/stable/not_in_slot
     if(mode >= PET_SAVE_AS_CURRENT)
     {
@@ -407,12 +340,10 @@ void Pet::SavePetToDB(PetSaveMode mode)
         CharacterDatabase.BeginTransaction();
         // remove current data
         CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u' AND id = '%u'", owner,m_charmInfo->GetPetNumber() );
-
         // prevent duplicate using slot (except PET_SAVE_NOT_IN_SLOT)
         if(mode <= PET_SAVE_LAST_STABLE_SLOT)
             CharacterDatabase.PExecute("UPDATE character_pet SET slot = '%u' WHERE owner = '%u' AND slot = '%u'",
                 PET_SAVE_NOT_IN_SLOT, owner, uint32(mode) );
-
         // prevent existence another hunter pet in PET_SAVE_AS_CURRENT and PET_SAVE_NOT_IN_SLOT
         if(getPetType()==HUNTER_PET && (mode==PET_SAVE_AS_CURRENT||mode > PET_SAVE_LAST_STABLE_SLOT))
             CharacterDatabase.PExecute("DELETE FROM character_pet WHERE owner = '%u' AND (slot = '%u' OR slot > '%u')",
@@ -434,21 +365,18 @@ void Pet::SavePetToDB(PetSaveMode mode)
             << (curhealth<1?1:curhealth) << ", "
             << curmana << ", "
             << GetPower(POWER_HAPPINESS) << ", '";
-
         // save only spell slots from action bar
         for(uint32 i = ACTION_BAR_INDEX_PET_SPELL_START; i < ACTION_BAR_INDEX_PET_SPELL_END; ++i)
         {
             ss << uint32(m_charmInfo->GetActionBarEntry(i)->GetType()) << " "
                << uint32(m_charmInfo->GetActionBarEntry(i)->GetAction()) << " ";
         };
-
         ss  << "', "
             << time(NULL) << ", "
             << uint32(m_resetTalentsCost) << ", "
             << uint64(m_resetTalentsTime) << ", "
             << GetUInt32Value(UNIT_CREATED_BY_SPELL) << ", "
             << uint32(getPetType()) << ")";
-
         CharacterDatabase.Execute( ss.str().c_str() );
         CharacterDatabase.CommitTransaction();
     }
@@ -459,7 +387,6 @@ void Pet::SavePetToDB(PetSaveMode mode)
         DeleteFromDB(m_charmInfo->GetPetNumber());
     }
 }
-
 void Pet::DeleteFromDB(uint32 guidlow)
 {
     CharacterDatabase.PExecute("DELETE FROM character_pet WHERE id = '%u'", guidlow);
@@ -468,7 +395,6 @@ void Pet::DeleteFromDB(uint32 guidlow)
     CharacterDatabase.PExecute("DELETE FROM pet_spell WHERE guid = '%u'", guidlow);
     CharacterDatabase.PExecute("DELETE FROM pet_spell_cooldown WHERE guid = '%u'", guidlow);
 }
-
 void Pet::setDeathState(DeathState s)                       // overwrite virtual Creature::setDeathState and Unit::setDeathState
 {
     Creature::setDeathState(s);
@@ -479,12 +405,10 @@ void Pet::setDeathState(DeathState s)                       // overwrite virtual
             // pet corpse non lootable and non skinnable
             SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 );
             RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
-
              //lose happiness when died and not in BG/Arena
             MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());
             if(!mapEntry || (mapEntry->map_type != MAP_ARENA && mapEntry->map_type != MAP_BATTLEGROUND))
                 ModifyPower(POWER_HAPPINESS, -HAPPINESS_LEVEL_SIZE);
-
             //SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
         }
     }
@@ -494,12 +418,10 @@ void Pet::setDeathState(DeathState s)                       // overwrite virtual
         CastPetAuras(true);
     }
 }
-
 void Pet::Update(uint32 diff)
 {
     if(m_removed)                                           // pet already removed, just wait in remove queue, no updates
         return;
-
     switch( m_deathState )
     {
         case CORPSE:
@@ -521,7 +443,6 @@ void Pet::Update(uint32 diff)
                 Remove(PET_SAVE_NOT_IN_SLOT, true);
                 return;
             }
-
             if(isControlled())
             {
                 if( owner->GetPetGUID() != GetGUID() )
@@ -531,7 +452,6 @@ void Pet::Update(uint32 diff)
                     return;
                 }
             }
-
             if(m_duration > 0)
             {
                 if(m_duration > diff)
@@ -542,7 +462,6 @@ void Pet::Update(uint32 diff)
                     return;
                 }
             }
-
             //regenerate focus for hunter pets or energy for deathknight's ghoul
             if(m_regenTimer)
             {
@@ -567,12 +486,10 @@ void Pet::Update(uint32 diff)
                             m_regenTimer = 0;
                             break;
                     }
-                }                   
+                }
             }
-
             if(getPetType() != HUNTER_PET)
                 break;
-
             if(m_happinessTimer <= diff)
             {
                 LooseHappiness();
@@ -580,7 +497,6 @@ void Pet::Update(uint32 diff)
             }
             else
                 m_happinessTimer -= diff;
-
             break;
         }
         default:
@@ -588,17 +504,13 @@ void Pet::Update(uint32 diff)
     }
     Creature::Update(diff);
 }
-
 void Creature::Regenerate(Powers power)
 {
     uint32 curValue = GetPower(power);
     uint32 maxValue = GetMaxPower(power);
-
     if (curValue >= maxValue)
         return;
-
     float addvalue = 0.0f;
-
     switch (power)
     {
         case POWER_FOCUS:
@@ -616,16 +528,13 @@ void Creature::Regenerate(Powers power)
         default:
             return;
     }
-
     // Apply modifiers (if any).
     AuraEffectList const& ModPowerRegenPCTAuras = GetAurasByType(SPELL_AURA_MOD_POWER_REGEN_PERCENT);
     for(AuraEffectList::const_iterator i = ModPowerRegenPCTAuras.begin(); i != ModPowerRegenPCTAuras.end(); ++i)
         if ((*i)->GetMiscValue() == power)
             addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
-
     ModifyPower(power, (int32)addvalue);
 }
-
 void Pet::LooseHappiness()
 {
     uint32 curValue = GetPower(POWER_HAPPINESS);
@@ -636,7 +545,6 @@ void Pet::LooseHappiness()
         addvalue = int32(addvalue * 1.5);
     ModifyPower(POWER_HAPPINESS, -addvalue);
 }
-
 HappinessState Pet::GetHappinessState()
 {
     if(GetPower(POWER_HAPPINESS) < HAPPINESS_LEVEL_SIZE)
@@ -646,35 +554,26 @@ HappinessState Pet::GetHappinessState()
     else
         return CONTENT;
 }
-
 bool Pet::CanTakeMoreActiveSpells(uint32 spellid)
 {
     uint8  activecount = 1;
     uint32 chainstartstore[ACTIVE_SPELLS_MAX];
-
     if(IsPassiveSpell(spellid))
         return true;
-
     chainstartstore[0] = spellmgr.GetFirstSpellInChain(spellid);
-
     for (PetSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
     {
         if(itr->second.state == PETSPELL_REMOVED)
             continue;
-
         if(IsPassiveSpell(itr->first))
             continue;
-
         uint32 chainstart = spellmgr.GetFirstSpellInChain(itr->first);
-
         uint8 x;
-
         for(x = 0; x < activecount; x++)
         {
             if(chainstart == chainstartstore[x])
                 break;
         }
-
         if(x == activecount)                                //spellchain not yet saved -> add active count
         {
             ++activecount;
@@ -685,63 +584,48 @@ bool Pet::CanTakeMoreActiveSpells(uint32 spellid)
     }
     return true;
 }
-
 void Pet::Remove(PetSaveMode mode, bool returnreagent)
 {
     m_owner->RemovePet(this,mode,returnreagent);
 }
-
 void Pet::GivePetXP(uint32 xp)
 {
     if(getPetType() != HUNTER_PET)
         return;
-
     if ( xp < 1 )
         return;
-
     if(!isAlive())
         return;
-
     uint32 level = getLevel();
-
     // XP to money conversion processed in Player::RewardQuest
     if(level >= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         return;
-
     uint32 curXP = GetUInt32Value(UNIT_FIELD_PETEXPERIENCE);
     uint32 nextLvlXP = GetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP);
     uint32 newXP = curXP + xp;
-
     if(newXP >= nextLvlXP && level+1 > GetOwner()->getLevel())
     {
         SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, nextLvlXP-1);
         return;
     }
-
     while( newXP >= nextLvlXP && level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) )
     {
         newXP -= nextLvlXP;
-
         GivePetLevel(level+1);
         SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, objmgr.GetXPForLevel(level+1)*PET_XP_FACTOR);
-
         level = getLevel();
         nextLvlXP = GetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP);
     }
-
     SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, newXP);
 }
-
 void Pet::GivePetLevel(uint32 level)
 {
     if(!level)
         return;
-
     InitStatsForLevel(level);
     InitLevelupSpellsForLevel();
     InitTalentForLevel();
 }
-
 bool Pet::CreateBaseAtCreature(Creature* creature)
 {
     if(!creature)
@@ -750,28 +634,23 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
         return false;
     }
     uint32 guid=objmgr.GenerateLowGuid(HIGHGUID_PET);
-
     sLog.outDebug("Create pet");
     uint32 pet_number = objmgr.GeneratePetNumber();
     if(!Create(guid, creature->GetMap(), creature->GetPhaseMask(), creature->GetEntry(), pet_number))
         return false;
-
     Relocate(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), creature->GetOrientation());
-
     if(!IsPositionValid())
     {
         sLog.outError("Pet (guidlow %d, entry %d) not created base at creature. Suggested coordinates isn't valid (X: %f Y: %f)",
             GetGUIDLow(), GetEntry(), GetPositionX(), GetPositionY());
         return false;
     }
-
     CreatureInfo const *cinfo = GetCreatureInfo();
     if(!cinfo)
     {
         sLog.outError("CreateBaseAtCreature() failed, creatureInfo is missing!");
         return false;
     }
-
     SetDisplayId(creature->GetDisplayId());
     SetNativeDisplayId(creature->GetNativeDisplayId());
     SetMaxPower(POWER_HAPPINESS, GetCreatePowers(POWER_HAPPINESS));
@@ -781,12 +660,10 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
     SetUInt32Value(UNIT_FIELD_PETEXPERIENCE, 0);
     SetUInt32Value(UNIT_FIELD_PETNEXTLEVELEXP, objmgr.GetXPForLevel(creature->getLevel())*PET_XP_FACTOR);
     SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-
     if(CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family))
         SetName(cFamily->Name[sWorld.GetDefaultDbcLocale()]);
     else
         SetName(creature->GetNameForLocaleIdx(objmgr.GetDBCLocaleIndex()));
-
     if(cinfo->type == CREATURE_TYPE_BEAST)
     {
         SetUInt32Value(UNIT_FIELD_BYTES_0, 0x02020100);
@@ -796,15 +673,12 @@ bool Pet::CreateBaseAtCreature(Creature* creature)
     }
     return true;
 }
-
 // TODO: Move stat mods code to pet passive auras
 bool Guardian::InitStatsForLevel(uint32 petlevel)
 {
     CreatureInfo const *cinfo = GetCreatureInfo();
     assert(cinfo);
-
     SetLevel(petlevel);
-
     //Determine pet type
     PetType petType = MAX_PET_TYPE;
     if(isPet() && m_owner->GetTypeId() == TYPEID_PLAYER)
@@ -819,19 +693,13 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
         else
             sLog.outError("Unknown type pet %u is summoned by player class %u", GetEntry(), m_owner->getClass());
     }
-
     uint32 creature_ID = (petType == HUNTER_PET) ? 1 : cinfo->Entry;
-
     SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool));
-
     SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(petlevel*50));
-
     SetAttackTime(BASE_ATTACK, BASE_ATTACK_TIME);
     SetAttackTime(OFF_ATTACK, BASE_ATTACK_TIME);
     SetAttackTime(RANGED_ATTACK, BASE_ATTACK_TIME);
-
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0);
-
     //scale
     CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cinfo->family);
     if(cFamily && cFamily->minScale > 0.0f && petType==HUNTER_PET)
@@ -843,10 +711,8 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
             scale = cFamily->minScale;
         else
             scale = cFamily->minScale + float(getLevel() - cFamily->minScaleLevel) / cFamily->maxScaleLevel * (cFamily->maxScale - cFamily->minScale);
-
         SetFloatValue(OBJECT_FIELD_SCALE_X, scale);
     }
-
     //resistance
     int32 createResistance[MAX_SPELL_SCHOOL] = {0,0,0,0,0,0,0};
     if(cinfo && petType != HUNTER_PET)
@@ -860,7 +726,6 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
     }
     for (uint8 i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
         SetModifierValue(UnitMods(UNIT_MOD_RESISTANCE_START + i), BASE_VALUE, float(createResistance[i]));
-
     //health, mana, armor and resistance
     PetLevelInfo const* pInfo = objmgr.GetPetLevelInfo(creature_ID, petlevel);
     if(pInfo)                                       // exist in DB
@@ -868,10 +733,8 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
         SetCreateHealth(pInfo->health);
         if(petType != HUNTER_PET) //hunter pet use focus
             SetCreateMana(pInfo->mana);
-
         if(pInfo->armor > 0)
             SetModifierValue(UNIT_MOD_ARMOR, BASE_VALUE, float(pInfo->armor));
-
         for(uint8 stat = 0; stat < MAX_STATS; ++stat)
             SetCreateStat(Stats(stat), float(pInfo->stats[stat]));
     }
@@ -880,14 +743,12 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
         // remove elite bonuses included in DB values
         //SetCreateHealth(uint32(((float(cinfo->maxhealth) / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel) );
         //SetCreateMana(  uint32(((float(cinfo->maxmana)   / cinfo->maxlevel) / (1 + 2 * cinfo->rank)) * petlevel) );
-
         SetCreateStat(STAT_STRENGTH, 22);
         SetCreateStat(STAT_AGILITY, 22);
         SetCreateStat(STAT_STAMINA, 25);
         SetCreateStat(STAT_INTELLECT, 28);
         SetCreateStat(STAT_SPIRIT, 27);
     }
-
     m_bonusdamage = 0;
     switch(petType)
     {
@@ -899,10 +760,8 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
             uint32 val  = (fire > shadow) ? fire : shadow;
             SetBonusDamage(int32 (val * 0.15f));
             //bonusAP += val * 0.57;
-
             SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - (petlevel / 4)) );
             SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4)) );
-
             //SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, float(cinfo->attackpower));
             break;
         }
@@ -996,32 +855,25 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
             break;
         }
     }
-
     UpdateAllStats();
-
     SetHealth(GetMaxHealth());
     SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
     return true;
 }
-
 bool Pet::HaveInDiet(ItemPrototype const* item) const
 {
     if (!item->FoodType)
         return false;
-
     CreatureInfo const* cInfo = GetCreatureInfo();
     if(!cInfo)
         return false;
-
     CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->family);
     if(!cFamily)
         return false;
-
     uint32 diet = cFamily->petFoodMask;
     uint32 FoodMask = 1 << (item->FoodType-1);
     return diet & FoodMask;
 }
-
 uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel)
 {
     // -5 or greater food level
@@ -1037,63 +889,47 @@ uint32 Pet::GetCurrentFoodBenefitLevel(uint32 itemlevel)
     else
         return 0;                                           //food too low level
 }
-
 void Pet::_LoadSpellCooldowns()
 {
     m_CreatureSpellCooldowns.clear();
     m_CreatureCategoryCooldowns.clear();
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT spell,time FROM pet_spell_cooldown WHERE guid = '%u'",m_charmInfo->GetPetNumber());
-
     if(result)
     {
         time_t curTime = time(NULL);
-
         WorldPacket data(SMSG_SPELL_COOLDOWN, (8+1+result->GetRowCount()*8));
         data << GetGUID();
         data << uint8(0x0);                                 // flags (0x1, 0x2)
-
         do
         {
             Field *fields = result->Fetch();
-
             uint32 spell_id = fields[0].GetUInt32();
             time_t db_time  = (time_t)fields[1].GetUInt64();
-
             if(!sSpellStore.LookupEntry(spell_id))
             {
                 sLog.outError("Pet %u have unknown spell %u in `pet_spell_cooldown`, skipping.",m_charmInfo->GetPetNumber(),spell_id);
                 continue;
             }
-
             // skip outdated cooldown
             if(db_time <= curTime)
                 continue;
-
             data << uint32(spell_id);
             data << uint32(uint32(db_time-curTime)*IN_MILISECONDS);
-
             _AddCreatureSpellCooldown(spell_id,db_time);
-
             sLog.outDebug("Pet (Number: %u) spell %u cooldown loaded (%u secs).", m_charmInfo->GetPetNumber(), spell_id, uint32(db_time-curTime));
         }
         while( result->NextRow() );
-
         delete result;
-
         if(!m_CreatureSpellCooldowns.empty() && GetOwner())
         {
             ((Player*)GetOwner())->GetSession()->SendPacket(&data);
         }
     }
 }
-
 void Pet::_SaveSpellCooldowns()
 {
     CharacterDatabase.PExecute("DELETE FROM pet_spell_cooldown WHERE guid = '%u'", m_charmInfo->GetPetNumber());
-
     time_t curTime = time(NULL);
-
     // remove oudated and save active
     for(CreatureSpellCooldowns::iterator itr = m_CreatureSpellCooldowns.begin();itr != m_CreatureSpellCooldowns.end();)
     {
@@ -1106,35 +942,28 @@ void Pet::_SaveSpellCooldowns()
         }
     }
 }
-
 void Pet::_LoadSpells()
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT spell,active FROM pet_spell WHERE guid = '%u'",m_charmInfo->GetPetNumber());
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             addSpell(fields[0].GetUInt32(), ActiveStates(fields[1].GetUInt8()), PETSPELL_UNCHANGED);
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Pet::_SaveSpells()
 {
     for (PetSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end(); itr = next)
     {
         ++next;
-
         // prevent saving family passives to DB
         if (itr->second.type == PETSPELL_FAMILY)
             continue;
-
         switch(itr->second.state)
         {
             case PETSPELL_REMOVED:
@@ -1151,17 +980,13 @@ void Pet::_SaveSpells()
             case PETSPELL_UNCHANGED:
                 continue;
         }
-
         itr->second.state = PETSPELL_UNCHANGED;
     }
 }
-
 void Pet::_LoadAuras(uint32 timediff)
 {
     sLog.outDebug("Loading auras for pet %u",GetGUIDLow());
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2 ,maxduration,remaintime,remaincharges FROM pet_aura WHERE guid = '%u'",m_charmInfo->GetPetNumber());
-
     if(result)
     {
         do
@@ -1178,23 +1003,19 @@ void Pet::_LoadAuras(uint32 timediff)
             int32 maxduration = (int32)fields[7].GetUInt32();
             int32 remaintime = (int32)fields[8].GetUInt32();
             int32 remaincharges = (int32)fields[9].GetUInt32();
-
             SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid);
             if(!spellproto)
             {
                 sLog.outError("Unknown aura (spellid %u), ignore.",spellid);
                 continue;
             }
-
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
                 if(remaintime  <= int32(timediff))
                     continue;
-
                 remaintime -= timediff;
             }
-
             // prevent wrong values of remaincharges
             if(spellproto->procCharges)
             {
@@ -1203,7 +1024,6 @@ void Pet::_LoadAuras(uint32 timediff)
             }
             else
                 remaincharges = 0;
-
             Aura* aura = new Aura(spellproto, effmask, this, this, this);
             aura->SetLoadedState(caster_guid,maxduration,remaintime,remaincharges, stackcount, &damage[0]);
             if(!aura->CanBeSaved())
@@ -1215,21 +1035,17 @@ void Pet::_LoadAuras(uint32 timediff)
             sLog.outDetail("Added aura spellid %u, effectmask %u", spellproto->Id, effmask);
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Pet::_SaveAuras()
 {
     CharacterDatabase.PExecute("DELETE FROM pet_aura WHERE guid = '%u'", m_charmInfo->GetPetNumber());
-
     AuraMap const& auras = GetAuras();
     for(AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr)
     {
         if(!itr->second->CanBeSaved())
             continue;
-
         int32 amounts[MAX_SPELL_EFFECTS];
         for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
         {
@@ -1238,7 +1054,6 @@ void Pet::_SaveAuras()
             else
                 amounts[i] = 0;
         }
-
         CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) "
             "VALUES ('%u', '" UI64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d', '%d', '%d', '%u')",
             m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(), itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
@@ -1246,7 +1061,6 @@ void Pet::_SaveAuras()
             ,itr->second->GetAuraMaxDuration(), itr->second->GetAuraDuration(), (uint32)itr->second->GetAuraCharges());
     }
 }
-
 bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpellState state /*= PETSPELL_NEW*/, PetSpellType type /*= PETSPELL_NORMAL*/)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
@@ -1260,10 +1074,8 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
         }
         else
             sLog.outError("Pet::addSpell: Non-existed in SpellStore spell #%u request.",spell_id);
-
         return false;
     }
-
     PetSpellMap::iterator itr = m_spells.find(spell_id);
     if (itr != m_spells.end())
     {
@@ -1276,24 +1088,19 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
         {
             // can be in case spell loading but learned at some previous spell loading
             itr->second.state = PETSPELL_UNCHANGED;
-
             if(active == ACT_ENABLED)
                 ToggleAutocast(spell_id, true);
             else if(active == ACT_DISABLED)
                 ToggleAutocast(spell_id, false);
-
             return false;
         }
         else
             return false;
     }
-
     uint32 oldspell_id = 0;
-
     PetSpell newspell;
     newspell.state = state;
     newspell.type = type;
-
     if(active == ACT_DECIDE)                                //active was not used before, so we save it's autocast/passive state here
     {
         if(IsAutocastableSpell(spell_id))
@@ -1303,7 +1110,6 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
     }
     else
         newspell.active = active;
-
     // talent: unlearn all other talent ranks (high and low)
     if(TalentSpellPos const* talentPos = GetTalentSpellPos(spell_id))
     {
@@ -1315,7 +1121,6 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
                 uint32 rankSpellId = talentInfo->RankID[i];
                 if(!rankSpellId || rankSpellId==spell_id)
                     continue;
-
                 // skip unknown ranks
                 if(!HasSpell(rankSpellId))
                     continue;
@@ -1328,17 +1133,14 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
         for (PetSpellMap::const_iterator itr2 = m_spells.begin(); itr2 != m_spells.end(); ++itr2)
         {
             if(itr2->second.state == PETSPELL_REMOVED) continue;
-
             if( spellmgr.IsRankSpellDueToSpell(spellInfo,itr2->first) )
             {
                 // replace by new high rank
                 if(spellmgr.IsHighRankOfSpell(spell_id,itr2->first))
                 {
                     newspell.active = itr2->second.active;
-
                     if(newspell.active == ACT_ENABLED)
                         ToggleAutocast(itr2->first, false);
-
                     oldspell_id = itr2->first;
                     unlearnSpell(itr2->first,false,false);
                     break;
@@ -1349,17 +1151,13 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
             }
         }
     }
-
     m_spells[spell_id] = newspell;
-
     if (IsPassiveSpell(spell_id))
         CastSpell(this, spell_id, true);
     else
         m_charmInfo->AddSpellToActionBar(spell_id);
-
     if(newspell.active == ACT_ENABLED)
         ToggleAutocast(spell_id, true);
-
     uint32 talentCost = GetTalentSpellCost(spell_id);
     if (talentCost)
     {
@@ -1371,13 +1169,11 @@ bool Pet::addSpell(uint32 spell_id,ActiveStates active /*= ACT_DECIDE*/, PetSpel
     }
     return true;
 }
-
 bool Pet::learnSpell(uint32 spell_id)
 {
     // prevent duplicated entires in spell book
     if (!addSpell(spell_id))
         return false;
-
     if(!m_loading)
     {
         WorldPacket data(SMSG_PET_LEARNED_SPELL, 4);
@@ -1387,11 +1183,9 @@ bool Pet::learnSpell(uint32 spell_id)
     }
     return true;
 }
-
 void Pet::InitLevelupSpellsForLevel()
 {
     uint32 level = getLevel();
-
     if(PetLevelupSpellSet const *levelupSpells = GetCreatureInfo()->family ? spellmgr.GetPetLevelupSpellList(GetCreatureInfo()->family) : NULL)
     {
         // PetLevelupSpellSet ordered by levels, process in reversed order
@@ -1405,9 +1199,7 @@ void Pet::InitLevelupSpellsForLevel()
                 learnSpell(itr->second);                        // will unlearn prev rank if any
         }
     }
-
     int32 petSpellsId = GetCreatureInfo()->PetSpellDataId ? -(int32)GetCreatureInfo()->PetSpellDataId : GetEntry();
-
     // default spells (can be not learned if pet level (as owner level decrease result for example) less first possible in normal game)
     if(PetDefaultSpellsEntry const *defSpells = spellmgr.GetPetDefaultSpellsEntry(petSpellsId))
     {
@@ -1416,7 +1208,6 @@ void Pet::InitLevelupSpellsForLevel()
             SpellEntry const* spellEntry = sSpellStore.LookupEntry(defSpells->spellid[i]);
             if(!spellEntry)
                 continue;
-
             // will called first if level down
             if(spellEntry->spellLevel > level)
                 unlearnSpell(spellEntry->Id,true);
@@ -1426,7 +1217,6 @@ void Pet::InitLevelupSpellsForLevel()
         }
     }
 }
-
 bool Pet::unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
 {
     if(removeSpell(spell_id,learn_prev,clear_ab))
@@ -1441,23 +1231,18 @@ bool Pet::unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
     }
     return false;
 }
-
 bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
 {
     PetSpellMap::iterator itr = m_spells.find(spell_id);
     if (itr == m_spells.end())
         return false;
-
     if(itr->second.state == PETSPELL_REMOVED)
         return false;
-
     if(itr->second.state == PETSPELL_NEW)
         m_spells.erase(itr);
     else
         itr->second.state = PETSPELL_REMOVED;
-
     RemoveAurasDueToSpell(spell_id);
-
     uint32 talentCost = GetTalentSpellCost(spell_id);
     if (talentCost > 0)
     {
@@ -1469,7 +1254,6 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
         int32 free_points = GetMaxTalentPointsForLevel(getLevel()) - m_usedTalentCount;
         SetFreeTalentPoints(free_points > 0 ? free_points : 0);
     }
-
     if (learn_prev)
     {
         if (uint32 prev_id = spellmgr.GetPrevSpellInChain (spell_id))
@@ -1477,7 +1261,6 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
         else
             learn_prev = false;
     }
-
     // if remove last rank or non-ranked then update action bar at server and client if need
     if (clear_ab && !learn_prev && m_charmInfo->RemoveSpellFromActionBar(spell_id))
     {
@@ -1489,11 +1272,9 @@ bool Pet::removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab)
                     ((Player*)owner)->PetSpellInitialize();
         }
     }
-
     return true;
 }
 
-
 void Pet::CleanupActionBar()
 {
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
@@ -1506,28 +1287,22 @@ void Pet::CleanupActionBar()
                     ToggleAutocast(ab->GetAction(), true);
             }
 }
-
 void Pet::InitPetCreateSpells()
 {
     m_charmInfo->InitPetActionBar();
     m_spells.clear();
-
     LearnPetPassives();
     InitLevelupSpellsForLevel();
-
     CastPetAuras(false);
 }
-
 bool Pet::resetTalents(bool no_cost)
 {
     Unit *owner = GetOwner();
     if (!owner || owner->GetTypeId()!=TYPEID_PLAYER)
         return false;
-
     // not need after this call
     if(((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
         ((Player*)owner)->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true);
-
     CreatureInfo const * ci = GetCreatureInfo();
     if(!ci)
         return false;
@@ -1535,46 +1310,34 @@ bool Pet::resetTalents(bool no_cost)
     CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
     if(!pet_family || pet_family->petTalentType < 0)
         return false;
-
     Player *player = (Player *)owner;
-
     uint32 level = getLevel();
     uint32 talentPointsForLevel = GetMaxTalentPointsForLevel(level);
-
     if (m_usedTalentCount == 0)
     {
         SetFreeTalentPoints(talentPointsForLevel);
         return false;
     }
-
     uint32 cost = 0;
-
     if(!no_cost)
     {
         cost = resetTalentsCost();
-
         if (player->GetMoney() < cost)
         {
             player->SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
             return false;
         }
     }
-
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); ++i)
     {
         TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
-
         if (!talentInfo) continue;
-
         TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
-
         if(!talentTabInfo)
             continue;
-
         // unlearn only talents for pets family talent type
         if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
             continue;
-
         for (int j = 0; j < MAX_TALENT_RANK; j++)
         {
             for(PetSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end();)
@@ -1586,7 +1349,6 @@ bool Pet::resetTalents(bool no_cost)
                 }
                 // remove learned spells (all ranks)
                 uint32 itrFirstId = spellmgr.GetFirstSpellInChain(itr->first);
-
                 // unlearn if first rank is talent or learned by talent
                 if (itrFirstId == talentInfo->RankID[j] || spellmgr.IsSpellLearnToSpell(talentInfo->RankID[j],itrFirstId))
                 {
@@ -1599,13 +1361,10 @@ bool Pet::resetTalents(bool no_cost)
             }
         }
     }
-
     SetFreeTalentPoints(talentPointsForLevel);
-
     if(!no_cost)
     {
         player->ModifyMoney(-(int32)cost);
-
         m_resetTalentsCost = cost;
         m_resetTalentsTime = time(NULL);
     }
@@ -1613,91 +1372,65 @@ bool Pet::resetTalents(bool no_cost)
         player->PetSpellInitialize();
     return true;
 }
-
 void Pet::resetTalentsForAllPetsOf(Player* owner, Pet* online_pet /*= NULL*/)
 {
     // not need after this call
     if(((Player*)owner)->HasAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS))
         ((Player*)owner)->RemoveAtLoginFlag(AT_LOGIN_RESET_PET_TALENTS,true);
-
     // reset for online
     if(online_pet)
         online_pet->resetTalents(true);
-
     // now need only reset for offline pets (all pets except online case)
     uint32 except_petnumber = online_pet ? online_pet->GetCharmInfo()->GetPetNumber() : 0;
-
     QueryResult *resultPets = CharacterDatabase.PQuery(
         "SELECT id FROM character_pet WHERE owner = '%u' AND id <> '%u'",
         owner->GetGUIDLow(),except_petnumber);
-
     // no offline pets
     if(!resultPets)
         return;
-
     QueryResult *result = CharacterDatabase.PQuery(
         "SELECT DISTINCT pet_spell.spell FROM pet_spell, character_pet "
         "WHERE character_pet.owner = '%u' AND character_pet.id = pet_spell.guid AND character_pet.id <> %u",
         owner->GetGUIDLow(),except_petnumber);
-
     if(!result)
     {
         delete resultPets;
         return;
     }
-
     bool need_comma = false;
     std::ostringstream ss;
     ss << "DELETE FROM pet_spell WHERE guid IN (";
-
     do
     {
         Field *fields = resultPets->Fetch();
-
         uint32 id = fields[0].GetUInt32();
-
         if(need_comma)
             ss << ",";
-
         ss << id;
-
         need_comma = true;
     }
     while( resultPets->NextRow() );
-
     delete resultPets;
-
     ss << ") AND spell IN (";
-
     bool need_execute = false;
     do
     {
         Field *fields = result->Fetch();
-
         uint32 spell = fields[0].GetUInt32();
-
         if(!GetTalentSpellCost(spell))
             continue;
-
         if(need_execute)
             ss << ",";
-
         ss << spell;
-
         need_execute = true;
     }
     while( result->NextRow() );
-
     delete result;
-
     if(!need_execute)
         return;
-
     ss << ")";
-
     CharacterDatabase.Execute(ss.str().c_str());
 }
-
 void Pet::InitTalentForLevel()
 {
     uint32 level = getLevel();
@@ -1709,19 +1442,15 @@ void Pet::InitTalentForLevel()
         resetTalents(true);
     }
     SetFreeTalentPoints(talentPointsForLevel - m_usedTalentCount);
-
     Unit *owner = GetOwner();
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(!m_loading)
         ((Player*)owner)->SendTalentsInfoData(true);
 }
-
 uint32 Pet::resetTalentsCost() const
 {
     uint32 days = (sWorld.GetGameTime() - m_resetTalentsTime)/DAY;
-
     // The first time reset costs 10 silver; after 1 day cost is reset to 10 silver
     if(m_resetTalentsCost < 10*SILVER || days > 0)
         return 10*SILVER;
@@ -1735,7 +1464,6 @@ uint32 Pet::resetTalentsCost() const
     else
         return (m_resetTalentsCost + 1*GOLD > 10*GOLD ? 10*GOLD : m_resetTalentsCost + 1*GOLD);
 }
-
 uint8 Pet::GetMaxTalentPointsForLevel(uint32 level)
 {
     uint8 points = (level >= 20) ? ((level - 16) / 4) : 0;
@@ -1744,27 +1472,21 @@ uint8 Pet::GetMaxTalentPointsForLevel(uint32 level)
         points+=owner->GetTotalAuraModifier(SPELL_AURA_MOD_PET_TALENT_POINTS);
     return points;
 }
-
 void Pet::ToggleAutocast(uint32 spellid, bool apply)
 {
     if(!IsAutocastableSpell(spellid))
         return;
-
     PetSpellMap::iterator itr = m_spells.find(spellid);
     if(itr == m_spells.end())
         return;
-
     uint32 i;
-
     if(apply)
     {
         for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; ++i)
             ;                                               // just search
-
         if (i == m_autospells.size())
         {
             m_autospells.push_back(spellid);
-
             if(itr->second.active != ACT_ENABLED)
             {
                 itr->second.active = ACT_ENABLED;
@@ -1778,7 +1500,6 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply)
         AutoSpellList::iterator itr2 = m_autospells.begin();
         for (i = 0; i < m_autospells.size() && m_autospells[i] != spellid; ++i, itr2++)
             ;                                               // just search
-
         if (i < m_autospells.size())
         {
             m_autospells.erase(itr2);
@@ -1791,7 +1512,6 @@ void Pet::ToggleAutocast(uint32 spellid, bool apply)
         }
     }
 }
-
 bool Pet::IsPermanentPetFor(Player* owner)
 {
     switch(getPetType())
@@ -1812,43 +1532,33 @@ bool Pet::IsPermanentPetFor(Player* owner)
             return false;
     }
 }
-
 bool Pet::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 pet_number)
 {
     assert(map);
     SetMap(map);
-
     SetPhaseMask(phaseMask,false);
     Object::_Create(guidlow, pet_number, HIGHGUID_PET);
-
     m_DBTableGuid = guidlow;
     m_originalEntry = Entry;
-
     if(!InitEntry(Entry))
         return false;
-
     SetSheath(SHEATH_STATE_MELEE);
-
     return true;
 }
-
 bool Pet::HasSpell(uint32 spell) const
 {
     PetSpellMap::const_iterator itr = m_spells.find(spell);
     return (itr != m_spells.end() && itr->second.state != PETSPELL_REMOVED );
 }
-
 // Get all passive spells in our skill line
 void Pet::LearnPetPassives()
 {
     CreatureInfo const* cInfo = GetCreatureInfo();
     if(!cInfo)
         return;
-
     CreatureFamilyEntry const* cFamily = sCreatureFamilyStore.LookupEntry(cInfo->family);
     if(!cFamily)
         return;
-
     PetFamilySpellsStore::const_iterator petStore = sPetFamilySpellsStore.find(cFamily->ID);
     if(petStore != sPetFamilySpellsStore.end())
     {
@@ -1859,34 +1569,28 @@ void Pet::LearnPetPassives()
             addSpell(*petSet, ACT_DECIDE, PETSPELL_NEW, PETSPELL_FAMILY);
     }
 }
-
 void Pet::CastPetAuras(bool current)
 {
     Unit* owner = GetOwner();
     if(!owner || owner->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     if(!IsPermanentPetFor((Player*)owner))
         return;
-
     for(PetAuraSet::const_iterator itr = owner->m_petAuras.begin(); itr != owner->m_petAuras.end();)
     {
         PetAura const* pa = *itr;
         ++itr;
-
         if(!current && pa->IsRemovedOnChangePet())
             owner->RemovePetAura(pa);
         else
             CastPetAura(pa);
     }
 }
-
 void Pet::CastPetAura(PetAura const* aura)
 {
     uint32 auraId = aura->GetAura(GetEntry());
     if(!auraId)
         return;
-
     if(auraId == 35696)                                       // Demonic Knowledge
     {
         int32 basePoints = int32(aura->GetDamage() * (GetStat(STAT_STAMINA) + GetStat(STAT_INTELLECT)) / 100);
@@ -1895,21 +1599,17 @@ void Pet::CastPetAura(PetAura const* aura)
     else
         CastSpell(this, auraId, true);
 }
-
 void Pet::learnSpellHighRank(uint32 spellid)
 {
     learnSpell(spellid);
-
     if(uint32 next = spellmgr.GetNextSpellInChain(spellid))
         learnSpellHighRank(next);
 }
-
 void Pet::SynchronizeLevelWithOwner()
 {
     Unit* owner = GetOwner();
     if (!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     switch(getPetType())
     {
         // always same level
diff --git a/src/game/Pet.h b/src/game/Pet.h
index 7f3684bbd59..1355b259e5f 100644
--- a/src/game/Pet.h
+++ b/src/game/Pet.h
@@ -17,25 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_PET_H
 #define TRINITYCORE_PET_H
-
 #include "ObjectDefines.h"
 #include "Unit.h"
 #include "TemporarySummon.h"
-
 enum PetType
 {
     SUMMON_PET              = 0,
     HUNTER_PET              = 1,
     MAX_PET_TYPE            = 4,
 };
-
 extern char const* petTypeSuffix[MAX_PET_TYPE];
-
 #define MAX_PET_STABLES         4
-
 // stored in character_pet.slot
 enum PetSaveMode
 {
@@ -45,14 +39,12 @@ enum PetSaveMode
     PET_SAVE_LAST_STABLE_SLOT  =  MAX_PET_STABLES,          // last in DB stable slot index (including), all higher have same meaning as PET_SAVE_NOT_IN_SLOT
     PET_SAVE_NOT_IN_SLOT       =  100                       // for avoid conflict with stable size grow will use 100
 };
-
 enum HappinessState
 {
     UNHAPPY = 1,
     CONTENT = 2,
     HAPPY   = 3
 };
-
 enum PetSpellState
 {
     PETSPELL_UNCHANGED = 0,
@@ -60,21 +52,18 @@ enum PetSpellState
     PETSPELL_NEW       = 2,
     PETSPELL_REMOVED   = 3
 };
-
 enum PetSpellType
 {
     PETSPELL_NORMAL = 0,
     PETSPELL_FAMILY = 1,
     PETSPELL_TALENT = 2,
 };
-
 struct PetSpell
 {
     ActiveStates active;
     PetSpellState state;
     PetSpellType type;
 };
-
 enum ActionFeedback
 {
     FEEDBACK_NONE            = 0,
@@ -82,18 +71,15 @@ enum ActionFeedback
     FEEDBACK_NOTHING_TO_ATT  = 2,
     FEEDBACK_CANT_ATT_TARGET = 3
 };
-
 enum PetTalk
 {
     PET_TALK_SPECIAL_SPELL  = 0,
     PET_TALK_ATTACK         = 1
 };
-
 enum PetNameInvalidReason
 {
     // custom, not send
     PET_NAME_SUCCESS                                        = 0,
-
     PET_NAME_INVALID                                        = 1,
     PET_NAME_NO_NAME                                        = 2,
     PET_NAME_TOO_SHORT                                      = 3,
@@ -108,37 +94,26 @@ enum PetNameInvalidReason
     PET_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END   = 15,
     PET_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME              = 16
 };
-
 typedef UNORDERED_MAP<uint32, PetSpell> PetSpellMap;
 typedef std::vector<uint32> AutoSpellList;
-
 #define HAPPINESS_LEVEL_SIZE        333000
-
 #define ACTIVE_SPELLS_MAX           4
-
 #define OWNER_MAX_DISTANCE 100.0f
-
 #define PET_FOLLOW_DIST  1
 #define PET_FOLLOW_ANGLE (M_PI/2)
-
 class Player;
-
 class Pet : public Guardian
 {
     public:
         explicit Pet(Player *owner, PetType type = MAX_PET_TYPE);
         virtual ~Pet();
-
         void AddToWorld();
         void RemoveFromWorld();
-
         PetType getPetType() const { return m_petType; }
         void setPetType(PetType type) { m_petType = type; }
         bool isControlled() const { return getPetType()==SUMMON_PET || getPetType()==HUNTER_PET; }
         bool isTemporarySummoned() const { return m_duration > 0; }
-
         bool IsPermanentPetFor(Player* owner);              // pet have tab in character windows and set UNIT_FIELD_PETNUMBER
-
         bool Create (uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, uint32 pet_number);
         bool CreateBaseAtCreature(Creature* creature);
         bool LoadPetFromDB( Player* owner,uint32 petentry = 0,uint32 petnumber = 0, bool current = false );
@@ -146,10 +121,8 @@ class Pet : public Guardian
         void SavePetToDB(PetSaveMode mode);
         void Remove(PetSaveMode mode, bool returnreagent = false);
         static void DeleteFromDB(uint32 guidlow);
-
         void setDeathState(DeathState s);                   // overwrite virtual Creature::setDeathState and Unit::setDeathState
         void Update(uint32 diff);                           // overwrite virtual Creature::Update and Unit::Update
-
         uint8 GetPetAutoSpellSize() const { return m_autospells.size(); }
         uint32 GetPetAutoSpellOnPos(uint8 pos) const
         {
@@ -158,7 +131,6 @@ class Pet : public Guardian
             else
                 return m_autospells[pos];
         }
-
         void LooseHappiness();
         HappinessState GetHappinessState();
         void GivePetXP(uint32 xp);
@@ -167,7 +139,6 @@ class Pet : public Guardian
         bool HaveInDiet(ItemPrototype const* item) const;
         uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel);
         void SetDuration(int32 dur) { m_duration = dur; }
-
         /*
         bool UpdateStats(Stats stat);
         bool UpdateAllStats();
@@ -178,23 +149,18 @@ class Pet : public Guardian
         void UpdateAttackPowerAndDamage(bool ranged = false);
         void UpdateDamagePhysical(WeaponAttackType attType);
         */
-
         bool CanTakeMoreActiveSpells(uint32 SpellIconID);
         void ToggleAutocast(uint32 spellid, bool apply);
-
         bool HasSpell(uint32 spell) const;
-
         void LearnPetPassives();
         void CastPetAuras(bool current);
         void CastPetAura(PetAura const* aura);
-
         void _LoadSpellCooldowns();
         void _SaveSpellCooldowns();
         void _LoadAuras(uint32 timediff);
         void _SaveAuras();
         void _LoadSpells();
         void _SaveSpells();
-
         bool addSpell(uint32 spell_id,ActiveStates active = ACT_DECIDE, PetSpellState state = PETSPELL_NEW, PetSpellType type = PETSPELL_NORMAL);
         bool learnSpell(uint32 spell_id);
         void learnSpellHighRank(uint32 spellid);
@@ -202,33 +168,24 @@ class Pet : public Guardian
         bool unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true);
         bool removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true);
         void CleanupActionBar();
-
         PetSpellMap     m_spells;
         AutoSpellList   m_autospells;
-
         void InitPetCreateSpells();
-
         bool resetTalents(bool no_cost = false);
         static void resetTalentsForAllPetsOf(Player* owner, Pet* online_pet = NULL);
         uint32 resetTalentsCost() const;
         void InitTalentForLevel();
-
         uint8 GetMaxTalentPointsForLevel(uint32 level);
         uint8 GetFreeTalentPoints() { return GetByteValue(UNIT_FIELD_BYTES_1, 1); }
         void SetFreeTalentPoints(uint8 points) { SetByteValue(UNIT_FIELD_BYTES_1, 1, points); }
-
         uint32  m_resetTalentsCost;
         time_t  m_resetTalentsTime;
         uint32  m_usedTalentCount;
-
         const uint64& GetAuraUpdateMaskForRaid() const { return m_auraRaidUpdateMask; }
         void SetAuraUpdateMaskForRaid(uint8 slot) { m_auraRaidUpdateMask |= (uint64(1) << slot); }
         void ResetAuraUpdateMaskForRaid() { m_auraRaidUpdateMask = 0; }
-
         DeclinedName const* GetDeclinedNames() const { return m_declinedname; }
-
         bool    m_removed;                                  // prevent overwrite pet state in DB at next Pet::Update if pet already removed(saved)
-
         Player *GetOwner() { return m_owner; }
     protected:
         Player *m_owner;
@@ -238,9 +195,7 @@ class Pet : public Guardian
         uint64  m_auraRaidUpdateMask;
         bool    m_loading;
         uint32  m_regenTimer;
-
         DeclinedName *m_declinedname;
-
     private:
         void SaveToDB(uint32, uint8)                        // overwrited of Creature::SaveToDB     - don't must be called
         {
diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index 534500e51ea..64cf01b383d 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "PetAI.h"
 #include "Errors.h"
 #include "Pet.h"
@@ -29,34 +28,27 @@
 #include "Creature.h"
 #include "World.h"
 #include "Util.h"
-
 int PetAI::Permissible(const Creature *creature)
 {
     if( creature->isPet())
         return PERMIT_BASE_SPECIAL;
-
     return PERMIT_BASE_NO;
 }
-
 PetAI::PetAI(Creature *c) : CreatureAI(c), i_tracker(TIME_INTERVAL_LOOK)
 {
     m_AllySet.clear();
     UpdateAllies();
 }
-
 void PetAI::EnterEvadeMode()
 {
 }
-
 bool PetAI::_needToStop() const
 {
     // This is needed for charmed creatures, as once their target was reset other effects can trigger threat
     if(m_creature->isCharmed() && m_creature->getVictim() == m_creature->GetCharmer())
         return true;
-
     return !m_creature->canAttack(m_creature->getVictim());
 }
-
 void PetAI::_stopAttack()
 {
     if( !m_creature->isAlive() )
@@ -66,25 +58,20 @@ void PetAI::_stopAttack()
         m_creature->GetMotionMaster()->MoveIdle();
         m_creature->CombatStop();
         m_creature->getHostilRefManager().deleteReferences();
-
         return;
     }
-
     m_creature->AttackStop();
     me->GetCharmInfo()->SetIsCommandAttack(false);
     HandleReturnMovement();
 }
-
 void PetAI::UpdateAI(const uint32 diff)
 {
     Unit* owner = m_creature->GetCharmerOrOwner();
-
     if(m_updateAlliesTimer <= diff)
         // UpdateAllies self set update timer
         UpdateAllies();
     else
         m_updateAlliesTimer -= diff;
-
     // m_creature->getVictim() can't be used for check in case stop fighting, m_creature->getVictim() clear at Unit death etc.
     if( m_creature->getVictim() )
     {
@@ -94,13 +81,11 @@ void PetAI::UpdateAI(const uint32 diff)
             _stopAttack();
             return;
         }
-
         DoMeleeAttackIfReady();
     }
     else if(owner && m_creature->GetCharmInfo()) //no victim
     {
         Unit *nextTarget = SelectNextTarget();
-
         if (nextTarget)
             AttackStart(nextTarget);
         else
@@ -108,35 +93,28 @@ void PetAI::UpdateAI(const uint32 diff)
     }
     else if (owner && !m_creature->hasUnitState(UNIT_STAT_FOLLOW)) // no charm info and no victim
         m_creature->GetMotionMaster()->MoveFollow(owner,PET_FOLLOW_DIST, m_creature->GetFollowAngle());
-
     if(!me->GetCharmInfo())
         return;
-
     bool inCombat = me->getVictim();
-
     // Autocast (casted only in combat or persistent spells in any state)
     if (m_creature->GetGlobalCooldown() == 0 && !m_creature->hasUnitState(UNIT_STAT_CASTING))
     {
         typedef std::vector<std::pair<Unit*, Spell*> > TargetSpellList;
         TargetSpellList targetSpellStore;
-
         for (uint8 i = 0; i < m_creature->GetPetAutoSpellSize(); ++i)
         {
             uint32 spellID = m_creature->GetPetAutoSpellOnPos(i);
             if (!spellID)
                 continue;
-
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
             if (!spellInfo)
                 continue;
-
             // ignore some combinations of combat state and combat/noncombat spells
             if (!inCombat)
             {
                 // ignore attacking spells, and allow only self/around spells
                 if (!IsPositiveSpell(spellInfo->Id))
                     continue;
-
                 // non combat spells allowed
                 // only pet spells have IsNonCombatSpell and not fit this reqs:
                 // Consume Shadows, Lesser Invisibility, so ignore checks for its
@@ -146,7 +124,6 @@ void PetAI::UpdateAI(const uint32 diff)
                     int32 duration = GetSpellDuration(spellInfo);
                     if ((spellInfo->manaCost || spellInfo->ManaCostPercentage || spellInfo->manaPerSecond) && duration > 0)
                         continue;
-
                     // allow only spell without cooldown > duration
                     int32 cooldown = GetSpellRecoveryTime(spellInfo);
                     if (cooldown >= 0 && duration >= 0 && cooldown > duration)
@@ -159,9 +136,7 @@ void PetAI::UpdateAI(const uint32 diff)
                 if (IsNonCombatSpell(spellInfo))
                     continue;
             }
-
             Spell *spell = new Spell(m_creature, spellInfo, false, 0);
-
             // Fix to allow pets on STAY to autocast
             if (inCombat && _CanAttack(me->getVictim()) && spell->CanAutoCast(me->getVictim()))
             {
@@ -174,11 +149,9 @@ void PetAI::UpdateAI(const uint32 diff)
                 for(std::set<uint64>::const_iterator tar = m_AllySet.begin(); tar != m_AllySet.end(); ++tar)
                 {
                     Unit* Target = ObjectAccessor::GetUnit(*m_creature,*tar);
-
                     //only buff targets that are in combat, unless the spell can only be cast while out of combat
                     if(!Target)
                         continue;
-
                     if(spell->CanAutoCast(Target))
                     {
                         targetSpellStore.push_back(std::make_pair<Unit*, Spell*>(Target, spell));
@@ -190,60 +163,46 @@ void PetAI::UpdateAI(const uint32 diff)
                     delete spell;
             }
         }
-
         //found units to cast on to
         if (!targetSpellStore.empty())
         {
             uint32 index = urand(0, targetSpellStore.size() - 1);
-
             Spell* spell  = targetSpellStore[index].second;
             Unit*  target = targetSpellStore[index].first;
-
             targetSpellStore.erase(targetSpellStore.begin() + index);
-
             SpellCastTargets targets;
             targets.setUnitTarget( target );
-
             if( !m_creature->HasInArc(M_PI, target) )
             {
                 m_creature->SetInFront(target);
                 if( target->GetTypeId() == TYPEID_PLAYER )
                     m_creature->SendUpdateToPlayer( (Player*)target );
-
                 if(owner && owner->GetTypeId() == TYPEID_PLAYER)
                     m_creature->SendUpdateToPlayer( (Player*)owner );
             }
-
             m_creature->AddCreatureSpellCooldown(spell->m_spellInfo->Id);
-
             spell->prepare(&targets);
         }
-
         // deleted cached Spell objects
         for(TargetSpellList::const_iterator itr = targetSpellStore.begin(); itr != targetSpellStore.end(); ++itr)
             delete itr->second;
     }
 }
-
 void PetAI::UpdateAllies()
 {
     Unit* owner = m_creature->GetCharmerOrOwner();
     Group *pGroup = NULL;
-
     m_updateAlliesTimer = 10*IN_MILISECONDS;                //update friendly targets every 10 seconds, lesser checks increase performance
-
     if(!owner)
         return;
     else if(owner->GetTypeId() == TYPEID_PLAYER)
         pGroup = ((Player*)owner)->GetGroup();
-
     //only pet and owner/not in group->ok
     if(m_AllySet.size() == 2 && !pGroup)
         return;
     //owner is in group; group members filled in already (no raid -> subgroupcount = whole count)
     if(pGroup && !pGroup->isRaidGroup() && m_AllySet.size() == (pGroup->GetMembersCount() + 2))
         return;
-
     m_AllySet.clear();
     m_AllySet.insert(m_creature->GetGUID());
     if(pGroup)                                              //add group
@@ -253,47 +212,38 @@ void PetAI::UpdateAllies()
             Player* Target = itr->getSource();
             if(!Target || !pGroup->SameSubGroup((Player*)owner, Target))
                 continue;
-
             if(Target->GetGUID() == owner->GetGUID())
                 continue;
-
             m_AllySet.insert(Target->GetGUID());
         }
     }
     else                                                    //remove group
         m_AllySet.insert(owner->GetGUID());
 }
-
 void PetAI::KilledUnit(Unit *victim)
 {
     // Called from Unit::Kill() in case where pet or owner kills something
     // if owner killed this victim, pet may still be attacking something else
     if (me->getVictim() && me->getVictim() != victim)
         return;
-
     // Clear target just in case. May help problem where health / focus / mana
     // regen gets stuck. Also resets attack command.
     // Can't use _stopAttack() because that activates movement handlers and ignores
     // next target selection
     me->AttackStop();
     me->GetCharmInfo()->SetIsCommandAttack(false);
-
     Unit *nextTarget = SelectNextTarget();
-
     if (nextTarget)
         AttackStart(nextTarget);
     else
         HandleReturnMovement(); // Return
 }
-
 void PetAI::AttackStart(Unit *target)
 {
     // Overrides Unit::AttackStart to correctly evaluate Pet states
-
     // Check all pet states to decide if we can attack this target
     if (!_CanAttack(target))
         return;
-
     // We can attack, should we chase or not?
     if (me->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
         DoAttack(target,true); // FOLLOW, attack with chase
@@ -305,36 +255,28 @@ void PetAI::AttackStart(Unit *target)
             DoAttack(target,false); // STAY, target in range, attack not clicked so attack without chase
     }
 }
-
 Unit *PetAI::SelectNextTarget()
 {
     // Provides next target selection after current target death
-
     // Passive pets don't do next target selection
     if (me->HasReactState(REACT_PASSIVE))
         return NULL;
-
     // Check pet's attackers first to prevent dragging mobs back
     // to owner
     if (me->getAttackerForHelper())
         return me->getAttackerForHelper();
-
     // Check owner's attackers if pet didn't have any
     if (me->GetCharmerOrOwner()->getAttackerForHelper())
         return me->GetCharmerOrOwner()->getAttackerForHelper();
-
     // 3.0.2 - Pets now start attacking their owners target in defensive mode as soon as the hunter does
     if (me->GetCharmerOrOwner()->getVictim())
         return me->GetCharmerOrOwner()->getVictim();
-
     // Default
     return NULL;
 }
-
 void PetAI::HandleReturnMovement()
 {
     // Handles moving the pet back to stay or owner
-
     if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY))
     {
         if (!me->GetCharmInfo()->IsAtStay() && !me->GetCharmInfo()->IsReturning())
@@ -343,7 +285,6 @@ void PetAI::HandleReturnMovement()
             if (!me->GetCharmInfo()->IsCommandAttack())
             {
                 float x,y,z;
-
                 me->GetCharmInfo()->GetStayPosition(x, y, z);
                 me->GetCharmInfo()->SetIsReturning(true);
                 me->GetMotionMaster()->Clear();
@@ -363,20 +304,15 @@ void PetAI::HandleReturnMovement()
             }
         }
     }
-
 }
-
 void PetAI::DoAttack(Unit *target, bool chase)
 {
     // Handles attack with or without chase and also resets all
     // PetAI flags for next update / creature kill
-
     // me->GetCharmInfo()->SetIsCommandAttack(false);
-
     // The following conditions are true if chase == true
     // (Follow && (Aggressive || Defensive))
     // ((Stay || Follow) && (Passive && player clicked attack))
-
     if (chase)
     {
         if (me->Attack(target,true))
@@ -396,7 +332,6 @@ void PetAI::DoAttack(Unit *target, bool chase)
         me->Attack(target,true);
     }
 }
-
 void PetAI::MovementInform(uint32 moveType, uint32 data)
 {
     // Receives notification when pet reaches stay or follow owner
@@ -417,7 +352,6 @@ void PetAI::MovementInform(uint32 moveType, uint32 data)
             }
         }
         break;
-
         case TARGETED_MOTION_TYPE:
         {
             // If data is owner's GUIDLow then we've reached follow point,
@@ -432,39 +366,30 @@ void PetAI::MovementInform(uint32 moveType, uint32 data)
             }
         }
         break;
-
         default:
             break;
     }
 }
-
 bool PetAI::_CanAttack(Unit *target)
 {
     // Evaluates wether a pet can attack a specific
     // target based on CommandState, ReactState and other flags
-
     // Returning - check first since pets returning ignore attacks
     if (me->GetCharmInfo()->IsReturning())
         return false;
-
     // Passive - check now so we don't have to worry about passive in later checks
     if (me->HasReactState(REACT_PASSIVE))
         return me->GetCharmInfo()->IsCommandAttack();
-
     //  Pets commanded to attack should not stop their approach if attacked by another creature
     if (me->getVictim() && (me->getVictim() != target))
         return !me->GetCharmInfo()->IsCommandAttack();
-
     // From this point on, pet will always be either aggressive or defensive
-
     // Stay - can attack if target is within range or commanded to
     if (me->GetCharmInfo()->HasCommandState(COMMAND_STAY))
         return (me->IsWithinMeleeRange(target, MIN_MELEE_REACH) || me->GetCharmInfo()->IsCommandAttack());
-
     // Follow
     if (me->GetCharmInfo()->HasCommandState(COMMAND_FOLLOW))
         return true;
-
     // default, though we shouldn't ever get here
     return false;
 }
diff --git a/src/game/PetAI.h b/src/game/PetAI.h
index 226aa493202..6dee89541f1 100644
--- a/src/game/PetAI.h
+++ b/src/game/PetAI.h
@@ -17,44 +17,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_PETAI_H
 #define TRINITY_PETAI_H
-
 #include "CreatureAI.h"
 #include "Timer.h"
-
 class Creature;
 class Spell;
-
 class TRINITY_DLL_DECL PetAI : public CreatureAI
 {
     public:
-
         explicit PetAI(Creature *c);
-
         void EnterEvadeMode();
         void JustDied(Unit *who) { _stopAttack(); }
-
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
-
         void KilledUnit(Unit *victim);
         void AttackStart(Unit *target);
         void MovementInform(uint32 moveType, uint32 data);
-
     private:
         bool _isVisible(Unit *) const;
         bool _needToStop(void) const;
         void _stopAttack(void);
-
         void UpdateAllies();
-
         TimeTracker i_tracker;
         bool inCombat;
         std::set<uint64> m_AllySet;
         uint32 m_updateAlliesTimer;
-
         Unit *SelectNextTarget();
         void HandleReturnMovement();
         void DoAttack(Unit *target, bool chase);
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 733a857373b..78813453722 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -31,7 +30,6 @@
 #include "Util.h"
 #include "Pet.h"
 #include "World.h"
-
 void WorldSession::HandlePetAction( WorldPacket & recv_data )
 {
     uint64 guid1;
@@ -40,10 +38,8 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
     recv_data >> guid1;                                     //pet guid
     recv_data >> data;
     recv_data >> guid2;                                     //tag guid
-
     uint32 spellid = UNIT_ACTION_BUTTON_ACTION(data);
     uint8 flag = UNIT_ACTION_BUTTON_TYPE(data);             //delete = 0x07 CastSpell = C1
-
     // used also for charmed creature
     Unit* pet= ObjectAccessor::GetUnit(*_player, guid1);
     sLog.outDetail("HandlePetAction.Pet %u flag is %u, spellid is %u, target %u.", uint32(GUID_LOPART(guid1)), uint32(flag), spellid, uint32(GUID_LOPART(guid2)) );
@@ -52,17 +48,14 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
         sLog.outError( "Pet %u not exist.", uint32(GUID_LOPART(guid1)) );
         return;
     }
-
     if(pet != GetPlayer()->GetFirstControlled())
     {
         sLog.outError("HandlePetAction.Pet %u isn't pet of player %s.", uint32(GUID_LOPART(guid1)), GetPlayer()->GetName() );
         return;
     }
-
     //TODO: allow control charmed player?
     if(pet->GetTypeId() == TYPEID_PLAYER && !(flag == ACT_COMMAND && spellid == COMMAND_ATTACK))
         return;
-
     if(GetPlayer()->m_Controlled.size() == 1)
         HandlePetActionHelper(pet, guid1, spellid, flag, guid2);
     else
@@ -76,7 +69,6 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
             HandlePetActionHelper(*itr, guid1, spellid, flag, guid2);
     }
 }
-
 void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2)
 {
     CharmInfo *charmInfo = pet->GetCharmInfo();
@@ -85,7 +77,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
         sLog.outError("WorldSession::HandlePetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
-
     switch(flag)
     {
         case ACT_COMMAND:                                   //0x07
@@ -96,7 +87,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     pet->InterruptNonMeleeSpells(false);
                     pet->GetMotionMaster()->MoveIdle();
                     charmInfo->SetCommandState( COMMAND_STAY );
-
                     charmInfo->SetIsCommandAttack(false);
                     charmInfo->SetIsAtStay(true);
                     charmInfo->SetIsFollowing(false);
@@ -108,7 +98,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     pet->InterruptNonMeleeSpells(false);
                     pet->GetMotionMaster()->MoveFollow(_player,PET_FOLLOW_DIST,pet->GetFollowAngle());
                     charmInfo->SetCommandState( COMMAND_FOLLOW );
-
                     charmInfo->SetIsCommandAttack(false);
                     charmInfo->SetIsAtStay(false);
                     charmInfo->SetIsReturning(true);
@@ -123,40 +112,31 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         //TODO: Send proper error message to client
                         return;
                     }
-
                     // only place where pet can be player
                     Unit *TargetUnit = ObjectAccessor::GetUnit(*_player, guid2);
                     if(!TargetUnit)
                         return;
-
                     if(!pet->canAttack(TargetUnit))
                         return;
-
                     // Not let attack through obstructions
                     if(sWorld.getConfig(CONFIG_PET_LOS))
                     {
-
                       if(!pet->IsWithinLOSInMap(TargetUnit))
                         return;
-
                     }
-                    
                     pet->clearUnitState(UNIT_STAT_FOLLOW);
                     // This is true if pet has no target or has target but targets differs.
                     if(pet->getVictim() != TargetUnit || ( pet->getVictim() == TargetUnit && !pet->GetCharmInfo()->IsCommandAttack() ))
                     {
                         if (pet->getVictim())
                             pet->AttackStop();
-
                         if(pet->GetTypeId() != TYPEID_PLAYER && ((Creature*)pet)->IsAIEnabled)
                         {
                             charmInfo->SetIsCommandAttack(true);
                             charmInfo->SetIsAtStay(false);
                             charmInfo->SetIsFollowing(false);
                             charmInfo->SetIsReturning(false);
-
                             ((Creature*)pet)->AI()->AttackStart(TargetUnit);
-
                             //10% chance to play special pet attack talk, else growl
                             if(((Creature*)pet)->isPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10)
                                 pet->SendPetTalk((uint32)PET_TALK_ATTACK);
@@ -170,12 +150,10 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         {
                             if(pet->getVictim() && pet->getVictim() != TargetUnit)
                                 pet->AttackStop();
-
                             charmInfo->SetIsCommandAttack(true);
                             charmInfo->SetIsAtStay(false);
                             charmInfo->SetIsFollowing(false);
                             charmInfo->SetIsReturning(false);
-
                             pet->Attack(TargetUnit,true);
                             pet->SendPetAIReaction(guid1);
                         }
@@ -211,7 +189,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             {
                 case REACT_PASSIVE:                         //passive
                     pet->AttackStop();
-
                 case REACT_DEFENSIVE:                       //recovery
                 case REACT_AGGRESSIVE:                      //activete
                     if(pet->GetTypeId() == TYPEID_UNIT)
@@ -226,10 +203,8 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             Unit* unit_target = NULL;
             if (((Creature*)pet)->GetGlobalCooldown() > 0)
                 return;
-
             if(guid2)
                 unit_target = ObjectAccessor::GetUnit(*_player,guid2);
-
             // do not cast unknown spells
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
             if(!spellInfo)
@@ -237,17 +212,14 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 sLog.outError("WORLD: unknown PET spell id %i", spellid);
                 return;
             }
-
             for(uint32 i = 0; i < 3;++i)
             {
                 if(spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_SRC || spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_AREA_ENEMY_DST || spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_DYNOBJ_ENEMY)
                     return;
             }
-
             // do not cast not learned spells
             if(!pet->HasSpell(spellid) || IsPassiveSpell(spellid))
                 return;
-
             //  Clear the flags as if owner clicked 'attack'. AI will reset them
             //  after AttackStart, even if spell failed
             if (pet->GetCharmInfo())
@@ -257,11 +229,8 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 pet->GetCharmInfo()->SetIsReturning(false);
                 pet->GetCharmInfo()->SetIsFollowing(false);
             }
-
             Spell *spell = new Spell(pet, spellInfo, false);
-
             SpellCastResult result = spell->CheckPetCast(unit_target);
-
             //auto turn to target unless possessed
             if(result == SPELL_FAILED_UNIT_NOT_INFRONT && !pet->isPossessed() && !pet->IsVehicle())
             {
@@ -282,13 +251,10 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                         pet->SendUpdateToPlayer((Player*)powner);
                 result = SPELL_CAST_OK;
             }
-
             if(result == SPELL_CAST_OK)
             {
                 ((Creature*)pet)->AddCreatureSpellCooldown(spellid);
-
                 unit_target = spell->m_targets.getUnitTarget();
-
                 //10% chance to play special pet attack talk, else growl
                 //actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell
                 if(((Creature*)pet)->isPet() && (((Pet*)pet)->getPetType() == SUMMON_PET) && (pet != unit_target) && (urand(0, 100) < 10))
@@ -297,7 +263,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                 {
                     pet->SendPetAIReaction(guid1);
                 }
-
                 if( unit_target && !GetPlayer()->IsFriendlyTo(unit_target) && !pet->isPossessed() && !pet->IsVehicle())
                 {
                     // This is true if pet has no target or has target but targets differs.
@@ -310,7 +275,6 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                             ((Creature*)pet)->AI()->AttackStart(unit_target);
                     }
                 }
-
                 spell->prepare(&(spell->m_targets));
             }
             else
@@ -319,13 +283,10 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
                     Spell::SendCastResult(GetPlayer(),spellInfo,0,result);
                 else
                     pet->SendPetCastFail(spellid, result);
-
                 if(!((Creature*)pet)->HasSpellCooldown(spellid))
                     GetPlayer()->SendClearCooldown(spellid, pet);
-
                 spell->finish(false);
                 delete spell;
-
                 // reset specific flags in case of spell fail. AI will reset other flags
                 if (pet->GetCharmInfo())
                     pet->GetCharmInfo()->SetIsCommandAttack(false);
@@ -336,33 +297,25 @@ void WorldSession::HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid
             sLog.outError("WORLD: unknown PET flag Action %i and spellid %i.", uint32(flag), spellid);
     }
 }
-
 void WorldSession::HandlePetNameQuery( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetNameQuery. CMSG_PET_NAME_QUERY" );
-
     uint32 petnumber;
     uint64 petguid;
-
     recv_data >> petnumber;
     recv_data >> petguid;
-
     SendPetNameQuery(petguid,petnumber);
 }
-
 void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
 {
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, petguid);
     if(!pet || !pet->GetCharmInfo() || pet->GetCharmInfo()->GetPetNumber() != petnumber)
         return;
-
     std::string name = pet->GetName();
-
     WorldPacket data(SMSG_PET_NAME_QUERY_RESPONSE, (4+4+name.size()+1));
     data << uint32(petnumber);
     data << name.c_str();
     data << uint32(pet->GetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP));
-
     if( pet->isPet() && ((Pet*)pet)->GetDeclinedNames() )
     {
         data << uint8(1);
@@ -371,52 +324,39 @@ void WorldSession::SendPetNameQuery( uint64 petguid, uint32 petnumber)
     }
     else
         data << uint8(0);
-
     _player->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetSetAction. CMSG_PET_SET_ACTION" );
-
     uint64 petguid;
     uint8  count;
-
     recv_data >> petguid;
-
     Unit* pet = ObjectAccessor::GetUnit(*_player, petguid);
-
     if(!pet || pet != _player->GetFirstControlled())
     {
         sLog.outError( "HandlePetSetAction: Unknown pet or pet owner." );
         return;
     }
-
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
         sLog.outError("WorldSession::HandlePetSetAction: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
-
     count = (recv_data.size() == 24) ? 2 : 1;
     for(uint8 i = 0; i < count; ++i)
     {
         uint32 position;
         uint32 data;
-
         recv_data >> position;
         recv_data >> data;
-
         uint32 spell_id = UNIT_ACTION_BUTTON_ACTION(data);
         uint8 act_state = UNIT_ACTION_BUTTON_TYPE(data);
-
         sLog.outDetail( "Player %s has changed pet spell action. Position: %u, Spell: %u, State: 0x%X", _player->GetName(), position, spell_id, uint32(act_state));
-
         //ignore invalid position
         if(position >= MAX_UNIT_ACTION_BAR_INDEX)
             return;
-
         //if it's act for spell (en/disable/cast) and there is a spell given (0 = remove spell) which pet doesn't know, don't add
         if(!((act_state == ACT_ENABLED || act_state == ACT_DISABLED || act_state == ACT_PASSIVE) && spell_id && !pet->HasSpell(spell_id)))
         {
@@ -435,63 +375,49 @@ void WorldSession::HandlePetSetAction( WorldPacket & recv_data )
                     ((Pet*)pet)->ToggleAutocast(spell_id, false);
                 else
                     charmInfo->ToggleCreatureAutocast(spell_id, false);
-
             }
-
             charmInfo->SetActionBar(position,spell_id,ActiveStates(act_state));
         }
     }
 }
-
 void WorldSession::HandlePetRename( WorldPacket & recv_data )
 {
     sLog.outDetail( "HandlePetRename. CMSG_PET_RENAME" );
-
     uint64 petguid;
     uint8 isdeclined;
-
     std::string name;
     DeclinedName declinedname;
-
     recv_data >> petguid;
     recv_data >> name;
     recv_data >> isdeclined;
-
     Pet* pet = ObjectAccessor::GetPet(petguid);
                                                             // check it!
     if( !pet || !pet->isPet() || ((Pet*)pet)->getPetType()!= HUNTER_PET ||
         pet->GetByteValue(UNIT_FIELD_BYTES_2, 2) != UNIT_RENAME_ALLOWED ||
         pet->GetOwnerGUID() != _player->GetGUID() || !pet->GetCharmInfo() )
         return;
-
     PetNameInvalidReason res = ObjectMgr::CheckPetName(name);
     if(res != PET_NAME_SUCCESS)
     {
         SendPetNameInvalid(res, name, NULL);
         return;
     }
-
     if(objmgr.IsReservedName(name))
     {
         SendPetNameInvalid(PET_NAME_RESERVED, name, NULL);
         return;
     }
-
     pet->SetName(name);
-
     Unit *owner = pet->GetOwner();
     if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
         ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_NAME);
-
     pet->SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_NOT_ALLOWED);
-
     if(isdeclined)
     {
         for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         {
             recv_data >> declinedname.name[i];
         }
-
         std::wstring wname;
         Utf8toWStr(name, wname);
         if(!ObjectMgr::CheckDeclinedNames(GetMainPartOfName(wname,0),declinedname))
@@ -500,7 +426,6 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data )
             return;
         }
     }
-
     CharacterDatabase.BeginTransaction();
     if(isdeclined)
     {
@@ -510,23 +435,18 @@ void WorldSession::HandlePetRename( WorldPacket & recv_data )
         CharacterDatabase.PExecute("INSERT INTO character_pet_declinedname (id, owner, genitive, dative, accusative, instrumental, prepositional) VALUES ('%u','%u','%s','%s','%s','%s','%s')",
             pet->GetCharmInfo()->GetPetNumber(), _player->GetGUIDLow(), declinedname.name[0].c_str(), declinedname.name[1].c_str(), declinedname.name[2].c_str(), declinedname.name[3].c_str(), declinedname.name[4].c_str());
     }
-
     CharacterDatabase.escape_string(name);
     CharacterDatabase.PExecute("UPDATE character_pet SET name = '%s', renamed = '1' WHERE owner = '%u' AND id = '%u'", name.c_str(), _player->GetGUIDLow(), pet->GetCharmInfo()->GetPetNumber());
     CharacterDatabase.CommitTransaction();
-
     pet->SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
 }
-
 void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;                                      //pet guid
     sLog.outDetail( "HandlePetAbandon. CMSG_PET_ABANDON pet guid is %u", GUID_LOPART(guid) );
-
     if(!_player->IsInWorld())
         return;
-
     // pet/charmed
     Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
     if(pet)
@@ -538,31 +458,25 @@ void WorldSession::HandlePetAbandon( WorldPacket & recv_data )
                 uint32 feelty = pet->GetPower(POWER_HAPPINESS);
                 pet->SetPower(POWER_HAPPINESS ,(feelty-50000) > 0 ?(feelty-50000) : 0);
             }
-
             _player->RemovePet((Pet*)pet,PET_SAVE_AS_DELETED);
         }
         else if(pet->GetGUID() == _player->GetCharmGUID())
             _player->StopCastingCharm();
     }
 }
-
 void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
 {
     sLog.outDetail("CMSG_PET_UNLEARN");
     uint64 guid;
     recvPacket >> guid;                 // Pet guid
-
     Pet* pet = _player->GetPet();
-
     if(!pet || pet->getPetType() != HUNTER_PET || pet->m_usedTalentCount == 0)
         return;
-
     if(guid != pet->GetGUID())
     {
         sLog.outError( "HandlePetUnlearnOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
-
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
@@ -572,7 +486,6 @@ void WorldSession::HandlePetUnlearnOpcode(WorldPacket& recvPacket)
     pet->resetTalents();
     _player->SendTalentsInfoData(true);
 }
-
 void WorldSession::HandlePetSpellAutocastOpcode( WorldPacket& recvPacket )
 {
     sLog.outDetail("CMSG_PET_SPELL_AUTOCAST");
@@ -580,93 +493,71 @@ void WorldSession::HandlePetSpellAutocastOpcode( WorldPacket& recvPacket )
     uint32 spellid;
     uint8  state;                                           //1 for on, 0 for off
     recvPacket >> guid >> spellid >> state;
-
     if(!_player->GetGuardianPet() && !_player->GetCharm())
         return;
-
     if(ObjectAccessor::FindPlayer(guid))
         return;
-
     Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player,guid);
-
     if(!pet || (pet != _player->GetGuardianPet() && pet != _player->GetCharm()))
     {
         sLog.outError( "HandlePetSpellAutocastOpcode.Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
-
     // do not add not learned spells/ passive spells
     if(!pet->HasSpell(spellid) || IsAutocastableSpell(spellid))
         return;
-
     CharmInfo *charmInfo = pet->GetCharmInfo();
     if(!charmInfo)
     {
         sLog.outError("WorldSession::HandlePetSpellAutocastOpcod: object (GUID: %u TypeId: %u) is considered pet-like but doesn't have a charminfo!", pet->GetGUIDLow(), pet->GetTypeId());
         return;
     }
-
     if(pet->isPet())
         ((Pet*)pet)->ToggleAutocast(spellid, state);
     else
         pet->GetCharmInfo()->ToggleCreatureAutocast(spellid, state);
-
     charmInfo->SetSpellAutocast(spellid,state);
 }
-
 void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
 {
     sLog.outDetail("WORLD: CMSG_PET_CAST_SPELL");
-
     uint64 guid;
     uint32 spellid;
     uint8  cast_count;
     uint8  unk_flags;                                       // flags (if 0x02 - some additional data are received)
-
     recvPacket >> guid >> cast_count >> spellid >> unk_flags;
-
     sLog.outDebug("WORLD: CMSG_PET_CAST_SPELL, cast_count: %u, spellid %u, unk_flags %u", cast_count, spellid, unk_flags);
-
     // This opcode is also sent from charmed and possessed units (players and creatures)
     if(!_player->GetGuardianPet() && !_player->GetCharm())
         return;
-
     Unit* caster = ObjectAccessor::GetUnit(*_player, guid);
-
     if(!caster || (caster != _player->GetGuardianPet() && caster != _player->GetCharm()))
     {
         sLog.outError( "HandlePetCastSpellOpcode: Pet %u isn't pet of player %s .", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
     if(!spellInfo)
     {
         sLog.outError("WORLD: unknown PET spell id %i", spellid);
         return;
     }
-
     if (spellInfo->StartRecoveryCategory > 0) //Check if spell is affected by GCD
         if (caster->GetTypeId() == TYPEID_UNIT && ((Creature*)caster)->GetGlobalCooldown() > 0)
         {
             caster->SendPetCastFail(spellid, SPELL_FAILED_NOT_READY);
             return;
         }
-
     // do not cast not learned spells
     if(!caster->HasSpell(spellid) || IsPassiveSpell(spellid))
         return;
-
     SpellCastTargets targets;
     if(!targets.read(&recvPacket,caster))
         return;
-
     caster->clearUnitState(UNIT_STAT_FOLLOW);
-
     Spell *spell = new Spell(caster, spellInfo, spellid == 33395); // water elemental can cast freeze as triggered
     spell->m_cast_count = spellid == 33395 ? 0 : cast_count;                       // probably pending spell cast
     spell->m_targets = targets;
-
     // TODO: need to check victim?
     SpellCastResult result;
     if(caster->m_movedPlayer)
@@ -690,7 +581,6 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
                     pet->SendPetAIReaction(guid);
             }
         }
-
         spell->prepare(&(spell->m_targets));
     }
     else
@@ -706,12 +596,10 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket )
             if(!((Creature*)caster)->HasSpellCooldown(spellid))
                 GetPlayer()->SendClearCooldown(spellid, caster);
         }
-
         spell->finish(false);
         delete spell;
     }
 }
-
 void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, DeclinedName *declinedName)
 {
     WorldPacket data(SMSG_PET_NAME_INVALID, 4 + name.size() + 1 + 1);
@@ -727,37 +615,27 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
         data << uint8(0);
     SendPacket(&data);
 }
-
 void WorldSession::HandlePetLearnTalent( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_PET_LEARN_TALENT");
-
     uint64 guid;
     uint32 talent_id, requested_rank;
     recv_data >> guid >> talent_id >> requested_rank;
-
     _player->LearnPetTalent(guid, talent_id, requested_rank);
     _player->SendTalentsInfoData(true);
 }
-
 void WorldSession::HandleLearnPreviewTalentsPet( WorldPacket & recv_data )
 {
     sLog.outDebug("CMSG_LEARN_PREVIEW_TALENTS_PET");
-
     uint64 guid;
     recv_data >> guid;
-
     uint32 talentsCount;
     recv_data >> talentsCount;
-
     uint32 talentId, talentRank;
-
     for(uint32 i = 0; i < talentsCount; ++i)
     {
         recv_data >> talentId >> talentRank;
-
         _player->LearnPetTalent(guid, talentId, talentRank);
     }
-
     _player->SendTalentsInfoData(true);
 }
diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp
index fe719b1b671..b9c1a465e2d 100644
--- a/src/game/PetitionsHandler.cpp
+++ b/src/game/PetitionsHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Language.h"
 #include "WorldPacket.h"
@@ -30,13 +29,11 @@
 #include "ArenaTeam.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
-
 /*enum PetitionType // dbc data
 {
     PETITION_TYPE_GUILD      = 1,
     PETITION_TYPE_ARENA_TEAM = 3
 };*/
-
 // Charters ID in item_template
 #define GUILD_CHARTER               5863
 #define GUILD_CHARTER_COST          1000                    // 10 S
@@ -46,12 +43,10 @@
 #define ARENA_TEAM_CHARTER_3v3_COST 1200000                 // 120 G
 #define ARENA_TEAM_CHARTER_5v5      23562
 #define ARENA_TEAM_CHARTER_5v5_COST 2000000                 // 200 G
-
 void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode CMSG_PETITION_BUY");
     //recv_data.hexlike();
-
     uint64 guidNPC;
     uint64 unk1, unk3, unk4, unk5, unk6, unk7;
     uint32 unk2;
@@ -64,7 +59,6 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
     recv_data >> unk1;                                      // 0
     recv_data >> unk2;                                      // 0
     recv_data >> name;                                      // name
-
     recv_data >> unk3;                                      // 0
     recv_data >> unk4;                                      // 0
     recv_data >> unk5;                                      // 0
@@ -75,7 +69,6 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
     recv_data >> unk10;                                     // index
     recv_data >> unk11;                                     // 0
     sLog.outDebug("Petitioner with GUID %u tried sell petition: name %s", GUID_LOPART(guidNPC), name.c_str());
-
     // prevent cheating
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guidNPC,UNIT_NPC_FLAG_PETITIONER);
     if (!pCreature)
@@ -83,11 +76,9 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
         sLog.outDebug("WORLD: HandlePetitionBuyOpcode - Unit (GUID: %u) not found or you can't interact with him.", GUID_LOPART(guidNPC));
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     uint32 charterid = 0;
     uint32 cost = 0;
     uint32 type = 0;
@@ -97,7 +88,6 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
         // do not let if already in guild.
         if(_player->GetGuildId())
             return;
-
         charterid = GUILD_CHARTER;
         cost = GUILD_CHARTER_COST;
         type = 9;
@@ -110,7 +100,6 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
             SendNotification(LANG_ARENA_ONE_TOOLOW, sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL));
             return;
         }
-
         switch(unk10)
         {
             case 1:
@@ -132,14 +121,12 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
                 sLog.outDebug("unknown selection at buy petition: %u", unk10);
                 return;
         }
-
         if(_player->GetArenaTeamId(unk10-1))
         {
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, name, "", ERR_ALREADY_IN_ARENA_TEAM);
             return;
         }
     }
-
     if(type == 9)
     {
         if(objmgr.GetGuildByName(name))
@@ -166,20 +153,17 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype(charterid);
     if(!pProto)
     {
         _player->SendBuyError(BUY_ERR_CANT_FIND_ITEM, NULL, charterid, 0);
         return;
     }
-
     if(_player->GetMoney() < cost)
     {                                                       //player hasn't got enough money
         _player->SendBuyError(BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, charterid, 0);
         return;
     }
-
     ItemPosCountVec dest;
     uint8 msg = _player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, charterid, pProto->BuyCount );
     if(msg != EQUIP_ERR_OK)
@@ -187,40 +171,31 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
         _player->SendBuyError(msg, pCreature, charterid, 0);
         return;
     }
-
     _player->ModifyMoney(-(int32)cost);
     Item *charter = _player->StoreNewItem(dest, charterid, true);
     if(!charter)
         return;
-
     charter->SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1, charter->GetGUIDLow());
     // ITEM_FIELD_ENCHANTMENT_1_1 is guild/arenateam id
     // ITEM_FIELD_ENCHANTMENT_1_1+1 is current signatures count (showed on item)
     charter->SetState(ITEM_CHANGED, _player);
     _player->SendNewItem(charter, 1, true, false);
-
     // a petition is invalid, if both the owner and the type matches
     // we checked above, if this player is in an arenateam, so this must be
     // datacorruption
     QueryResult *result = CharacterDatabase.PQuery("SELECT petitionguid FROM petition WHERE ownerguid = '%u'  AND type = '%u'", _player->GetGUIDLow(), type);
-
     std::ostringstream ssInvalidPetitionGUIDs;
-
     if (result)
     {
-
         do
         {
             Field *fields = result->Fetch();
             ssInvalidPetitionGUIDs << "'" << fields[0].GetUInt32() << "' , ";
         } while (result->NextRow());
-
         delete result;
     }
-
     // delete petitions with the same guid as this one
     ssInvalidPetitionGUIDs << "'" << charter->GetGUIDLow() << "'";
-
     sLog.outDebug("Invalid petition GUIDs: %s", ssInvalidPetitionGUIDs.str().c_str());
     CharacterDatabase.escape_string(name);
     CharacterDatabase.BeginTransaction();
@@ -230,20 +205,16 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recv_data)
         _player->GetGUIDLow(), charter->GetGUIDLow(), name.c_str(), type);
     CharacterDatabase.CommitTransaction();
 }
-
 void WorldSession::HandlePetitionShowSignOpcode(WorldPacket & recv_data)
 {
                                                             // ok
     sLog.outDebug("Received opcode CMSG_PETITION_SHOW_SIGNATURES");
     //recv_data.hexlike();
-
     uint8 signs = 0;
     uint64 petitionguid;
     recv_data >> petitionguid;                              // petition guid
-
     // solve (possible) some strange compile problems with explicit use GUID_LOPART(petitionguid) at some GCC versions (wrong code optimization in compiler?)
     uint32 petitionguid_low = GUID_LOPART(petitionguid);
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT type FROM petition WHERE petitionguid = '%u'", petitionguid_low);
     if(!result)
     {
@@ -253,66 +224,52 @@ void WorldSession::HandlePetitionShowSignOpcode(WorldPacket & recv_data)
     Field *fields = result->Fetch();
     uint32 type = fields[0].GetUInt32();
     delete result;
-
     // if guild petition and has guild => error, return;
     if(type==9 && _player->GetGuildId())
         return;
-
     result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", petitionguid_low);
-
     // result==NULL also correct in case no sign yet
     if(result)
         signs = result->GetRowCount();
-
     sLog.outDebug("CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionguid_low);
-
     WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12));
     data << petitionguid;                                   // petition guid
     data << _player->GetGUID();                             // owner guid
     data << petitionguid_low;                               // guild guid (in Trinity always same as GUID_LOPART(petitionguid)
     data << signs;                                          // sign's count
-
     for(uint8 i = 1; i <= signs; ++i)
     {
         Field *fields2 = result->Fetch();
         uint64 plguid = fields2[0].GetUInt64();
-
         data << plguid;                                     // Player GUID
         data << (uint32)0;                                  // there 0 ...
-
         result->NextRow();
     }
     delete result;
     SendPacket(&data);
 }
-
 void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode CMSG_PETITION_QUERY");   // ok
     //recv_data.hexlike();
-
     uint32 guildguid;
     uint64 petitionguid;
     recv_data >> guildguid;                                 // in Trinity always same as GUID_LOPART(petitionguid)
     recv_data >> petitionguid;                              // petition guid
     sLog.outDebug("CMSG_PETITION_QUERY Petition GUID %u Guild GUID %u", GUID_LOPART(petitionguid), guildguid);
-
     SendPetitionQueryOpcode(petitionguid);
 }
-
 void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
 {
     uint64 ownerguid = 0;
     uint32 type;
     std::string name = "NO_NAME_FOR_GUID";
     uint8 signs = 0;
-
     QueryResult *result = CharacterDatabase.PQuery(
         "SELECT ownerguid, name, "
         "  (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs, "
         "  type "
         "FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid));
-
     if(result)
     {
         Field* fields = result->Fetch();
@@ -327,7 +284,6 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
         sLog.outDebug("CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionguid));
         return;
     }
-
     WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4+8+name.size()+1+1+4*13));
     data << GUID_LOPART(petitionguid);                      // guild/team guid (in Trinity always same as GUID_LOPART(petition guid)
     data << ownerguid;                                      // charter owner guid
@@ -360,25 +316,19 @@ void WorldSession::SendPetitionQueryOpcode(uint64 petitionguid)
         data << uint32(1);
     SendPacket(&data);
 }
-
 void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode MSG_PETITION_RENAME");   // ok
     //recv_data.hexlike();
-
     uint64 petitionguid;
     uint32 type;
     std::string newname;
-
     recv_data >> petitionguid;                              // guid
     recv_data >> newname;                                   // new name
-
     Item *item = _player->GetItemByGuid(petitionguid);
     if(!item)
         return;
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT type FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
-
     if(result)
     {
         Field* fields = result->Fetch();
@@ -390,7 +340,6 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recv_data)
         sLog.outDebug("CMSG_PETITION_QUERY failed for petition (GUID: %u)", GUID_LOPART(petitionguid));
         return;
     }
-
     if(type == 9)
     {
         if(objmgr.GetGuildByName(newname))
@@ -417,53 +366,43 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     std::string db_newname = newname;
     CharacterDatabase.escape_string(db_newname);
     CharacterDatabase.PExecute("UPDATE petition SET name = '%s' WHERE petitionguid = '%u'",
         db_newname.c_str(), GUID_LOPART(petitionguid));
-
     sLog.outDebug("Petition (GUID: %u) renamed to '%s'", GUID_LOPART(petitionguid), newname.c_str());
     WorldPacket data(MSG_PETITION_RENAME, (8+newname.size()+1));
     data << petitionguid;
     data << newname;
     SendPacket(&data);
 }
-
 void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode CMSG_PETITION_SIGN");    // ok
     //recv_data.hexlike();
-
     Field *fields;
     uint64 petitionguid;
     uint8 unk;
     recv_data >> petitionguid;                              // petition guid
     recv_data >> unk;
-
     QueryResult *result = CharacterDatabase.PQuery(
         "SELECT ownerguid, "
         "  (SELECT COUNT(playerguid) FROM petition_sign WHERE petition_sign.petitionguid = '%u') AS signs, "
         "  type "
         "FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid), GUID_LOPART(petitionguid));
-
     if(!result)
     {
         sLog.outError("Petition %u is not found for player %u %s", GUID_LOPART(petitionguid), GetPlayer()->GetGUIDLow(), GetPlayer()->GetName());
         return;
     }
-
     fields = result->Fetch();
     uint64 ownerguid = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER);
     uint8 signs = fields[1].GetUInt8();
     uint32 type = fields[2].GetUInt32();
-
     delete result;
-
     uint32 plguidlo = _player->GetGUIDLow();
     if(GUID_LOPART(ownerguid) == plguidlo)
         return;
-
     // not let enemies sign guild charter
     if(!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && GetPlayer()->GetTeam() != objmgr.GetPlayerTeamByGUID(ownerguid))
     {
@@ -473,7 +412,6 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
             SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
         return;
     }
-
     if(type != 9)
     {
         if(_player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
@@ -481,17 +419,14 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, "", _player->GetName(), ERR_ARENA_TEAM_PLAYER_TO_LOW);
             return;
         }
-
         uint8 slot = ArenaTeam::GetSlotByType(type);
         if(slot >= MAX_ARENA_SLOT)
             return;
-
         if(_player->GetArenaTeamId(slot))
         {
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_IN_ARENA_TEAM_S);
             return;
         }
-
         if(_player->GetArenaTeamIdInvited())
         {
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S);
@@ -511,14 +446,11 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     if(++signs > type)                                        // client signs maximum
         return;
-
     //client doesn't allow to sign petition two times by one character, but not check sign by another character from same account
     //not allow sign another player from already sign player account
     result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE player_account = '%u' AND petitionguid = '%u'", GetAccountId(), GUID_LOPART(petitionguid));
-
     if(result)
     {
         delete result;
@@ -526,56 +458,43 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket & recv_data)
         data << petitionguid;
         data << _player->GetGUID();
         data << (uint32)PETITION_SIGN_ALREADY_SIGNED;
-
         // close at signer side
         SendPacket(&data);
-
         // update for owner if online
         if(Player *owner = objmgr.GetPlayer(ownerguid))
             owner->GetSession()->SendPacket(&data);
         return;
     }
-
     CharacterDatabase.PExecute("INSERT INTO petition_sign (ownerguid,petitionguid, playerguid, player_account) VALUES ('%u', '%u', '%u','%u')", GUID_LOPART(ownerguid),GUID_LOPART(petitionguid), plguidlo,GetAccountId());
-
     sLog.outDebug("PETITION SIGN: GUID %u by player: %s (GUID: %u Account: %u)", GUID_LOPART(petitionguid), _player->GetName(),plguidlo,GetAccountId());
-
     WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4));
     data << petitionguid;
     data << _player->GetGUID();
     data << (uint32)PETITION_SIGN_OK;
-
     // close at signer side
     SendPacket(&data);
-
     // update signs count on charter, required testing...
     //Item *item = _player->GetItemByGuid(petitionguid));
     //if(item)
     //    item->SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1+1, signs);
-
     // update for owner if online
     if(Player *owner = objmgr.GetPlayer(ownerguid))
         owner->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode MSG_PETITION_DECLINE");  // ok
     //recv_data.hexlike();
-
     uint64 petitionguid;
     uint64 ownerguid;
     recv_data >> petitionguid;                              // petition guid
     sLog.outDebug("Petition %u declined by %u", GUID_LOPART(petitionguid), _player->GetGUIDLow());
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT ownerguid FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     if(!result)
         return;
-
     Field *fields = result->Fetch();
     ownerguid = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER);
     delete result;
-
     Player *owner = objmgr.GetPlayer(ownerguid);
     if(owner)                                               // petition owner online
     {
@@ -584,12 +503,10 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket & recv_data)
         owner->GetSession()->SendPacket(&data);
     }
 }
-
 void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode CMSG_OFFER_PETITION");   // ok
     //recv_data.hexlike();
-
     uint8 signs = 0;
     uint64 petitionguid, plguid;
     uint32 type, junk;
@@ -597,21 +514,16 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data)
     recv_data >> junk;                                      // this is not petition type!
     recv_data >> petitionguid;                              // petition guid
     recv_data >> plguid;                                    // player guid
-
     player = ObjectAccessor::FindPlayer(plguid);
     if (!player)
         return;
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT type FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     if (!result)
         return;
-
     Field *fields = result->Fetch();
     type = fields[0].GetUInt32();
     delete result;
-
     sLog.outDebug("OFFER PETITION: type %u, GUID1 %u, to player id: %u", type, GUID_LOPART(petitionguid), GUID_LOPART(plguid));
-
     if (!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && GetPlayer()->GetTeam() != player->GetTeam() )
     {
         if(type != 9)
@@ -620,7 +532,6 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data)
             SendGuildCommandResult(GUILD_CREATE_S, "", GUILD_NOT_ALLIED);
         return;
     }
-
     if(type != 9)
     {
         if(player->getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
@@ -629,18 +540,15 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data)
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName(), "", ERR_ARENA_TEAM_PLAYER_TO_LOW);
             return;
         }
-
         uint8 slot = ArenaTeam::GetSlotByType(type);
         if(slot >= MAX_ARENA_SLOT)
             return;
-
         if(player->GetArenaTeamId(slot))
         {
             // player is already in an arena team
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_CREATE_S, player->GetName(), "", ERR_ALREADY_IN_ARENA_TEAM_S);
             return;
         }
-
         if(player->GetArenaTeamIdInvited())
         {
             SendArenaTeamCommandResult(ERR_ARENA_TEAM_INVITE_SS, "", _player->GetName(), ERR_ALREADY_INVITED_TO_ARENA_TEAM_S);
@@ -654,56 +562,43 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket & recv_data)
             SendGuildCommandResult(GUILD_INVITE_S, _player->GetName(), ALREADY_IN_GUILD);
             return;
         }
-
         if(player->GetGuildIdInvited())
         {
             SendGuildCommandResult(GUILD_INVITE_S, _player->GetName(), ALREADY_INVITED_TO_GUILD);
             return;
         }
     }
-
     result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     // result==NULL also correct charter without signs
     if(result)
         signs = result->GetRowCount();
-
     WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+signs+signs*12));
     data << petitionguid;                                   // petition guid
     data << _player->GetGUID();                             // owner guid
     data << GUID_LOPART(petitionguid);                      // guild guid (in Trinity always same as GUID_LOPART(petition guid)
     data << signs;                                          // sign's count
-
     for(uint8 i = 1; i <= signs; ++i)
     {
         Field *fields2 = result->Fetch();
         plguid = fields2[0].GetUInt64();
-
         data << plguid;                                     // Player GUID
         data << (uint32)0;                                  // there 0 ...
-
         result->NextRow();
     }
-
     delete result;
     player->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received opcode CMSG_TURN_IN_PETITION"); // ok
     //recv_data.hexlike();
-
     WorldPacket data;
     uint64 petitionguid;
-
     uint32 ownerguidlo;
     uint32 type;
     std::string name;
-
     recv_data >> petitionguid;
-
     sLog.outDebug("Petition %u turned in by %u", GUID_LOPART(petitionguid), _player->GetGUIDLow());
-
     // data
     QueryResult *result = CharacterDatabase.PQuery("SELECT ownerguid, name, type FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     if(result)
@@ -719,7 +614,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
         sLog.outError("petition table has broken data!");
         return;
     }
-
     if(type == 9)
     {
         if(_player->GetGuildId())
@@ -735,7 +629,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
         uint8 slot = ArenaTeam::GetSlotByType(type);
         if(slot >= MAX_ARENA_SLOT)
             return;
-
         if(_player->GetArenaTeamId(slot))
         {
             //data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4);
@@ -745,10 +638,8 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     if(_player->GetGUIDLow() != ownerguidlo)
         return;
-
     // signs
     uint8 signs;
     result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
@@ -756,7 +647,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
         signs = result->GetRowCount();
     else
         signs = 0;
-
     uint32 count;
     //if(signs < sWorld.getConfig(CONFIG_MIN_PETITION_SIGNS))
     if(type == 9)
@@ -771,7 +661,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
         delete result;
         return;
     }
-
     if(type == 9)
     {
         if(objmgr.GetGuildByName(name))
@@ -790,7 +679,6 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
             return;
         }
     }
-
     // and at last charter item check
     Item *item = _player->GetItemByGuid(petitionguid);
     if(!item)
@@ -798,12 +686,9 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
         delete result;
         return;
     }
-
     // OK!
-
     // delete charter item
     _player->DestroyItem(item->GetBagSlot(),item->GetSlot(), true);
-
     if(type == 9)                                           // create guild
     {
         Guild* guild = new Guild;
@@ -813,10 +698,8 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
             delete result;
             return;
         }
-
         // register guild and add guildmaster
         objmgr.AddGuild(guild);
-
         // add members
         for(uint8 i = 0; i < signs; ++i)
         {
@@ -835,16 +718,12 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
             delete result;
             return;
         }
-
         uint32 icon, iconcolor, border, bordercolor, backgroud;
         recv_data >> backgroud >> icon >> iconcolor >> border >> bordercolor;
-
         at->SetEmblem(backgroud, icon, iconcolor, border, bordercolor);
-
         // register team and add captain
         objmgr.AddArenaTeam(at);
         sLog.outDebug("PetitonsHandler: arena team added to objmrg");
-
         // add members
         for(uint8 i = 0; i < signs; ++i)
         {
@@ -855,33 +734,25 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket & recv_data)
             result->NextRow();
         }
     }
-
     delete result;
-
     CharacterDatabase.BeginTransaction();
     CharacterDatabase.PExecute("DELETE FROM petition WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE petitionguid = '%u'", GUID_LOPART(petitionguid));
     CharacterDatabase.CommitTransaction();
-
     // created
     sLog.outDebug("TURN IN PETITION GUID %u", GUID_LOPART(petitionguid));
-
     data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4);
     data << (uint32)PETITION_TURN_OK;
     SendPacket(&data);
 }
-
 void WorldSession::HandlePetitionShowListOpcode(WorldPacket & recv_data)
 {
     sLog.outDebug("Received CMSG_PETITION_SHOWLIST");       // ok
     //recv_data.hexlike();
-
     uint64 guid;
     recv_data >> guid;
-
     SendPetitionShowList(guid);
 }
-
 void WorldSession::SendPetitionShowList(uint64 guid)
 {
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_PETITIONER);
@@ -890,17 +761,14 @@ void WorldSession::SendPetitionShowList(uint64 guid)
         sLog.outDebug("WORLD: HandlePetitionShowListOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)));
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     uint8 count = 0;
     if(pCreature->isTabardDesigner())
         count = 1;
     else
         count = 3;
-
     WorldPacket data(SMSG_PETITION_SHOWLIST, 8+1+4*6);
     data << guid;                                           // npc guid
     data << count;                                          // count
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 2d49a7559e9..0fb078fc7c6 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Language.h"
 #include "Database/DatabaseEnv.h"
@@ -65,23 +64,17 @@
 #include "GameEventMgr.h"
 #include "AchievementMgr.h"
 #include "SpellAuras.h"
-
 #include <cmath>
-
 #define ZONE_UPDATE_INTERVAL (1*IN_MILISECONDS)
-
 #define PLAYER_SKILL_INDEX(x)       (PLAYER_SKILL_INFO_1_1 + ((x)*3))
 #define PLAYER_SKILL_VALUE_INDEX(x) (PLAYER_SKILL_INDEX(x)+1)
 #define PLAYER_SKILL_BONUS_INDEX(x) (PLAYER_SKILL_INDEX(x)+2)
-
 #define SKILL_VALUE(x)         PAIR32_LOPART(x)
 #define SKILL_MAX(x)           PAIR32_HIPART(x)
 #define MAKE_SKILL_VALUE(v, m) MAKE_PAIR32(v,m)
-
 #define SKILL_TEMP_BONUS(x)    int16(PAIR32_LOPART(x))
 #define SKILL_PERM_BONUS(x)    int16(PAIR32_HIPART(x))
 #define MAKE_SKILL_BONUS(t, p) MAKE_PAIR32(t,p)
-
 enum CharacterFlags
 {
     CHARACTER_FLAG_NONE                 = 0x00000000,
@@ -118,21 +111,16 @@ enum CharacterFlags
     CHARACTER_FLAG_UNK31                = 0x40000000,
     CHARACTER_FLAG_UNK32                = 0x80000000
 };
-
 // corpse reclaim times
 #define DEATH_EXPIRE_STEP (5*MINUTE)
 #define MAX_DEATH_COUNT 3
-
 static uint32 copseReclaimDelay[MAX_DEATH_COUNT] = { 30, 60, 120 };
-
 //== PlayerTaxi ================================================
-
 PlayerTaxi::PlayerTaxi()
 {
     // Taxi nodes
     memset(m_taximask, 0, sizeof(m_taximask));
 }
-
 void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 level)
 {
     // class specific initial known nodes
@@ -145,7 +133,6 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 leve
             break;
         }
     }
-
     // race specific initial known nodes: capital and taxi hub masks
     switch(race)
     {
@@ -161,7 +148,6 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 leve
         case RACE_BLOODELF: SetTaximaskNode(82); break;     // Blood Elf
         case RACE_DRAENEI:  SetTaximaskNode(94); break;     // Draenei
     }
-
     // new continent starting masks (It will be accessible only at new map)
     switch(Player::TeamForRace(race))
     {
@@ -172,11 +158,9 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 leve
     if(level>=68)
         SetTaximaskNode(213);                               //Shattered Sun Staging Area
 }
-
 void PlayerTaxi::LoadTaxiMask(const char* data)
 {
     Tokens tokens = StrSplit(data, " ");
-
     uint8 index;
     Tokens::iterator iter;
     for (iter = tokens.begin(), index = 0;
@@ -186,7 +170,6 @@ void PlayerTaxi::LoadTaxiMask(const char* data)
         m_taximask[index] = sTaxiNodesMask[index] & uint32(atol((*iter).c_str()));
     }
 }
-
 void PlayerTaxi::AppendTaximaskTo( ByteBuffer& data, bool all )
 {
     if(all)
@@ -200,26 +183,20 @@ void PlayerTaxi::AppendTaximaskTo( ByteBuffer& data, bool all )
             data << uint32(m_taximask[i]);                  // known nodes
     }
 }
-
 bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint32 team )
 {
     ClearTaxiDestinations();
-
     Tokens tokens = StrSplit(values," ");
-
     for(Tokens::iterator iter = tokens.begin(); iter != tokens.end(); ++iter)
     {
         uint32 node = uint32(atol(iter->c_str()));
         AddTaxiDestination(node);
     }
-
     if(m_TaxiDestinations.empty())
         return true;
-
     // Check integrity
     if(m_TaxiDestinations.size() < 2)
         return false;
-
     for(size_t i = 1; i < m_TaxiDestinations.size(); ++i)
     {
         uint32 cost;
@@ -228,40 +205,29 @@ bool PlayerTaxi::LoadTaxiDestinationsFromString( const std::string& values, uint
         if(!path)
             return false;
     }
-
     // can't load taxi path without mount set (quest taxi path?)
     if(!objmgr.GetTaxiMountDisplayId(GetTaxiSource(),team,true))
         return false;
-
     return true;
 }
-
 std::string PlayerTaxi::SaveTaxiDestinationsToString()
 {
     if(m_TaxiDestinations.empty())
         return "";
-
     std::ostringstream ss;
-
     for(size_t i=0; i < m_TaxiDestinations.size(); ++i)
         ss << m_TaxiDestinations[i] << " ";
-
     return ss.str();
 }
-
 uint32 PlayerTaxi::GetCurrentTaxiPath() const
 {
     if(m_TaxiDestinations.size() < 2)
         return 0;
-
     uint32 path;
     uint32 cost;
-
     objmgr.GetTaxiPath(m_TaxiDestinations[0],m_TaxiDestinations[1],path,cost);
-
     return path;
 }
-
 std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi)
 {
     ss << "'";
@@ -270,94 +236,62 @@ std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi)
     ss << "'";
     return ss;
 }
-
 //== Player ====================================================
-
 UpdateMask Player::updateVisualBits;
-
 Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputationMgr(this)
 {
     m_speakTime = 0;
     m_speakCount = 0;
-
     m_objectType |= TYPEMASK_PLAYER;
     m_objectTypeId = TYPEID_PLAYER;
-
     m_valuesCount = PLAYER_END;
-
     m_session = session;
-
     m_divider = 0;
-
     m_ExtraFlags = 0;
-
     m_spellModTakingSpell = NULL;
     m_pad = 0;
-
     // players always accept
     if(GetSession()->GetSecurity() == SEC_PLAYER)
         SetAcceptWhispers(true);
-
     m_curSelection = 0;
     m_lootGuid = 0;
-
     m_comboTarget = 0;
     m_comboPoints = 0;
-
     m_usedTalentCount = 0;
     m_questRewardTalentCount = 0;
-
     m_regenTimer = 0;
     m_regenTimerCount = 0;
     m_weaponChangeTimer = 0;
-
     m_zoneUpdateId = 0;
     m_zoneUpdateTimer = 0;
-
     m_areaUpdateId = 0;
-
     m_nextSave = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
-
     clearResurrectRequestData();
-
     memset(m_items, 0, sizeof(Item*)*PLAYER_SLOTS_COUNT);
-
     m_social = NULL;
-
     // group is initialized in the reference constructor
     SetGroupInvite(NULL);
     m_groupUpdateMask = 0;
     m_auraRaidUpdateMask = 0;
-
     duel = NULL;
-
     m_GuildIdInvited = 0;
     m_ArenaTeamIdInvited = 0;
-
     m_atLoginFlags = AT_LOGIN_NONE;
-
     mSemaphoreTeleport_Near = false;
     mSemaphoreTeleport_Far = false;
-
     m_DelayedOperations = 0;
     m_bCanDelayTeleport = false;
     m_bHasDelayedTeleport = false;
     m_teleport_options = 0;
-
     pTrader = 0;
     ClearTrade();
-
     m_cinematic = 0;
-
     PlayerTalkClass = new PlayerMenu( GetSession() );
     m_currentBuybackSlot = BUYBACK_SLOT_START;
-
     m_DailyQuestChanged = false;
     m_lastDailyQuestTime = 0;
-
     for (uint8 i=0; i<MAX_TIMERS; i++)
         m_MirrorTimer[i] = DISABLED_MIRROR_TIMER;
-
     m_MirrorTimerFlags = UNDERWATER_NONE;
     m_MirrorTimerFlagsLast = UNDERWATER_NONE;
     m_isInWater = false;
@@ -366,17 +300,13 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
     m_restTime = 0;
     m_deathTimer = 0;
     m_deathExpireTime = 0;
-
     m_swingErrorMsg = 0;
-
     m_DetectInvTimer = 1*IN_MILISECONDS;
-
     for (int j=0; j < PLAYER_MAX_BATTLEGROUND_QUEUES; ++j)
     {
         m_bgBattleGroundQueueID[j].bgQueueTypeId  = BATTLEGROUND_QUEUE_NONE;
         m_bgBattleGroundQueueID[j].invitedToInstance = 0;
     }
-
     m_logintime = time(NULL);
     m_Last_tick = m_logintime;
     m_WeaponProficiency = 0;
@@ -386,14 +316,12 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
     m_canDualWield = false;
     m_canTitanGrip = false;
     m_ammoDPS = 0.0f;
-
     m_temporaryUnsummonedPetNumber = 0;
     //cache for UNIT_CREATED_BY_SPELL to allow
     //returning reagents for temporarily removed pets
     //when dying/logging out
     m_oldpetspell = 0;
     m_lastpetnumber = 0;
-
     ////////////////////Rest System/////////////////////
     time_inn_enter=0;
     inn_pos_mapid=0;
@@ -403,187 +331,134 @@ Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputa
     m_rest_bonus=0;
     rest_type=REST_TYPE_NO;
     ////////////////////Rest System/////////////////////
-
     m_mailsLoaded = false;
     m_mailsUpdated = false;
     unReadMails = 0;
     m_nextMailDelivereTime = 0;
-
     m_resetTalentsCost = 0;
     m_resetTalentsTime = 0;
     m_itemUpdateQueueBlocked = false;
-
     for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
         m_forced_speed_changes[i] = 0;
-
     m_stableSlots = 0;
-
     /////////////////// Instance System /////////////////////
-
     m_HomebindTimer = 0;
     m_InstanceValid = true;
     m_dungeonDifficulty = DIFFICULTY_NORMAL;
-
     m_lastPotionId = 0;
-
     m_activeSpec = 0;
     m_specsCount = 0;
-
     for (uint8 i = 0; i < MAX_TALENT_SPECS; ++i)
     {
         for (int g = 0; g < MAX_GLYPH_SLOT_INDEX; ++g)
             m_Glyphs[i][g] = 0;
-
         m_talents[i] = new PlayerTalentMap();
     }
-
     for (int i = 0; i < BASEMOD_END; ++i)
     {
         m_auraBaseMod[i][FLAT_MOD] = 0.0f;
         m_auraBaseMod[i][PCT_MOD] = 1.0f;
     }
-
     for (uint8 i = 0; i < MAX_COMBAT_RATING; i++)
         m_baseRatingValue[i] = 0;
-
     m_baseSpellPower = 0;
     m_baseFeralAP = 0;
     m_baseManaRegen = 0;
-
     // Honor System
     m_lastHonorUpdateTime = time(NULL);
-
     // Player summoning
     m_summon_expire = 0;
     m_summon_mapid = 0;
     m_summon_x = 0.0f;
     m_summon_y = 0.0f;
     m_summon_z = 0.0f;
-
     //Default movement to run mode
     //m_unit_movement_flags = 0;
-
     m_mover = this;
     m_movedPlayer = this;
     m_seer = this;
-
     m_contestedPvPTimer = 0;
-
     m_declinedname = NULL;
-
     m_isActive = true;
-
     m_runes = NULL;
-
     m_lastFallTime = 0;
     m_lastFallZ = 0;
-
     m_ControlledByPlayer = true;
     m_isWorldObject = true;
-
     sWorld.IncreasePlayerCount();
-
     m_ChampioningFaction = 0;
-
     for(int i = 0; i < MAX_POWERS; ++i)
         m_powerFraction[i] = 0;
 }
-
 Player::~Player ()
 {
     // it must be unloaded already in PlayerLogout and accessed only for loggined player
     //m_social = NULL;
-
     // Note: buy back item already deleted from DB when player was saved
     for(uint8 i = 0; i < PLAYER_SLOTS_COUNT; ++i)
     {
         if(m_items[i])
             delete m_items[i];
     }
-
     for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
         delete itr->second;
-
     for (uint8 i = 0; i < MAX_TALENT_SPECS; ++i)
     {
         for (PlayerTalentMap::const_iterator itr = m_talents[i]->begin(); itr != m_talents[i]->end(); ++itr)
             delete itr->second;
         delete m_talents[i];
     }
-
     //all mailed items should be deleted, also all mail should be deallocated
     for (PlayerMails::iterator itr =  m_mail.begin(); itr != m_mail.end();++itr)
         delete *itr;
-
     for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter)
         delete iter->second;                                //if item is duplicated... then server may crash ... but that item should be deallocated
-
     delete PlayerTalkClass;
-
     for(size_t x = 0; x < ItemSetEff.size(); x++)
         if(ItemSetEff[x])
             delete ItemSetEff[x];
-
     delete m_declinedname;
     delete m_runes;
-
     sWorld.DecreasePlayerCount();
 }
-
 void Player::CleanupsBeforeDelete()
 {
     TradeCancel(false);
     DuelComplete(DUEL_INTERUPTED);
-
     Unit::CleanupsBeforeDelete();
-
     if (m_transport)
         m_transport->RemovePassenger(this);
-
     // clean up player-instance binds, may unload some instance saves
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i)
         for(BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
             itr->second.save->RemovePlayer(this);
 }
-
 bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId )
 {
     //FIXME: outfitId not used in player creating
-
     Object::_Create(guidlow, 0, HIGHGUID_PLAYER);
-
     m_name = name;
-
     PlayerInfo const* info = objmgr.GetPlayerInfo(race, class_);
     if(!info)
     {
         sLog.outError("Player have incorrect race/class pair. Can't be loaded.");
         return false;
     }
-
     for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; i++)
         m_items[i] = NULL;
-
     Relocate(info->positionX,info->positionY,info->positionZ);
-
     ChrClassesEntry const* cEntry = sChrClassesStore.LookupEntry(class_);
     if(!cEntry)
     {
         sLog.outError("Class %u not found in DBC (Wrong DBC files?)",class_);
         return false;
     }
-
     SetMap(MapManager::Instance().CreateMap(info->mapId, this, 0));
-
     uint8 powertype = cEntry->powerType;
-
     SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, DEFAULT_WORLD_OBJECT_SIZE);
     SetFloatValue(UNIT_FIELD_COMBATREACH, 1.5f);
-
     setFactionForRace(race);
-
     uint32 RaceClassGender = ( race ) | ( class_ << 8 ) | ( gender << 16 );
-
     SetUInt32Value(UNIT_FIELD_BYTES_0, ( RaceClassGender | ( powertype << 24 ) ) );
     InitDisplayIds();
     if(sWorld.getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_PVP || sWorld.getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_RPPVP)
@@ -594,18 +469,14 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);               // fix cast time showed in spell tooltip on client
     SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f);            // default for players in 3.0.3
-
                                                             // -1 is default value
     SetUInt32Value(PLAYER_FIELD_WATCHED_FACTION_INDEX, uint32(-1));
-
     SetUInt32Value(PLAYER_BYTES, (skin | (face << 8) | (hairStyle << 16) | (hairColor << 24)));
     SetUInt32Value(PLAYER_BYTES_2, (facialHair | (0x00 << 8) | (0x00 << 16) | (0x02 << 24)));
     SetByteValue(PLAYER_BYTES_3, 0, gender);
-
     SetUInt32Value( PLAYER_GUILDID, 0 );
     SetUInt32Value( PLAYER_GUILDRANK, 0 );
     SetUInt32Value( PLAYER_GUILD_TIMESTAMP, 0 );
-
     SetUInt64Value( PLAYER__FIELD_KNOWN_TITLES, 0 );        // 0=disabled
     SetUInt64Value( PLAYER__FIELD_KNOWN_TITLES1, 0 );       // 0=disabled
     SetUInt64Value( PLAYER__FIELD_KNOWN_TITLES2, 0 );       // 0=disabled
@@ -614,34 +485,27 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
     SetUInt32Value( PLAYER_FIELD_LIFETIME_HONORABLE_KILLS, 0 );
     SetUInt32Value( PLAYER_FIELD_TODAY_CONTRIBUTION, 0 );
     SetUInt32Value( PLAYER_FIELD_YESTERDAY_CONTRIBUTION, 0 );
-
     // set starting level
     uint32 start_level = getClass() != CLASS_DEATH_KNIGHT
         ? sWorld.getConfig(CONFIG_START_PLAYER_LEVEL)
         : sWorld.getConfig(CONFIG_START_HEROIC_PLAYER_LEVEL);
-
     if (GetSession()->GetSecurity() >= SEC_MODERATOR)
     {
         uint32 gm_level = sWorld.getConfig(CONFIG_START_GM_LEVEL);
         if(gm_level > start_level)
             start_level = gm_level;
     }
-
     SetUInt32Value(UNIT_FIELD_LEVEL, start_level);
-
     InitRunes();
-
     SetUInt32Value (PLAYER_FIELD_COINAGE, sWorld.getConfig(CONFIG_START_PLAYER_MONEY));
     SetUInt32Value (PLAYER_FIELD_HONOR_CURRENCY, sWorld.getConfig(CONFIG_START_HONOR_POINTS));
     SetUInt32Value (PLAYER_FIELD_ARENA_CURRENCY, sWorld.getConfig(CONFIG_START_ARENA_POINTS));
-
     // start with every map explored
     if(sWorld.getConfig(CONFIG_START_ALL_EXPLORED))
     {
         for (uint8 i=0; i<64; i++)
             SetFlag(PLAYER_EXPLORED_ZONES_1+i,0xFFFFFFFF);
     }
-
     //Reputations if "StartAllReputation" is enabled, -- TODO: Fix this in a better way
     if(sWorld.getConfig(CONFIG_START_ALL_REP))
     {
@@ -656,7 +520,6 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
         GetReputationMgr().SetReputation(sFactionStore.LookupEntry(934),42999);
         GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1038),42999);
         GetReputationMgr().SetReputation(sFactionStore.LookupEntry(1077),42999);
-
         // Factions depending on team, like cities and some more stuff
         switch(GetTeam())
         {
@@ -684,19 +547,16 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
             break;
         }
     }
-
     // Played time
     m_Last_tick = time(NULL);
     m_Played_time[PLAYED_TIME_TOTAL] = 0;
     m_Played_time[PLAYED_TIME_LEVEL] = 0;
-
     // base stats and related field values
     InitStatsForLevel();
     InitTaxiNodesForLevel();
     InitGlyphsForLevel();
     InitTalentForLevel();
     InitPrimaryProfessions();                               // to max set before any spell added
-
     // apply original stats mods before spell loading or item equipment that call before equip _RemoveStatsMods()
     UpdateMaxHealth();                                      // Update max Health (for add bonus from stamina)
     SetHealth(GetMaxHealth());
@@ -705,7 +565,6 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
         UpdateMaxPower(POWER_MANA);                         // Update max Mana (for add bonus from intellect)
         SetPower(POWER_MANA,GetMaxPower(POWER_MANA));
     }
-
     if(getPowerType() == POWER_RUNIC_POWER)
     {
         SetPower(POWER_RUNE, 8);
@@ -713,14 +572,11 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
         SetPower(POWER_RUNIC_POWER, 0);
         SetMaxPower(POWER_RUNIC_POWER, 1000);
     }
-
     // original spells
     learnDefaultSpells();
-
     // original action bar
     for (PlayerCreateInfoActions::const_iterator action_itr = info->action.begin(); action_itr != info->action.end(); ++action_itr)
         addActionButton(action_itr->button,action_itr->action,action_itr->type);
-
     // original items
     CharStartOutfitEntry const* oEntry = NULL;
     for (uint32 i = 1; i < sCharStartOutfitStore.GetNumRows(); ++i)
@@ -734,30 +590,24 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
             }
         }
     }
-
     if(oEntry)
     {
         for(int j = 0; j < MAX_OUTFIT_ITEMS; ++j)
         {
             if(oEntry->ItemId[j] <= 0)
                 continue;
-
             uint32 item_id = oEntry->ItemId[j];
-
             // Hack for not existed item id in dbc 3.0.3
             if(item_id==40582)
                 continue;
-
             ItemPrototype const* iProto = objmgr.GetItemPrototype(item_id);
             if(!iProto)
             {
                 sLog.outErrorDb("Initial item id %u (race %u class %u) from CharStartOutfit.dbc not listed in `item_template`, ignoring.",item_id,getRace(),getClass());
                 continue;
             }
-
             // BuyCount by default
             uint32 count = iProto->BuyCount;
-
             // special amount for food/drink
             if(iProto->Class==ITEM_CLASS_CONSUMABLE && iProto->SubClass==ITEM_SUBCLASS_FOOD)
             {
@@ -773,14 +623,11 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
                 if(iProto->Stackable < count)
                     count = iProto->Stackable;
             }
-
             StoreNewItemInBestSlots(item_id, count);
         }
     }
-
     for (PlayerCreateInfoItems::const_iterator item_id_itr = info->item.begin(); item_id_itr!=info->item.end(); ++item_id_itr++)
         StoreNewItemInBestSlots(item_id_itr->item_id, item_id_itr->item_amount);
-
     // bags and main-hand weapon must equipped at this moment
     // now second pass for not equipped (offhand weapon/shield if it attempt equipped before main-hand weapon)
     // or ammo not equipped in special bag
@@ -806,7 +653,6 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
                     RemoveItem(INVENTORY_SLOT_BAG_0, i,true);
                     pItem = StoreItem( sDest, pItem, true);
                 }
-
                 // if  this is ammo then use it
                 msg = CanUseAmmo( pItem->GetEntry() );
                 if( msg == EQUIP_ERR_OK )
@@ -815,14 +661,11 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
         }
     }
     // all item positions resolved
-
     return true;
 }
-
 bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount)
 {
     sLog.outDebug("STORAGE: Creating initial item, itemId = %u, count = %u",titem_id, titem_amount);
-
     // attempt equip by one
     while(titem_amount > 0)
     {
@@ -830,15 +673,12 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount)
         uint8 msg = CanEquipNewItem( NULL_SLOT, eDest, titem_id, false );
         if( msg != EQUIP_ERR_OK )
             break;
-
         EquipNewItem( eDest, titem_id, true);
         AutoUnequipOffhandIfNeed();
         --titem_amount;
     }
-
     if(titem_amount == 0)
         return true;                                        // equipped
-
     // attempt store
     ItemPosCountVec sDest;
     // store in main bag to simplify second pass (special bags can be not equipped yet at this moment)
@@ -848,12 +688,10 @@ bool Player::StoreNewItemInBestSlots(uint32 titem_id, uint32 titem_amount)
         StoreNewItem( sDest, titem_id, true, Item::GenerateItemRandomPropertyId(titem_id) );
         return true;                                        // stored
     }
-
     // item can't be added
     sLog.outError("STORAGE: Can't equip or store initial item %u for race %u class %u , error msg = %u",titem_id,getRace(),getClass(),msg);
     return false;
 }
-
 void Player::SendMirrorTimer(MirrorTimerType Type, uint32 MaxValue, uint32 CurrentValue, int32 Regen)
 {
     if (int(MaxValue) == DISABLED_MIRROR_TIMER)
@@ -871,7 +709,6 @@ void Player::SendMirrorTimer(MirrorTimerType Type, uint32 MaxValue, uint32 Curre
     data << (uint32)0;                                      // spell id
     GetSession()->SendPacket( &data );
 }
-
 void Player::StopMirrorTimer(MirrorTimerType Type)
 {
     m_MirrorTimer[Type] = DISABLED_MIRROR_TIMER;
@@ -879,12 +716,10 @@ void Player::StopMirrorTimer(MirrorTimerType Type)
     data << (uint32)Type;
     GetSession()->SendPacket( &data );
 }
-
 uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
 {
     if(!isAlive() || isGameMaster())
         return 0;
-
     // Absorb, resist some environmental damage type
     uint32 absorb = 0;
     uint32 resist = 0;
@@ -892,11 +727,8 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
         CalcAbsorbResist(this, SPELL_SCHOOL_MASK_FIRE, DIRECT_DAMAGE, damage, &absorb, &resist);
     else if (type == DAMAGE_SLIME)
         CalcAbsorbResist(this, SPELL_SCHOOL_MASK_NATURE, DIRECT_DAMAGE, damage, &absorb, &resist);
-
     damage-=absorb+resist;
-
     DealDamageMods(this,damage,&absorb);
-
     WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21));
     data << uint64(GetGUID());
     data << uint8(type!=DAMAGE_FALL_TO_VOID ? type : DAMAGE_FALL);
@@ -904,9 +736,7 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
     data << uint32(absorb);
     data << uint32(resist);
     SendMessageToSet(&data, true);
-
     uint32 final_damage = DealDamage(this, damage, NULL, SELF_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
-
     if(!isAlive())
     {
         if(type==DAMAGE_FALL)                               // DealDamage not apply item durability loss at self damage
@@ -917,13 +747,10 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage)
             WorldPacket data2(SMSG_DURABILITY_DAMAGE_DEATH, 0);
             GetSession()->SendPacket(&data2);
         }
-
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATHS_FROM, 1, type);
     }
-
     return final_damage;
 }
-
 int32 Player::getMaxTimer(MirrorTimerType timer)
 {
     switch (timer)
@@ -951,19 +778,16 @@ int32 Player::getMaxTimer(MirrorTimerType timer)
     }
     return 0;
 }
-
 void Player::UpdateMirrorTimers()
 {
     // Desync flags for update on next HandleDrowning
     if (m_MirrorTimerFlags)
         m_MirrorTimerFlagsLast = ~m_MirrorTimerFlags;
 }
-
 void Player::HandleDrowning(uint32 time_diff)
 {
     if (!m_MirrorTimerFlags)
         return;
-
     // In water
     if (m_MirrorTimerFlags & UNDERWATER_INWATER)
     {
@@ -999,7 +823,6 @@ void Player::HandleDrowning(uint32 time_diff)
         else if (m_MirrorTimerFlagsLast & UNDERWATER_INWATER)
             SendMirrorTimer(BREATH_TIMER, UnderWaterTime, m_MirrorTimer[BREATH_TIMER], 10);
     }
-
     // In dark water
     if (m_MirrorTimerFlags & UNDERWARER_INDARKWATER)
     {
@@ -1037,7 +860,6 @@ void Player::HandleDrowning(uint32 time_diff)
         else if (m_MirrorTimerFlagsLast & UNDERWARER_INDARKWATER)
             SendMirrorTimer(FATIGUE_TIMER, DarkWaterTime, m_MirrorTimer[FATIGUE_TIMER], 10);
     }
-
     if (m_MirrorTimerFlags & (UNDERWATER_INLAVA|UNDERWATER_INSLIME))
     {
         // Breath timer not activated - activate it
@@ -1061,7 +883,6 @@ void Player::HandleDrowning(uint32 time_diff)
     }
     else
         m_MirrorTimer[FIRE_TIMER] = DISABLED_MIRROR_TIMER;
-
     // Recheck timers flag
     m_MirrorTimerFlags&=~UNDERWATER_EXIST_TIMERS;
     for (uint8 i = 0; i< MAX_TIMERS; ++i)
@@ -1072,16 +893,13 @@ void Player::HandleDrowning(uint32 time_diff)
         }
     m_MirrorTimerFlagsLast = m_MirrorTimerFlags;
 }
-
 ///The player sobers by 256 every 10 seconds
 void Player::HandleSobering()
 {
     m_drunkTimer = 0;
-
     uint32 drunk = (m_drunk <= 256) ? 0 : (m_drunk - 256);
     SetDrunkValue(drunk);
 }
-
 DrunkenState Player::GetDrunkenstateByValue(uint16 value)
 {
     if(value >= 23000)
@@ -1092,48 +910,37 @@ DrunkenState Player::GetDrunkenstateByValue(uint16 value)
         return DRUNKEN_TIPSY;
     return DRUNKEN_SOBER;
 }
-
 void Player::SetDrunkValue(uint16 newDrunkenValue, uint32 itemId)
 {
     uint32 oldDrunkenState = Player::GetDrunkenstateByValue(m_drunk);
-
     m_drunk = newDrunkenValue;
     SetUInt32Value(PLAYER_BYTES_3,(GetUInt32Value(PLAYER_BYTES_3) & 0xFFFF0001) | (m_drunk & 0xFFFE));
-
     uint32 newDrunkenState = Player::GetDrunkenstateByValue(m_drunk);
-
     // special drunk invisibility detection
     if(newDrunkenState >= DRUNKEN_DRUNK)
         m_detectInvisibilityMask |= (1<<6);
     else
         m_detectInvisibilityMask &= ~(1<<6);
-
     if(newDrunkenState == oldDrunkenState)
         return;
-
     WorldPacket data(SMSG_CROSSED_INEBRIATION_THRESHOLD, (8+4+4));
     data << uint64(GetGUID());
     data << uint32(newDrunkenState);
     data << uint32(itemId);
-
     SendMessageToSet(&data, true);
 }
-
 void Player::Update( uint32 p_time )
 {
     if(!IsInWorld())
         return;
-
     // undelivered mail
     if(m_nextMailDelivereTime && m_nextMailDelivereTime <= time(NULL))
     {
         SendNewMail();
         ++unReadMails;
-
         // It will be recalculate at mailbox open (for unReadMails important non-0 until mailbox open, it also will be recalculated)
         m_nextMailDelivereTime = 0;
     }
-
     // If this is set during update SetSpellModTakingSpell call is missing somewhere in the code
     // Having this would prevent more aura charges to be dropped, so let's crash
     //assert (!m_spellModTakingSpell);
@@ -1145,35 +952,25 @@ void Player::Update( uint32 p_time )
         assert(false);
         m_spellModTakingSpell = NULL;
     }
-
     //used to implement delayed far teleports
     SetCanDelayTeleport(true);
     Unit::Update( p_time );
     SetCanDelayTeleport(false);
-
     time_t now = time (NULL);
-
     UpdatePvPFlag(now);
-
     UpdateContestedPvP(p_time);
-
     UpdateDuelFlag(now);
-
     CheckDuelDistance(now);
-
     UpdateAfkReport(now);
-
     if(isCharmed())
     {
         if(Unit *charmer = GetCharmer())
             if(charmer->GetTypeId() == TYPEID_UNIT && charmer->isAlive())
                 UpdateCharmedAI();
     }
-
     // Update items that have just a limited lifetime
     if (now>m_Last_tick)
         UpdateItemDuration(uint32(now- m_Last_tick));
-
     if (!m_timedquests.empty())
     {
         std::set<uint32>::iterator iter = m_timedquests.begin();
@@ -1194,14 +991,12 @@ void Player::Update( uint32 p_time )
             }
         }
     }
-
     if (hasUnitState(UNIT_STAT_MELEE_ATTACKING) && !hasUnitState(UNIT_STAT_CASTING))
     {
         if(Unit *pVictim = getVictim())
         {
             // default combat reach 10
             // TODO add weapon,skill check
-
             if (isAttackReady(BASE_ATTACK))
             {
                 if(!IsWithinMeleeRange(pVictim))
@@ -1226,7 +1021,6 @@ void Player::Update( uint32 p_time )
                 else
                 {
                     m_swingErrorMsg = 0;                    // reset swing error state
-
                     // prevent base and off attack in same time, delay attack at 0.2 sec
                     if(haveOffhandWeapon())
                     {
@@ -1238,7 +1032,6 @@ void Player::Update( uint32 p_time )
                     resetAttackTimer(BASE_ATTACK);
                 }
             }
-
             if ( haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
             {
                 if(!IsWithinMeleeRange(pVictim))
@@ -1260,7 +1053,6 @@ void Player::Update( uint32 p_time )
                     resetAttackTimer(OFF_ATTACK);
                 }
             }
-
             /*Unit *owner = pVictim->GetOwner();
             Unit *u = owner ? owner : pVictim;
             if(u->IsPvP() && (!duel || duel->opponent != u))
@@ -1270,7 +1062,6 @@ void Player::Update( uint32 p_time )
             }*/
         }
     }
-
     if(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
     {
         if(roll_chance_i(3) && GetTimeInnEnter() > 0)       //freeze update
@@ -1285,7 +1076,6 @@ void Player::Update( uint32 p_time )
             }
         }
     }
-    
     if (m_weaponChangeTimer > 0)
     {
         if(p_time >= m_weaponChangeTimer)
@@ -1293,14 +1083,12 @@ void Player::Update( uint32 p_time )
         else
             m_weaponChangeTimer -= p_time;
     }
-
     if (m_zoneUpdateTimer > 0)
     {
         if(p_time >= m_zoneUpdateTimer)
         {
             uint32 newzone, newarea;
             GetZoneAndAreaId(newzone,newarea);
-
             if( m_zoneUpdateId != newzone )
                 UpdateZone(newzone,newarea);                // also update area
             else
@@ -1309,25 +1097,21 @@ void Player::Update( uint32 p_time )
                 // needed for free far all arenas for example
                 if( m_areaUpdateId != newarea )
                     UpdateArea(newarea);
-
                 m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
             }
         }
         else
             m_zoneUpdateTimer -= p_time;
     }
-
     if (isAlive())
     {
         m_regenTimer += p_time;
         RegenerateAll();
     }
-
     if (m_deathState == JUST_DIED)
     {
         KillPlayer();
     }
-
     if(m_nextSave > 0)
     {
         if(p_time >= m_nextSave)
@@ -1341,10 +1125,8 @@ void Player::Update( uint32 p_time )
             m_nextSave -= p_time;
         }
     }
-
     //Handle Water/drowning
     HandleDrowning(p_time);
-
     //Handle detect stealth players
     if (m_DetectInvTimer > 0)
     {
@@ -1356,7 +1138,6 @@ void Player::Update( uint32 p_time )
         else
             m_DetectInvTimer -= p_time;
     }
-
     // Played time
     if (now > m_Last_tick)
     {
@@ -1365,15 +1146,12 @@ void Player::Update( uint32 p_time )
         m_Played_time[PLAYED_TIME_LEVEL] += elapsed;        // Level played time
         m_Last_tick = now;
     }
-
     if (m_drunk)
     {
         m_drunkTimer += p_time;
-
         if (m_drunkTimer > 10*IN_MILISECONDS)
             HandleSobering();
     }
-
     // not auto-free ghost from body in instances
     if(m_deathTimer > 0  && !GetBaseMap()->Instanceable())
     {
@@ -1386,32 +1164,25 @@ void Player::Update( uint32 p_time )
         else
             m_deathTimer -= p_time;
     }
-
     UpdateEnchantTime(p_time);
     UpdateHomebindTime(p_time);
-
     // group update
     SendUpdateToOutOfRangeGroupMembers();
-
     Pet* pet = GetPet();
     if(pet && !IsWithinDistInMap(pet, OWNER_MAX_DISTANCE) && !pet->isPossessed())
     //if(pet && !IsWithinDistInMap(pet, OWNER_MAX_DISTANCE) && (GetCharmGUID() && (pet->GetGUID() != GetCharmGUID())))
     {
         RemovePet(pet, PET_SAVE_NOT_IN_SLOT, true);
     }
-
     //we should execute delayed teleports only for alive(!) players
     //because we don't want player's ghost teleported from graveyard
     if(IsHasDelayedTeleport() && isAlive())
         TeleportTo(m_teleport_dest, m_teleport_options);
 }
-
 void Player::setDeathState(DeathState s)
 {
     uint32 ressSpellId = 0;
-
     bool cur = isAlive();
-
     if(s == JUST_DIED)
     {
         if(!cur)
@@ -1419,23 +1190,17 @@ void Player::setDeathState(DeathState s)
             sLog.outError("setDeathState: attempt to kill a dead player %s(%d)", GetName(), GetGUIDLow());
             return;
         }
-
         // drunken state is cleared on death
         SetDrunkValue(0);
         // lost combo points at any target (targeted combo points clear in Unit::setDeathState)
         ClearComboPoints();
-
         clearResurrectRequestData();
-
         // remove form before other mods to prevent incorrect stats calculation
         RemoveAurasDueToSpell(m_ShapeShiftFormSpellId);
-
         //FIXME: is pet dismissed at dying or releasing spirit? if second, add setDeathState(DEAD) to HandleRepopRequestOpcode and define pet unsummon here with (s == DEAD)
         RemovePet(NULL, PET_SAVE_NOT_IN_SLOT, true);
-
         // save value before aura remove in Unit::setDeathState
         ressSpellId = GetUInt32Value(PLAYER_SELF_RES_SPELL);
-
         // passive spell
         if(!ressSpellId)
             ressSpellId = GetResurrectionSpellId();
@@ -1444,22 +1209,18 @@ void Player::setDeathState(DeathState s)
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DEATH_IN_DUNGEON, 1);
     }
     Unit::setDeathState(s);
-
     // restore resurrection spell id for player after aura remove
     if(s == JUST_DIED && cur && ressSpellId)
         SetUInt32Value(PLAYER_SELF_RES_SPELL, ressSpellId);
-
     if(isAlive() && !cur)
     {
         //clear aura case after resurrection by another way (spells will be applied before next death)
         SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
-
         // restore default warrior stance
         if(getClass()== CLASS_WARRIOR)
             CastSpell(this,SPELL_ID_PASSIVE_BATTLE_STANCE,true);
     }
 }
-
 bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
 {
     //             0               1                2                3                 4                  5                       6                        7
@@ -1468,45 +1229,35 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     //    "characters.zone, characters.map, characters.position_x, characters.position_y, characters.position_z, guild_member.guildid, characters.playerFlags, "
     //    15                    16                   17                     18                   19               20
     //    "characters.at_login, character_pet.entry, character_pet.modelid, character_pet.level, characters.data, character_declinedname.genitive "
-
     Field *fields = result->Fetch();
-
     uint32 guid = fields[0].GetUInt32();
     uint8 pRace = fields[2].GetUInt8();
     uint8 pClass = fields[3].GetUInt8();
-
     PlayerInfo const *info = objmgr.GetPlayerInfo(pRace, pClass);
     if(!info)
     {
         sLog.outError("Player %u has incorrect race/class pair. Don't build enum.", guid);
         return false;
     }
-
     *p_data << uint64(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
     *p_data << fields[1].GetString();                       // name
     *p_data << uint8(pRace);                                // race
     *p_data << uint8(pClass);                               // class
     *p_data << uint8(fields[4].GetUInt8());                 // gender
-
     uint32 playerBytes = fields[5].GetUInt32();
     *p_data << uint8(playerBytes);                          // skin
     *p_data << uint8(playerBytes >> 8);                     // face
     *p_data << uint8(playerBytes >> 16);                    // hair style
     *p_data << uint8(playerBytes >> 24);                    // hair color
-
     uint32 playerBytes2 = fields[6].GetUInt32();
     *p_data << uint8(playerBytes2 & 0xFF);                  // facial hair
-
     *p_data << uint8(fields[7].GetUInt8());                 // level
     *p_data << uint32(fields[8].GetUInt32());               // zone
     *p_data << uint32(fields[9].GetUInt32());               // map
-
     *p_data << fields[10].GetFloat();                       // x
     *p_data << fields[11].GetFloat();                       // y
     *p_data << fields[12].GetFloat();                       // z
-
     *p_data << uint32(fields[13].GetUInt32());              // guild id
-
     uint32 char_flags = 0;
     uint32 playerFlags = fields[14].GetUInt32();
     uint32 atLoginFlags = fields[15].GetUInt32();
@@ -1525,18 +1276,15 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     }
     else
         char_flags |= CHARACTER_FLAG_DECLINED;
-
     *p_data << uint32(char_flags);                          // character flags
     // character customize (flags?)
     *p_data << uint32(atLoginFlags & AT_LOGIN_CUSTOMIZE ? 1 : 0);
     *p_data << uint8(1);                                    // unknown
-
     // Pets info
     {
         uint32 petDisplayId = 0;
         uint32 petLevel   = 0;
         uint32 petFamily  = 0;
-
         // show pet at selection character in character list only for non-ghost character
         if (result && !(playerFlags & PLAYER_FLAGS_GHOST) && (pClass == CLASS_WARLOCK || pClass == CLASS_HUNTER || pClass == CLASS_DEATH_KNIGHT))
         {
@@ -1549,15 +1297,12 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
                 petFamily    = cInfo->family;
             }
         }
-
         *p_data << uint32(petDisplayId);
         *p_data << uint32(petLevel);
         *p_data << uint32(petFamily);
     }
-
     // TODO: do not access data field here
     Tokens data = StrSplit(fields[19].GetCppString(), " ");
-
     for (uint8 slot = 0; slot < EQUIPMENT_SLOT_END; slot++)
     {
         uint32 visualbase = PLAYER_VISIBLE_ITEM_1_ENTRYID + (slot * 2);
@@ -1570,9 +1315,7 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
             *p_data << uint32(0);
             continue;
         }
-
         SpellItemEnchantmentEntry const *enchant = NULL;
-
         uint32 enchants = GetUInt32ValueFromArray(data, visualbase + 1);
         for(uint8 enchantSlot = PERM_ENCHANTMENT_SLOT; enchantSlot <= TEMP_ENCHANTMENT_SLOT; ++enchantSlot)
         {
@@ -1580,11 +1323,9 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
             uint32 enchantId = 0x0000FFFF & (enchants >> enchantSlot*16);
             if(!enchantId)
                 continue;
-
             if ((enchant = sSpellItemEnchantmentStore.LookupEntry(enchantId)))
                 break;
         }
-
         *p_data << uint32(proto->DisplayInfoID);
         *p_data << uint8(proto->InventoryType);
         *p_data << uint32(enchant ? enchant->aura_id : 0);
@@ -1592,30 +1333,22 @@ bool Player::BuildEnumData( QueryResult * result, WorldPacket * p_data )
     *p_data << uint32(0);                                   // first bag display id
     *p_data << uint8(0);                                    // first bag inventory type
     *p_data << uint32(0);                                   // enchant?
-
     return true;
 }
-
 bool Player::ToggleAFK()
 {
     ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK);
-
     bool state = HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK);
-
     // afk player not allowed in battleground
     if(state && InBattleGround())
         LeaveBattleground();
-
     return state;
 }
-
 bool Player::ToggleDND()
 {
     ToggleFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND);
-
     return HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_DND);
 }
-
 uint8 Player::chatTag() const
 {
     // it's bitmask
@@ -1632,7 +1365,6 @@ uint8 Player::chatTag() const
     else
         return 0;
 }
-
 void Player::SendTeleportAckMsg()
 {
     WorldPacket data(MSG_MOVE_TELEPORT_ACK, 41);
@@ -1641,21 +1373,16 @@ void Player::SendTeleportAckMsg()
     BuildMovementPacket(&data);
     GetSession()->SendPacket(&data);
 }
-
 // this is not used anywhere
 void Player::TeleportOutOfMap(Map *oldMap)
 {
     while(IsBeingTeleportedFar())
         GetSession()->HandleMoveWorldportAckOpcode();
-
     if(GetMap() != oldMap)
         return;
-
     TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
-
     while(IsBeingTeleportedFar())
         GetSession()->HandleMoveWorldportAckOpcode();
-
     if(GetMap() == oldMap)
     {
         sLog.outCrash("Cannot teleport player out of map!");
@@ -1663,7 +1390,6 @@ void Player::TeleportOutOfMap(Map *oldMap)
         assert(false);
     }
 }
-
 bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options)
 {
     if(!MapManager::IsValidMapCoord(mapid, x, y, z, orientation))
@@ -1671,43 +1397,33 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
         sLog.outError("TeleportTo: invalid map %d or absent instance template.", mapid);
         return false;
     }
-
     if((GetSession()->GetSecurity() < SEC_GAMEMASTER) && !sWorld.IsAllowedMap(mapid))
     {
         sLog.outError("Player %s tried to enter a forbidden map", GetName());
         return false;
     }
-
     // preparing unsummon pet if lost (we must get pet before teleportation or will not find it later)
     Pet* pet = GetPet();
-
     MapEntry const* mEntry = sMapStore.LookupEntry(mapid);
-
     // don't let enter battlegrounds without assigned battleground id (for example through areatrigger)...
     // don't let gm level > 1 either
     if(!InBattleGround() && mEntry->IsBattleGroundOrArena())
         return false;
-
     // client without expansion support
     if(GetSession()->Expansion() < mEntry->Expansion())
     {
         sLog.outDebug("Player %s using client without required expansion tried teleport to non accessible map %u", GetName(), mapid);
-
         if(GetTransport())
             RepopAtGraveyard();                             // teleport to near graveyard if on transport, looks blizz like :)
-
         SendTransferAborted(mapid, TRANSFER_ABORT_INSUF_EXPAN_LVL, mEntry->Expansion());
-
         return false;                                       // normal client can't teleport to this map...
     }
     else
     {
         sLog.outDebug("Player %s is being teleported to map %u", GetName(), mapid);
     }
-
     // reset movement flags at teleport, because player will continue move with these flags after teleport
     SetUnitMovementFlags(0);
-
     if (m_transport)
     {
         if (options & TELE_TO_NOT_LEAVE_TRANSPORT)
@@ -1723,7 +1439,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             m_movementInfo.t_time = 0;
         }
     }
-
     // The player was ported to another map and looses the duel immediately.
     // We have to perform this check before the teleport, otherwise the
     // ObjectAccessor won't find the flag.
@@ -1733,7 +1448,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
         if (obj)
             DuelComplete(DUEL_FLED);
     }
-
     if ((GetMapId() == mapid) && (!m_transport))
     {
         //lets reset far teleport flag if it wasn't reset during chained teleports
@@ -1750,21 +1464,17 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
             m_teleport_options = options;
             return true;
         }
-
         if (!(options & TELE_TO_NOT_UNSUMMON_PET))
         {
             //same map, only remove pet if out of range for new position
             if(pet && !pet->IsWithinDist3d(x,y,z, OWNER_MAX_DISTANCE))
                 UnsummonPetTemporaryIfAny();
         }
-
         if(!(options & TELE_TO_NOT_LEAVE_COMBAT))
             CombatStop();
-
         // this will be used instead of the current location in SaveToDB
         m_teleport_dest = WorldLocation(mapid, x, y, z, orientation);
         SetFallInformation(0, z);
-
         // code for finish transfer called in WorldSession::HandleMovementOpcodes()
         // at client packet MSG_MOVE_TELEPORT_ACK
         SetSemaphoreTeleportNear(true);
@@ -1783,16 +1493,13 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
         if(getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster()
             && !HasSpell(SPELL_ID_DEATH_GATE))
             return false;
-
         // far teleport to another map
         Map* oldmap = IsInWorld() ? GetMap() : NULL;
         // check if we can enter before stopping combat / removing pet / totems / interrupting spells
-
         // Check enter rights before map getting to avoid creating instance copy for player
         // this check not dependent from map instance copy and same for all instance copies of selected map
         if (!MapManager::Instance().CanPlayerEnter(mapid, this))
             return false;
-
         // If the map is not created, assume it is possible to enter it.
         // It will be created in the WorldPortAck.
         Map *map = MapManager::Instance().FindMap(mapid);
@@ -1812,13 +1519,9 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 m_teleport_options = options;
                 return true;
             }
-
             SetSelection(0);
-
             CombatStop();
-
             ResetContestedPvP();
-
             // remove player from battleground on far teleport (when changing maps)
             if(BattleGround const* bg = GetBattleGround())
             {
@@ -1828,23 +1531,18 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 if(bg->GetMapId() != mapid)
                     LeaveBattleground(false);                   // don't teleport to entry point
             }
-
             // remove pet on map change
             if (pet)
                 UnsummonPetTemporaryIfAny();
-
             // remove all dyn objects
             RemoveAllDynObjects();
-
             // stop spellcasting
             // not attempt interrupt teleportation spell at caster teleport
             if(!(options & TELE_TO_SPELL))
                 if(IsNonMeleeSpellCasted(true))
                     InterruptNonMeleeSpells(true);
-
             //remove auras before removing from map...
             RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_CHANGE_MAP | AURA_INTERRUPT_FLAG_MOVE | AURA_INTERRUPT_FLAG_TURNING);
-
             if(!GetSession()->PlayerLogout())
             {
                 // send transfer packets
@@ -1855,7 +1553,6 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                     data << m_transport->GetEntry() << GetMapId();
                 }
                 GetSession()->SendPacket(&data);
-
                 data.Initialize(SMSG_NEW_WORLD, (20));
                 if (m_transport)
                 {
@@ -1868,16 +1565,13 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 GetSession()->SendPacket( &data );
                 SendSavedInstances();
             }
-
             // remove from old map now
             if(oldmap) oldmap->Remove(this, false);
-
             // new final coordinates
             float final_x = x;
             float final_y = y;
             float final_z = z;
             float final_o = orientation;
-
             if(m_transport)
             {
                 final_x += m_movementInfo.t_x;
@@ -1885,12 +1579,10 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
                 final_z += m_movementInfo.t_z;
                 final_o += m_movementInfo.t_o;
             }
-
             m_teleport_dest = WorldLocation(mapid, final_x, final_y, final_z, final_o);
             SetFallInformation(0, final_z);
             // if the player is saved before worldportack (at logout for example)
             // this will be used instead of the current location in SaveToDB
-
             // move packet sent by client always after far teleport
             // code for finish transfer to new map called in WorldSession::HandleMoveWorldportAckOpcode at client packet
             SetSemaphoreTeleportFar(true);
@@ -1900,49 +1592,39 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     }
     return true;
 }
-
 bool Player::TeleportToBGEntryPoint()
 {
     ScheduleDelayedOperation(DELAYED_BG_MOUNT_RESTORE);
     ScheduleDelayedOperation(DELAYED_BG_TAXI_RESTORE);
     return TeleportTo(m_bgData.joinPos);
 }
-
 void Player::ProcessDelayedOperations()
 {
     if(m_DelayedOperations == 0)
         return;
-
     if(m_DelayedOperations & DELAYED_RESURRECT_PLAYER)
     {
         ResurrectPlayer(0.0f, false);
-
         if(GetMaxHealth() > m_resurrectHealth)
             SetHealth( m_resurrectHealth );
         else
             SetHealth( GetMaxHealth() );
-
         if(GetMaxPower(POWER_MANA) > m_resurrectMana)
             SetPower(POWER_MANA, m_resurrectMana );
         else
             SetPower(POWER_MANA, GetMaxPower(POWER_MANA) );
-
         SetPower(POWER_RAGE, 0 );
         SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
-
         SpawnCorpseBones();
     }
-
     if(m_DelayedOperations & DELAYED_SAVE_PLAYER)
     {
         SaveToDB();
     }
-
     if(m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
     {
         CastSpell(this, SPELL_ID_DESERTER, true);               // Deserter
     }
-
     if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE)
     {
         if (m_bgData.mountSpell)
@@ -1951,7 +1633,6 @@ void Player::ProcessDelayedOperations()
             m_bgData.mountSpell = 0;
         }
     }
-
     if (m_DelayedOperations & DELAYED_BG_TAXI_RESTORE)
     {
         if (m_bgData.HasTaxiPath())
@@ -1959,29 +1640,24 @@ void Player::ProcessDelayedOperations()
             m_taxi.AddTaxiDestination(m_bgData.taxiPath[0]);
             m_taxi.AddTaxiDestination(m_bgData.taxiPath[1]);
             m_bgData.ClearTaxiPath();
-
             ContinueTaxiFlight();
         }
     }
-
     //we have executed ALL delayed ops, so clear the flag
     m_DelayedOperations = 0;
 }
-
 void Player::AddToWorld()
 {
     ///- Do not add/remove the player from the object storage
     ///- It will crash when updating the ObjectAccessor
     ///- The player should only be added when logging in
     Unit::AddToWorld();
-
     for(uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
     {
         if(m_items[i])
             m_items[i]->AddToWorld();
     }
 }
-
 void Player::RemoveFromWorld()
 {
     // cleanup
@@ -1993,21 +1669,17 @@ void Player::RemoveFromWorld()
         UnsummonPetTemporaryIfAny();
         sOutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
     }
-
     ///- Do not add/remove the player from the object storage
     ///- It will crash when updating the ObjectAccessor
     ///- The player should only be removed when logging out
     Unit::RemoveFromWorld();
-
     for(uint8 i = PLAYER_SLOT_START; i < PLAYER_SLOT_END; ++i)
     {
         if(m_items[i])
             m_items[i]->RemoveFromWorld();
     }
-
     for (ItemMap::iterator iter = mMitems.begin(); iter != mMitems.end(); ++iter)
         iter->second->RemoveFromWorld();
-
     if(m_uint32Values)
     {
         if(WorldObject *viewpoint = GetViewpoint())
@@ -2017,18 +1689,13 @@ void Player::RemoveFromWorld()
         }
     }
 }
-
 void Player::RegenerateAll()
 {
     //if (m_regenTimer <= 500)
     //    return;
-    
     m_regenTimerCount += m_regenTimer;
-
     Regenerate( POWER_ENERGY );
-
     Regenerate( POWER_MANA );
-    
     if(m_regenTimerCount >= 2000)
     {
         // Not in combat or they have regeneration
@@ -2043,16 +1710,12 @@ void Player::RegenerateAll()
                     Regenerate(POWER_RUNIC_POWER);
             }
         }
-
         if(getClass() == CLASS_DEATH_KNIGHT)
             Regenerate( POWER_RUNE );
-
         m_regenTimerCount -= 2000;
     }
-
     m_regenTimer = 0;
 }
-
 void Player::Regenerate(Powers power)
 {
     if(power == POWER_RUNE)
@@ -2061,21 +1724,16 @@ void Player::Regenerate(Powers power)
             if(uint8 cd = GetRuneCooldown(i))           // if we have cooldown, reduce it...
                 SetRuneCooldown(i, cd - 1);             // ... by 2 sec (because update is every 2 sec)
     }
-
     uint32 maxValue = GetMaxPower(power);
     if(!maxValue)
         return;
-
     uint32 curValue = GetPower(power);
     if(curValue == maxValue)
         return;
-
     // TODO: possible use of miscvalueb instead of amount
     if (HasAuraTypeWithValue(SPELL_AURA_PREVENT_REGENERATE_POWER, power))
         return;
-
     float addvalue = 0.0f;
-
     switch (power)
     {
         case POWER_MANA:
@@ -2111,7 +1769,6 @@ void Player::Regenerate(Powers power)
         case POWER_HEALTH:
             break;
     }
-
     // Mana regen calculated in Player::UpdateManaRegen()
     // Exist only for POWER_MANA, POWER_ENERGY, POWER_FOCUS auras
     if(power != POWER_MANA)
@@ -2121,14 +1778,11 @@ void Player::Regenerate(Powers power)
             if ((*i)->GetMiscValue() == power)
                 addvalue *= ((*i)->GetAmount() + 100) / 100.0f;
     }
-
     addvalue += m_powerFraction[power];
     uint32 integerValue = (uint32)addvalue;
-
     if (power != POWER_RAGE && power != POWER_RUNIC_POWER)
     {
         curValue += integerValue;
-
         if (curValue > maxValue)
         {
             curValue = maxValue;
@@ -2148,25 +1802,20 @@ void Player::Regenerate(Powers power)
         {
             curValue = 0;
             m_powerFraction[power] = 0;
-        }            
+        }
     }
     if(m_regenTimerCount >= 2000)
         SetPower(power, curValue);
     else
         UpdateUInt32Value(UNIT_FIELD_POWER1 + power, curValue);
 }
-
 void Player::RegenerateHealth()
 {
     uint32 curValue = GetHealth();
     uint32 maxValue = GetMaxHealth();
-
     if (curValue >= maxValue) return;
-
     float HealthIncreaseRate = sWorld.getRate(RATE_HEALTH);
-
     float addvalue = 0.0f;
-
     // polymorphed case
     if ( IsPolymorphed() )
         addvalue = GetMaxHealth()/3;
@@ -2182,79 +1831,61 @@ void Player::RegenerateHealth()
         }
         else if(HasAuraType(SPELL_AURA_MOD_REGEN_DURING_COMBAT))
             addvalue *= GetTotalAuraModifier(SPELL_AURA_MOD_REGEN_DURING_COMBAT) / 100.0f;
-
         if(!IsStandState())
             addvalue *= 1.5;
     }
-
     // always regeneration bonus (including combat)
     addvalue += GetTotalAuraModifier(SPELL_AURA_MOD_HEALTH_REGEN_IN_COMBAT);
-
     if(addvalue < 0)
         addvalue = 0;
-
     ModifyHealth(int32(addvalue));
 }
-
 bool Player::CanInteractWithNPCs(bool alive) const
 {
     if(alive && !isAlive())
         return false;
     if(isInFlight())
         return false;
-
     return true;
 }
-
 Creature*
 Player::GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask)
 {
     // unit checks
     if (!guid)
         return NULL;
-
     if(!IsInWorld())
         return NULL;
-
     // exist (we need look pets also for some interaction (quest/etc)
     Creature *unit = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid);
     if (!unit)
         return NULL;
-
     // player check
     if(!CanInteractWithNPCs(!unit->isSpiritService()))
         return NULL;
-
     // appropriate npc type
     if(npcflagmask && !unit->HasFlag( UNIT_NPC_FLAGS, npcflagmask ))
         return NULL;
-
     // alive or spirit healer
     if(!unit->isAlive() && (!unit->isSpiritService() || isAlive() ))
         return NULL;
-
     // not allow interaction under control, but allow with own pets
     if(unit->GetCharmerGUID())
         return NULL;
-
     // not enemy
     if( unit->IsHostileTo(this))
         return NULL;
-
     // not unfriendly
     if(FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(unit->getFaction()))
         if(factionTemplate->faction)
             if(FactionEntry const* faction = sFactionStore.LookupEntry(factionTemplate->faction))
                 if(faction->reputationListID >= 0 && GetReputationMgr().GetRank(faction) <= REP_UNFRIENDLY)
                     return NULL;
-
     // not too far
     if(!unit->IsWithinDistInMap(this,INTERACTION_DISTANCE))
         return NULL;
-
     return unit;
 }
-
 GameObject* Player::GetGameObjectIfCanInteractWith(uint64 guid, GameobjectTypes type) const
 {
     if(GameObject *go = GetMap()->GetGameObject(guid))
@@ -2277,41 +1908,33 @@ GameObject* Player::GetGameObjectIfCanInteractWith(uint64 guid, GameobjectTypes
                     maxdist = INTERACTION_DISTANCE;
                     break;
             }
-
             if (go->IsWithinDistInMap(this, maxdist))
                 return go;
-
             sLog.outError("IsGameObjectOfTypeInRange: GameObject '%s' [GUID: %u] is too far away from player %s [GUID: %u] to be used by him (distance=%f, maximal 10 is allowed)", go->GetGOInfo()->name,
                 go->GetGUIDLow(), GetName(), GetGUIDLow(), go->GetDistance(this));
         }
     }
     return NULL;
 }
-
 bool Player::IsUnderWater() const
 {
     return IsInWater() &&
         GetPositionZ() < (GetBaseMap()->GetWaterLevel(GetPositionX(),GetPositionY())-2);
 }
-
 void Player::SetInWater(bool apply)
 {
     if(m_isInWater==apply)
         return;
-
     //define player in water by opcodes
     //move player's guid into HateOfflineList of those mobs
     //which can't swim and move guid back into ThreatList when
     //on surface.
     //TODO: exist also swimming mobs, and function must be symmetric to enter/leave water
     m_isInWater = apply;
-
     // remove auras that need water/land
     RemoveAurasWithInterruptFlags(apply ? AURA_INTERRUPT_FLAG_NOT_ABOVEWATER : AURA_INTERRUPT_FLAG_NOT_UNDERWATER);
-
     getHostilRefManager().updateThreatTables();
 }
-
 void Player::SetGameMaster(bool on)
 {
     if(on)
@@ -2319,19 +1942,15 @@ void Player::SetGameMaster(bool on)
         m_ExtraFlags |= PLAYER_EXTRA_GM_ON;
         setFaction(35);
         SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
-
         if (Pet* pet = GetPet())
         {
             pet->setFaction(35);
             pet->getHostilRefManager().setOnlineOfflineState(false);
         }
-
         RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
         ResetContestedPvP();
-
         getHostilRefManager().setOnlineOfflineState(false);
         CombatStopWithPets();
-
         SetPhaseMask(PHASEMASK_ANYWHERE,false);             // see and visible in all phases
     }
     else
@@ -2339,37 +1958,29 @@ void Player::SetGameMaster(bool on)
         // restore phase
         AuraEffectList const& phases = GetAurasByType(SPELL_AURA_PHASE);
         SetPhaseMask(!phases.empty() ? phases.front()->GetMiscValue() : PHASEMASK_NORMAL,false);
-
         m_ExtraFlags &= ~ PLAYER_EXTRA_GM_ON;
         setFactionForRace(getRace());
         RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM);
-
         if (Pet* pet = GetPet())
         {
             pet->setFaction(getFaction());
             pet->getHostilRefManager().setOnlineOfflineState(true);
         }
-
         // restore FFA PvP Server state
         if(sWorld.IsFFAPvPRealm())
             SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
-
         // restore FFA PvP area state, remove not allowed for GM mounts
         UpdateArea(m_areaUpdateId);
-
         getHostilRefManager().setOnlineOfflineState(true);
     }
-
     //ObjectAccessor::UpdateVisibilityForPlayer(this);
     SetToNotify();
 }
-
 void Player::SetGMVisible(bool on)
 {
     if(on)
     {
         m_ExtraFlags &= ~PLAYER_EXTRA_GM_INVISIBLE;         //remove flag
-
         // Reapply stealth/invisibility if active or show if not any
         if(HasAuraType(SPELL_AURA_MOD_STEALTH))
             SetVisibility(VISIBILITY_GROUP_STEALTH);
@@ -2381,14 +1992,11 @@ void Player::SetGMVisible(bool on)
     else
     {
         m_ExtraFlags |= PLAYER_EXTRA_GM_INVISIBLE;          //add flag
-
         SetAcceptWhispers(false);
         SetGameMaster(true);
-
         SetVisibility(VISIBILITY_OFF);
     }
 }
-
 bool Player::IsGroupVisibleFor(Player* p) const
 {
     switch(sWorld.getConfig(CONFIG_GROUP_VISIBILITY))
@@ -2398,14 +2006,12 @@ bool Player::IsGroupVisibleFor(Player* p) const
         case 2:  return GetTeam()==p->GetTeam();
     }
 }
-
 bool Player::IsInSameGroupWith(Player const* p) const
 {
     return  (p==this || (GetGroup() != NULL &&
         GetGroup() == p->GetGroup() &&
         GetGroup()->SameSubGroup((Player*)this, (Player*)p)));
 }
-
 ///- If the player is invited, remove him. If the group if then only 1 person, disband the group.
 /// \todo Shouldn't we also check if there is no other invitees before disbanding the group?
 void Player::UninviteFromGroup()
@@ -2413,9 +2019,7 @@ void Player::UninviteFromGroup()
     Group* group = GetGroupInvite();
     if(!group)
         return;
-
     group->RemoveInvite(this);
-
     if(group->GetMembersCount() <= 1)                       // group has just 1 member => disband
     {
         if(group->IsCreated())
@@ -2425,11 +2029,9 @@ void Player::UninviteFromGroup()
         }
         else
             group->RemoveAllInvites();
-
         delete group;
     }
 }
-
 void Player::RemoveFromGroup(Group* group, uint64 guid)
 {
     if(group)
@@ -2443,7 +2045,6 @@ void Player::RemoveFromGroup(Group* group, uint64 guid)
         }
     }
 }
-
 void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 RestXP)
 {
     WorldPacket data(SMSG_LOG_XPGAIN, 21);
@@ -2458,64 +2059,49 @@ void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 RestXP)
     data << uint8(0);                                       // new 2.4.0
     GetSession()->SendPacket(&data);
 }
-
 void Player::GiveXP(uint32 xp, Unit* victim)
 {
     if ( xp < 1 )
         return;
-
     if(!isAlive())
         return;
-
     uint32 level = getLevel();
-
     // Favored experience increase START
     uint32 zone = GetZoneId();
     float favored_exp_mult = 0;
     if( (HasAura(32096) || HasAura(32098)) && (zone == 3483 || zone == 3562 || zone == 3836 || zone == 3713 || zone == 3714) ) favored_exp_mult = 0.05; // Thrallmar's Favor and Honor Hold's Favor
     xp *= (1 + favored_exp_mult);
     // Favored experience increase END
-
     // XP to money conversion processed in Player::RewardQuest
     if(level >= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         return;
-
     // XP resting bonus for kill
     uint32 rested_bonus_xp = victim ? GetXPRestBonus(xp) : 0;
-
     SendLogXPGain(xp,victim,rested_bonus_xp);
-
     uint32 curXP = GetUInt32Value(PLAYER_XP);
     uint32 nextLvlXP = GetUInt32Value(PLAYER_NEXT_LEVEL_XP);
     uint32 newXP = curXP + xp + rested_bonus_xp;
-
     while( newXP >= nextLvlXP && level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) )
     {
         newXP -= nextLvlXP;
-
         if ( level < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) )
             GiveLevel(level + 1);
-
         level = getLevel();
         nextLvlXP = GetUInt32Value(PLAYER_NEXT_LEVEL_XP);
     }
     newXP = GetSession()->HandleOnGetXP(newXP);
     SetUInt32Value(PLAYER_XP, newXP);
 }
-
 // Update player to next level
 // Current player experience not update (must be update by caller)
 void Player::GiveLevel(uint32 level)
 {
     if ( level == getLevel() )
         return;
-
     PlayerLevelInfo info;
     objmgr.GetPlayerLevelInfo(getRace(),getClass(),level,&info);
-
     PlayerClassLevelInfo classInfo;
     objmgr.GetPlayerClassLevelInfo(getClass(),level,&classInfo);
-
     // send levelup info to client
     WorldPacket data(SMSG_LEVELUP_INFO, (4+4+MAX_POWERS*4+MAX_STATS*4));
     data << uint32(level);
@@ -2531,36 +2117,24 @@ void Player::GiveLevel(uint32 level)
     // end for
     for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)          // Stats loop (0-4)
         data << uint32(int32(info.stats[i]) - GetCreateStat(Stats(i)));
-
     GetSession()->SendPacket(&data);
-
     SetUInt32Value(PLAYER_NEXT_LEVEL_XP, objmgr.GetXPForLevel(level));
-
     //update level, max level of skills
     m_Played_time[PLAYED_TIME_LEVEL] = 0;                   // Level Played Time reset
-
     _ApplyAllLevelScaleItemMods(false);
-
     SetLevel(level);
-
     UpdateSkillsForLevel ();
-
     // save base values (bonuses already included in stored stats
     for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetCreateStat(Stats(i), info.stats[i]);
-
     SetCreateHealth(classInfo.basehealth);
     SetCreateMana(classInfo.basemana);
-
     InitTalentForLevel();
     InitTaxiNodesForLevel();
     InitGlyphsForLevel();
-
     UpdateAllStats();
-
     if(sWorld.getConfig(CONFIG_ALWAYS_MAXSKILL)) // Max weapon skill when leveling up
         UpdateSkillsToMaxSkillsForLevel();
-
     // set current level health and mana/energy to maximum after applying all mods.
     SetHealth(GetMaxHealth());
     SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
@@ -2569,16 +2143,12 @@ void Player::GiveLevel(uint32 level)
         SetPower(POWER_RAGE, GetMaxPower(POWER_RAGE));
     SetPower(POWER_FOCUS, 0);
     SetPower(POWER_HAPPINESS, 0);
-
     _ApplyAllLevelScaleItemMods(true);
-
     // update level to hunter/summon pet
     if (Pet* pet = GetPet())
         pet->SynchronizeLevelWithOwner();
-
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_LEVEL);
 }
-
 void Player::InitTalentForLevel()
 {
     uint32 level = getLevel();
@@ -2599,9 +2169,7 @@ void Player::InitTalentForLevel()
             m_specsCount = 1;
             m_activeSpec = 0;
         }
-
         uint32 talentPointsForLevel = CalculateTalentsPoints();
-
         // if used more that have then reset
         if(m_usedTalentCount > talentPointsForLevel)
         {
@@ -2614,53 +2182,37 @@ void Player::InitTalentForLevel()
         else
             SetFreeTalentPoints(talentPointsForLevel-m_usedTalentCount);
     }
-
     if(!GetSession()->PlayerLoading())
         SendTalentsInfoData(false);                         // update at client
 }
-
 void Player::InitStatsForLevel(bool reapplyMods)
 {
     if(reapplyMods)                                         //reapply stats values only on .reset stats (level) command
         _RemoveAllStatBonuses();
-
     PlayerClassLevelInfo classInfo;
     objmgr.GetPlayerClassLevelInfo(getClass(),getLevel(),&classInfo);
-
     PlayerLevelInfo info;
     objmgr.GetPlayerLevelInfo(getRace(),getClass(),getLevel(),&info);
-
     SetUInt32Value(PLAYER_FIELD_MAX_LEVEL, sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) );
     SetUInt32Value(PLAYER_NEXT_LEVEL_XP, objmgr.GetXPForLevel(getLevel()));
-
     UpdateSkillsForLevel ();
-
     // set default cast time multiplier
     SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
-
     // reset size before reapply auras
     SetFloatValue(OBJECT_FIELD_SCALE_X,1.0f);
-
     // save base values (bonuses already included in stored stats
     for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetCreateStat(Stats(i), info.stats[i]);
-
     for(uint8 i = STAT_STRENGTH; i < MAX_STATS; ++i)
         SetStat(Stats(i), info.stats[i]);
-
     SetCreateHealth(classInfo.basehealth);
-
     //set create powers
     SetCreateMana(classInfo.basemana);
-
     SetArmor(int32(m_createStats[STAT_AGILITY]*2));
-
     InitStatBuffMods();
-
     //reset rating fields values
     for(uint16 index = PLAYER_FIELD_COMBAT_RATING_1; index < PLAYER_FIELD_COMBAT_RATING_1 + MAX_COMBAT_RATING; ++index)
         SetUInt32Value(index, 0);
-
     SetUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS,0);
     for (uint8 i = 0; i < 7; i++)
     {
@@ -2668,42 +2220,34 @@ void Player::InitStatsForLevel(bool reapplyMods)
         SetUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, 0);
         SetFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+i, 1.00f);
     }
-
     //reset attack power, damage and attack speed fields
     SetFloatValue(UNIT_FIELD_BASEATTACKTIME, 2000.0f );
     SetFloatValue(UNIT_FIELD_BASEATTACKTIME + 1, 2000.0f ); // offhand attack time
     SetFloatValue(UNIT_FIELD_RANGEDATTACKTIME, 2000.0f );
-
     SetFloatValue(UNIT_FIELD_MINDAMAGE, 0.0f );
     SetFloatValue(UNIT_FIELD_MAXDAMAGE, 0.0f );
     SetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE, 0.0f );
     SetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE, 0.0f );
     SetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE, 0.0f );
     SetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE, 0.0f );
-
     SetInt32Value(UNIT_FIELD_ATTACK_POWER,            0 );
     SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS,       0 );
     SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER,0.0f);
     SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER,     0 );
     SetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS,0 );
     SetFloatValue(UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER,0.0f);
-
     // Base crit values (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset
     SetFloatValue(PLAYER_CRIT_PERCENTAGE,0.0f);
     SetFloatValue(PLAYER_OFFHAND_CRIT_PERCENTAGE,0.0f);
     SetFloatValue(PLAYER_RANGED_CRIT_PERCENTAGE,0.0f);
-
     // Init spell schools (will be recalculated in UpdateAllStats() at loading and in _ApplyAllStatBonuses() at reset
     for (uint8 i = 0; i < 7; ++i)
         SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1+i, 0.0f);
-
     SetFloatValue(PLAYER_PARRY_PERCENTAGE, 0.0f);
     SetFloatValue(PLAYER_BLOCK_PERCENTAGE, 0.0f);
     SetUInt32Value(PLAYER_SHIELD_BLOCK, 0);
-
     // Dodge percentage
     SetFloatValue(PLAYER_DODGE_PERCENTAGE, 0.0f);
-
     // set armor (resistance 0) to original value (create_agility*2)
     SetArmor(int32(m_createStats[STAT_AGILITY]*2));
     SetResistanceBuffMods(SpellSchools(0), true, 0.0f);
@@ -2715,7 +2259,6 @@ void Player::InitStatsForLevel(bool reapplyMods)
         SetResistanceBuffMods(SpellSchools(i), true, 0.0f);
         SetResistanceBuffMods(SpellSchools(i), false, 0.0f);
     }
-
     SetUInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,0);
     SetUInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,0);
     for(uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i)
@@ -2728,16 +2271,12 @@ void Player::InitStatsForLevel(bool reapplyMods)
         SetUInt32Value(PLAYER_NO_REAGENT_COST_1 + i, 0);
     // Init data for form but skip reapply item mods for form
     InitDataForForm(reapplyMods);
-
     // save new stats
     for (uint8 i = POWER_MANA; i < MAX_POWERS; i++)
         SetMaxPower(Powers(i),  uint32(GetCreatePowers(Powers(i))));
-
     SetMaxHealth(classInfo.basehealth);                     // stamina bonus will applied later
-
     // cleanup mounted state (it will set correctly at aura loading if player saved at mount.
     SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0);
-
     // cleanup unit flags (will be re-applied if need at aura load).
     RemoveFlag( UNIT_FIELD_FLAGS,
         UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_ATTACKABLE_1 |
@@ -2746,21 +2285,15 @@ void Player::InitStatsForLevel(bool reapplyMods)
         UNIT_FLAG_CONFUSED       | UNIT_FLAG_FLEEING      | UNIT_FLAG_NOT_SELECTABLE   |
         UNIT_FLAG_SKINNABLE      | UNIT_FLAG_MOUNT        | UNIT_FLAG_TAXI_FLIGHT      );
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE );   // must be set
-
     SetFlag(UNIT_FIELD_FLAGS_2,UNIT_FLAG2_REGENERATE_POWER);// must be set
-
     // cleanup player flags (will be re-applied if need at aura load), to avoid have ghost flag without ghost aura, for example.
     RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_AFK | PLAYER_FLAGS_DND | PLAYER_FLAGS_GM | PLAYER_FLAGS_GHOST | PLAYER_ALLOW_ONLY_ABILITY);
-
     RemoveStandFlags(UNIT_STAND_FLAGS_ALL);                 // one form stealth modified bytes
     RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP | UNIT_BYTE2_FLAG_SANCTUARY);
-
     // restore if need some important flags
     SetUInt32Value(PLAYER_FIELD_BYTES2, 0 );                // flags empty by default
-
     if(reapplyMods)                                         //reapply stats values only on .reset stats (level) command
         _ApplyAllStatBonuses();
-
     // set current level health and mana/energy to maximum after applying all mods.
     SetHealth(GetMaxHealth());
     SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
@@ -2770,41 +2303,30 @@ void Player::InitStatsForLevel(bool reapplyMods)
     SetPower(POWER_FOCUS, 0);
     SetPower(POWER_HAPPINESS, 0);
     SetPower(POWER_RUNIC_POWER, 0);
-
     // update level to hunter/summon pet
     if (Pet* pet = GetPet())
         pet->SynchronizeLevelWithOwner();
 }
-
 void Player::SendInitialSpells()
 {
     time_t curTime = time(NULL);
     time_t infTime = curTime + infinityCooldownDelayCheck;
-
     uint16 spellCount = 0;
-
     WorldPacket data(SMSG_INITIAL_SPELLS, (1+2+4*m_spells.size()+2+m_spellCooldowns.size()*(2+2+2+4+4)));
     data << uint8(0);
-
     size_t countPos = data.wpos();
     data << uint16(spellCount);                             // spell count placeholder
-
     for (PlayerSpellMap::const_iterator itr = m_spells.begin(); itr != m_spells.end(); ++itr)
     {
         if(itr->second->state == PLAYERSPELL_REMOVED)
             continue;
-
         if(!itr->second->active || itr->second->disabled)
             continue;
-
         data << uint32(itr->first);
         data << uint16(0);                                  // it's not slot id
-
         spellCount +=1;
     }
-
     data.put<uint16>(countPos,spellCount);                  // write real count value
-
     uint16 spellCooldowns = m_spellCooldowns.size();
     data << uint16(spellCooldowns);
     for(SpellCooldowns::const_iterator itr=m_spellCooldowns.begin(); itr!=m_spellCooldowns.end(); ++itr)
@@ -2812,12 +2334,9 @@ void Player::SendInitialSpells()
         SpellEntry const *sEntry = sSpellStore.LookupEntry(itr->first);
         if(!sEntry)
             continue;
-
         data << uint32(itr->first);
-
         data << uint16(itr->second.itemid);                 // cast item id
         data << uint16(sEntry->Category);                   // spell category
-
         // send infinity cooldown in special format
         if(itr->second.end >= infTime)
         {
@@ -2825,9 +2344,7 @@ void Player::SendInitialSpells()
             data << uint32(0x80000000);                     // category cooldown
             continue;
         }
-
         time_t cooldown = itr->second.end > curTime ? (itr->second.end-curTime)*IN_MILISECONDS : 0;
-
         if(sEntry->Category)                                // may be wrong, but anyway better than nothing...
         {
             data << uint32(0);                              // cooldown
@@ -2839,12 +2356,9 @@ void Player::SendInitialSpells()
             data << uint32(0);                              // category cooldown
         }
     }
-
     GetSession()->SendPacket(&data);
-
     sLog.outDetail( "CHARACTER: Sent Initial Spells" );
 }
-
 void Player::RemoveMail(uint32 id)
 {
     for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end();++itr)
@@ -2857,7 +2371,6 @@ void Player::RemoveMail(uint32 id)
         }
     }
 }
-
 void Player::SendMailResult(uint32 mailId, MailResponseType mailAction, MailResponseResult mailError, uint32 equipError, uint32 item_guid, uint32 item_count)
 {
     WorldPacket data(SMSG_SEND_MAIL_RESULT, (4+4+4+(mailError == MAIL_ERR_EQUIP_ERROR?4:(mailAction == MAIL_ITEM_TAKEN?4+4:0))));
@@ -2873,7 +2386,6 @@ void Player::SendMailResult(uint32 mailId, MailResponseType mailAction, MailResp
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendNewMail()
 {
     // deliver undelivered mail
@@ -2881,7 +2393,6 @@ void Player::SendNewMail()
     data << (uint32) 0;
     GetSession()->SendPacket(&data);
 }
-
 void Player::UpdateNextMailTimeAndUnreads()
 {
     // calculate next delivery time (min. from non-delivered mails
@@ -2900,7 +2411,6 @@ void Player::UpdateNextMailTimeAndUnreads()
             ++unReadMails;
     }
 }
-
 void Player::AddNewMailDeliverTime(time_t deliver_time)
 {
     if(deliver_time <= time(NULL))                          // ready now
@@ -2914,7 +2424,6 @@ void Player::AddNewMailDeliverTime(time_t deliver_time)
             m_nextMailDelivereTime =  deliver_time;
     }
 }
-
 bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
@@ -2928,10 +2437,8 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning)
         }
         else
             sLog.outError("Player::addSpell: Non-existed in SpellStore spell #%u request.",spell_id);
-
         return false;
     }
-
     if(!SpellMgr::IsSpellValid(spellInfo,this,false))
     {
         // do character spell book cleanup (all characters)
@@ -2942,10 +2449,8 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning)
         }
         else
             sLog.outError("Player::addTalent: Broken spell #%u learning not allowed.",spell_id);
-
         return false;
     }
-
     PlayerTalentMap::iterator itr = m_talents[spec]->find(spell_id);
     if (itr != m_talents[spec]->end())
     {
@@ -2961,7 +2466,6 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning)
                 uint32 rankSpellId = talentInfo->RankID[rank];
                 if(!rankSpellId || rankSpellId == spell_id)
                     continue;
-
                 PlayerTalentMap::iterator itr = m_talents[spec]->find(rankSpellId);
                 if (itr != m_talents[spec]->end())
                 {
@@ -2969,19 +2473,15 @@ bool Player::AddTalent(uint32 spell_id, uint8 spec, bool learning)
                 }
             }
         }
-
         PlayerSpellState state = learning ? PLAYERSPELL_NEW : PLAYERSPELL_UNCHANGED;
         PlayerTalent *newtalent = new PlayerTalent();
-        
         newtalent->state = state;
         newtalent->spec = spec;
-
         (*m_talents[spec])[spell_id] = newtalent;
         return true;
     }
     return false;
 }
-
 bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependent, bool disabled)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
@@ -2995,10 +2495,8 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         }
         else
             sLog.outError("Player::addSpell: Non-existed in SpellStore spell #%u request.",spell_id);
-
         return false;
     }
-
     if(!SpellMgr::IsSpellValid(spellInfo,this,false))
     {
         // do character spell book cleanup (all characters)
@@ -3009,18 +2507,13 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         }
         else
             sLog.outError("Player::addSpell: Broken spell #%u learning not allowed.",spell_id);
-
         return false;
     }
-
     PlayerSpellState state = learning ? PLAYERSPELL_NEW : PLAYERSPELL_UNCHANGED;
-
     bool dependent_set = false;
     bool disabled_case = false;
     bool superceded_old = false;
-
     PlayerSpellMap::iterator itr = m_spells.find(spell_id);
-
     // Remove temporary spell if found to prevent conflicts
     if (itr != m_spells.end() && itr->second->state == PLAYERSPELL_TEMPORARY)
         RemoveTemporarySpell(spell_id);
@@ -3040,17 +2533,14 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 }
             }
         }
-
         // not do anything if already known in expected state
         if(itr->second->state != PLAYERSPELL_REMOVED && itr->second->active == active &&
             itr->second->dependent == dependent && itr->second->disabled == disabled)
         {
             if(!IsInWorld() && !learning)                   // explicitly load from DB and then exist in it already and set correctly
                 itr->second->state = PLAYERSPELL_UNCHANGED;
-
             return false;
         }
-
         // dependent spell known as not dependent, overwrite state
         if (itr->second->state != PLAYERSPELL_REMOVED && !itr->second->dependent && dependent)
         {
@@ -3059,17 +2549,14 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 itr->second->state = PLAYERSPELL_CHANGED;
             dependent_set = true;
         }
-
         // update active state for known spell
         if(itr->second->active != active && itr->second->state != PLAYERSPELL_REMOVED && !itr->second->disabled)
         {
             itr->second->active = active;
-
             if(!IsInWorld() && !learning && !dependent_set) // explicitly load from DB and then exist in it already and set correctly
                 itr->second->state = PLAYERSPELL_UNCHANGED;
             else if(itr->second->state != PLAYERSPELL_NEW)
                 itr->second->state = PLAYERSPELL_CHANGED;
-
             if(active)
             {
                 if (IsPassiveSpell(spell_id) && IsNeedCastPassiveSpellAtLearn(spellInfo))
@@ -3092,19 +2579,15 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                     GetSession()->SendPacket(&data);
                 }
             }
-
             return active;                                  // learn (show in spell book if active now)
         }
-
         if(itr->second->disabled != disabled && itr->second->state != PLAYERSPELL_REMOVED)
         {
             if(itr->second->state != PLAYERSPELL_NEW)
                 itr->second->state = PLAYERSPELL_CHANGED;
             itr->second->disabled = disabled;
-
             if(disabled)
                 return false;
-
             disabled_case = true;
         }
         else switch(itr->second->state)
@@ -3123,12 +2606,10 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 // can be in case spell loading but learned at some previous spell loading
                 if(!IsInWorld() && !learning && !dependent_set)
                     itr->second->state = PLAYERSPELL_UNCHANGED;
-
                 return false;
             }
         }
     }
-
     if(!disabled_case) // skip new spell adding if spell already known (disabled spells case)
     {
         // talent: unlearn all other talent ranks (high and low)
@@ -3142,7 +2623,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                     uint32 rankSpellId = talentInfo->RankID[rank];
                     if(!rankSpellId || rankSpellId == spell_id)
                         continue;
-
                     removeSpell(rankSpellId,false,false);
                 }
             }
@@ -3155,13 +2635,11 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             else                                            // at normal learning
                 learnSpell(prev_spell,true);
         }
-
         PlayerSpell *newspell = new PlayerSpell;
         newspell->state     = state;
         newspell->active    = active;
         newspell->dependent = dependent;
         newspell->disabled  = disabled;
-
         // replace spells in action bars and spellbook to bigger rank if only one spell rank must be accessible
         if(newspell->active && !newspell->disabled && !SpellMgr::canStackSpellRanks(spellInfo) && spellmgr.GetSpellRank(spellInfo->Id) != 0)
         {
@@ -3170,7 +2648,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 if(itr2->second->state == PLAYERSPELL_REMOVED) continue;
                 SpellEntry const *i_spellInfo = sSpellStore.LookupEntry(itr2->first);
                 if(!i_spellInfo) continue;
-
                 if( spellmgr.IsRankSpellDueToSpell(spellInfo,itr2->first) )
                 {
                     if(itr2->second->active)
@@ -3184,7 +2661,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                                 data << uint32(spell_id);
                                 GetSession()->SendPacket( &data );
                             }
-
                             // mark old spell as disable (SMSG_SUPERCEDED_SPELL replace it in client by new)
                             itr2->second->active = false;
                             if(itr2->second->state != PLAYERSPELL_NEW)
@@ -3200,7 +2676,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                                 data << uint32(itr2->first);
                                 GetSession()->SendPacket( &data );
                             }
-
                             // mark new spell as disable (not learned yet for client and will not learned)
                             newspell->active = false;
                             if(newspell->state != PLAYERSPELL_NEW)
@@ -3210,16 +2685,12 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 }
             }
         }
-
         m_spells[spell_id] = newspell;
-
         // return false if spell disabled
         if (newspell->disabled)
             return false;
     }
-
     uint32 talentCost = GetTalentSpellCost(spell_id);
-
     // cast talents with SPELL_EFFECT_LEARN_SPELL (other dependent spells will learned later as not auto-learned)
     // note: all spells with SPELL_EFFECT_LEARN_SPELL isn't passive
     if (talentCost > 0 && IsSpellHaveEffect(spellInfo,SPELL_EFFECT_LEARN_SPELL))
@@ -3238,37 +2709,27 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
         CastSpell(this, spell_id, true);
         return false;
     }
-
     // update used talent points count
     m_usedTalentCount += talentCost;
-
     // update free primary prof.points (if any, can be none in case GM .learn prof. learning)
     if (uint32 freeProfs = GetFreePrimaryProfessionPoints())
     {
         if(spellmgr.IsPrimaryProfessionFirstRankSpell(spell_id))
             SetFreePrimaryProfessions(freeProfs-1);
     }
-
     // add dependent skills
     uint16 maxskill     = GetMaxSkillValueForLevel();
-
     SpellLearnSkillNode const* spellLearnSkill = spellmgr.GetSpellLearnSkill(spell_id);
-
     SkillLineAbilityMapBounds skill_bounds = spellmgr.GetSkillLineAbilityMapBounds(spell_id);
-
     if (spellLearnSkill)
     {
         uint32 skill_value = GetPureSkillValue(spellLearnSkill->skill);
         uint32 skill_max_value = GetPureMaxSkillValue(spellLearnSkill->skill);
-
         if (skill_value < spellLearnSkill->value)
             skill_value = spellLearnSkill->value;
-
         uint32 new_skill_max_value = spellLearnSkill->maxvalue == 0 ? maxskill : spellLearnSkill->maxvalue;
-
         if (skill_max_value < new_skill_max_value)
             skill_max_value =  new_skill_max_value;
-
         SetSkill(spellLearnSkill->skill,skill_value,skill_max_value);
     }
     else
@@ -3279,10 +2740,8 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
             if (!pSkill)
                 continue;
-
             if (HasSkill(pSkill->id))
                 continue;
-
             if (_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL ||
                 // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL
                 ((pSkill->id==SKILL_LOCKPICKING || pSkill->id==SKILL_RUNEFORGING) && _spell_idx->second->max_value==0))
@@ -3304,10 +2763,8 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             }
         }
     }
-
     // learn dependent spells
     SpellLearnSpellMapBounds spell_bounds = spellmgr.GetSpellLearnSpellMapBounds(spell_id);
-
     for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
     {
         if (!itr2->second.autoLearned)
@@ -3318,7 +2775,6 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
                 learnSpell(itr2->second.spell,true);
         }
     }
-
     if (!GetSession()->PlayerLoading())
     {
         // not ranked skills
@@ -3327,14 +2783,11 @@ bool Player::addSpell(uint32 spell_id, bool active, bool learning, bool dependen
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LINE,_spell_idx->second->skillId);
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILLLINE_SPELLS,_spell_idx->second->skillId);
         }
-
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SPELL,spell_id);
     }
-
     // return true (for send learn packet) only if spell active (in case ranked spells) and not replace old spell
     return active && !disabled && !superceded_old;
 }
-
 void Player::AddTemporarySpell(uint32 spellId)
 {
     PlayerSpellMap::iterator itr = m_spells.find(spellId);
@@ -3348,7 +2801,6 @@ void Player::AddTemporarySpell(uint32 spellId)
     newspell->disabled  = false;
     m_spells[spellId]   = newspell;
 }
-
 void Player::RemoveTemporarySpell(uint32 spellId)
 {
     PlayerSpellMap::iterator itr = m_spells.find(spellId);
@@ -3361,26 +2813,20 @@ void Player::RemoveTemporarySpell(uint32 spellId)
     delete itr->second;
     m_spells.erase(itr);
 }
-
 bool Player::IsNeedCastPassiveSpellAtLearn(SpellEntry const* spellInfo) const
 {
     // note: form passives activated with shapeshift spells be implemented by HandleShapeshiftBoosts instead of spell_learn_spell
     // talent dependent passives activated at form apply have proper stance data
     bool need_cast = (!spellInfo->Stances || (m_form != 0 && (spellInfo->Stances & (1<<(m_form-1)))));
-
     //Check CasterAuraStates
     return need_cast && (!spellInfo->CasterAuraState || HasAuraState(AuraState(spellInfo->CasterAuraState)));
 }
-
 void Player::learnSpell(uint32 spell_id, bool dependent)
 {
     PlayerSpellMap::iterator itr = m_spells.find(spell_id);
-
     bool disabled = (itr != m_spells.end()) ? itr->second->disabled : false;
     bool active = disabled ? itr->second->active : true;
-
     bool learning = addSpell(spell_id,active,true,dependent,false);
-
     // learn all disabled higher ranks (recursive)
     if(disabled)
     {
@@ -3392,25 +2838,20 @@ void Player::learnSpell(uint32 spell_id, bool dependent)
                 learnSpell(node->next,false);
         }
     }
-
     // prevent duplicated entires in spell book, also not send if not in world (loading)
     if(!learning || !IsInWorld ())
         return;
-
     WorldPacket data(SMSG_LEARNED_SPELL, 4);
     data << uint32(spell_id);
     GetSession()->SendPacket(&data);
 }
-
 void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
 {
     PlayerSpellMap::iterator itr = m_spells.find(spell_id);
     if (itr == m_spells.end())
         return;
-
     if (itr->second->state == PLAYERSPELL_REMOVED || (disabled && itr->second->disabled) || itr->second->state == PLAYERSPELL_TEMPORARY)
         return;
-
     // unlearn non talent higher ranks (recursive)
     SpellChainNode const* node = spellmgr.GetSpellChainNode(spell_id);
     if (node)
@@ -3423,15 +2864,12 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
     SpellsRequiringSpellMap::const_iterator itr2 = reqMap.find(spell_id);
     for (uint32 i=reqMap.count(spell_id);i>0;i--,itr2++)
         removeSpell(itr2->second,disabled,false);
-
     // re-search, it can be corrupted in prev loop
     itr = m_spells.find(spell_id);
     if (itr == m_spells.end())
         return;                                             // already unleared
-
     bool cur_active    = itr->second->active;
     bool cur_dependent = itr->second->dependent;
-
     if (disabled)
     {
         itr->second->disabled = disabled;
@@ -3448,14 +2886,11 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
         else
             itr->second->state = PLAYERSPELL_REMOVED;
     }
-
     RemoveAurasDueToSpell(spell_id);
-
     // remove pet auras
     for(int i = 0; i < MAX_SPELL_EFFECTS; ++i)
         if(PetAura const* petSpell = spellmgr.GetPetAura(spell_id, i))
             RemovePetAura(petSpell);
-
     // free talent points
     uint32 talentCosts = GetTalentSpellCost(spell_id);
     if(talentCosts > 0)
@@ -3465,7 +2900,6 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
         else
             m_usedTalentCount = 0;
     }
-
     // update free primary prof.points (if not overflow setting, can be in case GM use before .learn prof. learning)
     if(spellmgr.IsPrimaryProfessionFirstRankSpell(spell_id))
     {
@@ -3473,7 +2907,6 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
         if(freeProfs <= sWorld.getConfig(CONFIG_MAX_PRIMARY_TRADE_SKILL))
             SetFreePrimaryProfessions(freeProfs);
     }
-
     // remove dependent skill
     SpellLearnSkillNode const* spellLearnSkill = spellmgr.GetSpellLearnSkill(spell_id);
     if(spellLearnSkill)
@@ -3490,38 +2923,30 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
                 prev_spell = spellmgr.GetPrevSpellInChain(prev_spell);
                 prevSkill = spellmgr.GetSpellLearnSkill(spellmgr.GetFirstSpellInChain(prev_spell));
             }
-
             if (!prevSkill)                                 // not found prev skill setting, remove skill
                 SetSkill(spellLearnSkill->skill,0,0);
             else                                            // set to prev. skill setting values
             {
                 uint32 skill_value = GetPureSkillValue(prevSkill->skill);
                 uint32 skill_max_value = GetPureMaxSkillValue(prevSkill->skill);
-
                 if (skill_value >  prevSkill->value)
                     skill_value = prevSkill->value;
-
                 uint32 new_skill_max_value = prevSkill->maxvalue == 0 ? GetMaxSkillValueForLevel() : prevSkill->maxvalue;
-
                 if (skill_max_value > new_skill_max_value)
                     skill_max_value =  new_skill_max_value;
-
                 SetSkill(prevSkill->skill,skill_value,skill_max_value);
             }
         }
-
     }
     else
     {
         // not ranked skills
         SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spell_id);
-
         for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
         {
             SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(_spell_idx->second->skillId);
             if (!pSkill)
                 continue;
-
             if(_spell_idx->second->learnOnGetSkill == ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL &&
                 pSkill->categoryId != SKILL_CATEGORY_CLASS ||// not unlearn class skills (spellbook/talent pages)
                 // lockpicking/runeforging special case, not have ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL
@@ -3531,25 +2956,19 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
                 if ((pSkill->categoryId==SKILL_CATEGORY_SECONDARY || pSkill->categoryId==SKILL_CATEGORY_PROFESSION) &&
                     (IsProfessionSkill(pSkill->id) || _spell_idx->second->racemask!=0))
                     continue;
-
                 SetSkill(pSkill->id, 0, 0 );
             }
         }
     }
-
     // remove dependent spells
     SpellLearnSpellMapBounds spell_bounds = spellmgr.GetSpellLearnSpellMapBounds(spell_id);
-
     for(SpellLearnSpellMap::const_iterator itr2 = spell_bounds.first; itr2 != spell_bounds.second; ++itr2)
         removeSpell(itr2->second.spell, disabled);
-
     // activate lesser rank in spellbook/action bar, and cast it if need
     bool prev_activate = false;
-
     if (uint32 prev_id = spellmgr.GetPrevSpellInChain (spell_id))
     {
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
-
         // if talent then lesser rank also talent and need learn
         if (talentCosts)
         {
@@ -3570,7 +2989,6 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
                     if (prev_itr->second->state != PLAYERSPELL_NEW)
                         prev_itr->second->state = PLAYERSPELL_CHANGED;
                 }
-
                 // now re-learn if need re-activate
                 if (cur_active && !prev_itr->second->active && learn_low_rank)
                 {
@@ -3587,13 +3005,10 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
             }
         }
     }
-    
     if(spell_id == 46917 && m_canTitanGrip)
         SetCanTitanGrip(false);
-
     if(sWorld.getConfig(CONFIG_OFFHAND_CHECK_AT_SPELL_UNLEARN))
         AutoUnequipOffhandIfNeed();
-
     // remove from spell book if not replaced by lesser rank
     if(!prev_activate)
     {
@@ -3602,15 +3017,12 @@ void Player::removeSpell(uint32 spell_id, bool disabled, bool learn_low_rank)
         GetSession()->SendPacket(&data);
     }
 }
-
 void Player::RemoveSpellCooldown( uint32 spell_id, bool update /* = false */ )
 {
     m_spellCooldowns.erase(spell_id);
-
     if(update)
         SendClearCooldown(spell_id, this);
 }
-
 // I am not sure which one is more efficient
 void Player::RemoveCategoryCooldown( uint32 cat )
 {
@@ -3619,13 +3031,11 @@ void Player::RemoveCategoryCooldown( uint32 cat )
         for(SpellCategorySet::const_iterator i_scset = i_scstore->second.begin(); i_scset != i_scstore->second.end(); ++i_scset)
             RemoveSpellCooldown(*i_scset, true);
 }
-
 void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */)
 {
     SpellCategoryStore::const_iterator ct = sSpellCategoryStore.find(cat);
     if (ct == sSpellCategoryStore.end())
         return;
-
     const SpellCategorySet& ct_set = ct->second;
     for (SpellCooldowns::const_iterator i = m_spellCooldowns.begin(); i != m_spellCooldowns.end();)
     {
@@ -3635,7 +3045,6 @@ void Player::RemoveSpellCategoryCooldown(uint32 cat, bool update /* = false */)
             ++i;
     }
 }
-
 void Player::RemoveArenaSpellCooldowns()
 {
     // remove cooldowns on spells that has < 15 min CD
@@ -3656,63 +3065,48 @@ void Player::RemoveArenaSpellCooldowns()
         }
     }
 }
-
 void Player::RemoveAllSpellCooldown()
 {
     if(!m_spellCooldowns.empty())
     {
         for(SpellCooldowns::const_iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end(); ++itr)
             SendClearCooldown(itr->first, this);
-
         m_spellCooldowns.clear();
     }
 }
-
 void Player::_LoadSpellCooldowns(QueryResult *result)
 {
     // some cooldowns can be already set at aura loading...
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,item,time FROM character_spell_cooldown WHERE guid = '%u'",GetGUIDLow());
-
     if(result)
     {
         time_t curTime = time(NULL);
-
         do
         {
             Field *fields = result->Fetch();
-
             uint32 spell_id = fields[0].GetUInt32();
             uint32 item_id  = fields[1].GetUInt32();
             time_t db_time  = (time_t)fields[2].GetUInt64();
-
             if(!sSpellStore.LookupEntry(spell_id))
             {
                 sLog.outError("Player %u has unknown spell %u in `character_spell_cooldown`, skipping.",GetGUIDLow(),spell_id);
                 continue;
             }
-
             // skip outdated cooldown
             if(db_time <= curTime)
                 continue;
-
             AddSpellCooldown(spell_id, item_id, db_time);
-
             sLog.outDebug("Player (GUID: %u) spell %u, item %u cooldown loaded (%u secs).", GetGUIDLow(), spell_id, item_id, uint32(db_time-curTime));
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Player::_SaveSpellCooldowns()
 {
     CharacterDatabase.PExecute("DELETE FROM character_spell_cooldown WHERE guid = '%u'", GetGUIDLow());
-
     time_t curTime = time(NULL);
     time_t infTime = curTime + infinityCooldownDelayCheck;
-
     // remove outdated and save active
     for(SpellCooldowns::iterator itr = m_spellCooldowns.begin();itr != m_spellCooldowns.end();)
     {
@@ -3727,7 +3121,6 @@ void Player::_SaveSpellCooldowns()
             ++itr;
     }
 }
-
 uint32 Player::resetTalentsCost() const
 {
     // The first time reset costs 1 gold
@@ -3760,51 +3153,39 @@ uint32 Player::resetTalentsCost() const
         }
     }
 }
-
 bool Player::resetTalents(bool no_cost)
 {
     // not need after this call
     if(HasAtLoginFlag(AT_LOGIN_RESET_TALENTS))
         RemoveAtLoginFlag(AT_LOGIN_RESET_TALENTS,true);
-
     uint32 talentPointsForLevel = CalculateTalentsPoints();
-
     if (m_usedTalentCount == 0)
     {
         SetFreeTalentPoints(talentPointsForLevel);
         return false;
     }
-
     uint32 cost = 0;
-
     if(!no_cost && !sWorld.getConfig(CONFIG_NO_RESET_TALENT_COST))
     {
         cost = resetTalentsCost();
-
         if (GetMoney() < cost)
         {
             SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, 0, 0, 0);
             return false;
         }
     }
-
     for (uint32 i = 0; i < sTalentStore.GetNumRows(); i++)
     {
         TalentEntry const *talentInfo = sTalentStore.LookupEntry(i);
-
         if (!talentInfo) continue;
-
         TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
-
         if(!talentTabInfo)
             continue;
-
         // unlearn only talents for character class
         // some spell learned by one class as normal spells or know at creation but another class learn it as talent,
         // to prevent unexpected lost normal learned spell skip another class talents
         if( (getClassMask() & talentTabInfo->ClassMask) == 0 )
             continue;
-        
         // Re-use pre-dual talent way of resetting talents, to ensure talents aren't being stored in spell storage.
         for(uint8 rank = 0; rank < MAX_TALENT_RANK; ++rank)
         {
@@ -3815,10 +3196,8 @@ bool Player::resetTalents(bool no_cost)
                     ++itr;
                     continue;
                 }
-
                 // remove learned spells (all ranks)
                 uint32 itrFirstId = spellmgr.GetFirstSpellInChain(itr->first);
-
                 // unlearn if first rank is talent or learned by talent
                 if (itrFirstId == talentInfo->RankID[rank])
                 {
@@ -3836,26 +3215,21 @@ bool Player::resetTalents(bool no_cost)
                     ++itr;
             }
         }
-
         for (PlayerTalentMap::iterator itr2 = m_talents[m_activeSpec]->begin(); itr2 != m_talents[m_activeSpec]->end(); ++itr2)
         {
             removeSpell(itr2->first, !IsPassiveSpell(itr2->first),false);
             itr2->second->state = PLAYERSPELL_REMOVED;
         }
     }
-
     SetFreeTalentPoints(talentPointsForLevel);
-
     if(!no_cost)
     {
         ModifyMoney(-(int32)cost);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TALENTS, cost);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_NUMBER_OF_TALENT_RESETS, 1);
-
         m_resetTalentsCost = cost;
         m_resetTalentsTime = time(NULL);
     }
-
     //FIXME: remove pet before or after unlearn spells? for now after unlearn to allow removing of talent related, pet affecting auras
     RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true);
     /* when prev line will dropped use next line
@@ -3865,10 +3239,8 @@ bool Player::resetTalents(bool no_cost)
             RemovePet(NULL,PET_SAVE_NOT_IN_SLOT, true);
     }
     */
-
     return true;
 }
-
 Mail* Player::GetMail(uint32 id)
 {
     for(PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
@@ -3880,7 +3252,6 @@ Mail* Player::GetMail(uint32 id)
     }
     return NULL;
 }
-
 void Player::_SetCreateBits(UpdateMask *updateMask, Player *target) const
 {
     if(target == this)
@@ -3896,7 +3267,6 @@ void Player::_SetCreateBits(UpdateMask *updateMask, Player *target) const
         }
     }
 }
-
 void Player::_SetUpdateBits(UpdateMask *updateMask, Player *target) const
 {
     if(target == this)
@@ -3909,11 +3279,9 @@ void Player::_SetUpdateBits(UpdateMask *updateMask, Player *target) const
         *updateMask &= updateVisualBits;
     }
 }
-
 void Player::InitVisibleBits()
 {
     updateVisualBits.SetCount(PLAYER_END);
-
     updateVisualBits.SetBit(OBJECT_FIELD_GUID);
     updateVisualBits.SetBit(OBJECT_FIELD_TYPE);
     updateVisualBits.SetBit(OBJECT_FIELD_ENTRY);
@@ -3969,7 +3337,6 @@ void Player::InitVisibleBits()
     updateVisualBits.SetBit(UNIT_FIELD_BASE_MANA);
     updateVisualBits.SetBit(UNIT_FIELD_BYTES_2);
     updateVisualBits.SetBit(UNIT_FIELD_HOVERHEIGHT);
-
     updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 0);
     updateVisualBits.SetBit(PLAYER_DUEL_ARBITER + 1);
     updateVisualBits.SetBit(PLAYER_FLAGS);
@@ -3980,169 +3347,134 @@ void Player::InitVisibleBits()
     updateVisualBits.SetBit(PLAYER_BYTES_3);
     updateVisualBits.SetBit(PLAYER_DUEL_TEAM);
     updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP);
-
     // PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)...
     for(uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i += 4)
         updateVisualBits.SetBit(i);
-
     // Players visible items are not inventory stuff
     for(uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         uint16 offset = i * 2;
-
         // item entry
         updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENTRYID + offset);
         // enchant
         updateVisualBits.SetBit(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + offset);
     }
-
     updateVisualBits.SetBit(PLAYER_CHOSEN_TITLE);
 }
-
 void Player::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const
 {
     for(uint8 i = 0; i < EQUIPMENT_SLOT_END; i++)
     {
         if(m_items[i] == NULL)
             continue;
-
         m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
     }
-
     if(target == this)
     {
         for(uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++)
         {
             if(m_items[i] == NULL)
                 continue;
-
             m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
         }
         for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
         {
             if(m_items[i] == NULL)
                 continue;
-
             m_items[i]->BuildCreateUpdateBlockForPlayer( data, target );
         }
     }
-
     Unit::BuildCreateUpdateBlockForPlayer( data, target );
 }
-
 void Player::DestroyForPlayer( Player *target, bool anim ) const
 {
     Unit::DestroyForPlayer( target, anim );
-
     for(uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(m_items[i] == NULL)
             continue;
-
         m_items[i]->DestroyForPlayer( target );
     }
-
     if(target == this)
     {
         for(uint8 i = INVENTORY_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++)
         {
             if(m_items[i] == NULL)
                 continue;
-
             m_items[i]->DestroyForPlayer( target );
         }
         for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
         {
             if(m_items[i] == NULL)
                 continue;
-
             m_items[i]->DestroyForPlayer( target );
         }
     }
 }
-
 bool Player::HasSpell(uint32 spell) const
 {
     PlayerSpellMap::const_iterator itr = m_spells.find(spell);
     return (itr != m_spells.end() && itr->second->state != PLAYERSPELL_REMOVED &&
         !itr->second->disabled);
 }
-
 bool Player::HasTalent(uint32 spell, uint8 spec) const
 {
     PlayerTalentMap::const_iterator itr = m_talents[spec]->find(spell);
     return (itr != m_talents[spec]->end() && itr->second->state != PLAYERSPELL_REMOVED);
 }
-
 bool Player::HasActiveSpell(uint32 spell) const
 {
     PlayerSpellMap::const_iterator itr = m_spells.find(spell);
     return (itr != m_spells.end() && itr->second->state != PLAYERSPELL_REMOVED &&
         itr->second->active && !itr->second->disabled);
 }
-
 TrainerSpellState Player::GetTrainerSpellState(TrainerSpell const* trainer_spell) const
 {
     if (!trainer_spell)
         return TRAINER_SPELL_RED;
-
     if (!trainer_spell->learnedSpell)
         return TRAINER_SPELL_RED;
-
     // known spell
     if(HasSpell(trainer_spell->learnedSpell))
         return TRAINER_SPELL_GRAY;
-
     // check race/class requirement
     if(!IsSpellFitByClassAndRace(trainer_spell->learnedSpell))
         return TRAINER_SPELL_RED;
-
     // check level requirement
     if(getLevel() < trainer_spell->reqLevel)
         return TRAINER_SPELL_RED;
-
     if(SpellChainNode const* spell_chain = spellmgr.GetSpellChainNode(trainer_spell->learnedSpell))
     {
         // check prev.rank requirement
         if(spell_chain->prev && !HasSpell(spell_chain->prev))
             return TRAINER_SPELL_RED;
     }
-
     if(uint32 spell_req = spellmgr.GetSpellRequired(trainer_spell->spell))
     {
         // check additional spell requirement
         if(!HasSpell(spell_req))
             return TRAINER_SPELL_RED;
     }
-
     // check skill requirement
     if(trainer_spell->reqSkill && GetBaseSkillValue(trainer_spell->reqSkill) < trainer_spell->reqSkillValue)
         return TRAINER_SPELL_RED;
-
     // exist, already checked at loading
     SpellEntry const* spell = sSpellStore.LookupEntry(trainer_spell->learnedSpell);
-
     // secondary prof. or not prof. spell
     uint32 skill = spell->EffectMiscValue[1];
-
     if(spell->Effect[1] != SPELL_EFFECT_SKILL || !IsPrimaryProfessionSkill(skill))
         return TRAINER_SPELL_GREEN;
-
     // check primary prof. limit
     if(spellmgr.IsPrimaryProfessionFirstRankSpell(spell->Id) && GetFreePrimaryProfessionPoints() == 0)
         return TRAINER_SPELL_GREEN_DISABLED;
-
     return TRAINER_SPELL_GREEN;
 }
-
 void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmChars)
 {
     uint32 guid = GUID_LOPART(playerguid);
-
     // convert corpse to bones if exist (to prevent exiting Corpse in World without DB entry)
     // bones will be deleted by corpse/bones deleting thread shortly
     ObjectAccessor::Instance().ConvertCorpseForPlayer(playerguid);
-
     // remove from guild
     uint32 guildId = GetGuildIdFromDB(playerguid);
     if(guildId != 0)
@@ -4151,10 +3483,8 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
         if(guild)
             guild->DelMember(guid);
     }
-
     // remove from arena teams
     LeaveAllArenaTeams(playerguid);
-
     // the player was uninvited already on logout so just remove from group
     QueryResult *resultGroup = CharacterDatabase.PQuery("SELECT leaderGuid FROM group_member WHERE memberGuid='%u'", guid);
     if(resultGroup)
@@ -4167,10 +3497,8 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
             RemoveFromGroup(group, playerguid);
         }
     }
-
     // remove signs from petitions (also remove petitions if owner);
     RemovePetitionsAndSigns(playerguid, 10);
-
     // return back all mails with COD and Item                 0  1              2      3       4          5     6
     QueryResult *resultMail = CharacterDatabase.PQuery("SELECT id,mailTemplateId,sender,subject,itemTextId,money,has_items FROM mail WHERE receiver='%u' AND has_items<>0 AND cod<>0", guid);
     if(resultMail)
@@ -4178,7 +3506,6 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
         do
         {
             Field *fields = resultMail->Fetch();
-
             uint32 mail_id       = fields[0].GetUInt32();
             uint16 mailTemplateId= fields[1].GetUInt16();
             uint32 sender        = fields[2].GetUInt32();
@@ -4186,11 +3513,9 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
             uint32 itemTextId    = fields[4].GetUInt32();
             uint32 money         = fields[5].GetUInt32();
             bool has_items       = fields[6].GetBool();
-
             //we can return mail now
             //so firstly delete the old one
             CharacterDatabase.PExecute("DELETE FROM mail WHERE id = '%u'", mail_id);
-
             MailItemsInfo mi;
             if(has_items)
             {
@@ -4201,17 +3526,14 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
                     do
                     {
                         Field *fields2 = resultItems->Fetch();
-
                         uint32 item_guidlow = fields2[1].GetUInt32();
                         uint32 item_template = fields2[2].GetUInt32();
-
                         ItemPrototype const* itemProto = objmgr.GetItemPrototype(item_template);
                         if(!itemProto)
                         {
                             CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_guidlow);
                             continue;
                         }
-
                         Item *pItem = NewItemOrBag(itemProto);
                         if(!pItem->LoadFromDB(item_guidlow, MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER),resultItems))
                         {
@@ -4219,30 +3541,22 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
                             pItem->SaveToDB();              // it also deletes item object !
                             continue;
                         }
-
                         mi.AddItem(item_guidlow, item_template, pItem);
                     }
                     while (resultItems->NextRow());
-
                     delete resultItems;
                 }
             }
-
             CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", mail_id);
-
             uint32 pl_account = objmgr.GetPlayerAccountIdByGUID(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
-
             WorldSession::SendReturnToSender(MAIL_NORMAL, pl_account, guid, sender, subject, itemTextId, &mi, money, mailTemplateId);
         }
         while (resultMail->NextRow());
-
         delete resultMail;
     }
-
     // unsummon and delete for pets in world is not required: player deleted from CLI or character list with not loaded pet.
     // Get guids of character's pets, will deleted in transaction
     QueryResult *resultPets = CharacterDatabase.PQuery("SELECT id FROM character_pet WHERE owner = '%u'",guid);
-
     // NOW we can finally clear other DB data related to character
     CharacterDatabase.BeginTransaction();
     if (resultPets)
@@ -4255,7 +3569,6 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
         } while (resultPets->NextRow());
         delete resultPets;
     }
-
     CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM character_declinedname WHERE guid = '%u'",guid);
@@ -4284,11 +3597,9 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
     CharacterDatabase.PExecute("DELETE FROM guild_eventlog WHERE PlayerGuid2 = '%u'",guid);
     CharacterDatabase.PExecute("DELETE FROM guild_bank_eventlog WHERE PlayerGuid = '%u'",guid);
     CharacterDatabase.CommitTransaction();
-
     //loginDatabase.PExecute("UPDATE realmcharacters SET numchars = numchars - 1 WHERE acctid = %d AND realmid = %d", accountId, realmID);
     if(updateRealmChars) sWorld.UpdateRealmCharCount(accountId);
 }
-
 void Player::SetMovement(PlayerMovementType pType)
 {
     WorldPacket data;
@@ -4306,7 +3617,6 @@ void Player::SetMovement(PlayerMovementType pType)
     data << uint32(0);
     GetSession()->SendPacket( &data );
 }
-
 /* Preconditions:
   - a resurrectable corpse must not be loaded for the player (only bones)
   - the player must be in world
@@ -4316,22 +3626,18 @@ void Player::BuildPlayerRepop()
     WorldPacket data(SMSG_PRE_RESURRECT, GetPackGUID().size());
     data.append(GetPackGUID());
     GetSession()->SendPacket(&data);
-
     if(getRace() == RACE_NIGHTELF)
         CastSpell(this, SPELL_ID_NE_GHOST, true);
     CastSpell(this, SPELL_ID_GHOST, true);
-
     // there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK
     // there must be SMSG.STOP_MIRROR_TIMER
     // there we must send 888 opcode
-
     // the player cannot have a corpse already, only bones which are not returned by GetCorpse
     if(GetCorpse())
     {
         sLog.outError("BuildPlayerRepop: player %s(%d) already has a corpse", GetName(), GetGUIDLow());
         assert(false);
     }
-
     // create a corpse and place it at the player's location
     CreateCorpse();
     Corpse *corpse = GetCorpse();
@@ -4341,30 +3647,21 @@ void Player::BuildPlayerRepop()
         return;
     }
     GetMap()->Add(corpse);
-
     // convert player body to ghost
     SetHealth( 1 );
-
     SetMovement(MOVE_WATER_WALK);
     if(!GetSession()->isLogingOut())
         SetMovement(MOVE_UNROOT);
-
     // BG - remove insignia related
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
-
 //    SendCorpseReclaimDelay();
-
     // to prevent cheating
     corpse->ResetGhostTime();
-
     StopMirrorTimers();                                     //disable timers(bars)
-
     SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, (float)1.0);   //see radius of death player?
-
     // set and clear other
     SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
 }
-
 void Player::SendDelayResponse(const uint32 ml_seconds)
 {
     //FIXME: is this delay time arg really need? 50msec by default in code
@@ -4373,7 +3670,6 @@ void Player::SendDelayResponse(const uint32 ml_seconds)
     data << (uint32)0;
     GetSession()->SendPacket( &data );
 }
-
 void Player::ResurrectPlayer(float restore_percent, bool applySickness)
 {
     WorldPacket data(SMSG_DEATH_RELEASE_LOC, 4*4);          // remove spirit healer position
@@ -4382,22 +3678,16 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
     data << float(0);
     data << float(0);
     GetSession()->SendPacket(&data);
-
     // speed change, land walk
-
     // remove death flag + set aura
     SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00);
     if(getRace() == RACE_NIGHTELF)
         RemoveAurasDueToSpell(SPELL_ID_NE_GHOST);                       // speed bonuses
     RemoveAurasDueToSpell(SPELL_ID_GHOST);                            // SPELL_AURA_GHOST
-
     setDeathState(ALIVE);
-
     SetMovement(MOVE_LAND_WALK);
     SetMovement(MOVE_UNROOT);
-
     m_deathTimer = 0;
-
     // set health/powers (0- will be set in caller)
     if(restore_percent>0.0f)
     {
@@ -4406,35 +3696,28 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
         SetPower(POWER_RAGE, 0);
         SetPower(POWER_ENERGY, uint32(GetMaxPower(POWER_ENERGY)*restore_percent));
     }
-
     // trigger update zone for alive state zone updates
     uint32 newzone, newarea;
     GetZoneAndAreaId(newzone,newarea);
     UpdateZone(newzone,newarea);
-
     // update visibility
     //ObjectAccessor::UpdateVisibilityForPlayer(this);
     SetToNotify();
-
     if(!applySickness)
         return;
-
     //Characters from level 1-10 are not affected by resurrection sickness.
     //Characters from level 11-19 will suffer from one minute of sickness
     //for each level they are above 10.
     //Characters level 20 and up suffer from ten minutes of sickness.
     int32 startLevel = sWorld.getConfig(CONFIG_DEATH_SICKNESS_LEVEL);
-
     if(int32(getLevel()) >= startLevel)
     {
         // set resurrection sickness
         CastSpell(this,SPELL_ID_PASSIVE_RESURRECTION_SICKNESS,true);
-
         // not full duration
         if(int32(getLevel()) < startLevel+9)
         {
             int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE;
-
             if(Aura* Aur = GetAura(SPELL_ID_PASSIVE_RESURRECTION_SICKNESS, GetGUID()))
             {
                 Aur->SetAuraDuration(delta*IN_MILISECONDS);
@@ -4442,7 +3725,6 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
         }
     }
 }
-
 /**
  * FallMode = 0 implies that the player is dying, or already dead, and the proper death state will be set.
  *          = 1 simply causes the player to plummet towards the ground, and not suffer any damage.
@@ -4454,16 +3736,13 @@ bool Player::FallGround(uint8 FallMode)
     // Let's abort after we called this function one time
     if (getDeathState() == DEAD_FALLING && FallMode == 0)
         return false;
-
     float x, y, z;
     GetPosition(x, y, z);
     float ground_Z = GetMap()->GetVmapHeight(x, y, z, true);
     float z_diff = 0.0f;
     if ((z_diff = fabs(ground_Z - z)) < 0.1f)
         return false;
-
     GetMotionMaster()->MoveFall(ground_Z, EVENT_FALL_GROUND);
-
     // Below formula for falling damage is from Player::HandleFall
     if(FallMode == 2 && z_diff >= 14.57f)
     {
@@ -4474,66 +3753,48 @@ bool Player::FallGround(uint8 FallMode)
         Unit::setDeathState(DEAD_FALLING);
     return true;
 }
-
 void Player::KillPlayer()
 {
     if(IsFlying() && !GetTransport()) FallGround();
-
     SetMovement(MOVE_ROOT);
-
     StopMirrorTimers();                                     //disable timers(bars)
-
     setDeathState(CORPSE);
     //SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP );
-
     SetFlag(UNIT_DYNAMIC_FLAGS, 0x00);
     ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable());
-
     // 6 minutes until repop at graveyard
     m_deathTimer = 6*MINUTE*IN_MILISECONDS;
-
     UpdateCorpseReclaimDelay();                             // dependent at use SetDeathPvP() call before kill
     SendCorpseReclaimDelay();
-
     // don't create corpse at this moment, player might be falling
-
     // update visibility
     ObjectAccessor::UpdateObjectVisibility(this);
 }
-
 void Player::CreateCorpse()
 {
     // prevent existence 2 corpse for player
     SpawnCorpseBones();
-
     uint32 _uf, _pb, _pb2, _cfb1, _cfb2;
-
     Corpse *corpse = new Corpse( (m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH) ? CORPSE_RESURRECTABLE_PVP : CORPSE_RESURRECTABLE_PVE );
     SetPvPDeath(false);
-
     if(!corpse->Create(objmgr.GenerateLowGuid(HIGHGUID_CORPSE), this))
     {
         delete corpse;
         return;
     }
-
     _uf = GetUInt32Value(UNIT_FIELD_BYTES_0);
     _pb = GetUInt32Value(PLAYER_BYTES);
     _pb2 = GetUInt32Value(PLAYER_BYTES_2);
-
     uint8 race       = (uint8)(_uf);
     uint8 skin       = (uint8)(_pb);
     uint8 face       = (uint8)(_pb >> 8);
     uint8 hairstyle  = (uint8)(_pb >> 16);
     uint8 haircolor  = (uint8)(_pb >> 24);
     uint8 facialhair = (uint8)(_pb2);
-
     _cfb1 = ((0x00) | (race << 8) | (getGender() << 16) | (skin << 24));
     _cfb2 = ((face) | (hairstyle << 8) | (haircolor << 16) | (facialhair << 24));
-
     corpse->SetUInt32Value( CORPSE_FIELD_BYTES_1, _cfb1 );
     corpse->SetUInt32Value( CORPSE_FIELD_BYTES_2, _cfb2 );
-
     uint32 flags = CORPSE_FLAG_UNK2;
     if(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_HIDE_HELM))
         flags |= CORPSE_FLAG_HIDE_HELM;
@@ -4542,11 +3803,8 @@ void Player::CreateCorpse()
     if(InBattleGround() && !InArena())
         flags |= CORPSE_FLAG_LOOTABLE;                      // to be able to remove insignia
     corpse->SetUInt32Value( CORPSE_FIELD_FLAGS, flags );
-
     corpse->SetUInt32Value( CORPSE_FIELD_DISPLAY_ID, GetNativeDisplayId() );
-
     corpse->SetUInt32Value( CORPSE_FIELD_GUILD, GetGuildId() );
-
     uint32 iDisplayID;
     uint16 iIventoryType;
     uint32 _cfi;
@@ -4556,51 +3814,41 @@ void Player::CreateCorpse()
         {
             iDisplayID = m_items[i]->GetProto()->DisplayInfoID;
             iIventoryType = (uint16)m_items[i]->GetProto()->InventoryType;
-
             _cfi =  (uint16(iDisplayID)) | (iIventoryType)<< 24;
             corpse->SetUInt32Value(CORPSE_FIELD_ITEM + i,_cfi);
         }
     }
-
     // we don't SaveToDB for players in battlegrounds so don't do it for corpses either
     const MapEntry *entry = sMapStore.LookupEntry(corpse->GetMapId());
     assert(entry);
     if(entry->map_type != MAP_BATTLEGROUND)
         corpse->SaveToDB();
-
     // register for player, but not show
     ObjectAccessor::Instance().AddCorpse(corpse);
 }
-
 void Player::SpawnCorpseBones()
 {
     if(ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID()))
         SaveToDB();                                         // prevent loading as ghost without corpse
 }
-
 Corpse* Player::GetCorpse() const
 {
     return ObjectAccessor::Instance().GetCorpseForPlayerGUID(GetGUID());
 }
-
 void Player::DurabilityLossAll(double percent, bool inventory)
 {
     for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)
         if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             DurabilityLoss(pItem,percent);
-
     if(inventory)
     {
         // bags not have durability
         // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
-
         for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
             if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
                 DurabilityLoss(pItem,percent);
-
         // keys not have durability
         //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++)
-
         for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
             if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
                 for(uint32 j = 0; j < pBag->GetBagSize(); j++)
@@ -4608,43 +3856,32 @@ void Player::DurabilityLossAll(double percent, bool inventory)
                         DurabilityLoss(pItem,percent);
     }
 }
-
 void Player::DurabilityLoss(Item* item, double percent)
 {
     if(!item )
         return;
-
     uint32 pMaxDurability =  item ->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
-
     if(!pMaxDurability)
         return;
-
     uint32 pDurabilityLoss = uint32(pMaxDurability*percent);
-
     if(pDurabilityLoss < 1 )
         pDurabilityLoss = 1;
-
     DurabilityPointsLoss(item,pDurabilityLoss);
 }
-
 void Player::DurabilityPointsLossAll(int32 points, bool inventory)
 {
     for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)
         if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             DurabilityPointsLoss(pItem,points);
-
     if(inventory)
     {
         // bags not have durability
         // for(int i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
-
         for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
             if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
                 DurabilityPointsLoss(pItem,points);
-
         // keys not have durability
         //for(int i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++)
-
         for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
             if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
                 for(uint32 j = 0; j < pBag->GetBagSize(); j++)
@@ -4652,84 +3889,67 @@ void Player::DurabilityPointsLossAll(int32 points, bool inventory)
                         DurabilityPointsLoss(pItem,points);
     }
 }
-
 void Player::DurabilityPointsLoss(Item* item, int32 points)
 {
     int32 pMaxDurability = item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
     int32 pOldDurability = item->GetUInt32Value(ITEM_FIELD_DURABILITY);
     int32 pNewDurability = pOldDurability - points;
-
     if (pNewDurability < 0)
         pNewDurability = 0;
     else if (pNewDurability > pMaxDurability)
         pNewDurability = pMaxDurability;
-
     if (pOldDurability != pNewDurability)
     {
         // modify item stats _before_ Durability set to 0 to pass _ApplyItemMods internal check
         if ( pNewDurability == 0 && pOldDurability > 0 && item->IsEquipped())
             _ApplyItemMods(item,item->GetSlot(), false);
-
         item->SetUInt32Value(ITEM_FIELD_DURABILITY, pNewDurability);
-
         // modify item stats _after_ restore durability to pass _ApplyItemMods internal check
         if ( pNewDurability > 0 && pOldDurability == 0 && item->IsEquipped())
             _ApplyItemMods(item,item->GetSlot(), true);
-
         item->SetState(ITEM_CHANGED, this);
     }
 }
-
 void Player::DurabilityPointLossForEquipSlot(EquipmentSlots slot)
 {
     if(Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot ))
         DurabilityPointsLoss(pItem,1);
 }
-
 uint32 Player::DurabilityRepairAll(bool cost, float discountMod, bool guildBank)
 {
     uint32 TotalCost = 0;
     // equipped, backpack, bags itself
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++)
         TotalCost += DurabilityRepair(( (INVENTORY_SLOT_BAG_0 << 8) | i ),cost,discountMod, guildBank);
-
     // bank, buyback and keys not repaired
-
     // items in inventory bags
     for(uint8 j = INVENTORY_SLOT_BAG_START; j < INVENTORY_SLOT_BAG_END; j++)
         for(uint8 i = 0; i < MAX_BAG_SIZE; i++)
             TotalCost += DurabilityRepair(( (j << 8) | i ),cost,discountMod, guildBank);
     return TotalCost;
 }
-
 uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool guildBank)
 {
     Item* item = GetItemByPos(pos);
-
     uint32 TotalCost = 0;
     if(!item)
         return TotalCost;
-
     uint32 maxDurability = item->GetUInt32Value(ITEM_FIELD_MAXDURABILITY);
     if(!maxDurability)
         return TotalCost;
-
     uint32 curDurability = item->GetUInt32Value(ITEM_FIELD_DURABILITY);
-
     if(cost)
     {
         uint32 LostDurability = maxDurability - curDurability;
         if(LostDurability>0)
         {
             ItemPrototype const *ditemProto = item->GetProto();
-
             DurabilityCostsEntry const *dcost = sDurabilityCostsStore.LookupEntry(ditemProto->ItemLevel);
             if(!dcost)
             {
                 sLog.outError("RepairDurability: Wrong item lvl %u", ditemProto->ItemLevel);
                 return TotalCost;
             }
-
             uint32 dQualitymodEntryId = (ditemProto->Quality+1)*2;
             DurabilityQualityEntry const *dQualitymodEntry = sDurabilityQualityStore.LookupEntry(dQualitymodEntryId);
             if(!dQualitymodEntry)
@@ -4737,15 +3957,11 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
                 sLog.outError("RepairDurability: Wrong dQualityModEntry %u", dQualitymodEntryId);
                 return TotalCost;
             }
-
             uint32 dmultiplier = dcost->multiplier[ItemSubClassToDurabilityMultiplierId(ditemProto->Class,ditemProto->SubClass)];
             uint32 costs = uint32(LostDurability*dmultiplier*double(dQualitymodEntry->quality_mod));
-
             costs = uint32(costs * discountMod) * sWorld.getRate(RATE_REPAIRCOST);
-
             if (costs==0)                                   //fix for ITEM_QUALITY_ARTIFACT
                 costs = 1;
-
             if (guildBank)
             {
                 if (GetGuildId()==0)
@@ -4753,29 +3969,24 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
                     DEBUG_LOG("You are not member of a guild");
                     return TotalCost;
                 }
-
                 Guild *pGuild = objmgr.GetGuildById(GetGuildId());
                 if (!pGuild)
                     return TotalCost;
-
                 if (!pGuild->HasRankRight(GetRank(), GR_RIGHT_WITHDRAW_REPAIR))
                 {
                     DEBUG_LOG("You do not have rights to withdraw for repairs");
                     return TotalCost;
                 }
-
                 if (pGuild->GetMemberMoneyWithdrawRem(GetGUIDLow()) < costs)
                 {
                     DEBUG_LOG("You do not have enough money withdraw amount remaining");
                     return TotalCost;
                 }
-
                 if (pGuild->GetGuildBankMoney() < costs)
                 {
                     DEBUG_LOG("There is not enough money in bank");
                     return TotalCost;
                 }
-
                 pGuild->MemberMoneyWithdraw(costs, GetGUIDLow());
                 TotalCost = costs;
             }
@@ -4788,41 +3999,32 @@ uint32 Player::DurabilityRepair(uint16 pos, bool cost, float discountMod, bool g
                 ModifyMoney( -int32(costs) );
         }
     }
-
     item->SetUInt32Value(ITEM_FIELD_DURABILITY, maxDurability);
     item->SetState(ITEM_CHANGED, this);
-
     // reapply mods for total broken and repaired item if equipped
     if(IsEquipmentPos(pos) && !curDurability)
         _ApplyItemMods(item,pos & 255, true);
     return TotalCost;
 }
-
 void Player::RepopAtGraveyard()
 {
     // note: this can be called also when the player is alive
     // for example from WorldSession::HandleMovementOpcodes
-
     AreaTableEntry const *zone = GetAreaEntryByAreaID(GetAreaId());
-
     // Such zones are considered unreachable as a ghost and the player must be automatically revived
     if ((!isAlive() && zone && zone->flags & AREA_FLAG_NEED_FLY) || GetTransport() || GetPositionZ() < -500.0f)
     {
         ResurrectPlayer(0.5f);
         SpawnCorpseBones();
     }
-
     WorldSafeLocsEntry const *ClosestGrave = NULL;
-
     // Special handle for battleground maps
     if( BattleGround *bg = GetBattleGround() )
         ClosestGrave = bg->GetClosestGraveYard(this);
     else
         ClosestGrave = objmgr.GetClosestGraveYard( GetPositionX(), GetPositionY(), GetPositionZ(), GetMapId(), GetTeam() );
-
     // stop countdown until repop
     m_deathTimer = 0;
-
     // if no grave found, stay at the current location
     // and don't show spirit healer location
     if(ClosestGrave)
@@ -4841,17 +4043,14 @@ void Player::RepopAtGraveyard()
     else if(GetPositionZ() < -500.0f)
         TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
 }
-
 void Player::JoinedChannel(Channel *c)
 {
     m_channels.push_back(c);
 }
-
 void Player::LeftChannel(Channel *c)
 {
     m_channels.remove(c);
 }
-
 void Player::CleanupChannels()
 {
     while(!m_channels.empty())
@@ -4861,50 +4060,38 @@ void Player::CleanupChannels()
         ch->Leave(GetGUID(), false);                        // not send to client, not remove from player's channel list
         if (ChannelMgr* cMgr = channelMgr(GetTeam()))
             cMgr->LeftChannel(ch->GetName());               // deleted channel if empty
-
     }
     sLog.outDebug("Player: channels cleaned up!");
 }
-
 void Player::UpdateLocalChannels(uint32 newZone )
 {
     if(m_channels.empty())
         return;
-
     AreaTableEntry const* current_zone = GetAreaEntryByAreaID(newZone);
     if(!current_zone)
         return;
-
     ChannelMgr* cMgr = channelMgr(GetTeam());
     if(!cMgr)
         return;
-
     std::string current_zone_name = current_zone->area_name[GetSession()->GetSessionDbcLocale()];
-
     for(JoinedChannelsList::iterator i = m_channels.begin(), next; i != m_channels.end(); i = next)
     {
         next = i; ++next;
-
         // skip non built-in channels
         if(!(*i)->IsConstant())
             continue;
-
         ChatChannelsEntry const* ch = GetChannelEntryFor((*i)->GetChannelId());
         if(!ch)
             continue;
-
         if((ch->flags & 4) == 4)                            // global channel without zone name in pattern
             continue;
-
         //  new channel
         char new_channel_name_buf[100];
         snprintf(new_channel_name_buf,100,ch->pattern[m_session->GetSessionDbcLocale()],current_zone_name.c_str());
         Channel* new_channel = cMgr->GetJoinChannel(new_channel_name_buf,ch->ChannelID);
-
         if((*i)!=new_channel)
         {
             new_channel->Join(GetGUID(),"");                // will output Changed Channel: N. Name
-
             // leave old channel
             (*i)->Leave(GetGUID(),false);                   // not send leave channel, it already replaced at client
             std::string name = (*i)->GetName();             // store name, (*i)erase in LeftChannel
@@ -4914,7 +4101,6 @@ void Player::UpdateLocalChannels(uint32 newZone )
     }
     sLog.outDebug("Player: channels cleaned up!");
 }
-
 void Player::LeaveLFGChannel()
 {
     for(JoinedChannelsList::iterator i = m_channels.begin(); i != m_channels.end(); ++i )
@@ -4926,18 +4112,15 @@ void Player::LeaveLFGChannel()
         }
     }
 }
-
 void Player::UpdateDefense()
 {
     uint32 defense_skill_gain = sWorld.getConfig(CONFIG_SKILL_GAIN_DEFENSE);
-
     if(UpdateSkill(SKILL_DEFENSE,defense_skill_gain))
     {
         // update dependent from defense skill part
         UpdateDefenseBonusesMod();
     }
 }
-
 void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, float amount, bool apply)
 {
     if(modGroup >= BASEMOD_END || modType >= MOD_END)
@@ -4945,9 +4128,7 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
         sLog.outError("ERROR in HandleBaseModValue(): non existed BaseModGroup of wrong BaseModType!");
         return;
     }
-
     float val = 1.0f;
-
     switch(modType)
     {
         case FLAT_MOD:
@@ -4956,15 +4137,12 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
         case PCT_MOD:
             if(amount <= -100.0f)
                 amount = -200.0f;
-
             val = (100.0f + amount) / 100.0f;
             m_auraBaseMod[modGroup][modType] *= apply ? val : (1.0f/val);
             break;
     }
-
     if(!CanModifyStats())
         return;
-
     switch(modGroup)
     {
         case CRIT_PERCENTAGE:              UpdateCritPercentage(BASE_ATTACK);                          break;
@@ -4974,7 +4152,6 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
         default: break;
     }
 }
-
 float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
 {
     if(modGroup >= BASEMOD_END || modType > MOD_END)
@@ -4982,13 +4159,10 @@ float Player::GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const
         sLog.outError("trial to access non existed BaseModGroup or wrong BaseModType!");
         return 0.0f;
     }
-
     if(modType == PCT_MOD && m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
         return 0.0f;
-
     return m_auraBaseMod[modGroup][modType];
 }
-
 float Player::GetTotalBaseModValue(BaseModGroup modGroup) const
 {
     if(modGroup >= BASEMOD_END)
@@ -4996,38 +4170,28 @@ float Player::GetTotalBaseModValue(BaseModGroup modGroup) const
         sLog.outError("wrong BaseModGroup in GetTotalBaseModValue()!");
         return 0.0f;
     }
-
     if(m_auraBaseMod[modGroup][PCT_MOD] <= 0.0f)
         return 0.0f;
-
     return m_auraBaseMod[modGroup][FLAT_MOD] * m_auraBaseMod[modGroup][PCT_MOD];
 }
-
 uint32 Player::GetShieldBlockValue() const
 {
     float value = (m_auraBaseMod[SHIELD_BLOCK_VALUE][FLAT_MOD] + GetStat(STAT_STRENGTH) * 0.5f - 10)*m_auraBaseMod[SHIELD_BLOCK_VALUE][PCT_MOD];
-
     value = (value < 0) ? 0 : value;
-
     return uint32(value);
 }
-
 float Player::GetMeleeCritFromAgility()
 {
     uint32 level = getLevel();
     uint32 pclass = getClass();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
     GtChanceToMeleeCritBaseEntry const *critBase  = sGtChanceToMeleeCritBaseStore.LookupEntry(pclass-1);
     GtChanceToMeleeCritEntry     const *critRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     if (critBase==NULL || critRatio==NULL)
         return 0.0f;
-
     float crit=critBase->base + GetStat(STAT_AGILITY)*critRatio->ratio;
     return crit*100.0f;
 }
-
 float Player::GetDodgeFromAgility()
 {
     // Table for base dodge values
@@ -5058,69 +4222,53 @@ float Player::GetDodgeFromAgility()
          0.0f,      // ??
          1.7f       // Druid
     };
-
     uint32 level = getLevel();
     uint32 pclass = getClass();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
     // Dodge per agility for most classes equal crit per agility (but for some classes need apply some multiplier)
     GtChanceToMeleeCritEntry  const *dodgeRatio = sGtChanceToMeleeCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     if (dodgeRatio==NULL || pclass > MAX_CLASSES)
         return 0.0f;
-
     float dodge=dodge_base[pclass-1] + GetStat(STAT_AGILITY) * dodgeRatio->ratio * crit_to_dodge[pclass-1];
     return dodge*100.0f;
 }
-
 float Player::GetSpellCritFromIntellect()
 {
     uint32 level = getLevel();
     uint32 pclass = getClass();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
     GtChanceToSpellCritBaseEntry const *critBase  = sGtChanceToSpellCritBaseStore.LookupEntry(pclass-1);
     GtChanceToSpellCritEntry     const *critRatio = sGtChanceToSpellCritStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     if (critBase==NULL || critRatio==NULL)
         return 0.0f;
-
     float crit=critBase->base + GetStat(STAT_INTELLECT)*critRatio->ratio;
     return crit*100.0f;
 }
-
 float Player::GetRatingCoefficient(CombatRating cr) const
 {
     uint32 level = getLevel();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
     GtCombatRatingsEntry const *Rating = sGtCombatRatingsStore.LookupEntry(cr*GT_MAX_LEVEL+level-1);
     if (Rating == NULL)
         return 1.0f;                                        // By default use minimum coefficient (not must be called)
-
     return Rating->ratio;
 }
-
 float Player::GetRatingBonusValue(CombatRating cr) const
 {
     return float(GetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + cr)) / GetRatingCoefficient(cr);
 }
-
 uint32 Player::GetMeleeCritDamageReduction(uint32 damage) const
 {
     float melee  = GetRatingBonusValue(CR_CRIT_TAKEN_MELEE)*2.2f;
     if (melee>33.0f) melee = 33.0f;
     return uint32 (melee * damage /100.0f);
 }
-
 uint32 Player::GetRangedCritDamageReduction(uint32 damage) const
 {
     float ranged = GetRatingBonusValue(CR_CRIT_TAKEN_RANGED)*2.2f;
     if (ranged>33.0f) ranged=33.0f;
     return uint32 (ranged * damage /100.0f);
 }
-
 uint32 Player::GetSpellCritDamageReduction(uint32 damage) const
 {
     float spell = GetRatingBonusValue(CR_CRIT_TAKEN_SPELL)*2.2f;
@@ -5129,7 +4277,6 @@ uint32 Player::GetSpellCritDamageReduction(uint32 damage) const
         spell = 33.0f;
     return uint32 (spell * damage / 100.0f);
 }
-
 uint32 Player::GetDotDamageReduction(uint32 damage) const
 {
     float spellDot = GetRatingBonusValue(CR_CRIT_TAKEN_SPELL);
@@ -5138,7 +4285,6 @@ uint32 Player::GetDotDamageReduction(uint32 damage) const
         spellDot = 100.0f;
     return uint32 (spellDot * damage / 100.0f);
 }
-
 float Player::GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const
 {
     switch (attType)
@@ -5152,19 +4298,15 @@ float Player::GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const
     }
     return 0.0f;
 }
-
 float Player::OCTRegenHPPerSpirit()
 {
     uint32 level = getLevel();
     uint32 pclass = getClass();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
     GtOCTRegenHPEntry     const *baseRatio = sGtOCTRegenHPStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     GtRegenHPPerSptEntry  const *moreRatio = sGtRegenHPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     if (baseRatio==NULL || moreRatio==NULL)
         return 0.0f;
-
     // Formula from PaperDollFrame script
     float spirit = GetStat(STAT_SPIRIT);
     float baseSpirit = spirit;
@@ -5173,29 +4315,23 @@ float Player::OCTRegenHPPerSpirit()
     float regen = baseSpirit * baseRatio->ratio + moreSpirit * moreRatio->ratio;
     return regen;
 }
-
 float Player::OCTRegenMPPerSpirit()
 {
     uint32 level = getLevel();
     uint32 pclass = getClass();
-
     if (level>GT_MAX_LEVEL) level = GT_MAX_LEVEL;
-
 //    GtOCTRegenMPEntry     const *baseRatio = sGtOCTRegenMPStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     GtRegenMPPerSptEntry  const *moreRatio = sGtRegenMPPerSptStore.LookupEntry((pclass-1)*GT_MAX_LEVEL + level-1);
     if (moreRatio==NULL)
         return 0.0f;
-
     // Formula get from PaperDollFrame script
     float spirit    = GetStat(STAT_SPIRIT);
     float regen     = spirit * moreRatio->ratio;
     return regen;
 }
-
 void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
 {
     m_baseRatingValue[cr]+=(apply ? value : -value);
-
     int32 amount = uint32(m_baseRatingValue[cr]);
     // Apply bonus from SPELL_AURA_MOD_RATING_FROM_STAT
     // stat used stored in miscValueB for this aura
@@ -5206,12 +4342,9 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
     if (amount < 0)
         amount = 0;
     SetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + cr, uint32(amount));
-
     float RatingCoeffecient = GetRatingCoefficient(cr);
     float RatingChange = 0.0f;
-
     bool affectStats = CanModifyStats();
-
     switch (cr)
     {
         case CR_WEAPON_SKILL:                               // Implemented in Unit::RollMeleeOutcomeAgainst
@@ -5291,7 +4424,6 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
             break;
     }
 }
-
 void Player::SetRegularAttackTime()
 {
     for(uint8 i = 0; i < MAX_ATTACK; ++i)
@@ -5307,42 +4439,33 @@ void Player::SetRegularAttackTime()
         }
     }
 }
-
 //skill+step, checking for max value
 bool Player::UpdateSkill(uint32 skill_id, uint32 step)
 {
     if(!skill_id)
         return false;
-
     uint16 i=0;
     for (; i < PLAYER_MAX_SKILLS; i++)
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == skill_id)
             break;
-
     if(i>=PLAYER_MAX_SKILLS)
         return false;
-
     uint32 data = GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i));
     uint32 value = SKILL_VALUE(data);
     uint32 max = SKILL_MAX(data);
-
     if ((!max) || (!value) || (value >= max))
         return false;
-
     if (value < max)
     {
         uint32 new_value = value+step;
         if(new_value > max)
             new_value = max;
-
         SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(new_value,max));
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,skill_id);
         return true;
     }
-
     return false;
 }
-
 inline int SkillGainChance(uint32 SkillValue, uint32 GrayLevel, uint32 GreenLevel, uint32 YellowLevel)
 {
     if ( SkillValue >= GrayLevel )
@@ -5353,19 +4476,15 @@ inline int SkillGainChance(uint32 SkillValue, uint32 GrayLevel, uint32 GreenLeve
         return sWorld.getConfig(CONFIG_SKILL_CHANCE_YELLOW)*10;
     return sWorld.getConfig(CONFIG_SKILL_CHANCE_ORANGE)*10;
 }
-
 bool Player::UpdateCraftSkill(uint32 spellid)
 {
     sLog.outDebug("UpdateCraftSkill spellid %d", spellid);
-
     SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellid);
-
     for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
     {
         if (_spell_idx->second->skillId)
         {
             uint32 SkillValue = GetPureSkillValue(_spell_idx->second->skillId);
-
             // Alchemy Discoveries here
             SpellEntry const* spellEntry = sSpellStore.LookupEntry(spellid);
             if (spellEntry && spellEntry->Mechanic==MECHANIC_DISCOVERY)
@@ -5373,9 +4492,7 @@ bool Player::UpdateCraftSkill(uint32 spellid)
                 if (uint32 discoveredSpell = GetSkillDiscoverySpell(_spell_idx->second->skillId, spellid, this))
                     learnSpell(discoveredSpell,false);
             }
-
             uint32 craft_skill_gain = sWorld.getConfig(CONFIG_SKILL_GAIN_CRAFTING);
-
             return UpdateSkillPro(_spell_idx->second->skillId, SkillGainChance(SkillValue,
                 _spell_idx->second->max_value,
                 (_spell_idx->second->max_value + _spell_idx->second->min_value)/2,
@@ -5385,13 +4502,10 @@ bool Player::UpdateCraftSkill(uint32 spellid)
     }
     return false;
 }
-
 bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLevel, uint32 Multiplicator )
 {
     sLog.outDebug("UpdateGatherSkill(SkillId %d SkillLevel %d RedLevel %d)", SkillId, SkillValue, RedLevel);
-
     uint32 gathering_skill_gain = sWorld.getConfig(CONFIG_SKILL_GAIN_GATHERING);
-
     // For skinning and Mining chance decrease with level. 1-74 - no decrease, 75-149 - 2 times, 225-299 - 8 times
     switch (SkillId)
     {
@@ -5413,58 +4527,44 @@ bool Player::UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLeve
     }
     return false;
 }
-
 bool Player::UpdateFishingSkill()
 {
     sLog.outDebug("UpdateFishingSkill");
-
     uint32 SkillValue = GetPureSkillValue(SKILL_FISHING);
-
     int32 chance = SkillValue < 75 ? 100 : 2500/(SkillValue-50);
-
     uint32 gathering_skill_gain = sWorld.getConfig(CONFIG_SKILL_GAIN_GATHERING);
-
     return UpdateSkillPro(SKILL_FISHING,chance*10,gathering_skill_gain);
 }
-
 // levels sync. with spell requirement for skill levels to learn
 // bonus abilities in sSkillLineAbilityStore
 // Used only to avoid scan DBC at each skill grow
 static uint32 bonusSkillLevels[] = {75,150,225,300,375,450};
-
 bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step)
 {
     sLog.outDebug("UpdateSkillPro(SkillId %d, Chance %3.1f%%)", SkillId, Chance/10.0);
     if ( !SkillId )
         return false;
-
     if(Chance <= 0)                                         // speedup in 0 chance case
     {
         sLog.outDebug("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance/10.0);
         return false;
     }
-
     uint16 i=0;
     for (; i < PLAYER_MAX_SKILLS; i++)
         if ( SKILL_VALUE(GetUInt32Value(PLAYER_SKILL_INDEX(i))) == SkillId ) break;
     if ( i >= PLAYER_MAX_SKILLS )
         return false;
-
     uint32 data = GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i));
     uint16 SkillValue = SKILL_VALUE(data);
     uint16 MaxValue   = SKILL_MAX(data);
-
     if ( !MaxValue || !SkillValue || SkillValue >= MaxValue )
         return false;
-
     int32 Roll = irand(1,1000);
-
     if ( Roll <= Chance )
     {
         uint32 new_value = SkillValue+step;
         if(new_value > MaxValue)
             new_value = MaxValue;
-
         SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(new_value,MaxValue));
         for(uint32* bsl = &bonusSkillLevels[0]; *bsl; ++bsl)
         {
@@ -5478,35 +4578,27 @@ bool Player::UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step)
         sLog.outDebug("Player::UpdateSkillPro Chance=%3.1f%% taken", Chance/10.0);
         return true;
     }
-
     sLog.outDebug("Player::UpdateSkillPro Chance=%3.1f%% missed", Chance/10.0);
     return false;
 }
-
 void Player::UpdateWeaponSkill (WeaponAttackType attType)
 {
     // no skill gain in pvp
     Unit *pVictim = getVictim();
     if(pVictim && pVictim->GetTypeId() == TYPEID_PLAYER)
         return;
-
     if(IsInFeralForm())
         return;                                             // always maximized SKILL_FERAL_COMBAT in fact
-
     if(m_form == FORM_TREE)
         return;                                             // use weapon but not skill up
-
     if(pVictim && pVictim->GetTypeId() == TYPEID_UNIT && (((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_SKILLGAIN))
         return;
-
     uint32 weapon_skill_gain = sWorld.getConfig(CONFIG_SKILL_GAIN_WEAPON);
-
     switch(attType)
     {
         case BASE_ATTACK:
         {
             Item *tmpitem = GetWeaponForAttack(attType,true);
-
             if (!tmpitem)
                 UpdateSkill(SKILL_UNARMED,weapon_skill_gain);
             else if(tmpitem->GetProto()->SubClass != ITEM_SUBCLASS_WEAPON_FISHING_POLE)
@@ -5524,7 +4616,6 @@ void Player::UpdateWeaponSkill (WeaponAttackType attType)
     }
     UpdateAllCritPercentages();
 }
-
 void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool defence)
 {
     uint32 plevel = getLevel();                             // if defense than pVictim == attacker
@@ -5532,27 +4623,21 @@ void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool de
     uint32 moblevel = pVictim->getLevelForTarget(this);
     if(moblevel < greylevel)
         return;
-
     if (moblevel > plevel + 5)
         moblevel = plevel + 5;
-
     uint32 lvldif = moblevel - greylevel;
     if(lvldif < 3)
         lvldif = 3;
-
     uint32 skilldif = 5 * plevel - (defence ? GetBaseDefenseSkillValue() : GetBaseWeaponSkillValue(attType));
     if(skilldif <= 0)
         return;
-
     float chance = float(3 * lvldif * skilldif) / plevel;
     if(!defence)
     {
         if(getClass() == CLASS_WARRIOR || getClass() == CLASS_ROGUE)
             chance += chance * 0.02f * GetStat(STAT_INTELLECT);
     }
-
     chance = chance < 1.0f ? 1.0f : chance;                 //minimum chance to increase skill is 1%
-
     if(roll_chance_f(chance))
     {
         if(defence)
@@ -5563,7 +4648,6 @@ void Player::UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool de
     else
         return;
 }
-
 void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent)
 {
     for (uint16 i=0; i < PLAYER_MAX_SKILLS; i++)
@@ -5572,7 +4656,6 @@ void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent)
         uint32 bonus_val = GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i));
         int16 temp_bonus = SKILL_TEMP_BONUS(bonus_val);
         int16 perm_bonus = SKILL_PERM_BONUS(bonus_val);
-
         if(talent)                                          // permanent bonus stored in high part
             SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i),MAKE_SKILL_BONUS(temp_bonus,perm_bonus+val));
         else                                                // temporary/item bonus stored in low part
@@ -5580,30 +4663,23 @@ void Player::ModifySkillBonus(uint32 skillid,int32 val, bool talent)
         return;
     }
 }
-
 void Player::UpdateSkillsForLevel()
 {
     uint16 maxconfskill = sWorld.GetConfigMaxSkillValue();
     uint32 maxSkill = GetMaxSkillValueForLevel();
-
     bool alwaysMaxSkill = sWorld.getConfig(CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL);
-
     for (uint16 i=0; i < PLAYER_MAX_SKILLS; i++)
         if (GetUInt32Value(PLAYER_SKILL_INDEX(i)))
     {
         uint32 pskill = GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF;
-
         SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(pskill);
         if(!pSkill)
             continue;
-
         if(GetSkillRangeType(pSkill,false) != SKILL_RANGE_LEVEL)
             continue;
-
         uint32 data = GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i));
         uint32 max = SKILL_MAX(data);
         uint32 val = SKILL_VALUE(data);
-
         /// update only level dependent max skill values
         if(max!=1)
         {
@@ -5616,7 +4692,6 @@ void Player::UpdateSkillsForLevel()
         }
     }
 }
-
 void Player::UpdateSkillsToMaxSkillsForLevel()
 {
     for (uint16 i=0; i < PLAYER_MAX_SKILLS; i++)
@@ -5626,28 +4701,22 @@ void Player::UpdateSkillsToMaxSkillsForLevel()
         if( IsProfessionOrRidingSkill(pskill))
             continue;
         uint32 data = GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i));
-
         uint32 max = SKILL_MAX(data);
-
         if(max > 1)
             SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(max,max));
-
         if(pskill == SKILL_DEFENSE)
             UpdateDefenseBonusesMod();
     }
 }
-
 // This functions sets a skill line value (and adds if doesn't exist yet)
 // To "remove" a skill line, set it's values to zero
 void Player::SetSkill(uint32 id, uint16 currVal, uint16 maxVal)
 {
     if(!id)
         return;
-
     uint16 i=0;
     for (; i < PLAYER_MAX_SKILLS; i++)
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == id) break;
-
     if(i<PLAYER_MAX_SKILLS)                                 //has skill
     {
         if(currVal)
@@ -5663,7 +4732,6 @@ void Player::SetSkill(uint32 id, uint16 currVal, uint16 maxVal)
             SetUInt32Value(PLAYER_SKILL_INDEX(i),0);
             SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),0);
             SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i),0);
-
             // remove all spells that related to this skill
             for (uint32 j=0; j<sSkillLineAbilityStore.GetNumRows(); ++j)
                 if(SkillLineAbilityEntry const *pAbility = sSkillLineAbilityStore.LookupEntry(j))
@@ -5690,29 +4758,24 @@ void Player::SetSkill(uint32 id, uint16 currVal, uint16 maxVal)
             SetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i),MAKE_SKILL_VALUE(currVal,maxVal));
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_REACH_SKILL_LEVEL,id);
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LEARN_SKILL_LEVEL,id);
-
             // apply skill bonuses
             SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i),0);
-
             // temporary bonuses
             AuraEffectList const& mModSkill = GetAurasByType(SPELL_AURA_MOD_SKILL);
             for(AuraEffectList::const_iterator j = mModSkill.begin(); j != mModSkill.end(); ++j)
                 if ((*j)->GetMiscValue() == int32(id))
                     (*j)->ApplyModifier(true);
-
             // permanent bonuses
             AuraEffectList const& mModSkillTalent = GetAurasByType(SPELL_AURA_MOD_SKILL_TALENT);
             for(AuraEffectList::const_iterator j = mModSkillTalent.begin(); j != mModSkillTalent.end(); ++j)
                 if ((*j)->GetMiscValue() == int32(id))
                     (*j)->ApplyModifier(true);
-
             // Learn all spells for skill
             learnSkillRewardedSpells(id, currVal);
             return;
         }
     }
 }
-
 bool Player::HasSkill(uint32 skill) const
 {
     if(!skill)return false;
@@ -5725,18 +4788,15 @@ bool Player::HasSkill(uint32 skill) const
     }
     return false;
 }
-
 uint16 Player::GetSkillValue(uint32 skill) const
 {
     if(!skill)
         return 0;
-
     for (uint16 i=0; i < PLAYER_MAX_SKILLS; i++)
     {
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == skill)
         {
             uint32 bonus = GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i));
-
             int32 result = int32(SKILL_VALUE(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i))));
             result += SKILL_TEMP_BONUS(bonus);
             result += SKILL_PERM_BONUS(bonus);
@@ -5745,7 +4805,6 @@ uint16 Player::GetSkillValue(uint32 skill) const
     }
     return 0;
 }
-
 uint16 Player::GetMaxSkillValue(uint32 skill) const
 {
     if(!skill)return 0;
@@ -5754,7 +4813,6 @@ uint16 Player::GetMaxSkillValue(uint32 skill) const
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == skill)
         {
             uint32 bonus = GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i));
-
             int32 result = int32(SKILL_MAX(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i))));
             result += SKILL_TEMP_BONUS(bonus);
             result += SKILL_PERM_BONUS(bonus);
@@ -5763,7 +4821,6 @@ uint16 Player::GetMaxSkillValue(uint32 skill) const
     }
     return 0;
 }
-
 uint16 Player::GetPureMaxSkillValue(uint32 skill) const
 {
     if(!skill)return 0;
@@ -5776,7 +4833,6 @@ uint16 Player::GetPureMaxSkillValue(uint32 skill) const
     }
     return 0;
 }
-
 uint16 Player::GetBaseSkillValue(uint32 skill) const
 {
     if(!skill)return 0;
@@ -5791,7 +4847,6 @@ uint16 Player::GetBaseSkillValue(uint32 skill) const
     }
     return 0;
 }
-
 uint16 Player::GetPureSkillValue(uint32 skill) const
 {
     if(!skill)return 0;
@@ -5804,12 +4859,10 @@ uint16 Player::GetPureSkillValue(uint32 skill) const
     }
     return 0;
 }
-
 int16 Player::GetSkillPermBonusValue(uint32 skill) const
 {
     if(!skill)
         return 0;
-
     for (uint8 i = 0; i < PLAYER_MAX_SKILLS; i++)
     {
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == skill)
@@ -5817,15 +4870,12 @@ int16 Player::GetSkillPermBonusValue(uint32 skill) const
             return SKILL_PERM_BONUS(GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i)));
         }
     }
-
     return 0;
 }
-
 int16 Player::GetSkillTempBonusValue(uint32 skill) const
 {
     if(!skill)
         return 0;
-
     for (uint8 i = 0; i < PLAYER_MAX_SKILLS; i++)
     {
         if ((GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF) == skill)
@@ -5833,14 +4883,11 @@ int16 Player::GetSkillTempBonusValue(uint32 skill) const
             return SKILL_TEMP_BONUS(GetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i)));
         }
     }
-
     return 0;
 }
-
 void Player::SendActionButtons(uint32 state) const
 {
     sLog.outDetail( "Sending Action Buttons for '%u' spec '%u'", GetGUIDLow(), m_activeSpec);
-
     WorldPacket data(SMSG_ACTION_BUTTONS, 1+(MAX_ACTION_BUTTONS*4));
     data << uint8(state);                                       // can be 0, 1, 2
     for(int button = 0; button < MAX_ACTION_BUTTONS; ++button)
@@ -5851,11 +4898,9 @@ void Player::SendActionButtons(uint32 state) const
         else
             data << uint32(0);
     }
-
     GetSession()->SendPacket( &data );
     sLog.outDetail( "Action Buttons for '%u' spec '%u' Sent", GetGUIDLow(), m_activeSpec );
 }
-
 ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
 {
     if(button >= MAX_ACTION_BUTTONS)
@@ -5863,13 +4908,11 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
         sLog.outError( "Action %u not added into button %u for player %s: button must be < 132", action, button, GetName() );
         return NULL;
     }
-
     if(action >= MAX_ACTION_BUTTON_ACTION_VALUE)
     {
         sLog.outError( "Action %u not added into button %u for player %s: action must be < %u", action, button, GetName(), MAX_ACTION_BUTTON_ACTION_VALUE );
         return NULL;
     }
-
     switch(type)
     {
         case ACTION_BUTTON_SPELL:
@@ -5878,7 +4921,6 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
                 sLog.outError( "Action %u not added into button %u for player %s: spell not exist", action, button, GetName() );
                 return NULL;
             }
-
             if(!HasSpell(action))
             {
                 sLog.outError( "Action %u not added into button %u for player %s: player don't known this spell", action, button, GetName() );
@@ -5896,36 +4938,29 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
             break;                                          // pther cases not checked at this moment
     }
 
-
     // it create new button (NEW state) if need or return existed
     ActionButton& ab = m_actionButtons[button];
-
     // set data and update to CHANGED if not NEW
     ab.SetActionAndType(action,ActionButtonType(type));
-
     sLog.outDetail( "Player '%u' Added Action '%u' (type %u) to Button '%u'", GetGUIDLow(), action, uint32(type), button );
     return &ab;
 }
-
 void Player::removeActionButton(uint8 button)
 {
     ActionButtonList::iterator buttonItr = m_actionButtons.find(button);
     if (buttonItr==m_actionButtons.end())
         return;
-
     if (!buttonItr->second.canRemoveByClient)
     {
-        buttonItr->second.canRemoveByClient = true;    
+        buttonItr->second.canRemoveByClient = true;
         return;
-    }    
+    }
     if(buttonItr->second.uState==ACTIONBUTTON_NEW)
         m_actionButtons.erase(buttonItr);                   // new and not saved
     else
         buttonItr->second.uState = ACTIONBUTTON_DELETED;    // saved, will deleted at next save
-
     sLog.outDetail( "Action Button '%u' Removed from Player '%u'", button, GetGUIDLow() );
 }
-
 bool Player::SetPosition(float x, float y, float z, float orientation, bool teleport)
 {
     // prevent crash when a bad coord is sent by the client
@@ -5934,46 +4969,35 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
         sLog.outDebug("Player::SetPosition(%f, %f, %f, %f, %d) .. bad coordinates for player %d!",x,y,z,orientation,teleport,GetGUIDLow());
         return false;
     }
-
     //if(movementInfo.flags & MOVEMENTFLAG_MOVING)
     //    mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE);
     //if(movementInfo.flags & MOVEMENTFLAG_TURNING)
     //    mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
     //AURA_INTERRUPT_FLAG_JUMP not sure
-
     bool turn = (GetOrientation() != orientation);
     bool move2d = (teleport || GetPositionX() != x || GetPositionY() != y);
-
     if(turn)
         RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
-
     if(move2d || GetPositionZ() != z)
     {
         RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE);
-
         // move and update visible state if need
         GetMap()->PlayerRelocation(this, x, y, z, orientation);
-
         // reread after Map::Relocation
         GetPosition(x, y, z);
-
         // group update
         if(move2d && GetGroup())
             SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
-
         // code block for underwater state update
         UpdateUnderwaterState(GetMap(), x, y, z);
-
         CheckExploreSystem();
     }
     else if(turn)
     {
         SetOrientation(orientation);
     }
-
     return true;
 }
-
 void Player::SaveRecallPosition()
 {
     m_recallMap = GetMapId();
@@ -5982,63 +5006,51 @@ void Player::SaveRecallPosition()
     m_recallZ = GetPositionZ();
     m_recallO = GetOrientation();
 }
-
 void Player::SendMessageToSet(WorldPacket *data, bool self)
 {
     if(self)
         GetSession()->SendPacket(data);
-
     // we use World::GetMaxVisibleDistance() because i cannot see why not use a distance
     // update: replaced by GetMap()->GetVisibilityDistance()
     Trinity::MessageDistDeliverer notifier(this, data, GetMap()->GetVisibilityDistance());
     VisitNearbyWorldObject(GetMap()->GetVisibilityDistance(), notifier);
 }
-
 void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self)
 {
     if(self)
         GetSession()->SendPacket(data);
-
     Trinity::MessageDistDeliverer notifier(this, data, dist);
     VisitNearbyWorldObject(dist, notifier);
 }
-
 void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool own_team_only)
 {
     if(self)
         GetSession()->SendPacket(data);
-
     Trinity::MessageDistDeliverer notifier(this, data, dist, own_team_only);
     VisitNearbyWorldObject(dist, notifier);
 }
-
 void Player::SendDirectMessage(WorldPacket *data)
 {
     GetSession()->SendPacket(data);
 }
-
 void Player::SendCinematicStart(uint32 CinematicSequenceId)
 {
     WorldPacket data(SMSG_TRIGGER_CINEMATIC, 4);
     data << uint32(CinematicSequenceId);
     SendDirectMessage(&data);
 }
-
 void Player::SendMovieStart(uint32 MovieId)
 {
     WorldPacket data(SMSG_TRIGGER_MOVIE, 4);
     data << uint32(MovieId);
     SendDirectMessage(&data);
 }
-
 void Player::CheckExploreSystem()
 {
     if (!isAlive())
         return;
-
     if (isInFlight())
         return;
-
     if(!m_AreaID)
         m_AreaID = GetAreaId();
     if(m_AreaID != GetAreaId())
@@ -6046,27 +5058,21 @@ void Player::CheckExploreSystem()
         m_AreaID = GetAreaId();
         GetSession()->HandleOnAreaChange(GetAreaEntryByAreaID(m_AreaID));
     }
-
     uint16 areaFlag = GetBaseMap()->GetAreaFlag(GetPositionX(),GetPositionY(),GetPositionZ());
     if(areaFlag==0xffff)
         return;
     int offset = areaFlag / 32;
-
     if(offset >= 128)
     {
         sLog.outError("Wrong area flag %u in map data for (X: %f Y: %f) point to field PLAYER_EXPLORED_ZONES_1 + %u ( %u must be < 128 ).",areaFlag,GetPositionX(),GetPositionY(),offset,offset);
         return;
     }
-
     uint32 val = (uint32)(1 << (areaFlag % 32));
     uint32 currFields = GetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset);
-
     if( !(currFields & val) )
     {
         SetUInt32Value(PLAYER_EXPLORED_ZONES_1 + offset, (uint32)(currFields | val));
-
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EXPLORE_AREA);
-
         AreaTableEntry const *p = GetAreaEntryByAreaFlagAndMap(areaFlag,GetMapId());
         if(!p)
         {
@@ -6094,14 +5100,12 @@ void Player::CheckExploreSystem()
                         exploration_percent = 100;
                     else if (exploration_percent < 0)
                         exploration_percent = 0;
-
                     XP = uint32(objmgr.GetBaseXP(p->area_level)*exploration_percent/100*sWorld.getRate(RATE_XP_EXPLORE));
                 }
                 else
                 {
                     XP = uint32(objmgr.GetBaseXP(p->area_level)*sWorld.getRate(RATE_XP_EXPLORE));
                 }
-
                 GiveXP( XP, NULL );
                 SendExplorationExperience(area,XP);
             }
@@ -6109,7 +5113,6 @@ void Player::CheckExploreSystem()
         }
     }
 }
-
 uint32 Player::TeamForRace(uint8 race)
 {
     ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race);
@@ -6118,17 +5121,14 @@ uint32 Player::TeamForRace(uint8 race)
         sLog.outError("Race %u not found in DBC: wrong DBC files?",uint32(race));
         return ALLIANCE;
     }
-
     switch(rEntry->TeamID)
     {
         case 7: return ALLIANCE;
         case 1: return HORDE;
     }
-
     sLog.outError("Race %u have wrong teamid %u in DBC: wrong DBC files?",uint32(race),rEntry->TeamID);
     return ALLIANCE;
 }
-
 uint32 Player::getFactionForRace(uint8 race)
 {
     ChrRacesEntry const* rEntry = sChrRacesStore.LookupEntry(race);
@@ -6137,70 +5137,51 @@ uint32 Player::getFactionForRace(uint8 race)
         sLog.outError("Race %u not found in DBC: wrong DBC files?",uint32(race));
         return 0;
     }
-
     return rEntry->FactionID;
 }
-
 void Player::setFactionForRace(uint8 race)
 {
     m_team = TeamForRace(race);
     setFaction( getFactionForRace(race) );
 }
-
 ReputationRank Player::GetReputationRank(uint32 faction) const
 {
     FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction);
     return GetReputationMgr().GetRank(factionEntry);
 }
-
 //Calculate total reputation percent player gain with quest/creature level
 int32 Player::CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool for_quest)
 {
     float percent = 100.0f;
-
     float rate = for_quest ? sWorld.getRate(RATE_REPUTATION_LOWLEVEL_QUEST) : sWorld.getRate(RATE_REPUTATION_LOWLEVEL_KILL);
-
     if (rate != 1.0f && creatureOrQuestLevel <= MaNGOS::XP::GetGrayLevel(getLevel()))
         percent *= rate;
-
     float repMod = GetTotalAuraModifier(SPELL_AURA_MOD_REPUTATION_GAIN);
-
     if (!for_quest)
         repMod += GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_FACTION_REPUTATION_GAIN, faction);
-
     percent += rep > 0 ? repMod : -repMod;
-
     if (percent <= 0.0f)
         return 0;
-
     return int32(rep*percent/100);
 }
-
 //Calculates how many reputation points player gains in victim's enemy factions
 void Player::RewardReputation(Unit *pVictim, float rate)
 {
     if(!pVictim || pVictim->GetTypeId() == TYPEID_PLAYER)
         return;
-
     if(((Creature*)pVictim)->IsReputationGainDisabled())
         return;
-
     ReputationOnKillEntry const* Rep = objmgr.GetReputationOnKilEntry(((Creature*)pVictim)->GetCreatureInfo()->Entry);
-
     if(!Rep)
         return;
-
     uint32 ChampioningFaction = 0;
-
     if(GetChampioningFaction())
     {
         // support for: Championing - http://www.wowwiki.com/Championing
-
         Map const *pMap = GetMap();
         if(pMap && pMap->IsDungeon())
         {
             bool Heroic = pMap->IsHeroic();
-
             InstanceTemplate const *pInstance = objmgr.GetInstanceTemplate(pMap->GetId());
             if(pInstance)
             {
@@ -6213,18 +5194,14 @@ void Player::RewardReputation(Unit *pVictim, float rate)
             }
         }
     }
-
     // Favored reputation increase START
     uint32 zone = GetZoneId();
     uint32 team = GetTeam();
     float favored_rep_mult = 0;
-
     if( (HasAura(32096) || HasAura(32098)) && (zone == 3483 || zone == 3562 || zone == 3836 || zone == 3713 || zone == 3714) ) favored_rep_mult = 0.25; // Thrallmar's Favor and Honor Hold's Favor
     else if( HasAura(30754) && (Rep->repfaction1 == 609 || Rep->repfaction2 == 609) && !ChampioningFaction )                   favored_rep_mult = 0.25; // Cenarion Favor
-
     if(favored_rep_mult > 0) favored_rep_mult *= 2; // Multiplied by 2 because the reputation is divided by 2 for some reason (See "donerep1 / 2" and "donerep2 / 2") -- if you know why this is done, please update/explain :)
     // Favored reputation increase END
-
     if(Rep->repfaction1 && (!Rep->team_dependent || team == ALLIANCE))
     {
         int32 donerep1 = CalculateReputationGain(pVictim->getLevel(), Rep->repvalue1, ChampioningFaction ? ChampioningFaction : Rep->repfaction1, false);
@@ -6233,7 +5210,6 @@ void Player::RewardReputation(Unit *pVictim, float rate)
         uint32 current_reputation_rank1 = GetReputationMgr().GetRank(factionEntry1);
         if (factionEntry1 && current_reputation_rank1 <= Rep->reputation_max_cap1)
             GetReputationMgr().ModifyReputation(factionEntry1, donerep1);
-
         // Wiki: Team factions value divided by 2 -- Deprecated, see ModifyReputation
         /*if (factionEntry1 && Rep->is_teamaward1)
         {
@@ -6242,7 +5218,6 @@ void Player::RewardReputation(Unit *pVictim, float rate)
                 GetReputationMgr().ModifyReputation(team1_factionEntry, donerep1 / 2);
         }*/
     }
-
     if(Rep->repfaction2 && (!Rep->team_dependent || team == HORDE))
     {
         int32 donerep2 = CalculateReputationGain(pVictim->getLevel(), Rep->repvalue2, ChampioningFaction ? ChampioningFaction : Rep->repfaction2, false);
@@ -6251,7 +5226,6 @@ void Player::RewardReputation(Unit *pVictim, float rate)
         uint32 current_reputation_rank2 = GetReputationMgr().GetRank(factionEntry2);
         if (factionEntry2 && current_reputation_rank2 <= Rep->reputation_max_cap2)
             GetReputationMgr().ModifyReputation(factionEntry2, donerep2);
-
         // Wiki: Team factions value divided by 2 -- Deprecated, see ModifyReputation
         /*if (factionEntry2 && Rep->is_teamaward2)
         {
@@ -6261,7 +5235,6 @@ void Player::RewardReputation(Unit *pVictim, float rate)
         }*/
     }
 }
-
 //Calculate how many reputation points player gain with the quest
 void Player::RewardReputation(Quest const *pQuest)
 {
@@ -6276,32 +5249,25 @@ void Player::RewardReputation(Quest const *pQuest)
                 GetReputationMgr().ModifyReputation(factionEntry, rep);
         }
     }
-
     // TODO: implement reputation spillover
 }
-
 void Player::UpdateArenaFields(void)
 {
     /* arena calcs go here */
 }
-
 void Player::UpdateHonorFields()
 {
     /// called when rewarding honor and at each save
     uint64 now = time(NULL);
     uint64 today = uint64(time(NULL) / DAY) * DAY;
-
     if(m_lastHonorUpdateTime < today)
     {
         uint64 yesterday = today - DAY;
-
         uint16 kills_today = PAIR32_LOPART(GetUInt32Value(PLAYER_FIELD_KILLS));
-
         // update yesterday's contribution
         if(m_lastHonorUpdateTime >= yesterday )
         {
             SetUInt32Value(PLAYER_FIELD_YESTERDAY_CONTRIBUTION, GetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION));
-
             // this is the first update today, reset today's contribution
             SetUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, 0);
             SetUInt32Value(PLAYER_FIELD_KILLS, MAKE_PAIR32(0,kills_today));
@@ -6313,10 +5279,8 @@ void Player::UpdateHonorFields()
             SetUInt32Value(PLAYER_FIELD_KILLS, 0);
         }
     }
-
     m_lastHonorUpdateTime = now;
 }
-
 ///Calculate the amount of honor gained based on the victim
 ///and the size of the group for which the honor is divided
 ///An exact honor value can also be given (overriding the calcs)
@@ -6327,47 +5291,35 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
     {
         if(!uVictim || uVictim == this || uVictim->GetTypeId() != TYPEID_PLAYER)
             return false;
-
         if( GetBGTeam() == ((Player*)uVictim)->GetBGTeam() )
             return false;
-
         return true;
     }
-
     // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
     if(HasAura(SPELL_AURA_PLAYER_INACTIVE))
         return false;
-
     uint64 victim_guid = 0;
     uint32 victim_rank = 0;
     time_t now = time(NULL);
-
     // need call before fields update to have chance move yesterday data to appropriate fields before today data change.
     UpdateHonorFields();
-
     // do not reward honor in arenas, but return true to enable onkill spellproc
     if(InBattleGround() && GetBattleGround() && GetBattleGround()->isArena())
         return true;
-
     if(honor <= 0)
     {
         if(!uVictim || uVictim == this || uVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT))
             return false;
-
         victim_guid = uVictim->GetGUID();
-
         if( uVictim->GetTypeId() == TYPEID_PLAYER )
         {
             Player *pVictim = (Player *)uVictim;
-
             if( GetTeam() == pVictim->GetTeam() && !sWorld.IsFFAPvPRealm() )
                 return false;
-
             float f = 1;                                    //need for total kills (?? need more info)
             uint32 k_grey = 0;
             uint32 k_level = getLevel();
             uint32 v_level = pVictim->getLevel();
-
             {
                 // PLAYER_CHOSEN_TITLE VALUES DESCRIPTION
                 //  [0]      Just name
@@ -6390,19 +5342,13 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
                 else
                     victim_guid = 0;                        // Don't show HK: <rank> message, only log.
             }
-
             k_grey = Trinity::XP::GetGrayLevel(k_level);
-
             if(v_level<=k_grey)
                 return false;
-
             float diff_level = (k_level == k_grey) ? 1 : ((float(v_level) - float(k_grey)) / (float(k_level) - float(k_grey)));
-
             int32 v_rank =1;                                //need more info
-
             honor = ((f * diff_level * (190 + v_rank*10))/6);
             honor *= ((float)k_level) / 70.0f;              //factor of dependence on levels of the killer
-
             // count the number of playerkills in one day
             ApplyModUInt32Value(PLAYER_FIELD_KILLS, 1, true);
             // and those in a lifetime
@@ -6414,27 +5360,21 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
         else
         {
             Creature *cVictim = (Creature *)uVictim;
-
             if (!cVictim->isRacialLeader())
                 return false;
-
             honor = 100;                                    // ??? need more info
             victim_rank = 19;                               // HK: Leader
         }
     }
-
     if (uVictim != NULL)
     {
         honor *= sWorld.getRate(RATE_HONOR);
-
         if(groupsize > 1)
             honor /= groupsize;
-
         // apply honor multiplier from aura (not stacking-get highest)
         honor = int32(float(honor) * (float(GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HONOR_GAIN_PCT))+100.0f)/100.0f);
         honor *= (((float)urand(8,12))/10);                 // approx honor: 80% - 120% of real honor
     }
-
     // honor - for show honor points in log
     // victim_guid - for show victim name in log
     // victim_rank [1..4]  HK: <dishonored rank>
@@ -6444,19 +5384,14 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
     data << (uint32) honor;
     data << (uint64) victim_guid;
     data << (uint32) victim_rank;
-
     GetSession()->SendPacket(&data);
-
     // add honor points
     ModifyHonorPoints(int32(honor));
-
     ApplyModUInt32Value(PLAYER_FIELD_TODAY_CONTRIBUTION, uint32(honor), true);
-
     if( sWorld.getConfig(CONFIG_PVP_TOKEN_ENABLE) && pvptoken )
     {
         if(!uVictim || uVictim == this || uVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT))
             return true;
-
         if(uVictim->GetTypeId() == TYPEID_PLAYER)
         {
             // Check if allowed to receive it in current map
@@ -6465,33 +5400,27 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
                 || (MapType == 2 && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
                 || (MapType == 3 && !InBattleGround()) )
                 return true;
-
             uint32 noSpaceForCount = 0;
             uint32 itemId = sWorld.getConfig(CONFIG_PVP_TOKEN_ID);
             int32 count = sWorld.getConfig(CONFIG_PVP_TOKEN_COUNT);
-
             // check space and find places
             ItemPosCountVec dest;
             uint8 msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, count, &noSpaceForCount );
             if( msg != EQUIP_ERR_OK )   // convert to possible store amount
                 count = noSpaceForCount;
-
             if( count == 0 || dest.empty()) // can't add any
             {
                 // -- TODO: Send to mailbox if no space
                 ChatHandler(this).PSendSysMessage("You don't have any space in your bags for a token.");
                 return true;
             }
-
             Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
             SendNewItem(item,count,true,false);
             ChatHandler(this).PSendSysMessage("You have been awarded a token for slaying another player.");
         }
     }
-
     return true;
 }
-
 void Player::ModifyHonorPoints( int32 value )
 {
     if(value < 0)
@@ -6504,7 +5433,6 @@ void Player::ModifyHonorPoints( int32 value )
     else
         SetUInt32Value(PLAYER_FIELD_HONOR_CURRENCY, GetHonorPoints() < sWorld.getConfig(CONFIG_MAX_HONOR_POINTS) - value ? GetHonorPoints() + value : sWorld.getConfig(CONFIG_MAX_HONOR_POINTS));
 }
-
 void Player::ModifyArenaPoints( int32 value )
 {
     if(value < 0)
@@ -6517,18 +5445,15 @@ void Player::ModifyArenaPoints( int32 value )
     else
         SetUInt32Value(PLAYER_FIELD_ARENA_CURRENCY, GetArenaPoints() < sWorld.getConfig(CONFIG_MAX_ARENA_POINTS) - value ? GetArenaPoints() + value : sWorld.getConfig(CONFIG_MAX_ARENA_POINTS));
 }
-
 uint32 Player::GetGuildIdFromDB(uint64 guid)
 {
     QueryResult* result = CharacterDatabase.PQuery("SELECT guildid FROM guild_member WHERE guid='%u'", GUID_LOPART(guid));
     if(!result)
         return 0;
-
     uint32 id = result->Fetch()[0].GetUInt32();
     delete result;
     return id;
 }
-
 uint32 Player::GetRankFromDB(uint64 guid)
 {
     QueryResult *result = CharacterDatabase.PQuery( "SELECT rank FROM guild_member WHERE guid='%u'", GUID_LOPART(guid) );
@@ -6541,18 +5466,15 @@ uint32 Player::GetRankFromDB(uint64 guid)
     else
         return 0;
 }
-
 uint32 Player::GetArenaTeamIdFromDB(uint64 guid, uint8 type)
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u' AND type='%u' LIMIT 1", GUID_LOPART(guid), type);
     if(!result)
         return 0;
-
     uint32 id = (*result)[0].GetUInt32();
     delete result;
     return id;
 }
-
 uint32 Player::GetZoneIdFromDB(uint64 guid)
 {
     uint32 guidLow = GUID_LOPART(guid);
@@ -6562,7 +5484,6 @@ uint32 Player::GetZoneIdFromDB(uint64 guid)
     Field* fields = result->Fetch();
     uint32 zone = fields[0].GetUInt32();
     delete result;
-
     if (!zone)
     {
         // stored zone is zero, use generic and slow zone detection
@@ -6575,42 +5496,32 @@ uint32 Player::GetZoneIdFromDB(uint64 guid)
         float posy = fields[2].GetFloat();
         float posz = fields[3].GetFloat();
         delete result;
-
         zone = MapManager::Instance().GetZoneId(map,posx,posy,posz);
-
         if (zone > 0)
             CharacterDatabase.PExecute("UPDATE characters SET zone='%u' WHERE guid='%u'", zone, guidLow);
     }
-
     return zone;
 }
-
 uint32 Player::GetLevelFromDB(uint64 guid)
 {
     QueryResult *result = CharacterDatabase.PQuery( "SELECT level FROM characters WHERE guid='%u'", GUID_LOPART(guid) );
     if (!result)
         return 0;
-
     Field* fields = result->Fetch();
     uint32 level = fields[0].GetUInt32();
     delete result;
-
     return level;
 }
-
 void Player::UpdateArea(uint32 newArea)
 {
     // FFA_PVP flags are area and not zone id dependent
     // so apply them accordingly
     m_areaUpdateId    = newArea;
-
     AreaTableEntry const* area = GetAreaEntryByAreaID(newArea);
     pvpInfo.inFFAPvPArea = area && (area->flags & AREA_FLAG_ARENA);
     UpdatePvPState(true);
-
     UpdateAreaDependentAuras(newArea);
 }
-
 void Player::UpdateZone(uint32 newZone, uint32 newArea)
 {
     if(m_zoneUpdateId != newZone)
@@ -6619,17 +5530,13 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
         sOutdoorPvPMgr.HandlePlayerEnterZone(this, newZone);
         SendInitWorldStates(newZone, newArea);              // only if really enters to new zone, not just area change, works strange...
     }
-
     m_zoneUpdateId    = newZone;
     m_zoneUpdateTimer = ZONE_UPDATE_INTERVAL;
-
     // zone changed, so area changed as well, update it
     UpdateArea(newArea);
-
     AreaTableEntry const* zone = GetAreaEntryByAreaID(newZone);
     if(!zone)
         return;
-
     if (sWorld.getConfig(CONFIG_WEATHER))
     {
         Weather *wth = sWorld.FindWeather(zone->ID);
@@ -6646,7 +5553,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
             }
         }
     }
-
     // in PvP, any not controlled zone (except zone->team == 6, default case)
     // in PvE, only opposition team capital
     switch(zone->team)
@@ -6665,7 +5571,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
             pvpInfo.inHostileArea = false;
             break;
     }
-
     pvpInfo.inNoPvPArea = false;
     if(zone->IsSanctuary())       // in sanctuary
     {
@@ -6677,7 +5582,6 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
     {
         RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY);
     }
-
     if(zone->flags & AREA_FLAG_CAPITAL)                     // in capital city
     {
         SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
@@ -6704,44 +5608,34 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
             }
         }
     }
-
     UpdatePvPState();
-
     // remove items with area/map limitations (delete only for alive player to allow back in ghost mode)
     // if player resurrected at teleport this will be applied in resurrect code
     if(isAlive())
         DestroyZoneLimitedItem( true, newZone );
-
     // check some item equip limitations (in result lost CanTitanGrip at talent reset, for example)
     AutoUnequipOffhandIfNeed();
-
     // recent client version not send leave/join channel packets for built-in local channels
     UpdateLocalChannels( newZone );
-
     // group update
     if(GetGroup())
         SetGroupUpdateFlag(GROUP_UPDATE_FLAG_ZONE);
-
     UpdateZoneDependentAuras(newZone);
 }
-
 //If players are too far way of duel flag... then player loose the duel
 void Player::CheckDuelDistance(time_t currTime)
 {
     if(!duel)
         return;
-
     uint64 duelFlagGUID = GetUInt64Value(PLAYER_DUEL_ARBITER);
     GameObject* obj = GetMap()->GetGameObject(duelFlagGUID);
     if(!obj)
         return;
-
     if(duel->outOfBound == 0)
     {
         if(!IsWithinDistInMap(obj, 50))
         {
             duel->outOfBound = currTime;
-
             WorldPacket data(SMSG_DUEL_OUTOFBOUNDS, 0);
             GetSession()->SendPacket(&data);
         }
@@ -6751,7 +5645,6 @@ void Player::CheckDuelDistance(time_t currTime)
         if(IsWithinDistInMap(obj, 40))
         {
             duel->outOfBound = 0;
-
             WorldPacket data(SMSG_DUEL_INBOUNDS, 0);
             GetSession()->SendPacket(&data);
         }
@@ -6761,25 +5654,20 @@ void Player::CheckDuelDistance(time_t currTime)
         }
     }
 }
-
 bool Player::IsOutdoorPvPActive()
 {
     return (isAlive() && !HasInvisibilityAura() && !HasStealthAura() && (IsPvP() || sWorld.IsPvPRealm())  && !HasUnitMovementFlag(MOVEMENTFLAG_FLYING) && !isInFlight());
 }
-
 void Player::DuelComplete(DuelCompleteType type)
 {
     // duel not requested
     if(!duel)
         return;
-
     sLog.outDebug("Duel Complete %s %s", GetName(), duel->opponent->GetName());
-
     WorldPacket data(SMSG_DUEL_COMPLETE, (1));
     data << (uint8)((type != DUEL_INTERUPTED) ? 1 : 0);
     GetSession()->SendPacket(&data);
     duel->opponent->GetSession()->SendPacket(&data);
-
     if(type != DUEL_INTERUPTED)
     {
         data.Initialize(SMSG_DUEL_WINNER, (1+20));          // we guess size
@@ -6788,25 +5676,21 @@ void Player::DuelComplete(DuelCompleteType type)
         data << GetName();
         SendMessageToSet(&data,true);
     }
-
     if (type == DUEL_WON)
     {
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_LOSE_DUEL, 1);
         if (duel->opponent)
         {
              duel->opponent->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_WIN_DUEL, 1);
-
             //Credit for quest Death's Challenge
             if (getClass() == CLASS_DEATH_KNIGHT && duel->opponent->GetQuestStatus(12733) == QUEST_STATUS_INCOMPLETE)
                 duel->opponent->CastSpell(duel->opponent, 52994, true);
         }
     }
-
     //Remove Duel Flag object
     GameObject* obj = GetMap()->GetGameObject(GetUInt64Value(PLAYER_DUEL_ARBITER));
     if(obj)
         duel->initiator->RemoveGameObject(obj,true);
-
     /* remove auras */
     AuraMap &itsAuras = duel->opponent->GetAuras();
     for(AuraMap::iterator i = itsAuras.begin(); i != itsAuras.end();)
@@ -6818,7 +5702,6 @@ void Player::DuelComplete(DuelCompleteType type)
         else
             ++i;
     }
-
     AuraMap &myAuras = GetAuras();
     for(AuraMap::iterator i = myAuras.begin(); i != myAuras.end();)
     {
@@ -6829,93 +5712,69 @@ void Player::DuelComplete(DuelCompleteType type)
         else
             ++i;
     }
-
     // cleanup combo points
     if(GetComboTarget()==duel->opponent->GetGUID())
         ClearComboPoints();
     else if(GetComboTarget()==duel->opponent->GetPetGUID())
         ClearComboPoints();
-
     if(duel->opponent->GetComboTarget()==GetGUID())
         duel->opponent->ClearComboPoints();
     else if(duel->opponent->GetComboTarget()==GetPetGUID())
         duel->opponent->ClearComboPoints();
-
     // Honor points after duel (the winner) - ImpConfig
     if(uint32 amount = sWorld.getConfig(CONFIG_HONOR_AFTER_DUEL))
         duel->opponent->RewardHonor(NULL,1,amount);
-
     //cleanups
     SetUInt64Value(PLAYER_DUEL_ARBITER, 0);
     SetUInt32Value(PLAYER_DUEL_TEAM, 0);
     duel->opponent->SetUInt64Value(PLAYER_DUEL_ARBITER, 0);
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 0);
-
     delete duel->opponent->duel;
     duel->opponent->duel = NULL;
     delete duel;
     duel = NULL;
 }
-
 //---------------------------------------------------------//
-
 void Player::_ApplyItemMods(Item *item, uint8 slot,bool apply)
 {
     if(slot >= INVENTORY_SLOT_BAG_END || !item)
         return;
-
     // not apply mods for broken item
     if(item->IsBroken())
         return;
-
     ItemPrototype const *proto = item->GetProto();
-
     if(!proto)
         return;
-
     sLog.outDetail("applying mods for item %u ",item->GetGUIDLow());
-
     uint8 attacktype = Player::GetAttackBySlot(slot);
-
     //check disarm only on mod apply to allow remove item mods
     if (!CanUseAttackType(attacktype) )
         return;
-
     if(attacktype < MAX_ATTACK)
         _ApplyWeaponDependentAuraMods(item,WeaponAttackType(attacktype),apply);
-
     _ApplyItemBonuses(proto,slot,apply);
-
     if( slot==EQUIPMENT_SLOT_RANGED )
         _ApplyAmmoBonuses();
-
     ApplyItemEquipSpell(item,apply);
     ApplyEnchantment(item, apply);
-
     if(proto->Socket[0].Color)                              //only (un)equipping of items with sockets can influence metagems, so no need to waste time with normal items
         CorrectMetaGemEnchants(slot, apply);
-
     sLog.outDebug("_ApplyItemMods complete.");
 }
-
 void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool apply, bool only_level_scale /*= false*/)
 {
     if (slot >= INVENTORY_SLOT_BAG_END || !proto)
         return;
-
     ScalingStatDistributionEntry const *ssd = proto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(proto->ScalingStatDistribution) : NULL;
     if (only_level_scale && !ssd)
         return;
-
     // req. check at equip, but allow use for extended range if range limit max level, set proper level
     uint32 ssd_level = getLevel();
     if (ssd && ssd_level > ssd->MaxLevel)
         ssd_level = ssd->MaxLevel;
-
     ScalingStatValuesEntry const *ssv = proto->ScalingStatValue ? sScalingStatValuesStore.LookupEntry(ssd_level) : NULL;
     if (only_level_scale && !ssv)
         return;
-
     for (uint8 i = 0; i < MAX_ITEM_PROTO_STATS; ++i)
     {
         uint32 statType = 0;
@@ -6935,10 +5794,8 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
             statType = proto->ItemStat[i].ItemStatType;
             val = proto->ItemStat[i].ItemStatValue;
         }
-
         if(val == 0)
             continue;
-
         switch (statType)
         {
             case ITEM_MOD_MANA:
@@ -7082,14 +5939,12 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
                 break;
         }
     }
-
     // Apply Spell Power from ScalingStatValue if set
     if(ssv)
     {
         if (int32 spellbonus = ssv->getSpellBonus(proto->ScalingStatValue))
             ApplySpellPowerBonus(spellbonus, apply);
     }
-
     // If set ScalingStatValue armor get it or use item armor
     uint32 armor = proto->Armor;
     if (ssv)
@@ -7100,34 +5955,24 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
     // Add armor bonus from ArmorDamageModifier if > 0
     if (proto->ArmorDamageModifier > 0)
         armor += uint32(proto->ArmorDamageModifier);
-
     if (armor)
         HandleStatModifier(UNIT_MOD_ARMOR, BASE_VALUE, float(armor), apply);
-
     if (proto->Block)
         HandleBaseModValue(SHIELD_BLOCK_VALUE, FLAT_MOD, float(proto->Block), apply);
-
     if (proto->HolyRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_HOLY, BASE_VALUE, float(proto->HolyRes), apply);
-
     if (proto->FireRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_FIRE, BASE_VALUE, float(proto->FireRes), apply);
-
     if (proto->NatureRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_NATURE, BASE_VALUE, float(proto->NatureRes), apply);
-
     if (proto->FrostRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_FROST, BASE_VALUE, float(proto->FrostRes), apply);
-
     if (proto->ShadowRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_SHADOW, BASE_VALUE, float(proto->ShadowRes), apply);
-
     if (proto->ArcaneRes)
         HandleStatModifier(UNIT_MOD_RESISTANCE_ARCANE, BASE_VALUE, float(proto->ArcaneRes), apply);
-
     WeaponAttackType attType = BASE_ATTACK;
     float damage = 0.0f;
-
     if( slot == EQUIPMENT_SLOT_RANGED && (
         proto->InventoryType == INVTYPE_RANGED || proto->InventoryType == INVTYPE_THROWN ||
         proto->InventoryType == INVTYPE_RANGEDRIGHT ))
@@ -7138,7 +5983,6 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
     {
         attType = OFF_ATTACK;
     }
-
     float minDamage = proto->Damage[0].DamageMin;
     float maxDamage = proto->Damage[0].DamageMax;
     int32 extraDPS = 0;
@@ -7158,13 +6002,11 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
         SetBaseWeaponDamage(attType, MINDAMAGE, damage);
         //sLog.outError("applying mindam: assigning %f to weapon mindamage, now is: %f", damage, GetWeaponDamageRange(attType, MINDAMAGE));
     }
-
     if (maxDamage  > 0 )
     {
         damage = apply ? maxDamage : BASE_MAXDAMAGE;
         SetBaseWeaponDamage(attType, MAXDAMAGE, damage);
     }
-
     // Apply feral bonus from ScalingStatValue if set
     if (ssv)
     {
@@ -7178,10 +6020,8 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
         if (feral_bonus > 0)
             ApplyFeralAPBonus(feral_bonus, apply);
     }
-
     if(IsInFeralForm() || !CanUseAttackType(attType))
         return;
-
     if (proto->Delay)
     {
         if(slot == EQUIPMENT_SLOT_RANGED)
@@ -7191,32 +6031,26 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
         else if(slot==EQUIPMENT_SLOT_OFFHAND)
             SetAttackTime(OFF_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME);
     }
-
     if(CanModifyStats() && (damage || proto->Delay))
         UpdateDamagePhysical(attType);
 }
-
 void Player::_ApplyWeaponDependentAuraMods(Item *item,WeaponAttackType attackType,bool apply)
 {
     AuraEffectList const& auraCritList = GetAurasByType(SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
     for(AuraEffectList::const_iterator itr = auraCritList.begin(); itr!=auraCritList.end();++itr)
         _ApplyWeaponDependentAuraCritMod(item,attackType,*itr,apply);
-
     AuraEffectList const& auraDamageFlatList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
     for(AuraEffectList::const_iterator itr = auraDamageFlatList.begin(); itr!=auraDamageFlatList.end();++itr)
         _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply);
-
     AuraEffectList const& auraDamagePCTList = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
     for(AuraEffectList::const_iterator itr = auraDamagePCTList.begin(); itr!=auraDamagePCTList.end();++itr)
         _ApplyWeaponDependentAuraDamageMod(item,attackType,*itr,apply);
 }
-
 void Player::_ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply)
 {
     // generic not weapon specific case processes in aura code
     if(aura->GetSpellProto()->EquippedItemClass == -1)
         return;
-
     BaseModGroup mod = BASEMOD_END;
     switch(attackType)
     {
@@ -7225,23 +6059,19 @@ void Player::_ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attac
         case RANGED_ATTACK: mod = RANGED_CRIT_PERCENTAGE; break;
         default: return;
     }
-
     if (item->IsFitToSpellRequirements(aura->GetSpellProto()))
     {
         HandleBaseModValue(mod, FLAT_MOD, float (aura->GetAmount()), apply);
     }
 }
-
 void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply)
 {
     // ignore spell mods for not wands
     if((aura->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)==0 && (getClassMask() & CLASSMASK_WAND_USERS)==0)
         return;
-
     // generic not weapon specific case processes in aura code
     if(aura->GetSpellProto()->EquippedItemClass == -1)
         return;
-
     UnitMods unitMod = UNIT_MOD_END;
     switch(attackType)
     {
@@ -7250,7 +6080,6 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att
         case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED;   break;
         default: return;
     }
-
     UnitModifierType unitModType = TOTAL_VALUE;
     switch(aura->GetAuraName())
     {
@@ -7258,43 +6087,34 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att
         case SPELL_AURA_MOD_DAMAGE_PERCENT_DONE: unitModType = TOTAL_PCT;   break;
         default: return;
     }
-
     if (item->IsFitToSpellRequirements(aura->GetSpellProto()))
     {
         HandleStatModifier(unitMod, unitModType, float(aura->GetAmount()),apply);
     }
 }
-
 void Player::ApplyItemEquipSpell(Item *item, bool apply, bool form_change)
 {
     if(!item)
         return;
-
     ItemPrototype const *proto = item->GetProto();
     if(!proto)
         return;
-
     for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = proto->Spells[i];
-
         // no spell
         if(!spellData.SpellId )
             continue;
-
         // wrong triggering type
         if(apply && spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_EQUIP)
             continue;
-
         // check if it is valid spell
         SpellEntry const* spellproto = sSpellStore.LookupEntry(spellData.SpellId);
         if(!spellproto)
             continue;
-
         ApplyEquipSpell(spellproto,item,apply,form_change);
     }
 }
-
 void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply, bool form_change)
 {
     if(apply)
@@ -7302,7 +6122,6 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply
         // Cannot be used in this stance/form
         if(GetErrorAtShapeshiftedCast(spellInfo, m_form) != SPELL_CAST_OK)
             return;
-
         if(form_change)                                     // check aura active state from other form
         {
             AuraMap const& auras = GetAuras();
@@ -7310,9 +6129,7 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply
                 if(!item || itr->second->GetCastItemGUID()==item->GetGUID())
                     return;
         }
-
         DEBUG_LOG("WORLD: cast %s Equip spellId - %i", (item ? "item" : "itemset"), spellInfo->Id);
-
         CastSpell(this,spellInfo,true,item);
     }
     else
@@ -7323,14 +6140,12 @@ void Player::ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply
             if(GetErrorAtShapeshiftedCast(spellInfo, m_form)==SPELL_CAST_OK)
                 return;                                     // and remove only not compatible at form change
         }
-
         if(item)
             RemoveAurasDueToItemSpell(item,spellInfo->Id);  // un-apply all spells , not only at-equipped
         else
             RemoveAurasDueToSpell(spellInfo->Id);           // un-apply spell (item set case)
     }
 }
-
 void Player::UpdateEquipSpellsAtFormChange()
 {
     for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
@@ -7341,20 +6156,17 @@ void Player::UpdateEquipSpellsAtFormChange()
             ApplyItemEquipSpell(m_items[i],true,true);      // add spells that fit form but not active
         }
     }
-
     // item set bonuses not dependent from item broken state
     for(size_t setindex = 0; setindex < ItemSetEff.size(); ++setindex)
     {
         ItemSetEffect* eff = ItemSetEff[setindex];
         if(!eff)
             continue;
-
         for(uint32 y=0;y<8; ++y)
         {
             SpellEntry const* spellInfo = eff->spells[y];
             if(!spellInfo)
                 continue;
-
             ApplyEquipSpell(spellInfo,NULL,false,true);       // remove spells that not fit to form
             ApplyEquipSpell(spellInfo,NULL,true,true);        // add spells that fit form but not active
         }
@@ -7364,7 +6176,6 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
 {
     if(!target || !target->isAlive() || target == this)
         return;
-
     for(int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; i++)
     {
         // If usable, try to cast item spell
@@ -7397,7 +6208,6 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
                 }
     }
 }
-
 void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemPrototype const * proto)
 {
     // Can do effect if any damage done to target
@@ -7407,28 +6217,22 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
         for (int i = 0; i < 5; i++)
         {
             _Spell const& spellData = proto->Spells[i];
-
             // no spell
             if(!spellData.SpellId )
                 continue;
-
             // wrong triggering type
             if(spellData.SpellTrigger != ITEM_SPELLTRIGGER_CHANCE_ON_HIT)
                 continue;
-
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
             if(!spellInfo)
             {
                 sLog.outError("WORLD: unknown Item spellid %i", spellData.SpellId);
                 continue;
             }
-
             // not allow proc extra attack spell at extra attack
             if( m_extraAttacks && IsSpellHaveEffect(spellInfo, SPELL_EFFECT_ADD_EXTRA_ATTACKS) )
                 return;
-
             float chance = spellInfo->procChance;
-
             if(spellData.SpellPPMRate)
             {
                 if(spellData.SpellId == 52781) // Persuasive Strike
@@ -7450,12 +6254,10 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
             {
                 chance = GetWeaponProcChance();
             }
-
             if (roll_chance_f(chance))
                 CastSpell(target, spellInfo->Id, true, item);
         }
     }
-
     // item combat enchantments
     for(int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot)
     {
@@ -7466,9 +6268,7 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
         {
             if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
                 continue;
-
             SpellEnchantProcEntry const* entry =  spellmgr.GetSpellEnchantProcEvent(enchant_id);
-
             if (entry && entry->procEx)
             {
                 // Check hit/crit/dodge/parry requirement
@@ -7482,16 +6282,13 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
                 //if (!(damageInfo->procVictim & PROC_FLAG_TAKEN_ANY_DAMAGE))
                     continue;
             }
-
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(pEnchant->spellid[s]);
             if (!spellInfo)
             {
                 sLog.outError("Player::CastItemCombatSpell Enchant %i, cast unknown spell %i", pEnchant->ID, pEnchant->spellid[s]);
                 continue;
             }
-
             float chance = pEnchant->amount[s] != 0 ? float(pEnchant->amount[s]) : GetWeaponProcChance();
-
             if (entry)
             {
                 if(entry->PPMChance)
@@ -7499,10 +6296,8 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
                 else if(entry->customChance)
                     chance = entry->customChance;
             }
-
             // Apply spell mods
             ApplySpellMod(pEnchant->spellid[s],SPELLMOD_CHANCE_OF_SUCCESS,chance);
-
             if (roll_chance_f(chance))
             {
                 if(IsPositiveSpell(pEnchant->spellid[s]))
@@ -7513,7 +6308,6 @@ void Player::CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32
         }
     }
 }
-
 void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex)
 {
     ItemPrototype const* proto = item->GetProto();
@@ -7522,7 +6316,6 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
     {
         uint32 learn_spell_id = proto->Spells[0].SpellId;
         uint32 learning_spell_id = proto->Spells[1].SpellId;
-
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(learn_spell_id);
         if(!spellInfo)
         {
@@ -7530,7 +6323,6 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
             SendEquipError(EQUIP_ERR_NONE,item,NULL);
             return;
         }
-
         Spell *spell = new Spell(this, spellInfo,false);
         spell->m_CastItem = item;
         spell->m_cast_count = cast_count;                   //set count of casts
@@ -7538,39 +6330,31 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
         spell->prepare(&targets);
         return;
     }
-
     // use triggered flag only for items with many spell casts and for not first cast
     int count = 0;
-
     // item spells casted at use
     for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = proto->Spells[i];
-
         // no spell
         if(!spellData.SpellId)
             continue;
-
         // wrong triggering type
         if( spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE && spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_NO_DELAY_USE)
             continue;
-
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellData.SpellId);
         if(!spellInfo)
         {
             sLog.outError("Player::CastItemUseSpell: Item (Entry: %u) in have wrong spell id %u, ignoring",proto->ItemId, spellData.SpellId);
             continue;
         }
-
         Spell *spell = new Spell(this, spellInfo, (count > 0));
         spell->m_CastItem = item;
         spell->m_cast_count = cast_count;                   // set count of casts
         spell->m_glyphIndex = glyphIndex;                   // glyph index
         spell->prepare(&targets);
-
         ++count;
     }
-
     // Item enchantments spells casted at use
     for(int e_slot = 0; e_slot < MAX_ENCHANTMENT_SLOT; ++e_slot)
     {
@@ -7581,29 +6365,24 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
         {
             if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_USE_SPELL)
                 continue;
-
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(pEnchant->spellid[s]);
             if (!spellInfo)
             {
                 sLog.outError("Player::CastItemUseSpell Enchant %i, cast unknown spell %i", pEnchant->ID, pEnchant->spellid[s]);
                 continue;
             }
-
             Spell *spell = new Spell(this, spellInfo, (count > 0));
             spell->m_CastItem = item;
             spell->m_cast_count = cast_count;               // set count of casts
             spell->m_glyphIndex = glyphIndex;               // glyph index
             spell->prepare(&targets);
-
             ++count;
         }
     }
 }
-
 void Player::_RemoveAllItemMods()
 {
     sLog.outDebug("_RemoveAllItemMods start.");
-
     for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(m_items[i])
@@ -7611,19 +6390,15 @@ void Player::_RemoveAllItemMods()
             ItemPrototype const *proto = m_items[i]->GetProto();
             if(!proto)
                 continue;
-
             // item set bonuses not dependent from item broken state
             if(proto->ItemSet)
                 RemoveItemsSetItem(this,proto);
-
             if(m_items[i]->IsBroken())
                 continue;
-
             ApplyItemEquipSpell(m_items[i],false);
             ApplyEnchantment(m_items[i], false);
         }
     }
-
     for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(m_items[i])
@@ -7633,47 +6408,36 @@ void Player::_RemoveAllItemMods()
             ItemPrototype const *proto = m_items[i]->GetProto();
             if(!proto)
                 continue;
-
             uint32 attacktype = Player::GetAttackBySlot(i);
             if(attacktype < MAX_ATTACK)
                 _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),false);
-
             _ApplyItemBonuses(proto,i, false);
-
             if( i == EQUIPMENT_SLOT_RANGED )
                 _ApplyAmmoBonuses();
         }
     }
-
     sLog.outDebug("_RemoveAllItemMods complete.");
 }
-
 void Player::_ApplyAllItemMods()
 {
     sLog.outDebug("_ApplyAllItemMods start.");
-
     for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(m_items[i])
         {
             if(m_items[i]->IsBroken())
                 continue;
-
             ItemPrototype const *proto = m_items[i]->GetProto();
             if(!proto)
                 continue;
-
             uint32 attacktype = Player::GetAttackBySlot(i);
             if(attacktype < MAX_ATTACK)
                 _ApplyWeaponDependentAuraMods(m_items[i],WeaponAttackType(attacktype),true);
-
             _ApplyItemBonuses(proto,i, true);
-
             if( i == EQUIPMENT_SLOT_RANGED )
                 _ApplyAmmoBonuses();
         }
     }
-
     for (uint8 i = 0; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(m_items[i])
@@ -7681,22 +6445,17 @@ void Player::_ApplyAllItemMods()
             ItemPrototype const *proto = m_items[i]->GetProto();
             if(!proto)
                 continue;
-
             // item set bonuses not dependent from item broken state
             if(proto->ItemSet)
                 AddItemsSetItem(this,m_items[i]);
-
             if(m_items[i]->IsBroken())
                 continue;
-
             ApplyItemEquipSpell(m_items[i],true);
             ApplyEnchantment(m_items[i], true);
         }
     }
-
     sLog.outDebug("_ApplyAllItemMods complete.");
 }
-
 void Player::_ApplyAllLevelScaleItemMods(bool apply)
 {
     for (int i = 0; i < INVENTORY_SLOT_BAG_END; ++i)
@@ -7705,54 +6464,42 @@ void Player::_ApplyAllLevelScaleItemMods(bool apply)
         {
             if(m_items[i]->IsBroken())
                 continue;
-
             ItemPrototype const *proto = m_items[i]->GetProto();
             if(!proto)
                 continue;
-
             _ApplyItemBonuses(proto,i, apply, true);
         }
     }
 }
-
 void Player::_ApplyAmmoBonuses()
 {
     // check ammo
     uint32 ammo_id = GetUInt32Value(PLAYER_AMMO_ID);
     if(!ammo_id)
         return;
-
     float currentAmmoDPS;
-
     ItemPrototype const *ammo_proto = objmgr.GetItemPrototype( ammo_id );
     if( !ammo_proto || ammo_proto->Class!=ITEM_CLASS_PROJECTILE || !CheckAmmoCompatibility(ammo_proto))
         currentAmmoDPS = 0.0f;
     else
         currentAmmoDPS = ( ammo_proto->Damage[0].DamageMin + ammo_proto->Damage[0].DamageMax ) / 2;
-
     if(currentAmmoDPS == GetAmmoDPS())
         return;
-
     m_ammoDPS = currentAmmoDPS;
-
     if(CanModifyStats())
         UpdateDamagePhysical(RANGED_ATTACK);
 }
-
 bool Player::CheckAmmoCompatibility(const ItemPrototype *ammo_proto) const
 {
     if(!ammo_proto)
         return false;
-
     // check ranged weapon
     Item *weapon = GetWeaponForAttack( RANGED_ATTACK );
     if(!weapon  || weapon->IsBroken() )
         return false;
-
     ItemPrototype const* weapon_proto = weapon->GetProto();
     if(!weapon_proto || weapon_proto->Class!=ITEM_CLASS_WEAPON )
         return false;
-
     // check ammo ws. weapon compatibility
     switch(weapon_proto->SubClass)
     {
@@ -7768,17 +6515,14 @@ bool Player::CheckAmmoCompatibility(const ItemPrototype *ammo_proto) const
         default:
             return false;
     }
-
     return true;
 }
-
 /*  If in a battleground a player dies, and an enemy removes the insignia, the player's bones is lootable
     Called by remove insignia spell effect    */
 void Player::RemovedInsignia(Player* looterPlr)
 {
     if (!GetBattleGroundId())
         return;
-
     // If not released spirit, do it !
     if(m_deathTimer > 0)
     {
@@ -7786,48 +6530,39 @@ void Player::RemovedInsignia(Player* looterPlr)
         BuildPlayerRepop();
         RepopAtGraveyard();
     }
-
     Corpse *corpse = GetCorpse();
     if (!corpse)
         return;
-
     // We have to convert player corpse to bones, not to be able to resurrect there
     // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG
     Corpse *bones = ObjectAccessor::Instance().ConvertCorpseForPlayer(GetGUID(),true);
     if (!bones)
         return;
-
     // Now we must make bones lootable, and send player loot
     bones->SetFlag(CORPSE_FIELD_DYNAMIC_FLAGS, CORPSE_DYNFLAG_LOOTABLE);
-
     // We store the level of our player in the gold field
     // We retrieve this information at Player::SendLoot()
     bones->loot.gold = getLevel();
     bones->lootRecipient = looterPlr;
     looterPlr->SendLoot(bones->GetGUID(), LOOT_INSIGNIA);
 }
-
 void Player::SendLootRelease( uint64 guid )
 {
     WorldPacket data( SMSG_LOOT_RELEASE_RESPONSE, (8+1) );
     data << uint64(guid) << uint8(1);
     SendDirectMessage( &data );
 }
-
 void Player::SendLoot(uint64 guid, LootType loot_type)
 {
     if (uint64 lguid = GetLootGUID())
         m_session->DoLootRelease(lguid);
-
     Loot    *loot = 0;
     PermissionTypes permission = ALL_PERMISSION;
-
     sLog.outDebug("Player::SendLoot");
     if (IS_GAMEOBJECT_GUID(guid))
     {
         sLog.outDebug("       IS_GAMEOBJECT_GUID(guid)");
         GameObject *go = GetMap()->GetGameObject(guid);
-
         // not check distance for GO in case owned GO (fishing bobber case, for example)
         // And permit out of range GO with no owner in case fishing hole
         if (!go || (loot_type != LOOT_FISHINGHOLE && (loot_type != LOOT_FISHING || go->GetOwnerGUID() != GetGUID()) && !go->IsWithinDistInMap(this,INTERACTION_DISTANCE)))
@@ -7835,13 +6570,10 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
             SendLootRelease(guid);
             return;
         }
-
         loot = &go->loot;
-
         if (go->getLootState() == GO_READY)
         {
             uint32 lootid =  go->GetGOInfo()->GetLootId();
-
             //TODO: fix this big hack
             if((go->GetEntry() == BG_AV_OBJECTID_MINE_N || go->GetEntry() == BG_AV_OBJECTID_MINE_S))
                 if( BattleGround *bg = GetBattleGround())
@@ -7851,37 +6583,30 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
                             SendLootRelease(guid);
                             return;
                         }
-
             if (lootid)
             {
                 sLog.outDebug("       if(lootid)");
                 loot->clear();
                 loot->FillLoot(lootid, LootTemplates_Gameobject, this, false);
             }
-
             if (loot_type == LOOT_FISHING)
                 go->getFishLoot(loot,this);
-
             go->SetLootState(GO_ACTIVATED);
         }
     }
     else if (IS_ITEM_GUID(guid))
     {
         Item *item = GetItemByGuid( guid );
-
         if (!item)
         {
             SendLootRelease(guid);
             return;
         }
-
         loot = &item->loot;
-
         if (!item->m_lootGenerated)
         {
             item->m_lootGenerated = true;
             loot->clear();
-
             switch(loot_type)
             {
                 case LOOT_DISENCHANTING:
@@ -7903,15 +6628,12 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
     else if (IS_CORPSE_GUID(guid))                          // remove insignia
     {
         Corpse *bones = ObjectAccessor::GetCorpse(*this, guid);
-
         if (!bones || !((loot_type == LOOT_CORPSE) || (loot_type == LOOT_INSIGNIA)) || (bones->GetType() != CORPSE_BONES) )
         {
             SendLootRelease(guid);
             return;
         }
-
         loot = &bones->loot;
-
         if (!bones->lootForBody)
         {
             bones->lootForBody = true;
@@ -7924,39 +6646,32 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
             // Now it works like this: lvl10: ~6copper, lvl70: ~9silver
             bones->loot.gold = (uint32)( urand(50, 150) * 0.016f * pow( ((float)pLevel)/5.76f, 2.5f) * sWorld.getRate(RATE_DROP_MONEY) );
         }
-
         if (bones->lootRecipient != this)
             permission = NONE_PERMISSION;
     }
     else
     {
         Creature *creature = GetMap()->GetCreature(guid);
-
         // must be in range and creature must be alive for pickpocket and must be dead for another loot
         if (!creature || creature->isAlive()!=(loot_type == LOOT_PICKPOCKETING) || !creature->IsWithinDistInMap(this,INTERACTION_DISTANCE))
         {
             SendLootRelease(guid);
             return;
         }
-
         if (loot_type == LOOT_PICKPOCKETING && IsFriendlyTo(creature))
         {
             SendLootRelease(guid);
             return;
         }
-
         loot   = &creature->loot;
-
         if (loot_type == LOOT_PICKPOCKETING)
         {
             if (!creature->lootForPickPocketed)
             {
                 creature->lootForPickPocketed = true;
                 loot->clear();
-
                 if (uint32 lootid = creature->GetCreatureInfo()->pickpocketLootId)
                     loot->FillLoot(lootid, LootTemplates_Pickpocketing, this, false);
-
                 // Generate extra money for pick pocket loot
                 const uint32 a = urand(0, creature->getLevel()/2);
                 const uint32 b = urand(0, getLevel()/2);
@@ -7972,27 +6687,21 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
                 creature->SetLootRecipient(this);
                 recipient = this;
             }
-
             if (creature->lootForPickPocketed)
             {
                 creature->lootForPickPocketed = false;
                 loot->clear();
             }
-
             if (!creature->lootForBody)
             {
                 creature->lootForBody = true;
                 loot->clear();
-
                 if (uint32 lootid = creature->GetCreatureInfo()->lootid)
                     loot->FillLoot(lootid, LootTemplates_Creature, recipient, false);
-
                 loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold);
-
                 if (Group* group = recipient->GetGroup())
                 {
                     group->UpdateLooterGuid(creature,true);
-
                     switch (group->GetLootMethod())
                     {
                         case GROUP_LOOT:
@@ -8010,7 +6719,6 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
                     }
                 }
             }
-
             // possible only if creature->lootForBody && loot->empty() at spell cast check
             if (loot_type == LOOT_SKINNING)
             {
@@ -8046,9 +6754,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
             }
         }
     }
-
     SetLootGUID(guid);
-
     // LOOT_INSIGNIA and LOOT_FISHINGHOLE unsupported by client
     switch(loot_type)
     {
@@ -8056,39 +6762,30 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
         case LOOT_FISHINGHOLE: loot_type = LOOT_FISHING; break;
         default: break;
     }
-
     // need know merged fishing/corpse loot type for achievements
     loot->loot_type = loot_type;
-
     WorldPacket data(SMSG_LOOT_RESPONSE, (9+50));           // we guess size
-
     data << uint64(guid);
     data << uint8(loot_type);
     data << LootView(*loot, this, permission);
-
     SendDirectMessage(&data);
-
     // add 'this' player as one of the players that are looting 'loot'
     if (permission != NONE_PERMISSION)
         loot->AddLooter(GetGUID());
-
     if (loot_type == LOOT_CORPSE && !IS_ITEM_GUID(guid))
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_LOOTING);
 }
-
 void Player::SendNotifyLootMoneyRemoved()
 {
     WorldPacket data(SMSG_LOOT_CLEAR_MONEY, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendNotifyLootItemRemoved(uint8 lootSlot)
 {
     WorldPacket data(SMSG_LOOT_REMOVED, 1);
     data << uint8(lootSlot);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendUpdateWorldState(uint32 Field, uint32 Value)
 {
     WorldPacket data(SMSG_UPDATE_WORLD_STATE, 8);
@@ -8096,7 +6793,6 @@ void Player::SendUpdateWorldState(uint32 Field, uint32 Value)
     data << Value;
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
 {
     // data depends on zoneid/mapid...
@@ -8104,9 +6800,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
     uint16 NumberOfFields = 0;
     uint32 mapid = GetMapId();
     OutdoorPvP * pvp = sOutdoorPvPMgr.GetOutdoorPvPToZoneId(zoneid);
-
     sLog.outDebug("Sending SMSG_INIT_WORLD_STATES to Map:%u, Zone: %u", mapid, zoneid);
-
     // may be exist better way to do this...
     switch(zoneid)
     {
@@ -8169,7 +6863,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
             NumberOfFields = 12;
             break;
     }
-
     WorldPacket data(SMSG_INIT_WORLD_STATES, (4+4+4+2+(NumberOfFields*8)));
     data << uint32(mapid);                                  // mapid
     data << uint32(zoneid);                                 // zone id
@@ -8476,31 +7169,25 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
                     data << uint32(2502) << uint32(0x0);    // 11
                     data << uint32(2493) << uint32(0x0);    // 12
                     data << uint32(2491) << uint32(0x0);    // 13
-
                     data << uint32(2495) << uint32(0x0);    // 14
                     data << uint32(2494) << uint32(0x0);    // 15
                     data << uint32(2497) << uint32(0x0);    // 16
-
                     data << uint32(2762) << uint32(0x0);    // 17
                     data << uint32(2662) << uint32(0x0);    // 18
                     data << uint32(2663) << uint32(0x0);    // 19
                     data << uint32(2664) << uint32(0x0);    // 20
-
                     data << uint32(2760) << uint32(0x0);    // 21
                     data << uint32(2670) << uint32(0x0);    // 22
                     data << uint32(2668) << uint32(0x0);    // 23
                     data << uint32(2669) << uint32(0x0);    // 24
-
                     data << uint32(2761) << uint32(0x0);    // 25
                     data << uint32(2667) << uint32(0x0);    // 26
                     data << uint32(2665) << uint32(0x0);    // 27
                     data << uint32(2666) << uint32(0x0);    // 28
-
                     data << uint32(2763) << uint32(0x0);    // 29
                     data << uint32(2659) << uint32(0x0);    // 30
                     data << uint32(2660) << uint32(0x0);    // 31
                     data << uint32(2661) << uint32(0x0);    // 32
-
                     data << uint32(2671) << uint32(0x0);    // 33
                     data << uint32(2676) << uint32(0x0);    // 34
                     data << uint32(2677) << uint32(0x0);    // 35
@@ -8621,27 +7308,21 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
     }
     GetSession()->SendPacket(&data);
 }
-
 uint32 Player::GetXPRestBonus(uint32 xp)
 {
     uint32 rested_bonus = (uint32)GetRestBonus();           // xp for each rested bonus
-
     if(rested_bonus > xp)                                   // max rested_bonus == xp or (r+x) = 200% xp
         rested_bonus = xp;
-
     SetRestBonus( GetRestBonus() - rested_bonus);
-
     sLog.outDetail("Player gain %u xp (+ %u Rested Bonus). Rested points=%f",xp+rested_bonus,rested_bonus,GetRestBonus());
     return rested_bonus;
 }
-
 void Player::SetBindPoint(uint64 guid)
 {
     WorldPacket data(SMSG_BINDER_CONFIRM, 8);
     data << uint64(guid);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendTalentWipeConfirm(uint64 guid)
 {
     WorldPacket data(MSG_TALENT_WIPE_CONFIRM, (8+4));
@@ -8650,7 +7331,6 @@ void Player::SendTalentWipeConfirm(uint64 guid)
     data << cost;
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendPetSkillWipeConfirm()
 {
     Pet* pet = GetPet();
@@ -8661,11 +7341,9 @@ void Player::SendPetSkillWipeConfirm()
     data << uint32(pet->resetTalentsCost());
     GetSession()->SendPacket( &data );
 }
-
 /*********************************************************/
 /***                    STORAGE SYSTEM                 ***/
 /*********************************************************/
-
 void Player::SetVirtualItemSlot( uint8 i, Item* item)
 {
     assert(i < 3);
@@ -8685,7 +7363,6 @@ void Player::SetVirtualItemSlot( uint8 i, Item* item)
         }
     }
 }
-
 void Player::SetSheath( SheathState sheathed )
 {
     switch (sheathed)
@@ -8714,11 +7391,9 @@ void Player::SetSheath( SheathState sheathed )
     }
     Unit::SetSheath(sheathed);                              // this must visualize Sheath changing for other players...
 }
-
 uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap ) const
 {
     uint8 pClass = getClass();
-
     uint8 slots[4];
     slots[0] = NULL_SLOT;
     slots[1] = NULL_SLOT;
@@ -8773,7 +7448,6 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
         case INVTYPE_WEAPON:
         {
             slots[0] = EQUIPMENT_SLOT_MAINHAND;
-
             // suggest offhand slot only if know dual wielding
             // (this will be replace mainhand weapon at auto equip instead unwonted "you don't known dual wielding" ...
             if(CanDualWield())
@@ -8845,7 +7519,6 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
         default :
             return NULL_SLOT;
     }
-
     if( slot != NULL_SLOT )
     {
         if( swap || !GetItemByPos( INVENTORY_SLOT_BAG_0, slot ) )
@@ -8869,7 +7542,6 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
                     return slots[i];
             }
         }
-
         // if not found free and can swap return first appropriate from used
         for (uint8 i = 0; i < 4; i++)
         {
@@ -8877,18 +7549,14 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
                 return slots[i];
         }
     }
-
     // no free position
     return NULL_SLOT;
 }
-
 uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const
 {
     Item *pItem;
     uint32 tempcount = 0;
-
     uint8 res = EQUIP_ERR_OK;
-
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
         pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
@@ -8943,11 +7611,9 @@ uint8 Player::CanUnequipItems( uint32 item, uint32 count ) const
             }
         }
     }
-
     // not found req. item count and have unequippable items
     return res;
 }
-
 uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) const
 {
     uint32 count = 0;
@@ -8969,7 +7635,6 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons
         if( pBag )
             count += pBag->GetItemCount(item,skipItem);
     }
-
     if(skipItem && skipItem->GetProto()->GemProperties)
     {
         for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++)
@@ -8979,7 +7644,6 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons
                 count += pItem->GetGemCountWithID(item);
         }
     }
-
     if(inBankAlso)
     {
         for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++)
@@ -8994,7 +7658,6 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons
             if( pBag )
                 count += pBag->GetItemCount(item,skipItem);
         }
-
         if(skipItem && skipItem->GetProto()->GemProperties)
         {
             for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++)
@@ -9005,10 +7668,8 @@ uint32 Player::GetItemCount( uint32 item, bool inBankAlso, Item* skipItem ) cons
             }
         }
     }
-
     return count;
 }
-
 Item* Player::GetItemByGuid( uint64 guid ) const
 {
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_ITEM_END; i++)
@@ -9023,7 +7684,6 @@ Item* Player::GetItemByGuid( uint64 guid ) const
         if( pItem && pItem->GetGUID() == guid )
             return pItem;
     }
-
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
         Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i );
@@ -9050,17 +7710,14 @@ Item* Player::GetItemByGuid( uint64 guid ) const
             }
         }
     }
-
     return NULL;
 }
-
 Item* Player::GetItemByPos( uint16 pos ) const
 {
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
     return GetItemByPos( bag, slot );
 }
-
 Item* Player::GetItemByPos( uint8 bag, uint8 slot ) const
 {
     if( bag == INVENTORY_SLOT_BAG_0 && ( slot < BANK_SLOT_BAG_END || (slot >= KEYRING_SLOT_START && slot < CURRENCYTOKEN_SLOT_END )) )
@@ -9074,7 +7731,6 @@ Item* Player::GetItemByPos( uint8 bag, uint8 slot ) const
     }
     return NULL;
 }
-
 Item* Player::GetWeaponForAttack(WeaponAttackType attackType, bool useable) const
 {
     uint16 slot;
@@ -9085,35 +7741,26 @@ Item* Player::GetWeaponForAttack(WeaponAttackType attackType, bool useable) cons
         case RANGED_ATTACK: slot = EQUIPMENT_SLOT_RANGED;   break;
         default: return NULL;
     }
-
     Item* item = GetUseableItemByPos(INVENTORY_SLOT_BAG_0, slot);
     if (!item || item->GetProto()->Class != ITEM_CLASS_WEAPON)
         return NULL;
-
     if(!useable)
         return item;
-
     if( item->IsBroken() || IsInFeralForm())
         return NULL;
-
     return item;
 }
-
 Item* Player::GetShield(bool useable) const
 {
     Item* item = GetUseableItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
     if (!item || item->GetProto()->Class != ITEM_CLASS_ARMOR)
         return NULL;
-
     if(!useable)
         return item;
-
     if( item->IsBroken())
         return NULL;
-
     return item;
 }
-
 uint8 Player::GetAttackBySlot( uint8 slot )
 {
     switch(slot)
@@ -9124,7 +7771,6 @@ uint8 Player::GetAttackBySlot( uint8 slot )
         default:                      return MAX_ATTACK;
     }
 }
-
 bool Player::IsInventoryPos( uint8 bag, uint8 slot )
 {
     if( bag == INVENTORY_SLOT_BAG_0 && slot == NULL_SLOT )
@@ -9137,7 +7783,6 @@ bool Player::IsInventoryPos( uint8 bag, uint8 slot )
         return true;
     return false;
 }
-
 bool Player::IsEquipmentPos( uint8 bag, uint8 slot )
 {
     if( bag == INVENTORY_SLOT_BAG_0 && ( slot < EQUIPMENT_SLOT_END ) )
@@ -9146,7 +7791,6 @@ bool Player::IsEquipmentPos( uint8 bag, uint8 slot )
         return true;
     return false;
 }
-
 bool Player::IsBankPos( uint8 bag, uint8 slot )
 {
     if( bag == INVENTORY_SLOT_BAG_0 && ( slot >= BANK_SLOT_ITEM_START && slot < BANK_SLOT_ITEM_END ) )
@@ -9157,7 +7801,6 @@ bool Player::IsBankPos( uint8 bag, uint8 slot )
         return true;
     return false;
 }
-
 bool Player::IsBagPos( uint16 pos )
 {
     uint8 bag = pos >> 8;
@@ -9168,79 +7811,62 @@ bool Player::IsBagPos( uint16 pos )
         return true;
     return false;
 }
-
 bool Player::IsValidPos( uint8 bag, uint8 slot )
 {
     // post selected
     if(bag == NULL_BAG)
         return true;
-
     if (bag == INVENTORY_SLOT_BAG_0)
     {
         // any post selected
         if (slot == NULL_SLOT)
             return true;
-
         // equipment
         if (slot < EQUIPMENT_SLOT_END)
             return true;
-
         // bag equip slots
         if (slot >= INVENTORY_SLOT_BAG_START && slot < INVENTORY_SLOT_BAG_END)
             return true;
-
         // backpack slots
         if (slot >= INVENTORY_SLOT_ITEM_START && slot < INVENTORY_SLOT_ITEM_END)
             return true;
-
         // keyring slots
         if (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_END)
             return true;
-
         // bank main slots
         if (slot >= BANK_SLOT_ITEM_START && slot < BANK_SLOT_ITEM_END)
             return true;
-
         // bank bag slots
         if (slot >= BANK_SLOT_BAG_START && slot < BANK_SLOT_BAG_END)
             return true;
-
         return false;
     }
-
     // bag content slots
     if (bag >= INVENTORY_SLOT_BAG_START && bag < INVENTORY_SLOT_BAG_END)
     {
         Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
         if(!pBag)
             return false;
-
         // any post selected
         if (slot == NULL_SLOT)
             return true;
-
         return slot < pBag->GetBagSize();
     }
-
     // bank bag content slots
     if( bag >= BANK_SLOT_BAG_START && bag < BANK_SLOT_BAG_END )
     {
         Bag* pBag = (Bag*)GetItemByPos (INVENTORY_SLOT_BAG_0, bag);
         if(!pBag)
             return false;
-
         // any post selected
         if (slot == NULL_SLOT)
             return true;
-
         return slot < pBag->GetBagSize();
     }
-
     // where this?
     return false;
 }
 
-
 bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
 {
     uint32 tempcount = 0;
@@ -9280,7 +7906,6 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
             }
         }
     }
-
     if(inBankAlso)
     {
         for(uint8 i = BANK_SLOT_ITEM_START; i < BANK_SLOT_ITEM_END; i++)
@@ -9310,10 +7935,8 @@ bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const
             }
         }
     }
-
     return false;
 }
-
 bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except_slot ) const
 {
     uint32 tempcount = 0;
@@ -9321,7 +7944,6 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except
     {
         if(i == except_slot)
             continue;
-
         Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
         if( pItem && pItem->GetEntry() == item)
         {
@@ -9330,7 +7952,6 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except
                 return true;
         }
     }
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype(item);
     if (pProto && pProto->GemProperties)
     {
@@ -9338,7 +7959,6 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except
         {
             if(i == except_slot)
                 continue;
-
             Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
             if( pItem && pItem->GetProto()->Socket[0].Color)
             {
@@ -9348,10 +7968,8 @@ bool Player::HasItemOrGemWithIdEquipped( uint32 item, uint32 count, uint8 except
             }
         }
     }
-
     return false;
 }
-
 bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32 count, uint8 except_slot ) const
 {
     uint32 tempcount = 0;
@@ -9359,22 +7977,18 @@ bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32
     {
         if(i == except_slot)
             continue;
-
         Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
         if (!pItem)
             continue;
-
         ItemPrototype const *pProto = pItem->GetProto();
         if (!pProto)
             continue;
-
         if (pProto->ItemLimitCategory == limitCategory)
         {
             tempcount += pItem->GetCount();
             if( tempcount >= count )
                 return true;
         }
-
         if( pProto->Socket[0].Color)
         {
             tempcount += pItem->GetGemCountWithLimitCategory(limitCategory);
@@ -9382,10 +7996,8 @@ bool Player::HasItemOrGemWithLimitCategoryEquipped( uint32 limitCategory, uint32
                 return true;
         }
     }
-
     return false;
 }
-
 uint8 Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count ) const
 {
     ItemPrototype const *pProto = objmgr.GetItemPrototype(entry);
@@ -9395,23 +8007,18 @@ uint8 Player::_CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem,
             *no_space_count = count;
         return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
     }
-
     // no maximum
     if(pProto->MaxCount <= 0 || pProto->MaxCount == 2147483647)
         return EQUIP_ERR_OK;
-
     uint32 curcount = GetItemCount(pProto->ItemId,true,pItem);
-
     if (curcount + count > uint32(pProto->MaxCount))
     {
         if(no_space_count)
             *no_space_count = count +curcount - pProto->MaxCount;
         return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
     }
-
     return EQUIP_ERR_OK;
 }
-
 bool Player::HasItemTotemCategory( uint32 TotemCategory ) const
 {
     Item *pItem;
@@ -9441,17 +8048,13 @@ bool Player::HasItemTotemCategory( uint32 TotemCategory ) const
     }
     return false;
 }
-
 uint8 Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool swap, Item* pSrcItem ) const
 {
     Item* pItem2 = GetItemByPos( bag, slot );
-
     // ignore move item (this slot will be empty at move)
     if (pItem2==pSrcItem)
         pItem2 = NULL;
-
     uint32 need_space;
-
     // empty specific slot - check item fit to slot
     if (!pItem2 || swap)
     {
@@ -9460,11 +8063,9 @@ uint8 Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountV
             // keyring case
             if (slot >= KEYRING_SLOT_START && slot < KEYRING_SLOT_START+GetMaxKeyringSize() && !(pProto->BagFamily & BAG_FAMILY_MASK_KEYS))
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
             // currencytoken case
             if (slot >= CURRENCYTOKEN_SLOT_START && slot < CURRENCYTOKEN_SLOT_END && !(pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS))
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
             // prevent cheating
             if (slot >= BUYBACK_SLOT_START && slot < BUYBACK_SLOT_END || slot >= PLAYER_SLOT_END)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
@@ -9474,18 +8075,14 @@ uint8 Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountV
             Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
             if (!pBag)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
             ItemPrototype const* pBagProto = pBag->GetProto();
             if (!pBagProto)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
             if (slot >= pBagProto->ContainerSlots)
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
             if (!ItemCanGoIntoBag(pProto,pBagProto))
                 return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
         }
-
         // non empty stack with space
         need_space = pProto->GetMaxStackSize();
     }
@@ -9495,18 +8092,14 @@ uint8 Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountV
         // check item type
         if (pItem2->GetEntry() != pProto->ItemId)
             return EQUIP_ERR_ITEM_CANT_STACK;
-
         // check free space
         if (pItem2->GetCount() >= pProto->GetMaxStackSize())
             return EQUIP_ERR_ITEM_CANT_STACK;
-
         // free stack space or infinity
         need_space = pProto->GetMaxStackSize() - pItem2->GetCount();
     }
-
     if (need_space > count)
         need_space = count;
-
     ItemPosCount newPosition = ItemPosCount((bag << 8) | slot, need_space);
     if (!newPosition.isContainedIn(dest))
     {
@@ -9515,44 +8108,34 @@ uint8 Player::_CanStoreItem_InSpecificSlot( uint8 bag, uint8 slot, ItemPosCountV
     }
     return EQUIP_ERR_OK;
 }
-
 uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool merge, bool non_specialized, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot ) const
 {
     // skip specific bag already processed in first called _CanStoreItem_InBag
     if (bag==skip_bag)
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
     Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag );
     if (!pBag)
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
     ItemPrototype const* pBagProto = pBag->GetProto();
     if (!pBagProto)
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
     // specialized bag mode or non-specilized
     if (non_specialized != (pBagProto->Class == ITEM_CLASS_CONTAINER && pBagProto->SubClass == ITEM_SUBCLASS_CONTAINER))
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
     if (!ItemCanGoIntoBag(pProto,pBagProto))
         return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG;
-
     for(uint32 j = 0; j < pBag->GetBagSize(); j++)
     {
         // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot
         if (j==skip_slot)
             continue;
-
         Item* pItem2 = GetItemByPos( bag, j );
-
         // ignore move item (this slot will be empty at move)
         if (pItem2==pSrcItem)
             pItem2 = NULL;
-
         // if merge skip empty, if !merge skip non-empty
         if ((pItem2!=NULL)!=merge)
             continue;
-
         if (pItem2)
         {
             if (pItem2->GetEntry() == pProto->ItemId && pItem2->GetCount() < pProto->GetMaxStackSize())
@@ -9560,13 +8143,11 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy
                 uint32 need_space = pProto->GetMaxStackSize() - pItem2->GetCount();
                 if(need_space > count)
                     need_space = count;
-
                 ItemPosCount newPosition = ItemPosCount((bag << 8) | j, need_space);
                 if (!newPosition.isContainedIn(dest))
                 {
                     dest.push_back(newPosition);
                     count -= need_space;
-
                     if (count==0)
                         return EQUIP_ERR_OK;
                 }
@@ -9577,13 +8158,11 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy
             uint32 need_space = pProto->GetMaxStackSize();
             if (need_space > count)
                 need_space = count;
-
             ItemPosCount newPosition = ItemPosCount((bag << 8) | j, need_space);
             if (!newPosition.isContainedIn(dest))
             {
                 dest.push_back(newPosition);
                 count -= need_space;
-
                 if (count==0)
                     return EQUIP_ERR_OK;
             }
@@ -9591,7 +8170,6 @@ uint8 Player::_CanStoreItem_InBag( uint8 bag, ItemPosCountVec &dest, ItemPrototy
     }
     return EQUIP_ERR_OK;
 }
-
 uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end, ItemPosCountVec &dest, ItemPrototype const *pProto, uint32& count, bool merge, Item* pSrcItem, uint8 skip_bag, uint8 skip_slot ) const
 {
     for(uint32 j = slot_begin; j < slot_end; j++)
@@ -9599,17 +8177,13 @@ uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end,
         // skip specific slot already processed in first called _CanStoreItem_InSpecificSlot
         if (INVENTORY_SLOT_BAG_0==skip_bag && j==skip_slot)
             continue;
-
         Item* pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, j );
-
         // ignore move item (this slot will be empty at move)
         if (pItem2==pSrcItem)
             pItem2 = NULL;
-
         // if merge skip empty, if !merge skip non-empty
         if ((pItem2!=NULL)!=merge)
             continue;
-
         if (pItem2)
         {
             if (pItem2->GetEntry() == pProto->ItemId && pItem2->GetCount() < pProto->GetMaxStackSize())
@@ -9622,7 +8196,6 @@ uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end,
                 {
                     dest.push_back(newPosition);
                     count -= need_space;
-
                     if (count==0)
                         return EQUIP_ERR_OK;
                 }
@@ -9633,13 +8206,11 @@ uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end,
             uint32 need_space = pProto->GetMaxStackSize();
             if (need_space > count)
                 need_space = count;
-
             ItemPosCount newPosition = ItemPosCount((INVENTORY_SLOT_BAG_0 << 8) | j, need_space);
             if (!newPosition.isContainedIn(dest))
             {
                 dest.push_back(newPosition);
                 count -= need_space;
-
                 if (count==0)
                     return EQUIP_ERR_OK;
             }
@@ -9647,11 +8218,9 @@ uint8 Player::_CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end,
     }
     return EQUIP_ERR_OK;
 }
-
 uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint32 entry, uint32 count, Item *pItem, bool swap, uint32* no_space_count ) const
 {
     sLog.outDebug( "STORAGE: CanStoreItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, entry, count);
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype(entry);
     if (!pProto)
     {
@@ -9659,14 +8228,12 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
             *no_space_count = count;
         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED :EQUIP_ERR_ITEM_NOT_FOUND;
     }
-
     if (pItem && pItem->IsBindedNotWith(this))
     {
         if (no_space_count)
             *no_space_count = count;
         return EQUIP_ERR_DONT_OWN_THAT_ITEM;
     }
-
     // check count of items (skip for auto move for same player from bank)
     uint32 no_similar_count = 0;                            // can't store this amount similar items
     uint8 res = _CanTakeMoreSimilarItems(entry,count,pItem,&no_similar_count);
@@ -9680,7 +8247,6 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
         }
         count -= no_similar_count;
     }
-
     // in specific slot
     if (bag != NULL_BAG && slot != NULL_SLOT)
     {
@@ -9691,20 +8257,16 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                 *no_space_count = count + no_similar_count;
             return res;
         }
-
         if (count==0)
         {
             if (no_similar_count==0)
                 return EQUIP_ERR_OK;
-
             if (no_space_count)
                 *no_space_count = count + no_similar_count;
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
     }
-
     // not specific slot or have space for partly store only in specific slot
-
     // in specific bag
     if (bag != NULL_BAG)
     {
@@ -9720,17 +8282,14 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
-
                 res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
                 if (res!=EQUIP_ERR_OK)
                 {
@@ -9738,12 +8297,10 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
@@ -9755,26 +8312,22 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                 res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot);
                 if (res!=EQUIP_ERR_OK)
                     res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot);
-
                 if (res!=EQUIP_ERR_OK)
                 {
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
             }
         }
-
         // search free slot in bag for place to
         if(bag == INVENTORY_SLOT_BAG_0)                     // inventory
         {
@@ -9789,17 +8342,14 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
-
                 res = _CanStoreItem_InInventorySlots(CURRENCYTOKEN_SLOT_START,CURRENCYTOKEN_SLOT_END,dest,pProto,count,false,pItem,bag,slot);
                 if (res!=EQUIP_ERR_OK)
                 {
@@ -9807,12 +8357,10 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
@@ -9827,18 +8375,15 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                         *no_space_count = count + no_similar_count;
                     return res;
                 }
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
             }
-
             res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
             if (res!=EQUIP_ERR_OK)
             {
@@ -9846,12 +8391,10 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                     *no_space_count = count + no_similar_count;
                 return res;
             }
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
@@ -9862,28 +8405,23 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
             res = _CanStoreItem_InBag(bag,dest,pProto,count,false,false,pItem,NULL_BAG,slot);
             if (res!=EQUIP_ERR_OK)
                 res = _CanStoreItem_InBag(bag,dest,pProto,count,false,true,pItem,NULL_BAG,slot);
-
             if (res!=EQUIP_ERR_OK)
             {
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return res;
             }
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
             }
         }
     }
-
     // not specific bag or have space for partly store only in specific bag
-
     // search stack for merge to
     if (pProto->Stackable != 1)
     {
@@ -9894,17 +8432,14 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                 *no_space_count = count + no_similar_count;
             return res;
         }
-
         if (count==0)
         {
             if (no_similar_count==0)
                 return EQUIP_ERR_OK;
-
             if (no_space_count)
                 *no_space_count = count + no_similar_count;
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
-
         res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
         if (res!=EQUIP_ERR_OK)
         {
@@ -9912,17 +8447,14 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                 *no_space_count = count + no_similar_count;
             return res;
         }
-
         if (count==0)
         {
             if (no_similar_count==0)
                 return EQUIP_ERR_OK;
-
             if (no_space_count)
                 *no_space_count = count + no_similar_count;
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
-
         if (pProto->BagFamily)
         {
             for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
@@ -9930,37 +8462,31 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                 res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot);
                 if (res!=EQUIP_ERR_OK)
                     continue;
-
                 if (count==0)
                 {
                     if (no_similar_count==0)
                         return EQUIP_ERR_OK;
-
                     if (no_space_count)
                         *no_space_count = count + no_similar_count;
                     return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
                 }
             }
         }
-
         for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
         {
             res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot);
             if (res!=EQUIP_ERR_OK)
                 continue;
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
             }
         }
     }
-
     // search free slot - special bag case
     if (pProto->BagFamily)
     {
@@ -9974,12 +8500,10 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                     *no_space_count = count + no_similar_count;
                 return res;
             }
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
@@ -9994,36 +8518,30 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
                     *no_space_count = count + no_similar_count;
                 return res;
             }
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
             }
         }
-
         for(uint32 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
         {
             res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot);
             if (res!=EQUIP_ERR_OK)
                 continue;
-
             if (count==0)
             {
                 if (no_similar_count==0)
                     return EQUIP_ERR_OK;
-
                 if (no_space_count)
                     *no_space_count = count + no_similar_count;
                 return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
             }
         }
     }
-
     // search free slot
     res = _CanStoreItem_InInventorySlots(INVENTORY_SLOT_ITEM_START,INVENTORY_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
     if (res!=EQUIP_ERR_OK)
@@ -10032,86 +8550,69 @@ uint8 Player::_CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, uint3
             *no_space_count = count + no_similar_count;
         return res;
     }
-
     if (count==0)
     {
         if (no_similar_count==0)
             return EQUIP_ERR_OK;
-
         if (no_space_count)
             *no_space_count = count + no_similar_count;
         return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
     }
-
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
         res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot);
         if (res!=EQUIP_ERR_OK)
             continue;
-
         if (count==0)
         {
             if (no_similar_count==0)
                 return EQUIP_ERR_OK;
-
             if (no_space_count)
                 *no_space_count = count + no_similar_count;
             return EQUIP_ERR_CANT_CARRY_MORE_OF_THIS;
         }
     }
-
     if (no_space_count)
         *no_space_count = count + no_similar_count;
-
     return EQUIP_ERR_INVENTORY_FULL;
 }
-
 //////////////////////////////////////////////////////////////////////////
 uint8 Player::CanStoreItems( Item **pItems,int count) const
 {
     Item    *pItem2;
-
     // fill space table
     int inv_slot_items[INVENTORY_SLOT_ITEM_END-INVENTORY_SLOT_ITEM_START];
     int inv_bags[INVENTORY_SLOT_BAG_END-INVENTORY_SLOT_BAG_START][MAX_BAG_SIZE];
     int inv_keys[KEYRING_SLOT_END-KEYRING_SLOT_START];
     int inv_tokens[CURRENCYTOKEN_SLOT_END-CURRENCYTOKEN_SLOT_START];
-
     memset(inv_slot_items,0,sizeof(int)*(INVENTORY_SLOT_ITEM_END-INVENTORY_SLOT_ITEM_START));
     memset(inv_bags,0,sizeof(int)*(INVENTORY_SLOT_BAG_END-INVENTORY_SLOT_BAG_START)*MAX_BAG_SIZE);
     memset(inv_keys,0,sizeof(int)*(KEYRING_SLOT_END-KEYRING_SLOT_START));
     memset(inv_tokens,0,sizeof(int)*(CURRENCYTOKEN_SLOT_END-CURRENCYTOKEN_SLOT_START));
-
     for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
     {
         pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-
         if (pItem2 && !pItem2->IsInTrade())
         {
             inv_slot_items[i-INVENTORY_SLOT_ITEM_START] = pItem2->GetCount();
         }
     }
-
     for(uint8 i = KEYRING_SLOT_START; i < KEYRING_SLOT_END; i++)
     {
         pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-
         if (pItem2 && !pItem2->IsInTrade())
         {
             inv_keys[i-KEYRING_SLOT_START] = pItem2->GetCount();
         }
     }
-
     for(uint8 i = CURRENCYTOKEN_SLOT_START; i < CURRENCYTOKEN_SLOT_END; i++)
     {
         pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, i );
-
         if (pItem2 && !pItem2->IsInTrade())
         {
             inv_tokens[i-CURRENCYTOKEN_SLOT_START] = pItem2->GetCount();
         }
     }
-
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
         if(Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
@@ -10126,39 +8627,30 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             }
         }
     }
-
     // check free space for all items
     for (int k = 0; k < count; ++k)
     {
         Item  *pItem = pItems[k];
-
         // no item
         if (!pItem)  continue;
-
         sLog.outDebug( "STORAGE: CanStoreItems %i. item = %u, count = %u", k+1, pItem->GetEntry(), pItem->GetCount());
         ItemPrototype const *pProto = pItem->GetProto();
-
         // strange item
         if( !pProto )
             return EQUIP_ERR_ITEM_NOT_FOUND;
-
         // item it 'bind'
         if(pItem->IsBindedNotWith(this))
             return EQUIP_ERR_DONT_OWN_THAT_ITEM;
-
         Bag *pBag;
         ItemPrototype const *pBagProto;
-
         // item is 'one item only'
         uint8 res = CanTakeMoreSimilarItems(pItem);
         if(res != EQUIP_ERR_OK)
             return res;
-
         // search stack for merge to
         if( pProto->Stackable != 1 )
         {
             bool b_found = false;
-
             for(int t = KEYRING_SLOT_START; t < KEYRING_SLOT_END; ++t)
             {
                 pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
@@ -10170,7 +8662,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                 }
             }
             if (b_found) continue;
-
             for(int t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
             {
                 pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
@@ -10182,7 +8673,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                 }
             }
             if (b_found) continue;
-
             for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
             {
                 pItem2 = GetItemByPos( INVENTORY_SLOT_BAG_0, t );
@@ -10194,7 +8684,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                 }
             }
             if (b_found) continue;
-
             for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
             {
                 pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
@@ -10214,7 +8703,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             }
             if (b_found) continue;
         }
-
         // special bag case
         if( pProto->BagFamily )
         {
@@ -10232,9 +8720,7 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                     }
                 }
             }
-
             if (b_found) continue;
-
             if(pProto->BagFamily & BAG_FAMILY_MASK_CURRENCY_TOKENS)
             {
                 for(uint32 t = CURRENCYTOKEN_SLOT_START; t < CURRENCYTOKEN_SLOT_END; ++t)
@@ -10247,16 +8733,13 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                     }
                 }
             }
-
             if (b_found) continue;
-
             for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
             {
                 pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, t );
                 if( pBag )
                 {
                     pBagProto = pBag->GetProto();
-
                     // not plain container check
                     if( pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER) &&
                         ItemCanGoIntoBag(pProto,pBagProto) )
@@ -10275,7 +8758,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             }
             if (b_found) continue;
         }
-
         // search free slot
         bool b_found = false;
         for(int t = INVENTORY_SLOT_ITEM_START; t < INVENTORY_SLOT_ITEM_END; ++t)
@@ -10288,7 +8770,6 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             }
         }
         if (b_found) continue;
-
         // search free slot in bags
         for(int t = INVENTORY_SLOT_BAG_START; !b_found && t < INVENTORY_SLOT_BAG_END; ++t)
         {
@@ -10296,11 +8777,9 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
             if( pBag )
             {
                 pBagProto = pBag->GetProto();
-
                 // special bag already checked
                 if( pBagProto && (pBagProto->Class != ITEM_CLASS_CONTAINER || pBagProto->SubClass != ITEM_SUBCLASS_CONTAINER))
                     continue;
-
                 for(uint32 j = 0; j < pBag->GetBagSize(); j++)
                 {
                     if( inv_bags[t-INVENTORY_SLOT_BAG_START][j] == 0 )
@@ -10312,15 +8791,12 @@ uint8 Player::CanStoreItems( Item **pItems,int count) const
                 }
             }
         }
-
         // no free slot found?
         if (!b_found)
             return EQUIP_ERR_INVENTORY_FULL;
     }
-
     return EQUIP_ERR_OK;
 }
-
 //////////////////////////////////////////////////////////////////////////
 uint8 Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap ) const
 {
@@ -10332,10 +8808,8 @@ uint8 Player::CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap
         delete pItem;
         return result;
     }
-
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
-
 uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bool not_loading ) const
 {
     dest = 0;
@@ -10347,12 +8821,10 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
         {
             if(pItem->IsBindedNotWith(this))
                 return EQUIP_ERR_DONT_OWN_THAT_ITEM;
-
             // check count of items (skip for auto move for same player from bank)
             uint8 res = CanTakeMoreSimilarItems(pItem);
             if(res != EQUIP_ERR_OK)
                 return res;
-
             // check this only in game
             if(not_loading)
             {
@@ -10360,7 +8832,6 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                 // ROOT, CONFUSED, DISTRACTED, FLEEING this needs to be checked.
                 if (hasUnitState(UNIT_STAT_STUNNED))
                     return EQUIP_ERR_YOU_ARE_STUNNED;
-
                 // do not allow equipping gear except weapons, offhands, projectiles, relics in
                 // - combat
                 // - in-progress arenas
@@ -10368,38 +8839,30 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                 {
                     if( isInCombat() )
                         return EQUIP_ERR_NOT_IN_COMBAT;
-
                     if(BattleGround* bg = GetBattleGround())
                         if( bg->isArena() && bg->GetStatus() == STATUS_IN_PROGRESS )
                             return EQUIP_ERR_NOT_DURING_ARENA_MATCH;
                 }
-
                 if(isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer != 0)
                     return EQUIP_ERR_CANT_DO_RIGHT_NOW;         // maybe exist better err
-
                 if(IsNonMeleeSpellCasted(false))
                     return EQUIP_ERR_CANT_DO_RIGHT_NOW;
             }
-
             ScalingStatDistributionEntry const *ssd = pProto->ScalingStatDistribution ? sScalingStatDistributionStore.LookupEntry(pProto->ScalingStatDistribution) : 0;
             // check allowed level (extend range to upper values if MaxLevel more or equal max player level, this let GM set high level with 1...max range items)
             if (ssd && ssd->MaxLevel < DEFAULT_MAX_LEVEL && ssd->MaxLevel < getLevel())
                 return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
-
             uint8 eslot = FindEquipSlot( pProto, slot, swap );
             if (eslot == NULL_SLOT)
                 return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
-
             uint8 msg = CanUseItem(pItem , not_loading);
             if (msg != EQUIP_ERR_OK)
                 return msg;
             if (!swap && GetItemByPos(INVENTORY_SLOT_BAG_0, eslot))
                 return EQUIP_ERR_NO_EQUIPMENT_SLOT_AVAILABLE;
-
             // if swap ignore item (equipped also)
             if (uint8 res2 = CanEquipUniqueItem(pItem, swap ? eslot : NULL_SLOT))
                 return res2;
-
             // check unique-equipped special item classes
             if (pProto->Class == ITEM_CLASS_QUIVER)
             {
@@ -10420,9 +8883,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                     }
                 }
             }
-
             uint32 type = pProto->InventoryType;
-
             if (eslot == EQUIPMENT_SLOT_OFFHAND)
             {
                 if (type == INVTYPE_WEAPON || type == INVTYPE_WEAPONOFFHAND)
@@ -10435,11 +8896,9 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                     if (!CanDualWield() || !CanTitanGrip())
                         return EQUIP_ERR_CANT_DUAL_WIELD;
                 }
-
                 if (IsTwoHandUsed())
                     return EQUIP_ERR_CANT_EQUIP_WITH_TWOHANDED;
             }
-
             // equip two-hand weapon case (with possible unequip 2 items)
             if (type == INVTYPE_2HWEAPON)
             {
@@ -10450,7 +8909,6 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                 }
                 else if (eslot != EQUIPMENT_SLOT_MAINHAND)
                     return EQUIP_ERR_ITEM_CANT_BE_EQUIPPED;
-
                 if (!CanTitanGrip())
                 {
                     // offhand item must can be stored in inventory for offhand item and it also must be unequipped
@@ -10466,28 +8924,21 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
             return EQUIP_ERR_OK;
         }
     }
-
     return !swap ? EQUIP_ERR_ITEM_NOT_FOUND : EQUIP_ERR_ITEMS_CANT_BE_SWAPPED;
 }
-
 uint8 Player::CanUnequipItem( uint16 pos, bool swap ) const
 {
     // Applied only to equipped items and bank bags
     if(!IsEquipmentPos(pos) && !IsBagPos(pos))
         return EQUIP_ERR_OK;
-
     Item* pItem = GetItemByPos(pos);
-
     // Applied only to existed equipped item
     if( !pItem )
         return EQUIP_ERR_OK;
-
     sLog.outDebug( "STORAGE: CanUnequipItem slot = %u, item = %u, count = %u", pos, pItem->GetEntry(), pItem->GetCount());
-
     ItemPrototype const *pProto = pItem->GetProto();
     if( !pProto )
         return EQUIP_ERR_ITEM_NOT_FOUND;
-
     // do not allow unequipping gear except weapons, offhands, projectiles, relics in
     // - combat
     // - in-progress arenas
@@ -10495,38 +8946,29 @@ uint8 Player::CanUnequipItem( uint16 pos, bool swap ) const
     {
         if( isInCombat() )
             return EQUIP_ERR_NOT_IN_COMBAT;
-
         if(BattleGround* bg = GetBattleGround())
             if( bg->isArena() && bg->GetStatus() == STATUS_IN_PROGRESS )
                 return EQUIP_ERR_NOT_DURING_ARENA_MATCH;
     }
-
     if(!swap && pItem->IsBag() && !((Bag*)pItem)->IsEmpty())
         return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS;
-
     return EQUIP_ERR_OK;
 }
-
 uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *pItem, bool swap, bool not_loading ) const
 {
     if (!pItem)
         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_ITEM_NOT_FOUND;
-
     uint32 count = pItem->GetCount();
-
     sLog.outDebug( "STORAGE: CanBankItem bag = %u, slot = %u, item = %u, count = %u", bag, slot, pItem->GetEntry(), pItem->GetCount());
     ItemPrototype const *pProto = pItem->GetProto();
     if (!pProto)
         return swap ? EQUIP_ERR_ITEMS_CANT_BE_SWAPPED : EQUIP_ERR_ITEM_NOT_FOUND;
-
     if (pItem->IsBindedNotWith(this))
         return EQUIP_ERR_DONT_OWN_THAT_ITEM;
-
     // check count of items (skip for auto move for same player from bank)
     uint8 res = CanTakeMoreSimilarItems(pItem);
     if (res != EQUIP_ERR_OK)
         return res;
-
     // in specific slot
     if (bag != NULL_BAG && slot != NULL_SLOT)
     {
@@ -10534,24 +8976,18 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
         {
             if (!pItem->IsBag())
                 return EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT;
-
             if (slot - BANK_SLOT_BAG_START >= GetBankBagSlotCount())
                 return EQUIP_ERR_MUST_PURCHASE_THAT_BAG_SLOT;
-
             if (uint8 cantuse = CanUseItem( pItem, not_loading ) != EQUIP_ERR_OK)
                 return cantuse;
         }
-
         res = _CanStoreItem_InSpecificSlot(bag,slot,dest,pProto,count,swap,pItem);
         if (res!=EQUIP_ERR_OK)
             return res;
-
         if (count==0)
             return EQUIP_ERR_OK;
     }
-
     // not specific slot or have space for partly store only in specific slot
-
     // in specific bag
     if( bag != NULL_BAG )
     {
@@ -10561,7 +8997,6 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
             if( pBag && !pBag->IsEmpty() )
                 return EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG;
         }
-
         // search stack in bag for merge to
         if( pProto->Stackable != 1 )
         {
@@ -10570,7 +9005,6 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
                 res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
                 if(res!=EQUIP_ERR_OK)
                     return res;
-
                 if(count==0)
                     return EQUIP_ERR_OK;
             }
@@ -10579,22 +9013,18 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
                 res = _CanStoreItem_InBag(bag,dest,pProto,count,true,false,pItem,NULL_BAG,slot);
                 if(res!=EQUIP_ERR_OK)
                     res = _CanStoreItem_InBag(bag,dest,pProto,count,true,true,pItem,NULL_BAG,slot);
-
                 if(res!=EQUIP_ERR_OK)
                     return res;
-
                 if(count==0)
                     return EQUIP_ERR_OK;
             }
         }
-
         // search free slot in bag
         if( bag == INVENTORY_SLOT_BAG_0 )
         {
             res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
             if(res!=EQUIP_ERR_OK)
                 return res;
-
             if(count==0)
                 return EQUIP_ERR_OK;
         }
@@ -10603,17 +9033,13 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
             res = _CanStoreItem_InBag(bag, dest, pProto, count, false, false, pItem, NULL_BAG, slot);
             if(res != EQUIP_ERR_OK)
                 res = _CanStoreItem_InBag(bag, dest, pProto, count, false, true, pItem, NULL_BAG, slot);
-
             if(res != EQUIP_ERR_OK)
                 return res;
-
             if(count == 0)
                 return EQUIP_ERR_OK;
         }
     }
-
     // not specific bag or have space for partly store only in specific bag
-
     // search stack for merge to
     if( pProto->Stackable != 1 )
     {
@@ -10621,10 +9047,8 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
         res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,true,pItem,bag,slot);
         if(res != EQUIP_ERR_OK)
             return res;
-
         if(count == 0)
             return EQUIP_ERR_OK;
-
         // in special bags
         if( pProto->BagFamily )
         {
@@ -10633,23 +9057,19 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
                 res = _CanStoreItem_InBag(i,dest,pProto,count,true,false,pItem,bag,slot);
                 if(res!=EQUIP_ERR_OK)
                     continue;
-
                 if(count==0)
                     return EQUIP_ERR_OK;
             }
         }
-
         for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++)
         {
             res = _CanStoreItem_InBag(i,dest,pProto,count,true,true,pItem,bag,slot);
             if(res!=EQUIP_ERR_OK)
                 continue;
-
             if(count==0)
                 return EQUIP_ERR_OK;
         }
     }
-
     // search free place in special bag
     if( pProto->BagFamily )
     {
@@ -10658,87 +9078,68 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
             res = _CanStoreItem_InBag(i,dest,pProto,count,false,false,pItem,bag,slot);
             if(res!=EQUIP_ERR_OK)
                 continue;
-
             if(count==0)
                 return EQUIP_ERR_OK;
         }
     }
-
     // search free space
     res = _CanStoreItem_InInventorySlots(BANK_SLOT_ITEM_START,BANK_SLOT_ITEM_END,dest,pProto,count,false,pItem,bag,slot);
     if(res!=EQUIP_ERR_OK)
         return res;
-
     if(count==0)
         return EQUIP_ERR_OK;
-
     for(uint8 i = BANK_SLOT_BAG_START; i < BANK_SLOT_BAG_END; i++)
     {
         res = _CanStoreItem_InBag(i,dest,pProto,count,false,true,pItem,bag,slot);
         if(res!=EQUIP_ERR_OK)
             continue;
-
         if(count==0)
             return EQUIP_ERR_OK;
     }
     return EQUIP_ERR_BANK_FULL;
 }
-
 uint8 Player::CanUseItem( Item *pItem, bool not_loading ) const
 {
     if (pItem)
     {
         sLog.outDebug( "STORAGE: CanUseItem item = %u", pItem->GetEntry());
-
         if (!isAlive() && not_loading)
             return EQUIP_ERR_YOU_ARE_DEAD;
-
         //if (isStunned())
         //    return EQUIP_ERR_YOU_ARE_STUNNED;
-
         ItemPrototype const *pProto = pItem->GetProto();
         if (pProto)
         {
             if (pItem->IsBindedNotWith(this))
                 return EQUIP_ERR_DONT_OWN_THAT_ITEM;
-
             if ((pProto->AllowableClass & getClassMask()) == 0 || (pProto->AllowableRace & getRaceMask()) == 0)
                 return EQUIP_ERR_YOU_CAN_NEVER_USE_THAT_ITEM;
-
             if (pItem->GetSkill() != 0)
             {
                 if (GetSkillValue( pItem->GetSkill() ) == 0)
                     return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
             }
-
             if (pProto->RequiredSkill != 0)
             {
                 if (GetSkillValue( pProto->RequiredSkill ) == 0)
                     return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
-
                 if (GetSkillValue( pProto->RequiredSkill ) < pProto->RequiredSkillRank)
                     return EQUIP_ERR_ERR_CANT_EQUIP_SKILL;
             }
-
             if (pProto->RequiredSpell != 0 && !HasSpell(pProto->RequiredSpell))
                 return EQUIP_ERR_NO_REQUIRED_PROFICIENCY;
-
             if (pProto->RequiredReputationFaction && uint32(GetReputationRank(pProto->RequiredReputationFaction)) < pProto->RequiredReputationRank)
                 return EQUIP_ERR_CANT_EQUIP_REPUTATION;
-
             if (getLevel() < pProto->RequiredLevel)
                 return EQUIP_ERR_CANT_EQUIP_LEVEL_I;
-
             return EQUIP_ERR_OK;
         }
     }
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
-
 bool Player::CanUseItem( ItemPrototype const *pProto )
 {
     // Used by group, function NeedBeforeGreed, to know if a prototype can be used by a player
-
     if( pProto )
     {
         if( (pProto->AllowableClass & getClassMask()) == 0 || (pProto->AllowableRace & getRaceMask()) == 0 )
@@ -10758,7 +9159,6 @@ bool Player::CanUseItem( ItemPrototype const *pProto )
     }
     return false;
 }
-
 uint8 Player::CanUseAmmo( uint32 item ) const
 {
     sLog.outDebug( "STORAGE: CanUseAmmo item = %u", item);
@@ -10787,25 +9187,20 @@ uint8 Player::CanUseAmmo( uint32 item ) const
         */
         if( getLevel() < pProto->RequiredLevel )
             return EQUIP_ERR_CANT_EQUIP_LEVEL_I;
-
         // Requires No Ammo
         if(HasAura(46699))
             return EQUIP_ERR_BAG_FULL6;
-
         return EQUIP_ERR_OK;
     }
     return EQUIP_ERR_ITEM_NOT_FOUND;
 }
-
 void Player::SetAmmo( uint32 item )
 {
     if(!item)
         return;
-
     // already set
     if( GetUInt32Value(PLAYER_AMMO_ID) == item )
         return;
-
     // check ammo
     if(item)
     {
@@ -10816,29 +9211,22 @@ void Player::SetAmmo( uint32 item )
             return;
         }
     }
-
     SetUInt32Value(PLAYER_AMMO_ID, item);
-
     _ApplyAmmoBonuses();
 }
-
 void Player::RemoveAmmo()
 {
     SetUInt32Value(PLAYER_AMMO_ID, 0);
-
     m_ammoDPS = 0.0f;
-
     if(CanModifyStats())
         UpdateDamagePhysical(RANGED_ATTACK);
 }
-
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
 Item* Player::StoreNewItem( ItemPosCountVec const& dest, uint32 item, bool update,int32 randomPropertyId )
 {
     uint32 count = 0;
     for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); ++itr)
         count += itr->count;
-
     Item *pItem = Item::CreateItem( item, count, this );
     if( pItem )
     {
@@ -10849,81 +9237,64 @@ Item* Player::StoreNewItem( ItemPosCountVec const& dest, uint32 item, bool updat
     }
     return pItem;
 }
-
 Item* Player::StoreItem( ItemPosCountVec const& dest, Item* pItem, bool update )
 {
     if( !pItem )
         return NULL;
-
     Item* lastItem = pItem;
     uint32 entry = pItem->GetEntry();
     for(ItemPosCountVec::const_iterator itr = dest.begin(); itr != dest.end(); )
     {
         uint16 pos = itr->pos;
         uint32 count = itr->count;
-
         ++itr;
-
         if(itr == dest.end())
         {
             lastItem = _StoreItem(pos,pItem,count,false,update);
             break;
         }
-
         lastItem = _StoreItem(pos,pItem,count,true,update);
     }
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_OWN_ITEM, entry);
     return lastItem;
 }
-
 // Return stored item (if stored to stack, it can diff. from pItem). And pItem ca be deleted in this case.
 Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, bool update )
 {
     if( !pItem )
         return NULL;
-
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
-
     sLog.outDebug( "STORAGE: StoreItem bag = %u, slot = %u, item = %u, count = %u, guid = %u", bag, slot, pItem->GetEntry(), count, pItem->GetGUIDLow());
-
     Item *pItem2 = GetItemByPos( bag, slot );
-
     if (!pItem2)
     {
         if (clone)
             pItem = pItem->CloneItem(count, this);
         else
             pItem->SetCount(count);
-
         if (!pItem)
             return NULL;
-
         if (pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP ||
             pItem->GetProto()->Bonding == BIND_QUEST_ITEM ||
             (pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos)))
             pItem->SetBinding( true );
-
         if (bag == INVENTORY_SLOT_BAG_0)
         {
             m_items[slot] = pItem;
             SetUInt64Value( PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), pItem->GetGUID() );
             pItem->SetUInt64Value( ITEM_FIELD_CONTAINED, GetGUID() );
             pItem->SetUInt64Value( ITEM_FIELD_OWNER, GetGUID() );
-
             pItem->SetSlot( slot );
             pItem->SetContainer( NULL );
-
             // need update known currency
             if (slot >= CURRENCYTOKEN_SLOT_START && slot < CURRENCYTOKEN_SLOT_END)
                 UpdateKnownCurrencies(pItem->GetEntry(), true);
-
             if (IsInWorld() && update)
             {
                 pItem->AddToWorld();
                 pItem->SendUpdateToPlayer( this );
             }
-
             pItem->SetState(ITEM_CHANGED, this);
         }
         else if (Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
@@ -10937,10 +9308,8 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
             pItem->SetState(ITEM_CHANGED, this);
             pBag->SetState(ITEM_CHANGED, this);
         }
-
         AddEnchantmentDurations(pItem);
         AddItemDurations(pItem);
-
         return pItem;
     }
     else
@@ -10949,11 +9318,9 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
             pItem2->GetProto()->Bonding == BIND_QUEST_ITEM ||
             (pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos)))
             pItem2->SetBinding( true );
-
         pItem2->SetCount( pItem2->GetCount() + count );
         if (IsInWorld() && update)
             pItem2->SendUpdateToPlayer( this );
-
         if (!clone)
         {
             // delete item (it not in any slot currently)
@@ -10962,23 +9329,17 @@ Item* Player::_StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, boo
                 pItem->RemoveFromWorld();
                 pItem->DestroyForPlayer( this );
             }
-
             RemoveEnchantmentDurations(pItem);
             RemoveItemDurations(pItem);
-
             pItem->SetOwnerGUID(GetGUID());                 // prevent error at next SetState in case trade/mail/buy from vendor
             pItem->SetState(ITEM_REMOVED, this);
         }
-
         // AddItemDurations(pItem2); - pItem2 already have duration listed for player
         AddEnchantmentDurations(pItem2);
-
         pItem2->SetState(ITEM_CHANGED, this);
-
         return pItem2;
     }
 }
-
 Item* Player::EquipNewItem( uint16 pos, uint32 item, bool update )
 {
     if (Item *pItem = Item::CreateItem( item, 1, this ))
@@ -10986,49 +9347,36 @@ Item* Player::EquipNewItem( uint16 pos, uint32 item, bool update )
         ItemAddedQuestCheck( item, 1 );
         return EquipItem( pos, pItem, update );
     }
-
     return NULL;
 }
-
 Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
 {
     AddEnchantmentDurations(pItem);
     AddItemDurations(pItem);
-
     uint8 bag = pos >> 8;
     uint8 slot = pos & 255;
-
     Item *pItem2 = GetItemByPos( bag, slot );
-
     if( !pItem2 )
     {
         VisualizeItem( slot, pItem);
-
         if(isAlive())
         {
             ItemPrototype const *pProto = pItem->GetProto();
-
             // item set bonuses applied only at equip and removed at unequip, and still active for broken items
             if(pProto && pProto->ItemSet)
                 AddItemsSetItem(this, pItem);
-
             _ApplyItemMods(pItem, slot, true);
-
             if(pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0)
             {
                 uint32 cooldownSpell = SPELL_ID_WEAPON_SWITCH_COOLDOWN_1_5s;
-
                 if (getClass() == CLASS_ROGUE)
                     cooldownSpell = SPELL_ID_WEAPON_SWITCH_COOLDOWN_1_0s;
-
                 SpellEntry const* spellProto = sSpellStore.LookupEntry(cooldownSpell);
-
                 if (!spellProto)
                     sLog.outError("Weapon switch cooldown spell %u couldn't be found in Spell.dbc", cooldownSpell);
                 else
                 {
                     m_weaponChangeTimer = spellProto->StartRecoveryTime;
-
                     WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4);
                     data << uint64(GetGUID());
                     data << uint8(1);
@@ -11038,23 +9386,17 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
                 }
             }
         }
-
         if( IsInWorld() && update )
         {
             pItem->AddToWorld();
             pItem->SendUpdateToPlayer( this );
         }
-
         ApplyEquipCooldown(pItem);
-
          // update expertise and armor penetration - passive auras may need it
-
         if( slot == EQUIPMENT_SLOT_MAINHAND )
             UpdateExpertise(BASE_ATTACK);
-
         else if( slot == EQUIPMENT_SLOT_OFFHAND )
             UpdateExpertise(OFF_ATTACK);
-
         switch(slot)
         {
         case EQUIPMENT_SLOT_MAINHAND:
@@ -11070,7 +9412,6 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
         pItem2->SetCount( pItem2->GetCount() + pItem->GetCount() );
         if( IsInWorld() && update )
             pItem2->SendUpdateToPlayer( this );
-
         // delete item (it not in any slot currently)
         //pItem->DeleteFromDB();
         if( IsInWorld() && update )
@@ -11078,45 +9419,34 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
             pItem->RemoveFromWorld();
             pItem->DestroyForPlayer( this );
         }
-
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
-
         pItem->SetOwnerGUID(GetGUID());                     // prevent error at next SetState in case trade/mail/buy from vendor
         pItem->SetState(ITEM_REMOVED, this);
         pItem2->SetState(ITEM_CHANGED, this);
-
         ApplyEquipCooldown(pItem2);
-
         return pItem2;
     }
-
     // only for full equip instead adding to stack
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
-
     return pItem;
 }
-
 void Player::QuickEquipItem( uint16 pos, Item *pItem)
 {
     if( pItem )
     {
         AddEnchantmentDurations(pItem);
         AddItemDurations(pItem);
-
         uint8 slot = pos & 255;
         VisualizeItem( slot, pItem);
-
         if( IsInWorld() )
         {
             pItem->AddToWorld();
             pItem->SendUpdateToPlayer( this );
         }
-
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_EQUIP_ITEM, pItem->GetEntry());
     }
 }
-
 void Player::SetVisibleItemSlot(uint8 slot, Item *pItem)
 {
     if(pItem)
@@ -11131,63 +9461,49 @@ void Player::SetVisibleItemSlot(uint8 slot, Item *pItem)
         SetUInt32Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (slot * 2), 0);
     }
 }
-
 void Player::VisualizeItem( uint8 slot, Item *pItem)
 {
     if(!pItem)
         return;
-
     // check also  BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory)
     if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM )
         pItem->SetBinding( true );
-
     sLog.outDebug( "STORAGE: EquipItem slot = %u, item = %u", slot, pItem->GetEntry());
-
     m_items[slot] = pItem;
     SetUInt64Value( PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), pItem->GetGUID() );
     pItem->SetUInt64Value( ITEM_FIELD_CONTAINED, GetGUID() );
     pItem->SetUInt64Value( ITEM_FIELD_OWNER, GetGUID() );
     pItem->SetSlot( slot );
     pItem->SetContainer( NULL );
-
     if( slot < EQUIPMENT_SLOT_END )
         SetVisibleItemSlot(slot, pItem);
-
     pItem->SetState(ITEM_CHANGED, this);
 }
-
 void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
 {
     // note: removeitem does not actually change the item
     // it only takes the item out of storage temporarily
     // note2: if removeitem is to be used for delinking
     // the item must be removed from the player's updatequeue
-
     Item *pItem = GetItemByPos( bag, slot );
     if( pItem )
     {
         sLog.outDebug( "STORAGE: RemoveItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
-
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
-
         if( bag == INVENTORY_SLOT_BAG_0 )
         {
             if ( slot < INVENTORY_SLOT_BAG_END )
             {
                 ItemPrototype const *pProto = pItem->GetProto();
                 // item set bonuses applied only at equip and removed at unequip, and still active for broken items
-
                 if(pProto && pProto->ItemSet)
                     RemoveItemsSetItem(this, pProto);
-
                 _ApplyItemMods(pItem, slot, false);
-
                 // remove item dependent auras and casts (only weapon and armor slots)
                 if(slot < EQUIPMENT_SLOT_END)
                 {
                     RemoveItemDependentAurasAndCasts(pItem);
-
                     // remove held enchantments, update expertise
                     if ( slot == EQUIPMENT_SLOT_MAINHAND )
                     {
@@ -11201,7 +9517,6 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
                             pItem->ClearEnchantment(PROP_ENCHANTMENT_SLOT_0);
                             pItem->ClearEnchantment(PROP_ENCHANTMENT_SLOT_1);
                         }
-
                         UpdateExpertise(BASE_ATTACK);
                     }
                     else if( slot == EQUIPMENT_SLOT_OFFHAND )
@@ -11221,10 +9536,8 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
             // need update known currency
             else if (slot >= CURRENCYTOKEN_SLOT_START && slot < CURRENCYTOKEN_SLOT_END)
                 UpdateKnownCurrencies(pItem->GetEntry(), false);
-
             m_items[slot] = NULL;
             SetUInt64Value(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0);
-
             if ( slot < EQUIPMENT_SLOT_END )
                 SetVisibleItemSlot(slot, NULL);
         }
@@ -11241,7 +9554,6 @@ void Player::RemoveItem( uint8 bag, uint8 slot, bool update )
             pItem->SendUpdateToPlayer( this );
     }
 }
-
 // Common operation need to remove item from inventory without delete in trade, auction, guild bank, mail....
 void Player::MoveItemFromInventory(uint8 bag, uint8 slot, bool update)
 {
@@ -11257,72 +9569,57 @@ void Player::MoveItemFromInventory(uint8 bag, uint8 slot, bool update)
         }
     }
 }
-
 // Common operation need to add item from inventory without delete in trade, guild bank, mail....
 void Player::MoveItemToInventory(ItemPosCountVec const& dest, Item* pItem, bool update, bool in_characterInventoryDB)
 {
     // update quest counters
     ItemAddedQuestCheck(pItem->GetEntry(), pItem->GetCount());
-
     // store item
     Item* pLastItem = StoreItem(dest, pItem, update);
-
     // only set if not merged to existed stack (pItem can be deleted already but we can compare pointers any way)
     if(pLastItem == pItem)
     {
         // update owner for last item (this can be original item with wrong owner
         if(pLastItem->GetOwnerGUID() != GetGUID())
             pLastItem->SetOwnerGUID(GetGUID());
-
         // if this original item then it need create record in inventory
         // in case trade we already have item in other player inventory
         pLastItem->SetState(in_characterInventoryDB ? ITEM_CHANGED : ITEM_NEW, this);
     }
 }
-
 void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
 {
     Item *pItem = GetItemByPos( bag, slot );
     if( pItem )
     {
         sLog.outDebug( "STORAGE: DestroyItem bag = %u, slot = %u, item = %u", bag, slot, pItem->GetEntry());
-
         // start from destroy contained items (only equipped bag can have its)
         if (pItem->IsBag() && pItem->IsEquipped())          // this also prevent infinity loop if empty bag stored in bag==slot
         {
             for (uint8 i = 0; i < MAX_BAG_SIZE; ++i)
                 DestroyItem(slot, i, update);
         }
-
         if(pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))
             CharacterDatabase.PExecute("DELETE FROM character_gifts WHERE item_guid = '%u'", pItem->GetGUIDLow());
-
         RemoveEnchantmentDurations(pItem);
         RemoveItemDurations(pItem);
-
         ItemRemovedQuestCheck( pItem->GetEntry(), pItem->GetCount() );
-
         if( bag == INVENTORY_SLOT_BAG_0 )
         {
             SetUInt64Value(PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0);
-
             // equipment and equipped bags can have applied bonuses
             if ( slot < INVENTORY_SLOT_BAG_END )
             {
                 ItemPrototype const *pProto = pItem->GetProto();
-
                 // item set bonuses applied only at equip and removed at unequip, and still active for broken items
                 if(pProto && pProto->ItemSet)
                     RemoveItemsSetItem(this, pProto);
-
                 _ApplyItemMods(pItem, slot, false);
             }
-
             if ( slot < EQUIPMENT_SLOT_END )
             {
                 // remove item dependent auras and casts (only weapon and armor slots)
                 RemoveItemDependentAurasAndCasts(pItem);
-
                 // update expertise and armor penetration - passive auras may need it
                 switch(slot)
                 {
@@ -11333,43 +9630,35 @@ void Player::DestroyItem( uint8 bag, uint8 slot, bool update )
                 default:
                     break;
                 }
-
                 if( slot == EQUIPMENT_SLOT_MAINHAND )
                     UpdateExpertise(BASE_ATTACK);
-
                 else if( slot == EQUIPMENT_SLOT_OFFHAND )
                     UpdateExpertise(OFF_ATTACK);
-
                 // equipment visual show
                 SetVisibleItemSlot(slot, NULL);
             }
             // need update known currency
             else if (slot >= CURRENCYTOKEN_SLOT_START && slot < CURRENCYTOKEN_SLOT_END)
                 UpdateKnownCurrencies(pItem->GetEntry(), false);
-
             m_items[slot] = NULL;
         }
         else if(Bag *pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, bag ))
             pBag->RemoveItem(slot, update);
-
         if( IsInWorld() && update )
         {
             pItem->RemoveFromWorld();
             pItem->DestroyForPlayer(this);
         }
-
         //pItem->SetOwnerGUID(0);
         pItem->SetUInt64Value( ITEM_FIELD_CONTAINED, 0 );
         pItem->SetSlot( NULL_SLOT );
         pItem->SetState(ITEM_REMOVED, this);
     }
 }
-
 void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool unequip_check)
 {
     sLog.outDebug( "STORAGE: DestroyItemCount item = %u, count = %u", item, count);
     uint32 remcount = 0;
-
     // in inventory
     for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
     {
@@ -11382,7 +9671,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
                     // all items in inventory can unequipped
                     remcount += pItem->GetCount();
                     DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
                     if (remcount >= count)
                         return;
                 }
@@ -11398,7 +9686,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
             }
         }
     }
-
     for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
     {
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
@@ -11410,7 +9697,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
                     // all keys can be unequipped
                     remcount += pItem->GetCount();
                     DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
                     if (remcount >= count)
                         return;
                 }
@@ -11426,7 +9712,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
             }
         }
     }
-
     // in inventory bags
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
@@ -11443,7 +9728,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
                         {
                             remcount += pItem->GetCount();
                             DestroyItem( i, j, update );
-
                             if (remcount >= count)
                                 return;
                         }
@@ -11461,7 +9745,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
             }
         }
     }
-
     // in equipment and bag list
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++)
     {
@@ -11475,7 +9758,6 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
                     {
                         remcount += pItem->GetCount();
                         DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
                         if (remcount >= count)
                             return;
                     }
@@ -11493,22 +9775,18 @@ void Player::DestroyItemCount( uint32 item, uint32 count, bool update, bool uneq
         }
     }
 }
-
 void Player::DestroyZoneLimitedItem( bool update, uint32 new_zone )
 {
     sLog.outDebug( "STORAGE: DestroyZoneLimitedItem in map %u and area %u", GetMapId(), new_zone );
-
     // in inventory
     for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
                 DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
     for(uint8 i = KEYRING_SLOT_START; i < CURRENCYTOKEN_SLOT_END; ++i)
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
                 DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
     // in inventory bags
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
         if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
@@ -11516,26 +9794,22 @@ void Player::DestroyZoneLimitedItem( bool update, uint32 new_zone )
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
                         DestroyItem(i, j, update);
-
     // in equipment and bag list
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++)
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             if (pItem->IsLimitedToAnotherMapOrZone(GetMapId(), new_zone))
                 DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
 }
-
 void Player::DestroyConjuredItems( bool update )
 {
     // used when entering arena
     // destroys all conjured items
     sLog.outDebug( "STORAGE: DestroyConjuredItems" );
-
     // in inventory
     for(uint8 i = INVENTORY_SLOT_ITEM_START; i < INVENTORY_SLOT_ITEM_END; i++)
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             if (pItem->IsConjuredConsumable())
                 DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
-
     // in inventory bags
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; i++)
         if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
@@ -11543,25 +9817,20 @@ void Player::DestroyConjuredItems( bool update )
                 if (Item* pItem = pBag->GetItemByPos(j))
                     if (pItem->IsConjuredConsumable())
                         DestroyItem( i, j, update);
-
     // in equipment and bag list
     for(uint8 i = EQUIPMENT_SLOT_START; i < INVENTORY_SLOT_BAG_END; i++)
         if (Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
             if (pItem->IsConjuredConsumable())
                 DestroyItem( INVENTORY_SLOT_BAG_0, i, update);
 }
-
 void Player::DestroyItemCount( Item* pItem, uint32 &count, bool update )
 {
     if(!pItem)
         return;
-
     sLog.outDebug( "STORAGE: DestroyItemCount item (GUID: %u, Entry: %u) count = %u", pItem->GetGUIDLow(),pItem->GetEntry(), count);
-
     if( pItem->GetCount() <= count )
     {
         count -= pItem->GetCount();
-
         DestroyItem( pItem->GetBagSlot(),pItem->GetSlot(), update);
     }
     else
@@ -11574,43 +9843,36 @@ void Player::DestroyItemCount( Item* pItem, uint32 &count, bool update )
         pItem->SetState(ITEM_CHANGED, this);
     }
 }
-
 void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
 {
     uint8 srcbag = src >> 8;
     uint8 srcslot = src & 255;
-
     uint8 dstbag = dst >> 8;
     uint8 dstslot = dst & 255;
-
     Item *pSrcItem = GetItemByPos( srcbag, srcslot );
     if( !pSrcItem )
     {
         SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL );
         return;
     }
-
     // not let split all items (can be only at cheating)
     if(pSrcItem->GetCount() == count)
     {
         SendEquipError( EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL );
         return;
     }
-
     // not let split more existed items (can be only at cheating)
     if(pSrcItem->GetCount() < count)
     {
         SendEquipError( EQUIP_ERR_TRIED_TO_SPLIT_MORE_THAN_COUNT, pSrcItem, NULL );
         return;
     }
-
     if(pSrcItem->m_lootGenerated)                           // prevent split looting item (item
     {
         //best error message found for attempting to split while looting
         SendEquipError( EQUIP_ERR_COULDNT_SPLIT_ITEMS, pSrcItem, NULL );
         return;
     }
-
     sLog.outDebug( "STORAGE: SplitItem bag = %u, slot = %u, item = %u, count = %u", dstbag, dstslot, pSrcItem->GetEntry(), count);
     Item *pNewItem = pSrcItem->CloneItem( count, this );
     if( !pNewItem )
@@ -11618,12 +9880,10 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
         SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, pSrcItem, NULL );
         return;
     }
-
     if( IsInventoryPos( dst ) )
     {
         // change item amount before check (for unique max count check)
         pSrcItem->SetCount( pSrcItem->GetCount() - count );
-
         ItemPosCountVec dest;
         uint8 msg = CanStoreItem( dstbag, dstslot, dest, pNewItem, false );
         if( msg != EQUIP_ERR_OK )
@@ -11633,7 +9893,6 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
             SendEquipError( msg, pSrcItem, NULL );
             return;
         }
-
         if( IsInWorld() )
             pSrcItem->SendUpdateToPlayer( this );
         pSrcItem->SetState(ITEM_CHANGED, this);
@@ -11643,7 +9902,6 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
     {
         // change item amount before check (for unique max count check)
         pSrcItem->SetCount( pSrcItem->GetCount() - count );
-
         ItemPosCountVec dest;
         uint8 msg = CanBankItem( dstbag, dstslot, dest, pNewItem, false );
         if( msg != EQUIP_ERR_OK )
@@ -11653,7 +9911,6 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
             SendEquipError( msg, pSrcItem, NULL );
             return;
         }
-
         if( IsInWorld() )
             pSrcItem->SendUpdateToPlayer( this );
         pSrcItem->SetState(ITEM_CHANGED, this);
@@ -11663,7 +9920,6 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
     {
         // change item amount before check (for unique max count check), provide space for splitted items
         pSrcItem->SetCount( pSrcItem->GetCount() - count );
-
         uint16 dest;
         uint8 msg = CanEquipItem( dstslot, dest, pNewItem, false );
         if( msg != EQUIP_ERR_OK )
@@ -11673,7 +9929,6 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
             SendEquipError( msg, pSrcItem, NULL );
             return;
         }
-
         if( IsInWorld() )
             pSrcItem->SendUpdateToPlayer( this );
         pSrcItem->SetState(ITEM_CHANGED, this);
@@ -11681,38 +9936,29 @@ void Player::SplitItem( uint16 src, uint16 dst, uint32 count )
         AutoUnequipOffhandIfNeed();
     }
 }
-
 void Player::SwapItem( uint16 src, uint16 dst )
 {
     uint8 srcbag = src >> 8;
     uint8 srcslot = src & 255;
-
     uint8 dstbag = dst >> 8;
     uint8 dstslot = dst & 255;
-
     Item *pSrcItem = GetItemByPos( srcbag, srcslot );
     Item *pDstItem = GetItemByPos( dstbag, dstslot );
-
     if( !pSrcItem )
         return;
-
     sLog.outDebug( "STORAGE: SwapItem bag = %u, slot = %u, item = %u", dstbag, dstslot, pSrcItem->GetEntry());
-
     if(!isAlive() )
     {
         SendEquipError( EQUIP_ERR_YOU_ARE_DEAD, pSrcItem, pDstItem );
         return;
     }
-
     // SRC checks
-
     if(pSrcItem->m_lootGenerated)                           // prevent swap looting item
     {
         //best error message found for attempting to swap while looting
         SendEquipError( EQUIP_ERR_CANT_DO_RIGHT_NOW, pSrcItem, NULL );
         return;
     }
-
     // check unequip potability for equipped items and bank bags
     if(IsEquipmentPos ( src ) || IsBagPos ( src ))
     {
@@ -11724,16 +9970,13 @@ void Player::SwapItem( uint16 src, uint16 dst )
             return;
         }
     }
-
     // prevent put equipped/bank bag in self
     if( IsBagPos ( src ) && srcslot == dstbag)
     {
         SendEquipError( EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem );
         return;
     }
-
     // DST checks
-
     if (pDstItem)
     {
         if(pDstItem->m_lootGenerated)                       // prevent swap looting item
@@ -11742,7 +9985,6 @@ void Player::SwapItem( uint16 src, uint16 dst )
             SendEquipError( EQUIP_ERR_CANT_DO_RIGHT_NOW, pDstItem, NULL );
             return;
         }
-
         // check unequip potability for equipped items and bank bags
         if(IsEquipmentPos ( dst ) || IsBagPos ( dst ))
         {
@@ -11755,10 +9997,8 @@ void Player::SwapItem( uint16 src, uint16 dst )
             }
         }
     }
-
     // NOW this is or item move (swap with empty), or swap with another item (including bags in bag possitions)
     // or swap empty bag with another empty or not empty bag (with items exchange)
-
     // Move case
     if( !pDstItem )
     {
@@ -11771,7 +10011,6 @@ void Player::SwapItem( uint16 src, uint16 dst )
                 SendEquipError( msg, pSrcItem, NULL );
                 return;
             }
-
             RemoveItem(srcbag, srcslot, true);
             StoreItem( dest, pSrcItem, true);
         }
@@ -11784,7 +10023,6 @@ void Player::SwapItem( uint16 src, uint16 dst )
                 SendEquipError( msg, pSrcItem, NULL );
                 return;
             }
-
             RemoveItem(srcbag, srcslot, true);
             BankItem( dest, pSrcItem, true);
         }
@@ -11797,15 +10035,12 @@ void Player::SwapItem( uint16 src, uint16 dst )
                 SendEquipError( msg, pSrcItem, NULL );
                 return;
             }
-
             RemoveItem(srcbag, srcslot, true);
             EquipItem(dest, pSrcItem, true);
             AutoUnequipOffhandIfNeed();
         }
-
         return;
     }
-
     // attempt merge to / fill target item
     if(!pSrcItem->IsBag() && !pDstItem->IsBag())
     {
@@ -11820,14 +10055,12 @@ void Player::SwapItem( uint16 src, uint16 dst )
             msg = CanEquipItem( dstslot, eDest, pSrcItem, false );
         else
             return;
-
         // can be merge/fill
         if(msg == EQUIP_ERR_OK)
         {
             if( pSrcItem->GetCount() + pDstItem->GetCount() <= pSrcItem->GetProto()->GetMaxStackSize())
             {
                 RemoveItem(srcbag, srcslot, true);
-
                 if( IsInventoryPos( dst ) )
                     StoreItem( sDest, pSrcItem, true);
                 else if( IsBankPos ( dst ) )
@@ -11853,10 +10086,8 @@ void Player::SwapItem( uint16 src, uint16 dst )
             return;
         }
     }
-
     // impossible merge/fill, do real swap
     uint8 msg;
-
     // check src->dest move possibility
     ItemPosCountVec sDest;
     uint16 eDest = 0;
@@ -11870,13 +10101,11 @@ void Player::SwapItem( uint16 src, uint16 dst )
         if( msg == EQUIP_ERR_OK )
             msg = CanUnequipItem( eDest, true );
     }
-
     if( msg != EQUIP_ERR_OK )
     {
         SendEquipError( msg, pSrcItem, pDstItem );
         return;
     }
-
     // check dest->src move possibility
     ItemPosCountVec sDest2;
     uint16 eDest2 = 0;
@@ -11890,13 +10119,11 @@ void Player::SwapItem( uint16 src, uint16 dst )
         if( msg == EQUIP_ERR_OK )
             msg = CanUnequipItem( eDest2, true);
     }
-
     if( msg != EQUIP_ERR_OK )
     {
         SendEquipError( msg, pDstItem, pSrcItem );
         return;
     }
-
     // Check bag swap with item exchange (one from empty in not bag possition (equipped (not possible in fact) or store)
     if(pSrcItem->IsBag() && pDstItem->IsBag())
     {
@@ -11912,20 +10139,16 @@ void Player::SwapItem( uint16 src, uint16 dst )
             emptyBag = (Bag*)pDstItem;
             fullBag  = (Bag*)pSrcItem;
         }
-
         // bag swap (with items exchange) case
         if(emptyBag && fullBag)
         {
             ItemPrototype const* emotyProto = emptyBag->GetProto();
-
             uint32 count = 0;
-
             for(uint32 i=0; i < fullBag->GetBagSize(); ++i)
             {
                 Item *bagItem = fullBag->GetItemByPos(i);
                 if (!bagItem)
                     continue;
-
                 ItemPrototype const* bagItemProto = bagItem->GetProto();
                 if (!bagItemProto || !ItemCanGoIntoBag(bagItemProto, emotyProto))
                 {
@@ -11933,18 +10156,15 @@ void Player::SwapItem( uint16 src, uint16 dst )
                     SendEquipError( EQUIP_ERR_NONEMPTY_BAG_OVER_OTHER_BAG, pSrcItem, pDstItem );
                     return;
                 }
-
                 ++count;
             }
 
-
             if (count > emptyBag->GetBagSize())
             {
                 // too small targeted bag
                 SendEquipError( EQUIP_ERR_ITEMS_CANT_BE_SWAPPED, pSrcItem, pDstItem );
                 return;
             }
-
             // Items swap
             count = 0;                                      // will pos in new bag
             for(uint32 i = 0; i< fullBag->GetBagSize(); ++i)
@@ -11952,20 +10172,16 @@ void Player::SwapItem( uint16 src, uint16 dst )
                 Item *bagItem = fullBag->GetItemByPos(i);
                 if (!bagItem)
                     continue;
-
                 fullBag->RemoveItem(i, true);
                 emptyBag->StoreItem(count, bagItem, true);
                 bagItem->SetState(ITEM_CHANGED, this);
-
                 ++count;
             }
         }
     }
-
     // now do moves, remove...
     RemoveItem(dstbag, dstslot, false);
     RemoveItem(srcbag, srcslot, false);
-
     // add to dest
     if (IsInventoryPos(dst))
         StoreItem(sDest, pSrcItem, true);
@@ -11973,7 +10189,6 @@ void Player::SwapItem( uint16 src, uint16 dst )
         BankItem(sDest, pSrcItem, true);
     else if (IsEquipmentPos(dst))
         EquipItem(eDest, pSrcItem, true);
-
     // add to src
     if (IsInventoryPos(src))
         StoreItem(sDest2, pDstItem, true);
@@ -11981,10 +10196,8 @@ void Player::SwapItem( uint16 src, uint16 dst )
         BankItem(sDest2, pDstItem, true);
     else if (IsEquipmentPos(src))
         EquipItem(eDest2, pDstItem, true);
-
     AutoUnequipOffhandIfNeed();
 }
-
 void Player::AddItemToBuyBackSlot( Item *pItem )
 {
     if (pItem)
@@ -11995,7 +10208,6 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
         {
             uint32 oldest_time = GetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 );
             uint32 oldest_slot = BUYBACK_SLOT_START;
-
             for(uint32 i = BUYBACK_SLOT_START+1; i < BUYBACK_SLOT_END; ++i )
             {
                 // found empty
@@ -12004,41 +10216,33 @@ void Player::AddItemToBuyBackSlot( Item *pItem )
                     slot = i;
                     break;
                 }
-
                 uint32 i_time = GetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + i - BUYBACK_SLOT_START);
-
                 if (oldest_time > i_time)
                 {
                     oldest_time = i_time;
                     oldest_slot = i;
                 }
             }
-
             // find oldest
             slot = oldest_slot;
         }
-
         RemoveItemFromBuyBackSlot( slot, true );
         sLog.outDebug( "STORAGE: AddItemToBuyBackSlot item = %u, slot = %u", pItem->GetEntry(), slot);
-
         m_items[slot] = pItem;
         time_t base = time(NULL);
         uint32 etime = uint32(base - m_logintime + (30 * 3600));
         uint32 eslot = slot - BUYBACK_SLOT_START;
-
         SetUInt64Value( PLAYER_FIELD_VENDORBUYBACK_SLOT_1 + (eslot * 2), pItem->GetGUID() );
         if (ItemPrototype const *pProto = pItem->GetProto())
             SetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, pProto->SellPrice * pItem->GetCount() );
         else
             SetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, 0 );
         SetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + eslot, (uint32)etime );
-
         // move to next (for non filled list is move most optimized choice)
         if (m_currentBuybackSlot < BUYBACK_SLOT_END - 1)
             ++m_currentBuybackSlot;
     }
 }
-
 Item* Player::GetItemFromBuyBackSlot( uint32 slot )
 {
     sLog.outDebug( "STORAGE: GetItemFromBuyBackSlot slot = %u", slot);
@@ -12046,7 +10250,6 @@ Item* Player::GetItemFromBuyBackSlot( uint32 slot )
         return m_items[slot];
     return NULL;
 }
-
 void Player::RemoveItemFromBuyBackSlot( uint32 slot, bool del )
 {
     sLog.outDebug( "STORAGE: RemoveItemFromBuyBackSlot slot = %u", slot);
@@ -12058,46 +10261,37 @@ void Player::RemoveItemFromBuyBackSlot( uint32 slot, bool del )
             pItem->RemoveFromWorld();
             if(del) pItem->SetState(ITEM_REMOVED, this);
         }
-
         m_items[slot] = NULL;
-
         uint32 eslot = slot - BUYBACK_SLOT_START;
         SetUInt64Value( PLAYER_FIELD_VENDORBUYBACK_SLOT_1 + (eslot * 2), 0 );
         SetUInt32Value( PLAYER_FIELD_BUYBACK_PRICE_1 + eslot, 0 );
         SetUInt32Value( PLAYER_FIELD_BUYBACK_TIMESTAMP_1 + eslot, 0 );
-
         // if current backslot is filled set to now free slot
         if(m_items[m_currentBuybackSlot])
             m_currentBuybackSlot = slot;
     }
 }
-
 void Player::SendEquipError( uint8 msg, Item* pItem, Item *pItem2 )
 {
     sLog.outDebug( "WORLD: Sent SMSG_INVENTORY_CHANGE_FAILURE (%u)", msg);
     WorldPacket data(SMSG_INVENTORY_CHANGE_FAILURE, (msg == EQUIP_ERR_CANT_EQUIP_LEVEL_I ? 22 : 18));
     data << uint8(msg);
-
     if (msg != EQUIP_ERR_OK)
     {
         data << uint64(pItem ? pItem->GetGUID() : 0);
         data << uint64(pItem2 ? pItem2->GetGUID() : 0);
         data << uint8(0);                                   // not 0 there...
-
         if (msg == EQUIP_ERR_CANT_EQUIP_LEVEL_I)
         {
             uint32 level = 0;
-
             if (pItem)
                 if (ItemPrototype const* proto =  pItem->GetProto())
                     level = proto->RequiredLevel;
-
             data << uint32(level);                          // new 2.4.0
         }
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendBuyError( uint8 msg, Creature* pCreature, uint32 item, uint32 param )
 {
     sLog.outDebug( "WORLD: Sent SMSG_BUY_FAILED" );
@@ -12109,7 +10303,6 @@ void Player::SendBuyError( uint8 msg, Creature* pCreature, uint32 item, uint32 p
     data << uint8(msg);
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendSellError( uint8 msg, Creature* pCreature, uint64 guid, uint32 param )
 {
     sLog.outDebug( "WORLD: Sent SMSG_SELL_ITEM" );
@@ -12121,7 +10314,6 @@ void Player::SendSellError( uint8 msg, Creature* pCreature, uint64 guid, uint32
     data << uint8(msg);
     GetSession()->SendPacket(&data);
 }
-
 void Player::ClearTrade()
 {
     tradeGold = 0;
@@ -12129,7 +10321,6 @@ void Player::ClearTrade()
     for(uint8 i = 0; i < TRADE_SLOT_COUNT; i++)
         tradeItems[i] = NULL_SLOT;
 }
-
 void Player::TradeCancel(bool sendback)
 {
     if (pTrader)
@@ -12142,7 +10333,6 @@ void Player::TradeCancel(bool sendback)
         ws = pTrader->GetSession();
         if (!ws->PlayerLogout())
             ws->SendCancelTrade();
-
         // cleanup
         ClearTrade();
         pTrader->ClearTrade();
@@ -12151,24 +10341,19 @@ void Player::TradeCancel(bool sendback)
         pTrader = NULL;
     }
 }
-
 void Player::UpdateItemDuration(uint32 time, bool realtimeonly)
 {
     if (m_itemDuration.empty())
         return;
-
     sLog.outDebug("Player::UpdateItemDuration(%u,%u)", time, realtimeonly);
-
     for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); )
     {
         Item* item = *itr;
         ++itr;                                              // current element can be erased in UpdateDuration
-
         if ((realtimeonly && item->GetProto()->Duration < 0) || !realtimeonly)
             item->UpdateDuration(this,time);
     }
 }
-
 void Player::UpdateEnchantTime(uint32 time)
 {
     for(EnchantDurationList::iterator itr = m_enchantDuration.begin(),next;itr != m_enchantDuration.end();itr=next)
@@ -12192,20 +10377,17 @@ void Player::UpdateEnchantTime(uint32 time)
         }
     }
 }
-
 void Player::AddEnchantmentDurations(Item *item)
 {
     for(int x = 0; x < MAX_ENCHANTMENT_SLOT; ++x)
     {
         if (!item->GetEnchantmentId(EnchantmentSlot(x)))
             continue;
-
         uint32 duration = item->GetEnchantmentDuration(EnchantmentSlot(x));
         if (duration > 0)
             AddEnchantmentDuration(item, EnchantmentSlot(x), duration);
     }
 }
-
 void Player::RemoveEnchantmentDurations(Item *item)
 {
     for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end();)
@@ -12220,7 +10402,6 @@ void Player::RemoveEnchantmentDurations(Item *item)
             ++itr;
     }
 }
-
 void Player::RemoveArenaEnchantments(EnchantmentSlot slot)
 {
     // remove enchantments from equipped items first to clean up the m_enchantDuration list
@@ -12248,7 +10429,6 @@ void Player::RemoveArenaEnchantments(EnchantmentSlot slot)
         else
             ++next;
     }
-
     // remove enchants from inventory items
     // NOTE: no need to remove these from stats, since these aren't equipped
     // in inventory
@@ -12256,7 +10436,6 @@ void Player::RemoveArenaEnchantments(EnchantmentSlot slot)
         if (Item* pItem = GetItemByPos(INVENTORY_SLOT_BAG_0, i))
             if (pItem->GetEnchantmentId(slot))
                 pItem->ClearEnchantment(slot);
-
     // in inventory bags
     for(uint8 i = INVENTORY_SLOT_BAG_START; i < INVENTORY_SLOT_BAG_END; ++i)
         if (Bag* pBag = (Bag*)GetItemByPos( INVENTORY_SLOT_BAG_0, i ))
@@ -12265,16 +10444,13 @@ void Player::RemoveArenaEnchantments(EnchantmentSlot slot)
                     if (pItem->GetEnchantmentId(slot))
                         pItem->ClearEnchantment(slot);
 }
-
 // duration == 0 will remove item enchant
 void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 duration)
 {
     if (!item)
         return;
-
     if (slot >= MAX_ENCHANTMENT_SLOT)
         return;
-
     for(EnchantDurationList::iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
     {
         if (itr->item == item && itr->slot == slot)
@@ -12290,35 +10466,27 @@ void Player::AddEnchantmentDuration(Item *item,EnchantmentSlot slot,uint32 durat
         m_enchantDuration.push_back(EnchantDuration(item, slot, duration));
     }
 }
-
 void Player::ApplyEnchantment(Item *item,bool apply)
 {
     for(uint32 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot)
         ApplyEnchantment(item, EnchantmentSlot(slot), apply);
 }
-
 void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool apply_dur, bool ignore_condition)
 {
     if (!item)
         return;
-
     if (!item->IsEquipped())
         return;
-
     if (slot >= MAX_ENCHANTMENT_SLOT)
         return;
-
     uint32 enchant_id = item->GetEnchantmentId(slot);
     if (!enchant_id)
         return;
-
     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
     if (!pEnchant)
         return;
-
     if (!ignore_condition && pEnchant->EnchantmentCondition && !((Player*)this)->EnchantmentFitsRequirements(pEnchant->EnchantmentCondition, -1))
         return;
-
     if (!item->IsBroken())
     {
         for (int s = 0; s < 3; ++s)
@@ -12326,7 +10494,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
             uint32 enchant_display_type = pEnchant->type[s];
             uint32 enchant_amount = pEnchant->amount[s];
             uint32 enchant_spell_id = pEnchant->spellid[s];
-
             switch(enchant_display_type)
             {
                 case ITEM_ENCHANTMENT_TYPE_NONE:
@@ -12391,7 +10558,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                             }
                         }
                     }
-
                     HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + enchant_spell_id), TOTAL_VALUE, float(enchant_amount), apply);
                     break;
                 case ITEM_ENCHANTMENT_TYPE_STAT:
@@ -12411,7 +10577,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
                             }
                         }
                     }
-
                     sLog.outDebug("Adding %u to stat nb %u",enchant_amount,enchant_spell_id);
                     switch (enchant_spell_id)
                     {
@@ -12618,15 +10783,12 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
             }                                               /*switch(enchant_display_type)*/
         }                                                   /*for*/
     }
-
     // visualize enchantment at player and equipped items
     if(slot == PERM_ENCHANTMENT_SLOT)
         SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (item->GetSlot() * 2), 0, apply ? item->GetEnchantmentId(slot) : 0);
-
     if(slot == TEMP_ENCHANTMENT_SLOT)
         SetUInt16Value(PLAYER_VISIBLE_ITEM_1_ENCHANTMENT + (item->GetSlot() * 2), 1, apply ? item->GetEnchantmentId(slot) : 0);
 
-
     if(apply_dur)
     {
         if(apply)
@@ -12643,7 +10805,6 @@ void Player::ApplyEnchantment(Item *item, EnchantmentSlot slot, bool apply, bool
         }
     }
 }
-
 void Player::SendEnchantmentDurations()
 {
     for(EnchantDurationList::const_iterator itr = m_enchantDuration.begin(); itr != m_enchantDuration.end(); ++itr)
@@ -12651,7 +10812,6 @@ void Player::SendEnchantmentDurations()
         GetSession()->SendItemEnchantTimeUpdate(GetGUID(), itr->item->GetGUID(), itr->slot, uint32(itr->leftduration) / 1000);
     }
 }
-
 void Player::SendItemDurations()
 {
     for(ItemDurationList::const_iterator itr = m_itemDuration.begin(); itr != m_itemDuration.end(); ++itr)
@@ -12659,12 +10819,10 @@ void Player::SendItemDurations()
         (*itr)->SendTimeUpdate(this);
     }
 }
-
 void Player::SendNewItem(Item *item, uint32 count, bool received, bool created, bool broadcast)
 {
     if(!item)                                               // prevent crash
         return;
-
                                                             // last check 2.0.10
     WorldPacket data( SMSG_ITEM_PUSH_RESULT, (8+4+4+4+1+4+4+4+4+4) );
     data << uint64(GetGUID());                              // player GUID
@@ -12679,23 +10837,19 @@ void Player::SendNewItem(Item *item, uint32 count, bool received, bool created,
     data << uint32(item->GetItemRandomPropertyId());        // random item property id
     data << uint32(count);                                  // count of items
     data << uint32(GetItemCount(item->GetEntry()));         // count of items in inventory
-
     if (broadcast && GetGroup())
         GetGroup()->BroadcastPacket(&data, true);
     else
         GetSession()->SendPacket(&data);
 }
-
 /*********************************************************/
 /***                    QUEST SYSTEM                   ***/
 /*********************************************************/
-
 void Player::PrepareQuestMenu( uint64 guid )
 {
     Object *pObject;
     QuestRelations* pObjectQR;
     QuestRelations* pObjectQIR;
-
     // pets also can have quests
     Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, guid);
     if( pCreature )
@@ -12720,10 +10874,8 @@ void Player::PrepareQuestMenu( uint64 guid )
         else
             return;
     }
-
     QuestMenu &qm = PlayerTalkClass->GetQuestMenu();
     qm.ClearMenu();
-
     for(QuestRelations::const_iterator i = pObjectQIR->lower_bound(pObject->GetEntry()); i != pObjectQIR->upper_bound(pObject->GetEntry()); ++i)
     {
         uint32 quest_id = i->second;
@@ -12735,39 +10887,31 @@ void Player::PrepareQuestMenu( uint64 guid )
         //else if (status == QUEST_STATUS_AVAILABLE )
         //    qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT);
     }
-
     for(QuestRelations::const_iterator i = pObjectQR->lower_bound(pObject->GetEntry()); i != pObjectQR->upper_bound(pObject->GetEntry()); ++i)
     {
         uint32 quest_id = i->second;
         Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
         if(!pQuest) continue;
-
         QuestStatus status = GetQuestStatus( quest_id );
-
         if (pQuest->IsAutoComplete() && CanTakeQuest(pQuest, false))
             qm.AddMenuItem(quest_id, DIALOG_STATUS_UNK2);
         else if ( status == QUEST_STATUS_NONE && CanTakeQuest( pQuest, false ) )
             qm.AddMenuItem(quest_id, DIALOG_STATUS_CHAT);
     }
 }
-
 void Player::SendPreparedQuest(uint64 guid)
 {
     QuestMenu& questMenu = PlayerTalkClass->GetQuestMenu();
     if (questMenu.Empty())
         return;
-
     QuestMenuItem const& qmi0 = questMenu.GetItem(0);
-
     uint32 status = qmi0.m_qIcon;
-
     // single element case
     if (questMenu.MenuItemCount() == 1)
     {
         // Auto open -- maybe also should verify there is no greeting
         uint32 quest_id = qmi0.m_qId;
         Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
-
         if (pQuest)
         {
             if (status == DIALOG_STATUS_UNK2 && !GetQuestRewardStatus(quest_id))
@@ -12789,7 +10933,6 @@ void Player::SendPreparedQuest(uint64 guid)
         qe._Delay = 0;
         qe._Emote = 0;
         std::string title = "";
-
         // need pet case for some quests
         Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid);
         if (pCreature)
@@ -12805,11 +10948,9 @@ void Player::SendPreparedQuest(uint64 guid)
             else
             {
                 qe = gossiptext->Options[0].Emotes[0];
-
                 if(!gossiptext->Options[0].Text_0.empty())
                 {
                     title = gossiptext->Options[0].Text_0;
-
                     int loc_idx = GetSession()->GetSessionDbLocaleIndex();
                     if (loc_idx >= 0)
                     {
@@ -12824,7 +10965,6 @@ void Player::SendPreparedQuest(uint64 guid)
                 else
                 {
                     title = gossiptext->Options[0].Text_1;
-
                     int loc_idx = GetSession()->GetSessionDbLocaleIndex();
                     if (loc_idx >= 0)
                     {
@@ -12841,20 +10981,16 @@ void Player::SendPreparedQuest(uint64 guid)
         PlayerTalkClass->SendQuestGiverQuestList(qe, title, guid);
     }
 }
-
 bool Player::IsActiveQuest( uint32 quest_id ) const
 {
     QuestStatusMap::const_iterator itr = mQuestStatus.find(quest_id);
-
     return itr != mQuestStatus.end() && itr->second.m_status != QUEST_STATUS_NONE;
 }
-
 Quest const * Player::GetNextQuest( uint64 guid, Quest const *pQuest )
 {
     Object *pObject;
     QuestRelations* pObjectQR;
     QuestRelations* pObjectQIR;
-
     Creature *pCreature = ObjectAccessor::GetCreatureOrPetOrVehicle(*this,guid);
     if( pCreature )
     {
@@ -12878,17 +11014,14 @@ Quest const * Player::GetNextQuest( uint64 guid, Quest const *pQuest )
         else
             return NULL;
     }
-
     uint32 nextQuestID = pQuest->GetNextQuestInChain();
     for(QuestRelations::const_iterator itr = pObjectQR->lower_bound(pObject->GetEntry()); itr != pObjectQR->upper_bound(pObject->GetEntry()); ++itr)
     {
         if (itr->second == nextQuestID)
             return objmgr.GetQuestTemplate(nextQuestID);
     }
-
     return NULL;
 }
-
 bool Player::CanSeeStartQuest( Quest const *pQuest )
 {
     if( SatisfyQuestRace( pQuest, false ) && SatisfyQuestSkillOrClass( pQuest, false ) &&
@@ -12898,10 +11031,8 @@ bool Player::CanSeeStartQuest( Quest const *pQuest )
     {
         return getLevel() + sWorld.getConfig(CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF) >= pQuest->GetMinLevel();
     }
-
     return false;
 }
-
 bool Player::CanTakeQuest( Quest const *pQuest, bool msg )
 {
     return SatisfyQuestStatus( pQuest, msg ) && SatisfyQuestExclusiveGroup( pQuest, msg )
@@ -12911,19 +11042,16 @@ bool Player::CanTakeQuest( Quest const *pQuest, bool msg )
         && SatisfyQuestNextChain( pQuest, msg ) && SatisfyQuestPrevChain( pQuest, msg )
         && SatisfyQuestDay( pQuest, msg );
 }
-
 bool Player::CanAddQuest( Quest const *pQuest, bool msg )
 {
     if( !SatisfyQuestLog( msg ) )
         return false;
-
     uint32 srcitem = pQuest->GetSrcItemId();
     if( srcitem > 0 )
     {
         uint32 count = pQuest->GetSrcItemCount();
         ItemPosCountVec dest;
         uint8 msg2 = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, srcitem, count );
-
         // player already have max number (in most case 1) source item, no additional item needed and quest can be added.
         if( msg2 == EQUIP_ERR_CANT_CARRY_MORE_OF_THIS )
             return true;
@@ -12935,7 +11063,6 @@ bool Player::CanAddQuest( Quest const *pQuest, bool msg )
     }
     return true;
 }
-
 bool Player::CanCompleteQuest( uint32 quest_id )
 {
     if( quest_id )
@@ -12943,19 +11070,14 @@ bool Player::CanCompleteQuest( uint32 quest_id )
         QuestStatusData& q_status = mQuestStatus[quest_id];
         if( q_status.m_status == QUEST_STATUS_COMPLETE )
             return false;                                   // not allow re-complete quest
-
         Quest const* qInfo = objmgr.GetQuestTemplate(quest_id);
-
         if(!qInfo)
             return false;
-
         // auto complete quest
         if (qInfo->IsAutoComplete() && CanTakeQuest(qInfo, false))
             return true;
-
         if ( q_status.m_status == QUEST_STATUS_INCOMPLETE )
         {
-
             if ( qInfo->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
             {
                 for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
@@ -12964,41 +11086,33 @@ bool Player::CanCompleteQuest( uint32 quest_id )
                         return false;
                 }
             }
-
             if ( qInfo->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO) )
             {
                 for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
                 {
                     if( qInfo->ReqCreatureOrGOId[i] == 0 )
                         continue;
-
                     if( qInfo->ReqCreatureOrGOCount[i] != 0 && q_status.m_creatureOrGOcount[i] < qInfo->ReqCreatureOrGOCount[i] )
                         return false;
                 }
             }
-
             if ( qInfo->HasFlag( QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT ) && !q_status.m_explored )
                 return false;
-
             if ( qInfo->HasFlag( QUEST_TRINITY_FLAGS_TIMED ) && q_status.m_timer == 0 )
                 return false;
-
             if ( qInfo->GetRewOrReqMoney() < 0 )
             {
                 if ( GetMoney() < uint32(-qInfo->GetRewOrReqMoney()) )
                     return false;
             }
-
             uint32 repFacId = qInfo->GetRepObjectiveFaction();
             if ( repFacId && GetReputationMgr().GetReputation(repFacId) < qInfo->GetRepObjectiveValue() )
                 return false;
-
             return true;
         }
     }
     return false;
 }
-
 bool Player::CanCompleteRepeatableQuest( Quest const *pQuest )
 {
     // Solve problem that player don't have the quest and try complete it.
@@ -13006,32 +11120,25 @@ bool Player::CanCompleteRepeatableQuest( Quest const *pQuest )
     // Seem that all repeatable quest are DELIVER Flag so, no need to add more.
     if( !CanTakeQuest(pQuest, false) )
         return false;
-
     if (pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER) )
         for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++)
             if( pQuest->ReqItemId[i] && pQuest->ReqItemCount[i] && !HasItemCount(pQuest->ReqItemId[i],pQuest->ReqItemCount[i]) )
                 return false;
-
     if( !CanRewardQuest(pQuest, false) )
         return false;
-
     return true;
 }
-
 bool Player::CanRewardQuest( Quest const *pQuest, bool msg )
 {
     // not auto complete quest and not completed quest (only cheating case, then ignore without message)
     if(!pQuest->IsAutoComplete() && GetQuestStatus(pQuest->GetQuestId()) != QUEST_STATUS_COMPLETE)
         return false;
-
     // daily quest can't be rewarded (25 daily quest already completed)
     if(!SatisfyQuestDay(pQuest,true))
         return false;
-
     // rewarded and not repeatable quest (only cheating case, then ignore without message)
     if(GetQuestRewardStatus(pQuest->GetQuestId()))
         return false;
-
     // prevent receive reward with quest items in bank
     if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
     {
@@ -13046,20 +11153,16 @@ bool Player::CanRewardQuest( Quest const *pQuest, bool msg )
             }
         }
     }
-
     // prevent receive reward with low money and GetRewOrReqMoney() < 0
     if(pQuest->GetRewOrReqMoney() < 0 && GetMoney() < uint32(-pQuest->GetRewOrReqMoney()) )
         return false;
-
     return true;
 }
-
 bool Player::CanRewardQuest( Quest const *pQuest, uint32 reward, bool msg )
 {
     // prevent receive reward with quest items in bank or for not completed quest
     if(!CanRewardQuest(pQuest,msg))
         return false;
-
     if ( pQuest->GetRewChoiceItemsCount() > 0 )
     {
         if( pQuest->RewChoiceItemId[reward] )
@@ -13073,7 +11176,6 @@ bool Player::CanRewardQuest( Quest const *pQuest, uint32 reward, bool msg )
             }
         }
     }
-
     if ( pQuest->GetRewItemsCount() > 0 )
     {
         for (uint32 i = 0; i < pQuest->GetRewItemsCount(); ++i)
@@ -13090,94 +11192,73 @@ bool Player::CanRewardQuest( Quest const *pQuest, uint32 reward, bool msg )
             }
         }
     }
-
     return true;
 }
-
 void Player::AddQuest( Quest const *pQuest, Object *questGiver )
 {
     uint16 log_slot = FindQuestSlot( 0 );
     assert(log_slot < MAX_QUEST_LOG_SIZE);
-
     uint32 quest_id = pQuest->GetQuestId();
-
     // if not exist then created with set uState==NEW and rewarded=false
     QuestStatusData& questStatusData = mQuestStatus[quest_id];
-
     // check for repeatable quests status reset
     questStatusData.m_status = QUEST_STATUS_INCOMPLETE;
     questStatusData.m_explored = false;
-
     if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
     {
         for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
             questStatusData.m_itemcount[i] = 0;
     }
-
     if ( pQuest->HasFlag(QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO) )
     {
         for(uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
             questStatusData.m_creatureOrGOcount[i] = 0;
     }
-
     GiveQuestSourceItem( pQuest );
     AdjustQuestReqItemCount( pQuest, questStatusData );
-
     if( pQuest->GetRepObjectiveFaction() )
         if(FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->GetRepObjectiveFaction()))
             GetReputationMgr().SetVisible(factionEntry);
-
     uint32 qtime = 0;
     if( pQuest->HasFlag( QUEST_TRINITY_FLAGS_TIMED ) )
     {
         uint32 limittime = pQuest->GetLimitTime();
-
         // shared timed quest
         if(questGiver && questGiver->GetTypeId()==TYPEID_PLAYER)
             limittime = ((Player*)questGiver)->getQuestStatusMap()[quest_id].m_timer / IN_MILISECONDS;
-
         AddTimedQuest( quest_id );
         questStatusData.m_timer = limittime * IN_MILISECONDS;
         qtime = static_cast<uint32>(time(NULL)) + limittime;
     }
     else
         questStatusData.m_timer = 0;
-
     SetQuestSlot(log_slot, quest_id, qtime);
-
     if (questStatusData.uState != QUEST_NEW)
         questStatusData.uState = QUEST_CHANGED;
-
     //starting initial quest script
     if(questGiver && pQuest->GetQuestStartScript()!=0)
         GetMap()->ScriptsStart(sQuestStartScripts, pQuest->GetQuestStartScript(), questGiver, this);
-
     // Some spells applied at quest activation
     SpellAreaForQuestMapBounds saBounds = spellmgr.GetSpellAreaForQuestMapBounds(quest_id,true);
     if(saBounds.first != saBounds.second)
     {
         uint32 zone, area;
         GetZoneAndAreaId(zone,area);
-
         for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
             if(itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area))
                 if( !HasAura(itr->second->spellId) )
                     CastSpell(this,itr->second->spellId,true);
     }
-
     UpdateForQuestWorldObjects();
 }
-
 void Player::CompleteQuest( uint32 quest_id )
 {
     if( quest_id )
     {
         SetQuestStatus( quest_id, QUEST_STATUS_COMPLETE );
-
         uint16 log_slot = FindQuestSlot( quest_id );
         if( log_slot < MAX_QUEST_LOG_SIZE)
             SetQuestSlotState(log_slot,QUEST_STATE_COMPLETE);
-
         if(Quest const* qInfo = objmgr.GetQuestTemplate(quest_id))
         {
             if( qInfo->HasFlag(QUEST_FLAGS_AUTO_REWARDED) )
@@ -13187,35 +11268,28 @@ void Player::CompleteQuest( uint32 quest_id )
         }
     }
 }
-
 void Player::IncompleteQuest( uint32 quest_id )
 {
     if( quest_id )
     {
         SetQuestStatus( quest_id, QUEST_STATUS_INCOMPLETE );
-
         uint16 log_slot = FindQuestSlot( quest_id );
         if( log_slot < MAX_QUEST_LOG_SIZE)
             RemoveQuestSlotState(log_slot,QUEST_STATE_COMPLETE);
     }
 }
-
 void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver, bool announce )
 {
     //this THING should be here to protect code from quest, which cast on player far teleport as a reward
     //should work fine, cause far teleport will be executed in Player::Update()
     SetCanDelayTeleport(true);
-
     uint32 quest_id = pQuest->GetQuestId();
-
     for (uint8 i = 0; i < QUEST_OBJECTIVES_COUNT; i++ )
     {
         if (pQuest->ReqItemId[i])
             DestroyItemCount( pQuest->ReqItemId[i], pQuest->ReqItemCount[i], true);
     }
-
     TakeQuestSourceItem(quest_id, true); // take quest src item from player on completing quest
-
     for(uint8 i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
     {
         if (pQuest->ReqSourceId[i])
@@ -13224,9 +11298,7 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
             DestroyItemCount(pQuest->ReqSourceId[i], count ? count : 9999, true);
         }
     }
-
     RemoveTimedQuest(quest_id);
-
     if (pQuest->GetRewChoiceItemsCount() > 0)
     {
         if (uint32 itemId = pQuest->RewChoiceItemId[reward])
@@ -13239,7 +11311,6 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
             }
         }
     }
-
     if (pQuest->GetRewItemsCount() > 0)
     {
         for (uint32 i=0; i < pQuest->GetRewItemsCount(); ++i)
@@ -13255,23 +11326,17 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
             }
         }
     }
-
     RewardReputation( pQuest );
-
     uint16 log_slot = FindQuestSlot( quest_id );
     if (log_slot < MAX_QUEST_LOG_SIZE)
         SetQuestSlot(log_slot,0);
-
     QuestStatusData& q_status = mQuestStatus[quest_id];
-
     // Not give XP in case already completed once repeatable quest
     uint32 XP = q_status.m_rewarded ? 0 : uint32(pQuest->XPValue( this )*sWorld.getRate(RATE_XP_QUEST));
-
     // handle SPELL_AURA_MOD_XP_QUEST_PCT auras
     Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_QUEST_PCT);
     for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
         XP = uint32(XP*(1.0f + (*i)->GetAmount() / 100.0f));
-
     if (getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         GiveXP( XP , NULL );
     else
@@ -13280,33 +11345,27 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
         ModifyMoney( money );
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, money);
     }
-
     // Give player extra money if GetRewOrReqMoney > 0 and get ReqMoney if negative
     if (pQuest->GetRewOrReqMoney())
     {
         ModifyMoney( pQuest->GetRewOrReqMoney() );
-
         if (pQuest->GetRewOrReqMoney() > 0)
             GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_MONEY_FROM_QUEST_REWARD, pQuest->GetRewOrReqMoney());
     }
-
     // honor reward
     if (pQuest->GetRewHonorableKills())
         RewardHonor(NULL, 0, MaNGOS::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills()));
-
     // title reward
     if (pQuest->GetCharTitleId())
     {
         if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId()))
             SetTitle(titleEntry);
     }
-
     if (pQuest->GetBonusTalents())
     {
         m_questRewardTalentCount+=pQuest->GetBonusTalents();
         InitTalentForLevel();
     }
-
     // Send reward mail
     if (pQuest->GetRewMailTemplateId())
     {
@@ -13335,14 +11394,10 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
                 senderGuidOrEntry = GetGUIDLow();
                 break;
         }
-
         Loot questMailLoot;
-
         questMailLoot.FillLoot(pQuest->GetQuestId(), LootTemplates_QuestMail, this,true);
-
         // fill mail
         MailItemsInfo mi;                                   // item list preparing
-
         uint32 max_slot = questMailLoot.GetMaxSlotInLootFor(this);
         for(uint32 i = 0; mi.size() < MAX_MAIL_ITEMS && i < max_slot; ++i)
         {
@@ -13355,110 +11410,87 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
                 }
             }
         }
-
         WorldSession::SendMailTo(this, mailType, MAIL_STATIONERY_NORMAL, senderGuidOrEntry, GetGUIDLow(), "", 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE,pQuest->GetRewMailDelaySecs(),pQuest->GetRewMailTemplateId());
     }
-
     if (pQuest->IsDaily())
     {
         SetDailyQuestStatus(quest_id);
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_DAILY_QUEST, 1);
     }
-
     if (!pQuest->IsRepeatable())
         SetQuestStatus(quest_id, QUEST_STATUS_COMPLETE);
     else
         SetQuestStatus(quest_id, QUEST_STATUS_NONE);
-
     q_status.m_rewarded = true;
     if (q_status.uState != QUEST_NEW)
         q_status.uState = QUEST_CHANGED;
-
     if (announce)
         SendQuestReward( pQuest, XP, questGiver );
-
     // cast spells after mark quest complete (some spells have quest completed state reqyurements in spell_area data)
     if (pQuest->GetRewSpellCast() > 0)
         CastSpell( this, pQuest->GetRewSpellCast(), true);
     else if ( pQuest->GetRewSpell() > 0)
         CastSpell( this, pQuest->GetRewSpell(), true);
-
     if (pQuest->GetZoneOrSort() > 0)
         GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUESTS_IN_ZONE, pQuest->GetZoneOrSort());
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST_COUNT);
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_COMPLETE_QUEST, pQuest->GetQuestId());
-
     uint32 zone = 0;
     uint32 area = 0;
-
     // remove auras from spells with quest reward state limitations
     SpellAreaForQuestMapBounds saEndBounds = spellmgr.GetSpellAreaForQuestEndMapBounds(quest_id);
     if(saEndBounds.first != saEndBounds.second)
     {
         GetZoneAndAreaId(zone,area);
-
         for(SpellAreaForAreaMap::const_iterator itr = saEndBounds.first; itr != saEndBounds.second; ++itr)
             if(!itr->second->IsFitToRequirements(this,zone,area))
                 RemoveAurasDueToSpell(itr->second->spellId);
     }
-
     // Some spells applied at quest reward
     SpellAreaForQuestMapBounds saBounds = spellmgr.GetSpellAreaForQuestMapBounds(quest_id,false);
     if(saBounds.first != saBounds.second)
     {
         if(!zone || !area)
             GetZoneAndAreaId(zone,area);
-
         for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
             if(itr->second->autocast && itr->second->IsFitToRequirements(this,zone,area))
                 if( !HasAura(itr->second->spellId) )
                     CastSpell(this,itr->second->spellId,true);
     }
-
     //lets remove flag for delayed teleports
     SetCanDelayTeleport(false);
 }
-
 void Player::FailQuest(uint32 questId)
 {
     if (Quest const* pQuest = objmgr.GetQuestTemplate(questId))
     {
         SetQuestStatus(questId, QUEST_STATUS_FAILED);
-
         uint16 log_slot = FindQuestSlot(questId);
-
         if (log_slot < MAX_QUEST_LOG_SIZE)
         {
             SetQuestSlotTimer(log_slot, 1);
             SetQuestSlotState(log_slot, QUEST_STATE_FAIL);
         }
-
         if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_TIMED))
         {
             QuestStatusData& q_status = mQuestStatus[questId];
-
             RemoveTimedQuest(questId);
             q_status.m_timer = 0;
-
             SendQuestTimerFailed(questId);
         }
         else
             SendQuestFailed(questId);
     }
 }
-
 bool Player::SatisfyQuestSkillOrClass( Quest const* qInfo, bool msg )
 {
     int32 zoneOrSort   = qInfo->GetZoneOrSort();
     int32 skillOrClass = qInfo->GetSkillOrClass();
-
     // skip zone zoneOrSort and 0 case skillOrClass
     if( zoneOrSort >= 0 && skillOrClass == 0 )
         return true;
-
     int32 questSort = -zoneOrSort;
     uint8 reqSortClass = ClassByQuestSort(questSort);
-
     // check class sort cases in zoneOrSort
     if( reqSortClass != 0 && getClass() != reqSortClass)
     {
@@ -13466,7 +11498,6 @@ bool Player::SatisfyQuestSkillOrClass( Quest const* qInfo, bool msg )
             SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
         return false;
     }
-
     // check class
     if( skillOrClass < 0 )
     {
@@ -13489,10 +11520,8 @@ bool Player::SatisfyQuestSkillOrClass( Quest const* qInfo, bool msg )
             return false;
         }
     }
-
     return true;
 }
-
 bool Player::SatisfyQuestLevel( Quest const* qInfo, bool msg )
 {
     if( getLevel() < qInfo->GetMinLevel() )
@@ -13503,13 +11532,11 @@ bool Player::SatisfyQuestLevel( Quest const* qInfo, bool msg )
     }
     return true;
 }
-
 bool Player::SatisfyQuestLog( bool msg )
 {
     // exist free slot
     if( FindQuestSlot(0) < MAX_QUEST_LOG_SIZE )
         return true;
-
     if( msg )
     {
         WorldPacket data( SMSG_QUESTLOG_FULL, 0 );
@@ -13518,20 +11545,16 @@ bool Player::SatisfyQuestLog( bool msg )
     }
     return false;
 }
-
 bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg )
 {
     // No previous quest (might be first quest in a series)
     if( qInfo->prevQuests.empty())
         return true;
-
     for(Quest::PrevQuests::const_iterator iter = qInfo->prevQuests.begin(); iter != qInfo->prevQuests.end(); ++iter )
     {
         uint32 prevId = abs(*iter);
-
         QuestStatusMap::iterator i_prevstatus = mQuestStatus.find( prevId );
         Quest const* qPrevInfo = objmgr.GetQuestTemplate(prevId);
-
         if( qPrevInfo && i_prevstatus != mQuestStatus.end() )
         {
             // If any of the positive previous quests completed, return true
@@ -13540,24 +11563,18 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg )
                 // skip one-from-all exclusive group
                 if(qPrevInfo->GetExclusiveGroup() >= 0)
                     return true;
-
                 // each-from-all exclusive group ( < 0)
                 // can be start if only all quests in prev quest exclusive group completed and rewarded
                 ObjectMgr::ExclusiveQuestGroups::iterator iter2 = objmgr.mExclusiveQuestGroups.lower_bound(qPrevInfo->GetExclusiveGroup());
                 ObjectMgr::ExclusiveQuestGroups::iterator end  = objmgr.mExclusiveQuestGroups.upper_bound(qPrevInfo->GetExclusiveGroup());
-
                 assert(iter2!=end);                         // always must be found if qPrevInfo->ExclusiveGroup != 0
-
                 for(; iter2 != end; ++iter2)
                 {
                     uint32 exclude_Id = iter2->second;
-
                     // skip checked quest id, only state of other quests in group is interesting
                     if(exclude_Id == prevId)
                         continue;
-
                     QuestStatusMap::iterator i_exstatus = mQuestStatus.find( exclude_Id );
-
                     // alternative quest from group also must be completed and rewarded(reported)
                     if( i_exstatus == mQuestStatus.end() || !i_exstatus->second.m_rewarded )
                     {
@@ -13575,24 +11592,18 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg )
                 // skip one-from-all exclusive group
                 if(qPrevInfo->GetExclusiveGroup() >= 0)
                     return true;
-
                 // each-from-all exclusive group ( < 0)
                 // can be start if only all quests in prev quest exclusive group active
                 ObjectMgr::ExclusiveQuestGroups::iterator iter2 = objmgr.mExclusiveQuestGroups.lower_bound(qPrevInfo->GetExclusiveGroup());
                 ObjectMgr::ExclusiveQuestGroups::iterator end  = objmgr.mExclusiveQuestGroups.upper_bound(qPrevInfo->GetExclusiveGroup());
-
                 assert(iter2!=end);                         // always must be found if qPrevInfo->ExclusiveGroup != 0
-
                 for(; iter2 != end; ++iter2)
                 {
                     uint32 exclude_Id = iter2->second;
-
                     // skip checked quest id, only state of other quests in group is interesting
                     if(exclude_Id == prevId)
                         continue;
-
                     QuestStatusMap::iterator i_exstatus = mQuestStatus.find( exclude_Id );
-
                     // alternative quest from group also must be active
                     if( i_exstatus == mQuestStatus.end() ||
                         i_exstatus->second.m_status != QUEST_STATUS_INCOMPLETE &&
@@ -13607,15 +11618,12 @@ bool Player::SatisfyQuestPreviousQuest( Quest const* qInfo, bool msg )
             }
         }
     }
-
     // Has only positive prev. quests in non-rewarded state
     // and negative prev. quests in non-active state
     if( msg )
         SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
-
     return false;
 }
-
 bool Player::SatisfyQuestRace( Quest const* qInfo, bool msg )
 {
     uint32 reqraces = qInfo->GetRequiredRaces();
@@ -13629,7 +11637,6 @@ bool Player::SatisfyQuestRace( Quest const* qInfo, bool msg )
     }
     return true;
 }
-
 bool Player::SatisfyQuestReputation( Quest const* qInfo, bool msg )
 {
     uint32 fIdMin = qInfo->GetRequiredMinRepFaction();      //Min required rep
@@ -13639,7 +11646,6 @@ bool Player::SatisfyQuestReputation( Quest const* qInfo, bool msg )
             SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
         return false;
     }
-
     uint32 fIdMax = qInfo->GetRequiredMaxRepFaction();      //Max required rep
     if(fIdMax && GetReputationMgr().GetReputation(fIdMax) >= qInfo->GetRequiredMaxRepValue())
     {
@@ -13647,10 +11653,8 @@ bool Player::SatisfyQuestReputation( Quest const* qInfo, bool msg )
             SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
         return false;
     }
-
     return true;
 }
-
 bool Player::SatisfyQuestStatus( Quest const* qInfo, bool msg )
 {
     QuestStatusMap::iterator itr = mQuestStatus.find( qInfo->GetQuestId() );
@@ -13662,7 +11666,6 @@ bool Player::SatisfyQuestStatus( Quest const* qInfo, bool msg )
     }
     return true;
 }
-
 bool Player::SatisfyQuestTimed(Quest const* qInfo, bool msg)
 {
     if (m_timedquests.empty() && qInfo->HasFlag(QUEST_TRINITY_FLAGS_TIMED))
@@ -13673,26 +11676,20 @@ bool Player::SatisfyQuestTimed(Quest const* qInfo, bool msg)
     }
     return true;
 }
-
 bool Player::SatisfyQuestExclusiveGroup( Quest const* qInfo, bool msg )
 {
     // non positive exclusive group, if > 0 then can be start if any other quest in exclusive group already started/completed
     if(qInfo->GetExclusiveGroup() <= 0)
         return true;
-
     ObjectMgr::ExclusiveQuestGroups::iterator iter = objmgr.mExclusiveQuestGroups.lower_bound(qInfo->GetExclusiveGroup());
     ObjectMgr::ExclusiveQuestGroups::iterator end  = objmgr.mExclusiveQuestGroups.upper_bound(qInfo->GetExclusiveGroup());
-
     assert(iter!=end);                                      // always must be found if qInfo->ExclusiveGroup != 0
-
     for(; iter != end; ++iter)
     {
         uint32 exclude_Id = iter->second;
-
         // skip checked quest id, only state of other quests in group is interesting
         if(exclude_Id == qInfo->GetQuestId())
             continue;
-
         // not allow have daily quest if daily quest from exclusive group already recently completed
         Quest const* Nquest = objmgr.GetQuestTemplate(exclude_Id);
         if( !SatisfyQuestDay(Nquest, false) )
@@ -13701,9 +11698,7 @@ bool Player::SatisfyQuestExclusiveGroup( Quest const* qInfo, bool msg )
                 SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
             return false;
         }
-
         QuestStatusMap::iterator i_exstatus = mQuestStatus.find( exclude_Id );
-
         // alternative quest already started or completed
         if( i_exstatus != mQuestStatus.end()
             && (i_exstatus->second.m_status == QUEST_STATUS_COMPLETE || i_exstatus->second.m_status == QUEST_STATUS_INCOMPLETE) )
@@ -13715,12 +11710,10 @@ bool Player::SatisfyQuestExclusiveGroup( Quest const* qInfo, bool msg )
     }
     return true;
 }
-
 bool Player::SatisfyQuestNextChain( Quest const* qInfo, bool msg )
 {
     if(!qInfo->GetNextQuestInChain())
         return true;
-
     // next quest in chain already started or completed
     QuestStatusMap::iterator itr = mQuestStatus.find( qInfo->GetNextQuestInChain() );
     if( itr != mQuestStatus.end()
@@ -13730,25 +11723,20 @@ bool Player::SatisfyQuestNextChain( Quest const* qInfo, bool msg )
             SendCanTakeQuestResponse( INVALIDREASON_DONT_HAVE_REQ );
         return false;
     }
-
     // check for all quests further up the chain
     // only necessary if there are quest chains with more than one quest that can be skipped
     //return SatisfyQuestNextChain( qInfo->GetNextQuestInChain(), msg );
     return true;
 }
-
 bool Player::SatisfyQuestPrevChain( Quest const* qInfo, bool msg )
 {
     // No previous quest in chain
     if( qInfo->prevChainQuests.empty())
         return true;
-
     for(Quest::PrevChainQuests::const_iterator iter = qInfo->prevChainQuests.begin(); iter != qInfo->prevChainQuests.end(); ++iter )
     {
         uint32 prevId = *iter;
-
         QuestStatusMap::iterator i_prevstatus = mQuestStatus.find( prevId );
-
         if( i_prevstatus != mQuestStatus.end() )
         {
             // If any of the previous quests in chain active, return false
@@ -13760,43 +11748,35 @@ bool Player::SatisfyQuestPrevChain( Quest const* qInfo, bool msg )
                 return false;
             }
         }
-
         // check for all quests further down the chain
         // only necessary if there are quest chains with more than one quest that can be skipped
         //if( !SatisfyQuestPrevChain( prevId, msg ) )
         //    return false;
     }
-
     // No previous quest in chain active
     return true;
 }
-
 bool Player::SatisfyQuestDay( Quest const* qInfo, bool msg )
 {
     if(!qInfo->IsDaily())
         return true;
-
     bool have_slot = false;
     for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
     {
         uint32 id = GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx);
         if(qInfo->GetQuestId()==id)
             return false;
-
         if(!id)
             have_slot = true;
     }
-
     if(!have_slot)
     {
         if( msg )
             SendCanTakeQuestResponse( INVALIDREASON_DAILY_QUESTS_REMAINING );
         return false;
     }
-
     return true;
 }
-
 bool Player::GiveQuestSourceItem( Quest const *pQuest )
 {
     uint32 srcitem = pQuest->GetSrcItemId();
@@ -13805,7 +11785,6 @@ bool Player::GiveQuestSourceItem( Quest const *pQuest )
         uint32 count = pQuest->GetSrcItemCount();
         if( count <= 0 )
             count = 1;
-
         ItemPosCountVec dest;
         uint8 msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, srcitem, count );
         if( msg == EQUIP_ERR_OK )
@@ -13821,10 +11800,8 @@ bool Player::GiveQuestSourceItem( Quest const *pQuest )
             SendEquipError( msg, NULL, NULL );
         return false;
     }
-
     return true;
 }
-
 bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
 {
     Quest const* qInfo = objmgr.GetQuestTemplate(quest_id);
@@ -13836,7 +11813,6 @@ bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
             uint32 count = qInfo->GetSrcItemCount();
             if( count <= 0 )
                 count = 1;
-
             // exist one case when destroy source quest item not possible:
             // non un-equippable item (equipped non-empty bag, for example)
             uint8 res = CanUnequipItems(srcitem,count);
@@ -13846,13 +11822,11 @@ bool Player::TakeQuestSourceItem( uint32 quest_id, bool msg )
                     SendEquipError( res, NULL, NULL );
                 return false;
             }
-
             DestroyItemCount(srcitem, count, true, true);
         }
     }
     return true;
 }
-
 bool Player::GetQuestRewardStatus( uint32 quest_id ) const
 {
     Quest const* qInfo = objmgr.GetQuestTemplate(quest_id);
@@ -13863,12 +11837,10 @@ bool Player::GetQuestRewardStatus( uint32 quest_id ) const
         if( itr != mQuestStatus.end() && itr->second.m_status != QUEST_STATUS_NONE
             && !qInfo->IsRepeatable() )
             return itr->second.m_rewarded;
-
         return false;
     }
     return false;
 }
-
 QuestStatus Player::GetQuestStatus( uint32 quest_id ) const
 {
     if( quest_id )
@@ -13879,7 +11851,6 @@ QuestStatus Player::GetQuestStatus( uint32 quest_id ) const
     }
     return QUEST_STATUS_NONE;
 }
-
 bool Player::CanShareQuest(uint32 quest_id) const
 {
     Quest const* qInfo = objmgr.GetQuestTemplate(quest_id);
@@ -13891,36 +11862,28 @@ bool Player::CanShareQuest(uint32 quest_id) const
     }
     return false;
 }
-
 void Player::SetQuestStatus(uint32 quest_id, QuestStatus status)
 {
     if (Quest const* qInfo = objmgr.GetQuestTemplate(quest_id))
     {
         QuestStatusData& q_status = mQuestStatus[quest_id];
-
         q_status.m_status = status;
-
         if (q_status.uState != QUEST_NEW)
             q_status.uState = QUEST_CHANGED;
     }
-
     UpdateForQuestWorldObjects();
 }
-
 // not used in TrinIty, but used in scripting code
 uint32 Player::GetReqKillOrCastCurrentCount(uint32 quest_id, int32 entry)
 {
     Quest const* qInfo = objmgr.GetQuestTemplate(quest_id);
     if( !qInfo )
         return 0;
-
     for (int j = 0; j < QUEST_OBJECTIVES_COUNT; ++j)
         if ( qInfo->ReqCreatureOrGOId[j] == entry )
             return mQuestStatus[quest_id].m_creatureOrGOcount[j];
-
     return 0;
 }
-
 void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& questStatusData )
 {
     if ( pQuest->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
@@ -13931,23 +11894,19 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques
             if( reqitemcount != 0 )
             {
                 uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i],true);
-
                 questStatusData.m_itemcount[i] = std::min(curitemcount, reqitemcount);
                 if (questStatusData.uState != QUEST_NEW) questStatusData.uState = QUEST_CHANGED;
             }
         }
     }
 }
-
 uint16 Player::FindQuestSlot( uint32 quest_id ) const
 {
     for ( uint16 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
         if ( GetQuestSlotQuestId(i) == quest_id )
             return i;
-
     return MAX_QUEST_LOG_SIZE;
 }
-
 void Player::AreaExploredOrEventHappens( uint32 questId )
 {
     if( questId )
@@ -13956,7 +11915,6 @@ void Player::AreaExploredOrEventHappens( uint32 questId )
         if( log_slot < MAX_QUEST_LOG_SIZE)
         {
             QuestStatusData& q_status = mQuestStatus[questId];
-
             if(!q_status.m_explored)
             {
                 q_status.m_explored = true;
@@ -13968,7 +11926,6 @@ void Player::AreaExploredOrEventHappens( uint32 questId )
             CompleteQuest( questId );
     }
 }
-
 //not used in Trinityd, function for external script library
 void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject )
 {
@@ -13977,7 +11934,6 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player *pGroupGuy = itr->getSource();
-
             // for any leave or dead (with not released body) group member at appropriate distance
             if( pGroupGuy && pGroupGuy->IsAtGroupRewardDistance(pEventObject) && !pGroupGuy->GetCorpse() )
                 pGroupGuy->AreaExploredOrEventHappens(questId);
@@ -13986,7 +11942,6 @@ void Player::GroupEventHappens( uint32 questId, WorldObject const* pEventObject
     else
         AreaExploredOrEventHappens(questId);
 }
-
 void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -13994,16 +11949,12 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
         uint32 questid = GetQuestSlotQuestId(i);
         if ( questid == 0 )
             continue;
-
         QuestStatusData& q_status = mQuestStatus[questid];
-
         if ( q_status.m_status != QUEST_STATUS_INCOMPLETE )
             continue;
-
         Quest const* qInfo = objmgr.GetQuestTemplate(questid);
         if( !qInfo || !qInfo->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
             continue;
-
         for (int j = 0; j < QUEST_OBJECTIVES_COUNT; j++)
         {
             uint32 reqitem = qInfo->ReqItemId[j];
@@ -14016,7 +11967,6 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
                     uint32 additemcount = ( curitemcount + count <= reqitemcount ? count : reqitemcount - curitemcount);
                     q_status.m_itemcount[j] += additemcount;
                     if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
-
                     SendQuestUpdateAddItem( qInfo, j, additemcount );
                 }
                 if ( CanCompleteQuest( questid ) )
@@ -14027,7 +11977,6 @@ void Player::ItemAddedQuestCheck( uint32 entry, uint32 count )
     }
     UpdateForQuestWorldObjects();
 }
-
 void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -14040,14 +11989,12 @@ void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
             continue;
         if( !qInfo->HasFlag( QUEST_TRINITY_FLAGS_DELIVER ) )
             continue;
-
         for (int j = 0; j < QUEST_OBJECTIVES_COUNT; j++)
         {
             uint32 reqitem = qInfo->ReqItemId[j];
             if ( reqitem == entry )
             {
                 QuestStatusData& q_status = mQuestStatus[questid];
-
                 uint32 reqitemcount = qInfo->ReqItemCount[j];
                 uint32 curitemcount;
                 if( q_status.m_status != QUEST_STATUS_COMPLETE )
@@ -14059,7 +12006,6 @@ void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
                     uint32 remitemcount = ( curitemcount <= reqitemcount ? count : count + reqitemcount - curitemcount);
                     q_status.m_itemcount[j] = curitemcount - remitemcount;
                     if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
-
                     IncompleteQuest( questid );
                 }
                 return;
@@ -14068,17 +12014,14 @@ void Player::ItemRemovedQuestCheck( uint32 entry, uint32 count )
     }
     UpdateForQuestWorldObjects();
 }
-
 void Player::KilledMonster( CreatureInfo const* cInfo, uint64 guid )
 {
     if(cInfo->Entry)
         KilledMonsterCredit(cInfo->Entry,guid);
-
     for(int i = 0; i < MAX_KILL_CREDIT; ++i)
         if(cInfo->KillCredit[i])
             KilledMonsterCredit(cInfo->KillCredit[i],guid);
 }
-
 void Player::KilledMonsterCredit( uint32 entry, uint64 guid )
 {
     uint32 addkillcount = 1;
@@ -14088,7 +12031,6 @@ void Player::KilledMonsterCredit( uint32 entry, uint64 guid )
         uint32 questid = GetQuestSlotQuestId(i);
         if(!questid)
             continue;
-
         Quest const* qInfo = objmgr.GetQuestTemplate(questid);
         if( !qInfo )
             continue;
@@ -14103,13 +12045,10 @@ void Player::KilledMonsterCredit( uint32 entry, uint64 guid )
                     // skip GO activate objective or none
                     if(qInfo->ReqCreatureOrGOId[j] <=0)
                         continue;
-
                     // skip Cast at creature objective
                     if(qInfo->ReqSpell[j] !=0 )
                         continue;
-
                     uint32 reqkill = qInfo->ReqCreatureOrGOId[j];
-
                     if ( reqkill == entry )
                     {
                         uint32 reqkillcount = qInfo->ReqCreatureOrGOCount[j];
@@ -14118,12 +12057,10 @@ void Player::KilledMonsterCredit( uint32 entry, uint64 guid )
                         {
                             q_status.m_creatureOrGOcount[j] = curkillcount + addkillcount;
                             if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
-
                             SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, curkillcount, addkillcount);
                         }
                         if ( CanCompleteQuest( questid ) )
                             CompleteQuest( questid );
-
                         // same objective target can be in many active quests, but not in 2 objectives for single quest (code optimization).
                         continue;
                     }
@@ -14132,24 +12069,19 @@ void Player::KilledMonsterCredit( uint32 entry, uint64 guid )
         }
     }
 }
-
 void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
 {
     bool isCreature = IS_CRE_OR_VEH_GUID(guid);
-
     uint32 addCastCount = 1;
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i)
     {
         uint32 questid = GetQuestSlotQuestId(i);
         if(!questid)
             continue;
-
         Quest const* qInfo = objmgr.GetQuestTemplate(questid);
         if ( !qInfo  )
             continue;
-
         QuestStatusData& q_status = mQuestStatus[questid];
-
         if ( q_status.m_status == QUEST_STATUS_INCOMPLETE )
         {
             if( qInfo->HasFlag( QUEST_TRINITY_FLAGS_KILL_OR_CAST ) )
@@ -14159,9 +12091,7 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
                     // skip kill creature objective (0) or wrong spell casts
                     if(qInfo->ReqSpell[j] != spell_id )
                         continue;
-
                     uint32 reqTarget = 0;
-
                     if(isCreature)
                     {
                         // creature activate objectives
@@ -14176,24 +12106,19 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
                             // checked at quest_template loading
                             reqTarget = - qInfo->ReqCreatureOrGOId[j];
                     }
-
                     // other not this creature/GO related objectives
                     if( reqTarget != entry )
                         continue;
-
                     uint32 reqCastCount = qInfo->ReqCreatureOrGOCount[j];
                     uint32 curCastCount = q_status.m_creatureOrGOcount[j];
                     if ( curCastCount < reqCastCount )
                     {
                         q_status.m_creatureOrGOcount[j] = curCastCount + addCastCount;
                         if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
-
                         SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, curCastCount, addCastCount);
                     }
-
                     if ( CanCompleteQuest( questid ) )
                         CompleteQuest( questid );
-
                     // same objective target can be in many active quests, but not in 2 objectives for single quest (code optimization).
                     break;
                 }
@@ -14201,7 +12126,6 @@ void Player::CastedCreatureOrGO( uint32 entry, uint64 guid, uint32 spell_id )
         }
     }
 }
-
 void Player::TalkedToCreature( uint32 entry, uint64 guid )
 {
     uint32 addTalkCount = 1;
@@ -14210,13 +12134,10 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid )
         uint32 questid = GetQuestSlotQuestId(i);
         if(!questid)
             continue;
-
         Quest const* qInfo = objmgr.GetQuestTemplate(questid);
         if ( !qInfo )
             continue;
-
         QuestStatusData& q_status = mQuestStatus[questid];
-
         if ( q_status.m_status == QUEST_STATUS_INCOMPLETE )
         {
             if( qInfo->HasFlag( QUEST_TRINITY_FLAGS_KILL_OR_CAST | QUEST_TRINITY_FLAGS_SPEAKTO ) )
@@ -14226,15 +12147,12 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid )
                                                             // skip spell casts and Gameobject objectives
                     if(qInfo->ReqSpell[j] > 0 || qInfo->ReqCreatureOrGOId[j] < 0)
                         continue;
-
                     uint32 reqTarget = 0;
-
                     if(qInfo->ReqCreatureOrGOId[j] > 0)     // creature activate objectives
                                                             // checked at quest_template loading
                         reqTarget = qInfo->ReqCreatureOrGOId[j];
                     else
                         continue;
-
                     if ( reqTarget == entry )
                     {
                         uint32 reqTalkCount = qInfo->ReqCreatureOrGOCount[j];
@@ -14243,12 +12161,10 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid )
                         {
                             q_status.m_creatureOrGOcount[j] = curTalkCount + addTalkCount;
                             if (q_status.uState != QUEST_NEW) q_status.uState = QUEST_CHANGED;
-
                             SendQuestUpdateAddCreatureOrGo( qInfo, guid, j, curTalkCount, addTalkCount);
                         }
                         if ( CanCompleteQuest( questid ) )
                             CompleteQuest( questid );
-
                         // same objective target can be in many active quests, but not in 2 objectives for single quest (code optimization).
                         continue;
                     }
@@ -14257,7 +12173,6 @@ void Player::TalkedToCreature( uint32 entry, uint64 guid )
         }
     }
 }
-
 void Player::MoneyChanged( uint32 count )
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -14265,12 +12180,10 @@ void Player::MoneyChanged( uint32 count )
         uint32 questid = GetQuestSlotQuestId(i);
         if (!questid)
             continue;
-
         Quest const* qInfo = objmgr.GetQuestTemplate(questid);
         if( qInfo && qInfo->GetRewOrReqMoney() < 0 )
         {
             QuestStatusData& q_status = mQuestStatus[questid];
-
             if( q_status.m_status == QUEST_STATUS_INCOMPLETE )
             {
                 if(int32(count) >= -qInfo->GetRewOrReqMoney())
@@ -14287,7 +12200,6 @@ void Player::MoneyChanged( uint32 count )
         }
     }
 }
-
 void Player::ReputationChanged(FactionEntry const* factionEntry )
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -14315,7 +12227,6 @@ void Player::ReputationChanged(FactionEntry const* factionEntry )
         }
     }
 }
-
 bool Player::HasQuestForItem( uint32 itemid ) const
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -14323,24 +12234,19 @@ bool Player::HasQuestForItem( uint32 itemid ) const
         uint32 questid = GetQuestSlotQuestId(i);
         if ( questid == 0 )
             continue;
-
         QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
         if(qs_itr == mQuestStatus.end())
             continue;
-
         QuestStatusData const& q_status = qs_itr->second;
-
         if (q_status.m_status == QUEST_STATUS_INCOMPLETE)
         {
             Quest const* qinfo = objmgr.GetQuestTemplate(questid);
             if(!qinfo)
                 continue;
-
             // hide quest if player is in raid-group and quest is no raid quest
             if(GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID)
                 if(!InBattleGround()) //there are two ways.. we can make every bg-quest a raidquest, or add this code here.. i don't know if this can be exploited by other quests, but i think all other quests depend on a specific area.. but keep this in mind, if something strange happens later
                     continue;
-
             // There should be no mixed ReqItem/ReqSource drop
             // This part for ReqItem drop
             for (int j = 0; j < QUEST_OBJECTIVES_COUNT; j++)
@@ -14355,11 +12261,9 @@ bool Player::HasQuestForItem( uint32 itemid ) const
                 if (qinfo->ReqSourceId[j] == itemid)
                 {
                     ItemPrototype const *pProto = objmgr.GetItemPrototype(itemid);
-
                     // 'unique' item
                     if (pProto->MaxCount && GetItemCount(itemid,true) < pProto->MaxCount)
                         return true;
-
                     // allows custom amount drop when not 0
                     if (qinfo->ReqSourceCount[j])
                     {
@@ -14373,7 +12277,6 @@ bool Player::HasQuestForItem( uint32 itemid ) const
     }
     return false;
 }
-
 void Player::SendQuestComplete( uint32 quest_id )
 {
     if( quest_id )
@@ -14384,7 +12287,6 @@ void Player::SendQuestComplete( uint32 quest_id )
         sLog.outDebug( "WORLD: Sent SMSG_QUESTUPDATE_COMPLETE quest = %u", quest_id );
     }
 }
-
 void Player::SendQuestReward( Quest const *pQuest, uint32 XP, Object * questGiver )
 {
     uint32 questid = pQuest->GetQuestId();
@@ -14392,7 +12294,6 @@ void Player::SendQuestReward( Quest const *pQuest, uint32 XP, Object * questGive
     gameeventmgr.HandleQuestComplete(questid);
     WorldPacket data( SMSG_QUESTGIVER_QUEST_COMPLETE, (4+4+4+4+4) );
     data << uint32(questid);
-
     if ( getLevel() < sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL) )
     {
         data << uint32(XP);
@@ -14403,15 +12304,12 @@ void Player::SendQuestReward( Quest const *pQuest, uint32 XP, Object * questGive
         data << uint32(0);
         data << uint32(pQuest->GetRewOrReqMoney() + int32(pQuest->GetRewMoneyMaxLevel() * sWorld.getRate(RATE_DROP_MONEY)));
     }
-
     data << uint32(10*Trinity::Honor::hk_honor_at_level(getLevel(), pQuest->GetRewHonorableKills()));
     data << uint32(pQuest->GetBonusTalents());              // bonus talents
     GetSession()->SendPacket( &data );
-
     if (pQuest->GetQuestCompleteScript() != 0)
         GetMap()->ScriptsStart(sQuestEndScripts, pQuest->GetQuestCompleteScript(), questGiver, this);
 }
-
 void Player::SendQuestFailed( uint32 quest_id )
 {
     if( quest_id )
@@ -14423,7 +12321,6 @@ void Player::SendQuestFailed( uint32 quest_id )
         sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_FAILED");
     }
 }
-
 void Player::SendQuestTimerFailed( uint32 quest_id )
 {
     if( quest_id )
@@ -14434,7 +12331,6 @@ void Player::SendQuestTimerFailed( uint32 quest_id )
         sLog.outDebug("WORLD: Sent SMSG_QUESTUPDATE_FAILEDTIMER");
     }
 }
-
 void Player::SendCanTakeQuestResponse( uint32 msg )
 {
     WorldPacket data( SMSG_QUESTGIVER_QUEST_INVALID, 4 );
@@ -14442,7 +12338,6 @@ void Player::SendCanTakeQuestResponse( uint32 msg )
     GetSession()->SendPacket( &data );
     sLog.outDebug("WORLD: Sent SMSG_QUESTGIVER_QUEST_INVALID");
 }
-
 void Player::SendPushToPartyResponse( Player *pPlayer, uint32 msg )
 {
     if( pPlayer )
@@ -14454,7 +12349,6 @@ void Player::SendPushToPartyResponse( Player *pPlayer, uint32 msg )
         sLog.outDebug("WORLD: Sent MSG_QUEST_PUSH_RESULT");
     }
 }
-
 void Player::SendQuestUpdateAddItem( Quest const* pQuest, uint32 item_idx, uint32 count )
 {
     WorldPacket data( SMSG_QUESTUPDATE_ADD_ITEM, 0 );
@@ -14463,16 +12357,13 @@ void Player::SendQuestUpdateAddItem( Quest const* pQuest, uint32 item_idx, uint3
     //data << count;
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, uint64 guid, uint32 creatureOrGO_idx, uint32 old_count, uint32 add_count )
 {
     assert(old_count + add_count < 256 && "mob/GO count store in 8 bits 2^8 = 256 (0..256)");
-
     int32 entry = pQuest->ReqCreatureOrGOId[ creatureOrGO_idx ];
     if (entry < 0)
         // client expected gameobject template id in form (id|0x80000000)
         entry = (-entry) | 0x80000000;
-
     WorldPacket data( SMSG_QUESTUPDATE_ADD_KILL, (4*4+8) );
     sLog.outDebug( "WORLD: Sent SMSG_QUESTUPDATE_ADD_KILL" );
     data << uint32(pQuest->GetQuestId());
@@ -14481,16 +12372,13 @@ void Player::SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, uint64 guid, u
     data << uint32(pQuest->ReqCreatureOrGOCount[ creatureOrGO_idx ]);
     data << uint64(guid);
     GetSession()->SendPacket(&data);
-
     uint16 log_slot = FindQuestSlot( pQuest->GetQuestId() );
     if( log_slot < MAX_QUEST_LOG_SIZE)
         SetQuestSlotCounter(log_slot,creatureOrGO_idx,GetQuestSlotCounter(log_slot,creatureOrGO_idx)+add_count);
 }
-
 /*********************************************************/
 /***                   LOAD SYSTEM                     ***/
 /*********************************************************/
-
 bool Player::MinimalLoadFromDB( QueryResult *result, uint32 guid )
 {
     bool delete_result = true;
@@ -14503,9 +12391,7 @@ bool Player::MinimalLoadFromDB( QueryResult *result, uint32 guid )
     }
     else
         delete_result = false;
-
     Field *fields = result->Fetch();
-
     if (!LoadValues( fields[1].GetString()))
     {
         sLog.outError("Player #%d have broken data in `data` field. Can't be loaded for character list.",GUID_LOPART(guid));
@@ -14513,76 +12399,55 @@ bool Player::MinimalLoadFromDB( QueryResult *result, uint32 guid )
             delete result;
         return false;
     }
-
     // overwrite possible wrong/corrupted guid
     SetUInt64Value(OBJECT_FIELD_GUID, MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
-
     m_name = fields[2].GetCppString();
-
     Relocate(fields[3].GetFloat(),fields[4].GetFloat(),fields[5].GetFloat());
     Map *map = MapManager::Instance().CreateMap(fields[6].GetUInt32(), this, 0);
     SetMap(map);
-
     // randomize first save time in range [CONFIG_INTERVAL_SAVE] around [CONFIG_INTERVAL_SAVE]
     // this must help in case next save after mass player load after server startup
     m_nextSave = urand(m_nextSave/2,m_nextSave*3/2);
-
     // the instance id is not needed at character enum
-
     m_Played_time[PLAYED_TIME_TOTAL] = fields[7].GetUInt32();
     m_Played_time[PLAYED_TIME_LEVEL] = fields[8].GetUInt32();
-
     m_atLoginFlags = fields[9].GetUInt32();
-
     // I don't see these used anywhere ..
     /*_LoadGroup();
-
     _LoadBoundInstances();*/
-
     if (delete_result)
         delete result;
-
     for (uint8 i = 0; i < PLAYER_SLOTS_COUNT; i++)
         m_items[i] = NULL;
-
     if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         m_deathState = DEAD;
-
     return true;
 }
-
 void Player::_LoadDeclinedNames(QueryResult* result)
 {
     if(!result)
         return;
-
     if(m_declinedname)
         delete m_declinedname;
-
     m_declinedname = new DeclinedName;
     Field *fields = result->Fetch();
     for(uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
         m_declinedname->name[i] = fields[i].GetCppString();
-
     delete result;
 }
-
 void Player::_LoadArenaTeamInfo(QueryResult *result)
 {
     // arenateamid, played_week, played_season, personal_rating
     memset((void*)&m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1], 0, sizeof(uint32)*18);
     if (!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
-
         uint32 arenateamid     = fields[0].GetUInt32();
         uint32 played_week     = fields[1].GetUInt32();
         uint32 played_season   = fields[2].GetUInt32();
         uint32 personal_rating = fields[3].GetUInt32();
-
         ArenaTeam* aTeam = objmgr.GetArenaTeamById(arenateamid);
         if(!aTeam)
         {
@@ -14590,55 +12455,43 @@ void Player::_LoadArenaTeamInfo(QueryResult *result)
             continue;
         }
         uint8  arenaSlot = aTeam->GetSlot();
-
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6]     = arenateamid;      // TeamID
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6 + 1] = ((aTeam->GetCaptain() == GetGUID()) ? (uint32)0 : (uint32)1); // Captain 0, member 1
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6 + 2] = played_week;      // Played Week
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6 + 3] = played_season;    // Played Season
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6 + 4] = 0;                // Unk
         m_uint32Values[PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arenaSlot * 6 + 5] = personal_rating;  // Personal Rating
-
     }while (result->NextRow());
     delete result;
 }
-
 void Player::_LoadEquipmentSets(QueryResult *result)
 {
     // SetPQuery(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS,   "SELECT setguid, setindex, name, iconname, item0, item1, item2, item3, item4, item5, item6, item7, item8, item9, item10, item11, item12, item13, item14, item15, item16, item17, item18 FROM character_equipmentsets WHERE guid = '%u' ORDER BY setindex", GUID_LOPART(m_guid));
     if (!result)
         return;
-
     uint32 count = 0;
     do
     {
         Field *fields = result->Fetch();
-
         EquipmentSet eqSet;
-
         eqSet.Guid      = fields[0].GetUInt64();
         uint32 index    = fields[1].GetUInt32();
         eqSet.Name      = fields[2].GetCppString();
         eqSet.IconName  = fields[3].GetCppString();
         eqSet.state     = EQUIPMENT_SET_UNCHANGED;
-
         for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
             eqSet.Items[i] = fields[4+i].GetUInt32();
-
         m_EquipmentSets[index] = eqSet;
-
         ++count;
-
         if(count >= MAX_EQUIPMENT_SET_INDEX)                // client limit
             break;
     } while (result->NextRow());
     delete result;
 }
-
 void Player::_LoadBGData(QueryResult* result)
 {
     if (!result)
         return;
-
     // Expecting only one row
     Field *fields = result->Fetch();
     /* bgInstanceID, bgTeam, x, y, z, o, map, taxi[0], taxi[1], mountSpell */
@@ -14652,61 +12505,46 @@ void Player::_LoadBGData(QueryResult* result)
     m_bgData.taxiPath[0]  = fields[7].GetUInt32();
     m_bgData.taxiPath[1]  = fields[8].GetUInt32();
     m_bgData.mountSpell   = fields[9].GetUInt32();
-
     delete result;
 }
-
 bool Player::LoadPositionFromDB(uint32& mapid, float& x,float& y,float& z,float& o, bool& in_flight, uint64 guid)
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map,taxi_path FROM characters WHERE guid = '%u'",GUID_LOPART(guid));
     if(!result)
         return false;
-
     Field *fields = result->Fetch();
-
     x = fields[0].GetFloat();
     y = fields[1].GetFloat();
     z = fields[2].GetFloat();
     o = fields[3].GetFloat();
     mapid = fields[4].GetUInt32();
     in_flight = !fields[5].GetCppString().empty();
-
     delete result;
     return true;
 }
-
 bool Player::LoadValuesArrayFromDB(Tokens& data, uint64 guid)
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT data FROM characters WHERE guid='%u'",GUID_LOPART(guid));
     if( !result )
         return false;
-
     Field *fields = result->Fetch();
-
     data = StrSplit(fields[0].GetCppString(), " ");
-
     delete result;
-
     return true;
 }
-
 uint32 Player::GetUInt32ValueFromArray(Tokens const& data, uint16 index)
 {
     if(index >= data.size())
         return 0;
-
     return (uint32)atoi(data[index].c_str());
 }
-
 float Player::GetFloatValueFromArray(Tokens const& data, uint16 index)
 {
     float result;
     uint32 temp = Player::GetUInt32ValueFromArray(data,index);
     memcpy(&result, &temp, sizeof(result));
-
     return result;
 }
-
 uint32 Player::GetUInt32ValueFromDB(uint16 index, uint64 guid)
 {
     // todo: cleanup in this, move to a separate function.
@@ -14743,35 +12581,27 @@ uint32 Player::GetUInt32ValueFromDB(uint16 index, uint64 guid)
     Tokens data;
     if(!LoadValuesArrayFromDB(data,guid))
         return 0;
-
     return GetUInt32ValueFromArray(data,index);
 }
-
 float Player::GetFloatValueFromDB(uint16 index, uint64 guid)
 {
     float result;
     uint32 temp = Player::GetUInt32ValueFromDB(index, guid);
     memcpy(&result, &temp, sizeof(result));
-
     return result;
 }
-
 bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
 {
     ////                                                     0     1        2     3     4     5      6       7      8   9      10           11            12           13          14          15          16   17           18        19         20         21         22          23           24                 25                 26                 27       28       29       30       31         32           33            34        35    36      37                 38         39                  40                    41           42         43
     //QueryResult *result = CharacterDatabase.PQuery("SELECT guid, account, data, name, race, class, gender, level, xp, money, playerBytes, playerBytes2, playerFlags, position_x, position_y, position_z, map, orientation, taximask, cinematic, totaltime, leveltime, rest_bonus, logout_time, is_logout_resting, resettalents_cost, resettalents_time, trans_x, trans_y, trans_z, trans_o, transguid, extra_flags, stable_slots, at_login, zone, online, death_expire_time, taxi_path, dungeon_difficulty, arena_pending_points, instance_id, speccount, activespec FROM characters WHERE guid = '%u'", guid);
     QueryResult *result = holder->GetResult(PLAYER_LOGIN_QUERY_LOADFROM);
-
     if(!result)
     {
         sLog.outError("Player (GUID: %u) not found in table `characters`, can't load. ",guid);
         return false;
     }
-
     Field *fields = result->Fetch();
-
     uint32 dbAccountId = fields[1].GetUInt32();
-
     // check if the character's account in the db and the logged in account match.
     // player should be able to load/delete character only with correct account!
     if( dbAccountId != GetSession()->GetAccountId() )
@@ -14780,11 +12610,8 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         delete result;
         return false;
     }
-
     Object::_Create( guid, 0, HIGHGUID_PLAYER );
-
     m_name = fields[3].GetCppString();
-
     // check name limitations
     if (ObjectMgr::CheckPlayerName(m_name) != CHAR_NAME_SUCCESS ||
         (GetSession()->GetSecurity() == SEC_PLAYER && objmgr.IsReservedName(m_name)))
@@ -14793,24 +12620,20 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE guid ='%u'", uint32(AT_LOGIN_RENAME),guid);
         return false;
     }
-
     if(!LoadValues( fields[2].GetString()))
     {
         sLog.outError("Player #%d have broken data in `data` field. Can't be loaded.", GUID_LOPART(guid));
         delete result;
         return false;
     }
-
     // overwrite possible wrong/corrupted guid
     SetUInt64Value(OBJECT_FIELD_GUID, MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
-
     // overwrite some data fields
     uint32 bytes0 = GetUInt32Value(UNIT_FIELD_BYTES_0) & 0xFF000000;
     bytes0 |= fields[4].GetUInt8();                         // race
     bytes0 |= fields[5].GetUInt8() << 8;                    // class
     bytes0 |= fields[6].GetUInt8() << 16;                   // gender
     SetUInt32Value(UNIT_FIELD_BYTES_0, bytes0);
-
     SetUInt32Value(UNIT_FIELD_LEVEL, fields[7].GetUInt8());
     SetUInt32Value(PLAYER_XP, fields[8].GetUInt32());
     SetUInt32Value(PLAYER_FIELD_COINAGE, fields[9].GetUInt32());
@@ -14818,42 +12641,33 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     SetUInt32Value(PLAYER_BYTES_2, fields[11].GetUInt32());
     SetUInt32Value(PLAYER_BYTES_3, (GetUInt32Value(PLAYER_BYTES_3) & ~1) | fields[6].GetUInt8());
     SetUInt32Value(PLAYER_FLAGS, fields[12].GetUInt32());
-
     InitDisplayIds();
-
     // cleanup inventory related item value fields (its will be filled correctly in _LoadInventory)
     for(uint8 slot = EQUIPMENT_SLOT_START; slot < EQUIPMENT_SLOT_END; ++slot)
     {
         SetUInt64Value( PLAYER_FIELD_INV_SLOT_HEAD + (slot * 2), 0 );
         SetVisibleItemSlot(slot, NULL);
-
         if (m_items[slot])
         {
             delete m_items[slot];
             m_items[slot] = NULL;
         }
     }
-
     // update money limits
     if(GetMoney() > MAX_MONEY_AMOUNT)
         SetMoney(MAX_MONEY_AMOUNT);
-
     sLog.outDebug("Load Basic value of player %s is: ", m_name.c_str());
     outDebugValues();
-
     //Need to call it to initialize m_team (m_team can be calculated from race)
     //Other way is to saves m_team into characters table.
     setFactionForRace(getRace());
-
     // load home bind and check in same time class/race pair, it used later for restore broken positions
     if(!_LoadHomeBind(holder->GetResult(PLAYER_LOGIN_QUERY_LOADHOMEBIND)))
     {
         delete result;
         return false;
     }
-
     InitPrimaryProfessions();                               // to max set before any spell loaded
-
     // init saved position, and fix it later if problematic
     uint32 transGUID = fields[31].GetUInt32();
     Relocate(fields[13].GetFloat(),fields[14].GetFloat(),fields[15].GetFloat(),fields[17].GetFloat());
@@ -14861,38 +12675,28 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     uint32 instanceId = fields[41].GetFloat();
     SetDifficulty(fields[39].GetUInt32());                  // may be changed in _LoadGroup
     std::string taxi_nodes = fields[38].GetCppString();
-
 #define RelocateToHomebind(){ mapId = m_homebindMapId; instanceId = 0; Relocate(m_homebindX, m_homebindY, m_homebindZ); }
-
     _LoadGroup(holder->GetResult(PLAYER_LOGIN_QUERY_LOADGROUP));
-
     _LoadArenaTeamInfo(holder->GetResult(PLAYER_LOGIN_QUERY_LOADARENAINFO));
-
     uint32 arena_currency = GetUInt32Value(PLAYER_FIELD_ARENA_CURRENCY) + fields[40].GetUInt32();
     if (arena_currency > sWorld.getConfig(CONFIG_MAX_ARENA_POINTS))
         arena_currency = sWorld.getConfig(CONFIG_MAX_ARENA_POINTS);
-
     SetUInt32Value(PLAYER_FIELD_ARENA_CURRENCY, arena_currency);
-
     // check arena teams integrity
     for(uint32 arena_slot = 0; arena_slot < MAX_ARENA_SLOT; ++arena_slot)
     {
         uint32 arena_team_id = GetArenaTeamId(arena_slot);
         if(!arena_team_id)
             continue;
-
         if(ArenaTeam * at = objmgr.GetArenaTeamById(arena_team_id))
             if(at->HaveMember(GetGUID()))
                 continue;
-
         // arena team not exist or not member, cleanup fields
         for(int j = 0; j < 6; ++j)
             SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + arena_slot * 6 + j, 0);
     }
-
     _LoadBoundInstances(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBOUNDINSTANCES));
     _LoadBGData(holder->GetResult(PLAYER_LOGIN_QUERY_LOADBGDATA));
-
     MapEntry const * mapEntry = sMapStore.LookupEntry(mapId);
     if(!mapEntry || !IsPositionValid())
     {
@@ -14905,18 +12709,14 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         BattleGround *currentBg = NULL;
         if(m_bgData.bgInstanceID)                                                //saved in BattleGround
             currentBg = sBattleGroundMgr.GetBattleGround(m_bgData.bgInstanceID, BATTLEGROUND_TYPE_NONE);
-
         if(currentBg && currentBg->IsPlayerInBattleGround(GetGUID()))
         {
             BattleGroundQueueTypeId bgQueueTypeId = sBattleGroundMgr.BGQueueTypeId(currentBg->GetTypeID(), currentBg->GetArenaType());
             AddBattleGroundQueueId(bgQueueTypeId);
-
             m_bgData.bgTypeID = currentBg->GetTypeID();
-
             //join player to battleground group
             currentBg->EventPlayerLoggedIn(this, GetGUID());
             currentBg->AddOrSetPlayerToCorrectBgGroup(this, GetGUID(), m_bgData.bgTeam);
-
             SetInviteForBattleGroundQueueType(bgQueueTypeId,currentBg->GetInstanceID());
         }
         // Bg was not found - go to Entry Point
@@ -14925,7 +12725,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             // Do not look for instance if bg not found
             const WorldLocation& _loc = GetBattleGroundEntryPoint();
             mapId = _loc.GetMapId(); instanceId = 0;
-
             if(mapId == MAPID_INVALID) // Battleground Entry Point not found (???)
             {
                 sLog.outError("Player (guidlow %d) was in BG in database, but BG was not found, and entry point was invalid! Teleport to default race/class locations.",guid);
@@ -14933,7 +12732,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             } else {
                 Relocate(&_loc);
             }
-
             // We are not in BG anymore
             m_bgData.bgInstanceID = 0;
         }
@@ -14943,12 +12741,10 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     {
         // There are no transports on instances
         instanceId = 0;
-
         m_movementInfo.t_x = fields[27].GetFloat();
         m_movementInfo.t_y = fields[28].GetFloat();
         m_movementInfo.t_z = fields[29].GetFloat();
         m_movementInfo.t_o = fields[30].GetFloat();
-
         if( !MaNGOS::IsValidMapCoord(
             GetPositionX()+m_movementInfo.t_x,GetPositionY()+m_movementInfo.t_y,
             GetPositionZ()+m_movementInfo.t_z,GetOrientation()+m_movementInfo.t_o) ||
@@ -14958,7 +12754,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             sLog.outError("Player (guidlow %d) have invalid transport coordinates (X: %f Y: %f Z: %f O: %f). Teleport to default race/class locations.",
                 guid,GetPositionX()+m_movementInfo.t_x,GetPositionY()+m_movementInfo.t_y,
                 GetPositionZ()+m_movementInfo.t_z,GetOrientation()+m_movementInfo.t_o);
-
             RelocateToHomebind();
         }
         else
@@ -14977,7 +12772,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             {
                 sLog.outError("Player (guidlow %d) have problems with transport guid (%u). Teleport to default race/class locations.",
                     guid,transGUID);
-
                 RelocateToHomebind();
             }
         }
@@ -14986,7 +12780,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     else if (!taxi_nodes.empty())
     {
         instanceId = 0;
-
         // Not finish taxi flight path
         if(m_bgData.HasTaxiPath())
         {
@@ -14999,7 +12792,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             TaxiNodesEntry const* nodeEntry = NULL;
             if(uint32 node_id = m_taxi.GetTaxiSource())
                 nodeEntry = sTaxiNodesStore.LookupEntry(node_id);
-
             if(!nodeEntry)                                      // don't know taxi start node, to homebind
             {
                 sLog.outError("Character %u have wrong data in taxi destination list, teleport to homebind.",GetGUIDLow());
@@ -15013,7 +12805,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             }
             m_taxi.ClearTaxiDestinations();
         }
-
         if(uint32 node_id = m_taxi.GetTaxiSource())
         {
             // save source node as recall coord to prevent recall and fall from sky
@@ -15021,11 +12812,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             assert(nodeEntry);                                  // checked in m_taxi.LoadTaxiDestinationsFromString
             mapId = nodeEntry->map_id;
             Relocate(nodeEntry->x, nodeEntry->y, nodeEntry->z,0.0f);
-
             // flight will started later
         }
     }
-
     // Map could be changed before
     mapEntry = sMapStore.LookupEntry(mapId);
     // client without expansion support
@@ -15034,17 +12823,14 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         sLog.outDebug("Player %s using client without required expansion tried login at non accessible map %u", GetName(), mapId);
         RelocateToHomebind();
     }
-
     // fix crash (because of if(Map *map = _FindMap(instanceId)) in MapInstanced::CreateInstance)
     if(instanceId)
         if(InstanceSave * save = GetInstanceSave(mapId))
             if(save->GetInstanceId() != instanceId)
                 instanceId = 0;
-
     // NOW player must have valid map
     // load the player's map here if it's not already loaded
     Map *map = MapManager::Instance().CreateMap(mapId, this, instanceId);
-
     if (!map)
     {
         instanceId = 0;
@@ -15060,7 +12846,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             sLog.outError("Player (guidlow %d) is teleported to home (Map: %u X: %f Y: %f Z: %f O: %f).",guid,mapId,GetPositionX(),GetPositionY(),GetPositionZ(),GetOrientation());
             RelocateToHomebind();
         }
-
         map = MapManager::Instance().CreateMap(mapId, this, 0);
         if(!map)
         {
@@ -15077,7 +12862,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             }
         }
     }
-
     // if the player is in an instance and it has been reset in the meantime teleport him to the entrance
     if(instanceId && !sInstanceSaveManager.GetInstanceSave(instanceId))
     {
@@ -15090,21 +12874,15 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
             RelocateToHomebind();
         }
     }
-
     SetMap(map);
-
     // randomize first save time in range [CONFIG_INTERVAL_SAVE] around [CONFIG_INTERVAL_SAVE]
     // this must help in case next save after mass player load after server startup
     m_nextSave = urand(m_nextSave/2,m_nextSave*3/2);
-
     SaveRecallPosition();
-
     time_t now = time(NULL);
     time_t logoutTime = time_t(fields[23].GetUInt64());
-
     // since last logout (in seconds)
     uint64 time_diff = uint64(now - logoutTime);
-
     // set value, including drunk invisibility detection
     // calculate sobering. after 15 minutes logged out, the player will be sober again
     float soberFactor;
@@ -15114,61 +12892,46 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         soberFactor = 1-time_diff/(15.0f*MINUTE);
     uint16 newDrunkenValue = uint16(soberFactor*(GetUInt32Value(PLAYER_BYTES_3) & 0xFFFE));
     SetDrunkValue(newDrunkenValue);
-
     m_rest_bonus = fields[22].GetFloat();
     //speed collect rest bonus in offline, in logout, far from tavern, city (section/in hour)
     float bubble0 = 0.031;
     //speed collect rest bonus in offline, in logout, in tavern, city (section/in hour)
     float bubble1 = 0.125;
-
     if(time_diff > 0)
     {
         float bubble = fields[24].GetUInt32() > 0
             ? bubble1*sWorld.getRate(RATE_REST_OFFLINE_IN_TAVERN_OR_CITY)
             : bubble0*sWorld.getRate(RATE_REST_OFFLINE_IN_WILDERNESS);
-
         SetRestBonus(GetRestBonus()+ time_diff*((float)GetUInt32Value(PLAYER_NEXT_LEVEL_XP)/72000)*bubble);
     }
-
     m_cinematic = fields[19].GetUInt32();
     m_Played_time[PLAYED_TIME_TOTAL]= fields[20].GetUInt32();
     m_Played_time[PLAYED_TIME_LEVEL]= fields[21].GetUInt32();
-
     m_resetTalentsCost = fields[25].GetUInt32();
     m_resetTalentsTime = time_t(fields[26].GetUInt64());
-
     // reserve some flags
     uint32 old_safe_flags = GetUInt32Value(PLAYER_FLAGS) & ( PLAYER_FLAGS_HIDE_CLOAK | PLAYER_FLAGS_HIDE_HELM );
-
     if( HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GM) )
         SetUInt32Value(PLAYER_FLAGS, 0 | old_safe_flags);
-
     m_taxi.LoadTaxiMask( fields[18].GetString() );          // must be before InitTaxiNodesForLevel
-
     uint32 extraflags = fields[32].GetUInt32();
-
     m_stableSlots = fields[33].GetUInt32();
     if(m_stableSlots > MAX_PET_STABLES)
     {
         sLog.outError("Player can have not more %u stable slots, but have in DB %u",MAX_PET_STABLES,uint32(m_stableSlots));
         m_stableSlots = MAX_PET_STABLES;
     }
-
     m_atLoginFlags = fields[34].GetUInt32();
-
     // Honor system
     // Update Honor kills data
     m_lastHonorUpdateTime = logoutTime;
     UpdateHonorFields();
-
     m_deathExpireTime = (time_t)fields[37].GetUInt64();
     if(m_deathExpireTime > now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP)
         m_deathExpireTime = now+MAX_DEATH_COUNT*DEATH_EXPIRE_STEP-1;
-
     // clear channel spell data (if saved at channel spell casting)
     SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, 0);
     SetUInt32Value(UNIT_CHANNEL_SPELL,0);
-
     // clear charm/summon related fields
     SetUInt64Value(UNIT_FIELD_SUMMONEDBY, 0);
     SetUInt64Value(UNIT_FIELD_CHARMEDBY, 0);
@@ -15176,43 +12939,32 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
     SetUInt64Value(UNIT_FIELD_SUMMON, 0);
     SetUInt64Value(PLAYER_FARSIGHT, 0);
     SetCreatorGUID(0);
-
     RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE);
-
     // reset some aura modifiers before aura apply
     SetUInt32Value(PLAYER_TRACK_CREATURES, 0 );
     SetUInt32Value(PLAYER_TRACK_RESOURCES, 0 );
-
     _LoadSkills();
-
     // make sure the unit is considered out of combat for proper loading
     ClearInCombat();
-
     // make sure the unit is considered not in duel for proper loading
     SetUInt64Value(PLAYER_DUEL_ARBITER, 0);
     SetUInt32Value(PLAYER_DUEL_TEAM, 0);
-
     // remember loaded power/health values to restore after stats initialization and modifier applying
     uint32 savedHealth = GetHealth();
     uint32 savedPower[MAX_POWERS];
     for(uint32 i = 0; i < MAX_POWERS; ++i)
         savedPower[i] = GetPower(Powers(i));
-
     // reset stats before loading any modifiers
     InitStatsForLevel();
     InitTaxiNodesForLevel();
     InitGlyphsForLevel();
     InitRunes();
-
     // apply original stats mods before spell loading or item equipment that call before equip _RemoveStatsMods()
-
     //mails are loaded only when needed ;-) - when player in game click on mailbox.
     //_LoadMail();
-   
     m_specsCount = fields[42].GetUInt32();
     m_activeSpec = fields[43].GetUInt32();
     delete result;
-    
     // sanity check
     if (m_specsCount > MAX_TALENT_SPECS || m_activeSpec > MAX_TALENT_SPEC ||
         m_specsCount < MIN_TALENT_SPECS || m_activeSpec < MIN_TALENT_SPEC ) // if (m_specsCount < 2) is not logical
@@ -15220,40 +12972,29 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         m_activeSpec = 0;
         sLog.outError("Player %s(GUID: %u) has SpecCount = %u and ActiveSpec = %u.", GetName(), GetGUIDLow(), m_specsCount, m_activeSpec);
     }
-        
     _LoadTalents(holder->GetResult(PLAYER_LOGIN_QUERY_LOADTALENTS));
     _LoadSpells(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSPELLS));
-
     _LoadGlyphs(holder->GetResult(PLAYER_LOGIN_QUERY_LOADGLYPHS));
     _LoadAuras(holder->GetResult(PLAYER_LOGIN_QUERY_LOADAURAS), time_diff);
     _LoadGlyphAuras();
     // add ghost flag (must be after aura load: PLAYER_FLAGS_GHOST set in aura)
     if( HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST) )
         m_deathState = DEAD;
-
     // after spell load, learn rewarded spell if need also
     _LoadQuestStatus(holder->GetResult(PLAYER_LOGIN_QUERY_LOADQUESTSTATUS));
     _LoadDailyQuestStatus(holder->GetResult(PLAYER_LOGIN_QUERY_LOADDAILYQUESTSTATUS));
-
     // after spell and quest load
     InitTalentForLevel();
     learnDefaultSpells();
-
     // must be before inventory (some items required reputation check)
     m_reputationMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADREPUTATION));
-
     _LoadInventory(holder->GetResult(PLAYER_LOGIN_QUERY_LOADINVENTORY), time_diff);
-
     // update items with duration and realtime
     UpdateItemDuration(time_diff, true);
-
     _LoadActions(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACTIONS), true);
-
     // unread mails and next delivery time, actual mails not loaded
     _LoadMailInit(holder->GetResult(PLAYER_LOGIN_QUERY_LOADMAILCOUNT), holder->GetResult(PLAYER_LOGIN_QUERY_LOADMAILDATE));
-
     m_social = sSocialMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSOCIALLIST), GetGUIDLow());
-
     // check PLAYER_CHOSEN_TITLE compatibility with PLAYER__FIELD_KNOWN_TITLES
     // note: PLAYER__FIELD_KNOWN_TITLES updated at quest status loaded
     if(uint32 curTitle = GetUInt32Value(PLAYER_CHOSEN_TITLE))
@@ -15261,29 +13002,22 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
         if(!HasTitle(curTitle))
             SetUInt32Value(PLAYER_CHOSEN_TITLE, 0);
     }
-
     // has to be called after last Relocate() in Player::LoadFromDB
     SetFallInformation(0, GetPositionZ());
-
     _LoadSpellCooldowns(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSPELLCOOLDOWNS));
-
     // Spell code allow apply any auras to dead character in load time in aura/spell/item loading
     // Do now before stats re-calculation cleanup for ghost state unexpected auras
     if(!isAlive())
         RemoveAllAurasOnDeath();
-
     //apply all stat bonuses from items and auras
     SetCanModifyStats(true);
     UpdateAllStats();
-
     // restore remembered power/health values (but not more max values)
     SetHealth(savedHealth > GetMaxHealth() ? GetMaxHealth() : savedHealth);
     for(uint32 i = 0; i < MAX_POWERS; ++i)
         SetPower(Powers(i),savedPower[i] > GetMaxPower(Powers(i)) ? GetMaxPower(Powers(i)) : savedPower[i]);
-
     sLog.outDebug("The value of player %s after load item and aura is: ", m_name.c_str());
     outDebugValues();
-
     // GM state
     if(GetSession()->GetSecurity() > SEC_PLAYER)
     {
@@ -15297,7 +13031,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
                     SetGameMaster(true);
                 break;
         }
-
         switch(sWorld.getConfig(CONFIG_GM_VISIBLE_STATE))
         {
             default:
@@ -15308,7 +13041,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
                     SetGMVisible(false);
                 break;
         }
-
         /*switch(sWorld.getConfig(CONFIG_GM_ACCEPT_TICKETS))
         {
             default:
@@ -15319,7 +13051,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
                 SetAcceptTicket(true);
             break;
         }*/
-
         switch(sWorld.getConfig(CONFIG_GM_CHAT))
         {
             default:
@@ -15330,7 +13061,6 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
                     SetGMChat(true);
                 break;
         }
-
         switch(sWorld.getConfig(CONFIG_GM_WISPERING_TO))
         {
             default:
@@ -15342,22 +13072,16 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
                 break;
         }
     }
-
     _LoadDeclinedNames(holder->GetResult(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES));
-
     m_achievementMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS), holder->GetResult(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS));
     m_achievementMgr.CheckAllAchievementCriteria();
-
     _LoadEquipmentSets(holder->GetResult(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS));
-
     return true;
 }
-
 bool Player::isAllowedToLoot(Creature* creature)
 {
     if(creature->isDead() && !creature->IsDamageEnoughForLootingAndReward())
        return false;
-
     if(Player* recipient = creature->GetLootRecipient())
     {
         if (recipient == this)
@@ -15375,7 +13099,6 @@ bool Player::isAllowedToLoot(Creature* creature)
         // prevent other players from looting if the recipient got disconnected
         return !creature->hasLootRecipient();
 }
-
 void Player::_LoadActions(QueryResult *result, bool startup)
 {
     if(result)
@@ -15383,11 +13106,9 @@ void Player::_LoadActions(QueryResult *result, bool startup)
         do
         {
             Field *fields = result->Fetch();
-
             uint8 button = fields[0].GetUInt8();
             uint32 action = fields[1].GetUInt32();
             uint8 type = fields[2].GetUInt8();
-
             if(ActionButton* ab = addActionButton(button, action, type))
             {
                 ab->uState = ACTIONBUTTON_UNCHANGED;
@@ -15397,23 +13118,18 @@ void Player::_LoadActions(QueryResult *result, bool startup)
             else
             {
                 sLog.outError( "  ...at loading, and will deleted in DB also");
-
                 // Will deleted in DB at next save (it can create data until save but marked as deleted)
                 m_actionButtons[button].uState = ACTIONBUTTON_DELETED;
             }
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Player::_LoadAuras(QueryResult *result, uint32 timediff)
 {
     sLog.outDebug("Loading auras for player %u",GetGUIDLow());
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_mask,stackcount,amount0,amount1,amount2,maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow());
-
     if(result)
     {
         do
@@ -15430,23 +13146,19 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
             int32 maxduration = (int32)fields[7].GetUInt32();
             int32 remaintime = (int32)fields[8].GetUInt32();
             int32 remaincharges = (int32)fields[9].GetUInt32();
-
             SpellEntry const* spellproto = sSpellStore.LookupEntry(spellid);
             if(!spellproto)
             {
                 sLog.outError("Unknown aura (spellid %u), ignore.",spellid);
                 continue;
             }
-
             // negative effects should continue counting down after logout
             if (remaintime != -1 && !IsPositiveSpell(spellid))
             {
                 if(remaintime  <= int32(timediff))
                     continue;
-
                 remaintime -= timediff;
             }
-
             // prevent wrong values of remaincharges
             if(spellproto->procCharges)
             {
@@ -15455,7 +13167,6 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
             }
             else
                 remaincharges = 0;
-
             Aura* aura = new Aura(spellproto, effmask, this, this, this);
             aura->SetLoadedState(caster_guid,maxduration,remaintime,remaincharges, stackcount, &damage[0]);
             if(!aura->CanBeSaved())
@@ -15467,14 +13178,11 @@ void Player::_LoadAuras(QueryResult *result, uint32 timediff)
             sLog.outDetail("Added aura spellid %u, effectmask %u", spellproto->Id, effmask);
         }
         while( result->NextRow() );
-
         delete result;
     }
-
     if(getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
         CastSpell(this,SPELL_ID_PASSIVE_BATTLE_STANCE,true);
 }
-
 void Player::_LoadGlyphAuras()
 {
     for (uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i)
@@ -15498,13 +13206,11 @@ void Player::_LoadGlyphAuras()
             }
             else
                 sLog.outError("Player %s has not existing glyph entry %u on index %u", m_name.c_str(), glyph, i);
-
             // On any error remove glyph
             SetGlyph(i, 0);
         }
     }
 }
-
 void Player::LoadCorpse()
 {
     if( isAlive() )
@@ -15524,7 +13230,6 @@ void Player::LoadCorpse()
         }
     }
 }
-
 void Player::_LoadInventory(QueryResult *result, uint32 timediff)
 {
     //QueryResult *result = CharacterDatabase.PQuery("SELECT data,bag,slot,item,item_template FROM character_inventory JOIN item_instance ON character_inventory.item = item_instance.guid WHERE character_inventory.guid = '%u' ORDER BY bag,slot", GetGUIDLow());
@@ -15533,13 +13238,10 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
     //the bagMap is filled before items in the bags are loaded
     //NOTE2: the "order by `slot`" is needed because mainhand weapons are (wrongly?)
     //expected to be equipped before offhand items (TODO: fixme)
-
     uint32 zone = GetZoneId();
-
     if (result)
     {
         std::list<Item*> problematicItems;
-
         // prevent items from being added to the queue when stored
         m_itemUpdateQueueBlocked = true;
         do
@@ -15549,9 +13251,7 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
             uint8  slot      = fields[2].GetUInt8();
             uint32 item_guid = fields[3].GetUInt32();
             uint32 item_id   = fields[4].GetUInt32();
-
             ItemPrototype const * proto = objmgr.GetItemPrototype(item_id);
-
             if(!proto)
             {
                 CharacterDatabase.PExecute("DELETE FROM character_inventory WHERE item = '%u'", item_guid);
@@ -15559,9 +13259,7 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 sLog.outError( "Player::_LoadInventory: Player %s has an unknown item (id: #%u) in inventory, deleted.", GetName(),item_id );
                 continue;
             }
-
             Item *item = NewItemOrBag(proto);
-
             if(!item->LoadFromDB(item_guid, GetGUID(), result))
             {
                 sLog.outError( "Player::_LoadInventory: Player %s has broken item (id: #%u) in inventory, deleted.", GetName(),item_id );
@@ -15570,7 +13268,6 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 item->SaveToDB();                           // it also deletes item object !
                 continue;
             }
-
             // not allow have in alive state item limited to another map/zone
             if(isAlive() && item->IsLimitedToAnotherMapOrZone(GetMapId(),zone) )
             {
@@ -15579,7 +13276,6 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 item->SaveToDB();                           // it also deletes item object !
                 continue;
             }
-
             // "Conjured items disappear if you are logged out for more than 15 minutes"
             if ((timediff > 15*60) && (item->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_CONJURED)))
             {
@@ -15588,15 +13284,12 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 item->SaveToDB();                           // it also deletes item object !
                 continue;
             }
-
             bool success = true;
-
             if (!bag_guid)
             {
                 // the item is not in a bag
                 item->SetContainer( NULL );
                 item->SetSlot(slot);
-
                 if( IsInventoryPos( INVENTORY_SLOT_BAG_0, slot ) )
                 {
                     ItemPosCountVec dest;
@@ -15621,7 +13314,6 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                     else
                         success = false;
                 }
-
                 if(success)
                 {
                     // store bags that may contain items in them
@@ -15649,7 +13341,6 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 else
                     success = false;
             }
-
             // item's state may have changed after stored
             if (success)
                 item->SetState(ITEM_UNCHANGED, this);
@@ -15660,33 +13351,26 @@ void Player::_LoadInventory(QueryResult *result, uint32 timediff)
                 problematicItems.push_back(item);
             }
         } while (result->NextRow());
-
         delete result;
         m_itemUpdateQueueBlocked = false;
-
         // send by mail problematic items
         while(!problematicItems.empty())
         {
             // fill mail
             MailItemsInfo mi;                               // item list preparing
-
             for(uint8 i = 0; !problematicItems.empty() && i < MAX_MAIL_ITEMS; ++i)
             {
                 Item* item = problematicItems.front();
                 problematicItems.pop_front();
-
                 mi.AddItem(item->GetGUIDLow(), item->GetEntry(), item);
             }
-
             std::string subject = GetSession()->GetTrinityString(LANG_NOT_EQUIPPED_ITEM);
-
             WorldSession::SendMailTo(this, MAIL_NORMAL, MAIL_STATIONERY_GM, GetGUIDLow(), GetGUIDLow(), subject, 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
         }
     }
     //if(isAlive())
     _ApplyAllItemMods();
 }
-
 // load mailed item which should receive current player
 void Player::_LoadMailedItems(Mail *mail)
 {
@@ -15694,17 +13378,13 @@ void Player::_LoadMailedItems(Mail *mail)
     QueryResult* result = CharacterDatabase.PQuery("SELECT data, item_guid, item_template FROM mail_items JOIN item_instance ON item_guid = guid WHERE mail_id='%u'", mail->messageID);
     if(!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
         uint32 item_guid_low = fields[1].GetUInt32();
         uint32 item_template = fields[2].GetUInt32();
-
         mail->AddItem(item_guid_low, item_template);
-
         ItemPrototype const *proto = objmgr.GetItemPrototype(item_template);
-
         if(!proto)
         {
             sLog.outError( "Player %u has unknown item_template (ProtoType) in mailed items(GUID: %u template: %u) in mail (%u), deleted.", GetGUIDLow(), item_guid_low, item_template,mail->messageID);
@@ -15712,9 +13392,7 @@ void Player::_LoadMailedItems(Mail *mail)
             CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item_guid_low);
             continue;
         }
-
         Item *item = NewItemOrBag(proto);
-
         if(!item->LoadFromDB(item_guid_low, 0, result))
         {
             sLog.outError( "Player::_LoadMailedItems - Item in mail (%u) doesn't exist !!!! - item guid: %u, deleted from mail", mail->messageID, item_guid_low);
@@ -15723,13 +13401,10 @@ void Player::_LoadMailedItems(Mail *mail)
             item->SaveToDB();                               // it also deletes item object !
             continue;
         }
-
         AddMItem(item);
     } while (result->NextRow());
-
     delete result;
 }
-
 void Player::_LoadMailInit(QueryResult *resultUnread, QueryResult *resultDelivery)
 {
     //set a count of unread mails
@@ -15740,7 +13415,6 @@ void Player::_LoadMailInit(QueryResult *resultUnread, QueryResult *resultDeliver
         unReadMails = fieldMail[0].GetUInt8();
         delete resultUnread;
     }
-
     // store nearest delivery time (it > 0 and if it < current then at next player update SendNewMaill will be called)
     //resultMails = CharacterDatabase.PQuery("SELECT MIN(deliver_time) FROM mail WHERE receiver = '%u' AND (checked & 1)=0", GUID_LOPART(playerGuid));
     if (resultDelivery)
@@ -15750,7 +13424,6 @@ void Player::_LoadMailInit(QueryResult *resultUnread, QueryResult *resultDeliver
         delete resultDelivery;
     }
 }
-
 void Player::_LoadMail()
 {
     m_mail.clear();
@@ -15776,25 +13449,20 @@ void Player::_LoadMail()
             m->checked = fields[11].GetUInt32();
             m->stationery = fields[12].GetUInt8();
             m->mailTemplateId = fields[13].GetInt16();
-
             if(m->mailTemplateId && !sMailTemplateStore.LookupEntry(m->mailTemplateId))
             {
                 sLog.outError( "Player::_LoadMail - Mail (%u) have not existed MailTemplateId (%u), remove at load", m->messageID, m->mailTemplateId);
                 m->mailTemplateId = 0;
             }
-
             m->state = MAIL_STATE_UNCHANGED;
-
             if (has_items)
                 _LoadMailedItems(m);
-
             m_mail.push_back(m);
         } while( result->NextRow() );
         delete result;
     }
     m_mailsLoaded = true;
 }
-
 void Player::LoadPet()
 {
     //fixme: the pet should still be loaded if the player is not in world
@@ -15806,22 +13474,17 @@ void Player::LoadPet()
             delete pet;
     }
 }
-
 void Player::_LoadQuestStatus(QueryResult *result)
 {
     mQuestStatus.clear();
-
     uint32 slot = 0;
-
     ////                                                     0      1       2         3         4      5          6          7          8          9           10          11          12
     //QueryResult *result = CharacterDatabase.PQuery("SELECT quest, status, rewarded, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, itemcount1, itemcount2, itemcount3, itemcount4 FROM character_queststatus WHERE guid = '%u'", GetGUIDLow());
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             uint32 quest_id = fields[0].GetUInt32();
                                                             // used to be new, no delete?
             Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
@@ -15829,7 +13492,6 @@ void Player::_LoadQuestStatus(QueryResult *result)
             {
                 // find or create
                 QuestStatusData& questStatusData = mQuestStatus[quest_id];
-
                 uint32 qstatus = fields[1].GetUInt32();
                 if(qstatus < MAX_QUEST_STATUS)
                     questStatusData.m_status = QuestStatus(qstatus);
@@ -15838,16 +13500,12 @@ void Player::_LoadQuestStatus(QueryResult *result)
                     questStatusData.m_status = QUEST_STATUS_NONE;
                     sLog.outError("Player %s have invalid quest %d status (%d), replaced by QUEST_STATUS_NONE(0).",GetName(),quest_id,qstatus);
                 }
-
                 questStatusData.m_rewarded = ( fields[2].GetUInt8() > 0 );
                 questStatusData.m_explored = ( fields[3].GetUInt8() > 0 );
-
                 time_t quest_time = time_t(fields[4].GetUInt64());
-
                 if( pQuest->HasFlag( QUEST_TRINITY_FLAGS_TIMED ) && !GetQuestRewardStatus(quest_id) &&  questStatusData.m_status != QUEST_STATUS_NONE )
                 {
                     AddTimedQuest( quest_id );
-
                     if (quest_time <= sWorld.GetGameTime())
                         questStatusData.m_timer = 1;
                     else
@@ -15855,7 +13513,6 @@ void Player::_LoadQuestStatus(QueryResult *result)
                 }
                 else
                     quest_time = 0;
-
                 questStatusData.m_creatureOrGOcount[0] = fields[5].GetUInt32();
                 questStatusData.m_creatureOrGOcount[1] = fields[6].GetUInt32();
                 questStatusData.m_creatureOrGOcount[2] = fields[7].GetUInt32();
@@ -15864,9 +13521,7 @@ void Player::_LoadQuestStatus(QueryResult *result)
                 questStatusData.m_itemcount[1] = fields[10].GetUInt32();
                 questStatusData.m_itemcount[2] = fields[11].GetUInt32();
                 questStatusData.m_itemcount[3] = fields[12].GetUInt32();
-
                 questStatusData.uState = QUEST_UNCHANGED;
-
                 // add to quest log
                 if (slot < MAX_QUEST_LOG_SIZE &&
                     ((questStatusData.m_status == QUEST_STATUS_INCOMPLETE ||
@@ -15875,60 +13530,46 @@ void Player::_LoadQuestStatus(QueryResult *result)
                     (!questStatusData.m_rewarded || pQuest->IsDaily())))
                 {
                     SetQuestSlot(slot, quest_id, quest_time);
-
                     if (questStatusData.m_status == QUEST_STATUS_COMPLETE)
                         SetQuestSlotState(slot, QUEST_STATE_COMPLETE);
-
                     if (questStatusData.m_status == QUEST_STATUS_FAILED)
                         SetQuestSlotState(slot, QUEST_STATE_FAIL);
-
                     for(uint8 idx = 0; idx < QUEST_OBJECTIVES_COUNT; ++idx)
                         if(questStatusData.m_creatureOrGOcount[idx])
                             SetQuestSlotCounter(slot, idx, questStatusData.m_creatureOrGOcount[idx]);
-
                     ++slot;
                 }
-
                 if(questStatusData.m_rewarded)
                 {
                     // learn rewarded spell if unknown
                     learnQuestRewardedSpells(pQuest);
-
                     // set rewarded title if any
                     if(pQuest->GetCharTitleId())
                     {
                         if(CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(pQuest->GetCharTitleId()))
                             SetTitle(titleEntry);
                     }
-
                     if(pQuest->GetBonusTalents())
                         m_questRewardTalentCount += pQuest->GetBonusTalents();
                 }
-
                 sLog.outDebug("Quest status is {%u} for quest {%u} for player (GUID: %u)", questStatusData.m_status, quest_id, GetGUIDLow());
             }
         }
         while( result->NextRow() );
-
         delete result;
     }
-
     // clear quest log tail
     for ( uint16 i = slot; i < MAX_QUEST_LOG_SIZE; ++i )
         SetQuestSlot(i, 0);
 }
-
 void Player::_LoadDailyQuestStatus(QueryResult *result)
 {
     for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
         SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0);
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT quest,time FROM character_queststatus_daily WHERE guid = '%u'", GetGUIDLow());
-
     if(result)
     {
         uint32 quest_daily_idx = 0;
-
         do
         {
             if(quest_daily_idx >= PLAYER_MAX_DAILY_QUESTS)  // max amount with exist data in query
@@ -15936,49 +13577,36 @@ void Player::_LoadDailyQuestStatus(QueryResult *result)
                 sLog.outError("Player (GUID: %u) have more 25 daily quest records in `charcter_queststatus_daily`",GetGUIDLow());
                 break;
             }
-
             Field *fields = result->Fetch();
-
             uint32 quest_id = fields[0].GetUInt32();
-
             // save _any_ from daily quest times (it must be after last reset anyway)
             m_lastDailyQuestTime = (time_t)fields[1].GetUInt64();
-
             Quest const* pQuest = objmgr.GetQuestTemplate(quest_id);
             if( !pQuest )
                 continue;
-
             SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,quest_id);
             ++quest_daily_idx;
-
             sLog.outDebug("Daily quest {%u} cooldown for player (GUID: %u)", quest_id, GetGUIDLow());
         }
         while( result->NextRow() );
-
         delete result;
     }
-
     m_DailyQuestChanged = false;
 }
-
 void Player::_LoadSpells(QueryResult *result)
 {
     //QueryResult *result = CharacterDatabase.PQuery("SELECT spell,active,disabled FROM character_spell WHERE guid = '%u'",GetGUIDLow());
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             addSpell(fields[0].GetUInt32(), fields[1].GetBool(), false, false, fields[2].GetBool());
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Player::_LoadGroup(QueryResult *result)
 {
     //QueryResult *result = CharacterDatabase.PQuery("SELECT leaderGuid FROM group_member WHERE memberGuid='%u'", GetGUIDLow());
@@ -15999,14 +13627,11 @@ void Player::_LoadGroup(QueryResult *result)
         }
     }
 }
-
 void Player::_LoadBoundInstances(QueryResult *result)
 {
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++)
         m_boundInstances[i].clear();
-
     Group *group = GetGroup();
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT id, permanent, map, difficulty, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = '%u'", GUID_LOPART(m_guid));
     if(result)
     {
@@ -16021,7 +13646,6 @@ void Player::_LoadBoundInstances(QueryResult *result)
             // the resettime for normal instances is only saved when the InstanceSave is unloaded
             // so the value read from the DB may be wrong here but only if the InstanceSave is loaded
             // and in that case it is not used
-
             MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
             if(!mapEntry || !mapEntry->IsDungeon())
             {
@@ -16029,14 +13653,12 @@ void Player::_LoadBoundInstances(QueryResult *result)
                 CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId);
                 continue;
             }
-
             if(!perm && group)
             {
                 sLog.outError("_LoadBoundInstances: player %s(%d) is in group %d but has a non-permanent character bind to map %d,%d,%d", GetName(), GetGUIDLow(), GUID_LOPART(group->GetLeaderGUID()), mapId, instanceId, difficulty);
                 CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND instance = '%d'", GetGUIDLow(), instanceId);
                 continue;
             }
-
             // since non permanent binds are always solo bind, they can always be reset
             InstanceSave *save = sInstanceSaveManager.AddInstanceSave(mapId, instanceId, difficulty, resetTime, !perm, true);
             if(save) BindToInstance(save, perm, true);
@@ -16044,20 +13666,17 @@ void Player::_LoadBoundInstances(QueryResult *result)
         delete result;
     }
 }
-
 InstancePlayerBind* Player::GetBoundInstance(uint32 mapid, uint8 difficulty)
 {
     // some instances only have one difficulty
     const MapEntry* entry = sMapStore.LookupEntry(mapid);
     if(!entry || !entry->SupportsHeroicMode()) difficulty = DIFFICULTY_NORMAL;
-
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
     if(itr != m_boundInstances[difficulty].end())
         return &itr->second;
     else
         return NULL;
 }
-
 InstanceSave * Player::GetInstanceSave(uint32 mapid)
 {
     InstancePlayerBind *pBind = GetBoundInstance(mapid, GetDifficulty());
@@ -16070,13 +13689,11 @@ InstanceSave * Player::GetInstanceSave(uint32 mapid)
     }
     return pSave;
 }
-
 void Player::UnbindInstance(uint32 mapid, uint8 difficulty, bool unload)
 {
     BoundInstancesMap::iterator itr = m_boundInstances[difficulty].find(mapid);
     UnbindInstance(itr, difficulty, unload);
 }
-
 void Player::UnbindInstance(BoundInstancesMap::iterator &itr, uint8 difficulty, bool unload)
 {
     if(itr != m_boundInstances[difficulty].end())
@@ -16086,7 +13703,6 @@ void Player::UnbindInstance(BoundInstancesMap::iterator &itr, uint8 difficulty,
         m_boundInstances[difficulty].erase(itr++);
     }
 }
-
 InstancePlayerBind* Player::BindToInstance(InstanceSave *save, bool permanent, bool load)
 {
     if(save)
@@ -16100,15 +13716,12 @@ InstancePlayerBind* Player::BindToInstance(InstanceSave *save, bool permanent, b
         }
         else
             if(!load) CharacterDatabase.PExecute("INSERT INTO character_instance (guid, instance, permanent) VALUES ('%u', '%u', '%u')", GetGUIDLow(), save->GetInstanceId(), permanent);
-
         if(bind.save != save)
         {
             if(bind.save) bind.save->RemovePlayer(this);
             save->AddPlayer(this);
         }
-
         if(permanent) save->SetCanReset(false);
-
         bind.save = save;
         bind.perm = permanent;
         if(!load) sLog.outDebug("Player::BindToInstance: %s(%d) is now bound to map %d, instance %d, difficulty %d", GetName(), GetGUIDLow(), save->GetMapId(), save->GetInstanceId(), save->GetDifficulty());
@@ -16117,18 +13730,13 @@ InstancePlayerBind* Player::BindToInstance(InstanceSave *save, bool permanent, b
     else
         return NULL;
 }
-
 void Player::SendRaidInfo()
 {
     uint32 counter = 0;
-
     WorldPacket data(SMSG_RAID_INSTANCE_INFO, 4);
-
     size_t p_counter = data.wpos();
     data << uint32(counter);                                // placeholder
-
     time_t now = time(NULL);
-
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; ++i)
     {
         for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
@@ -16148,7 +13756,6 @@ void Player::SendRaidInfo()
     data.put<uint32>(p_counter, counter);
     GetSession()->SendPacket(&data);
 }
-
 /*
 - called on every successful teleportation to a map
 */
@@ -16156,7 +13763,6 @@ void Player::SendSavedInstances()
 {
     bool hasBeenSaved = false;
     WorldPacket data;
-
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++)
     {
         for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
@@ -16168,15 +13774,12 @@ void Player::SendSavedInstances()
             }
         }
     }
-
     //Send opcode 811. true or false means, whether you have current raid/heroic instances
     data.Initialize(SMSG_UPDATE_INSTANCE_OWNERSHIP);
     data << uint32(hasBeenSaved);
     GetSession()->SendPacket(&data);
-
     if(!hasBeenSaved)
         return;
-
     for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++)
     {
         for (BoundInstancesMap::iterator itr = m_boundInstances[i].begin(); itr != m_boundInstances[i].end(); ++itr)
@@ -16190,19 +13793,15 @@ void Player::SendSavedInstances()
         }
     }
 }
-
 /// convert the player's binds to the group
 void Player::ConvertInstancesToGroup(Player *player, Group *group, uint64 player_guid)
 {
     bool has_binds = false;
     bool has_solo = false;
-
     if(player) { player_guid = player->GetGUID(); if(!group) group = player->GetGroup(); }
     assert(player_guid);
-
     // copy all binds to the group, when changing leader it's assumed the character
     // will not have any solo binds
-
     if(player)
     {
         for(uint8 i = 0; i < TOTAL_DIFFICULTIES; i++)
@@ -16222,20 +13821,17 @@ void Player::ConvertInstancesToGroup(Player *player, Group *group, uint64 player
             }
         }
     }
-
     // if the player's not online we don't know what binds it has
     if(!player || !group || has_binds) CharacterDatabase.PExecute("INSERT INTO group_instance SELECT guid, instance, permanent FROM character_instance WHERE guid = '%u'", GUID_LOPART(player_guid));
     // the following should not get executed when changing leaders
     if(!player || has_solo) CharacterDatabase.PExecute("DELETE FROM character_instance WHERE guid = '%d' AND permanent = 0", GUID_LOPART(player_guid));
 }
-
 bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report)
 {
     if(!isGameMaster() && ar)
     {
         uint32 LevelMin = 0;
         uint32 LevelMax = 0;
-
         if(!sWorld.getConfig(CONFIG_INSTANCE_IGNORE_LEVEL))
         {
             if(ar->levelMin && getLevel() < ar->levelMin)
@@ -16245,7 +13841,6 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
             if(ar->levelMax && getLevel() > ar->levelMax)
                 LevelMax = ar->levelMax;
         }
-
         uint32 missingItem = 0;
         if(ar->item)
         {
@@ -16255,7 +13850,6 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
         }
         else if(ar->item2 && !HasItemCount(ar->item2, 1))
             missingItem = ar->item2;
-
         uint32 missingKey = 0;
         uint32 missingHeroicQuest = 0;
         if(GetDifficulty() == DIFFICULTY_HEROIC)
@@ -16268,15 +13862,12 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
             }
             else if(ar->heroicKey2 && !HasItemCount(ar->heroicKey2, 1))
                 missingKey = ar->heroicKey2;
-
             if(ar->heroicQuest && !GetQuestRewardStatus(ar->heroicQuest))
                 missingHeroicQuest = ar->heroicQuest;
         }
-
         uint32 missingQuest = 0;
         if(ar->quest && !GetQuestRewardStatus(ar->quest))
             missingQuest = ar->quest;
-
         if(LevelMin || LevelMax || missingItem || missingKey || missingQuest || missingHeroicQuest)
         {
             if(report)
@@ -16297,7 +13888,6 @@ bool Player::Satisfy(AccessRequirement const *ar, uint32 target_map, bool report
     }
     return true;
 }
-
 bool Player::_LoadHomeBind(QueryResult *result)
 {
     PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
@@ -16306,7 +13896,6 @@ bool Player::_LoadHomeBind(QueryResult *result)
         sLog.outError("Player have incorrect race/class pair. Can't be loaded.");
         return false;
     }
-
     bool ok = false;
     //QueryResult *result = CharacterDatabase.PQuery("SELECT map,zone,position_x,position_y,position_z FROM character_homebind WHERE guid = '%u'", GUID_LOPART(playerGuid));
     if (result)
@@ -16318,9 +13907,7 @@ bool Player::_LoadHomeBind(QueryResult *result)
         m_homebindY = fields[3].GetFloat();
         m_homebindZ = fields[4].GetFloat();
         delete result;
-
         MapEntry const* bindMapEntry = sMapStore.LookupEntry(m_homebindMapId);
-
         // accept saved data only for valid position (and non instanceable), and accessable
         if( MapManager::IsValidMapCoord(m_homebindMapId,m_homebindX,m_homebindY,m_homebindZ) &&
             !bindMapEntry->Instanceable() && GetSession()->Expansion() >= bindMapEntry->Expansion())
@@ -16330,7 +13917,6 @@ bool Player::_LoadHomeBind(QueryResult *result)
         else
             CharacterDatabase.PExecute("DELETE FROM character_homebind WHERE guid = '%u'", GetGUIDLow());
     }
-
     if(!ok)
     {
         m_homebindMapId = info->mapId;
@@ -16338,45 +13924,33 @@ bool Player::_LoadHomeBind(QueryResult *result)
         m_homebindX = info->positionX;
         m_homebindY = info->positionY;
         m_homebindZ = info->positionZ;
-
         CharacterDatabase.PExecute("INSERT INTO character_homebind (guid,map,zone,position_x,position_y,position_z) VALUES ('%u', '%u', '%u', '%f', '%f', '%f')", GetGUIDLow(), m_homebindMapId, (uint32)m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ);
     }
-
     DEBUG_LOG("Setting player home position: mapid is: %u, zoneid is %u, X is %f, Y is %f, Z is %f",
         m_homebindMapId, m_homebindZoneId, m_homebindX, m_homebindY, m_homebindZ);
-
     return true;
 }
-
 /*********************************************************/
 /***                   SAVE SYSTEM                     ***/
 /*********************************************************/
-
 void Player::SaveToDB()
 {
     // delay auto save at any saves (manual, in code, or autosave)
     m_nextSave = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
-
     //lets allow only players in world to be saved
     if(IsBeingTeleportedFar())
     {
         ScheduleDelayedOperation(DELAYED_SAVE_PLAYER);
         return;
     }
-
     // first save/honor gain after midnight will also update the player's honor fields
     UpdateHonorFields();
-
     sLog.outDebug("The value of player %s at save: ", m_name.c_str());
     outDebugValues();
-
     CharacterDatabase.BeginTransaction();
-
     CharacterDatabase.PExecute("DELETE FROM characters WHERE guid = '%u'",GetGUIDLow());
-
     std::string sql_name = m_name;
     CharacterDatabase.escape_string(sql_name);
-
     std::ostringstream ss;
     ss << "INSERT INTO characters (guid,account,name,race,class,gender,level,xp,money,playerBytes,playerBytes2,playerFlags,"
         "map, instance_id, dungeon_difficulty, position_x, position_y, position_z, orientation, data, "
@@ -16396,7 +13970,6 @@ void Player::SaveToDB()
         << GetUInt32Value(PLAYER_BYTES) << ", "
         << GetUInt32Value(PLAYER_BYTES_2) << ", "
         << GetUInt32Value(PLAYER_FLAGS) << ", ";
-
     if(!IsBeingTeleported())
     {
         ss << GetMapId() << ", "
@@ -16417,24 +13990,17 @@ void Player::SaveToDB()
         << finiteAlways(GetTeleportDest().GetPositionZ()) << ", "
         << finiteAlways(GetTeleportDest().GetOrientation()) << ", '";
     }
-
     uint16 i;
     for( i = 0; i < m_valuesCount; i++ )
     {
         ss << GetUInt32Value(i) << " ";
     }
-
     ss << "', ";
-
     ss << m_taxi << ", ";                                   // string with TaxiMaskSize numbers
-
     ss << (IsInWorld() ? 1 : 0) << ", ";
-
     ss << m_cinematic << ", ";
-
     ss << m_Played_time[PLAYED_TIME_TOTAL] << ", ";
     ss << m_Played_time[PLAYED_TIME_LEVEL] << ", ";
-
     ss << finiteAlways(m_rest_bonus) << ", ";
     ss << (uint64)time(NULL) << ", ";
     ss << (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) ? 1 : 0) << ", ";
@@ -16442,7 +14008,6 @@ void Player::SaveToDB()
                                                             //save, but in tavern/city
     ss << m_resetTalentsCost << ", ";
     ss << (uint64)m_resetTalentsTime << ", ";
-
     ss << finiteAlways(m_movementInfo.t_x) << ", ";
     ss << finiteAlways(m_movementInfo.t_y) << ", ";
     ss << finiteAlways(m_movementInfo.t_z) << ", ";
@@ -16452,17 +14017,11 @@ void Player::SaveToDB()
     else
         ss << "0";
     ss << ", ";
-
     ss << m_ExtraFlags << ", ";
-
     ss << uint32(m_stableSlots) << ", ";                    // to prevent save uint8 as char
-
     ss << uint32(m_atLoginFlags) << ", ";
-
     ss << GetZoneId() << ", ";
-
     ss << (uint64)m_deathExpireTime << ", '";
-
     ss << m_taxi.SaveTaxiDestinationsToString() << "', ";
     ss << "'0', ";                                          // arena_pending_points
     ss << GetSession()->GetLatency();
@@ -16471,12 +14030,9 @@ void Player::SaveToDB()
     ss << ", ";
     ss << uint32(m_activeSpec);
     ss << ")";
-
     CharacterDatabase.Execute( ss.str().c_str() );
-
     if(m_mailsUpdated)                                      //save mails only when needed
         _SaveMail();
-
     _SaveBGData();
     _SaveInventory();
     _SaveQuestStatus();
@@ -16491,26 +14047,21 @@ void Player::SaveToDB()
     _SaveEquipmentSets();
     GetSession()->SaveTutorialsData();                      // changed only while character in game
     _SaveGlyphs();
-
     CharacterDatabase.CommitTransaction();
-
     // save pet (hunter pet level and experience and all type pets health/mana).
     if(Pet* pet = GetPet())
         pet->SavePetToDB(PET_SAVE_AS_CURRENT);
 }
-
 // fast save function for item/money cheating preventing - save only inventory and money state
 void Player::SaveInventoryAndGoldToDB()
 {
     _SaveInventory();
     SaveGoldToDB();
 }
-
 void Player::SaveGoldToDB()
 {
     CharacterDatabase.PExecute("UPDATE characters SET money = '%u' WHERE guid = '%u'", GetMoney(), GetGUIDLow());
 }
-
 void Player::_SaveActions()
 {
     for(ActionButtonList::iterator itr = m_actionButtons.begin(); itr != m_actionButtons.end(); )
@@ -16539,17 +14090,14 @@ void Player::_SaveActions()
         }
     }
 }
-
 void Player::_SaveAuras()
 {
     CharacterDatabase.PExecute("DELETE FROM character_aura WHERE guid = '%u'",GetGUIDLow());
-
     AuraMap const& auras = GetAuras();
     for(AuraMap::const_iterator itr = auras.begin(); itr !=auras.end() ; ++itr)
     {
         if(!itr->second->CanBeSaved())
             continue;
-
         int32 amounts[MAX_SPELL_EFFECTS];
         for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i)
         {
@@ -16558,7 +14106,6 @@ void Player::_SaveAuras()
             else
                 amounts[i]=0;
         }
-
         CharacterDatabase.PExecute("INSERT INTO character_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) "
             "VALUES ('%u', '" UI64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
             GetGUIDLow(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
@@ -16566,7 +14113,6 @@ void Player::_SaveAuras()
             ,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges()));
     }
 }
-
 void Player::_SaveInventory()
 {
     // force items in buyback slots to new state
@@ -16579,16 +14125,13 @@ void Player::_SaveInventory()
         CharacterDatabase.PExecute("DELETE FROM item_instance WHERE guid = '%u'", item->GetGUIDLow());
         m_items[i]->FSetState(ITEM_NEW);
     }
-
     // update enchantment durations
     for(EnchantDurationList::iterator itr = m_enchantDuration.begin();itr != m_enchantDuration.end();++itr)
     {
         itr->item->SetEnchantmentDuration(itr->slot,itr->leftduration);
     }
-
     // if no changes
     if (m_itemUpdateQueue.empty()) return;
-
     // do not save if the update queue is corrupt
     bool error = false;
     for(size_t i = 0; i < m_itemUpdateQueue.size(); i++)
@@ -16596,7 +14139,6 @@ void Player::_SaveInventory()
         Item *item = m_itemUpdateQueue[i];
         if(!item || item->GetState() == ITEM_REMOVED) continue;
         Item *test = GetItemByPos( item->GetBagSlot(), item->GetSlot());
-
         if (test == NULL)
         {
             sLog.outCrash("Player(GUID: %u Name: %s)::_SaveInventory - the bag(%d) and slot(%d) values for the item with guid %d (state %d) are incorrect, the player doesn't have an item at that position!", GetGUIDLow(), GetName(), item->GetBagSlot(), item->GetSlot(), item->GetGUIDLow(), (int32)item->GetState());
@@ -16609,22 +14151,18 @@ void Player::_SaveInventory()
             error = true;
         }
     }
-
     if (error)
     {
         sLog.outError("Player::_SaveInventory - one or more errors occurred save aborted!");
         ChatHandler(this).SendSysMessage(LANG_ITEM_SAVE_FAILED);
         return;
     }
-
     for(size_t i = 0; i < m_itemUpdateQueue.size(); i++)
     {
         Item *item = m_itemUpdateQueue[i];
         if(!item) continue;
-
         Bag *container = item->GetContainer();
         uint32 bag_guid = container ? container->GetGUIDLow() : 0;
-
         switch(item->GetState())
         {
             case ITEM_NEW:
@@ -16639,17 +14177,14 @@ void Player::_SaveInventory()
             case ITEM_UNCHANGED:
                 break;
         }
-
         item->SaveToDB();                                   // item have unchanged inventory record and can be save standalone
     }
     m_itemUpdateQueue.clear();
 }
-
 void Player::_SaveMail()
 {
     if (!m_mailsLoaded)
         return;
-
     for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); ++itr)
     {
         Mail *m = (*itr);
@@ -16676,7 +14211,6 @@ void Player::_SaveMail()
             CharacterDatabase.PExecute("DELETE FROM mail_items WHERE mail_id = '%u'", m->messageID);
         }
     }
-
     //deallocate deleted mails...
     for (PlayerMails::iterator itr = m_mail.begin(); itr != m_mail.end(); )
     {
@@ -16690,10 +14224,8 @@ void Player::_SaveMail()
         else
             ++itr;
     }
-
     m_mailsUpdated = false;
 }
-
 void Player::_SaveQuestStatus()
 {
     // we don't need transactions here.
@@ -16716,16 +14248,12 @@ void Player::_SaveQuestStatus()
         i->second.uState = QUEST_UNCHANGED;
     }
 }
-
 void Player::_SaveDailyQuestStatus()
 {
     if(!m_DailyQuestChanged)
         return;
-
     m_DailyQuestChanged = false;
-
     // save last daily quest time for all quests: we need only mostly reset time for reset check anyway
-
     // we don't need transactions here.
     CharacterDatabase.PExecute("DELETE FROM character_queststatus_daily WHERE guid = '%u'",GetGUIDLow());
     for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
@@ -16733,18 +14261,15 @@ void Player::_SaveDailyQuestStatus()
             CharacterDatabase.PExecute("INSERT INTO character_queststatus_daily (guid,quest,time) VALUES ('%u', '%u','" UI64FMTD "')",
                 GetGUIDLow(), GetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx),uint64(m_lastDailyQuestTime));
 }
-
 void Player::_SaveSpells()
 {
     for (PlayerSpellMap::iterator itr = m_spells.begin(), next = m_spells.begin(); itr != m_spells.end();)
     {
         if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->state == PLAYERSPELL_CHANGED)
             CharacterDatabase.PExecute("DELETE FROM character_spell WHERE guid = '%u' and spell = '%u'", GetGUIDLow(), itr->first);
-
         // add only changed/new not dependent spells
         if (!itr->second->dependent && (itr->second->state == PLAYERSPELL_NEW || itr->second->state == PLAYERSPELL_CHANGED))
             CharacterDatabase.PExecute("INSERT INTO character_spell (guid,spell,active,disabled) VALUES ('%u', '%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->active ? 1 : 0,itr->second->disabled ? 1 : 0);
-
         if (itr->second->state == PLAYERSPELL_REMOVED)
         {
             delete itr->second;
@@ -16755,15 +14280,12 @@ void Player::_SaveSpells()
             itr->second->state = PLAYERSPELL_UNCHANGED;
             ++itr;
         }
-
     }
 }
-
 void Player::outDebugValues() const
 {
     if(!sLog.IsOutDebug())                                  // optimize disabled debug output
         return;
-
     sLog.outDebug("HP is: \t\t\t%u\t\tMP is: \t\t\t%u",GetMaxHealth(), GetMaxPower(POWER_MANA));
     sLog.outDebug("AGILITY is: \t\t%f\t\tSTRENGTH is: \t\t%f",GetStat(STAT_AGILITY), GetStat(STAT_STRENGTH));
     sLog.outDebug("INTELLECT is: \t\t%f\t\tSPIRIT is: \t\t%f",GetStat(STAT_INTELLECT), GetStat(STAT_SPIRIT));
@@ -16777,24 +14299,20 @@ void Player::outDebugValues() const
     sLog.outDebug("MIN_RANGED_DAMAGE is: \t%f\tMAX_RANGED_DAMAGE is: \t%f",GetFloatValue(UNIT_FIELD_MINRANGEDDAMAGE), GetFloatValue(UNIT_FIELD_MAXRANGEDDAMAGE));
     sLog.outDebug("ATTACK_TIME is: \t%u\t\tRANGE_ATTACK_TIME is: \t%u",GetAttackTime(BASE_ATTACK), GetAttackTime(RANGED_ATTACK));
 }
-
 /*********************************************************/
 /***               FLOOD FILTER SYSTEM                 ***/
 /*********************************************************/
-
 void Player::UpdateSpeakTime()
 {
     // ignore chat spam protection for GMs in any mode
     if(GetSession()->GetSecurity() > SEC_PLAYER)
         return;
-
     time_t current = time (NULL);
     if(m_speakTime > current)
     {
         uint32 max_count = sWorld.getConfig(CONFIG_CHATFLOOD_MESSAGE_COUNT);
         if(!max_count)
             return;
-
         ++m_speakCount;
         if(m_speakCount >= max_count)
         {
@@ -16802,31 +14320,25 @@ void Player::UpdateSpeakTime()
             time_t new_mute = current + sWorld.getConfig(CONFIG_CHATFLOOD_MUTE_TIME);
             if(GetSession()->m_muteTime < new_mute)
                 GetSession()->m_muteTime = new_mute;
-
             m_speakCount = 0;
         }
     }
     else
         m_speakCount = 0;
-
     m_speakTime = current + sWorld.getConfig(CONFIG_CHATFLOOD_MESSAGE_DELAY);
 }
-
 bool Player::CanSpeak() const
 {
     return  GetSession()->m_muteTime <= time (NULL);
 }
-
 /*********************************************************/
 /***              LOW LEVEL FUNCTIONS:Notifiers        ***/
 /*********************************************************/
-
 void Player::SendAttackSwingNotInRange()
 {
     WorldPacket data(SMSG_ATTACKSWING_NOTINRANGE, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint32 zone,uint64 guid)
 {
     std::ostringstream ss;
@@ -16837,21 +14349,17 @@ void Player::SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint
     sLog.outDebug(ss.str().c_str());
     CharacterDatabase.Execute(ss.str().c_str());
 }
-
 void Player::SaveDataFieldToDB()
 {
     std::ostringstream ss;
     ss<<"UPDATE characters SET data='";
-
     for(uint16 i = 0; i < m_valuesCount; i++ )
     {
         ss << GetUInt32Value(i) << " ";
     }
     ss<<"' WHERE guid='"<< GUID_LOPART(GetGUIDLow()) <<"'";
-
     CharacterDatabase.Execute(ss.str().c_str());
 }
-
 bool Player::SaveValuesArrayInDB(Tokens const& tokens, uint64 guid)
 {
     std::ostringstream ss2;
@@ -16862,93 +14370,73 @@ bool Player::SaveValuesArrayInDB(Tokens const& tokens, uint64 guid)
         ss2<<tokens[i]<<" ";
     }
     ss2<<"' WHERE guid='"<< GUID_LOPART(guid) <<"'";
-
     return CharacterDatabase.Execute(ss2.str().c_str());
 }
-
 void Player::SetUInt32ValueInArray(Tokens& tokens,uint16 index, uint32 value)
 {
     char buf[11];
     snprintf(buf,11,"%u",value);
-
     if(index >= tokens.size())
         return;
-
     tokens[index] = buf;
 }
-
 void Player::SetUInt32ValueInDB(uint16 index, uint32 value, uint64 guid)
 {
     Tokens tokens;
     if(!LoadValuesArrayFromDB(tokens,guid))
         return;
-
     if(index >= tokens.size())
         return;
-
     char buf[11];
     snprintf(buf,11,"%u",value);
     tokens[index] = buf;
-
     SaveValuesArrayInDB(tokens,guid);
 }
-
 void Player::SetFloatValueInDB(uint16 index, float value, uint64 guid)
 {
     uint32 temp;
     memcpy(&temp, &value, sizeof(value));
     Player::SetUInt32ValueInDB(index, temp, guid);
 }
-
 void Player::Customize(uint64 guid, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair)
 {
     //                                                     0
     QueryResult* result = CharacterDatabase.PQuery("SELECT playerBytes2 FROM characters WHERE guid = '%u'", GUID_LOPART(guid));
     if(!result)
         return;
-
     Field* fields = result->Fetch();
-
     uint32 player_bytes2 = fields[0].GetUInt32();
     player_bytes2 &= ~0xFF;
     player_bytes2 |= facialHair;
-
     CharacterDatabase.PExecute("UPDATE characters SET gender = '%u', playerBytes = '%u', playerBytes2 = '%u' WHERE guid = '%u'", gender, skin | (face << 8) | (hairStyle << 16) | (hairColor << 24), player_bytes2, GUID_LOPART(guid));
-
     delete result;
 }
-
 void Player::SendAttackSwingDeadTarget()
 {
     WorldPacket data(SMSG_ATTACKSWING_DEADTARGET, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendAttackSwingCantAttack()
 {
     WorldPacket data(SMSG_ATTACKSWING_CANT_ATTACK, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendAttackSwingCancelAttack()
 {
     WorldPacket data(SMSG_CANCEL_COMBAT, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendAttackSwingBadFacingAttack()
 {
     WorldPacket data(SMSG_ATTACKSWING_BADFACING, 0);
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendAutoRepeatCancel(Unit *target)
 {
     WorldPacket data(SMSG_CANCEL_AUTO_REPEAT, target->GetPackGUID().size());
     data.append(target->GetPackGUID());                     // may be it's target guid
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendExplorationExperience(uint32 Area, uint32 Experience)
 {
     WorldPacket data( SMSG_EXPLORATION_EXPERIENCE, 8 );
@@ -16956,7 +14444,6 @@ void Player::SendExplorationExperience(uint32 Area, uint32 Experience)
     data << Experience;
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendDungeonDifficulty(bool IsInGroup)
 {
     uint8 val = 0x00000001;
@@ -16966,22 +14453,18 @@ void Player::SendDungeonDifficulty(bool IsInGroup)
     data << uint32(IsInGroup);
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendResetFailedNotify(uint32 mapid)
 {
     WorldPacket data(SMSG_RESET_FAILED_NOTIFY, 4);
     data << uint32(mapid);
     GetSession()->SendPacket(&data);
 }
-
 /// Reset all solo instances and optionally send a message on success for each
 void Player::ResetInstances(uint8 method)
 {
     // method can be INSTANCE_RESET_ALL, INSTANCE_RESET_CHANGE_DIFFICULTY, INSTANCE_RESET_GROUP_JOIN
-
     // we assume that when the difficulty changes, all instances that can be reset will be
     uint8 dif = GetDifficulty();
-
     for (BoundInstancesMap::iterator itr = m_boundInstances[dif].begin(); itr != m_boundInstances[dif].end();)
     {
         InstanceSave *p = itr->second.save;
@@ -16991,7 +14474,6 @@ void Player::ResetInstances(uint8 method)
             ++itr;
             continue;
         }
-
         if(method == INSTANCE_RESET_ALL)
         {
             // the "reset all instances" method can only reset normal maps
@@ -17001,7 +14483,6 @@ void Player::ResetInstances(uint8 method)
                 continue;
             }
         }
-
         // if the map is loaded, reset it
         Map *map = MapManager::Instance().FindMap(p->GetMapId(), p->GetInstanceId());
         if(map && map->IsDungeon())
@@ -17010,26 +14491,21 @@ void Player::ResetInstances(uint8 method)
                 ++itr;
                 continue;
             }
-
         // since this is a solo instance there should not be any players inside
         if(method == INSTANCE_RESET_ALL || method == INSTANCE_RESET_CHANGE_DIFFICULTY)
             SendResetInstanceSuccess(p->GetMapId());
-
         p->DeleteFromDB();
         m_boundInstances[dif].erase(itr++);
-
         // the following should remove the instance save from the manager and delete it as well
         p->RemovePlayer(this);
     }
 }
-
 void Player::SendResetInstanceSuccess(uint32 MapId)
 {
     WorldPacket data(SMSG_INSTANCE_RESET, 4);
     data << MapId;
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
 {
     // TODO: find what other fail reasons there are besides players in the instance
@@ -17038,11 +14514,9 @@ void Player::SendResetInstanceFailed(uint32 reason, uint32 MapId)
     data << MapId;
     GetSession()->SendPacket(&data);
 }
-
 /*********************************************************/
 /***              Update timers                        ***/
 /*********************************************************/
-
 ///checks the 15 afk reports per 5 minutes limit
 void Player::UpdateAfkReport(time_t currTime)
 {
@@ -17052,7 +14526,6 @@ void Player::UpdateAfkReport(time_t currTime)
         m_bgData.bgAfkReportedTimer = currTime+5*MINUTE;
     }
 }
-
 void Player::UpdateContestedPvP(uint32 diff)
 {
     if(!m_contestedPvPTimer||isInCombat())
@@ -17064,68 +14537,54 @@ void Player::UpdateContestedPvP(uint32 diff)
     else
         m_contestedPvPTimer -= diff;
 }
-
 void Player::UpdatePvPFlag(time_t currTime)
 {
     if(!IsPvP())
         return;
     if(pvpInfo.endTimer == 0 || currTime < (pvpInfo.endTimer + 300))
         return;
-
     UpdatePvP(false);
 }
-
 void Player::UpdateDuelFlag(time_t currTime)
 {
     if(!duel || duel->startTimer == 0 ||currTime < duel->startTimer + 3)
         return;
-
     SetUInt32Value(PLAYER_DUEL_TEAM, 1);
     duel->opponent->SetUInt32Value(PLAYER_DUEL_TEAM, 2);
-
     duel->startTimer = 0;
     duel->startTime  = currTime;
     duel->opponent->duel->startTimer = 0;
     duel->opponent->duel->startTime  = currTime;
 }
-
 Pet* Player::GetPet() const
 {
     if(uint64 pet_guid = GetPetGUID())
     {
         if(!IS_PET_GUID(pet_guid))
             return NULL;
-
         if(Pet* pet = ObjectAccessor::GetPet(pet_guid))
             return pet;
-
         //there may be a guardian in slot
         //sLog.outError("Player::GetPet: Pet %u not exist.",GUID_LOPART(pet_guid));
         //const_cast<Player*>(this)->SetPetGUID(0);
     }
-
     return NULL;
 }
-
 void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
 {
     if(!pet)
         pet = GetPet();
-
     if(pet)
     {
         sLog.outDebug("RemovePet %u, %u, %u", pet->GetEntry(), mode, returnreagent);
-
         if(pet->m_removed)
             return;
     }
-
     if(returnreagent && (pet || m_temporaryUnsummonedPetNumber) && !InBattleGround())
     {
         //returning of reagents only for players, so best done here
         uint32 spellId = pet ? pet->GetUInt32Value(UNIT_CREATED_BY_SPELL) : m_oldpetspell;
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
-
         if(spellInfo)
         {
             for(uint32 i = 0; i < 7; ++i)
@@ -17145,12 +14604,9 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
         }
         m_temporaryUnsummonedPetNumber = 0;
     }
-
     if(!pet || pet->GetOwnerGUID()!=GetGUID())
         return;
-
     pet->CombatStop();
-
     if(returnreagent)
     {
         switch(pet->GetEntry())
@@ -17164,32 +14620,25 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
                 break;
         }
     }
-
     // only if current pet in slot
     pet->SavePetToDB(mode);
-
     SetMinion(pet, false);
-
     pet->AddObjectToRemoveList();
     pet->m_removed = true;
-
     if(pet->isControlled())
     {
         WorldPacket data(SMSG_PET_SPELLS, 8);
         data << uint64(0);
         GetSession()->SendPacket(&data);
-
         if(GetGroup())
             SetGroupUpdateFlag(GROUP_UPDATE_PET);
     }
 }
-
 void Player::StopCastingCharm()
 {
     Unit* charm = GetCharm();
     if(!charm)
         return;
-
     if(charm->GetTypeId() == TYPEID_UNIT)
     {
         if(((Creature*)charm)->HasUnitTypeMask(UNIT_MASK_PUPPET))
@@ -17199,7 +14648,6 @@ void Player::StopCastingCharm()
     }
     if(GetCharmGUID())
         charm->RemoveCharmAuras();
-
     if(GetCharmGUID())
     {
         sLog.outCrash("Player %s (GUID: " UI64FMTD " is not able to uncharm unit (GUID: " UI64FMTD " Entry: %u, Type: %u)", GetName(), GetGUID(), GetCharmGUID(), charm->GetEntry(), charm->GetTypeId());
@@ -17212,7 +14660,6 @@ void Player::StopCastingCharm()
             SetCharm(charm, false);
     }
 }
-
 void Player::BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string& text, uint32 language) const
 {
     *data << (uint8)msgtype;
@@ -17224,58 +14671,47 @@ void Player::BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string
     *data << text;
     *data << (uint8)chatTag();
 }
-
 void Player::Say(const std::string& text, const uint32 language)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildPlayerChat(&data, CHAT_MSG_SAY, text, language);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_SAY),true);
-
     if(sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
         sLog.outChat("[SAY] Player %s says (language %u): %s",
             GetName(), language, text.c_str());
 }
-
 void Player::Yell(const std::string& text, const uint32 language)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildPlayerChat(&data, CHAT_MSG_YELL, text, language);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_YELL),true);
-
     if(sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
         sLog.outChat("[YELL] Player %s yells (language %u): %s",
             GetName(), language, text.c_str());
 }
-
 void Player::TextEmote(const std::string& text)
 {
     WorldPacket data(SMSG_MESSAGECHAT, 200);
     BuildPlayerChat(&data, CHAT_MSG_EMOTE, text, LANG_UNIVERSAL);
     SendMessageToSetInRange(&data,sWorld.getConfig(CONFIG_LISTEN_RANGE_TEXTEMOTE),true, !sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT));
-
     if(sWorld.getConfig(CONFIG_CHATLOG_PUBLIC))
         sLog.outChat("[TEXTEMOTE] Player %s emotes: %s",
             GetName(), text.c_str());
 }
-
 void Player::Whisper(const std::string& text, uint32 language,uint64 receiver)
 {
     if (language != LANG_ADDON)                             // if not addon data
         language = LANG_UNIVERSAL;                          // whispers should always be readable
-
     Player *rPlayer = objmgr.GetPlayer(receiver);
-
     if(sWorld.getConfig(CONFIG_CHATLOG_WHISPER))
         sLog.outChat("[WHISPER] Player %s tells %s: %s",
             GetName(), rPlayer->GetName(), text.c_str());
-
     // when player you are whispering to is dnd, he cannot receive your message, unless you are in gm mode
     if(!rPlayer->isDND() || isGameMaster())
     {
         WorldPacket data(SMSG_MESSAGECHAT, 200);
         BuildPlayerChat(&data, CHAT_MSG_WHISPER, text, language);
         rPlayer->GetSession()->SendPacket(&data);
-
         data.Initialize(SMSG_MESSAGECHAT, 200);
         rPlayer->BuildPlayerChat(&data, CHAT_MSG_REPLY, text, language);
         GetSession()->SendPacket(&data);
@@ -17285,48 +14721,36 @@ void Player::Whisper(const std::string& text, uint32 language,uint64 receiver)
         // announce to player that player he is whispering to is dnd and cannot receive his message
         ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->dndMsg.c_str());
     }
-
     if(!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster())
     {
         SetAcceptWhispers(true);
         ChatHandler(this).SendSysMessage(LANG_COMMAND_WHISPERON);
     }
-
     // announce to player that player he is whispering to is afk
     if(rPlayer->isAFK())
         ChatHandler(this).PSendSysMessage(LANG_PLAYER_AFK, rPlayer->GetName(), rPlayer->afkMsg.c_str());
-
     // if player whisper someone, auto turn of dnd to be able to receive an answer
     if(isDND() && !rPlayer->isGameMaster())
         ToggleDND();
 }
-
 void Player::PetSpellInitialize()
 {
     Pet* pet = GetPet();
-
     if(!pet)
         return;
-
     sLog.outDebug("Pet Spells Groups");
-
     CharmInfo *charmInfo = pet->GetCharmInfo();
-
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
     data << uint64(pet->GetGUID());
     data << uint16(pet->GetCreatureInfo()->family);         // creature family (required for pet talents)
     data << uint32(0);
     data << uint8(pet->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0);
-
     // action bar loop
     charmInfo->BuildActionBar(&data);
-
     size_t spellsCountPos = data.wpos();
-
     // spells count
     uint8 addlist = 0;
     data << uint8(addlist);                                 // placeholder
-
     if (pet->IsPermanentPetFor(this))
     {
         // spells loop
@@ -17334,94 +14758,72 @@ void Player::PetSpellInitialize()
         {
             if(itr->second.state == PETSPELL_REMOVED)
                 continue;
-
             data << uint32(MAKE_UNIT_ACTION_BUTTON(itr->first,itr->second.active));
             ++addlist;
         }
     }
-
     data.put<uint8>(spellsCountPos, addlist);
-
     uint8 cooldownsCount = pet->m_CreatureSpellCooldowns.size() + pet->m_CreatureCategoryCooldowns.size();
     data << uint8(cooldownsCount);
-
     time_t curTime = time(NULL);
-
     for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureSpellCooldowns.begin(); itr != pet->m_CreatureSpellCooldowns.end(); ++itr)
     {
         time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
-
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
         data << uint32(cooldown);                           // cooldown
         data << uint32(0);                                  // category cooldown
     }
-
     for(CreatureSpellCooldowns::const_iterator itr = pet->m_CreatureCategoryCooldowns.begin(); itr != pet->m_CreatureCategoryCooldowns.end(); ++itr)
     {
         time_t cooldown = (itr->second > curTime) ? (itr->second - curTime) * IN_MILISECONDS : 0;
-
         data << uint32(itr->first);                         // spellid
         data << uint16(0);                                  // spell category?
         data << uint32(0);                                  // cooldown
         data << uint32(cooldown);                           // category cooldown
     }
-
     data.hexlike();
-
     GetSession()->SendPacket(&data);
 }
-
 void Player::PossessSpellInitialize()
 {
     Unit* charm = GetCharm();
     if(!charm)
         return;
-
     CharmInfo *charmInfo = charm->GetCharmInfo();
-
     if(!charmInfo)
     {
         sLog.outError("Player::PossessSpellInitialize(): charm ("UI64FMTD") has no charminfo!", charm->GetGUID());
         return;
     }
-
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+1);
     data << uint64(charm->GetGUID());
     data << uint16(0);
     data << uint32(0);
     data << uint32(0);
-
     charmInfo->BuildActionBar(&data);
-
     data << uint8(0);                                       // spells count
     data << uint8(0);                                       // cooldowns count
-
     GetSession()->SendPacket(&data);
 }
-
 void Player::VehicleSpellInitialize()
 {
     Creature* veh = GetVehicleCreatureBase();
     if(!veh)
         return;
-
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*10+1+1);
     data << uint64(veh->GetGUID());
     data << uint16(0);
     data << uint32(0);
     data << uint32(0x00000101);
-
     for(uint32 i = 0; i < CREATURE_MAX_SPELLS; ++i)
     {
         uint32 spellId = ((Creature*)veh)->m_spells[i];
         if(!spellId)
             continue;
-
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
         if(!spellInfo)
             continue;
-
         if(IsPassiveSpell(spellId))
         {
             veh->CastSpell(veh, spellId, true);
@@ -17430,28 +14832,23 @@ void Player::VehicleSpellInitialize()
         else
             data << uint16(spellId) << uint8(0) << uint8(i+8);
     }
-
     for(uint32 i = CREATURE_MAX_SPELLS; i < MAX_SPELL_CONTROL_BAR; ++i)
         data << uint16(0) << uint8(0) << uint8(i+8);
-
     data << uint8(0);
     data << uint8(0);
     GetSession()->SendPacket(&data);
 }
-
 void Player::CharmSpellInitialize()
 {
     Unit* charm = GetFirstControlled();
     if(!charm)
         return;
-
     CharmInfo *charmInfo = charm->GetCharmInfo();
     if(!charmInfo)
     {
         sLog.outError("Player::CharmSpellInitialize(): the player's charm ("UI64FMTD") has no charminfo!", charm->GetGUID());
         return;
     }
-
     uint8 addlist = 0;
     if(charm->GetTypeId() != TYPEID_PLAYER)
     {
@@ -17465,21 +14862,16 @@ void Player::CharmSpellInitialize()
             }
         }
     }
-
     WorldPacket data(SMSG_PET_SPELLS, 8+2+4+4+4*MAX_UNIT_ACTION_BAR_INDEX+1+4*addlist+1);
     data << uint64(charm->GetGUID());
     data << uint16(0);
     data << uint32(0);
-
     if(charm->GetTypeId() != TYPEID_PLAYER)
         data << uint8(((Creature*)charm)->GetReactState()) << uint8(charmInfo->GetCommandState()) << uint16(0);
     else
         data << uint8(0) << uint8(0) << uint16(0);
-
     charmInfo->BuildActionBar(&data);
-
     data << uint8(addlist);
-
     if(addlist)
     {
         for(uint32 i = 0; i < MAX_SPELL_CHARM; ++i)
@@ -17489,42 +14881,33 @@ void Player::CharmSpellInitialize()
                 data << uint32(cspell->packedData);
         }
     }
-
     data << uint8(0);                                       // cooldowns count
-
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendRemoveControlBar()
 {
     WorldPacket data(SMSG_PET_SPELLS, 8);
     data << uint64(0);
     GetSession()->SendPacket(&data);
 }
-
 bool Player::IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell * spell)
 {
      if (!mod || !spellInfo)
          return false;
-
     // Mod out of charges
     if (spell && mod->charges == -1 && spell->m_appliedMods.find(mod->ownerAura) == spell->m_appliedMods.end())
         return false;
-
     return spellmgr.IsAffectedByMod(spellInfo, mod);
 }
-
 void Player::AddSpellMod(SpellModifier* mod, bool apply)
 {
     uint16 Opcode = (mod->type == SPELLMOD_FLAT) ? SMSG_SET_FLAT_SPELL_MODIFIER : SMSG_SET_PCT_SPELL_MODIFIER;
-
     int i = 0;
     flag96 _mask = 0;
     for (int eff = 0; eff < 96; ++eff)
     {
         if (eff != 0 && eff%32 == 0)
             _mask[i++] = 0;
-
         _mask[i] = uint32(1) << (eff-(32*i));
         if (mod->mask & _mask)
         {
@@ -17542,7 +14925,6 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply)
             SendDirectMessage(&data);
         }
     }
-
     if (apply)
         m_spellMods[mod->op].push_back(mod);
     else
@@ -17551,54 +14933,44 @@ void Player::AddSpellMod(SpellModifier* mod, bool apply)
         delete mod;
     }
 }
-
 // Restore spellmods in case of failed cast
 void Player::RestoreSpellMods(Spell * spell)
 {
     if (!spell || spell->m_appliedMods.empty())
         return;
-
     for(uint8 i=0;i<MAX_SPELLMOD;++i)
     {
         for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();++itr)
         {
             SpellModifier *mod = *itr;
-
             // spellmods without aura set cannot be charged
             if (!mod->ownerAura || !mod->ownerAura->GetAuraCharges())
                 continue;
-
             // check if mod affected this spell
             Spell::UsedSpellMods::iterator iterMod = spell->m_appliedMods.find(mod->ownerAura);
             if (iterMod == spell->m_appliedMods.end())
                 continue;
-
             // remove from list
             spell->m_appliedMods.erase(iterMod);
-
             // add mod charges back to mod
             if (mod->charges == -1)
                 mod->charges = 1;
             else
                 mod->charges++;
-
             // Do not set more spellmods than avalible
             if (mod->ownerAura->GetAuraCharges() < mod->charges)
                 mod->charges = mod->ownerAura->GetAuraCharges();
-
             // Skip this check for now - aura charges may change due to various reason
             // TODO: trac these changes correctly
             //assert (mod->ownerAura->GetAuraCharges() <= mod->charges);
         }
     }
 }
-
 void Player::RemoveSpellMods(Spell * spell)
 {
     if (!spell)
         return;
     std::set <Aura *> checkedSpells;
-
     AuraEffectList const & auraList = GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE);
     for(AuraEffectList::const_iterator itr = auraList.begin(); itr != auraList.end();)
     {
@@ -17606,13 +14978,10 @@ void Player::RemoveSpellMods(Spell * spell)
         ++itr;
         if (!aur->GetParentAura()->GetAuraCharges())
             continue;
-
         SpellEntry const * spellInfo = aur->GetSpellProto();
-
         if (spellInfo->SpellFamilyName != spell->m_spellInfo->SpellFamilyName ||
             checkedSpells.find(aur->GetParentAura()) != checkedSpells.end())
             continue;
-
         if (spell->m_spellInfo->SpellFamilyFlags & spellInfo->EffectSpellClassMask[aur->GetEffIndex()]
         // this is for fingers of frost, look at spell::finish part, a charge will be taken by the triggering spell
             && aur->GetParentAura()->GetAuraDuration() != aur->GetParentAura()->GetAuraMaxDuration())
@@ -17623,35 +14992,28 @@ void Player::RemoveSpellMods(Spell * spell)
                 itr = auraList.begin();
         }
     }
-
     if (spell->m_appliedMods.empty())
         return;
-
     for(uint8 i=0;i<MAX_SPELLMOD;++i)
     {
         for (SpellModList::iterator itr = m_spellMods[i].begin(); itr != m_spellMods[i].end();)
         {
             SpellModifier *mod = *itr;
             ++itr;
-
             // spellmods without aura set cannot be charged
             if (!mod->ownerAura || !mod->ownerAura->GetAuraCharges())
                 continue;
-
             // check if mod affected this spell
             Spell::UsedSpellMods::iterator iterMod = spell->m_appliedMods.find(mod->ownerAura);
             if (iterMod == spell->m_appliedMods.end())
                 continue;
-
             // remove from list
             spell->m_appliedMods.erase(iterMod);
-
             if (mod->ownerAura->DropAuraCharge())
                 itr = m_spellMods[i].begin();
         }
     }
 }
-
 void Player::DropModCharge(SpellModifier * mod, Spell * spell)
 {
     if (spell && mod->ownerAura && mod->charges > 0 )
@@ -17664,18 +15026,14 @@ void Player::DropModCharge(SpellModifier * mod, Spell * spell)
         spell->m_appliedMods.insert(mod->ownerAura);
     }
 }
-
 void Player::SetSpellModTakingSpell(Spell * spell, bool apply)
 {
     if (!spell || (m_spellModTakingSpell && m_spellModTakingSpell != spell))
         return;
-
     if (apply && spell->getState() == SPELL_STATE_FINISHED)
         return;
-
     m_spellModTakingSpell = apply ? spell : NULL;
 }
-
 // send Proficiency
 void Player::SendProficiency(uint8 pr1, uint32 pr2)
 {
@@ -17683,7 +15041,6 @@ void Player::SendProficiency(uint8 pr1, uint32 pr2)
     data << pr1 << pr2;
     GetSession()->SendPacket (&data);
 }
-
 void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type)
 {
     QueryResult *result = NULL;
@@ -17698,22 +15055,17 @@ void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type)
             Field *fields = result->Fetch();
             uint64 ownerguid   = MAKE_NEW_GUID(fields[0].GetUInt32(), 0, HIGHGUID_PLAYER);
             uint64 petitionguid = MAKE_NEW_GUID(fields[1].GetUInt32(), 0, HIGHGUID_ITEM);
-
             // send update if charter owner in game
             Player* owner = objmgr.GetPlayer(ownerguid);
             if(owner)
                 owner->GetSession()->SendPetitionQueryOpcode(petitionguid);
-
         } while ( result->NextRow() );
-
         delete result;
-
         if(type==10)
             CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = '%u'", GUID_LOPART(guid));
         else
             CharacterDatabase.PExecute("DELETE FROM petition_sign WHERE playerguid = '%u' AND type = '%u'", GUID_LOPART(guid), type);
     }
-
     CharacterDatabase.BeginTransaction();
     if(type == 10)
     {
@@ -17727,13 +15079,11 @@ void Player::RemovePetitionsAndSigns(uint64 guid, uint32 type)
     }
     CharacterDatabase.CommitTransaction();
 }
-
 void Player::LeaveAllArenaTeams(uint64 guid)
 {
     QueryResult *result = CharacterDatabase.PQuery("SELECT arena_team_member.arenateamid FROM arena_team_member JOIN arena_team ON arena_team_member.arenateamid = arena_team.arenateamid WHERE guid='%u'", GUID_LOPART(guid));
     if(!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
@@ -17745,63 +15095,50 @@ void Player::LeaveAllArenaTeams(uint64 guid)
                 at->DelMember(guid);
         }
     } while (result->NextRow());
-
     delete result;
 }
-
 void Player::SetRestBonus (float rest_bonus_new)
 {
     // Prevent resting on max level
     if(getLevel() >= sWorld.getConfig(CONFIG_MAX_PLAYER_LEVEL))
         rest_bonus_new = 0;
-
     if(rest_bonus_new < 0)
         rest_bonus_new = 0;
-
     float rest_bonus_max = (float)GetUInt32Value(PLAYER_NEXT_LEVEL_XP)*1.5/2;
-
     if(rest_bonus_new > rest_bonus_max)
         m_rest_bonus = rest_bonus_max;
     else
         m_rest_bonus = rest_bonus_new;
-
     // update data for client
     if(m_rest_bonus>10)
         SetByteValue(PLAYER_BYTES_2, 3, 0x01);              // Set Reststate = Rested
     else if(m_rest_bonus<=1)
         SetByteValue(PLAYER_BYTES_2, 3, 0x02);              // Set Reststate = Normal
-
     //RestTickUpdate
     SetUInt32Value(PLAYER_REST_STATE_EXPERIENCE, uint32(m_rest_bonus));
 }
-
 void Player::HandleStealthedUnitsDetection()
 {
     std::list<Unit*> stealthedUnits;
     Trinity::AnyStealthedCheck u_check;
     Trinity::UnitListSearcher<Trinity::AnyStealthedCheck > searcher(this, stealthedUnits, u_check);
     VisitNearbyObject(GetMap()->GetVisibilityDistance(), searcher);
-
     for (std::list<Unit*>::const_iterator i = stealthedUnits.begin(); i != stealthedUnits.end(); ++i)
     {
         if((*i)==this)
             continue;
-
         bool hasAtClient = HaveAtClient((*i));
         bool hasDetected = canSeeOrDetect(*i, true);
-
         if (hasDetected)
         {
             if(!hasAtClient)
             {
                 (*i)->SendUpdateToPlayer(this);
                 m_clientGUIDs.insert((*i)->GetGUID());
-
                 #ifdef MANGOS_DEBUG
                 if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
                     sLog.outDebug("Object %u (Type: %u) is detected in stealth by player %u. Distance = %f",(*i)->GetGUIDLow(),(*i)->GetTypeId(),GetGUIDLow(),GetDistance(*i));
                 #endif
-
                 // target aura duration for caster show only if target exist at caster client
                 // send data at target visibility change (adding to client)
                 SendInitialVisiblePackets(*i);
@@ -17817,12 +15154,10 @@ void Player::HandleStealthedUnitsDetection()
         }
     }
 }
-
 bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc /*= NULL*/, uint32 spellid /*= 0*/)
 {
     if(nodes.size() < 2)
         return false;
-
     // not let cheating with start flight in time of logout process || while in combat || has type state: stunned || has type state: root
     if(GetSession()->isLogingOut() || isInCombat() || hasUnitState(UNIT_STAT_STUNNED) || hasUnitState(UNIT_STAT_ROOT))
     {
@@ -17831,10 +15166,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         GetSession()->SendPacket(&data);
         return false;
     }
-
     if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE))
         return false;
-
     // taximaster case
     if(npc)
     {
@@ -17846,7 +15179,6 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
             GetSession()->SendPacket(&data);
             return false;
         }
-
         if( m_ShapeShiftFormSpellId && m_form != FORM_BATTLESTANCE && m_form != FORM_BERSERKERSTANCE && m_form != FORM_DEFENSIVESTANCE && m_form != FORM_SHADOW )
         {
             WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
@@ -17854,7 +15186,6 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
             GetSession()->SendPacket(&data);
             return false;
         }
-
         // not let cheating with start flight in time of logout process || if casting not finished || while in combat || if not use Spell's with EffectSendTaxi
         if(IsNonMeleeSpellCasted(false))
         {
@@ -17868,23 +15199,17 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     else
     {
         RemoveAurasByType(SPELL_AURA_MOUNTED);
-
         if( m_ShapeShiftFormSpellId && m_form != FORM_BATTLESTANCE && m_form != FORM_BERSERKERSTANCE && m_form != FORM_DEFENSIVESTANCE && m_form != FORM_SHADOW )
             RemoveAurasDueToSpell(m_ShapeShiftFormSpellId);
-
         if (Spell* spell = GetCurrentSpell(CURRENT_GENERIC_SPELL))
             if (spell->m_spellInfo->Id != spellid)
                 InterruptSpell(CURRENT_GENERIC_SPELL,false);
-
         InterruptSpell(CURRENT_AUTOREPEAT_SPELL,false);
-
         if (Spell* spell = GetCurrentSpell(CURRENT_CHANNELED_SPELL))
             if (spell->m_spellInfo->Id != spellid)
                 InterruptSpell(CURRENT_CHANNELED_SPELL,true);
     }
-
     uint32 sourcenode = nodes[0];
-
     // starting node too far away (cheat?)
     TaxiNodesEntry const* node = sTaxiNodesStore.LookupEntry(sourcenode);
     if (!node)
@@ -17894,7 +15219,6 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         GetSession()->SendPacket(&data);
         return false;
     }
-
     // check node starting pos data set case if provided
     if (node->x != 0.0f || node->y != 0.0f || node->z != 0.0f)
     {
@@ -17918,55 +15242,39 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         GetSession()->SendPacket(&data);
         return false;
     }
-
     // Prepare to flight start now
-
     // stop combat at start taxi flight if any
     CombatStop();
-
     StopCastingCharm();
     StopCastingBindSight();
     ExitVehicle();
-
     // stop trade (client cancel trade at taxi map open but cheating tools can be used for reopen it)
     TradeCancel(true);
-
     // clean not finished taxi path if any
     m_taxi.ClearTaxiDestinations();
-
     // 0 element current node
     m_taxi.AddTaxiDestination(sourcenode);
-
     // fill destinations path tail
     uint32 sourcepath = 0;
     uint32 totalcost = 0;
-
     uint32 prevnode = sourcenode;
     uint32 lastnode = 0;
-
     for(uint32 i = 1; i < nodes.size(); ++i)
     {
         uint32 path, cost;
-
         lastnode = nodes[i];
         objmgr.GetTaxiPath(prevnode, lastnode, path, cost);
-
         if(!path)
         {
             m_taxi.ClearTaxiDestinations();
             return false;
         }
-
         totalcost += cost;
-
         if(prevnode == sourcenode)
             sourcepath = path;
-
         m_taxi.AddTaxiDestination(lastnode);
-
         prevnode = lastnode;
     }
-
     // get mount model (in case non taximaster (npc==NULL) allow more wide lookup)
     //
     // Hack-Fix for Alliance not being able to use Acherus taxi. There is
@@ -17974,7 +15282,6 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     // change but I couldn't find a suitable alternative. OK to use class because only DK
     // can use this taxi.
     uint32 mount_display_id = objmgr.GetTaxiMountDisplayId(sourcenode, GetTeam(), npc == NULL || (sourcenode == 315 && getClass() == CLASS_DEATH_KNIGHT));
-
     // in spell case allow 0 model
     if ((mount_display_id == 0 && spellid == 0) || sourcepath == 0)
     {
@@ -17984,12 +15291,9 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         m_taxi.ClearTaxiDestinations();
         return false;
     }
-
     uint32 money = GetMoney();
-
     if (npc)
         totalcost = (uint32)ceil(totalcost*GetReputationPriceDiscount(npc));
-
     if(money < totalcost)
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
@@ -17998,15 +15302,12 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         m_taxi.ClearTaxiDestinations();
         return false;
     }
-
     //Checks and preparations done, DO FLIGHT
     ModifyMoney(-(int32)totalcost);
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GOLD_SPENT_FOR_TRAVELLING, totalcost);
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FLIGHT_PATHS_TAKEN, 1);
-
     // prevent stealth flight
     //RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK);
-
     if (sWorld.getConfig(CONFIG_INSTANT_TAXI))
     {
         TaxiNodesEntry const* lastnode = sTaxiNodesStore.LookupEntry(nodes[nodes.size()-1]);
@@ -18024,22 +15325,17 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
     }
     return true;
 }
-
 bool Player::ActivateTaxiPathTo( uint32 taxi_path_id, uint32 spellid /*= 0*/ )
 {
     TaxiPathEntry const* entry = sTaxiPathStore.LookupEntry(taxi_path_id);
     if(!entry)
         return false;
-
     std::vector<uint32> nodes;
-
     nodes.resize(2);
     nodes[0] = entry->from;
     nodes[1] = entry->to;
-
     return ActivateTaxiPathTo(nodes,NULL,spellid);
 }
-
 void Player::CleanupAfterTaxiFlight()
 {
     m_taxi.ClearTaxiDestinations();        // not destinations, clear source node
@@ -18047,60 +15343,46 @@ void Player::CleanupAfterTaxiFlight()
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
     getHostilRefManager().setOnlineOfflineState(true);
 }
-
 void Player::ContinueTaxiFlight()
 {
     uint32 sourceNode = m_taxi.GetTaxiSource();
     if (!sourceNode)
         return;
-
     sLog.outDebug( "WORLD: Restart character %u taxi flight", GetGUIDLow() );
-
     uint32 mountDisplayId = objmgr.GetTaxiMountDisplayId(sourceNode, GetTeam(),true);
     uint32 path = m_taxi.GetCurrentTaxiPath();
-
     // search appropriate start path node
     uint32 startNode = 0;
-
     TaxiPathNodeList const& nodeList = sTaxiPathNodesByPath[path];
-
     float distPrev = MAP_SIZE*MAP_SIZE;
     float distNext =
         (nodeList[0].x-GetPositionX())*(nodeList[0].x-GetPositionX())+
         (nodeList[0].y-GetPositionY())*(nodeList[0].y-GetPositionY())+
         (nodeList[0].z-GetPositionZ())*(nodeList[0].z-GetPositionZ());
-
     for(uint32 i = 1; i < nodeList.size(); ++i)
     {
         TaxiPathNode const& node = nodeList[i];
         TaxiPathNode const& prevNode = nodeList[i-1];
-
         // skip nodes at another map
         if(node.mapid != GetMapId())
             continue;
-
         distPrev = distNext;
-
         distNext =
             (node.x-GetPositionX())*(node.x-GetPositionX())+
             (node.y-GetPositionY())*(node.y-GetPositionY())+
             (node.z-GetPositionZ())*(node.z-GetPositionZ());
-
         float distNodes =
             (node.x-prevNode.x)*(node.x-prevNode.x)+
             (node.y-prevNode.y)*(node.y-prevNode.y)+
             (node.z-prevNode.z)*(node.z-prevNode.z);
-
         if(distNext + distPrev < distNodes)
         {
             startNode = i;
             break;
         }
     }
-
     GetSession()->SendDoFlight(mountDisplayId, path, startNode);
 }
-
 void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
 {
                                                             // last check 2.0.10
@@ -18119,14 +15401,11 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
             ASSERT(spellInfo);
             continue;
         }
-
         // Not send cooldown for this spells
         if (spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE)
             continue;
-
         if(spellInfo->PreventionType != SPELL_PREVENTION_TYPE_SILENCE)
             continue;
-
         if((idSchoolMask & GetSpellSchoolMask(spellInfo)) && GetSpellCooldownDelay(unSpellId) < unTimeMs )
         {
             data << uint32(unSpellId);
@@ -18136,7 +15415,6 @@ void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::InitDataForForm(bool reapplyMods)
 {
     SpellShapeshiftEntry const* ssEntry = sSpellShapeshiftStore.LookupEntry(m_form);
@@ -18148,7 +15426,6 @@ void Player::InitDataForForm(bool reapplyMods)
     }
     else
         SetRegularAttackTime();
-
     switch(m_form)
     {
         case FORM_GHOUL:
@@ -18173,15 +15450,12 @@ void Player::InitDataForForm(bool reapplyMods)
             break;
         }
     }
-
     // update auras at form change, ignore this at mods reapply (.reset stats/etc) when form not change.
     if (!reapplyMods)
         UpdateEquipSpellsAtFormChange();
-
     UpdateAttackPowerAndDamage();
     UpdateAttackPowerAndDamage(true);
 }
-
 void Player::InitDisplayIds()
 {
     PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
@@ -18190,7 +15464,6 @@ void Player::InitDisplayIds()
         sLog.outError("Player %u has incorrect race/class pair. Can't init display ids.", GetGUIDLow());
         return;
     }
-
     uint8 gender = getGender();
     switch(gender)
     {
@@ -18207,27 +15480,22 @@ void Player::InitDisplayIds()
             return;
     }
 }
-
 // Return true is the bought item has a max count to force refresh of window by caller
 bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint8 bag, uint8 slot)
 {
     // cheating attempt
     if (count < 1) count = 1;
-
     // cheating attempt
     if(slot > MAX_BAG_SIZE && slot !=NULL_SLOT)
         return false;
-
     if (!isAlive())
         return false;
-
     ItemPrototype const *pProto = objmgr.GetItemPrototype( item );
     if (!pProto)
     {
         SendBuyError( BUY_ERR_CANT_FIND_ITEM, NULL, item, 0);
         return false;
     }
-
     Creature *pCreature = GetNPCIfCanInteractWith(vendorguid,UNIT_NPC_FLAG_VENDOR);
     if (!pCreature)
     {
@@ -18235,23 +15503,19 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
         SendBuyError( BUY_ERR_DISTANCE_TOO_FAR, NULL, item, 0);
         return false;
     }
-
     VendorItemData const* vItems = pCreature->GetVendorItems();
     if(!vItems || vItems->Empty())
     {
         SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
         return false;
     }
-
     size_t vendor_slot = vItems->FindItemSlot(item);
     if (vendor_slot >= vItems->GetItemCount())
     {
         SendBuyError( BUY_ERR_CANT_FIND_ITEM, pCreature, item, 0);
         return false;
     }
-
     VendorItem const* crItem = vItems->m_items[vendor_slot];
-
     // check current item amount if it limited
     if (crItem->maxcount != 0)
     {
@@ -18261,7 +15525,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             return false;
         }
     }
-
     if (pProto->RequiredReputationFaction && (uint32(GetReputationRank(pProto->RequiredReputationFaction)) < pProto->RequiredReputationRank))
     {
         SendBuyError( BUY_ERR_REPUTATION_REQUIRE, pCreature, item, 0);
@@ -18275,7 +15538,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             return false;
         }
     }
-
     if (crItem->ExtendedCost)
     {
         ItemExtendedCostEntry const* iece = sItemExtendedCostStore.LookupEntry(crItem->ExtendedCost);
@@ -18284,21 +15546,18 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             sLog.outError("Item %u have wrong ExtendedCost field value %u", pProto->ItemId, crItem->ExtendedCost);
             return false;
         }
-
         // honor points price
         if (GetHonorPoints() < (iece->reqhonorpoints * count))
         {
             SendEquipError(EQUIP_ERR_NOT_ENOUGH_HONOR_POINTS, NULL, NULL);
             return false;
         }
-
         // arena points price
         if (GetArenaPoints() < (iece->reqarenapoints * count))
         {
             SendEquipError(EQUIP_ERR_NOT_ENOUGH_ARENA_POINTS, NULL, NULL);
             return false;
         }
-
         // item base price
         for (uint8 i = 0; i < 5; ++i)
         {
@@ -18308,7 +15567,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
                 return false;
             }
         }
-
         // check for personal arena rating requirement
         if( GetMaxPersonalArenaRatingRequirement() < iece->reqpersonalarenarating )
         {
@@ -18317,18 +15575,14 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             return false;
         }
     }
-
     uint32 price  = pProto->BuyPrice * count;
-
     // reputation discount
     price = uint32(floor(price * GetReputationPriceDiscount(pCreature)));
-
     if (GetMoney() < price)
     {
         SendBuyError( BUY_ERR_NOT_ENOUGHT_MONEY, pCreature, item, 0);
         return false;
     }
-
     if ((bag == NULL_BAG && slot == NULL_SLOT) || IsInventoryPos(bag, slot))
     {
         ItemPosCountVec dest;
@@ -18338,7 +15592,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             SendEquipError( msg, NULL, NULL );
             return false;
         }
-
         ModifyMoney( -(int32)price );
         if (crItem->ExtendedCost)                            // case for new honor system
         {
@@ -18353,18 +15606,15 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
                     DestroyItemCount(iece->reqitem[i], (iece->reqitemcount[i] * count), true);
             }
         }
-
         if (Item *it = StoreNewItem( dest, item, true ))
         {
             uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count);
-
             WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
             data << pCreature->GetGUID();
             data << (uint32)(vendor_slot+1);                // numbered from 1 at client
             data << (uint32)(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
             data << (uint32)count;
             GetSession()->SendPacket(&data);
-
             SendNewItem(it, pProto->BuyCount*count, true, false, false);
         }
     }
@@ -18375,7 +15625,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             SendEquipError( EQUIP_ERR_ITEM_CANT_BE_EQUIPPED, NULL, NULL );
             return false;
         }
-
         uint16 dest;
         uint8 msg = CanEquipNewItem( slot, dest, item, false );
         if (msg != EQUIP_ERR_OK)
@@ -18383,7 +15632,6 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
             SendEquipError( msg, NULL, NULL );
             return false;
         }
-
         ModifyMoney( -(int32)price );
         if (crItem->ExtendedCost)                            // case for new honor system
         {
@@ -18398,20 +15646,16 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
                     DestroyItemCount(iece->reqitem[i], iece->reqitemcount[i], true);
             }
         }
-
         if (Item *it = EquipNewItem( dest, item, true ))
         {
             uint32 new_count = pCreature->UpdateVendorItemCurrentCount(crItem,pProto->BuyCount * count);
-
             WorldPacket data(SMSG_BUY_ITEM, (8+4+4+4));
             data << pCreature->GetGUID();
             data << (uint32)(vendor_slot+1);                // numbered from 1 at client
             data << (uint32)(crItem->maxcount > 0 ? new_count : 0xFFFFFFFF);
             data << (uint32)count;
             GetSession()->SendPacket(&data);
-
             SendNewItem(it, pProto->BuyCount*count, true, false, false);
-
             AutoUnequipOffhandIfNeed();
         }
     }
@@ -18420,10 +15664,8 @@ bool Player::BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint
         SendEquipError( EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT, NULL, NULL );
         return false;
     }
-
     return crItem->maxcount != 0;
 }
-
 uint32 Player::GetMaxPersonalArenaRatingRequirement()
 {
     // returns the maximal personal arena rating that can be used to purchase items requiring this condition
@@ -18443,7 +15685,6 @@ uint32 Player::GetMaxPersonalArenaRatingRequirement()
     }
     return max_personal_rating;
 }
-
 void Player::UpdateHomebindTime(uint32 time)
 {
     // GMs never get homebind timer online
@@ -18482,7 +15723,6 @@ void Player::UpdateHomebindTime(uint32 time)
         sLog.outDebug("PLAYER: Player '%s' (GUID: %u) will be teleported to homebind in 60 seconds", GetName(),GetGUIDLow());
     }
 }
-
 void Player::UpdatePvPState(bool onlyFFA)
 {
     // TODO: should we always synchronize UNIT_FIELD_BYTES_2, 1 of controller and controlled?
@@ -18502,10 +15742,8 @@ void Player::UpdatePvPState(bool onlyFFA)
         for(ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
             (*itr)->RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP);
     }
-
     if(onlyFFA)
         return;
-
     if(pvpInfo.inHostileArea)                               // in hostile area
     {
         if(!IsPvP() || pvpInfo.endTimer != 0)
@@ -18517,7 +15755,6 @@ void Player::UpdatePvPState(bool onlyFFA)
             pvpInfo.endTimer = time(0);                     // start toggle-off
     }
 }
-
 void Player::UpdatePvP(bool state, bool override)
 {
     if(!state || override)
@@ -18533,18 +15770,15 @@ void Player::UpdatePvP(bool state, bool override)
             SetPvP(state);
     }
 }
-
 void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 itemId, Spell* spell, bool infinityCooldown)
 {
     // init cooldown values
     uint32 cat   = 0;
     int32 rec    = -1;
     int32 catrec = -1;
-
     // some special item spells without correct cooldown in SpellInfo
     // cooldown information stored in item prototype
     // This used in same way in WorldSession::HandleItemQuerySingleOpcode data sending to client.
-
     if(itemId)
     {
         if(ItemPrototype const* proto = ObjectMgr::GetItemPrototype(itemId))
@@ -18561,7 +15795,6 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
             }
         }
     }
-
     // if no cooldown found above then base at DBC data
     if(rec < 0 && catrec < 0)
     {
@@ -18569,12 +15802,9 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
         rec = spellInfo->RecoveryTime;
         catrec = spellInfo->CategoryRecoveryTime;
     }
-
     time_t curTime = time(NULL);
-
     time_t catrecTime;
     time_t recTime;
-
     // overwrite time for selected category
     if(infinityCooldown)
     {
@@ -18589,30 +15819,23 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
         // prevent 0 cooldowns set by another way
         if (rec <= 0 && catrec <= 0 && (cat == 76 || IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != SPELL_ID_AUTOSHOT))
             rec = GetAttackTime(RANGED_ATTACK);
-
         // Now we have cooldown data (if found any), time to apply mods
         if(rec > 0)
             ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, rec, spell);
-
         if(catrec > 0)
             ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, catrec, spell);
-
         // replace negative cooldowns by 0
         if (rec < 0) rec = 0;
         if (catrec < 0) catrec = 0;
-
         // no cooldown after applying spell mods
         if( rec == 0 && catrec == 0)
             return;
-
         catrecTime = catrec ? curTime+catrec/IN_MILISECONDS : 0;
         recTime    = rec ? curTime+rec/IN_MILISECONDS : catrecTime;
     }
-
     // self spell cooldown
     if(recTime > 0)
         AddSpellCooldown(spellInfo->Id, itemId, recTime);
-
     // category spells
     if (cat && catrec > 0)
     {
@@ -18623,13 +15846,11 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
             {
                 if(*i_scset == spellInfo->Id)                    // skip main spell, already handled above
                     continue;
-
                 AddSpellCooldown(*i_scset, itemId, catrecTime);
             }
         }
     }
 }
-
 void Player::AddSpellCooldown(uint32 spellid, uint32 itemid, time_t end_time)
 {
     SpellCooldown sc;
@@ -18637,25 +15858,21 @@ void Player::AddSpellCooldown(uint32 spellid, uint32 itemid, time_t end_time)
     sc.itemid = itemid;
     m_spellCooldowns[spellid] = sc;
 }
-
 void Player::SendCooldownEvent(SpellEntry const *spellInfo, uint32 itemId, Spell* spell)
 {
     // start cooldowns at server side, if any
     AddSpellAndCategoryCooldowns(spellInfo,itemId,spell);
-
     // Send activate cooldown timer (possible 0) at client side
     WorldPacket data(SMSG_COOLDOWN_EVENT, (4+8));
     data << spellInfo->Id;
     data << GetGUID();
     SendDirectMessage(&data);
 }
-
 void Player::UpdatePotionCooldown(Spell* spell)
 {
     // no potion used i combat or still in combat
     if(!m_lastPotionId || isInCombat())
         return;
-
     // Call not from spell cast, send cooldown event for item spells if no in combat
     if(!spell)
     {
@@ -18669,23 +15886,17 @@ void Player::UpdatePotionCooldown(Spell* spell)
     // from spell cases (m_lastPotionId set in Spell::SendSpellCooldown)
     else
         SendCooldownEvent(spell->m_spellInfo,m_lastPotionId,spell);
-
     m_lastPotionId = 0;
 }
-
                                                            //slot to be excluded while counting
 bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
 {
     if(!enchantmentcondition)
         return true;
-
     SpellItemEnchantmentConditionEntry const *Condition = sSpellItemEnchantmentConditionStore.LookupEntry(enchantmentcondition);
-
     if(!Condition)
         return true;
-
     uint8 curcount[4] = {0, 0, 0, 0};
-
     //counting current equipped gem colors
     for(uint8 i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
     {
@@ -18699,25 +15910,19 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
                 uint32 enchant_id = pItem2->GetEnchantmentId(EnchantmentSlot(enchant_slot));
                 if(!enchant_id)
                     continue;
-
                 SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
                 if(!enchantEntry)
                     continue;
-
                 uint32 gemid = enchantEntry->GemID;
                 if(!gemid)
                     continue;
-
                 ItemPrototype const* gemProto = sItemStorage.LookupEntry<ItemPrototype>(gemid);
                 if(!gemProto)
                     continue;
-
                 GemPropertiesEntry const* gemProperty = sGemPropertiesStore.LookupEntry(gemProto->GemProperties);
                 if(!gemProperty)
                     continue;
-
                 uint8 GemColor = gemProperty->color;
-
                 for(uint8 b = 0, tmpcolormask = 1; b < 4; b++, tmpcolormask <<= 1)
                 {
                     if(tmpcolormask & GemColor)
@@ -18726,19 +15931,14 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
             }
         }
     }
-
     bool activate = true;
-
     for(uint8 i = 0; i < 5; i++)
     {
         if(!Condition->Color[i])
             continue;
-
         uint32 _cur_gem = curcount[Condition->Color[i] - 1];
-
         // if have <CompareColor> use them as count, else use <value> from Condition
         uint32 _cmp_gem = Condition->CompareColor[i] ? curcount[Condition->CompareColor[i] - 1]: Condition->Value[i];
-
         switch(Condition->Comparator[i])
         {
             case 2:                                         // requires less <color> than (<value> || <comparecolor>) gems
@@ -18752,12 +15952,9 @@ bool Player::EnchantmentFitsRequirements(uint32 enchantmentcondition, int8 slot)
                 break;
         }
     }
-
     sLog.outDebug("Checking Condition %u, there are %u Meta Gems, %u Red Gems, %u Yellow Gems and %u Blue Gems, Activate:%s", enchantmentcondition, curcount[0], curcount[1], curcount[2], curcount[3], activate ? "yes" : "no");
-
     return activate;
 }
-
 void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
 {
                                                             //cycle all equipped items
@@ -18766,22 +15963,17 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
         //enchants for the slot being socketed are handled by Player::ApplyItemMods
         if(slot == exceptslot)
             continue;
-
         Item* pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot );
-
         if(!pItem || !pItem->GetProto()->Socket[0].Color)
             continue;
-
         for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
         {
             uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
             if(!enchant_id)
                 continue;
-
             SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
             if(!enchantEntry)
                 continue;
-
             uint32 condition = enchantEntry->EnchantmentCondition;
             if(condition)
             {
@@ -18798,7 +15990,6 @@ void Player::CorrectMetaGemEnchants(uint8 exceptslot, bool apply)
         }
     }
 }
-
                                                             //if false -> then toggled off if was on| if true -> toggled on if was off AND meets requirements
 void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply)
 {
@@ -18808,23 +15999,18 @@ void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply)
         //enchants for the slot being socketed are handled by WorldSession::HandleSocketOpcode(WorldPacket& recv_data)
         if(slot == exceptslot)
             continue;
-
         Item *pItem = GetItemByPos( INVENTORY_SLOT_BAG_0, slot );
-
         if(!pItem || !pItem->GetProto()->Socket[0].Color)   //if item has no sockets or no item is equipped go to next item
             continue;
-
         //cycle all (gem)enchants
         for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
         {
             uint32 enchant_id = pItem->GetEnchantmentId(EnchantmentSlot(enchant_slot));
             if(!enchant_id)                                 //if no enchant go to next enchant(slot)
                 continue;
-
             SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
             if(!enchantEntry)
                 continue;
-
             //only metagems to be (de)activated, so only enchants with condition
             uint32 condition = enchantEntry->EnchantmentCondition;
             if(condition)
@@ -18832,7 +16018,6 @@ void Player::ToggleMetaGemsActive(uint8 exceptslot, bool apply)
         }
     }
 }
-
 void Player::SetBattleGroundEntryPoint()
 {
     // Taxi path store
@@ -18841,7 +16026,6 @@ void Player::SetBattleGroundEntryPoint()
         m_bgData.mountSpell  = 0;
         m_bgData.taxiPath[0] = m_taxi.GetTaxiSource();
         m_bgData.taxiPath[1] = m_taxi.GetTaxiDestination();
-
         // On taxi we don't need check for dungeon
         m_bgData.joinPos = WorldLocation(GetMapId(), GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
         return;
@@ -18849,7 +16033,6 @@ void Player::SetBattleGroundEntryPoint()
     else
     {
         m_bgData.ClearTaxiPath();
-
         // Mount spell id storing
         if (IsMounted())
         {
@@ -18859,7 +16042,6 @@ void Player::SetBattleGroundEntryPoint()
         }
         else
             m_bgData.mountSpell = 0;
-
         // If map is dungeon find linked graveyard
         if(GetMap()->IsDungeon())
         {
@@ -18878,17 +16060,14 @@ void Player::SetBattleGroundEntryPoint()
             return;
         }
     }
-
     // In error cases use homebind position
     m_bgData.joinPos = WorldLocation(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, 0.0f);
 }
-
 void Player::LeaveBattleground(bool teleportToEntryPoint)
 {
     if(BattleGround *bg = GetBattleGround())
     {
         bg->RemovePlayerAtLeave(GetGUID(), teleportToEntryPoint, true);
-
         // call after remove to be sure that player resurrected for correct cast
         if( bg->isBattleGround() && !isGameMaster() && sWorld.getConfig(CONFIG_BATTLEGROUND_CAST_DESERTER) )
         {
@@ -18900,38 +16079,31 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
                     ScheduleDelayedOperation(DELAYED_SPELL_CAST_DESERTER);
                     return;
                 }
-
                 CastSpell(this, SPELL_ID_DESERTER, true);               // Deserter
             }
         }
     }
 }
-
 bool Player::CanJoinToBattleground() const
 {
     // check Deserter debuff
     if(HasAura(SPELL_ID_DESERTER))
         return false;
-
     return true;
 }
-
 bool Player::CanReportAfkDueToLimit()
 {
     // a player can complain about 15 people per 5 minutes
     if(m_bgData.bgAfkReportedCount++ >= 15)
         return false;
-
     return true;
 }
-
 ///This player has been blamed to be inactive in a battleground
 void Player::ReportedAfkBy(Player* reporter)
 {
     BattleGround *bg = GetBattleGround();
     if(!bg || bg != reporter->GetBattleGround() || GetTeam() != reporter->GetTeam())
         return;
-
     // check if player has 'Idle' or 'Inactive' debuff
     if(m_bgData.bgAfkReporter.find(reporter->GetGUIDLow())==m_bgData.bgAfkReporter.end() && !HasAura(43680) && !HasAura(43681) && reporter->CanReportAfkDueToLimit())
     {
@@ -18945,7 +16117,6 @@ void Player::ReportedAfkBy(Player* reporter)
         }
     }
 }
-
 WorldLocation Player::GetStartPosition() const
 {
     PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
@@ -18954,17 +16125,14 @@ WorldLocation Player::GetStartPosition() const
         mapId = 0;
     return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0);
 }
-
 bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const
 {
     // Always can see self
     if (m_mover == u || this == u)
         return true;
-
     // phased visibility (both must phased in same way)
     if(!InSamePhase(u))
         return false;
-
     // player visible for other player if not logout and at same transport
     // including case when player is out of world
     bool at_same_transport =
@@ -18972,30 +16140,24 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
         && !GetSession()->PlayerLogout() && !((Player*)u)->GetSession()->PlayerLogout()
         && !GetSession()->PlayerLoading() && !((Player*)u)->GetSession()->PlayerLoading()
         && GetTransport() == ((Player*)u)->GetTransport();
-
     // not in world
     if(!at_same_transport && (!IsInWorld() || !u->IsInWorld()))
         return false;
-
     // forbidden to seen (at GM respawn command)
     //if(u->GetVisibility() == VISIBILITY_RESPAWN)
     //    return false;
-
     Map& _map = *u->GetMap();
     // Grid dead/alive checks
     // non visible at grid for any stealth state
     if(!u->IsVisibleInGridForPlayer(this))
         return false;
-
     // always seen by owner
     if(uint64 guid = u->GetCharmerOrOwnerGUID())
         if(GetGUID() == guid)
             return true;
-
     if(uint64 guid = GetUInt64Value(PLAYER_FARSIGHT))
         if(u->GetGUID() == guid)
             return true;
-
     // different visible distance checks
     if(isInFlight())                                           // what see player in flight
     {
@@ -19028,7 +16190,6 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
             , is3dDistance))
             return false;
     }
-
     if(u->GetVisibility() == VISIBILITY_OFF)
     {
         // GMs see any players, not higher GMs and all units
@@ -19041,7 +16202,6 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
         }
         return false;
     }
-
     // GM's can see everyone with invisibilitymask with less or equal security level
     if(m_mover->m_invisibilityMask || u->m_invisibilityMask)
     {
@@ -19052,13 +16212,11 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
             else
                 return true;
         }
-
         // player see other player with stealth/invisibility only if he in same group or raid or same team (raid/team case dependent from conf setting)
         if(!m_mover->canDetectInvisibilityOf(u))
             if(!(u->GetTypeId()==TYPEID_PLAYER && !IsHostileTo(u) && IsGroupVisibleFor(((Player*)u))))
                 return false;
     }
-
     // GM invisibility checks early, invisibility if any detectable, so if not stealth then visible
     if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH && !isGameMaster())
     {
@@ -19072,19 +16230,16 @@ bool Player::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool
                 if(!detect || !m_mover->canDetectStealthOf(u, GetDistance(u)))
                     return false;
     }
-
     // If use this server will be too laggy
     // Now check is target visible with LoS
     //return u->IsWithinLOS(GetPositionX(),GetPositionY(),GetPositionZ());
     return true;
 }
-
 bool Player::IsVisibleInGridForPlayer( Player const * pl ) const
 {
     // gamemaster in GM mode see all, including ghosts
     if(pl->isGameMaster() && GetSession()->GetSecurity() <= pl->GetSession()->GetSecurity())
         return true;
-
     // It seems in battleground everyone sees everyone, except the enemy-faction ghosts
     if (InBattleGround())
     {
@@ -19092,17 +16247,14 @@ bool Player::IsVisibleInGridForPlayer( Player const * pl ) const
             return false;
         return true;
     }
-
     // Live player see live player or dead player with not realized corpse
     if(pl->isAlive() || pl->m_deathTimer > 0)
     {
         return isAlive() || m_deathTimer > 0;
     }
-
     // Ghost see other friendly ghosts, that's for sure
     if(!(isAlive() || m_deathTimer > 0) && IsFriendlyTo(pl))
         return true;
-
     // Dead player see live players near own corpse
     if(isAlive())
     {
@@ -19114,49 +16266,39 @@ bool Player::IsVisibleInGridForPlayer( Player const * pl ) const
                 return true;
         }
     }
-
     // and not see any other
     return false;
 }
-
 bool Player::IsVisibleGloballyFor( Player* u ) const
 {
     if(!u)
         return false;
-
     // Always can see self
     if (u==this)
         return true;
-
     // Visible units, always are visible for all players
     if (GetVisibility() == VISIBILITY_ON)
         return true;
-
     // GMs are visible for higher gms (or players are visible for gms)
     if (u->GetSession()->GetSecurity() > SEC_PLAYER)
         return GetSession()->GetSecurity() <= u->GetSession()->GetSecurity();
-
     // non faction visibility non-breakable for non-GMs
     if (GetVisibility() == VISIBILITY_OFF)
         return false;
-
     // non-gm stealth/invisibility not hide from global player lists
     return true;
 }
-
 template<class T>
 inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, T* target)
 {
     s64.insert(target->GetGUID());
 }
-
 template<>
 inline void UpdateVisibilityOf_helper(std::set<uint64>& s64, GameObject* target)
 {
     if(!target->IsTransport())
         s64.insert(target->GetGUID());
 }
-
 void Player::UpdateVisibilityOf(WorldObject* target)
 {
     if(HaveAtClient(target))
@@ -19165,7 +16307,6 @@ void Player::UpdateVisibilityOf(WorldObject* target)
         {
             target->DestroyForPlayer(this);
             m_clientGUIDs.erase(target->GetGUID());
-
             #ifdef TRINITY_DEBUG
             if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
                 sLog.outDebug("Object %u (Type: %u) out of range for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),GetGUIDLow(),GetDistance(target));
@@ -19178,15 +16319,12 @@ void Player::UpdateVisibilityOf(WorldObject* target)
         {
             //if(target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle)
             //    UpdateVisibilityOf(((Unit*)target)->m_Vehicle);
-                
             target->SendUpdateToPlayer(this);
             UpdateVisibilityOf_helper(m_clientGUIDs, target);
-
             #ifdef TRINITY_DEBUG
             if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
                 sLog.outDebug("Object %u (Type: %u) is visible now for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),GetGUIDLow(),GetDistance(target));
             #endif
-
             // target aura duration for caster show only if target exist at caster client
             // send data at target visibility change (adding to client)
             if(target->isType(TYPEMASK_UNIT))
@@ -19194,7 +16332,6 @@ void Player::UpdateVisibilityOf(WorldObject* target)
         }
     }
 }
-
 void Player::SendInitialVisiblePackets(Unit* target)
 {
     SendAurasForTarget(target);
@@ -19206,7 +16343,6 @@ void Player::SendInitialVisiblePackets(Unit* target)
             target->SendMeleeAttackStart(target->getVictim());
     }
 }
-
 template<class T>
 void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow)
 {
@@ -19216,7 +16352,6 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObjec
         {
             target->BuildOutOfRangeUpdateBlock(&data);
             m_clientGUIDs.erase(target->GetGUID());
-
             #ifdef TRINITY_DEBUG
             if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
                 sLog.outDebug("Object %u (Type: %u, Entry: %u) is out of range for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),target->GetEntry(),GetGUIDLow(),GetDistance(target));
@@ -19229,11 +16364,9 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObjec
         {
             //if(target->isType(TYPEMASK_UNIT) && ((Unit*)target)->m_Vehicle)
             //    UpdateVisibilityOf(((Unit*)target)->m_Vehicle, data, visibleNow);
-
             visibleNow.insert(target);
             target->BuildCreateUpdateBlockForPlayer(&data, this);
             UpdateVisibilityOf_helper(m_clientGUIDs,target);
-
             #ifdef TRINITY_DEBUG
             if((sLog.getLogFilter() & LOG_FILTER_VISIBILITY_CHANGES)==0)
                 sLog.outDebug("Object %u (Type: %u, Entry: %u) is visible now for player %u. Distance = %f",target->GetGUIDLow(),target->GetTypeId(),target->GetEntry(),GetGUIDLow(),GetDistance(target));
@@ -19241,32 +16374,27 @@ void Player::UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObjec
         }
     }
 }
-
 template void Player::UpdateVisibilityOf(Player*        target, UpdateData& data, std::set<WorldObject*>& visibleNow);
 template void Player::UpdateVisibilityOf(Creature*      target, UpdateData& data, std::set<WorldObject*>& visibleNow);
 template void Player::UpdateVisibilityOf(Corpse*        target, UpdateData& data, std::set<WorldObject*>& visibleNow);
 template void Player::UpdateVisibilityOf(GameObject*    target, UpdateData& data, std::set<WorldObject*>& visibleNow);
 template void Player::UpdateVisibilityOf(DynamicObject* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-
 void Player::InitPrimaryProfessions()
 {
     SetFreePrimaryProfessions(sWorld.getConfig(CONFIG_MAX_PRIMARY_TRADE_SKILL));
 }
-
 Unit * Player::GetSelectedUnit() const
 {
     if(m_curSelection)
         return ObjectAccessor::GetUnit(*this, m_curSelection);
     return NULL;
 }
-
 Player * Player::GetSelectedPlayer() const
 {
     if(m_curSelection)
         return ObjectAccessor::GetPlayer(*this, m_curSelection);
     return NULL;
 }
-
 void Player::SendComboPoints()
 {
     Unit *combotarget = ObjectAccessor::GetUnit(*this, m_comboTarget);
@@ -19285,17 +16413,13 @@ void Player::SendComboPoints()
         GetSession()->SendPacket(&data);
     }
 }
-
 void Player::AddComboPoints(Unit* target, int8 count, Spell * spell)
 {
     if(!count)
         return;
-
     int8 * comboPoints = spell ? &spell->m_comboPointGain : &m_comboPoints;
-
     // without combo points lost (duration checked in aura)
     RemoveAurasByType(SPELL_AURA_RETAIN_COMBO_POINTS);
-
     if(target->GetGUID() == m_comboTarget)
     {
         *comboPoints += count;
@@ -19305,50 +16429,36 @@ void Player::AddComboPoints(Unit* target, int8 count, Spell * spell)
         if(m_comboTarget)
             if(Unit* target2 = ObjectAccessor::GetUnit(*this,m_comboTarget))
                 target2->RemoveComboPointHolder(GetGUIDLow());
-
         m_comboTarget = target->GetGUID();
         *comboPoints = count;
-
         target->AddComboPointHolder(GetGUIDLow());
     }
-
     if (*comboPoints > 5) *comboPoints = 5;
     else if (*comboPoints < 0) *comboPoints = 0;
-
     if (!spell)
         SendComboPoints();
 }
-
 void Player::GainSpellComboPoints(int8 count)
 {
     if(!count)
         return;
-
     m_comboPoints += count;
     if (m_comboPoints > 5) m_comboPoints = 5;
     else if (m_comboPoints < 0) m_comboPoints = 0;
-
     SendComboPoints();
 }
-
 void Player::ClearComboPoints()
 {
     if(!m_comboTarget)
         return;
-
     // without combopoints lost (duration checked in aura)
     RemoveAurasByType(SPELL_AURA_RETAIN_COMBO_POINTS);
-
     m_comboPoints = 0;
-
     SendComboPoints();
-
     if(Unit* target = ObjectAccessor::GetUnit(*this,m_comboTarget))
         target->RemoveComboPointHolder(GetGUIDLow());
-
     m_comboTarget = 0;
 }
-
 void Player::SetGroup(Group *group, int8 subgroup)
 {
     if(group == NULL)
@@ -19361,58 +16471,45 @@ void Player::SetGroup(Group *group, int8 subgroup)
         m_group.setSubGroup((uint8)subgroup);
     }
 }
-
 void Player::SendInitialPacketsBeforeAddToMap()
 {
     WorldPacket data(SMSG_SET_REST_START_OBSOLETE, 4);
     data << uint32(0);                                      // unknown, may be rest state time or experience
     GetSession()->SendPacket(&data);
-
     GetSocial()->SendSocialList();
-
     // Homebind
     data.Initialize(SMSG_BINDPOINTUPDATE, 5*4);
     data << m_homebindX << m_homebindY << m_homebindZ;
     data << (uint32) m_homebindMapId;
     data << (uint32) m_homebindZoneId;
     GetSession()->SendPacket(&data);
-
     // SMSG_SET_PROFICIENCY
     // SMSG_UPDATE_AURA_DURATION
-
     SendTalentsInfoData(false);
     SendInitialSpells();
-
     data.Initialize(SMSG_SEND_UNLEARN_SPELLS, 4);
     data << uint32(0);                                      // count, for(count) uint32;
     GetSession()->SendPacket(&data);
-
     SendInitialActionButtons();
     m_reputationMgr.SendInitialReputations();
     m_achievementMgr.SendAllAchievementData();
-
     SendEquipmentSetList();
-
     data.Initialize(SMSG_LOGIN_SETTIMESPEED, 4 + 4 + 4);
     data << uint32(secsToTimeBitFields(sWorld.GetGameTime()));
     data << (float)0.01666667f;                             // game speed
     data << uint32(0);                                      // added in 3.1.2
     GetSession()->SendPacket( &data );
 }
-
 void Player::SendInitialPacketsAfterAddToMap()
 {
     // update zone
     uint32 newzone, newarea;
     GetZoneAndAreaId(newzone,newarea);
     UpdateZone(newzone,newarea);                            // also call SendInitWorldStates();
-
     WorldPacket data(SMSG_TIME_SYNC_REQ, 4);                // new 2.0.x, enable movement
     data << uint32(0x00000000);                             // on blizz it increments periodically
     GetSession()->SendPacket(&data);
-
     CastSpell(this, SPELL_ID_LOGINEFFECT, true);                             // LOGINEFFECT
-
     // set some aura effects that send packet to player client after add player to map
     // SendMessageToSet not send it to player not it map, only for aura that not changed anything at re-apply
     // same auras state lost at far teleport, send it one more time in this case also
@@ -19428,10 +16525,8 @@ void Player::SendInitialPacketsAfterAddToMap()
         if(!auraList.empty())
             auraList.front()->ApplyModifier(true,true);
     }
-
     if(HasAuraType(SPELL_AURA_MOD_STUN))
         SetMovement(MOVE_ROOT);
-
     // manual send package (have code in ApplyModifier(true,true); that don't must be re-applied.
     if(HasAuraType(SPELL_AURA_MOD_ROOT))
     {
@@ -19440,25 +16535,21 @@ void Player::SendInitialPacketsAfterAddToMap()
         data2 << (uint32)2;
         SendMessageToSet(&data2,true);
     }
-
     SendAurasForTarget(this);
     SendEnchantmentDurations();                             // must be after add to map
     SendItemDurations();                                    // must be after add to map
 }
-
 void Player::SendUpdateToOutOfRangeGroupMembers()
 {
     if (m_groupUpdateMask == GROUP_UPDATE_FLAG_NONE)
         return;
     if(Group* group = GetGroup())
         group->UpdatePlayerOutOfRange(this);
-
     m_groupUpdateMask = GROUP_UPDATE_FLAG_NONE;
     m_auraRaidUpdateMask = 0;
     if(Pet *pet = GetPet())
         pet->ResetAuraUpdateMaskForRaid();
 }
-
 void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
 {
     WorldPacket data(SMSG_TRANSFER_ABORTED, 4+2);
@@ -19474,7 +16565,6 @@ void Player::SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg)
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::SendInstanceResetWarning( uint32 mapid, uint32 difficulty, uint32 time )
 {
     // type of warning, based on the time remaining until reset
@@ -19487,7 +16577,6 @@ void Player::SendInstanceResetWarning( uint32 mapid, uint32 difficulty, uint32 t
         type = RAID_INSTANCE_WARNING_MIN;
     else
         type = RAID_INSTANCE_WARNING_MIN_SOON;
-
     WorldPacket data(SMSG_RAID_INSTANCE_MESSAGE, 4+4+4+4);
     data << uint32(type);
     data << uint32(mapid);
@@ -19500,42 +16589,33 @@ void Player::SendInstanceResetWarning( uint32 mapid, uint32 difficulty, uint32 t
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::ApplyEquipCooldown( Item * pItem )
 {
     for(uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         _Spell const& spellData = pItem->GetProto()->Spells[i];
-
         // no spell
         if( !spellData.SpellId )
             continue;
-
         // wrong triggering type (note: ITEM_SPELLTRIGGER_ON_NO_DELAY_USE not have cooldown)
         if( spellData.SpellTrigger != ITEM_SPELLTRIGGER_ON_USE )
             continue;
-
         AddSpellCooldown(spellData.SpellId, pItem->GetEntry(), time(NULL) + 30);
-
         WorldPacket data(SMSG_ITEM_COOLDOWN, 12);
         data << pItem->GetGUID();
         data << uint32(spellData.SpellId);
         GetSession()->SendPacket(&data);
     }
 }
-
 void Player::resetSpells(bool myClassOnly)
 {
     // not need after this call
     if(HasAtLoginFlag(AT_LOGIN_RESET_SPELLS))
         RemoveAtLoginFlag(AT_LOGIN_RESET_SPELLS,true);
-
     // make full copy of map (spells removed and marked as deleted at another spell remove
     // and we can't use original map for safe iterative with visit each spell at loop end
     PlayerSpellMap smap = GetSpellMap();
-
     uint32 family;
-
     if(myClassOnly)
     {
         ChrClassesEntry const* clsEntry = sChrClassesStore.LookupEntry(getClass());
@@ -19543,7 +16623,6 @@ void Player::resetSpells(bool myClassOnly)
             return;
         family = clsEntry->spellfamily;
     }
-
     for(PlayerSpellMap::const_iterator iter = smap.begin();iter != smap.end(); ++iter)
     {
         if(myClassOnly)
@@ -19551,35 +16630,28 @@ void Player::resetSpells(bool myClassOnly)
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(iter->first);
             if(!spellInfo)
                 continue;
-
             // skip server-side/triggered spells
             if(spellInfo->spellLevel == 0)
                 continue;
-
             // skip wrong class/race skills
             if(!IsSpellFitByClassAndRace(spellInfo->Id))
                 continue;
-
             // skip other spell families
             if(spellInfo->SpellFamilyName != family)
                 continue;
-
             // skip spells with first rank learned as talent (and all talents then also)
             uint32 first_rank = spellmgr.GetFirstSpellInChain(spellInfo->Id);
             if(GetTalentSpellCost(first_rank) > 0)
                 continue;
-
             // skip broken spells
             if(!SpellMgr::IsSpellValid(spellInfo,this,false))
                 continue;
         }
         removeSpell(iter->first,false,false);               // only iter->first can be accessed, object by iter->second can be deleted already
     }
-
     learnDefaultSpells();
     learnQuestRewardedSpells();
 }
-
 void Player::learnDefaultSpells()
 {
     // learn default race/class spells
@@ -19594,19 +16666,15 @@ void Player::learnDefaultSpells()
             learnSpell(tspell,true);
     }
 }
-
 void Player::learnQuestRewardedSpells(Quest const* quest)
 {
     uint32 spell_id = quest->GetRewSpellCast();
-
     // skip quests without rewarded spell
     if( !spell_id )
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spell_id);
     if(!spellInfo)
         return;
-
     // check learned spells state
     bool found = false;
     for(uint8 i=0; i < 3; ++i)
@@ -19617,11 +16685,9 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
             break;
         }
     }
-
     // skip quests with not teaching spell or already known spell
     if(!found)
         return;
-
     // prevent learn non first rank unknown profession and second specialization for same profession)
     uint32 learned_0 = spellInfo->EffectTriggerSpell[0];
     if( spellmgr.GetSpellRank(learned_0) > 1 && !HasSpell(learned_0) )
@@ -19630,13 +16696,10 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
         uint32 first_spell = spellmgr.GetFirstSpellInChain(learned_0);
         if( !HasSpell(first_spell) )
             return;
-
         SpellEntry const *learnedInfo = sSpellStore.LookupEntry(learned_0);
         if(!learnedInfo)
             return;
-
         uint32 profSpell = spellmgr.GetSpellRequired(learned_0);
-
         // specialization
         if(learnedInfo->Effect[0]==SPELL_EFFECT_TRADE_SKILL && learnedInfo->Effect[1]==0 && profSpell)
         {
@@ -19645,25 +16708,20 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
             {
                 if(itr->second->state == PLAYERSPELL_REMOVED || itr->first==learned_0)
                     continue;
-
                 SpellEntry const *itrInfo = sSpellStore.LookupEntry(itr->first);
                 if(!itrInfo)
                     return;
-
                 // compare only specializations
                 if(itrInfo->Effect[0]!=SPELL_EFFECT_TRADE_SKILL || itrInfo->Effect[1]!=0)
                     continue;
-
                 // compare same chain spells
                 if (spellmgr.GetSpellRequired(itr->first) == profSpell)
                     return;
             }
         }
     }
-
     CastSpell( this, spell_id, true);
 }
-
 void Player::learnQuestRewardedSpells()
 {
     // learn spells received from quest completing
@@ -19672,15 +16730,12 @@ void Player::learnQuestRewardedSpells()
         // skip no rewarded quests
         if(!itr->second.m_rewarded)
             continue;
-
         Quest const* quest = objmgr.GetQuestTemplate(itr->first);
         if( !quest )
             continue;
-
         learnQuestRewardedSpells(quest);
     }
 }
-
 void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value )
 {
     uint32 raceMask  = getRaceMask();
@@ -19696,7 +16751,6 @@ void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value )
         // Check class if set
         if (pAbility->classmask && !(pAbility->classmask & classMask))
             continue;
-
         if (sSpellStore.LookupEntry(pAbility->spellId))
         {
             // need unlearn spell
@@ -19710,29 +16764,24 @@ void Player::learnSkillRewardedSpells(uint32 skill_id, uint32 skill_value )
         }
     }
 }
-
 void Player::SendAurasForTarget(Unit *target)
 {
     if(!target || target->GetVisibleAuras()->empty())                  // speedup things
         return;
-
     WorldPacket data(SMSG_AURA_UPDATE_ALL);
     data.append(target->GetPackGUID());
-
     Unit::VisibleAuraMap const *visibleAuras = target->GetVisibleAuras();
     for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr)
     {
         Aura * aura=itr->second;
         data << uint8(aura->GetAuraSlot());
         data << uint32(aura->GetId());
-
         // flags
         data << aura->m_auraFlags;
         // level
         data << aura->m_auraLevel;
         // charges
         data << uint8(aura->GetStackAmount()>1 ? aura->GetStackAmount() : aura->GetAuraCharges());
-
         if(!(aura->m_auraFlags & AFLAG_CASTER))
         {
             if (Unit * caster = aura->GetCaster())
@@ -19740,17 +16789,14 @@ void Player::SendAurasForTarget(Unit *target)
             else
                 data << uint8(0);
         }
-
         if(aura->m_auraFlags & AFLAG_DURATION)          // include aura duration
         {
             data << uint32(aura->GetAuraMaxDuration());
             data << uint32(aura->GetAuraDuration());
         }
     }
-
     GetSession()->SendPacket(&data);
 }
-
 void Player::SetDailyQuestStatus( uint32 quest_id )
 {
     for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
@@ -19764,54 +16810,43 @@ void Player::SetDailyQuestStatus( uint32 quest_id )
         }
     }
 }
-
 void Player::ResetDailyQuestStatus()
 {
     for(uint32 quest_daily_idx = 0; quest_daily_idx < PLAYER_MAX_DAILY_QUESTS; ++quest_daily_idx)
         SetUInt32Value(PLAYER_FIELD_DAILY_QUESTS_1+quest_daily_idx,0);
-
     // DB data deleted in caller
     m_DailyQuestChanged = false;
     m_lastDailyQuestTime = 0;
 }
-
 BattleGround* Player::GetBattleGround() const
 {
     if(GetBattleGroundId()==0)
         return NULL;
-
     return sBattleGroundMgr.GetBattleGround(GetBattleGroundId(), m_bgData.bgTypeID);
 }
-
 bool Player::InArena() const
 {
     BattleGround *bg = GetBattleGround();
     if(!bg || !bg->isArena())
         return false;
-
     return true;
 }
-
 bool Player::GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const
 {
     // get a template bg instead of running one
     BattleGround *bg = sBattleGroundMgr.GetBattleGroundTemplate(bgTypeId);
     if(!bg)
         return false;
-
     if(getLevel() < bg->GetMinLevel() || getLevel() > bg->GetMaxLevel())
         return false;
-
     return true;
 }
-
 BGQueueIdBasedOnLevel Player::GetBattleGroundQueueIdFromLevel(BattleGroundTypeId bgTypeId) const
 {
     //returned to hardcoded version of this function, because there is no way to code it dynamic
     uint32 level = getLevel();
     if( bgTypeId == BATTLEGROUND_AV )
         level--;
-
     uint32 queue_id = (level / 10) - 1; // for ranges 0 - 19, 20 - 29, 30 - 39, 40 - 49, 50 - 59, 60 - 69, 70 -79, 80
     if( queue_id >= MAX_BATTLEGROUND_QUEUES )
     {
@@ -19820,45 +16855,35 @@ BGQueueIdBasedOnLevel Player::GetBattleGroundQueueIdFromLevel(BattleGroundTypeId
     }
     return BGQueueIdBasedOnLevel(queue_id);
 }
-
 float Player::GetReputationPriceDiscount( Creature const* pCreature ) const
 {
     FactionTemplateEntry const* vendor_faction = pCreature->getFactionTemplateEntry();
     if(!vendor_faction || !vendor_faction->faction)
         return 1.0f;
-
     ReputationRank rank = GetReputationRank(vendor_faction->faction);
     if(rank <= REP_NEUTRAL)
         return 1.0f;
-
     return 1.0f - 0.05f* (rank - REP_NEUTRAL);
 }
-
 bool Player::IsSpellFitByClassAndRace( uint32 spell_id ) const
 {
     uint32 racemask  = getRaceMask();
     uint32 classmask = getClassMask();
-
     SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spell_id);
     if (bounds.first==bounds.second)
         return true;
-
     for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
     {
         // skip wrong race skills
         if (_spell_idx->second->racemask && (_spell_idx->second->racemask & racemask) == 0)
             continue;
-
         // skip wrong class skills
         if (_spell_idx->second->classmask && (_spell_idx->second->classmask & classmask) == 0)
             continue;
-
         return true;
     }
-
     return false;
 }
-
 bool Player::HasQuestForGO(int32 GOId) const
 {
     for( uint8 i = 0; i < MAX_QUEST_LOG_SIZE; ++i )
@@ -19866,27 +16891,21 @@ bool Player::HasQuestForGO(int32 GOId) const
         uint32 questid = GetQuestSlotQuestId(i);
         if ( questid == 0 )
             continue;
-
         QuestStatusMap::const_iterator qs_itr = mQuestStatus.find(questid);
         if(qs_itr == mQuestStatus.end())
             continue;
-
         QuestStatusData const& qs = qs_itr->second;
-
         if (qs.m_status == QUEST_STATUS_INCOMPLETE)
         {
             Quest const* qinfo = objmgr.GetQuestTemplate(questid);
             if(!qinfo)
                 continue;
-
             if(GetGroup() && GetGroup()->isRaidGroup() && qinfo->GetType() != QUEST_TYPE_RAID)
                 continue;
-
             for (int j = 0; j < QUEST_OBJECTIVES_COUNT; j++)
             {
                 if (qinfo->ReqCreatureOrGOId[j]>=0)         //skip non GO case
                     continue;
-
                 if((-1)*GOId == qinfo->ReqCreatureOrGOId[j] && qs.m_creatureOrGOcount[j] < qinfo->ReqCreatureOrGOCount[j])
                     return true;
             }
@@ -19894,12 +16913,10 @@ bool Player::HasQuestForGO(int32 GOId) const
     }
     return false;
 }
-
 void Player::UpdateForQuestWorldObjects()
 {
     if(m_clientGUIDs.empty())
         return;
-
     UpdateData udata;
     WorldPacket packet;
     for(ClientGUIDs::iterator itr=m_clientGUIDs.begin(); itr!=m_clientGUIDs.end(); ++itr)
@@ -19915,11 +16932,9 @@ void Player::UpdateForQuestWorldObjects()
             Creature *obj = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, *itr);
             if(!obj)
                 continue;
-
             // check if this unit requires quest specific flags
             if(!obj->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
                 continue;
-
             SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(obj->GetEntry());
             for(SpellClickInfoMap::const_iterator _itr = clickPair.first; _itr != clickPair.second; ++_itr)
             {
@@ -19934,7 +16949,6 @@ void Player::UpdateForQuestWorldObjects()
     udata.BuildPacket(&packet);
     GetSession()->SendPacket(&packet);
 }
-
 void Player::SummonIfPossible(bool agree)
 {
     if(!agree)
@@ -19942,30 +16956,23 @@ void Player::SummonIfPossible(bool agree)
         m_summon_expire = 0;
         return;
     }
-
     // expire and auto declined
     if(m_summon_expire < time(NULL))
         return;
-
     // stop taxi flight at summon
     if(isInFlight())
     {
         GetMotionMaster()->MovementExpired();
         CleanupAfterTaxiFlight();
     }
-
     // drop flag at summon
     // this code can be reached only when GM is summoning player who carries flag, because player should be immune to summoning spells when he carries flag
     if(BattleGround *bg = GetBattleGround())
         bg->EventPlayerDroppedFlag(this);
-
     m_summon_expire = 0;
-
     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ACCEPTED_SUMMONINGS, 1);
-
     TeleportTo(m_summon_mapid, m_summon_x, m_summon_y, m_summon_z,GetOrientation());
 }
-
 void Player::RemoveItemDurations( Item *item )
 {
     for(ItemDurationList::iterator itr = m_itemDuration.begin();itr != m_itemDuration.end(); ++itr)
@@ -19977,7 +16984,6 @@ void Player::RemoveItemDurations( Item *item )
         }
     }
 }
-
 void Player::AddItemDurations( Item *item )
 {
     if(item->GetUInt32Value(ITEM_FIELD_DURATION))
@@ -19986,17 +16992,14 @@ void Player::AddItemDurations( Item *item )
         item->SendTimeUpdate(this);
     }
 }
-
 void Player::AutoUnequipOffhandIfNeed()
 {
     Item *offItem = GetItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND );
     if(!offItem)
         return;
-
     // need unequip offhand for 2h-weapon without TitanGrip (in any from hands)
     if (CanTitanGrip() || (offItem->GetProto()->InventoryType != INVTYPE_2HWEAPON && !IsTwoHandUsed()))
         return;
-
     ItemPosCountVec off_dest;
     uint8 off_msg = CanStoreItem( NULL_BAG, NULL_SLOT, off_dest, offItem, false );
     if( off_msg == EQUIP_ERR_OK )
@@ -20013,22 +17016,18 @@ void Player::AutoUnequipOffhandIfNeed()
         offItem->DeleteFromInventoryDB();                   // deletes item from character's inventory
         offItem->SaveToDB();                                // recursive and not have transaction guard into self, item not in inventory and can be save standalone
         CharacterDatabase.CommitTransaction();
-
         std::string subject = GetSession()->GetMangosString(LANG_NOT_EQUIPPED_ITEM);
         WorldSession::SendMailTo(this, MAIL_NORMAL, MAIL_STATIONERY_GM, GetGUIDLow(), GetGUIDLow(), subject, 0, &mi, 0, 0, MAIL_CHECK_MASK_NONE);
     }
 }
-
 OutdoorPvP * Player::GetOutdoorPvP() const
 {
     return sOutdoorPvPMgr.GetOutdoorPvPToZoneId(GetZoneId());
 }
-
 bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item const* ignoreItem)
 {
     if(spellInfo->EquippedItemClass < 0)
         return true;
-
     // scan other equipped items for same requirements (mostly 2 daggers/etc)
     // for optimize check 2 used cases only
     switch(spellInfo->EquippedItemClass)
@@ -20048,34 +17047,28 @@ bool Player::HasItemFitToSpellReqirements(SpellEntry const* spellInfo, Item cons
                 if(Item *item = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, i ))
                     if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                         return true;
-
             // shields can be equipped to offhand slot
             if(Item *item = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
                 if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                     return true;
-
             // ranged slot can have some armor subclasses
             if(Item *item = GetUseableItemByPos( INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED))
                 if(item!=ignoreItem && item->IsFitToSpellRequirements(spellInfo))
                     return true;
-
             break;
         }
         default:
             sLog.outError("HasItemFitToSpellReqirements: Not handled spell requirement for item class %u",spellInfo->EquippedItemClass);
             break;
     }
-
     return false;
 }
-
 bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const
 {
     // don't take reagents for spells with SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP
     if (spellInfo->AttributesEx5 & SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP &&
         HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION))
         return true;
-
     // Check no reagent use mask
     flag96 noReagentMask;
     noReagentMask[0] = GetUInt32Value(PLAYER_NO_REAGENT_COST_1);
@@ -20083,17 +17076,14 @@ bool Player::CanNoReagentCast(SpellEntry const* spellInfo) const
     noReagentMask[2] = GetUInt32Value(PLAYER_NO_REAGENT_COST_1+2);
     if (spellInfo->SpellFamilyFlags  & noReagentMask)
         return true;
-
     return false;
 }
-
 void Player::RemoveItemDependentAurasAndCasts( Item * pItem )
 {
     AuraMap& auras = GetAuras();
     for(AuraMap::iterator itr = auras.begin(); itr != auras.end(); )
     {
         Aura* aura = itr->second;
-
         // skip passive (passive item dependent spells work in another way) and not self applied auras
         SpellEntry const* spellInfo = aura->GetSpellProto();
         if(aura->IsPassive() ||  aura->GetCasterGUID()!=GetGUID())
@@ -20101,25 +17091,21 @@ void Player::RemoveItemDependentAurasAndCasts( Item * pItem )
             ++itr;
             continue;
         }
-
         // skip if not item dependent or have alternative item
         if(HasItemFitToSpellReqirements(spellInfo,pItem))
         {
             ++itr;
             continue;
         }
-
         // no alt item, remove aura, restart check
         RemoveAura(itr);
     }
-
     // currently casted spells can be dependent from item
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
         if (Spell* spell = GetCurrentSpell(CurrentSpellTypes(i)))
             if (spell->getState()!=SPELL_STATE_DELAYED && !HasItemFitToSpellReqirements(spell->m_spellInfo,pItem) )
                 InterruptSpell(CurrentSpellTypes(i));
 }
-
 uint32 Player::GetResurrectionSpellId()
 {
     // search priceless resurrection possibilities
@@ -20144,7 +17130,6 @@ uint32 Player::GetResurrectionSpellId()
                     sLog.outError("Unhandled spell %u: S.Resurrection",(*itr)->GetId());
                     continue;
             }
-
             prio = 3;
         }
         // Twisting Nether                                  // prio: 2 (max)
@@ -20154,24 +17139,19 @@ uint32 Player::GetResurrectionSpellId()
             spell_id = 23700;
         }
     }
-
     // Reincarnation (passive spell)  // prio: 1                  // Glyph of Renewed Life
     if(prio < 1 && HasSpell(20608) && !HasSpellCooldown(21169) && (HasAura(58059) || HasItemCount(17030,1)))
         spell_id = 21169;
-
     return spell_id;
 }
-
 // Used in triggers for check "Only to targets that grant experience or honor" req
 bool Player::isHonorOrXPTarget(Unit* pVictim)
 {
     uint32 v_level = pVictim->getLevel();
     uint32 k_grey  = Trinity::XP::GetGrayLevel(getLevel());
-
     // Victim level less gray level
     if(v_level<=k_grey)
         return false;
-
     if(pVictim->GetTypeId() == TYPEID_UNIT)
     {
         if (((Creature*)pVictim)->isTotem() ||
@@ -20181,73 +17161,58 @@ bool Player::isHonorOrXPTarget(Unit* pVictim)
     }
     return true;
 }
-
 bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
 {
     bool PvP = pVictim->isCharmedOwnedByPlayerOrPlayer();
-
     // prepare data for near group iteration (PvP and !PvP cases)
     uint32 xp = 0;
     bool honored_kill = false;
-
     if(Group *pGroup = GetGroup())
     {
         uint32 count = 0;
         uint32 sum_level = 0;
         Player* member_with_max_level = NULL;
         Player* not_gray_member_with_max_level = NULL;
-
         pGroup->GetDataForXPAtKill(pVictim,count,sum_level,member_with_max_level,not_gray_member_with_max_level);
-
         if(member_with_max_level)
         {
             // PvP kills doesn't yield experience
             // also no XP gained if there is no member below gray level
             xp = (PvP || !not_gray_member_with_max_level || GetVehicle()) ? 0 : Trinity::XP::Gain(not_gray_member_with_max_level, pVictim);
-
             /// skip in check PvP case (for speed, not used)
             bool is_raid = PvP ? false : sMapStore.LookupEntry(GetMapId())->IsRaid() && pGroup->isRaidGroup();
             bool is_dungeon = PvP ? false : sMapStore.LookupEntry(GetMapId())->IsDungeon();
             float group_rate = Trinity::XP::xp_in_group_rate(count,is_raid);
-
             for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
             {
                 Player* pGroupGuy = itr->getSource();
                 if(!pGroupGuy)
                     continue;
-
                 if(!pGroupGuy->IsAtGroupRewardDistance(pVictim))
                     continue;                               // member (alive or dead) or his corpse at req. distance
-
                 // honor can be in PvP and !PvP (racial leader) cases (for alive)
                 if(pGroupGuy->isAlive() && pGroupGuy->RewardHonor(pVictim,count, -1, true) && pGroupGuy==this)
                     honored_kill = true;
-
                 // xp and reputation only in !PvP case
                 if(!PvP)
                 {
                     float rate = group_rate * float(pGroupGuy->getLevel()) / sum_level;
-
                     // if is in dungeon then all receive full reputation at kill
                     // rewarded any alive/dead/near_corpse group member
                     pGroupGuy->RewardReputation(pVictim,is_dungeon ? 1.0f : rate);
-
                     // XP updated only for alive group member
                     if(pGroupGuy->isAlive() && not_gray_member_with_max_level &&
                        pGroupGuy->getLevel() <= not_gray_member_with_max_level->getLevel())
                     {
                         uint32 itr_xp = (member_with_max_level == not_gray_member_with_max_level) ? uint32(xp*rate) : uint32((xp*rate/2)+1);
-
                         // handle SPELL_AURA_MOD_XP_PCT auras
                         Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_PCT);
                         for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
                             itr_xp = uint32(itr_xp*(1.0f + (*i)->GetAmount() / 100.0f));
-
                         pGroupGuy->GiveXP(itr_xp, pVictim);
                         if(Pet* pet = pGroupGuy->GetPet())
                             pet->GivePetXP(itr_xp/2);
                     }
-
                     // quest objectives updated only for alive group member or dead but with not released body
                     if(pGroupGuy->isAlive()|| !pGroupGuy->GetCorpse())
                     {
@@ -20262,26 +17227,20 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
     else                                                    // if (!pGroup)
     {
         xp = (PvP || GetVehicle()) ? 0 : Trinity::XP::Gain(this, pVictim);
-
         // honor can be in PvP and !PvP (racial leader) cases
         if(RewardHonor(pVictim,1, -1, true))
             honored_kill = true;
-
         // xp and reputation only in !PvP case
         if(!PvP)
         {
             RewardReputation(pVictim,1);
-
             // handle SPELL_AURA_MOD_XP_PCT auras
             Unit::AuraEffectList const& ModXPPctAuras = GetAurasByType(SPELL_AURA_MOD_XP_PCT);
             for(Unit::AuraEffectList::const_iterator i = ModXPPctAuras.begin();i != ModXPPctAuras.end(); ++i)
                 xp = uint32(xp*(1.0f + (*i)->GetAmount() / 100.0f));
-
             GiveXP(xp, pVictim);
-
             if(Pet* pet = GetPet())
                 pet->GivePetXP(xp);
-
             // normal creature (not pet/etc) can be only in !PvP case
             if(pVictim->GetTypeId()==TYPEID_UNIT)
                 KilledMonster(((Creature*)pVictim)->GetCreatureInfo(), pVictim->GetGUID());
@@ -20289,11 +17248,9 @@ bool Player::RewardPlayerAndGroupAtKill(Unit* pVictim)
     }
     return xp || honored_kill;
 }
-
 void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewardSource)
 {
     uint64 creature_guid = pRewardSource->GetTypeId()==TYPEID_UNIT ? pRewardSource->GetGUID() : uint64(0);
-
     // prepare data for near group iteration
     if(Group *pGroup = GetGroup())
     {
@@ -20302,10 +17259,8 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
             Player* pGroupGuy = itr->getSource();
             if(!pGroupGuy)
                 continue;
-
             if(!pGroupGuy->IsAtGroupRewardDistance(pRewardSource))
                 continue;                               // member (alive or dead) or his corpse at req. distance
-
             // quest objectives updated only for alive group member or dead but with not released body
             if(pGroupGuy->isAlive()|| !pGroupGuy->GetCorpse())
                 pGroupGuy->KilledMonsterCredit(creature_id, creature_guid);
@@ -20314,38 +17269,30 @@ void Player::RewardPlayerAndGroupAtEvent(uint32 creature_id, WorldObject* pRewar
     else                                                    // if (!pGroup)
         KilledMonsterCredit(creature_id, creature_guid);
 }
-
 bool Player::IsAtGroupRewardDistance(WorldObject const* pRewardSource) const
 {
     const WorldObject* player = GetCorpse();
     if(!player || isAlive())
         player = this;
-
     if(player->GetMapId() != pRewardSource->GetMapId() || player->GetInstanceId() != pRewardSource->GetInstanceId())
         return false;
-
     return pRewardSource->GetDistance(player) <= sWorld.getConfig(CONFIG_GROUP_XP_DISTANCE);
 }
-
 uint32 Player::GetBaseWeaponSkillValue (WeaponAttackType attType) const
 {
     Item* item = GetWeaponForAttack(attType,true);
-
     // unarmed only with base attack
     if(attType != BASE_ATTACK && !item)
         return 0;
-
     // weapon skill or (unarmed for base attack)
     uint32  skill = item ? item->GetSkill() : uint32(SKILL_UNARMED);
     return GetBaseSkillValue(skill);
 }
-
 void Player::ResurectUsingRequestData()
 {
     /// Teleport before resurrecting by player, otherwise the player might get attacked from creatures near his corpse
     if(IS_PLAYER_GUID(m_resurrectGUID))
         TeleportTo(m_resurrectMap, m_resurrectX, m_resurrectY, m_resurrectZ, GetOrientation());
-
     //we cannot resurrect player when we triggered far teleport
     //player will be resurrected upon teleportation
     if(IsBeingTeleportedFar())
@@ -20353,26 +17300,19 @@ void Player::ResurectUsingRequestData()
         ScheduleDelayedOperation(DELAYED_RESURRECT_PLAYER);
         return;
     }
-
     ResurrectPlayer(0.0f,false);
-
     if(GetMaxHealth() > m_resurrectHealth)
         SetHealth( m_resurrectHealth );
     else
         SetHealth( GetMaxHealth() );
-
     if(GetMaxPower(POWER_MANA) > m_resurrectMana)
         SetPower(POWER_MANA, m_resurrectMana );
     else
         SetPower(POWER_MANA, GetMaxPower(POWER_MANA) );
-
     SetPower(POWER_RAGE, 0 );
-
     SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY) );
-
     SpawnCorpseBones();
 }
-
 void Player::SetClientControl(Unit* target, uint8 allowMove)
 {
     WorldPacket data(SMSG_CLIENT_CONTROL_UPDATE, target->GetPackGUID().size()+1);
@@ -20382,7 +17322,6 @@ void Player::SetClientControl(Unit* target, uint8 allowMove)
     if(target == this)
         SetMover(this);
 }
-
 void Player::UpdateZoneDependentAuras( uint32 newZone )
 {
     // Some spells applied at enter into zone (with subzones), aura removed in UpdateAreaDependentAuras that called always at zone->area update
@@ -20392,7 +17331,6 @@ void Player::UpdateZoneDependentAuras( uint32 newZone )
             if( !HasAura(itr->second->spellId) )
                 CastSpell(this,itr->second->spellId,true);
 }
-
 void Player::UpdateAreaDependentAuras( uint32 newArea )
 {
     // remove auras from spells with area limitations
@@ -20404,14 +17342,12 @@ void Player::UpdateAreaDependentAuras( uint32 newArea )
         else
             ++iter;
     }
-
     // some auras applied at subzone enter
     SpellAreaForAreaMapBounds saBounds = spellmgr.GetSpellAreaForAreaMapBounds(newArea);
     for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
         if(itr->second->autocast && itr->second->IsFitToRequirements(this,m_zoneUpdateId,newArea))
             if( !HasAura(itr->second->spellId) )
                 CastSpell(this,itr->second->spellId,true);
-
     if(newArea == 4273 && GetVehicle() && GetPositionX() > 400) // Ulduar
     {
         switch(GetVehicleBase()->GetEntry())
@@ -20424,7 +17360,6 @@ void Player::UpdateAreaDependentAuras( uint32 newArea )
         }
     }
 }
-
 uint32 Player::GetCorpseReclaimDelay(bool pvp) const
 {
     if(pvp)
@@ -20434,22 +17369,18 @@ uint32 Player::GetCorpseReclaimDelay(bool pvp) const
     }
     else if(!sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE) )
         return 0;
-
     time_t now = time(NULL);
     // 0..2 full period
     // should be ceil(x)-1 but not floor(x)
     uint32 count = (now < m_deathExpireTime - 1) ? (m_deathExpireTime - 1 - now)/DEATH_EXPIRE_STEP : 0;
     return copseReclaimDelay[count];
 }
-
 void Player::UpdateCorpseReclaimDelay()
 {
     bool pvp = m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH;
-
     if ((pvp && !sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVP)) ||
         (!pvp && !sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE) ))
         return;
-
     time_t now = time(NULL);
     if(now < m_deathExpireTime)
     {
@@ -20463,25 +17394,21 @@ void Player::UpdateCorpseReclaimDelay()
     else
         m_deathExpireTime = now+DEATH_EXPIRE_STEP;
 }
-
 void Player::SendCorpseReclaimDelay(bool load)
 {
     Corpse* corpse = GetCorpse();
     if(load && !corpse)
         return;
-
     bool pvp;
     if(corpse)
         pvp = (corpse->GetType() == CORPSE_RESURRECTABLE_PVP);
     else
         pvp = (m_ExtraFlags & PLAYER_EXTRA_PVP_DEATH);
-
     uint32 delay;
     if(load)
     {
         if(corpse->GetGhostTime() > m_deathExpireTime)
             return;
-
         uint32 count;
         if( pvp && sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVP) ||
            !pvp && sWorld.getConfig(CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE) )
@@ -20492,77 +17419,59 @@ void Player::SendCorpseReclaimDelay(bool load)
         }
         else
             count=0;
-
         time_t expected_time = corpse->GetGhostTime()+copseReclaimDelay[count];
-
         time_t now = time(NULL);
         if(now >= expected_time)
             return;
-
         delay = expected_time-now;
     }
     else
         delay = GetCorpseReclaimDelay(pvp);
-
     if(!delay) return;
-
     //! corpse reclaim delay 30 * 1000ms or longer at often deaths
     WorldPacket data(SMSG_CORPSE_RECLAIM_DELAY, 4);
     data << uint32(delay*IN_MILISECONDS);
     GetSession()->SendPacket( &data );
 }
-
 Player* Player::GetNextRandomRaidMember(float radius)
 {
     Group *pGroup = GetGroup();
     if(!pGroup)
         return NULL;
-
     std::vector<Player*> nearMembers;
     nearMembers.reserve(pGroup->GetMembersCount());
-
     for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player* Target = itr->getSource();
-
         // IsHostileTo check duel and controlled by enemy
         if( Target && Target != this && IsWithinDistInMap(Target, radius) &&
             !Target->HasInvisibilityAura() && !IsHostileTo(Target) )
             nearMembers.push_back(Target);
     }
-
     if (nearMembers.empty())
         return NULL;
-
     uint32 randTarget = urand(0,nearMembers.size()-1);
     return nearMembers[randTarget];
 }
-
 PartyResult Player::CanUninviteFromGroup() const
 {
     const Group* grp = GetGroup();
     if(!grp)
         return PARTY_RESULT_YOU_NOT_IN_GROUP;
-
     if(!grp->IsLeader(GetGUID()) && !grp->IsAssistant(GetGUID()))
         return PARTY_RESULT_YOU_NOT_LEADER;
-
     if(InBattleGround())
         return PARTY_RESULT_INVITE_RESTRICTED;
-
     return PARTY_RESULT_OK;
 }
-
 void Player::SetBattleGroundRaid(Group* group, int8 subgroup)
 {
     //we must move references from m_group to m_originalGroup
     SetOriginalGroup(GetGroup(), GetSubGroup());
-
     m_group.unlink();
     m_group.link(group, this);
     m_group.setSubGroup((uint8)subgroup);
 }
-
 void Player::RemoveFromBattleGroundRaid()
 {
     //remove existing reference
@@ -20574,7 +17483,6 @@ void Player::RemoveFromBattleGroundRaid()
     }
     SetOriginalGroup(NULL);
 }
-
 void Player::SetOriginalGroup(Group *group, int8 subgroup)
 {
     if( group == NULL )
@@ -20587,7 +17495,6 @@ void Player::SetOriginalGroup(Group *group, int8 subgroup)
         m_originalGroup.setSubGroup((uint8)subgroup);
     }
 }
-
 void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
 {
     LiquidData liquid_status;
@@ -20600,7 +17507,6 @@ void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
             m_MirrorTimerFlags|=UNDERWATER_INWATER;
         return;
     }
-
     // All liquids type - check under water position
     if (liquid_status.type&(MAP_LIQUID_TYPE_WATER|MAP_LIQUID_TYPE_OCEAN|MAP_LIQUID_TYPE_MAGMA|MAP_LIQUID_TYPE_SLIME))
     {
@@ -20609,13 +17515,11 @@ void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
         else
             m_MirrorTimerFlags &= ~UNDERWATER_INWATER;
     }
-
     // Allow travel in dark water on taxi or transport
     if ((liquid_status.type & MAP_LIQUID_TYPE_DARK_WATER) && !isInFlight() && !GetTransport())
         m_MirrorTimerFlags |= UNDERWARER_INDARKWATER;
     else
         m_MirrorTimerFlags &= ~UNDERWARER_INDARKWATER;
-
     // in lava check, anywhere in lava level
     if (liquid_status.type&MAP_LIQUID_TYPE_MAGMA)
     {
@@ -20633,25 +17537,20 @@ void Player::UpdateUnderwaterState( Map* m, float x, float y, float z )
             m_MirrorTimerFlags &= ~UNDERWATER_INSLIME;
     }
 }
-
 void Player::SetCanParry( bool value )
 {
     if(m_canParry==value)
         return;
-
     m_canParry = value;
     UpdateParryPercentage();
 }
-
 void Player::SetCanBlock( bool value )
 {
     if(m_canBlock==value)
         return;
-
     m_canBlock = value;
     UpdateBlockPercentage();
 }
-
 bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const
 {
     for(ItemPosCountVec::const_iterator itr = vec.begin(); itr != vec.end();++itr)
@@ -20659,11 +17558,9 @@ bool ItemPosCount::isContainedIn(ItemPosCountVec const& vec) const
             return true;
     return false;
 }
-
 //***********************************
 //-------------TRINITY---------------
 //***********************************
-
 void Player::StopCastingBindSight()
 {
     if(WorldObject* target = GetViewpoint())
@@ -20676,53 +17573,43 @@ void Player::StopCastingBindSight()
         }
     }
 }
-
 void Player::SetViewpoint(WorldObject* target, bool apply)
 {
     if(apply)
     {
         sLog.outDebug("Player::CreateViewpoint: Player %s create seer %u (TypeId: %u).", GetName(), target->GetEntry(), target->GetTypeId());
-
         if(!AddUInt64Value(PLAYER_FARSIGHT, target->GetGUID()))
         {
             sLog.outCrash("Player::CreateViewpoint: Player %s cannot add new viewpoint!", GetName());
             return;
         }
-
         // farsight dynobj or puppet may be very far away
         UpdateVisibilityOf(target);
-
         if(target->isType(TYPEMASK_UNIT) && !GetVehicle())
             ((Unit*)target)->AddPlayerToVision(this);
     }
     else
     {
         sLog.outDebug("Player::CreateViewpoint: Player %s remove seer", GetName());
-
         if(!RemoveUInt64Value(PLAYER_FARSIGHT, target->GetGUID()))
         {
             sLog.outCrash("Player::CreateViewpoint: Player %s cannot remove current viewpoint!", GetName());
             return;
         }
-
         if(target->isType(TYPEMASK_UNIT) && !GetVehicle())
             ((Unit*)target)->RemovePlayerFromVision(this);
-
         //must immediately set seer back otherwise may crash
         m_seer = this;
-
         //WorldPacket data(SMSG_CLEAR_FAR_SIGHT_IMMEDIATE, 0);
         //GetSession()->SendPacket(&data);
     }
 }
-
 WorldObject* Player::GetViewpoint() const
 {
     if(uint64 guid = GetUInt64Value(PLAYER_FARSIGHT))
         return (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER);
     return NULL;
 }
-
 bool Player::CanUseBattleGroundObject()
 {
     // TODO : some spells gives player ForceReaction to one faction (ReputationMgr::ApplyForceReaction)
@@ -20739,7 +17626,6 @@ bool Player::CanUseBattleGroundObject()
              isAlive()                                      // live player
            );
 }
-
 bool Player::CanCaptureTowerPoint()
 {
     return ( !HasStealthAura() &&                           // not stealthed
@@ -20747,50 +17633,36 @@ bool Player::CanCaptureTowerPoint()
              isAlive()                                      // live player
            );
 }
-
 uint32 Player::GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair)
 {
     uint32 level = getLevel();
-
     if(level > GT_MAX_LEVEL)
         level = GT_MAX_LEVEL;                               // max level in this dbc
-
     uint8 hairstyle = GetByteValue(PLAYER_BYTES, 2);
     uint8 haircolor = GetByteValue(PLAYER_BYTES, 3);
     uint8 facialhair = GetByteValue(PLAYER_BYTES_2, 0);
-
     if((hairstyle == newhairstyle) && (haircolor == newhaircolor) && (facialhair == newfacialhair))
         return 0;
-
     GtBarberShopCostBaseEntry const *bsc = sGtBarberShopCostBaseStore.LookupEntry(level - 1);
-
     if(!bsc)                                                // shouldn't happen
         return 0xFFFFFFFF;
-
     float cost = 0;
-
     if(hairstyle != newhairstyle)
         cost += bsc->cost;                                  // full price
-
     if((haircolor != newhaircolor) && (hairstyle == newhairstyle))
         cost += bsc->cost * 0.5f;                           // +1/2 of price
-
     if(facialhair != newfacialhair)
         cost += bsc->cost * 0.75f;                          // +3/4 of price
-
     return uint32(cost);
 }
-
 void Player::InitGlyphsForLevel()
 {
     for(uint32 i = 0; i < sGlyphSlotStore.GetNumRows(); ++i)
         if(GlyphSlotEntry const * gs = sGlyphSlotStore.LookupEntry(i))
             if(gs->Order)
                 SetGlyphSlot(gs->Order - 1, gs->Id);
-
     uint32 level = getLevel();
     uint32 value = 0;
-
     // 0x3F = 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 for 80 level
     if(level >= 15)
         value |= (0x01 | 0x02);
@@ -20802,14 +17674,11 @@ void Player::InitGlyphsForLevel()
         value |= 0x10;
     if(level >= 80)
         value |= 0x20;
-
     SetUInt32Value(PLAYER_GLYPHS_ENABLED, value);
 }
-
 bool Player::isTotalImmune()
 {
     AuraEffectList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY);
-
     uint32 immuneMask = 0;
     for(AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr)
     {
@@ -20819,48 +17688,39 @@ bool Player::isTotalImmune()
     }
     return false;
 }
-
 bool Player::HasTitle(uint32 bitIndex)
 {
     if (bitIndex > MAX_TITLE_INDEX)
         return false;
-
     uint32 fieldIndexOffset = bitIndex / 32;
     uint32 flag = 1 << (bitIndex % 32);
     return HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag);
 }
-
 void Player::SetTitle(CharTitlesEntry const* title, bool lost)
 {
     uint32 fieldIndexOffset = title->bit_index / 32;
     uint32 flag = 1 << (title->bit_index % 32);
-
     if(lost)
     {
         if(!HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
             return;
-
         RemoveFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag);
     }
     else
     {
         if(HasFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag))
             return;
-
         SetFlag(PLAYER__FIELD_KNOWN_TITLES + fieldIndexOffset, flag);
     }
-
     WorldPacket data(SMSG_TITLE_EARNED, 4 + 4);
     data << uint32(title->bit_index);
     data << uint32(lost ? 0 : 1);                           // 1 - earned, 0 - lost
     GetSession()->SendPacket(&data);
 }
-
 /*-----------------------TRINITY--------------------------*/
 bool Player::isTotalImmunity()
 {
     AuraEffectList const& immune = GetAurasByType(SPELL_AURA_SCHOOL_IMMUNITY);
-
     for(AuraEffectList::const_iterator itr = immune.begin(); itr != immune.end(); ++itr)
     {
         if (((*itr)->GetMiscValue() & SPELL_SCHOOL_MASK_ALL) !=0)   // total immunity
@@ -20880,12 +17740,10 @@ bool Player::isTotalImmunity()
     }
     return false;
 }
-
 void Player::UpdateCharmedAI()
 {
     //This should only called in Player::Update
     Creature *charmer = (Creature*)GetCharmer();
-
     //kill self if charm aura has infinite duration
     if(charmer->IsInEvadeMode())
     {
@@ -20897,32 +17755,26 @@ void Player::UpdateCharmedAI()
                 return;
             }
     }
-
     if(!charmer->isInCombat())
         GetMotionMaster()->MoveFollow(charmer, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
-
     Unit *target = getVictim();
     if(!target || !charmer->canAttack(target))
     {
         target = charmer->SelectNearestTarget();
         if(!target)
             return;
-
         GetMotionMaster()->MoveChase(target);
         Attack(target, true);
     }
 }
-
 void Player::ConvertRune(uint8 index, RuneType newType)
 {
     SetCurrentRune(index, newType);
-
     WorldPacket data(SMSG_CONVERT_RUNE, 2);
     data << uint8(index);
     data << uint8(newType);
     GetSession()->SendPacket(&data);
 }
-
 void Player::ResyncRunes(uint8 count)
 {
     WorldPacket data(SMSG_RESYNC_RUNES, count * 2);
@@ -20933,14 +17785,12 @@ void Player::ResyncRunes(uint8 count)
     }
     GetSession()->SendPacket(&data);
 }
-
 void Player::AddRunePower(uint8 index)
 {
     WorldPacket data(SMSG_ADD_RUNE_POWER, 4);
     data << uint32(1 << index);                             // mask (0x00-0x3F probably)
     GetSession()->SendPacket(&data);
 }
-
 static RuneType runeSlotTypes[MAX_RUNES] = {
     /*0*/ RUNE_BLOOD,
     /*1*/ RUNE_BLOOD,
@@ -20949,17 +17799,13 @@ static RuneType runeSlotTypes[MAX_RUNES] = {
     /*4*/ RUNE_FROST,
     /*5*/ RUNE_FROST
 };
-
 void Player::InitRunes()
 {
     if(getClass() != CLASS_DEATH_KNIGHT)
         return;
-
     m_runes = new Runes;
-
     m_runes->runeState = 0;
     m_runes->lastUsedRune = RUNE_BLOOD;
-
     for(uint32 i = 0; i < MAX_RUNES; ++i)
     {
         SetBaseRune(i, runeSlotTypes[i]);                              // init base types
@@ -20967,30 +17813,24 @@ void Player::InitRunes()
         SetRuneCooldown(i, 0);                                         // reset cooldowns
         m_runes->SetRuneState(i);
     }
-
     for(uint32 i = 0; i < NUM_RUNE_TYPES; ++i)
         SetFloatValue(PLAYER_RUNE_REGEN_1 + i, 0.1f);
 }
-
 bool Player::IsBaseRuneSlotsOnCooldown(RuneType runeType) const
 {
     for(uint32 i = 0; i < MAX_RUNES; ++i)
         if (GetBaseRune(i) == runeType && GetRuneCooldown(i) == 0)
             return false;
-
     return true;
 }
-
 void Player::AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore const& store, bool broadcast)
 {
     Loot loot;
     loot.FillLoot (loot_id,store,this,true);
-
     uint32 max_slot = loot.GetMaxSlotInLootFor(this);
     for(uint32 i = 0; i < max_slot; ++i)
     {
         LootItem* lootItem = loot.LootItemInSlot(i,this);
-
         ItemPosCountVec dest;
         uint8 msg = CanStoreNewItem (bag,slot,dest,lootItem->itemid,lootItem->count);
         if(msg != EQUIP_ERR_OK && slot != NULL_SLOT)
@@ -21002,65 +17842,50 @@ void Player::AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore cons
             SendEquipError( msg, NULL, NULL );
             continue;
         }
-
         Item* pItem = StoreNewItem (dest,lootItem->itemid,true,lootItem->randomPropertyId);
         SendNewItem(pItem, lootItem->count, false, false, broadcast);
     }
 }
-
 uint32 Player::CalculateTalentsPoints() const
 {
     uint32 base_talent = getLevel() < 10 ? 0 : getLevel()-9;
-
     if(getClass() != CLASS_DEATH_KNIGHT || GetMapId() != 609)
         return uint32(base_talent * sWorld.getRate(RATE_TALENT));
-
     uint32 talentPointsForLevel = getLevel() < 56 ? 0 : getLevel() - 55;
     talentPointsForLevel += m_questRewardTalentCount;
-
     if(talentPointsForLevel > base_talent)
         talentPointsForLevel = base_talent;
-
     return uint32(talentPointsForLevel * sWorld.getRate(RATE_TALENT));
 }
-
 bool Player::IsKnowHowFlyIn(uint32 mapid, uint32 zone) const
 {
     // continent checked in SpellMgr::GetSpellAllowedInLocationError at cast and area update
     uint32 v_map = GetVirtualMapForMapAndZone(mapid, zone);
     return v_map != 571 || HasSpell(54197) && zone != 4197;                 // Cold Weather Flying
 }
-
 void Player::learnSpellHighRank(uint32 spellid)
 {
     learnSpell(spellid,false);
-
     if(uint32 next = spellmgr.GetNextSpellInChain(spellid))
         learnSpellHighRank(next);
 }
-
 void Player::_LoadSkills()
 {
     // Note: skill data itself loaded from `data` field. This is only cleanup part of load
-
     // reset skill modifiers and set correct unlearn flags
     for (uint32 i = 0; i < PLAYER_MAX_SKILLS; i++)
     {
         SetUInt32Value(PLAYER_SKILL_BONUS_INDEX(i),0);
-
         // set correct unlearn bit
         uint32 id = GetUInt32Value(PLAYER_SKILL_INDEX(i)) & 0x0000FFFF;
         if(!id) continue;
-
         SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(id);
         if(!pSkill) continue;
-
         // enable unlearn button for primary professions only
         if (pSkill->categoryId == SKILL_CATEGORY_PROFESSION)
             SetUInt32Value(PLAYER_SKILL_INDEX(i), MAKE_PAIR32(id,1));
         else
             SetUInt32Value(PLAYER_SKILL_INDEX(i), MAKE_PAIR32(id,0));
-
         // set fixed skill ranges
         switch(GetSkillRangeType(pSkill,false))
         {
@@ -21073,11 +17898,9 @@ void Player::_LoadSkills()
             default:
                 break;
         }
-
         uint32 vskill = SKILL_VALUE(GetUInt32Value(PLAYER_SKILL_VALUE_INDEX(i)));
         learnSkillRewardedSpells(id, vskill);
     }
-
     // special settings
     if(getClass()==CLASS_DEATH_KNIGHT)
     {
@@ -21087,7 +17910,6 @@ void Player::_LoadSkills()
         uint32 base_skill = (base_level-1)*5;               // 270 at starting level 55
         if(base_skill < 1)
             base_skill = 1;                                 // skill mast be known and then > 0 in any case
-
         if(GetPureSkillValue (SKILL_FIRST_AID) < base_skill)
             SetSkill(SKILL_FIRST_AID,base_skill, base_skill);
         if(GetPureSkillValue (SKILL_AXES) < base_skill)
@@ -21106,7 +17928,6 @@ void Player::_LoadSkills()
             SetSkill(SKILL_UNARMED, base_skill,base_skill);
     }
 }
-
 uint32 Player::GetPhaseMaskForSpawn() const
 {
     uint32 phase = PHASEMASK_NORMAL;
@@ -21118,22 +17939,17 @@ uint32 Player::GetPhaseMaskForSpawn() const
         if(!phases.empty())
             phase = phases.front()->GetMiscValue();
     }
-
     // some aura phases include 1 normal map in addition to phase itself
     if(uint32 n_phase = phase & ~PHASEMASK_NORMAL)
         return n_phase;
-
     return PHASEMASK_NORMAL;
 }
-
 uint8 Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limit_count) const
 {
     ItemPrototype const* pProto = pItem->GetProto();
-
     // proto based limitations
     if(uint8 res = CanEquipUniqueItem(pProto,eslot,limit_count))
         return res;
-
     // check unique-equipped on gems
     for(uint32 enchant_slot = SOCK_ENCHANTMENT_SLOT; enchant_slot < SOCK_ENCHANTMENT_SLOT+3; ++enchant_slot)
     {
@@ -21143,22 +17959,17 @@ uint8 Player::CanEquipUniqueItem(Item* pItem, uint8 eslot, uint32 limit_count) c
         SpellItemEnchantmentEntry const* enchantEntry = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!enchantEntry)
             continue;
-
         ItemPrototype const* pGem = objmgr.GetItemPrototype(enchantEntry->GemID);
         if(!pGem)
             continue;
-
         // include for check equip another gems with same limit category for not equipped item (and then not counted)
         uint32 gem_limit_count = !pItem->IsEquipped() && pGem->ItemLimitCategory
             ? pItem->GetGemCountWithLimitCategory(pGem->ItemLimitCategory) : 1;
-
         if(uint8 res = CanEquipUniqueItem(pGem, eslot,gem_limit_count))
             return res;
     }
-
     return EQUIP_ERR_OK;
 }
-
 uint8 Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_slot, uint32 limit_count) const
 {
     // check unique-equipped on item
@@ -21168,31 +17979,25 @@ uint8 Player::CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_s
         if(HasItemOrGemWithIdEquipped(itemProto->ItemId,1,except_slot))
             return EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE;
     }
-
     // check unique-equipped limit
     if (itemProto->ItemLimitCategory)
     {
         ItemLimitCategoryEntry const* limitEntry = sItemLimitCategoryStore.LookupEntry(itemProto->ItemLimitCategory);
         if(!limitEntry)
             return EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE;
-
         if(limit_count > limitEntry->maxCount)
             return EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE;         // attempt add too many limit category items (gems)
-
         // there is an equip limit on this item
         if(HasItemOrGemWithLimitCategoryEquipped(itemProto->ItemLimitCategory,limitEntry->maxCount-limit_count+1,except_slot))
             return EQUIP_ERR_ITEM_UNIQUE_EQUIPABLE;
     }
-
     return EQUIP_ERR_OK;
 }
-
 void Player::HandleFall(MovementInfo const& movementInfo)
 {
     // calculate total z distance of the fall
     float z_diff = m_lastFallZ - movementInfo.z;
     //sLog.outDebug("zDiff = %f", z_diff);
-
     //Players with low fall distance, Feather Fall or physical immunity (charges used) are ignored
     // 14.57 can be calculated by resolving damageperc formula below to 0
     if (z_diff >= 14.57f && !isDead() && !isGameMaster() &&
@@ -21201,74 +18006,55 @@ void Player::HandleFall(MovementInfo const& movementInfo)
     {
         //Safe fall, fall height reduction
         int32 safe_fall = GetTotalAuraModifier(SPELL_AURA_SAFE_FALL);
-
         float damageperc = 0.018f*(z_diff-safe_fall)-0.2426f;
-
         if(damageperc >0 )
         {
             uint32 damage = (uint32)(damageperc * GetMaxHealth()*sWorld.getRate(RATE_DAMAGE_FALL));
-
             float height = movementInfo.z;
             UpdateGroundPositionZ(movementInfo.x,movementInfo.y,height);
-
             if (damage > 0)
             {
                 //Prevent fall damage from being more than the player maximum health
                 if (damage > GetMaxHealth())
                     damage = GetMaxHealth();
-
                 // Gust of Wind
                 if (HasAura(43621))
                     damage = GetMaxHealth()/2;
-
                 uint32 original_health = GetHealth();
                 uint32 final_damage = EnvironmentalDamage(DAMAGE_FALL, damage);
-
                 // recheck alive, might have died of EnvironmentalDamage, avoid cases when player die in fact like Spirit of Redemption case
                 if (isAlive() && final_damage < original_health)
                     GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_FALL_WITHOUT_DYING, uint32(z_diff*100));
             }
-
             //Z given by moveinfo, LastZ, FallTime, WaterZ, MapZ, Damage, Safefall reduction
             DEBUG_LOG("FALLDAMAGE z=%f sz=%f pZ=%f FallTime=%d mZ=%f damage=%d SF=%d" , movementInfo.z, height, GetPositionZ(), movementInfo.fallTime, height, damage, safe_fall);
         }
     }
 }
-
 void Player::UpdateAchievementCriteria( AchievementCriteriaTypes type, uint32 miscvalue1/*=0*/, uint32 miscvalue2/*=0*/, Unit *unit/*=NULL*/, uint32 time/*=0*/ )
 {
     GetAchievementMgr().UpdateAchievementCriteria(type, miscvalue1, miscvalue2, unit, time);
 }
-
 void Player::CompletedAchievement(AchievementEntry const* entry)
 {
     GetAchievementMgr().CompletedAchievement(entry);
 }
-
 void Player::LearnTalent(uint32 talentId, uint32 talentRank)
 {
     uint32 CurTalentPoints = GetFreeTalentPoints();
-
     if(CurTalentPoints == 0)
         return;
-
     if (talentRank >= MAX_TALENT_RANK)
         return;
-
     TalentEntry const *talentInfo = sTalentStore.LookupEntry( talentId );
-
     if(!talentInfo)
         return;
-
     TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentInfo->TalentTab );
-
     if(!talentTabInfo)
         return;
-
     // prevent learn talent for different class (cheating)
     if( (getClassMask() & talentTabInfo->ClassMask) == 0 )
         return;
-
     // find current max talent rank (0~5)
     uint8 curtalent_maxrank = 0; // 0 = not learned any rank
     for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
@@ -21279,15 +18065,12 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
             break;
         }
     }
-
     // we already have same or higher talent rank learned
     if(curtalent_maxrank >= (talentRank + 1))
         return;
-
     // check if we have enough talent points
     if(CurTalentPoints < (talentRank - curtalent_maxrank + 1))
         return;
-
     // Check if it requires another talent
     if (talentInfo->DependsOn > 0)
     {
@@ -21304,10 +18087,8 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
                 return;
         }
     }
-
     // Find out how many points we have in this field
     uint32 spentPoints = 0;
-
     uint32 tTab = talentInfo->TalentTab;
     if (talentInfo->Row > 0)
     {
@@ -21334,11 +18115,9 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
             }
         }
     }
-
     // not have required min points spent in talent tree
     if(spentPoints < (talentInfo->Row * MAX_TALENT_RANK))
         return;
-
     // spell not set in talent.dbc
     uint32 spellid = talentInfo->RankID[talentRank];
     if( spellid == 0 )
@@ -21346,66 +18125,45 @@ void Player::LearnTalent(uint32 talentId, uint32 talentRank)
         sLog.outError("Talent.dbc have for talent: %u Rank: %u spell id = 0", talentId, talentRank);
         return;
     }
-
     // already known
     if(HasSpell(spellid))
         return;
-
     // learn! (other talent ranks will unlearned at learning)
     learnSpell(spellid, false);
     AddTalent(spellid, m_activeSpec, true);
-
     sLog.outDetail("TalentID: %u Rank: %u Spell: %u Spec: %u\n", talentId, talentRank, spellid, m_activeSpec);
-
     // update free talent points
     SetFreeTalentPoints(CurTalentPoints - (talentRank - curtalent_maxrank + 1));
 }
-
 void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
 {
     Pet *pet = GetPet();
-
     if(!pet)
         return;
-
     if(petGuid != pet->GetGUID())
         return;
-
     uint32 CurTalentPoints = pet->GetFreeTalentPoints();
-
     if(CurTalentPoints == 0)
         return;
-
     if (talentRank >= MAX_PET_TALENT_RANK)
         return;
-
     TalentEntry const *talentInfo = sTalentStore.LookupEntry(talentId);
-
     if(!talentInfo)
         return;
-
     TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry(talentInfo->TalentTab);
-
     if(!talentTabInfo)
         return;
-
     CreatureInfo const *ci = pet->GetCreatureInfo();
-
     if(!ci)
         return;
-
     CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
-
     if(!pet_family)
         return;
-
     if(pet_family->petTalentType < 0)                       // not hunter pet
         return;
-
     // prevent learn talent for different family (cheating)
     if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
         return;
-
     // find current max talent rank (0~5)
     uint8 curtalent_maxrank = 0; // 0 = not learned any rank
     for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
@@ -21416,15 +18174,12 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
             break;
         }
     }
-
     // we already have same or higher talent rank learned
     if(curtalent_maxrank >= (talentRank + 1))
         return;
-
     // check if we have enough talent points
     if(CurTalentPoints < (talentRank - curtalent_maxrank + 1))
         return;
-
     // Check if it requires another talent
     if (talentInfo->DependsOn > 0)
     {
@@ -21441,10 +18196,8 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
                 return;
         }
     }
-
     // Find out how many points we have in this field
     uint32 spentPoints = 0;
-
     uint32 tTab = talentInfo->TalentTab;
     if (talentInfo->Row > 0)
     {
@@ -21471,11 +18224,9 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
             }
         }
     }
-
     // not have required min points spent in talent tree
     if(spentPoints < (talentInfo->Row * MAX_PET_TALENT_RANK))
         return;
-
     // spell not set in talent.dbc
     uint32 spellid = talentInfo->RankID[talentRank];
     if( spellid == 0 )
@@ -21483,19 +18234,15 @@ void Player::LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank)
         sLog.outError("Talent.dbc have for talent: %u Rank: %u spell id = 0", talentId, talentRank);
         return;
     }
-
     // already known
     if(pet->HasSpell(spellid))
         return;
-
     // learn! (other talent ranks will unlearned at learning)
     pet->learnSpell(spellid);
     sLog.outDetail("PetTalentID: %u Rank: %u Spell: %u\n", talentId, talentRank, spellid);
-
     // update free talent points
     pet->SetFreeTalentPoints(CurTalentPoints - (talentRank - curtalent_maxrank + 1));
 }
-
 void Player::UpdateKnownCurrencies(uint32 itemId, bool apply)
 {
     if(CurrencyTypesEntry const* ctEntry = sCurrencyTypesStore.LookupEntry(itemId))
@@ -21506,69 +18253,54 @@ void Player::UpdateKnownCurrencies(uint32 itemId, bool apply)
             RemoveFlag64(PLAYER_FIELD_KNOWN_CURRENCIES,(1LL << (ctEntry->BitIndex-1)));
     }
 }
-
 void Player::UpdateFallInformationIfNeed( MovementInfo const& minfo,uint16 opcode )
 {
     if (m_lastFallTime >= minfo.fallTime || m_lastFallZ <=minfo.z || opcode == MSG_MOVE_FALL_LAND)
         SetFallInformation(minfo.fallTime, minfo.z);
 }
-
 void Player::UnsummonPetTemporaryIfAny()
 {
     Pet* pet = GetPet();
     if(!pet)
         return;
-
     if(!m_temporaryUnsummonedPetNumber && pet->isControlled() && !pet->isTemporarySummoned() )
     {
         m_temporaryUnsummonedPetNumber = pet->GetCharmInfo()->GetPetNumber();
         m_oldpetspell = pet->GetUInt32Value(UNIT_CREATED_BY_SPELL);
     }
-
     RemovePet(pet, PET_SAVE_AS_CURRENT);
 }
-
 void Player::ResummonPetTemporaryUnSummonedIfAny()
 {
     if(!m_temporaryUnsummonedPetNumber)
         return;
-
     // not resummon in not appropriate state
     if(IsPetNeedBeTemporaryUnsummoned())
         return;
-
     if(GetPetGUID())
         return;
-
     Pet* NewPet = new Pet(this);
     if(!NewPet->LoadPetFromDB(this, 0, m_temporaryUnsummonedPetNumber, true))
         delete NewPet;
-
     m_temporaryUnsummonedPetNumber = 0;
 }
-
 bool Player::canSeeSpellClickOn(Creature const *c) const
 {
     if(!c->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
         return false;
-
     SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(c->GetEntry());
     if(clickPair.first == clickPair.second)
         return true;
-
     for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
         if(itr->second.IsFitToRequirements(this, c))
             return true;
-
     return false;
 }
-
 void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
 {
     *data << uint32(GetFreeTalentPoints());                 // unspentTalentPoints
     *data << uint8(m_specsCount);                           // talent group count (0, 1 or 2)
     *data << uint8(m_activeSpec);                           // talent group index (0 or 1)
-
     if(m_specsCount)
     {
         // loop through all specs (only 1 for now)
@@ -21577,24 +18309,19 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
             uint8 talentIdCount = 0;
             size_t pos = data->wpos();
             *data << uint8(talentIdCount);                  // [PH], talentIdCount
-
             // find class talent tabs (all players have 3 talent tabs)
             uint32 const* talentTabIds = GetTalentTabPages(getClass());
-
             for(uint8 i = 0; i < 3; ++i)
             {
                 uint32 talentTabId = talentTabIds[i];
-
                 for(uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
                 {
                     TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
                     if(!talentInfo)
                         continue;
-
                     // skip another tab talents
                     if(talentInfo->TalentTab != talentTabId)
                         continue;
-
                     // find max talent rank (0~4)
                     int8 curtalent_maxrank = -1;
                     for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
@@ -21605,73 +18332,55 @@ void Player::BuildPlayerTalentsInfoData(WorldPacket *data)
                             break;
                         }
                     }
-
                     // not learned talent
                     if(curtalent_maxrank < 0)
                         continue;
-
                     *data << uint32(talentInfo->TalentID);  // Talent.dbc
                     *data << uint8(curtalent_maxrank);      // talentMaxRank (0-4)
-
                     ++talentIdCount;
                 }
             }
-
             data->put<uint8>(pos, talentIdCount);           // put real count
-
             *data << uint8(MAX_GLYPH_SLOT_INDEX);           // glyphs count
-
             for(uint8 i = 0; i < MAX_GLYPH_SLOT_INDEX; ++i)
                 *data << uint16(m_Glyphs[specIdx][i]);               // GlyphProperties.dbc
         }
     }
 }
-
 void Player::BuildPetTalentsInfoData(WorldPacket *data)
 {
     uint32 unspentTalentPoints = 0;
     size_t pointsPos = data->wpos();
     *data << uint32(unspentTalentPoints);                   // [PH], unspentTalentPoints
-
     uint8 talentIdCount = 0;
     size_t countPos = data->wpos();
     *data << uint8(talentIdCount);                          // [PH], talentIdCount
-
     Pet *pet = GetPet();
     if(!pet)
         return;
-
     unspentTalentPoints = pet->GetFreeTalentPoints();
-
     data->put<uint32>(pointsPos, unspentTalentPoints);      // put real points
-
     CreatureInfo const *ci = pet->GetCreatureInfo();
     if(!ci)
         return;
-
     CreatureFamilyEntry const *pet_family = sCreatureFamilyStore.LookupEntry(ci->family);
     if(!pet_family || pet_family->petTalentType < 0)
         return;
-
     for(uint32 talentTabId = 1; talentTabId < sTalentTabStore.GetNumRows(); ++talentTabId)
     {
         TalentTabEntry const *talentTabInfo = sTalentTabStore.LookupEntry( talentTabId );
         if(!talentTabInfo)
             continue;
-
         if(!((1 << pet_family->petTalentType) & talentTabInfo->petTalentMask))
             continue;
-
         for(uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
         {
             TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
             if(!talentInfo)
                 continue;
-
             // skip another tab talents
             if(talentInfo->TalentTab != talentTabId)
                 continue;
-
             // find max talent rank (0~4)
             int8 curtalent_maxrank = -1;
             for(int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
@@ -21682,23 +18391,17 @@ void Player::BuildPetTalentsInfoData(WorldPacket *data)
                     break;
                 }
             }
-
             // not learned talent
             if(curtalent_maxrank < 0)
                 continue;
-
             *data << uint32(talentInfo->TalentID);          // Talent.dbc
             *data << uint8(curtalent_maxrank);              // talentMaxRank (0-4)
-
             ++talentIdCount;
         }
-
         data->put<uint8>(countPos, talentIdCount);          // put real count
-
         break;
     }
 }
-
 void Player::SendTalentsInfoData(bool pet)
 {
     WorldPacket data(SMSG_TALENTS_INFO, 50);
@@ -21709,51 +18412,37 @@ void Player::SendTalentsInfoData(bool pet)
         BuildPlayerTalentsInfoData(&data);
     GetSession()->SendPacket(&data);
 }
-
 void Player::BuildEnchantmentsInfoData(WorldPacket *data)
 {
     uint32 slotUsedMask = 0;
     size_t slotUsedMaskPos = data->wpos();
     *data << uint32(slotUsedMask);                          // slotUsedMask < 0x80000
-
     for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
     {
         Item *item = GetItemByPos(INVENTORY_SLOT_BAG_0, i);
-
         if(!item)
             continue;
-
         slotUsedMask |= (1 << i);
-
         *data << uint32(item->GetEntry());                  // item entry
-
         uint16 enchantmentMask = 0;
         size_t enchantmentMaskPos = data->wpos();
         *data << uint16(enchantmentMask);                   // enchantmentMask < 0x1000
-
         for(uint32 j = 0; j < MAX_ENCHANTMENT_SLOT; ++j)
         {
             uint32 enchId = item->GetEnchantmentId(EnchantmentSlot(j));
-
             if(!enchId)
                 continue;
-
             enchantmentMask |= (1 << j);
-
             *data << uint16(enchId);                        // enchantmentId?
         }
-
         data->put<uint16>(enchantmentMaskPos, enchantmentMask);
 
-
         *data << uint16(0);                                 // unknown
         data->appendPackGUID(item->GetUInt64Value(ITEM_FIELD_CREATOR)); // item creator
         *data << uint32(0);                                 // seed?
     }
-
     data->put<uint32>(slotUsedMaskPos, slotUsedMask);
 }
-
 void Player::SendEquipmentSetList()
 {
     uint32 count = 0;
@@ -21770,19 +18459,16 @@ void Player::SendEquipmentSetList()
         data << itr->second.IconName;
         for(uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
             data.appendPackGUID(MAKE_NEW_GUID(itr->second.Items[i], 0, HIGHGUID_ITEM));
-
         ++count;                                            // client have limit but it checked at loading and set
     }
     data.put<uint32>(count_pos, count);
     GetSession()->SendPacket(&data);
 }
-
 void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset)
 {
     if(eqset.Guid != 0)
     {
         bool found = false;
-
         for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
         {
             if((itr->second.Guid == eqset.Guid) && (itr->first == index))
@@ -21791,33 +18477,25 @@ void Player::SetEquipmentSet(uint32 index, EquipmentSet eqset)
                 break;
             }
         }
-
         if(!found)                                          // something wrong...
         {
             sLog.outError("Player %s tried to save equipment set "UI64FMTD" (index %u), but that equipment set not found!", GetName(), eqset.Guid, index);
             return;
         }
     }
-
     EquipmentSet& eqslot = m_EquipmentSets[index];
-
     EquipmentSetUpdateState old_state = eqslot.state;
-
     eqslot = eqset;
-
     if(eqset.Guid == 0)
     {
         eqslot.Guid = objmgr.GenerateEquipmentSetGuid();
-
         WorldPacket data(SMSG_EQUIPMENT_SET_SAVED, 4 + 1);
         data << uint32(index);
         data.appendPackGUID(eqslot.Guid);
         GetSession()->SendPacket(&data);
     }
-
     eqslot.state = old_state == EQUIPMENT_SET_NEW ? EQUIPMENT_SET_NEW : EQUIPMENT_SET_CHANGED;
 }
-
 void Player::_SaveEquipmentSets()
 {
     for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end();)
@@ -21850,7 +18528,6 @@ void Player::_SaveEquipmentSets()
         }
     }
 }
-
 void Player::_SaveBGData()
 {
     CharacterDatabase.PExecute("DELETE FROM character_battleground_data WHERE guid='%u'", GetGUIDLow());
@@ -21862,7 +18539,6 @@ void Player::_SaveBGData()
             m_bgData.joinPos.GetOrientation(), m_bgData.joinPos.GetMapId(), m_bgData.taxiPath[0], m_bgData.taxiPath[1], m_bgData.mountSpell);
     }
 }
-
 void Player::DeleteEquipmentSet(uint64 setGuid)
 {
     for(EquipmentSets::iterator itr = m_EquipmentSets.begin(); itr != m_EquipmentSets.end(); ++itr)
@@ -21877,15 +18553,12 @@ void Player::DeleteEquipmentSet(uint64 setGuid)
         }
     }
 }
-
 void Player::RemoveAtLoginFlag( AtLoginFlags f, bool in_db_also /*= false*/ )
 {
     m_atLoginFlags &= ~f;
-
     if(in_db_also)
         CharacterDatabase.PExecute("UPDATE characters set at_login = at_login & ~ %u WHERE guid ='%u'", uint32(f), GetGUIDLow());
 }
-
 void Player::SendClearCooldown( uint32 spell_id, Unit* target )
 {
     WorldPacket data(SMSG_CLEAR_COOLDOWN, 4+8);
@@ -21893,7 +18566,6 @@ void Player::SendClearCooldown( uint32 spell_id, Unit* target )
     data << uint64(target->GetGUID());
     SendDirectMessage(&data);
 }
-
 void Player::ResetMap()
 {
     // this may be called during Map::Update
@@ -21905,39 +18577,31 @@ void Player::ResetMap()
     Unit::ResetMap();
     GetMapRef().unlink();
 }
-
 void Player::SetMap(Map * map)
 {
     Unit::SetMap(map);
     m_mapRef.link(map, this);
 }
-
 void Player::_LoadGlyphs(QueryResult *result)
 {
     // SetPQuery(PLAYER_LOGIN_QUERY_LOADGLYPHS, "SELECT spec, glyph1, glyph2, glyph3, glyph4, glyph5, glyph6 from character_glyphs WHERE guid = '%u'", GUID_LOPART(m_guid));
     if (!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
-
         uint8 spec = fields[0].GetUInt8();
         if (spec >= m_specsCount)
             continue;
-
         m_Glyphs[spec][0] = fields[1].GetUInt32();
         m_Glyphs[spec][1] = fields[2].GetUInt32();
         m_Glyphs[spec][2] = fields[3].GetUInt32();
         m_Glyphs[spec][3] = fields[4].GetUInt32();
         m_Glyphs[spec][4] = fields[5].GetUInt32();
         m_Glyphs[spec][5] = fields[6].GetUInt32();
-        
     } while (result->NextRow());
-
     delete result;
 }
-
 void Player::_SaveGlyphs()
 {
     CharacterDatabase.PExecute("DELETE FROM character_glyphs WHERE guid='%u'",GetGUIDLow());
@@ -21947,7 +18611,6 @@ void Player::_SaveGlyphs()
             GetGUIDLow(), spec, m_Glyphs[spec][0], m_Glyphs[spec][1], m_Glyphs[spec][2], m_Glyphs[spec][3], m_Glyphs[spec][4], m_Glyphs[spec][5]);
     }
 }
-
 void Player::_LoadTalents(QueryResult *result)
 {
     // SetPQuery(PLAYER_LOGIN_QUERY_LOADTALENTS, "SELECT spell, spec FROM character_talent WHERE guid = '%u'", GUID_LOPART(m_guid));
@@ -21956,15 +18619,12 @@ void Player::_LoadTalents(QueryResult *result)
         do
         {
             Field *fields = result->Fetch();
-
             AddTalent(fields[0].GetUInt32(), fields[1].GetUInt32(), false);
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void Player::_SaveTalents()
 {
     for (uint8 i = 0; i < MAX_TALENT_SPECS; ++i)
@@ -21973,10 +18633,8 @@ void Player::_SaveTalents()
         {
             if (itr->second->state == PLAYERSPELL_REMOVED || itr->second->state == PLAYERSPELL_CHANGED)
                 CharacterDatabase.PExecute("DELETE FROM character_talent WHERE guid = '%u' and spell = '%u' and spec = '%u'", GetGUIDLow(), itr->first, itr->second->spec);
-
             if (itr->second->state == PLAYERSPELL_NEW || itr->second->state == PLAYERSPELL_CHANGED)
                 CharacterDatabase.PExecute("INSERT INTO character_talent (guid,spell,spec) VALUES ('%u', '%u', '%u')", GetGUIDLow(), itr->first, itr->second->spec);
-
             if (itr->second->state == PLAYERSPELL_REMOVED)
             {
                 delete itr->second;
@@ -21990,12 +18648,10 @@ void Player::_SaveTalents()
         }
     }
 }
-
 void Player::UpdateSpecCount(uint8 count)
 {
     if(GetSpecsCount() == count)
         return;
-
     if(count == MIN_TALENT_SPECS)
     {
         _SaveActions(); // make sure the button list is cleaned up
@@ -22016,76 +18672,57 @@ void Player::UpdateSpecCount(uint8 count)
     {
         return;
     }
-
     SetSpecsCount(count);
-
     SendTalentsInfoData(false);
 }
-
 void Player::ActivateSpec(uint8 spec)
 {
     if (GetActiveSpec() == spec)
         return;
-
     if (GetSpecsCount() != MAX_TALENT_SPECS)
         return;
-
     if (GetMap()->IsBattleGround() && !HasAura(44521)) // In BattleGround with no Preparation buff
         return;
-
     RemoveAllAuras(this->GetGUID(), NULL, false, true); // remove all positive auras (ie: buffs from another spec)
-
     _SaveActions();
-    
     UnsummonPetTemporaryIfAny();
-    
     uint32 const* talentTabIds = GetTalentTabPages(getClass());
-    
     for (uint8 i = 0; i < 3; ++i)
     {
         uint32 talentTabId = talentTabIds[i];
-
         for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
         {
             TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
             if (!talentInfo)
                 continue;
-
             // skip another tab talents
             if (talentInfo->TalentTab != talentTabId)
                 continue;
-
             // remove all talent ranks, starting at highest rank
             for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
                 if (talentInfo->RankID[rank] != 0 && HasTalent(talentInfo->RankID[rank], m_activeSpec))
                     removeSpell(talentInfo->RankID[rank], true);
         }
     }
-
     // set glyphs
     for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot)
         // remove secondary glyph
         if (uint32 oldglyph = m_Glyphs[m_activeSpec][slot])
             if (GlyphPropertiesEntry const *old_gp = sGlyphPropertiesStore.LookupEntry(oldglyph))
                 RemoveAurasDueToSpell(old_gp->SpellId);
-
     SetActiveSpec(spec);
     uint32 spentTalents = 0;
-    
     for (uint8 i = 0; i < 3; ++i)
     {
         uint32 talentTabId = talentTabIds[i];
-
         for (uint32 talentId = 0; talentId < sTalentStore.GetNumRows(); ++talentId)
         {
             TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
             if (!talentInfo)
                 continue;
-
             // skip another tab talents
             if (talentInfo->TalentTab != talentTabId)
                 continue;
-
             // learn highest talent rank that exists in newly activated spec
             for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
             {
@@ -22097,37 +18734,28 @@ void Player::ActivateSpec(uint8 spec)
             }
         }
     }
-
     // set glyphs
-    for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot) 
+    for (uint8 slot = 0; slot < MAX_GLYPH_SLOT_INDEX; ++slot)
     {
         uint32 glyph = m_Glyphs[m_activeSpec][slot];
-
         // apply primary glyph
         if (glyph)
             if (GlyphPropertiesEntry const *gp = sGlyphPropertiesStore.LookupEntry(glyph))
                 CastSpell(this, gp->SpellId, true);
-
         SetGlyph(slot, glyph);
     }
-
     m_usedTalentCount = spentTalents;
     InitTalentForLevel();
-
     m_actionButtons.clear();
     if (QueryResult *result = CharacterDatabase.PQuery("SELECT button,action,type FROM character_action WHERE guid = '%u' AND spec = '%u' ORDER BY button", GetGUIDLow(), m_activeSpec))
         _LoadActions(result, false);
-    
     ResummonPetTemporaryUnSummonedIfAny();
     SendActionButtons(1);
-
     Powers pw = getPowerType();
     if (pw != POWER_MANA)
         SetPower(POWER_MANA, 0); // what on earth is this for?!
-    
     SetPower(pw, 0);
 }
-
 void Player::SetReputation(uint32 factionentry, uint32 value)
 {
     GetReputationMgr().SetReputation(sFactionStore.LookupEntry(factionentry),value);
diff --git a/src/game/Player.h b/src/game/Player.h
index 1a218879aa6..655a914c23b 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _PLAYER_H
 #define _PLAYER_H
-
 #include "Common.h"
 #include "ItemPrototype.h"
 #include "Unit.h"
 #include "Item.h"
-
 #include "Database/DatabaseEnv.h"
 #include "NPCHandler.h"
 #include "QuestDef.h"
@@ -38,10 +35,8 @@
 #include "AchievementMgr.h"
 #include "ReputationMgr.h"
 #include "BattleGround.h"
-
 #include<string>
 #include<vector>
-
 struct Mail;
 class Channel;
 class DynamicObject;
@@ -52,19 +47,15 @@ class UpdateMask;
 class SpellCastTargets;
 class PlayerSocial;
 class OutdoorPvP;
-
 typedef std::deque<Mail*> PlayerMails;
-
 #define PLAYER_MAX_SKILLS       127
 #define PLAYER_MAX_DAILY_QUESTS 25
-
 // Note: SPELLMOD_* values is aura types in fact
 enum SpellModType
 {
     SPELLMOD_FLAT         = 107,                            // SPELL_AURA_ADD_FLAT_MODIFIER
     SPELLMOD_PCT          = 108                             // SPELL_AURA_ADD_PCT_MODIFIER
 };
-
 // 2^n values, Player::m_isunderwater is a bitmask. These are mangos internal values, they are never send to any client
 enum PlayerUnderwaterState
 {
@@ -73,10 +64,8 @@ enum PlayerUnderwaterState
     UNDERWATER_INLAVA                   = 0x02,             // terrain type is lava and player is afflicted by it
     UNDERWATER_INSLIME                  = 0x04,             // terrain type is lava and player is afflicted by it
     UNDERWARER_INDARKWATER              = 0x08,             // terrain type is dark water and player is afflicted by it
-
     UNDERWATER_EXIST_TIMERS             = 0x10
 };
-
 enum PlayerSpellState
 {
     PLAYERSPELL_UNCHANGED = 0,
@@ -85,7 +74,6 @@ enum PlayerSpellState
     PLAYERSPELL_REMOVED   = 3,
     PLAYERSPELL_TEMPORARY = 4
 };
-
 struct PlayerSpell
 {
     PlayerSpellState state : 8;
@@ -93,13 +81,11 @@ struct PlayerSpell
     bool dependent         : 1;                             // learned as result another spell learn, skill grow, quest reward, etc
     bool disabled          : 1;                             // first rank has been learned in result talent learn but currently talent unlearned, save max learned ranks
 };
-
 struct PlayerTalent
 {
     PlayerSpellState state : 8;
     uint8 spec             : 8;
 };
-
 // Spell modifier (used for modify other spells)
 struct SpellModifier
 {
@@ -112,19 +98,15 @@ struct SpellModifier
     uint32 spellId;
     Aura *const ownerAura;
 };
-
 typedef UNORDERED_MAP<uint32, PlayerTalent*> PlayerTalentMap;
 typedef UNORDERED_MAP<uint32, PlayerSpell*> PlayerSpellMap;
 typedef std::list<SpellModifier*> SpellModList;
-
 struct SpellCooldown
 {
     time_t end;
     uint16 itemid;
 };
-
 typedef std::map<uint32, SpellCooldown> SpellCooldowns;
-
 enum TrainerSpellState
 {
     TRAINER_SPELL_GREEN = 0,
@@ -132,7 +114,6 @@ enum TrainerSpellState
     TRAINER_SPELL_GRAY  = 2,
     TRAINER_SPELL_GREEN_DISABLED = 10                       // custom value, not send to client: formally green but learn not allowed
 };
-
 enum ActionButtonUpdateState
 {
     ACTIONBUTTON_UNCHANGED = 0,
@@ -140,7 +121,6 @@ enum ActionButtonUpdateState
     ACTIONBUTTON_NEW       = 2,
     ACTIONBUTTON_DELETED   = 3
 };
-
 enum ActionButtonType
 {
     ACTION_BUTTON_SPELL     = 0x00,
@@ -150,19 +130,15 @@ enum ActionButtonType
     ACTION_BUTTON_CMACRO    = ACTION_BUTTON_C | ACTION_BUTTON_MACRO,
     ACTION_BUTTON_ITEM      = 0x80
 };
-
 #define ACTION_BUTTON_ACTION(X) (uint32(X) & 0x00FFFFFF)
 #define ACTION_BUTTON_TYPE(X)   ((uint32(X) & 0xFF000000) >> 24)
 #define MAX_ACTION_BUTTON_ACTION_VALUE (0x00FFFFFF+1)
-
 struct ActionButton
 {
     ActionButton() : packedData(0), uState( ACTIONBUTTON_NEW ), canRemoveByClient(true){}
-
     uint32 packedData;
     ActionButtonUpdateState uState;
     bool canRemoveByClient;
-
     // helpers
     ActionButtonType GetType() const { return ActionButtonType(ACTION_BUTTON_TYPE(packedData)); }
     uint32 GetAction() const { return ACTION_BUTTON_ACTION(packedData); }
@@ -177,63 +153,47 @@ struct ActionButton
         }
     }
 };
-
 #define  MAX_ACTION_BUTTONS 132                             //checked in 2.3.0
-
 typedef std::map<uint8,ActionButton> ActionButtonList;
-
 struct PlayerCreateInfoItem
 {
     PlayerCreateInfoItem(uint32 id, uint32 amount) : item_id(id), item_amount(amount) {}
-
     uint32 item_id;
     uint32 item_amount;
 };
-
 typedef std::list<PlayerCreateInfoItem> PlayerCreateInfoItems;
-
 struct PlayerClassLevelInfo
 {
     PlayerClassLevelInfo() : basehealth(0), basemana(0) {}
     uint16 basehealth;
     uint16 basemana;
 };
-
 struct PlayerClassInfo
 {
     PlayerClassInfo() : levelInfo(NULL) { }
-
     PlayerClassLevelInfo* levelInfo;                        //[level-1] 0..MaxPlayerLevel-1
 };
-
 struct PlayerLevelInfo
 {
     PlayerLevelInfo() { for(uint8 i=0; i < MAX_STATS; ++i ) stats[i] = 0; }
-
     uint8 stats[MAX_STATS];
 };
-
 typedef std::list<uint32> PlayerCreateInfoSpells;
-
 struct PlayerCreateInfoAction
 {
     PlayerCreateInfoAction() : button(0), type(0), action(0) {}
     PlayerCreateInfoAction(uint8 _button, uint32 _action, uint8 _type) : button(_button), type(_type), action(_action) {}
-
     uint8 button;
     uint8 type;
     uint32 action;
 };
-
 typedef std::list<PlayerCreateInfoAction> PlayerCreateInfoActions;
-
 struct PlayerInfo
 {
                                                             // existence checked by displayId != 0             // existence checked by displayId != 0
     PlayerInfo() : displayId_m(0),displayId_f(0),levelInfo(NULL)
     {
     }
-
     uint32 mapId;
     uint32 zoneId;
     float positionX;
@@ -244,31 +204,25 @@ struct PlayerInfo
     PlayerCreateInfoItems item;
     PlayerCreateInfoSpells spell;
     PlayerCreateInfoActions action;
-
     PlayerLevelInfo* levelInfo;                             //[level-1] 0..MaxPlayerLevel-1
 };
-
 struct PvPInfo
 {
     PvPInfo() : inHostileArea(false), inNoPvPArea(false), inFFAPvPArea(false), endTimer(0) {}
-
     bool inHostileArea;
     bool inNoPvPArea;
     bool inFFAPvPArea;
     time_t endTimer;
 };
-
 struct DuelInfo
 {
     DuelInfo() : initiator(NULL), opponent(NULL), startTimer(0), startTime(0), outOfBound(0) {}
-
     Player *initiator;
     Player *opponent;
     time_t startTimer;
     time_t startTime;
     time_t outOfBound;
 };
-
 struct Areas
 {
     uint32 areaID;
@@ -278,10 +232,8 @@ struct Areas
     float y1;
     float y2;
 };
-
 #define MAX_RUNES       6
 #define RUNE_COOLDOWN   5                                   // 5*2=10 sec
-
 enum RuneType
 {
     RUNE_BLOOD      = 0,
@@ -290,20 +242,17 @@ enum RuneType
     RUNE_DEATH      = 3,
     NUM_RUNE_TYPES  = 4
 };
-
 struct RuneInfo
 {
     uint8 BaseRune;
     uint8 CurrentRune;
     uint8 Cooldown;
 };
-
 struct Runes
 {
     RuneInfo runes[MAX_RUNES];
     uint8 runeState;                                        // mask of available runes
     RuneType lastUsedRune;
-
     void SetRuneState(uint8 index, bool set = true)
     {
         if(set)
@@ -312,21 +261,17 @@ struct Runes
             runeState &= ~(1 << index);                     // on cooldown
     }
 };
-
 struct EnchantDuration
 {
     EnchantDuration() : item(NULL), slot(MAX_ENCHANTMENT_SLOT), leftduration(0) {};
-    EnchantDuration(Item * _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot), 
+    EnchantDuration(Item * _item, EnchantmentSlot _slot, uint32 _leftduration) : item(_item), slot(_slot),
         leftduration(_leftduration){ assert(item); };
-
     Item * item;
     EnchantmentSlot slot;
     uint32 leftduration;
 };
-
 typedef std::list<EnchantDuration> EnchantDurationList;
 typedef std::list<Item*> ItemDurationList;
-
 enum LfgType
 {
     LFG_TYPE_NONE           = 0,
@@ -336,7 +281,6 @@ enum LfgType
     LFG_TYPE_ZONE           = 4,
     LFG_TYPE_HEROIC_DUNGEON = 5
 };
-
 enum LfgRoles
 {
     LEADER  = 1,
@@ -344,7 +288,6 @@ enum LfgRoles
     HEALER  = 4,
     DAMAGE  = 8
 };
-
 struct LookingForGroupSlot
 {
     LookingForGroupSlot() : entry(0), type(0) {}
@@ -353,13 +296,10 @@ struct LookingForGroupSlot
     void Set(uint32 _entry, uint32 _type ) { entry = _entry; type = _type; }
     bool Is(uint32 _entry, uint32 _type) const { return entry == _entry && type == _type; }
     bool canAutoJoin() const { return entry && (type == LFG_TYPE_DUNGEON || type == LFG_TYPE_HEROIC_DUNGEON); }
-
     uint32 entry;
     uint32 type;
 };
-
 #define MAX_LOOKING_FOR_GROUP_SLOT 3
-
 struct LookingForGroup
 {
     LookingForGroup() {}
@@ -371,7 +311,6 @@ struct LookingForGroup
                 return true;
         return false;
     }
-
     bool canAutoJoin() const
     {
         for(uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i)
@@ -379,7 +318,6 @@ struct LookingForGroup
                 return true;
         return false;
     }
-
     bool Empty() const
     {
         for(uint8 i = 0; i < MAX_LOOKING_FOR_GROUP_SLOT; ++i)
@@ -387,13 +325,11 @@ struct LookingForGroup
                 return false;
         return more.Empty();
     }
-
     LookingForGroupSlot slots[MAX_LOOKING_FOR_GROUP_SLOT];
     LookingForGroupSlot more;
     std::string comment;
     uint8 roles;
 };
-
 enum PlayerMovementType
 {
     MOVE_ROOT       = 1,
@@ -401,7 +337,6 @@ enum PlayerMovementType
     MOVE_WATER_WALK = 3,
     MOVE_LAND_WALK  = 4
 };
-
 enum DrunkenState
 {
     DRUNKEN_SOBER   = 0,
@@ -409,9 +344,7 @@ enum DrunkenState
     DRUNKEN_DRUNK   = 2,
     DRUNKEN_SMASHED = 3
 };
-
 #define MAX_DRUNKEN   4
-
 enum PlayerFlags
 {
     PLAYER_FLAGS_GROUP_LEADER   = 0x00000001,
@@ -440,7 +373,6 @@ enum PlayerFlags
     PLAYER_ALLOW_ONLY_ABILITY   = 0x00800000,                // used by bladestorm and killing spree
     PLAYER_FLAGS_UNK25          = 0x01000000                 // disabled all melee ability on tab include autoattack
 };
-
 // used for PLAYER__FIELD_KNOWN_TITLES field (uint64), (1<<bit_index) without (-1)
 // can't use enum for uint64 values
 #define PLAYER_TITLE_DISABLED              UI64LIT(0x0000000000000000)
@@ -485,9 +417,7 @@ enum PlayerFlags
 #define PLAYER_TITLE_OF_THE_SHATTERED_SUN  UI64LIT(0x0000004000000000) // 38
 #define PLAYER_TITLE_HAND_OF_ADAL          UI64LIT(0x0000008000000000) // 39
 #define PLAYER_TITLE_VENGEFUL_GLADIATOR    UI64LIT(0x0000010000000000) // 40
-
 #define MAX_TITLE_INDEX     (3*64)                          // 3 uint64 fields
-
 // used in PLAYER_FIELD_BYTES values
 enum PlayerFieldByteFlags
 {
@@ -495,14 +425,12 @@ enum PlayerFieldByteFlags
     PLAYER_FIELD_BYTE_RELEASE_TIMER     = 0x00000008,       // Display time till auto release spirit
     PLAYER_FIELD_BYTE_NO_RELEASE_WINDOW = 0x00000010        // Display no "release spirit" window at all
 };
-
 // used in PLAYER_FIELD_BYTES2 values
 enum PlayerFieldByte2Flags
 {
     PLAYER_FIELD_BYTE2_NONE              = 0x0000,
     PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW = 0x4000
 };
-
 enum ActivateTaxiReplies
 {
     ERR_TAXIOK                      = 0,
@@ -520,8 +448,6 @@ enum ActivateTaxiReplies
     ERR_TAXINOTSTANDING             = 12
 };
 
-
-
 enum MirrorTimerType
 {
     FATIGUE_TIMER      = 0,
@@ -530,7 +456,6 @@ enum MirrorTimerType
 };
 #define MAX_TIMERS      3
 #define DISABLED_MIRROR_TIMER   -1
-
 // 2^n values
 enum PlayerExtraFlags
 {
@@ -540,11 +465,9 @@ enum PlayerExtraFlags
     PLAYER_EXTRA_TAXICHEAT          = 0x0008,
     PLAYER_EXTRA_GM_INVISIBLE       = 0x0010,
     PLAYER_EXTRA_GM_CHAT            = 0x0020,               // Show GM badge in chat messages
-
     // other states
     PLAYER_EXTRA_PVP_DEATH          = 0x0100                // store PvP death status until corpse creating.
 };
-
 // 2^n values
 enum AtLoginFlags
 {
@@ -555,9 +478,7 @@ enum AtLoginFlags
     AT_LOGIN_CUSTOMIZE         = 0x08,
     AT_LOGIN_RESET_PET_TALENTS = 0x10,
 };
-
 typedef std::map<uint32, QuestStatusData> QuestStatusMap;
-
 enum QuestSlotOffsets
 {
     QUEST_ID_OFFSET     = 0,
@@ -565,21 +486,17 @@ enum QuestSlotOffsets
     QUEST_COUNTS_OFFSET = 2,
     QUEST_TIME_OFFSET   = 3
 };
-
 #define MAX_QUEST_OFFSET 4
-
 enum QuestSlotStateMask
 {
     QUEST_STATE_NONE     = 0x0000,
     QUEST_STATE_COMPLETE = 0x0001,
     QUEST_STATE_FAIL     = 0x0002
 };
-
 class Quest;
 class Spell;
 class Item;
 class WorldSession;
-
 enum PlayerSlots
 {
     // first slot for item stored (in any way in player m_items data)
@@ -588,9 +505,7 @@ enum PlayerSlots
     PLAYER_SLOT_END             = 150,
     PLAYER_SLOTS_COUNT          = (PLAYER_SLOT_END - PLAYER_SLOT_START)
 };
-
 #define INVENTORY_SLOT_BAG_0    255
-
 enum EquipmentSlots                                         // 19 slots
 {
     EQUIPMENT_SLOT_START        = 0,
@@ -615,50 +530,42 @@ enum EquipmentSlots                                         // 19 slots
     EQUIPMENT_SLOT_TABARD       = 18,
     EQUIPMENT_SLOT_END          = 19
 };
-
 enum InventorySlots                                         // 4 slots
 {
     INVENTORY_SLOT_BAG_START    = 19,
     INVENTORY_SLOT_BAG_END      = 23
 };
-
 enum InventoryPackSlots                                     // 16 slots
 {
     INVENTORY_SLOT_ITEM_START   = 23,
     INVENTORY_SLOT_ITEM_END     = 39
 };
-
 enum BankItemSlots                                          // 28 slots
 {
     BANK_SLOT_ITEM_START        = 39,
     BANK_SLOT_ITEM_END          = 67
 };
-
 enum BankBagSlots                                           // 7 slots
 {
     BANK_SLOT_BAG_START         = 67,
     BANK_SLOT_BAG_END           = 74
 };
-
 enum BuyBackSlots                                           // 12 slots
 {
     // stored in m_buybackitems
     BUYBACK_SLOT_START          = 74,
     BUYBACK_SLOT_END            = 86
 };
-
 enum KeyRingSlots                                           // 32 slots
 {
     KEYRING_SLOT_START          = 86,
     KEYRING_SLOT_END            = 118
 };
-
 enum CurrencyTokenSlots                                     // 32 slots
 {
     CURRENCYTOKEN_SLOT_START    = 118,
     CURRENCYTOKEN_SLOT_END      = 150
 };
-
 enum EquipmentSetUpdateState
 {
     EQUIPMENT_SET_UNCHANGED = 0,
@@ -666,7 +573,6 @@ enum EquipmentSetUpdateState
     EQUIPMENT_SET_NEW       = 2,
     EQUIPMENT_SET_DELETED   = 3
 };
-
 struct EquipmentSet
 {
     EquipmentSet() : Guid(0), state(EQUIPMENT_SET_NEW)
@@ -674,18 +580,14 @@ struct EquipmentSet
         for(uint8 i = 0; i < EQUIPMENT_SLOT_END; ++i)
             Items[i] = 0;
     }
-
     uint64 Guid;
     std::string Name;
     std::string IconName;
     uint32 Items[EQUIPMENT_SLOT_END];
     EquipmentSetUpdateState state;
 };
-
 #define MAX_EQUIPMENT_SET_INDEX 10                          // client limit
-
 typedef std::map<uint32, EquipmentSet> EquipmentSets;
-
 struct ItemPosCount
 {
     ItemPosCount(uint16 _pos, uint32 _count) : pos(_pos), count(_count) {}
@@ -694,14 +596,12 @@ struct ItemPosCount
     uint32 count;
 };
 typedef std::vector<ItemPosCount> ItemPosCountVec;
-
 enum TradeSlots
 {
     TRADE_SLOT_COUNT            = 7,
     TRADE_SLOT_TRADED_COUNT     = 6,
     TRADE_SLOT_NONTRADED        = 6
 };
-
 enum TransferAbortReason
 {
     TRANSFER_ABORT_NONE                     = 0x00,
@@ -718,7 +618,6 @@ enum TransferAbortReason
     TRANSFER_ABORT_NOT_FOUND2               = 0x0C,         // 3.1
     TRANSFER_ABORT_NOT_FOUND3               = 0x0D,         // 3.1
 };
-
 enum InstanceResetWarningType
 {
     RAID_INSTANCE_WARNING_HOURS     = 1,                    // WARNING! %s is scheduled to reset in %d hour(s).
@@ -727,23 +626,19 @@ enum InstanceResetWarningType
     RAID_INSTANCE_WELCOME           = 4,                    // Welcome to %s. This raid instance is scheduled to reset in %s.
     RAID_INSTANCE_EXPIRED           = 5
 };
-
 class InstanceSave;
-
 enum RestType
 {
     REST_TYPE_NO        = 0,
     REST_TYPE_IN_TAVERN = 1,
     REST_TYPE_IN_CITY   = 2
 };
-
 enum DuelCompleteType
 {
     DUEL_INTERUPTED = 0,
     DUEL_WON        = 1,
     DUEL_FLED       = 2
 };
-
 enum TeleportToOptions
 {
     TELE_TO_GM_MODE             = 0x01,
@@ -752,7 +647,6 @@ enum TeleportToOptions
     TELE_TO_NOT_UNSUMMON_PET    = 0x08,
     TELE_TO_SPELL               = 0x10,
 };
-
 /// Type of environmental damages
 enum EnviromentalDamage
 {
@@ -764,15 +658,12 @@ enum EnviromentalDamage
     DAMAGE_FIRE      = 5,
     DAMAGE_FALL_TO_VOID = 6                                 // custom case for fall without durability loss
 };
-
 enum PlayedTimeIndex
 {
     PLAYED_TIME_TOTAL = 0,
     PLAYED_TIME_LEVEL = 1
 };
-
 #define MAX_PLAYED_TIME_INDEX 2
-
 // used at player loading query list preparing, and later result selection
 enum PlayerLoginQueryIndex
 {
@@ -803,7 +694,6 @@ enum PlayerLoginQueryIndex
     PLAYER_LOGIN_QUERY_LOADACCOUNTDATA          = 24,
     MAX_PLAYER_LOGIN_QUERY                      = 25
 };
-
 enum PlayerDelayedOperations
 {
     DELAYED_SAVE_PLAYER         = 0x01,
@@ -813,11 +703,9 @@ enum PlayerDelayedOperations
     DELAYED_BG_TAXI_RESTORE     = 0x10, ///< Flag to restore taxi state after teleport from BG
     DELAYED_END
 };
-
 // Player summoning auto-decline time (in secs)
 #define MAX_PLAYER_SUMMON_DELAY                   (2*MINUTE)
 #define MAX_MONEY_AMOUNT                       (0x7FFFFFFF-1)
-
 struct InstancePlayerBind
 {
     InstanceSave *save;
@@ -827,7 +715,6 @@ struct InstancePlayerBind
        or when they enter an instance that the group leader is permanently bound to. */
     InstancePlayerBind() : save(NULL), perm(false) {}
 };
-
 struct AccessRequirement
 {
     uint8  levelMin;
@@ -842,7 +729,6 @@ struct AccessRequirement
     uint32 heroicQuest;
     std::string heroicQuestFailedText;
 };
-
 class TRINITY_DLL_SPEC PlayerTaxi
 {
     public:
@@ -851,7 +737,6 @@ class TRINITY_DLL_SPEC PlayerTaxi
         // Nodes
         void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint32 level);
         void LoadTaxiMask(const char* data);
-
         bool IsTaximaskNodeKnown(uint32 nodeidx) const
         {
             uint8  field   = uint8((nodeidx - 1) / 32);
@@ -871,11 +756,9 @@ class TRINITY_DLL_SPEC PlayerTaxi
                 return false;
         }
         void AppendTaximaskTo(ByteBuffer& data,bool all);
-
         // Destinations
         bool LoadTaxiDestinationsFromString(const std::string& values, uint32 team);
         std::string SaveTaxiDestinationsToString();
-
         void ClearTaxiDestinations() { m_TaxiDestinations.clear(); }
         void AddTaxiDestination(uint32 dest) { m_TaxiDestinations.push_back(dest); }
         uint32 GetTaxiSource() const { return m_TaxiDestinations.empty() ? 0 : m_TaxiDestinations.front(); }
@@ -887,44 +770,33 @@ class TRINITY_DLL_SPEC PlayerTaxi
             return GetTaxiDestination();
         }
         bool empty() const { return m_TaxiDestinations.empty(); }
-
         friend std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi);
     private:
         TaxiMask m_taximask;
         std::deque<uint32> m_TaxiDestinations;
 };
-
 std::ostringstream& operator<< (std::ostringstream& ss, PlayerTaxi const& taxi);
-
 class Player;
-
 /// Holder for BattleGround data
 struct BGData
 {
     BGData() : bgInstanceID(0), bgTypeID(BATTLEGROUND_TYPE_NONE), bgAfkReportedCount(0), bgAfkReportedTimer(0),
         bgTeam(0), mountSpell(0) { ClearTaxiPath(); }
 
-
     uint32 bgInstanceID;                    ///< This variable is set to bg->m_InstanceID,
                                             ///  when player is teleported to BG - (it is battleground's GUID)
     BattleGroundTypeId bgTypeID;
-
     std::set<uint32>   bgAfkReporter;
     uint8              bgAfkReportedCount;
     time_t             bgAfkReportedTimer;
-
     uint32 bgTeam;                          ///< What side the player will be added to
 
-
     uint32 mountSpell;
     uint32 taxiPath[2];
-
     WorldLocation joinPos;                  ///< From where player entered BG
-
     void ClearTaxiPath()     { taxiPath[0] = taxiPath[1] = 0; }
     bool HasTaxiPath() const { return taxiPath[0] && taxiPath[1]; }
 };
-
 class MANGOS_DLL_SPEC Player : public Unit
 {
     friend class WorldSession;
@@ -933,25 +805,18 @@ class MANGOS_DLL_SPEC Player : public Unit
     public:
         explicit Player (WorldSession *session);
         ~Player ( );
-
         void CleanupsBeforeDelete();
-
         static UpdateMask updateVisualBits;
         static void InitVisibleBits();
-
         void AddToWorld();
         void RemoveFromWorld();
-
         bool TeleportTo(uint32 mapid, float x, float y, float z, float orientation, uint32 options = 0);
         void TeleportOutOfMap(Map *oldMap);
-
         bool TeleportTo(WorldLocation const &loc, uint32 options = 0)
         {
             return TeleportTo(loc.GetMapId(), loc.GetPositionX(), loc.GetPositionY(), loc.GetPositionZ(), loc.GetOrientation(), options);
         }
-
         bool TeleportToBGEntryPoint();
-
         void SetSummonPoint(uint32 mapid, float x, float y, float z)
         {
             m_summon_expire = time(NULL) + MAX_PLAYER_SUMMON_DELAY;
@@ -961,27 +826,19 @@ class MANGOS_DLL_SPEC Player : public Unit
             m_summon_z = z;
         }
         void SummonIfPossible(bool agree);
-
         bool Create( uint32 guidlow, const std::string& name, uint8 race, uint8 class_, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair, uint8 outfitId );
-
         void Update( uint32 time );
-
         static bool BuildEnumData( QueryResult * result,  WorldPacket * p_data );
-
         void SetInWater(bool apply);
-
         bool IsInWater() const { return m_isInWater; }
         bool IsUnderWater() const;
-
         void SendInitialPacketsBeforeAddToMap();
         void SendInitialPacketsAfterAddToMap();
         void SendTransferAborted(uint32 mapid, uint8 reason, uint8 arg = 0);
         void SendInstanceResetWarning(uint32 mapid, uint32 difficulty, uint32 time);
-
         Creature* GetNPCIfCanInteractWith(uint64 guid, uint32 npcflagmask);
         bool CanInteractWithNPCs(bool alive = true) const;
         GameObject* GetGameObjectIfCanInteractWith(uint64 guid, GameobjectTypes type) const;
-
         bool ToggleAFK();
         bool ToggleDND();
         bool isAFK() const { return HasFlag(PLAYER_FLAGS,PLAYER_FLAGS_AFK); };
@@ -989,11 +846,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint8 chatTag() const;
         std::string afkMsg;
         std::string dndMsg;
-
         uint32 GetBarberShopCost(uint8 newhairstyle, uint8 newhaircolor, uint8 newfacialhair);
-
         PlayerSocial *GetSocial() { return m_social; }
-
         PlayerTaxi m_taxi;
         void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); }
         bool ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc = NULL, uint32 spellid = 0);
@@ -1012,21 +866,16 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool isGMVisible() const { return !(m_ExtraFlags & PLAYER_EXTRA_GM_INVISIBLE); }
         void SetGMVisible(bool on);
         void SetPvPDeath(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_PVP_DEATH; else m_ExtraFlags &= ~PLAYER_EXTRA_PVP_DEATH; }
-
         void GiveXP(uint32 xp, Unit* victim);
         void GiveLevel(uint32 level);
-
         void InitStatsForLevel(bool reapplyMods = false);
-
         // Played Time Stuff
         time_t m_logintime;
         time_t m_Last_tick;
         uint32 m_Played_time[MAX_PLAYED_TIME_INDEX];
         uint32 GetTotalPlayedTime() { return m_Played_time[PLAYED_TIME_TOTAL]; };
         uint32 GetLevelPlayedTime() { return m_Played_time[PLAYED_TIME_LEVEL]; };
-
         void setDeathState(DeathState s);                   // overwrite Unit::setDeathState
-
         void InnEnter (int time,uint32 mapid, float x,float y,float z)
         {
             inn_pos_mapid = mapid;
@@ -1035,36 +884,28 @@ class MANGOS_DLL_SPEC Player : public Unit
             inn_pos_z = z;
             time_inn_enter = time;
         };
-
         float GetRestBonus() const { return m_rest_bonus; };
         void SetRestBonus(float rest_bonus_new);
-
         RestType GetRestType() const { return rest_type; };
         void SetRestType(RestType n_r_type) { rest_type = n_r_type; };
-
         uint32 GetInnPosMapId() const { return inn_pos_mapid; };
         float GetInnPosX() const { return inn_pos_x; };
         float GetInnPosY() const { return inn_pos_y; };
         float GetInnPosZ() const { return inn_pos_z; };
-
         int GetTimeInnEnter() const { return time_inn_enter; };
         void UpdateInnerTime (int time) { time_inn_enter = time; };
-
         Pet* GetPet() const;
         Pet* SummonPet(uint32 entry, float x, float y, float z, float ang, PetType petType, uint32 despwtime);
         void RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent = false);
         uint32 GetPhaseMaskForSpawn() const;                // used for proper set phase for DB at GM-mode creature/GO spawn
-
         void Say(const std::string& text, const uint32 language);
         void Yell(const std::string& text, const uint32 language);
         void TextEmote(const std::string& text);
         void Whisper(const std::string& text, const uint32 language,uint64 receiver);
         void BuildPlayerChat(WorldPacket *data, uint8 msgtype, const std::string& text, uint32 language) const;
-
         /*********************************************************/
         /***                    STORAGE SYSTEM                 ***/
         /*********************************************************/
-
         void SetVirtualItemSlot( uint8 i, Item* item);
         void SetSheath( SheathState sheathed );             // overwrite Unit version
         uint8 FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap ) const;
@@ -1110,12 +951,10 @@ class MANGOS_DLL_SPEC Player : public Unit
                 return EQUIP_ERR_ITEM_NOT_FOUND;
             uint32 count = pItem->GetCount();
             return _CanStoreItem( bag, slot, dest, pItem->GetEntry(), count, pItem, swap, NULL );
-
         }
         uint8 CanStoreItems( Item **pItem,int count) const;
         uint8 CanEquipNewItem( uint8 slot, uint16 &dest, uint32 item, bool swap ) const;
         uint8 CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bool not_loading = true ) const;
-
         uint8 CanEquipUniqueItem( Item * pItem, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1 ) const;
         uint8 CanEquipUniqueItem( ItemPrototype const* itemProto, uint8 except_slot = NULL_SLOT, uint32 limit_count = 1 ) const;
         uint8 CanUnequipItems( uint32 item, uint32 count ) const;
@@ -1133,10 +972,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool StoreNewItemInBestSlots(uint32 item_id, uint32 item_count);
         void AutoStoreLoot(uint8 bag, uint8 slot, uint32 loot_id, LootStore const& store, bool broadcast = false);
         void AutoStoreLoot(uint32 loot_id, LootStore const& store, bool broadcast = false) { AutoStoreLoot(NULL_BAG,NULL_SLOT,loot_id,store,broadcast); }
-
         uint8 _CanTakeMoreSimilarItems(uint32 entry, uint32 count, Item* pItem, uint32* no_space_count = NULL) const;
         uint8 _CanStoreItem( uint8 bag, uint8 slot, ItemPosCountVec& dest, uint32 entry, uint32 count, Item *pItem = NULL, bool swap = false, uint32* no_space_count = NULL ) const;
-
         void ApplyEquipCooldown( Item * pItem );
         void SetAmmo( uint32 item );
         void RemoveAmmo();
@@ -1186,13 +1023,11 @@ class MANGOS_DLL_SPEC Player : public Unit
         }
         void SendNewItem( Item *item, uint32 count, bool received, bool created, bool broadcast = false );
         bool BuyItemFromVendor(uint64 vendorguid, uint32 item, uint8 count, uint8 bag, uint8 slot);
-
         float GetReputationPriceDiscount( Creature const* pCreature ) const;
         Player* GetTrader() const { return pTrader; }
         void ClearTrade();
         void TradeCancel(bool sendback);
         uint16 GetItemPosByTradeSlot(uint32 slot) const { return tradeItems[slot]; }
-
         void UpdateEnchantTime(uint32 time);
         void UpdateItemDuration(uint32 time, bool realtimeonly=false);
         void AddEnchantmentDurations(Item *item);
@@ -1208,15 +1043,11 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendItemDurations();
         void LoadCorpse();
         void LoadPet();
-
         uint32 m_stableSlots;
-
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
         /*********************************************************/
-
         uint32 GetQuestLevel( Quest const* pQuest ) const { return pQuest && pQuest->GetQuestLevel() ? pQuest->GetQuestLevel() : getLevel(); }
-
         void PrepareQuestMenu( uint64 guid );
         void SendPreparedQuest( uint64 guid );
         bool IsActiveQuest( uint32 quest_id ) const;
@@ -1250,10 +1081,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool GetQuestRewardStatus( uint32 quest_id ) const;
         QuestStatus GetQuestStatus( uint32 quest_id ) const;
         void SetQuestStatus( uint32 quest_id, QuestStatus status );
-
         void SetDailyQuestStatus( uint32 quest_id );
         void ResetDailyQuestStatus();
-
         uint16 FindQuestSlot( uint32 quest_id ) const;
         uint32 GetQuestSlotQuestId(uint16 slot) const { return GetUInt32Value(PLAYER_QUEST_LOG_1_1 + slot*MAX_QUEST_OFFSET + QUEST_ID_OFFSET); }
         uint32 GetQuestSlotState(uint16 slot)   const { return GetUInt32Value(PLAYER_QUEST_LOG_1_1 + slot*MAX_QUEST_OFFSET + QUEST_STATE_OFFSET); }
@@ -1277,7 +1106,6 @@ class MANGOS_DLL_SPEC Player : public Unit
             {
                 uint32 temp1 = GetUInt32Value(PLAYER_QUEST_LOG_1_1 + MAX_QUEST_OFFSET *slot1 + i);
                 uint32 temp2 = GetUInt32Value(PLAYER_QUEST_LOG_1_1 + MAX_QUEST_OFFSET *slot2 + i);
-
                 SetUInt32Value(PLAYER_QUEST_LOG_1_1 + MAX_QUEST_OFFSET *slot1 + i, temp2);
                 SetUInt32Value(PLAYER_QUEST_LOG_1_1 + MAX_QUEST_OFFSET *slot2 + i, temp1);
             }
@@ -1297,7 +1125,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool HasQuestForGO(int32 GOId) const;
         void UpdateForQuestWorldObjects();
         bool CanShareQuest(uint32 quest_id) const;
-
         void SendQuestComplete( uint32 quest_id );
         void SendQuestReward( Quest const *pQuest, uint32 XP, Object* questGiver );
         void SendQuestFailed( uint32 quest_id );
@@ -1306,24 +1133,17 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendPushToPartyResponse( Player *pPlayer, uint32 msg );
         void SendQuestUpdateAddItem( Quest const* pQuest, uint32 item_idx, uint32 count );
         void SendQuestUpdateAddCreatureOrGo( Quest const* pQuest, uint64 guid, uint32 creatureOrGO_idx, uint32 old_count, uint32 add_count );
-
         uint64 GetDivider() { return m_divider; };
         void SetDivider( uint64 guid ) { m_divider = guid; };
-
         uint32 GetInGameTime() { return m_ingametime; };
-
         void SetInGameTime( uint32 time ) { m_ingametime = time; };
-
         void AddTimedQuest( uint32 quest_id ) { m_timedquests.insert(quest_id); }
         void RemoveTimedQuest( uint32 quest_id ) { m_timedquests.erase(quest_id); }
-
         /*********************************************************/
         /***                   LOAD SYSTEM                     ***/
         /*********************************************************/
-
         bool LoadFromDB(uint32 guid, SqlQueryHolder *holder);
         bool isBeingLoaded() const { return GetSession()->PlayerLoading();}
-
         bool MinimalLoadFromDB(QueryResult *result, uint32 guid);
         static bool   LoadValuesArrayFromDB(Tokens& data,uint64 guid);
         static uint32 GetUInt32ValueFromArray(Tokens const& data, uint16 index);
@@ -1333,11 +1153,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         static uint32 GetZoneIdFromDB(uint64 guid);
         static uint32 GetLevelFromDB(uint64 guid);
         static bool   LoadPositionFromDB(uint32& mapid, float& x,float& y,float& z,float& o, bool& in_flight, uint64 guid);
-
         /*********************************************************/
         /***                   SAVE SYSTEM                     ***/
         /*********************************************************/
-
         void SaveToDB();
         void SaveInventoryAndGoldToDB();                    // fast save function for item/money cheating preventing
         void SaveGoldToDB();
@@ -1349,10 +1167,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         static void SetFloatValueInDB(uint16 index, float value, uint64 guid);
         static void Customize(uint64 guid, uint8 gender, uint8 skin, uint8 face, uint8 hairStyle, uint8 hairColor, uint8 facialHair);
         static void SavePositionInDB(uint32 mapid, float x,float y,float z,float o,uint32 zone,uint64 guid);
-
         bool m_mailsLoaded;
         bool m_mailsUpdated;
-
         void SetBindPoint(uint64 guid);
         void SendTalentWipeConfirm(uint64 guid);
         void SendPetSkillWipeConfirm();
@@ -1362,7 +1178,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void RegenerateHealth();
         void setRegenTimerCount(uint32 time) {m_regenTimerCount = time;}
         void setWeaponChangeTimer(uint32 time) {m_weaponChangeTimer = time;}
-
         uint32 GetMoney() { return GetUInt32Value (PLAYER_FIELD_COINAGE); }
         void ModifyMoney( int32 d )
         {
@@ -1371,7 +1186,6 @@ class MANGOS_DLL_SPEC Player : public Unit
                 SetMoney (GetMoney() > uint32(-d) ? GetMoney() + d : 0);
             else
                 SetMoney (GetMoney() < uint32(MAX_MONEY_AMOUNT - d) ? GetMoney() + d : MAX_MONEY_AMOUNT);
-
             // "At Gold Limit"
             if(GetMoney() >= MAX_MONEY_AMOUNT)
                 SendEquipError(EQUIP_ERR_TOO_MUCH_GOLD,NULL,NULL);
@@ -1382,67 +1196,51 @@ class MANGOS_DLL_SPEC Player : public Unit
             MoneyChanged( value );
             UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_GOLD_VALUE_OWNED);
         }
-
         QuestStatusMap& getQuestStatusMap() { return mQuestStatus; };
-
         const uint64& GetSelection( ) const { return m_curSelection; }
         Unit *GetSelectedUnit() const;
         Player *GetSelectedPlayer() const;
         void SetSelection(const uint64 &guid) { m_curSelection = guid; SetUInt64Value(UNIT_FIELD_TARGET, guid); }
-
         uint8 GetComboPoints() { return m_comboPoints; }
         const uint64& GetComboTarget() const { return m_comboTarget; }
-
         void AddComboPoints(Unit* target, int8 count, Spell * spell = NULL);
         void GainSpellComboPoints(int8 count);
         void ClearComboPoints();
         void SendComboPoints();
-
         void SendMailResult(uint32 mailId, MailResponseType mailAction, MailResponseResult mailError, uint32 equipError = 0, uint32 item_guid = 0, uint32 item_count = 0);
         void SendNewMail();
         void UpdateNextMailTimeAndUnreads();
         void AddNewMailDeliverTime(time_t deliver_time);
         bool IsMailsLoaded() const { return m_mailsLoaded; }
-
         //void SetMail(Mail *m);
         void RemoveMail(uint32 id);
-
         void AddMail(Mail* mail) { m_mail.push_front(mail);}// for call from WorldSession::SendMailTo
         uint32 GetMailSize() { return m_mail.size();};
         Mail* GetMail(uint32 id);
-
         PlayerMails::iterator GetmailBegin() { return m_mail.begin();};
         PlayerMails::iterator GetmailEnd() { return m_mail.end();};
-
         /*********************************************************/
         /*** MAILED ITEMS SYSTEM ***/
         /*********************************************************/
-
         uint8 unReadMails;
         time_t m_nextMailDelivereTime;
-
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
-
         ItemMap mMitems;                                    //template defined in objectmgr.cpp
-
         Item* GetMItem(uint32 id)
         {
             ItemMap::const_iterator itr = mMitems.find(id);
             return itr != mMitems.end() ? itr->second : NULL;
         }
-
         void AddMItem(Item* it)
         {
             ASSERT( it );
             //assert deleted, because items can be added before loading
             mMitems[it->GetGUIDLow()] = it;
         }
-
         bool RemoveMItem(uint32 id)
         {
             return mMitems.erase(id) ? true : false;
         }
-
         void PetSpellInitialize();
         void CharmSpellInitialize();
         void PossessSpellInitialize();
@@ -1453,7 +1251,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         TrainerSpellState GetTrainerSpellState(TrainerSpell const* trainer_spell) const;
         bool IsSpellFitByClassAndRace( uint32 spell_id ) const;
         bool IsNeedCastPassiveSpellAtLearn(SpellEntry const* spellInfo) const;
-
         void SendProficiency(uint8 pr1, uint32 pr2);
         void SendInitialSpells();
         bool addSpell(uint32 spell_id, bool active, bool learning, bool dependent, bool disabled);
@@ -1479,12 +1276,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendTalentsInfoData(bool pet);
         void LearnTalent(uint32 talentId, uint32 talentRank);
         void LearnPetTalent(uint64 petGuid, uint32 talentId, uint32 talentRank);
-
         bool AddTalent(uint32 spell, uint8 spec, bool learning);
         bool HasTalent(uint32 spell_id, uint8 spec) const;
-
         uint32 CalculateTalentsPoints() const;
-
         // Dual Spec
         void UpdateSpecCount(uint8 count);
         uint32 GetActiveSpec() { return m_activeSpec; }
@@ -1492,26 +1286,21 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint8 GetSpecsCount() { return m_specsCount; }
         void SetSpecsCount(uint8 count) { m_specsCount = count; }
         void ActivateSpec(uint8 spec);
-
         void InitGlyphsForLevel();
         void SetGlyphSlot(uint8 slot, uint32 slottype) { SetUInt32Value(PLAYER_FIELD_GLYPH_SLOTS_1 + slot, slottype); }
         uint32 GetGlyphSlot(uint8 slot) { return GetUInt32Value(PLAYER_FIELD_GLYPH_SLOTS_1 + slot); }
         void SetGlyph(uint8 slot, uint32 glyph)
-        { 
+        {
             m_Glyphs[m_activeSpec][slot] = glyph;
-            SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + slot, glyph); 
+            SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + slot, glyph);
         }
         uint32 GetGlyph(uint8 slot) { return m_Glyphs[m_activeSpec][slot]; }
-
         uint32 GetFreePrimaryProfessionPoints() const { return GetUInt32Value(PLAYER_CHARACTER_POINTS2); }
         void SetFreePrimaryProfessions(uint16 profs) { SetUInt32Value(PLAYER_CHARACTER_POINTS2, profs); }
         void InitPrimaryProfessions();
-
         PlayerSpellMap const& GetSpellMap() const { return m_spells; }
         PlayerSpellMap      & GetSpellMap()       { return m_spells; }
-
         SpellCooldowns const& GetSpellCooldownMap() const { return m_spellCooldowns; }
-
         void AddSpellMod(SpellModifier* mod, bool apply);
         bool IsAffectedBySpellmod(SpellEntry const *spellInfo, SpellModifier *mod, Spell * spell = NULL);
         template <class T> T ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell * spell = NULL);
@@ -1519,7 +1308,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void RestoreSpellMods(Spell * spell);
         void DropModCharge(SpellModifier * mod, Spell * spell);
         void SetSpellModTakingSpell(Spell* spell, bool apply);
-
         static uint32 const infinityCooldownDelay = MONTH;  // used for set "infinity cooldowns" for spells and check
         static uint32 const infinityCooldownDelayCheck = MONTH/2;
         bool HasSpellCooldown(uint32 spell_id) const
@@ -1540,7 +1328,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void RemoveSpellCooldown(uint32 spell_id, bool update = false);
         void RemoveSpellCategoryCooldown(uint32 cat, bool update = false);
         void SendClearCooldown( uint32 spell_id, Unit* target );
-
         void RemoveCategoryCooldown(uint32 cat);
         void RemoveArenaSpellCooldowns();
         void RemoveAllSpellCooldown();
@@ -1548,7 +1335,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void _SaveSpellCooldowns();
         void SetLastPotionId(uint32 item_id) { m_lastPotionId = item_id; }
         void UpdatePotionCooldown(Spell* spell = NULL);
-
         void setResurrectRequestData(uint64 guid, uint32 mapId, float X, float Y, float Z, uint32 health, uint32 mana)
         {
             m_resurrectGUID = guid;
@@ -1563,7 +1349,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool isRessurectRequestedBy(uint64 guid) const { return m_resurrectGUID == guid; }
         bool isRessurectRequested() const { return m_resurrectGUID != 0; }
         void ResurectUsingRequestData();
-
         int getCinematic()
         {
             return m_cinematic;
@@ -1572,12 +1357,10 @@ class MANGOS_DLL_SPEC Player : public Unit
         {
             m_cinematic = cine;
         }
-
         ActionButton* addActionButton(uint8 button, uint32 action, uint8 type);
         void removeActionButton(uint8 button);
         void SendInitialActionButtons() const { SendActionButtons(0); }
         void SendActionButtons(uint32 state) const;
-
         PvPInfo pvpInfo;
         void UpdatePvPState(bool onlyFFA = false);
         void SetPvP(bool state)
@@ -1589,10 +1372,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         void UpdatePvP(bool state, bool override=false);
         void UpdateZone(uint32 newZone,uint32 newArea);
         void UpdateArea(uint32 newArea);
-
         void UpdateZoneDependentAuras( uint32 zone_id );    // zones
         void UpdateAreaDependentAuras( uint32 area_id );    // subzones
-
         void UpdateAfkReport(time_t currTime);
         void UpdatePvPFlag(time_t currTime);
         void UpdateContestedPvP(uint32 currTime);
@@ -1603,13 +1384,11 @@ class MANGOS_DLL_SPEC Player : public Unit
             RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_CONTESTED_PVP);
             m_contestedPvPTimer = 0;
         }
-
         /** todo: -maybe move UpdateDuelFlag+DuelComplete to independent DuelHandler.. **/
         DuelInfo *duel;
         void UpdateDuelFlag(time_t currTime);
         void CheckDuelDistance(time_t currTime);
         void DuelComplete(DuelCompleteType type);
-
         bool IsGroupVisibleFor(Player* p) const;
         bool IsInSameGroupWith(Player const* p) const;
         bool IsInSameRaidWith(Player const* p) const { return p==this || (GetGroup() != NULL && GetGroup() == p->GetGroup()); }
@@ -1617,7 +1396,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         static void RemoveFromGroup(Group* group, uint64 guid);
         void RemoveFromGroup() { RemoveFromGroup(GetGroup(),GetGUID()); }
         void SendUpdateToOutOfRangeGroupMembers();
-
         void SetInGuild(uint32 GuildId) { SetUInt32Value(PLAYER_GUILDID, GuildId); }
         void SetRank(uint32 rankId){ SetUInt32Value(PLAYER_GUILDRANK, rankId); }
         void SetGuildIdInvited(uint32 GuildId) { m_GuildIdInvited = GuildId; }
@@ -1627,7 +1405,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         static uint32 GetRankFromDB(uint64 guid);
         int GetGuildIdInvited() { return m_GuildIdInvited; }
         static void RemovePetitionsAndSigns(uint64 guid, uint32 type);
-
         // Arena Team
         void SetInArenaTeam(uint32 ArenaTeamId, uint8 slot)
         {
@@ -1638,26 +1415,19 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SetArenaTeamIdInvited(uint32 ArenaTeamId) { m_ArenaTeamIdInvited = ArenaTeamId; }
         uint32 GetArenaTeamIdInvited() { return m_ArenaTeamIdInvited; }
         static void LeaveAllArenaTeams(uint64 guid);
-
         void SetDifficulty(uint32 dungeon_difficulty) { m_dungeonDifficulty = dungeon_difficulty; }
         uint8 GetDifficulty() { return m_dungeonDifficulty; }
         bool IsHeroic() { return m_dungeonDifficulty == DIFFICULTY_HEROIC; }
-
         bool UpdateSkill(uint32 skill_id, uint32 step);
         bool UpdateSkillPro(uint16 SkillId, int32 Chance, uint32 step);
-
         bool UpdateCraftSkill(uint32 spellid);
         bool UpdateGatherSkill(uint32 SkillId, uint32 SkillValue, uint32 RedLevel, uint32 Multiplicator = 1);
         bool UpdateFishingSkill();
-
         uint32 GetBaseDefenseSkillValue() const { return GetBaseSkillValue(SKILL_DEFENSE); }
         uint32 GetBaseWeaponSkillValue(WeaponAttackType attType) const;
-
         uint32 GetSpellByProto(ItemPrototype *proto);
-
         float GetHealthBonusFromStamina();
         float GetManaBonusFromIntellect();
-
         bool UpdateStats(Stats stat);
         bool UpdateAllStats();
         void UpdateResistances(uint32 school);
@@ -1670,9 +1440,7 @@ class MANGOS_DLL_SPEC Player : public Unit
         void UpdateDamagePhysical(WeaponAttackType attType);
         void ApplySpellPowerBonus(int32 amount, bool apply);
         void UpdateSpellDamageAndHealingBonus();
-
         void CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bool addTotalPct, float& min_damage, float& max_damage);
-
         void UpdateDefenseBonusesMod();
         void ApplyRatingMod(CombatRating cr, int32 value, bool apply);
         inline void RecalculateRating(CombatRating cr) { ApplyRatingMod(cr, 0, true);}
@@ -1688,7 +1456,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         uint32 GetSpellCritDamageReduction(uint32 damage) const;
         uint32 GetDotDamageReduction(uint32 damage) const;
         uint32 GetBaseSpellPowerBonus() { return m_baseSpellPower; }
-
         float GetExpertiseDodgeOrParryReduction(WeaponAttackType attType) const;
         void UpdateBlockPercentage();
         void UpdateCritPercentage(WeaponAttackType attType);
@@ -1698,27 +1465,21 @@ class MANGOS_DLL_SPEC Player : public Unit
         void UpdateMeleeHitChances();
         void UpdateRangedHitChances();
         void UpdateSpellHitChances();
-
         void UpdateAllSpellCritChances();
         void UpdateSpellCritChance(uint32 school);
         void UpdateArmorPenetration(int32 amount);
         void UpdateExpertise(WeaponAttackType attType);
         void ApplyManaRegenBonus(int32 amount, bool apply);
         void UpdateManaRegen();
-
         const uint64& GetLootGUID() const { return m_lootGuid; }
         void SetLootGUID(const uint64 &guid) { m_lootGuid = guid; }
-
         void RemovedInsignia(Player* looterPlr);
-
         WorldSession* GetSession() const { return m_session; }
         void SetSession(WorldSession *s) { m_session = s; }
-
         void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const;
         void DestroyForPlayer( Player *target, bool anim = false ) const;
         void SendDelayResponse(const uint32);
         void SendLogXPGain(uint32 GivenXP,Unit* victim,uint32 RestXP);
-
         // notifiers
         void SendAttackSwingCantAttack();
         void SendAttackSwingCancelAttack();
@@ -1727,25 +1488,19 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendAttackSwingBadFacingAttack();
         void SendAutoRepeatCancel(Unit *target);
         void SendExplorationExperience(uint32 Area, uint32 Experience);
-
         void SendDungeonDifficulty(bool IsInGroup);
         void ResetInstances(uint8 method);
         void SendResetInstanceSuccess(uint32 MapId);
         void SendResetInstanceFailed(uint32 reason, uint32 MapId);
         void SendResetFailedNotify(uint32 mapid);
-
         bool SetPosition(const Position &pos, bool teleport = false) { return SetPosition(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), teleport); }
         bool SetPosition(float x, float y, float z, float orientation, bool teleport = false);
         void UpdateUnderwaterState( Map * m, float x, float y, float z );
-
         void SendMessageToSet(WorldPacket *data, bool self);// overwrite Object::SendMessageToSet
         void SendMessageToSetInRange(WorldPacket *data, float fist, bool self);// overwrite Object::SendMessageToSetInRange
         void SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool own_team_only);
-
         void SendTeleportAckMsg();
-
         static void DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmChars = true);
-
         Corpse *GetCorpse() const;
         void SpawnCorpseBones();
         void CreateCorpse();
@@ -1755,7 +1510,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void ResurrectPlayer(float restore_percent, bool applySickness = false);
         void BuildPlayerRepop();
         void RepopAtGraveyard();
-
         void DurabilityLossAll(double percent, bool inventory);
         void DurabilityLoss(Item* item, double percent);
         void DurabilityPointsLossAll(int32 points, bool inventory);
@@ -1763,7 +1517,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         void DurabilityPointLossForEquipSlot(EquipmentSlots slot);
         uint32 DurabilityRepairAll(bool cost, float discountMod, bool guildBank);
         uint32 DurabilityRepair(uint16 pos, bool cost, float discountMod, bool guildBank);
-
         void UpdateMirrorTimers();
         void StopMirrorTimers()
         {
@@ -1771,19 +1524,15 @@ class MANGOS_DLL_SPEC Player : public Unit
             StopMirrorTimer(BREATH_TIMER);
             StopMirrorTimer(FIRE_TIMER);
         }
-
         void SetMovement(PlayerMovementType pType);
-
         void JoinedChannel(Channel *c);
         void LeftChannel(Channel *c);
         void CleanupChannels();
         void UpdateLocalChannels( uint32 newZone );
         void LeaveLFGChannel();
-
         void UpdateDefense();
         void UpdateWeaponSkill (WeaponAttackType attType);
         void UpdateCombatSkills(Unit *pVictim, WeaponAttackType attType, bool defence);
-
         void SetSkill(uint32 id, uint16 currVal, uint16 maxVal);
         uint16 GetMaxSkillValue(uint32 skill) const;        // max + perm. bonus + temp bonus
         uint16 GetPureMaxSkillValue(uint32 skill) const;    // max
@@ -1794,7 +1543,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         int16 GetSkillTempBonusValue(uint32 skill) const;
         bool HasSkill(uint32 skill) const;
         void learnSkillRewardedSpells(uint32 id, uint32 value);
-
         WorldLocation& GetTeleportDest() { return m_teleport_dest; }
         bool IsBeingTeleported() const { return mSemaphoreTeleport_Near || mSemaphoreTeleport_Far; }
         bool IsBeingTeleportedNear() const { return mSemaphoreTeleport_Near; }
@@ -1802,32 +1550,25 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SetSemaphoreTeleportNear(bool semphsetting) { mSemaphoreTeleport_Near = semphsetting; }
         void SetSemaphoreTeleportFar(bool semphsetting) { mSemaphoreTeleport_Far = semphsetting; }
         void ProcessDelayedOperations();
-
         void CheckExploreSystem(void);
-
         static uint32 TeamForRace(uint8 race);
         uint32 GetTeam() const { return m_team; }
         TeamId GetTeamId() const { return m_team == ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE; }
         static uint32 getFactionForRace(uint8 race);
         void setFactionForRace(uint8 race);
-
         void InitDisplayIds();
-
         bool IsAtGroupRewardDistance(WorldObject const* pRewardSource) const;
         bool RewardPlayerAndGroupAtKill(Unit* pVictim);
         void RewardPlayerAndGroupAtEvent(uint32 creature_id,WorldObject* pRewardSource);
         bool isHonorOrXPTarget(Unit* pVictim);
-
         ReputationMgr&       GetReputationMgr()       { return m_reputationMgr; }
         ReputationMgr const& GetReputationMgr() const { return m_reputationMgr; }
         ReputationRank GetReputationRank(uint32 faction_id) const;
         void RewardReputation(Unit *pVictim, float rate);
         void RewardReputation(Quest const *pQuest);
-
         void UpdateSkillsForLevel();
         void UpdateSkillsToMaxSkillsForLevel();             // for .levelup
         void ModifySkillBonus(uint32 skillid,int32 val, bool talent);
-
         /*********************************************************/
         /***                  PVP SYSTEM                       ***/
         /*********************************************************/
@@ -1839,20 +1580,15 @@ class MANGOS_DLL_SPEC Player : public Unit
         void ModifyHonorPoints( int32 value );
         void ModifyArenaPoints( int32 value );
         uint32 GetMaxPersonalArenaRatingRequirement();
-
         //End of PvP System
-
         inline SpellCooldowns GetSpellCooldowns() const { return m_spellCooldowns; }
-
         void SetDrunkValue(uint16 newDrunkValue, uint32 itemid=0);
         uint16 GetDrunkValue() const { return m_drunk; }
         static DrunkenState GetDrunkenstateByValue(uint16 value);
-
         uint32 GetDeathTimer() const { return m_deathTimer; }
         uint32 GetCorpseReclaimDelay(bool pvp) const;
         void UpdateCorpseReclaimDelay();
         void SendCorpseReclaimDelay(bool load = false);
-
         uint32 GetShieldBlockValue() const;                 // overwrite Unit version (virtual)
         bool CanParry() const { return m_canParry; }
         void SetCanParry(bool value);
@@ -1861,7 +1597,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         bool CanTitanGrip() const { return m_canTitanGrip ; }
         void SetCanTitanGrip(bool value) { m_canTitanGrip = value; }
         bool CanTameExoticPets() const { return isGameMaster() || HasAuraType(SPELL_AURA_ALLOW_TAME_PET_TYPE); }
-
         void SetRegularAttackTime();
         void SetBaseModValue(BaseModGroup modGroup, BaseModType modType, float value) { m_auraBaseMod[modGroup][modType] = value; }
         void HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, float amount, bool apply);
@@ -1870,11 +1605,9 @@ class MANGOS_DLL_SPEC Player : public Unit
         float GetTotalPercentageModValue(BaseModGroup modGroup) const { return m_auraBaseMod[modGroup][FLAT_MOD] + m_auraBaseMod[modGroup][PCT_MOD]; }
         void _ApplyAllStatBonuses();
         void _RemoveAllStatBonuses();
-        
         void _ApplyWeaponDependentAuraMods(Item *item, WeaponAttackType attackType, bool apply);
         void _ApplyWeaponDependentAuraCritMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply);
         void _ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType attackType, AuraEffect* aura, bool apply);
-
         void _ApplyItemMods(Item *item,uint8 slot,bool apply);
         void _RemoveAllItemMods();
         void _ApplyAllItemMods();
@@ -1885,45 +1618,35 @@ class MANGOS_DLL_SPEC Player : public Unit
         void ToggleMetaGemsActive(uint8 exceptslot, bool apply);
         void CorrectMetaGemEnchants(uint8 slot, bool apply);
         void InitDataForForm(bool reapplyMods = false);
-
         void ApplyItemEquipSpell(Item *item, bool apply, bool form_change = false);
         void ApplyEquipSpell(SpellEntry const* spellInfo, Item* item, bool apply, bool form_change = false);
         void UpdateEquipSpellsAtFormChange();
         void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx);
         void CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 cast_count, uint32 glyphIndex);
         void CastItemCombatSpell(Unit *target, WeaponAttackType attType, uint32 procVictim, uint32 procEx, Item *item, ItemPrototype const * proto);
-
         void SendEquipmentSetList();
         void SetEquipmentSet(uint32 index, EquipmentSet eqset);
         void DeleteEquipmentSet(uint64 setGuid);
-
         void SendInitWorldStates(uint32 zone, uint32 area);
         void SendUpdateWorldState(uint32 Field, uint32 Value);
         void SendDirectMessage(WorldPacket *data);
-
         void SendAurasForTarget(Unit *target);
-
         PlayerMenu* PlayerTalkClass;
         std::vector<ItemSetEffect *> ItemSetEff;
-
         void SendLoot(uint64 guid, LootType loot_type);
         void SendLootRelease( uint64 guid );
         void SendNotifyLootItemRemoved(uint8 lootSlot);
         void SendNotifyLootMoneyRemoved();
-
         /*********************************************************/
         /***               BATTLEGROUND SYSTEM                 ***/
         /*********************************************************/
-
         bool InBattleGround()       const                { return m_bgData.bgInstanceID != 0; }
         bool InArena()              const;
         uint32 GetBattleGroundId()  const                { return m_bgData.bgInstanceID; }
         BattleGroundTypeId GetBattleGroundTypeId() const { return m_bgData.bgTypeID; }
         BattleGround* GetBattleGround() const;
 
-
         BGQueueIdBasedOnLevel GetBattleGroundQueueIdFromLevel(BattleGroundTypeId bgTypeId) const;
-
         bool InBattleGroundQueue() const
         {
             for (uint8 i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
@@ -1931,7 +1654,6 @@ class MANGOS_DLL_SPEC Player : public Unit
                     return true;
             return false;
         }
-
         BattleGroundQueueTypeId GetBattleGroundQueueTypeId(uint32 index) const { return m_bgBattleGroundQueueID[index].bgQueueTypeId; }
         uint32 GetBattleGroundQueueIndex(BattleGroundQueueTypeId bgQueueTypeId) const
         {
@@ -1951,7 +1673,6 @@ class MANGOS_DLL_SPEC Player : public Unit
         {
             return GetBattleGroundQueueIndex(bgQueueTypeId) < PLAYER_MAX_BATTLEGROUND_QUEUES;
         }
-
         void SetBattleGroundId(uint32 val, BattleGroundTypeId bgTypeId)
         {
             m_bgData.bgInstanceID = val;
@@ -2004,53 +1725,41 @@ class MANGOS_DLL_SPEC Player : public Unit
         }
         WorldLocation const& GetBattleGroundEntryPoint() const { return m_bgData.joinPos; }
         void SetBattleGroundEntryPoint();
-
         void SetBGTeam(uint32 team) { m_bgData.bgTeam = team; }
         uint32 GetBGTeam() const { return m_bgData.bgTeam ? m_bgData.bgTeam : GetTeam(); }
-
         void LeaveBattleground(bool teleportToEntryPoint = true);
         bool CanJoinToBattleground() const;
         bool CanReportAfkDueToLimit();
         void ReportedAfkBy(Player* reporter);
         void ClearAfkReports() { m_bgData.bgAfkReporter.clear(); }
-
         bool GetBGAccessByLevel(BattleGroundTypeId bgTypeId) const;
         bool isTotalImmunity();
         bool CanUseBattleGroundObject();
         bool isTotalImmune();
         bool CanCaptureTowerPoint();
-
         /*********************************************************/
         /***               OUTDOOR PVP SYSTEM                  ***/
         /*********************************************************/
-
         OutdoorPvP * GetOutdoorPvP() const;
         // returns true if the player is in active state for outdoor pvp objective capturing, false otherwise
         bool IsOutdoorPvPActive();
-
         /*********************************************************/
         /***                    REST SYSTEM                    ***/
         /*********************************************************/
-
         bool isRested() const { return GetRestTime() >= 10*IN_MILISECONDS; }
         uint32 GetXPRestBonus(uint32 xp);
         uint32 GetRestTime() const { return m_restTime;};
         void SetRestTime(uint32 v) { m_restTime = v;};
-
         /*********************************************************/
         /***              ENVIROMENTAL SYSTEM                  ***/
         /*********************************************************/
-
         uint32 EnvironmentalDamage(EnviromentalDamage type, uint32 damage);
-
         /*********************************************************/
         /***               FLOOD FILTER SYSTEM                 ***/
         /*********************************************************/
-
         void UpdateSpeakTime();
         bool CanSpeak() const;
         void ChangeSpeakTime(int utime);
-
         /*********************************************************/
         /***                 VARIOUS SYSTEMS                   ***/
         /*********************************************************/
@@ -2063,11 +1772,8 @@ class MANGOS_DLL_SPEC Player : public Unit
             m_lastFallZ = z;
         }
         void HandleFall(MovementInfo const& movementInfo);
-
         bool IsKnowHowFlyIn(uint32 mapid, uint32 zone) const;
-
         void SetClientControl(Unit* target, uint8 allowMove);
-
         void SetMover(Unit* target)
         {
             m_mover->m_movedPlayer = NULL;
@@ -2079,10 +1785,8 @@ class MANGOS_DLL_SPEC Player : public Unit
         WorldObject* GetViewpoint() const;
         void StopCastingCharm();
         void StopCastingBindSight();
-
         uint32 GetSaveTimer() const { return m_nextSave; }
         void   SetSaveTimer(uint32 timer) { m_nextSave = timer; }
-
         // Recall position
         uint32 m_recallMap;
         float  m_recallX;
@@ -2090,61 +1794,44 @@ class MANGOS_DLL_SPEC Player : public Unit
         float  m_recallZ;
         float  m_recallO;
         void   SaveRecallPosition();
-
         // Homebind coordinates
         uint32 m_homebindMapId;
         uint16 m_homebindZoneId;
         float m_homebindX;
         float m_homebindY;
         float m_homebindZ;
-
         WorldLocation GetStartPosition() const;
-
         // currently visible objects at player client
         typedef std::set<uint64> ClientGUIDs;
         ClientGUIDs m_clientGUIDs;
-
         bool HaveAtClient(WorldObject const* u) const { return u==this || m_clientGUIDs.find(u->GetGUID())!=m_clientGUIDs.end(); }
-
         bool canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList = false, bool is3dDistance = true) const;
         bool IsVisibleInGridForPlayer(Player const* pl) const;
         bool IsVisibleGloballyFor(Player* pl) const;
-
         void UpdateVisibilityOf(WorldObject* target);
         void SendInitialVisiblePackets(Unit* target);
-
         template<class T>
             void UpdateVisibilityOf(T* target, UpdateData& data, std::set<WorldObject*>& visibleNow);
-
         // Stealth detection system
         void HandleStealthedUnitsDetection();
-
         uint8 m_forced_speed_changes[MAX_MOVE_TYPE];
-
         bool HasAtLoginFlag(AtLoginFlags f) const { return m_atLoginFlags & f; }
         void SetAtLoginFlag(AtLoginFlags f) { m_atLoginFlags |= f; }
         void RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also = false);
-
         LookingForGroup m_lookingForGroup;
-
         // Temporarily removed pet cache
         uint32 GetTemporaryUnsummonedPetNumber() const { return m_temporaryUnsummonedPetNumber; }
         void SetTemporaryUnsummonedPetNumber(uint32 petnumber) { m_temporaryUnsummonedPetNumber = petnumber; }
         void UnsummonPetTemporaryIfAny();
         void ResummonPetTemporaryUnSummonedIfAny();
         bool IsPetNeedBeTemporaryUnsummoned() const { return !IsInWorld() || !isAlive() || IsMounted() /*+in flight*/; }
-
         void SendCinematicStart(uint32 CinematicSequenceId);
         void SendMovieStart(uint32 MovieId);
-
         /*********************************************************/
         /***                 INSTANCE SYSTEM                   ***/
         /*********************************************************/
-
         typedef UNORDERED_MAP< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap;
-
         void UpdateHomebindTime(uint32 time);
-
         uint32 m_HomebindTimer;
         bool m_InstanceValid;
         // permanent binds and solo binds by difficulty
@@ -2159,15 +1846,12 @@ class MANGOS_DLL_SPEC Player : public Unit
         void SendSavedInstances();
         static void ConvertInstancesToGroup(Player *player, Group *group = NULL, uint64 player_guid = 0);
         bool Satisfy(AccessRequirement const*, uint32 target_map, bool report = false);
-
         // last used pet number (for BG's)
         uint32 GetLastPetNumber() const { return m_lastpetnumber; }
         void SetLastPetNumber(uint32 petnumber) { m_lastpetnumber = petnumber; }
-
         /*********************************************************/
         /***                   GROUP SYSTEM                    ***/
         /*********************************************************/
-
         Group * GetGroupInvite() { return m_groupInvite; }
         void SetGroupInvite(Group *group) { m_groupInvite = group; }
         Group * GetGroup() { return m_group.getTarget(); }
@@ -2188,16 +1872,12 @@ class MANGOS_DLL_SPEC Player : public Unit
         GroupReference& GetOriginalGroupRef() { return m_originalGroup; }
         uint8 GetOriginalSubGroup() const { return m_originalGroup.getSubGroup(); }
         void SetOriginalGroup(Group *group, int8 subgroup = -1);
-
         GridReference<Player> &GetGridRef() { return m_gridRef; }
         MapReference &GetMapRef() { return m_mapRef; }
-
         // Set map to player and add reference
         void SetMap(Map * map);
         void ResetMap();
-
         bool isAllowedToLoot(Creature* creature);
-
         DeclinedName const* GetDeclinedNames() const { return m_declinedname; }
         uint8 GetRunesState() const { return m_runes->runeState; }
         RuneType GetBaseRune(uint8 index) const { return RuneType(m_runes->runes[index].BaseRune); }
@@ -2213,18 +1893,14 @@ class MANGOS_DLL_SPEC Player : public Unit
         void ResyncRunes(uint8 count);
         void AddRunePower(uint8 index);
         void InitRunes();
-
         AchievementMgr& GetAchievementMgr() { return m_achievementMgr; }
         void UpdateAchievementCriteria(AchievementCriteriaTypes type, uint32 miscvalue1 = 0, uint32 miscvalue2 = 0, Unit *unit = NULL, uint32 time = 0);
         void CompletedAchievement(AchievementEntry const* entry);
-
         bool HasTitle(uint32 bitIndex);
         bool HasTitle(CharTitlesEntry const* title) { return HasTitle(title->bit_index); }
         void SetTitle(CharTitlesEntry const* title, bool lost = false);
-
         //bool isActiveObject() const { return true; }
         bool canSeeSpellClickOn(Creature const* creature) const;
-
         uint32 GetChampioningFaction() const { return m_ChampioningFaction; }
         void SetChampioningFaction(uint32 faction) { m_ChampioningFaction = faction; }
 Spell * m_spellModTakingSpell;
@@ -2233,11 +1909,9 @@ Spell * m_spellModTakingSpell;
         uint32 m_regenTimerCount;
         float m_powerFraction[MAX_POWERS];
         uint32 m_contestedPvPTimer;
-
         /*********************************************************/
         /***               BATTLEGROUND SYSTEM                 ***/
         /*********************************************************/
-
         /*
         this is an array of BG queues (BgTypeIDs) in which is player
         */
@@ -2246,24 +1920,18 @@ Spell * m_spellModTakingSpell;
             BattleGroundQueueTypeId bgQueueTypeId;
             uint32 invitedToInstance;
         };
-
         BgBattleGroundQueueID_Rec m_bgBattleGroundQueueID[PLAYER_MAX_BATTLEGROUND_QUEUES];
         BGData                    m_bgData;
-
         /*********************************************************/
         /***                    QUEST SYSTEM                   ***/
         /*********************************************************/
-        
         //We allow only one timed quest active at the same time. Below can then be simple value instead of set.
         std::set<uint32> m_timedquests;
-
         uint64 m_divider;
         uint32 m_ingametime;
-
         /*********************************************************/
         /***                   LOAD SYSTEM                     ***/
         /*********************************************************/
-
         void _LoadActions(QueryResult *result, bool startup);
         void _LoadAuras(QueryResult *result, uint32 timediff);
         void _LoadGlyphAuras();
@@ -2285,11 +1953,9 @@ Spell * m_spellModTakingSpell;
         void _LoadBGData(QueryResult* result);
         void _LoadGlyphs(QueryResult *result);
         void _LoadTalents(QueryResult *result);
-
         /*********************************************************/
         /***                   SAVE SYSTEM                     ***/
         /*********************************************************/
-
         void _SaveActions();
         void _SaveAuras();
         void _SaveInventory();
@@ -2301,10 +1967,8 @@ Spell * m_spellModTakingSpell;
         void _SaveBGData();
         void _SaveGlyphs();
         void _SaveTalents();
-
         void _SetCreateBits(UpdateMask *updateMask, Player *target) const;
         void _SetUpdateBits(UpdateMask *updateMask, Player *target) const;
-
         /*********************************************************/
         /***              ENVIRONMENTAL SYSTEM                 ***/
         /*********************************************************/
@@ -2313,100 +1977,71 @@ Spell * m_spellModTakingSpell;
         void StopMirrorTimer(MirrorTimerType Type);
         void HandleDrowning(uint32 time_diff);
         int32 getMaxTimer(MirrorTimerType timer);
-
         /*********************************************************/
         /***                  HONOR SYSTEM                     ***/
         /*********************************************************/
         time_t m_lastHonorUpdateTime;
-
         void outDebugValues() const;
         uint64 m_lootGuid;
-
         uint32 m_team;
         uint32 m_nextSave;
         time_t m_speakTime;
         uint32 m_speakCount;
         uint32 m_dungeonDifficulty;
-
         uint32 m_atLoginFlags;
-
         Item* m_items[PLAYER_SLOTS_COUNT];
         uint32 m_currentBuybackSlot;
-
         std::vector<Item*> m_itemUpdateQueue;
         bool m_itemUpdateQueueBlocked;
-
         uint32 m_ExtraFlags;
         uint64 m_curSelection;
-
         uint64 m_comboTarget;
         int8 m_comboPoints;
-
         QuestStatusMap mQuestStatus;
-
         uint32 m_GuildIdInvited;
         uint32 m_ArenaTeamIdInvited;
-
         PlayerMails m_mail;
         PlayerSpellMap m_spells;
         PlayerTalentMap *m_talents[MAX_TALENT_SPECS];
         uint32 m_lastPotionId;                              // last used health/mana potion in combat, that block next potion use
-
         uint32 m_activeSpec;
         uint32 m_specsCount;
-
         uint32 m_Glyphs[MAX_TALENT_SPECS][MAX_GLYPH_SLOT_INDEX];
-
         ActionButtonList m_actionButtons;
-
         float m_auraBaseMod[BASEMOD_END][MOD_END];
         int16 m_baseRatingValue[MAX_COMBAT_RATING];
         uint16 m_baseSpellPower;
         uint16 m_baseFeralAP;
         uint16 m_baseManaRegen;
-
         SpellModList m_spellMods[MAX_SPELLMOD];
         uint32 m_pad;
 //        Spell * m_spellModTakingSpell;  // Spell for which charges are dropped in spell::finish
-
         EnchantDurationList m_enchantDuration;
         ItemDurationList m_itemDuration;
-
         uint64 m_resurrectGUID;
         uint32 m_resurrectMap;
         float m_resurrectX, m_resurrectY, m_resurrectZ;
         uint32 m_resurrectHealth, m_resurrectMana;
-
         WorldSession *m_session;
-
         typedef std::list<Channel*> JoinedChannelsList;
         JoinedChannelsList m_channels;
-
         int m_cinematic;
-
         Player *pTrader;
         bool acceptTrade;
         uint16 tradeItems[TRADE_SLOT_COUNT];
         uint32 tradeGold;
-
         time_t m_nextThinkTime;
-
         bool   m_DailyQuestChanged;
         time_t m_lastDailyQuestTime;
-
         uint32 m_drunkTimer;
         uint16 m_drunk;
         uint32 m_weaponChangeTimer;
-
         uint32 m_zoneUpdateId;
         uint32 m_zoneUpdateTimer;
         uint32 m_areaUpdateId;
-
         uint32 m_deathTimer;
         time_t m_deathExpireTime;
-
         uint32 m_restTime;
-
         uint32 m_WeaponProficiency;
         uint32 m_ArmorProficiency;
         bool m_canParry;
@@ -2414,7 +2049,6 @@ Spell * m_spellModTakingSpell;
         bool m_canTitanGrip;
         uint8 m_swingErrorMsg;
         float m_ammoDPS;
-
         ////////////////////Rest System/////////////////////
         int time_inn_enter;
         uint32 inn_pos_mapid;
@@ -2424,32 +2058,26 @@ Spell * m_spellModTakingSpell;
         float m_rest_bonus;
         RestType rest_type;
         ////////////////////Rest System/////////////////////
-
         uint32 m_resetTalentsCost;
         time_t m_resetTalentsTime;
         uint32 m_usedTalentCount;
         uint32 m_questRewardTalentCount;
-
         // Social
         PlayerSocial *m_social;
-
         // Groups
         GroupReference m_group;
         GroupReference m_originalGroup;
         Group *m_groupInvite;
         uint32 m_groupUpdateMask;
         uint64 m_auraRaidUpdateMask;
-
         // last used pet number (for BG's)
         uint32 m_lastpetnumber;
-
         // Player summoning
         time_t m_summon_expire;
         uint32 m_summon_mapid;
         float  m_summon_x;
         float  m_summon_y;
         float  m_summon_z;
-
         DeclinedName *m_declinedname;
         Runes *m_runes;
         EquipmentSets m_EquipmentSets;
@@ -2459,63 +2087,47 @@ Spell * m_spellModTakingSpell;
         uint8 _CanStoreItem_InBag( uint8 bag, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, bool non_specialized, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot ) const;
         uint8 _CanStoreItem_InInventorySlots( uint8 slot_begin, uint8 slot_end, ItemPosCountVec& dest, ItemPrototype const *pProto, uint32& count, bool merge, Item *pSrcItem, uint8 skip_bag, uint8 skip_slot ) const;
         Item* _StoreItem( uint16 pos, Item *pItem, uint32 count, bool clone, bool update );
-
         void UpdateKnownCurrencies(uint32 itemId, bool apply);
         int32 CalculateReputationGain(uint32 creatureOrQuestLevel, int32 rep, int32 faction, bool for_quest);
         void AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& questStatusData );
-
         bool IsCanDelayTeleport() const { return m_bCanDelayTeleport; }
         void SetCanDelayTeleport(bool setting) { m_bCanDelayTeleport = setting; }
         bool IsHasDelayedTeleport() const { return m_bHasDelayedTeleport; }
         void SetDelayedTeleportFlag(bool setting) { m_bHasDelayedTeleport = setting; }
-
         void ScheduleDelayedOperation(uint32 operation)
         {
             if(operation < DELAYED_END)
                 m_DelayedOperations |= operation;
         }
-
         GridReference<Player> m_gridRef;
         MapReference m_mapRef;
-
         void UpdateCharmedAI();
         UnitAI *i_AI;
-
         uint32 m_lastFallTime;
         float  m_lastFallZ;
-
         int32 m_MirrorTimer[MAX_TIMERS];
         uint8 m_MirrorTimerFlags;
         uint8 m_MirrorTimerFlagsLast;
         bool m_isInWater;
-
         // Current teleport data
         WorldLocation m_teleport_dest;
         uint32 m_teleport_options;
         bool mSemaphoreTeleport_Near;
         bool mSemaphoreTeleport_Far;
-
         uint32 m_DelayedOperations;
         bool m_bCanDelayTeleport;
         bool m_bHasDelayedTeleport;
-
         uint32 m_DetectInvTimer;
-
         // Temporary removed pet cache
         uint32 m_temporaryUnsummonedPetNumber;
         uint32 m_oldpetspell;
-
         AchievementMgr m_achievementMgr;
         ReputationMgr  m_reputationMgr;
-
         SpellCooldowns m_spellCooldowns;
-
         uint32 m_ChampioningFaction;
 };
-
 void AddItemsSetItem(Player*player,Item *item);
 void RemoveItemsSetItem(Player*player,ItemPrototype const *proto);
-
 // "the bodies of template functions must be made available in a header file"
 template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &basevalue, Spell * spell)
 {
@@ -2523,19 +2135,15 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
     if (!spellInfo) return 0;
     int32 totalpct = 0;
     int32 totalflat = 0;
-
     // Drop charges for triggering spells instead of triggered ones
     if (m_spellModTakingSpell)
         spell = m_spellModTakingSpell;
-
     for (SpellModList::iterator itr = m_spellMods[op].begin(); itr != m_spellMods[op].end(); ++itr)
     {
         SpellModifier *mod = *itr;
-
         // Charges can be set only for mods with auras
         if (!mod->ownerAura)
             assert(mod->charges==0);
-
         if(!IsAffectedBySpellmod(spellInfo,mod,spell))
             continue;
         if (mod->type == SPELLMOD_FLAT)
@@ -2545,17 +2153,13 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T &bas
             // skip percent mods for null basevalue (most important for spell mods with charges )
             if(basevalue == T(0))
                 continue;
-
             // special case (skip >10sec spell casts for instant cast setting)
             if( mod->op==SPELLMOD_CASTING_TIME  && basevalue >= T(10000) && mod->value <= -100)
                 continue;
-
             totalpct += mod->value;
         }
-
         DropModCharge(mod, spell);
     }
-
     float diff = (float)basevalue*(float)totalpct/100.0f + (float)totalflat;
     basevalue = T((float)basevalue + diff);
     return T(diff);
diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp
index 12544c62e41..5922582dd10 100644
--- a/src/game/PlayerDump.cpp
+++ b/src/game/PlayerDump.cpp
@@ -17,23 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "PlayerDump.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
 #include "UpdateFields.h"
 #include "ObjectMgr.h"
-
 // Character Dump tables
 #define DUMP_TABLE_COUNT 26
-
 struct DumpTable
 {
     char const* name;
     DumpTableType type;
 };
-
 static DumpTable dumpTables[DUMP_TABLE_COUNT] =
 {
     { "characters",                       DTT_CHARACTER  },
@@ -63,7 +59,6 @@ static DumpTable dumpTables[DUMP_TABLE_COUNT] =
     { "pet_spell",                        DTT_PET_TABLE  },
     { "pet_spell_cooldown",               DTT_PET_TABLE  },
 };
-
 // Low level functions
 static bool findtoknth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
 {
@@ -72,32 +67,25 @@ static bool findtoknth(std::string &str, int n, std::string::size_type &s, std::
     for(i = 1; s < size && i < n; s++) if(str[s] == ' ') ++i;
     if (i < n)
         return false;
-
     e = str.find(' ', s);
-
     return e != std::string::npos;
 }
-
 std::string gettoknth(std::string &str, int n)
 {
     std::string::size_type s = 0, e = 0;
     if(!findtoknth(str, n, s, e))
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool findnth(std::string &str, int n, std::string::size_type &s, std::string::size_type &e)
 {
     s = str.find("VALUES ('")+9;
     if (s == std::string::npos) return false;
-
     do
     {
         e = str.find("'",s);
         if (e == std::string::npos) return false;
     } while(str[e-1] == '\\');
-
     for(int i = 1; i < n; ++i)
     {
         do
@@ -109,42 +97,34 @@ bool findnth(std::string &str, int n, std::string::size_type &s, std::string::si
     }
     return true;
 }
-
 std::string gettablename(std::string &str)
 {
     std::string::size_type s = 13;
     std::string::size_type e = str.find(_TABLE_SIM_, s);
     if (e == std::string::npos)
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool changenth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
 {
     std::string::size_type s, e;
     if(!findnth(str,n,s,e))
         return false;
-
     if(nonzero && str.substr(s,e-s) == "0")
         return true;                                        // not an error
     if(!insert)
         str.replace(s,e-s, with);
     else
         str.insert(s, with);
-
     return true;
 }
-
 std::string getnth(std::string &str, int n)
 {
     std::string::size_type s, e;
     if(!findnth(str,n,s,e))
         return "";
-
     return str.substr(s, e-s);
 }
-
 bool changetoknth(std::string &str, int n, const char *with, bool insert = false, bool nonzero = false)
 {
     std::string::size_type s = 0, e = 0;
@@ -156,47 +136,37 @@ bool changetoknth(std::string &str, int n, const char *with, bool insert = false
         str.replace(s, e-s, with);
     else
         str.insert(s, with);
-
     return true;
 }
-
 uint32 registerNewGuid(uint32 oldGuid, std::map<uint32, uint32> &guidMap, uint32 hiGuid)
 {
     std::map<uint32, uint32>::const_iterator itr = guidMap.find(oldGuid);
     if(itr != guidMap.end())
         return itr->second;
-
     uint32 newguid = hiGuid + guidMap.size();
     guidMap[oldGuid] = newguid;
     return newguid;
 }
-
 bool changeGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
 {
     char chritem[20];
     uint32 oldGuid = atoi(getnth(str, n).c_str());
     if (nonzero && oldGuid == 0)
         return true;                                        // not an error
-
     uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
     snprintf(chritem, 20, "%d", newGuid);
-
     return changenth(str, n, chritem, false, nonzero);
 }
-
 bool changetokGuid(std::string &str, int n, std::map<uint32, uint32> &guidMap, uint32 hiGuid, bool nonzero = false)
 {
     char chritem[20];
     uint32 oldGuid = atoi(gettoknth(str, n).c_str());
     if (nonzero && oldGuid == 0)
         return true;                                        // not an error
-
     uint32 newGuid = registerNewGuid(oldGuid, guidMap, hiGuid);
     snprintf(chritem, 20, "%d", newGuid);
-
     return changetoknth(str, n, chritem, false, nonzero);
 }
-
 std::string CreateDumpString(char const* tableName, QueryResult *result)
 {
     if(!tableName || !result) return "";
@@ -207,24 +177,20 @@ std::string CreateDumpString(char const* tableName, QueryResult *result)
     {
         if (i == 0) ss << "'";
         else ss << ", '";
-
         std::string s = fields[i].GetCppString();
         CharacterDatabase.escape_string(s);
         ss << s;
-
         ss << "'";
     }
     ss << ");";
     return ss.str();
 }
-
 std::string PlayerDumpWriter::GenerateWhereStr(char const* field, uint32 guid)
 {
     std::ostringstream wherestr;
     wherestr << field << " = '" << guid << "'";
     return wherestr.str();
 }
-
 std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& guids, GUIDs::const_iterator& itr)
 {
     std::ostringstream wherestr;
@@ -232,13 +198,11 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g
     for(; itr != guids.end(); ++itr)
     {
         wherestr << *itr;
-
         if(wherestr.str().size() > MAX_QUERY_LEN - 50)      // near to max query
         {
             ++itr;
             break;
         }
-
         GUIDs::const_iterator itr2 = itr;
         if(++itr2 != guids.end())
             wherestr << "','";
@@ -246,7 +210,6 @@ std::string PlayerDumpWriter::GenerateWhereStr(char const* field, GUIDs const& g
     wherestr << "')";
     return wherestr.str();
 }
-
 void StoreGUID(QueryResult *result,uint32 field,std::set<uint32>& guids)
 {
     Field* fields = result->Fetch();
@@ -254,7 +217,6 @@ void StoreGUID(QueryResult *result,uint32 field,std::set<uint32>& guids)
     if(guid)
         guids.insert(guid);
 }
-
 void StoreGUID(QueryResult *result,uint32 data,uint32 field, std::set<uint32>& guids)
 {
     Field* fields = result->Fetch();
@@ -263,13 +225,11 @@ void StoreGUID(QueryResult *result,uint32 data,uint32 field, std::set<uint32>& g
     if(guid)
         guids.insert(guid);
 }
-
 // Writing - High-level functions
 void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type)
 {
     GUIDs const* guids = NULL;
     char const* fieldname = NULL;
-
     switch ( type )
     {
         case DTT_ITEM:      fieldname = "guid";      guids = &items; break;
@@ -281,29 +241,23 @@ void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl
         case DTT_ITEM_TEXT: fieldname = "id";        guids = &texts; break;
         default:            fieldname = "guid";                      break;
     }
-
     // for guid set stop if set is empty
     if(guids && guids->empty())
         return;                                             // nothing to do
-
     // setup for guids case start position
     GUIDs::const_iterator guids_itr;
     if(guids)
         guids_itr = guids->begin();
-
     do
     {
         std::string wherestr;
-
         if(guids)                                           // set case, get next guids string
             wherestr = GenerateWhereStr(fieldname,*guids,guids_itr);
         else                                                // not set case, get single guid string
             wherestr = GenerateWhereStr(fieldname,guid);
-
         QueryResult *result = CharacterDatabase.PQuery("SELECT * FROM %s WHERE %s", tableFrom, wherestr.c_str());
         if(!result)
             return;
-
         do
         {
             // collect guids
@@ -323,24 +277,19 @@ void PlayerDumpWriter::DumpTable(std::string& dump, uint32 guid, char const*tabl
                     StoreGUID(result,1,items); break;       // item guid collection
                 default:                       break;
             }
-
             dump += CreateDumpString(tableTo, result);
             dump += "\n";
         }
         while (result->NextRow());
-
         delete result;
     }
     while(guids && guids_itr != guids->end());              // not set case iterate single time, set case iterate for all guids
 }
-
 std::string PlayerDumpWriter::GetDump(uint32 guid)
 {
     std::string dump;
-
     dump += "IMPORTANT NOTE: This sql queries not created for apply directly, use '.pdump load' command in console or client chat instead.\n";
     dump += "IMPORTANT NOTE: NOT APPLY ITS DIRECTLY to character DB or you will DAMAGE and CORRUPT character DB\n\n";
-
     // revision check guard
     /*
     QueryNamedResult* result = CharacterDatabase.QueryNamed("SELECT * FROM character_db_version LIMIT 1");
@@ -356,7 +305,6 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
                 break;
             }
         }
-
         if(!reqName.empty())
         {
             // this will fail at wrong character DB version
@@ -364,7 +312,6 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
         }
         else
             sLog.outError("Table 'character_db_version' not have revision guard field, revision guard query not added to pdump.");
-
         delete result;
     }
     else
@@ -372,29 +319,22 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
     */
     for(int i = 0; i < DUMP_TABLE_COUNT; ++i)
         DumpTable(dump, guid, dumpTables[i].name, dumpTables[i].name, dumpTables[i].type);
-
     // TODO: Add instance/group..
     // TODO: Add a dump level option to skip some non-important tables
-
     return dump;
 }
-
 DumpReturn PlayerDumpWriter::WriteDump(const std::string& file, uint32 guid)
 {
     FILE *fout = fopen(file.c_str(), "w");
     if (!fout)
         return DUMP_FILE_OPEN_ERROR;
-
     std::string dump = GetDump(guid);
-
     fprintf(fout,"%s\n",dump.c_str());
     fclose(fout);
     return DUMP_SUCCESS;
 }
-
 // Reading - High-level functions
 #define ROLLBACK(DR) {CharacterDatabase.RollbackTransaction(); fclose(fin); return (DR);}
-
 DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, std::string name, uint32 guid)
 {
     // check character count
@@ -406,19 +346,15 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             Field *fields=result->Fetch();
             charcount = fields[0].GetUInt8();
             delete result;
-
             if (charcount >= 10)
                 return DUMP_TOO_MANY_CHARS;
         }
     }
-
     FILE *fin = fopen(file.c_str(), "r");
     if (!fin)
         return DUMP_FILE_OPEN_ERROR;
-
     QueryResult * result = NULL;
     char newguid[20], chraccount[20], newpetid[20], currpetid[20], lastpetid[20];
-
     // make sure the same guid doesn't already exist and is safe to use
     bool incHighest = true;
     if (guid != 0 && guid < objmgr.m_hiCharGuid)
@@ -433,11 +369,9 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
     }
     else
         guid = objmgr.m_hiCharGuid;
-
     // normalize the name if specified and check if it exists
     if (!normalizePlayerName(name))
         name = "";
-
     if (ObjectMgr::CheckPlayerName(name,true) == CHAR_NAME_SUCCESS)
     {
         CharacterDatabase.escape_string(name);              // for safe, we use name only for sql quearies anyway
@@ -450,23 +384,18 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
     }
     else
         name = "";
-
     // name encoded or empty
-
     snprintf(newguid, 20, "%d", guid);
     snprintf(chraccount, 20, "%d", account);
     snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
     snprintf(lastpetid, 20, "%s", "");
-
     std::map<uint32,uint32> items;
     std::map<uint32,uint32> mails;
     std::map<uint32,uint32> itemTexts;
     char buf[32000] = "";
-
     typedef std::map<uint32, uint32> PetIds;                // old->new petid relation
     typedef PetIds::value_type PetIdsPair;
     PetIds petids;
-
     CharacterDatabase.BeginTransaction();
     while(!feof(fin))
     {
@@ -475,29 +404,23 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             if(feof(fin)) break;
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         std::string line; line.assign(buf);
-
         // skip empty strings
         size_t nw_pos = line.find_first_not_of(" \t\n\r\7");
         if(nw_pos==std::string::npos)
             continue;
-
         // skip NOTE
         if(line.substr(nw_pos,15)=="IMPORTANT NOTE:")
             continue;
-
         // add required_ check
         /*
         if(line.substr(nw_pos,41)=="UPDATE character_db_version SET required_")
         {
             if(!CharacterDatabase.Execute(line.c_str()))
                 ROLLBACK(DUMP_FILE_BROKEN);
-
             continue;
         }
         */
-
         // determine table name and load type
         std::string tn = gettablename(line);
         if(tn.empty())
@@ -505,7 +428,6 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
             sLog.outError("LoadPlayerDump: Can't extract table name from line: '%s'!", line.c_str());
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         DumpTableType type;
         uint8 i;
         for(i = 0; i < DUMP_TABLE_COUNT; ++i)
@@ -516,13 +438,11 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 break;
             }
         }
-
         if (i == DUMP_TABLE_COUNT)
         {
             sLog.outError("LoadPlayerDump: Unknown table: '%s'!", tn.c_str());
             ROLLBACK(DUMP_FILE_BROKEN);
         }
-
         // change the data to server values
         switch(type)
         {
@@ -530,12 +450,10 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
                 break;
-
             case DTT_CHARACTER:                             // character t.
             {
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // guid, data field:guid, items
                 if(!changenth(line, 2, chraccount))
                     ROLLBACK(DUMP_FILE_BROKEN);
@@ -552,26 +470,22 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                     // check if the original name already exists
                     name = getnth(line, 4);
                     CharacterDatabase.escape_string(name);
-
                     result = CharacterDatabase.PQuery("SELECT * FROM characters WHERE name = '%s'", name.c_str());
                     if (result)
                     {
                         delete result;
-
                         if(!changenth(line, 37, "1"))       // rename on login: `at_login` field 37 in raw field list
                             ROLLBACK(DUMP_FILE_BROKEN);
                     }
                 }
                 else if(!changenth(line, 4, name.c_str()))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_INVENTORY:                             // character_inventory t.
             {
                 if(!changenth(line, 1, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // bag, item
                 if(!changeGuid(line, 2, items, objmgr.m_hiItemGuid, true))
                     ROLLBACK(DUMP_FILE_BROKEN);
@@ -616,36 +530,28 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                     snprintf(newpetid, 20, "%d", objmgr.GeneratePetNumber());
                     snprintf(lastpetid, 20, "%s", currpetid);
                 }
-
                 std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
-
                 if(petids_iter == petids.end())
                 {
                     petids.insert(PetIdsPair(atoi(currpetid), atoi(newpetid)));
                 }
-
                 // item, entry, owner, ...
                 if(!changenth(line, 1, newpetid))
                     ROLLBACK(DUMP_FILE_BROKEN);
                 if(!changenth(line, 3, newguid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_PET_TABLE:                             // pet_aura, pet_spell, pet_spell_cooldown t
             {
                 snprintf(currpetid, 20, "%s", getnth(line, 1).c_str());
-
                 // lookup currpetid and match to new inserted pet id
                 std::map<uint32, uint32> :: const_iterator petids_iter = petids.find(atoi(currpetid));
                 if(petids_iter == petids.end())             // couldn't find new inserted id
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 snprintf(newpetid, 20, "%d", petids_iter->second);
-
                 if(!changenth(line, 1, newpetid))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 break;
             }
             case DTT_MAIL:                                  // mail
@@ -675,7 +581,6 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 // id
                 if(!changeGuid(line, 1, itemTexts, objmgr.m_ItemTextId))
                     ROLLBACK(DUMP_FILE_BROKEN);
-
                 // add it to cache
                 uint32 id= atoi(getnth(line,1).c_str());
                 std::string text = getnth(line,2);
@@ -686,22 +591,16 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
                 sLog.outError("Unknown dump table type: %u",type);
                 break;
         }
-
         if(!CharacterDatabase.Execute(line.c_str()))
             ROLLBACK(DUMP_FILE_BROKEN);
     }
-
     CharacterDatabase.CommitTransaction();
-
     objmgr.m_hiItemGuid += items.size();
     objmgr.m_mailid     += mails.size();
     objmgr.m_ItemTextId += itemTexts.size();
-
     if(incHighest)
         ++objmgr.m_hiCharGuid;
-
     fclose(fin);
-
     return DUMP_SUCCESS;
 }
 
diff --git a/src/game/PlayerDump.h b/src/game/PlayerDump.h
index e3dfd192efb..934244b5d09 100644
--- a/src/game/PlayerDump.h
+++ b/src/game/PlayerDump.h
@@ -17,41 +17,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _PLAYER_DUMP_H
 #define _PLAYER_DUMP_H
-
 #include <string>
 #include <map>
 #include <set>
-
 enum DumpTableType
 {
     DTT_CHARACTER,      //                                  // characters
-
     DTT_CHAR_TABLE,     //                                  // character_achievement, character_achievement_progress,
                                                             // character_action, character_aura, character_homebind,
                                                             // character_queststatus, character_reputation, character_spell,
                                                             // character_spell_cooldown, character_ticket, character_tutorial
-
     DTT_INVENTORY,      //    -> item guids collection      // character_inventory
-
     DTT_MAIL,           //    -> mail ids collection        // mail
                         //    -> item_text
-
     DTT_MAIL_ITEM,      // <- mail ids                      // mail_items
                         //    -> item guids collection
-
     DTT_ITEM,           // <- item guids                    // item_instance
                         //    -> item_text
-
     DTT_ITEM_GIFT,      // <- item guids                    // character_gifts
-
     DTT_PET,            //    -> pet guids collection       // character_pet
     DTT_PET_TABLE,      // <- pet guids                     // pet_aura, pet_spell, pet_spell_cooldown
     DTT_ITEM_TEXT,      // <- item_text                     // item_text
 };
-
 enum DumpReturn
 {
     DUMP_SUCCESS,
@@ -60,40 +49,32 @@ enum DumpReturn
     DUMP_UNEXPECTED_END,
     DUMP_FILE_BROKEN,
 };
-
 class PlayerDump
 {
     protected:
         PlayerDump() {}
 };
-
 class PlayerDumpWriter : public PlayerDump
 {
     public:
         PlayerDumpWriter() {}
-
         std::string GetDump(uint32 guid);
         DumpReturn WriteDump(const std::string& file, uint32 guid);
     private:
         typedef std::set<uint32> GUIDs;
-
         void DumpTable(std::string& dump, uint32 guid, char const*tableFrom, char const*tableTo, DumpTableType type);
         std::string GenerateWhereStr(char const* field, GUIDs const& guids, GUIDs::const_iterator& itr);
         std::string GenerateWhereStr(char const* field, uint32 guid);
-
         GUIDs pets;
         GUIDs mails;
         GUIDs items;
         GUIDs texts;
 };
-
 class PlayerDumpReader : public PlayerDump
 {
     public:
         PlayerDumpReader() {}
-
         DumpReturn LoadDump(const std::string& file, uint32 account, std::string name, uint32 guid);
 };
-
 #endif
 
diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp
index 23012f7e170..10f8357ef87 100644
--- a/src/game/PointMovementGenerator.cpp
+++ b/src/game/PointMovementGenerator.cpp
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "PointMovementGenerator.h"
 #include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "DestinationHolderImp.h"
 #include "World.h"
-
 //----- Point Movement Generator
 template<class T>
 void PointMovementGenerator<T>::Initialize(T &unit)
@@ -34,13 +32,11 @@ void PointMovementGenerator<T>::Initialize(T &unit)
     // knockback effect has UNIT_STAT_JUMPING set,so if here we disable sentmonstermove there will be creature position sync problem between client and server
     i_destinationHolder.SetDestination(traveller,i_x,i_y,i_z, true /* !unit.hasUnitState(UNIT_STAT_JUMPING)*/);
 }
-
 template<class T>
 bool PointMovementGenerator<T>::Update(T &unit, const uint32 &diff)
 {
     if(!&unit)
         return false;
-
     if(unit.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED))
     {
         if(unit.hasUnitState(UNIT_STAT_CHARGING))
@@ -48,21 +44,16 @@ bool PointMovementGenerator<T>::Update(T &unit, const uint32 &diff)
         else
             return true;
     }
-
     Traveller<T> traveller(unit);
-
     i_destinationHolder.UpdateTraveller(traveller, diff);
-
     if(i_destinationHolder.HasArrived())
     {
         unit.clearUnitState(UNIT_STAT_MOVE);
         arrived = true;
         return false;
     }
-
     return true;
 }
-
 template<class T>
 void PointMovementGenerator<T>:: Finalize(T &unit)
 {
@@ -71,12 +62,10 @@ void PointMovementGenerator<T>:: Finalize(T &unit)
     if(arrived) // without this crash!
         MovementInform(unit);
 }
-
 template<class T>
 void PointMovementGenerator<T>::MovementInform(T &unit)
 {
 }
-
 template <> void PointMovementGenerator<Creature>::MovementInform(Creature &unit)
 {
     if(id == EVENT_FALL_GROUND)
@@ -86,16 +75,13 @@ template <> void PointMovementGenerator<Creature>::MovementInform(Creature &unit
     }
     unit.AI()->MovementInform(POINT_MOTION_TYPE, id);
 }
-
 template void PointMovementGenerator<Player>::Initialize(Player&);
 template bool PointMovementGenerator<Player>::Update(Player &, const uint32 &diff);
 template void PointMovementGenerator<Player>::MovementInform(Player&);
 template void PointMovementGenerator<Player>::Finalize(Player&);
-
 template void PointMovementGenerator<Creature>::Initialize(Creature&);
 template bool PointMovementGenerator<Creature>::Update(Creature&, const uint32 &diff);
 template void PointMovementGenerator<Creature>::Finalize(Creature&);
-
 void AssistanceMovementGenerator::Finalize(Unit &unit)
 {
     ((Creature*)&unit)->SetNoCallAssistance(false);
diff --git a/src/game/PointMovementGenerator.h b/src/game/PointMovementGenerator.h
index baeb8b26dbd..1c07d580600 100644
--- a/src/game/PointMovementGenerator.h
+++ b/src/game/PointMovementGenerator.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_POINTMOVEMENTGENERATOR_H
 #define TRINITY_POINTMOVEMENTGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
 #include "FollowerReference.h"
-
 template<class T>
 class TRINITY_DLL_SPEC PointMovementGenerator
 : public MovementGeneratorMedium< T, PointMovementGenerator<T> >
@@ -33,16 +30,12 @@ class TRINITY_DLL_SPEC PointMovementGenerator
     public:
         PointMovementGenerator(uint32 _id, float _x, float _y, float _z) : id(_id),
             i_x(_x), i_y(_y), i_z(_z), i_nextMoveTime(0), arrived(false) {}
-
         void Initialize(T &);
         void Finalize(T &unit);
         void Reset(T &unit){unit.StopMoving();}
         bool Update(T &, const uint32 &diff);
-
         void MovementInform(T &);
-
         MovementGeneratorType GetMovementGeneratorType() { return POINT_MOTION_TYPE; }
-
         bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; }
     private:
         uint32 id;
@@ -51,17 +44,14 @@ class TRINITY_DLL_SPEC PointMovementGenerator
         DestinationHolder< Traveller<T> > i_destinationHolder;
         bool arrived;
 };
-
 class MANGOS_DLL_SPEC AssistanceMovementGenerator
 : public PointMovementGenerator<Creature>
 {
     public:
         AssistanceMovementGenerator(float _x, float _y, float _z) :
             PointMovementGenerator<Creature>(0, _x, _y, _z) {}
-
         MovementGeneratorType GetMovementGeneratorType() { return ASSISTANCE_MOTION_TYPE; }
         void Finalize(Unit &);
 };
-
 #endif
 
diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index 03b09f9a483..2eccbb39d41 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -15,26 +15,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "PoolHandler.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
 #include "Policies/SingletonImp.h"
-
 INSTANTIATE_SINGLETON_1(PoolHandler);
-
 ////////////////////////////////////////////////////////////
 // Methods of template class PoolGroup
-
 template <class T>
 PoolGroup<T>::PoolGroup()
 {
     m_SpawnedPoolAmount = 0;
     m_LastDespawnedNode = 0;
 }
-
 // Method to add a gameobject/creature guid to the proper list depending on pool type and chance value
 template <class T>
 void PoolGroup<T>::AddEntry(PoolObject& poolitem, uint32 maxentries)
@@ -44,7 +39,6 @@ void PoolGroup<T>::AddEntry(PoolObject& poolitem, uint32 maxentries)
     else
         EqualChanced.push_back(poolitem);
 }
-
 // Method to check the chances are proper in this object pool
 template <class T>
 bool PoolGroup<T>::CheckPool(void)
@@ -59,7 +53,6 @@ bool PoolGroup<T>::CheckPool(void)
     }
     return true;
 }
-
 // Method that tell if the gameobject, creature or pool is spawned currently
 template <class T>
 bool PoolGroup<T>::IsSpawnedObject(uint32 guid)
@@ -72,7 +65,6 @@ bool PoolGroup<T>::IsSpawnedObject(uint32 guid)
             return EqualChanced[i].spawned;
     return false;
 }
-
 // Method that return a guid of a rolled creature or gameobject
 // Note: Copy from loot system because it's very similar and only few things change
 template <class T>
@@ -81,7 +73,6 @@ uint32 PoolGroup<T>::RollOne(void)
     if (!ExplicitlyChanced.empty())                         // First explicitly chanced entries are checked
     {
         float roll = rand_chance();
-
         for (uint32 i=0; i<ExplicitlyChanced.size(); ++i)
         {
             roll -= ExplicitlyChanced[i].chance;
@@ -91,10 +82,8 @@ uint32 PoolGroup<T>::RollOne(void)
     }
     if (!EqualChanced.empty())
         return EqualChanced[irand(0, EqualChanced.size()-1)].guid;
-
     return 0;                                               // None found
 }
-
 // Main method to despawn a creature or gameobject in a pool
 // If no guid is passed, the pool is just removed (event end case)
 // If guid is filled, cache will be used and no removal will occur, it just fill the cache
@@ -111,7 +100,6 @@ void PoolGroup<T>::DespawnObject(uint32 guid)
                     m_LastDespawnedNode = EqualChanced[i].guid;
                 else
                     Despawn1Object(EqualChanced[i].guid);
-
                 EqualChanced[i].spawned = false;
                 if (m_SpawnedPoolAmount > 0)
                     --m_SpawnedPoolAmount;
@@ -119,7 +107,6 @@ void PoolGroup<T>::DespawnObject(uint32 guid)
         }
     }
 }
-
 // Method that is actualy doing the removal job on one creature
 template<>
 void PoolGroup<Creature>::Despawn1Object(uint32 guid)
@@ -127,12 +114,10 @@ void PoolGroup<Creature>::Despawn1Object(uint32 guid)
     if (CreatureData const* data = objmgr.GetCreatureData(guid))
     {
         objmgr.RemoveCreatureFromGrid(guid, data);
-
         if (Creature* pCreature = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_UNIT), (Creature*)NULL))
             pCreature->AddObjectToRemoveList();
     }
 }
-
 // Same on one gameobject
 template<>
 void PoolGroup<GameObject>::Despawn1Object(uint32 guid)
@@ -140,19 +125,16 @@ void PoolGroup<GameObject>::Despawn1Object(uint32 guid)
     if (GameObjectData const* data = objmgr.GetGOData(guid))
     {
         objmgr.RemoveGameobjectFromGrid(guid, data);
-
         if (GameObject* pGameobject = ObjectAccessor::Instance().GetObjectInWorld(MAKE_NEW_GUID(guid, data->id, HIGHGUID_GAMEOBJECT), (GameObject*)NULL))
             pGameobject->AddObjectToRemoveList();
     }
 }
-
 // Same on one pool
 template<>
 void PoolGroup<Pool>::Despawn1Object(uint32 child_pool_id)
 {
     poolhandler.DespawnPool(child_pool_id);
 }
-
 // Method for a pool only to remove any found record causing a circular dependency loop
 template<>
 void PoolGroup<Pool>::RemoveOneRelation(uint16 child_pool_id)
@@ -174,7 +156,6 @@ void PoolGroup<Pool>::RemoveOneRelation(uint16 child_pool_id)
         }
     }
 }
-
 // Method that Spawn 1+ creatures or gameobject
 // if cache is false (initialization or event start), X creatures are spawned with X <= limit (< if limit higher that the number of creatures in pool)
 // if cache is true, this means only one has to be spawned (or respawned if the rolled one is same as cached one)
@@ -186,7 +167,6 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
         uint32 roll = RollOne();
         if (cache && m_LastDespawnedNode != roll)
             Despawn1Object(m_LastDespawnedNode);
-
         m_LastDespawnedNode = 0;
         Spawn1Object(roll);
     }
@@ -196,7 +176,6 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
         for (size_t i=0; i<EqualChanced.size(); ++i)
             if (!EqualChanced[i].spawned)
                 IndexList.push_back(i);
-
         while (m_SpawnedPoolAmount < limit && IndexList.size() > 0)
         {
             uint32 roll = urand(1, IndexList.size()) - 1;
@@ -209,10 +188,8 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
             }
             else
                 EqualChanced[index].spawned = ReSpawn1Object(EqualChanced[index].guid);
-
             if (EqualChanced[index].spawned)
                 ++m_SpawnedPoolAmount;                      // limited group use the Spawned variable to store the number of actualy spawned creatures
-
             std::vector<uint32>::iterator itr = IndexList.begin()+roll;
             IndexList.erase(itr);
         }
@@ -224,7 +201,6 @@ void PoolGroup<T>::SpawnObject(uint32 limit, bool cache)
             EqualChanced[i].spawned = Spawn1Object(EqualChanced[i].guid);
     }
 }
-
 // Method that is actualy doing the spawn job on 1 creature
 template <>
 bool PoolGroup<Creature>::Spawn1Object(uint32 guid)
@@ -233,7 +209,6 @@ bool PoolGroup<Creature>::Spawn1Object(uint32 guid)
     if (data)
     {
         objmgr.AddCreatureToGrid(guid, data);
-
         // Spawn if necessary (loaded grids only)
         Map* map = const_cast<Map*>(MapManager::Instance().CreateBaseMap(data->mapid));
         // We use spawn coords to spawn
@@ -254,7 +229,6 @@ bool PoolGroup<Creature>::Spawn1Object(uint32 guid)
     }
     return false;
 }
-
 // Same for 1 gameobject
 template <>
 bool PoolGroup<GameObject>::Spawn1Object(uint32 guid)
@@ -285,7 +259,6 @@ bool PoolGroup<GameObject>::Spawn1Object(uint32 guid)
     }
     return false;
 }
-
 // Same for 1 pool
 template <>
 bool PoolGroup<Pool>::Spawn1Object(uint32 child_pool_id)
@@ -293,7 +266,6 @@ bool PoolGroup<Pool>::Spawn1Object(uint32 child_pool_id)
     poolhandler.SpawnPool(child_pool_id);
     return true;
 }
-
 // Method that does the respawn job on the specified creature
 template <>
 bool PoolGroup<Creature>::ReSpawn1Object(uint32 guid)
@@ -307,7 +279,6 @@ bool PoolGroup<Creature>::ReSpawn1Object(uint32 guid)
     }
     return false;
 }
-
 // Same for 1 gameobject
 template <>
 bool PoolGroup<GameObject>::ReSpawn1Object(uint32 guid)
@@ -321,7 +292,6 @@ bool PoolGroup<GameObject>::ReSpawn1Object(uint32 guid)
     }
     return false;
 }
-
 // Nothing to do for a child Pool
 template <>
 bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/)
@@ -329,15 +299,12 @@ bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/)
     return true;
 }
 
-
 ////////////////////////////////////////////////////////////
 // Methods of class PoolHandler
-
 PoolHandler::PoolHandler()
 {
     m_IsPoolSystemStarted = false;
 }
-
 void PoolHandler::LoadFromDB()
 {
     QueryResult *result = WorldDatabase.Query("SELECT MAX(entry) FROM pool_template");
@@ -353,9 +320,7 @@ void PoolHandler::LoadFromDB()
         max_pool_id = fields[0].GetUInt16();
         delete result;
     }
-
     mPoolTemplate.resize(max_pool_id + 1);
-
     result = WorldDatabase.Query("SELECT entry,max_limit FROM pool_template");
     if (!result)
     {
@@ -364,58 +329,43 @@ void PoolHandler::LoadFromDB()
         sLog.outString();
         return;
     }
-
     uint32 count = 0;
-
     barGoLink bar(result->GetRowCount());
     do
     {
         ++count;
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint16 pool_id = fields[0].GetUInt16();
-
         PoolTemplateData& pPoolTemplate = mPoolTemplate[pool_id];
         pPoolTemplate.MaxLimit  = fields[1].GetUInt32();
-
     } while (result->NextRow());
-
     sLog.outString();
     sLog.outString( ">> Loaded %u objects pools", count );
     delete result;
-
     // Creatures
-
     mPoolCreatureGroups.resize(max_pool_id + 1);
     mCreatureSearchMap.clear();
     //                                   1     2           3
     result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_creature");
-
     count = 0;
     if (!result)
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u creatures in pools", count );
     }
     else
     {
-
         barGoLink bar2(result->GetRowCount());
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint32 guid    = fields[0].GetUInt32();
             uint16 pool_id = fields[1].GetUInt16();
             float chance   = fields[2].GetFloat();
-
             CreatureData const* data = objmgr.GetCreatureData(guid);
             if (!data)
             {
@@ -434,49 +384,39 @@ void PoolHandler::LoadFromDB()
             }
             PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
             ++count;
-
             PoolObject plObject = PoolObject(guid, chance);
             PoolGroup<Creature>& cregroup = mPoolCreatureGroups[pool_id];
             cregroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
             SearchPair p(guid, pool_id);
             mCreatureSearchMap.insert(p);
-
         } while (result->NextRow());
         sLog.outString();
         sLog.outString( ">> Loaded %u creatures in pools", count );
         delete result;
     }
-
     // Gameobjects
-
     mPoolGameobjectGroups.resize(max_pool_id + 1);
     mGameobjectSearchMap.clear();
     //                                   1     2           3
     result = WorldDatabase.Query("SELECT guid, pool_entry, chance FROM pool_gameobject");
-
     count = 0;
     if (!result)
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u gameobject in pools", count );
     }
     else
     {
-
         barGoLink bar2(result->GetRowCount());
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint32 guid    = fields[0].GetUInt32();
             uint16 pool_id = fields[1].GetUInt16();
             float chance   = fields[2].GetFloat();
-
             GameObjectData const* data = objmgr.GetGOData(guid);
             if (!data)
             {
@@ -502,49 +442,39 @@ void PoolHandler::LoadFromDB()
                 continue;
             }
             PoolTemplateData *pPoolTemplate = &mPoolTemplate[pool_id];
-
             ++count;
-
             PoolObject plObject = PoolObject(guid, chance);
             PoolGroup<GameObject>& gogroup = mPoolGameobjectGroups[pool_id];
             gogroup.AddEntry(plObject, pPoolTemplate->MaxLimit);
             SearchPair p(guid, pool_id);
             mGameobjectSearchMap.insert(p);
-
         } while( result->NextRow() );
         sLog.outString();
         sLog.outString( ">> Loaded %u gameobject in pools", count );
         delete result;
     }
-
     // Pool of pools
     mPoolPoolGroups.resize(max_pool_id + 1);
     //                                   1        2            3
     result = WorldDatabase.Query("SELECT pool_id, mother_pool, chance FROM pool_pool");
-
     count = 0;
     if( !result )
     {
         barGoLink bar2(1);
         bar2.step();
-
         sLog.outString();
         sLog.outString(">> Loaded %u pools in pools", count );
     }
     else
     {
-
         barGoLink bar2( result->GetRowCount() );
         do
         {
             Field *fields = result->Fetch();
-
             bar2.step();
-
             uint16 child_pool_id  = fields[0].GetUInt16();
             uint16 mother_pool_id = fields[1].GetUInt16();
             float chance          = fields[2].GetFloat();
-
             if (mother_pool_id > max_pool_id)
             {
                 sLog.outErrorDb("`pool_pool` mother_pool id (%i) is out of range compared to max pool id in `pool_template`, skipped.",mother_pool_id);
@@ -566,17 +496,13 @@ void PoolHandler::LoadFromDB()
                 continue;
             }
             PoolTemplateData *pPoolTemplateMother = &mPoolTemplate[mother_pool_id];
-
             ++count;
-
             PoolObject plObject = PoolObject(child_pool_id, chance);
             PoolGroup<Pool>& plgroup = mPoolPoolGroups[mother_pool_id];
             plgroup.AddEntry(plObject, pPoolTemplateMother->MaxLimit);
             SearchPair p(child_pool_id, mother_pool_id);
             mPoolSearchMap.insert(p);
-
         } while( result->NextRow() );
-
         // Now check for circular reference
         for(uint16 i=0; i<max_pool_id; ++i)
         {
@@ -605,7 +531,6 @@ void PoolHandler::LoadFromDB()
         delete result;
     }
 }
-
 // The initialize method will spawn all pools not in an event and not in another pool, this is why there is 2 left joins with 2 null checks
 void PoolHandler::Initialize()
 {
@@ -627,11 +552,9 @@ void PoolHandler::Initialize()
         } while (result->NextRow());
         delete result;
     }
-
     sLog.outBasic("Pool handling system initialized, %u pools spawned.", count);
     m_IsPoolSystemStarted = true;
 }
-
 // Call to spawn a pool, if cache if true the method will spawn only if cached entry is different
 // If it's same, the gameobject/creature is respawned only (added back to map)
 void PoolHandler::SpawnPool(uint16 pool_id, bool cache)
@@ -643,7 +566,6 @@ void PoolHandler::SpawnPool(uint16 pool_id, bool cache)
     if (!mPoolCreatureGroups[pool_id].isEmpty())
         mPoolCreatureGroups[pool_id].SpawnObject(mPoolTemplate[pool_id].MaxLimit, cache);
 }
-
 // Call to despawn a pool, all gameobjects/creatures in this pool are removed
 void PoolHandler::DespawnPool(uint16 pool_id)
 {
@@ -654,27 +576,23 @@ void PoolHandler::DespawnPool(uint16 pool_id)
     if (!mPoolCreatureGroups[pool_id].isEmpty())
         mPoolCreatureGroups[pool_id].DespawnObject();
 }
-
 // Call to update the pool when a gameobject/creature part of pool [pool_id] is ready to respawn
 // Here we cache only the creature/gameobject whose guid is passed as parameter
 // Then the spawn pool call will use this cache to decide
 void PoolHandler::UpdatePool(uint16 pool_id, uint32 guid, uint32 type)
 {
     uint16 motherpoolid = IsPartOfAPool(pool_id, 0);
-
     if (motherpoolid)
         mPoolPoolGroups[motherpoolid].DespawnObject(pool_id);
     else if (type == TYPEID_GAMEOBJECT && !mPoolGameobjectGroups[pool_id].isEmpty())
         mPoolGameobjectGroups[pool_id].DespawnObject(guid);
     else if (type != TYPEID_GAMEOBJECT && !mPoolCreatureGroups[pool_id].isEmpty())
         mPoolCreatureGroups[pool_id].DespawnObject(guid);
-
     if (motherpoolid)
         SpawnPool(motherpoolid, true);
     else
         SpawnPool(pool_id, true);
 }
-
 // Method that tell if the gameobject/creature is part of a pool and return the pool id if yes
 uint16 PoolHandler::IsPartOfAPool(uint32 guid, uint32 type)
 {
@@ -698,7 +616,6 @@ uint16 PoolHandler::IsPartOfAPool(uint32 guid, uint32 type)
     }
     return 0;
 }
-
 // Method that check chance integrity of the creatures and gameobjects in this pool
 bool PoolHandler::CheckPool(uint16 pool_id)
 {
@@ -707,7 +624,6 @@ bool PoolHandler::CheckPool(uint16 pool_id)
         mPoolCreatureGroups[pool_id].CheckPool() &&
         mPoolPoolGroups[pool_id].CheckPool();
 }
-
 // Method that tell if a creature or gameobject in pool_id is spawned currently
 bool PoolHandler::IsSpawnedObject(uint16 pool_id, uint32 guid, uint32 type)
 {
diff --git a/src/game/PoolHandler.h b/src/game/PoolHandler.h
index 10ed000ea25..ee59f9587e4 100644
--- a/src/game/PoolHandler.h
+++ b/src/game/PoolHandler.h
@@ -15,20 +15,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOS_POOLHANDLER_H
 #define MANGOS_POOLHANDLER_H
-
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
-
 struct PoolTemplateData
 {
     uint32  MaxLimit;
 };
-
 struct PoolObject
 {
     uint32  guid;
@@ -36,7 +32,6 @@ struct PoolObject
     bool    spawned;
     PoolObject(uint32 _guid, float _chance): guid(_guid), chance(fabs(_chance)), spawned(false) {}
 };
-
 template <class T>
 class PoolGroup
 {
@@ -61,11 +56,9 @@ class PoolGroup
         uint32 m_LastDespawnedNode ;                        // Store the guid of the removed creature/gameobject during a pool update
         uint32 m_SpawnedPoolAmount;                         // Used to know the number of spawned objects
 };
-
 class Pool                                                  // for Pool of Pool case
 {
 };
-
 class PoolHandler
 {
     public:
@@ -79,7 +72,6 @@ class PoolHandler
         void DespawnPool(uint16 pool_id);
         void UpdatePool(uint16 pool_id, uint32 guid, uint32 type);
         void Initialize();
-
     protected:
         bool m_IsPoolSystemStarted;
         uint16 max_pool_id;
@@ -89,7 +81,6 @@ class PoolHandler
         typedef std::vector<PoolGroup<Pool> >       PoolGroupPoolMap;
         typedef std::pair<uint32, uint16> SearchPair;
         typedef std::map<uint32, uint16> SearchMap;
-
         PoolTemplateDataMap mPoolTemplate;
         PoolGroupCreatureMap mPoolCreatureGroups;
         PoolGroupGameObjectMap mPoolGameobjectGroups;
@@ -97,8 +88,6 @@ class PoolHandler
         SearchMap mCreatureSearchMap;
         SearchMap mGameobjectSearchMap;
         SearchMap mPoolSearchMap;
-
 };
-
 #define poolhandler MaNGOS::Singleton<PoolHandler>::Instance()
 #endif
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index ebd5e773c12..f4e9540d5ad 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Language.h"
 #include "Database/DatabaseEnv.h"
@@ -33,12 +32,10 @@
 #include "NPCHandler.h"
 #include "Pet.h"
 #include "MapManager.h"
-
 void WorldSession::SendNameQueryOpcode(Player *p)
 {
     if(!p)
         return;
-
                                                             // guess size
     WorldPacket data( SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+10) );
     data.append(p->GetPackGUID());                          // player guid
@@ -56,10 +53,8 @@ void WorldSession::SendNameQueryOpcode(Player *p)
     }
     else
         data << uint8(0);                                   // is not declined
-
     SendPacket(&data);
 }
-
 void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
 {
     CharacterDatabase.AsyncPQuery(&WorldSession::SendNameQueryOpcodeFromDBCallBack, GetAccountId(),
@@ -77,19 +72,16 @@ void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
         "FROM characters LEFT JOIN character_declinedname ON characters.guid = character_declinedname.guid WHERE characters.guid = '%u'",
         GUID_LOPART(guid));
 }
-
 void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32 accountId)
 {
     if(!result)
         return;
-
     WorldSession * session = sWorld.FindSession(accountId);
     if(!session)
     {
         delete result;
         return;
     }
-
     Field *fields = result->Fetch();
     uint32 guid      = fields[0].GetUInt32();
     std::string name = fields[1].GetCppString();
@@ -102,7 +94,6 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32
         pGender      = fields[3].GetUInt8();
         pClass       = fields[4].GetUInt8();
     }
-
                                                             // guess size
     WorldPacket data( SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+1+10) );
     data.appendPackGUID(MAKE_NEW_GUID(guid, 0, HIGHGUID_PLAYER));
@@ -112,7 +103,6 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32
     data << uint8(pRace);                                   // race
     data << uint8(pGender);                                 // gender
     data << uint8(pClass);                                  // class
-
     // if the first declined name field (5) is empty, the rest must be too
     if(sWorld.getConfig(CONFIG_DECLINED_NAMES_USED) && fields[5].GetCppString() != "")
     {
@@ -122,25 +112,19 @@ void WorldSession::SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32
     }
     else
         data << uint8(0);                                   // is not declined
-
     session->SendPacket( &data );
     delete result;
 }
-
 void WorldSession::HandleNameQueryOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
-
     recv_data >> guid;
-
     Player *pChar = objmgr.GetPlayer(guid);
-
     if (pChar)
         SendNameQueryOpcode(pChar);
     else
         SendNameQueryOpcodeFromDB(guid);
 }
-
 void WorldSession::HandleQueryTimeOpcode( WorldPacket & /*recv_data*/ )
 {
     WorldPacket data( SMSG_QUERY_TIME_RESPONSE, 4+4 );
@@ -148,22 +132,18 @@ void WorldSession::HandleQueryTimeOpcode( WorldPacket & /*recv_data*/ )
     data << (uint32)0;
     SendPacket( &data );
 }
-
 /// Only _static_ data send in this packet !!!
 void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
 {
     uint32 entry;
     recv_data >> entry;
     recv_data.read_skip<uint64>();                          // guid
-
     CreatureInfo const *ci = objmgr.GetCreatureTemplate(entry);
     if (ci)
     {
-
         std::string Name, SubName;
         Name = ci->Name;
         SubName = ci->SubName;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -207,7 +187,6 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
     {
         uint64 guid;
         recv_data >> guid;
-
         sLog.outDebug("WORLD: CMSG_CREATURE_QUERY - NO CREATURE INFO! (GUID: %u, ENTRY: %u)",
             GUID_LOPART(guid), entry);
         WorldPacket data( SMSG_CREATURE_QUERY_RESPONSE, 4 );
@@ -216,25 +195,21 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
         sLog.outDebug( "WORLD: Sent SMSG_CREATURE_QUERY_RESPONSE" );
     }
 }
-
 /// Only _static_ data send in this packet !!!
 void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data )
 {
     uint32 entryID;
     recv_data >> entryID;
     recv_data.read_skip<uint64>();                          // guid
-
     const GameObjectInfo *info = objmgr.GetGameObjectInfo(entryID);
     if(info)
     {
         std::string Name;
         std::string IconName;
         std::string CastBarCaption;
-
         Name = info->name;
         IconName = info->IconName;
         CastBarCaption = info->castBarCaption;
-
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -266,10 +241,8 @@ void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data )
     }
     else
     {
-
         uint64 guid;
         recv_data >> guid;
-
         sLog.outDebug(  "WORLD: CMSG_GAMEOBJECT_QUERY - Missing gameobject info for (GUID: %u, ENTRY: %u)",
             GUID_LOPART(guid), entryID );
         WorldPacket data ( SMSG_GAMEOBJECT_QUERY_RESPONSE, 4 );
@@ -278,13 +251,10 @@ void WorldSession::HandleGameObjectQueryOpcode( WorldPacket & recv_data )
         sLog.outDebug( "WORLD: Sent SMSG_GAMEOBJECT_QUERY_RESPONSE" );
     }
 }
-
 void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
 {
     sLog.outDetail("WORLD: Received MSG_CORPSE_QUERY");
-
     Corpse *corpse = GetPlayer()->GetCorpse();
-
     if(!corpse)
     {
         WorldPacket data(MSG_CORPSE_QUERY, 1);
@@ -292,13 +262,11 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
         SendPacket(&data);
         return;
     }
-
     int32 mapid = corpse->GetMapId();
     float x = corpse->GetPositionX();
     float y = corpse->GetPositionY();
     float z = corpse->GetPositionZ();
     int32 corpsemapid = mapid;
-
     // if corpse at different map
     if(mapid != _player->GetMapId())
     {
@@ -318,7 +286,6 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
             }
         }
     }
-
     WorldPacket data(MSG_CORPSE_QUERY, 1+(5*4));
     data << uint8(1);                                       // corpse found
     data << int32(mapid);
@@ -328,23 +295,17 @@ void WorldSession::HandleCorpseQueryOpcode(WorldPacket & /*recv_data*/)
     data << int32(corpsemapid);
     SendPacket(&data);
 }
-
 void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
 {
     uint32 textID;
     uint64 guid;
-
     recv_data >> textID;
     sLog.outDetail("WORLD: CMSG_NPC_TEXT_QUERY ID '%u'", textID);
-
     recv_data >> guid;
     GetPlayer()->SetUInt64Value(UNIT_FIELD_TARGET, guid);
-
     GossipText const* pGossip = objmgr.GetGossipText(textID);
-
     WorldPacket data( SMSG_NPC_TEXT_UPDATE, 100 );          // guess size
     data << textID;
-
     if (!pGossip)
     {
         for(uint32 i = 0; i < 8; ++i)
@@ -369,7 +330,6 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
             Text_0[i]=pGossip->Options[i].Text_0;
             Text_1[i]=pGossip->Options[i].Text_1;
         }
-
         int loc_idx = GetSessionDbLocaleIndex();
         if (loc_idx >= 0)
         {
@@ -385,23 +345,18 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
                 }
             }
         }
-
         for (int i = 0; i < 8; ++i)
         {
             data << pGossip->Options[i].Probability;
-
             if ( Text_0[i].empty() )
                 data << Text_1[i];
             else
                 data << Text_0[i];
-
             if ( Text_1[i].empty() )
                 data << Text_0[i];
             else
                 data << Text_1[i];
-
             data << pGossip->Options[i].Language;
-
             for(int j = 0; j < 3; ++j)
             {
                 data << pGossip->Options[i].Emotes[j]._Delay;
@@ -409,26 +364,20 @@ void WorldSession::HandleNpcTextQueryOpcode( WorldPacket & recv_data )
             }
         }
     }
-
     SendPacket( &data );
-
     sLog.outDebug( "WORLD: Sent SMSG_NPC_TEXT_UPDATE" );
 }
-
 void WorldSession::HandlePageTextQueryOpcode( WorldPacket & recv_data )
 {
     uint32 pageID;
-
     recv_data >> pageID;
     sLog.outDetail("WORLD: Received CMSG_PAGE_TEXT_QUERY for pageID '%u'", pageID);
-
     while (pageID)
     {
         PageText const *pPage = sPageTextStore.LookupEntry<PageText>( pageID );
                                                             // guess size
         WorldPacket data( SMSG_PAGE_TEXT_QUERY_RESPONSE, 50 );
         data << pageID;
-
         if (!pPage)
         {
             data << "Item page missing.";
@@ -438,7 +387,6 @@ void WorldSession::HandlePageTextQueryOpcode( WorldPacket & recv_data )
         else
         {
             std::string Text = pPage->Text;
-
             int loc_idx = GetSessionDbLocaleIndex();
             if (loc_idx >= 0)
             {
@@ -449,13 +397,11 @@ void WorldSession::HandlePageTextQueryOpcode( WorldPacket & recv_data )
                         Text = pl->Text[loc_idx];
                 }
             }
-
             data << Text;
             data << uint32(pPage->Next_Page);
             pageID = pPage->Next_Page;
         }
         SendPacket( &data );
-
         sLog.outDebug( "WORLD: Sent SMSG_PAGE_TEXT_QUERY_RESPONSE" );
     }
 }
diff --git a/src/game/QuestDef.cpp b/src/game/QuestDef.cpp
index 013d6da1f0f..67be373d876 100644
--- a/src/game/QuestDef.cpp
+++ b/src/game/QuestDef.cpp
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "QuestDef.h"
 #include "Player.h"
 #include "World.h"
-
 Quest::Quest(Field * questRecord)
 {
     QuestId = questRecord[0].GetUInt32();
@@ -59,49 +57,34 @@ Quest::Quest(Field * questRecord)
     OfferRewardText = questRecord[32].GetCppString();
     RequestItemsText = questRecord[33].GetCppString();
     EndText = questRecord[34].GetCppString();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ObjectiveText[i] = questRecord[35+i].GetCppString();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ReqItemId[i] = questRecord[39+i].GetUInt32();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ReqItemCount[i] = questRecord[43+i].GetUInt32();
-
     for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
         ReqSourceId[i] = questRecord[47+i].GetUInt32();
-
     for (int i = 0; i < QUEST_SOURCE_ITEM_IDS_COUNT; ++i)
         ReqSourceCount[i] = questRecord[51+i].GetUInt32();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ReqCreatureOrGOId[i] = questRecord[55+i].GetInt32();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ReqCreatureOrGOCount[i] = questRecord[59+i].GetUInt32();
-
     for (int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
         ReqSpell[i] = questRecord[63+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         RewChoiceItemId[i] = questRecord[67+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
         RewChoiceItemCount[i] = questRecord[73+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
         RewItemId[i] = questRecord[79+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REWARDS_COUNT; ++i)
         RewItemCount[i] = questRecord[83+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
         RewRepFaction[i] = questRecord[87+i].GetUInt32();
-
     for (int i = 0; i < QUEST_REPUTATIONS_COUNT; ++i)
         RewRepValue[i] = questRecord[92+i].GetInt32();
-
     RewHonorableKills = questRecord[97].GetUInt32();
     RewOrReqMoney = questRecord[98].GetInt32();
     RewMoneyMaxLevel = questRecord[99].GetUInt32();
@@ -113,32 +96,23 @@ Quest::Quest(Field * questRecord)
     PointX = questRecord[105].GetFloat();
     PointY = questRecord[106].GetFloat();
     PointOpt = questRecord[107].GetUInt32();
-
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         DetailsEmote[i] = questRecord[108+i].GetUInt32();
-
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         DetailsEmoteDelay[i] = questRecord[112+i].GetUInt32();
-
     IncompleteEmote = questRecord[116].GetUInt32();
     CompleteEmote = questRecord[117].GetUInt32();
-
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         OfferRewardEmote[i] = questRecord[118+i].GetInt32();
-
     for (int i = 0; i < QUEST_EMOTE_COUNT; ++i)
         OfferRewardEmoteDelay[i] = questRecord[122+i].GetInt32();
-
     QuestStartScript = questRecord[126].GetUInt32();
     QuestCompleteScript = questRecord[127].GetUInt32();
-
     QuestFlags |= SpecialFlags << 16;
-
     m_reqitemscount = 0;
     m_reqCreatureOrGOcount = 0;
     m_rewitemscount = 0;
     m_rewchoiceitemscount = 0;
-
     for (int i=0; i < QUEST_OBJECTIVES_COUNT; ++i)
     {
         if ( ReqItemId[i] )
@@ -146,20 +120,17 @@ Quest::Quest(Field * questRecord)
         if ( ReqCreatureOrGOId[i] )
             ++m_reqCreatureOrGOcount;
     }
-
     for (int i=0; i < QUEST_REWARDS_COUNT; ++i)
     {
         if ( RewItemId[i] )
             ++m_rewitemscount;
     }
-
     for (int i=0; i < QUEST_REWARD_CHOICES_COUNT; ++i)
     {
         if (RewChoiceItemId[i])
             ++m_rewchoiceitemscount;
     }
 }
-
 uint32 Quest::XPValue( Player *pPlayer ) const
 {
     if( pPlayer )
@@ -183,7 +154,6 @@ uint32 Quest::XPValue( Player *pPlayer ) const
                 fullxp = RewMoneyMaxLevel / 0.6f;
             else if (qLevel == 0)
                 fullxp = RewMoneyMaxLevel;
-
             if( pLevel <= qLevel +  5 )
                 return (uint32)fullxp;
             else if( pLevel == qLevel +  6 )
@@ -200,12 +170,10 @@ uint32 Quest::XPValue( Player *pPlayer ) const
     }
     return 0;
 }
-
 int32  Quest::GetRewOrReqMoney() const
 {
     if(RewOrReqMoney <=0)
         return RewOrReqMoney;
-
     return int32(RewOrReqMoney * sWorld.getRate(RATE_DROP_MONEY));
 }
 
diff --git a/src/game/QuestDef.h b/src/game/QuestDef.h
index 264acff95b8..f95e984e204 100644
--- a/src/game/QuestDef.h
+++ b/src/game/QuestDef.h
@@ -17,22 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_QUEST_H
 #define TRINITYCORE_QUEST_H
-
 #include "Platform/Define.h"
 #include "Database/DatabaseEnv.h"
-
 #include <string>
 #include <vector>
-
 class Player;
-
 class ObjectMgr;
-
 #define MAX_QUEST_LOG_SIZE 25
-
 #define QUEST_OBJECTIVES_COUNT 4
 #define QUEST_SOURCE_ITEM_IDS_COUNT 4
 #define QUEST_REWARD_CHOICES_COUNT 6
@@ -40,7 +33,6 @@ class ObjectMgr;
 #define QUEST_DEPLINK_COUNT 10
 #define QUEST_REPUTATIONS_COUNT 5
 #define QUEST_EMOTE_COUNT 4
-
 enum QuestFailedReasons
 {
     INVALIDREASON_DONT_HAVE_REQ                 = 0,
@@ -57,7 +49,6 @@ enum QuestFailedReasons
     INVALIDREASON_QUEST_FAILED_CAIS             = 27,       // You cannot complete quests once you have reached tired time.
     INVALIDREASON_DAILY_QUEST_COMPLETED_TODAY   = 29        // You have completed that daily quest today.
 };
-
 enum QuestShareMessages
 {
     QUEST_PARTY_MSG_SHARING_QUEST           = 0,
@@ -72,7 +63,6 @@ enum QuestShareMessages
     QUEST_PARTY_MSG_SHARING_TIMER_EXPIRED   = 9,
     QUEST_PARTY_MSG_NOT_IN_PARTY            = 10
 };
-
 enum __QuestTradeSkill
 {
     QUEST_TRSKILL_NONE           = 0,
@@ -91,7 +81,6 @@ enum __QuestTradeSkill
     QUEST_TRSKILL_SKINNING       = 13,
     QUEST_TRSKILL_JEWELCRAFTING  = 14,
 };
-
 enum QuestStatus
 {
     QUEST_STATUS_NONE           = 0,
@@ -102,7 +91,6 @@ enum QuestStatus
     QUEST_STATUS_FAILED         = 5,
     MAX_QUEST_STATUS
 };
-
 enum __QuestGiverStatus
 {
     DIALOG_STATUS_NONE                     = 0,
@@ -117,7 +105,6 @@ enum __QuestGiverStatus
     DIALOG_STATUS_REWARD2                  = 9,             // no yellow dot on minimap
     DIALOG_STATUS_REWARD                   = 10             // yellow dot on minimap
 };
-
 enum __QuestFlags
 {
     // Flags used at server and sent to client
@@ -135,23 +122,19 @@ enum __QuestFlags
     QUEST_FLAGS_TBC_RACES      = 0x00000800,                // Not used currently: Blood elf/Draenei starting zone quests
     QUEST_FLAGS_DAILY          = 0x00001000,                // Used to know quest is Daily one
     QUEST_FLAGS_WEEKLY         = 0x00008000,
-
     // Trinity flags for set SpecialFlags in DB if required but used only at server
     QUEST_TRINITY_FLAGS_REPEATABLE           = 0x010000,     // Set by 1 in SpecialFlags from DB
     QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT = 0x020000,     // Set by 2 in SpecialFlags from DB (if reequired area explore, spell SPELL_EFFECT_QUEST_COMPLETE casting, table `*_script` command SCRIPT_COMMAND_QUEST_EXPLORED use, set from script DLL)
     QUEST_TRINITY_FLAGS_DB_ALLOWED = 0xFFFF | QUEST_TRINITY_FLAGS_REPEATABLE | QUEST_TRINITY_FLAGS_EXPLORATION_OR_EVENT,
-
     // Trinity flags for internal use only
     QUEST_TRINITY_FLAGS_DELIVER              = 0x040000,     // Internal flag computed only
     QUEST_TRINITY_FLAGS_SPEAKTO              = 0x080000,     // Internal flag computed only
     QUEST_TRINITY_FLAGS_KILL_OR_CAST         = 0x100000,     // Internal flag computed only
     QUEST_TRINITY_FLAGS_TIMED                = 0x200000,     // Internal flag computed only
 };
-
 struct QuestLocale
 {
     QuestLocale() { ObjectiveText.resize(QUEST_OBJECTIVES_COUNT); }
-
     std::vector<std::string> Title;
     std::vector<std::string> Details;
     std::vector<std::string> Objectives;
@@ -160,7 +143,6 @@ struct QuestLocale
     std::vector<std::string> EndText;
     std::vector< std::vector<std::string> > ObjectiveText;
 };
-
 // This Quest class provides a convenient way to access a few pretotaled (cached) quest details,
 // all base quest information, and any utility functions such as generating the amount of
 // xp to give
@@ -170,10 +152,8 @@ class Quest
     public:
         Quest(Field * questRecord);
         uint32 XPValue( Player *pPlayer ) const;
-
         bool HasFlag( uint32 flag ) const { return ( QuestFlags & flag ) != 0; }
         void SetFlag( uint32 flag ) { QuestFlags |= flag; }
-
         // table data accessors:
         uint32 GetQuestId() const { return QuestId; }
         uint32 GetQuestMethod() const { return QuestMethod; }
@@ -228,7 +208,6 @@ class Quest
         bool   IsAutoComplete() const { return QuestMethod ? false : true; }
         uint32 GetFlags() const { return QuestFlags; }
         bool   IsDaily() const { return QuestFlags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); }
-
         // multiple values
         std::string ObjectiveText[QUEST_OBJECTIVES_COUNT];
         uint32 ReqItemId[QUEST_OBJECTIVES_COUNT];
@@ -248,24 +227,20 @@ class Quest
         uint32 DetailsEmoteDelay[QUEST_EMOTE_COUNT];
         uint32 OfferRewardEmote[QUEST_EMOTE_COUNT];
         uint32 OfferRewardEmoteDelay[QUEST_EMOTE_COUNT];
-
         uint32 GetReqItemsCount() const { return m_reqitemscount; }
         uint32 GetReqCreatureOrGOcount() const { return m_reqCreatureOrGOcount; }
         uint32 GetRewChoiceItemsCount() const { return m_rewchoiceitemscount; }
         uint32 GetRewItemsCount() const { return m_rewitemscount; }
-
         typedef std::vector<int32> PrevQuests;
         PrevQuests prevQuests;
         typedef std::vector<uint32> PrevChainQuests;
         PrevChainQuests prevChainQuests;
-
         // cached data
     private:
         uint32 m_reqitemscount;
         uint32 m_reqCreatureOrGOcount;
         uint32 m_rewchoiceitemscount;
         uint32 m_rewitemscount;
-
         // table data
     protected:
         uint32 QuestId;
@@ -318,14 +293,12 @@ class Quest
         uint32 QuestStartScript;
         uint32 QuestCompleteScript;
 };
-
 enum QuestUpdateState
 {
     QUEST_UNCHANGED = 0,
     QUEST_CHANGED = 1,
     QUEST_NEW = 2
 };
-
 struct QuestStatusData
 {
     QuestStatusData()
@@ -335,13 +308,11 @@ struct QuestStatusData
         memset(m_itemcount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint32));
         memset(m_creatureOrGOcount, 0, QUEST_OBJECTIVES_COUNT * sizeof(uint32));
     }
-
     QuestStatus m_status;
     bool m_rewarded;
     bool m_explored;
     uint32 m_timer;
     QuestUpdateState uState;
-
     uint32 m_itemcount[ QUEST_OBJECTIVES_COUNT ];
     uint32 m_creatureOrGOcount[ QUEST_OBJECTIVES_COUNT ];
 };
diff --git a/src/game/QuestHandler.cpp b/src/game/QuestHandler.cpp
index a803c49d6fd..6aeb6e371ba 100644
--- a/src/game/QuestHandler.cpp
+++ b/src/game/QuestHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Log.h"
 #include "WorldPacket.h"
@@ -33,21 +32,18 @@
 #include "Group.h"
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-
 void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
     uint8 questStatus = DIALOG_STATUS_NONE;
     uint8 defstatus = DIALOG_STATUS_NONE;
-
     Object* questgiver = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
     if(!questgiver)
     {
         sLog.outDetail("Error in CMSG_QUESTGIVER_STATUS_QUERY, called for not found questgiver (Typeid: %u GUID: %u)",GuidHigh2TypeId(GUID_HIPART(guid)),GUID_LOPART(guid));
         return;
     }
-
     switch(questgiver->GetTypeId())
     {
         case TYPEID_UNIT:
@@ -75,18 +71,14 @@ void WorldSession::HandleQuestgiverStatusQueryOpcode( WorldPacket & recv_data )
             sLog.outError("QuestGiver called for unexpected type %u", questgiver->GetTypeId());
             break;
     }
-
     //inform client about status of quest
     _player->PlayerTalkClass->SendQuestGiverStatus(questStatus, guid);
 }
-
 void WorldSession::HandleQuestgiverHelloOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     sLog.outDebug ("WORLD: Received CMSG_QUESTGIVER_HELLO npc = %u", GUID_LOPART(guid));
-
     Creature *pCreature = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_NONE);
     if (!pCreature)
     {
@@ -94,34 +86,26 @@ void WorldSession::HandleQuestgiverHelloOpcode( WorldPacket & recv_data )
             GUID_LOPART(guid));
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
     // Stop the npc if moving
     pCreature->StopMoving();
-
     if(Script->GossipHello( _player, pCreature ) )
         return;
-
     pCreature->prepareGossipMenu(_player);
     pCreature->sendPreparedGossip(_player);
 }
-
 void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
     uint32 quest;
     uint32 unk1;
     recv_data >> guid >> quest >> unk1;
-
     if(!GetPlayer()->isAlive())
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_ACCEPT_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1 );
-
     Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM|TYPEMASK_PLAYER);
-
     // no or incorrect quest giver
     if(!pObject
         || (pObject->GetTypeId()!=TYPEID_PLAYER && !pObject->hasQuest(quest))
@@ -132,7 +116,6 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
         _player->SetDivider( 0 );
         return;
     }
-
     Quest const* qInfo = objmgr.GetQuestTemplate(quest);
     if ( qInfo )
     {
@@ -143,7 +126,6 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
             _player->SetDivider( 0 );
             return;
         }
-
         if( _player->GetDivider() != 0 )
         {
             Player *pPlayer = ObjectAccessor::FindPlayer( _player->GetDivider() );
@@ -153,14 +135,11 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
                 _player->SetDivider( 0 );
             }
         }
-
         if( _player->CanAddQuest( qInfo, true ) )
         {
             _player->AddQuest( qInfo, pObject );
-
             if ( _player->CanCompleteQuest( quest ) )
                 _player->CompleteQuest( quest );
-
             switch(pObject->GetTypeId())
             {
                 case TYPEID_UNIT:
@@ -170,7 +149,6 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
                 case TYPEID_CONTAINER:
                 {
                     Script->ItemQuestAccept(_player, ((Item*)pObject), qInfo );
-
                     // destroy not required for quest finish quest starting item
                     bool destroyItem = true;
                     for(int i = 0; i < QUEST_OBJECTIVES_COUNT; ++i)
@@ -181,10 +159,8 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
                             break;
                         }
                     }
-
                     if(destroyItem)
                         _player->DestroyItem(((Item*)pObject)->GetBagSlot(),((Item*)pObject)->GetSlot(),true);
-
                     break;
                 }
                 case TYPEID_GAMEOBJECT:
@@ -192,17 +168,13 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode( WorldPacket & recv_data )
                     break;
             }
             _player->PlayerTalkClass->CloseGossip();
-
             if( qInfo->GetSrcSpell() > 0 )
                 _player->CastSpell( _player, qInfo->GetSrcSpell(), true);
-
             return;
         }
     }
-
     _player->PlayerTalkClass->CloseGossip();
 }
-
 void WorldSession::HandleQuestgiverQueryQuestOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
@@ -210,7 +182,6 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode( WorldPacket & recv_data )
     uint8 unk1;
     recv_data >> guid >> quest >> unk1;
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_QUERY_QUEST npc = %u, quest = %u, unk1 = %u", uint32(GUID_LOPART(guid)), quest, unk1 );
-
     // Verify that the guid is valid and is a questgiver or involved in the requested quest
     Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT|TYPEMASK_ITEM);
     if(!pObject||!pObject->hasQuest(quest) && !pObject->hasInvolvedQuest(quest))
@@ -218,58 +189,47 @@ void WorldSession::HandleQuestgiverQueryQuestOpcode( WorldPacket & recv_data )
         _player->PlayerTalkClass->CloseGossip();
         return;
     }
-
     Quest const* pQuest = objmgr.GetQuestTemplate(quest);
     if ( pQuest )
     {
         _player->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, pObject->GetGUID(), true);
     }
 }
-
 void WorldSession::HandleQuestQueryOpcode( WorldPacket & recv_data )
 {
     uint32 quest;
     recv_data >> quest;
     sLog.outDebug( "WORLD: Received CMSG_QUEST_QUERY quest = %u",quest );
-
     Quest const *pQuest = objmgr.GetQuestTemplate(quest);
     if ( pQuest )
     {
         _player->PlayerTalkClass->SendQuestQueryResponse( pQuest );
     }
 }
-
 void WorldSession::HandleQuestgiverChooseRewardOpcode( WorldPacket & recv_data )
 {
     uint32 quest, reward;
     uint64 guid;
     recv_data >> guid >> quest >> reward;
-
     if(reward >= QUEST_REWARD_CHOICES_COUNT)
     {
         sLog.outError("Error in CMSG_QUESTGIVER_CHOOSE_REWARD: player %s (guid %d) tried to get invalid reward (%u) (probably packet hacking)", _player->GetName(), _player->GetGUIDLow(), reward);
         return;
     }
-
     if(!GetPlayer()->isAlive())
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_CHOOSE_REWARD npc = %u, quest = %u, reward = %u",uint32(GUID_LOPART(guid)),quest,reward );
-
     Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
     if(!pObject)
         return;
-
     if(!pObject->hasInvolvedQuest(quest))
         return;
-
     Quest const *pQuest = objmgr.GetQuestTemplate(quest);
     if( pQuest )
     {
         if( _player->CanRewardQuest( pQuest, reward, true ) )
         {
             _player->RewardQuest( pQuest, reward, pObject );
-
             switch(pObject->GetTypeId())
             {
                 case TYPEID_UNIT:
@@ -294,101 +254,75 @@ void WorldSession::HandleQuestgiverChooseRewardOpcode( WorldPacket & recv_data )
             _player->PlayerTalkClass->SendQuestGiverOfferReward( pQuest, guid, true );
     }
 }
-
 void WorldSession::HandleQuestgiverRequestRewardOpcode( WorldPacket & recv_data )
 {
     uint32 quest;
     uint64 guid;
     recv_data >> guid >> quest;
-
     if(!GetPlayer()->isAlive())
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_REQUEST_REWARD npc = %u, quest = %u",uint32(GUID_LOPART(guid)),quest );
-
     Object* pObject = ObjectAccessor::GetObjectByTypeMask(*_player, guid,TYPEMASK_UNIT|TYPEMASK_GAMEOBJECT);
     if(!pObject||!pObject->hasInvolvedQuest(quest))
         return;
-
     if ( _player->CanCompleteQuest( quest ) )
         _player->CompleteQuest( quest );
-
     if( _player->GetQuestStatus( quest ) != QUEST_STATUS_COMPLETE )
         return;
-
     if(Quest const *pQuest = objmgr.GetQuestTemplate(quest))
         _player->PlayerTalkClass->SendQuestGiverOfferReward( pQuest, guid, true );
 }
-
 void WorldSession::HandleQuestgiverCancel(WorldPacket& /*recv_data*/ )
 {
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_CANCEL" );
-
     _player->PlayerTalkClass->CloseGossip();
 }
-
 void WorldSession::HandleQuestLogSwapQuest(WorldPacket& recv_data )
 {
     uint8 slot1, slot2;
     recv_data >> slot1 >> slot2;
-
     if(slot1 == slot2 || slot1 >= MAX_QUEST_LOG_SIZE || slot2 >= MAX_QUEST_LOG_SIZE)
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTLOG_SWAP_QUEST slot 1 = %u, slot 2 = %u", slot1, slot2 );
-
     GetPlayer()->SwapQuestSlot(slot1,slot2);
 }
-
 void WorldSession::HandleQuestLogRemoveQuest(WorldPacket& recv_data)
 {
     uint8 slot;
     recv_data >> slot;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTLOG_REMOVE_QUEST slot = %u",slot );
-
     if( slot < MAX_QUEST_LOG_SIZE )
     {
         if(uint32 quest = _player->GetQuestSlotQuestId(slot))
         {
             if(!_player->TakeQuestSourceItem( quest, true ))
                 return;                                     // can't un-equip some items, reject quest cancel
-
             if (const Quest *pQuest = objmgr.GetQuestTemplate(quest))
             {
                 if (pQuest->HasFlag(QUEST_TRINITY_FLAGS_TIMED))
                     _player->RemoveTimedQuest(quest);
             }
-
             _player->TakeQuestSourceItem(quest, true); // remove quest src item from player
             _player->SetQuestStatus( quest, QUEST_STATUS_NONE);
         }
-
         _player->SetQuestSlot(slot, 0);
-
         _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_QUEST_ABANDONED, 1);
     }
 }
-
 void WorldSession::HandleQuestConfirmAccept(WorldPacket& recv_data)
 {
     uint32 quest;
     recv_data >> quest;
-
     sLog.outDebug( "WORLD: Received CMSG_QUEST_CONFIRM_ACCEPT quest = %u",quest );
 }
-
 void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data)
 {
     uint32 quest;
     uint64 guid;
     recv_data >> guid >> quest;
-
     if(!GetPlayer()->isAlive())
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_COMPLETE_QUEST npc = %u, quest = %u",uint32(GUID_LOPART(guid)),quest );
-
     Quest const *pQuest = objmgr.GetQuestTemplate(quest);
     if( pQuest )
     {
@@ -397,7 +331,6 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data)
             if(BattleGround* bg = GetPlayer()->GetBattleGround())
                 if(bg->GetTypeID() == BATTLEGROUND_AV)
                     ((BattleGroundAV*)bg)->HandleQuestComplete(quest, GetPlayer());
-
         if( _player->GetQuestStatus( quest ) != QUEST_STATUS_COMPLETE )
         {
             if( pQuest->IsRepeatable() )
@@ -414,19 +347,15 @@ void WorldSession::HandleQuestgiverCompleteQuest(WorldPacket& recv_data)
         }
     }
 }
-
 void WorldSession::HandleQuestgiverQuestAutoLaunch(WorldPacket& /*recvPacket*/)
 {
     sLog.outDebug( "WORLD: Received CMSG_QUESTGIVER_QUEST_AUTOLAUNCH" );
 }
-
 void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
 {
     uint32 questId;
     recvPacket >> questId;
-
     sLog.outDebug("WORLD: Received CMSG_PUSHQUESTTOPARTY quest = %u", questId);
-
     if (Quest const *pQuest = objmgr.GetQuestTemplate(questId))
     {
         if (Group* pGroup = _player->GetGroup())
@@ -434,57 +363,46 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket)
             for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
             {
                 Player *pPlayer = itr->getSource();
-
                 if (!pPlayer || pPlayer == _player)         // skip self
                     continue;
-
                 _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_SHARING_QUEST);
-
                 if (!pPlayer->SatisfyQuestStatus(pQuest, false))
                 {
                     _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_HAVE_QUEST);
                     continue;
                 }
-
                 if (pPlayer->GetQuestStatus(questId) == QUEST_STATUS_COMPLETE)
                 {
                     _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_FINISH_QUEST);
                     continue;
                 }
-
                 if (!pPlayer->CanTakeQuest(pQuest, false))
                 {
                     _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_CANT_TAKE_QUEST);
                     continue;
                 }
-
                 if (!pPlayer->SatisfyQuestLog(false))
                 {
                     _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_LOG_FULL);
                     continue;
                 }
-
                 if (pPlayer->GetDivider() != 0)
                 {
                     _player->SendPushToPartyResponse(pPlayer, QUEST_PARTY_MSG_BUSY);
                     continue;
                 }
-
                 pPlayer->PlayerTalkClass->SendQuestGiverQuestDetails(pQuest, _player->GetGUID(), true);
                 pPlayer->SetDivider(_player->GetGUID());
             }
         }
     }
 }
-
 void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket)
 {
     uint64 guid;
     uint8 msg;
     recvPacket >> guid >> msg;
-
     sLog.outDebug( "WORLD: Received MSG_QUEST_PUSH_RESULT" );
-
     if( _player->GetDivider() != 0 )
     {
         Player *pPlayer = ObjectAccessor::FindPlayer( _player->GetDivider() );
@@ -498,14 +416,11 @@ void WorldSession::HandleQuestPushResult(WorldPacket& recvPacket)
         }
     }
 }
-
 uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32 defstatus)
 {
     uint32 result = defstatus;
-
     QuestRelations const* qir;
     QuestRelations const* qr;
-
     switch(questgiver->GetTypeId())
     {
         case TYPEID_GAMEOBJECT:
@@ -525,14 +440,12 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
             sLog.outError("Warning: GetDialogStatus called for unexpected type %u", questgiver->GetTypeId());
             return DIALOG_STATUS_NONE;
     }
-
     for(QuestRelations::const_iterator i = qir->lower_bound(questgiver->GetEntry()); i != qir->upper_bound(questgiver->GetEntry()); ++i )
     {
         uint32 result2 = 0;
         uint32 quest_id = i->second;
         Quest const *pQuest = objmgr.GetQuestTemplate(quest_id);
         if ( !pQuest ) continue;
-
         QuestStatus status = pPlayer->GetQuestStatus( quest_id );
         if( (status == QUEST_STATUS_COMPLETE && !pPlayer->GetQuestRewardStatus(quest_id)) ||
             (pQuest->IsAutoComplete() && pPlayer->CanTakeQuest(pQuest, false)) )
@@ -544,11 +457,9 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
         }
         else if ( status == QUEST_STATUS_INCOMPLETE )
             result2 = DIALOG_STATUS_INCOMPLETE;
-
         if (result2 > result)
             result = result2;
     }
-
     for(QuestRelations::const_iterator i = qr->lower_bound(questgiver->GetEntry()); i != qr->upper_bound(questgiver->GetEntry()); ++i )
     {
         uint32 result2 = 0;
@@ -556,7 +467,6 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
         Quest const *pQuest = objmgr.GetQuestTemplate(quest_id);
         if ( !pQuest )
             continue;
-
         QuestStatus status = pPlayer->GetQuestStatus( quest_id );
         if ( status == QUEST_STATUS_NONE )
         {
@@ -580,28 +490,21 @@ uint32 WorldSession::getDialogStatus(Player *pPlayer, Object* questgiver, uint32
                     result2 = DIALOG_STATUS_UNAVAILABLE;
             }
         }
-
         if (result2 > result)
             result = result2;
     }
-
     return result;
 }
-
 void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket*/)
 {
     sLog.outDebug("WORLD: Received CMSG_QUESTGIVER_STATUS_MULTIPLE_QUERY");
-
     uint32 count = 0;
-
     WorldPacket data(SMSG_QUESTGIVER_STATUS_MULTIPLE, 4);
     data << uint32(count);                                  // placeholder
-
     for(Player::ClientGUIDs::const_iterator itr = _player->m_clientGUIDs.begin(); itr != _player->m_clientGUIDs.end(); ++itr)
     {
         uint8 questStatus = DIALOG_STATUS_NONE;
         uint8 defstatus = DIALOG_STATUS_NONE;
-
         if (IS_CRE_OR_VEH_OR_PET_GUID(*itr))
         {
             // need also pet quests case support
@@ -613,7 +516,6 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
             questStatus = Script->NPCDialogStatus(_player, questgiver);
             if( questStatus > 6 )
                 questStatus = getDialogStatus(_player, questgiver, defstatus);
-
             data << uint64(questgiver->GetGUID());
             data << uint8(questStatus);
             ++count;
@@ -628,13 +530,11 @@ void WorldSession::HandleQuestgiverStatusMultipleQuery(WorldPacket& /*recvPacket
             questStatus = Script->GODialogStatus(_player, questgiver);
             if( questStatus > 6 )
                 questStatus = getDialogStatus(_player, questgiver, defstatus);
-
             data << uint64(questgiver->GetGUID());
             data << uint8(questStatus);
             ++count;
         }
     }
-
     data.put<uint32>(0, count);                             // write real count
     SendPacket(&data);
 }
diff --git a/src/game/RandomMovementGenerator.cpp b/src/game/RandomMovementGenerator.cpp
index f50e6af4709..5d6711db13a 100644
--- a/src/game/RandomMovementGenerator.cpp
+++ b/src/game/RandomMovementGenerator.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Creature.h"
 #include "MapManager.h"
 #include "RandomMovementGenerator.h"
@@ -27,63 +26,48 @@
 #include "Map.h"
 #include "Util.h"
 #include "CreatureGroups.h"
-
 #define RUNNING_CHANCE_RANDOMMV 20                                  //will be "1 / RUNNING_CHANCE_RANDOMMV"
-
 template<>
 bool
 RandomMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
     if(i_destinationHolder.HasArrived())
         return false;
-
     i_destinationHolder.GetDestination(x, y, z);
     return true;
 }
-
 #ifdef MAP_BASED_RAND_GEN
 #define rand_norm() creature.rand_norm()
 #endif
-
 template<>
 void
 RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
 {
     float X,Y,Z,z,nx,ny,nz,ori,dist;
-
     creature.GetHomePosition(X, Y, Z, ori);
-
     z = creature.GetPositionZ();
     Map const* map = creature.GetBaseMap();
-
     // For 2D/3D system selection
     bool is_land_ok  = creature.canWalk();
     bool is_water_ok = creature.canSwim();
     bool is_air_ok   = creature.canFly();
-
     for(uint32 i = 0;; ++i)
     {
-
     const float angle = rand_norm()*(M_PI*2);
     const float range = rand_norm()*wander_distance;
     const float distanceX = range * cos(angle);
     const float distanceY = range * sin(angle);
-
     nx = X + distanceX;
     ny = Y + distanceY;
-
     // prevent invalid coordinates generation
     Trinity::NormalizeMapCoord(nx);
     Trinity::NormalizeMapCoord(ny);
-
     dist = (nx - X)*(nx - X) + (ny - Y)*(ny - Y);
-
     if(i == 5)
     {
         nz = Z;
         break;
     }
-
     if (is_air_ok) // 3D system above ground and above water (flying mode)
     {
         const float distanceZ = rand_norm() * sqrtf(dist)/2; // Limit height change
@@ -97,7 +81,6 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
     else // 2D only
     {
         dist = dist>=100.0f ? 10.0f : sqrtf(dist); // 10.0 is the max that vmap high can check (MAX_CAN_FALL_DISTANCE)
-
         // The fastest way to get an accurate result 90% of the time.
         // Better result can be obtained like 99% accuracy with a ray light, but the cost is too high and the code is too long.
         nz = map->GetHeight(nx,ny,Z+dist-2.0f,false); // Map check
@@ -112,10 +95,8 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
             }
         }
     }
-
     break;
     }
-
     Traveller<Creature> traveller(creature);
     creature.SetOrientation(creature.GetAngle(nx,ny));
     i_destinationHolder.SetDestination(traveller, nx, ny, nz);
@@ -130,40 +111,33 @@ RandomMovementGenerator<Creature>::_setRandomLocation(Creature &creature)
         i_nextMoveTime.Reset(urand(500+i_destinationHolder.GetTotalTravelTime(),5000+i_destinationHolder.GetTotalTravelTime()));
         creature.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
     }
-
     //Call for creature group update
     if(creature.GetFormation() && creature.GetFormation()->getLeader() == &creature)
     {
         creature.GetFormation()->LeaderMoveTo(nx, ny, nz);
     }
 }
-
 template<>
 void
 RandomMovementGenerator<Creature>::Initialize(Creature &creature)
 {
     if(!creature.isAlive())
         return;
-
     if(!wander_distance)
         wander_distance = creature.GetRespawnRadius();
-
     if(irand(0,RUNNING_CHANCE_RANDOMMV) > 0)
         creature.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
     _setRandomLocation(creature);
 }
-
 template<>
 void
 RandomMovementGenerator<Creature>::Reset(Creature &creature)
 {
     Initialize(creature);
 }
-
 template<>
 void
 RandomMovementGenerator<Creature>::Finalize(Creature &creature){}
-
 template<>
 bool
 RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff)
@@ -174,17 +148,12 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff
         creature.clearUnitState(UNIT_STAT_ROAMING);
         return true;
     }
-
     i_nextMoveTime.Update(diff);
-
     if(i_destinationHolder.HasArrived() && !creature.IsStopped() && !creature.canFly())
         creature.clearUnitState(UNIT_STAT_ROAMING | UNIT_STAT_MOVE);
-
     if(!i_destinationHolder.HasArrived() && creature.IsStopped())
         creature.addUnitState(UNIT_STAT_ROAMING);
-
     CreatureTraveller traveller(creature);
-
     if( i_destinationHolder.UpdateTraveller(traveller, diff, true) )
     {
         if(i_nextMoveTime.Passed())
diff --git a/src/game/RandomMovementGenerator.h b/src/game/RandomMovementGenerator.h
index 20afe23d375..0be58541b3f 100644
--- a/src/game/RandomMovementGenerator.h
+++ b/src/game/RandomMovementGenerator.h
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_RANDOMMOTIONGENERATOR_H
 #define TRINITY_RANDOMMOTIONGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-
 template<class T>
 class TRINITY_DLL_SPEC RandomMovementGenerator
 : public MovementGeneratorMedium< T, RandomMovementGenerator<T> >
@@ -32,7 +29,6 @@ class TRINITY_DLL_SPEC RandomMovementGenerator
     public:
         // Wander dist is related on db spawn dist. So what if we wanna set eandom movement on summoned creature?!
         RandomMovementGenerator(float spawn_dist = 0.0f) : i_nextMoveTime(0), wander_distance(spawn_dist) {}
-
         void _setRandomLocation(T &);
         void Initialize(T &);
         void Finalize(T &);
@@ -46,7 +42,6 @@ class TRINITY_DLL_SPEC RandomMovementGenerator
         MovementGeneratorType GetMovementGeneratorType() { return RANDOM_MOTION_TYPE; }
     private:
         TimeTrackerSmall i_nextMoveTime;
-
         DestinationHolder< Traveller<T> > i_destinationHolder;
         float wander_distance;
         uint32 i_nextMove;
diff --git a/src/game/ReactorAI.cpp b/src/game/ReactorAI.cpp
index 3cece43a7c1..b50aa1825e2 100644
--- a/src/game/ReactorAI.cpp
+++ b/src/game/ReactorAI.cpp
@@ -17,37 +17,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ByteBuffer.h"
 #include "ReactorAI.h"
 #include "Errors.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAIImpl.h"
-
 #define REACTOR_VISIBLE_RANGE (26.46f)
-
 int
 ReactorAI::Permissible(const Creature *creature)
 {
     if( creature->isCivilian() || creature->IsNeutralToAll() )
         return PERMIT_BASE_REACTIVE;
-
     return PERMIT_BASE_NO;
 }
-
 void
 ReactorAI::MoveInLineOfSight(Unit *)
 {
 }
-
 void
 ReactorAI::UpdateAI(const uint32 /*time_diff*/)
 {
     // update i_victimGuid if m_creature->getVictim() !=0 and changed
     if(!UpdateVictim())
         return;
-
     if( m_creature->isAttackReady() )
     {
         if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h
index c20c01154f5..a3862ac1258 100644
--- a/src/game/ReactorAI.h
+++ b/src/game/ReactorAI.h
@@ -17,22 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_REACTORAI_H
 #define TRINITY_REACTORAI_H
-
 #include "CreatureAI.h"
-
 class Unit;
-
 class TRINITY_DLL_DECL ReactorAI : public CreatureAI
 {
     public:
-
         explicit ReactorAI(Creature *c) : CreatureAI(c) {}
-
         void MoveInLineOfSight(Unit *);
-
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
 };
diff --git a/src/game/ReputationMgr.cpp b/src/game/ReputationMgr.cpp
index 35bf2304fe4..da1d6750461 100644
--- a/src/game/ReputationMgr.cpp
+++ b/src/game/ReputationMgr.cpp
@@ -15,15 +15,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "ReputationMgr.h"
 #include "DBCStores.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "World.h"
-
 const int32 ReputationMgr::PointsInRank[MAX_REPUTATION_RANK] = {36000, 3000, 3000, 3000, 6000, 12000, 21000, 1000};
-
 ReputationRank ReputationMgr::ReputationToRank(int32 standing)
 {
     int32 limit = Reputation_Cap + 1;
@@ -35,25 +32,20 @@ ReputationRank ReputationMgr::ReputationToRank(int32 standing)
     }
     return MIN_REPUTATION_RANK;
 }
-
 int32 ReputationMgr::GetReputation(uint32 faction_id) const
 {
     FactionEntry const *factionEntry = sFactionStore.LookupEntry(faction_id);
-
     if (!factionEntry)
     {
         sLog.outError("ReputationMgr::GetReputation: Can't get reputation of %s for unknown faction (faction id) #%u.",m_player->GetName(), faction_id);
         return 0;
     }
-
     return GetReputation(factionEntry);
 }
-
 int32 ReputationMgr::GetBaseReputation(FactionEntry const* factionEntry) const
 {
     if (!factionEntry)
         return 0;
-
     uint32 raceMask = m_player->getRaceMask();
     uint32 classMask = m_player->getClassMask();
     for (int i=0; i < 4; i++)
@@ -66,35 +58,28 @@ int32 ReputationMgr::GetBaseReputation(FactionEntry const* factionEntry) const
             )
             return factionEntry->BaseRepValue[i];
     }
-
     // in faction.dbc exist factions with (RepListId >=0, listed in character reputation list) with all BaseRepRaceMask[i]==0
     return 0;
 }
-
 int32 ReputationMgr::GetReputation(FactionEntry const* factionEntry) const
 {
     // Faction without recorded reputation. Just ignore.
     if(!factionEntry)
         return 0;
-
     if(FactionState const* state = GetState(factionEntry))
         return GetBaseReputation(factionEntry) + state->Standing;
-
     return 0;
 }
-
 ReputationRank ReputationMgr::GetRank(FactionEntry const* factionEntry) const
 {
     int32 reputation = GetReputation(factionEntry);
     return ReputationToRank(reputation);
 }
-
 ReputationRank ReputationMgr::GetBaseRank(FactionEntry const* factionEntry) const
 {
     int32 reputation = GetBaseReputation(factionEntry);
     return ReputationToRank(reputation);
 }
-
 void ReputationMgr::ApplyForceReaction( uint32 faction_id,ReputationRank rank,bool apply )
 {
     if(apply)
@@ -102,12 +87,10 @@ void ReputationMgr::ApplyForceReaction( uint32 faction_id,ReputationRank rank,bo
     else
         m_forcedReactions.erase(faction_id);
 }
-
 uint32 ReputationMgr::GetDefaultStateFlags(FactionEntry const* factionEntry) const
 {
     if (!factionEntry)
         return 0;
-
     uint32 raceMask = m_player->getRaceMask();
     uint32 classMask = m_player->getClassMask();
     for (int i=0; i < 4; i++)
@@ -122,7 +105,6 @@ uint32 ReputationMgr::GetDefaultStateFlags(FactionEntry const* factionEntry) con
     }
     return 0;
 }
-
 void ReputationMgr::SendForceReactions()
 {
     WorldPacket data;
@@ -135,7 +117,6 @@ void ReputationMgr::SendForceReactions()
     }
     m_player->SendDirectMessage(&data);
 }
-
 void ReputationMgr::SendState(FactionState const* faction) const
 {
     if(faction->Flags & FACTION_FLAG_VISIBLE)               //If faction is visible then update it
@@ -151,14 +132,11 @@ void ReputationMgr::SendState(FactionState const* faction) const
         m_player->SendDirectMessage(&data);
     }
 }
-
 void ReputationMgr::SendInitialReputations()
 {
     WorldPacket data(SMSG_INITIALIZE_FACTIONS, (4+128*5));
     data << uint32 (0x00000080);
-
     RepListID a = 0;
-
     for (FactionStateList::const_iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr)
     {
         // fill in absent fields
@@ -167,41 +145,33 @@ void ReputationMgr::SendInitialReputations()
             data << uint8  (0x00);
             data << uint32 (0x00000000);
         }
-
         // fill in encountered data
         data << uint8  (itr->second.Flags);
         data << uint32 (itr->second.Standing);
-
         ++a;
     }
-
     // fill in absent fields
     for (; a != 128; a++)
     {
         data << uint8  (0x00);
         data << uint32 (0x00000000);
     }
-
     m_player->SendDirectMessage(&data);
 }
-
 void ReputationMgr::SendStates() const
 {
     for(FactionStateList::const_iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr)
         SendState(&(itr->second));
 }
-
 void ReputationMgr::SendVisible(FactionState const* faction) const
 {
     if(m_player->GetSession()->PlayerLoading())
         return;
-
     // make faction visible in reputation list at client
     WorldPacket data(SMSG_SET_FACTION_VISIBLE, 4);
     data << faction->ReputationListID;
     m_player->SendDirectMessage(&data);
 }
-
 void ReputationMgr::Initialize()
 {
     m_factions.clear();
@@ -209,11 +179,9 @@ void ReputationMgr::Initialize()
     m_honoredFactionCount = 0;
     m_reveredFactionCount = 0;
     m_exaltedFactionCount = 0;
-
     for(unsigned int i = 1; i < sFactionStore.GetNumRows(); i++)
     {
         FactionEntry const *factionEntry = sFactionStore.LookupEntry(i);
-
         if( factionEntry && (factionEntry->reputationListID >= 0))
         {
             FactionState newFaction;
@@ -222,42 +190,33 @@ void ReputationMgr::Initialize()
             newFaction.Standing = 0;
             newFaction.Flags = GetDefaultStateFlags(factionEntry);
             newFaction.Changed = true;
-
             if( newFaction.Flags & FACTION_FLAG_VISIBLE )
                 ++m_visibleFactionCount;
-
             UpdateRankCounters(REP_HOSTILE,GetBaseRank(factionEntry));
-
             m_factions[newFaction.ReputationListID] = newFaction;
         }
     }
 }
-
 bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
 {
     // Determines whether or not the faction is part of a team or the leader of a team.
     bool isTeamMember = false;
-
     // Return variable for the function
     bool res = false;
-
     SimpleFactionsList const* flist = GetFactionTeamList(factionEntry->ID, isTeamMember);
     // Determines whether reputation should be sent to team parent or other team members.
     int8 extraTarget = (isTeamMember || !flist ? -1 : 0);     // 0 = Give equal amount of reputation to anyone in the team (unhandled cases).
-
     /* When gaining reputation with some factions, you receive a reputation increase
        towards other reputations for that group.
     */
     uint32 team = factionEntry->team;
-     
     int32 sharedStanding = standing;            // Here we decide what the amount is to send to the others of the group.
     switch(factionEntry->ID)
     {
         case 1037:                              // Alliance Vanguard
         case 1052:                              // Horde Expedition
             extraTarget = -1;                   // Make possible to earn rep with this two factions
-            break;                              
-
+            break;
     }
     switch(team)
     {
@@ -270,9 +229,8 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
         case 1052:                              // Horde Expedition
             sharedStanding *= 0.5f;             // Half of the reputation earned by any of the four subfactions of this team will
             extraTarget = 2;                    // be added to the main faction. (http://www.wowwiki.com/Alliance_Vanguard)
-            break;                              
+            break;
     }
-
     FactionEntry const *targetFaction = NULL;
     switch(extraTarget)
     {
@@ -281,7 +239,7 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
             for (SimpleFactionsList::const_iterator itr = flist->begin(); itr != flist->end(); ++itr)
             {
                 targetFaction = sFactionStore.LookupEntry(*itr);
-                ASSERT(targetFaction != NULL);   
+                ASSERT(targetFaction != NULL);
                 res = SetOneFactionReputation(targetFaction, sharedStanding, incremental);
             }
             return res;
@@ -292,9 +250,8 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
             {
                 if((*itr) == factionEntry->ID)  // Not to self
                     continue;
-                
                 targetFaction = sFactionStore.LookupEntry(*itr);
-                ASSERT(targetFaction != NULL); 
+                ASSERT(targetFaction != NULL);
                 res = SetOneFactionReputation(targetFaction, sharedStanding, incremental);
             }
         }break;
@@ -309,191 +266,146 @@ bool ReputationMgr::SetReputation(FactionEntry const* factionEntry, int32 standi
             return SetOneFactionReputation(factionEntry, standing, incremental);
             break;
     }
-
     return (SetOneFactionReputation(factionEntry, standing, incremental) && res);
 }
-
 bool ReputationMgr::SetOneFactionReputation(FactionEntry const* factionEntry, int32 standing, bool incremental)
 {
     FactionStateList::iterator itr = m_factions.find(factionEntry->reputationListID);
     if (itr != m_factions.end())
     {
         int32 BaseRep = GetBaseReputation(factionEntry);
-
         if(incremental)
         {
             // int32 *= float cause one point loss?
             standing = floor( (float)standing * sWorld.getRate(RATE_REPUTATION_GAIN) + 0.5 );
             standing += itr->second.Standing + BaseRep;
         }
-
         if (standing > Reputation_Cap)
             standing = Reputation_Cap;
         else if (standing < Reputation_Bottom)
             standing = Reputation_Bottom;
-
         ReputationRank old_rank = ReputationToRank(itr->second.Standing + BaseRep);
         ReputationRank new_rank = ReputationToRank(standing);
-
         itr->second.Standing = standing - BaseRep;
         itr->second.Changed = true;
-
         SetVisible(&itr->second);
-
         if(new_rank <= REP_HOSTILE)
             SetAtWar(&itr->second,true);
-
         SendState(&itr->second);
-
         UpdateRankCounters(old_rank, new_rank);
-
         m_player->ReputationChanged(factionEntry);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KNOWN_FACTIONS,         factionEntry->ID);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REPUTATION,        factionEntry->ID);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_EXALTED_REPUTATION,factionEntry->ID);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_REVERED_REPUTATION,factionEntry->ID);
         m_player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_GAIN_HONORED_REPUTATION,factionEntry->ID);
-
         return true;
     }
     return false;
 }
-
 void ReputationMgr::SetVisible(FactionTemplateEntry const*factionTemplateEntry)
 {
     if(!factionTemplateEntry->faction)
         return;
-
     if(FactionEntry const *factionEntry = sFactionStore.LookupEntry(factionTemplateEntry->faction))
         // Never show factions of the opposing team
         if(!(factionEntry->BaseRepRaceMask[1] & m_player->getRaceMask() && factionEntry->BaseRepValue[1] == Reputation_Bottom) )
             SetVisible(factionEntry);
 }
-
 void ReputationMgr::SetVisible(FactionEntry const *factionEntry)
 {
     if(factionEntry->reputationListID < 0)
         return;
-
     FactionStateList::iterator itr = m_factions.find(factionEntry->reputationListID);
     if (itr == m_factions.end())
         return;
-
     SetVisible(&itr->second);
 }
-
 void ReputationMgr::SetVisible(FactionState* faction)
 {
     // always invisible or hidden faction can't be make visible
     // except if faction has FACTION_FLAG_SPECIAL
     if(faction->Flags & (FACTION_FLAG_INVISIBLE_FORCED|FACTION_FLAG_HIDDEN) && !(faction->Flags & FACTION_FLAG_SPECIAL) )
         return;
-
     // already set
     if(faction->Flags & FACTION_FLAG_VISIBLE)
         return;
-
     faction->Flags |= FACTION_FLAG_VISIBLE;
     faction->Changed = true;
-
     ++m_visibleFactionCount;
-
     SendVisible(faction);
 }
-
 void ReputationMgr::SetAtWar( RepListID repListID, bool on )
 {
     FactionStateList::iterator itr = m_factions.find(repListID);
     if (itr == m_factions.end())
         return;
-
     // always invisible or hidden faction can't change war state
     if(itr->second.Flags & (FACTION_FLAG_INVISIBLE_FORCED|FACTION_FLAG_HIDDEN) )
         return;
-
     SetAtWar(&itr->second,on);
 }
-
 void ReputationMgr::SetAtWar(FactionState* faction, bool atWar)
 {
     // not allow declare war to own faction
     if(atWar && (faction->Flags & FACTION_FLAG_PEACE_FORCED) )
         return;
-
     // already set
     if(((faction->Flags & FACTION_FLAG_AT_WAR) != 0) == atWar)
         return;
-
     if( atWar )
         faction->Flags |= FACTION_FLAG_AT_WAR;
     else
         faction->Flags &= ~FACTION_FLAG_AT_WAR;
-
     faction->Changed = true;
 }
-
 void ReputationMgr::SetInactive( RepListID repListID, bool on )
 {
     FactionStateList::iterator itr = m_factions.find(repListID);
     if (itr == m_factions.end())
         return;
-
     SetInactive(&itr->second,on);
 }
-
 void ReputationMgr::SetInactive(FactionState* faction, bool inactive)
 {
     // always invisible or hidden faction can't be inactive
     if(inactive && ((faction->Flags & (FACTION_FLAG_INVISIBLE_FORCED|FACTION_FLAG_HIDDEN)) || !(faction->Flags & FACTION_FLAG_VISIBLE) ) )
         return;
-
     // already set
     if(((faction->Flags & FACTION_FLAG_INACTIVE) != 0) == inactive)
         return;
-
     if(inactive)
         faction->Flags |= FACTION_FLAG_INACTIVE;
     else
         faction->Flags &= ~FACTION_FLAG_INACTIVE;
-
     faction->Changed = true;
 }
-
 void ReputationMgr::LoadFromDB(QueryResult *result)
 {
     // Set initial reputations (so everything is nifty before DB data load)
     Initialize();
-
     //QueryResult *result = CharacterDatabase.PQuery("SELECT faction,standing,flags FROM character_reputation WHERE guid = '%u'",GetGUIDLow());
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             FactionEntry const *factionEntry = sFactionStore.LookupEntry(fields[0].GetUInt32());
             if( factionEntry && (factionEntry->reputationListID >= 0))
             {
                 FactionState* faction = &m_factions[factionEntry->reputationListID];
-
                 // update standing to current
                 faction->Standing = int32(fields[1].GetUInt32());
-
                 // update counters
                 int32 BaseRep = GetBaseReputation(factionEntry);
                 ReputationRank old_rank = ReputationToRank(BaseRep);
                 ReputationRank new_rank = ReputationToRank(BaseRep + faction->Standing);
                 UpdateRankCounters(old_rank,new_rank);
-
                 uint32 dbFactionFlags = fields[2].GetUInt32();
-
                 if( dbFactionFlags & FACTION_FLAG_VISIBLE )
                     SetVisible(faction);                    // have internal checks for forced invisibility
-
                 if( dbFactionFlags & FACTION_FLAG_INACTIVE)
                     SetInactive(faction,true);              // have internal checks for visibility requirement
-
                 if( dbFactionFlags & FACTION_FLAG_AT_WAR )  // DB at war
                     SetAtWar(faction,true);                 // have internal checks for FACTION_FLAG_PEACE_FORCED
                 else                                        // DB not at war
@@ -502,22 +414,18 @@ void ReputationMgr::LoadFromDB(QueryResult *result)
                     if( faction->Flags & FACTION_FLAG_VISIBLE )
                         SetAtWar(faction,false);            // have internal checks for FACTION_FLAG_PEACE_FORCED
                 }
-
                 // set atWar for hostile
                 if(GetRank(factionEntry) <= REP_HOSTILE)
                     SetAtWar(faction,true);
-
                 // reset changed flag if values similar to saved in DB
                 if(faction->Flags==dbFactionFlags)
                     faction->Changed = false;
             }
         }
         while( result->NextRow() );
-
         delete result;
     }
 }
-
 void ReputationMgr::SaveToDB()
 {
     for(FactionStateList::iterator itr = m_factions.begin(); itr != m_factions.end(); ++itr)
@@ -530,7 +438,6 @@ void ReputationMgr::SaveToDB()
         }
     }
 }
-
 void ReputationMgr::UpdateRankCounters( ReputationRank old_rank, ReputationRank new_rank )
 {
     if(old_rank >= REP_EXALTED)
@@ -539,7 +446,6 @@ void ReputationMgr::UpdateRankCounters( ReputationRank old_rank, ReputationRank
         --m_reveredFactionCount;
     if(old_rank >= REP_HONORED)
         --m_honoredFactionCount;
-
     if(new_rank >= REP_EXALTED)
         ++m_exaltedFactionCount;
     if(new_rank >= REP_REVERED)
diff --git a/src/game/ReputationMgr.h b/src/game/ReputationMgr.h
index 6c78e0fa3b5..99c0d34f6dd 100644
--- a/src/game/ReputationMgr.h
+++ b/src/game/ReputationMgr.h
@@ -15,22 +15,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __MANGOS_REPUTATION_MGR_H
 #define __MANGOS_REPUTATION_MGR_H
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Language.h"
 #include "DBCStructure.h"
 #include <map>
-
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
 {
     LANG_REP_HATED,    LANG_REP_HOSTILE, LANG_REP_UNFRIENDLY, LANG_REP_NEUTRAL,
     LANG_REP_FRIENDLY, LANG_REP_HONORED, LANG_REP_REVERED,    LANG_REP_EXALTED
 };
-
 enum FactionFlags
 {
     FACTION_FLAG_NONE               = 0x00,                 // no faction flag
@@ -43,7 +39,6 @@ enum FactionFlags
     FACTION_FLAG_RIVAL              = 0x40,                 // flag for the two competing outland factions
     FACTION_FLAG_SPECIAL            = 0x80                  // horde and alliance home cities and their northrend allies have this flag
 };
-
 typedef uint32 RepListID;
 struct FactionState
 {
@@ -53,60 +48,48 @@ struct FactionState
     int32  Standing;
     bool Changed;
 };
-
 typedef std::map<RepListID,FactionState> FactionStateList;
 typedef std::map<uint32,ReputationRank> ForcedReactions;
-
 class Player;
 class QueryResult;
-
 class ReputationMgr
 {
     public:                                                 // constructors and global modifiers
         explicit ReputationMgr(Player* owner) : m_player(owner),
             m_visibleFactionCount(0), m_honoredFactionCount(0), m_reveredFactionCount(0), m_exaltedFactionCount(0) {}
         ~ReputationMgr() {}
-
         void SaveToDB();
         void LoadFromDB(QueryResult *result);
     public:                                                 // statics
         static const int32 PointsInRank[MAX_REPUTATION_RANK];
         static const int32 Reputation_Cap    =  42999;
         static const int32 Reputation_Bottom = -42000;
-
         static ReputationRank ReputationToRank(int32 standing);
     public:                                                 // accessors
         uint8 GetVisibleFactionCount() const { return m_visibleFactionCount; }
         uint8 GetHonoredFactionCount() const { return m_honoredFactionCount; }
         uint8 GetReveredFactionCount() const { return m_reveredFactionCount; }
         uint8 GetExaltedFactionCount() const { return m_exaltedFactionCount; }
-
         FactionStateList const& GetStateList() const { return m_factions; }
-
         FactionState const* GetState(FactionEntry const* factionEntry) const
         {
             return factionEntry->reputationListID >= 0 ? GetState(factionEntry->reputationListID) : NULL;
         }
-
         FactionState const* GetState(RepListID id) const
         {
             FactionStateList::const_iterator repItr = m_factions.find (id);
             return repItr != m_factions.end() ? &repItr->second : NULL;
         }
-
         int32 GetReputation(uint32 faction_id) const;
         int32 GetReputation(FactionEntry const* factionEntry) const;
         int32 GetBaseReputation(FactionEntry const* factionEntry) const;
-
         ReputationRank GetRank(FactionEntry const* factionEntry) const;
         ReputationRank GetBaseRank(FactionEntry const* factionEntry) const;
-
         ReputationRank const* GetForcedRankIfAny(FactionTemplateEntry const* factionTemplateEntry) const
         {
             ForcedReactions::const_iterator forceItr = m_forcedReactions.find(factionTemplateEntry->faction);
             return forceItr != m_forcedReactions.end() ? &forceItr->second : NULL;
         }
-
     public:                                                 // modifiers
         bool SetReputation(FactionEntry const* factionEntry, int32 standing)
         {
@@ -116,20 +99,16 @@ class ReputationMgr
         {
             return SetReputation(factionEntry, standing, true);
         }
-
         void SetVisible(FactionTemplateEntry const* factionTemplateEntry);
         void SetVisible(FactionEntry const* factionEntry);
         void SetAtWar(RepListID repListID, bool on);
         void SetInactive(RepListID repListID, bool on);
-
         void ApplyForceReaction(uint32 faction_id,ReputationRank rank,bool apply);
-
     public:                                                 // senders
         void SendInitialReputations();
         void SendForceReactions();
         void SendState(FactionState const* faction) const;
         void SendStates() const;
-
     private:                                                // internal helper functions
         void Initialize();
         uint32 GetDefaultStateFlags(FactionEntry const* factionEntry) const;
@@ -149,5 +128,4 @@ class ReputationMgr
         uint8 m_reveredFactionCount :8;
         uint8 m_exaltedFactionCount :8;
 };
-
 #endif
diff --git a/src/game/ScriptCalls.cpp b/src/game/ScriptCalls.cpp
index 805a5361063..bc84efd03de 100644
--- a/src/game/ScriptCalls.cpp
+++ b/src/game/ScriptCalls.cpp
@@ -17,19 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
-
 #include "Common.h"
 #include "Platform/Define.h"
 #include "ScriptCalls.h"
 #include "World.h"
 #include "Config/ConfigEnv.h"
-
 ScriptsSet Script=NULL;
-
 void UnloadScriptingModule()
 {
     if(Script)
@@ -41,23 +37,18 @@ void UnloadScriptingModule()
         Script = NULL;
     }
 }
-
 bool LoadScriptingModule(char const* libName)
 {
     ScriptsSet testScript=new _ScriptSet;
-
     std::string name = strlen(libName) ? libName : TRINITY_SCRIPT_NAME;
     name += TRINITY_SCRIPT_EXT;
-
     testScript->hScriptsLib=TRINITY_LOAD_LIBRARY(name.c_str());
-
     if(!testScript->hScriptsLib )
     {
         printf("Error loading Scripts Library %s !\n",name.c_str());
         delete testScript;
         return false;
     }
-
     if(   !(testScript->ScriptsInit         =(scriptCallScriptsInit         )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"ScriptsInit"         ))
         ||!(testScript->OnLogin             =(scriptCallOnLogin             )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"OnLogin"             ))
         ||!(testScript->OnLogout            =(scriptCallOnLogout            )TRINITY_GET_PROC_ADDR(testScript->hScriptsLib,"OnLogout"            ))
@@ -109,19 +100,14 @@ bool LoadScriptingModule(char const* libName)
         delete testScript;
         return false;
     }
-
     sLog.outString();
     sLog.outString( ">>> Scripts Library %s was successfully loaded.\n", name.c_str() );
-
     //heh we are still there :P we have a valid library
     //we reload script
     UnloadScriptingModule();
-
     Script=testScript;
     Script->ScriptsInit(sConfig.GetFilename().c_str());
-
     sWorld.SetScriptsVersion(Script->ScriptsVersion());
-
     return true;
 }
 
diff --git a/src/game/ScriptCalls.h b/src/game/ScriptCalls.h
index 5a156c7e83f..be7c0ab7a01 100644
--- a/src/game/ScriptCalls.h
+++ b/src/game/ScriptCalls.h
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __SCRIPT_CALLS_H
 #define __SCRIPT_CALLS_H
-
 #include "Common.h"
 #include "ObjectMgr.h"
-
 class Creature;
 class CreatureAI;
 class GameObject;
@@ -33,10 +30,8 @@ class Quest;
 class SpellCastTargets;
 class Map;
 class InstanceData;
-
 bool LoadScriptingModule(char const* libName = "");
 void UnloadScriptingModule();
-
 //On Event Handlers
 typedef void(TRINITY_IMPORT * scriptCallOnLogin) (Player *pPlayer);
 typedef void(TRINITY_IMPORT * scriptCallOnLogout) (Player *pPlayer);
@@ -52,11 +47,9 @@ typedef bool(TRINITY_IMPORT * scriptCallOnItemClick) (Player *pPlayer, Item *pIt
 typedef bool(TRINITY_IMPORT * scriptCallOnItemOpen) (Player *pPlayer, Item *pItem);
 typedef bool(TRINITY_IMPORT * scriptCallOnGoClick) (Player *pPlayer, GameObject *pGameObject);
 typedef void(TRINITY_IMPORT * scriptCallOnCreatureKill) (Player *pPlayer, Creature *pCreature);
-
 typedef void(TRINITY_IMPORT * scriptCallScriptsInit) (char const*);
 typedef void(TRINITY_IMPORT * scriptCallScriptsFree) ();
 typedef char const* (TRINITY_IMPORT * scriptCallScriptsVersion) ();
-
 typedef bool(TRINITY_IMPORT * scriptCallGossipHello) (Player *player, Creature *_Creature );
 typedef bool(TRINITY_IMPORT * scriptCallQuestAccept) (Player *player, Creature *_Creature, Quest const *);
 typedef bool(TRINITY_IMPORT * scriptCallGossipSelect)(Player *player, Creature *_Creature, uint32 sender, uint32 action);
@@ -81,13 +74,11 @@ typedef bool(TRINITY_IMPORT * scriptCallEffectDummyCreature) (Unit *caster, uint
 typedef bool(TRINITY_IMPORT * scriptCallEffectDummyItem) (Unit *caster, uint32 spellId, uint32 effIndex, Item *itemTarget);
 typedef CreatureAI* (TRINITY_IMPORT * scriptCallGetAI) ( Creature *_Creature );
 typedef InstanceData* (TRINITY_IMPORT * scriptCallCreateInstanceData) (Map *map);
-
 typedef struct
 {
     scriptCallScriptsInit ScriptsInit;
     scriptCallScriptsFree ScriptsFree;
     scriptCallScriptsVersion ScriptsVersion;
-
     scriptCallOnLogin OnLogin;
     scriptCallOnLogout OnLogout;
     scriptCallOnPVPKill OnPVPKill;
@@ -126,10 +117,8 @@ typedef struct
     scriptCallEffectDummyItem     EffectDummyItem;
     scriptCallGetAI GetAI;
     scriptCallCreateInstanceData CreateInstanceData;
-
     TRINITY_LIBRARY_HANDLE hScriptsLib;
 }_ScriptSet,*ScriptsSet;
-
 extern ScriptsSet Script;
 #endif
 
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 0ccab173166..3fbb97e5a82 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -17,20 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_SHAREDDEFINES_H
 #define TRINITY_SHAREDDEFINES_H
-
 #include "Platform/Define.h"
 #include <cassert>
-
 enum Gender
 {
     GENDER_MALE                        = 0,
     GENDER_FEMALE                      = 1,
     GENDER_NONE                        = 2
 };
-
 // Race value is index in ChrRaces.dbc
 enum Races
 {
@@ -56,16 +52,13 @@ enum Races
     //RACE_NORTHREND_SKELETON = 20,
     //RACE_ICE_TROLL      = 21
 };
-
 // max+1 for player race
 #define MAX_RACES         12
-
 #define RACEMASK_ALL_PLAYABLE \
     ((1<<(RACE_HUMAN-1))   |(1<<(RACE_ORC-1))          |(1<<(RACE_DWARF-1))   | \
     (1<<(RACE_NIGHTELF-1))|(1<<(RACE_UNDEAD_PLAYER-1))|(1<<(RACE_TAUREN-1))  | \
     (1<<(RACE_GNOME-1))   |(1<<(RACE_TROLL-1))        |(1<<(RACE_BLOODELF-1))| \
     (1<<(RACE_DRAENEI-1)) )
-
 // Class value is index in ChrClasses.dbc
 enum Classes
 {
@@ -81,22 +74,16 @@ enum Classes
     // CLASS_UNK2       = 10,unused
     CLASS_DRUID         = 11,
 };
-
 // max+1 for player class
 #define MAX_CLASSES       12
-
 #define CLASSMASK_ALL_PLAYABLE \
     ((1<<(CLASS_WARRIOR-1))|(1<<(CLASS_PALADIN-1))|(1<<(CLASS_HUNTER-1))| \
     (1<<(CLASS_ROGUE-1))  |(1<<(CLASS_PRIEST-1)) |(1<<(CLASS_SHAMAN-1))| \
     (1<<(CLASS_MAGE-1))   |(1<<(CLASS_WARLOCK-1))|(1<<(CLASS_DRUID-1)) | \
     (1<<(CLASS_DEATH_KNIGHT-1)) )
-
 #define CLASSMASK_ALL_CREATURES ((1<<(CLASS_WARRIOR-1)) | (1<<(CLASS_PALADIN-1)) | (1<<(CLASS_ROGUE-1)) | (1<<(CLASS_MAGE-1)) )
-
 #define CLASSMASK_WAND_USERS ((1<<(CLASS_PRIEST-1))|(1<<(CLASS_MAGE-1))|(1<<(CLASS_WARLOCK-1)))
-
 #define PLAYER_MAX_BATTLEGROUND_QUEUES 3
-
 enum ReputationRank
 {
     REP_HATED       = 0,
@@ -108,17 +95,14 @@ enum ReputationRank
     REP_REVERED     = 6,
     REP_EXALTED     = 7
 };
-
 #define MIN_REPUTATION_RANK (REP_HATED)
 #define MAX_REPUTATION_RANK 8
-
 enum MoneyConstants
 {
     COPPER = 1,
     SILVER = COPPER*100,
     GOLD   = SILVER*100
 };
-
 enum Stats
 {
     STAT_STRENGTH                      = 0,
@@ -127,9 +111,7 @@ enum Stats
     STAT_INTELLECT                     = 3,
     STAT_SPIRIT                        = 4
 };
-
 #define MAX_STATS                        5
-
 enum Powers
 {
     POWER_MANA                          = 0,
@@ -143,7 +125,6 @@ enum Powers
     POWER_ALL                           = 127,    // default for class?
     POWER_HEALTH                        = 0xFFFFFFFE    // (-2 as signed value)
 };
-
 enum SpellSchools
 {
     SPELL_SCHOOL_NORMAL                 = 0,
@@ -154,9 +135,7 @@ enum SpellSchools
     SPELL_SCHOOL_SHADOW                 = 5,
     SPELL_SCHOOL_ARCANE                 = 6
 };
-
 #define MAX_SPELL_SCHOOL                  7
-
 enum SpellSchoolMask
 {
     SPELL_SCHOOL_MASK_NONE    = 0x00,                       // not exist
@@ -167,29 +146,23 @@ enum SpellSchoolMask
     SPELL_SCHOOL_MASK_FROST   = (1 << SPELL_SCHOOL_FROST ),
     SPELL_SCHOOL_MASK_SHADOW  = (1 << SPELL_SCHOOL_SHADOW),
     SPELL_SCHOOL_MASK_ARCANE  = (1 << SPELL_SCHOOL_ARCANE),
-
     // unions
-
     // 124, not include normal and holy damage
     SPELL_SCHOOL_MASK_SPELL   = ( SPELL_SCHOOL_MASK_FIRE   |
                                   SPELL_SCHOOL_MASK_NATURE | SPELL_SCHOOL_MASK_FROST  |
                                   SPELL_SCHOOL_MASK_SHADOW | SPELL_SCHOOL_MASK_ARCANE ),
     // 126
     SPELL_SCHOOL_MASK_MAGIC   = ( SPELL_SCHOOL_MASK_HOLY | SPELL_SCHOOL_MASK_SPELL ),
-
     // 127
     SPELL_SCHOOL_MASK_ALL     = ( SPELL_SCHOOL_MASK_NORMAL | SPELL_SCHOOL_MASK_MAGIC )
 };
-
 inline SpellSchools GetFirstSchoolInMask(SpellSchoolMask mask)
 {
     for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         if(mask & (1 << i))
             return SpellSchools(i);
-
     return SPELL_SCHOOL_NORMAL;
 }
-
 enum ItemQualities
 {
     ITEM_QUALITY_POOR                  = 0,                 //GREY
@@ -201,15 +174,12 @@ enum ItemQualities
     ITEM_QUALITY_ARTIFACT              = 6,                 //LIGHT YELLOW
     ITEM_QUALITY_HEIRLOOM              = 7
 };
-
 #define MAX_ITEM_QUALITY                 8
-
 enum SpellCategory
 {
     SPELL_CATEGORY_FOOD             = 11,
     SPELL_CATEGORY_DRINK            = 59,
 };
-
 const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
     0xff9d9d9d,        //GREY
     0xffffffff,        //WHITE
@@ -221,11 +191,9 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
     0xffe6cc80         //LIGHT YELLOW
 };
 
-
 // ***********************************
 // Spell Attributes definitions
 // ***********************************
-
 #define SPELL_ATTR_UNK0                           0x00000001            // 0
 #define SPELL_ATTR_REQ_AMMO                       0x00000002            // 1
 #define SPELL_ATTR_ON_NEXT_SWING                  0x00000004            // 2 on next swing
@@ -258,7 +226,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY  0x20000000            // 29 unaffected by invulnerability (hmm possible not...)
 #define SPELL_ATTR_BREAKABLE_BY_DAMAGE            0x40000000            // 30
 #define SPELL_ATTR_CANT_CANCEL                    0x80000000            // 31 positive aura can't be canceled
-
 #define SPELL_ATTR_EX_DISMISS_PET                 0x00000001            // 0 dismiss pet and not allow to summon new one?
 #define SPELL_ATTR_EX_DRAIN_ALL_POWER             0x00000002            // 1 use all power (Only paladin Lay of Hands and Bunyanize)
 #define SPELL_ATTR_EX_CHANNELED_1                 0x00000004            // 2 channeled target
@@ -291,7 +258,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX_UNK29                       0x20000000            // 29
 #define SPELL_ATTR_EX_UNK30                       0x40000000            // 30 overpower
 #define SPELL_ATTR_EX_UNK31                       0x80000000            // 31
-
 #define SPELL_ATTR_EX2_UNK0                       0x00000001            // 0
 #define SPELL_ATTR_EX2_UNK1                       0x00000002            // 1 ? many triggered spells have this flag
 #define SPELL_ATTR_EX2_CANT_REFLECTED             0x00000004            // 2 ? used for detect can or not spell reflected
@@ -324,7 +290,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX2_CANT_CRIT                  0x20000000            // 29 Spell can't crit
 #define SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER      0x40000000            // 30 spell can trigger even if triggered
 #define SPELL_ATTR_EX2_FOOD_BUFF                  0x80000000            // 31 Food or Drink Buff (like Well Fed)
-
 #define SPELL_ATTR_EX3_UNK0                       0x00000001            // 0
 #define SPELL_ATTR_EX3_UNK1                       0x00000002            // 1
 #define SPELL_ATTR_EX3_UNK2                       0x00000004            // 2
@@ -357,7 +322,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX3_UNK29                      0x20000000            // 29
 #define SPELL_ATTR_EX3_UNK30                      0x40000000            // 30
 #define SPELL_ATTR_EX3_UNK31                      0x80000000            // 31
-
 #define SPELL_ATTR_EX4_UNK0                       0x00000001            // 0
 #define SPELL_ATTR_EX4_UNK1                       0x00000002            // 1 proc on finishing move?
 #define SPELL_ATTR_EX4_UNK2                       0x00000004            // 2
@@ -390,7 +354,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX4_UNK29                      0x20000000            // 29
 #define SPELL_ATTR_EX4_UNK30                      0x40000000            // 30
 #define SPELL_ATTR_EX4_UNK31                      0x80000000            // 31
-
 #define SPELL_ATTR_EX5_UNK0                       0x00000001            // 0
 #define SPELL_ATTR_EX5_NO_REAGENT_WHILE_PREP      0x00000002            // 1 not need reagents if UNIT_FLAG_PREPARATION
 #define SPELL_ATTR_EX5_UNK2                       0x00000004            // 2
@@ -423,7 +386,6 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX5_UNK29                      0x20000000            // 29
 #define SPELL_ATTR_EX5_UNK30                      0x40000000            // 30
 #define SPELL_ATTR_EX5_UNK31                      0x80000000            // 31 Forces all nearby enemies to focus attacks caster
-
 #define SPELL_ATTR_EX6_UNK0                       0x00000001            // 0 Only Move spell have this flag
 #define SPELL_ATTR_EX6_ONLY_IN_ARENA              0x00000002            // 1 only usable in arena
 #define SPELL_ATTR_EX6_IGNORE_CASTER_AURAS        0x00000004            // 2
@@ -456,13 +418,11 @@ const uint32 ItemQualityColors[MAX_ITEM_QUALITY] = {
 #define SPELL_ATTR_EX6_UNK29                      0x20000000            // 29 not set in 3.0.3
 #define SPELL_ATTR_EX6_UNK30                      0x40000000            // 30 not set in 3.0.3
 #define SPELL_ATTR_EX6_UNK31                      0x80000000            // 31 not set in 3.0.3
-
 #define MIN_TALENT_SPEC         0
 #define MAX_TALENT_SPEC         1
 #define MIN_TALENT_SPECS        1
 #define MAX_TALENT_SPECS        2
 #define MAX_GLYPH_SLOT_INDEX    6
-
 // Custom values
 enum SpellClickUserTypes
 {
@@ -472,11 +432,9 @@ enum SpellClickUserTypes
     SPELL_CLICK_USER_PARTY = 3,
     SPELL_CLICK_USER_MAX = 4
 };
-
 #define NPC_CLICK_CAST_CASTER_PLAYER              0x01
 #define NPC_CLICK_CAST_TARGET_PLAYER              0x02
 #define NPC_CLICK_CAST_ORIG_CASTER_OWNER          0x04
-
 enum SheathTypes
 {
     SHEATHETYPE_NONE                   = 0,
@@ -488,9 +446,7 @@ enum SheathTypes
     SHEATHETYPE_HIPWEAPONRIGHT         = 6,
     SHEATHETYPE_SHIELD                 = 7
 };
-
 #define MAX_SHEATHETYPE                  8
-
 enum CharacterSlot
 {
     SLOT_HEAD                          = 0,
@@ -514,7 +470,6 @@ enum CharacterSlot
     SLOT_TABARD                        = 18,
     SLOT_EMPTY                         = 19
 };
-
 enum Language
 {
     LANG_UNIVERSAL      = 0,
@@ -537,16 +492,13 @@ enum Language
     LANG_GOBLIN_BINARY  = 38,
     LANG_ADDON          = 0xFFFFFFFF                        // used by addons, in 2.4.0 not exit, replaced by messagetype?
 };
-
 #define LANGUAGES_COUNT   19
-
 enum TeamId
 {
     TEAM_ALLIANCE = 0,
     TEAM_HORDE,
     TEAM_NEUTRAL,
 };
-
 enum Team
 {
     HORDE               = 67,
@@ -558,9 +510,7 @@ enum Team
     //TEAM_OUTLAND             = 980,
     TEAM_OTHER               = 0,                         // if ReputationListId > 0 && Flags != FACTION_FLAG_TEAM_HEADER
 };
-
 const Team TeamId2Team[3] = {ALLIANCE, HORDE, TEAM_OTHER};
-
 enum SpellEffects
 {
     SPELL_EFFECT_INSTAKILL                 = 1,
@@ -727,7 +677,6 @@ enum SpellEffects
     SPELL_EFFECT_TALENT_SPEC_SELECT        = 162,
     TOTAL_SPELL_EFFECTS                    = 163
 };
-
 enum SpellCastResult
 {
     SPELL_FAILED_AFFECTING_COMBAT               = 0x00,
@@ -916,10 +865,8 @@ enum SpellCastResult
     SPELL_FAILED_MAX_SOCKETS                    = 0xB7,
     SPELL_FAILED_PET_CAN_RENAME                 = 0xB8,
     SPELL_FAILED_UNKNOWN                        = 0xB9,
-
     SPELL_CAST_OK                               = 0xFF      // custom value, don't must be send to client
 };
-
 // Spell aura states
 enum AuraState
 {   // (C) used in caster aura state     (T) used in target aura state
@@ -951,10 +898,8 @@ enum AuraState
     //AURA_STATE_UNKNOWN22                  = 22,           // C   | not implemented yet (Requires Evasive Charges to use)
     AURA_STATE_HEALTH_ABOVE_75_PERCENT      = 23,           // C   |
 };
-
 #define PER_CASTER_AURA_STATE_MASK ( \
     (1<<(AURA_STATE_CONFLAGRATE-1))|(1<<(AURA_STATE_DEADLY_POISON-1)))
-
 // Spell mechanics
 enum Mechanics
 {
@@ -991,7 +936,6 @@ enum Mechanics
     MECHANIC_SAPPED           = 30,
     MECHANIC_ENRAGED          = 31
 };
-
 // Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967da6)
 #define IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK ( \
     (1<<MECHANIC_CHARM   )|(1<<MECHANIC_DISORIENTED )|(1<<MECHANIC_FEAR  )| \
@@ -1000,13 +944,11 @@ enum Mechanics
     (1<<MECHANIC_KNOCKOUT)|(1<<MECHANIC_POLYMORPH)|(1<<MECHANIC_BANISH)| \
     (1<<MECHANIC_SHACKLE )|(1<<MECHANIC_TURN     )|(1<<MECHANIC_HORROR)| \
     (1<<MECHANIC_DAZE    )|(1<<MECHANIC_SAPPED   ) )
-
 // Daze and all croud control spells except polymorph are not removed
 #define MECHANIC_NOT_REMOVED_BY_SHAPESHIFT ( \
     (1<<MECHANIC_CHARM )|(1<<MECHANIC_DISORIENTED)|(1<<MECHANIC_FEAR  )|(1<<MECHANIC_PACIFY )| \
     (1<<MECHANIC_STUN  )|(1<<MECHANIC_FREEZE     )|(1<<MECHANIC_BANISH)|(1<<MECHANIC_SHACKLE)| \
     (1<<MECHANIC_HORROR)|(1<<MECHANIC_TURN       )|(1<<MECHANIC_DAZE  )|(1<<MECHANIC_SAPPED ) )
-
 // Spell dispell type
 enum DispelType
 {
@@ -1023,9 +965,7 @@ enum DispelType
     DISPEL_ZG_TICKET    = 10,
     DESPEL_OLD_UNUSED   = 11
 };
-
 #define DISPEL_ALL_MASK ( (1<<DISPEL_MAGIC) | (1<<DISPEL_CURSE) | (1<<DISPEL_DISEASE) | (1<<DISPEL_POISON) )
-
 //To all Immune system,if target has immunes,
 //some spell that related to ImmuneToDispel or ImmuneToSchool or ImmuneToDamage type can't cast to it,
 //some spell_effects that related to ImmuneToEffect<effect>(only this effect in the spell) can't cast to it,
@@ -1040,9 +980,7 @@ enum SpellImmunity
     IMMUNITY_MECHANIC              = 5,                     // enum Mechanics
     IMMUNITY_ID                    = 6
 };
-
 #define MAX_SPELL_IMMUNITY           7
-
 enum Targets
 {
     TARGET_UNIT_CASTER                 = 1,
@@ -1142,9 +1080,7 @@ enum Targets
     TARGET_UNIT_PASSENGER              = 97,
     TARGET_UNIT_AREA_PATH              = 104,
 };
-
 #define TOTAL_SPELL_TARGETS              105
-
 enum SpellMissInfo
 {
     SPELL_MISS_NONE                    = 0,
@@ -1160,7 +1096,6 @@ enum SpellMissInfo
     SPELL_MISS_ABSORB                  = 10,
     SPELL_MISS_REFLECT                 = 11
 };
-
 enum SpellHitType
 {
     SPELL_HIT_TYPE_UNK1 = 0x00001,
@@ -1170,7 +1105,6 @@ enum SpellHitType
     SPELL_HIT_TYPE_UNK5 = 0x00010,                          // replace caster?
     SPELL_HIT_TYPE_UNK6 = 0x00020
 };
-
 enum SpellDmgClass
 {
     SPELL_DAMAGE_CLASS_NONE     = 0,
@@ -1178,14 +1112,12 @@ enum SpellDmgClass
     SPELL_DAMAGE_CLASS_MELEE    = 2,
     SPELL_DAMAGE_CLASS_RANGED   = 3
 };
-
 enum SpellPreventionType
 {
     SPELL_PREVENTION_TYPE_NONE      = 0,
     SPELL_PREVENTION_TYPE_SILENCE   = 1,
     SPELL_PREVENTION_TYPE_PACIFY    = 2
 };
-
 enum GameobjectTypes
 {
     GAMEOBJECT_TYPE_DOOR                   = 0,
@@ -1225,11 +1157,8 @@ enum GameobjectTypes
     GAMEOBJECT_TYPE_GUILD_BANK             = 34,
     GAMEOBJECT_TYPE_TRAPDOOR               = 35
 };
-
 #define MAX_GAMEOBJECT_TYPE                  36             // sending to client this or greater value can crash client.
-
 #define GAMEOBJECT_FISHINGNODE_ENTRY        35591           // Better to define it somewhere instead of hardcoding everywhere
-
 enum GameObjectFlags
 {
     GO_FLAG_IN_USE          = 0x00000001,                   //disables interaction while animated
@@ -1242,7 +1171,6 @@ enum GameObjectFlags
     GO_FLAG_DAMAGED         = 0x00000200,
     GO_FLAG_DESTROYED       = 0x00000400,
 };
-
 enum TextEmotes
 {
     TEXTEMOTE_AGREE                = 1,
@@ -1418,7 +1346,6 @@ enum TextEmotes
     TEXTEMOTE_EYEBROW              = 377,
     TEXTEMOTE_TOAST                = 378
 };
-
 enum Emote
 {
     EMOTE_ONESHOT_NONE                 = 0,
@@ -1587,7 +1514,6 @@ enum Emote
     EMOTE_ONESHOT_SPELLCAST_OMNI       = 463,
     EMOTE_STATE_READYTHROWN            = 464
 };
-
 enum Anim
 {
     ANIM_STAND                     = 0x0,
@@ -1735,7 +1661,6 @@ enum Anim
     ANIM_SPELL_KNEEL_END           = 0x8E,
     ANIM_SPRINT                    = 0x8F,
     ANIM_IN_FIGHT                  = 0x90,
-
     ANIM_GAMEOBJ_SPAWN             = 145,
     ANIM_GAMEOBJ_CLOSE             = 146,
     ANIM_GAMEOBJ_CLOSED            = 147,
@@ -1816,14 +1741,12 @@ enum Anim
     ANIM_CUSTOMSPELL10             = 222,
     ANIM_StealthRun                = 223
 };
-
 enum LockKeyType
 {
     LOCK_KEY_NONE  = 0,
     LOCK_KEY_ITEM  = 1,
     LOCK_KEY_SKILL = 2
 };
-
 enum LockType
 {
     LOCKTYPE_PICKLOCK              = 1,
@@ -1848,7 +1771,6 @@ enum LockType
     LOCKTYPE_INSCRIPTION           = 20,
     LOCKTYPE_OPEN_FROM_VEHICLE     = 21
 };
-
 enum TrainerType                                            // this is important type for npcs!
 {
     TRAINER_TYPE_CLASS             = 0,
@@ -1856,9 +1778,7 @@ enum TrainerType                                            // this is important
     TRAINER_TYPE_TRADESKILLS       = 2,
     TRAINER_TYPE_PETS              = 3
 };
-
 #define MAX_TRAINER_TYPE 4
-
 // CreatureType.dbc
 enum CreatureType
 {
@@ -1876,11 +1796,9 @@ enum CreatureType
     CREATURE_TYPE_NON_COMBAT_PET   = 12,
     CREATURE_TYPE_GAS_CLOUD        = 13
 };
-
 uint32 const CREATURE_TYPEMASK_DEMON_OR_UNDEAD = (1 << (CREATURE_TYPE_DEMON-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
 uint32 const CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD = (1 << (CREATURE_TYPE_HUMANOID-1)) | (1 << (CREATURE_TYPE_UNDEAD-1));
 uint32 const CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL = (1 << (CREATURE_TYPE_MECHANICAL-1)) | (1 << (CREATURE_TYPE_ELEMENTAL-1));
-
 // CreatureFamily.dbc
 enum CreatureFamily
 {
@@ -1926,7 +1844,6 @@ enum CreatureFamily
     CREATURE_FAMILY_CORE_HOUND     = 45,
     CREATURE_FAMILY_SPIRIT_BEAST   = 46
 };
-
 enum CreatureTypeFlags
 {
     CREATURE_TYPEFLAGS_TAMEABLE        = 0x00001,           //tameable by any hunter
@@ -1950,7 +1867,6 @@ enum CreatureTypeFlags
     CREATURE_TYPEFLAGS_UNK19           = 0x40000,           //? Related to veichle/siege weapons?
     CREATURE_TYPEFLAGS_UNK20           = 0x80000
 };
-
 enum CreatureEliteType
 {
     CREATURE_ELITE_NORMAL          = 0,
@@ -1960,7 +1876,6 @@ enum CreatureEliteType
     CREATURE_ELITE_RARE            = 4,
     CREATURE_UNKNOWN               = 5                      // found in 2.2.3 for 2 mobs
 };
-
 // values based at Holidays.dbc
 enum HolidayIds
 {
@@ -1985,7 +1900,6 @@ enum HolidayIds
     HOLIDAY_CALL_TO_ARMS_SA          = 400,
     HOLIDAY_WOTLK_LAUNCH             = 406
 };
-
 // values based at QuestInfo.dbc
 enum QuestTypes
 {
@@ -2001,7 +1915,6 @@ enum QuestTypes
     QUEST_TYPE_RAID_10             = 88,
     QUEST_TYPE_RAID_25             = 89
 };
-
 // values based at QuestSort.dbc
 enum QuestSort
 {
@@ -2044,7 +1957,6 @@ enum QuestSort
     QUEST_SORT_DEATH_KNIGHT        = 372,
     QUEST_SORT_JEWELCRAFTING       = 373
 };
-
 inline uint8 ClassByQuestSort(int32 QuestSort)
 {
     switch(QuestSort)
@@ -2062,11 +1974,9 @@ inline uint8 ClassByQuestSort(int32 QuestSort)
     }
     return 0;
 }
-
 enum SkillType
 {
     SKILL_NONE                     = 0,
-
     SKILL_FROST                    = 6,
     SKILL_FIRE                     = 8,
     SKILL_ARMS                     = 26,
@@ -2218,9 +2128,7 @@ enum SkillType
     SKILL_PET_EXOTIC_CORE_HOUND    = 787,
     SKILL_PET_EXOTIC_SPIRIT_BEAST  = 788
 };
-
 #define MAX_SKILL_TYPE               789
-
 inline SkillType SkillByLockType(LockType locktype)
 {
     switch(locktype)
@@ -2234,7 +2142,6 @@ inline SkillType SkillByLockType(LockType locktype)
     }
     return SKILL_NONE;
 }
-
 inline uint32 SkillByQuestSort(int32 QuestSort)
 {
     switch(QuestSort)
@@ -2253,7 +2160,6 @@ inline uint32 SkillByQuestSort(int32 QuestSort)
     }
     return 0;
 }
-
 enum SkillCategory
 {
     SKILL_CATEGORY_ATTRIBUTES    = 5,
@@ -2265,7 +2171,6 @@ enum SkillCategory
     SKILL_CATEGORY_PROFESSION    = 11,                      // primary professions
     SKILL_CATEGORY_GENERIC       = 12
 };
-
 enum TotemCategory
 {
     TC_SKINNING_SKIFE_OLD          = 1,
@@ -2301,7 +2206,6 @@ enum TotemCategory
     TC_RUNED_COBALT_ROD            = 189,
     TC_RUNED_TITANIUM_ROD          = 190
 };
-
 enum UnitDynFlags
 {
     UNIT_DYNFLAG_LOOTABLE          = 0x0001,
@@ -2312,12 +2216,10 @@ enum UnitDynFlags
     UNIT_DYNFLAG_DEAD              = 0x0020,
     UNIT_DYNFLAG_REFER_A_FRIEND    = 0x0040
 };
-
 enum CorpseDynFlags
 {
     CORPSE_DYNFLAG_LOOTABLE        = 0x0001
 };
-
 // Passive Spell codes explicit used in code
 #define SPELL_ID_GENERIC_LEARN                  483
 #define SPELL_ID_GENERIC_LEARN_PET              55884       // used for learning mounts and companions
@@ -2337,7 +2239,6 @@ enum CorpseDynFlags
 #define SPELL_ID_HONORLESS_TARGET               2479        // Honorless target
 #define SPELL_ID_DUEL_BEG                       7267        // Beg
 #define SPELL_ID_DEATH_GATE                     50977       // Death Gate
-
 enum WeatherType
 {
     WEATHER_TYPE_FINE       = 0,
@@ -2347,9 +2248,7 @@ enum WeatherType
     WEATHER_TYPE_THUNDERS   = 86,
     WEATHER_TYPE_BLACKRAIN  = 90
 };
-
 #define MAX_WEATHER_TYPE 4
-
 enum ChatMsg
 {
     CHAT_MSG_ADDON                  = 0xFFFFFFFF,
@@ -2404,9 +2303,7 @@ enum ChatMsg
     CHAT_MSG_ACHIEVEMENT            = 0x30,
     CHAT_MSG_GUILD_ACHIEVEMENT      = 0x31
 };
-
 #define MAX_CHAT_MSG_TYPE 0x32
-
 enum ChatLinkColors
 {
     CHAT_LINK_COLOR_TRADE       = 0xffffd000,   // orange
@@ -2416,7 +2313,6 @@ enum ChatLinkColors
     CHAT_LINK_COLOR_ACHIEVEMENT = 0xffffff00,
     CHAT_LINK_COLOR_GLYPH       = 0xff66bbff
 };
-
 // Values from ItemPetFood (power of (value-1) used for compare with CreatureFamilyEntry.petDietMask
 enum PetDiet
 {
@@ -2429,11 +2325,8 @@ enum PetDiet
     PET_DIET_RAW_MEAT = 7,
     PET_DIET_RAW_FISH = 8
 };
-
 #define MAX_PET_DIET 9
-
 #define CHAIN_SPELL_JUMP_RADIUS 10
-
 // Max values for Guild & Guild Bank
 #define GUILD_BANK_MAX_TABS         6
 #define GUILD_BANK_MAX_SLOTS        98
@@ -2442,7 +2335,6 @@ enum PetDiet
 #define GUILD_EVENTLOG_MAX_RECORDS  100
 #define GUILD_RANKS_MIN_COUNT       5
 #define GUILD_RANKS_MAX_COUNT       10
-
 enum AiReaction
 {
     AI_REACTION_UNK1    = 1,
@@ -2450,7 +2342,6 @@ enum AiReaction
     AI_REACTION_UNK3    = 3,
     AI_REACTION_UNK4    = 4
 };
-
 // Diminishing Returns Types
 enum DiminishingReturnsType
 {
@@ -2458,7 +2349,6 @@ enum DiminishingReturnsType
     DRTYPE_PLAYER       = 1,                                // this spell is diminished only when applied on players
     DRTYPE_ALL          = 2                                 // this spell is diminished in every case
 };
-
 // Diminishing Return Groups
 enum DiminishingGroup
 {
@@ -2485,14 +2375,12 @@ enum DiminishingGroup
     DIMINISHING_TAUNT,
     DIMINISHING_LIMITONLY               // Don't Diminish, but limit duration to 10s
 };
-
 enum DungeonDifficulties
 {
     DIFFICULTY_NORMAL = 0,
     DIFFICULTY_HEROIC = 1,
     TOTAL_DIFFICULTIES
 };
-
 enum SummonCategory
 {
     SUMMON_CATEGORY_WILD        = 0,
@@ -2501,7 +2389,6 @@ enum SummonCategory
     SUMMON_CATEGORY_PUPPET      = 3,
     SUMMON_CATEGORY_VEHICLE     = 4,
 };
-
 enum SummonType
 {
     SUMMON_TYPE_NONE        = 0,
@@ -2517,14 +2404,12 @@ enum SummonType
     SUMMON_TYPE_VEHICLE2    = 10,
     SUMMON_TYPE_OBJECT      = 11,
 };
-
 enum EventId
 {
     EVENT_SPELLCLICK        = 1001,
     EVENT_FALL_GROUND       = 1002,
     EVENT_CHARGE            = 1003,
 };
-
 enum ResponseCodes
 {
     RESPONSE_SUCCESS                                       = 0x00,
@@ -2534,13 +2419,11 @@ enum ResponseCodes
     RESPONSE_FAILED_TO_CONNECT                             = 0x04,
     RESPONSE_CONNECTED                                     = 0x05,
     RESPONSE_VERSION_MISMATCH                              = 0x06,
-
     CSTATUS_CONNECTING                                     = 0x07,
     CSTATUS_NEGOTIATING_SECURITY                           = 0x08,
     CSTATUS_NEGOTIATION_COMPLETE                           = 0x09,
     CSTATUS_NEGOTIATION_FAILED                             = 0x0A,
     CSTATUS_AUTHENTICATING                                 = 0x0B,
-
     AUTH_OK                                                = 0x0C,
     AUTH_FAILED                                            = 0x0D,
     AUTH_REJECT                                            = 0x0E,
@@ -2564,21 +2447,17 @@ enum ResponseCodes
     AUTH_SUSPENDED                                         = 0x20,
     AUTH_PARENTAL_CONTROL                                  = 0x21,
     AUTH_LOCKED_ENFORCED                                   = 0x22,
-
     REALM_LIST_IN_PROGRESS                                 = 0x23,
     REALM_LIST_SUCCESS                                     = 0x24,
     REALM_LIST_FAILED                                      = 0x25,
     REALM_LIST_INVALID                                     = 0x26,
     REALM_LIST_REALM_NOT_FOUND                             = 0x27,
-
     ACCOUNT_CREATE_IN_PROGRESS                             = 0x28,
     ACCOUNT_CREATE_SUCCESS                                 = 0x29,
     ACCOUNT_CREATE_FAILED                                  = 0x2A,
-
     CHAR_LIST_RETRIEVING                                   = 0x2B,
     CHAR_LIST_RETRIEVED                                    = 0x2C,
     CHAR_LIST_FAILED                                       = 0x2D,
-
     CHAR_CREATE_IN_PROGRESS                                = 0x2E,
     CHAR_CREATE_SUCCESS                                    = 0x2F,
     CHAR_CREATE_ERROR                                      = 0x30,
@@ -2594,14 +2473,12 @@ enum ResponseCodes
     CHAR_CREATE_EXPANSION_CLASS                            = 0x3A,
     CHAR_CREATE_LEVEL_REQUIREMENT                          = 0x3B,
     CHAR_CREATE_UNIQUE_CLASS_LIMIT                         = 0x3C,
-
     CHAR_DELETE_IN_PROGRESS                                = 0x3D,
     CHAR_DELETE_SUCCESS                                    = 0x3E,
     CHAR_DELETE_FAILED                                     = 0x3F,
     CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER                 = 0x40,
     CHAR_DELETE_FAILED_GUILD_LEADER                        = 0x41,
     CHAR_DELETE_FAILED_ARENA_CAPTAIN                       = 0x42,
-
     CHAR_LOGIN_IN_PROGRESS                                 = 0x43,
     CHAR_LOGIN_SUCCESS                                     = 0x44,
     CHAR_LOGIN_NO_WORLD                                    = 0x45,
@@ -2612,7 +2489,6 @@ enum ResponseCodes
     CHAR_LOGIN_NO_CHARACTER                                = 0x4A,
     CHAR_LOGIN_LOCKED_FOR_TRANSFER                         = 0x4B,
     CHAR_LOGIN_LOCKED_BY_BILLING                           = 0x4C,
-
     CHAR_NAME_SUCCESS                                      = 0x4D,
     CHAR_NAME_FAILURE                                      = 0x4E,
     CHAR_NAME_NO_NAME                                      = 0x4F,
@@ -2631,7 +2507,6 @@ enum ResponseCodes
     CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END = 0x5C,
     CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME            = 0x5D
 };
-
 /// Ban function modes
 enum BanMode
 {
@@ -2639,7 +2514,6 @@ enum BanMode
     BAN_CHARACTER,
     BAN_IP
 };
-
 /// Ban function return codes
 enum BanReturn
 {
@@ -2647,7 +2521,6 @@ enum BanReturn
     BAN_SYNTAX_ERROR,
     BAN_NOTFOUND
 };
-
 // indexes of BattlemasterList.dbc
 enum BattleGroundTypeId
 {
@@ -2665,7 +2538,6 @@ enum BattleGroundTypeId
     BATTLEGROUND_RV            = 11
 };
 #define MAX_BATTLEGROUND_TYPE_ID 12
-
 enum MailResponseType
 {
     MAIL_SEND               = 0,
@@ -2675,7 +2547,6 @@ enum MailResponseType
     MAIL_DELETED            = 4,
     MAIL_MADE_PERMANENT     = 5
 };
-
 enum MailResponseResult
 {
     MAIL_OK                            = 0,
@@ -2693,7 +2564,6 @@ enum MailResponseResult
     MAIL_ERR_MAIL_ATTACHMENT_INVALID   = 19,
     MAIL_ERR_ITEM_HAS_EXPIRED          = 21,
 };
-
 enum SpellFamilyNames
 {
     SPELLFAMILY_GENERIC     = 0,
@@ -2715,6 +2585,5 @@ enum SpellFamilyNames
     // 16 - unused
     SPELLFAMILY_PET         = 17
 };
-
 #endif
 
diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
index b1e16897b18..d30d25e2355 100644
--- a/src/game/SkillDiscovery.cpp
+++ b/src/game/SkillDiscovery.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
@@ -28,64 +27,48 @@
 #include "SpellMgr.h"
 #include "Player.h"
 #include <map>
-
 struct SkillDiscoveryEntry
 {
     uint32  spellId;                                        // discavered spell
     uint32  reqSkillValue;                                  // skill level limitation
     float   chance;                                         // chance
-
     SkillDiscoveryEntry()
         : spellId(0), reqSkillValue(0), chance(0) {}
-
     SkillDiscoveryEntry(uint32 _spellId, uint32 req_skill_val, float _chance)
         : spellId(_spellId), reqSkillValue(req_skill_val), chance(_chance) {}
 };
-
 typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList;
 typedef UNORDERED_MAP<int32, SkillDiscoveryList> SkillDiscoveryMap;
-
 static SkillDiscoveryMap SkillDiscoveryStore;
-
 void LoadSkillDiscoveryTable()
 {
-
     SkillDiscoveryStore.clear();                            // need for reload
-
     uint32 count = 0;
-
     //                                                0        1         2              3
     QueryResult *result = WorldDatabase.Query("SELECT spellId, reqSpell, reqSkillValue, chance FROM skill_discovery_template");
-
     if (!result)
     {
         sLog.outString();
         sLog.outString( ">> Loaded 0 skill discovery definitions. DB table `skill_discovery_template` is empty." );
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     std::ostringstream ssNonDiscoverableEntries;
     std::set<uint32> reportedReqSpells;
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 spellId         = fields[0].GetUInt32();
         int32  reqSkillOrSpell = fields[1].GetInt32();
         uint32 reqSkillValue   = fields[2].GetInt32();
         float  chance          = fields[3].GetFloat();
-
         if (chance <= 0)                                    // chance
         {
             ssNonDiscoverableEntries << "spellId = " << spellId << " reqSkillOrSpell = " << reqSkillOrSpell
                 << " reqSkillValue = " << reqSkillValue << " chance = " << chance << "(chance problem)\n";
             continue;
         }
-
         if (reqSkillOrSpell > 0)                            // spell case
         {
             SpellEntry const* reqSpellEntry = sSpellStore.LookupEntry(reqSkillOrSpell);
@@ -98,7 +81,6 @@ void LoadSkillDiscoveryTable()
                 }
                 continue;
             }
-
             // mechanic discovery
             if (reqSpellEntry->Mechanic != MECHANIC_DISCOVERY &&
                 // explicit discovery ability
@@ -113,19 +95,16 @@ void LoadSkillDiscoveryTable()
                 }
                 continue;
             }
-
             SkillDiscoveryStore[reqSkillOrSpell].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
         }
         else if (reqSkillOrSpell == 0)                      // skill case
         {
             SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellId);
-
             if (bounds.first==bounds.second)
             {
                 sLog.outErrorDb("Spell (ID: %u) not listed in `SkillLineAbility.dbc` but listed with `reqSpell`=0 in `skill_discovery_template` table",spellId);
                 continue;
             }
-
             for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
                 SkillDiscoveryStore[-int32(_spell_idx->second->skillId)].push_back( SkillDiscoveryEntry(spellId, reqSkillValue, chance) );
         }
@@ -134,33 +113,26 @@ void LoadSkillDiscoveryTable()
             sLog.outErrorDb("Spell (ID: %u) have negative value in `reqSpell` field in `skill_discovery_template` table",spellId);
             continue;
         }
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u skill discovery definitions", count );
     if (!ssNonDiscoverableEntries.str().empty())
         sLog.outErrorDb("Some items can't be successfully discovered: have in chance field value < 0.000001 in `skill_discovery_template` DB table . List:\n%s",ssNonDiscoverableEntries.str().c_str());
-
     // report about empty data for explicit discovery spells
     for(uint32 spell_id = 1; spell_id < sSpellStore.GetNumRows(); ++spell_id)
     {
         SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell_id);
         if (!spellEntry)
             continue;
-
         // skip not explicit discovery spells
         if (!IsExplicitDiscoverySpell(spellEntry))
             continue;
-
         if (SkillDiscoveryStore.find(spell_id)==SkillDiscoveryStore.end())
             sLog.outErrorDb("Spell (ID: %u) is 100%% chance random discovery ability but not have data in `skill_discovery_template` table",spell_id);
     }
 }
-
 uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
 {
     // explicit discovery spell chances (always success if case exist)
@@ -168,43 +140,32 @@ uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player)
     SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
     if (tab == SkillDiscoveryStore.end())
         return 0;
-
     SkillLineAbilityMapBounds bounds = spellmgr.GetSkillLineAbilityMapBounds(spellId);
     uint32 skillvalue = bounds.first != bounds.second ? player->GetSkillValue(bounds.first->second->skillId) : 0;
-
     float full_chance = 0;
     for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
         if (item_iter->reqSkillValue <= skillvalue)
             if (!player->HasSpell(item_iter->spellId))
                 full_chance += item_iter->chance;
-
     float rate = full_chance / 100.0f;
     float roll = rand_chance() * rate;                      // roll now in range 0..full_chance
-
     for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
     {
         if (item_iter->reqSkillValue > skillvalue)
             continue;
-
         if (player->HasSpell(item_iter->spellId))
             continue;
-
         if (item_iter->chance > roll)
             return item_iter->spellId;
-
         roll -= item_iter->chance;
     }
-
     return 0;
 }
-
 uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
 {
     uint32 skillvalue = skillId ? player->GetSkillValue(skillId) : 0;
-
     // check spell case
     SkillDiscoveryMap::const_iterator tab = SkillDiscoveryStore.find(spellId);
-
     if (tab != SkillDiscoveryStore.end())
     {
         for(SkillDiscoveryList::const_iterator item_iter = tab->second.begin(); item_iter != tab->second.end(); ++item_iter)
@@ -214,13 +175,10 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
                 !player->HasSpell(item_iter->spellId))
                 return item_iter->spellId;
         }
-
         return 0;
     }
-
     if (!skillId)
         return 0;
-
     // check skill line case
     tab = SkillDiscoveryStore.find(-(int32)skillId);
     if (tab != SkillDiscoveryStore.end())
@@ -232,10 +190,8 @@ uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player)
                 !player->HasSpell(item_iter->spellId))
                 return item_iter->spellId;
         }
-
         return 0;
     }
-
     return 0;
 }
 
diff --git a/src/game/SkillDiscovery.h b/src/game/SkillDiscovery.h
index 9981eb133f6..c63ac1503be 100644
--- a/src/game/SkillDiscovery.h
+++ b/src/game/SkillDiscovery.h
@@ -17,14 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_SKILLDISCOVERY_H
 #define TRINITY_SKILLDISCOVERY_H
-
 #include "Common.h"
-
 class Player;
-
 void LoadSkillDiscoveryTable();
 uint32 GetSkillDiscoverySpell(uint32 skillId, uint32 spellId, Player* player);
 uint32 GetExplicitDiscoverySpell(uint32 spellId, Player* player);
diff --git a/src/game/SkillExtraItems.cpp b/src/game/SkillExtraItems.cpp
index f0061f97c00..d5d1eb54c8d 100644
--- a/src/game/SkillExtraItems.cpp
+++ b/src/game/SkillExtraItems.cpp
@@ -17,17 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "SkillExtraItems.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Player.h"
 #include <map>
-
 // some type definitions
 // no use putting them in the header file, they're only used in this .cpp
-
 // struct to store information about extra item creation
 // one entry for every spell that is able to create an extra item
 struct SkillExtraItemEntry
@@ -38,78 +35,59 @@ struct SkillExtraItemEntry
     float additionalCreateChance;
     // maximum number of extra items created per crafting
     uint8 additionalMaxNum;
-
     SkillExtraItemEntry()
         : requiredSpecialization(0), additionalCreateChance(0.0f), additionalMaxNum(0) {}
-
     SkillExtraItemEntry(uint32 rS, float aCC, uint8 aMN)
         : requiredSpecialization(rS), additionalCreateChance(aCC), additionalMaxNum(aMN) {}
 };
-
 // map to store the extra item creation info, the key is the spellId of the creation spell, the mapped value is the assigned SkillExtraItemEntry
 typedef std::map<uint32,SkillExtraItemEntry> SkillExtraItemMap;
-
 SkillExtraItemMap SkillExtraItemStore;
-
 // loads the extra item creation info from DB
 void LoadSkillExtraItemTable()
 {
     uint32 count = 0;
-
     SkillExtraItemStore.clear();                            // need for reload
-
     //                                                 0        1                       2                       3
     QueryResult *result = WorldDatabase.Query("SELECT spellId, requiredSpecialization, additionalCreateChance, additionalMaxNum FROM skill_extra_item_template");
-
     if (result)
     {
         barGoLink bar(result->GetRowCount());
-
         do
         {
             Field *fields = result->Fetch();
             bar.step();
-
             uint32 spellId = fields[0].GetUInt32();
-
             if(!sSpellStore.LookupEntry(spellId))
             {
                 sLog.outError("Skill specialization %u has non-existent spell id in `skill_extra_item_template`!", spellId);
                 continue;
             }
-
             uint32 requiredSpecialization = fields[1].GetUInt32();
             if(!sSpellStore.LookupEntry(requiredSpecialization))
             {
                 sLog.outError("Skill specialization %u have not existed required specialization spell id %u in `skill_extra_item_template`!", spellId,requiredSpecialization);
                 continue;
             }
-
             float additionalCreateChance = fields[2].GetFloat();
             if(additionalCreateChance <= 0.0f)
             {
                 sLog.outError("Skill specialization %u has too low additional create chance in `skill_extra_item_template`!", spellId);
                 continue;
             }
-
             uint8 additionalMaxNum = fields[3].GetUInt8();
             if(!additionalMaxNum)
             {
                 sLog.outError("Skill specialization %u has 0 max number of extra items in `skill_extra_item_template`!", spellId);
                 continue;
             }
-
             SkillExtraItemEntry& skillExtraItemEntry = SkillExtraItemStore[spellId];
-
             skillExtraItemEntry.requiredSpecialization = requiredSpecialization;
             skillExtraItemEntry.additionalCreateChance = additionalCreateChance;
             skillExtraItemEntry.additionalMaxNum       = additionalMaxNum;
-
             ++count;
         } while (result->NextRow());
-
         delete result;
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell specialization definitions", count );
     }
@@ -119,28 +97,22 @@ void LoadSkillExtraItemTable()
         sLog.outString( ">> Loaded 0 spell specialization definitions. DB table `skill_extra_item_template` is empty." );
     }
 }
-
 bool canCreateExtraItems(Player * player, uint32 spellId, float &additionalChance, uint8 &additionalMax)
 {
     // get the info for the specified spell
     SkillExtraItemMap::const_iterator ret = SkillExtraItemStore.find(spellId);
     if(ret==SkillExtraItemStore.end())
         return false;
-
     SkillExtraItemEntry const* specEntry = &ret->second;
-
     // if no entry, then no extra items can be created
     if(!specEntry)
         return false;
-
     // the player doesn't have the required specialization, return false
     if(!player->HasSpell(specEntry->requiredSpecialization))
         return false;
-
     // set the arguments to the appropriate values
     additionalChance = specEntry->additionalCreateChance;
     additionalMax = specEntry->additionalMaxNum;
-
     // enable extra item creation
     return true;
 }
diff --git a/src/game/SkillExtraItems.h b/src/game/SkillExtraItems.h
index 3a44619a862..f1e39d1b982 100644
--- a/src/game/SkillExtraItems.h
+++ b/src/game/SkillExtraItems.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_SKILL_EXTRA_ITEMS_H
 #define TRINITY_SKILL_EXTRA_ITEMS_H
-
 #include "Common.h"
-
 // predef classes used in functions
 class Player;
 // returns true and sets the appropriate info if the player can create extra items with the given spellId
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
index e8ee75ab86b..949cb33a656 100644
--- a/src/game/SkillHandler.cpp
+++ b/src/game/SkillHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
@@ -27,52 +26,40 @@
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
 #include "UpdateMask.h"
-
 void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
 {
     uint32 talent_id, requested_rank;
     recv_data >> talent_id >> requested_rank;
-
     _player->LearnTalent(talent_id, requested_rank);
     _player->SendTalentsInfoData(false);
 }
-
 void WorldSession::HandleLearnPreviewTalents(WorldPacket& recvPacket)
 {
     sLog.outDebug("CMSG_LEARN_PREVIEW_TALENTS");
-
     uint32 talentsCount;
     recvPacket >> talentsCount;
-
     uint32 talentId, talentRank;
-
     for(uint32 i = 0; i < talentsCount; ++i)
     {
         recvPacket >> talentId >> talentRank;
-
         _player->LearnTalent(talentId, talentRank);
     }
-
     _player->SendTalentsInfoData(false);
 }
-
 void WorldSession::HandleTalentWipeConfirmOpcode( WorldPacket & recv_data )
 {
     sLog.outDetail("MSG_TALENT_WIPE_CONFIRM");
     uint64 guid;
     recv_data >> guid;
-
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid,UNIT_NPC_FLAG_TRAINER);
     if (!unit)
     {
         sLog.outDebug( "WORLD: HandleTalentWipeConfirmOpcode - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     if(!(_player->resetTalents()))
     {
         WorldPacket data( MSG_TALENT_WIPE_CONFIRM, 8+4);    //you have not any talent
@@ -81,11 +68,9 @@ void WorldSession::HandleTalentWipeConfirmOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     _player->SendTalentsInfoData(false);
     unit->CastSpell(_player, 14867, true);                  //spell: "Untalent Visual Effect"
 }
-
 void WorldSession::HandleUnlearnSkillOpcode(WorldPacket & recv_data)
 {
     uint32 skill_id;
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
index 2331b7ad839..6d016062e1b 100644
--- a/src/game/SocialMgr.cpp
+++ b/src/game/SocialMgr.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "SocialMgr.h"
 #include "Policies/SingletonImp.h"
 #include "Database/DatabaseEnv.h"
@@ -27,19 +26,15 @@
 #include "ObjectMgr.h"
 #include "World.h"
 #include "Util.h"
-
 INSTANTIATE_SINGLETON_1( SocialMgr );
-
 PlayerSocial::PlayerSocial()
 {
     m_playerGUID = 0;
 }
-
 PlayerSocial::~PlayerSocial()
 {
     m_playerSocialMap.clear();
 }
-
 uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag)
 {
     uint32 counter = 0;
@@ -50,7 +45,6 @@ uint32 PlayerSocial::GetNumberOfSocialsWithFlag(SocialFlag flag)
     }
     return counter;
 }
-
 bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore)
 {
     // check client limits
@@ -64,11 +58,9 @@ bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore)
         if(GetNumberOfSocialsWithFlag(SOCIAL_FLAG_FRIEND) >= SOCIALMGR_FRIEND_LIMIT)
             return false;
     }
-
     uint32 flag = SOCIAL_FLAG_FRIEND;
     if(ignore)
         flag = SOCIAL_FLAG_IGNORED;
-
     PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr != m_playerSocialMap.end())
     {
@@ -84,17 +76,14 @@ bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore)
     }
     return true;
 }
-
 void PlayerSocial::RemoveFromSocialList(uint32 friend_guid, bool ignore)
 {
     PlayerSocialMap::iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr == m_playerSocialMap.end())                      // not exist
         return;
-
     uint32 flag = SOCIAL_FLAG_FRIEND;
     if(ignore)
         flag = SOCIAL_FLAG_IGNORED;
-
     itr->second.Flags &= ~flag;
     if(itr->second.Flags == 0)
     {
@@ -106,36 +95,28 @@ void PlayerSocial::RemoveFromSocialList(uint32 friend_guid, bool ignore)
         CharacterDatabase.PExecute("UPDATE character_social SET flags = (flags & ~%u) WHERE guid = '%u' AND friend = '%u'", flag, GetPlayerGUID(), friend_guid);
     }
 }
-
 void PlayerSocial::SetFriendNote(uint32 friend_guid, std::string note)
 {
     PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid);
     if(itr == m_playerSocialMap.end())                      // not exist
         return;
-
     utf8truncate(note,48);                                  // DB and client size limitation
-
     CharacterDatabase.escape_string(note);
     CharacterDatabase.PExecute("UPDATE character_social SET note = '%s' WHERE guid = '%u' AND friend = '%u'", note.c_str(), GetPlayerGUID(), friend_guid);
     m_playerSocialMap[friend_guid].Note = note;
 }
-
 void PlayerSocial::SendSocialList()
 {
     Player *plr = objmgr.GetPlayer(GetPlayerGUID());
     if(!plr)
         return;
-
     uint32 size = m_playerSocialMap.size();
-
     WorldPacket data(SMSG_CONTACT_LIST, (4+4+size*25));     // just can guess size
     data << uint32(7);                                      // unk flag (0x1, 0x2, 0x4), 0x7 if it include ignore list
     data << uint32(size);                                   // friends count
-
     for(PlayerSocialMap::iterator itr = m_playerSocialMap.begin(); itr != m_playerSocialMap.end(); ++itr)
     {
         sSocialMgr.GetFriendInfo(plr, itr->first, itr->second);
-
         data << uint64(itr->first);                         // player guid
         data << uint32(itr->second.Flags);                  // player flag (0x1-friend?, 0x2-ignored?, 0x4-muted?)
         data << itr->second.Note;                           // string note
@@ -150,11 +131,9 @@ void PlayerSocial::SendSocialList()
             }
         }
     }
-
     plr->GetSession()->SendPacket(&data);
     sLog.outDebug("WORLD: Sent SMSG_CONTACT_LIST");
 }
-
 bool PlayerSocial::HasFriend(uint32 friend_guid)
 {
     PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(friend_guid);
@@ -162,7 +141,6 @@ bool PlayerSocial::HasFriend(uint32 friend_guid)
         return itr->second.Flags & SOCIAL_FLAG_FRIEND;
     return false;
 }
-
 bool PlayerSocial::HasIgnore(uint32 ignore_guid)
 {
     PlayerSocialMap::const_iterator itr = m_playerSocialMap.find(ignore_guid);
@@ -170,40 +148,30 @@ bool PlayerSocial::HasIgnore(uint32 ignore_guid)
         return itr->second.Flags & SOCIAL_FLAG_IGNORED;
     return false;
 }
-
 SocialMgr::SocialMgr()
 {
-
 }
-
 SocialMgr::~SocialMgr()
 {
-
 }
-
 void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo)
 {
     if(!player)
         return;
-
     friendInfo.Status = FRIEND_STATUS_OFFLINE;
     friendInfo.Area = 0;
     friendInfo.Level = 0;
     friendInfo.Class = 0;
-
     Player *pFriend = ObjectAccessor::FindPlayer(friendGUID);
     if(!pFriend)
         return;
-
     uint32 team = player->GetTeam();
     AccountTypes security = player->GetSession()->GetSecurity();
     bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST);
     AccountTypes gmLevelInWhoList = AccountTypes (sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST));
-
     PlayerSocialMap::iterator itr = player->GetSocial()->m_playerSocialMap.find(friendGUID);
     if(itr != player->GetSocial()->m_playerSocialMap.end())
         friendInfo.Note = itr->second.Note;
-
     // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
     // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
     if (pFriend && pFriend->GetName() &&
@@ -221,18 +189,15 @@ void SocialMgr::GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &fri
         friendInfo.Class = pFriend->getClass();
     }
 }
-
 void SocialMgr::MakeFriendStatusPacket(FriendsResult result, uint32 guid, WorldPacket *data)
 {
     data->Initialize(SMSG_FRIEND_STATUS, 5);
     *data << uint8(result);
     *data << uint64(guid);
 }
-
 void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 friend_guid, bool broadcast)
 {
     FriendInfo fi;
-
     WorldPacket data;
     MakeFriendStatusPacket(result, friend_guid, &data);
     GetFriendInfo(player, friend_guid, fi);
@@ -245,7 +210,6 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr
         default:
             break;
     }
-
     switch(result)
     {
         case FRIEND_ADDED_ONLINE:
@@ -258,31 +222,26 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr
         default:
             break;
     }
-
     if(broadcast)
         BroadcastToFriendListers(player, &data);
     else
         player->GetSession()->SendPacket(&data);
 }
-
 void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet)
 {
     if(!player)
         return;
-
     uint32 team     = player->GetTeam();
     AccountTypes security = player->GetSession()->GetSecurity();
     uint32 guid     = player->GetGUIDLow();
     AccountTypes gmLevelInWhoList = AccountTypes(sWorld.getConfig(CONFIG_GM_LEVEL_IN_WHO_LIST));
     bool allowTwoSideWhoList = sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_WHO_LIST);
-
     for(SocialMap::const_iterator itr = m_socialMap.begin(); itr != m_socialMap.end(); ++itr)
     {
         PlayerSocialMap::const_iterator itr2 = itr->second.m_playerSocialMap.find(guid);
         if(itr2 != itr->second.m_playerSocialMap.end() && (itr2->second.Flags & SOCIAL_FLAG_FRIEND))
         {
             Player *pFriend = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER));
-
             // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
             // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
             if (pFriend && pFriend->IsInWorld() &&
@@ -295,29 +254,22 @@ void SocialMgr::BroadcastToFriendListers(Player *player, WorldPacket *packet)
         }
     }
 }
-
 PlayerSocial *SocialMgr::LoadFromDB(QueryResult *result, uint32 guid)
 {
     PlayerSocial *social = &m_socialMap[guid];
     social->SetPlayerGUID(guid);
-
     if(!result)
         return social;
-
     uint32 friend_guid = 0;
     uint32 flags = 0;
     std::string note = "";
-
     do
     {
         Field *fields  = result->Fetch();
-
         friend_guid = fields[0].GetUInt32();
         flags = fields[1].GetUInt32();
         note = fields[2].GetCppString();
-
         social->m_playerSocialMap[friend_guid] = FriendInfo(flags, note);
-
         // client limit
         if(social->m_playerSocialMap.size() >= 50)
             break;
diff --git a/src/game/SocialMgr.h b/src/game/SocialMgr.h
index 1ca04d69707..736667c3e0b 100644
--- a/src/game/SocialMgr.h
+++ b/src/game/SocialMgr.h
@@ -17,19 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __TRINITY_SOCIALMGR_H
 #define __TRINITY_SOCIALMGR_H
-
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "Common.h"
-
 class SocialMgr;
 class PlayerSocial;
 class Player;
 class WorldPacket;
-
 enum FriendStatus
 {
     FRIEND_STATUS_OFFLINE   = 0,
@@ -38,14 +34,12 @@ enum FriendStatus
     FRIEND_STATUS_UNK3      = 3,
     FRIEND_STATUS_DND       = 4
 };
-
 enum SocialFlag
 {
     SOCIAL_FLAG_FRIEND      = 0x01,
     SOCIAL_FLAG_IGNORED     = 0x02,
     SOCIAL_FLAG_MUTED       = 0x04                          // guessed
 };
-
 struct FriendInfo
 {
     FriendStatus Status;
@@ -54,7 +48,6 @@ struct FriendInfo
     uint32 Level;
     uint32 Class;
     std::string Note;
-
     FriendInfo()
     {
         Status = FRIEND_STATUS_OFFLINE;
@@ -64,7 +57,6 @@ struct FriendInfo
         Class = 0;
         Note = "";
     }
-
     FriendInfo(uint32 flags, const std::string& note)
     {
         Status = FRIEND_STATUS_OFFLINE;
@@ -75,10 +67,8 @@ struct FriendInfo
         Note = note;
     }
 };
-
 typedef std::map<uint32, FriendInfo> PlayerSocialMap;
 typedef std::map<uint32, PlayerSocial> SocialMap;
-
 /// Results of friend related commands
 enum FriendsResult
 {
@@ -110,10 +100,8 @@ enum FriendsResult
     FRIEND_UNK7             = 0x19,                         // no message at client
     FRIEND_UNKNOWN          = 0x1A                          // Unknown friend response from server
 };
-
 #define SOCIALMGR_FRIEND_LIMIT  50
 #define SOCIALMGR_IGNORE_LIMIT  25
-
 class PlayerSocial
 {
     friend class SocialMgr;
@@ -136,7 +124,6 @@ class PlayerSocial
         PlayerSocialMap m_playerSocialMap;
         uint32 m_playerGUID;
 };
-
 class SocialMgr
 {
     public:
@@ -144,7 +131,6 @@ class SocialMgr
         ~SocialMgr();
         // Misc
         void RemovePlayerSocial(uint32 guid) { m_socialMap.erase(guid); }
-
         void GetFriendInfo(Player *player, uint32 friendGUID, FriendInfo &friendInfo);
         // Packet management
         void MakeFriendStatusPacket(FriendsResult result, uint32 friend_guid, WorldPacket *data);
@@ -155,7 +141,6 @@ class SocialMgr
     private:
         SocialMap m_socialMap;
 };
-
 #define sSocialMgr Trinity::Singleton<SocialMgr>::Instance()
 #endif
 
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index cb0236967ab..9690f131427 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -50,20 +49,15 @@
 #include "TemporarySummon.h"
 #include "Vehicle.h"
 #include "ScriptCalls.h"
-
 #define SPELL_CHANNEL_UPDATE_INTERVAL (1 * IN_MILISECONDS)
-
 extern pEffect SpellEffects[TOTAL_SPELL_EFFECTS];
-
 bool IsQuestTameSpell(uint32 spellId)
 {
     SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
     if (!spellproto) return false;
-
     return spellproto->Effect[0] == SPELL_EFFECT_THREAT
         && spellproto->Effect[1] == SPELL_EFFECT_APPLY_AURA && spellproto->EffectApplyAuraName[1] == SPELL_AURA_DUMMY;
 }
-
 class PrioritizeManaUnitWraper
 {
     public:
@@ -78,7 +72,6 @@ class PrioritizeManaUnitWraper
         Unit* i_unit;
         uint32 i_percent;
 };
-
 struct PrioritizeMana
 {
     int operator()( PrioritizeManaUnitWraper const& x, PrioritizeManaUnitWraper const& y ) const
@@ -86,9 +79,7 @@ struct PrioritizeMana
         return x.getPercent() > y.getPercent();
     }
 };
-
 typedef std::priority_queue<PrioritizeManaUnitWraper, std::vector<PrioritizeManaUnitWraper>, PrioritizeMana> PrioritizeManaUnitQueue;
-
 class PrioritizeHealthUnitWraper
 {
 public:
@@ -102,7 +93,6 @@ private:
     Unit* i_unit;
     uint32 i_percent;
 };
-
 struct PrioritizeHealth
 {
     int operator()( PrioritizeHealthUnitWraper const& x, PrioritizeHealthUnitWraper const& y ) const
@@ -110,46 +100,37 @@ struct PrioritizeHealth
         return x.getPercent() > y.getPercent();
     }
 };
-
 typedef std::priority_queue<PrioritizeHealthUnitWraper, std::vector<PrioritizeHealthUnitWraper>, PrioritizeHealth> PrioritizeHealthUnitQueue;
-
 SpellCastTargets::SpellCastTargets() : m_elevation(0), m_speed(0)
 {
     m_unitTarget = NULL;
     m_itemTarget = NULL;
     m_GOTarget   = NULL;
-
     m_unitTargetGUID   = 0;
     m_GOTargetGUID     = 0;
     m_CorpseTargetGUID = 0;
     m_itemTargetGUID   = 0;
     m_itemTargetEntry  = 0;
-
     m_srcPos.Relocate(0,0,0,0);
     m_strTarget = "";
     m_targetMask = 0;
 }
-
 SpellCastTargets::~SpellCastTargets()
 {
 }
-
 void SpellCastTargets::setUnitTarget(Unit *target)
 {
     if (!target)
         return;
-
     m_unitTarget = target;
     m_unitTargetGUID = target->GetGUID();
     m_targetMask |= TARGET_FLAG_UNIT;
 }
-
 void SpellCastTargets::setSrc(float x, float y, float z)
 {
     m_srcPos.Relocate(x, y, z);
     m_targetMask |= TARGET_FLAG_SOURCE_LOCATION;
 }
-
 void SpellCastTargets::setSrc(Position *pos)
 {
     if(pos)
@@ -158,7 +139,6 @@ void SpellCastTargets::setSrc(Position *pos)
         m_targetMask |= TARGET_FLAG_SOURCE_LOCATION;
     }
 }
-
 void SpellCastTargets::setDst(float x, float y, float z, uint32 mapId)
 {
     m_dstPos.Relocate(x, y, z);
@@ -166,7 +146,6 @@ void SpellCastTargets::setDst(float x, float y, float z, uint32 mapId)
     if(mapId != MAPID_INVALID)
         m_dstPos.m_mapId = mapId;
 }
-
 void SpellCastTargets::setDst(Position *pos)
 {
     if(pos)
@@ -175,37 +154,31 @@ void SpellCastTargets::setDst(Position *pos)
         m_targetMask |= TARGET_FLAG_DEST_LOCATION;
     }
 }
-
 void SpellCastTargets::setGOTarget(GameObject *target)
 {
     m_GOTarget = target;
     m_GOTargetGUID = target->GetGUID();
     //    m_targetMask |= TARGET_FLAG_OBJECT;
 }
-
 void SpellCastTargets::setItemTarget(Item* item)
 {
     if(!item)
         return;
-
     m_itemTarget = item;
     m_itemTargetGUID = item->GetGUID();
     m_itemTargetEntry = item->GetEntry();
     m_targetMask |= TARGET_FLAG_ITEM;
 }
-
 void SpellCastTargets::setCorpseTarget(Corpse* corpse)
 {
     m_CorpseTargetGUID = corpse->GetGUID();
 }
-
 void SpellCastTargets::Update(Unit* caster)
 {
     m_GOTarget   = m_GOTargetGUID ? caster->GetMap()->GetGameObject(m_GOTargetGUID) : NULL;
     m_unitTarget = m_unitTargetGUID ?
         ( m_unitTargetGUID == caster->GetGUID() ? caster : ObjectAccessor::GetUnit(*caster, m_unitTargetGUID) ) :
     NULL;
-
     m_itemTarget = NULL;
     if(caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -222,61 +195,47 @@ void SpellCastTargets::Update(Unit* caster)
             m_itemTargetEntry = m_itemTarget->GetEntry();
     }
 }
-
 bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
 {
     if(data->rpos() + 4 > data->size())
         return false;
-
     //data->hexlike();
-
     *data >> m_targetMask;
     //sLog.outDebug("Spell read, target mask = %u", m_targetMask);
-
     if(m_targetMask == TARGET_FLAG_SELF)
         return true;
-
     // TARGET_FLAG_UNK2 is used for non-combat pets, maybe other?
     if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_UNK2 ))
         if(!data->readPackGUID(m_unitTargetGUID))
             return false;
-
     if( m_targetMask & ( TARGET_FLAG_OBJECT ))
         if(!data->readPackGUID(m_GOTargetGUID))
             return false;
-
     if(( m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM )) && caster->GetTypeId() == TYPEID_PLAYER)
         if(!data->readPackGUID(m_itemTargetGUID))
             return false;
-
     if( m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
         if(!data->readPackGUID(m_CorpseTargetGUID))
             return false;
-
     if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION )
     {
         if(data->rpos() + 4 + 4 + 4 > data->size())
             return false;
-
         *data >> m_srcPos.m_positionX >> m_srcPos.m_positionY >> m_srcPos.m_positionZ;
         if(!m_srcPos.IsPositionValid())
             return false;
     }
     else
         m_srcPos.Relocate(caster);
-
     if( m_targetMask & TARGET_FLAG_DEST_LOCATION )
     {
         if(data->rpos() + 1 + 4 + 4 + 4 > data->size())
             return false;
-
         if(!data->readPackGUID(m_unitTargetGUID))
             return false;
-
         *data >> m_dstPos.m_positionX >> m_dstPos.m_positionY >> m_dstPos.m_positionZ;
         if(!m_dstPos.IsPositionValid())
             return false;
-
         if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION )
         {
             if(data->rpos() + 4 + 4 <= data->size())
@@ -291,25 +250,20 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
     }
     else
         m_dstPos.Relocate(caster);
-
     if( m_targetMask & TARGET_FLAG_STRING )
     {
         if(data->rpos() + 1 > data->size())
             return false;
-
         *data >> m_strTarget;
     }
-
     // find real units/GOs
     Update(caster);
     return true;
 }
-
 void SpellCastTargets::write ( WorldPacket * data )
 {
     *data << uint32(m_targetMask);
     //sLog.outDebug("Spell write, target mask = %u", m_targetMask);
-
     if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_PVP_CORPSE | TARGET_FLAG_OBJECT | TARGET_FLAG_CORPSE | TARGET_FLAG_UNK2 ) )
     {
         if(m_targetMask & TARGET_FLAG_UNIT)
@@ -331,7 +285,6 @@ void SpellCastTargets::write ( WorldPacket * data )
         else
             *data << uint8(0);
     }
-
     if( m_targetMask & ( TARGET_FLAG_ITEM | TARGET_FLAG_TRADE_ITEM ) )
     {
         if(m_itemTarget)
@@ -339,24 +292,19 @@ void SpellCastTargets::write ( WorldPacket * data )
         else
             *data << uint8(0);
     }
-
     if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION )
         *data << m_srcPos.m_positionX << m_srcPos.m_positionY << m_srcPos.m_positionZ;
-
     if( m_targetMask & TARGET_FLAG_DEST_LOCATION )
     {
         if(m_unitTarget)
             data->append(m_unitTarget->GetPackGUID());
         else
             *data << uint8(0);
-
         *data << m_dstPos.m_positionX << m_dstPos.m_positionY << m_dstPos.m_positionZ;
     }
-
     if( m_targetMask & TARGET_FLAG_STRING )
         *data << m_strTarget;
 }
-
 Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 originalCasterGUID, Spell** triggeringContainer, bool skipCheck )
 : m_spellInfo(info), m_spellValue(new SpellValue(m_spellInfo))
 , m_caster(Caster)
@@ -371,13 +319,10 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
     m_comboPointGain = 0;
     m_delayStart = 0;
     m_delayAtDamageCount = 0;
-
     m_canTrigger=true;
-
     m_applyMultiplierMask = 0;
     m_effectMask = 0;
     m_auraScaleMask = 0;
-
     // Get data for type of attack
     switch (m_spellInfo->DmgClass)
     {
@@ -398,9 +343,7 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
                 m_attackType = BASE_ATTACK;
             break;
     }
-
     m_spellSchoolMask = GetSpellSchoolMask(info);           // Can be override for some spell (wand shoot for example)
-
     if(m_attackType == RANGED_ATTACK)
     {
         // wand case
@@ -412,12 +355,10 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
     }
     // Set health leech amount to zero
     m_healthLeech = 0;
-
     if(originalCasterGUID)
         m_originalCasterGUID = originalCasterGUID;
     else
         m_originalCasterGUID = m_caster->GetGUID();
-
     if(m_originalCasterGUID == m_caster->GetGUID())
         m_originalCaster = m_caster;
     else
@@ -425,17 +366,13 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
         m_originalCaster = ObjectAccessor::GetUnit(*m_caster, m_originalCasterGUID);
         if(m_originalCaster && !m_originalCaster->IsInWorld()) m_originalCaster = NULL;
     }
-
     for(int i=0; i <3; ++i)
         m_currentBasePoints[i] = m_spellValue->EffectBasePoints[i];
-
     m_spellState = SPELL_STATE_NULL;
-
     m_TriggerSpells.clear();
     m_IsTriggeredSpell = triggered;
     //m_AreaAura = false;
     m_CastItem = NULL;
-
     unitTarget = NULL;
     itemTarget = NULL;
     gameObjTarget = NULL;
@@ -446,78 +383,61 @@ Spell::Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 origi
     m_triggeredByAuraSpell  = NULL;
     m_spellAura = NULL;
     m_spellDynObj = NULL;
-
     //Auto Shot & Shoot (wand)
     m_autoRepeat = IsAutoRepeatRangedSpell(m_spellInfo);
-
     m_runesState = 0;
     m_powerCost = 0;                                        // setup to correct value in Spell::prepare, don't must be used before.
     m_casttime = 0;                                         // setup to correct value in Spell::prepare, don't must be used before.
     m_timer = 0;                                            // will set to castime in prepare
-
     m_needAliveTargetMask = 0;
-
     // determine reflection
     m_canReflect = false;
-
     if(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC && !IsAreaOfEffectSpell(m_spellInfo) && !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_CANT_REFLECTED))
     {
         for(int j = 0;j < 3; ++j)
         {
             if (m_spellInfo->Effect[j] == 0)
                 continue;
-
             if(!IsPositiveTarget(m_spellInfo->EffectImplicitTargetA[j], m_spellInfo->EffectImplicitTargetB[j]))
                 m_canReflect = true;
             else
                 m_canReflect = (m_spellInfo->AttributesEx & SPELL_ATTR_EX_NEGATIVE) ? true : false;
-
             if(m_canReflect)
                 continue;
             else
                 break;
         }
     }
-
     CleanupTargetList();
 }
-
 Spell::~Spell()
 {
     if(m_caster && m_caster->GetTypeId() == TYPEID_PLAYER)
         assert(((Player*)m_caster)->m_spellModTakingSpell != this);
     delete m_spellValue;
 }
-
 template<typename T>
 WorldObject* Spell::FindCorpseUsing()
 {
     // non-standard target selection
     float max_range = GetSpellMaxRange(m_spellInfo, false);
-
     CellPair p(MaNGOS::ComputeCellPair(m_caster->GetPositionX(), m_caster->GetPositionY()));
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
     cell.SetNoCreate();
-
     WorldObject* result = NULL;
-
     T u_check(m_caster, max_range);
     MaNGOS::WorldObjectSearcher<T> searcher(m_caster, result, u_check);
-
     TypeContainerVisitor<MaNGOS::WorldObjectSearcher<T>, GridTypeMapContainer > grid_searcher(searcher);
     CellLock<GridReadGuard> cell_lock(cell, p);
     cell_lock->Visit(cell_lock, grid_searcher, *m_caster->GetMap(), *m_caster, max_range);
-
     if (!result)
     {
         TypeContainerVisitor<MaNGOS::WorldObjectSearcher<T>, WorldTypeMapContainer > world_searcher(searcher);
         cell_lock->Visit(cell_lock, world_searcher, *m_caster->GetMap(), *m_caster, max_range);
     }
-
     return result;
 }
-
 void Spell::SelectSpellTargets()
 {
     for(uint32 i = 0; i < 3; ++i)
@@ -526,21 +446,16 @@ void Spell::SelectSpellTargets()
         // Also some spells use not used effect targets for store targets for dummy effect in triggered spells
         if(!m_spellInfo->Effect[i])
             continue;
-
         uint32 effectTargetType = EffectTargetType[m_spellInfo->Effect[i]];
-
         // is it possible that areaaura is not applied to caster?
         if(effectTargetType == SPELL_REQUIRE_NONE)
             continue;
-
         uint32 targetA = m_spellInfo->EffectImplicitTargetA[i];
         uint32 targetB = m_spellInfo->EffectImplicitTargetB[i];
-
         if(targetA)
             SelectEffectTargets(i, targetA);
         if(targetB) // In very rare case !A && B
             SelectEffectTargets(i, targetB);
-
         if(effectTargetType != SPELL_REQUIRE_UNIT)
         {
             if(effectTargetType == SPELL_REQUIRE_CASTER)
@@ -552,13 +467,11 @@ void Spell::SelectSpellTargets()
             }
             continue;
         }
-
         if(/*tmpUnitMap.empty() && */m_spellInfo->Targets & TARGET_FLAG_CASTER)
         {
             AddUnitTarget(m_caster, i);
             continue;
         }
-
         if(!targetA && !targetB)
         {
             if(!GetSpellMaxRangeForFriend(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex)))
@@ -566,7 +479,6 @@ void Spell::SelectSpellTargets()
                 AddUnitTarget(m_caster, i);
                 continue;
             }
-
             // add here custom effects that need default target.
             // FOR EVERY TARGET TYPE THERE IS A DIFFERENT FILL!!
             switch(m_spellInfo->Effect[i])
@@ -578,7 +490,6 @@ void Spell::SelectSpellTargets()
                         case 20577:                         // Cannibalize
                         {
                             WorldObject* result = FindCorpseUsing<MaNGOS::CannibalizeObjectCheck> ();
-
                             if(result)
                             {
                                 switch(result->GetTypeId())
@@ -746,7 +657,6 @@ void Spell::SelectSpellTargets()
             }
         }
     }
-
     if(m_targets.HasDst())
     {
         if(m_targets.HasTraj())
@@ -762,7 +672,6 @@ void Spell::SelectSpellTargets()
         }
     }
 }
-
 void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
 {
     //==========================================================================================
@@ -770,7 +679,6 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
     // can spell trigger another or not ( m_canTrigger )
     // Create base triggers flags for Attacker and Victim ( m_procAttacker, m_procVictim and m_procEx)
     //==========================================================================================
-
     m_procVictim = m_procAttacker = 0;
     // Get data for type of attack and fill base info for trigger
     switch (m_spellInfo->DmgClass)
@@ -793,7 +701,7 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
             }
             break;
         default:
-            if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && 
+            if (m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON &&
                 m_spellInfo->EquippedItemSubClassMask & (1<<ITEM_SUBCLASS_WEAPON_WAND)
                 && m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG) // Wands auto attack
             {
@@ -804,7 +712,6 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
             // Because spell positivity is dependant on target
     }
     m_procEx= PROC_EX_NONE;
-
     // Hunter traps spells (for Entrapment trigger)
     // Gives your Immolation Trap, Frost Trap, Explosive Trap, and Snake Trap ....
     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && (m_spellInfo->SpellFamilyFlags[1] & 0x00002000 || m_spellInfo->SpellFamilyFlags[0] & 0x1C))
@@ -822,11 +729,10 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
     {
         m_canTrigger=false;
     }
-
     // Ranged autorepeat attack is set as triggered spell - ignore it
     if (!(m_procAttacker & PROC_FLAG_SUCCESSFUL_RANGED_HIT))
     {
-        if (m_IsTriggeredSpell && 
+        if (m_IsTriggeredSpell &&
             (m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_TRIGGERED_CAN_TRIGGER ||
             m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_TRIGGERED_CAN_TRIGGER_2))
             m_procEx |= PROC_EX_INTERNAL_CANT_PROC;
@@ -839,7 +745,6 @@ void Spell::prepareDataForTriggerSystem(AuraEffect * triggeredByAura)
         m_procEx |= PROC_EX_INTERNAL_REQ_FAMILY;
     }
 }
-
 void Spell::CleanupTargetList()
 {
     m_UniqueTargetInfo.clear();
@@ -847,20 +752,15 @@ void Spell::CleanupTargetList()
     m_UniqueItemInfo.clear();
     m_delayMoment = 0;
 }
-
 void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex)
 {
     if( m_spellInfo->Effect[effIndex] == 0 )
         return;
-
     if(!CheckTarget(pVictim, effIndex))
         return;
-
     // Check for effect immune skip if immuned
     bool immuned = pVictim->IsImmunedToSpellEffect(m_spellInfo, effIndex);
-
     uint64 targetGUID = pVictim->GetGUID();
-
     // Lookup target in already in list
     for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
@@ -878,9 +778,7 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex)
             return;
         }
     }
-
     // This is new target calculate data for him
-
     // Get spell hit result on target
     TargetInfo target;
     target.targetGUID = targetGUID;                         // Store target GUID
@@ -896,7 +794,6 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex)
         if ((pVictim->getLevel() + 10) >= auraSpell->spellLevel)
             target.scaleAura = true;
     }
-
     // Calculate hit result
     if(m_originalCaster)
     {
@@ -906,57 +803,46 @@ void Spell::AddUnitTarget(Unit* pVictim, uint32 effIndex)
     }
     else
         target.missCondition = SPELL_MISS_EVADE; //SPELL_MISS_NONE;
-
     // Spell have speed - need calculate incoming time
     if (m_spellInfo->speed > 0.0f)
     {
         // calculate spell incoming interval
         // TODO: this is a hack
         float dist = m_caster->GetDistance(pVictim->GetPositionX(), pVictim->GetPositionY(), pVictim->GetPositionZ());
-
         if (dist < 5.0f) dist = 5.0f;
         target.timeDelay = (uint64) floor(dist / m_spellInfo->speed * 1000.0f);
-
         // Calculate minimum incoming time
         if (m_delayMoment == 0 || m_delayMoment>target.timeDelay)
             m_delayMoment = target.timeDelay;
     }
     else
         target.timeDelay = 0LL;
-
     // If target reflect spell back to caster
     if (target.missCondition == SPELL_MISS_REFLECT)
     {
         // Calculate reflected spell result on caster
         target.reflectResult =  m_caster->SpellHitResult(m_caster, m_spellInfo, m_canReflect);
-
         if (target.reflectResult == SPELL_MISS_REFLECT)     // Impossible reflect again, so simply deflect spell
             target.reflectResult = SPELL_MISS_PARRY;
-
         // Increase time interval for reflected spells by 1.5
         target.timeDelay += target.timeDelay >> 1;
     }
     else
         target.reflectResult = SPELL_MISS_NONE;
-
     // Add target to list
     m_UniqueTargetInfo.push_back(target);
 }
-
 void Spell::AddUnitTarget(uint64 unitGUID, uint32 effIndex)
 {
     Unit* unit = m_caster->GetGUID() == unitGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, unitGUID);
     if (unit)
         AddUnitTarget(unit, effIndex);
 }
-
 void Spell::AddGOTarget(GameObject* pVictim, uint32 effIndex)
 {
     if( m_spellInfo->Effect[effIndex] == 0 )
         return;
-
     uint64 targetGUID = pVictim->GetGUID();
-
     // Lookup target in already in list
     for(std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit)
     {
@@ -966,14 +852,11 @@ void Spell::AddGOTarget(GameObject* pVictim, uint32 effIndex)
             return;
         }
     }
-
     // This is new target calculate data for him
-
     GOTargetInfo target;
     target.targetGUID = targetGUID;
     target.effectMask = 1 << effIndex;
     target.processed  = false;                              // Effects not apply on target
-
     // Spell have speed - need calculate incoming time
     if (m_spellInfo->speed > 0.0f)
     {
@@ -986,23 +869,19 @@ void Spell::AddGOTarget(GameObject* pVictim, uint32 effIndex)
     }
     else
         target.timeDelay = 0LL;
-
     // Add target to list
     m_UniqueGOTargetInfo.push_back(target);
 }
-
 void Spell::AddGOTarget(uint64 goGUID, uint32 effIndex)
 {
     GameObject* go = m_caster->GetMap()->GetGameObject(goGUID);
     if (go)
         AddGOTarget(go, effIndex);
 }
-
 void Spell::AddItemTarget(Item* pitem, uint32 effIndex)
 {
     if( m_spellInfo->Effect[effIndex] == 0 )
         return;
-
     // Lookup target in already in list
     for(std::list<ItemTargetInfo>::iterator ihit = m_UniqueItemInfo.begin(); ihit != m_UniqueItemInfo.end(); ++ihit)
     {
@@ -1012,60 +891,45 @@ void Spell::AddItemTarget(Item* pitem, uint32 effIndex)
             return;
         }
     }
-
     // This is new target add data
-
     ItemTargetInfo target;
     target.item       = pitem;
     target.effectMask = 1 << effIndex;
     m_UniqueItemInfo.push_back(target);
 }
-
 void Spell::DoAllEffectOnTarget(TargetInfo *target)
 {
-    if (target->processed)                                  // Check target
+    if (!target || target->processed)                       // Check target
         return;
     target->processed = true;                               // Target checked in apply effects procedure
-
     // Get mask of effects for target
     uint32 mask = target->effectMask;
-
     Unit* unit = m_caster->GetGUID()==target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster,target->targetGUID);
     if (!unit)
         return;
-
     if(unit->isAlive() != target->alive)
         return;
-
     // Get original caster (if exist) and calculate damage/healing from him data
     Unit *caster = m_originalCaster ? m_originalCaster : m_caster;
-
     // Skip if m_originalCaster not avaiable
     if (!caster)
         return;
-
     SpellMissInfo missInfo = target->missCondition;
-
     // Need init unitTarget by default unit (can changed in code on reflect)
     // Or on missInfo!=SPELL_MISS_NONE unitTarget undefined (but need in trigger subsystem)
     unitTarget = unit;
-
     // Reset damage/healing counter
     m_damage = target->damage;
     m_healing = -target->damage;
-
     // Fill base trigger info
     uint32 procAttacker = m_procAttacker;
     uint32 procVictim   = m_procVictim;
     uint32 procEx = m_procEx;
-
     m_spellAura = NULL; // Set aura to null for every target-make sure that pointer is not used for unit without aura applied
-
                             //Spells with this flag cannot trigger if effect is casted on self
                             // Slice and Dice, relentless strikes, eviscerate
     bool canEffectTrigger = m_canTrigger && (m_spellInfo->AttributesEx4 & (SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST) ? m_caster!=unitTarget : true);
     Unit * spellHitTarget = NULL;
-
     if (missInfo==SPELL_MISS_NONE)                          // In case spell hit target, do all effect on that target
         spellHitTarget = unit;
     else if (missInfo == SPELL_MISS_REFLECT)                // In case spell reflect from target, do all effect on caster (if hit)
@@ -1077,7 +941,6 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
                 ((Creature*)m_caster)->LowerPlayerDamageReq(target->damage);
         }
     }
-
     if(spellHitTarget)
     {
         SpellMissInfo missInfo = DoSpellHitOnUnit(spellHitTarget, mask, target->scaleAura);
@@ -1089,12 +952,10 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
             spellHitTarget = NULL;
         }
     }
-
     // Do not take combo points on dodge
     if (m_needComboPoints && m_targets.getUnitTargetGUID() == target->targetGUID)
         if( missInfo != SPELL_MISS_NONE && missInfo != SPELL_MISS_MISS)
             m_needComboPoints = false;
-
     // Trigger info was not filled in spell::preparedatafortriggersystem - we do it now
     if (canEffectTrigger && !procAttacker && !procVictim)
     {
@@ -1152,14 +1013,11 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         }
         else
             procEx |= PROC_EX_NORMAL_HIT;
-
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (canEffectTrigger && missInfo != SPELL_MISS_REFLECT)
             caster->ProcDamageAndSpell(unitTarget, procAttacker, procVictim, procEx, addhealth, m_attackType, m_spellInfo, m_triggeredByAuraSpell);
-
         if (m_spellAura)
             m_spellAura->SetProcDamage(addhealth);
-
         int32 gain = caster->DealHeal(unitTarget, addhealth, m_spellInfo, crit);
         unitTarget->getHostilRefManager().threatAssist(caster, float(gain) * 0.5f, m_spellInfo);
     }
@@ -1168,17 +1026,13 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
     {
         // Fill base damage struct (unitTarget - is real spell target)
         SpellNonMeleeDamage damageInfo(caster, unitTarget, m_spellInfo->Id, m_spellSchoolMask);
-
         // Add bonuses and fill damageInfo struct
         caster->CalculateSpellDamageTaken(&damageInfo, m_damage, m_spellInfo, m_attackType,  target->crit);
         caster->DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb);
-
         // Send log damage message to client
         caster->SendSpellNonMeleeDamageLog(&damageInfo);
-
         procEx |= createProcExtendMask(&damageInfo, missInfo);
         procVictim |= PROC_FLAG_TAKEN_ANY_DAMAGE;
-
         // Do triggers for unit (reflect triggers passed on hit phase for correct drop charge)
         if (canEffectTrigger && missInfo != SPELL_MISS_REFLECT)
         {
@@ -1187,11 +1041,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
                (m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE || m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_RANGED))
                 ((Player *)caster)->CastItemCombatSpell(unitTarget, m_attackType, procVictim, procEx);
         }
-
         if (m_spellAura)
             m_spellAura->SetProcDamage(damageInfo.damage);
         caster->DealSpellDamage(&damageInfo, true);
-
     }
     // Passive spell hits/misses or active spells only misses (only triggers)
     else
@@ -1203,16 +1055,13 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         if (canEffectTrigger && missInfo != SPELL_MISS_REFLECT)
             caster->ProcDamageAndSpell(unit, procAttacker, procVictim, procEx, 0, m_attackType, m_spellInfo, m_triggeredByAuraSpell);
     }
-
     if(m_caster && !m_caster->IsFriendlyTo(unit) && !IsPositiveSpell(m_spellInfo->Id))
     {
         m_caster->CombatStart(unit, !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO));
-
         if(m_customAttr & SPELL_ATTR_CU_AURA_CC)
             if(!unit->IsStandState())
                 unit->SetStandState(UNIT_STAND_STATE_STAND);
     }
-
     if(spellHitTarget)
     {
         //AI functions
@@ -1220,50 +1069,40 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         {
             if(((Creature*)spellHitTarget)->IsAIEnabled)
                 ((Creature*)spellHitTarget)->AI()->SpellHit(m_caster, m_spellInfo);
-
             // cast at creature (or GO) quest objectives update at successful cast finished (+channel finished)
             // ignore pets or autorepeat/melee casts for speed (not exist quest for spells (hm... )
             if(m_originalCaster && m_originalCaster->IsControlledByPlayer() && !((Creature*)spellHitTarget)->isPet() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive())
                 if(Player* p = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself())
                     p->CastedCreatureOrGO(spellHitTarget->GetEntry(),spellHitTarget->GetGUID(),m_spellInfo->Id);
         }
-
         if(m_caster && m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->IsAIEnabled)
             ((Creature*)m_caster)->AI()->SpellHitTarget(spellHitTarget, m_spellInfo);
-
         // Needs to be called after dealing damage/healing to not remove breaking on damage auras
         DoTriggersOnSpellHit(spellHitTarget);
-        
         // if target is fallged for pvp also flag caster if a player
         if(unit->IsPvP())
         {
             if (m_caster->GetTypeId() == TYPEID_PLAYER)
             ((Player*)m_caster)->UpdatePvP(true);
         }
-
     }
 }
-
 SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool scaleAura)
 {
     if(!unit || !effectMask)
         return SPELL_MISS_EVADE;
-
     // Recheck immune (only for delayed spells)
     if(m_spellInfo->speed && (unit->IsImmunedToDamage(m_spellInfo) || unit->IsImmunedToSpell(m_spellInfo)))
         return SPELL_MISS_IMMUNE;
-
     if (unit->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, m_spellInfo->Id);
         ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET2, m_spellInfo->Id);
     }
-
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL2, m_spellInfo->Id, 0, unit);
     }
-
     if( m_caster != unit )
     {
         // Recheck  UNIT_FLAG_NON_ATTACKABLE for delayed spells
@@ -1273,7 +1112,6 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
         {
             return SPELL_MISS_EVADE;
         }
-
         if( !m_caster->IsFriendlyTo(unit) )
         {
             // reset damage to 0 if target has Invisibility or Vanish aura (_only_ vanish, not stealth) and isn't visible for caster
@@ -1288,7 +1126,6 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
                 // return SPELL_MISS_EVADE;
                 return SPELL_MISS_MISS; // miss = do not send anything here
             }
-
             unit->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_HITBYSPELL);
             //TODO: This is a hack. But we do not know what types of stealth should be interrupted by CC
             if((m_customAttr & SPELL_ATTR_CU_AURA_CC) && unit->IsControlledByPlayer())
@@ -1302,7 +1139,6 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
             {
                 return SPELL_MISS_EVADE;
             }
-
             // assisting case, healing and resurrection
             if(unit->hasUnitState(UNIT_STAT_ATTACK_PLAYER))
             {
@@ -1317,7 +1153,6 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
             }
         }
     }
-
     // Get Data Needed for Diminishing Returns, some effects may have multiple auras, so this must be done on spell hit, not aura add
     if(m_diminishGroup = GetDiminishingReturnsGroupForSpell(m_spellInfo,m_triggeredByAuraSpell))
     {
@@ -1327,12 +1162,10 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
         if((type == DRTYPE_PLAYER && (unit->GetTypeId() == TYPEID_PLAYER || ((Creature*)unit)->isPet() || ((Creature*)unit)->isPossessedByPlayer())) || type == DRTYPE_ALL)
             unit->IncrDiminishing(m_diminishGroup);
     }
-
     uint8 aura_effmask = 0;
     for (uint8 i = 0; i < 3; ++i)
         if (effectMask & (1<<i) && (m_spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA || IsAreaAuraEffect(m_spellInfo->Effect[i])))
             aura_effmask |= 1<<i;
-
     if (aura_effmask)
     {
         // Select rank for aura with level requirements only in specific cases
@@ -1355,11 +1188,9 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
                 basePoints[i] = m_currentBasePoints[i];
             }
         }
-
         if(m_originalCaster)
         {
             Aura *Aur = new Aura(aurSpellInfo, aura_effmask, unit, m_caster, m_originalCaster, basePoints, m_CastItem);
-
         if (!Aur->IsAreaAura())
         {
             // Now Reduce spell duration using data received at spell hit
@@ -1367,19 +1198,15 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
             int32 limitduration = GetDiminishingReturnsLimitDuration(m_diminishGroup,aurSpellInfo);
             unitTarget->ApplyDiminishingToDuration(m_diminishGroup, duration, m_originalCaster, m_diminishLevel,limitduration);
             Aur->setDiminishGroup(m_diminishGroup);
-
             duration = m_originalCaster->ModSpellDuration(aurSpellInfo, unit, duration, Aur->IsPositive());
-
             //mod duration of channeled aura by spell haste
             if (IsChanneledSpell(m_spellInfo))
                 m_originalCaster->ModSpellCastTime(aurSpellInfo, duration, this);
-
             if(duration != Aur->GetAuraMaxDuration())
             {
                 Aur->SetAuraMaxDuration(duration);
                 Aur->SetAuraDuration(duration);
             }
-
             // Prayer of Mending (jump animation), we need formal caster instead original for correct animation
             if( aurSpellInfo->SpellFamilyName == SPELLFAMILY_PRIEST)
             {
@@ -1390,19 +1217,15 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit *unit, const uint32 effectMask, bool
         // Set aura only when successfully applied
         if (unit->AddAura(Aur, false))
             m_spellAura = Aur;
-
         }
     }
-
     for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber)
     {
         if (effectMask & (1<<effectNumber))
             HandleEffects(unit,NULL,NULL,effectNumber);
     }
-
     return SPELL_MISS_NONE;
 }
-
 void Spell::DoTriggersOnSpellHit(Unit *unit)
 {
     // Apply additional spell effects to target
@@ -1420,7 +1243,6 @@ void Spell::DoTriggersOnSpellHit(Unit *unit)
         else
             m_caster->CastSpell(unit,m_preCastSpell, true, m_CastItem);
     }
-
     // spells with this flag can trigger only if not selfcast (eviscerate for example)
     if (m_ChanceTriggerSpells.size() && (!((m_spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CANT_PROC_FROM_SELFCAST) && unit==m_caster)))
     {
@@ -1450,7 +1272,6 @@ void Spell::DoTriggersOnSpellHit(Unit *unit)
             }
         }
     }
-
     if(m_customAttr & SPELL_ATTR_CU_LINK_HIT)
     {
         if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id + SPELL_LINK_HIT))
@@ -1461,25 +1282,20 @@ void Spell::DoTriggersOnSpellHit(Unit *unit)
                     unit->CastSpell(unit, *i, true, 0, 0, m_caster->GetGUID());
     }
 }
-
 void Spell::DoAllEffectOnTarget(GOTargetInfo *target)
 {
     if (target->processed)                                  // Check target
         return;
     target->processed = true;                               // Target checked in apply effects procedure
-
     uint32 effectMask = target->effectMask;
     if(!effectMask)
         return;
-
     GameObject* go = m_caster->GetMap()->GetGameObject(target->targetGUID);
     if(!go)
         return;
-
     for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber)
         if (effectMask & (1 << effectNumber))
             HandleEffects(NULL, NULL, go, effectNumber);
-
     // cast at creature (or GO) quest objectives update at successful cast finished (+channel finished)
     // ignore autorepeat/melee casts for speed (not exist quest for spells (hm... )
     if(m_originalCaster && m_originalCaster->IsControlledByPlayer() && !IsAutoRepeat() && !IsNextMeleeSwingSpell() && !IsChannelActive() )
@@ -1488,32 +1304,26 @@ void Spell::DoAllEffectOnTarget(GOTargetInfo *target)
             p->CastedCreatureOrGO(go->GetEntry(),go->GetGUID(),m_spellInfo->Id);
     }
 }
-
 void Spell::DoAllEffectOnTarget(ItemTargetInfo *target)
 {
     uint32 effectMask = target->effectMask;
     if(!target->item || !effectMask)
         return;
-
     for(uint32 effectNumber = 0; effectNumber < 3; ++effectNumber)
         if (effectMask & (1 << effectNumber))
             HandleEffects(NULL, target->item, NULL, effectNumber);
 }
-
 bool Spell::UpdateChanneledTargetList()
 {
     // Not need check return true
     if (m_needAliveTargetMask == 0)
         return true;
-
     uint8 needAliveTargetMask = m_needAliveTargetMask;
     uint8 needAuraMask = 0;
     for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
         if (m_spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA)
             needAuraMask |= 1<<i;
-
     needAuraMask &= needAliveTargetMask;
-
     float range;
     if(needAuraMask)
     {
@@ -1521,13 +1331,11 @@ bool Spell::UpdateChanneledTargetList()
         if(Player * modOwner = m_caster->GetSpellModOwner())
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this);
     }
-
     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
         if( ihit->missCondition == SPELL_MISS_NONE && (needAliveTargetMask & ihit->effectMask) )
         {
             Unit *unit = m_caster->GetGUID() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID);
-
             if (unit && unit->isAlive())
             {
                 if (needAuraMask & ihit->effectMask)
@@ -1544,16 +1352,13 @@ bool Spell::UpdateChanneledTargetList()
                     else // aura is dispelled
                         continue;
                 }
-
                 needAliveTargetMask &= ~ihit->effectMask;   // remove from need alive mask effect that have alive target
             }
         }
     }
-
     // is all effects from m_needAliveTargetMask have alive targets
     return needAliveTargetMask == 0;
 }
-
 // Helper for Chain Healing
 // Spell target first
 // Raidmates then descending by injury suffered (MaxHealth - Health)
@@ -1567,7 +1372,6 @@ struct ChainHealingOrder : public std::binary_function<const Unit*, const Unit*,
     {
         return (ChainHealingHash(_Left) < ChainHealingHash(_Right));
     }
-
     int32 ChainHealingHash(Unit const* Target) const
     {
         /*if (Target == MainTarget)
@@ -1584,7 +1388,6 @@ struct ChainHealingOrder : public std::binary_function<const Unit*, const Unit*,
             return 40000 - Target->GetMaxHealth() + Target->GetHealth();
     }
 };
-
 // Helper for targets nearest to the spell target
 // The spell target is always first unless there is a target at _completely_ the same position (unbelievable case)
 struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit, bool>
@@ -1597,13 +1400,11 @@ struct TargetDistanceOrder : public std::binary_function<const Unit, const Unit,
         return MainTarget->GetDistanceOrder(_Left,_Right);
     }
 };
-
 void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uint32 num, SpellTargets TargetType)
 {
     Unit *cur = m_targets.getUnitTarget();
     if(!cur)
         return;
-
     // Get spell max affected targets
     /*uint32 unMaxTargets = m_spellInfo->MaxAffectedTargets;
     Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_MOD_MAX_AFFECTED_TARGETS);
@@ -1613,11 +1414,9 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin
             continue;
         unMaxTargets+=(*m)->GetAmount();
     }*/
-
     //FIXME: This very like horrible hack and wrong for most spells
     if(m_spellInfo->DmgClass != SPELL_DAMAGE_CLASS_MELEE)
         max_range += num * CHAIN_SPELL_JUMP_RADIUS;
-
     std::list<Unit*> tempUnitMap;
     if(TargetType == SPELL_TARGETS_CHAINHEAL)
     {
@@ -1629,17 +1428,13 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin
     else
         SearchAreaTarget(tempUnitMap, max_range, PUSH_CHAIN, TargetType);
     tempUnitMap.remove(cur);
-
     while(num)
     {
         TagUnitMap.push_back(cur);
         --num;
-
         if(tempUnitMap.empty())
             break;
-
         std::list<Unit*>::iterator next;
-
         if(TargetType == SPELL_TARGETS_CHAINHEAL)
         {
             next = tempUnitMap.begin();
@@ -1655,7 +1450,6 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin
         {
             tempUnitMap.sort(TargetDistanceOrder(cur));
             next = tempUnitMap.begin();
-
             if(cur->GetDistance(*next) > CHAIN_SPELL_JUMP_RADIUS)
                 break;
             while(m_spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MELEE
@@ -1668,12 +1462,10 @@ void Spell::SearchChainTarget(std::list<Unit*> &TagUnitMap, float max_range, uin
                     return;
             }
         }
-
         cur = *next;
         tempUnitMap.erase(next);
     }
 }
-
 void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, SpellNotifyPushType type, SpellTargets TargetType, uint32 entry)
 {
     Position *pos;
@@ -1702,18 +1494,15 @@ void Spell::SearchAreaTarget(std::list<Unit*> &TagUnitMap, float radius, SpellNo
             pos = m_caster;
             break;
     }
-
     Trinity::SpellNotifierCreatureAndPlayer notifier(m_caster, TagUnitMap, radius, type, TargetType, pos, entry);
     if((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_PLAYERS_ONLY)
         || TargetType == SPELL_TARGETS_ENTRY && !entry)
         m_caster->GetMap()->VisitWorld(pos->m_positionX, pos->m_positionY, radius, notifier);
     else
         m_caster->GetMap()->VisitAll(pos->m_positionX, pos->m_positionY, radius, notifier);
-
     if(m_customAttr & SPELL_ATTR_CU_EXCLUDE_SELF)
         TagUnitMap.remove(m_caster);
 }
-
 WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
 {
     switch(TargetType)
@@ -1729,10 +1518,8 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
                 else
                     return SearchNearbyTarget(range, SPELL_TARGETS_ENEMY);
             }
-
             Creature* creatureScriptTarget = NULL;
             GameObject* goScriptTarget = NULL;
-
             for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
             {
                 switch(i_spellST->second.type)
@@ -1782,7 +1569,6 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
                         break;
                 }
             }
-
             if(creatureScriptTarget)
                 return creatureScriptTarget;
             else
@@ -1807,14 +1593,12 @@ WorldObject* Spell::SearchNearbyTarget(float range, SpellTargets TargetType)
         }
     }
 }
-
 void Spell::SelectEffectTargets(uint32 i, uint32 cur)
 {
     SpellNotifyPushType pushType = PUSH_NONE;
     Player *modOwner = NULL;
     if(m_originalCaster)
         modOwner = m_originalCaster->GetSpellModOwner();
-
     switch(SpellTargetType[cur])
     {
         case TARGET_TYPE_UNIT_CASTER:
@@ -1859,7 +1643,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             }
             break;
         }
-
         case TARGET_TYPE_UNIT_TARGET:
         {
             Unit *target = m_targets.getUnitTarget();
@@ -1868,7 +1651,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 sLog.outError("SPELL: no unit target for spell ID %u", m_spellInfo->Id);
                 break;
             }
-
             switch(cur)
             {
                 case TARGET_UNIT_TARGET_ENEMY:
@@ -1900,12 +1682,10 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             }
             break;
         }
-
         case TARGET_TYPE_UNIT_NEARBY:
         {
             WorldObject *target = NULL;
             float range;
-
             switch(cur)
             {
                 case TARGET_UNIT_NEARBY_ENEMY:
@@ -1926,7 +1706,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                     target = SearchNearbyTarget(range, SPELL_TARGETS_ENTRY);
                     break;
             }
-
             if(!target)
                 return;
             else if(target->GetTypeId() == TYPEID_GAMEOBJECT)
@@ -1934,22 +1713,17 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             else
             {
                 pushType = PUSH_CHAIN;
-
                 if(m_targets.getUnitTarget() != target)
                     m_targets.setUnitTarget((Unit*)target);
             }
-
             break;
         }
-
         case TARGET_TYPE_AREA_SRC:
             pushType = PUSH_SRC_CENTER;
             break;
-
         case TARGET_TYPE_AREA_DST:
             pushType = PUSH_DST_CENTER;
             break;
-
         case TARGET_TYPE_AREA_CONE:
             if(m_customAttr & SPELL_ATTR_CU_CONE_BACK)
                 pushType = PUSH_IN_BACK;
@@ -1958,7 +1732,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             else
                 pushType = PUSH_IN_FRONT;
             break;
-           
         case TARGET_TYPE_DEST_CASTER: //4+8+2
         {
             if(cur == TARGET_SRC_CASTER)
@@ -1971,16 +1744,13 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 m_targets.setDst(m_caster);
                 break;
             }
-
             float angle, dist;
-
             float objSize = m_caster->GetObjectSize();
             dist = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
             if(dist < objSize)
                 dist = objSize;
             else if(cur == TARGET_DEST_CASTER_RANDOM)
                 dist = objSize + (dist - objSize) * rand_norm();
-
             switch(cur)
             {
                 case TARGET_DEST_CASTER_FRONT_LEFT: angle = -M_PI/4;    break;
@@ -1995,13 +1765,11 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 case TARGET_DEST_CASTER_LEFT:       angle = -M_PI/2;    break;
                 default:                            angle = rand_norm()*2*M_PI; break;
             }
-
             Position pos;
             m_caster->GetNearPosition(pos, dist, angle);
             m_targets.setDst(&pos); // also flag
             break;
         }
-
         case TARGET_TYPE_DEST_TARGET: //2+8+2
         {
             Unit *target = m_targets.getUnitTarget();
@@ -2010,22 +1778,18 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 sLog.outError("SPELL: no unit target for spell ID %u\n", m_spellInfo->Id);
                 break;
             }
-
             if(cur == TARGET_DST_TARGET_ENEMY || cur == TARGET_DEST_TARGET_ANY)
             {
                 m_targets.setDst(target);
                 break;
             }
-
             float angle, dist;
-
             float objSize = target->GetObjectSize();
             dist = target->GetSpellRadiusForTarget(target, sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
             if(dist < objSize)
                 dist = objSize;
             else if(cur == TARGET_DEST_CASTER_RANDOM)
                 dist = objSize + (dist - objSize) * rand_norm();
-
             switch(cur)
             {
                 case TARGET_DEST_TARGET_FRONT:      angle = 0.0f;       break;
@@ -2038,13 +1802,11 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 case TARGET_DEST_TARGET_FRONT_RIGHT:angle = M_PI/4;     break;
                 default:                            angle = rand_norm()*2*M_PI; break;
             }
-
             Position pos;
             target->GetNearPosition(pos, dist, angle);
             m_targets.setDst(&pos);
             break;
         }
-
         case TARGET_TYPE_DEST_DEST: //5+8+1
         {
             if(!m_targets.HasDst())
@@ -2052,7 +1814,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 sLog.outError("SPELL: no destination for spell ID %u\n", m_spellInfo->Id);
                 break;
             }
-
             float angle;
             switch(cur)
             {
@@ -2074,17 +1835,14 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 case TARGET_DEST_DEST_FRONT_RIGHT:angle = M_PI/4;     break;
                 default:                          angle = rand_norm()*2*M_PI; break;
             }
-
             float dist;
             dist = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
             if (cur == TARGET_DEST_DEST_RANDOM)
                 dist *= rand_norm();
-
             // must has dst, no need to set flag
             m_caster->MovePosition(m_targets.m_dstPos, dist, angle);
             break;
         }
-
         case TARGET_TYPE_DEST_SPECIAL:
         {
             switch(cur)
@@ -2117,7 +1875,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 {
                     float range = GetSpellMaxRange(m_spellInfo, IsPositiveSpell(m_spellInfo->Id));
                     if(modOwner) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, range, this);
-
                     if(WorldObject *target = SearchNearbyTarget(range, SPELL_TARGETS_ENTRY))
                         m_targets.setDst(target);
                     break;
@@ -2125,7 +1882,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             }
             break;
         }
-
         case TARGET_TYPE_CHANNEL:
         {
             if(!m_originalCaster || !m_originalCaster->GetCurrentSpell(CURRENT_CHANNELED_SPELL))
@@ -2133,7 +1889,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 sLog.outError( "SPELL: no current channeled spell for spell ID %u", m_spellInfo->Id );
                 break;
             }
-
             switch(cur)
             {
                 case TARGET_UNIT_CHANNEL:
@@ -2154,7 +1909,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             }
             break;
         }
-
         default:
         {
             switch(cur)
@@ -2177,7 +1931,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             break;
         }
     }
-
     if(pushType == PUSH_CHAIN) // Chain
     {
         Unit *target = m_targets.getUnitTarget();
@@ -2186,21 +1939,17 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
             sLog.outError("SPELL: no chain unit target for spell ID %u", m_spellInfo->Id);
             return;
         }
-
         //Chain: 2, 6, 22, 25, 45, 77
         uint32 maxTargets = m_spellInfo->EffectChainTarget[i];
         if(modOwner)
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_JUMP_TARGETS, maxTargets, this);
-
         if(maxTargets > 1)
         {
             //otherwise, this multiplier is used for something else
             m_damageMultipliers[i] = 1.0f;
             m_applyMultiplierMask |= 1 << i;
-
             float range;
             std::list<Unit*> unitList;
-
             switch(cur)
             {
                 case TARGET_UNIT_NEARBY_ENEMY:
@@ -2219,7 +1968,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                     SearchChainTarget(unitList, range, maxTargets, SPELL_TARGETS_CHAINHEAL);
                     break;
             }
-            
             for(std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end(); ++itr)
                 AddUnitTarget(*itr, i);
         }
@@ -2231,7 +1979,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
         // Dummy, just for client
         if(EffectTargetType[m_spellInfo->Effect[i]] != SPELL_REQUIRE_UNIT)
             return;
-
         float radius;
         SpellTargets targetType;
         switch(cur)
@@ -2261,11 +2008,9 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 targetType = SPELL_TARGETS_NONE;
                 break;
         }
-
         if(modOwner)
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius, this);
         radius *= m_spellValue->RadiusMod;
-
         std::list<Unit*> unitList;
         if(targetType == SPELL_TARGETS_ENTRY)
         {
@@ -2299,16 +2044,14 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                         // Search for ghoul if our ghoul or dead body not valid unit target
                         if (!(m_targets.getUnitTarget() && (m_targets.getUnitTarget()->GetEntry() == 26125 && m_targets.getUnitTarget()->GetOwnerGUID() == m_caster->GetGUID()
                             || (m_targets.getUnitTarget()->getDeathState() == CORPSE
-                                && m_targets.getUnitTarget()->GetDisplayId() == m_targets.getUnitTarget()->GetNativeDisplayId() 
+                                && m_targets.getUnitTarget()->GetDisplayId() == m_targets.getUnitTarget()->GetNativeDisplayId()
                                 && m_targets.getUnitTarget()->GetTypeId()== TYPEID_UNIT
                                 && !((Creature*)m_targets.getUnitTarget())->isDeadByDefault()
                                 && !(m_targets.getUnitTarget()->GetCreatureTypeMask() & CREATURE_TYPEMASK_MECHANICAL_OR_ELEMENTAL))
                                 && m_targets.getUnitTarget()->GetDisplayId() == m_targets.getUnitTarget()->GetNativeDisplayId())))
                         {
                             CleanupTargetList();
-
                             WorldObject* result = FindCorpseUsing <Trinity::ExplodeCorpseObjectCheck> ();
-
                             if(result)
                             {
                                 switch(result->GetTypeId())
@@ -2328,10 +2071,8 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                             }
                         }
                         break;
-
                     default:
                         sLog.outDebug("Spell (ID: %u) (caster Entry: %u) does not have record in `spell_script_target`", m_spellInfo->Id, m_caster->GetEntry());
-
                         if(m_spellInfo->Effect[i] == SPELL_EFFECT_TELEPORT_UNITS)
                             SearchAreaTarget(unitList, radius, pushType, SPELL_TARGETS_ENTRY, 0);
                         else if(IsPositiveEffect(m_spellInfo->Id, i))
@@ -2350,7 +2091,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                     else if (i_spellST->second.type == SPELL_TARGET_TYPE_CONTROLLED)
                     {
                         for(Unit::ControlList::iterator itr = m_caster->m_Controlled.begin(); itr != m_caster->m_Controlled.end(); ++itr)
-                            if ((*itr)->GetEntry() == i_spellST->second.targetEntry && 
+                            if ((*itr)->GetEntry() == i_spellST->second.targetEntry &&
                                 /*(*itr)->IsWithinDistInMap(m_caster, radius)*/ (*itr)->IsInMap(m_caster)) // For 60243 and 52173 need skip radius check or use range (no radius entry for effect)
                                 unitList.push_back(*itr);
                     }
@@ -2385,7 +2126,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                         else
                             break;
                     }
-
                     Trinity::GameObjectInRangeCheck check(x, y, z, radius + 50);
                     std::list<GameObject*> goList;
                     Trinity::GameObjectListSearcher<Trinity::GameObjectInRangeCheck> searcher(m_caster, goList, check);
@@ -2407,14 +2147,12 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 {
                     Player* targetPlayer = m_targets.getUnitTarget() && m_targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER
                         ? (Player*)m_targets.getUnitTarget() : NULL;
-
                     Group* pGroup = targetPlayer ? targetPlayer->GetGroup() : NULL;
                     if(pGroup)
                     {
                         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
                         {
                             Player* Target = itr->getSource();
-
                             // IsHostileTo check duel and controlled by enemy
                             if( Target && targetPlayer->IsWithinDistInMap(Target, radius) &&
                                 targetPlayer->getClass() == Target->getClass() &&
@@ -2430,7 +2168,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 }
             }
         }
-
         if(!unitList.empty())
         {
             if(uint32 maxTargets = m_spellValue->MaxAffectedTargets)
@@ -2439,7 +2176,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                 for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j)
                     if((*j)->isAffectedOnSpell(m_spellInfo))
                         maxTargets += (*j)->GetAmount();
-
                 if(m_spellInfo->Id == 5246) //Intimidating Shout
                     unitList.remove(m_targets.getUnitTarget());
                 Trinity::RandomResizeList(unitList, m_spellValue->MaxAffectedTargets);
@@ -2467,7 +2203,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                                 manaUsers.push(WTarget);
                             }
                         }
-
                         unitList.clear();
                         while(!manaUsers.empty() && unitList.size()<10)
                         {
@@ -2485,7 +2220,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                             PrioritizeHealthUnitWraper  WTarget(*itr);
                             healedMembers.push(WTarget);
                         }
-
                         unitList.clear();
                         while(!healedMembers.empty() && unitList.size()<1)
                         {
@@ -2508,13 +2242,10 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
                             healedMembers.push(WTarget);
                         }
                     }
-
                     unitList.clear();
                     uint32 maxsize = 5;
-
                     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x04000000)
                         maxsize += m_caster->HasAura(62970) ? 1 : 0;
-
                     while(!healedMembers.empty() && unitList.size()<maxsize)
                     {
                         unitList.push_back(healedMembers.top().getUnit());
@@ -2555,16 +2286,13 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
         }
     }
 }
-
 void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura)
 {
     if(m_CastItem)
         m_castItemGUID = m_CastItem->GetGUID();
     else
         m_castItemGUID = 0;
-
     m_targets = *targets;
-
     if(!m_targets.getUnitTargetGUID() && m_spellInfo->Targets & TARGET_FLAG_UNIT)
     {
         Unit *target = NULL;
@@ -2572,7 +2300,6 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
             target = m_caster->getVictim();
         else
             target = ObjectAccessor::GetUnit(*m_caster, ((Player*)m_caster)->GetSelection());
-
         if(target && IsValidSingleTargetSpell(target))
             m_targets.setUnitTarget(target);
         else
@@ -2582,7 +2309,6 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
             return;
         }
     }
-
     // Fill aura scaling information
     if (m_caster->IsControlledByPlayer() && !IsPassiveSpell(m_spellInfo->Id) && m_spellInfo->spellLevel && !IsChanneledSpell(m_spellInfo) && !m_IsTriggeredSpell)
     {
@@ -2603,16 +2329,12 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
             }
         }
     }
-
     m_spellState = SPELL_STATE_PREPARING;
-
     if(triggeredByAura)
         m_triggeredByAuraSpell  = triggeredByAura->GetSpellProto();
-
     // create and add update event for this spell
     SpellEvent* Event = new SpellEvent(this);
     m_caster->m_Events.AddEvent(Event, m_caster->m_Events.CalculateTime(1));
-
     //Prevent casting at cast another spell (ServerSide check)
     if(m_caster->IsNonMeleeSpellCasted(false, true, true) && m_cast_count)
     {
@@ -2620,7 +2342,6 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
         finish(false);
         return;
     }
-
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         if(objmgr.IsPlayerSpellDisabled(m_spellInfo->Id))
@@ -2647,14 +2368,12 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
             return;
         }
     }
-
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, true);
     // Fill cost data (not use power for item casts
     m_powerCost = m_CastItem ? 0 : CalculatePowerCost(m_spellInfo, m_caster, m_spellSchoolMask);
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, false);
-
     SpellCastResult result = CheckCast(true);
     if(result != SPELL_CAST_OK && !IsAutoRepeat())          //always cast autorepeat dummy for triggering
     {
@@ -2664,31 +2383,24 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
             triggeredByAura->GetParentAura()->SetAuraDuration(0);
         }
         SendCastResult(result);
-
         finish(false);
         return;
     }
-
     // Prepare data for triggers
     prepareDataForTriggerSystem(triggeredByAura);
-
     // Set combo point requirement
     if (m_IsTriggeredSpell || m_CastItem || !m_caster->m_movedPlayer)
         m_needComboPoints = false;
-
     // calculate cast time (calculated after first CheckCast check to prevent charge counting for first CheckCast fail)
     m_casttime = GetSpellCastTime(m_spellInfo, this);
     //m_caster->ModSpellCastTime(m_spellInfo, m_casttime, this);
-
     // set timer base at cast time
     ReSetTimer();
-
     sLog.outDebug("Spell::prepare: spell id %u source %u caster %d triggered %u mask %u", m_spellInfo->Id, m_caster->GetEntry(), m_originalCaster ? m_originalCaster->GetEntry() : -1, m_IsTriggeredSpell ? 1 : 0, m_targets.m_targetMask);
     //if(m_targets.getUnitTarget())
     //    sLog.outError("Spell::prepare: unit target %u", m_targets.getUnitTarget()->GetEntry());
     //if(m_targets.HasDst())
     //    sLog.outError("Spell::prepare: pos target %f %f %f", m_targets.m_dstPos.m_positionX, m_targets.m_dstPos.m_positionY, m_targets.m_dstPos.m_positionZ);
-
     //Containers for channeled spells have to be set
     //TODO:Apply this to all casted spells if needed
     // Why check duration? 29350: channelled triggers channelled
@@ -2710,29 +2422,23 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura
                 }
             }
         }
-
         m_caster->SetCurrentCastedSpell( this );
         SendSpellStart();
-
         if(!m_casttime && !m_spellInfo->StartRecoveryTime
             && !m_castItemGUID     //item: first cast may destroy item and second cast causes crash
             && GetCurrentContainer() == CURRENT_GENERIC_SPELL)
             cast(true);
     }
 }
-
 void Spell::cancel()
 {
     if(m_spellState == SPELL_STATE_FINISHED)
         return;
-
     SetReferencedFromCurrent(false);
     if(m_selfContainer && *m_selfContainer == this)
         *m_selfContainer = NULL;
-
     uint32 oldState = m_spellState;
     m_spellState = SPELL_STATE_FINISHED;
-
     m_autoRepeat = false;
     switch (oldState)
     {
@@ -2742,7 +2448,6 @@ void Spell::cancel()
             SendInterrupted(0);
             SendCastResult(SPELL_FAILED_INTERRUPTED);
         } break;
-
         case SPELL_STATE_CASTING:
         {
             for(std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
@@ -2750,41 +2455,32 @@ void Spell::cancel()
                     if(Unit* unit = m_caster->GetGUID() == ihit->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, ihit->targetGUID))
                         if(unit->isAlive())
                             unit->RemoveAurasDueToSpell(m_spellInfo->Id, m_originalCasterGUID, AURA_REMOVE_BY_CANCEL);
-
             SendChannelUpdate(0);
             SendInterrupted(0);
             SendCastResult(SPELL_FAILED_INTERRUPTED);
-
             // spell is canceled-take mods and clear list
             if (m_caster->GetTypeId() == TYPEID_PLAYER)
                 ((Player*)m_caster)->RemoveSpellMods(this);
-
             m_appliedMods.clear();
         } break;
-
         default:
         {
         } break;
     }
-
     m_caster->RemoveDynObject(m_spellInfo->Id);
     m_caster->RemoveGameObject(m_spellInfo->Id,true);
-
     //set state back so finish will be processed
     m_spellState = oldState;
-
     finish(false);
 }
-
 void Spell::cast(bool skipCheck)
 {
     // update pointers base at GUIDs to prevent access to non-existed already object
     UpdatePointers();
-
     if(Unit *target = m_targets.getUnitTarget())
     {
         // three check: prepare, cast (m_casttime > 0), hit (delayed)
-        if(m_casttime && target->isAlive() 
+        if(m_casttime && target->isAlive()
             && (target->m_invisibilityMask || m_caster->m_invisibilityMask
             || target->GetVisibility() == VISIBILITY_GROUP_STEALTH)
             && !target->IsFriendlyTo(m_caster) && !m_caster->canSeeOrDetect(target, true))
@@ -2804,12 +2500,9 @@ void Spell::cast(bool skipCheck)
             return;
         }
     }
-
     SetExecutedCurrently(true);
-
     if(m_caster->GetTypeId() != TYPEID_PLAYER && m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
         m_caster->SetInFront(m_targets.getUnitTarget());
-
     // Should this be done for original caster?
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
     {
@@ -2817,7 +2510,6 @@ void Spell::cast(bool skipCheck)
         // if not successfully casted, will be remove in finish(false)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, true);
     }
-
     // triggered cast called from Spell::prepare where it was already checked
     if(!m_IsTriggeredSpell || !skipCheck)
     {
@@ -2839,9 +2531,7 @@ void Spell::cast(bool skipCheck)
             return;
         }
     }
-
     SelectSpellTargets();
-
     // Spell may be finished after target map check
     if(m_spellState == SPELL_STATE_FINISHED)
     {
@@ -2858,7 +2548,6 @@ void Spell::cast(bool skipCheck)
         SetExecutedCurrently(false);
         return;
     }
-
     if(m_spellInfo->SpellFamilyName)
     {
         if (m_spellInfo->excludeCasterAuraSpell && !IsPositiveSpell(m_spellInfo->excludeCasterAuraSpell))
@@ -2878,22 +2567,18 @@ void Spell::cast(bool skipCheck)
     // traded items have trade slot instead of guid in m_itemTargetGUID
     // set to real guid to be sent later to the client
     m_targets.updateTradeSlotItem();
-
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         if (!m_IsTriggeredSpell && m_CastItem)
             ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM, m_CastItem->GetEntry());
-
         ((Player*)m_caster)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_CAST_SPELL, m_spellInfo->Id);
     }
-
     if(!m_IsTriggeredSpell)
     {
         // Powers have to be taken before SendSpellGo
         TakePower();
         TakeReagents();                                         // we must remove reagents before HandleEffects to allow place crafted item in same slot
     }
-
     // are there any spells need to be triggered after hit?
     // handle SPELL_AURA_ADD_TARGET_TRIGGER auras
     Unit::AuraEffectList const& targetTriggers = m_caster->GetAurasByType(SPELL_AURA_ADD_TARGET_TRIGGER);
@@ -2910,15 +2595,12 @@ void Spell::cast(bool skipCheck)
             m_ChanceTriggerSpells.push_back(std::make_pair(spellInfo, chance * (*i)->GetParentAura()->GetStackAmount()));
         }
     }
-
     if(m_customAttr & SPELL_ATTR_CU_DIRECT_DAMAGE)
         CalculateDamageDoneForAllTargets();
-
     // CAST SPELL
     SendSpellCooldown();
     //SendCastResult(castResult);
     SendSpellGo();                                          // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()...
-
     if(m_customAttr & SPELL_ATTR_CU_CHARGE)
     {
         for(uint32 i = 0; i < 3; ++i)
@@ -2935,19 +2617,16 @@ void Spell::cast(bool skipCheck)
             }
         }
     }
-
     // Okay, everything is prepared. Now we need to distinguish between immediate and evented delayed spells
     if (m_spellInfo->speed > 0.0f && !IsChanneledSpell(m_spellInfo))
     {
         // Remove used for cast item if need (it can be already NULL after TakeReagents call
         // in case delayed spell remove item at cast delay start
         TakeCastItem();
-
         // Okay, maps created, now prepare flags
         m_immediateHandled = false;
         m_spellState = SPELL_STATE_DELAYED;
         SetDelayStart(0);
-
         if(m_caster->hasUnitState(UNIT_STAT_CASTING) && !m_caster->IsNonMeleeSpellCasted(false, false, true))
             m_caster->clearUnitState(UNIT_STAT_CASTING);
     }
@@ -2956,7 +2635,6 @@ void Spell::cast(bool skipCheck)
         // Immediate spell, no big deal
         handle_immediate();
     }
-
     if(m_customAttr & SPELL_ATTR_CU_LINK_CAST)
     {
         if(const std::vector<int32> *spell_triggered = spellmgr.GetSpellLinked(m_spellInfo->Id))
@@ -2966,13 +2644,10 @@ void Spell::cast(bool skipCheck)
                 else
                     m_caster->CastSpell(m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster, *i, true);
     }
-
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, false);
-
     SetExecutedCurrently(false);
 }
-
 void Spell::handle_immediate()
 {
     // start channeling if applicable
@@ -2991,43 +2666,31 @@ void Spell::handle_immediate()
             SendChannelStart(duration);
         }
     }
-
     // process immediate effects (items, ground, etc.) also initialize some variables
     _handle_immediate_phase();
-
     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
         DoAllEffectOnTarget(&(*ihit));
-
     for(std::list<GOTargetInfo>::iterator ihit= m_UniqueGOTargetInfo.begin();ihit != m_UniqueGOTargetInfo.end();++ihit)
         DoAllEffectOnTarget(&(*ihit));
-
     // spell is finished, perform some last features of the spell here
     _handle_finish_phase();
-
     // Remove used for cast item if need (it can be already NULL after TakeReagents call
     TakeCastItem();
-
     if(m_spellState != SPELL_STATE_CASTING)
         finish(true);                                       // successfully finish spell cast (not last in case autorepeat or channel spell)
 }
-
 uint64 Spell::handle_delayed(uint64 t_offset)
 {
     UpdatePointers();
-
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, true);
-
     uint64 next_time = 0;
-
     if (!m_immediateHandled)
     {
         _handle_immediate_phase();
         m_immediateHandled = true;
     }
-
     bool single_missile = (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION);
-
     // now recheck units targeting correctness (need before any effects apply to prevent adding immunity at first effect not allow apply second spell effect and similar cases)
     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end();++ihit)
     {
@@ -3039,7 +2702,6 @@ uint64 Spell::handle_delayed(uint64 t_offset)
                 next_time = ihit->timeDelay;
         }
     }
-
     // now recheck gameobject targeting correctness
     for(std::list<GOTargetInfo>::iterator ighit= m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end();++ighit)
     {
@@ -3051,18 +2713,14 @@ uint64 Spell::handle_delayed(uint64 t_offset)
                 next_time = ighit->timeDelay;
         }
     }
-
     if (m_caster->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_caster)->SetSpellModTakingSpell(this, false);
-
     // All targets passed - need finish phase
     if (next_time == 0)
     {
         // spell is finished, perform some last features of the spell here
         _handle_finish_phase();
-
         finish(true);                                       // successfully finish spell cast
-
         // return zero, spell is finished now
         return 0;
     }
@@ -3072,38 +2730,31 @@ uint64 Spell::handle_delayed(uint64 t_offset)
         return next_time;
     }
 }
-
 void Spell::_handle_immediate_phase()
 {
     // handle some immediate features of the spell here
     HandleThreatSpells(m_spellInfo->Id);
-
     m_needSpellLog = IsNeedSendToClient();
     for(uint32 j = 0; j < 3; ++j)
     {
         if(m_spellInfo->Effect[j] == 0)
             continue;
-
         // apply Send Event effect to ground in case empty target lists
         if( m_spellInfo->Effect[j] == SPELL_EFFECT_SEND_EVENT && !HaveTargetsForEffect(j) )
         {
             HandleEffects(NULL, NULL, NULL, j);
             continue;
         }
-
         // Don't do spell log, if is school damage spell
         if(m_spellInfo->Effect[j] == SPELL_EFFECT_SCHOOL_DAMAGE || m_spellInfo->Effect[j] == 0)
             m_needSpellLog = false;
     }
-
     // initialize Diminishing Returns Data
     m_diminishLevel = DIMINISHING_LEVEL_1;
     m_diminishGroup = DIMINISHING_NONE;
-
     // process items
     for(std::list<ItemTargetInfo>::iterator ihit= m_UniqueItemInfo.begin();ihit != m_UniqueItemInfo.end();++ihit)
         DoAllEffectOnTarget(&(*ihit));
-
     if(!m_originalCaster)
         return;
     uint8 oldEffMask = m_effectMask;
@@ -3156,7 +2807,6 @@ void Spell::_handle_immediate_phase()
         m_originalCaster->ProcDamageAndSpell(0, procAttacker, 0, m_procEx | PROC_EX_NORMAL_HIT, 0, BASE_ATTACK, m_spellInfo, m_triggeredByAuraSpell);
     }
 }
-
 void Spell::_handle_finish_phase()
 {
     if(m_caster->m_movedPlayer)
@@ -3164,24 +2814,19 @@ void Spell::_handle_finish_phase()
         // Take for real after all targets are processed
         if (m_needComboPoints)
             m_caster->m_movedPlayer->ClearComboPoints();
-
         // Real add combo points from effects
         if (m_comboPointGain)
             m_caster->m_movedPlayer->GainSpellComboPoints(m_comboPointGain);
     }
-
     // spell log
     if(m_needSpellLog)
         SendLogExecute();
 }
-
 void Spell::SendSpellCooldown()
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* _player = (Player*)m_caster;
-
     // mana/health/etc potions, disabled by client (until combat out as declarate)
     if (m_CastItem && m_CastItem->IsPotion())
     {
@@ -3189,26 +2834,21 @@ void Spell::SendSpellCooldown()
         _player->SetLastPotionId(m_CastItem->GetEntry());
         return;
     }
-
     // have infinity cooldown but set at aura apply                  // do not set cooldown for triggered spells (needed by reincarnation)
     if(m_spellInfo->Attributes & SPELL_ATTR_DISABLED_WHILE_ACTIVE || m_IsTriggeredSpell)
         return;
-
     _player->AddSpellAndCategoryCooldowns(m_spellInfo,m_CastItem ? m_CastItem->GetEntry() : 0, this);
 }
-
 void Spell::update(uint32 difftime)
 {
     // update pointers based at it's GUIDs
     UpdatePointers();
-
     if(m_targets.getUnitTargetGUID() && !m_targets.getUnitTarget())
     {
         sLog.outDebug("Spell %u is cancelled due to removal of target.", m_spellInfo->Id);
         cancel();
         return;
     }
-
     // check if the player caster has moved before the spell finished
     if ((m_caster->GetTypeId() == TYPEID_PLAYER && m_timer != 0) &&
         m_caster->isMoving() && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_MOVEMENT) &&
@@ -3218,7 +2858,6 @@ void Spell::update(uint32 difftime)
         if(!IsNextMeleeSwingSpell() && !IsAutoRepeat() && !m_IsTriggeredSpell)
             cancel();
     }
-
     switch(m_spellState)
     {
         case SPELL_STATE_PREPARING:
@@ -3230,7 +2869,6 @@ void Spell::update(uint32 difftime)
                 else
                     m_timer -= difftime;
             }
-
             if(m_timer == 0 && !IsNextMeleeSwingSpell() && !IsAutoRepeat())
                 cast(m_spellInfo->CastingTimeIndex == 1);
         } break;
@@ -3245,17 +2883,14 @@ void Spell::update(uint32 difftime)
                     SendChannelUpdate(0);
                     finish();
                 }
-
                 if(difftime >= m_timer)
                     m_timer = 0;
                 else
                     m_timer -= difftime;
             }
-
             if(m_timer == 0)
             {
                 SendChannelUpdate(0);
-
                 // channeled spell processed independently for quest targeting
                 // cast at creature (or GO) quest objectives update at successful cast channel finished
                 // ignore autorepeat/melee casts for speed (not exist quest for spells (hm... )
@@ -3268,27 +2903,21 @@ void Spell::update(uint32 difftime)
                             TargetInfo* target = &*ihit;
                             if(!IS_CRE_OR_VEH_GUID(target->targetGUID))
                                 continue;
-
                             Unit* unit = m_caster->GetGUID() == target->targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, target->targetGUID);
                             if (unit == NULL)
                                 continue;
-
                             p->CastedCreatureOrGO(unit->GetEntry(), unit->GetGUID(), m_spellInfo->Id);
                         }
-
                         for(std::list<GOTargetInfo>::iterator ihit = m_UniqueGOTargetInfo.begin(); ihit != m_UniqueGOTargetInfo.end(); ++ihit)
                         {
                             GOTargetInfo* target = &*ihit;
-
                             GameObject* go = m_caster->GetMap()->GetGameObject(target->targetGUID);
                             if(!go)
                                 continue;
-
                             p->CastedCreatureOrGO(go->GetEntry(), go->GetGUID(), m_spellInfo->Id);
                         }
                     }
                 }
-
                 finish();
             }
         } break;
@@ -3297,22 +2926,17 @@ void Spell::update(uint32 difftime)
         }break;
     }
 }
-
 void Spell::finish(bool ok)
 {
     if(!m_caster)
         return;
-
     if(m_spellState == SPELL_STATE_FINISHED)
         return;
     m_spellState = SPELL_STATE_FINISHED;
-
     if(IsChanneledSpell(m_spellInfo))
         m_caster->UpdateInterruptMask();
-
     if(m_caster->hasUnitState(UNIT_STAT_CASTING) && !m_caster->IsNonMeleeSpellCasted(false, false, true))
         m_caster->clearUnitState(UNIT_STAT_CASTING);
-
     // Unsummon summon as possessed creatures on spell cancel
     if(IsChanneledSpell(m_spellInfo) && m_caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -3322,10 +2946,8 @@ void Spell::finish(bool ok)
                 && charm->GetUInt32Value(UNIT_CREATED_BY_SPELL) == m_spellInfo->Id)
                 ((Puppet*)charm)->UnSummon();
     }
-
     if(!ok)
         return;
-
     if (m_caster->GetTypeId()==TYPEID_UNIT && ((Creature*)m_caster)->isSummon())
     {
         // Unsummon statue
@@ -3338,15 +2960,12 @@ void Spell::finish(bool ok)
             return;
         }
     }
-
     // Okay to remove extra attacks
     if(IsSpellHaveEffect(m_spellInfo, SPELL_EFFECT_ADD_EXTRA_ATTACKS))
         m_caster->m_extraAttacks = 0;
-
     // Heal caster for all health leech from all targets
     if (m_healthLeech)
         m_caster->DealHeal(m_caster, uint32(m_healthLeech), m_spellInfo);
-
     if (IsMeleeAttackResetSpell())
     {
         m_caster->resetAttackTimer(BASE_ATTACK);
@@ -3355,23 +2974,19 @@ void Spell::finish(bool ok)
         if(!(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT))
             m_caster->resetAttackTimer(RANGED_ATTACK);
     }
-
     // potions disabled by client, send event "not in combat" if need
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         if (!m_triggeredByAuraSpell)
             ((Player*)m_caster)->UpdatePotionCooldown(this);
-
         // triggered spell pointer can be not set in some cases
         // this is needed for proper apply of triggered spell mods
         ((Player*)m_caster)->SetSpellModTakingSpell(this, true);
     }
-
     // call triggered spell only at successful cast (after clear combo points -> for add some if need)
     // I assume what he means is that some triggered spells may add combo points
     if(!m_TriggerSpells.empty())
         TriggerSpell();
-
     // Take mods after trigger spell (needed for 14177 to affect 48664)
     // mods are taken only on succesfull cast and independantly from targets of the spell
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
@@ -3379,31 +2994,24 @@ void Spell::finish(bool ok)
         ((Player*)m_caster)->RemoveSpellMods(this);
         ((Player*)m_caster)->SetSpellModTakingSpell(this, false);
     }
-
     // Stop Attack for some spells
     if( m_spellInfo->Attributes & SPELL_ATTR_STOP_ATTACK_TARGET )
         m_caster->AttackStop();
 }
-
 void Spell::SendCastResult(SpellCastResult result)
 {
     if(result == SPELL_CAST_OK)
         return;
-
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(((Player*)m_caster)->GetSession()->PlayerLoading())  // don't send cast results at loading time
         return;
-
     SendCastResult((Player*)m_caster,m_spellInfo,m_cast_count,result);
 }
-
 void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result)
 {
     if(result == SPELL_CAST_OK)
         return;
-
     WorldPacket data(SMSG_CAST_FAILED, (4+1+1));
     data << uint8(cast_count);                              // single cast or multi 2.3 (0/1)
     data << uint32(spellInfo->Id);
@@ -3455,14 +3063,11 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca
     }
     caster->GetSession()->SendPacket(&data);
 }
-
 void Spell::SendSpellStart()
 {
     if(!IsNeedSendToClient())
         return;
-
     //sLog.outDebug("Sending SMSG_SPELL_START id=%u", m_spellInfo->Id);
-
     uint32 castFlags = CAST_FLAG_UNKNOWN1;
     if(m_spellInfo->Attributes & SPELL_ATTR_REQ_AMMO)
         castFlags |= CAST_FLAG_AMMO;
@@ -3470,80 +3075,60 @@ void Spell::SendSpellStart()
         (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->isPet()))
          && m_spellInfo->powerType != POWER_HEALTH )
         castFlags |= CAST_FLAG_POWER_LEFT_SELF;
-
     if(m_spellInfo->runeCostID && m_spellInfo->powerType == POWER_RUNE)
         castFlags |= CAST_FLAG_UNKNOWN10;
-
     WorldPacket data(SMSG_SPELL_START, (8+8+4+4+2));
     if(m_CastItem)
         data.append(m_CastItem->GetPackGUID());
     else
         data.append(m_caster->GetPackGUID());
-
     data.append(m_caster->GetPackGUID());
     data << uint8(m_cast_count);                            // pending spell cast?
     data << uint32(m_spellInfo->Id);                        // spellId
     data << uint32(castFlags);                              // cast flags
     data << uint32(m_timer);                                // delay?
-
     m_targets.write(&data);
-
     if(castFlags & CAST_FLAG_POWER_LEFT_SELF)
         data << uint32(m_caster->GetPower((Powers)m_spellInfo->powerType));
-
     if ( castFlags & CAST_FLAG_AMMO )
         WriteAmmoToPacket(&data);
-
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::SendSpellGo()
 {
     // not send invisible spell casting
     if(!IsNeedSendToClient())
         return;
-
     //sLog.outDebug("Sending SMSG_SPELL_GO id=%u", m_spellInfo->Id);
-
     uint32 castFlags = CAST_FLAG_UNKNOWN3;
-
     // triggered spells with spell visual != 0
     if((m_IsTriggeredSpell && !IsAutoRepeatRangedSpell(m_spellInfo)) || m_triggeredByAuraSpell)
-        castFlags |= CAST_FLAG_UNKNOWN0; 
-
+        castFlags |= CAST_FLAG_UNKNOWN0;
     if(m_spellInfo->Attributes & SPELL_ATTR_REQ_AMMO)
         castFlags |= CAST_FLAG_AMMO;                        // arrows/bullets visual
     if ((m_caster->GetTypeId() == TYPEID_PLAYER ||
         (m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->isPet()))
         && m_spellInfo->powerType != POWER_HEALTH )
         castFlags |= CAST_FLAG_POWER_LEFT_SELF; // should only be sent to self, but the current messaging doesn't make that possible
-
     if((m_caster->GetTypeId() == TYPEID_PLAYER) && (m_caster->getClass() == CLASS_DEATH_KNIGHT) && m_spellInfo->runeCostID && m_spellInfo->powerType == POWER_RUNE)
     {
         castFlags |= CAST_FLAG_UNKNOWN10;                   // same as in SMSG_SPELL_START
         castFlags |= CAST_FLAG_UNKNOWN7;                    // rune cooldowns list
     }
-
     WorldPacket data(SMSG_SPELL_GO, 50);                    // guess size
-
     if(m_CastItem)
         data.append(m_CastItem->GetPackGUID());
     else
         data.append(m_caster->GetPackGUID());
-
     data.append(m_caster->GetPackGUID());
     data << uint8(m_cast_count);                            // pending spell cast?
     data << uint32(m_spellInfo->Id);                        // spellId
     data << uint32(castFlags);                              // cast flags
     data << uint32(getMSTime());                            // timestamp
-
     WriteSpellGoTargets(&data);
-
     m_targets.write(&data);
-
     if(castFlags & CAST_FLAG_POWER_LEFT_SELF)
         data << uint32(m_caster->GetPower((Powers)m_spellInfo->powerType));
-
     if ( castFlags & CAST_FLAG_UNKNOWN7 )                   // rune cooldowns list
     {
         uint8 v1 = m_runesState;
@@ -3558,35 +3143,28 @@ void Spell::SendSpellGo()
                     data << uint8(0);                       // some unknown byte (time?)
         }
     }
-
     if ( castFlags & CAST_FLAG_UNKNOWN4 )                   // unknown wotlk
     {
         data << float(0);
         data << uint32(0);
     }
-
     if ( castFlags & CAST_FLAG_AMMO )
         WriteAmmoToPacket(&data);
-
     if ( castFlags & CAST_FLAG_UNKNOWN5 )                   // unknown wotlk
     {
         data << uint32(0);
         data << uint32(0);
     }
-
     if ( m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION )
     {
         data << uint8(0);
     }
-
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::WriteAmmoToPacket( WorldPacket * data )
 {
     uint32 ammoInventoryType = 0;
     uint32 ammoDisplayID = 0;
-
     if (m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         Item *pItem = ((Player*)m_caster)->GetWeaponForAttack( RANGED_ATTACK );
@@ -3641,7 +3219,6 @@ void Spell::WriteAmmoToPacket( WorldPacket * data )
                                 ammoInventoryType = INVTYPE_AMMO;
                                 break;
                         }
-
                         if(ammoDisplayID)
                             break;
                     }
@@ -3649,11 +3226,9 @@ void Spell::WriteAmmoToPacket( WorldPacket * data )
             }
         }
     }
-
     *data << uint32(ammoDisplayID);
     *data << uint32(ammoInventoryType);
 }
-
 void Spell::WriteSpellGoTargets( WorldPacket * data )
 {
     // This function also fill data for channeled spells:
@@ -3673,7 +3248,6 @@ void Spell::WriteSpellGoTargets( WorldPacket * data )
         else
             ++miss;
     }
-
     *data << (uint8)hit;
     for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
@@ -3683,10 +3257,8 @@ void Spell::WriteSpellGoTargets( WorldPacket * data )
             m_needAliveTargetMask |=ihit->effectMask;
         }
     }
-
     for(std::list<GOTargetInfo>::const_iterator ighit = m_UniqueGOTargetInfo.begin(); ighit != m_UniqueGOTargetInfo.end(); ++ighit)
         *data << uint64(ighit->targetGUID);                 // Always hits
-
     *data << (uint8)miss;
     for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
@@ -3702,18 +3274,14 @@ void Spell::WriteSpellGoTargets( WorldPacket * data )
     if(!IsChanneledSpell(m_spellInfo))
         m_needAliveTargetMask = 0;
 }
-
 void Spell::SendLogExecute()
 {
     Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster;
-
     WorldPacket data(SMSG_SPELLLOGEXECUTE, (8+4+4+4+4+8));
-
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
         data.append(m_caster->GetPackGUID());
     else
         data.append(target->GetPackGUID());
-
     data << uint32(m_spellInfo->Id);
     uint32 count1 = 1;
     data << uint32(count1);                                 // count1 (effect count?)
@@ -3740,7 +3308,7 @@ void Spell::SendLogExecute()
                         data.append(unit->GetPackGUID());
                     else
                         data << uint8(0);
-                    data << uint32(m_caster->m_extraAttacks); 
+                    data << uint32(m_caster->m_extraAttacks);
                     break;
                 case SPELL_EFFECT_INTERRUPT_CAST:
                     if(Unit *unit = m_targets.getUnitTarget())
@@ -3807,10 +3375,8 @@ void Spell::SendLogExecute()
             }
         }
     }
-
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::SendInterrupted(uint8 result)
 {
     WorldPacket data(SMSG_SPELL_FAILURE, (8+4+1));
@@ -3819,7 +3385,6 @@ void Spell::SendInterrupted(uint8 result)
     data << uint32(m_spellInfo->Id);
     data << uint8(result);
     m_caster->SendMessageToSet(&data, true);
-
     data.Initialize(SMSG_SPELL_FAILED_OTHER, (8+4));
     data.append(m_caster->GetPackGUID());
     data << uint8(m_cast_count);
@@ -3827,7 +3392,6 @@ void Spell::SendInterrupted(uint8 result)
     data << uint8(result);
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::SendChannelUpdate(uint32 time)
 {
     if(time == 0)
@@ -3835,21 +3399,16 @@ void Spell::SendChannelUpdate(uint32 time)
         m_caster->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, 0);
         m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0);
     }
-
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data( MSG_CHANNEL_UPDATE, 8+4 );
     data.append(m_caster->GetPackGUID());
     data << uint32(time);
-
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::SendChannelStart(uint32 duration)
 {
     WorldObject* target = NULL;
-
     // select first not resisted target from target list for _0_ effect
     if(!m_UniqueTargetInfo.empty())
     {
@@ -3873,60 +3432,46 @@ void Spell::SendChannelStart(uint32 duration)
             }
         }
     }
-
     WorldPacket data( MSG_CHANNEL_START, (8+4+4) );
     data.append(m_caster->GetPackGUID());
     data << uint32(m_spellInfo->Id);
     data << uint32(duration);
-
     m_caster->SendMessageToSet(&data, true);
-
     m_timer = duration;
     if(target)
         m_caster->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, target->GetGUID());
     m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, m_spellInfo->Id);
 }
-
 void Spell::SendResurrectRequest(Player* target)
 {
     // Both players and NPCs can resurrect using spells - have a look at creature 28487 for example
     // However, the packet structure differs slightly
-
     const char* sentName = m_caster->GetTypeId() == TYPEID_PLAYER ? "" : m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex());
-
     WorldPacket data(SMSG_RESURRECT_REQUEST, (8+4+strlen(sentName)+1+1+1));
     data << uint64(m_caster->GetGUID());
     data << uint32(strlen(sentName) + 1);
-
     data << sentName;
     data << uint8(0);
-
     data << uint8(m_caster->GetTypeId() == TYPEID_PLAYER ? 0 : 1);
     target->GetSession()->SendPacket(&data);
 }
-
 void Spell::SendPlaySpellVisual(uint32 SpellID)
 {
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data(SMSG_PLAY_SPELL_VISUAL, 8 + 4);
     data << uint64(m_caster->GetGUID());
     data << uint32(SpellID);                                // spell visual id?
     ((Player*)m_caster)->GetSession()->SendPacket(&data);
 }
-
 void Spell::TakeCastItem()
 {
     if(!m_CastItem || m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // not remove cast item at triggered spell (equipping, weapon damage, etc)
     if(m_IsTriggeredSpell)
         return;
-
     ItemPrototype const *proto = m_CastItem->GetProto();
-
     if(!proto)
     {
         // This code is to avoid a crash
@@ -3934,10 +3479,8 @@ void Spell::TakeCastItem()
         sLog.outError("Cast item has no item prototype highId=%d, lowId=%d",m_CastItem->GetGUIDHigh(), m_CastItem->GetGUIDLow());
         return;
     }
-
     bool expendable = false;
     bool withoutCharges = false;
-
     for (int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
     {
         if (proto->Spells[i].SpellId)
@@ -3947,9 +3490,7 @@ void Spell::TakeCastItem()
             {
                 if (proto->Spells[i].SpellCharges < 0)
                     expendable = true;
-
                 int32 charges = m_CastItem->GetSpellCharges(i);
-
                 // item has charges left
                 if (charges)
                 {
@@ -3958,31 +3499,25 @@ void Spell::TakeCastItem()
                         m_CastItem->SetSpellCharges(i, charges);
                     m_CastItem->SetState(ITEM_CHANGED, (Player*)m_caster);
                 }
-
                 // all charges used
                 withoutCharges = (charges == 0);
             }
         }
     }
-
     if (expendable && withoutCharges)
     {
         uint32 count = 1;
         ((Player*)m_caster)->DestroyItemCount(m_CastItem, count, true);
-
         // prevent crash at access to deleted m_targets.getItemTarget
         if(m_CastItem==m_targets.getItemTarget())
             m_targets.setItemTarget(NULL);
-
         m_CastItem = NULL;
     }
 }
-
 void Spell::TakePower()
 {
     if(m_CastItem || m_triggeredByAuraSpell)
         return;
-
     bool hit = true;
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -4002,51 +3537,41 @@ void Spell::TakePower()
                         break;
                     }
     }
-
     Powers powerType = Powers(m_spellInfo->powerType);
-
     if(powerType == POWER_RUNE)
     {
         TakeRunePower();
         return;
     }
-
     if (!m_powerCost)
         return;
-
     // health as power used
     if(m_spellInfo->powerType == POWER_HEALTH)
     {
         m_caster->ModifyHealth( -(int32)m_powerCost );
         return;
     }
-
     if(m_spellInfo->powerType >= MAX_POWERS)
     {
         sLog.outError("Spell::TakePower: Unknown power type '%d'", m_spellInfo->powerType);
         return;
     }
-
     if(hit)
         m_caster->ModifyPower(powerType, -m_powerCost);
     else
         m_caster->ModifyPower(powerType, -irand(0, m_powerCost/4));
-
     // Set the five second timer
     if (powerType == POWER_MANA && m_powerCost > 0)
         m_caster->SetLastManaUse(getMSTime());
 }
-
 void Spell::TakeAmmo()
 {
     if(m_attackType == RANGED_ATTACK && m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         Item *pItem = ((Player*)m_caster)->GetWeaponForAttack( RANGED_ATTACK );
-
         // wands don't have ammo
         if(!pItem  || pItem->IsBroken() || pItem->GetProto()->SubClass==ITEM_SUBCLASS_WEAPON_WAND)
             return;
-
         if( pItem->GetProto()->InventoryType == INVTYPE_THROWN )
         {
             if(pItem->GetMaxStackCount()==1)
@@ -4065,77 +3590,54 @@ void Spell::TakeAmmo()
             ((Player*)m_caster)->DestroyItemCount(ammo, 1, true);
     }
 }
-
 SpellCastResult Spell::CheckRuneCost(uint32 runeCostID)
 {
     if(m_spellInfo->powerType != POWER_RUNE || !runeCostID)
         return SPELL_CAST_OK;
-
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return SPELL_CAST_OK;
-
     Player *plr = (Player*)m_caster;
-
     if(plr->getClass() != CLASS_DEATH_KNIGHT)
         return SPELL_CAST_OK;
-
     SpellRuneCostEntry const *src = sSpellRuneCostStore.LookupEntry(runeCostID);
-
     if(!src)
         return SPELL_CAST_OK;
-
     if(src->NoRuneCost())
         return SPELL_CAST_OK;
-
     int32 runeCost[NUM_RUNE_TYPES];                         // blood, frost, unholy, death
-
     for(uint32 i = 0; i < RUNE_DEATH; ++i)
         runeCost[i] = src->RuneCost[i];
-
     runeCost[RUNE_DEATH] = MAX_RUNES;                       // calculated later
-
     for(uint32 i = 0; i < MAX_RUNES; ++i)
     {
         RuneType rune = plr->GetCurrentRune(i);
         if((plr->GetRuneCooldown(i) == 0) && (runeCost[rune] > 0))
             runeCost[rune]--;
     }
-
     for(uint32 i = 0; i < RUNE_DEATH; ++i)
         if(runeCost[i] > 0)
             runeCost[RUNE_DEATH] += runeCost[i];
-
     if(runeCost[RUNE_DEATH] > MAX_RUNES)
         return SPELL_FAILED_NO_POWER;                       // not sure if result code is correct
-
     return SPELL_CAST_OK;
 }
-
 void Spell::TakeRunePower()
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *plr = (Player*)m_caster;
-
     if(plr->getClass() != CLASS_DEATH_KNIGHT)
         return;
-
     SpellRuneCostEntry const *src = sSpellRuneCostStore.LookupEntry(m_spellInfo->runeCostID);
-
     if(!src || (src->NoRuneCost() && src->NoRunicPowerGain()))
         return;
     m_runesState = plr->GetRunesState();                    // store previous state
-
     int32 runeCost[NUM_RUNE_TYPES];                         // blood, frost, unholy, death
-
     for(uint32 i = 0; i < RUNE_DEATH; ++i)
     {
         runeCost[i] = src->RuneCost[i];
     }
-
     runeCost[RUNE_DEATH] = 0;                               // calculated later
-
     for(uint32 i = 0; i < MAX_RUNES; ++i)
     {
         RuneType rune = plr->GetCurrentRune(i);
@@ -4146,9 +3648,7 @@ void Spell::TakeRunePower()
             runeCost[rune]--;
         }
     }
-
     runeCost[RUNE_DEATH] = runeCost[RUNE_BLOOD] + runeCost[RUNE_UNHOLY] + runeCost[RUNE_FROST];
-
     if(runeCost[RUNE_DEATH] > 0)
     {
         for(uint32 i = 0; i < MAX_RUNES; ++i)
@@ -4195,53 +3695,43 @@ void Spell::TakeRunePower()
                     }
                     // Blood of the North
                     // Reaping
-                    else if ((*itr)->GetSpellProto()->SpellIconID != 3041 && 
+                    else if ((*itr)->GetSpellProto()->SpellIconID != 3041 &&
                         (*itr)->GetSpellProto()->SpellIconID != 22)
                         continue;
-
                     // Remove rune of aura if avalible
                     if ((*itr)->GetAmount() & (1<<i))
                         (*itr)->SetAmount((*itr)->GetAmount() & ~(1<<i));
                     break;
                 }
                 }
-
                 if(runeCost[RUNE_DEATH] == 0)
                     break;
             }
         }
     }
-
     // you can gain some runic power when use runes
     float rp = src->runePowerGain;
     rp *= sWorld.getRate(RATE_POWER_RUNICPOWER_INCOME);
     plr->ModifyPower(POWER_RUNIC_POWER, (int32)rp);
 }
-
 void Spell::TakeReagents()
 {
     if(m_IsTriggeredSpell)                                  // reagents used in triggered spell removed by original spell or don't must be removed.
         return;
-
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // do not take reagents for these item casts
     if (m_CastItem && m_CastItem->GetProto()->Flags & ITEM_FLAGS_TRIGGERED_CAST)
         return;
-
     Player* p_caster = (Player*)m_caster;
     if (p_caster->CanNoReagentCast(m_spellInfo))
         return;
-
     for(uint32 x = 0; x < 8; ++x)
     {
         if(m_spellInfo->Reagent[x] <= 0)
             continue;
-
         uint32 itemid = m_spellInfo->Reagent[x];
         uint32 itemcount = m_spellInfo->ReagentCount[x];
-
         // if CastItem is also spell reagent
         if (m_CastItem)
         {
@@ -4258,65 +3748,47 @@ void Spell::TakeReagents()
                         break;
                     }
                 }
-
                 m_CastItem = NULL;
             }
         }
-
         // if getItemTarget is also spell reagent
         if (m_targets.getItemTargetEntry() == itemid)
             m_targets.setItemTarget(NULL);
-
         p_caster->DestroyItemCount(itemid, itemcount, true);
     }
 }
-
 void Spell::HandleThreatSpells(uint32 spellId)
 {
     if(!m_targets.getUnitTarget() || !spellId)
         return;
-
     if(!m_targets.getUnitTarget()->CanHaveThreatList())
         return;
-
     uint16 threat = spellmgr.GetSpellThreat(spellId);
-
     if(!threat)
         return;
-
     m_targets.getUnitTarget()->AddThreat(m_caster, float(threat));
-
     DEBUG_LOG("Spell %u, rank %u, added an additional %i threat", spellId, spellmgr.GetSpellRank(spellId), threat);
 }
-
 void Spell::HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,uint32 i)
 {
-
     if(!Script->OnSpellCast(pUnitTarget,pItemTarget,pGOTarget,i,m_spellInfo))
         return;
-
     //effect has been handled, skip it
     if(m_effectMask & (1<<i))
         return;
-
     unitTarget = pUnitTarget;
     itemTarget = pItemTarget;
     gameObjTarget = pGOTarget;
-
     uint8 eff = m_spellInfo->Effect[i];
-
     sLog.outDebug( "Spell: %u Effect : %u", m_spellInfo->Id, eff);
-
     //we do not need DamageMultiplier here.
     damage = CalculateDamage(i, NULL);
-
     if(eff<TOTAL_SPELL_EFFECTS)
     {
         //sLog.outDebug( "WORLD: Spell FX %d < TOTAL_SPELL_EFFECTS ", eff);
         (this->*SpellEffects[eff])(i);
     }
 }
-
 void Spell::TriggerSpell()
 {
     for(TriggerSpells::iterator si=m_TriggerSpells.begin(); si!=m_TriggerSpells.end(); ++si)
@@ -4325,7 +3797,6 @@ void Spell::TriggerSpell()
         spell->prepare(&m_targets);                         // use original spell original targets
     }
 }
-
 SpellCastResult Spell::CheckCast(bool strict)
 {
     // check cooldowns to prevent cheating
@@ -4334,7 +3805,6 @@ SpellCastResult Spell::CheckCast(bool strict)
         //can cast triggered (by aura only?) spells while have this flag
         if (!m_IsTriggeredSpell && ((Player*)m_caster)->HasFlag(PLAYER_FLAGS, PLAYER_ALLOW_ONLY_ABILITY))
             return SPELL_FAILED_SPELL_IN_PROGRESS;
-
         if  (((Player*)m_caster)->HasSpellCooldown(m_spellInfo->Id))
         {
             if(m_triggeredByAuraSpell)
@@ -4343,13 +3813,11 @@ SpellCastResult Spell::CheckCast(bool strict)
                 return SPELL_FAILED_NOT_READY;
         }
     }
-
     // only allow triggered spells if at an ended battleground
     if( !m_IsTriggeredSpell && m_caster->GetTypeId() == TYPEID_PLAYER)
         if(BattleGround * bg = ((Player*)m_caster)->GetBattleGround())
             if(bg->GetStatus() == STATUS_WAIT_LEAVE)
                 return SPELL_FAILED_DONT_REPORT;
-
     // only check at first call, Stealth auras are already removed at second call
     // for now, ignore triggered spells
     if( strict && !m_IsTriggeredSpell)
@@ -4370,12 +3838,10 @@ SpellCastResult Spell::CheckCast(bool strict)
             SpellCastResult shapeError = GetErrorAtShapeshiftedCast(m_spellInfo, m_caster->m_form);
             if(shapeError != SPELL_CAST_OK)
                 return shapeError;
-
             if ((m_spellInfo->Attributes & SPELL_ATTR_ONLY_STEALTHED) && !(m_caster->HasStealthAura()))
                 return SPELL_FAILED_ONLY_STEALTHED;
         }
     }
-
     bool reqCombat=true;
     Unit::AuraEffectList const& stateAuras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_IGNORE_AURASTATE);
     for(Unit::AuraEffectList::const_iterator j = stateAuras.begin();j != stateAuras.end(); ++j)
@@ -4389,8 +3855,7 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
         }
     }
-
-    // caster state requirements 
+    // caster state requirements
     // not for triggered spells (needed by execute)
     if (!m_IsTriggeredSpell)
     {
@@ -4398,17 +3863,14 @@ SpellCastResult Spell::CheckCast(bool strict)
             return SPELL_FAILED_CASTER_AURASTATE;
         if(m_spellInfo->CasterAuraStateNot && m_caster->HasAuraState(AuraState(m_spellInfo->CasterAuraStateNot), m_spellInfo, m_caster))
             return SPELL_FAILED_CASTER_AURASTATE;
-
         // Note: spell 62473 requres casterAuraSpell = triggering spell
         if(m_spellInfo->casterAuraSpell && !m_caster->HasAura(m_spellInfo->casterAuraSpell))
             return SPELL_FAILED_CASTER_AURASTATE;
         if(m_spellInfo->excludeCasterAuraSpell && m_caster->HasAura(m_spellInfo->excludeCasterAuraSpell))
             return SPELL_FAILED_CASTER_AURASTATE;
-
         if(reqCombat && m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
             return SPELL_FAILED_AFFECTING_COMBAT;
     }
-
     // cancel autorepeat spells if cast start when moving
     // (not wand currently autorepeat cast delayed to moving stop anyway in spell update code)
     if( m_caster->GetTypeId()==TYPEID_PLAYER && ((Player*)m_caster)->isMoving() )
@@ -4418,41 +3880,31 @@ SpellCastResult Spell::CheckCast(bool strict)
             (IsAutoRepeat() || (m_spellInfo->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED) != 0) )
             return SPELL_FAILED_MOVING;
     }
-
     if(Unit *target = m_targets.getUnitTarget())
     {
         // target state requirements (not allowed state), apply to self also
         if(!m_IsTriggeredSpell && m_spellInfo->TargetAuraStateNot && target->HasAuraState(AuraState(m_spellInfo->TargetAuraStateNot), m_spellInfo, m_caster))
             return SPELL_FAILED_TARGET_AURASTATE;
-
         if(m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
             return SPELL_FAILED_TARGET_AURASTATE;
-
         if(m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
             return SPELL_FAILED_TARGET_AURASTATE;
-
         if(!m_IsTriggeredSpell && target == m_caster && m_spellInfo->AttributesEx & SPELL_ATTR_EX_CANT_TARGET_SELF)
             return SPELL_FAILED_BAD_TARGETS;
-
         bool non_caster_target = target != m_caster && !spellmgr.IsSpellWithCasterSourceTargetsOnly(m_spellInfo);
-
         if(non_caster_target)
         {
             // target state requirements (apply to non-self only), to allow cast affects to self like Dirty Deeds
             if(!m_IsTriggeredSpell && m_spellInfo->TargetAuraState && !target->HasAuraState(AuraState(m_spellInfo->TargetAuraState), m_spellInfo, m_caster))
                 return SPELL_FAILED_TARGET_AURASTATE;
-
             // Not allow casting on flying player
             if (target->hasUnitState(UNIT_STAT_UNATTACKABLE))
                 return SPELL_FAILED_BAD_TARGETS;
-
             if(!m_IsTriggeredSpell && VMAP::VMapFactory::checkSpellForLoS(m_spellInfo->Id) && !m_caster->IsWithinLOSInMap(target))
                 return SPELL_FAILED_LINE_OF_SIGHT;
-
         }
         else if (m_caster == target)
         {
-
             if (m_caster->GetTypeId() == TYPEID_PLAYER) // Target - is player caster
             {
                 // Additional check for some spells
@@ -4468,7 +3920,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
             }
         }
-
         // check pet presents
         for(int j = 0; j < 3; ++j)
         {
@@ -4485,7 +3936,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                 break;
             }
         }
-
         //check creature type
         //ignore self casts (including area casts when caster selected as target)
         if(non_caster_target)
@@ -4498,7 +3948,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_BAD_TARGETS;
             }
         }
-
         // who can give me an example to show what is the use of this
         // even if we need check, check by effect rather than whole spell, otherwise 57108,57143 are broken
         /*
@@ -4520,11 +3969,9 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
         }
         */
-
         if(IsPositiveSpell(m_spellInfo->Id))
             if(target->IsImmunedToSpell(m_spellInfo))
                 return SPELL_FAILED_TARGET_AURASTATE;
-
         //Must be behind the target.
         if( m_spellInfo->AttributesEx2 == 0x100000 && (m_spellInfo->AttributesEx & 0x200) == 0x200 && target->HasInArc(M_PI, m_caster)
             //Exclusion for Pounce: Facing Limitation was removed in 2.0.1, but it still uses the same, old Ex-Flags
@@ -4535,24 +3982,20 @@ SpellCastResult Spell::CheckCast(bool strict)
             SendInterrupted(2);
             return SPELL_FAILED_NOT_BEHIND;
         }
-
         //Target must be facing you.
         if((m_spellInfo->Attributes == 0x150010) && !target->HasInArc(M_PI, m_caster) )
         {
             SendInterrupted(2);
             return SPELL_FAILED_NOT_INFRONT;
         }
-
         // check if target is in combat
         if (non_caster_target && (m_spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_IN_COMBAT_TARGET) && target->isInCombat())
             return SPELL_FAILED_TARGET_AFFECTING_COMBAT;
     }
-
     // Spell casted only on battleground
     if ((m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_BATTLEGROUND) &&  m_caster->GetTypeId() == TYPEID_PLAYER)
         if(!((Player*)m_caster)->InBattleGround())
             return SPELL_FAILED_ONLY_BATTLEGROUNDS;
-
     // do not allow spells to be cast in arenas
     // - with greater than 15 min CD without SPELL_ATTR_EX4_USABLE_IN_ARENA flag
     // - with SPELL_ATTR_EX4_NOT_USABLE_IN_ARENA flag
@@ -4561,19 +4004,16 @@ SpellCastResult Spell::CheckCast(bool strict)
         if(MapEntry const* mapEntry = sMapStore.LookupEntry(m_caster->GetMapId()))
             if(mapEntry->IsBattleArena())
                 return SPELL_FAILED_NOT_IN_ARENA;
-
     // zone check
     if(m_caster->GetTypeId() == TYPEID_UNIT || !((Player*)m_caster)->isGameMaster())
     {
         uint32 zone, area;
         m_caster->GetZoneAndAreaId(zone,area);
-
         SpellCastResult locRes= spellmgr.GetSpellAllowedInLocationError(m_spellInfo,m_caster->GetMapId(),zone,area,
             m_caster->GetTypeId()==TYPEID_PLAYER ? ((Player*)m_caster) : NULL);
         if(locRes != SPELL_CAST_OK)
             return locRes;
     }
-
     // not let players cast spells at mount (and let do it to creatures)
     if (m_caster->IsMounted() && m_caster->GetTypeId()==TYPEID_PLAYER && !m_IsTriggeredSpell &&
         !IsPassiveSpell(m_spellInfo->Id) && !(m_spellInfo->Attributes & SPELL_ATTR_CASTABLE_WHILE_MOUNTED))
@@ -4583,7 +4023,6 @@ SpellCastResult Spell::CheckCast(bool strict)
         else
             return SPELL_FAILED_NOT_MOUNTED;
     }
-
     // always (except passive spells) check items (focus object can be required for any type casts)
     if (!IsPassiveSpell(m_spellInfo->Id))
     {
@@ -4591,7 +4030,6 @@ SpellCastResult Spell::CheckCast(bool strict)
         if(castResult != SPELL_CAST_OK)
             return castResult;
     }
-
     /*//ImpliciteTargetA-B = 38, If fact there is 0 Spell with  ImpliciteTargetB=38
     if(m_UniqueTargetInfo.empty())                          // skip second CheckCast apply (for delayed spells for example)
     {
@@ -4606,13 +4044,10 @@ SpellCastResult Spell::CheckCast(bool strict)
                 SpellScriptTarget::const_iterator upper = spellmgr.GetEndSpellScriptTarget(m_spellInfo->Id);
                 if(lower==upper)
                     sLog.outErrorDb("Spell (ID: %u) has effect EffectImplicitTargetA/EffectImplicitTargetB = TARGET_UNIT_NEARBY_ENTRY or TARGET_DST_NEARBY_ENTRY, but does not have record in `spell_script_target`",m_spellInfo->Id);
-
                 SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
                 float range = GetSpellMaxRange(srange);
-
                 Creature* creatureScriptTarget = NULL;
                 GameObject* goScriptTarget = NULL;
-
                 for(SpellScriptTarget::const_iterator i_spellST = bounds.first; i_spellST != bounds.second; ++i_spellST)
                 {
                     switch(i_spellST->second.type)
@@ -4620,20 +4055,16 @@ SpellCastResult Spell::CheckCast(bool strict)
                         case SPELL_TARGET_TYPE_GAMEOBJECT:
                         {
                             GameObject* p_GameObject = NULL;
-
                             if (i_spellST->second.targetEntry)
                             {
                                 CellPair p(MaNGOS::ComputeCellPair(m_caster->GetPositionX(), m_caster->GetPositionY()));
                                 Cell cell(p);
                                 cell.data.Part.reserved = ALL_DISTRICT;
-
                                 MaNGOS::NearestGameObjectEntryInObjectRangeCheck go_check(*m_caster,i_spellST->second.targetEntry,range);
                                 MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck> checker(m_caster, p_GameObject,go_check);
-
                                 TypeContainerVisitor<MaNGOS::GameObjectLastSearcher<MaNGOS::NearestGameObjectEntryInObjectRangeCheck>, GridTypeMapContainer > object_checker(checker);
                                 CellLock<GridReadGuard> cell_lock(cell, p);
                                 cell_lock->Visit(cell_lock, object_checker, *m_caster->GetMap());
-
                                 if (p_GameObject)
                                 {
                                     // remember found target and range, next attempt will find more near target with another entry
@@ -4659,20 +4090,15 @@ SpellCastResult Spell::CheckCast(bool strict)
                         default:
                         {
                             Creature *p_Creature = NULL;
-
                             CellPair p(MaNGOS::ComputeCellPair(m_caster->GetPositionX(), m_caster->GetPositionY()));
                             Cell cell(p);
                             cell.data.Part.reserved = ALL_DISTRICT;
                             cell.SetNoCreate();             // Really don't know what is that???
-
                             MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck u_check(*m_caster,i_spellST->second.targetEntry,i_spellST->second.type!=SPELL_TARGET_TYPE_DEAD,range);
                             MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck> searcher(m_caster, p_Creature, u_check);
-
                             TypeContainerVisitor<MaNGOS::CreatureLastSearcher<MaNGOS::NearestCreatureEntryWithLiveStateInObjectRangeCheck>, GridTypeMapContainer >  grid_creature_searcher(searcher);
-
                             CellLock<GridReadGuard> cell_lock(cell, p);
                             cell_lock->Visit(cell_lock, grid_creature_searcher, *m_caster->GetMap(), *m_caster, range);
-
                             if(p_Creature )
                             {
                                 creatureScriptTarget = p_Creature;
@@ -4683,7 +4109,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                         }
                     }
                 }
-
                 if(creatureScriptTarget)
                 {
                     // store coordinates for TARGET_DST_NEARBY_ENTRY
@@ -4691,7 +4116,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                         m_spellInfo->EffectImplicitTargetB[j] == TARGET_DST_NEARBY_ENTRY )
                     {
                         m_targets.setDst(creatureScriptTarget->GetPositionX(),creatureScriptTarget->GetPositionY(),creatureScriptTarget->GetPositionZ());
-
                         if(m_spellInfo->EffectImplicitTargetA[j] == TARGET_DST_NEARBY_ENTRY && m_spellInfo->EffectImplicitTargetB[j] == 0 && m_spellInfo->Effect[j]!=SPELL_EFFECT_PERSISTENT_AREA_AURA)
                             AddUnitTarget(creatureScriptTarget, j);
                     }
@@ -4706,7 +4130,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                         m_spellInfo->EffectImplicitTargetB[j] == TARGET_DST_NEARBY_ENTRY )
                     {
                         m_targets.setDst(goScriptTarget->GetPositionX(),goScriptTarget->GetPositionY(),goScriptTarget->GetPositionZ());
-
                         if(m_spellInfo->EffectImplicitTargetA[j] == TARGET_DST_NEARBY_ENTRY && m_spellInfo->EffectImplicitTargetB[j] == 0 && m_spellInfo->Effect[j]!=SPELL_EFFECT_PERSISTENT_AREA_AURA)
                             AddGOTarget(goScriptTarget, j);
                     }
@@ -4726,22 +4149,18 @@ SpellCastResult Spell::CheckCast(bool strict)
             }
         }
     }*/
-
     if(!m_IsTriggeredSpell)
     {
         SpellCastResult castResult = CheckRange(strict);
         if(castResult != SPELL_CAST_OK)
             return castResult;
-
         castResult = CheckPower();
         if(castResult != SPELL_CAST_OK)
             return castResult;
-
         castResult = CheckCasterAuras();
         if(castResult != SPELL_CAST_OK)
             return castResult;
     }
-
     for (int i = 0; i < 3; i++)
     {
         // for effects of spells that have only one target
@@ -4784,42 +4203,30 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if (m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 if(m_spellInfo->EffectImplicitTargetA[i] != TARGET_UNIT_PET)
                     break;
-
                 Pet* pet = ((Player*)m_caster)->GetPet();
-
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
-
                 SpellEntry const *learn_spellproto = sSpellStore.LookupEntry(m_spellInfo->EffectTriggerSpell[i]);
-
                 if(!learn_spellproto)
                     return SPELL_FAILED_NOT_KNOWN;
-
                 if(m_spellInfo->spellLevel > pet->getLevel())
                     return SPELL_FAILED_LOWLEVEL;
-
                 break;
             }
             case SPELL_EFFECT_LEARN_PET_SPELL:
             {
                 if (m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 Pet* pet = ((Player*)m_caster)->GetPet();
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
-
                 SpellEntry const *learn_spellproto = sSpellStore.LookupEntry(m_spellInfo->EffectTriggerSpell[i]);
-
                 if(!learn_spellproto)
                     return SPELL_FAILED_NOT_KNOWN;
-
                 if(m_spellInfo->spellLevel > pet->getLevel())
                     return SPELL_FAILED_LOWLEVEL;
-
                 break;
             }
             case SPELL_EFFECT_APPLY_GLYPH:
@@ -4834,25 +4241,18 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if (m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 Item* foodItem = m_targets.getItemTarget();
                 if(!foodItem)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 Pet* pet = ((Player*)m_caster)->GetPet();
-
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
-
                 if(!pet->HaveInDiet(foodItem->GetProto()))
                     return SPELL_FAILED_WRONG_PET_FOOD;
-
                 if(!pet->GetCurrentFoodBenefitLevel(foodItem->GetProto()->ItemLevel))
                     return SPELL_FAILED_FOOD_LOWLEVEL;
-
                 if(m_caster->isInCombat() || pet->isInCombat())
                     return SPELL_FAILED_AFFECTING_COMBAT;
-
                 break;
             }
             case SPELL_EFFECT_POWER_BURN:
@@ -4881,30 +4281,24 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if (m_caster->GetTypeId() != TYPEID_PLAYER || !m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetTypeId() != TYPEID_UNIT)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 if( !(m_targets.getUnitTarget()->GetUInt32Value(UNIT_FIELD_FLAGS) & UNIT_FLAG_SKINNABLE) )
                     return SPELL_FAILED_TARGET_UNSKINNABLE;
-
                 Creature* creature = (Creature*)m_targets.getUnitTarget();
                 if ( creature->GetCreatureType() != CREATURE_TYPE_CRITTER && ( !creature->lootForBody || !creature->loot.empty() ) )
                 {
                     return SPELL_FAILED_TARGET_NOT_LOOTED;
                 }
-
                 uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
-
                 int32 skillValue = ((Player*)m_caster)->GetSkillValue(skill);
                 int32 TargetLevel = m_targets.getUnitTarget()->getLevel();
                 int32 ReqValue = (skillValue < 100 ? (TargetLevel-10) * 10 : TargetLevel * 5);
                 if (ReqValue > skillValue)
                     return SPELL_FAILED_LOW_CASTLEVEL;
-
                 // chance for fail at orange skinning attempt
                 if( (m_selfContainer && (*m_selfContainer) == this) &&
                     skillValue < sWorld.GetConfigMaxSkillValue() &&
                     (ReqValue < 0 ? 0 : ReqValue) > irand(skillValue - 25, skillValue + 37) )
                     return SPELL_FAILED_TRY_AGAIN;
-
                 break;
             }
             case SPELL_EFFECT_OPEN_LOCK:
@@ -4912,7 +4306,6 @@ SpellCastResult Spell::CheckCast(bool strict)
                 if( m_spellInfo->EffectImplicitTargetA[i] != TARGET_GAMEOBJECT &&
                     m_spellInfo->EffectImplicitTargetA[i] != TARGET_GAMEOBJECT_ITEM )
                     break;
-
                 if( m_caster->GetTypeId() != TYPEID_PLAYER  // only players can open locks, gather etc.
                     // we need a go target in case of TARGET_GAMEOBJECT
                     || m_spellInfo->EffectImplicitTargetA[i] == TARGET_GAMEOBJECT && !m_targets.getGOTarget()
@@ -4920,12 +4313,10 @@ SpellCastResult Spell::CheckCast(bool strict)
                     || m_spellInfo->EffectImplicitTargetA[i] == TARGET_GAMEOBJECT_ITEM && !m_targets.getGOTarget() &&
                     (!m_targets.getItemTarget() || !m_targets.getItemTarget()->GetProto()->LockID || m_targets.getItemTarget()->GetOwner() != m_caster ) )
                     return SPELL_FAILED_BAD_TARGETS;
-
                 // In BattleGround players can use only flags and banners
                 if( ((Player*)m_caster)->InBattleGround() &&
                     !((Player*)m_caster)->CanUseBattleGroundObject() )
                     return SPELL_FAILED_TRY_AGAIN;
-
                 // get the lock entry
                 uint32 lockId = 0;
                 if (GameObject* go = m_targets.getGOTarget())
@@ -4936,22 +4327,18 @@ SpellCastResult Spell::CheckCast(bool strict)
                 }
                 else if(Item* itm = m_targets.getItemTarget())
                     lockId = itm->GetProto()->LockID;
-
                 SkillType skillId = SKILL_NONE;
                 int32 reqSkillValue = 0;
                 int32 skillValue = 0;
-
                 // check lock compatibility
                 SpellCastResult res = CanOpenLock(i, lockId, skillId, reqSkillValue, skillValue);
                 if(res != SPELL_CAST_OK)
                     return res;
-
                 // chance for fail at orange mining/herb/LockPicking gathering attempt
                 // second check prevent fail at rechecks
                 if(skillId != SKILL_NONE && (!m_selfContainer || ((*m_selfContainer) != this)))
                 {
                     bool canFailAtMax = skillId != SKILL_HERBALISM && skillId != SKILL_MINING;
-
                     // chance for failure in orange gather / lockpick (gathering skill can't fail at maxskill)
                     if((canFailAtMax || skillValue < sWorld.GetConfigMaxSkillValue()) && reqSkillValue > irand(skillValue - 25, skillValue + 37))
                         return SPELL_FAILED_TRY_AGAIN;
@@ -4963,10 +4350,8 @@ SpellCastResult Spell::CheckCast(bool strict)
                 Creature *pet = m_caster->GetGuardianPet();
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
-
                 if(pet->isAlive())
                     return SPELL_FAILED_ALREADY_HAVE_SUMMON;
-
                 break;
             }
             // This is generic summon effect
@@ -4992,10 +4377,8 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if(m_caster->GetPetGUID())
                     return SPELL_FAILED_ALREADY_HAVE_SUMMON;
-
                 if(m_caster->GetCharmGUID())
                     return SPELL_FAILED_ALREADY_HAVE_CHARM;
-
                 break;
             }
             case SPELL_EFFECT_SUMMON_PET:
@@ -5011,10 +4394,8 @@ SpellCastResult Spell::CheckCast(bool strict)
                     else
                         return SPELL_FAILED_ALREADY_HAVE_SUMMON;
                 }
-
                 if(m_caster->GetCharmGUID())
                     return SPELL_FAILED_ALREADY_HAVE_CHARM;
-
                 break;
             }
             case SPELL_EFFECT_SUMMON_PLAYER:
@@ -5023,11 +4404,9 @@ SpellCastResult Spell::CheckCast(bool strict)
                     return SPELL_FAILED_BAD_TARGETS;
                 if(!((Player*)m_caster)->GetSelection())
                     return SPELL_FAILED_BAD_TARGETS;
-
                 Player* target = objmgr.GetPlayer(((Player*)m_caster)->GetSelection());
                 if( !target || ((Player*)m_caster) == target || !target->IsInSameRaidWith((Player*)m_caster) )
                     return SPELL_FAILED_BAD_TARGETS;
-
                 // check if our map is dungeon
                 if( sMapStore.LookupEntry(m_caster->GetMapId())->IsDungeon() )
                 {
@@ -5058,7 +4437,6 @@ SpellCastResult Spell::CheckCast(bool strict)
             default:break;
         }
     }
-
     for (int i = 0; i < 3; i++)
     {
         switch(m_spellInfo->EffectApplyAuraName[i])
@@ -5076,25 +4454,18 @@ SpellCastResult Spell::CheckCast(bool strict)
                     {
                         if (m_caster->GetTypeId() != TYPEID_PLAYER)
                             return SPELL_FAILED_BAD_TARGETS;
-
                         if (!m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER)
                             return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
                         Creature* target = (Creature*)m_targets.getUnitTarget();
-
                         if (target->getLevel() > m_caster->getLevel())
                             return SPELL_FAILED_HIGHLEVEL;
-
                         // use SMSG_PET_TAME_FAILURE?
                         if (!target->GetCreatureInfo()->isTameable (((Player*)m_caster)->CanTameExoticPets()))
                             return SPELL_FAILED_BAD_TARGETS;
-
                         if(m_caster->GetPetGUID())
                             return SPELL_FAILED_ALREADY_HAVE_SUMMON;
-
                         if(m_caster->GetCharmGUID())
                             return SPELL_FAILED_ALREADY_HAVE_CHARM;
-
                         break;
                     }
                     default:
@@ -5106,11 +4477,9 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if(m_caster->GetTypeId() != TYPEID_PLAYER)
                     return SPELL_FAILED_NO_PET;
-
                 Pet *pet = ((Player*)m_caster)->GetPet();
                 if(!pet)
                     return SPELL_FAILED_NO_PET;
-
                 if(pet->GetCharmerGUID())
                     return SPELL_FAILED_CHARMED;
                 break;
@@ -5121,62 +4490,50 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if(m_caster->GetCharmerGUID())
                     return SPELL_FAILED_CHARMED;
-
                 if(m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_CHARM
                     || m_spellInfo->EffectApplyAuraName[i] == SPELL_AURA_MOD_POSSESS)
                 {
                     if(m_caster->GetPetGUID())
                         return SPELL_FAILED_ALREADY_HAVE_SUMMON;
-
                     if(m_caster->GetCharmGUID())
                         return SPELL_FAILED_ALREADY_HAVE_CHARM;
                 }
-
                 if(Unit *target = m_targets.getUnitTarget())
                 {
                     if(target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsVehicle())
                         return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
                     if(target->GetCharmerGUID())
                         return SPELL_FAILED_CHARMED;
-
                     int32 damage = CalculateDamage(i, target);
                     if(damage && int32(target->getLevel()) > damage)
                         return SPELL_FAILED_HIGHLEVEL;
                 }
-
                 break;
             }
             case SPELL_AURA_MOUNTED:
             {
                 if (m_caster->IsInWater())
                     return SPELL_FAILED_ONLY_ABOVEWATER;
-
                 if (m_caster->GetTypeId() == TYPEID_PLAYER && ((Player*)m_caster)->GetTransport())
                     return SPELL_FAILED_NO_MOUNTS_ALLOWED;
-
                 // Ignore map check if spell have AreaId. AreaId already checked and this prevent special mount spells
                 if (m_caster->GetTypeId() == TYPEID_PLAYER && !sMapStore.LookupEntry(m_caster->GetMapId())->IsMountAllowed() && !m_IsTriggeredSpell && !m_spellInfo->AreaGroupId)
                     return SPELL_FAILED_NO_MOUNTS_ALLOWED;
-
                 ShapeshiftForm form = m_caster->m_form;
                 if( form == FORM_CAT          || form == FORM_TREE      || form == FORM_TRAVEL   ||
                     form == FORM_AQUA         || form == FORM_BEAR      || form == FORM_DIREBEAR ||
                     form == FORM_CREATUREBEAR || form == FORM_GHOSTWOLF || form == FORM_FLIGHT   ||
                     form == FORM_FLIGHT_EPIC  || form == FORM_MOONKIN   || form == FORM_METAMORPHOSIS )
                     return SPELL_FAILED_NOT_SHAPESHIFT;
-
                 break;
             }
             case SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS:
             {
                 if(!m_targets.getUnitTarget())
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
                 // can be casted at non-friendly unit or own pet/charm
                 if(m_caster->IsFriendlyTo(m_targets.getUnitTarget()))
                     return SPELL_FAILED_TARGET_FRIENDLY;
-
                 break;
             }
             case SPELL_AURA_FLY:
@@ -5195,42 +4552,33 @@ SpellCastResult Spell::CheckCast(bool strict)
             {
                 if (!m_targets.getUnitTarget())
                     return SPELL_FAILED_BAD_IMPLICIT_TARGETS;
-
                 if (m_caster->GetTypeId() != TYPEID_PLAYER || m_CastItem)
                     break;
-
                 if(m_targets.getUnitTarget()->getPowerType() != POWER_MANA)
                     return SPELL_FAILED_BAD_TARGETS;
-
                 break;
             }
             default:
                 break;
         }
     }
-
     // all ok
     return SPELL_CAST_OK;
 }
-
 SpellCastResult Spell::CheckPetCast(Unit* target)
 {
     if(!m_caster->isAlive() && !(m_spellInfo->Attributes & SPELL_ATTR_CASTABLE_WHILE_DEAD))
         return SPELL_FAILED_CASTER_DEAD;
-
     if(m_caster->hasUnitState(UNIT_STAT_CASTING) && !m_IsTriggeredSpell)              //prevent spellcast interruption by another spellcast
         return SPELL_FAILED_SPELL_IN_PROGRESS;
     if(m_caster->isInCombat() && IsNonCombatSpell(m_spellInfo))
         return SPELL_FAILED_AFFECTING_COMBAT;
-
                                                             //dead owner (pets still alive when owners ressed?)
         if(Unit *owner = m_caster->GetCharmerOrOwner())
             if(!owner->isAlive())
                 return SPELL_FAILED_CASTER_DEAD;
-
         if(!target && m_targets.getUnitTarget())
             target = m_targets.getUnitTarget();
-
         for(uint32 i = 0; i < 3; ++i)
         {
             if(SpellTargetType[m_spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET
@@ -5242,34 +4590,27 @@ SpellCastResult Spell::CheckPetCast(Unit* target)
                 break;
             }
         }
-
         Unit* _target = m_targets.getUnitTarget();
-
         if(_target)                                         //for target dead/target not valid
         {
             if(!_target->isAlive())
                 return SPELL_FAILED_BAD_TARGETS;
-
             if(!IsValidSingleTargetSpell(_target))
                 return SPELL_FAILED_BAD_TARGETS;
         }
                                                             //cooldown
         if(((Creature*)m_caster)->HasSpellCooldown(m_spellInfo->Id))
             return SPELL_FAILED_NOT_READY;
-
     return CheckCast(true);
 }
-
 SpellCastResult Spell::CheckCasterAuras() const
 {
     // spells totally immuned to caster auras ( wsg flag drop, give marks etc)
     if(m_spellInfo->AttributesEx6& SPELL_ATTR_EX6_IGNORE_CASTER_AURAS)
         return SPELL_CAST_OK;
-
     uint8 school_immune = 0;
     uint32 mechanic_immune = 0;
     uint32 dispel_immune = 0;
-
     // Check if the spell grants school or mechanic immunity.
     // We use bitmasks so the loop is done only once and not on every aura check below.
     if ( m_spellInfo->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY )
@@ -5287,7 +4628,6 @@ SpellCastResult Spell::CheckCasterAuras() const
         if(m_spellInfo->Id==42292 || m_spellInfo->Id==59752)
             mechanic_immune = IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK;
     }
-
     // Check whether the cast should be prevented by any state you might have.
     SpellCastResult prevented_reason = SPELL_CAST_OK;
     // Have to check if there is a stun aura. Otherwise will have problems with ghost aura apply while logging out
@@ -5302,7 +4642,6 @@ SpellCastResult Spell::CheckCasterAuras() const
         prevented_reason = SPELL_FAILED_SILENCED;
     else if(unitflag & UNIT_FLAG_PACIFIED && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY)
         prevented_reason = SPELL_FAILED_PACIFIED;
-
     // Attr must make flag drop spell totally immune from all effects
     if(prevented_reason != SPELL_CAST_OK)
     {
@@ -5320,7 +4659,6 @@ SpellCastResult Spell::CheckCasterAuras() const
                         continue;
                     if( (1<<(itr->second->GetSpellProto()->Dispel)) & dispel_immune)
                         continue;
-
                     //Make a second check for spell failed so the right SPELL_FAILED message is returned.
                     //That is needed when your casting is prevented by multiple states and you are only immune to some of them.
                     for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i)
@@ -5362,11 +4700,9 @@ SpellCastResult Spell::CheckCasterAuras() const
     }
     return SPELL_CAST_OK;
 }
-
 bool Spell::CanAutoCast(Unit* target)
 {
     uint64 targetguid = target->GetGUID();
-
     for(uint32 j = 0; j < 3; ++j)
     {
         if(m_spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
@@ -5389,9 +4725,7 @@ bool Spell::CanAutoCast(Unit* target)
                 return false;
         }
     }
-
     SpellCastResult result = CheckPetCast(target);
-
     if(result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
     {
         SelectSpellTargets();
@@ -5402,31 +4736,24 @@ bool Spell::CanAutoCast(Unit* target)
     }
     return false;                                           //target invalid
 }
-
 SpellCastResult Spell::CheckRange(bool strict)
 {
     //float range_mod;
-
     // self cast doesn't need range checking -- also for Starshards fix
     if (m_spellInfo->rangeIndex == 1)
         return SPELL_CAST_OK;
-
     // i do not know why we need this
     /*if (strict)                                             //add radius of caster
         range_mod = 1.25;
     else                                                    //add radius of caster and ~5 yds "give"
         range_mod = 6.25;*/
-
     SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
-
     Unit *target = m_targets.getUnitTarget();
     float max_range = m_caster->GetSpellMaxRangeForTarget(target, srange); // + range_mod;
     float min_range = m_caster->GetSpellMinRangeForTarget(target, srange);
     uint32 range_type = GetSpellRangeType(srange);
-
     if(Player* modOwner = m_caster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RANGE, max_range, this);
-
     if(target && target != m_caster)
     {
         if(range_type == SPELL_RANGE_MELEE)
@@ -5437,7 +4764,6 @@ SpellCastResult Spell::CheckRange(bool strict)
         }
         else if(!m_caster->IsWithinCombatRange(target, max_range))
             return SPELL_FAILED_OUT_OF_RANGE;               //0x5A;
-
         if(range_type == SPELL_RANGE_RANGED)
         {
             if(m_caster->IsWithinMeleeRange(target))
@@ -5445,12 +4771,10 @@ SpellCastResult Spell::CheckRange(bool strict)
         }
         else if(min_range && m_caster->IsWithinCombatRange(target, min_range)) // skip this check if min_range = 0
             return SPELL_FAILED_TOO_CLOSE;
-
         if( m_caster->GetTypeId() == TYPEID_PLAYER &&
             (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc( M_PI, target ) )
             return SPELL_FAILED_UNIT_NOT_INFRONT;
     }
-
     if(m_targets.HasDst() && !m_targets.HasTraj())
     {
         if(!m_caster->IsWithinDist3d(&m_targets.m_dstPos, max_range))
@@ -5458,16 +4782,13 @@ SpellCastResult Spell::CheckRange(bool strict)
         if(min_range && m_caster->IsWithinDist3d(&m_targets.m_dstPos, min_range))
             return SPELL_FAILED_TOO_CLOSE;
     }
-
     return SPELL_CAST_OK;
 }
-
 SpellCastResult Spell::CheckPower()
 {
     // item cast not used power
     if(m_CastItem)
         return SPELL_CAST_OK;
-
     // health as power used - need check health amount
     if(m_spellInfo->powerType == POWER_HEALTH)
     {
@@ -5481,7 +4802,6 @@ SpellCastResult Spell::CheckPower()
         sLog.outError("Spell::CheckPower: Unknown power type '%d'", m_spellInfo->powerType);
         return SPELL_FAILED_UNKNOWN;
     }
-    
     //check rune cost only if a spell has PowerType == POWER_RUNE
     if(m_spellInfo->powerType == POWER_RUNE)
     {
@@ -5489,7 +4809,6 @@ SpellCastResult Spell::CheckPower()
         if(failReason != SPELL_CAST_OK)
             return failReason;
     }
-
     // Check power amount
     Powers powerType = Powers(m_spellInfo->powerType);
     if(m_caster->GetPower(powerType) < m_powerCost)
@@ -5497,14 +4816,11 @@ SpellCastResult Spell::CheckPower()
     else
         return SPELL_CAST_OK;
 }
-
 SpellCastResult Spell::CheckItems()
 {
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return SPELL_CAST_OK;
-
     Player* p_caster = (Player*)m_caster;
-
     if(!m_CastItem)
     {
         if(m_castItemGUID)
@@ -5515,16 +4831,13 @@ SpellCastResult Spell::CheckItems()
         uint32 itemid = m_CastItem->GetEntry();
         if( !p_caster->HasItemCount(itemid, 1) )
             return SPELL_FAILED_ITEM_NOT_READY;
-
         ItemPrototype const *proto = m_CastItem->GetProto();
         if(!proto)
             return SPELL_FAILED_ITEM_NOT_READY;
-
         for (int i = 0; i < 5; ++i)
             if (proto->Spells[i].SpellCharges)
                 if(m_CastItem->GetSpellCharges(i) == 0)
                     return SPELL_FAILED_NO_CHARGES_REMAIN;
-
         // consumable cast item checks
         if (proto->Class == ITEM_CLASS_CONSUMABLE && m_targets.getUnitTarget())
         {
@@ -5535,7 +4848,6 @@ SpellCastResult Spell::CheckItems()
                     // skip check, pet not required like checks, and for TARGET_UNIT_PET m_targets.getUnitTarget() is not the real target but the caster
                     if (m_spellInfo->EffectImplicitTargetA[i] == TARGET_UNIT_PET)
                     continue;
-
                 if (m_spellInfo->Effect[i] == SPELL_EFFECT_HEAL)
                 {
                     if (m_targets.getUnitTarget()->GetHealth() == m_targets.getUnitTarget()->GetMaxHealth())
@@ -5549,7 +4861,6 @@ SpellCastResult Spell::CheckItems()
                         break;
                     }
                 }
-
                 // Mana Potion, Rage Potion, Thistle Tea(Rogue), ...
                 if (m_spellInfo->Effect[i] == SPELL_EFFECT_ENERGIZE)
                 {
@@ -5558,7 +4869,6 @@ SpellCastResult Spell::CheckItems()
                         failReason = SPELL_FAILED_ALREADY_AT_FULL_POWER;
                         continue;
                     }
-
                     Powers power = Powers(m_spellInfo->EffectMiscValue[i]);
                     if (m_targets.getUnitTarget()->GetPower(power) == m_targets.getUnitTarget()->GetMaxPower(power))
                     {
@@ -5576,16 +4886,13 @@ SpellCastResult Spell::CheckItems()
                 return failReason;
         }
     }
-
     // check target item
     if(m_targets.getItemTargetGUID())
     {
         if(m_caster->GetTypeId() != TYPEID_PLAYER)
             return SPELL_FAILED_BAD_TARGETS;
-
         if(!m_targets.getItemTarget())
             return SPELL_FAILED_ITEM_GONE;
-
         if(!m_targets.getItemTarget()->IsFitToSpellRequirements(m_spellInfo))
             return SPELL_FAILED_EQUIPPED_ITEM_CLASS;
     }
@@ -5595,29 +4902,23 @@ SpellCastResult Spell::CheckItems()
         if(m_caster->GetTypeId() == TYPEID_PLAYER && !((Player*)m_caster)->HasItemFitToSpellReqirements(m_spellInfo))
             return SPELL_FAILED_EQUIPPED_ITEM_CLASS;
     }
-
     // check spell focus object
     if(m_spellInfo->RequiresSpellFocus)
     {
         CellPair p(Trinity::ComputeCellPair(m_caster->GetPositionX(), m_caster->GetPositionY()));
         Cell cell(p);
         cell.data.Part.reserved = ALL_DISTRICT;
-
         GameObject* ok = NULL;
         MaNGOS::GameObjectFocusCheck go_check(m_caster,m_spellInfo->RequiresSpellFocus);
         MaNGOS::GameObjectSearcher<MaNGOS::GameObjectFocusCheck> checker(m_caster, ok, go_check);
-
         TypeContainerVisitor<Trinity::GameObjectSearcher<Trinity::GameObjectFocusCheck>, GridTypeMapContainer > object_checker(checker);
         CellLock<GridReadGuard> cell_lock(cell, p);
         Map& map = *m_caster->GetMap();
         cell_lock->Visit(cell_lock, object_checker, map, *m_caster, map.GetVisibilityDistance());
-
         if(!ok)
             return SPELL_FAILED_REQUIRES_SPELL_FOCUS;
-
         focusObject = ok;                                   // game object found in range
     }
-
     // do not take reagents for these item casts
     if (!(m_CastItem && m_CastItem->GetProto()->Flags & ITEM_FLAGS_TRIGGERED_CAST))
     {
@@ -5628,10 +4929,8 @@ SpellCastResult Spell::CheckItems()
             {
                 if(m_spellInfo->Reagent[i] <= 0)
                     continue;
-
                 uint32 itemid    = m_spellInfo->Reagent[i];
                 uint32 itemcount = m_spellInfo->ReagentCount[i];
-
                 // if CastItem is also spell reagent
                 if( m_CastItem && m_CastItem->GetEntry() == itemid )
                 {
@@ -5653,7 +4952,6 @@ SpellCastResult Spell::CheckItems()
                     return SPELL_FAILED_ITEM_NOT_READY;         //0x54
             }
         }
-
         // check totem-item requirements (items presence in inventory)
         uint32 totems = 2;
         for(int i = 0; i < 2 ; ++i)
@@ -5670,7 +4968,6 @@ SpellCastResult Spell::CheckItems()
         }
         if(totems != 0)
             return SPELL_FAILED_TOTEMS;                         //0x7C
-
         // Check items for TotemCategory  (items presence in inventory)
         uint32 TotemCategory = 2;
         for(int i= 0; i < 2; ++i)
@@ -5689,7 +4986,6 @@ SpellCastResult Spell::CheckItems()
         if(TotemCategory != 0)
             return SPELL_FAILED_TOTEM_CATEGORY;                 //0x7B
     }
-
     // special checks for spell effects
     for(int i = 0; i < 3; i++)
     {
@@ -5710,7 +5006,7 @@ SpellCastResult Spell::CheckItems()
                 break;
             }
             case SPELL_EFFECT_ENCHANT_ITEM:
-                if(m_spellInfo->EffectItemType[i] && m_targets.getItemTarget() 
+                if(m_spellInfo->EffectItemType[i] && m_targets.getItemTarget()
                     && (m_targets.getItemTarget()->IsWeaponVellum() || m_targets.getItemTarget()->IsArmorVellum()))
                 {
                     // cannot enchant vellum for other player
@@ -5732,7 +5028,6 @@ SpellCastResult Spell::CheckItems()
                 Item* targetItem = m_targets.getItemTarget();
                 if(!targetItem)
                     return SPELL_FAILED_ITEM_NOT_FOUND;
-
                 if( targetItem->GetProto()->ItemLevel < m_spellInfo->baseLevel )
                     return SPELL_FAILED_LOWLEVEL;
                 // Not allow enchant in trade slot for some enchant type
@@ -5771,15 +5066,12 @@ SpellCastResult Spell::CheckItems()
             {
                 if(!m_targets.getItemTarget())
                     return SPELL_FAILED_CANT_BE_DISENCHANTED;
-
                 // prevent disenchanting in trade slot
                 if( m_targets.getItemTarget()->GetOwnerGUID() != m_caster->GetGUID() )
                     return SPELL_FAILED_CANT_BE_DISENCHANTED;
-
                 ItemPrototype const* itemProto = m_targets.getItemTarget()->GetProto();
                 if(!itemProto)
                     return SPELL_FAILED_CANT_BE_DISENCHANTED;
-
                 uint32 item_quality = itemProto->Quality;
                 // 2.0.x addon: Check player enchanting level against the item disenchanting requirements
                 uint32 item_disenchantskilllevel = itemProto->RequiredDisenchantSkill;
@@ -5812,10 +5104,8 @@ SpellCastResult Spell::CheckItems()
                 //make sure the player has the required ores in inventory
                 if(m_targets.getItemTarget()->GetCount() < 5)
                     return SPELL_FAILED_NEED_MORE_ITEMS;
-
                 if(!LootTemplates_Prospecting.HaveLootFor(m_targets.getItemTargetEntry()))
                     return SPELL_FAILED_CANT_BE_PROSPECTED;
-
                 break;
             }
             case SPELL_EFFECT_MILLING:
@@ -5835,10 +5125,8 @@ SpellCastResult Spell::CheckItems()
                 //make sure the player has the required herbs in inventory
                 if(m_targets.getItemTarget()->GetCount() < 5)
                     return SPELL_FAILED_NEED_MORE_ITEMS;
-
                 if(!LootTemplates_Milling.HaveLootFor(m_targets.getItemTargetEntry()))
                     return SPELL_FAILED_CANT_BE_MILLED;
-
                 break;
             }
             case SPELL_EFFECT_WEAPON_DAMAGE:
@@ -5850,7 +5138,6 @@ SpellCastResult Spell::CheckItems()
                 Item *pItem = ((Player*)m_caster)->GetWeaponForAttack(m_attackType);
                 if(!pItem || pItem->IsBroken())
                     return SPELL_FAILED_EQUIPPED_ITEM;
-
                 switch(pItem->GetProto()->SubClass)
                 {
                     case ITEM_SUBCLASS_WEAPON_THROWN:
@@ -5869,17 +5156,13 @@ SpellCastResult Spell::CheckItems()
                             // Requires No Ammo
                             if(m_caster->HasAura(46699))
                                 break;                      // skip other checks
-
                             return SPELL_FAILED_NO_AMMO;
                         }
-
                         ItemPrototype const *ammoProto = objmgr.GetItemPrototype( ammo );
                         if(!ammoProto)
                             return SPELL_FAILED_NO_AMMO;
-
                         if(ammoProto->Class != ITEM_CLASS_PROJECTILE)
                             return SPELL_FAILED_NO_AMMO;
-
                         // check ammo ws. weapon compatibility
                         switch(pItem->GetProto()->SubClass)
                         {
@@ -5895,7 +5178,6 @@ SpellCastResult Spell::CheckItems()
                             default:
                                 return SPELL_FAILED_NO_AMMO;
                         }
-
                         if( !((Player*)m_caster)->HasItemCount( ammo, 1 ) )
                             return SPELL_FAILED_NO_AMMO;
                     };  break;
@@ -5909,7 +5191,6 @@ SpellCastResult Spell::CheckItems()
             default:break;
         }
     }
-
     // check weapon presence in slots for main/offhand weapons
     if(m_spellInfo->EquippedItemClass >=0)
     {
@@ -5917,49 +5198,38 @@ SpellCastResult Spell::CheckItems()
         if(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_MAIN_HAND)
         {
             Item* item = ((Player*)m_caster)->GetWeaponForAttack(BASE_ATTACK);
-
             // skip spell if no weapon in slot or broken
             if(!item || item->IsBroken() )
                 return m_IsTriggeredSpell? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
-
             // skip spell if weapon not fit to triggered spell
             if(!item->IsFitToSpellRequirements(m_spellInfo))
                 return m_IsTriggeredSpell? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
         }
-
         // offhand hand weapon required
         if(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_REQ_OFFHAND)
         {
             Item* item = ((Player*)m_caster)->GetWeaponForAttack(OFF_ATTACK);
-
             // skip spell if no weapon in slot or broken
             if(!item || item->IsBroken() )
                 return m_IsTriggeredSpell? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
-
             // skip spell if weapon not fit to triggered spell
             if(!item->IsFitToSpellRequirements(m_spellInfo))
                 return m_IsTriggeredSpell? SPELL_FAILED_DONT_REPORT : SPELL_FAILED_EQUIPPED_ITEM_CLASS;
         }
     }
-
     return SPELL_CAST_OK;
 }
-
 void Spell::Delayed() // only called in DealDamage()
 {
     if(!m_caster)// || m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     //if (m_spellState == SPELL_STATE_DELAYED)
     //    return;                                             // spell is active and can't be time-backed
-
     if(isDelayableNoMore())                                 // Spells may only be delayed twice
         return;
-
     // spells not loosing casting time ( slam, dynamites, bombs.. )
     //if(!(m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_DAMAGE))
     //    return;
-
     //check pushback reduce
     int32 delaytime = 500;                                  // spellcasting delay is normally 500ms
     int32 delayReduce = 100;                                // must be initialized to 100 for percent modifiers
@@ -5967,9 +5237,7 @@ void Spell::Delayed() // only called in DealDamage()
     delayReduce += m_caster->GetTotalAuraModifier(SPELL_AURA_REDUCE_PUSHBACK) - 100;
     if(delayReduce >= 100)
         return;
-
     delaytime = delaytime * (100 - delayReduce) / 100;
-
     if(int32(m_timer) + delaytime > m_casttime)
     {
         delaytime = m_casttime - m_timer;
@@ -5977,24 +5245,18 @@ void Spell::Delayed() // only called in DealDamage()
     }
     else
         m_timer += delaytime;
-
     sLog.outDetail("Spell %u partially interrupted for (%d) ms at damage", m_spellInfo->Id, delaytime);
-
     WorldPacket data(SMSG_SPELL_DELAYED, 8+4);
     data.append(m_caster->GetPackGUID());
     data << uint32(delaytime);
-
     m_caster->SendMessageToSet(&data, true);
 }
-
 void Spell::DelayedChannel()
 {
     if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER || getState() != SPELL_STATE_CASTING)
         return;
-
     if(isDelayableNoMore())                                 // Spells may only be delayed twice
         return;
-
     //check pushback reduce
     int32 delaytime = GetSpellDuration(m_spellInfo) * 25 / 100; // channeling delay is normally 25% of its time per hit
     int32 delayReduce = 100;                               // must be initialized to 100 for percent modifiers
@@ -6002,9 +5264,7 @@ void Spell::DelayedChannel()
     delayReduce += m_caster->GetTotalAuraModifier(SPELL_AURA_REDUCE_PUSHBACK) - 100;
     if(delayReduce >= 100)
         return;
-
     delaytime = delaytime * (100 - delayReduce) / 100;
-
     if(int32(m_timer) < delaytime)
     {
         delaytime = m_timer;
@@ -6012,9 +5272,7 @@ void Spell::DelayedChannel()
     }
     else
         m_timer -= delaytime;
-
     sLog.outDebug("Spell %u partially interrupted for %i ms, new duration: %u ms", m_spellInfo->Id, delaytime, m_timer);
-
     for(std::list<TargetInfo>::const_iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
         if ((*ihit).missCondition == SPELL_MISS_NONE)
@@ -6026,14 +5284,11 @@ void Spell::DelayedChannel()
             }
         }
     }
-
     // partially interrupt persistent area auras
     if(DynamicObject* dynObj = m_caster->GetDynObject(m_spellInfo->Id))
         dynObj->Delay(delaytime);
-
     SendChannelUpdate(m_timer);
 }
-
 void Spell::UpdatePointers()
 {
     if(m_originalCasterGUID==m_caster->GetGUID())
@@ -6043,17 +5298,13 @@ void Spell::UpdatePointers()
         m_originalCaster = ObjectAccessor::GetUnit(*m_caster,m_originalCasterGUID);
         if(m_originalCaster && !m_originalCaster->IsInWorld()) m_originalCaster = NULL;
     }
-
     if(m_castItemGUID && m_caster->GetTypeId() == TYPEID_PLAYER)
         m_CastItem = ((Player*)m_caster)->GetItemByGuid(m_castItemGUID);
-
     m_targets.Update(m_caster);
 }
-
 bool Spell::CheckTargetCreatureType(Unit* target) const
 {
     uint32 spellCreatureTargetMask = m_spellInfo->TargetCreatureType;
-
     // Curse of Doom & Exorcism: not find another way to fix spell target check :/
     if (m_spellInfo->SpellFamilyName==SPELLFAMILY_WARLOCK && m_spellInfo->Category == 1179 ||
         // TODO: will be removed in 3.2.x
@@ -6062,27 +5313,21 @@ bool Spell::CheckTargetCreatureType(Unit* target) const
         // not allow cast at player
         if(target->GetTypeId()==TYPEID_PLAYER)
             return false;
-
         spellCreatureTargetMask = 0x7FF;
     }
-
     // Dismiss Pet and Taming Lesson skipped
     if(m_spellInfo->Id == 2641 || m_spellInfo->Id == 23356)
         spellCreatureTargetMask =  0;
-
     // Polymorph and Grounding Totem
     if (target->GetEntry() == 5925 && m_spellInfo->SpellFamilyName == SPELLFAMILY_MAGE && (m_spellInfo->SpellFamilyFlags[0] & 0x1000000) && m_spellInfo->EffectApplyAuraName[0] == SPELL_AURA_MOD_CONFUSE)
         return true;
-
     if (spellCreatureTargetMask)
     {
         uint32 TargetCreatureType = target->GetCreatureTypeMask();
-
         return !TargetCreatureType || (spellCreatureTargetMask & TargetCreatureType);
     }
     return true;
 }
-
 CurrentSpellTypes Spell::GetCurrentContainer()
 {
     if (IsNextMeleeSwingSpell())
@@ -6094,7 +5339,6 @@ CurrentSpellTypes Spell::GetCurrentContainer()
     else
         return(CURRENT_GENERIC_SPELL);
 }
-
 bool Spell::CheckTarget(Unit* target, uint32 eff)
 {
     // Check targets for creature type mask and remove not appropriate (skip explicit self target case, maybe need other explicit targets)
@@ -6103,13 +5347,11 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
         if (!CheckTargetCreatureType(target))
             return false;
     }
-
     // Check Aura spell req (need for AoE spells)
     if(m_spellInfo->targetAuraSpell && !target->HasAura(m_spellInfo->targetAuraSpell))
         return false;
     if (m_spellInfo->excludeTargetAuraSpell && target->HasAura(m_spellInfo->excludeTargetAuraSpell))
         return false;
-
     // Check targets for not_selectable unit flag and remove
     // A player can cast spells on his pet (or other controlled unit) though in any state
     if (target != m_caster && target->GetCharmerOrOwnerGUID() != m_caster->GetGUID())
@@ -6117,7 +5359,6 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
         // any unattackable target skipped
         if (target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
             return false;
-
         // unselectable targets skipped in all cases except TARGET_UNIT_NEARBY_ENTRY targeting
         // in case TARGET_UNIT_NEARBY_ENTRY target selected by server always and can't be cheated
         /*if( target->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE) &&
@@ -6125,17 +5366,14 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
             m_spellInfo->EffectImplicitTargetB[eff] != TARGET_UNIT_NEARBY_ENTRY )
             return false;*/
     }
-
     //Check player targets and remove if in GM mode or GM invisibility (for not self casting case)
     if( target != m_caster && target->GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)target)->GetVisibility() == VISIBILITY_OFF)
             return false;
-
         if(((Player*)target)->isGameMaster() && !IsPositiveSpell(m_spellInfo->Id))
             return false;
     }
-
     switch(m_spellInfo->EffectApplyAuraName[eff])
     {
         case SPELL_AURA_NONE:
@@ -6154,11 +5392,9 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
                     return false;
             break;
     }
-
     //Do not do further checks for triggered spells
     if(m_IsTriggeredSpell)
         return true;
-
     //Check targets for LOS visibility (except spells without range limitations )
     switch(m_spellInfo->Effect[eff])
     {
@@ -6174,18 +5410,14 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
             {
                 if(!m_targets.getCorpseTargetGUID())
                     return false;
-
                 Corpse *corpse = ObjectAccessor::GetCorpse(*m_caster, m_targets.getCorpseTargetGUID());
                 if(!corpse)
                     return false;
-
                 if(target->GetGUID() != corpse->GetOwnerGUID())
                     return false;
-
                 if(!corpse->IsWithinLOSInMap(m_caster))
                     return false;
             }
-
             // all ok by some way or another, skip normal check
             break;
         default:                                            // normal case
@@ -6201,43 +5433,34 @@ bool Spell::CheckTarget(Unit* target, uint32 eff)
                 return false;
             break;
     }
-
     return true;
 }
-
 bool Spell::IsNeedSendToClient() const
 {
     return m_spellInfo->SpellVisual[0] || m_spellInfo->SpellVisual[1] || IsChanneledSpell(m_spellInfo) ||
         m_spellInfo->speed > 0.0f || !m_triggeredByAuraSpell && !m_IsTriggeredSpell;
 }
-
 bool Spell::HaveTargetsForEffect( uint8 effect ) const
 {
     for(std::list<TargetInfo>::const_iterator itr = m_UniqueTargetInfo.begin(); itr != m_UniqueTargetInfo.end(); ++itr)
         if(itr->effectMask & (1 << effect))
             return true;
-
     for(std::list<GOTargetInfo>::const_iterator itr = m_UniqueGOTargetInfo.begin(); itr != m_UniqueGOTargetInfo.end(); ++itr)
         if(itr->effectMask & (1 << effect))
             return true;
-
     for(std::list<ItemTargetInfo>::const_iterator itr = m_UniqueItemInfo.begin(); itr != m_UniqueItemInfo.end(); ++itr)
         if(itr->effectMask & (1 << effect))
             return true;
-
     return false;
 }
-
 SpellEvent::SpellEvent(Spell* spell) : BasicEvent()
 {
     m_Spell = spell;
 }
-
 SpellEvent::~SpellEvent()
 {
     if (m_Spell->getState() != SPELL_STATE_FINISHED)
         m_Spell->cancel();
-
     if (m_Spell->IsDeletable())
     {
         delete m_Spell;
@@ -6248,13 +5471,11 @@ SpellEvent::~SpellEvent()
             (m_Spell->GetCaster()->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUIDLow(), m_Spell->m_spellInfo->Id);
     }
 }
-
 bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
 {
     // update spell if it is not finished
     if (m_Spell->getState() != SPELL_STATE_FINISHED)
         m_Spell->update(p_time);
-
     // check spell state to process
     switch (m_Spell->getState())
     {
@@ -6268,7 +5489,6 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
             }
             // event will be re-added automatically at the end of routine)
         } break;
-
         case SPELL_STATE_DELAYED:
         {
             // first, check, if we have just started
@@ -6292,7 +5512,6 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
                         ((Player*)m_Spell->GetCaster())->SetSpellModTakingSpell(m_Spell, true);
                         // do the action (pass spell to channeling state)
                         m_Spell->handle_immediate();
-
                         // And remove after effect handling
                         ((Player*)m_Spell->GetCaster())->SetSpellModTakingSpell(m_Spell, false);
                     }
@@ -6323,31 +5542,26 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time)
                 return false;                               // event not complete
             }
         } break;
-
         default:
         {
             // all other states
             // event will be re-added automatically at the end of routine)
         } break;
     }
-
     // spell processing not complete, plan event on the next update interval
     m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + 1, false);
     return false;                                           // event not complete
 }
-
 void SpellEvent::Abort(uint64 /*e_time*/)
 {
     // oops, the spell we try to do is aborted
     if (m_Spell->getState() != SPELL_STATE_FINISHED)
         m_Spell->cancel();
 }
-
 bool SpellEvent::IsDeletable() const
 {
     return m_Spell->IsDeletable();
 }
-
 bool Spell::IsValidSingleTargetEffect(Unit const* target, Targets type) const
 {
     switch(type)
@@ -6364,7 +5578,6 @@ bool Spell::IsValidSingleTargetEffect(Unit const* target, Targets type) const
     }
     return true;
 }
-
 bool Spell::IsValidSingleTargetSpell(Unit const* target) const
 {
     for(int i = 0; i < 3; ++i)
@@ -6377,7 +5590,6 @@ bool Spell::IsValidSingleTargetSpell(Unit const* target) const
     }
     return true;
 }
-
 void Spell::CalculateDamageDoneForAllTargets()
 {
     float multiplier[3];
@@ -6393,7 +5605,6 @@ void Spell::CalculateDamageDoneForAllTargets()
                     modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_EFFECT_PAST_FIRST, multiplier[i], this);
         }
     }
-
     bool usesAmmo=true;
     Unit::AuraEffectList const& Auras = m_caster->GetAurasByType(SPELL_AURA_ABILITY_CONSUME_NO_AMMO);
     for(Unit::AuraEffectList::const_iterator j = Auras.begin();j != Auras.end(); ++j)
@@ -6401,19 +5612,15 @@ void Spell::CalculateDamageDoneForAllTargets()
         if((*j)->isAffectedOnSpell(m_spellInfo))
             usesAmmo=false;
     }
-
     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
     {
         TargetInfo &target = *ihit;
-
         uint32 mask = target.effectMask;
         if(!mask)
             continue;
-
         Unit* unit = m_caster->GetGUID()==target.targetGUID ? m_caster : ObjectAccessor::GetUnit(*m_caster, target.targetGUID);
         if (!unit) // || !unit->isAlive()) do we need to check alive here?
             continue;
-
         if (usesAmmo)
         {
             bool ammoTaken=false;
@@ -6435,7 +5642,6 @@ void Spell::CalculateDamageDoneForAllTargets()
                     break;
             }
         }
-
         if (target.missCondition==SPELL_MISS_NONE)                          // In case spell hit target, do all effect on that target
         {
             target.damage += CalculateDamageDone(unit, mask, multiplier);
@@ -6451,7 +5657,6 @@ void Spell::CalculateDamageDoneForAllTargets()
         }
     }
 }
-
 int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *multiplier)
 {
     int32 damageDone = 0;
@@ -6462,7 +5667,6 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
         {
             m_damage = 0;
             damage = CalculateDamage(i, NULL);
-
             switch(m_spellInfo->Effect[i])
             {
                 case SPELL_EFFECT_SCHOOL_DAMAGE:
@@ -6478,7 +5682,6 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
                     SpellDamageHeal(i);
                     break;
             }
-
             if(m_damage > 0)
             {
                 if(IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetA[i]] || IsAreaEffectTarget[m_spellInfo->EffectImplicitTargetB[i]])
@@ -6492,27 +5695,20 @@ int32 Spell::CalculateDamageDone(Unit *unit, const uint32 effectMask, float *mul
                 m_damage *= m_damageMultipliers[i];
                 m_damageMultipliers[i] *= multiplier[i];
             }
-
             damageDone += m_damage;
         }
     }
-
     return damageDone;
 }
-
 SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& skillId, int32& reqSkillValue, int32& skillValue)
 {
     if(!lockId)                                             // possible case for GO and maybe for items.
         return SPELL_CAST_OK;
-
     // Get LockInfo
     LockEntry const *lockInfo = sLockStore.LookupEntry(lockId);
-
     if (!lockInfo)
         return SPELL_FAILED_BAD_TARGETS;
-
     bool reqKey = false;                                    // some locks not have reqs
-
     for(int j = 0; j < 8; ++j)
     {
         switch(lockInfo->Type[j])
@@ -6527,41 +5723,31 @@ SpellCastResult Spell::CanOpenLock(uint32 effIndex, uint32 lockId, SkillType& sk
             case LOCK_KEY_SKILL:
             {
                 reqKey = true;
-
                 // wrong locktype, skip
                 if(uint32(m_spellInfo->EffectMiscValue[effIndex]) != lockInfo->Index[j])
                     continue;
-
                 skillId = SkillByLockType(LockType(lockInfo->Index[j]));
-
                 if ( skillId != SKILL_NONE )
                 {
                     // skill bonus provided by casting spell (mostly item spells)
                     // add the damage modifier from the spell casted (cheat lock / skeleton key etc.) (use m_currentBasePoints, CalculateDamage returns wrong value)
                     uint32 spellSkillBonus = uint32(m_currentBasePoints[effIndex]+1);
                     reqSkillValue = lockInfo->Skill[j];
-
                     // castitem check: rogue using skeleton keys. the skill values should not be added in this case.
                     skillValue = m_CastItem || m_caster->GetTypeId()!= TYPEID_PLAYER ?
                         0 : ((Player*)m_caster)->GetSkillValue(skillId);
-
                     skillValue += spellSkillBonus;
-
                     if (skillValue < reqSkillValue)
                         return SPELL_FAILED_LOW_CASTLEVEL;
                 }
-
                 return SPELL_CAST_OK;
             }
         }
     }
-
     if(reqKey)
         return SPELL_FAILED_BAD_TARGETS;
-
     return SPELL_CAST_OK;
 }
-
 void Spell::SetSpellValue(SpellValueMod mod, int32 value)
 {
     switch(mod)
@@ -6586,7 +5772,6 @@ void Spell::SetSpellValue(SpellValueMod mod, int32 value)
             break;
     }
 }
-
 float tangent(float x)
 {
     x = tan(x);
@@ -6598,47 +5783,35 @@ float tangent(float x)
     if(x <= 100000.0f) return -100000.0f;
     return 0.0f;
 }
-
 #define DEBUG_TRAJ(a) //a
-
 void Spell::SelectTrajTargets()
 {
     if(!m_targets.HasTraj())
         return;
-
     float dist2d = m_targets.GetDist2d();
     if(!dist2d)
         return;
-
     float dz = m_targets.m_dstPos.m_positionZ - m_targets.m_srcPos.m_positionZ;
-
     UnitList unitList;
     SearchAreaTarget(unitList, dist2d, PUSH_IN_THIN_LINE, SPELL_TARGETS_ANY);
     if(unitList.empty())
         return;
-
     unitList.sort(TargetDistanceOrder(m_caster));
-
     float b = tangent(m_targets.m_elevation);
     float a = (dz - dist2d * b) / (dist2d * dist2d);
     if(a > -0.0001f) a = 0;
     DEBUG_TRAJ(sLog.outError("Spell::SelectTrajTargets: a %f b %f", a, b);)
-
     float bestDist = GetSpellMaxRange(m_spellInfo, false);
-
     UnitList::const_iterator itr = unitList.begin();
     for(; itr != unitList.end(); ++itr)
     {
         if(m_caster == *itr || m_caster->IsOnVehicle(*itr) || (*itr)->GetVehicle())//(*itr)->IsOnVehicle(m_caster))
             continue;
-
         const float size = std::max((*itr)->GetObjectSize() * 0.7f, 1.0f); // 1/sqrt(3)
         // TODO: all calculation should be based on src instead of m_caster
         const float objDist2d = m_targets.m_srcPos.GetExactDist2d(*itr) * cos(m_targets.m_srcPos.GetRelativeAngle(*itr));
         const float dz = (*itr)->GetPositionZ() - m_targets.m_srcPos.m_positionZ;
-
         DEBUG_TRAJ(sLog.outError("Spell::SelectTrajTargets: check %u, dist between %f %f, height between %f %f.", (*itr)->GetEntry(), objDist2d - size, objDist2d + size, dz - size, dz + size);)
-
         float dist = objDist2d - size;
         float height = dist * (a * dist + b);
         DEBUG_TRAJ(sLog.outError("Spell::SelectTrajTargets: dist %f, height %f.", dist, height);)
@@ -6647,26 +5820,21 @@ void Spell::SelectTrajTargets()
             bestDist = dist > 0 ? dist : 0;
             break;
         }
-
 #define CHECK_DIST {\
     DEBUG_TRAJ(sLog.outError("Spell::SelectTrajTargets: dist %f, height %f.", dist, height);)\
     if(dist > bestDist) continue;\
     if(dist < objDist2d + size && dist > objDist2d - size) { bestDist = dist; break; }\
         }
-
         if(!a)
         {
             height = dz - size;
             dist = height / b;
             CHECK_DIST;
-
             height = dz + size;
             dist = height / b;
             CHECK_DIST;
-
             continue;
         }
-
         height = dz - size;
         float sqrt1 = b * b + 4 * a * height;
         if(sqrt1 > 0)
@@ -6675,7 +5843,6 @@ void Spell::SelectTrajTargets()
             dist = (sqrt1 - b) / (2 * a);
             CHECK_DIST;
         }
-
         height = dz + size;
         float sqrt2 = b * b + 4 * a * height;
         if(sqrt2 > 0)
@@ -6683,24 +5850,20 @@ void Spell::SelectTrajTargets()
             sqrt2 = sqrt(sqrt2);
             dist = (sqrt2 - b) / (2 * a);
             CHECK_DIST;
-
             dist = (-sqrt2 - b) / (2 * a);
             CHECK_DIST;
         }
-
         if(sqrt1 > 0)
         {
             dist = (-sqrt1 - b) / (2 * a);
             CHECK_DIST;
         }
     }
-
     if(m_targets.m_srcPos.GetExactDist2d(&m_targets.m_dstPos) > bestDist)
     {
         float x = m_targets.m_srcPos.m_positionX + cos(m_caster->GetOrientation()) * bestDist;
         float y = m_targets.m_srcPos.m_positionY + sin(m_caster->GetOrientation()) * bestDist;
         float z = m_targets.m_srcPos.m_positionZ + bestDist * (a * bestDist + b);
-
         if(itr != unitList.end())
         {
             float distSq = (*itr)->GetExactDistSq(x, y, z);
@@ -6713,29 +5876,23 @@ void Spell::SelectTrajTargets()
                 x += factor * ((*itr)->GetPositionX() - x);
                 y += factor * ((*itr)->GetPositionY() - y);
                 z += factor * ((*itr)->GetPositionZ() - z);
-
                 distSq = (*itr)->GetExactDistSq(x, y, z);
                 DEBUG_TRAJ(sLog.outError("Initial %f %f %f %f %f", x, y, z, distSq, sizeSq);)
             }
         }
-
         m_targets.setDst(x, y, z);
     }
 }
-
 void Spell::FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float radius, bool raid, bool withPets, bool withcaster )
 {
     Player *pTarget = target->GetCharmerOrOwnerPlayerOrPlayerItself();
     Group *pGroup = pTarget ? pTarget->GetGroup() : NULL;
-
     if (pGroup)
     {
         uint8 subgroup = pTarget->GetSubGroup();
-
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* Target = itr->getSource();
-
             // IsHostileTo check duel and controlled by enemy
             if (Target && (raid || subgroup==Target->GetSubGroup())
                 && !m_caster->IsHostileTo(Target))
@@ -6743,7 +5900,6 @@ void Spell::FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float ra
                 if (Target==m_caster && withcaster ||
                     Target!=m_caster && m_caster->IsWithinDistInMap(Target, radius))
                     TagUnitMap.push_back(Target);
-
                 if (withPets)
                     if (Pet* pet = Target->GetPet())
                         if (pet==m_caster && withcaster ||
@@ -6758,7 +5914,6 @@ void Spell::FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float ra
         if (ownerOrSelf==m_caster && withcaster ||
             ownerOrSelf!=m_caster && m_caster->IsWithinDistInMap(ownerOrSelf, radius))
             TagUnitMap.push_back(ownerOrSelf);
-
         if (withPets)
             if (Guardian* pet = ownerOrSelf->GetGuardianPet())
                 if (pet==m_caster && withcaster ||
@@ -6766,16 +5921,13 @@ void Spell::FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float ra
                     TagUnitMap.push_back(pet);
     }
 }
-
 void Spell::FillRaidOrPartyManaPriorityTargets( UnitList &TagUnitMap, Unit* target, float radius, uint32 count, bool raid, bool withPets, bool withCaster )
 {
     FillRaidOrPartyTargets(TagUnitMap,target,radius,raid,withPets,withCaster);
-
     PrioritizeManaUnitQueue manaUsers;
     for(UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && manaUsers.size() < count; ++itr)
         if ((*itr)->getPowerType() == POWER_MANA && !(*itr)->isDead())
             manaUsers.push(PrioritizeManaUnitWraper(*itr));
-
     TagUnitMap.clear();
     while(!manaUsers.empty())
     {
@@ -6783,20 +5935,17 @@ void Spell::FillRaidOrPartyManaPriorityTargets( UnitList &TagUnitMap, Unit* targ
         manaUsers.pop();
     }
 }
-
 void Spell::FillRaidOrPartyHealthPriorityTargets( UnitList &TagUnitMap, Unit* target, float radius, uint32 count, bool raid, bool withPets, bool withCaster )
 {
     FillRaidOrPartyTargets(TagUnitMap,target,radius,raid,withPets,withCaster);
-
     PrioritizeHealthUnitQueue healthQueue;
     for(UnitList::const_iterator itr = TagUnitMap.begin(); itr != TagUnitMap.end() && healthQueue.size() < count; ++itr)
         if (!(*itr)->isDead())
             healthQueue.push(PrioritizeHealthUnitWraper(*itr));
-
     TagUnitMap.clear();
     while(!healthQueue.empty())
     {
         TagUnitMap.push_back(healthQueue.top().getUnit());
         healthQueue.pop();
     }
-}
\ No newline at end of file
+}
diff --git a/src/game/Spell.h b/src/game/Spell.h
index f045a1415e0..5f77e72bdd9 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -17,19 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __SPELL_H
 #define __SPELL_H
-
 #include "GridDefines.h"
 #include "SharedDefines.h"
-
 class Unit;
 class Player;
 class GameObject;
 class DynamicObject;
 class Aura;
-
 enum SpellCastTargetFlags
 {
     TARGET_FLAG_SELF            = 0x00000000,
@@ -52,7 +48,6 @@ enum SpellCastTargetFlags
     TARGET_FLAG_UNK2            = 0x00010000,               // pguid, not used in any spells as of 3.0.3 (can be set dynamically)
     TARGET_FLAG_GLYPH           = 0x00020000                // used in glyph spells
 };
-
 enum SpellCastFlags
 {
     CAST_FLAG_NONE               = 0x00000000,
@@ -79,14 +74,12 @@ enum SpellCastFlags
     CAST_FLAG_UNKNOWN20          = 0x00100000,
     CAST_FLAG_UNKNOWN7           = 0x00200000               // wotlk, rune cooldown list
 };
-
 enum SpellRangeFlag
 {
     SPELL_RANGE_DEFAULT             = 0,
     SPELL_RANGE_MELEE               = 1,     //melee
     SPELL_RANGE_RANGED              = 2,     //hunter range and ranged weapon
 };
-
 enum SpellNotifyPushType
 {
     PUSH_NONE           = 0,
@@ -99,51 +92,37 @@ enum SpellNotifyPushType
     PUSH_CASTER_CENTER, //this is never used in grid search
     PUSH_CHAIN,
 };
-
 bool IsQuestTameSpell(uint32 spellId);
-
 namespace Trinity
 {
     struct SpellNotifierCreatureAndPlayer;
 }
-
 typedef std::list<Unit*> UnitList;
-
 class SpellCastTargets
 {
     public:
         SpellCastTargets();
         ~SpellCastTargets();
-
         bool read ( WorldPacket * data, Unit *caster );
         void write ( WorldPacket * data );
-
         SpellCastTargets& operator=(const SpellCastTargets &target)
         {
             m_unitTarget = target.m_unitTarget;
             m_itemTarget = target.m_itemTarget;
             m_GOTarget   = target.m_GOTarget;
-
             m_unitTargetGUID   = target.m_unitTargetGUID;
             m_GOTargetGUID     = target.m_GOTargetGUID;
             m_CorpseTargetGUID = target.m_CorpseTargetGUID;
             m_itemTargetGUID   = target.m_itemTargetGUID;
-
             m_itemTargetEntry  = target.m_itemTargetEntry;
-
             m_srcPos = target.m_srcPos;
             m_dstPos.Relocate(target.m_dstPos);
-
             m_elevation = target.m_elevation;
             m_speed = target.m_speed;
-
             m_strTarget = target.m_strTarget;
-
             m_targetMask = target.m_targetMask;
-
             return *this;
         }
-
         uint64 getUnitTargetGUID() const { return m_unitTargetGUID; }
         Unit *getUnitTarget() const { return m_unitTarget; }
         void setUnitTarget(Unit *target);
@@ -151,11 +130,9 @@ class SpellCastTargets
         void setSrc(Position *pos);
         void setDst(float x, float y, float z, uint32 mapId = MAPID_INVALID);
         void setDst(Position *pos);
-
         uint64 getGOTargetGUID() const { return m_GOTargetGUID; }
         GameObject *getGOTarget() const { return m_GOTarget; }
         void setGOTarget(GameObject *target);
-
         uint64 getCorpseTargetGUID() const { return m_CorpseTargetGUID; }
         void setCorpseTarget(Corpse* corpse);
         uint64 getItemTargetGUID() const { return m_itemTargetGUID; }
@@ -170,30 +147,24 @@ class SpellCastTargets
                 m_itemTargetEntry = m_itemTarget->GetEntry();
             }
         }
-
         bool IsEmpty() const { return m_GOTargetGUID==0 && m_unitTargetGUID==0 && m_itemTarget==0 && m_CorpseTargetGUID==0; }
         bool HasSrc() const { return m_targetMask & TARGET_FLAG_SOURCE_LOCATION; }
         bool HasDst() const { return m_targetMask & TARGET_FLAG_DEST_LOCATION; }
         bool HasTraj() const { return m_speed != 0; }
-
         float GetDist2d() const { return m_srcPos.GetExactDist2d(&m_dstPos); }
         float GetSpeedXY() const { return m_speed * cos(m_elevation); }
         float GetSpeedZ() const { return m_speed * sin(m_elevation); }
-
         void Update(Unit* caster);
-
         Position m_srcPos;
         WorldLocation m_dstPos;
         float m_elevation, m_speed;
         std::string m_strTarget;
-
         uint32 m_targetMask;
     private:
         // objects (can be used at spell creating and after Update at casting
         Unit *m_unitTarget;
         GameObject *m_GOTarget;
         Item *m_itemTarget;
-
         // object GUID/etc, can be used always
         uint64 m_unitTargetGUID;
         uint64 m_GOTargetGUID;
@@ -201,7 +172,6 @@ class SpellCastTargets
         uint64 m_itemTargetGUID;
         uint32 m_itemTargetEntry;
 };
-
 struct SpellValue
 {
     explicit SpellValue(SpellEntry const *proto)
@@ -215,7 +185,6 @@ struct SpellValue
     uint32    MaxAffectedTargets;
     float     RadiusMod;
 };
-
 enum SpellState
 {
     SPELL_STATE_NULL      = 0,
@@ -225,7 +194,6 @@ enum SpellState
     SPELL_STATE_IDLE      = 4,
     SPELL_STATE_DELAYED   = 5
 };
-
 enum ReplenishType
 {
     REPLENISH_UNDEFINED = 0,
@@ -233,7 +201,6 @@ enum ReplenishType
     REPLENISH_MANA      = 21,
     REPLENISH_RAGE      = 22
 };
-
 enum SpellTargets
 {
     SPELL_TARGETS_NONE      = 0,
@@ -243,13 +210,11 @@ enum SpellTargets
     SPELL_TARGETS_CHAINHEAL,
     SPELL_TARGETS_ANY,
 };
-
 class Spell
 {
     friend struct Trinity::SpellNotifierCreatureAndPlayer;
     friend void Unit::SetCurrentCastedSpell( Spell * pSpell );
     public:
-
         void EffectNULL(uint32 );
         void EffectUnused(uint32 );
         void EffectDistract(uint32 i);
@@ -362,12 +327,9 @@ class Spell
         void EffectPlayMusic(uint32 i);
         void EffectSpecCount(uint32 i);
         void EffectActivateSpec(uint32 i);
-
         typedef std::set<Aura *> UsedSpellMods;
-
         Spell( Unit* Caster, SpellEntry const *info, bool triggered, uint64 originalCasterGUID = 0, Spell** triggeringContainer = NULL, bool skipCheck = false );
         ~Spell();
-
         void prepare(SpellCastTargets const* targets, AuraEffect* triggeredByAura = NULL);
         void cancel();
         void update(uint32 difftime);
@@ -375,54 +337,43 @@ class Spell
         void finish(bool ok = true);
         void TakePower();
         void TakeAmmo();
-
         void TakeRunePower();
         void TakeReagents();
         void TakeCastItem();
         void TriggerSpell();
-
         SpellCastResult CheckCast(bool strict);
         SpellCastResult CheckPetCast(Unit* target);
-
         // handlers
         void handle_immediate();
         uint64 handle_delayed(uint64 t_offset);
         // handler helpers
         void _handle_immediate_phase();
         void _handle_finish_phase();
-
         SpellCastResult CheckItems();
         SpellCastResult CheckRange(bool strict);
         SpellCastResult CheckPower();
         SpellCastResult CheckRuneCost(uint32 runeCostID);
         SpellCastResult CheckCasterAuras() const;
-
         int32 CalculateDamage(uint8 i, Unit* target) { return m_caster->CalculateSpellDamage(m_spellInfo,i,m_currentBasePoints[i],target); }
-
         bool HaveTargetsForEffect(uint8 effect) const;
         void Delayed();
         void DelayedChannel();
         uint32 getState() const { return m_spellState; }
         void setState(uint32 state) { m_spellState = state; }
-
         void DoCreateItem(uint32 i, uint32 itemtype);
         void WriteSpellGoTargets( WorldPacket * data );
         void WriteAmmoToPacket( WorldPacket * data );
-
         void SelectSpellTargets();
         void SelectEffectTargets(uint32 i, uint32 cur);
         void SelectTrajTargets();
         void FillRaidOrPartyTargets( UnitList &TagUnitMap, Unit* target, float radius, bool raid, bool withPets, bool withcaster );
         void FillRaidOrPartyManaPriorityTargets( UnitList &TagUnitMap, Unit* target, float radius, uint32 count, bool raid, bool withPets, bool withcaster );
         void FillRaidOrPartyHealthPriorityTargets( UnitList &TagUnitMap, Unit* target, float radius, uint32 count, bool raid, bool withPets, bool withcaster );
-
         template<typename T> WorldObject* FindCorpseUsing();
-
         bool CheckTarget( Unit* target, uint32 eff );
         bool CanAutoCast(Unit* target);
         void CheckSrc() { if(!m_targets.HasSrc()) m_targets.setSrc(m_caster); }
         void CheckDst() { if(!m_targets.HasDst()) m_targets.setDst(m_caster); }
-
         static void MANGOS_DLL_SPEC SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result);
         void SendCastResult(SpellCastResult result);
         void SendSpellStart();
@@ -434,11 +385,9 @@ class Spell
         void SendChannelStart(uint32 duration);
         void SendResurrectRequest(Player* target);
         void SendPlaySpellVisual(uint32 SpellID);
-
         void HandleEffects(Unit *pUnitTarget,Item *pItemTarget,GameObject *pGOTarget,uint32 i);
         void HandleThreatSpells(uint32 spellId);
         //void HandleAddAura(Unit* Target);
-
         const SpellEntry * const m_spellInfo;
         int32 m_currentBasePoints[3];                       // cache SpellEntry::EffectBasePoints and use for set custom base points
         Item* m_CastItem;
@@ -448,9 +397,7 @@ class Spell
         uint32 m_preCastSpell;
         SpellCastTargets m_targets;
         int8 m_comboPointGain;
-
         UsedSpellMods m_appliedMods;
-
         int32 GetCastTime() const { return m_casttime; }
         bool IsAutoRepeat() const { return m_autoRepeat; }
         void SetAutoRepeat(bool rep) { m_autoRepeat = rep; }
@@ -463,7 +410,6 @@ class Spell
         bool IsChannelActive() const { return m_caster->GetUInt32Value(UNIT_CHANNEL_SPELL) != 0; }
         bool IsMeleeAttackResetSpell() const { return !m_IsTriggeredSpell && (m_spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_AUTOATTACK);  }
         bool IsRangedAttackResetSpell() const { return !m_IsTriggeredSpell && /*IsRangedSpell() &&*/ !(m_spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_RESET_AUTOSHOT); }
-
         bool IsDeletable() const { return !m_referencedFromCurrentSpell && !m_executedCurrently; }
         void SetReferencedFromCurrent(bool yes) { m_referencedFromCurrentSpell = yes; }
         bool IsInterruptable() const { return !m_executedCurrently; }
@@ -471,40 +417,26 @@ class Spell
         uint64 GetDelayStart() const { return m_delayStart; }
         void SetDelayStart(uint64 m_time) { m_delayStart = m_time; }
         uint64 GetDelayMoment() const { return m_delayMoment; }
-
         bool IsNeedSendToClient() const;
-
         CurrentSpellTypes GetCurrentContainer();
-
         Unit* GetCaster() const { return m_caster; }
         Unit* GetOriginalCaster() const { return m_originalCaster; }
         int32 GetPowerCost() const { return m_powerCost; }
-
         void UpdatePointers();                              // must be used at call Spell code after time delay (non triggered spell cast/update spell call/etc)
-
         bool CheckTargetCreatureType(Unit* target) const;
-
         void AddTriggeredSpell(SpellEntry const* spell) { m_TriggerSpells.push_back(spell); }
-
         void CleanupTargetList();
-
         void SetSpellValue(SpellValueMod mod, int32 value);
         //void SetSpellValue(SpellValueMod mod, float value);
     protected:
-
         void SendLoot(uint64 guid, LootType loottype);
-
         Unit* const m_caster;
-
         SpellValue * const m_spellValue;
-
         uint64 m_originalCasterGUID;                        // real source of cast (aura caster/etc), used for spell targets selection
                                                             // e.g. damage around area spell trigered by victim aura and damage enemies of aura caster
         Unit* m_originalCaster;                             // cached pointer for m_originalCaster, updated at Spell::UpdatePointers()
-
         Spell** m_selfContainer;                            // pointer to our spell container (if applicable)
         Spell** m_triggeringContainer;                      // pointer to container with spell that has triggered us
-
         //Spell data
         SpellSchoolMask m_spellSchoolMask;                  // Spell school (can be overwrite for some spells (wand shoot for example)
         WeaponAttackType m_attackType;                      // For weapon based attack
@@ -513,22 +445,18 @@ class Spell
         bool m_canReflect;                                  // can reflect this spell?
         bool m_autoRepeat;
         uint8 m_runesState;
-
         uint8 m_delayAtDamageCount;
         bool isDelayableNoMore()
         {
             if(m_delayAtDamageCount >= 2)
                 return true;
-
             m_delayAtDamageCount++;
             return false;
         }
-
         // Delayed spells system
         uint64 m_delayStart;                                // time of spell delay start, filled by event handler, zero = just started
         uint64 m_delayMoment;                               // moment of next delay call, used internally
         bool m_immediateHandled;                            // were immediate actions handled? (used by delayed spells only)
-
         // These vars are used in both delayed spell system and modified immediate spell system
         bool m_referencedFromCurrentSpell;                  // mark as references to prevent deleted and access by dead pointers
         bool m_executedCurrently;                           // mark as executed to prevent deleted and access by dead pointers
@@ -536,7 +464,6 @@ class Spell
         bool m_needComboPoints;
         uint8 m_applyMultiplierMask;                        // by effect: damage multiplier needed?
         float m_damageMultipliers[3];                       // by effect: damage multiplier
-
         // Current targets, to be used in SpellEffects (MUST BE USED ONLY IN SPELL EFFECTS)
         Unit* unitTarget;
         Item* itemTarget;
@@ -544,19 +471,15 @@ class Spell
         int32 damage;
         Aura * m_spellAura; // only used in DoAllEffectOnTarget
         DynamicObject *m_spellDynObj; // only used in DoAllEffectOnTarget
-
         // this is set in Spell Hit, but used in Apply Aura handler
         DiminishingLevels m_diminishLevel;
         DiminishingGroup m_diminishGroup;
-
         // -------------------------------------------
         GameObject* focusObject;
-
         // Damage and healing in effects need just calculate
         int32 m_damage;           // Damge   in effects count here
         int32 m_healing;          // Healing in effects count here
         int32 m_healthLeech;      // Health leech in effects for all targets count here
-
         //******************************************
         // Spell trigger system
         //******************************************
@@ -565,7 +488,6 @@ class Spell
         uint32 m_procEx;
         bool m_canTrigger;
         void   prepareDataForTriggerSystem(AuraEffect * triggeredByAura);
-
         //*****************************************
         // Spell target subsystem
         //*****************************************
@@ -585,7 +507,6 @@ class Spell
         };
         std::list<TargetInfo> m_UniqueTargetInfo;
         uint8 m_needAliveTargetMask;                        // Mask req. alive targets
-
         struct GOTargetInfo
         {
             uint64 targetGUID;
@@ -594,14 +515,12 @@ class Spell
             bool   processed:1;
         };
         std::list<GOTargetInfo> m_UniqueGOTargetInfo;
-
         struct ItemTargetInfo
         {
             Item  *item;
             uint8 effectMask;
         };
         std::list<ItemTargetInfo> m_UniqueItemInfo;
-
         void AddUnitTarget(Unit* target, uint32 effIndex);
         void AddUnitTarget(uint64 unitGUID, uint32 effIndex);
         void AddGOTarget(GameObject* target, uint32 effIndex);
@@ -623,34 +542,26 @@ class Spell
         void SpellDamageSchoolDmg(uint32 i);
         void SpellDamageWeaponDmg(uint32 i);
         void SpellDamageHeal(uint32 i);
-
         void GetSummonPosition(uint32 i, Position &pos, float radius = 0.0f, uint32 count = 0);
         void SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *properties);
-
         SpellCastResult CanOpenLock(uint32 effIndex, uint32 lockid, SkillType& skillid, int32& reqSkillValue, int32& skillValue);
         // -------------------------------------------
-
         //List For Triggered Spells
         typedef std::vector<SpellEntry const*> TriggerSpells;
         TriggerSpells m_TriggerSpells;
         typedef std::vector< std::pair<SpellEntry const*, int32> > ChanceTriggerSpells;
         ChanceTriggerSpells m_ChanceTriggerSpells;
-
         uint32 m_spellState;
         uint32 m_timer;
-
         bool m_IsTriggeredSpell;
-
         // if need this can be replaced by Aura copy
         // we can't store original aura link to prevent access to deleted auras
         // and in same time need aura data and after aura deleting.
         SpellEntry const* m_triggeredByAuraSpell;
-
         uint32 m_customAttr;
         bool m_skipCheck;
         uint32 m_effectMask;
         uint8 m_auraScaleMask;
-
 #ifdef MAP_BASED_RAND_GEN
         int32 irand(int32 min, int32 max)       { return int32 (m_caster->GetMap()->mtRand.randInt(max - min)) + min; }
         uint32 urand(uint32 min, uint32 max)    { return m_caster->GetMap()->mtRand.randInt(max - min) + min; }
@@ -659,7 +570,6 @@ class Spell
         double rand_chance()                    { return m_caster->GetMap()->mtRand.randExc(100.0); }
 #endif
 };
-
 namespace Trinity
 {
     struct TRINITY_DLL_DECL SpellNotifierCreatureAndPlayer
@@ -671,7 +581,6 @@ namespace Trinity
         const Unit * const i_source;
         uint32 i_entry;
         const Position * const i_pos;
-
         SpellNotifierCreatureAndPlayer(Unit *source, std::list<Unit*> &data, float radius, SpellNotifyPushType type,
             SpellTargets TargetType = SPELL_TARGETS_ENEMY, const Position *pos = NULL, uint32 entry = 0)
             : i_source(source), i_data(&data), i_radius(radius), i_push_type(type)
@@ -679,16 +588,13 @@ namespace Trinity
         {
             assert(i_source);
         }
-
         template<class T> inline void Visit(GridRefManager<T>  &m)
         {
             for(typename GridRefManager<T>::iterator itr = m.begin(); itr != m.end(); ++itr)
             {
                 Unit *target = (Unit*)itr->getSource();
-
                 if(!target->InSamePhase(i_source))
                     continue;
-
                 switch (i_TargetType)
                 {
                     case SPELL_TARGETS_ENEMY:
@@ -721,7 +627,6 @@ namespace Trinity
                     default:
                         break;
                 }
-
                 switch(i_push_type)
                 {
                     case PUSH_SRC_CENTER:
@@ -750,29 +655,24 @@ namespace Trinity
                 }
             }
         }
-
         #ifdef WIN32
         template<> inline void Visit(CorpseMapType & ) {}
         template<> inline void Visit(GameObjectMapType & ) {}
         template<> inline void Visit(DynamicObjectMapType & ) {}
         #endif
     };
-
     #ifndef WIN32
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(CorpseMapType& ) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(GameObjectMapType& ) {}
     template<> inline void SpellNotifierCreatureAndPlayer::Visit(DynamicObjectMapType& ) {}
     #endif
 }
-
 typedef void(Spell::*pEffect)(uint32 i);
-
 class SpellEvent : public BasicEvent
 {
     public:
         SpellEvent(Spell* spell);
         virtual ~SpellEvent();
-
         virtual bool Execute(uint64 e_time, uint32 p_time);
         virtual void Abort(uint64 e_time);
         virtual bool IsDeletable() const;
diff --git a/src/game/SpellAuraDefines.h b/src/game/SpellAuraDefines.h
index ffcbdacda34..f5af5e22f84 100644
--- a/src/game/SpellAuraDefines.h
+++ b/src/game/SpellAuraDefines.h
@@ -19,10 +19,8 @@
  */
 #ifndef TRINITY_SPELLAURADEFINES_H
 #define TRINITY_SPELLAURADEFINES_H
-
 #define MAX_AURAS 64                                        // client support up to 255, but it will cause problems with group auras updating
 #define FRIENDLY_AA_REMOVE_TIME 2*IN_MILISECONDS
-
 enum AURA_FLAGS
 {
     AFLAG_NONE              = 0x00,
@@ -35,14 +33,12 @@ enum AURA_FLAGS
     AFLAG_UNK2              = 0x40,
     AFLAG_NEGATIVE          = 0x80
 };
-
 //m_schoolAbsorb
 enum DAMAGE_ABSORB_TYPE
 {
     ALL_DAMAGE_ABSORB       = -2,
     ONLY_MAGIC_ABSORB       = -1,
 };
-
 enum AuraType
 {
     SPELL_AURA_NONE = 0,
@@ -342,7 +338,6 @@ enum AuraType
     SPELL_AURA_PREVENT_REGENERATE_POWER,
     TOTAL_AURAS = 295
 };
-
 enum AreaAuraType
 {
     AREA_AURA_PARTY,
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 77b21f17562..711605c2da7 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -49,7 +48,6 @@
 #include "GridNotifiersImpl.h"
 #include "Vehicle.h"
 #include "CellImpl.h"
-
 #define Aura AuraEffect
 pAuraHandler AuraHandler[TOTAL_AURAS]=
 {
@@ -350,7 +348,6 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
     &Aura::HandleNoImmediateEffect                          //294 SPELL_AURA_PREVENT_REGENERATE_POWER implemented in Player::Regenerate(Powers power)
 };
 #undef Aura
-
 Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObject *source, Unit *caster, int32 *currentBasePoints, Item* castItem) :
     m_spellProto(spellproto),
     m_target(target), m_sourceGuid(source->GetGUID()), m_casterGuid(caster->GetGUID()), m_castItemGuid(castItem ? castItem->GetGUID() : 0),
@@ -360,26 +357,18 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje
 {
     assert(target);
     assert(spellproto && spellproto == sSpellStore.LookupEntry( spellproto->Id ) && "`info` must be pointer to sSpellStore element");
-
     m_auraFlags = effMask;
-
     if(m_spellProto->manaPerSecond || m_spellProto->manaPerSecondPerLevel)
         m_timeCla = 1000;
-
     m_isPassive = IsPassiveSpell(GetId());
-
     m_isSingleTargetAura = IsSingleTargetSpell(m_spellProto);
-
     //damage        = caster->CalculateSpellDamage(m_spellProto,m_effIndex,m_currentBasePoints,target);
     m_maxduration = caster->CalcSpellDuration(m_spellProto);
-
     if(m_maxduration == -1 || m_isPassive && m_spellProto->DurationIndex == 0)
         m_permanent = true;
     else
         m_permanent = false;
-
     Player* modOwner = caster->GetSpellModOwner();
-
     if(!m_permanent && modOwner)
     {
         modOwner->ApplySpellMod(GetId(), SPELLMOD_DURATION, m_maxduration);
@@ -387,20 +376,15 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje
         if (m_maxduration<=0)
             m_maxduration = 1;
     }
-
     m_duration = m_maxduration;
-
     m_isDeathPersist = IsDeathPersistentSpell(m_spellProto);
-
     m_procCharges = m_spellProto->procCharges;
     if(modOwner)
         modOwner->ApplySpellMod(GetId(), SPELLMOD_CHARGES, m_procCharges);
-
     m_isRemovedOnShapeLost = (caster == target &&
                               m_spellProto->Stances &&
                             !(m_spellProto->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) &&
                             !(m_spellProto->Attributes & SPELL_ATTR_NOT_SHAPESHIFT));
-
     for (uint8 i=0 ;i<MAX_SPELL_EFFECTS;++i)
     {
         if (m_auraFlags & (uint8(1) << i))
@@ -413,7 +397,6 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje
             m_partAuras[i] = NULL;
         }
     }
-
     // Aura is positive when it is casted by friend and at least one aura is positive
     // or when it is casted by enemy and at least one aura is negative
     bool swap = false;
@@ -421,7 +404,6 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje
         m_positive = false;
     else
         m_positive = !caster->IsHostileTo(m_target);
-
     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
         if((1<<i & GetEffectMask()) && m_positive == IsPositiveEffect(GetId(), i))
@@ -433,7 +415,6 @@ Aura::Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObje
     if (!swap)
         m_positive = !m_positive;
 }
-
 Aura::~Aura()
 {
     // free part auras memory
@@ -441,28 +422,23 @@ Aura::~Aura()
         if (m_partAuras[i])
             delete m_partAuras[i];
 }
-
 AuraEffect::AuraEffect(Aura *parentAura, uint8 effIndex, int32 *currentBasePoints) :
 m_parentAura(parentAura), m_spellmod(NULL), m_periodicTimer(0), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false),
 m_target(parentAura->GetTarget()), m_tickNumber(0)
 , m_spellProto(parentAura->GetSpellProto()), m_effIndex(effIndex), m_auraName(AuraType(m_spellProto->EffectApplyAuraName[m_effIndex]))
 {
     assert(m_auraName < TOTAL_AURAS);
-
     if(currentBasePoints)
         m_currentBasePoints = *currentBasePoints;
     else
         m_currentBasePoints = m_spellProto->EffectBasePoints[m_effIndex];
-
     Unit *caster = GetParentAura()->GetCaster();
     if(caster)
         m_amount = caster->CalculateSpellDamage(m_spellProto, m_effIndex, m_currentBasePoints, m_target);
     else
         m_amount = m_currentBasePoints + m_spellProto->EffectBaseDice[m_effIndex];
-
     if (int32 amount = CalculateCrowdControlAuraAmount(caster))
         m_amount = amount;
-
     if(!m_amount && caster)
         if(uint64 itemGUID = GetParentAura()->GetCastItemGUID())
             if(Player *playerCaster = dynamic_cast<Player*>(caster))
@@ -484,47 +460,37 @@ m_target(parentAura->GetTarget()), m_tickNumber(0)
                         break;
                     }
                 }
-
                 if(m_amount)
                     break;
             }
         }
     }
-
     Player* modOwner = caster ? caster->GetSpellModOwner() : NULL;
     m_amplitude = m_spellProto->EffectAmplitude[m_effIndex];
-
     //apply casting time mods for channeled spells
     if (modOwner && m_amplitude && IsChanneledSpell(m_spellProto))
         modOwner->ModSpellCastTime(m_spellProto, m_amplitude);
-
     // Apply periodic time mod
     if(modOwner && m_amplitude)
         modOwner->ApplySpellMod(GetId(), SPELLMOD_ACTIVATION_TIME, m_amplitude);
-
     // Start periodic on next tick or at aura apply
     if (!(m_spellProto->AttributesEx5 & SPELL_ATTR_EX5_START_PERIODIC_AT_APPLY))
         m_periodicTimer += m_amplitude;
-
     m_isApplied = false;
 }
-
 AreaAuraEffect::AreaAuraEffect(Aura * parentAura, uint32 effIndex, int32 *currentBasePoints)
 : AuraEffect(parentAura, effIndex, currentBasePoints)
 {
     m_removeTime = FRIENDLY_AA_REMOVE_TIME;
     m_isAreaAura = true;
-
     if (m_spellProto->Effect[effIndex] == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY)
         m_radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex]));
     else
         m_radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex]));
-
     Unit *source = GetSource();
     assert(source);
     if(Player* modOwner = source->GetSpellModOwner()) // source or caster? should be the same
         modOwner->ApplySpellMod(GetId(), SPELLMOD_RADIUS, m_radius);
-
     switch(m_spellProto->Effect[effIndex])
     {
         case SPELL_EFFECT_APPLY_AREA_AURA_PARTY:
@@ -559,13 +525,11 @@ AreaAuraEffect::AreaAuraEffect(Aura * parentAura, uint32 effIndex, int32 *curren
             break;
     }
 }
-
 PersistentAreaAuraEffect::PersistentAreaAuraEffect(Aura * parentAura, uint32 effIndex, int32 *currentBasePoints)
 : AuraEffect(parentAura, effIndex, currentBasePoints)
 {
     m_isPersistent = true;
 }
-
 DynamicObject *PersistentAreaAuraEffect::GetSource() const
 {
     uint64 guid = GetParentAura()->GetSourceGUID();
@@ -573,7 +537,6 @@ DynamicObject *PersistentAreaAuraEffect::GetSource() const
         return ObjectAccessor::GetObjectInWorld(guid, (DynamicObject*)NULL);
     return NULL;
 }
-
 AuraEffect* CreateAuraEffect(Aura * parentAura, uint32 effIndex, int32 *currentBasePoints)
 {
     // TODO: source should belong to aura, but not areaeffect. multiple areaaura/persistent aura should use one source
@@ -603,35 +566,28 @@ AuraEffect* CreateAuraEffect(Aura * parentAura, uint32 effIndex, int32 *currentB
     }
     return NULL;
 }
-
 Unit* Aura::GetCaster() const
 {
     if(m_casterGuid == m_target->GetGUID())
         return m_target;
-
     //return ObjectAccessor::GetUnit(*m_target,m_casterGuid);
     //must return caster even if it's in another grid/map
     return ObjectAccessor::GetObjectInWorld(m_casterGuid, (Unit*)NULL);
 }
-
 Unit* Aura::GetUnitSource() const
 {
     if(m_sourceGuid == m_target->GetGUID())
         return m_target;
-
     return ObjectAccessor::GetObjectInWorld(m_sourceGuid, (Unit*)NULL);
 }
-
 void Aura::Update(uint32 diff)
 {
     // TODO: store pointer to caster in aura class for update/mod handling code
-
     if (m_duration > 0)
     {
         m_duration -= diff;
         if (m_duration < 0)
             m_duration = 0;
-
         // all spells with manaPerSecond/manaPerSecondPerLevel have aura in effect 0
         if(m_timeCla)
         {
@@ -642,7 +598,6 @@ void Aura::Update(uint32 diff)
                 if(int32 manaPerSecond = m_spellProto->manaPerSecond + m_spellProto->manaPerSecondPerLevel * caster->getLevel())
                 {
                     m_timeCla += 1000 - diff;
-
                     Powers powertype = Powers(m_spellProto->powerType);
                     if(powertype == POWER_HEALTH)
                     {
@@ -668,7 +623,6 @@ void Aura::Update(uint32 diff)
             }
         }
     }
-
     // Apply charged spellmods for channeled auras
     // used for example when triggered spell of spell:10 is modded
     Spell *modSpell = NULL;
@@ -676,15 +630,12 @@ void Aura::Update(uint32 diff)
     if(IS_PLAYER_GUID(GetCasterGUID()) && (modOwner = (Player*)GetCaster())
         && (modSpell = modOwner->FindCurrentSpellBySpellId(GetId())))
         modOwner->SetSpellModTakingSpell(modSpell, true);
-
     for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
         if (m_partAuras[i])
             m_partAuras[i]->Update(diff);
-
     if (modOwner)
         modOwner->SetSpellModTakingSpell(modSpell, false);
 }
-
 void AuraEffect::Update(uint32 diff)
 {
     if (m_isPeriodic && (GetParentAura()->GetAuraDuration() >=0 || GetParentAura()->IsPassive() || GetParentAura()->IsPermanent()))
@@ -694,16 +645,13 @@ void AuraEffect::Update(uint32 diff)
         else // tick also at m_periodicTimer==0 to prevent lost last tick in case max m_duration == (max m_periodicTimer)*N
         {
             ++m_tickNumber;
-
             // update before applying (aura can be removed in TriggerSpell or PeriodicTick calls)
             m_periodicTimer += m_amplitude - diff;
-
             if(!m_target->hasUnitState(UNIT_STAT_ISOLATED))
                 PeriodicTick();
         }
     }
 }
-
 void AreaAuraEffect::Update(uint32 diff)
 {
     // update for the source of the aura
@@ -716,11 +664,9 @@ void AreaAuraEffect::Update(uint32 diff)
             m_target->RemoveAura(GetParentAura());
             return;
         }
-
         if( !source->hasUnitState(UNIT_STAT_ISOLATED) )
         {
             std::list<Unit *> targets;
-
             switch(m_areaAuraType)
             {
                 case AREA_AURA_PARTY:
@@ -752,7 +698,6 @@ void AreaAuraEffect::Update(uint32 diff)
                     break;
                 }
             }
-
             for(std::list<Unit*>::iterator tIter = targets.begin(); tIter != targets.end(); tIter++)
             {
                 if(Aura *aur = (*tIter)->GetAura(GetId(), GetCasterGUID()))
@@ -774,7 +719,6 @@ void AreaAuraEffect::Update(uint32 diff)
                     if(skip)
                         continue;
                 }
-
                 // Select lower rank of aura if needed
                 if(SpellEntry const *actualSpellInfo = spellmgr.SelectAuraRankForPlayerLevel(GetSpellProto(), (*tIter)->getLevel()))
                 {
@@ -783,7 +727,6 @@ void AreaAuraEffect::Update(uint32 diff)
                     if (newBp == m_spellProto->EffectBasePoints[m_effIndex])
                         newBp = actualSpellInfo->EffectBasePoints[m_effIndex];
                     (*tIter)->AddAuraEffect(actualSpellInfo, GetEffIndex(), source, caster, &newBp);
-
                     if(m_areaAuraType == AREA_AURA_ENEMY)
                         caster->CombatStart(*tIter);
                 }
@@ -796,15 +739,12 @@ void AreaAuraEffect::Update(uint32 diff)
         // WARNING: the aura may get deleted during the update
         // DO NOT access its members after update!
         AuraEffect::Update(diff);
-
         // Speedup - no need to do more checks
         if (GetParentAura()->IsRemoved())
             return;
-
         // Caster may be deleted due to update
         Unit *caster = GetCaster();
         Unit *source = GetSource();
-
         // remove aura if out-of-range from caster (after teleport for example)
         // or caster is isolated or caster no longer has the aura
         // or caster is (no longer) friendly
@@ -849,7 +789,6 @@ void AreaAuraEffect::Update(uint32 diff)
         }
     }
 }
-
 void PersistentAreaAuraEffect::Update(uint32 diff)
 {
     /*
@@ -873,26 +812,20 @@ void PersistentAreaAuraEffect::Update(uint32 diff)
             return;
         }
     }
-
     // remove the aura if its caster or the dynamic object causing it was removed
     // or if the target moves too far from the dynamic object
     m_target->RemoveAura(GetParentAura());
 }
-
 void AuraEffect::ApplyModifier(bool apply, bool Real, bool changeAmount)
 {
     if (GetParentAura()->IsRemoved())
         return;
-
     if (apply)
         HandleAuraEffectSpecificMods(true, Real, changeAmount);
-
     (*this.*AuraHandler [m_auraName])(apply,Real, changeAmount);
-
     if (!apply)
         HandleAuraEffectSpecificMods(false, Real, changeAmount);
 }
-
 void AuraEffect::RecalculateAmount(bool applied)
 {
     Unit *caster = GetParentAura()->GetCaster();
@@ -908,42 +841,34 @@ void AuraEffect::RecalculateAmount(bool applied)
             ApplyModifier(true,false,true);
     }
 }
-
 void AuraEffect::CleanupTriggeredSpells()
 {
     uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()];
     if(!tSpellId)
         return;
-
     SpellEntry const* tProto = sSpellStore.LookupEntry(tSpellId);
     if(!tProto)
         return;
-
     if(GetSpellDuration(tProto) != -1)
         return;
-
     // needed for spell 43680, maybe others
     // TODO: is there a spell flag, which can solve this in a more sophisticated way?
     if(m_spellProto->EffectApplyAuraName[GetEffIndex()] == SPELL_AURA_PERIODIC_TRIGGER_SPELL &&
             GetSpellDuration(m_spellProto) == m_spellProto->EffectAmplitude[GetEffIndex()])
         return;
-
     m_target->RemoveAurasDueToSpell(tSpellId, GetCasterGUID());
 }
-
 void Aura::ApplyAllModifiers(bool apply, bool Real)
 {
     for (uint8 i = 0; i<MAX_SPELL_EFFECTS;++i)
         if (m_partAuras[i])
             m_partAuras[i]->ApplyModifier(apply, Real);
 }
-
 void Aura::HandleAuraSpecificMods(bool apply)
 {
     //**************************************************************************************
     // Function called after applying all mods from aura or after removing all mods from it
     //**************************************************************************************
-
     //********************
     // MODS AT AURA APPLY
     //********************
@@ -957,7 +882,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
             {
                 uint32 zone, area;
                 m_target->GetZoneAndAreaId(zone,area);
-
                 for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
                 {
                     // some auras remove at aura remove
@@ -972,7 +896,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                 }
             }
         }
-
         if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE)
         {
             if (m_spellProto->SpellFamilyFlags[1] & 0x00000002 && m_spellProto->SpellFamilyFlags[2] & 0x00000008)
@@ -985,7 +908,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                         if (roll_chance_i(aureff->GetAmount()))
                         {
                             uint32 spell_id = 0;
-
                             switch (aureff->GetId())
                             {
                                 case 31571: spell_id = 57529; break;
@@ -1018,7 +940,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                 Unit * caster = GetCaster();
                 if (!caster)
                     return;
-
                 // Polymorph Sound - Sheep && Penguin
                 if (m_spellProto->SpellIconID == 82 && m_spellProto->SpellVisual[0] == 12978)
                 {
@@ -1038,7 +959,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                 Unit * caster = GetCaster();
                 if (!caster)
                     return;
-
                 // Improved Devouring Plague
                 if (AuraEffect const * aurEff = caster->GetDummyAura(SPELLFAMILY_PRIEST, 3790, 1))
                 {
@@ -1046,13 +966,12 @@ void Aura::HandleAuraSpecificMods(bool apply)
                     caster->CastCustomSpell(m_target, 63675, &basepoints0, NULL, NULL, true, NULL, GetPartAura(0));
                 }
             }
-            // Renew 
+            // Renew
             else if (GetSpellProto()->SpellFamilyFlags[0] & 0x00000040 && GetPartAura(0))
             {
                 Unit * caster = GetCaster();
                 if (!caster)
                     return;
-
                 // Empowered Renew
                 if (AuraEffect const * aurEff = caster->GetDummyAura(SPELLFAMILY_PRIEST, 3021, 1))
                 {
@@ -1080,7 +999,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                 Unit * caster = GetCaster();
                 if (!caster)
                     return;
-
                 AuraEffect * aurEff = NULL;
                 // Ebon Plaguebringer / Crypt Fever
                 Unit::AuraEffectList const& TalentAuras = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
@@ -1138,11 +1056,9 @@ void Aura::HandleAuraSpecificMods(bool apply)
             }
         }
     }
-
     //*******************************
     // MODS AT AURA APPLY AND REMOVE
     //*******************************
-
     // Aura Mastery Triggered Spell Handler
     // If apply Concentration Aura -> trigger -> apply Aura Mastery Immunity
     // If remove Concentration Aura -> trigger -> remove Aura Mastery Immunity
@@ -1165,7 +1081,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
             return;
         }
     }
-
     // Bestial Wrath
     if (GetSpellProto()->Id == 19574)
     {
@@ -1182,13 +1097,11 @@ void Aura::HandleAuraSpecificMods(bool apply)
             }
         }
     }
-
     if (GetSpellSpecific(m_spellProto->Id) == SPELL_PRESENCE)
     {
         AuraEffect *bloodPresenceAura=0;  // healing by damage done
         AuraEffect *frostPresenceAura=0;  // increased health
         AuraEffect *unholyPresenceAura=0; // increased movement speed, faster rune recovery
-
         // Improved Presences
         Unit::AuraEffectList const& vDummyAuras = m_target->GetAurasByType(SPELL_AURA_DUMMY);
         for(Unit::AuraEffectList::const_iterator itr = vDummyAuras.begin(); itr != vDummyAuras.end(); ++itr)
@@ -1218,7 +1131,6 @@ void Aura::HandleAuraSpecificMods(bool apply)
                 }
             }
         }
-
         uint32 presence=GetId();
         if (apply)
         {
@@ -1274,11 +1186,9 @@ void Aura::HandleAuraSpecificMods(bool apply)
             }
         }
     }
-
     //*********************
     // MODS AT AURA REMOVE
     //*********************
-
     if(!apply)
     {
         // Spell Reflection
@@ -1309,17 +1219,14 @@ void Aura::HandleAuraSpecificMods(bool apply)
             Unit *caster = GetCaster();
             if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
                 return;
-
             Player *player = ((Player*)caster);
             // Glyph of Guardian Spirit
             if(AuraEffect * aurEff = player->GetAuraEffect(63231, 0))
             {
                 if (!player->HasSpellCooldown(47788))
                     return;
-
                 player->RemoveSpellCooldown(m_spellProto->Id, true);
                 player->AddSpellCooldown(m_spellProto->Id, 0, uint32(time(NULL) + aurEff->GetAmount()));
-
                 WorldPacket data(SMSG_SPELL_COOLDOWN, 8+1+4+4);
                 data << uint64(player->GetGUID());
                 data << uint8(0x0);                                     // flags (0x1, 0x2)
@@ -1376,16 +1283,13 @@ void Aura::HandleAuraSpecificMods(bool apply)
         }
     }
 }
-
 void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool changeAmount)
 {
     //***********************************************************************
     // Function called before aura effect handler apply or after it's remove
     //***********************************************************************
-
     if(!Real && !changeAmount)
         return;
-
     if(apply)
     {
         // prevent double apply bonuses
@@ -1488,13 +1392,10 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
                         // 0.01*$AP*cp
                         if (caster->GetTypeId() != TYPEID_PLAYER)
                             return;
-
                         uint8 cp = ((Player*)caster)->GetComboPoints();
-
                         // Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs
                         if (AuraEffect const * aurEff = caster->GetAuraEffect(34241,0))
                             m_amount += cp * aurEff->GetAmount();
-
                         m_amount += int32(caster->GetTotalAttackPowerValue(BASE_ATTACK) * cp / 100);
                     }
                     // TODO: i do not know what is this for so i simply disable it
@@ -1554,10 +1455,8 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
                         {
                             int32 value = int32((m_amount*-1)-10);
                             uint32 defva = uint32(((Player*)caster)->GetSkillValue(SKILL_DEFENSE) + ((Player*)caster)->GetRatingBonusValue(CR_DEFENSE_SKILL));
-
                             if(defva > 400)
                                 value += int32((defva-400)*0.15);
-
                             // Glyph of Icebound Fortitude
                             if (AuraEffect *auradummy = caster->GetAuraEffect(58625,0))
                             {
@@ -1573,7 +1472,6 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
                 default:
                     break;
             }
-
             if (DoneActualBenefit != 0.0f)
             {
                 DoneActualBenefit *= caster->CalculateLevelPenalty(GetSpellProto());
@@ -1582,16 +1480,13 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
         }
     }
 }
-
 void Aura::SendAuraUpdate()
 {
     if (m_auraSlot>=MAX_AURAS)
         return;
     WorldPacket data(SMSG_AURA_UPDATE);
-
     data.append(m_target->GetPackGUID());
     data << uint8(m_auraSlot);
-
     if(!m_target->GetVisibleAura(m_auraSlot))
     {
         data << uint32(0);
@@ -1599,12 +1494,10 @@ void Aura::SendAuraUpdate()
         m_target->SendMessageToSet(&data, true);
         return;
     }
-
     data << uint32(GetId());
     data << uint8(m_auraFlags);
     data << uint8(m_auraLevel);
     data << uint8(m_stackAmount > 1 ? m_stackAmount : (m_procCharges) ? m_procCharges : 1);
-
     if(!(m_auraFlags & AFLAG_CASTER))
     {
         if (Unit * caster = GetCaster())
@@ -1612,25 +1505,20 @@ void Aura::SendAuraUpdate()
         else
             data << uint8(0);
     }
-
     if(m_auraFlags & AFLAG_DURATION)
     {
         data << uint32(m_maxduration);
         data << uint32(m_duration);
     }
-
     m_target->SendMessageToSet(&data, true);
 }
-
 bool Aura::IsVisible() const
 {
     // passive auras (except totem auras) do not get placed in the slots
     // area auras with SPELL_AURA_NONE are not shown on target
     //(m_spellProto->Attributes & 0x80 && GetTalentSpellPos(GetId()))
-
     if(!m_isPassive)
         return true;
-
     bool noneAreaAura = true;
     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
@@ -1641,7 +1529,6 @@ bool Aura::IsVisible() const
                 if(Unit *source = ((AreaAuraEffect*)m_partAuras[i])->GetSource())
                     if(source->isTotem())
                         return true;
-
                 if(m_partAuras[i]->GetAuraName() != SPELL_AURA_NONE)
                     noneAreaAura = false;
             }
@@ -1649,22 +1536,17 @@ bool Aura::IsVisible() const
                 noneAreaAura = false;
         }
     }
-
     if(noneAreaAura)
         return false;
-
     return IsAuraType(SPELL_AURA_ABILITY_IGNORE_AURASTATE);
 }
-
 void Aura::_AddAura()
 {
     if (!GetId())
         return;
     if(!m_target)
         return;
-
     Unit* caster = GetCaster();
-
     // set infinity cooldown state for spells
     if(caster && caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -1674,7 +1556,6 @@ void Aura::_AddAura()
             ((Player*)caster)->AddSpellAndCategoryCooldowns(m_spellProto,castItem ? castItem->GetEntry() : 0, NULL,true);
         }
     }
-
     if(IsVisible())
     {
         // Try find slot for aura
@@ -1699,7 +1580,6 @@ void Aura::_AddAura()
                 }
             }
         }
-
         // Register Visible Aura
         if(slot < MAX_AURAS)
         {
@@ -1716,15 +1596,12 @@ void Aura::_AddAura()
         else
             sLog.outDebug("Aura: %u Effect: %d could not find empty unit visible slot",GetId(), GetEffectMask());
     }
-
     // Sitdown on apply aura req seated
     if (m_spellProto->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED && !m_target->IsSitState())
         m_target->SetStandState(UNIT_STAND_STATE_SIT);
-
     // register aura diminishing on apply
     if (getDiminishGroup() != DIMINISHING_NONE )
         m_target->ApplyDiminishingAura(getDiminishGroup(),true);
-
     // Apply linked auras (On first aura apply)
     uint32 id = GetId();
     if(spellmgr.GetSpellCustomAttr(id) & SPELL_ATTR_CU_LINK_AURA)
@@ -1738,10 +1615,8 @@ void Aura::_AddAura()
                     caster->AddAura(*itr, m_target);
             }
     }
-
     HandleAuraSpecificMods(true);
 }
-
 bool Aura::SetPartAura(AuraEffect* aurEff, uint8 effIndex)
 {
     if (IsRemoved())
@@ -1754,13 +1629,10 @@ bool Aura::SetPartAura(AuraEffect* aurEff, uint8 effIndex)
     SendAuraUpdate();
     return true;
 }
-
 void Aura::_RemoveAura()
 {
     Unit* caster = GetCaster();
-
     uint8 slot = GetAuraSlot();
-
     if (Aura * foundAura = m_target->GetAura(GetId(), GetCasterGUID()))
     {
         // allow use single slot only by auras from same caster
@@ -1772,7 +1644,6 @@ void Aura::_RemoveAura()
                 slot = MAX_AURAS;
             }
     }
-
     // update for out of range group members
     if (slot < MAX_AURAS)
     {
@@ -1780,16 +1651,13 @@ void Aura::_RemoveAura()
         m_target->UpdateAuraForGroup(slot);
         SendAuraUpdate();
     }
-
     // unregister aura diminishing (and store last time)
     if (getDiminishGroup() != DIMINISHING_NONE )
         m_target->ApplyDiminishingAura(getDiminishGroup(),false);
-
     // since now aura cannot apply/remove it's modifiers
     m_isRemoved = true;
     // disable client server communication for removed aura
     SetAuraSlot(MAX_AURAS);
-
     // reset cooldown state for spells
     if(caster && caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -1827,7 +1695,6 @@ void Aura::_RemoveAura()
             }
         }
     }
-
     // Proc on aura remove (only spell flags for now)
     if (caster)
     {
@@ -1854,7 +1721,6 @@ void Aura::_RemoveAura()
     }
     HandleAuraSpecificMods(false);
 }
-
 void Aura::SetStackAmount(uint8 stackAmount, bool applied)
 {
     bool refresh = stackAmount >= m_stackAmount;
@@ -1869,20 +1735,17 @@ void Aura::SetStackAmount(uint8 stackAmount, bool applied)
             }
         }
     }
-
     if (refresh)
         RefreshAura();
     else
         SendAuraUpdate();
 }
-
 // TODO: lifebloom should bloom when each stack is dispelled
 bool Aura::modStackAmount(int32 num)
 {
     // Can`t mod
     if (!m_spellProto->StackAmount)
         return true;
-
     // Modify stack but limit it
     int32 stackAmount = m_stackAmount + num;
     if (stackAmount > m_spellProto->StackAmount)
@@ -1892,12 +1755,10 @@ bool Aura::modStackAmount(int32 num)
         m_stackAmount = 0;
         return true; // need remove aura
     }
-
     // Update stack amount
     SetStackAmount(stackAmount);
     return false;
 }
-
 void Aura::SetAuraDuration(int32 duration, bool withMods)
 {
     if (withMods)
@@ -1912,7 +1773,6 @@ void Aura::SetAuraDuration(int32 duration, bool withMods)
         //m_permanent=false;
     SendAuraUpdate();
 }
-
 void Aura::SetAuraCharges(uint8 charges)
 {
     if (m_procCharges == charges)
@@ -1920,7 +1780,6 @@ void Aura::SetAuraCharges(uint8 charges)
     m_procCharges = charges;
     SendAuraUpdate();
 }
-
 bool Aura::DropAuraCharge()
 {
     if(m_procCharges) //auras without charges always have charge = 0
@@ -1935,26 +1794,20 @@ bool Aura::DropAuraCharge()
     }
     return false;
 }
-
 bool Aura::CanBeSaved() const
 {
     if (IsPassive())
         return false;
-
     if(IsPersistent())
         return false;
-
     if (GetCasterGUID() != m_target->GetGUID())
         if (IsSingleTargetSpell(GetSpellProto()) || IsAreaAura())
             return false;
-
     // Can't be saved - aura handler relies on calculated amount and changes it
     if (IsAuraType(SPELL_AURA_CONVERT_RUNE))
         return false;
-
     return true;
 }
-
 bool Aura::IsPersistent() const
 {
     return IS_DYNAMICOBJECT_GUID(m_sourceGuid);
@@ -1965,7 +1818,6 @@ bool Aura::IsPersistent() const
     return false;
     */
 }
-
 bool Aura::IsAreaAura() const
 {
     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
@@ -1973,7 +1825,6 @@ bool Aura::IsAreaAura() const
             return true;
     return false;
 }
-
 bool Aura::IsAuraType(AuraType type) const
 {
     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
@@ -1983,7 +1834,6 @@ bool Aura::IsAuraType(AuraType type) const
     }
     return false;
 }
-
 void Aura::SetLoadedState(uint64 caster_guid,int32 maxduration,int32 duration,int32 charges, uint8 stackamount, int32 * amount)
 {
     *const_cast<uint64*>(&m_casterGuid) = caster_guid;
@@ -1995,14 +1845,12 @@ void Aura::SetLoadedState(uint64 caster_guid,int32 maxduration,int32 duration,in
         if(m_partAuras[i])
             m_partAuras[i]->SetAmount(amount[i]);
 }
-
 void AuraEffect::HandleShapeshiftBoosts(bool apply)
 {
     uint32 spellId = 0;
     uint32 spellId2 = 0;
     uint32 spellId3 = 0;
     uint32 HotWSpellId = 0;
-
     switch(GetMiscValue())
     {
         case FORM_CAT:
@@ -2067,9 +1915,7 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
         case FORM_CREATUREBEAR:
             break;
     }
-
     uint32 form = GetMiscValue()-1;
-
     if(apply)
     {
         // Remove cooldown of spells triggered on stance change - they may share cooldown with stance spell
@@ -2079,14 +1925,12 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
                 ((Player *)m_target)->RemoveSpellCooldown(spellId);
             m_target->CastSpell(m_target, spellId, true, NULL, this );
         }
-
         if (spellId2)
         {
             if(m_target->GetTypeId() == TYPEID_PLAYER)
                 ((Player *)m_target)->RemoveSpellCooldown(spellId2);
             m_target->CastSpell(m_target, spellId2, true, NULL, this);
         }
-
         if(m_target->GetTypeId() == TYPEID_PLAYER)
         {
             const PlayerSpellMap& sp_list = ((Player *)m_target)->GetSpellMap();
@@ -2117,7 +1961,6 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
                         int32 HotWMod = (*i)->GetAmount();
                         if(GetMiscValue() == FORM_CAT)
                             HotWMod /= 2;
-
                         m_target->CastCustomSpell(m_target, HotWSpellId, &HotWMod, NULL, NULL, true, NULL, this);
                         break;
                     }
@@ -2188,7 +2031,6 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
             m_target->RemoveAurasDueToSpell(spellId);
         if (spellId2)
             m_target->RemoveAurasDueToSpell(spellId2);
-
         Unit::AuraMap& tAuras = m_target->GetAuras();
         for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end();)
         {
@@ -2203,7 +2045,6 @@ void AuraEffect::HandleShapeshiftBoosts(bool apply)
         }
     }
 }
-
 bool AuraEffect::isAffectedOnSpell(SpellEntry const *spell) const
 {
     if (!spell)
@@ -2211,13 +2052,11 @@ bool AuraEffect::isAffectedOnSpell(SpellEntry const *spell) const
     // Check family name
     if (spell->SpellFamilyName != m_spellProto->SpellFamilyName)
         return false;
-
     // Check EffectClassMask
     if (m_spellProto->EffectSpellClassMask[m_effIndex] & spell->SpellFamilyFlags)
         return true;
     return false;
 }
-
 void Aura::UnregisterSingleCastAura()
 {
     if (IsSingleTarget())
@@ -2236,7 +2075,6 @@ void Aura::UnregisterSingleCastAura()
         m_isSingleTargetAura = false;
     }
 }
-
 /*********************************************************/
 /***               BASIC AURA FUNCTION                 ***/
 /*********************************************************/
@@ -2244,12 +2082,9 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER || (!Real && !changeAmount))
         return;
-
     uint32 modOp = GetMiscValue();
-
     if(modOp >= MAX_SPELLMOD)
         return;
-
     if (apply)
     {
         SpellModifier *mod = new SpellModifier(GetParentAura());
@@ -2257,15 +2092,11 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount)
         mod->value = m_amount;
         mod->type = SpellModType(m_auraName);    // SpellModType value == spell aura types
         mod->spellId = GetId();
-
         mod->mask = m_spellProto->EffectSpellClassMask[m_effIndex];
         mod->charges = GetParentAura()->GetAuraCharges();
-
         m_spellmod = mod;
     }
-
     ((Player*)m_target)->AddSpellMod(m_spellmod, apply);
-
     // Auras with charges do not mod amount of passive auras
     if (GetParentAura()->GetAuraCharges())
         return;
@@ -2317,22 +2148,17 @@ void AuraEffect::HandleAddModifier(bool apply, bool Real, bool changeAmount)
             break;
     }
 }
-
 void AuraEffect::TriggerSpell()
 {
     Unit* caster = GetCaster();
     Unit* target = GetTriggerTarget();
-
     if(!caster || !target)
         return;
-
     // generic casting code with custom spells and target/caster customs
     uint32 trigger_spell_id = GetSpellProto()->EffectTriggerSpell[m_effIndex];
-
     SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
     SpellEntry const *auraSpellInfo = GetSpellProto();
     uint32 auraId = auraSpellInfo->Id;
-
     // specific code for cases with no trigger spell provided in field
     if (triggeredSpellInfo == NULL)
     {
@@ -2384,7 +2210,6 @@ void AuraEffect::TriggerSpell()
                     {
                         int32 heal = caster->GetMaxHealth() / 10;
                         caster->DealHeal(m_target, heal, auraSpellInfo);
-
                         int32 mana = caster->GetMaxPower(POWER_MANA);
                         if (mana)
                         {
@@ -2438,9 +2263,7 @@ void AuraEffect::TriggerSpell()
                             // missing lootid has been reported on startup - just return
                             if (!creature->GetCreatureInfo()->SkinLootId)
                                 return;
-
                             player->AutoStoreLoot(creature->GetCreatureInfo()->SkinLootId,LootTemplates_Skinning,true);
-
                             creature->ForcedDespawn();
                         }
                         return;
@@ -2484,11 +2307,8 @@ void AuraEffect::TriggerSpell()
                     {
                         if(m_target->GetTypeId() != TYPEID_UNIT)
                             return;
-
                         caster->CastSpell(caster, 38495, true, NULL, this);
-
                         Creature* creatureTarget = (Creature*)m_target;
-
                         creatureTarget->ForcedDespawn();
                         return;
                     }
@@ -2545,26 +2365,21 @@ void AuraEffect::TriggerSpell()
                     case 53304:
                         if (m_target->GetTypeId() != TYPEID_PLAYER)
                             return;
-
                         if (((Player*)m_target)->isMoving())
                         {
                             m_amount = m_target->CalculateSpellDamage(m_spellProto,m_effIndex,m_currentBasePoints,m_target);
                             return;
                         }
-
                         // We are standing at the moment
                         if (m_amount > 0)
                         {
                             --m_amount;
                             return;
                         }
-
                         trigger_spell_id = 64418 + auraId - 53302;
-
                         // If aura is active - no need to continue
                         if (target->HasAura(trigger_spell_id))
                             return;
-
                         break;
                     default:
                         break;
@@ -2595,7 +2410,6 @@ void AuraEffect::TriggerSpell()
                                 break;
                             }
                         }
-
                         if(all)
                             caster->CastSpell(caster,38437,true, NULL, this);
                         else
@@ -2610,7 +2424,6 @@ void AuraEffect::TriggerSpell()
             default:
                 break;
         }
-
         // Reget trigger spell proto
         triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
     }
@@ -2648,7 +2461,6 @@ void AuraEffect::TriggerSpell()
                 return;
         }
     }
-
     if(triggeredSpellInfo)
     {
         if(!caster->GetSpellMaxRangeForTarget(m_target,sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex)))
@@ -2658,36 +2470,28 @@ void AuraEffect::TriggerSpell()
     else if(target->GetTypeId()!=TYPEID_UNIT || !Script->EffectDummyCreature(caster, GetId(), GetEffIndex(), (Creature*)target))
         sLog.outError("AuraEffect::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
 }
-
 Unit* AuraEffect::GetTriggerTarget() const
 {
     Unit* target = ObjectAccessor::GetUnit(*m_target, m_target->GetUInt64Value(UNIT_FIELD_TARGET));
     return target ? target : m_target;
 }
-
 void AuraEffect::TriggerSpellWithValue()
 {
     Unit* caster = GetCaster();
     Unit* target = GetTriggerTarget();
-
     if(!caster || !target)
         return;
-
     // generic casting code with custom spells and target/caster customs
     uint32 trigger_spell_id = GetSpellProto()->EffectTriggerSpell[m_effIndex];
     int32  basepoints0 = this->GetAmount();
-
     caster->CastCustomSpell(target, trigger_spell_id, &basepoints0, 0, 0, true, 0, this);
 }
-
 /*********************************************************/
 /***                  AURA EFFECTS                     ***/
 /*********************************************************/
-
 void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
 {
     Unit* caster = GetCaster();
-
     // spells required only Real aura add/remove
     if (Real)
     {
@@ -2695,7 +2499,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
     if(apply)
     {
         // Overpower
-        if (caster && m_spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR && 
+        if (caster && m_spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR &&
             m_spellProto->SpellFamilyFlags[0] & 0x4)
         {
             // Must be casting target
@@ -2740,9 +2544,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 Unit * pet = m_target->GetGuardianPet();
                 if (!pet)
                     return;
-
                 m_target->CastSpell(m_target,34027,true,NULL,this);
-
                 // set 3 stacks and 3 charges (to make all auras not disappear at once)
                 Aura* owner_aura = m_target->GetAura(34027,GetCasterGUID());
                 Aura* pet_aura  = pet->GetAura(58914, GetCasterGUID());
@@ -2824,13 +2626,11 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                         m_target->CastSpell(target, 51699, true);
                return;
         }
-
         //Druid, Survival Instincts
         if(GetSpellProto()->SpellFamilyName==SPELLFAMILY_DRUID && GetSpellProto()->SpellFamilyFlags[2]& 0x40 )
         {
             if(!m_target)
                 return;
-
                int32 bp0 = int32(m_target->GetMaxHealth() * m_amount / 100);
                m_target->CastCustomSpell(m_target, 50322, &bp0, NULL, NULL, true);
         }
@@ -2862,12 +2662,10 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 case 30102: finalSpelId = 30103; break;
                 case 30105: finalSpelId = 30104; break;
             }
-
             if(finalSpelId)
                 caster->CastSpell(m_target,finalSpelId,true,NULL,this);
             return;
         }
-
         switch(m_spellProto->SpellFamilyName)
         {
             case SPELLFAMILY_GENERIC:
@@ -2889,7 +2687,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                         if (m_target->GetMap()->IsDungeon())
                         {
                             uint32 spellId = m_target->GetMap()->IsHeroic() ? 46163 : 44190;
-
                             m_target->CastSpell(m_target, spellId, true, NULL, this);
                         }
                         return;
@@ -2958,9 +2755,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
         }
     }
     }
-
     // AT APPLY & REMOVE
-
     switch(m_spellProto->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
@@ -2982,7 +2777,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                         const SpellEntry *spell = sSpellStore.LookupEntry(spellId);
                         if (!spell)
                             return;
-
                         for (int i=0; i < spell->StackAmount; ++i)
                             caster->CastSpell(m_target, spell->Id, true, NULL, NULL, GetCasterGUID());
                         return;
@@ -3011,7 +2805,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 {
                     if (!caster)
                         return;
-
                     Unit *owner = caster->GetOwner();
                     if (owner && owner->GetTypeId() == TYPEID_PLAYER)
                     {
@@ -3027,7 +2820,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 {
                     if (!caster)
                         return;
-
                     Unit *owner = caster->GetOwner();
                     if (owner && owner->GetTypeId() == TYPEID_PLAYER)
                     {
@@ -3045,9 +2837,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 {
                     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     uint32 FactionID = 0;
-
                     if(apply)
                     {
                         switch(m_spellProto->Id)
@@ -3086,7 +2876,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                     }
                     return;
             }
-
             break;
         }
         case SPELLFAMILY_MAGE:
@@ -3129,7 +2918,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 {
                     if (m_target->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     if(apply)
                     {
                         SpellModifier *mod = new SpellModifier;
@@ -3138,10 +2926,8 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                         mod->type = SPELLMOD_FLAT;
                         mod->spellId = GetId();
                         mod->mask[1] = 0x0010;
-
                         m_spellmod = mod;
                     }
-
                     ((Player*)m_target)->AddSpellMod(m_spellmod, apply);
                     return;
                 }
@@ -3153,7 +2939,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                     {
                         if (!m_target->IsInFeralForm())
                             return;
-
                         int32 bp0 = int32(m_target->GetMaxHealth() * m_amount / 100);
                         m_target->CastCustomSpell(m_target, 50322, &bp0, NULL, NULL, true);
                     }
@@ -3178,14 +2963,12 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                     // Final heal only on dispelled or duration end
                     if (GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE && GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL)
                         return;
-
                     // final heal
                     //if(m_target->IsInWorld())
                     // This may be a hack, but we need a way to count healing bonus three times
                     //for(uint8 i = 0; i < GetParentAura()->GetStackAmount(); ++i)
                     // Update: apparently not anymore, it should only count once, so.. commented out.
                     m_target->CastCustomSpell(m_target,33778,&m_amount,NULL,NULL,true,NULL,this,GetCasterGUID());
-
                     // restore mana
                     if (caster)
                     {
@@ -3221,7 +3004,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
             break;
         }
     }
-
     if (Real)
     {
         // pet auras
@@ -3233,7 +3015,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                 m_target->RemovePetAura(petSpell);
             return;
         }
-
         if(GetEffIndex()==0 && m_target->GetTypeId()==TYPEID_PLAYER)
         {
             SpellAreaForAreaMapBounds saBounds = spellmgr.GetSpellAreaForAuraMapBounds(GetId());
@@ -3241,7 +3022,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
             {
                 uint32 zone, area;
                 m_target->GetZoneAndAreaId(zone,area);
-
                 for(SpellAreaForAreaMap::const_iterator itr = saBounds.first; itr != saBounds.second; ++itr)
                 {
                     // some auras remove at aura remove
@@ -3258,13 +3038,11 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
         }
     }
 }
-
 void AuraEffect::HandleAuraMounted(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if(!Real)
         return;
-
     if(apply)
     {
         CreatureInfo const* ci = objmgr.GetCreatureTemplate(GetMiscValue());
@@ -3273,16 +3051,13 @@ void AuraEffect::HandleAuraMounted(bool apply, bool Real, bool /*changeAmount*/)
             sLog.outErrorDb("AuraMounted: `creature_template`='%u' not found in database (only need it modelid)",GetMiscValue());
             return;
         }
-
         uint32 team = 0;
         if (m_target->GetTypeId()==TYPEID_PLAYER)
             team = ((Player*)m_target)->GetTeam();
-
         uint32 display_id = objmgr.ChooseDisplayId(team,ci);
         CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(display_id);
         if (minfo)
             display_id = minfo->modelid;
-
         //some spell has one aura of mount and one of vehicle
         for(uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
             if(GetSpellProto()->Effect[i] == SPELL_EFFECT_SUMMON
@@ -3295,13 +3070,11 @@ void AuraEffect::HandleAuraMounted(bool apply, bool Real, bool /*changeAmount*/)
         m_target->Unmount();
     }
 }
-
 void AuraEffect::HandleAuraWaterWalk(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if(!Real)
         return;
-
     WorldPacket data;
     if(apply)
         data.Initialize(SMSG_MOVE_WATER_WALK, 8+4);
@@ -3311,13 +3084,11 @@ void AuraEffect::HandleAuraWaterWalk(bool apply, bool Real, bool /*changeAmount*
     data << uint32(0);
     m_target->SendMessageToSet(&data,true);
 }
-
 void AuraEffect::HandleAuraFeatherFall(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if(!Real)
         return;
-
     WorldPacket data;
     if(apply)
         data.Initialize(SMSG_MOVE_FEATHER_FALL, 8+4);
@@ -3326,18 +3097,15 @@ void AuraEffect::HandleAuraFeatherFall(bool apply, bool Real, bool /*changeAmoun
     data.append(m_target->GetPackGUID());
     data << uint32(0);
     m_target->SendMessageToSet(&data, true);
-
     // start fall from current height
     if(!apply && m_target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_target)->SetFallInformation(0, m_target->GetPositionZ());
 }
-
 void AuraEffect::HandleAuraHover(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if(!Real)
         return;
-
     WorldPacket data;
     if(apply)
         data.Initialize(SMSG_MOVE_SET_HOVER, 8+4);
@@ -3347,19 +3115,16 @@ void AuraEffect::HandleAuraHover(bool apply, bool Real, bool /*changeAmount*/)
     data << uint32(0);
     m_target->SendMessageToSet(&data,true);
 }
-
 void AuraEffect::HandleWaterBreathing(bool apply, bool Real, bool /*changeAmount*/)
 {
     // update timers in client
     if(m_target->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_target)->UpdateMirrorTimers();
 }
-
 void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmount)
 {
     if(!Real && !changeAmount)
         return;
-
     uint32 modelid = 0;
     Powers PowerType = POWER_MANA;
     ShapeshiftForm form = ShapeshiftForm(GetMiscValue());
@@ -3446,7 +3211,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
         default:
             sLog.outError("Auras: Unknown Shapeshift Type: %u", GetMiscValue());
     }
-
     // remove polymorph before changing display id to keep new display id
     switch ( form )
     {
@@ -3462,7 +3226,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
         {
             // remove movement affects
             m_target->RemoveMovementImpairingAuras();
-
             // and polymorphic affects
             if(m_target->IsPolymorphed())
                 m_target->RemoveAurasDueToSpell(m_target->getTransForm());
@@ -3471,25 +3234,20 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
         default:
            break;
     }
-
     if(apply)
     {
         // remove other shapeshift before applying a new one
         if(m_target->m_ShapeShiftFormSpellId)
             m_target->RemoveAurasDueToSpell(m_target->m_ShapeShiftFormSpellId);
-
         m_target->SetByteValue(UNIT_FIELD_BYTES_2, 3, form);
-
         if(modelid > 0)
             m_target->SetDisplayId(modelid);
-
         if(PowerType != POWER_MANA)
         {
             uint32 oldVal = m_target->GetPower(PowerType);
             // reset power to default values only at power change
             if(m_target->getPowerType()!=PowerType)
                 m_target->setPowerType(PowerType);
-
             switch(form)
             {
                 case FORM_CAT:
@@ -3500,7 +3258,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
                     int32 FurorChance = 0;
                     if(AuraEffect const * dummy = m_target->GetDummyAura(SPELLFAMILY_DRUID, 238, 0))
                         FurorChance = dummy->GetAmount();
-
                     if (GetMiscValue() == FORM_CAT)
                     {
                         int32 basePoints = (FurorChance < oldVal ? FurorChance : oldVal);
@@ -3518,7 +3275,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
                     break;
             }
         }
-
         m_target->m_ShapeShiftFormSpellId = GetId();
         m_target->m_form = form;
     }
@@ -3531,7 +3287,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
             m_target->setPowerType(POWER_MANA);
         m_target->m_ShapeShiftFormSpellId = 0;
         m_target->m_form = FORM_NONE;
-
         switch(form)
         {
             // Nordrassil Harness - bonus
@@ -3577,14 +3332,11 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
                 break;
         }
     }
-
     // adding/removing linked auras
     // add/remove the shapeshift aura's boosts
     HandleShapeshiftBoosts(apply);
-
     if(m_target->GetTypeId()==TYPEID_PLAYER)
         ((Player*)m_target)->InitDataForForm();
-
     if(m_target->getClass() == CLASS_DRUID)
     {
         if(form == FORM_CAT && apply)
@@ -3621,7 +3373,6 @@ void AuraEffect::HandleAuraModShapeshift(bool apply, bool Real, bool changeAmoun
         }
     }
 }
-
 void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (apply)
@@ -3632,7 +3383,6 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
             // player applied only
             if (m_target->GetTypeId()!=TYPEID_PLAYER)
                 return;
-
             switch (GetId())
             {
                 // Orb of Deception
@@ -3701,28 +3451,22 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
             else
             {
                 uint32 model_id;
-
                 if (uint32 modelid = ci->GetRandomValidModelId())
                     model_id = modelid;                     // Will use the default model here
-
                 // Polymorph (sheep)
                 if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && GetSpellProto()->SpellIconID == 82 && GetSpellProto()->SpellVisual[0] == 12978)
                     if (Unit * caster = GetCaster())
                         if (caster->HasAura(52648))         // Glyph of the Penguin
                             model_id = 26452;
-
                 m_target->SetDisplayId(model_id);
-
                 // Dragonmaw Illusion (set mount model also)
                 if(GetId()==42016 && m_target->GetMountID() && !m_target->GetAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED).empty())
                     m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
             }
         }
-
         // update active transform spell only not set or not overwriting negative by positive case
         if (!m_target->getTransForm() || !IsPositiveSpell(GetId()) || IsPositiveSpell(m_target->getTransForm()))
             m_target->setTransForm(GetId());
-
         // polymorph case
         if (Real && m_target->GetTypeId() == TYPEID_PLAYER && m_target->IsPolymorphed())
         {
@@ -3730,7 +3474,6 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
             // only if caster is Player (after patch 2.4.2)
             if (IS_PLAYER_GUID(GetCasterGUID()) )
                 ((Player*)m_target)->setRegenTimerCount(1*IN_MILISECONDS);
-
             //dismount polymorphed target (after patch 2.4.2)
             if (m_target->IsMounted())
                 m_target->RemoveAurasByType(SPELL_AURA_MOUNTED);
@@ -3741,7 +3484,6 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
         // ApplyModifier(true) will reapply it if need
         m_target->setTransForm(0);
         m_target->SetDisplayId(m_target->GetNativeDisplayId());
-
         // re-aplly some from still active with preference negative cases
         Unit::AuraEffectList const& otherTransforms = m_target->GetAurasByType(SPELL_AURA_TRANSFORM);
         if (!otherTransforms.empty())
@@ -3759,7 +3501,6 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
             }
             handledAura->ApplyModifier(true);
         }
-
         // Dragonmaw Illusion (restore mount model)
         if (GetId()==42016 && m_target->GetMountID()==16314)
         {
@@ -3771,49 +3512,38 @@ void AuraEffect::HandleAuraTransform(bool apply, bool Real, bool /*changeAmount*
                     uint32 team = 0;
                     if (m_target->GetTypeId()==TYPEID_PLAYER)
                         team = ((Player*)m_target)->GetTeam();
-
                     uint32 display_id = objmgr.ChooseDisplayId(team,ci);
                     CreatureModelInfo const *minfo = objmgr.GetCreatureModelRandomGender(display_id);
                     if (minfo)
                         display_id = minfo->modelid;
-
                     m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,display_id);
                 }
             }
         }
     }
 }
-
 void AuraEffect::HandleForceReaction(bool apply, bool Real, bool changeAmount)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(!Real && !changeAmount)
         return;
-
     Player* player = (Player*)m_target;
-
     uint32 faction_id = GetMiscValue();
     uint32 faction_rank = m_amount;
-
     player->GetReputationMgr().ApplyForceReaction(faction_id,ReputationRank(faction_rank),apply);
     player->GetReputationMgr().SendForceReactions();
 }
-
 void AuraEffect::HandleAuraModSkill(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     uint32 prot=GetSpellProto()->EffectMiscValue[m_effIndex];
     int32 points = m_amount;
-
     ((Player*)m_target)->ModifySkillBonus(prot,(apply ? points: -points),m_auraName==SPELL_AURA_MOD_SKILL_TALENT);
     if(prot == SKILL_DEFENSE)
         ((Player*)m_target)->UpdateDefenseBonusesMod();
 }
-
 void AuraEffect::HandleChannelDeathItem(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(Real && !apply)
@@ -3822,7 +3552,6 @@ void AuraEffect::HandleChannelDeathItem(bool apply, bool Real, bool /*changeAmou
         Unit* victim = m_target;
         if(!caster || caster->GetTypeId() != TYPEID_PLAYER || !victim)// || m_removeMode!=AURA_REMOVE_BY_DEATH)
             return;
-
         //we cannot check removemode = death
         //talent will remove the caster's aura->interrupt channel->remove victim aura
         if(victim->GetHealth() > 0)
@@ -3830,11 +3559,9 @@ void AuraEffect::HandleChannelDeathItem(bool apply, bool Real, bool /*changeAmou
         // Item amount
         if (m_amount <= 0)
             return;
-
         SpellEntry const *spellInfo = GetSpellProto();
         if(spellInfo->EffectItemType[m_effIndex] == 0)
             return;
-
         // Soul Shard only from non-grey units
         if( spellInfo->EffectItemType[m_effIndex] == 6265 &&
             (victim->getLevel() <= Trinity::XP::GetGrayLevel(caster->getLevel()) ||
@@ -3843,7 +3570,6 @@ void AuraEffect::HandleChannelDeathItem(bool apply, bool Real, bool /*changeAmou
         //Adding items
         uint32 noSpaceForCount = 0;
         uint32 count = m_amount;
-
         ItemPosCountVec dest;
         uint8 msg = ((Player*)caster)->CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, spellInfo->EffectItemType[m_effIndex], count, &noSpaceForCount);
         if( msg != EQUIP_ERR_OK )
@@ -3853,12 +3579,10 @@ void AuraEffect::HandleChannelDeathItem(bool apply, bool Real, bool /*changeAmou
             if (count==0)
                 return;
         }
-
         Item* newitem = ((Player*)caster)->StoreNewItem(dest, spellInfo->EffectItemType[m_effIndex], true);
         ((Player*)caster)->SendNewItem(newitem, count, true, false);
     }
 }
-
 void AuraEffect::HandleBindSight(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
@@ -3866,83 +3590,64 @@ void AuraEffect::HandleBindSight(bool apply, bool Real, bool /*changeAmount*/)
     Unit* caster = GetCaster();
     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)caster)->SetViewpoint(m_target, apply);
 }
-
 void AuraEffect::HandleFarSight(bool apply, bool Real, bool /*changeAmount*/)
 {
     //Handled by client
 }
-
 void AuraEffect::HandleAuraTrackCreatures(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     m_target->SetUInt32Value(PLAYER_TRACK_CREATURES, apply ? ((uint32)1)<<(GetMiscValue()-1) : 0 );
 }
-
 void AuraEffect::HandleAuraTrackResources(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     m_target->SetUInt32Value(PLAYER_TRACK_RESOURCES, apply ? ((uint32)1)<<(GetMiscValue()-1): 0 );
 }
-
 void AuraEffect::HandleAuraTrackStealthed(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     m_target->ApplyModFlag(PLAYER_FIELD_BYTES,PLAYER_FIELD_BYTE_TRACK_STEALTHED,apply);
 }
-
 void AuraEffect::HandleAuraModScale(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X,m_amount,apply);
 }
-
 void AuraEffect::HandleAuraModPetTalentsPoints(bool Apply, bool Real, bool changeAmount)
 {
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Recalculate pet tlaent points
     if (Pet *pet = ((Player*)m_target)->GetPet())
-        pet->InitTalentForLevel(); 
+        pet->InitTalentForLevel();
 }
-
 void AuraEffect::HandleModConfuse(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     //m_target->SetConfused(apply, GetCasterGUID(), GetId());
     m_target->SetControlled(apply, UNIT_STAT_CONFUSED);
 }
-
 void AuraEffect::HandleModFear(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
         return;
-
     //m_target->SetFeared(apply, GetCasterGUID(), GetId());
     m_target->SetControlled(apply, UNIT_STAT_FLEEING);
 }
-
 void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if( apply )
     {
         /*
@@ -3951,7 +3656,6 @@ void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/)
         data<<uint8(0);
         m_target->SendMessageToSet(&data,true);
         */
-
         std::list<Unit*> targets;
         Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(m_target, m_target, m_target->GetMap()->GetVisibilityDistance());
         Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(m_target, targets, u_check);
@@ -3960,7 +3664,6 @@ void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/)
         {
             if(!(*iter)->hasUnitState(UNIT_STAT_CASTING))
                 continue;
-
             for(uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++)
             {
                 if((*iter)->GetCurrentSpell(i)
@@ -3976,11 +3679,9 @@ void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/)
         m_target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
                                                             // blizz like 2.0.x
         m_target->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
-
         m_target->addUnitState(UNIT_STAT_DIED);
         m_target->CombatStop();
         m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
         // prevent interrupt message
         if(GetCasterGUID()==m_target->GetGUID() && m_target->GetCurrentSpell(CURRENT_GENERIC_SPELL))
             m_target->FinishSpell(CURRENT_GENERIC_SPELL, false);
@@ -4001,21 +3702,17 @@ void AuraEffect::HandleFeignDeath(bool apply, bool Real, bool /*changeAmount*/)
         m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
                                                             // blizz like 2.0.x
         m_target->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
-
         m_target->clearUnitState(UNIT_STAT_DIED);
     }
 }
-
 void AuraEffect::HandleAuraModDisarm(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
         return;
     AuraType type = AuraType(GetAuraName());
-
     //Prevent handling aura twice
     if(apply ? m_target->GetAurasByType(type).size() > 1 : m_target->HasAuraType(type))
         return;
-
     uint32 field, flag, slot;
     WeaponAttackType attType;
     switch (type)
@@ -4041,10 +3738,8 @@ void AuraEffect::HandleAuraModDisarm(bool apply, bool Real, bool /*changeAmount*
     default:
         return;
     }
-
     if(!apply)
         m_target->RemoveFlag(field, flag);
-
     if (m_target->GetTypeId() == TYPEID_PLAYER)
     {
         // This is between the two because there is a check in _ApplyItemMods
@@ -4053,28 +3748,22 @@ void AuraEffect::HandleAuraModDisarm(bool apply, bool Real, bool /*changeAmount*
         if(Item *pItem = ((Player*)m_target)->GetItemByPos( INVENTORY_SLOT_BAG_0, slot ))
             ((Player*)m_target)->_ApplyItemMods(pItem, slot, !apply);
     }
-
     if(apply)
         m_target->SetFlag(field, flag);
-
     if (m_target->GetTypeId() == TYPEID_UNIT && ((Creature*)m_target)->GetCurrentEquipmentId())
         m_target->UpdateDamagePhysical(attType);
 }
-
 void AuraEffect::HandleModStealth(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     if(apply)
     {
         // drop flag at stealth in bg
         m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
         m_target->SetStandFlags(UNIT_STAND_FLAGS_CREEP);
         if(m_target->GetTypeId()==TYPEID_PLAYER)
             m_target->SetFlag(PLAYER_FIELD_BYTES2, 0x2000);
-
         // apply only if not in GM invisibility (and overwrite invisibility state)
         if(m_target->GetVisibility() != VISIBILITY_OFF)
             m_target->SetVisibility(VISIBILITY_GROUP_STEALTH);
@@ -4084,26 +3773,21 @@ void AuraEffect::HandleModStealth(bool apply, bool Real, bool /*changeAmount*/)
         m_target->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP);
         if(m_target->GetTypeId()==TYPEID_PLAYER)
             m_target->RemoveFlag(PLAYER_FIELD_BYTES2, 0x2000);
-
         if(m_target->GetVisibility() != VISIBILITY_OFF)
             m_target->SetVisibility(VISIBILITY_ON);
     }
 }
-
 void AuraEffect::HandleInvisibility(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(apply)
     {
         m_target->m_invisibilityMask |= (1 << GetMiscValue());
-
         if(Real)
         {
             m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
             // apply glow vision
             if(m_target->GetTypeId()==TYPEID_PLAYER)
                 m_target->SetFlag(PLAYER_FIELD_BYTES2,PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
-
             m_target->SetToNotify();
         }
     }
@@ -4114,19 +3798,16 @@ void AuraEffect::HandleInvisibility(bool apply, bool Real, bool /*changeAmount*/
         Unit::AuraEffectList const& auras = m_target->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY);
         for(Unit::AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
             m_target->m_invisibilityMask |= (1 << GetMiscValue());
-
         // only at real aura remove and if not have different invisibility auras.
         if(Real)
         {
             // remove glow vision
             if(!m_target->m_invisibilityMask && m_target->GetTypeId() == TYPEID_PLAYER)
                 m_target->RemoveFlag(PLAYER_FIELD_BYTES2,PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
-
             m_target->SetToNotify();
         }
     }
 }
-
 void AuraEffect::HandleInvisibilityDetect(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(apply)
@@ -4144,13 +3825,11 @@ void AuraEffect::HandleInvisibilityDetect(bool apply, bool Real, bool /*changeAm
     if(Real && m_target->GetTypeId()==TYPEID_PLAYER)
         m_target->SetToNotify();
 }
-
 void AuraEffect::HandleAuraModSilence(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if(!Real)
         return;
-
     if(apply)
     {
         m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
@@ -4166,25 +3845,19 @@ void AuraEffect::HandleAuraModSilence(bool apply, bool Real, bool /*changeAmount
         // Real remove called after current aura remove from lists, check if other similar auras active
         if(m_target->HasAuraType(SPELL_AURA_MOD_SILENCE))
             return;
-
         m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED);
     }
 }
-
 void AuraEffect::HandleModThreat(bool apply, bool Real, bool changeAmount)
 {
     // only at real add/remove aura
     if(!Real && !changeAmount)
         return;
-
     if (!m_target->isAlive())
         return;
-
     Unit* caster = GetCaster();
-
     if (!caster || !caster->isAlive())
         return;
-
     int level_diff = 0;
     int multiplier = 0;
     if (apply && !m_target->isBeingLoaded())
@@ -4202,50 +3875,37 @@ void AuraEffect::HandleModThreat(bool apply, bool Real, bool changeAmount)
                 multiplier = 1;
                 break;
         }
-
         if (level_diff > 0)
             m_amount += multiplier * level_diff;
     }
-
     if (m_target->GetTypeId() == TYPEID_PLAYER)
         for(int8 x=0;x < MAX_SPELL_SCHOOL;x++)
             if (GetMiscValue() & int32(1<<x))
                 ApplyPercentModFloatVar(m_target->m_threatModifier[x], m_amount, apply);
 }
-
 void AuraEffect::HandleAuraModTotalThreat(bool apply, bool Real, bool changeAmount)
 {
     // only at real add/remove aura
     if(!Real && !changeAmount)
         return;
-
     if (!m_target->isAlive() || m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Unit* caster = GetCaster();
-
     if (!caster || !caster->isAlive())
         return;
-
     float threatMod = apply ? float(m_amount) : float(-m_amount);
-
     m_target->getHostilRefManager().threatAssist(caster, threatMod);
 }
-
 void AuraEffect::HandleModTaunt(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only at real add/remove aura
     if (!Real)
         return;
-
     if (!m_target->isAlive() || !m_target->CanHaveThreatList())
         return;
-
     Unit* caster = GetCaster();
-
     if (!caster || !caster->isAlive())
         return;
-
     if (apply)
         m_target->TauntApply(caster);
     else
@@ -4254,7 +3914,6 @@ void AuraEffect::HandleModTaunt(bool apply, bool Real, bool /*changeAmount*/)
         m_target->TauntFadeOut(caster);
     }
 }
-
 /*********************************************************/
 /***                  MODIFY SPEED                     ***/
 /*********************************************************/
@@ -4263,32 +3922,26 @@ void AuraEffect::HandleAuraModIncreaseSpeed(bool apply, bool Real, bool changeAm
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(apply) // Dash wont work if you are not in cat form
         if(m_spellProto->SpellFamilyName==SPELLFAMILY_DRUID && m_spellProto->SpellFamilyFlags[2] & 0x8 && m_target->m_form != FORM_CAT )
         {
             m_target->HandleAuraEffect(this, false);
             return;
         }
-
     m_target->UpdateSpeed(MOVE_RUN, true);
 }
-
 void AuraEffect::HandleAuraModIncreaseMountedSpeed(bool /*apply*/, bool Real, bool changeAmount)
 {
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     m_target->UpdateSpeed(MOVE_RUN, true);
 }
-
 void AuraEffect::HandleAuraModIncreaseFlightSpeed(bool apply, bool Real, bool changeAmount)
 {
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     // Enable Fly mode for flying mounts
     if (m_auraName == SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED)
     {
@@ -4300,34 +3953,27 @@ void AuraEffect::HandleAuraModIncreaseFlightSpeed(bool apply, bool Real, bool ch
         data.append(m_target->GetPackGUID());
         data << uint32(0);                                      // unknown
         m_target->SendMessageToSet(&data, true);
-
         //Players on flying mounts must be immune to polymorph
         if (m_target->GetTypeId()==TYPEID_PLAYER)
             m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,MECHANIC_POLYMORPH,apply);
-
         // Dragonmaw Illusion (overwrite mount model, mounted aura already applied)
         if( apply && m_target->HasAuraEffect(42016,0) && m_target->GetMountID())
             m_target->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID,16314);
     }
-
     m_target->UpdateSpeed(MOVE_FLIGHT, true);
 }
-
 void AuraEffect::HandleAuraModIncreaseSwimSpeed(bool /*apply*/, bool Real, bool changeAmount)
 {
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     m_target->UpdateSpeed(MOVE_SWIM, true);
 }
-
 void AuraEffect::HandleAuraModDecreaseSpeed(bool apply, bool Real, bool changeAmount)
 {
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     m_target->UpdateSpeed(MOVE_RUN, true);
     m_target->UpdateSpeed(MOVE_SWIM, true);
     m_target->UpdateSpeed(MOVE_FLIGHT, true);
@@ -4335,22 +3981,18 @@ void AuraEffect::HandleAuraModDecreaseSpeed(bool apply, bool Real, bool changeAm
     m_target->UpdateSpeed(MOVE_SWIM_BACK, true);
     m_target->UpdateSpeed(MOVE_FLIGHT_BACK, true);
 }
-
 void AuraEffect::HandleAuraModUseNormalSpeed(bool /*apply*/, bool Real, bool changeAmount)
 {
     // all applied/removed only at real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     m_target->UpdateSpeed(MOVE_RUN,  true);
     m_target->UpdateSpeed(MOVE_SWIM, true);
     m_target->UpdateSpeed(MOVE_FLIGHT,  true);
 }
-
 /*********************************************************/
 /***                     IMMUNITY                      ***/
 /*********************************************************/
-
 void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
@@ -4362,7 +4004,6 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*change
         immunity_list.push_back(SPELL_AURA_MOD_DISARM);
     if (GetMiscValue() & (1<<1))
         immunity_list.push_back(SPELL_AURA_TRANSFORM);
-
     // These flag can be recognized wrong:
     if (GetMiscValue() & (1<<6))
         immunity_list.push_back(SPELL_AURA_MOD_DECREASE_SPEED);
@@ -4372,7 +4013,6 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*change
         immunity_list.push_back(SPELL_AURA_MOD_CONFUSE);
     if (GetMiscValue() & (1<<9))
         immunity_list.push_back(SPELL_AURA_MOD_FEAR);
-
     // Patch 3.0.3 Bladestorm now breaks all snares and roots on the warrior when activated.
     // however not all mechanic specified in immunity
     if (apply && GetId()==46924)
@@ -4380,7 +4020,6 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*change
         m_target->RemoveAurasByType(SPELL_AURA_MOD_ROOT);
         m_target->RemoveAurasByType(SPELL_AURA_MOD_DECREASE_SPEED);
     }
-
     if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
     {
         for (std::list <AuraType>::iterator iter = immunity_list.begin(); iter != immunity_list.end();++iter)
@@ -4393,14 +4032,12 @@ void AuraEffect::HandleModStateImmunityMask(bool apply, bool Real, bool /*change
         m_target->ApplySpellImmune(GetId(),IMMUNITY_STATE,*iter,apply);
     }
 }
-
 void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
         return;
     uint32 mechanic;
     mechanic = 1 << GetMiscValue();
-
     //immune movement impairment and loss of control
     if(GetId()==42292 || GetId()==59752)
         mechanic=IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK;
@@ -4408,10 +4045,8 @@ void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeA
     // in DBC wrong mechanic immune since 3.0.x
     else if (GetId() == 25771)
         mechanic = 1 << MECHANIC_IMMUNE_SHIELD;
-
     if (!mechanic)
         return;
-
     if(apply && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
     {
         Unit::AuraMap& Auras = m_target->GetAuras();
@@ -4432,20 +4067,16 @@ void AuraEffect::HandleModMechanicImmunity(bool apply, bool Real, bool /*changeA
                 ++iter;
         }
     }
-
     m_target->ApplySpellImmune(GetId(),IMMUNITY_MECHANIC,GetMiscValue(),apply);
-
     // Demonic Empowerment -- voidwalker -- missing movement impairing effects immunity
     if (GetId() == 54508)
     {
         if (apply)
             m_target->RemoveMovementImpairingAuras();
-
         m_target->ApplySpellImmune(GetId(),IMMUNITY_STATE,SPELL_AURA_MOD_ROOT,apply);
         m_target->ApplySpellImmune(GetId(),IMMUNITY_STATE,SPELL_AURA_MOD_DECREASE_SPEED,apply);
     }
 }
-
 void AuraEffect::HandleAuraModEffectImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     // when removing flag aura, handle flag drop
@@ -4463,32 +4094,25 @@ void AuraEffect::HandleAuraModEffectImmunity(bool apply, bool Real, bool /*chang
                 sOutdoorPvPMgr.HandleDropFlag((Player*)m_target,GetSpellProto()->Id);
         }
     }
-
     m_target->ApplySpellImmune(GetId(),IMMUNITY_EFFECT,GetMiscValue(),apply);
 }
-
 void AuraEffect::HandleAuraModStateImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(apply && Real && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
     {
         m_target->RemoveAurasByType(AuraType(GetMiscValue()), NULL , GetParentAura());
     }
-
     m_target->ApplySpellImmune(GetId(),IMMUNITY_STATE,GetMiscValue(),apply);
 }
-
 void AuraEffect::HandleAuraModSchoolImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(apply && GetMiscValue() == SPELL_SCHOOL_MASK_NORMAL)
         m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
     m_target->ApplySpellImmune(GetId(),IMMUNITY_SCHOOL,GetMiscValue(),apply);
-
     // remove all flag auras (they are positive, but they must be removed when you are immune)
     if( this->GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY
         && this->GetSpellProto()->AttributesEx2 & SPELL_ATTR_EX2_DAMAGE_REDUCED_SHIELD )
         m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
-
     // TODO: optimalize this cycle - use RemoveAurasWithInterruptFlags call or something else
     if( Real && apply
         && GetSpellProto()->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY
@@ -4518,21 +4142,17 @@ void AuraEffect::HandleAuraModSchoolImmunity(bool apply, bool Real, bool /*chang
             m_target->clearUnitState(UNIT_STAT_ISOLATED);
     }
 }
-
 void AuraEffect::HandleAuraModDmgImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplySpellImmune(GetId(),IMMUNITY_DAMAGE,GetMiscValue(),apply);
 }
-
 void AuraEffect::HandleAuraModDispelImmunity(bool apply, bool Real, bool /*changeAmount*/)
 {
     // all applied/removed only at real aura add/remove
     if(!Real)
         return;
-
     m_target->ApplySpellDispelImmunity(m_spellProto, DispelType(GetMiscValue()), apply);
 }
-
 void AuraEffect::HandleAuraProcTriggerSpell(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
@@ -4553,7 +4173,6 @@ void AuraEffect::HandleAuraProcTriggerSpell(bool apply, bool Real, bool /*change
         ((Player*)m_target)->AddSpellMod(m_spellmod, apply);
     }
 }
-
 void AuraEffect::HandleAuraModStalked(bool apply, bool Real, bool /*changeAmount*/)
 {
     // used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND
@@ -4562,39 +4181,31 @@ void AuraEffect::HandleAuraModStalked(bool apply, bool Real, bool /*changeAmount
     else
         m_target->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_TRACK_UNIT);
 }
-
 /*********************************************************/
 /***                   PERIODIC                        ***/
 /*********************************************************/
-
 void AuraEffect::HandlePeriodicTriggerSpell(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicTriggerSpellWithValue(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicEnergize(bool apply, bool Real, bool changeAmount)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleAuraPowerBurn(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleAuraPeriodicDummy(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     Unit* caster = GetCaster();
-
     SpellEntry const*spell = GetSpellProto();
     switch( spell->SpellFamilyName)
     {
@@ -4640,48 +4251,38 @@ void AuraEffect::HandleAuraPeriodicDummy(bool apply, bool Real, bool changeAmoun
             break;
         }
     }
-
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicHeal(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicDamage(bool apply, bool Real, bool changeAmount)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicDamagePCT(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicLeech(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicManaLeech(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandlePeriodicHealthFunnel(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_isPeriodic = apply;
 }
-
 /*********************************************************/
 /***                  MODIFY STATS                     ***/
 /*********************************************************/
-
 /********************************/
 /***        RESISTANCE        ***/
 /********************************/
-
 void AuraEffect::HandleAuraModResistanceExclusive(bool apply, bool Rea, bool /*changeAmount*/)
 {
     for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
@@ -4694,7 +4295,6 @@ void AuraEffect::HandleAuraModResistanceExclusive(bool apply, bool Rea, bool /*c
         }
     }
 }
-
 void AuraEffect::HandleAuraModResistance(bool apply, bool Real, bool /*changeAmount*/)
 {
     for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
@@ -4707,7 +4307,6 @@ void AuraEffect::HandleAuraModResistance(bool apply, bool Real, bool /*changeAmo
         }
     }
 }
-
 void AuraEffect::HandleAuraModBaseResistancePCT(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only players have base stats
@@ -4726,7 +4325,6 @@ void AuraEffect::HandleAuraModBaseResistancePCT(bool apply, bool Real, bool /*ch
         }
     }
 }
-
 void AuraEffect::HandleModResistancePercent(bool apply, bool Real, bool /*changeAmount*/)
 {
     for(int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
@@ -4742,7 +4340,6 @@ void AuraEffect::HandleModResistancePercent(bool apply, bool Real, bool /*change
         }
     }
 }
-
 void AuraEffect::HandleModBaseResistance(bool apply, bool Real, bool /*changeAmount*/)
 {
     // only players have base stats
@@ -4759,11 +4356,9 @@ void AuraEffect::HandleModBaseResistance(bool apply, bool Real, bool /*changeAmo
                 m_target->HandleStatModifier(UnitMods(UNIT_MOD_RESISTANCE_START + i), TOTAL_VALUE, float(m_amount), apply);
     }
 }
-
 /********************************/
 /***           STAT           ***/
 /********************************/
-
 void AuraEffect::HandleAuraModStat(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (GetMiscValue() < -2 || GetMiscValue() > 4)
@@ -4771,7 +4366,6 @@ void AuraEffect::HandleAuraModStat(bool apply, bool Real, bool /*changeAmount*/)
         sLog.outError("WARNING: Spell %u effect %u have unsupported misc value (%i) for SPELL_AURA_MOD_STAT ",GetId(),GetEffIndex(),GetMiscValue());
         return;
     }
-
     for(int32 i = STAT_STRENGTH; i < MAX_STATS; i++)
     {
         // -1 or -2 is all stats ( misc < -2 checked in function beginning )
@@ -4784,7 +4378,6 @@ void AuraEffect::HandleAuraModStat(bool apply, bool Real, bool /*changeAmount*/)
         }
     }
 }
-
 void AuraEffect::HandleModPercentStat(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (GetMiscValue() < -1 || GetMiscValue() > 4)
@@ -4792,58 +4385,47 @@ void AuraEffect::HandleModPercentStat(bool apply, bool Real, bool /*changeAmount
         sLog.outError("WARNING: Misc Value for SPELL_AURA_MOD_PERCENT_STAT not valid");
         return;
     }
-
     // only players have base stats
     if (m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     for (int32 i = STAT_STRENGTH; i < MAX_STATS; ++i)
     {
         if(GetMiscValue() == i || GetMiscValue() == -1)
             m_target->HandleStatModifier(UnitMods(UNIT_MOD_STAT_START + i), BASE_PCT, float(m_amount), apply);
     }
 }
-
 void AuraEffect::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Magic damage modifiers implemented in Unit::SpellDamageBonus
     // This information for client side use only
     // Recalculate bonus
     ((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
 }
-
 void AuraEffect::HandleModSpellHealingPercentFromStat(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Recalculate bonus
     ((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
 }
-
 void AuraEffect::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Magic damage modifiers implemented in Unit::SpellDamageBonus
     // This information for client side use only
     // Recalculate bonus
     ((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
 }
-
 void AuraEffect::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Recalculate bonus
     ((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
 }
-
 void AuraEffect::HandleModHealingDone(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
@@ -4852,7 +4434,6 @@ void AuraEffect::HandleModHealingDone(bool /*apply*/, bool Real, bool /*changeAm
     // this information is for client side only
     ((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
 }
-
 void AuraEffect::HandleModTotalPercentStat(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (GetMiscValue() < -1 || GetMiscValue() > 4)
@@ -4860,11 +4441,9 @@ void AuraEffect::HandleModTotalPercentStat(bool apply, bool Real, bool /*changeA
         sLog.outError("WARNING: Misc Value for SPELL_AURA_MOD_PERCENT_STAT not valid");
         return;
     }
-
     //save current and max HP before applying aura
     uint32 curHPValue = m_target->GetHealth();
     uint32 maxHPValue = m_target->GetMaxHealth();
-
     for (int32 i = STAT_STRENGTH; i < MAX_STATS; i++)
     {
         if(GetMiscValue() == i || GetMiscValue() == -1)
@@ -4874,7 +4453,6 @@ void AuraEffect::HandleModTotalPercentStat(bool apply, bool Real, bool /*changeA
                 m_target->ApplyStatPercentBuffMod(Stats(i), m_amount, apply );
         }
     }
-
     //recalculate current HP/MP after applying aura modifications (only for spells with 0x10 flag)
     if ((GetMiscValue() == STAT_STAMINA) && (maxHPValue > 0) && (m_spellProto->Attributes & 0x10))
     {
@@ -4883,12 +4461,10 @@ void AuraEffect::HandleModTotalPercentStat(bool apply, bool Real, bool /*changeA
         m_target->SetHealth(newHPValue);
     }
 }
-
 void AuraEffect::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(GetMiscValue() != SPELL_SCHOOL_MASK_NORMAL)
     {
         // support required adding replace UpdateArmor by loop by UpdateResistence at intellect update
@@ -4896,11 +4472,9 @@ void AuraEffect::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool Real,
         sLog.outError("Aura SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT(182) need adding support for non-armor resistances!");
         return;
     }
-
     // Recalculate Armor
     m_target->UpdateArmor();
 }
-
 /********************************/
 /***      HEAL & ENERGIZE     ***/
 /********************************/
@@ -4908,30 +4482,24 @@ void AuraEffect::HandleAuraModTotalHealthPercentRegen(bool apply, bool Real, boo
 {
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleAuraModTotalEnergyPercentRegen(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_amplitude == 0)
         m_amplitude = 1000;
-
     m_periodicTimer = m_amplitude;
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleModRegen(bool apply, bool Real, bool /*changeAmount*/)            // eating
 {
     if(m_amplitude == 0)
         m_amplitude = 5000;
-
     m_periodicTimer = 5000;
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleModPowerRegen(bool apply, bool Real, bool changeAmount)       // drinking
 {
     if(!Real && !changeAmount)
         return;
-
     Powers pt = m_target->getPowerType();
     if(m_amplitude == 0)
     {
@@ -4941,42 +4509,32 @@ void AuraEffect::HandleModPowerRegen(bool apply, bool Real, bool changeAmount)
         else
             m_amplitude = 2000;
     }
-
     m_periodicTimer = 5000;
-
     if (m_target->GetTypeId() == TYPEID_PLAYER && GetMiscValue() == POWER_MANA)
         ((Player*)m_target)->UpdateManaRegen();
-
     m_isPeriodic = apply;
 }
-
 void AuraEffect::HandleModPowerRegenPCT(bool /*apply*/, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if (m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Update manaregen value
     if (GetMiscValue() == POWER_MANA)
         ((Player*)m_target)->UpdateManaRegen();
 }
-
 void AuraEffect::HandleModManaRegen(bool /*apply*/, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if (m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     //Note: an increase in regen does NOT cause threat.
     ((Player*)m_target)->UpdateManaRegen();
 }
-
 void AuraEffect::HandleComprehendLanguage(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(apply)
@@ -4984,7 +4542,6 @@ void AuraEffect::HandleComprehendLanguage(bool apply, bool Real, bool /*changeAm
     else
         m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_COMPREHEND_LANG);
 }
-
 void AuraEffect::HandleAuraModIncreaseHealth(bool apply, bool Real, bool changeAmount)
 {
     if(Real || changeAmount)
@@ -5004,33 +4561,26 @@ void AuraEffect::HandleAuraModIncreaseHealth(bool apply, bool Real, bool changeA
         }
     }
 }
-
 void AuraEffect::HandleAuraModIncreaseMaxHealth(bool apply, bool Real, bool /*changeAmount*/)
 {
     uint32 oldhealth = m_target->GetHealth();
     double healthPercentage = (double)oldhealth / (double)m_target->GetMaxHealth();
-
     m_target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_amount), apply);
-
     // refresh percentage
     if(oldhealth > 0)
     {
         uint32 newhealth = uint32(ceil((double)m_target->GetMaxHealth() * healthPercentage));
         if(newhealth==0)
             newhealth = 1;
-
         m_target->SetHealth(newhealth);
     }
 }
-
 void AuraEffect::HandleAuraModIncreaseEnergy(bool apply, bool Real, bool /*changeAmount*/)
 {
     Powers powerType = m_target->getPowerType();
     if(int32(powerType) != GetMiscValue())
         return;
-
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
-
     // Special case with temporary increase max/current power (percent)
     if (GetId()==64904)                                     // Hymn of Hope
     {
@@ -5042,79 +4592,61 @@ void AuraEffect::HandleAuraModIncreaseEnergy(bool apply, bool Real, bool /*chang
         }
         return;
     }
-
     // generic flat case
     m_target->HandleStatModifier(unitMod, TOTAL_VALUE, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModIncreaseEnergyPercent(bool apply, bool /*Real*/, bool /*changeAmount*/)
 {
     Powers powerType = m_target->getPowerType();
     if(int32(powerType) != GetMiscValue())
         return;
-
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + powerType);
-
     m_target->HandleStatModifier(unitMod, TOTAL_PCT, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModIncreaseHealthPercent(bool apply, bool /*Real*/, bool /*changeAmount*/)
 {
     m_target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_PCT, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraIncreaseBaseHealthPercent(bool apply, bool /*Real*/, bool /*changeAmount*/)
 {
     m_target->HandleStatModifier(UNIT_MOD_HEALTH, BASE_PCT, float(m_amount), apply);
 }
-
 /********************************/
 /***          FIGHT           ***/
 /********************************/
-
 void AuraEffect::HandleAuraModParryPercent(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->UpdateParryPercentage();
 }
-
 void AuraEffect::HandleAuraModDodgePercent(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->UpdateDodgePercentage();
     //sLog.outError("BONUS DODGE CHANCE: + %f", float(m_amount));
 }
-
 void AuraEffect::HandleAuraModBlockPercent(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->UpdateBlockPercentage();
     //sLog.outError("BONUS BLOCK CHANCE: + %f", float(m_amount));
 }
-
 void AuraEffect::HandleAuraModRegenInterrupt(bool /*apply*/, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->UpdateManaRegen();
 }
-
 void AuraEffect::HandleAuraModWeaponCritPercent(bool apply, bool Real, bool changeAmount)
 {
     if(m_target->GetTypeId()!=TYPEID_PLAYER)
         return;
-
     // apply item specific bonuses for already equipped weapon
     if(Real || changeAmount)
     {
@@ -5122,11 +4654,9 @@ void AuraEffect::HandleAuraModWeaponCritPercent(bool apply, bool Real, bool chan
             if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i)))
                 ((Player*)m_target)->_ApplyWeaponDependentAuraCritMod(pItem,WeaponAttackType(i),this,apply);
     }
-
     // mods must be applied base at equipped weapon class and subclass comparison
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // GetMiscValue() comparison with item generated damage types
-
     if (GetSpellProto()->EquippedItemClass == -1)
     {
         ((Player*)m_target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, float (m_amount), apply);
@@ -5138,7 +4668,6 @@ void AuraEffect::HandleAuraModWeaponCritPercent(bool apply, bool Real, bool chan
         // done in Player::_ApplyWeaponDependentAuraMods
     }
 }
-
 void AuraEffect::HandleModHitChance(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() == TYPEID_PLAYER)
@@ -5152,7 +4681,6 @@ void AuraEffect::HandleModHitChance(bool apply, bool Real, bool /*changeAmount*/
         m_target->m_modRangedHitChance += apply ? m_amount : (-m_amount);
     }
 }
-
 void AuraEffect::HandleModSpellHitChance(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() == TYPEID_PLAYER)
@@ -5160,49 +4688,40 @@ void AuraEffect::HandleModSpellHitChance(bool apply, bool Real, bool /*changeAmo
     else
         m_target->m_modSpellHitChance += apply ? m_amount: (-m_amount);
 }
-
 void AuraEffect::HandleModSpellCritChance(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_target)->UpdateAllSpellCritChances();
     else
         m_target->m_baseSpellCritChance += apply ? m_amount:-m_amount;
 }
-
 void AuraEffect::HandleModSpellCritChanceShool(bool /*apply*/, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     for(int school = SPELL_SCHOOL_NORMAL; school < MAX_SPELL_SCHOOL; ++school)
         if (GetMiscValue() & (1<<school))
             ((Player*)m_target)->UpdateSpellCritChance(school);
 }
-
 /********************************/
 /***         ATTACK SPEED     ***/
 /********************************/
-
 void AuraEffect::HandleModCastingSpeed(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyCastTimePercentMod(m_amount,apply);
 }
-
 void AuraEffect::HandleModMeleeRangedSpeedPct(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyAttackTimePercentMod(BASE_ATTACK,m_amount,apply);
     m_target->ApplyAttackTimePercentMod(OFF_ATTACK,m_amount,apply);
     m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_amount, apply);
 }
-
 void AuraEffect::HandleModCombatSpeedPct(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyCastTimePercentMod(m_amount,apply);
@@ -5210,94 +4729,76 @@ void AuraEffect::HandleModCombatSpeedPct(bool apply, bool Real, bool /*changeAmo
     m_target->ApplyAttackTimePercentMod(OFF_ATTACK,m_amount,apply);
     m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_amount, apply);
 }
-
 void AuraEffect::HandleModAttackSpeed(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!m_target->isAlive() )
         return;
-
     m_target->ApplyAttackTimePercentMod(BASE_ATTACK,m_amount,apply);
 }
-
 void AuraEffect::HandleHaste(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyAttackTimePercentMod(BASE_ATTACK,  m_amount,apply);
     m_target->ApplyAttackTimePercentMod(OFF_ATTACK,   m_amount,apply);
     m_target->ApplyAttackTimePercentMod(RANGED_ATTACK,m_amount,apply);
 }
-
 void AuraEffect::HandleAuraModRangedHaste(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_amount, apply);
 }
-
 void AuraEffect::HandleRangedAmmoHaste(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
     m_target->ApplyAttackTimePercentMod(RANGED_ATTACK,m_amount, apply);
 }
-
 /********************************/
 /***        ATTACK POWER      ***/
 /********************************/
-
 void AuraEffect::HandleAuraModAttackPower(bool apply, bool Real, bool /*changeAmount*/)
 {
     m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_VALUE, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModRangedAttackPower(bool apply, bool Real, bool /*changeAmount*/)
 {
     if((m_target->getClassMask() & CLASSMASK_WAND_USERS)!=0)
         return;
-
     m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModAttackPowerPercent(bool apply, bool Real, bool /*changeAmount*/)
 {
     //UNIT_FIELD_ATTACK_POWER_MULTIPLIER = multiplier - 1
     m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_PCT, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModRangedAttackPowerPercent(bool apply, bool Real, bool /*changeAmount*/)
 {
     if((m_target->getClassMask() & CLASSMASK_WAND_USERS)!=0)
         return;
-
     //UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER = multiplier - 1
     m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraModRangedAttackPowerOfStatPercent(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     // Recalculate bonus
     if(m_target->GetTypeId() == TYPEID_PLAYER && !(m_target->getClassMask() & CLASSMASK_WAND_USERS))
         ((Player*)m_target)->UpdateAttackPowerAndDamage(true);
 }
-
 void AuraEffect::HandleAuraModAttackPowerOfStatPercent(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     // Recalculate bonus
     if(m_target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_target)->UpdateAttackPowerAndDamage(false);
 }
-
 void AuraEffect::HandleAuraModAttackPowerOfArmor(bool /*apply*/, bool Real, bool /*changeAmount*/)
 {
     // spells required only Real aura add/remove
     if(!Real)
         return;
-
     // Recalculate bonus
     if(m_target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_target)->UpdateAttackPowerAndDamage(false);
@@ -5314,7 +4815,6 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount)
             if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i)))
                 ((Player*)m_target)->_ApplyWeaponDependentAuraDamageMod(pItem,WeaponAttackType(i),this,apply);
     }
-
     // GetMiscValue() is bitmask of spell schools
     // 1 ( 0-bit ) - normal school damage (SPELL_SCHOOL_MASK_NORMAL)
     // 126 - full bitmask all magic damages (SPELL_SCHOOL_MASK_MAGIC) including wands
@@ -5323,7 +4823,6 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount)
     // mods must be applied base at equipped weapon class and subclass comparison
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // GetMiscValue() comparison with item generated damage types
-
     if((GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
@@ -5337,7 +4836,6 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount)
         {
             // done in Player::_ApplyWeaponDependentAuraMods
         }
-
         if(m_target->GetTypeId() == TYPEID_PLAYER)
         {
             if(m_amount > 0)
@@ -5346,20 +4844,16 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount)
                 m_target->ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_NEG,m_amount,apply);
         }
     }
-
     // Skip non magic case for speedup
     if((GetMiscValue() & SPELL_SCHOOL_MASK_MAGIC) == 0)
         return;
-
     if( GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0 )
     {
         // wand magic case (skip generic to all item spell bonuses)
         // done in Player::_ApplyWeaponDependentAuraMods
-
         // Skip item specific requirements for not wand magic damage
         return;
     }
-
     // Magic damage modifiers implemented in Unit::SpellDamageBonus
     // This information for client side use only
     if(m_target->GetTypeId() == TYPEID_PLAYER)
@@ -5384,11 +4878,9 @@ void AuraEffect::HandleModDamageDone(bool apply, bool Real, bool changeAmount)
             pet->UpdateAttackPowerAndDamage();
     }
 }
-
 void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAmount)
 {
     sLog.outDebug("AURA MOD DAMAGE type:%u negative:%u", GetMiscValue(), m_amount > 0);
-
     // apply item specific bonuses for already equipped weapon
     if((Real || changeAmount) && m_target->GetTypeId()==TYPEID_PLAYER)
     {
@@ -5396,7 +4888,6 @@ void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAm
             if(Item* pItem = ((Player*)m_target)->GetWeaponForAttack(WeaponAttackType(i)))
                 ((Player*)m_target)->_ApplyWeaponDependentAuraDamageMod(pItem,WeaponAttackType(i),this,apply);
     }
-
     // GetMiscValue() is bitmask of spell schools
     // 1 ( 0-bit ) - normal school damage (SPELL_SCHOOL_MASK_NORMAL)
     // 126 - full bitmask all magic damages (SPELL_SCHOOL_MASK_MAGIC) including wand
@@ -5405,7 +4896,6 @@ void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAm
     // mods must be applied base at equipped weapon class and subclass comparison
     // with spell->EquippedItemClass and  EquippedItemSubClassMask and EquippedItemInventoryTypeMask
     // GetMiscValue() comparison with item generated damage types
-
     if((GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL) != 0)
     {
         // apply generic physical damage bonuses including wand case
@@ -5423,65 +4913,52 @@ void AuraEffect::HandleModDamagePercentDone(bool apply, bool Real, bool changeAm
         if(m_target->GetTypeId() == TYPEID_PLAYER)
             m_target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT,m_amount/100.0f,apply);
     }
-
     // Skip non magic case for speedup
     if((GetMiscValue() & SPELL_SCHOOL_MASK_MAGIC) == 0)
         return;
-
     if( GetSpellProto()->EquippedItemClass != -1 || GetSpellProto()->EquippedItemInventoryTypeMask != 0 )
     {
         // wand magic case (skip generic to all item spell bonuses)
         // done in Player::_ApplyWeaponDependentAuraMods
-
         // Skip item specific requirements for not wand magic damage
         return;
     }
-
     // Magic damage percent modifiers implemented in Unit::SpellDamageBonus
     // Send info to client
     if(m_target->GetTypeId() == TYPEID_PLAYER)
         for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
             m_target->ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT+i,m_amount/100.0f,apply);
 }
-
 void AuraEffect::HandleModOffhandDamagePercent(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     sLog.outDebug("AURA MOD OFFHAND DAMAGE");
-
     m_target->HandleStatModifier(UNIT_MOD_DAMAGE_OFFHAND, TOTAL_PCT, float(m_amount), apply);
 }
-
 /********************************/
 /***        POWER COST        ***/
 /********************************/
-
 void AuraEffect::HandleModPowerCostPCT(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     float amount = m_amount /100.0f;
     for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         if(GetMiscValue() & (1<<i))
             m_target->ApplyModSignedFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+i,amount,apply);
 }
-
 void AuraEffect::HandleModPowerCost(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     for(int i = 0; i < MAX_SPELL_SCHOOL; ++i)
         if(GetMiscValue() & (1<<i))
             m_target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,m_amount,apply);
 }
-
 void AuraEffect::HandleNoReagentUseAura(bool Apply, bool Real, bool /*changeAmount*/)
 {
     // spells required only Real aura add/remove
@@ -5493,24 +4970,19 @@ void AuraEffect::HandleNoReagentUseAura(bool Apply, bool Real, bool /*changeAmou
     Unit::AuraEffectList const& noReagent = m_target->GetAurasByType(SPELL_AURA_NO_REAGENT_USE);
         for(Unit::AuraEffectList::const_iterator i = noReagent.begin(); i !=  noReagent.end(); ++i)
             mask |= (*i)->m_spellProto->EffectSpellClassMask[(*i)->m_effIndex];
-
     m_target->SetUInt32Value(PLAYER_NO_REAGENT_COST_1  , mask[0]);
     m_target->SetUInt32Value(PLAYER_NO_REAGENT_COST_1+1, mask[1]);
     m_target->SetUInt32Value(PLAYER_NO_REAGENT_COST_1+2, mask[2]);
 }
-
 /*********************************************************/
 /***                    OTHERS                         ***/
 /*********************************************************/
-
 void AuraEffect::HandleAuraAllowOnlyAbility(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     if(!apply && m_target->HasAuraType(SPELL_AURA_ALLOW_ONLY_ABILITY))
         return;
-
     if(m_target->GetTypeId()==TYPEID_PLAYER)
     {
         if (apply)
@@ -5519,17 +4991,14 @@ void AuraEffect::HandleAuraAllowOnlyAbility(bool apply, bool Real, bool /*change
             m_target->RemoveFlag(PLAYER_FLAGS, PLAYER_ALLOW_ONLY_ABILITY);
     }
 }
-
 void AuraEffect::HandleAuraEmpathy(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real || m_target->GetTypeId() != TYPEID_UNIT)
         return;
-
     CreatureInfo const * ci = objmgr.GetCreatureTemplate(m_target->GetEntry());
     if(ci && ci->type == CREATURE_TYPE_BEAST)
         m_target->ApplyModUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_SPECIALINFO, apply);
 }
-
 void AuraEffect::HandleAuraUntrackable(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
@@ -5539,18 +5008,15 @@ void AuraEffect::HandleAuraUntrackable(bool apply, bool Real, bool /*changeAmoun
     else
         m_target->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
 }
-
 void AuraEffect::HandleAuraModPacify(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real || m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(apply)
         m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
     else
         m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
 }
-
 void AuraEffect::HandleAuraModPacifyAndSilence(bool apply, bool Real, bool changeAmount)
 {
     // Vengeance of the Blue Flight
@@ -5564,27 +5030,22 @@ void AuraEffect::HandleAuraModPacifyAndSilence(bool apply, bool Real, bool chang
     HandleAuraModPacify(apply,Real, changeAmount);
     HandleAuraModSilence(apply,Real, changeAmount);
 }
-
 void AuraEffect::HandleAuraGhost(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real || m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(apply)
         m_target->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST);
     else
         m_target->RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST);
 }
-
 void AuraEffect::HandleAuraAllowFlight(bool apply, bool Real, bool /*changeAmount*/)
 {
     // all applied/removed only at real aura add/remove
     if(!Real)
         return;
-
     if(m_target->GetTypeId() == TYPEID_UNIT)
         m_target->SetFlying(apply);
-    
     if(Player *plr = m_target->m_movedPlayer)
     {
     // allow fly
@@ -5597,30 +5058,24 @@ void AuraEffect::HandleAuraAllowFlight(bool apply, bool Real, bool /*changeAmoun
     data << uint32(0);                                      // unk
         plr->SendDirectMessage(&data);
     }
-
     //m_target->SendMessageToSet(&data, true);
 }
-
 void AuraEffect::HandleModRating(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     for (uint32 rating = 0; rating < MAX_COMBAT_RATING; ++rating)
         if (GetMiscValue() & (1 << rating))
             ((Player*)m_target)->ApplyRatingMod(CombatRating(rating), m_amount, apply);
 }
-
 void AuraEffect::HandleModRatingFromStat(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
     // Just recalculate ratings
@@ -5628,7 +5083,6 @@ void AuraEffect::HandleModRatingFromStat(bool apply, bool Real, bool changeAmoun
         if (GetMiscValue() & (1 << rating))
             ((Player*)m_target)->ApplyRatingMod(CombatRating(rating), 0, apply);
 }
-
 void AuraEffect::HandleForceMoveForward(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real || m_target->GetTypeId() != TYPEID_PLAYER)
@@ -5638,80 +5092,64 @@ void AuraEffect::HandleForceMoveForward(bool apply, bool Real, bool /*changeAmou
     else
         m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE);
 }
-
 void AuraEffect::HandleAuraModExpertise(bool /*apply*/, bool Real, bool changeAmount)
 {
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->UpdateExpertise(BASE_ATTACK);
     ((Player*)m_target)->UpdateExpertise(OFF_ATTACK);
 }
-
 void AuraEffect::HandleModTargetResistance(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
     // applied to damage as HandleNoImmediateEffect in Unit::CalcAbsorbResist and Unit::CalcArmorReducedDamage
-
     // show armor penetration
     if (m_target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL))
         m_target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE,m_amount, apply);
-
     // show as spell penetration only full spell penetration bonuses (all resistances except armor and holy
     if (m_target->GetTypeId() == TYPEID_PLAYER && (GetMiscValue() & SPELL_SCHOOL_MASK_SPELL)==SPELL_SCHOOL_MASK_SPELL)
         m_target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,m_amount, apply);
 }
-
 void AuraEffect::HandleShieldBlockValue(bool apply, bool Real, bool /*changeAmount*/)
 {
     BaseModType modType = FLAT_MOD;
     if(m_auraName == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT)
         modType = PCT_MOD;
-
     if(m_target->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_target)->HandleBaseModValue(SHIELD_BLOCK_VALUE, modType, float(m_amount), apply);
 }
-
 void AuraEffect::HandleAuraRetainComboPoints(bool apply, bool Real, bool changeAmount)
 {
     // spells required only Real aura add/remove
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *target = (Player*)m_target;
-
     // combo points was added in SPELL_EFFECT_ADD_COMBO_POINTS handler
     // remove only if aura expire by time (in case combo points amount change aura removed without combo points lost)
     if( !apply && GetParentAura()->GetAuraDuration()==0 && target->GetComboTarget())
         if(Unit* unit = ObjectAccessor::GetUnit(*m_target,target->GetComboTarget()))
             target->AddComboPoints(unit, -m_amount);
 }
-
 void AuraEffect::HandleModUnattackable( bool Apply, bool Real , bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     if(Apply)
     {
         m_target->CombatStop();
         m_target->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_IMMUNE_OR_LOST_SELECTION);
     }
-
     m_target->ApplyModFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE, Apply);
 }
-
 void AuraEffect::HandleSpiritOfRedemption( bool apply, bool Real , bool /*changeAmount*/)
 {
     // spells required only Real aura add/remove
     if(!Real)
         return;
-
     // prepare spirit state
     if(apply)
     {
@@ -5719,24 +5157,20 @@ void AuraEffect::HandleSpiritOfRedemption( bool apply, bool Real , bool /*change
         {
             // disable breath/etc timers
             ((Player*)m_target)->StopMirrorTimers();
-
             // set stand state (expected in this form)
             if(!m_target->IsStandState())
                 m_target->SetStandState(UNIT_STAND_STATE_STAND);
         }
-
         m_target->SetHealth(1);
     }
     // die at aura end
     else
         m_target->setDeathState(JUST_DIED);
 }
-
 void AuraEffect::PeriodicTick()
 {
     if(!m_target->isAlive())
         return;
-
     switch(GetAuraName())
     {
         case SPELL_AURA_PERIODIC_DAMAGE:
@@ -5745,16 +5179,13 @@ void AuraEffect::PeriodicTick()
             Unit *pCaster = GetCaster();
             if(!pCaster)
                 return;
-
             // Consecrate ticks can miss and will not show up in the combat log
             if( GetSpellProto()->Effect[GetEffIndex()]==SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(m_target,GetSpellProto(),false)!=SPELL_MISS_NONE)
                 return;
-
             // Check for immune (not use charges)
             if(m_target->IsImmunedToDamage(GetSpellProto()))
                 return;
-
             // some auras remove at specific health level or more
             if(m_auraName==SPELL_AURA_PERIODIC_DAMAGE)
             {
@@ -5796,19 +5227,15 @@ void AuraEffect::PeriodicTick()
                         break;
                 }
             }
-
             uint32 absorb=0;
             uint32 resist=0;
             CleanDamage cleanDamage =  CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL );
-
             // ignore non positive values (can be result apply spellmods to aura damage
             //uint32 amount = GetModifierValuePerStack() > 0 ? GetModifierValuePerStack() : 0;
             uint32 pdamage = GetAmount() > 0 ? GetAmount() : 0;
-
             if(GetAuraName() == SPELL_AURA_PERIODIC_DAMAGE)
             {
                 pdamage = pCaster->SpellDamageBonus(m_target, GetSpellProto(), pdamage, DOT, GetParentAura()->GetStackAmount());
-
                 // Calculate armor mitigation if it is a physical spell
                 // But not for bleed mechanic spells
                 if ( GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL &&
@@ -5818,7 +5245,6 @@ void AuraEffect::PeriodicTick()
                     cleanDamage.mitigated_damage += pdamage - pdamageReductedArmor;
                     pdamage = pdamageReductedArmor;
                 }
-
                 // Curse of Agony damage-per-tick calculation
                 if (GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (GetSpellProto()->SpellFamilyFlags[0] & 0x400) && GetSpellProto()->SpellIconID==544)
                 {
@@ -5840,29 +5266,21 @@ void AuraEffect::PeriodicTick()
             }
             else
                 pdamage = uint32(m_target->GetMaxHealth()*pdamage/100);
-
             bool crit = IsPeriodicTickCrit(pCaster);
             if (crit)
                 pdamage = pCaster->SpellCriticalDamageBonus(m_spellProto, pdamage, m_target);
-
             //As of 2.2 resilience reduces damage from DoT ticks as much as the chance to not be critically hit
             // Reduce dot damage from resilience for players
             if (m_target->GetTypeId()==TYPEID_PLAYER)
                 pdamage-=((Player*)m_target)->GetDotDamageReduction(pdamage);
-
             pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto);
-
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) attacked %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
-
             pCaster->DealDamageMods(m_target,pdamage,&absorb);
-
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, 0, absorb, resist, 0.0f, crit);
             m_target->SendPeriodicAuraLog(&pInfo);
-
             Unit* target = m_target;                        // aura can be deleted in DealDamage
             SpellEntry const* spellProto = GetSpellProto();
-
             // Set trigger flag
             uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
@@ -5871,7 +5289,6 @@ void AuraEffect::PeriodicTick()
             if (pdamage)
                 procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
             pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
-
             pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, true);
             break;
         }
@@ -5880,30 +5297,23 @@ void AuraEffect::PeriodicTick()
             Unit *pCaster = GetCaster();
             if(!pCaster)
                 return;
-
             if(!pCaster->isAlive())
                 return;
-
             if( GetSpellProto()->Effect[GetEffIndex()]==SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(m_target,GetSpellProto(),false)!=SPELL_MISS_NONE)
                 return;
-
             // Check for immune
             if(m_target->IsImmunedToDamage(GetSpellProto()))
                 return;
-
             uint32 absorb=0;
             uint32 resist=0;
             CleanDamage cleanDamage =  CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL );
-
             //uint32 pdamage = GetModifierValuePerStack() > 0 ? GetModifierValuePerStack() : 0;
             uint32 pdamage = GetAmount() > 0 ? GetAmount() : 0;
             pdamage = pCaster->SpellDamageBonus(m_target, GetSpellProto(), pdamage, DOT, GetParentAura()->GetStackAmount());
-
             bool crit = IsPeriodicTickCrit(pCaster);
             if (crit)
                 pdamage = pCaster->SpellCriticalDamageBonus(m_spellProto, pdamage, m_target);
-
             //Calculate armor mitigation if it is a physical spell
             if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL)
             {
@@ -5911,27 +5321,20 @@ void AuraEffect::PeriodicTick()
                 cleanDamage.mitigated_damage += pdamage - pdamageReductedArmor;
                 pdamage = pdamageReductedArmor;
             }
-
             //As of 2.2 resilience reduces damage from DoT ticks as much as the chance to not be critically hit
             // Reduce dot damage from resilience for players
             if (m_target->GetTypeId()==TYPEID_PLAYER)
                 pdamage-=((Player*)m_target)->GetDotDamageReduction(pdamage);
-
             pCaster->CalcAbsorbResist(m_target, GetSpellSchoolMask(GetSpellProto()), DOT, pdamage, &absorb, &resist, m_spellProto);
-
             if(m_target->GetHealth() < pdamage)
                 pdamage = uint32(m_target->GetHealth());
-
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) health leech of %u (TypeId: %u) for %u dmg inflicted by %u abs is %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId(),absorb);
-
             pCaster->SendSpellNonMeleeDamageLog(m_target, GetId(), pdamage, GetSpellSchoolMask(GetSpellProto()), absorb, resist, false, 0, crit);
-
             Unit* target = m_target;                        // aura can be deleted in DealDamage
             SpellEntry const* spellProto = GetSpellProto();
             float multiplier = spellProto->EffectMultipleValue[GetEffIndex()] > 0 ? spellProto->EffectMultipleValue[GetEffIndex()] : 1;
             int32 stackAmount = GetParentAura()->GetStackAmount();
-
             // Set trigger flag
             uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
@@ -5941,18 +5344,14 @@ void AuraEffect::PeriodicTick()
                 procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
             pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, procEx, pdamage, BASE_ATTACK, spellProto);
             int32 new_damage = pCaster->DealDamage(target, pdamage, &cleanDamage, DOT, GetSpellSchoolMask(spellProto), spellProto, false);
-
             if (!target->isAlive() && pCaster->IsNonMeleeSpellCasted(false))
                 for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
                     if (Spell* spell = pCaster->GetCurrentSpell(CurrentSpellTypes(i)))
                         if (spell->m_spellInfo->Id == GetId())
                             spell->cancel();
-
             if(Player *modOwner = pCaster->GetSpellModOwner())
                 modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
-
             uint32 heal = uint32(pCaster->SpellHealingBonus(pCaster, spellProto, uint32(new_damage * multiplier), DOT, stackAmount));
-
             int32 gain = pCaster->DealHeal(pCaster, heal, spellProto);
             pCaster->getHostilRefManager().threatAssist(pCaster, gain * 0.5f, spellProto);
             break;
@@ -5962,22 +5361,18 @@ void AuraEffect::PeriodicTick()
             Unit *donator = GetCaster();
             if(!donator || !donator->GetHealth())
                 return;
-
             uint32 pdamage = GetAmount() * GetParentAura()->GetStackAmount();
             if(donator->GetHealth() < pdamage)
                 pdamage = donator->GetHealth() - 1;
             if(!pdamage)
                 return;
-
             Unit* target = m_target;                        // aura can be deleted in DealDamage
             SpellEntry const* spellProto = GetSpellProto();
             //donator->SendSpellNonMeleeDamageLog(donator, GetId(), pdamage, GetSpellSchoolMask(spellProto), 0, 0, false, 0);
             donator->ModifyHealth(-(int32)pdamage);
             sLog.outDetail("PeriodicTick: donator %u target %u damage %u.", donator->GetEntry(), target->GetEntry(), pdamage);
-
             if(spellProto->EffectMultipleValue[GetEffIndex()] > 0)
                 pdamage *= spellProto->EffectMultipleValue[GetEffIndex()];
-
             donator->DealHeal(target, pdamage, spellProto);
             break;
         }
@@ -5987,18 +5382,14 @@ void AuraEffect::PeriodicTick()
             Unit *pCaster = GetCaster();
             if(!pCaster)
                 return;
-
             // heal for caster damage (must be alive)
             if(m_target != pCaster && GetSpellProto()->AttributesEx2 & SPELL_ATTR_EX2_HEALTH_FUNNEL && !pCaster->isAlive())
                 return;
-
             if(GetParentAura()->GetAuraDuration() ==-1 && m_target->GetHealth()==m_target->GetMaxHealth())
                 return;
-
             // ignore non positive values (can be result apply spellmods to aura damage
             //uint32 amount = GetModifierValuePerStack() > 0 ? GetModifierValuePerStack() : 0;
             int32 pdamage = GetAmount() > 0 ? GetAmount() : 0;
-
             if(m_auraName==SPELL_AURA_OBS_MOD_HEALTH)
                 pdamage = uint32(m_target->GetMaxHealth() * pdamage * GetParentAura()->GetStackAmount() / 100);
             else
@@ -6010,33 +5401,24 @@ void AuraEffect::PeriodicTick()
                     int32 remainingTicks = int32(float(GetParentAura()->GetAuraDuration()) / m_amplitude + 0.5);
                     pdamage = int32(pdamage) + int32(pdamage)*ticks*(-6+2*remainingTicks)/100;
                 }
-
                 pdamage = pCaster->SpellHealingBonus(m_target, GetSpellProto(), pdamage, DOT, GetParentAura()->GetStackAmount());
             }
-
             bool crit = IsPeriodicTickCrit(pCaster);
             if (crit)
                 pdamage = pCaster->SpellCriticalHealingBonus(m_spellProto, pdamage, m_target);
-
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) heal of %u (TypeId: %u) for %u health inflicted by %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId());
-
             int32 gain = m_target->ModifyHealth(pdamage);
-
             SpellPeriodicAuraLogInfo pInfo(this, pdamage, pdamage - gain, 0, 0, 0.0f, crit);
             m_target->SendPeriodicAuraLog(&pInfo);
-
             // add HoTs to amount healed in bgs
             if( pCaster->GetTypeId() == TYPEID_PLAYER )
                 if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )
                     bg->UpdatePlayerScore(((Player*)pCaster), SCORE_HEALING_DONE, gain);
-
             m_target->getHostilRefManager().threatAssist(pCaster, float(gain) * 0.5f, GetSpellProto());
-
             Unit* target = m_target;                        // aura can be deleted in DealDamage
             SpellEntry const* spellProto = GetSpellProto();
             bool haveCastItem = GetParentAura()->GetCastItemGUID()!=0;
-
             // Health Funnel
             // heal for caster damage
             if(m_target!=pCaster && GetSpellProto()->AttributesEx2 & SPELL_ATTR_EX2_HEALTH_FUNNEL)
@@ -6045,7 +5427,6 @@ void AuraEffect::PeriodicTick()
                 if(pCaster->GetHealth() <= dmg && pCaster->GetTypeId()==TYPEID_PLAYER)
                 {
                     pCaster->RemoveAurasDueToSpell(GetId());
-
                     // finish current generic/channeling spells, don't affect autorepeat
                     pCaster->FinishSpell(CURRENT_GENERIC_SPELL);
                     pCaster->FinishSpell(CURRENT_CHANNELED_SPELL);
@@ -6056,12 +5437,10 @@ void AuraEffect::PeriodicTick()
                     uint32 absorb = 0;
                     pCaster->DealDamageMods(pCaster,damage,&absorb);
                     pCaster->SendSpellNonMeleeDamageLog(pCaster, GetId(), damage, GetSpellSchoolMask(GetSpellProto()), absorb, 0, false, 0, false);
-
                     CleanDamage cleanDamage =  CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL );
                     pCaster->DealDamage(pCaster, damage, &cleanDamage, NODAMAGE, GetSpellSchoolMask(GetSpellProto()), GetSpellProto(), true);
                 }
             }
-
             uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
             uint32 procEx = PROC_EX_NORMAL_HIT | PROC_EX_INTERNAL_HOT;
@@ -6074,31 +5453,23 @@ void AuraEffect::PeriodicTick()
         {
             if(GetMiscValue() < 0 || GetMiscValue() >= MAX_POWERS)
                 return;
-
             Powers power = Powers(GetMiscValue());
-
             // power type might have changed between aura applying and tick (druid's shapeshift)
             if(m_target->getPowerType() != power)
                 return;
-
             Unit *pCaster = GetCaster();
             if(!pCaster)
                 return;
-
             if(!pCaster->isAlive())
                 return;
-
             if( GetSpellProto()->Effect[GetEffIndex()]==SPELL_EFFECT_PERSISTENT_AREA_AURA &&
                 pCaster->SpellHitResult(m_target,GetSpellProto(),false)!=SPELL_MISS_NONE)
                 return;
-
             // Check for immune (not use charges)
             if(m_target->IsImmunedToDamage(GetSpellProto()))
                 return;
-
             // ignore non positive values (can be result apply spellmods to aura damage
             uint32 pdamage = m_amount > 0 ? m_amount : 0;
-
             // Special case: draining x% of mana (up to a maximum of 2*x% of the caster's maximum mana)
             // It's mana percent cost spells, m_amount is percent drain from target
             if (m_spellProto->ManaCostPercentage)
@@ -6109,39 +5480,28 @@ void AuraEffect::PeriodicTick()
                 if(pdamage > maxmana)
                     pdamage = maxmana;
             }
-
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) power leech of %u (TypeId: %u) for %u dmg inflicted by %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), pdamage, GetId());
-
             int32 drain_amount = m_target->GetPower(power) > pdamage ? pdamage : m_target->GetPower(power);
-
             // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
             if (power == POWER_MANA && m_target->GetTypeId() == TYPEID_PLAYER)
                 drain_amount -= ((Player*)m_target)->GetSpellCritDamageReduction(drain_amount);
-
             m_target->ModifyPower(power, -drain_amount);
-
             float gain_multiplier = 0;
-
             if(pCaster->GetMaxPower(power) > 0)
             {
                 gain_multiplier = GetSpellProto()->EffectMultipleValue[GetEffIndex()];
-
                 if(Player *modOwner = pCaster->GetSpellModOwner())
                     modOwner->ApplySpellMod(GetId(), SPELLMOD_MULTIPLE_VALUE, gain_multiplier);
             }
-
             SpellPeriodicAuraLogInfo pInfo(this, drain_amount, 0, 0, 0, gain_multiplier, false);
             m_target->SendPeriodicAuraLog(&pInfo);
-
             int32 gain_amount = int32(drain_amount*gain_multiplier);
-
             if(gain_amount)
             {
                 int32 gain = pCaster->ModifyPower(power,gain_amount);
                 m_target->AddThreat(pCaster, float(gain) * 0.5f, GetSpellSchoolMask(GetSpellProto()), GetSpellProto());
             }
-
             // Mark of Kaz'rogal
             if(GetId() == 31447 && m_target->GetPower(power) == 0)
             {
@@ -6149,13 +5509,11 @@ void AuraEffect::PeriodicTick()
                 // Remove aura
                 GetParentAura()->SetAuraDuration(0);
             }
-
             // Mark of Kazzak
             if(GetId() == 32960)
             {
                 int32 modifier = (m_target->GetPower(power) * 0.05f);
                 m_target->ModifyPower(power, -modifier);
-
                 if(m_target->GetPower(power) == 0)
                 {
                     m_target->CastSpell(m_target, 32961, true, 0, this);
@@ -6170,7 +5528,6 @@ void AuraEffect::PeriodicTick()
                 int32 manaFeedVal = 0;
                 if (AuraEffect const * aurEff = GetParentAura()->GetPartAura(1))
                     manaFeedVal = aurEff->GetAmount();
-
                 if(manaFeedVal > 0)
                 {
                     manaFeedVal = manaFeedVal * gain_amount / 100;
@@ -6183,28 +5540,21 @@ void AuraEffect::PeriodicTick()
         {
             if(GetMiscValue() < 0)
                 return;
-
             Powers power;
             if (GetMiscValue() == POWER_ALL)
                 power = m_target->getPowerType();
             else
                 power = Powers(GetMiscValue());
-
             if(m_target->GetMaxPower(power) == 0)
                 return;
-
             if(GetParentAura()->GetAuraDuration() ==-1 && m_target->GetPower(power)==m_target->GetMaxPower(power))
                 return;
-
             uint32 amount = m_amount * m_target->GetMaxPower(power) /100;
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), amount, GetId());
-
             SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false);
             m_target->SendPeriodicAuraLog(&pInfo);
-
             int32 gain = m_target->ModifyPower(power,amount);
-
             if(Unit* pCaster = GetCaster())
                 m_target->getHostilRefManager().threatAssist(pCaster, float(gain) * 0.5f, GetSpellProto());
             break;
@@ -6214,25 +5564,17 @@ void AuraEffect::PeriodicTick()
             // ignore non positive values (can be result apply spellmods to aura damage
             if(m_amount < 0 || GetMiscValue() >= MAX_POWERS)
                 return;
-
             Powers power = Powers(GetMiscValue());
-
             if(m_target->GetMaxPower(power) == 0)
                 return;
-
             if(GetParentAura()->GetAuraDuration() ==-1 && m_target->GetPower(power)==m_target->GetMaxPower(power))
                 return;
-
             uint32 amount = m_amount;
-
             SpellPeriodicAuraLogInfo pInfo(this, amount, 0, 0, 0, 0.0f, false);
             m_target->SendPeriodicAuraLog(&pInfo);
-
             sLog.outDetail("PeriodicTick: %u (TypeId: %u) energize %u (TypeId: %u) for %u dmg inflicted by %u",
                 GUID_LOPART(GetCasterGUID()), GuidHigh2TypeId(GUID_HIPART(GetCasterGUID())), m_target->GetGUIDLow(), m_target->GetTypeId(), amount, GetId());
-
             int32 gain = m_target->ModifyPower(power,amount);
-
             if(Unit* pCaster = GetCaster())
                 m_target->getHostilRefManager().threatAssist(pCaster, float(gain) * 0.5f, GetSpellProto());
             break;
@@ -6242,45 +5584,32 @@ void AuraEffect::PeriodicTick()
             Unit *pCaster = GetCaster();
             if(!pCaster)
                 return;
-
             // Check for immune (not use charges)
             if(m_target->IsImmunedToDamage(GetSpellProto()))
                 return;
-
             int32 pdamage = m_amount > 0 ? m_amount : 0;
-
             Powers powerType = Powers(GetMiscValue());
-
             if(!m_target->isAlive() || m_target->getPowerType() != powerType)
                 return;
-
             // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
             if (powerType == POWER_MANA && m_target->GetTypeId() == TYPEID_PLAYER)
                 pdamage -= ((Player*)m_target)->GetSpellCritDamageReduction(pdamage);
-
             uint32 gain = uint32(-m_target->ModifyPower(powerType, -pdamage));
-
             gain = uint32(gain * GetSpellProto()->EffectMultipleValue[GetEffIndex()]);
-
             SpellEntry const* spellProto = GetSpellProto();
             //maybe has to be sent different to client, but not by SMSG_PERIODICAURALOG
             SpellNonMeleeDamage damageInfo(pCaster, m_target, spellProto->Id, spellProto->SchoolMask);
             //no SpellDamageBonus for burn mana
             pCaster->CalculateSpellDamageTaken(&damageInfo, gain, spellProto);
-
             pCaster->DealDamageMods(damageInfo.target,damageInfo.damage,&damageInfo.absorb);
-
             pCaster->SendSpellNonMeleeDamageLog(&damageInfo);
-
             // Set trigger flag
             uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;
             uint32 procVictim   = PROC_FLAG_ON_TAKE_PERIODIC;
             uint32 procEx       = createProcExtendMask(&damageInfo, SPELL_MISS_NONE) | PROC_EX_INTERNAL_DOT;
             if (damageInfo.damage)
                 procVictim|=PROC_FLAG_TAKEN_ANY_DAMAGE;
-
             pCaster->ProcDamageAndSpell(damageInfo.target, procAttacker, procVictim, procEx, damageInfo.damage, BASE_ATTACK, spellProto);
-
             pCaster->DealSpellDamage(&damageInfo, true);
             break;
         }
@@ -6296,7 +5625,6 @@ void AuraEffect::PeriodicTick()
             Powers pt = m_target->getPowerType();
             if(int32(pt) != GetMiscValue())
                 return;
-
             if ( GetSpellProto()->AuraInterruptFlags & AURA_INTERRUPT_FLAG_NOT_SEATED )
             {
                 // eating anim
@@ -6309,7 +5637,6 @@ void AuraEffect::PeriodicTick()
                 if (m_target->isInCombat())
                     m_target->ModifyPower(pt,m_amount);
             }
-
             // Anger Management
             // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
             // so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec
@@ -6340,13 +5667,11 @@ void AuraEffect::PeriodicTick()
             Unit *pCaster = GetCaster();
             if (!pCaster)
                 return;
-
             if (pCaster->GetTypeId() == TYPEID_UNIT && ((Creature*)pCaster)->isTotem() && ((Totem*)pCaster)->GetTotemType() != TOTEM_STATUE)
             {
                 uint32 procAttacker = PROC_FLAG_SUCCESSFUL_NEGATIVE_SPELL_HIT;
                 uint32 procVictim   = PROC_FLAG_TAKEN_NEGATIVE_SPELL_HIT;
                 SpellEntry const *spellProto = GetSpellProto();
-
                 if (spellProto->SpellFamilyName == SPELLFAMILY_GENERIC) // SPELLFAMILY_GENERIC proc by triggered spell
                 {
                     uint32 trigger_spell_id = spellProto->EffectTriggerSpell[m_effIndex];
@@ -6356,7 +5681,6 @@ void AuraEffect::PeriodicTick()
                 else
                     ((Totem*)pCaster)->GetOwner()->ProcDamageAndSpell(pCaster, procAttacker, procVictim, PROC_EX_NORMAL_HIT, 0, BASE_ATTACK, spellProto);
             }
-
             TriggerSpell();
             break;
         }
@@ -6369,7 +5693,6 @@ void AuraEffect::PeriodicTick()
             break;
     }
 }
-
 void AuraEffect::PeriodicDummyTick()
 {
     Unit *caster = GetCaster();
@@ -6425,7 +5748,6 @@ void AuraEffect::PeriodicDummyTick()
                             // on 0 tick -   0  (handled in 2 second)
                             // on 1 tick - 166% (handled in 4 second)
                             // on 2 tick - 133% (handled in 6 second)
-
                             // Apply bonus for 1 - 4 tick
                             switch (m_tickNumber)
                             {
@@ -6561,30 +5883,22 @@ void AuraEffect::PeriodicDummyTick()
                     {
                         // eff_radius ==0
                         float radius = GetSpellMaxRange(spell, false);
-
                         CellPair p(MaNGOS::ComputeCellPair(caster->GetPositionX(),caster->GetPositionY()));
                         Cell cell(p);
                         cell.data.Part.reserved = ALL_DISTRICT;
-
                         MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck u_check(caster, caster, radius);
                         MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck> checker(caster,targets, u_check);
-
                         TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, GridTypeMapContainer > grid_object_checker(checker);
                         TypeContainerVisitor<MaNGOS::UnitListSearcher<MaNGOS::AnyUnfriendlyVisibleUnitInObjectRangeCheck>, WorldTypeMapContainer > world_object_checker(checker);
-
                         CellLock<GridReadGuard> cell_lock(cell, p);
-
                         cell_lock->Visit(cell_lock, grid_object_checker,  *caster->GetMap(), *caster, radius);
                         cell_lock->Visit(cell_lock, world_object_checker, *caster->GetMap(), *caster, radius);
                     }
-
                     if(targets.empty())
                         return;
-
                     std::list<Unit*>::const_iterator itr = targets.begin();
                     std::advance(itr, rand()%targets.size());
                     Unit* target = *itr;
-
                     caster->CastSpell(target, 57840, true);
                     caster->CastSpell(target, 57841, true);
                     return;
@@ -6676,7 +5990,6 @@ void AuraEffect::PeriodicDummyTick()
                     return;
                 if(((Player*)m_target)->getClass() != CLASS_DEATH_KNIGHT)
                     return;
-
                 // Remove death rune added on proc
                 for (uint8 i=0;i<MAX_RUNES && m_amount;++i)
                 {
@@ -6692,10 +6005,8 @@ void AuraEffect::PeriodicDummyTick()
                             ((Player*)m_target)->GetBaseRune(i) != RUNE_BLOOD )
                             continue;
                     }
-
                     if (!(m_amount & (1<<i)))
                         continue;
-
                     ((Player*)m_target)->ConvertRune(i,((Player*)m_target)->GetBaseRune(i));
                 }
                 m_amount = 0;
@@ -6707,12 +6018,10 @@ void AuraEffect::PeriodicDummyTick()
             break;
     }
 }
-
 void AuraEffect::HandlePreventFleeing(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     Unit::AuraEffectList const& fearAuras = m_target->GetAurasByType(SPELL_AURA_MOD_FEAR);
     if( !fearAuras.empty() )
     {
@@ -6723,18 +6032,15 @@ void AuraEffect::HandlePreventFleeing(bool apply, bool Real, bool /*changeAmount
             m_target->SetFeared(true);*/
     }
 }
-
 void AuraEffect::HandleArenaPreparation(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     if(apply)
         m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION);
     else
         m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION);
 }
-
 /**
  * Such auras are applied from a caster(=player) to a vehicle.
  * This has been verified using spell #49256
@@ -6743,14 +6049,11 @@ void AuraEffect::HandleAuraControlVehicle(bool apply, bool Real, bool /*changeAm
 {
     if(!Real)
         return;
-
     if(!m_target->IsVehicle())
         return;
-
     Unit *caster = GetParentAura()->GetUnitSource();
     if(!caster || caster == m_target)
         return;
-
     if (apply)
     {
         //if(caster->GetTypeId() == TYPEID_PLAYER)
@@ -6766,26 +6069,20 @@ void AuraEffect::HandleAuraControlVehicle(bool apply, bool Real, bool /*changeAm
             if(caster->GetTypeId() == TYPEID_UNIT)
                 ((Creature*)caster)->RemoveCorpse();
         }
-
         // some SPELL_AURA_CONTROL_VEHICLE auras have a dummy effect on the player - remove them
         caster->RemoveAurasDueToSpell(GetId());
         caster->ExitVehicle();
     }
 }
-
 void AuraEffect::HandleAuraConvertRune(bool apply, bool Real, bool changeAmount)
 {
     if(!Real && !changeAmount)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *plr = (Player*)m_target;
-
     if(plr->getClass() != CLASS_DEATH_KNIGHT)
         return;
-
     uint32 runes = 0;
     // convert number of runes specified in aura amount of rune type in miscvalue to runetype in miscvalueb
     for(uint32 i = 0; i < MAX_RUNES && m_amount; ++i)
@@ -6813,70 +6110,55 @@ void AuraEffect::HandleAuraConvertRune(bool apply, bool Real, bool changeAmount)
     if (apply)
         m_amount = runes;
 }
-
 // Control Auras
-
 void AuraEffect::HandleAuraModStun(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     m_target->SetControlled(apply, UNIT_STAT_STUNNED);
 }
-
 void AuraEffect::HandleAuraModRoot(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     m_target->SetControlled(apply, UNIT_STAT_ROOT);
 }
-
 // Charm Auras
-
 void AuraEffect::HandleModPossess(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     Unit* caster = GetCaster();
     if(caster && caster->GetTypeId() == TYPEID_UNIT)
     {
         HandleModCharm(apply, Real, false);
         return;
     }
-
     if(apply)
         m_target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
     else
         m_target->RemoveCharmedBy(caster);
 }
-
 // only one spell has this aura
 void AuraEffect::HandleModPossessPet(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     Unit* caster = GetCaster();
     if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     //seems it may happen that when removing it is no longer owner's pet
     //if(((Player*)caster)->GetPet() != m_target)
     //    return;
-
     if(apply)
     {
         if(((Player*)caster)->GetPet() != m_target)
             return;
-
         m_target->SetCharmedBy(caster, CHARM_TYPE_POSSESS);
     }
     else
     {
         m_target->RemoveCharmedBy(caster);
-
         // Reinitialize the pet bar and make the pet come back to the owner
         ((Player*)caster)->PetSpellInitialize();
         if(!m_target->getVictim())
@@ -6887,40 +6169,31 @@ void AuraEffect::HandleModPossessPet(bool apply, bool Real, bool /*changeAmount*
         }
     }
 }
-
 void AuraEffect::HandleModCharm(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     Unit* caster = GetCaster();
-
     if(apply)
         m_target->SetCharmedBy(caster, CHARM_TYPE_CHARM);
     else
         m_target->RemoveCharmedBy(caster);
 }
-
 void AuraEffect::HandleCharmConvert(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     Unit* caster = GetCaster();
-
     if(apply)
         m_target->SetCharmedBy(caster, CHARM_TYPE_CONVERT);
     else
         m_target->RemoveCharmedBy(caster);
 }
-
 void AuraEffect::HandlePhase(bool apply, bool Real, bool /*changeAmount*/)
 {
     if(!Real)
         return;
-
     // no-phase is also phase state so same code for apply and remove
-
     // phase auras normally not expected at BG but anyway better check
     if(m_target->GetTypeId()==TYPEID_PLAYER)
     {
@@ -6928,21 +6201,17 @@ void AuraEffect::HandlePhase(bool apply, bool Real, bool /*changeAmount*/)
         if(((Player*)m_target)->InBattleGround())
             if(BattleGround *bg = ((Player*)m_target)->GetBattleGround())
                 bg->EventPlayerDroppedFlag((Player*)m_target);
-
         // GM-mode have mask 0xFFFFFFFF
         if(!((Player*)m_target)->isGameMaster())
             m_target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL,false);
-
         ((Player*)m_target)->GetSession()->SendSetPhaseShift(apply ? GetMiscValue() : PHASEMASK_NORMAL);
     }
     else
         m_target->SetPhaseMask(apply ? GetMiscValue() : PHASEMASK_NORMAL,false);
-
     // need triggering visibility update base at phase update of not GM invisible (other GMs anyway see in any phases)
     if(m_target->GetVisibility()!=VISIBILITY_OFF)
         m_target->SetVisibility(m_target->GetVisibility());
 }
-
 void AuraEffect::HandleAuraInitializeImages( bool Apply, bool Real , bool /*changeAmount*/)
 {
     if (!Real)
@@ -6981,12 +6250,10 @@ void AuraEffect::HandleAuraInitializeImages( bool Apply, bool Real , bool /*chan
         }
     }
 }
-
 void AuraEffect::HandleAuraCloneCaster( bool Apply, bool Real , bool /*changeAmount*/)
 {
     if (!Real)
         return;
-
     if (Apply)
     {
         Unit * caster = GetCaster();
@@ -7002,7 +6269,6 @@ void AuraEffect::HandleAuraCloneCaster( bool Apply, bool Real , bool /*changeAmo
         m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_MIRROR_IMAGE);
     }
 }
-
 void AuraEffect::HandleAuraModCritPct(bool apply, bool Real, bool changeAmount)
 {
     /*
@@ -7011,10 +6277,8 @@ void AuraEffect::HandleAuraModCritPct(bool apply, bool Real, bool changeAmount)
         m_target->m_baseSpellCritChance += apply ? m_amount:-m_amount;
         return;
     }
-
     if(Real || changeAmount)
         ((Player*)m_target)->UpdateAllSpellCritChances();
-
     ((Player*)m_target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, float (m_amount), apply);
     ((Player*)m_target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, float (m_amount), apply);
     ((Player*)m_target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, float (m_amount), apply);
@@ -7022,23 +6286,18 @@ void AuraEffect::HandleAuraModCritPct(bool apply, bool Real, bool changeAmount)
     // spells required only Real aura add/remove
     if(!Real)
         return;
-
     if(m_target->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)m_target)->HandleBaseModValue(CRIT_PERCENTAGE,         FLAT_MOD, float (m_amount), apply);
     ((Player*)m_target)->HandleBaseModValue(OFFHAND_CRIT_PERCENTAGE, FLAT_MOD, float (m_amount), apply);
     ((Player*)m_target)->HandleBaseModValue(RANGED_CRIT_PERCENTAGE,  FLAT_MOD, float (m_amount), apply);
-
     // included in Player::UpdateSpellCritChance calculation
     ((Player*)m_target)->UpdateAllSpellCritChances();
 }
-
 void AuraEffect::HandleAuraLinked(bool apply, bool Real, bool /*changeAmount*/)
 {
     if (!Real)
         return;
-
     if (apply)
     {
         Unit * caster = GetCaster();
@@ -7053,25 +6312,20 @@ void AuraEffect::HandleAuraLinked(bool apply, bool Real, bool /*changeAmount*/)
     else
         m_target->RemoveAura(m_spellProto->EffectTriggerSpell[m_effIndex], GetCasterGUID(), AuraRemoveMode(GetParentAura()->GetRemoveMode()));
 }
-
 int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster)
 {
     // Damage cap for CC effects
     if (!m_spellProto->procFlags)
         return 0;
-
     if (m_auraName !=SPELL_AURA_MOD_CONFUSE &&
         m_auraName !=SPELL_AURA_MOD_FEAR &&
         m_auraName !=SPELL_AURA_MOD_STUN &&
         m_auraName !=SPELL_AURA_MOD_ROOT &&
         m_auraName !=SPELL_AURA_TRANSFORM)
         return 0;
-
     int32 damageCap = (int32)(m_target->GetMaxHealth()*0.10f);
-
     if (!caster)
         return damageCap;
-
     // Glyphs increasing damage cap
     Unit::AuraEffectList const& overrideClassScripts = caster->GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
     for(Unit::AuraEffectList::const_iterator itr = overrideClassScripts.begin();itr != overrideClassScripts.end(); ++itr)
@@ -7088,7 +6342,6 @@ int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster)
     }
     return damageCap;
 }
-
 bool AuraEffect::IsPeriodicTickCrit(Unit const * pCaster) const
 {
     Unit::AuraEffectList const& mPeriodicCritAuras= pCaster->GetAurasByType(SPELL_AURA_ABILITY_PERIODIC_CRIT);
diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h
index 821e208d6b7..ae1a017bee7 100644
--- a/src/game/SpellAuras.h
+++ b/src/game/SpellAuras.h
@@ -19,18 +19,14 @@
  */
 #ifndef TRINITY_SPELLAURAS_H
 #define TRINITY_SPELLAURAS_H
-
 #include "SpellAuraDefines.h"
-
 class Unit;
 struct SpellEntry;
 struct SpellModifier;
 struct ProcTriggerSpell;
-
 // forward decl
 class Aura;
 class AuraEffect;
-
 typedef void(AuraEffect::*pAuraHandler)(bool Apply, bool Real, bool changeAmount);
 // Real == true at aura add/remove
 // Real == false at aura mod unapply/reapply; when adding/removing dependent aura/item/stat mods
@@ -45,35 +41,30 @@ typedef void(AuraEffect::*pAuraHandler)(bool Apply, bool Real, bool changeAmount
 //      each setting object update field code line moved under if(Real) check is significant Trinity speedup, and less server->client data sends
 //      each packet sending code moved under if(Real) check is _large_ Trinity speedup, and lot less server->client data sends
 //
-// changeAmount == true at changing existing aura amount - called wit real == false 
+// changeAmount == true at changing existing aura amount - called wit real == false
 // if aura has amount dependant effect handler has to allow proceeding it
 // example: change speed aura, modifier aura
-
 class TRINITY_DLL_SPEC Aura
 {
     friend void Player::SendAurasForTarget(Unit *target);
     public:
         virtual ~Aura();
         explicit Aura(SpellEntry const* spellproto, uint32 effMask, Unit *target, WorldObject *source, Unit *caster, int32 *currentBasePoints = NULL, Item *castItem = NULL);
-
         SpellEntry const* GetSpellProto() const { return m_spellProto; }
         uint32 GetId() const{ return m_spellProto->Id; }
         uint64 GetCastItemGUID() const { return m_castItemGuid; }
-
         uint64 const& GetCasterGUID() const { return m_casterGuid; }
         Unit* GetCaster() const;
         uint64 const& GetSourceGUID() const { return m_sourceGuid; }
         Unit *GetUnitSource() const;
         Unit* GetTarget() const { return m_target; }
         time_t GetAuraApplyTime() const { return m_applyTime; }
-
         int32 GetAuraMaxDuration() const { return m_maxduration; }
         void SetAuraMaxDuration(int32 duration) { m_maxduration = duration; }
         int32 GetAuraDuration() const { return m_duration; }
         void SetAuraDuration(int32 duration, bool withMods = false);
         void RefreshAura() { SetAuraDuration(m_maxduration);}
         bool IsExpired() const { return !GetAuraDuration() && !(IsPermanent() || IsPassive()); }
-
         void SendAuraUpdate();
         uint8 GetAuraSlot() const { return m_auraSlot; }
         void SetAuraSlot(uint8 slot) { m_auraSlot = slot; }
@@ -82,30 +73,24 @@ class TRINITY_DLL_SPEC Aura
         bool DropAuraCharge();
         void SetProcDamage(uint32 val) { m_procDamage = val; }
         uint32 GetProcDamage() const { return m_procDamage; }
-
         uint8 GetStackAmount() const { return m_stackAmount; }
         void SetStackAmount(uint8 num, bool applied = true);
         bool modStackAmount(int32 num); // return true if last charge dropped
-
         void SetRemoveMode(AuraRemoveMode mode) { m_removeMode = mode; }
         uint8 GetRemoveMode() const {return m_removeMode;}
-
         inline uint8 GetEffectMask() const {return m_auraFlags & 7;}
         AuraEffect * GetPartAura (uint8 effIndex) const {assert (effIndex < MAX_SPELL_EFFECTS); return m_partAuras[effIndex];}
         bool SetPartAura(AuraEffect* aurEff, uint8 effIndex);
-
         bool IsPositive() const { return m_positive; }
         void SetNegative() { m_positive = false; }
         void SetPositive() { m_positive = true; }
         bool IsPermanent() const { return m_permanent; }
         void SetPermanent(bool val) { m_permanent = val; }
-
         bool IsPassive() const { return m_isPassive; }
         bool IsDeathPersistent() const { return m_isDeathPersist; }
         bool IsRemovedOnShapeLost() const { return m_isRemovedOnShapeLost; }
         bool CanBeSaved() const;
         bool IsRemoved() const { return m_isRemoved; }
-
         bool IsPersistent() const;
         bool IsAreaAura() const;
         bool IsAuraType(AuraType type) const;
@@ -119,21 +104,16 @@ class TRINITY_DLL_SPEC Aura
         }
         void ApplyAllModifiers(bool apply, bool Real=false);
         void HandleAuraSpecificMods(bool apply);
-
         void Update(uint32 diff);
-
         void _AddAura();
         void _RemoveAura();
-
         // Allow Apply Aura Handler to modify and access m_AuraDRGroup
         void setDiminishGroup(DiminishingGroup group) { m_AuraDRGroup = group; }
         DiminishingGroup getDiminishGroup() const { return m_AuraDRGroup; }
-
         // Single cast aura helpers
         void UnregisterSingleCastAura();
         bool IsSingleTarget() const {return m_isSingleTargetAura;}
         void SetIsSingleTarget(bool val) { m_isSingleTargetAura = val;}
-
     private:
         const SpellEntry * const m_spellProto;
         Unit * const m_target;
@@ -142,23 +122,18 @@ class TRINITY_DLL_SPEC Aura
         const uint64 m_casterGuid;
         const uint64 m_castItemGuid;                              // it is NOT safe to keep a pointer to the item because it may get deleted
         const time_t m_applyTime;
-
         int32 m_maxduration;                                // Max aura duration
         int32 m_duration;                                   // Current time
         int32 m_timeCla;                                    // Timer for power per sec calcultion
-
         AuraRemoveMode m_removeMode:8;                      // Store info for know remove aura reason
         DiminishingGroup m_AuraDRGroup:8;                   // Diminishing
-
         uint8 m_auraSlot;                                   // Aura slot on unit (for show in client)
         uint8 m_auraFlags;                                  // Aura info flag (for send data to client)
         uint8 m_auraLevel;                                  // Aura level (store caster level for correct show level dep amount)
         uint8 m_procCharges;                                // Aura charges (0 for infinite)
         uint8 m_stackAmount;                                // Aura stack amount
         AuraEffect * m_partAuras[3];
-
         uint32 m_procDamage;                                // used in aura proc code
-
         bool m_isDeathPersist:1;
         bool m_isRemovedOnShapeLost:1;
         bool m_isPassive:1;
@@ -166,10 +141,8 @@ class TRINITY_DLL_SPEC Aura
         bool m_permanent:1;
         bool m_isRemoved:1;
         bool m_isSingleTargetAura:1;                        // true if it's a single target spell and registered at caster - can change at spell steal for example
-
         bool IsVisible() const;
 };
-
 class TRINITY_DLL_SPEC AuraEffect
 {
     public:
@@ -333,26 +306,20 @@ class TRINITY_DLL_SPEC AuraEffect
         void HandleAuraCloneCaster(bool Apply, bool Real, bool changeAmount);
         void HandleAuraModCritPct(bool Apply, bool Real, bool changeAmount);
         void HandleAuraLinked(bool Apply, bool Real, bool changeAmount);
-
         void HandleAuraEffectSpecificMods(bool apply, bool Real, bool changeAmount);
         int32 CalculateCrowdControlAuraAmount(Unit * caster);
-
         // add/remove SPELL_AURA_MOD_SHAPESHIFT (36) linked auras
         void HandleShapeshiftBoosts(bool apply);
-
         Unit * GetCaster() const { return m_parentAura->GetCaster(); }
         uint64 GetCasterGUID() const{ return m_parentAura->GetCasterGUID(); }
         Aura * GetParentAura() const { return m_parentAura; }
-
         SpellEntry const* GetSpellProto() const { return m_spellProto; }
         uint32 GetId() const { return m_spellProto->Id; }
         uint32 GetEffIndex() const { return m_effIndex; }
         int32 GetBasePoints() const { return m_currentBasePoints; }
         int32 GetAuraAmplitude(){return m_amplitude;}
         void ResetPeriodicTimer(){m_periodicTimer = m_amplitude;}
-
         virtual void Update(uint32 diff);
-
         uint32 GetTickNumber() const { return m_tickNumber; }
         int32 GetTotalTicks () const { return m_amplitude ? (GetParentAura()->GetAuraMaxDuration() / m_amplitude) : 1;}
         bool IsAreaAura() const { return m_isAreaAura; }
@@ -361,43 +328,34 @@ class TRINITY_DLL_SPEC AuraEffect
         bool IsApplied() const { return m_isApplied; }
         void SetApplied (bool val) {m_isApplied = val; }
         bool isAffectedOnSpell(SpellEntry const *spell) const;
-
         void ApplyModifier(bool apply, bool Real = false, bool changeAmount=false);
         void RecalculateAmount(bool applied = true);
         void HandleAuraEffect(bool apply);
         void ApplyAllModifiers(bool apply, bool Real);
-
         Unit* GetTriggerTarget() const;
         void TriggerSpell();
         void TriggerSpellWithValue();
         void PeriodicTick();
         void PeriodicDummyTick();
-
         int32 GetMiscBValue() const {return m_spellProto->EffectMiscValueB[m_effIndex];}
         int32 GetMiscValue() const {return m_spellProto->EffectMiscValue[m_effIndex];}
         uint32 GetAuraName() const {return m_auraName;}
         int32 GetAmount() const {return m_amount;}
         void SetAmount(int32 amount) { m_amount = amount; }
         void CleanupTriggeredSpells();
-
     protected:
         explicit AuraEffect(Aura * parentAura, uint8 effIndex, int32 *currentBasePoints = NULL);
         Aura * const m_parentAura;
         Unit * const m_target;
-
         uint32 m_tickNumber;
-
         const SpellEntry * const m_spellProto;
         const uint8 m_effIndex;
         const AuraType m_auraName;
         int32 m_currentBasePoints;
         int32 m_amount;
-
         SpellModifier *m_spellmod;
-
         int32 m_periodicTimer;                              // Timer for periodic auras
         int32 m_amplitude;
-
         bool m_isPeriodic:1;
         bool m_isAreaAura:1;
         bool m_isPersistent:1;
@@ -405,7 +363,6 @@ class TRINITY_DLL_SPEC AuraEffect
     private:
         bool IsPeriodicTickCrit(Unit const * pCaster) const;
 };
-
 class TRINITY_DLL_SPEC AreaAuraEffect : public AuraEffect
 {
     public:
@@ -418,7 +375,6 @@ class TRINITY_DLL_SPEC AreaAuraEffect : public AuraEffect
         int32 m_removeTime;
         AreaAuraType m_areaAuraType;
 };
-
 class TRINITY_DLL_SPEC PersistentAreaAuraEffect : public AuraEffect
 {
     public:
@@ -428,7 +384,5 @@ class TRINITY_DLL_SPEC PersistentAreaAuraEffect : public AuraEffect
     protected:
         explicit PersistentAreaAuraEffect(Aura * parentAura, uint32 eff, int32 *currentBasePoints = NULL);
 };
-
 AuraEffect* CreateAuraEffect(Aura * parentAura, uint32 effIndex, int32 *currentBasePoints = NULL);
-
 #endif
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index d9aedd5fc98..df396c7f24e 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -61,7 +60,6 @@
 #include "SkillDiscovery.h"
 #include "Formulas.h"
 #include "Vehicle.h"
-
 pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
 {
     &Spell::EffectNULL,                                     //  0
@@ -228,44 +226,34 @@ pEffect SpellEffects[TOTAL_SPELL_EFFECTS]=
     &Spell::EffectSpecCount,                                //161 SPELL_EFFECT_TALENT_SPEC_COUNT        second talent spec (learn/revert)
     &Spell::EffectActivateSpec,                             //162 SPELL_EFFECT_TALENT_SPEC_SELECT       activate primary/secondary spec
 };
-
 void Spell::EffectNULL(uint32 /*i*/)
 {
     sLog.outDebug("WORLD: Spell Effect DUMMY");
 }
-
 void Spell::EffectUnused(uint32 /*i*/)
 {
     // NOT USED BY ANY SPELL OR USELESS OR IMPLEMENTED IN DIFFERENT WAY IN MANGOS
 }
-
 void Spell::EffectResurrectNew(uint32 i)
 {
     if(!unitTarget || unitTarget->isAlive())
         return;
-
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(!unitTarget->IsInWorld())
         return;
-
     Player* pTarget = ((Player*)unitTarget);
-
     if(pTarget->isRessurectRequested())       // already have one active request
         return;
-
     uint32 health = damage;
     uint32 mana = m_spellInfo->EffectMiscValue[i];
     pTarget->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana);
     SendResurrectRequest(pTarget);
 }
-
 void Spell::EffectInstaKill(uint32 /*i*/)
 {
     if (!unitTarget || !unitTarget->isAlive())
         return;
-
     // Demonic Sacrifice
     if (m_spellInfo->Id == 18788 && unitTarget->GetTypeId() == TYPEID_UNIT)
     {
@@ -282,41 +270,31 @@ void Spell::EffectInstaKill(uint32 /*i*/)
                 sLog.outError("EffectInstaKill: Unhandled creature entry (%u) case.", entry);
                 return;
         }
-
         m_caster->CastSpell(m_caster, spellID, true);
     }
-
     if(m_caster == unitTarget)                              // prevent interrupt message
         finish();
-
     m_caster->DealDamage(unitTarget, unitTarget->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
 }
-
 void Spell::EffectEnvirinmentalDMG(uint32 i)
 {
     uint32 absorb = 0;
     uint32 resist = 0;
-
     // Note: this hack with damage replace required until GO casting not implemented
     // environment damage spells already have around enemies targeting but this not help in case not existed GO casting support
     // currently each enemy selected explicitly and self cast damage, we prevent apply self casted spell bonuses/etc
     damage = m_spellInfo->CalculateSimpleValue(i);
-
     m_caster->CalcAbsorbResist(m_caster, GetSpellSchoolMask(m_spellInfo), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist, m_spellInfo);
-
     m_caster->SendSpellNonMeleeDamageLog(m_caster, m_spellInfo->Id, damage, GetSpellSchoolMask(m_spellInfo), absorb, resist, false, 0, false);
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
         ((Player*)m_caster)->EnvironmentalDamage(DAMAGE_FIRE, damage);
 }
-
 void Spell::EffectSchoolDMG(uint32 effect_idx)
 {
 }
-
 void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
 {
     bool apply_direct_bonus = true;
-
     if (unitTarget && unitTarget->isAlive())
     {
         switch (m_spellInfo->SpellFamilyName)
@@ -330,10 +308,8 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
                         if (ihit->effectMask & (1<<effect_idx))
                             ++count;
-
                     damage /= count;                    // divide to all targets
                 }
-
                 switch(m_spellInfo->Id)                     // better way to check unknown
                 {
                     // Positive/Negative Charge
@@ -371,7 +347,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                                     aur->SetStackAmount(count);
                             }
                         }
-
                         if (unitTarget->HasAura(m_triggeredByAuraSpell->Id))
                             damage = 0;
                         break;
@@ -401,7 +376,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         // don't damage self and only players
                         if(unitTarget->GetGUID() == m_caster->GetGUID() || unitTarget->GetTypeId() != TYPEID_PLAYER)
                             return;
-
                         float radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[0]));
                         if (!radius) return;
                         float distance = m_caster->GetDistance2d(unitTarget);
@@ -423,7 +397,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 }
                 break;
             }
-
             case SPELLFAMILY_WARRIOR:
             {
                 // Bloodthirst
@@ -465,7 +438,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 else if (m_spellInfo->TargetAuraState == AURA_STATE_CONFLAGRATE)
                 {
                     AuraEffect const* aura = NULL;                // found req. aura for damage calculation
-
                     Unit::AuraEffectList const &mPeriodic = unitTarget->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
                     for(Unit::AuraEffectList::const_iterator i = mPeriodic.begin(); i != mPeriodic.end(); ++i)
                     {
@@ -473,19 +445,16 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         if ((*i)->GetSpellProto()->SpellFamilyName != SPELLFAMILY_WARLOCK ||
                             (*i)->GetCasterGUID() != m_caster->GetGUID())
                             continue;
-
                         // Immolate
                         if ((*i)->GetSpellProto()->SpellFamilyFlags[0] & 0x4)
                         {
                             aura = *i;                      // it selected always if exist
                             break;
                         }
-
                         // Shadowflame
                         if ((*i)->GetSpellProto()->SpellFamilyFlags[2] & 0x00000002)
                             aura = *i;                      // remember but wait possible Immolate as primary priority
                     }
-
                     // found Immolate or Shadowflame
                     if (aura)
                     {
@@ -496,7 +465,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                         // Glyph of Conflagrate
                         if (!m_caster->HasAura(56235))
                             unitTarget->RemoveAurasDueToSpell(aura->GetId(), m_caster->GetGUID());
-
                         break;
                     }
                 }
@@ -578,7 +546,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                     {
                         float ap = m_caster->GetTotalAttackPowerValue(BASE_ATTACK);
                         damage += irand(int32(ap * combo * 0.03f), int32(ap * combo * 0.07f));
-
                         // Eviscerate and Envenom Bonus Damage (item set effect)
                         if (m_caster->HasAura(37169))
                             damage += combo*40;
@@ -608,11 +575,9 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                             break;
                         }
                     }
-
                     // TODO: should this be put on taken but not done?
                     if(found)
                         damage += m_spellInfo->EffectBasePoints[1];
-                        
                     if (m_caster->GetTypeId() == TYPEID_PLAYER)
                     {
                         // Add Ammo and Weapon damage plus RAP * 0.1
@@ -628,7 +593,6 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                             damage += ((Player*)m_caster)->GetAmmoDPS()*item->GetProto()->Delay/1000;
                         }
                     }
-
                 }
                 break;
             }
@@ -660,24 +624,19 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
                 break;
             }
         }
-
         if(m_originalCaster && damage > 0 && apply_direct_bonus)
             damage = m_originalCaster->SpellDamageBonus(unitTarget, m_spellInfo, (uint32)damage, SPELL_DIRECT_DAMAGE);
-
         m_damage += damage;
     }
 }
-
 void Spell::EffectDummy(uint32 i)
 {
     if (!unitTarget && !gameObjTarget && !itemTarget)
         return;
-
     uint32 spell_id = 0;
     int32 bp = 0;
     bool triggered = true;
     SpellCastTargets targets;
-
     // selection by spell family
     switch (m_spellInfo->SpellFamilyName)
     {
@@ -692,12 +651,9 @@ void Spell::EffectDummy(uint32 i)
                     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
                         if(ihit->effectMask & (1<<i))
                             ++count;
-
                     damage = 12000; // maybe wrong value
                     damage /= count;
-
                     SpellEntry const *spellInfo = sSpellStore.LookupEntry(42784);
-
                      // now deal the damage
                     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
                         if(ihit->effectMask & (1<<i))
@@ -710,7 +666,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
                     switch(urand(1,5))
                     {
@@ -727,7 +682,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
                     switch(urand(1,2))
                     {
@@ -753,7 +707,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (!unitTarget)
                         return;
-
                     float damage;
                     // DW should benefit of attack power, damage percent mods etc.
                     // TODO: check if using offhand damage is correct and if it should be divided by 2
@@ -761,7 +714,6 @@ void Spell::EffectDummy(uint32 i)
                         damage = (m_caster->GetFloatValue(UNIT_FIELD_MINOFFHANDDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXOFFHANDDAMAGE))/2;
                     else
                         damage = (m_caster->GetFloatValue(UNIT_FIELD_MINDAMAGE) + m_caster->GetFloatValue(UNIT_FIELD_MAXDAMAGE))/2;
-
                     switch (m_spellInfo->Id)
                     {
                         case 12162: damage *= 0.16f; break; // Rank 1
@@ -771,7 +723,6 @@ void Spell::EffectDummy(uint32 i)
                             sLog.outError("Spell::EffectDummy: Spell %u not handled in DW",m_spellInfo->Id);
                             return;
                     };
-
                     // get remaining damage of old Deep Wound aura
                     AuraEffect* deepWound = unitTarget->GetAuraEffect(12721, 0);
                     if (deepWound)
@@ -779,7 +730,6 @@ void Spell::EffectDummy(uint32 i)
                         int32 remainingTicks = deepWound->GetParentAura()->GetAuraDuration() / deepWound->GetAuraAmplitude();
                         damage += remainingTicks * deepWound->GetAmount();
                     }
-
                     // 1 tick/sec * 6 sec = 6 ticks
                     int32 deepWoundsDotBasePoints0 = int32(damage / 6);
                     m_caster->CastCustomSpell(unitTarget, 12721, &deepWoundsDotBasePoints0, NULL, NULL, true, NULL);
@@ -789,18 +739,14 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (!unitTarget)
                         return;
-
                     uint32 spell_id = 0;
-
                     uint32 roll = urand(0, 99);
-
                     if(roll < 2)                            // 2% for 30 sec self root (off-like chance unknown)
                         spell_id = 16566;
                     else if(roll < 4)                       // 2% for 20 sec root, charge to target (off-like chance unknown)
                         spell_id = 13119;
                     else                                    // normal root
                         spell_id = 13099;
-
                     m_caster->CastSpell(unitTarget,spell_id,true,NULL);
                     return;
                 }
@@ -809,7 +755,6 @@ void Spell::EffectDummy(uint32 i)
                     // can be used for different aura triggering, so select by aura
                     if (!m_triggeredByAuraSpell || !unitTarget)
                         return;
-
                     switch (m_triggeredByAuraSpell->Id)
                     {
                         case 26467:                         // Persistent Shield
@@ -826,7 +771,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
-
                     ((Creature*)unitTarget)->ForcedDespawn();
                     return;
                 }
@@ -834,7 +778,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
                     switch (urand(1, 3))
                     {
@@ -842,7 +785,6 @@ void Spell::EffectDummy(uint32 i)
                         case 2: spell_id = 16593; break;
                         default:spell_id = 16591; break;
                     }
-
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
@@ -850,7 +792,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget || !m_originalCaster)
                         return;
-
                     if(m_originalCaster->GetTypeId() == TYPEID_PLAYER)
                     {
                         WorldPacket data(SMSG_SPIRIT_HEALER_CONFIRM, 8);
@@ -863,11 +804,9 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!itemTarget && m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = roll_chance_i(50)
                         ? 17269                             // Create Resonating Skull
                         : 17270;                            // Create Bone Dust
-
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
@@ -879,18 +818,13 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget || !unitTarget->isAlive() || unitTarget->GetTypeId() != TYPEID_UNIT || ((Creature*)unitTarget)->isPet())
                         return;
-
                     Creature* creatureTarget = (Creature*)unitTarget;
-
                     GameObject* Crystal_Prison = m_caster->SummonGameObject(179644, creatureTarget->GetPositionX(), creatureTarget->GetPositionY(), creatureTarget->GetPositionZ(), creatureTarget->GetOrientation(), 0, 0, 0, 0, creatureTarget->GetRespawnTime()-time(NULL));
                     sLog.outDebug("SummonGameObject at SpellEfects.cpp EffectDummy for Spell 23019");
-
                     creatureTarget->ForcedDespawn();
-
                     WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
                     data << uint64(Crystal_Prison->GetGUID());
                     m_caster->SendMessageToSet(&data, true);
-
                     return;
                 }
                 case 23074:                                 // Arcanite Dragonling
@@ -937,12 +871,9 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (!m_caster->HasAuraType(SPELL_AURA_MOUNTED))
                         return;
-
                     float flyspeed = m_caster->GetSpeedRate(MOVE_FLIGHT);
                     float speed = m_caster->GetSpeedRate(MOVE_RUN);
-
                     m_caster->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
                     //5 different spells used depending on mounted speed and if mount can fly or not
                     if (flyspeed >= 4.1f)
                         // Flying Reindeer
@@ -959,7 +890,6 @@ void Spell::EffectDummy(uint32 i)
                     else
                         // Reindeer
                         m_caster->CastSpell(m_caster, 25858, true); //60% ground Reindeer
-
                     return;
                 }
                 case 26074:                                 // Holiday Cheer
@@ -986,11 +916,9 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if( m_caster->GetTypeId() != TYPEID_PLAYER )
                         return;
-
                     uint32 spell_id = roll_chance_i(50)
                         ? 29277                             // Summon Purified Helboar Meat
                         : 29278;                            // Summon Toxic Helboar Meat
-
                     m_caster->CastSpell(m_caster,spell_id,true,NULL);
                     return;
                 }
@@ -1017,9 +945,7 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
-
                     switch(urand(1,5))
                     {
                         case 1: spell_id = 33053; break;    // Mr Pinchy's Blessing
@@ -1028,7 +954,6 @@ void Spell::EffectDummy(uint32 i)
                         case 4: spell_id = 33062; break;    // Tiny Magical Crawdad
                         case 5: spell_id = 33064; break;    // Mr. Pinchy's Gift
                     }
-
                     m_caster->CastSpell(m_caster, spell_id, true, NULL);
                     return;
                 }
@@ -1041,7 +966,6 @@ void Spell::EffectDummy(uint32 i)
                         case 3742: spell_id = 35744; break; // Socrethar Portal
                         default: return;
                     }
-
                     m_caster->CastSpell(m_caster, spell_id, true);
                     return;
                 }
@@ -1049,7 +973,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget)
                         return;
-
                     int32 basepoints0 = 100;
                     m_caster->CastCustomSpell(unitTarget, 37675, &basepoints0, NULL, NULL, true);
                     return;
@@ -1083,7 +1006,6 @@ void Spell::EffectDummy(uint32 i)
                         default:
                             return;
                     }
-
                     DoCreateItem(i, newitemid);
                     return;
                 }
@@ -1092,9 +1014,7 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     Player *player = (Player*)m_caster;
-
                     if (player && player->GetQuestStatus(11379) == QUEST_STATUS_INCOMPLETE)
                     {
                         Creature *creature = player->FindNearestCreature(19973, 10, false);
@@ -1103,7 +1023,6 @@ void Spell::EffectDummy(uint32 i)
                             SendCastResult(SPELL_FAILED_NOT_HERE);
                             return;
                         }
-
                         player->CastSpell(player, 43753, false);
                     }
                     return;
@@ -1112,9 +1031,7 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
-
                     ((Creature*)unitTarget)->ForcedDespawn();
-
                     //cast spell Raptor Capture Credit
                     m_caster->CastSpell(m_caster, 42337, true, NULL);
                     return;
@@ -1124,13 +1041,10 @@ void Spell::EffectDummy(uint32 i)
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT
                         || unitTarget->GetEntry() != 16880 || ((Creature*)unitTarget)->isPet())
                         return;
-
                     ((Creature*)unitTarget)->UpdateEntry(16992);
                     ((Player*)m_caster)->RewardPlayerAndGroupAtEvent(16992, unitTarget);
-
                     if (unitTarget->IsAIEnabled)
                         ((Creature*)unitTarget)->AI()->AttackStart(m_caster);
-
                     return;
                 }
                 case 44997:                                 // Converting Sentry
@@ -1156,7 +1070,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // spell has a 1/3 chance to trigger one of the below
                     if(roll_chance_i(66))
                         return;
@@ -1170,17 +1083,14 @@ void Spell::EffectDummy(uint32 i)
                         // 01001000 - goblin binary
                         m_caster->CastSpell(m_caster, 50246, true);
                     }
-
                     return;
                 }
                 case 51582:                                 //Rocket Boots Engaged (Rocket Boots Xtreme and Rocket Boots Xtreme Lite)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     if(BattleGround* bg = ((Player*)m_caster)->GetBattleGround())
                         bg->EventPlayerDroppedFlag((Player*)m_caster);
-
                     m_caster->CastSpell(m_caster, 30452, true, NULL);
                     return;
                 }
@@ -1188,10 +1098,8 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
-
                     ((Creature*)unitTarget)->ForcedDespawn();
                     return;
-
                 }
                 case 52308:                                 // Take Sputum Sample
                 {
@@ -1201,7 +1109,6 @@ void Spell::EffectDummy(uint32 i)
                         {
                             uint32 spellID = m_spellInfo->CalculateSimpleValue(0);
                             uint32 reqAuraID = m_spellInfo->CalculateSimpleValue(1);
-
                             if (m_caster->HasAuraEffect(reqAuraID,0))
                                 m_caster->CastSpell(m_caster,spellID,true,NULL);
                             return;
@@ -1230,7 +1137,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
                     switch(urand(1,3))
                     {
@@ -1280,7 +1186,6 @@ void Spell::EffectDummy(uint32 i)
                     }
                     return;
             }
-
             //All IconID Check in there
             switch(m_spellInfo->SpellIconID)
             {
@@ -1293,11 +1198,9 @@ void Spell::EffectDummy(uint32 i)
                         melee_mod = 30;
                     if (healthPerc < 100 && healthPerc > 40)
                         melee_mod = 10+(100-healthPerc)/3;
-
                     int32 hasteModBasePoints0 = melee_mod;          // (EffectBasePoints[0]+1)-1+(5-melee_mod) = (melee_mod-1+1)-1+5-melee_mod = 5-1
                     int32 hasteModBasePoints1 = (5-melee_mod);
                     int32 hasteModBasePoints2 = 5;
-
                     // FIXME: custom spell required this aura state by some unknown reason, we not need remove it anyway
                     m_caster->ModifyAuraState(AURA_STATE_BERSERKING,true);
                     m_caster->CastCustomSpell(m_caster, 26635, &hasteModBasePoints0, &hasteModBasePoints1, &hasteModBasePoints2, true, NULL);
@@ -1313,13 +1216,11 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     // immediately finishes the cooldown on Frost spells
                     const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap();
                     for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
                     {
                         SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-
                         if( spellInfo->SpellFamilyName == SPELLFAMILY_MAGE &&
                             (GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_FROST) &&
                             spellInfo->Id != 11958 && GetSpellRecoveryTime(spellInfo) > 0 )
@@ -1370,12 +1271,10 @@ void Spell::EffectDummy(uint32 i)
             {
                 if(!unitTarget)
                     return;
-
                 uint32 rage=0;
                 // Glyph of Execution bonus
                 if (AuraEffect *aura = m_caster->GetAuraEffect(58367, 0))
                     rage+=aura->GetAmount();
-
                 spell_id = 20647;
                 // Sudden death cost modifier
                 if (Aura * aur = m_caster->GetAura(52437))
@@ -1391,7 +1290,6 @@ void Spell::EffectDummy(uint32 i)
                     rage += m_caster->GetPower(POWER_RAGE);
                     m_caster->SetPower(POWER_RAGE,0);
                 }
-
                 bp = damage+int32(rage * m_spellInfo->DmgMultiplier[i] +
                     m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
                 break;
@@ -1453,19 +1351,15 @@ void Spell::EffectDummy(uint32 i)
                 {
                     // Shouldn't Appear in Combat Log
                     unitTarget->ModifyHealth(-damage);
-
                     int32 mana = damage;
                     // Improved Life Tap mod
                     if (AuraEffect const * aurEff = m_caster->GetDummyAura(SPELLFAMILY_WARLOCK, 208, 0))
                         mana = (aurEff->GetAmount() + 100)* mana / 100;
-
                     m_caster->CastCustomSpell(unitTarget, 31818, &mana, NULL, NULL, true);
-
                     // Mana Feed
                     int32 manaFeedVal = 0;
                     if (AuraEffect const * aurEff = m_caster->GetAuraEffect(SPELL_AURA_ADD_FLAT_MODIFIER, SPELLFAMILY_WARLOCK, 1982, 0))
                         manaFeedVal = aurEff->GetAmount();
-
                     if(manaFeedVal > 0)
                     {
                         manaFeedVal = manaFeedVal * mana / 100;
@@ -1483,7 +1377,6 @@ void Spell::EffectDummy(uint32 i)
             {
                 if (!unitTarget || !unitTarget->isAlive())
                     return;
-
                 int hurt = 0;
                 int heal = 0;
                 switch(m_spellInfo->Id)
@@ -1514,11 +1407,9 @@ void Spell::EffectDummy(uint32 i)
                         m_caster->RemoveAurasDueToSpell(m_triggeredByAuraSpell->Id);
                     return;
                 }
-
                 //Any effect which causes you to lose control of your character will supress the starfall effect.
                 if(m_caster->hasUnitState(UNIT_STAT_STUNNED | UNIT_STAT_FLEEING | UNIT_STAT_ROOT | UNIT_STAT_CONFUSED))
                     return;
-
                 m_caster->CastSpell(unitTarget, damage, true);
                 return;
             }
@@ -1536,34 +1427,26 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     Player *pCaster = ((Player*)m_caster);
-
                     Item *item = pCaster->GetWeaponForAttack(OFF_ATTACK);
                     if(!item)
                         return;
-
                     // all poison enchantments is temporary
                     uint32 enchant_id = item->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT);
                     if(!enchant_id)
                         return;
-
                     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
                     if(!pEnchant)
                         return;
-
                     for (int s=0;s<3;s++)
                     {
                         if(pEnchant->type[s]!=ITEM_ENCHANTMENT_TYPE_COMBAT_SPELL)
                             continue;
-
                         SpellEntry const* combatEntry = sSpellStore.LookupEntry(pEnchant->spellid[s]);
                         if(!combatEntry || combatEntry->Dispel != DISPEL_POISON)
                             continue;
-
                         m_caster->CastSpell(unitTarget, combatEntry, true, item);
                     }
-
                     m_caster->CastSpell(unitTarget, 5940, true);
                     return;
                 }
@@ -1571,13 +1454,11 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     //immediately finishes the cooldown on certain Rogue abilities
                     const SpellCooldowns& cm = ((Player *)m_caster)->GetSpellCooldownMap();
                     for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
                     {
                         SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-
                         if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && (spellInfo->SpellFamilyFlags[1] & 0x00000240 || spellInfo->SpellFamilyFlags[0] & 0x00000860))
                             ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true);
                         else
@@ -1599,13 +1480,11 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     // immediately finishes the cooldown on your other Hunter abilities except Bestial Wrath
                     const SpellCooldowns& cm = ((Player*)m_caster)->GetSpellCooldownMap();
                     for (SpellCooldowns::const_iterator itr = cm.begin(); itr != cm.end();)
                     {
                         SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
-
                         if (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && spellInfo->Id != 23989 && GetSpellRecoveryTime(spellInfo) > 0 )
                             ((Player*)m_caster)->RemoveSpellCooldown((itr++)->first,true);
                         else
@@ -1617,7 +1496,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if (m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     // break Auto Shot and autohit
                     m_caster->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
                     m_caster->AttackStop();
@@ -1656,10 +1534,8 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget)
                         return;
-
                     int hurt = 0;
                     int heal = 0;
-
                     switch(m_spellInfo->Id)
                     {
                         case 20473: hurt = 25912; heal = 25914; break;
@@ -1673,16 +1549,13 @@ void Spell::EffectDummy(uint32 i)
                             sLog.outError("Spell::EffectDummy: Spell %u not handled in HS",m_spellInfo->Id);
                             return;
                     }
-
                     if(m_caster->IsFriendlyTo(unitTarget))
                         m_caster->CastSpell(unitTarget, heal, true, 0);
                     else
                         m_caster->CastSpell(unitTarget, hurt, true, 0);
-
                     return;
                 }
             }
-
             switch(m_spellInfo->Id)
             {
                 case 54171:                                   //Divine Storm
@@ -1693,18 +1566,15 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget)
                         return;
-
                     SpellEntry const* spell_proto = sSpellStore.LookupEntry(damage);
                     if(!spell_proto)
                         return;
-
                     m_caster->CastSpell(unitTarget, spell_proto, true, NULL);
                     return;
                 }
                 case 31789:                                 // Righteous Defense (step 1)
                 {
                     // 31989 -> dummy effect (step 1) + dummy effect (step 2) -> 31709 (taunt like spell for each target)
-
                     // non-standard cast requirement check
                     if (!unitTarget || unitTarget->getAttackers().empty())
                     {
@@ -1713,15 +1583,12 @@ void Spell::EffectDummy(uint32 i)
                         SendCastResult(SPELL_FAILED_TARGET_AFFECTING_COMBAT);
                         return;
                     }
-
                     // Righteous Defense (step 2) (in old version 31980 dummy effect)
                     // Clear targets for eff 1
                     for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit)
                         ihit->effectMask &= ~(1<<1);
-
                     // not empty (checked)
                     Unit::AttackerSet const& attackers = unitTarget->getAttackers();
-
                     // chance to be selected from list
                     float chance = 100.0f / attackers.size();
                     uint32 count = 0;
@@ -1732,7 +1599,6 @@ void Spell::EffectDummy(uint32 i)
                         ++count;
                         AddUnitTarget((*aItr), 1);
                     }
-
                     // now let next effect cast spell at each target.
                     return;
                 }
@@ -1740,7 +1606,6 @@ void Spell::EffectDummy(uint32 i)
                 {
                     if(!unitTarget)
                         return;
-
                     uint32 spell_id = 0;
                     switch(unitTarget->getClass())
                     {
@@ -1750,7 +1615,6 @@ void Spell::EffectDummy(uint32 i)
                         case CLASS_SHAMAN:  spell_id = 37881; break;
                         default: return;                    // ignore for not healing classes
                     }
-
                     m_caster->CastSpell(m_caster, spell_id, true);
                     return;
                 }
@@ -1773,18 +1637,14 @@ void Spell::EffectDummy(uint32 i)
                         sLog.outError("Spell::EffectDummy: Spell %u not handled in RW", m_spellInfo->Id);
                         return;
                 }
-
                 SpellEntry const *spellInfo = sSpellStore.LookupEntry( spell_id );
-
                 if(!spellInfo)
                 {
                     sLog.outError("WORLD: unknown spell id %i", spell_id);
                     return;
                 }
-
                 if(m_caster->GetTypeId() != TYPEID_PLAYER)
                     return;
-
                 for(uint8 j = BASE_ATTACK; j <= OFF_ATTACK; ++j)
                 {
                     if(Item* item = ((Player*)m_caster)->GetWeaponForAttack(WeaponAttackType(j)))
@@ -1792,12 +1652,10 @@ void Spell::EffectDummy(uint32 i)
                         if(item->IsFitToSpellRequirements(m_spellInfo))
                         {
                             Spell *spell = new Spell(m_caster, spellInfo, true);
-
                             // enchanting spell selected by calculated damage-per-sec in enchanting effect
                             // at calculation applied affect from Elemental Weapons talent
                             // real enchantment damage-1
                             spell->m_currentBasePoints[1] = damage-1;
-
                             SpellCastTargets targets;
                             targets.setItemTarget( item );
                             spell->prepare(&targets);
@@ -1846,7 +1704,6 @@ void Spell::EffectDummy(uint32 i)
             {
                 if (m_caster->GetTypeId()!=TYPEID_PLAYER)
                     return;
-
                 if (Item *item = ((Player*)m_caster)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND))
                 {
                     // Damage is increased by 25% if your off-hand weapon is enchanted with Flametongue.
@@ -1920,7 +1777,6 @@ void Spell::EffectDummy(uint32 i)
             {
                 if ( m_caster->GetTypeId() != TYPEID_PLAYER)
                     return;
-
                 // Do we have talent Master of Ghouls?
                 if(m_caster->HasAura(52143))
                     // summon as pet
@@ -1928,7 +1784,6 @@ void Spell::EffectDummy(uint32 i)
                 else
                     // or guardian
                     bp = 46585;
-
                 if (m_targets.HasDst())
                 {
                     targets.setDst(&m_targets.m_dstPos);
@@ -1948,7 +1803,6 @@ void Spell::EffectDummy(uint32 i)
             {
                 if (m_targets.HasDst())
                     targets.setDst(&m_targets.m_dstPos);
-
                 spell_id = m_currentBasePoints[0];
             }
             // Corpse Explosion
@@ -1982,36 +1836,30 @@ void Spell::EffectDummy(uint32 i)
                     m_caster->RemoveAurasDueToSpell(50514, m_caster->GetGUID());
                 else
                     m_caster->ModifyPower(POWER_RUNIC_POWER,-30);
-
                 return;
             }
             break;
     }
-
     //spells triggered by dummy effect should not miss
     if(spell_id)
     {
         SpellEntry const *spellInfo = sSpellStore.LookupEntry( spell_id );
-
         if(!spellInfo)
         {
             sLog.outError("EffectDummy of spell %u: triggering unknown spell id %i\n", m_spellInfo->Id, spell_id);
             return;
         }
-
         targets.setUnitTarget(unitTarget);
         Spell* spell = new Spell(m_caster, spellInfo, triggered, m_originalCasterGUID, NULL, true);
         if(bp) spell->m_currentBasePoints[0] = bp;
         spell->prepare(&targets);
     }
-
     // pet auras
     if(PetAura const* petSpell = spellmgr.GetPetAura(m_spellInfo->Id,i))
     {
         m_caster->AddPetAura(petSpell);
         return;
     }
-
     // Script based implementation. Must be used only for not good for implementation in core spell effects
     // So called only for not proccessed cases
     if(gameObjTarget)
@@ -2021,56 +1869,43 @@ void Spell::EffectDummy(uint32 i)
     else if(itemTarget)
         Script->EffectDummyItem(m_caster, m_spellInfo->Id, i, itemTarget);
 }
-
 void Spell::EffectTriggerSpellWithValue(uint32 i)
 {
     uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[i];
-
     // normal case
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
-
     if(!spellInfo)
     {
         sLog.outError("EffectTriggerSpellWithValue of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
         return;
     }
-
     int32 bp = damage;
     m_caster->CastCustomSpell(unitTarget,triggered_spell_id,&bp,&bp,&bp,true,NULL,NULL,m_originalCasterGUID);
 }
-
 void Spell::EffectTriggerRitualOfSummoning(uint32 i)
 {
     uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[i];
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
-
     if(!spellInfo)
     {
         sLog.outError("EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
         return;
     }
-
     finish();
-
     m_caster->CastSpell(unitTarget,spellInfo,false);
 }
-
 void Spell::EffectForceCast(uint32 i)
 {
     if( !unitTarget )
         return;
-
     uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[i];
-
     // normal case
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
-
     if(!spellInfo)
     {
         sLog.outError("EffectForceCast of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
         return;
     }
-
     if (damage)
     {
         if(m_spellInfo->EffectBasePoints[i] > 0)
@@ -2087,10 +1922,8 @@ void Spell::EffectForceCast(uint32 i)
             return;
         }
     }
-
     unitTarget->CastSpell(unitTarget, spellInfo, true, NULL, NULL, m_originalCasterGUID);
 }
-
 void Spell::EffectTriggerSpell(uint32 effIndex)
 {
     // only unit case known
@@ -2100,9 +1933,7 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             sLog.outError("Spell::EffectTriggerSpell (Spell: %u): Unsupported non-unit case!",m_spellInfo->Id);
         return;
     }
-
     uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effIndex];
-
     // special cases
     switch(triggered_spell_id)
     {
@@ -2112,7 +1943,6 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             // Glyph of Mirror Image
             if (m_caster->HasAura(63093))
                m_caster->CastSpell(m_caster, 65047, true); // Mirror Image
-
             break;
         }
         // Vanish (not exist)
@@ -2120,11 +1950,9 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
         {
             unitTarget->RemoveMovementImpairingAuras();
             unitTarget->RemoveAurasByType(SPELL_AURA_MOD_STALKED);
-
             // if this spell is given to NPC it must handle rest by it's own AI
             if (unitTarget->GetTypeId() != TYPEID_PLAYER)
                 return;
-
             // get highest rank of the Stealth spell
             uint32 spellId = 0;
             SpellEntry const *spellInfo;
@@ -2134,26 +1962,21 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
                 // only highest rank is shown in spell book, so simply check if shown in spell book
                 if (!itr->second->active || itr->second->disabled || itr->second->state == PLAYERSPELL_REMOVED)
                     continue;
-
                 spellInfo = sSpellStore.LookupEntry(itr->first);
                 if (!spellInfo)
                     continue;
-
                 if (spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && spellInfo->SpellFamilyFlags[0] & SPELLFAMILYFLAG_ROGUE_STEALTH)
                 {
                     spellId = spellInfo->Id;
                     break;
                 }
             }
-
             // no Stealth spell found
             if (!spellId)
                 return;
-
             // reset cooldown on it if needed
             if (((Player*)unitTarget)->HasSpellCooldown(spellId))
                 ((Player*)unitTarget)->RemoveSpellCooldown(spellId);
-
             // Push stealth to list because it must be handled after combat remove
             m_TriggerSpells.push_back(spellInfo);
             return;
@@ -2164,7 +1987,6 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             unitTarget->RemoveMovementImpairingAuras();
             unitTarget->RemoveAurasByType(SPELL_AURA_MOD_STALKED);
             unitTarget->RemoveAurasByType(SPELL_AURA_MOD_STUN);
-
             // Cast Lesser Invisibility
             triggered_spell_id = 7870;
             break;
@@ -2180,7 +2002,6 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             SpellEntry const* spell = sSpellStore.LookupEntry(24575);
             if (!spell)
                 return;
-
             for (int j=0; j < spell->StackAmount; ++j)
                 m_caster->CastSpell(unitTarget, spell->Id, true, m_CastItem, NULL, m_originalCasterGUID);
             return;
@@ -2192,7 +2013,6 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             SpellEntry const* spell = sSpellStore.LookupEntry(26464);
             if (!spell)
                 return;
-
             for (int j=0; j < spell->StackAmount; ++j)
                 m_caster->CastSpell(unitTarget, spell->Id, true, m_CastItem, NULL, m_originalCasterGUID);
             return;
@@ -2232,7 +2052,6 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
             return;
         }
     }
-
     // normal case
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
     if (!spellInfo)
@@ -2240,59 +2059,47 @@ void Spell::EffectTriggerSpell(uint32 effIndex)
         sLog.outError("EffectTriggerSpell of spell %u: triggering unknown spell id %i", m_spellInfo->Id,triggered_spell_id);
         return;
     }
-
     // Remove spell cooldown (not category) if spell triggering spell with cooldown and same category
     // Needed by freezing arrow and few other spells
     if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->CategoryRecoveryTime && spellInfo->CategoryRecoveryTime
         && m_spellInfo->Category == spellInfo->Category)
         ((Player*)m_caster)->RemoveSpellCooldown(spellInfo->Id);
-
     // Note: not exist spells with weapon req. and IsSpellHaveCasterSourceTargets == true
     // so this just for speedup places in else
     Unit *caster = IsSpellWithCasterSourceTargetsOnly(spellInfo) ? unitTarget : m_caster;
-
     caster->CastSpell(unitTarget,spellInfo,true,NULL,NULL,m_originalCasterGUID);
 }
-
 void Spell::EffectTriggerMissileSpell(uint32 effect_idx)
 {
     uint32 triggered_spell_id = m_spellInfo->EffectTriggerSpell[effect_idx];
-
     // normal case
     SpellEntry const *spellInfo = sSpellStore.LookupEntry( triggered_spell_id );
-
     if(!spellInfo)
     {
         sLog.outError("EffectTriggerMissileSpell of spell %u (eff: %u): triggering unknown spell id %u",
             m_spellInfo->Id,effect_idx,triggered_spell_id);
         return;
     }
-
     if (m_CastItem)
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
-
     // Remove spell cooldown (not category) if spell triggering spell with cooldown and same category
     // Needed by freezing arrow and few other spells
     if (m_caster->GetTypeId() == TYPEID_PLAYER && m_spellInfo->CategoryRecoveryTime && spellInfo->CategoryRecoveryTime
         && m_spellInfo->Category == spellInfo->Category)
         ((Player*)m_caster)->RemoveSpellCooldown(spellInfo->Id);
-
     float x, y, z;
     m_targets.m_dstPos.GetPosition(x, y, z);
     m_caster->CastSpell(x, y, z, spellInfo->Id, true, m_CastItem, 0, m_originalCasterGUID);
 }
-
 void Spell::EffectJump(uint32 i)
 {
     if(m_caster->isInFlight())
         return;
-
     // Init dest coordinates
     float x,y,z,o;
     if(m_targets.HasDst())
     {
         m_targets.m_dstPos.GetPosition(x, y, z);
-
         if(m_spellInfo->EffectImplicitTargetA[i] == TARGET_DEST_TARGET_BACK)
         {
             // explicit cast data from client or server-side cast
@@ -2304,7 +2111,6 @@ void Spell::EffectJump(uint32 i)
                 pTarget = m_caster->getVictim();
             else if(m_caster->GetTypeId() == TYPEID_PLAYER)
                 pTarget = ObjectAccessor::GetUnit(*m_caster, ((Player*)m_caster)->GetSelection());
-
             o = pTarget ? pTarget->GetOrientation() : m_caster->GetOrientation();
         }
         else
@@ -2325,7 +2131,6 @@ void Spell::EffectJump(uint32 i)
         sLog.outError( "Spell::EffectJump - unsupported target mode for spell ID %u", m_spellInfo->Id );
         return;
     }
-
     //m_caster->NearTeleportTo(x,y,z,o,true);
     float speedZ;
     if(m_spellInfo->EffectMiscValue[i])
@@ -2337,19 +2142,16 @@ void Spell::EffectJump(uint32 i)
     float speedXY = m_caster->GetExactDist2d(x, y) * 10.0f / speedZ;
     m_caster->GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
 }
-
 void Spell::EffectTeleportUnits(uint32 i)
 {
     if(!unitTarget || unitTarget->isInFlight())
         return;
-
     // If not exist data for dest location - return
     if(!m_targets.HasDst())
     {
         sLog.outError( "Spell::EffectTeleportUnits - does not have destination for spell ID %u\n", m_spellInfo->Id );
         return;
     }
-
     // Init dest coordinates
     uint32 mapid = m_targets.m_dstPos.GetMapId();
     if(mapid == MAPID_INVALID) mapid = unitTarget->GetMapId();
@@ -2357,12 +2159,10 @@ void Spell::EffectTeleportUnits(uint32 i)
     m_targets.m_dstPos.GetPosition(x, y, z);
     float orientation = m_targets.getUnitTarget() ? m_targets.getUnitTarget()->GetOrientation() : unitTarget->GetOrientation();
     sLog.outDebug("Spell::EffectTeleportUnits - teleport unit to %u %f %f %f\n", mapid, x, y, z);
-
     if(mapid == unitTarget->GetMapId())
         unitTarget->NearTeleportTo(x, y, z, orientation, unitTarget == m_caster);
     else if(unitTarget->GetTypeId() == TYPEID_PLAYER)
         ((Player*)unitTarget)->TeleportTo(mapid, x, y, z, orientation, unitTarget==m_caster ? TELE_TO_SPELL : 0);
-
     // post effects for TARGET_DST_DB
     switch ( m_spellInfo->Id )
     {
@@ -2459,41 +2259,32 @@ void Spell::EffectTeleportUnits(uint32 i)
         }
     }
 }
-
 void Spell::EffectApplyAura(uint32 i)
 {
     if (m_spellAura)
         if (AuraEffect * AurEff = m_spellAura->GetPartAura(i))
             unitTarget->HandleAuraEffect(AurEff, true);
 }
-
 void Spell::EffectApplyAreaAura(uint32 i)
 {
     if (m_spellAura)
         if (AuraEffect * AurEff = m_spellAura->GetPartAura(i))
             unitTarget->HandleAuraEffect(AurEff, true);
 }
-
 void Spell::EffectUnlearnSpecialization( uint32 i )
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *_player = (Player*)unitTarget;
     uint32 spellToUnlearn = m_spellInfo->EffectTriggerSpell[i];
-
     _player->removeSpell(spellToUnlearn);
-
     sLog.outDebug( "Spell: Player %u has unlearned spell %u from NpcGUID: %u", _player->GetGUIDLow(), spellToUnlearn, m_caster->GetGUIDLow() );
 }
-
 void Spell::EffectPowerDrain(uint32 i)
 {
     if(m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
         return;
-
     Powers drain_power = Powers(m_spellInfo->EffectMiscValue[i]);
-
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
@@ -2502,41 +2293,31 @@ void Spell::EffectPowerDrain(uint32 i)
         return;
     if(damage < 0)
         return;
-
     uint32 curPower = unitTarget->GetPower(drain_power);
-
     //add spell damage bonus
     damage=m_caster->SpellDamageBonus(unitTarget,m_spellInfo,uint32(damage),SPELL_DIRECT_DAMAGE);
-
     // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
     uint32 power = damage;
     if ( drain_power == POWER_MANA && unitTarget->GetTypeId() == TYPEID_PLAYER )
         power -= ((Player*)unitTarget)->GetSpellCritDamageReduction(power);
-
     int32 new_damage;
     if(curPower < power)
         new_damage = curPower;
     else
         new_damage = power;
-
     unitTarget->ModifyPower(drain_power,-new_damage);
-
     // Don`t restore from self drain
     if(drain_power == POWER_MANA && m_caster != unitTarget)
     {
         float manaMultiplier = m_spellInfo->EffectMultipleValue[i];
         if(manaMultiplier==0)
             manaMultiplier = 1;
-
         if(Player *modOwner = m_caster->GetSpellModOwner())
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
-
         int32 gain = int32(new_damage * manaMultiplier);
-
         m_caster->EnergizeBySpell(m_caster, m_spellInfo->Id, gain, POWER_MANA);
     }
 }
-
 void Spell::EffectSendEvent(uint32 EffectIndex)
 {
     /*
@@ -2545,14 +2326,11 @@ void Spell::EffectSendEvent(uint32 EffectIndex)
     sLog.outDebug("Spell ScriptStart %u for spellid %u in EffectSendEvent ", m_spellInfo->EffectMiscValue[EffectIndex], m_spellInfo->Id);
     m_caster->GetMap()->ScriptsStart(sEventScripts, m_spellInfo->EffectMiscValue[EffectIndex], m_caster, focusObject);
 }
-
 void Spell::EffectPowerBurn(uint32 i)
 {
     if(m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
         return;
-
     Powers powertype = Powers(m_spellInfo->EffectMiscValue[i]);
-
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
@@ -2561,9 +2339,7 @@ void Spell::EffectPowerBurn(uint32 i)
         return;
     if(damage < 0)
         return;
-
     Unit* caster = m_originalCaster ? m_originalCaster : m_caster;
-
     // burn x% of target's mana, up to maximum of 2x% of caster's mana (Mana Burn)
     if(m_spellInfo->ManaCostPercentage)
     {
@@ -2571,22 +2347,16 @@ void Spell::EffectPowerBurn(uint32 i)
         damage = unitTarget->GetMaxPower(powertype) * damage / 100;
         if(damage > maxdamage) damage = maxdamage;
     }
-
     int32 curPower = int32(unitTarget->GetPower(powertype));
-
     uint32 power = damage;
     // resilience reduce mana draining effect at spell crit damage reduction (added in 2.4)
     if ( powertype == POWER_MANA && unitTarget->GetTypeId() == TYPEID_PLAYER )
         power -= ((Player*)unitTarget)->GetSpellCritDamageReduction(power);
-
     int32 new_damage = (curPower < power) ? curPower : power;
-
     unitTarget->ModifyPower(powertype, -new_damage);
     float multiplier = m_spellInfo->EffectMultipleValue[i];
-
     if(Player *modOwner = m_caster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
-
     new_damage = int32(new_damage*multiplier);
     //m_damage+=new_damage; should not apply spell bonus
     //TODO: no log
@@ -2594,24 +2364,19 @@ void Spell::EffectPowerBurn(uint32 i)
     if(m_originalCaster)
         m_originalCaster->DealDamage(unitTarget, new_damage);
 }
-
 void Spell::EffectHeal( uint32 /*i*/ )
 {
 }
-
 void Spell::SpellDamageHeal(uint32 /*i*/)
 {
     if( unitTarget && unitTarget->isAlive() && damage >= 0)
     {
         // Try to get original caster
         Unit *caster = m_originalCasterGUID ? m_originalCaster : m_caster;
-
         // Skip if m_originalCaster not available
         if (!caster)
             return;
-
         int32 addhealth = damage;
-
         // Vessel of the Naaru (Vial of the Sunwell trinket)
         if (m_spellInfo->Id == 45064)
         {
@@ -2622,7 +2387,6 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
                 damageAmount+= aurEff->GetAmount();
                 m_caster->RemoveAurasDueToSpell(45062);
             }
-
             addhealth += damageAmount;
         }
         // Swiftmend - consumes Regrowth or Rejuvenation
@@ -2640,19 +2404,16 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
                         targetAura = *i;
                 }
             }
-
             if(!targetAura)
             {
                 sLog.outError("Target(GUID:" UI64FMTD ") has aurastate AURA_STATE_SWIFTMEND but no matching aura.", unitTarget->GetGUID());
                 return;
             }
-
             int32 tickheal = targetAura->GetAmount();
             if(Unit* auraCaster = targetAura->GetCaster())
                 tickheal = auraCaster->SpellHealingBonus(unitTarget, targetAura->GetSpellProto(), tickheal, DOT);
             //int32 tickheal = targetAura->GetSpellProto()->EffectBasePoints[idx] + 1;
             //It is said that talent bonus should not be included
-
             int32 tickcount = 0;
             // Rejuvenation
             if (targetAura->GetSpellProto()->SpellFamilyFlags[0] & 0x10)
@@ -2660,13 +2421,10 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
             // Regrowth
             else // if (targetAura->GetSpellProto()->SpellFamilyFlags[0] & 0x40)
                 tickcount = 6;
-
             addhealth += tickheal * tickcount;
-
             // Glyph of Swiftmend
             if(!caster->HasAura(54824))
                 unitTarget->RemoveAura(targetAura->GetId(), targetAura->GetCasterGUID());
-
             //addhealth += tickheal * tickcount;
             //addhealth = caster->SpellHealingBonus(m_spellInfo, addhealth,HEAL, unitTarget);
         }
@@ -2688,35 +2446,28 @@ void Spell::SpellDamageHeal(uint32 /*i*/)
         }
         else
             addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, addhealth, HEAL);
-
         m_damage -= addhealth;
     }
 }
-
 void Spell::EffectHealPct( uint32 /*i*/ )
 {
     if( unitTarget && unitTarget->isAlive() && damage >= 0)
     {
         // Try to get original caster
         Unit *caster = m_originalCasterGUID ? m_originalCaster : m_caster;
-
         // Skip if m_originalCaster not available
         if (!caster)
             return;
-
         // Rune Tap - Party
         if (m_spellInfo->Id == 59754 && unitTarget == m_caster)
             return;
-
         uint32 addhealth = unitTarget->GetMaxHealth() * damage / 100;
         if(Player* modOwner = m_caster->GetSpellModOwner())
             modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DAMAGE, addhealth, this);
-
         int32 gain = caster->DealHeal(unitTarget, addhealth, m_spellInfo);
         unitTarget->getHostilRefManager().threatAssist(m_caster, float(gain) * 0.5f, m_spellInfo);
     }
 }
-
 void Spell::EffectHealMechanical( uint32 /*i*/ )
 {
     // Mechanic creature type should be correctly checked by targetCreatureType field
@@ -2724,33 +2475,25 @@ void Spell::EffectHealMechanical( uint32 /*i*/ )
     {
         // Try to get original caster
         Unit *caster = m_originalCasterGUID ? m_originalCaster : m_caster;
-
         // Skip if m_originalCaster not available
         if (!caster)
             return;
-
         uint32 addhealth = caster->SpellHealingBonus(unitTarget, m_spellInfo, uint32(damage), HEAL);
         caster->DealHeal(unitTarget, addhealth, m_spellInfo);
     }
 }
-
 void Spell::EffectHealthLeech(uint32 i)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     if(damage < 0)
         return;
-
     sLog.outDebug("HealthLeech :%i", damage);
-
     float multiplier = m_spellInfo->EffectMultipleValue[i];
-
     if(Player *modOwner = m_caster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);
-
     // Do not apply multiplier to damage if it's Death Coil
     int32 new_damage;
     if (m_spellInfo->SpellFamilyFlags[0] & 0x80000)
@@ -2761,7 +2504,6 @@ void Spell::EffectHealthLeech(uint32 i)
     new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage );
     if(curHealth < new_damage)
         new_damage = curHealth;
-
     if(m_caster->isAlive())
     {
         // Insead add it just to healing if it's Death Coil
@@ -2773,14 +2515,11 @@ void Spell::EffectHealthLeech(uint32 i)
 //    m_healthLeech+=tmpvalue;
 //    m_damage+=new_damage;
 }
-
 void Spell::DoCreateItem(uint32 i, uint32 itemtype)
 {
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* player = (Player*)unitTarget;
-
     uint32 newitemid = itemtype;
     ItemPrototype const *pProto = objmgr.GetItemPrototype( newitemid );
     if(!pProto)
@@ -2788,7 +2527,6 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
         player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     // bg reward have some special in code work
     uint32 bgType = 0;
     switch(m_spellInfo->Id)
@@ -2808,9 +2546,7 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
         default:
             break;
     }
-
     uint32 num_to_add;
-
     // TODO: maybe all this can be replaced by using correct calculated `damage` value
     if(pProto->Class != ITEM_CLASS_CONSUMABLE || m_spellInfo->SpellFamilyName != SPELLFAMILY_MAGE)
     {
@@ -2833,12 +2569,10 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
     }
     else
         num_to_add = 2;
-
     if (num_to_add < 1)
         num_to_add = 1;
     if (num_to_add > pProto->GetMaxStackSize())
         num_to_add = pProto->GetMaxStackSize();
-
     // init items_count to 1, since 1 item will be created regardless of specialization
     int items_count=1;
     // the chance to create additional items
@@ -2852,10 +2586,8 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
         while ( roll_chance_f(additionalCreateChance) && items_count<=additionalMaxNum )
             ++items_count;
     }
-
     // really will be created more items
     num_to_add *= items_count;
-
     // can the player store the new item?
     ItemPosCountVec dest;
     uint32 no_space = 0;
@@ -2872,32 +2604,26 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
             return;
         }
     }
-
     if(num_to_add)
     {
         // create the new item and store it
         Item* pItem = player->StoreNewItem( dest, newitemid, true, Item::GenerateItemRandomPropertyId(newitemid));
-
         // was it successful? return error if not
         if(!pItem)
         {
             player->SendEquipError( EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
             return;
         }
-
         // set the "Crafted by ..." property of the item
         if( pItem->GetProto()->Class != ITEM_CLASS_CONSUMABLE && pItem->GetProto()->Class != ITEM_CLASS_QUEST)
             pItem->SetUInt32Value(ITEM_FIELD_CREATOR, player->GetGUIDLow());
-
         // send info to the client
         if(pItem)
             player->SendNewItem(pItem, num_to_add, true, bgType == 0);
-
         // we succeeded in creating at least one item, so a levelup is possible
         if(bgType == 0)
             player->UpdateCraftSkill(m_spellInfo->Id);
     }
-
 /*
     // for battleground marks send by mail if not add all expected
     if(no_space > 0 && bgType)
@@ -2905,49 +2631,39 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
         if(BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BattleGroundTypeId(bgType)))
             bg->SendRewardMarkByMail(player, newitemid, no_space);
     }
-*/    
+*/
 }
-
 void Spell::EffectCreateItem(uint32 i)
 {
     DoCreateItem(i,m_spellInfo->EffectItemType[i]);
 }
-
 void Spell::EffectCreateItem2(uint32 i)
 {
     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
         return;
     Player* player = (Player*)m_caster;
-
     uint32 item_id = m_spellInfo->EffectItemType[i];
-
     DoCreateItem(i, item_id);
-
     // special case: fake item replaced by generate using spell_loot_template
     if(IsLootCraftingSpell(m_spellInfo))
     {
         if(!player->HasItemCount(item_id, 1))
             return;
-
         // remove reagent
         uint32 count = 1;
         player->DestroyItemCount(item_id, count, true);
-
         // create some random items
         player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);
     }
 }
-
 void Spell::EffectCreateRandomItem(uint32 i)
 {
     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
         return;
     Player* player = (Player*)m_caster;
-
     // create some random items
     player->AutoStoreLoot(m_spellInfo->Id, LootTemplates_Spell);
 }
-
 void Spell::EffectPersistentAA(uint32 i)
 {
     if(m_spellDynObj)
@@ -2956,11 +2672,9 @@ void Spell::EffectPersistentAA(uint32 i)
         m_spellDynObj->AddEffect(i);
         return;
     }
-
     float radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
     if(Player* modOwner = m_originalCaster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, radius);
-
     Unit *caster = m_caster->GetEntry() == WORLD_TRIGGER ? m_originalCaster : m_caster;
     int32 duration = GetSpellDuration(m_spellInfo);
     DynamicObject* dynObj = new DynamicObject;
@@ -2974,19 +2688,15 @@ void Spell::EffectPersistentAA(uint32 i)
     dynObj->GetMap()->Add(dynObj);
     m_spellDynObj = dynObj;
 }
-
 void Spell::EffectEnergize(uint32 i)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     if(m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
         return;
-
     Powers power = Powers(m_spellInfo->EffectMiscValue[i]);
-
     // Some level depends spells
     int level_multiplier = 0;
     int level_diff = 0;
@@ -3014,18 +2724,13 @@ void Spell::EffectEnergize(uint32 i)
         default:
             break;
     }
-
     if (level_diff > 0)
         damage -= level_multiplier * level_diff;
-
     if(damage < 0)
         return;
-
     if(unitTarget->GetMaxPower(power) == 0)
         return;
-
     m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, damage, power);
-
     // Mad Alchemist's Potion
     if (m_spellInfo->Id == 45051)
     {
@@ -3038,10 +2743,8 @@ void Spell::EffectEnergize(uint32 i)
             if(uint32 mask = spellmgr.GetSpellElixirMask(spell_id))
                 elixir_mask |= mask;
         }
-
         // get available elixir mask any not active type from battle/guardian (and flask if no any)
         elixir_mask = (elixir_mask & ELIXIR_FLASK_MASK) ^ ELIXIR_FLASK_MASK;
-
         // get all available elixirs by mask and spell level
         std::vector<uint32> elixirs;
         SpellElixirMap const& m_spellElixirs = spellmgr.GetSpellElixirMap();
@@ -3051,15 +2754,12 @@ void Spell::EffectEnergize(uint32 i)
             {
                 if (itr->second & (ELIXIR_UNSTABLE_MASK | ELIXIR_SHATTRATH_MASK))
                     continue;
-
                 SpellEntry const *spellInfo = sSpellStore.LookupEntry(itr->first);
                 if (spellInfo && (spellInfo->spellLevel < m_spellInfo->spellLevel || spellInfo->spellLevel > unitTarget->getLevel()))
                     continue;
-
                 elixirs.push_back(itr->first);
             }
         }
-
         if (!elixirs.empty())
         {
             // cast random elixir on target
@@ -3068,38 +2768,30 @@ void Spell::EffectEnergize(uint32 i)
         }
     }
 }
-
 void Spell::EffectEnergizePct(uint32 i)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     if(m_spellInfo->EffectMiscValue[i] < 0 || m_spellInfo->EffectMiscValue[i] >= MAX_POWERS)
         return;
-
     Powers power = Powers(m_spellInfo->EffectMiscValue[i]);
-
     uint32 maxPower = unitTarget->GetMaxPower(power);
     if(maxPower == 0)
         return;
-
     uint32 gain = damage * maxPower / 100;
     m_caster->EnergizeBySpell(unitTarget, m_spellInfo->Id, gain, power);
 }
-
 void Spell::SendLoot(uint64 guid, LootType loottype)
 {
     Player* player = (Player*)m_caster;
     if (!player)
         return;
-
     if (gameObjTarget)
     {
         if (Script->GOHello(player, gameObjTarget))
             return;
-
         switch (gameObjTarget->GetGoType())
         {
             case GAMEOBJECT_TYPE_DOOR:
@@ -3107,19 +2799,16 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
                 gameObjTarget->UseDoorOrButton();
                 player->GetMap()->ScriptsStart(sGameObjectScripts, gameObjTarget->GetDBTableGUIDLow(), player, gameObjTarget);
                 return;
-
             case GAMEOBJECT_TYPE_QUESTGIVER:
                 // start or end quest
                 player->PrepareQuestMenu(guid);
                 player->SendPreparedQuest(guid);
                 return;
-
             case GAMEOBJECT_TYPE_SPELL_FOCUS:
                 // triggering linked GO
                 if(uint32 trapEntry = gameObjTarget->GetGOInfo()->spellFocus.linkedTrapId)
                     gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
                 return;
-
             case GAMEOBJECT_TYPE_GOOBER:
                 // goober_scripts can be triggered if the player don't have the quest
                 if (gameObjTarget->GetGOInfo()->goober.eventId)
@@ -3128,31 +2817,24 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
                     player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->goober.eventId, player, gameObjTarget);
                     gameObjTarget->EventInform(gameObjTarget->GetGOInfo()->goober.eventId);
                 }
-
                 // cast goober spell
                 if (gameObjTarget->GetGOInfo()->goober.questId)
                     ///Quest require to be active for GO using
                     if(player->GetQuestStatus(gameObjTarget->GetGOInfo()->goober.questId) != QUEST_STATUS_INCOMPLETE)
                         return;
-
                 Script->GOHello(player, gameObjTarget);
                 gameObjTarget->GetMap()->ScriptsStart(sGameObjectScripts, gameObjTarget->GetDBTableGUIDLow(), player, gameObjTarget);
-
                 gameObjTarget->AddUniqueUse(player);
                 gameObjTarget->SetLootState(GO_JUST_DEACTIVATED);
-
                 //TODO? Objective counting called without spell check but with quest objective check
                 // if send spell id then this line will duplicate to spell casting call (double counting)
                 // So we or have this line and not required in quest_template have reqSpellIdN
                 // or must remove this line and required in DB have data in quest_template have reqSpellIdN for all quest using cases.
                 player->CastedCreatureOrGO(gameObjTarget->GetEntry(), gameObjTarget->GetGUID(), 0);
-
                 // triggering linked GO
                 if(uint32 trapEntry = gameObjTarget->GetGOInfo()->goober.linkedTrapId)
                     gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
-
                 return;
-
             case GAMEOBJECT_TYPE_CHEST:
                 // TODO: possible must be moved to loot release (in different from linked triggering)
                 if (gameObjTarget->GetGOInfo()->chest.eventId)
@@ -3160,21 +2842,17 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
                     sLog.outDebug("Chest ScriptStart id %u for GO %u", gameObjTarget->GetGOInfo()->chest.eventId,gameObjTarget->GetDBTableGUIDLow());
                     player->GetMap()->ScriptsStart(sEventScripts, gameObjTarget->GetGOInfo()->chest.eventId, player, gameObjTarget);
                 }
-
                 // triggering linked GO
                 if(uint32 trapEntry = gameObjTarget->GetGOInfo()->chest.linkedTrapId)
                     gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
-
                 // Don't return, let loots been taken
             default:
                 break;
         }
     }
-
     // Send loot
     player->SendLoot(guid, loottype);
 }
-
 void Spell::EffectOpenLock(uint32 effIndex)
 {
     if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -3182,12 +2860,9 @@ void Spell::EffectOpenLock(uint32 effIndex)
         sLog.outDebug( "WORLD: Open Lock - No Player Caster!");
         return;
     }
-
     Player* player = (Player*)m_caster;
-
     uint32 lockId = 0;
     uint64 guid = 0;
-
     // Get lockId
     if(gameObjTarget)
     {
@@ -3234,20 +2909,16 @@ void Spell::EffectOpenLock(uint32 effIndex)
         sLog.outDebug( "WORLD: Open Lock - No GameObject/Item Target!");
         return;
     }
-
     SkillType skillId = SKILL_NONE;
     int32 reqSkillValue = 0;
     int32 skillValue;
-
     SpellCastResult res = CanOpenLock(effIndex, lockId, skillId, reqSkillValue, skillValue);
     if(res != SPELL_CAST_OK)
     {
         SendCastResult(res);
         return;
     }
-
     SendLoot(guid, LOOT_SKINNING);
-
     // not allow use skill grow at item base open
     if(!m_CastItem && skillId != SKILL_NONE)
     {
@@ -3269,44 +2940,34 @@ void Spell::EffectOpenLock(uint32 effIndex)
         }
     }
 }
-
 void Spell::EffectSummonChangeItem(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *player = (Player*)m_caster;
-
     // applied only to using item
     if(!m_CastItem)
         return;
-
     // ... only to item in own inventory/bank/equip_slot
     if(m_CastItem->GetOwnerGUID()!=player->GetGUID())
         return;
-
     uint32 newitemid = m_spellInfo->EffectItemType[i];
     if(!newitemid)
         return;
-
     uint16 pos = m_CastItem->GetPos();
-
     Item *pNewItem = Item::CreateItem( newitemid, 1, player);
     if( !pNewItem )
         return;
-
     for(uint8 j= PERM_ENCHANTMENT_SLOT; j<=TEMP_ENCHANTMENT_SLOT; ++j)
     {
         if(m_CastItem->GetEnchantmentId(EnchantmentSlot(j)))
             pNewItem->SetEnchantment(EnchantmentSlot(j), m_CastItem->GetEnchantmentId(EnchantmentSlot(j)), m_CastItem->GetEnchantmentDuration(EnchantmentSlot(j)), m_CastItem->GetEnchantmentCharges(EnchantmentSlot(j)));
     }
-
     if(m_CastItem->GetUInt32Value(ITEM_FIELD_DURABILITY) < m_CastItem->GetUInt32Value(ITEM_FIELD_MAXDURABILITY))
     {
         double loosePercent = 1 - m_CastItem->GetUInt32Value(ITEM_FIELD_DURABILITY) / double(m_CastItem->GetUInt32Value(ITEM_FIELD_MAXDURABILITY));
         player->DurabilityLoss(pNewItem, loosePercent);
     }
-
     if( player->IsInventoryPos( pos ) )
     {
         ItemPosCountVec dest;
@@ -3314,13 +2975,10 @@ void Spell::EffectSummonChangeItem(uint32 i)
         if( msg == EQUIP_ERR_OK )
         {
             player->DestroyItem(m_CastItem->GetBagSlot(), m_CastItem->GetSlot(), true);
-
             // prevent crash at access and unexpected charges counting with item update queue corrupt
             if(m_CastItem==m_targets.getItemTarget())
                 m_targets.setItemTarget(NULL);
-
             m_CastItem = NULL;
-
             player->StoreItem( dest, pNewItem, true);
             return;
         }
@@ -3332,13 +2990,10 @@ void Spell::EffectSummonChangeItem(uint32 i)
         if( msg == EQUIP_ERR_OK )
         {
             player->DestroyItem(m_CastItem->GetBagSlot(), m_CastItem->GetSlot(), true);
-
             // prevent crash at access and unexpected charges counting with item update queue corrupt
             if(m_CastItem==m_targets.getItemTarget())
                 m_targets.setItemTarget(NULL);
-
             m_CastItem = NULL;
-
             player->BankItem( dest, pNewItem, true);
             return;
         }
@@ -3350,29 +3005,23 @@ void Spell::EffectSummonChangeItem(uint32 i)
         if( msg == EQUIP_ERR_OK )
         {
             player->DestroyItem(m_CastItem->GetBagSlot(), m_CastItem->GetSlot(), true);
-
             // prevent crash at access and unexpected charges counting with item update queue corrupt
             if(m_CastItem==m_targets.getItemTarget())
                 m_targets.setItemTarget(NULL);
-
             m_CastItem = NULL;
-
             player->EquipItem( dest, pNewItem, true);
             player->AutoUnequipOffhandIfNeed();
             return;
         }
     }
-
     // fail
     delete pNewItem;
 }
-
 void Spell::EffectProficiency(uint32 /*i*/)
 {
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
     Player *p_target = (Player*)unitTarget;
-
     uint32 subClassMask = m_spellInfo->EquippedItemSubClassMask;
     if(m_spellInfo->EquippedItemClass == ITEM_CLASS_WEAPON && !(p_target->GetWeaponProficiency() & subClassMask))
     {
@@ -3385,36 +3034,28 @@ void Spell::EffectProficiency(uint32 /*i*/)
         p_target->SendProficiency(ITEM_CLASS_ARMOR, p_target->GetArmorProficiency());
     }
 }
-
 void Spell::EffectSummonType(uint32 i)
 {
     uint32 entry = m_spellInfo->EffectMiscValue[i];
     if(!entry)
         return;
-
     SummonPropertiesEntry const *properties = sSummonPropertiesStore.LookupEntry(m_spellInfo->EffectMiscValueB[i]);
     if(!properties)
     {
         sLog.outError("EffectSummonType: Unhandled summon type %u", m_spellInfo->EffectMiscValueB[i]);
         return;
     }
-
     if(!m_originalCaster)
         return;
-
     int32 duration = GetSpellDuration(m_spellInfo);
     if(Player* modOwner = m_originalCaster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
-
     Position pos;
     GetSummonPosition(i, pos);
-
     /*//totem must be at same Z in case swimming caster and etc.
         if( fabs( z - m_caster->GetPositionZ() ) > 5 )
             z = m_caster->GetPositionZ();
-
     uint32 level = m_caster->getLevel();
-
     // level of creature summoned using engineering item based at engineering skill level
     if(m_caster->GetTypeId()==TYPEID_PLAYER && m_CastItem)
     {
@@ -3428,9 +3069,7 @@ void Spell::EffectSummonType(uint32 i)
             }
         }
     }*/
-
     TempSummon *summon = NULL;
-
     switch(properties->Category)
     {
         default:
@@ -3456,15 +3095,12 @@ void Spell::EffectSummonType(uint32 i)
                     summon = m_caster->GetMap()->SummonCreature(entry, pos, properties, duration, m_originalCaster);
                     if(!summon || !summon->isTotem())
                         return;
-
                     if(damage)                                             // if not spell info, DB values used
                     {
                         summon->SetMaxHealth(damage);
                         summon->SetHealth(damage);
                     }
-
                     //summon->SetUInt32Value(UNIT_CREATED_BY_SPELL,m_spellInfo->Id);
-
                     if(m_originalCaster->GetTypeId() == TYPEID_PLAYER
                         && properties->Slot >= SUMMON_SLOT_TOTEM
                         && properties->Slot < MAX_TOTEM_SLOT)
@@ -3484,15 +3120,11 @@ void Spell::EffectSummonType(uint32 i)
                     summon = m_caster->GetMap()->SummonCreature(entry, pos, properties, duration, m_originalCaster);
                     if(!summon || !summon->HasUnitTypeMask(UNIT_MASK_MINION))
                         return;
-
                     //summon->InitPetCreateSpells();                         // e.g. disgusting oozeling has a create spell as summon...
                     summon->SelectLevel(summon->GetCreatureInfo());       // some summoned creaters have different from 1 DB data for level/hp
                     summon->SetUInt32Value(UNIT_NPC_FLAGS, summon->GetCreatureInfo()->npcflag);
-
                     summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-
                     summon->AI()->EnterEvadeMode();
-
                     std::string name = m_originalCaster->GetName();
                     name.append(petTypeSuffix[3]);
                     summon->SetName( name );
@@ -3501,17 +3133,13 @@ void Spell::EffectSummonType(uint32 i)
                 default:
                 {
                     float radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
-
                     int32 amount = damage > 0 ? damage : 1;
                     if (m_spellInfo->Id == 18662) // Curse of Doom
                         amount = 1;
-
                     for(uint32 count = 0; count < amount; ++count)
                     {
                         GetSummonPosition(i, pos, radius, count);
-
                         TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN;
-
                         TempSummon * summon = m_originalCaster->SummonCreature(entry, pos, summonType, duration);
                         if (!summon)
                             continue;
@@ -3539,49 +3167,38 @@ void Spell::EffectSummonType(uint32 i)
             summon = m_caster->GetMap()->SummonCreature(entry, pos, properties, duration, m_caster);
             if(!summon || !summon->IsVehicle())
                 return;
-
             if(damage)
                 m_caster->CastSpell(summon, damage, true);
             m_caster->EnterVehicle(summon->GetVehicleKit());
             break;
         }
     }
-
     if(summon)
     {
         summon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
     }
 }
-
 void Spell::EffectLearnSpell(uint32 i)
 {
     if(!unitTarget)
         return;
-
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
     {
         if(m_caster->GetTypeId() == TYPEID_PLAYER)
             EffectLearnPetSpell(i);
-
         return;
     }
-
     Player *player = (Player*)unitTarget;
-
     uint32 spellToLearn = ((m_spellInfo->Id==SPELL_ID_GENERIC_LEARN) || (m_spellInfo->Id==SPELL_ID_GENERIC_LEARN_PET)) ? damage : m_spellInfo->EffectTriggerSpell[i];
     player->learnSpell(spellToLearn,false);
-
     sLog.outDebug( "Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow() );
 }
-
 typedef std::list< std::pair<uint32, uint64> > DispelList;
 void Spell::EffectDispel(uint32 i)
 {
     if(!unitTarget)
         return;
-
     Unit::AuraList dispel_list;
-
     // Create dispel mask by dispel type
     uint32 dispel_type = m_spellInfo->EffectMiscValue[i];
     uint32 dispelMask  = GetDispellMask( DispelType(dispel_type) );
@@ -3594,21 +3211,17 @@ void Spell::EffectDispel(uint32 i)
             if(aur->GetSpellProto()->Dispel == DISPEL_MAGIC)
             {
                 bool positive = aur->IsPositive() ? (!(aur->GetSpellProto()->AttributesEx & SPELL_ATTR_EX_NEGATIVE)) : false;
-
                 // do not remove positive auras if friendly target
                 //               negative auras if non-friendly target
                 if(positive == unitTarget->IsFriendlyTo(m_caster))
                     continue;
             }
-
             for (uint8 i = aur->GetStackAmount(); i; --i)
                 dispel_list.push_back(aur);
         }
     }
-
     if (dispel_list.empty())
         return;
-
     // Ok if exist some buffs for dispel try dispel it
     uint32 failCount = 0;
     DispelList success_list;
@@ -3619,7 +3232,6 @@ void Spell::EffectDispel(uint32 i)
         // Random select buff for dispel
         Unit::AuraList::iterator itr = dispel_list.begin();
         std::advance(itr, urand(0, dispel_list.size() - 1));
-
         if (GetDispelChance((*itr)->GetCaster(), (*itr)->GetId()))
         {
             success_list.push_back(std::make_pair((*itr)->GetId(), (*itr)->GetCasterGUID()));
@@ -3638,13 +3250,10 @@ void Spell::EffectDispel(uint32 i)
             dataFail << uint32((*itr)->GetId());                         // Spell Id
         }
     }
-
     if (failCount)
         m_caster->SendMessageToSet(&dataFail, true);
-
     if (success_list.empty())
         return;
-
     WorldPacket dataSuccess(SMSG_SPELLDISPELLOG, 8+8+4+1+4+damage*5);
     // Send packet header
     dataSuccess.append(unitTarget->GetPackGUID());         // Victim GUID
@@ -3660,7 +3269,6 @@ void Spell::EffectDispel(uint32 i)
         unitTarget->RemoveAurasDueToSpellByDispel(itr->first, itr->second, m_caster);
     }
     m_caster->SendMessageToSet(&dataSuccess, true);
-
     // On success dispel
     // Devour Magic
     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK && m_spellInfo->Category == SPELLCATEGORY_DEVOUR_MAGIC)
@@ -3669,32 +3277,26 @@ void Spell::EffectDispel(uint32 i)
         m_caster->CastCustomSpell(m_caster, 19658, &heal_amount, NULL, NULL, true);
     }
 }
-
 void Spell::EffectDualWield(uint32 /*i*/)
 {
     unitTarget->SetCanDualWield(true);
     if(unitTarget->GetTypeId() == TYPEID_UNIT)
         ((Creature*)unitTarget)->UpdateDamagePhysical(OFF_ATTACK);
 }
-
 void Spell::EffectPull(uint32 /*i*/)
 {
     // TODO: create a proper pull towards distract spell center for distract
     sLog.outDebug("WORLD: Spell Effect DUMMY");
 }
-
 void Spell::EffectDistract(uint32 /*i*/)
 {
     // Check for possible target
     if (!unitTarget || unitTarget->isInCombat())
         return;
-
     // target must be OK to do this
     if( unitTarget->hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_STUNNED | UNIT_STAT_FLEEING ) )
         return;
-
     float angle = unitTarget->GetAngle(&m_targets.m_dstPos);
-
     if ( unitTarget->GetTypeId() == TYPEID_PLAYER )
     {
         // For players just turn them
@@ -3709,21 +3311,17 @@ void Spell::EffectDistract(uint32 /*i*/)
         unitTarget->GetMotionMaster()->MoveDistract(damage * IN_MILISECONDS);
     }
 }
-
 void Spell::EffectPickPocket(uint32 /*i*/)
 {
     if( m_caster->GetTypeId() != TYPEID_PLAYER )
         return;
-
     // victim must be creature and attackable
     if( !unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT || m_caster->IsFriendlyTo(unitTarget) )
         return;
-
     // victim have to be alive and humanoid or undead
     if( unitTarget->isAlive() && (unitTarget->GetCreatureTypeMask() &CREATURE_TYPEMASK_HUMANOID_OR_UNDEAD) != 0)
     {
         int32 chance = 10 + int32(m_caster->getLevel()) - int32(unitTarget->getLevel());
-
         if (chance > irand(0, 19))
         {
             // Stealing successful
@@ -3738,12 +3336,10 @@ void Spell::EffectPickPocket(uint32 /*i*/)
         }
     }
 }
-
 void Spell::EffectAddFarsight(uint32 i)
 {
     if (m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     float radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
     int32 duration = GetSpellDuration(m_spellInfo);
     DynamicObject* dynObj = new DynamicObject;
@@ -3754,49 +3350,37 @@ void Spell::EffectAddFarsight(uint32 i)
     }
     dynObj->SetUInt32Value(DYNAMICOBJECT_BYTES, 0x80000002);
     m_caster->AddDynObject(dynObj);
-
     dynObj->setActive(true);    //must before add to map to be put in world container
     dynObj->GetMap()->Add(dynObj); //grid will also be loaded
-
     // Need to update visibility of object for client to accept farsight guid
     ((Player*)m_caster)->SetViewpoint(dynObj, true);
     //((Player*)m_caster)->UpdateVisibilityOf(dynObj);
 }
-
 void Spell::EffectTeleUnitsFaceCaster(uint32 i)
 {
     if(!unitTarget)
         return;
-
     if(unitTarget->isInFlight())
         return;
-
     float dis = m_caster->GetSpellRadiusForTarget(unitTarget, sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
-
     float fx,fy,fz;
     m_caster->GetClosePoint(fx,fy,fz,unitTarget->GetObjectSize(),dis);
-
     unitTarget->NearTeleportTo(fx,fy,fz,-m_caster->GetOrientation(),unitTarget==m_caster);
 }
-
 void Spell::EffectLearnSkill(uint32 i)
 {
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(damage < 0)
         return;
-
     uint32 skillid =  m_spellInfo->EffectMiscValue[i];
     uint16 skillval = ((Player*)unitTarget)->GetPureSkillValue(skillid);
     ((Player*)unitTarget)->SetSkill(skillid, skillval?skillval:1, damage*75);
 }
-
 void Spell::EffectAddHonor(uint32 /*i*/)
 {
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // not scale value for item based reward (/10 value expected)
     if(m_CastItem)
     {
@@ -3804,7 +3388,6 @@ void Spell::EffectAddHonor(uint32 /*i*/)
         sLog.outError("SpellEffect::AddHonor (spell_id %u) rewards %d honor points (item %u) for player: %u", m_spellInfo->Id, damage/10, m_CastItem->GetEntry(),((Player*)unitTarget)->GetGUIDLow());
         return;
     }
-
     // do not allow to add too many honor for player (50 * 21) = 1040 at level 70, or (50 * 31) = 1550 at level 80
     if( damage <= 50)
     {
@@ -3819,7 +3402,6 @@ void Spell::EffectAddHonor(uint32 /*i*/)
         sLog.outError("SpellEffect::AddHonor (spell_id %u) rewards %u honor points (non scale) for player: %u", m_spellInfo->Id, damage, ((Player*)unitTarget)->GetGUIDLow());
     }
 }
-
 void Spell::EffectTradeSkill(uint32 /*i*/)
 {
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
@@ -3828,16 +3410,13 @@ void Spell::EffectTradeSkill(uint32 /*i*/)
     // uint16 skillmax = ((Player*)unitTarget)->(skillid);
     // ((Player*)unitTarget)->SetSkill(skillid,skillval?skillval:1,skillmax+75);
 }
-
 void Spell::EffectEnchantItemPerm(uint32 effect_idx)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
     if (!itemTarget)
         return;
-
     Player* p_caster = (Player*)m_caster;
-
     // Handle vellums
     if (itemTarget->IsWeaponVellum() || itemTarget->IsArmorVellum())
     {
@@ -3855,20 +3434,16 @@ void Spell::EffectEnchantItemPerm(uint32 effect_idx)
         // do not increase skill if vellum used
         if (!(m_CastItem && m_CastItem->GetProto()->Flags & ITEM_FLAGS_TRIGGERED_CAST))
             p_caster->UpdateCraftSkill(m_spellInfo->Id);
-
         uint32 enchant_id = m_spellInfo->EffectMiscValue[effect_idx];
         if (!enchant_id)
             return;
-
         SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!pEnchant)
             return;
-
         // item can be in trade slot and have owner diff. from caster
         Player* item_owner = itemTarget->GetOwner();
         if(!item_owner)
             return;
-
         if(item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
         {
             sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
@@ -3876,34 +3451,26 @@ void Spell::EffectEnchantItemPerm(uint32 effect_idx)
                 itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
                 item_owner->GetName(),item_owner->GetSession()->GetAccountId());
         }
-
         // remove old enchanting before applying new if equipped
         item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,false);
-
         itemTarget->SetEnchantment(PERM_ENCHANTMENT_SLOT, enchant_id, 0, 0);
-
         // add new enchanting if equipped
         item_owner->ApplyEnchantment(itemTarget,PERM_ENCHANTMENT_SLOT,true);
     }
 }
-
 void Spell::EffectEnchantItemPrismatic(uint32 effect_idx)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
     if (!itemTarget)
         return;
-
     Player* p_caster = (Player*)m_caster;
-
     uint32 enchant_id = m_spellInfo->EffectMiscValue[effect_idx];
     if (!enchant_id)
         return;
-
     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
     if(!pEnchant)
         return;
-
     // support only enchantings with add socket in this slot
     {
         bool add_socket = false;
@@ -3922,12 +3489,10 @@ void Spell::EffectEnchantItemPrismatic(uint32 effect_idx)
             return;
         }
     }
-
     // item can be in trade slot and have owner diff. from caster
     Player* item_owner = itemTarget->GetOwner();
     if(!item_owner)
         return;
-
     if(item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
     {
         sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(perm): %s (Entry: %d) for player: %s (Account: %u)",
@@ -3935,33 +3500,24 @@ void Spell::EffectEnchantItemPrismatic(uint32 effect_idx)
             itemTarget->GetProto()->Name1,itemTarget->GetEntry(),
             item_owner->GetName(),item_owner->GetSession()->GetAccountId());
     }
-
     // remove old enchanting before applying new if equipped
     item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,false);
-
     itemTarget->SetEnchantment(PRISMATIC_ENCHANTMENT_SLOT, enchant_id, 0, 0);
-
     // add new enchanting if equipped
     item_owner->ApplyEnchantment(itemTarget,PRISMATIC_ENCHANTMENT_SLOT,true);
 }
-
 void Spell::EffectEnchantItemTmp(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* p_caster = (Player*)m_caster;
-
     if(!itemTarget)
         return;
-
     uint32 enchant_id = m_spellInfo->EffectMiscValue[i];
-
     // Shaman Rockbiter Weapon
     if(i==0 && m_spellInfo->Effect[1]==SPELL_EFFECT_DUMMY)
     {
         int32 enchnting_damage = CalculateDamage(1, NULL);//+1;
-
         // enchanting id selected by calculated damage-per-sec stored in Effect[1] base value
         // with already applied percent bonus from Elemental Weapons talent
         // Note: damage calculated (correctly) with rounding int32(float(v)) but
@@ -4010,23 +3566,19 @@ void Spell::EffectEnchantItemTmp(uint32 i)
                 return;
         }
     }
-
     if (!enchant_id)
     {
         sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have 0 as enchanting id",m_spellInfo->Id,i);
         return;
     }
-
     SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
     if(!pEnchant)
     {
         sLog.outError("Spell %u Effect %u (SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY) have not existed enchanting id %u ",m_spellInfo->Id,i,enchant_id);
         return;
     }
-
     // select enchantment duration
     uint32 duration;
-
     // rogue family enchantments exception by duration
     if(m_spellInfo->Id == 38615)
         duration = 1800;                                    // 30 mins
@@ -4052,12 +3604,10 @@ void Spell::EffectEnchantItemTmp(uint32 i)
     // default case
     else
         duration = 3600;                                    // 1 hour
-
     // item can be in trade slot and have owner diff. from caster
     Player* item_owner = itemTarget->GetOwner();
     if(!item_owner)
         return;
-
     if(item_owner!=p_caster && p_caster->GetSession()->GetSecurity() > SEC_PLAYER && sWorld.getConfig(CONFIG_GM_LOG_TRADE) )
     {
         sLog.outCommand(p_caster->GetSession()->GetAccountId(),"GM %s (Account: %u) enchanting(temp): %s (Entry: %d) for player: %s (Account: %u)",
@@ -4065,69 +3615,49 @@ void Spell::EffectEnchantItemTmp(uint32 i)
             itemTarget->GetProto()->Name1, itemTarget->GetEntry(),
             item_owner->GetName(), item_owner->GetSession()->GetAccountId());
     }
-
     // remove old enchanting before applying new if equipped
     item_owner->ApplyEnchantment(itemTarget,TEMP_ENCHANTMENT_SLOT, false);
-
     itemTarget->SetEnchantment(TEMP_ENCHANTMENT_SLOT, enchant_id, duration * 1000, 0);
-
     // add new enchanting if equipped
     item_owner->ApplyEnchantment(itemTarget, TEMP_ENCHANTMENT_SLOT, true);
 }
-
 void Spell::EffectTameCreature(uint32 /*i*/)
 {
     if(m_caster->GetPetGUID())
         return;
-
     if(!unitTarget)
         return;
-
     if(unitTarget->GetTypeId() != TYPEID_UNIT)
         return;
-
     Creature* creatureTarget = (Creature*)unitTarget;
-
     if(creatureTarget->isPet())
         return;
-
     if(m_caster->getClass() != CLASS_HUNTER)
         return;
-
     // cast finish successfully
     //SendChannelUpdate(0);
     finish();
-
     Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget,m_spellInfo->Id);
     if(!pet)                                                // in versy specific state like near world end/etc.
         return;
-
     // "kill" original creature
     creatureTarget->ForcedDespawn();
-
     uint32 level = (creatureTarget->getLevel() < (m_caster->getLevel() - 5)) ? (m_caster->getLevel() - 5) : creatureTarget->getLevel();
-
     // prepare visual effect for levelup
     pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1);
-
     // add to world
     pet->GetMap()->Add((Creature*)pet);
-
     // visual effect for levelup
     pet->SetUInt32Value(UNIT_FIELD_LEVEL, level);
-
     // caster have pet now
     m_caster->SetMinion(pet, true);
-    
     pet->InitTalentForLevel();
-
     if(m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         pet->SavePetToDB(PET_SAVE_AS_CURRENT);
         ((Player*)m_caster)->PetSpellInitialize();
     }
 }
-
 void Spell::EffectSummonPet(uint32 i)
 {
     Player *owner = NULL;
@@ -4138,9 +3668,7 @@ void Spell::EffectSummonPet(uint32 i)
         else if(((Creature*)m_originalCaster)->isTotem())
             owner = m_originalCaster->GetCharmerOrOwnerPlayerOrPlayerItself();
     }
-
     uint32 petentry = m_spellInfo->EffectMiscValue[i];
-
     if(!owner)
     {
         SummonPropertiesEntry const *properties = sSummonPropertiesStore.LookupEntry(67);
@@ -4148,9 +3676,7 @@ void Spell::EffectSummonPet(uint32 i)
             SummonGuardian(i, petentry, properties);
         return;
     }
-
     Pet *OldSummon = owner->GetPet();
-
     // if pet requested type already exist
     if( OldSummon )
     {
@@ -4159,38 +3685,30 @@ void Spell::EffectSummonPet(uint32 i)
             // pet in corpse state can't be summoned
             if( OldSummon->isDead() )
                 return;
-
             assert(OldSummon->GetMap() == owner->GetMap());
-
             //OldSummon->GetMap()->Remove((Creature*)OldSummon,false);
-
             float px, py, pz;
             owner->GetClosePoint(px, py, pz, OldSummon->GetObjectSize());
-
             OldSummon->NearTeleportTo(px, py, pz, OldSummon->GetOrientation());
             //OldSummon->Relocate(px, py, pz, OldSummon->GetOrientation());
             //OldSummon->SetMap(owner->GetMap());
             //owner->GetMap()->Add((Creature*)OldSummon);
-
             if(owner->GetTypeId() == TYPEID_PLAYER && OldSummon->isControlled() )
             {
                 ((Player*)owner)->PetSpellInitialize();
             }
             return;
         }
-
         if(owner->GetTypeId() == TYPEID_PLAYER)
             ((Player*)owner)->RemovePet(OldSummon,(OldSummon->getPetType()==HUNTER_PET ? PET_SAVE_AS_DELETED : PET_SAVE_NOT_IN_SLOT),false);
         else
             return;
     }
-
     float x, y, z;
     owner->GetClosePoint(x, y, z, owner->GetObjectSize());
     Pet* pet = owner->SummonPet(petentry, x, y, z, owner->GetOrientation(), SUMMON_PET, 0);
     if(!pet)
         return;
-
     if(m_caster->GetTypeId() == TYPEID_UNIT)
     {
         if ( ((Creature*)m_caster)->isTotem() )
@@ -4198,43 +3716,33 @@ void Spell::EffectSummonPet(uint32 i)
         else
             pet->SetReactState(REACT_DEFENSIVE);
     }
-
     pet->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
-
     // generate new name for summon pet
     std::string new_name=objmgr.GeneratePetName(petentry);
     if(!new_name.empty())
         pet->SetName(new_name);
 }
-
 void Spell::EffectLearnPetSpell(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *_player = (Player*)m_caster;
-
     Pet *pet = _player->GetPet();
     if(!pet)
         return;
     if(!pet->isAlive())
         return;
-
     SpellEntry const *learn_spellproto = sSpellStore.LookupEntry(m_spellInfo->EffectTriggerSpell[i]);
     if(!learn_spellproto)
         return;
-
     pet->learnSpell(learn_spellproto->Id);
-
     pet->SavePetToDB(PET_SAVE_AS_CURRENT);
     _player->PetSpellInitialize();
 }
-
 void Spell::EffectTaunt(uint32 /*i*/)
 {
     if (!unitTarget)
         return;
-
     // this effect use before aura Taunt apply for prevent taunt already attacking target
     // for spell as marked "non effective at already attacking target"
     if(!unitTarget || !unitTarget->CanHaveThreatList()
@@ -4243,7 +3751,6 @@ void Spell::EffectTaunt(uint32 /*i*/)
         SendCastResult(SPELL_FAILED_DONT_REPORT);
         return;
     }
-
     // Also use this effect to set the taunter's threat to the taunted creature's highest value
     if(unitTarget->getThreatManager().getCurrentVictim())
     {
@@ -4252,27 +3759,22 @@ void Spell::EffectTaunt(uint32 /*i*/)
         if(itsThreat > myThreat)
             unitTarget->getThreatManager().addThreat(m_caster, itsThreat - myThreat);
     }
-
     //Set aggro victim to caster
     if( !unitTarget->getThreatManager().getOnlineContainer().empty() )
         if(HostilReference* forcedVictim = unitTarget->getThreatManager().getOnlineContainer().getReferenceByTarget(m_caster))
             unitTarget->getThreatManager().setCurrentVictim(forcedVictim);
-
     if(((Creature*)unitTarget)->IsAIEnabled && !((Creature*)unitTarget)->HasReactState(REACT_PASSIVE))
         ((Creature*)unitTarget)->AI()->AttackStart(m_caster);
 }
-
 void Spell::EffectWeaponDmg(uint32 i)
 {
 }
-
 void Spell::SpellDamageWeaponDmg(uint32 i)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     // multiple weapon dmg effect workaround
     // execute only the last weapon damage
     // and handle all effects at once
@@ -4288,12 +3790,10 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
             break;
         }
     }
-
     // some spell specific modifiers
     float totalDamagePercentMod  = 1.0f;                    // applied to final bonus+weapon damage
     int32 fixed_bonus = 0;
     int32 spell_bonus = 0;                                  // bonus specific for spell
-
     switch(m_spellInfo->SpellFamilyName)
     {
         case SPELLFAMILY_WARRIOR:
@@ -4305,14 +3805,12 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                     return;
                 SpellEntry const *spellInfo = NULL;
                 uint32 stack = 0;
-
                 if (Aura * aur = unitTarget->GetAura(58567, m_caster->GetGUID()))
                 {
                     aur->RefreshAura();
                     spellInfo = aur->GetSpellProto();
                     stack = aur->GetStackAmount();
                 }
-
                 for(uint8 j = 0; j < 3; j++)
                 {
                     if(m_spellInfo->Effect[j] == SPELL_EFFECT_NORMALIZED_WEAPON_DMG)
@@ -4321,7 +3819,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                         break;
                     }
                 }
-
                 if(!spellInfo)
                 {
                     // get highest rank of the Sunder Armor spell
@@ -4331,11 +3828,9 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                         // only highest rank is shown in spell book, so simply check if shown in spell book
                         if(!itr->second->active || itr->second->disabled || itr->second->state == PLAYERSPELL_REMOVED)
                             continue;
-
                         SpellEntry const *spellProto = sSpellStore.LookupEntry(itr->first);
                         if (!spellProto)
                             continue;
-
                         if (spellProto->SpellFamilyFlags[0] & SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR
                             && spellProto->Id != m_spellInfo->Id
                             && spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR)
@@ -4395,7 +3890,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                         }
                     }
                 }
-
                 if(found)
                     totalDamagePercentMod *= 1.2f;          // 120% if poisoned
             }
@@ -4409,7 +3903,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                 spell_bonus += int32(0.23f*m_caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellInfo)));
                 spell_bonus += int32(0.29f*m_caster->SpellBaseDamageBonusForVictim(GetSpellSchoolMask(m_spellInfo), unitTarget));
             }
-
             // Seal of Command Unleashed
             else if(m_spellInfo->Id==20467)
             {
@@ -4475,7 +3968,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
             else if (m_spellInfo->SpellFamilyFlags[0] & 0x400000)
             {
                 totalDamagePercentMod *= (float(unitTarget->GetDiseasesByCaster(m_caster->GetGUID())) * 12.5f + 100.0f) / 100.0f;
-
                 // Glyph of Blood Strike
                 if (AuraEffect * aurEff = m_caster->GetAuraEffect(59332,0))
                 {
@@ -4493,7 +3985,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                     {
                         if (runic > 25)
                             runic = 25;
-
                         totalDamagePercentMod *= float((runic + 100.0f) / 100.0f);
                     }
                 }
@@ -4517,7 +4008,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
             break;
         }
     }
-
     bool normalized = false;
     float weaponDamagePercentMod = 1.0;
     for (int j = 0; j < 3; ++j)
@@ -4539,7 +4029,6 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                 break;                                      // not weapon damage effect, just skip
         }
     }
-
     // apply to non-weapon bonus weapon total pct effect, weapon total flat effect included in weapon damage
     if(fixed_bonus || spell_bonus)
     {
@@ -4551,19 +4040,15 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
             case OFF_ATTACK:    unitMod = UNIT_MOD_DAMAGE_OFFHAND;  break;
             case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED;   break;
         }
-
         float weapon_total_pct = 1.0f;
         if ( m_spellInfo->SchoolMask & SPELL_SCHOOL_MASK_NORMAL )
              weapon_total_pct = m_caster->GetModifierValue(unitMod, TOTAL_PCT);
-
         if(fixed_bonus)
             fixed_bonus = int32(fixed_bonus * weapon_total_pct);
         if(spell_bonus)
             spell_bonus = int32(spell_bonus * weapon_total_pct);
     }
-
     int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized, true);
-
     // Sequence is important
     for (int j = 0; j < 3; ++j)
     {
@@ -4582,41 +4067,32 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
                 break;                                      // not weapon damage effect, just skip
         }
     }
-
     // only for Seal of Command
     if(spell_bonus)
         weaponDamage += spell_bonus;
-
     // only for Mutilate
     if(totalDamagePercentMod != 1.0f)
         weaponDamage = int32(weaponDamage * totalDamagePercentMod);
-
     // prevent negative damage
     uint32 eff_damage = uint32(weaponDamage > 0 ? weaponDamage : 0);
-
     // Add melee damage bonuses (also check for negative)
     m_caster->MeleeDamageBonus(unitTarget, &eff_damage, m_attackType, m_spellInfo);
     m_damage+= eff_damage;
 }
-
 void Spell::EffectThreat(uint32 /*i*/)
 {
     if(!unitTarget || !unitTarget->isAlive() || !m_caster->isAlive())
         return;
-
     if(!unitTarget->CanHaveThreatList())
         return;
-
     unitTarget->AddThreat(m_caster, float(damage));
 }
-
 void Spell::EffectHealMaxHealth(uint32 /*i*/)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     int32 addhealth;
     if(m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN) // Lay on Hands
         addhealth = m_caster->GetMaxHealth();
@@ -4625,14 +4101,12 @@ void Spell::EffectHealMaxHealth(uint32 /*i*/)
     if(m_originalCaster)
         m_originalCaster->DealHeal(unitTarget, addhealth, m_spellInfo);
 }
-
 void Spell::EffectInterruptCast(uint32 i)
 {
     if(!unitTarget)
         return;
     if(!unitTarget->isAlive())
         return;
-
     // TODO: not all spells that used this effect apply cooldown at school spells
     // also exist case: apply cooldown to interrupted cast only and to all spells
     for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
@@ -4655,45 +4129,34 @@ void Spell::EffectInterruptCast(uint32 i)
         }
     }
 }
-
 void Spell::EffectSummonObjectWild(uint32 i)
 {
     uint32 gameobject_id = m_spellInfo->EffectMiscValue[i];
-
     GameObject* pGameObj = new GameObject;
-
     WorldObject* target = focusObject;
     if( !target )
         target = m_caster;
-
     float x, y, z;
     if(m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
         m_targets.m_dstPos.GetPosition(x, y, z);
     else
         m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE);
-
     Map *map = target->GetMap();
-
     if(!pGameObj->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id, map,
         m_caster->GetPhaseMask(), x, y, z, target->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
     {
         delete pGameObj;
         return;
     }
-
     int32 duration = GetSpellDuration(m_spellInfo);
-
     pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
-
     // Wild object not have owner and check clickable by players
     map->Add(pGameObj);
-
     if(pGameObj->GetGoType() == GAMEOBJECT_TYPE_FLAGDROP && m_caster->GetTypeId() == TYPEID_PLAYER)
     {
         Player *pl = (Player*)m_caster;
         BattleGround* bg = ((Player *)m_caster)->GetBattleGround();
-
         switch(pGameObj->GetMapId())
         {
             case 489:                                       //WS
@@ -4701,10 +4164,8 @@ void Spell::EffectSummonObjectWild(uint32 i)
                 if(bg && bg->GetTypeID()==BATTLEGROUND_WS && bg->GetStatus() == STATUS_IN_PROGRESS)
                 {
                     uint32 team = ALLIANCE;
-
                     if(pl->GetTeam() == team)
                         team = HORDE;
-
                     ((BattleGroundWS*)bg)->SetDroppedFlagGUID(pGameObj->GetGUID(),team);
                 }
                 break;
@@ -4719,7 +4180,6 @@ void Spell::EffectSummonObjectWild(uint32 i)
             }
         }
     }
-
     if(uint32 linkedEntry = pGameObj->GetGOInfo()->GetLinkedGameObjectEntry())
     {
         GameObject* linkedGO = new GameObject;
@@ -4728,7 +4188,6 @@ void Spell::EffectSummonObjectWild(uint32 i)
         {
             linkedGO->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
             linkedGO->SetSpellId(m_spellInfo->Id);
-
             // Wild object not have owner and check clickable by players
             map->Add(linkedGO);
         }
@@ -4740,11 +4199,9 @@ void Spell::EffectSummonObjectWild(uint32 i)
         }
     }
 }
-
 void Spell::EffectScriptEffect(uint32 effIndex)
 {
     // TODO: we must implement hunter pet summon at login there (spell 6962)
-
     switch(m_spellInfo->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
@@ -4755,18 +4212,16 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     Player* plr = ((Player*)m_caster);
                     if(plr && plr->GetLastPetNumber())
                     {
-                        PetType NewPetType = (plr->getClass()==CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET;                        
+                        PetType NewPetType = (plr->getClass()==CLASS_HUNTER) ? HUNTER_PET : SUMMON_PET;
                         if (Pet* NewPet = new Pet(plr,NewPetType))
                         {
                             if(NewPet->LoadPetFromDB(plr, 0, plr->GetLastPetNumber(), true))
                             {
                                 NewPet->SetHealth(NewPet->GetMaxHealth());
                                 NewPet->SetPower(NewPet->getPowerType(),NewPet->GetMaxPower(NewPet->getPowerType()));
-                                
                                 switch (NewPet->GetEntry())
                                 {
                                     case 11859:
@@ -4792,7 +4247,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         uint32 countMax = 18000;
                         countMax += m_caster->HasAura(38414) ? 3000 : 0;
                         countMax += m_caster->HasAura(57865) ? 3000 : 0;
-
                         if (countMin < countMax)
                         {
                             aurEff->GetParentAura()->SetAuraDuration(uint32(aurEff->GetParentAura()->GetAuraDuration()+3000));
@@ -4810,13 +4264,11 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         uint32 countMax = 20000;
                         countMax += m_caster->HasAura(54818) ? 4000 : 0;
                         countMax += m_caster->HasAura(60141) ? 4000 : 0;
-
                         if (countMin < countMax)
                         {
                             aurEff->GetParentAura()->SetAuraDuration(uint32(aurEff->GetParentAura()->GetAuraDuration()+3000));
                             aurEff->GetParentAura()->SetAuraMaxDuration(countMin+2000);
                         }
-
                     }
                     return;
                 }
@@ -4828,13 +4280,11 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         uint32 countMin = aurEff->GetParentAura()->GetAuraMaxDuration();
                         uint32 countMax = 12000;
                         countMax += m_caster->HasAura(56801) ? 4000 : 0;
-
                         if (countMin < countMax)
                         {
                             aurEff->GetParentAura()->SetAuraDuration(uint32(aurEff->GetParentAura()->GetAuraDuration()+3000));
                             aurEff->GetParentAura()->SetAuraMaxDuration(countMin+2000);
                         }
-
                     }
                     return;
                 }
@@ -4870,15 +4320,12 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 case 26275:
                 {
                     uint32 spells[4] = { 26272, 26157, 26273, 26274 };
-
                     // check presence
                     for(uint8 j = 0; j < 4; ++j)
                         if(unitTarget->HasAuraEffect(spells[j],0))
                             return;
-
                     // select spell
                     uint32 iTmpSpellId = spells[urand(0,3)];
-
                     // cast
                     unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
                     return;
@@ -4888,14 +4335,12 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!itemTarget && m_caster->GetTypeId()!=TYPEID_PLAYER)
                         return;
-
                     uint32 spell_id = 0;
                     switch(urand(1, 5))
                     {
                     case 1:  spell_id = 8854; break;
                     default: spell_id = 8855; break;
                     }
-
                     m_caster->CastSpell(m_caster,spell_id,true,NULL);
                     return;
                 }
@@ -4919,7 +4364,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     uint32 spellid;
                     switch(m_spellInfo->Id)
                     {
@@ -4934,7 +4378,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         default:
                             return;
                     }
-
                     unitTarget->CastSpell(unitTarget,spellid,false);
                     return;
                 }
@@ -4955,11 +4398,9 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || !unitTarget->isAlive())
                         return;
-
                     // Onyxia Scale Cloak
                     if(unitTarget->HasAura(22683))
                         return;
-
                     // Shadow Flame
                     m_caster->CastSpell(unitTarget, 22682, true);
                     return;
@@ -5027,7 +4468,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     unitTarget->CastSpell(unitTarget, 41131, true);
                     break;
                 }*/
@@ -5036,7 +4476,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     unitTarget->CastSpell(m_caster, 40903, true);
                     break;
                 }
@@ -5044,7 +4483,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                 if(!unitTarget)
                         return;
-
                     switch(((Player*)unitTarget)->GetBaseSkillValue(762))
                     {
                     case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;;
@@ -5059,7 +4497,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     if(unitTarget)
                     {
                         switch(((Player*)unitTarget)->GetBaseSkillValue(762))
@@ -5076,11 +4513,9 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     int bag=19;
                     int slot=0;
                     Item* item = NULL;
-
                     while (bag < 256)
                     {
                         item = ((Player*)m_caster)->GetItemByPos(bag,slot);
@@ -5107,7 +4542,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     unitTarget->CastSpell(unitTarget, 44870, true);
                     break;
                 }
@@ -5116,9 +4550,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     unitTarget->RemoveAurasDueToSpell(46394);
-
                     break;
                 }
                 // Negative Energy
@@ -5126,7 +4558,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     m_caster->CastSpell(unitTarget, 46285, true);
                     break;
                 }
@@ -5135,7 +4566,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget)
                         return;
-
                     uint32 spellId = 0;
                     switch(rand() % 4)
                     {
@@ -5152,9 +4582,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     ((Player*)unitTarget)->ModifyMoney(5000 * GOLD);
-
                     break;
                 }
                 // Vigilance
@@ -5162,10 +4590,8 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // Remove Taunt cooldown
                     ((Player*)unitTarget)->RemoveSpellCooldown(355, true);
-
                     return;
                 }
                 // Death Knight Initiate Visual
@@ -5173,7 +4599,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
                         return;
-
                     uint32 iTmpSpellId = 0;
                     switch (unitTarget->GetDisplayId())
                     {
@@ -5199,7 +4624,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         case 25365: iTmpSpellId = 51546; break; // troll male
                         default: return;
                     }
-
                     unitTarget->CastSpell(unitTarget, iTmpSpellId, true);
                     Creature* npc = (Creature*)unitTarget;
                     npc->LoadEquipment(npc->GetEquipmentId());
@@ -5210,7 +4634,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!m_originalCaster)
                         return;
-
                     m_originalCaster->CastSpell(m_originalCaster, damage, false);
                     break;
                 }
@@ -5219,7 +4642,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!m_targets.HasDst())
                         return;
-
                     float x, y, z;
                     float radius = GetSpellRadius(m_spellInfo, effIndex, true);
                     for(uint32 i = 0; i < 15; ++i)
@@ -5261,10 +4683,8 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // Prevent stacking of mounts
                     unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
                     // Triggered spell id dependent of riding skill
                     if(uint16 skillval = ((Player*)unitTarget)->GetSkillValue(SKILL_RIDING))
                     {
@@ -5280,13 +4700,10 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || effIndex!=0)
                         return;
-
                     uint32 spellID = m_spellInfo->CalculateSimpleValue(0);
                     uint32 questID = m_spellInfo->CalculateSimpleValue(1);
-
                     if (((Player*)unitTarget)->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE && !((Player*)unitTarget)->GetQuestRewardStatus (questID))
                         unitTarget->CastSpell(unitTarget, spellID, true);
-
                     return;
                 }
                 case 58941:                                 // Rock Shards
@@ -5313,10 +4730,8 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // Prevent stacking of mounts
                     unitTarget->RemoveAurasByType(SPELL_AURA_MOUNTED);
-
                     // Triggered spell id dependent of riding skill
                     if(uint16 skillval = ((Player*)unitTarget)->GetSkillValue(SKILL_RIDING))
                     {
@@ -5330,14 +4745,12 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 case 59317:                                 // Teleporting
                     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // return from top
                     if (((Player*)unitTarget)->GetAreaId() == 4637)
                         unitTarget->CastSpell(unitTarget, 59316, true);
                     // teleport atop
                     else
                         unitTarget->CastSpell(unitTarget, 59314, true);
-
                     return;
                 // random spell learn instead placeholder
                 case 60893:                                 // Northrend Alchemy Research
@@ -5348,7 +4761,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if(m_caster->GetTypeId() != TYPEID_PLAYER)
                         return;
-
                     // learn random explicit discovery recipe (if any)
                     if(uint32 discoveredSpell = GetExplicitDiscoverySpell(m_spellInfo->Id, (Player*)m_caster))
                         ((Player*)m_caster)->learnSpell(discoveredSpell, false);
@@ -5377,9 +4789,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if (m_caster->GetTypeId() != TYPEID_UNIT || !((Creature*)m_caster)->isSummon())
                         return;
-
                     uint32 spell_heal;
-
                     switch(m_caster->GetEntry())
                     {
                         case 31897: spell_heal = 7001; break;
@@ -5393,7 +4803,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                             return;
                     }
                     Aura * chargesaura = m_caster->GetAura(59907);
-
                     if(chargesaura && chargesaura->GetAuraCharges() > 1)
                     {
                         chargesaura->SetAuraCharges(chargesaura->GetAuraCharges() - 1);
@@ -5421,7 +4830,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     {
                         if(!unitTarget->m_SummonSlot[slot])
                             continue;
-
                         Creature* totem = unitTarget->GetMap()->GetCreature(unitTarget->m_SummonSlot[slot]);
                         if(totem && totem->isTotem())
                         {
@@ -5455,7 +4863,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     uint32 itemtype;
                     uint32 rank = 0;
-
                     // Improved Healthstone
                     if (AuraEffect const * aurEff = unitTarget->GetDummyAura(SPELLFAMILY_WARLOCK, 284, 0))
                     {
@@ -5466,7 +4873,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         else
                             sLog.outError("Unknown rank of Improved Healthstone id: %d", aurEff->GetId());
                     }
-
                     static uint32 const itypes[8][3] = {
                         { 5512, 19004, 19005},              // Minor Healthstone
                         { 5511, 19006, 19007},              // Lesser Healthstone
@@ -5477,7 +4883,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         {36889, 36890, 36891},              // Demonic Healthstone
                         {36892, 36893, 36894}               // Fel Healthstone
                     };
-
                     switch(m_spellInfo->Id)
                     {
                         case  6201:
@@ -5609,7 +5014,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                             continue;
                         if (!aura->GetPartAura(0))
                             continue;
-
                         // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting.
                         if (familyFlag[0] & 0x4000)
                         {
@@ -5637,7 +5041,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                         //{
                         //    spellId = 53366; // 53366 Chimera Shot - Wyvern
                         //}
-
                         // Refresh aura duration
                         aura->RefreshAura();
                         break;
@@ -5651,7 +5054,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                 {
                     if (!unitTarget)
                         return;
-
                     // script effect have in value, but this outdated removed part
                     unitTarget->CastSpell(unitTarget, 62305, true);
                     return;
@@ -5670,7 +5072,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     return;
                 uint32 spellId1 = 0;
                 uint32 spellId2 = 0;
-
                 // Judgement self add switch
                 switch (m_spellInfo->Id)
                 {
@@ -5738,12 +5139,10 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     // 25% chance of casting a random buff
                     if(roll_chance_i(75))
                         return;
-
                     // triggered spells are 28703 to 28707
                     // Note: some sources say, that there was the possibility of
                     //       receiving a debuff. However, this seems to be removed by a patch.
                     const uint32 spellid = 28703;
-
                     // don't overwrite an existing aura
                     for(uint8 i = 0; i < 5; ++i)
                         if(unitTarget->HasAura(spellid + i))
@@ -5751,7 +5150,6 @@ void Spell::EffectScriptEffect(uint32 effIndex)
                     unitTarget->CastSpell(unitTarget, spellid+urand(0, 4), true);
                     break;
                 }
-
                 // Nightmare Vine
                 case 28720:
                 {
@@ -5789,7 +5187,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
         case SPELLFAMILY_WARRIOR:
         {
             // Shattering Throw
-            if ( m_spellInfo->SpellFamilyFlags[1] & 0x1 ) 
+            if ( m_spellInfo->SpellFamilyFlags[1] & 0x1 )
             {
                 if(!unitTarget)
                     return;
@@ -5800,17 +5198,14 @@ void Spell::EffectScriptEffect(uint32 effIndex)
             break;
         }
     }
-
     // normal DB scripted effect
     sLog.outDebug("Spell ScriptStart spellid %u in EffectScriptEffect ", m_spellInfo->Id);
     m_caster->GetMap()->ScriptsStart(sSpellScripts, m_spellInfo->Id, m_caster, unitTarget);
 }
-
 void Spell::EffectSanctuary(uint32 /*i*/)
 {
     if(!unitTarget)
         return;
-
     std::list<Unit*> targets;
     Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(unitTarget, unitTarget, m_caster->GetMap()->GetVisibilityDistance());
     Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(unitTarget, targets, u_check);
@@ -5819,7 +5214,6 @@ void Spell::EffectSanctuary(uint32 /*i*/)
     {
         if(!(*iter)->hasUnitState(UNIT_STAT_CASTING))
             continue;
-
         for(uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++)
         {
             if((*iter)->GetCurrentSpell(i)
@@ -5829,7 +5223,6 @@ void Spell::EffectSanctuary(uint32 /*i*/)
             }
         }
     }
-
     unitTarget->CombatStop();
     unitTarget->getHostilRefManager().deleteReferences();   // stop all fighting
     // Vanish allows to remove all threat and cast regular stealth so other spells can be used
@@ -5838,33 +5231,25 @@ void Spell::EffectSanctuary(uint32 /*i*/)
         ((Player *)m_caster)->RemoveAurasByType(SPELL_AURA_MOD_ROOT);
     }
 }
-
 void Spell::EffectAddComboPoints(uint32 /*i*/)
 {
     if(!unitTarget)
         return;
-
     if(!m_caster->m_movedPlayer)
         return;
-
     if(damage <= 0)
         return;
-
     m_caster->m_movedPlayer->AddComboPoints(unitTarget, damage, this);
 }
-
 void Spell::EffectDuel(uint32 i)
 {
     if(!m_caster || !unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *caster = (Player*)m_caster;
     Player *target = (Player*)unitTarget;
-
     // caster or target already have requested duel
     if( caster->duel || target->duel || !target->GetSocial() || target->GetSocial()->HasIgnore(caster->GetGUIDLow()) )
         return;
-
     // Players can only fight a duel with each other outside (=not inside dungeons and not in capital cities)
     // Don't have to check the target's map since you cannot challenge someone across maps
     if(caster->GetMap()->Instanceable())
@@ -5873,26 +5258,21 @@ void Spell::EffectDuel(uint32 i)
         SendCastResult(SPELL_FAILED_NO_DUELING);            // Dueling isn't allowed here
         return;
     }
-
     AreaTableEntry const* casterAreaEntry = GetAreaEntryByAreaID(caster->GetZoneId());
     if(casterAreaEntry && (casterAreaEntry->flags & AREA_FLAG_CAPITAL) )
     {
         SendCastResult(SPELL_FAILED_NO_DUELING);            // Dueling isn't allowed here
         return;
     }
-
     AreaTableEntry const* targetAreaEntry = GetAreaEntryByAreaID(target->GetZoneId());
     if(targetAreaEntry && (targetAreaEntry->flags & AREA_FLAG_CAPITAL) )
     {
         SendCastResult(SPELL_FAILED_NO_DUELING);            // Dueling isn't allowed here
         return;
     }
-
     //CREATE DUEL FLAG OBJECT
     GameObject* pGameObj = new GameObject;
-
     uint32 gameobject_id = m_spellInfo->EffectMiscValue[i];
-
     Map *map = m_caster->GetMap();
     if(!pGameObj->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), gameobject_id,
         map, m_caster->GetPhaseMask(),
@@ -5904,24 +5284,20 @@ void Spell::EffectDuel(uint32 i)
         delete pGameObj;
         return;
     }
-
     pGameObj->SetUInt32Value(GAMEOBJECT_FACTION, m_caster->getFaction() );
     pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel()+1 );
     int32 duration = GetSpellDuration(m_spellInfo);
     pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
-
     m_caster->AddGameObject(pGameObj);
     map->Add(pGameObj);
     //END
-
     // Send request
     WorldPacket data(SMSG_DUEL_REQUESTED, 8 + 8);
     data << uint64(pGameObj->GetGUID());
     data << uint64(caster->GetGUID());
     caster->GetSession()->SendPacket(&data);
     target->GetSession()->SendPacket(&data);
-
     // create duel-info
     DuelInfo *duel   = new DuelInfo;
     duel->initiator  = caster;
@@ -5929,38 +5305,29 @@ void Spell::EffectDuel(uint32 i)
     duel->startTime  = 0;
     duel->startTimer = 0;
     caster->duel     = duel;
-
     DuelInfo *duel2   = new DuelInfo;
     duel2->initiator  = caster;
     duel2->opponent   = caster;
     duel2->startTime  = 0;
     duel2->startTimer = 0;
     target->duel      = duel2;
-
     caster->SetUInt64Value(PLAYER_DUEL_ARBITER, pGameObj->GetGUID());
     target->SetUInt64Value(PLAYER_DUEL_ARBITER, pGameObj->GetGUID());
 }
-
 void Spell::EffectStuck(uint32 /*i*/)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(!sWorld.getConfig(CONFIG_CAST_UNSTUCK))
         return;
-
     Player* pTarget = (Player*)unitTarget;
-
     sLog.outDebug("Spell Effect: Stuck");
     sLog.outDetail("Player %s (guid %u) used auto-unstuck future at map %u (%f, %f, %f)", pTarget->GetName(), pTarget->GetGUIDLow(), m_caster->GetMapId(), m_caster->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
-
     if(pTarget->isInFlight())
         return;
-
     pTarget->TeleportTo(pTarget->GetStartPosition(), unitTarget == m_caster ? TELE_TO_SPELL : 0);
     // homebind location is loaded always
     // pTarget->TeleportTo(pTarget->m_homebindMapId,pTarget->m_homebindX,pTarget->m_homebindY,pTarget->m_homebindZ,pTarget->GetOrientation(), (unitTarget==m_caster ? TELE_TO_SPELL : 0));
-
     // Stuck spell trigger Hearthstone cooldown
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(8690);
     if(!spellInfo)
@@ -5968,54 +5335,41 @@ void Spell::EffectStuck(uint32 /*i*/)
     Spell spell(pTarget, spellInfo, true, 0);
     spell.SendSpellCooldown();
 }
-
 void Spell::EffectSummonPlayer(uint32 /*i*/)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     // Evil Twin (ignore player summon, but hide this for summoner)
     if(unitTarget->HasAura(23445))
         return;
-
     float x, y, z;
     m_caster->GetClosePoint(x, y, z, unitTarget->GetObjectSize());
-
     ((Player*)unitTarget)->SetSummonPoint(m_caster->GetMapId(),x,y,z);
-
     WorldPacket data(SMSG_SUMMON_REQUEST, 8+4+4);
     data << uint64(m_caster->GetGUID());                    // summoner guid
     data << uint32(m_caster->GetZoneId());                  // summoner zone
     data << uint32(MAX_PLAYER_SUMMON_DELAY*IN_MILISECONDS); // auto decline after msecs
     ((Player*)unitTarget)->GetSession()->SendPacket(&data);
 }
-
 static ScriptInfo generateActivateCommand()
 {
     ScriptInfo si;
     si.command = SCRIPT_COMMAND_ACTIVATE_OBJECT;
     return si;
 }
-
 void Spell::EffectActivateObject(uint32 effect_idx)
 {
     if(!gameObjTarget)
         return;
-
     static ScriptInfo activateCommand = generateActivateCommand();
-
     int32 delay_secs = m_spellInfo->EffectMiscValue[effect_idx];
-
     gameObjTarget->GetMap()->ScriptCommandStart(activateCommand, delay_secs, m_caster, gameObjTarget);
 }
-
 void Spell::EffectApplyGlyph(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *player = (Player*)m_caster;
-
     // apply new one
     if(uint32 glyph = m_spellInfo->EffectMiscValue[i])
     {
@@ -6029,7 +5383,6 @@ void Spell::EffectApplyGlyph(uint32 i)
                     return;                                 // glyph slot mismatch
                 }
             }
-
             // remove old glyph
             if(uint32 oldglyph = player->GetGlyph(m_glyphIndex))
             {
@@ -6039,30 +5392,24 @@ void Spell::EffectApplyGlyph(uint32 i)
                     player->SetGlyph(m_glyphIndex, 0);
                 }
             }
-
             player->CastSpell(m_caster, gp->SpellId, true);
             player->SetGlyph(m_glyphIndex, glyph);
             player->SendTalentsInfoData(false);
         }
     }
 }
-
 void Spell::EffectEnchantHeldItem(uint32 i)
 {
     // this is only item spell effect applied to main-hand weapon of target player (players in area)
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* item_owner = (Player*)unitTarget;
     Item* item = item_owner->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
-
     if(!item )
         return;
-
     // must be equipped
     if(!item ->IsEquipped())
         return;
-
     if (m_spellInfo->EffectMiscValue[i])
     {
         uint32 enchant_id = m_spellInfo->EffectMiscValue[i];
@@ -6071,45 +5418,34 @@ void Spell::EffectEnchantHeldItem(uint32 i)
             duration = damage;//+1;            //Base points after ..
         if(!duration)
             duration = 10;                                  //10 seconds for enchants which don't have listed duration
-
         SpellItemEnchantmentEntry const *pEnchant = sSpellItemEnchantmentStore.LookupEntry(enchant_id);
         if(!pEnchant)
             return;
-
         // Always go to temp enchantment slot
         EnchantmentSlot slot = TEMP_ENCHANTMENT_SLOT;
-
         // Enchantment will not be applied if a different one already exists
         if(item->GetEnchantmentId(slot) && item->GetEnchantmentId(slot) != enchant_id)
             return;
-
         // Apply the temporary enchantment
         item->SetEnchantment(slot, enchant_id, duration*IN_MILISECONDS, 0);
         item_owner->ApplyEnchantment(item, slot, true);
     }
 }
-
 void Spell::EffectDisEnchant(uint32 /*i*/)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* p_caster = (Player*)m_caster;
     if(!itemTarget || !itemTarget->GetProto()->DisenchantID)
         return;
-
     p_caster->UpdateCraftSkill(m_spellInfo->Id);
-
     ((Player*)m_caster)->SendLoot(itemTarget->GetGUID(),LOOT_DISENCHANTING);
-
     // item will be removed at disenchanting end
 }
-
 void Spell::EffectInebriate(uint32 /*i*/)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *player = (Player*)unitTarget;
     uint16 currentDrunk = player->GetDrunkValue();
     uint16 drunkMod = damage * 256;
@@ -6119,54 +5455,40 @@ void Spell::EffectInebriate(uint32 /*i*/)
         currentDrunk += drunkMod;
     player->SetDrunkValue(currentDrunk, m_CastItem ? m_CastItem->GetEntry() : 0);
 }
-
 void Spell::EffectFeedPet(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *_player = (Player*)m_caster;
-
     Item* foodItem = m_targets.getItemTarget();
     if(!foodItem)
         return;
-
     Pet *pet = _player->GetPet();
     if(!pet)
         return;
-
     if(!pet->isAlive())
         return;
-
     int32 benefit = pet->GetCurrentFoodBenefitLevel(foodItem->GetProto()->ItemLevel);
     if(benefit <= 0)
         return;
-
     uint32 count = 1;
     _player->DestroyItemCount(foodItem,count,true);
     // TODO: fix crash when a spell has two effects, both pointed at the same item target
-
     m_caster->CastCustomSpell(pet, m_spellInfo->EffectTriggerSpell[i], &benefit, NULL, NULL, true);
 }
-
 void Spell::EffectDismissPet(uint32 /*i*/)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Pet* pet = ((Player*)m_caster)->GetPet();
-
     // not let dismiss dead pet
     if(!pet||!pet->isAlive())
         return;
-
     ((Player*)m_caster)->RemovePet(pet, PET_SAVE_NOT_IN_SLOT);
 }
-
 void Spell::EffectSummonObject(uint32 i)
 {
     uint32 go_id = m_spellInfo->EffectMiscValue[i];
-
     uint8 slot = 0;
     switch(m_spellInfo->Effect[i])
     {
@@ -6176,14 +5498,12 @@ void Spell::EffectSummonObject(uint32 i)
         case SPELL_EFFECT_SUMMON_OBJECT_SLOT4: slot = 3; break;
         default: return;
     }
-
     uint64 guid = m_caster->m_ObjectSlot[slot];
     if(guid != 0)
     {
         GameObject* obj = NULL;
         if( m_caster )
             obj = m_caster->GetMap()->GetGameObject(guid);
-
         if(obj)
         {
             // Recast case - null spell id to make auras not be removed on object remove from world
@@ -6193,9 +5513,7 @@ void Spell::EffectSummonObject(uint32 i)
         }
         m_caster->m_ObjectSlot[slot] = 0;
     }
-
     GameObject* pGameObj = new GameObject;
-
     float x, y, z;
     // If dest location if present
     if (m_targets.HasDst())
@@ -6203,7 +5521,6 @@ void Spell::EffectSummonObject(uint32 i)
     // Summon in random point all other units if location present
     else
         m_caster->GetClosePoint(x, y, z, DEFAULT_WORLD_OBJECT_SIZE);
-
     Map *map = m_caster->GetMap();
     if(!pGameObj->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), go_id, map,
         m_caster->GetPhaseMask(), x, y, z, m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 0, GO_STATE_READY))
@@ -6211,33 +5528,27 @@ void Spell::EffectSummonObject(uint32 i)
         delete pGameObj;
         return;
     }
-
     //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL,m_caster->getLevel());
     int32 duration = GetSpellDuration(m_spellInfo);
     pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
     pGameObj->SetSpellId(m_spellInfo->Id);
     m_caster->AddGameObject(pGameObj);
-
     map->Add(pGameObj);
     WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
     data << uint64(pGameObj->GetGUID());
     m_caster->SendMessageToSet(&data, true);
-
     m_caster->m_ObjectSlot[slot] = pGameObj->GetGUID();
 }
-
 void Spell::EffectResurrect(uint32 /*effIndex*/)
 {
     if(!unitTarget)
         return;
     if(unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     if(unitTarget->isAlive())
         return;
     if(!unitTarget->IsInWorld())
         return;
-
     switch (m_spellInfo->Id)
     {
         // Defibrillate (Goblin Jumper Cables) have 33% chance on success
@@ -6259,81 +5570,62 @@ void Spell::EffectResurrect(uint32 /*effIndex*/)
         default:
             break;
     }
-
     Player* pTarget = ((Player*)unitTarget);
-
     if(pTarget->isRessurectRequested())       // already have one active request
         return;
-
     uint32 health = pTarget->GetMaxHealth() * damage / 100;
     uint32 mana   = pTarget->GetMaxPower(POWER_MANA) * damage / 100;
-
     pTarget->setResurrectRequestData(m_caster->GetGUID(), m_caster->GetMapId(), m_caster->GetPositionX(), m_caster->GetPositionY(), m_caster->GetPositionZ(), health, mana);
     SendResurrectRequest(pTarget);
 }
-
 void Spell::EffectAddExtraAttacks(uint32 /*i*/)
 {
     if(!unitTarget || !unitTarget->isAlive())
         return;
-
     if( unitTarget->m_extraAttacks )
         return;
-
     Unit *victim = unitTarget->getVictim();
-
     // attack prevented
     // fixme, some attacks may not target current victim, this is right now not handled
     if (!victim || !unitTarget->IsWithinMeleeRange(victim) || !unitTarget->HasInArc( 2*M_PI/3, victim ))
         return;
-
     // Only for proc/log informations
     unitTarget->m_extraAttacks = damage;
     // Need to send log before attack is made
     SendLogExecute();
     m_needSpellLog = false;
-
     unitTarget->AttackerStateUpdate(victim, BASE_ATTACK, true);
 }
-
 void Spell::EffectParry(uint32 /*i*/)
 {
     if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
         ((Player*)unitTarget)->SetCanParry(true);
 }
-
 void Spell::EffectBlock(uint32 /*i*/)
 {
     if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
         ((Player*)unitTarget)->SetCanBlock(true);
 }
-
 void Spell::EffectLeapForward(uint32 i)
 {
     if(unitTarget->isInFlight())
         return;
-
     if(!m_targets.HasDst())
         return;
-
     uint32 mapid = m_caster->GetMapId();
     float dist = m_caster->GetSpellRadiusForTarget(unitTarget, sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
     if(Player* modOwner = m_originalCaster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_RADIUS, dist);
-
     float x,y,z;
     float destx,desty,destz,ground,floor;
     float orientation = unitTarget->GetOrientation(), step = dist/10.0f;
-
     unitTarget->GetPosition(x,y,z);
     destx = x + dist * cos(orientation);
     desty = y + dist * sin(orientation);
     ground = unitTarget->GetMap()->GetHeight(destx,desty,MAX_HEIGHT,true);
     floor = unitTarget->GetMap()->GetHeight(destx,desty,z, true);
     destz = fabs(ground - z) <= fabs(floor - z) ? ground:floor;
-
     bool col = VMAP::VMapFactory::createOrGetVMapManager()->getObjectHitPos(mapid,x,y,z+0.5f,destx,desty,destz+0.5f,destx,desty,destz,-0.5f);
-
     if(col)    // We had a collision!
     {
       destx -= 0.6 * cos(orientation);
@@ -6341,7 +5633,6 @@ void Spell::EffectLeapForward(uint32 i)
       dist = sqrt((x-destx)*(x-destx) + (y-desty)*(y-desty));
       step = dist/10.0f;
     }
-
     int j = 0;
     for(j; j<10 ;j++)
       {
@@ -6360,39 +5651,27 @@ void Spell::EffectLeapForward(uint32 i)
     return;
       }
     unitTarget->NearTeleportTo(destx, desty, destz + 0.07531, orientation, unitTarget==m_caster);
-
 }
-
 void Spell::EffectReputation(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *_player = (Player*)unitTarget;
-
     int32  rep_change = damage;//+1;           // field store reputation change -1
-
     uint32 faction_id = m_spellInfo->EffectMiscValue[i];
-
     FactionEntry const* factionEntry = sFactionStore.LookupEntry(faction_id);
-
     if(!factionEntry)
         return;
-
     _player->GetReputationMgr().ModifyReputation(factionEntry, rep_change);
 }
-
 void Spell::EffectQuestComplete(uint32 i)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *_player = (Player*)m_caster;
-
     uint32 quest_id = m_spellInfo->EffectMiscValue[i];
     _player->AreaExploredOrEventHappens(quest_id);
 }
-
 void Spell::EffectSelfResurrect(uint32 i)
 {
     if(!unitTarget || unitTarget->isAlive())
@@ -6401,10 +5680,8 @@ void Spell::EffectSelfResurrect(uint32 i)
         return;
     if(!unitTarget->IsInWorld())
         return;
-
     uint32 health = 0;
     uint32 mana = 0;
-
     // flat case
     if(damage < 0)
     {
@@ -6418,61 +5695,45 @@ void Spell::EffectSelfResurrect(uint32 i)
         if(unitTarget->GetMaxPower(POWER_MANA) > 0)
             mana = uint32(damage/100.0f*unitTarget->GetMaxPower(POWER_MANA));
     }
-
     Player *plr = ((Player*)unitTarget);
     plr->ResurrectPlayer(0.0f);
-
     plr->SetHealth( health );
     plr->SetPower(POWER_MANA, mana );
     plr->SetPower(POWER_RAGE, 0 );
     plr->SetPower(POWER_ENERGY, plr->GetMaxPower(POWER_ENERGY) );
-
     plr->SpawnCorpseBones();
-
     plr->SaveToDB();
 }
-
 void Spell::EffectSkinning(uint32 /*i*/)
 {
     if(unitTarget->GetTypeId() != TYPEID_UNIT )
         return;
     if(!m_caster || m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Creature* creature = (Creature*) unitTarget;
     int32 targetLevel = creature->getLevel();
-
     uint32 skill = creature->GetCreatureInfo()->GetRequiredLootSkill();
-
     ((Player*)m_caster)->SendLoot(creature->GetGUID(),LOOT_SKINNING);
     creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
-
     int32 reqValue = targetLevel < 10 ? 0 : targetLevel < 20 ? (targetLevel-10)*10 : targetLevel*5;
-
     int32 skillValue = ((Player*)m_caster)->GetPureSkillValue(skill);
-
     // Double chances for elites
     ((Player*)m_caster)->UpdateGatherSkill(skill, skillValue, reqValue, creature->isElite() ? 2 : 1 );
 }
-
 void Spell::EffectCharge(uint32 /*i*/)
 {
     if(!m_caster)
         return;
-
     Unit *target = m_targets.getUnitTarget();
     if(!target)
         return;
-
     float x, y, z;
     target->GetContactPoint(m_caster, x, y, z);
     m_caster->GetMotionMaster()->MoveCharge(x, y, z);
-
     // not all charge effects used in negative spells
     if ( !IsPositiveSpell(m_spellInfo->Id) && m_caster->GetTypeId() == TYPEID_PLAYER)
         m_caster->Attack(target, true);
 }
-
 void Spell::EffectCharge2(uint32 /*i*/)
 {
     float x, y, z;
@@ -6487,15 +5748,12 @@ void Spell::EffectCharge2(uint32 /*i*/)
     }
     else
         return;
-
     m_caster->GetMotionMaster()->MoveCharge(x, y, z);
 }
-
 void Spell::EffectKnockBack(uint32 i)
 {
     if(!unitTarget)
         return;
-
     // Typhoon
     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && m_spellInfo->SpellFamilyFlags[1] & 0x01000000)
     {
@@ -6503,7 +5761,6 @@ void Spell::EffectKnockBack(uint32 i)
         if (m_caster->HasAura(62135))
             return;
     }
-
     // Thunderstorm
     if (m_spellInfo->SpellFamilyName == SPELLFAMILY_SHAMAN && m_spellInfo->SpellFamilyFlags[1] & 0x00002000)
     {
@@ -6511,7 +5768,6 @@ void Spell::EffectKnockBack(uint32 i)
         if (m_caster->HasAura(62132))
             return;
     }
-
     float ratio = m_caster->GetCombatReach() / std::max(unitTarget->GetCombatReach(), 1.0f);
     if(ratio < 1.0f)
         ratio = ratio * ratio * ratio * 0.1f; // volume = length^3
@@ -6521,16 +5777,13 @@ void Spell::EffectKnockBack(uint32 i)
     float speedz = float(damage) * ratio;
     if(speedxy < 0.1f && speedz < 0.1f)
         return;
-
     float x, y;
     if(m_targets.HasDst() && !m_targets.HasTraj())
         m_targets.m_dstPos.GetPosition(x, y);
     else
         m_caster->GetPosition(x, y);
-
     unitTarget->KnockbackFrom(x, y, speedxy, speedz);
 }
-
 void Spell::EffectJump2(uint32 i)
 {
     float speedxy = float(m_spellInfo->EffectMiscValue[i])/10;
@@ -6546,32 +5799,24 @@ void Spell::EffectJump2(uint32 i)
         m_caster->JumpTo(speedxy, speedz, m_spellInfo->SpellIconID != 1891);
     }
 }
-
 void Spell::EffectSendTaxi(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)unitTarget)->ActivateTaxiPathTo(m_spellInfo->EffectMiscValue[i],m_spellInfo->Id);
 }
-
 void Spell::EffectPlayerPull(uint32 i)
 {
     if(!unitTarget)
         return;
-
     unitTarget->KnockbackFrom(m_caster->GetPositionX(), m_caster->GetPositionY(), float(damage ? damage : unitTarget->GetDistance2d(m_caster)), float(m_spellInfo->EffectMiscValue[i])/10);
 }
-
 void Spell::EffectDispelMechanic(uint32 i)
 {
     if(!unitTarget)
         return;
-
     uint32 mechanic = m_spellInfo->EffectMiscValue[i];
-
     std::queue < std::pair < uint32, uint64 > > dispel_list;
-
     Unit::AuraMap& Auras = unitTarget->GetAuras();
     for(Unit::AuraMap::iterator iter = Auras.begin(); iter != Auras.end(); iter++)
     {
@@ -6580,13 +5825,11 @@ void Spell::EffectDispelMechanic(uint32 i)
            dispel_list.push(std::make_pair(iter->second->GetId(), iter->second->GetCasterGUID() ) );
        }
     }
-
     for(;dispel_list.size();dispel_list.pop())
     {
         unitTarget->RemoveAura(dispel_list.front().first, dispel_list.front().second, AURA_REMOVE_BY_ENEMY_SPELL);
     }
 }
-
 void Spell::EffectSummonDeadPet(uint32 /*i*/)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
@@ -6599,18 +5842,15 @@ void Spell::EffectSummonDeadPet(uint32 /*i*/)
         return;
     if(damage < 0)
         return;
-
     pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0);
     pet->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
     pet->setDeathState( ALIVE );
     pet->clearUnitState(UNIT_STAT_ALL_STATE);
     pet->SetHealth( uint32(pet->GetMaxHealth()*(float(damage)/100)));
-
     //pet->AIM_Initialize();
     //_player->PetSpellInitialize();
     pet->SavePetToDB(PET_SAVE_AS_CURRENT);
 }
-
 void Spell::EffectDestroyAllTotems(uint32 /*i*/)
 {
     int32 mana = 0;
@@ -6618,7 +5858,6 @@ void Spell::EffectDestroyAllTotems(uint32 /*i*/)
     {
         if(!m_caster->m_SummonSlot[slot])
             continue;
-
         Creature* totem = m_caster->GetMap()->GetCreature(m_caster->m_SummonSlot[slot]);
         if(totem && totem->isTotem())
         {
@@ -6633,18 +5872,14 @@ void Spell::EffectDestroyAllTotems(uint32 /*i*/)
         }
     }
     mana = mana * damage / 100;
-
     if (mana)
         m_caster->CastCustomSpell(m_caster, 39104, &mana, NULL, NULL, true);
 }
-
 void Spell::EffectDurabilityDamage(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     int32 slot = m_spellInfo->EffectMiscValue[i];
-
     // FIXME: some spells effects have value -1/-2
     // Possibly its mean -1 all player equipped items and -2 all items
     if(slot < 0)
@@ -6652,22 +5887,17 @@ void Spell::EffectDurabilityDamage(uint32 i)
         ((Player*)unitTarget)->DurabilityPointsLossAll(damage, (slot < -1));
         return;
     }
-
     // invalid slot value
     if(slot >= INVENTORY_SLOT_BAG_END)
         return;
-
     if(Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
         ((Player*)unitTarget)->DurabilityPointsLoss(item, damage);
 }
-
 void Spell::EffectDurabilityDamagePCT(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     int32 slot = m_spellInfo->EffectMiscValue[i];
-
     // FIXME: some spells effects have value -1/-2
     // Possibly its mean -1 all player equipped items and -2 all items
     if(slot < 0)
@@ -6675,40 +5905,30 @@ void Spell::EffectDurabilityDamagePCT(uint32 i)
         ((Player*)unitTarget)->DurabilityLossAll(double(damage)/100.0f, (slot < -1));
         return;
     }
-
     // invalid slot value
     if(slot >= INVENTORY_SLOT_BAG_END)
         return;
-
     if(damage <= 0)
         return;
-
     if(Item* item = ((Player*)unitTarget)->GetItemByPos(INVENTORY_SLOT_BAG_0, slot))
         ((Player*)unitTarget)->DurabilityLoss(item, double(damage)/100.0f);
 }
-
 void Spell::EffectModifyThreatPercent(uint32 /*effIndex*/)
 {
     if(!unitTarget)
         return;
-
     unitTarget->getThreatManager().modifyThreatPercent(m_caster, damage);
 }
-
 void Spell::EffectTransmitted(uint32 effIndex)
 {
     uint32 name_id = m_spellInfo->EffectMiscValue[effIndex];
-
     GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(name_id);
-
     if (!goinfo)
     {
         sLog.outErrorDb("Gameobject (Entry: %u) not exist and not created at spell (ID: %u) cast",name_id, m_spellInfo->Id);
         return;
     }
-
     float fx, fy, fz;
-
     if(m_targets.HasDst())
         m_targets.m_dstPos.GetPosition(fx, fy, fz);
     //FIXME: this can be better check for most objects but still hack
@@ -6723,10 +5943,8 @@ void Spell::EffectTransmitted(uint32 effIndex)
         float min_dis = GetSpellMinRangeForFriend(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
         float max_dis = GetSpellMaxRangeForFriend(sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex));
         float dis = rand_norm() * (max_dis - min_dis) + min_dis;
-
         m_caster->GetClosePoint(fx, fy, fz, DEFAULT_WORLD_OBJECT_SIZE, dis);
     }
-
     Map *cMap = m_caster->GetMap();
     if(goinfo->type==GAMEOBJECT_TYPE_FISHINGNODE)
     {
@@ -6735,14 +5953,13 @@ void Spell::EffectTransmitted(uint32 effIndex)
         {
             fx = 36.69+irand(-8,8);//random place for the bobber
             fy = -416.38+irand(-8,8);
-            fz = -19.9645;//serpentshrine water level        
+            fz = -19.9645;//serpentshrine water level
         }else if ( !cMap->IsInWater(fx, fy, fz-0.5f, 0.5f))             // Hack to prevent fishing bobber from failing to land on fishing hole
         { // but this is not proper, we really need to ignore not materialized objects
             SendCastResult(SPELL_FAILED_NOT_HERE);
             SendChannelUpdate(0);
             return;
         }
-
         // replace by water level in this case
         if(cMap->GetId() != 548)//if map is not serpentshrine caverns
             fz = cMap->GetWaterLevel(fx, fy);
@@ -6752,25 +5969,20 @@ void Spell::EffectTransmitted(uint32 effIndex)
     {
         m_caster->GetPosition(fx, fy, fz);
     }
-
     GameObject* pGameObj = new GameObject;
-
     if(!pGameObj->Create(objmgr.GenerateLowGuid(HIGHGUID_GAMEOBJECT), name_id, cMap,
         m_caster->GetPhaseMask(), fx, fy, fz, m_caster->GetOrientation(), 0.0f, 0.0f, 0.0f, 0.0f, 100, GO_STATE_READY))
     {
         delete pGameObj;
         return;
     }
-
     int32 duration = GetSpellDuration(m_spellInfo);
-
     switch(goinfo->type)
     {
         case GAMEOBJECT_TYPE_FISHINGNODE:
         {
             m_caster->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT,pGameObj->GetGUID());
             m_caster->AddGameObject(pGameObj);              // will removed at spell cancel
-
             // end time of range when possible catch fish (FISHING_BOBBER_READY_TIME..GetDuration(m_spellInfo))
             // start time == fish-FISHING_BOBBER_READY_TIME (0..GetDuration(m_spellInfo)-FISHING_BOBBER_READY_TIME)
             int32 lastSec = 0;
@@ -6781,7 +5993,6 @@ void Spell::EffectTransmitted(uint32 effIndex)
                 case 2: lastSec = 13; break;
                 case 3: lastSec = 17; break;
             }
-
             duration = duration - lastSec*IN_MILISECONDS + FISHING_BOBBER_READY_TIME*IN_MILISECONDS;
             break;
         }
@@ -6802,24 +6013,17 @@ void Spell::EffectTransmitted(uint32 effIndex)
         default:
             break;
     }
-
     pGameObj->SetRespawnTime(duration > 0 ? duration/IN_MILISECONDS : 0);
-
     pGameObj->SetOwnerGUID(m_caster->GetGUID());
-
     //pGameObj->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel());
     pGameObj->SetSpellId(m_spellInfo->Id);
-
     DEBUG_LOG("AddObject at SpellEfects.cpp EffectTransmitted");
     //m_caster->AddGameObject(pGameObj);
     //m_ObjToDel.push_back(pGameObj);
-
     cMap->Add(pGameObj);
-
     WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
     data << uint64(pGameObj->GetGUID());
     m_caster->SendMessageToSet(&data,true);
-
     if(uint32 linkedEntry = pGameObj->GetGOInfo()->GetLinkedGameObjectEntry())
     {
         GameObject* linkedGO = new GameObject;
@@ -6830,7 +6034,6 @@ void Spell::EffectTransmitted(uint32 effIndex)
             //linkedGO->SetUInt32Value(GAMEOBJECT_LEVEL, m_caster->getLevel());
             linkedGO->SetSpellId(m_spellInfo->Id);
             linkedGO->SetOwnerGUID(m_caster->GetGUID());
-
             linkedGO->GetMap()->Add(linkedGO);
         }
         else
@@ -6841,56 +6044,44 @@ void Spell::EffectTransmitted(uint32 effIndex)
         }
     }
 }
-
 void Spell::EffectProspecting(uint32 /*i*/)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* p_caster = (Player*)m_caster;
     if(!itemTarget || !(itemTarget->GetProto()->BagFamily & BAG_FAMILY_MASK_MINING_SUPP))
         return;
-
     if(itemTarget->GetCount() < 5)
         return;
-
     if( sWorld.getConfig(CONFIG_SKILL_PROSPECTING))
     {
         uint32 SkillValue = p_caster->GetPureSkillValue(SKILL_JEWELCRAFTING);
         uint32 reqSkillValue = itemTarget->GetProto()->RequiredSkillRank;
         p_caster->UpdateGatherSkill(SKILL_JEWELCRAFTING, SkillValue, reqSkillValue);
     }
-
     ((Player*)m_caster)->SendLoot(itemTarget->GetGUID(), LOOT_PROSPECTING);
 }
-
 void Spell::EffectMilling(uint32 /*i*/)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player* p_caster = (Player*)m_caster;
     if(!itemTarget || !(itemTarget->GetProto()->BagFamily & BAG_FAMILY_MASK_HERBS))
         return;
-
     if(itemTarget->GetCount() < 5)
         return;
-
     if( sWorld.getConfig(CONFIG_SKILL_MILLING))
     {
         uint32 SkillValue = p_caster->GetPureSkillValue(SKILL_INSCRIPTION);
         uint32 reqSkillValue = itemTarget->GetProto()->RequiredSkillRank;
         p_caster->UpdateGatherSkill(SKILL_INSCRIPTION, SkillValue, reqSkillValue);
     }
-
     ((Player*)m_caster)->SendLoot(itemTarget->GetGUID(), LOOT_MILLING);
 }
-
 void Spell::EffectSkill(uint32 /*i*/)
 {
     sLog.outDebug("WORLD: SkillEFFECT");
 }
-
 /* There is currently no need for this effect. We handle it in BattleGround.cpp
    If we would handle the resurrection here, the spiritguide would instantly disappear as the
    player revives, and so we wouldn't see the spirit heal visual effect on the npc.
@@ -6904,31 +6095,25 @@ void Spell::EffectSpiritHeal(uint32 /*i*/)
         return;
     if(!unitTarget->IsInWorld())
         return;
-
     //m_spellInfo->EffectBasePoints[i]; == 99 (percent?)
     //((Player*)unitTarget)->setResurrect(m_caster->GetGUID(), unitTarget->GetPositionX(), unitTarget->GetPositionY(), unitTarget->GetPositionZ(), unitTarget->GetMaxHealth(), unitTarget->GetMaxPower(POWER_MANA));
     ((Player*)unitTarget)->ResurrectPlayer(1.0f);
     ((Player*)unitTarget)->SpawnCorpseBones();
     */
 }
-
 // remove insignia spell effect
 void Spell::EffectSkinPlayerCorpse(uint32 /*i*/)
 {
     sLog.outDebug("Effect: SkinPlayerCorpse");
     if ( (m_caster->GetTypeId() != TYPEID_PLAYER) || (unitTarget->GetTypeId() != TYPEID_PLAYER) || (unitTarget->isAlive()) )
         return;
-
     ((Player*)unitTarget)->RemovedInsignia( (Player*)m_caster );
 }
-
 void Spell::EffectStealBeneficialBuff(uint32 i)
 {
     sLog.outDebug("Effect: StealBeneficialBuff");
-
     if(!unitTarget || unitTarget==m_caster)                 // can't steal from self
         return;
-
     std::list <Aura *> steal_list;
     // Create dispel mask by dispel type
     uint32 dispelMask  = GetDispellMask( DispelType(m_spellInfo->EffectMiscValue[i]) );
@@ -6947,7 +6132,6 @@ void Spell::EffectStealBeneficialBuff(uint32 i)
     if (uint32 list_size = steal_list.size())
     {
         std::list < Aura * > success_list;
-
         // dispel N = damage buffs (or while exist buffs for dispel)
         for (int32 count=0; count < damage && list_size > 0; ++count, list_size = steal_list.size())
         {
@@ -6976,49 +6160,38 @@ void Spell::EffectStealBeneficialBuff(uint32 i)
         }
     }
 }
-
 void Spell::EffectKillCreditPersonal(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)unitTarget)->KilledMonsterCredit(m_spellInfo->EffectMiscValue[i], 0);
 }
-
 void Spell::EffectKillCredit(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     int32 creatureEntry = m_spellInfo->EffectMiscValue[i];
     if(!creatureEntry)
     {
         if(m_spellInfo->Id == 42793) // Burn Body
             creatureEntry = 24008; // Fallen Combatant
     }
-
     if(creatureEntry)
         ((Player*)unitTarget)->RewardPlayerAndGroupAtEvent(creatureEntry, unitTarget);
 }
-
 void Spell::EffectQuestFail(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)unitTarget)->FailQuest(m_spellInfo->EffectMiscValue[i]);
 }
-
 void Spell::EffectActivateRune(uint32  eff_idx)
 {
     if(m_caster->GetTypeId() != TYPEID_PLAYER)
         return;
-
     Player *plr = (Player*)m_caster;
-
     if(plr->getClass() != CLASS_DEATH_KNIGHT)
         return;
-
     for(uint32 j = 0; j < MAX_RUNES; ++j)
     {
         if(plr->GetRuneCooldown(j) && plr->GetCurrentRune(j) == RuneType(m_spellInfo->EffectMiscValue[eff_idx]))
@@ -7027,19 +6200,16 @@ void Spell::EffectActivateRune(uint32  eff_idx)
         }
     }
 }
-
 void Spell::EffectTitanGrip(uint32 /*eff_idx*/)
 {
     if (unitTarget && unitTarget->GetTypeId() == TYPEID_PLAYER)
         ((Player*)unitTarget)->SetCanTitanGrip(true);
 }
-
 void Spell::EffectRedirectThreat(uint32 /*i*/)
 {
     if(unitTarget)
         m_caster->SetReducedThreatPercent((uint32)damage, unitTarget->GetGUID());
 }
-
 void Spell::EffectWMODamage(uint32 /*i*/)
 {
     if(gameObjTarget && gameObjTarget->GetGoType() == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
@@ -7047,7 +6217,6 @@ void Spell::EffectWMODamage(uint32 /*i*/)
         Unit *caster = m_originalCaster;
         if(!caster)
             return;
-
         FactionTemplateEntry const *casterft, *goft;
         casterft = caster->getFactionTemplateEntry();
         goft = sFactionTemplateStore.LookupEntry(gameObjTarget->GetUInt32Value(GAMEOBJECT_FACTION));
@@ -7056,25 +6225,20 @@ void Spell::EffectWMODamage(uint32 /*i*/)
             gameObjTarget->TakenDamage((uint32)damage);
     }
 }
-
 void Spell::EffectWMORepair(uint32 /*i*/)
 {
     if(gameObjTarget && gameObjTarget->GetGoType() == GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING)
         gameObjTarget->Rebuild();
 }
-
 void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *properties)
 {
     Unit *caster = m_originalCaster;
     if(!caster)
         return;
-
     if(caster->isTotem())
         caster = ((Totem*)caster)->GetOwner();
-
     // in another case summon new
     uint32 level = caster->getLevel();
-
     // level of pet summoned using engineering item based at engineering skill level
     if(m_CastItem && caster->GetTypeId() == TYPEID_PLAYER)
     {
@@ -7088,7 +6252,6 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *
             }
         }
     }
-
     //float radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(m_spellInfo->EffectRadiusIndex[i]));
     float radius = 5.0f;
     int32 amount = damage > 0 ? damage : 1;
@@ -7101,33 +6264,26 @@ void Spell::SummonGuardian(uint32 i, uint32 entry, SummonPropertiesEntry const *
     int32 duration = GetSpellDuration(m_spellInfo);
     if(Player* modOwner = m_originalCaster->GetSpellModOwner())
         modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration);
-
     TempSummonType summonType = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN;
     Map *map = caster->GetMap();
-
     for(uint32 count = 0; count < amount; ++count)
     {
         Position pos;
         GetSummonPosition(i, pos, radius, count);
-
         TempSummon *summon = map->SummonCreature(entry, pos, properties, duration, caster);
         if(!summon)
             return;
         if(summon->HasUnitTypeMask(UNIT_MASK_GUARDIAN))
             ((Guardian*)summon)->InitStatsForLevel(level);
-
         summon->SetUInt32Value(UNIT_CREATED_BY_SPELL, m_spellInfo->Id);
         if(summon->HasUnitTypeMask(UNIT_MASK_MINION) && m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
             ((Minion*)summon)->SetFollowAngle(m_caster->GetAngle(summon));
-
         summon->AI()->EnterEvadeMode();
     }
 }
-
 void Spell::GetSummonPosition(uint32 i, Position &pos, float radius, uint32 count)
 {
     pos.SetOrientation(m_caster->GetOrientation());
-
     if (m_targets.m_targetMask & TARGET_FLAG_DEST_LOCATION)
     {
         // Summon 1 unit in dest location
@@ -7161,47 +6317,37 @@ void Spell::GetSummonPosition(uint32 i, Position &pos, float radius, uint32 coun
         pos.Relocate(x, y, z);
     }
 }
-
 void Spell::EffectRenamePet(uint32 /*eff_idx*/)
 {
     if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT ||
         !((Creature*)unitTarget)->isPet() || ((Pet*)unitTarget)->getPetType() != HUNTER_PET)
         return;
-
     unitTarget->SetByteValue(UNIT_FIELD_BYTES_2, 2, UNIT_RENAME_ALLOWED);
 }
-
 void Spell::EffectPlayMusic(uint32 i)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     uint32 soundid = m_spellInfo->EffectMiscValue[i];
-
     if (!sSoundEntriesStore.LookupEntry(soundid))
     {
         sLog.outError("EffectPlayMusic: Sound (Id: %u) not exist in spell %u.",soundid,m_spellInfo->Id);
         return;
     }
-
     WorldPacket data(SMSG_PLAY_MUSIC, 4);
     data << uint32(soundid);
     ((Player*)unitTarget)->GetSession()->SendPacket(&data);
 }
-
 void Spell::EffectSpecCount(uint32 /*eff_idx*/)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)unitTarget)->UpdateSpecCount(damage);
 }
-
 void Spell::EffectActivateSpec(uint32 /*eff_idx*/)
 {
     if(!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
         return;
-
     ((Player*)unitTarget)->ActivateSpec(damage-1);  // damage is 1 or 2, spec is 0 or 1
 }
 
diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
index b8aa4469472..31eb05ae802 100644
--- a/src/game/SpellHandler.cpp
+++ b/src/game/SpellHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "DBCStores.h"
 #include "WorldPacket.h"
@@ -32,61 +31,50 @@
 #include "TemporarySummon.h"
 #include "SpellAuras.h"
 #include "CreatureAI.h"
-
 void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
 {
     // TODO: add targets.read() check
     Player* pUser = _player;
-
     // ignore for remote control state
     if(pUser->m_mover != pUser)
         return;
-
     uint8 bagIndex, slot;
     uint8 unk_flags;                                        // flags (if 0x02 - some additional data are received)
     uint8 cast_count;                                       // next cast if exists (single or not)
     uint64 item_guid;
     uint32 glyphIndex;                                      // something to do with glyphs?
     uint32 spellid;                                         // casted spell id
-
     recvPacket >> bagIndex >> slot >> cast_count >> spellid >> item_guid >> glyphIndex >> unk_flags;
-
     Item *pItem = pUser->GetUseableItemByPos(bagIndex, slot);
     if(!pItem)
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     if(pItem->GetGUID() != item_guid)
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     sLog.outDetail("WORLD: CMSG_USE_ITEM packet, bagIndex: %u, slot: %u, cast_count: %u, spellid: %u, Item: %u, glyphIndex: %u, unk_flags: %u, data length = %i", bagIndex, slot, cast_count, spellid, pItem->GetEntry(), glyphIndex, unk_flags, (uint32)recvPacket.size());
-
     ItemPrototype const *proto = pItem->GetProto();
     if(!proto)
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItem, NULL );
         return;
     }
-
     // some item classes can be used only in equipped state
     if(proto->InventoryType != INVTYPE_NON_EQUIP && !pItem->IsEquipped())
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItem, NULL );
         return;
     }
-
     uint8 msg = pUser->CanUseItem(pItem);
     if( msg != EQUIP_ERR_OK )
     {
         pUser->SendEquipError( msg, pItem, NULL );
         return;
     }
-
     // only allow conjured consumable, bandage, poisons (all should have the 2^21 item flag set in DB)
     if( proto->Class == ITEM_CLASS_CONSUMABLE &&
         !(proto->Flags & ITEM_FLAGS_USEABLE_IN_ARENA) &&
@@ -95,7 +83,6 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
         pUser->SendEquipError(EQUIP_ERR_NOT_DURING_ARENA_MATCH,pItem,NULL);
         return;
     }
-
     if (pUser->isInCombat())
     {
         for(int i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
@@ -110,7 +97,6 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
             }
         }
     }
-
     // check also  BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory)
     if( pItem->GetProto()->Bonding == BIND_WHEN_USE || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM )
     {
@@ -120,31 +106,26 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
             pItem->SetBinding( true );
         }
     }
-
     SpellCastTargets targets;
     if (!targets.read(&recvPacket, pUser))
         return;
-
     targets.Update(pUser);
-
     if (!pItem->IsTargetValidForItemUse(targets.getUnitTarget()))
     {
         // free gray item after use fail
         pUser->SendEquipError(EQUIP_ERR_NONE, pItem, NULL);
-
         // send spell error
         if (SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellid))
         {
-            // for implicit area/coord target spells 
+            // for implicit area/coord target spells
             if(!targets.getUnitTarget())
                 Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_NO_VALID_TARGETS);
-            // for explicit target spells 
+            // for explicit target spells
             else
-                Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_BAD_TARGETS);                
+                Spell::SendCastResult(_player,spellInfo,cast_count,SPELL_FAILED_BAD_TARGETS);
         }
         return;
     }
-
     //Note: If script stop casting it must send appropriate data to client to prevent stuck item in gray state.
     if(!Script->ItemUse(pUser,pItem,targets))
     {
@@ -152,59 +133,46 @@ void WorldSession::HandleUseItemOpcode(WorldPacket& recvPacket)
         pUser->CastItemUseSpell(pItem,targets,cast_count,glyphIndex);
     }
 }
-
 #define OPEN_CHEST 11437
 #define OPEN_SAFE 11535
 #define OPEN_CAGE 11792
 #define OPEN_BOOTY_CHEST 5107
 #define OPEN_STRONGBOX 8517
-
 void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
 {
     sLog.outDetail("WORLD: CMSG_OPEN_ITEM packet, data length = %i",(uint32)recvPacket.size());
-
     Player* pUser = _player;
-
     // ignore for remote control state
     if(pUser->m_mover != pUser)
         return;
-
     uint8 bagIndex, slot;
-
     recvPacket >> bagIndex >> slot;
-
     sLog.outDetail("bagIndex: %u, slot: %u",bagIndex,slot);
-
     Item *pItem = pUser->GetItemByPos(bagIndex, slot);
     if(!pItem)
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, NULL, NULL );
         return;
     }
-
     ItemPrototype const *proto = pItem->GetProto();
     if(!proto)
     {
         pUser->SendEquipError(EQUIP_ERR_ITEM_NOT_FOUND, pItem, NULL );
         return;
     }
-
     if(!pUser->GetSession()->HandleOnItemOpen(pItem))
         return;
-
     // locked item
     uint32 lockId = proto->LockID;
     if(lockId)
     {
         LockEntry const *lockInfo = sLockStore.LookupEntry(lockId);
-
         if (!lockInfo)
         {
             pUser->SendEquipError(EQUIP_ERR_ITEM_LOCKED, pItem, NULL );
             sLog.outError( "WORLD::OpenItem: item [guid = %u] has an unknown lockId: %u!", pItem->GetGUIDLow() , lockId);
             return;
         }
-
         // required picklocking
         if(lockInfo->Skill[1] || lockInfo->Skill[0])
         {
@@ -212,7 +180,6 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
             return;
         }
     }
-
     if(pItem->HasFlag(ITEM_FIELD_FLAGS, ITEM_FLAGS_WRAPPED))// wrapped?
     {
         QueryResult *result = CharacterDatabase.PQuery("SELECT entry, flags FROM character_gifts WHERE item_guid = '%u'", pItem->GetGUIDLow());
@@ -221,7 +188,6 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
             Field *fields = result->Fetch();
             uint32 entry = fields[0].GetUInt32();
             uint32 flags = fields[1].GetUInt32();
-
             pItem->SetUInt64Value(ITEM_FIELD_GIFTCREATOR, 0);
             pItem->SetEntry(entry);
             pItem->SetUInt32Value(ITEM_FIELD_FLAGS, flags);
@@ -239,51 +205,36 @@ void WorldSession::HandleOpenItemOpcode(WorldPacket& recvPacket)
     else
         pUser->SendLoot(pItem->GetGUID(),LOOT_CORPSE);
 }
-
 void WorldSession::HandleGameObjectUseOpcode( WorldPacket & recv_data )
 {
     uint64 guid;
-
     recv_data >> guid;
-
     sLog.outDebug( "WORLD: Recvd CMSG_GAMEOBJ_USE Message [guid=%u]", GUID_LOPART(guid));
-
     // ignore for remote control state
     if(_player->m_mover != _player)
         return;
-
     GameObject *obj = GetPlayer()->GetMap()->GetGameObject(guid);
-
     if(!obj)
         return;
-
     if (Script->GOHello(_player, obj))
         return;
-
     obj->Use(_player);
 }
-
 void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
 {
     uint64 guid;
     recvPacket >> guid;
-
     sLog.outDebug( "WORLD: Recvd CMSG_GAMEOBJ_REPORT_USE Message [in game guid: %u]", GUID_LOPART(guid));
-
     // ignore for remote control state
     if(_player->m_mover != _player)
         return;
-
     GameObject* go = GetPlayer()->GetMap()->GetGameObject(guid);
     if(!go)
         return;
-
     if(!go->IsWithinDistInMap(_player,INTERACTION_DISTANCE))
         return;
-
     _player->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT, go->GetEntry());
 }
-
 void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
 {
     uint32 spellId;
@@ -291,7 +242,6 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
     recvPacket >> cast_count;
     recvPacket >> spellId;
     recvPacket >> unk_flags;                                // flags (if 0x02 - some additional data are received)
-
     // ignore for remote control state (for player case)
     Unit* mover = _player->m_mover;
     if(mover != _player && mover->GetTypeId()==TYPEID_PLAYER)
@@ -299,19 +249,15 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
         recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
         return;
     }
-
     sLog.outDebug("WORLD: got cast spell packet, spellId - %u, cast_count: %u, unk_flags %u, data length = %i",
         spellId, cast_count, unk_flags, (uint32)recvPacket.size());
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
-
     if(!spellInfo)
     {
         sLog.outError("WORLD: unknown spell id %u", spellId);
         recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
         return;
     }
-
     if(mover->GetTypeId()==TYPEID_PLAYER)
     {
         // not have spell in spellbook or spell passive and not casted by client
@@ -332,17 +278,14 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
             return;
         }
     }
-
     // Client is resending autoshot cast opcode when other spell is casted during shoot rotation
     // Skip it to prevent "interrupt" message
     if (IsAutoRepeatRangedSpell(spellInfo) && _player->GetCurrentSpell(CURRENT_AUTOREPEAT_SPELL)
         && _player->GetCurrentSpell(CURRENT_AUTOREPEAT_SPELL)->m_spellInfo == spellInfo)
         return;
-
     // can't use our own spells when we're in possession of another unit,
     if(_player->isPossessing())
         return;
-
     // client provided targets
     SpellCastTargets targets;
     if(!targets.read(&recvPacket,mover))
@@ -350,7 +293,6 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
         recvPacket.rpos(recvPacket.wpos());                 // prevent spam at ignore packet
         return;
     }
-
     // some spell cast packet including more data (for projectiles?)
     if (unk_flags & 0x02)
     {
@@ -361,46 +303,36 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket)
         MovementInfo movementInfo;
         ReadMovementInfo(recvPacket, &movementInfo);
     }
-
     // auto-selection buff level base at target level (in spellInfo)
     if(targets.getUnitTarget())
     {
         SpellEntry const *actualSpellInfo = spellmgr.SelectAuraRankForPlayerLevel(spellInfo,targets.getUnitTarget()->getLevel());
-
         // if rank not found then function return NULL but in explicit cast case original spell can be casted and later failed with appropriate error message
         if(actualSpellInfo)
             spellInfo = actualSpellInfo;
     }
-
     Spell *spell = new Spell(mover, spellInfo, false);
     spell->m_cast_count = cast_count;                       // set count of casts
     spell->prepare(&targets);
 }
-
 void WorldSession::HandleCancelCastOpcode(WorldPacket& recvPacket)
 {
     uint32 spellId;
-
     recvPacket.read_skip<uint8>();                          // counter, increments with every CANCEL packet, don't use for now
     recvPacket >> spellId;
-
     if(_player->IsNonMeleeSpellCasted(false))
         _player->InterruptNonMeleeSpells(false,spellId,false);
 }
-
 void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
 {
     uint32 spellId;
     recvPacket >> spellId;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if (!spellInfo)
         return;
-
     // not allow remove non positive spells and spells with attr SPELL_ATTR_CANT_CANCEL
     if(!IsPositiveSpell(spellId) || (spellInfo->Attributes & SPELL_ATTR_CANT_CANCEL))
         return;
-
     // channeled spell case (it currently casted then)
     if (IsChanneledSpell(spellInfo))
     {
@@ -409,124 +341,96 @@ void WorldSession::HandleCancelAuraOpcode( WorldPacket& recvPacket)
                 _player->InterruptSpell(CURRENT_CHANNELED_SPELL);
         return;
     }
-
     // non channeled case
     // maybe should only remove one buff when there are multiple?
     _player->RemoveAurasDueToSpell(spellId, 0, AURA_REMOVE_BY_CANCEL);
 }
-
 void WorldSession::HandlePetCancelAuraOpcode( WorldPacket& recvPacket)
 {
     uint64 guid;
     uint32 spellId;
-
     recvPacket >> guid;
     recvPacket >> spellId;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
     if(!spellInfo)
     {
         sLog.outError("WORLD: unknown PET spell id %u", spellId);
         return;
     }
-
     Creature* pet=ObjectAccessor::GetCreatureOrPetOrVehicle(*_player,guid);
-
     if(!pet)
     {
         sLog.outError( "Pet %u not exist.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     if(pet != GetPlayer()->GetGuardianPet() && pet != GetPlayer()->GetCharm())
     {
         sLog.outError( "HandlePetCancelAura.Pet %u isn't pet of player %s", uint32(GUID_LOPART(guid)),GetPlayer()->GetName() );
         return;
     }
-
     if(!pet->isAlive())
     {
         pet->SendPetActionFeedback(FEEDBACK_PET_DEAD);
         return;
     }
-
     pet->RemoveAurasDueToSpell(spellId);
-
     pet->AddCreatureSpellCooldown(spellId);
 }
-
 void WorldSession::HandleCancelGrowthAuraOpcode( WorldPacket& /*recvPacket*/)
 {
     // nothing do
 }
-
 void WorldSession::HandleCancelAutoRepeatSpellOpcode( WorldPacket& /*recvPacket*/)
 {
     // may be better send SMSG_CANCEL_AUTO_REPEAT?
     // cancel and prepare for deleting
     _player->InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
 }
-
 void WorldSession::HandleCancelChanneling( WorldPacket & recv_data)
 {
     recv_data.read_skip<uint32>();                          // spellid, not used
-
     // ignore for remote control state (for player case)
     Unit* mover = _player->m_mover;
     if(mover != _player && mover->GetTypeId()==TYPEID_PLAYER)
         return;
-
     mover->InterruptSpell(CURRENT_CHANNELED_SPELL);
 }
-
 void WorldSession::HandleTotemDestroyed( WorldPacket& recvPacket)
 {
     // ignore for remote control state
     if(_player->m_mover != _player)
         return;
-
     uint8 slotId;
-
     recvPacket >> slotId;
-
     ++slotId;
     if (slotId >= MAX_TOTEM_SLOT)
         return;
-
     if(!_player->m_SummonSlot[slotId])
         return;
-
     Creature* totem = GetPlayer()->GetMap()->GetCreature(_player->m_SummonSlot[slotId]);
     // Don't unsummon sentry totem
     if(totem && totem->isTotem() && totem->GetEntry() != SENTRY_TOTEM_ENTRY)
         ((Totem*)totem)->UnSummon();
 }
-
 void WorldSession::HandleSelfResOpcode( WorldPacket & /*recv_data*/ )
 {
     sLog.outDebug("WORLD: CMSG_SELF_RES");                  // empty opcode
-
     if(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL))
     {
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(_player->GetUInt32Value(PLAYER_SELF_RES_SPELL));
         if(spellInfo)
             _player->CastSpell(_player,spellInfo,false,0);
-
         _player->SetUInt32Value(PLAYER_SELF_RES_SPELL, 0);
     }
 }
-
 void WorldSession::HandleSpellClick( WorldPacket & recv_data )
 {
     uint64 guid;
     recv_data >> guid;
-
     // this will get something not in world. crash
     Creature *unit = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid);
-    
     if(!unit)
         return;
-
     // TODO: Unit::SetCharmedBy: 28782 is not in world but 0 is trying to charm it! -> crash
     if(!unit->IsInWorld())
     {
@@ -534,7 +438,6 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data )
         assert(false);
         return;
     }
-
     SpellClickInfoMapBounds clickPair = objmgr.GetSpellClickInfoMapBounds(unit->GetEntry());
     for(SpellClickInfoMap::const_iterator itr = clickPair.first; itr != clickPair.second; ++itr)
     {
@@ -546,19 +449,15 @@ void WorldSession::HandleSpellClick( WorldPacket & recv_data )
             caster->CastSpell(target, itr->second.spellId, true, NULL, NULL, origCasterGUID);
         }
     }
-
     if(unit->IsVehicle())
         _player->EnterVehicle(unit);
-
     unit->AI()->DoAction(EVENT_SPELLCLICK);
 }
-
 void WorldSession::HandleMirrrorImageDataRequest( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_GET_MIRRORIMAGE_DATA");
     uint64 guid;
     recv_data >> guid;
-
     // Get unit for which data is needed by client
     Unit *unit = ObjectAccessor::GetObjectInWorld(guid, (Unit*)NULL);
     if(!unit)
@@ -577,14 +476,12 @@ void WorldSession::HandleMirrrorImageDataRequest( WorldPacket & recv_data )
         data << (uint8)pCreator->getGender();
         data << (uint8)pCreator->getClass();
         data << (uint8)pCreator->GetByteValue(PLAYER_BYTES, 0); // skin
-
         data << (uint8)pCreator->GetByteValue(PLAYER_BYTES, 1); // face
         data << (uint8)pCreator->GetByteValue(PLAYER_BYTES, 2); // hair
         data << (uint8)pCreator->GetByteValue(PLAYER_BYTES, 3); // haircolor
         data << (uint8)pCreator->GetByteValue(PLAYER_BYTES_2, 0); // facialhair
-
         data << (uint32)pCreator->GetGuildId();  // unk
-        static const EquipmentSlots ItemSlots[] = 
+        static const EquipmentSlots ItemSlots[] =
         {
             EQUIPMENT_SLOT_HEAD,
             EQUIPMENT_SLOT_SHOULDERS,
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index ef42f0d50ac..3f11cfccf80 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "SpellMgr.h"
 #include "ObjectMgr.h"
 #include "SpellAuraDefines.h"
@@ -28,11 +27,9 @@
 #include "Spell.h"
 #include "BattleGroundMgr.h"
 #include "CreatureAI.h"
-
 bool IsAreaEffectTarget[TOTAL_SPELL_TARGETS];
 SpellEffectTargetTypes EffectTargetType[TOTAL_SPELL_EFFECTS];
 SpellSelectTargetTypes SpellTargetType[TOTAL_SPELL_TARGETS];
-
 SpellMgr::SpellMgr()
 {
     for(int i = 0; i < TOTAL_SPELL_EFFECTS; ++i)
@@ -97,7 +94,6 @@ SpellMgr::SpellMgr()
                 break;
         }
     }
-
     for(int i = 0; i < TOTAL_SPELL_TARGETS; ++i)
     {
         switch(i)
@@ -210,7 +206,6 @@ SpellMgr::SpellMgr()
                 SpellTargetType[i] = TARGET_TYPE_DEFAULT;
         }
     }
-
     for(int i = 0; i < TOTAL_SPELL_TARGETS; ++i)
     {
         switch(i)
@@ -239,17 +234,14 @@ SpellMgr::SpellMgr()
     }
 }
 
-
 SpellMgr::~SpellMgr()
 {
 }
-
 SpellMgr& SpellMgr::Instance()
 {
     static SpellMgr spellMgr;
     return spellMgr;
 }
-
 bool SpellMgr::IsSrcTargetSpell(SpellEntry const *spellInfo) const
 {
     for (uint8 i = 0; i< MAX_SPELL_EFFECTS; ++i)
@@ -259,7 +251,6 @@ bool SpellMgr::IsSrcTargetSpell(SpellEntry const *spellInfo) const
     }
     return false;
 }
-
 int32 GetSpellDuration(SpellEntry const *spellInfo)
 {
     if(!spellInfo)
@@ -269,7 +260,6 @@ int32 GetSpellDuration(SpellEntry const *spellInfo)
         return 0;
     return (du->Duration[0] == -1) ? -1 : abs(du->Duration[0]);
 }
-
 int32 GetSpellMaxDuration(SpellEntry const *spellInfo)
 {
     if(!spellInfo)
@@ -279,7 +269,6 @@ int32 GetSpellMaxDuration(SpellEntry const *spellInfo)
         return 0;
     return (du->Duration[2] == -1) ? -1 : abs(du->Duration[2]);
 }
-
 bool GetDispelChance(Unit* caster, uint32 spellId)
 {
     // we assume that aura dispel chance is 100% on start
@@ -294,26 +283,19 @@ bool GetDispelChance(Unit* caster, uint32 spellId)
     // Try dispel
     return !roll_chance_i(miss_chance);
 }
-
 uint32 GetSpellCastTime(SpellEntry const* spellInfo, Spell * spell)
 {
     SpellCastTimesEntry const *spellCastTimeEntry = sSpellCastTimesStore.LookupEntry(spellInfo->CastingTimeIndex);
-
     // not all spells have cast time index and this is all is pasiive abilities
     if(!spellCastTimeEntry)
         return 0;
-
     int32 castTime = spellCastTimeEntry->CastTime;
-
     if (spell && spell->GetCaster())
         spell->GetCaster()->ModSpellCastTime(spellInfo, castTime, spell);
-
     if (spellInfo->Attributes & SPELL_ATTR_REQ_AMMO && (!spell || !(spell->IsAutoRepeat())))
         castTime += 500;
-
     return (castTime > 0) ? uint32(castTime) : 0;
 }
-
 bool IsPassiveSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
@@ -323,7 +305,6 @@ bool IsPassiveSpell(uint32 spellId)
         return true;
     return false;
 }
-
 bool IsAutocastableSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
@@ -335,12 +316,10 @@ bool IsAutocastableSpell(uint32 spellId)
         return false;
     return true;
 }
-
 bool IsHigherHankOfSpell(uint32 spellId_1, uint32 spellId_2)
 {
     return spellmgr.GetSpellRank(spellId_1)<spellmgr.GetSpellRank(spellId_2);
 }
-
 uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, SpellSchoolMask schoolMask)
 {
     // Spell drain all exist power on cast (Only paladin lay of Hands)
@@ -355,7 +334,6 @@ uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, Spe
         sLog.outError("CalculateManaCost: Unknown power type '%d' in spell %d", spellInfo->powerType, spellInfo->Id);
         return 0;
     }
-
     // Base powerCost
     int32 powerCost = spellInfo->manaCost;
     // PCT cost from total amount
@@ -394,23 +372,19 @@ uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, Spe
     // Apply cost mod by spell
     if(Player* modOwner = caster->GetSpellModOwner())
         modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_COST, powerCost);
-
     if(spellInfo->Attributes & SPELL_ATTR_LEVEL_DAMAGE_CALCULATION)
         powerCost = int32(powerCost/ (1.117f* spellInfo->spellLevel / caster->getLevel() -0.1327f));
-
     // PCT mod from user auras by school
     powerCost = int32(powerCost * (1.0f+caster->GetFloatValue(UNIT_FIELD_POWER_COST_MULTIPLIER+school)));
     if (powerCost < 0)
         powerCost = 0;
     return powerCost;
 }
-
 AuraState GetSpellAuraState(SpellEntry const * spellInfo)
 {
     // Seals
     if (IsSealSpell(spellInfo))
         return AURA_STATE_JUDGEMENT;
-
     // Conflagrate aura state on Immolate and Shadowflame
     if (spellInfo->SpellFamilyName == SPELLFAMILY_WARLOCK &&
         // Immolate
@@ -418,35 +392,27 @@ AuraState GetSpellAuraState(SpellEntry const * spellInfo)
         // Shadowflame
         (spellInfo->SpellFamilyFlags[2] & 2)))
         return AURA_STATE_CONFLAGRATE;
-
     // Faerie Fire (druid versions)
     if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && spellInfo->SpellFamilyFlags[0] & 0x400)
         return AURA_STATE_FAERIE_FIRE;
-
     // Sting (hunter's pet ability)
     if (spellInfo->Category == 1133)
         return AURA_STATE_FAERIE_FIRE;
-
     // Victorious
     if (spellInfo->SpellFamilyName == SPELLFAMILY_WARRIOR &&  spellInfo->SpellFamilyFlags[1] & 0x00040000)
         return AURA_STATE_WARRIOR_VICTORY_RUSH;
-
     // Swiftmend state on Regrowth & Rejuvenation
     if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID && spellInfo->SpellFamilyFlags[0] & 0x50 )
         return AURA_STATE_SWIFTMEND;
-
     // Deadly poison aura state
     if(spellInfo->SpellFamilyName == SPELLFAMILY_ROGUE && spellInfo->SpellFamilyFlags[0] & 0x10000)
         return AURA_STATE_DEADLY_POISON;
-
     // Enrage aura state
     if(spellInfo->Dispel == DISPEL_ENRAGE)
         return AURA_STATE_ENRAGE;
-
     // Bleeding aura state
     if (GetAllSpellMechanicMask(spellInfo) & 1<<MECHANIC_BLEED)
         return AURA_STATE_BLEEDING;
-
     if(GetSpellSchoolMask(spellInfo) & SPELL_SCHOOL_MASK_FROST)
     {
         for (uint8 i = 0;i<MAX_SPELL_EFFECTS;++i)
@@ -458,13 +424,11 @@ AuraState GetSpellAuraState(SpellEntry const * spellInfo)
     }
     return AURA_STATE_NONE;
 }
-
 SpellSpecific GetSpellSpecific(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return SPELL_NORMAL;
-
     switch(spellInfo->SpellFamilyName)
     {
         case SPELLFAMILY_GENERIC:
@@ -492,7 +456,6 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                             break;
                     }
                 }
-
                 if(food && drink)
                     return SPELL_FOOD_AND_DRINK;
                 else if(food)
@@ -533,14 +496,11 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             // family flags 18(Molten), 25(Frost/Ice), 28(Mage)
             if (spellInfo->SpellFamilyFlags[0] & 0x12040000)
                 return SPELL_MAGE_ARMOR;
-
             // Arcane brillance and Arcane intelect (normal check fails because of flags difference)
             if (spellInfo->SpellFamilyFlags[0] & 0x400)
                 return SPELL_MAGE_ARCANE_BRILLANCE;
-
             if ((spellInfo->SpellFamilyFlags[0] & 0x1000000) && spellInfo->EffectApplyAuraName[0]==SPELL_AURA_MOD_CONFUSE)
                 return SPELL_MAGE_POLYMORPH;
-
             break;
         }
         case SPELLFAMILY_WARRIOR:
@@ -549,7 +509,6 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                 return SPELL_POSITIVE_SHOUT;
             if (spellInfo->Id == 12292) // Death Wish
                 return SPELL_WARRIOR_ENRAGE;
-
             break;
         }
         case SPELLFAMILY_WARLOCK:
@@ -557,11 +516,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             // only warlock curses have this
             if (spellInfo->Dispel == DISPEL_CURSE)
                 return SPELL_CURSE;
-
             // Warlock (Demon Armor | Demon Skin | Fel Armor)
             if (spellInfo->SpellFamilyFlags[1] & 0x20000020 || spellInfo->SpellFamilyFlags[2] & 0x00000010)
                 return SPELL_WARLOCK_ARMOR;
-
             //seed of corruption and corruption
             if (spellInfo->SpellFamilyFlags[1] & 0x10 || spellInfo->SpellFamilyFlags[0] & 0x2)
                 return SPELL_WARLOCK_CORRUPTION;
@@ -574,11 +531,9 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                 (spellInfo->InterruptFlags & SPELL_INTERRUPT_FLAG_AUTOATTACK) &&
                 (spellInfo->SpellIconID == 52 || spellInfo->SpellIconID == 79))
                 return SPELL_WELL_FED;
-
             // Divine Spirit and Prayer of Spirit
             if (spellInfo->SpellFamilyFlags[0] & 0x20)
                 return SPELL_PRIEST_DIVINE_SPIRIT;
-
             break;
         }
         case SPELLFAMILY_HUNTER:
@@ -586,52 +541,41 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             // only hunter stings have this
             if (spellInfo->Dispel == DISPEL_POISON)
                 return SPELL_STING;
-
             // only hunter aspects have this (but not all aspects in hunter family)
             if( spellInfo->SpellFamilyFlags.HasFlag(0x00380000, 0x00440000, 0x00001010))
                 return SPELL_ASPECT;
-
             break;
         }
         case SPELLFAMILY_PALADIN:
         {
             if (IsSealSpell(spellInfo))
                 return SPELL_SEAL;
-
             if (spellInfo->SpellFamilyFlags[0] & 0x11010002)
                 return SPELL_BLESSING;
-
             if (spellInfo->SpellFamilyFlags[0] & 0x00002190)
                 return SPELL_HAND;
-
             // Judgement of Wisdom, Judgement of Light, Judgement of Justice
             if (spellInfo->Id == 20184 || spellInfo->Id == 20185 || spellInfo->Id == 20186)
                 return SPELL_JUDGEMENT;
-
             // only paladin auras have this (for palaldin class family)
             if( spellInfo->SpellFamilyFlags[2] & 0x00000020 )
                 return SPELL_AURA;
-
             break;
         }
         case SPELLFAMILY_SHAMAN:
         {
             if (IsElementalShield(spellInfo))
                 return SPELL_ELEMENTAL_SHIELD;
-
             break;
         }
-
         case SPELLFAMILY_POTION:
             return spellmgr.GetSpellElixirSpecific(spellInfo->Id);
-
         case SPELLFAMILY_DEATHKNIGHT:
             if (spellInfo->Id == SPELL_ID_BLOOD_PRESENCE || spellInfo->Id == SPELL_ID_FROST_PRESENCE || spellInfo->Id == SPELL_ID_UNHOLY_PRESENCE)
             //if (spellInfo->Category == 47)
                 return SPELL_PRESENCE;
             break;
     }
-
     for(int i = 0; i < 3; ++i)
     {
         if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA)
@@ -655,10 +599,8 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
     // elixirs can have different families, but potion most ofc.
     if(SpellSpecific sp = spellmgr.GetSpellElixirSpecific(spellInfo->Id))
         return sp;
-
     return SPELL_NORMAL;
 }
-
 // target not allow have more one spell specific from same caster
 bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1,SpellSpecific spellSpec2)
 {
@@ -679,7 +621,6 @@ bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1,SpellSpecific s
             return false;
     }
 }
-
 bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific spellSpec2)
 {
     switch(spellSpec1)
@@ -722,7 +663,6 @@ bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific
             return false;
     }
 }
-
 bool IsPositiveTarget(uint32 targetA, uint32 targetB)
 {
     // non-positive targets
@@ -743,12 +683,10 @@ bool IsPositiveTarget(uint32 targetA, uint32 targetB)
         return IsPositiveTarget(targetB, 0);
     return true;
 }
-
 bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) const
 {
     SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
     if (!spellproto) return false;
-
     switch(spellId)
     {
         case  1852:                                         // Silenced (GM)
@@ -767,7 +705,6 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
         case 12042:                                         // Arcane Power
             return true;
     }
-
     switch(spellproto->Mechanic)
     {
         case MECHANIC_IMMUNE_SHIELD:
@@ -775,14 +712,12 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
         default:
             break;
     }
-
     // Special case: effects which determine positivity of whole spell
     for (uint8 i = 0;i<MAX_SPELL_EFFECTS;++i)
     {
         if (spellproto->EffectApplyAuraName[i] == SPELL_AURA_MOD_STEALTH)
             return true;
     }
-
     switch(spellproto->Effect[effIndex])
     {
         case SPELL_EFFECT_DUMMY:
@@ -801,7 +736,6 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
         case SPELL_EFFECT_HEAL_PCT:
         case SPELL_EFFECT_ENERGIZE_PCT:
             return true;
-
             // non-positive aura use
         case SPELL_EFFECT_APPLY_AURA:
         case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND:
@@ -851,7 +785,6 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                     {
                         uint32 spellTriggeredId = spellproto->EffectTriggerSpell[effIndex];
                         SpellEntry const *spellTriggeredProto = sSpellStore.LookupEntry(spellTriggeredId);
-
                         if(spellTriggeredProto)
                         {
                             // non-positive targets of main spell return early
@@ -872,7 +805,6 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
                 case SPELL_AURA_MOD_STUN:                   //have positive and negative spells, we can't sort its correctly at this moment.
                     if(effIndex==0 && spellproto->Effect[1]==0 && spellproto->Effect[2]==0)
                         return false;                       // but all single stun aura spells is negative
-
                     // Petrification
                     if(spellproto->Id == 17624)
                         return false;
@@ -977,32 +909,26 @@ bool SpellMgr::_isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) con
         default:
             break;
     }
-
     // non-positive targets
     if(!IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex],spellproto->EffectImplicitTargetB[effIndex]))
         return false;
-
     // AttributesEx check
     if(spellproto->AttributesEx & SPELL_ATTR_EX_NEGATIVE)
         return false;
-
     if (!deep && spellproto->EffectTriggerSpell[effIndex]
         && !spellproto->EffectApplyAuraName[effIndex]
         && IsPositiveTarget(spellproto->EffectImplicitTargetA[effIndex],spellproto->EffectImplicitTargetB[effIndex])
         && !_isPositiveSpell(spellproto->EffectTriggerSpell[effIndex], true))
         return false;
-
     // ok, positive
     return true;
 }
-
 bool IsPositiveSpell(uint32 spellId)
 {
     if(!sSpellStore.LookupEntry(spellId)) // non-existing spells such as 61988 (Forbearance)
         return false;
     return !(spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_NEGATIVE);
 }
-
 bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
 {
     if(!sSpellStore.LookupEntry(spellId))
@@ -1015,12 +941,10 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
         case 2: return !(spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_NEGATIVE_EFF2);
     }
 }
-
 bool SpellMgr::_isPositiveSpell(uint32 spellId, bool deep) const
 {
     SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
     if (!spellproto) return false;
-
     // spells with at least one negative effect are considered negative
     // some self-applied spells have negative effects but in self casting case negative check ignored.
     for (int i = 0; i < 3; ++i)
@@ -1028,13 +952,11 @@ bool SpellMgr::_isPositiveSpell(uint32 spellId, bool deep) const
             return false;
     return true;
 }
-
 bool IsSingleTargetSpell(SpellEntry const *spellInfo)
 {
     // all other single target spells have if it has AttributesEx5
     if ( spellInfo->AttributesEx5 & SPELL_ATTR_EX5_SINGLE_TARGET_SPELL )
         return true;
-
     // TODO - need found Judgements rule
     switch(GetSpellSpecific(spellInfo->Id))
     {
@@ -1043,10 +965,8 @@ bool IsSingleTargetSpell(SpellEntry const *spellInfo)
         default:
             break;
     }
-
     return false;
 }
-
 bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellInfo2)
 {
     // TODO - need better check
@@ -1054,7 +974,6 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
     if( spellInfo1->SpellFamilyName == spellInfo2->SpellFamilyName &&
         spellInfo1->SpellIconID == spellInfo2->SpellIconID )
         return true;
-
     // TODO - need found Judgements rule
     SpellSpecific spec1 = GetSpellSpecific(spellInfo1->Id);
     // spell with single target specific types
@@ -1068,10 +987,8 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
         default:
             break;
     }
-
     return false;
 }
-
 SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32 form)
 {
     // talents that learn spells can have stance requirements that need ignore
@@ -1079,15 +996,11 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
     if( GetTalentSpellCost(spellInfo->Id) > 0 &&
         (spellInfo->Effect[0]==SPELL_EFFECT_LEARN_SPELL || spellInfo->Effect[1]==SPELL_EFFECT_LEARN_SPELL || spellInfo->Effect[2]==SPELL_EFFECT_LEARN_SPELL) )
         return SPELL_CAST_OK;
-
     uint32 stanceMask = (form ? 1 << (form - 1) : 0);
-
     if (stanceMask & spellInfo->StancesNot)                 // can explicitly not be casted in this stance
         return SPELL_FAILED_NOT_SHAPESHIFT;
-
     if (stanceMask & spellInfo->Stances)                    // can explicitly be casted in this stance
         return SPELL_CAST_OK;
-
     bool actAsShifted = false;
     SpellShapeshiftEntry const *shapeInfo = NULL;
     if (form > 0)
@@ -1100,7 +1013,6 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
         }
         actAsShifted = !(shapeInfo->flags1 & 1);            // shapeshift acts as normal form for spells
     }
-
     if(actAsShifted)
     {
         if (spellInfo->Attributes & SPELL_ATTR_NOT_SHAPESHIFT) // not while shapeshifted
@@ -1114,7 +1026,6 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
         if(!(spellInfo->AttributesEx2 & SPELL_ATTR_EX2_NOT_NEED_SHAPESHIFT) && spellInfo->Stances != 0)
             return SPELL_FAILED_ONLY_SHAPESHIFT;
     }
-
     // Check if stance disables cast of not-stance spells
     // Example: cannot cast any other spells in zombie or ghoul form
     // TODO: Find a way to disable use of these spells clientside
@@ -1123,55 +1034,40 @@ SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32
         if(!(stanceMask & spellInfo->Stances))
             return SPELL_FAILED_ONLY_SHAPESHIFT;
     }
-
     return SPELL_CAST_OK;
 }
-
 void SpellMgr::LoadSpellTargetPositions()
 {
     mSpellTargetPositions.clear();                                // need for reload case
-
     uint32 count = 0;
-
     //                                                0   1           2                  3                  4                  5
     QueryResult *result = WorldDatabase.Query("SELECT id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM spell_target_position");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell target coordinates", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 Spell_ID = fields[0].GetUInt32();
-
         SpellTargetPosition st;
-
         st.target_mapId       = fields[1].GetUInt32();
         st.target_X           = fields[2].GetFloat();
         st.target_Y           = fields[3].GetFloat();
         st.target_Z           = fields[4].GetFloat();
         st.target_Orientation = fields[5].GetFloat();
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(Spell_ID);
         if(!spellInfo)
         {
             sLog.outErrorDb("Spell (ID:%u) listed in `spell_target_position` does not exist.",Spell_ID);
             continue;
         }
-
         bool found = false;
         for(int i = 0; i < 3; ++i)
         {
@@ -1186,32 +1082,26 @@ void SpellMgr::LoadSpellTargetPositions()
             sLog.outErrorDb("Spell (Id: %u) listed in `spell_target_position` does not have target TARGET_DST_DB (17).",Spell_ID);
             continue;
         }
-
         MapEntry const* mapEntry = sMapStore.LookupEntry(st.target_mapId);
         if(!mapEntry)
         {
             sLog.outErrorDb("Spell (ID:%u) target map (ID: %u) does not exist in `Map.dbc`.",Spell_ID,st.target_mapId);
             continue;
         }
-
         if(st.target_X==0 && st.target_Y==0 && st.target_Z==0)
         {
             sLog.outErrorDb("Spell (ID:%u) target coordinates not provided.",Spell_ID);
             continue;
         }
-
         mSpellTargetPositions[Spell_ID] = st;
         ++count;
-
     } while( result->NextRow() );
-
     // Check all spells
     for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
     {
         SpellEntry const * spellInfo = sSpellStore.LookupEntry(i);
         if(!spellInfo)
             continue;
-
         bool found = false;
         for(int j = 0; j < 3; ++j)
         {
@@ -1238,37 +1128,28 @@ void SpellMgr::LoadSpellTargetPositions()
                 sLog.outDebug("Spell (ID: %u) does not have record in `spell_target_position`", i);
         }
     }
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell teleport coordinates", count );
 }
-
 bool SpellMgr::IsAffectedByMod(SpellEntry const *spellInfo, SpellModifier *mod) const
 {
     // false for spellInfo == NULL
     if (!spellInfo || !mod)
         return false;
-
     SpellEntry const *affect_spell = sSpellStore.LookupEntry(mod->spellId);
     // False if affect_spell == NULL or spellFamily not equal
     if (!affect_spell || affect_spell->SpellFamilyName != spellInfo->SpellFamilyName)
         return false;
-
     // true
     if (mod->mask  & spellInfo->SpellFamilyFlags)
         return true;
-
     return false;
 }
-
 void SpellMgr::LoadSpellProcEvents()
 {
     mSpellProcEventMap.clear();                             // need for reload case
-
     uint32 count = 0;
-
     //                                                0      1           2                3                 4                 5                 6          7       8        9             10
     QueryResult *result = WorldDatabase.Query("SELECT entry, SchoolMask, SpellFamilyName, SpellFamilyMask0, SpellFamilyMask1, SpellFamilyMask2, procFlags, procEx, ppmRate, CustomChance, Cooldown FROM spell_proc_event");
     if( !result )
@@ -1279,26 +1160,20 @@ void SpellMgr::LoadSpellProcEvents()
         sLog.outString( ">> Loaded %u spell proc event conditions", count  );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
     uint32 customProc = 0;
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
-
         const SpellEntry *spell = sSpellStore.LookupEntry(entry);
         if (!spell)
         {
             sLog.outErrorDb("Spell %u listed in `spell_proc_event` does not exist", entry);
             continue;
         }
-
         SpellProcEventEntry spe;
-
         spe.schoolMask      = fields[1].GetUInt32();
         spe.spellFamilyName = fields[2].GetUInt32();
         spe.spellFamilyMask[0] = fields[3].GetUInt32();
@@ -1309,9 +1184,7 @@ void SpellMgr::LoadSpellProcEvents()
         spe.ppmRate         = fields[8].GetFloat();
         spe.customChance    = fields[9].GetFloat();
         spe.cooldown        = fields[10].GetUInt32();
-
         mSpellProcEventMap[entry] = spe;
-
         if (spell->procFlags==0)
         {
             if (spe.procFlags == 0)
@@ -1323,16 +1196,13 @@ void SpellMgr::LoadSpellProcEvents()
         }
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     if (customProc)
         sLog.outString( ">> Loaded %u extra spell proc event conditions +%u custom",  count, customProc );
     else
         sLog.outString( ">> Loaded %u extra spell proc event conditions", count );
 }
-
 void SpellMgr::LoadSpellBonusess()
 {
     mSpellBonusMap.clear();                             // need for reload case
@@ -1347,62 +1217,45 @@ void SpellMgr::LoadSpellBonusess()
         sLog.outString( ">> Loaded %u spell bonus data", count);
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
     do
     {
         Field *fields = result->Fetch();
         bar.step();
         uint32 entry = fields[0].GetUInt32();
-
         const SpellEntry *spell = sSpellStore.LookupEntry(entry);
         if (!spell)
         {
             sLog.outErrorDb("Spell %u listed in `spell_bonus_data` does not exist", entry);
             continue;
         }
-
         SpellBonusEntry sbe;
-
         sbe.direct_damage = fields[1].GetFloat();
         sbe.dot_damage    = fields[2].GetFloat();
         sbe.ap_bonus      = fields[3].GetFloat();
         sbe.ap_dot_bonus   = fields[4].GetFloat();
-
         mSpellBonusMap[entry] = sbe;
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u extra spell bonus data",  count);
 }
-
 bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active)
 {
     // No extra req need
     uint32 procEvent_procEx = PROC_EX_NONE;
-
     // check prockFlags for condition
     if((procFlags & EventProcFlag) == 0)
         return false;
-
     bool hasFamilyMask = false;
-
     /* Check Periodic Auras
-
     *Dots can trigger if spell has no PROC_FLAG_SUCCESSFUL_NEGATIVE_MAGIC_SPELL
         nor PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL
-
     *Only Hots can trigger if spell has PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL
-
     *Only dots can trigger if spell has both positivity flags or PROC_FLAG_SUCCESSFUL_NEGATIVE_MAGIC_SPELL
-
     *Aura has to have PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL or spellfamily specified to trigger from Hot
-
     */
-
     if (procFlags & PROC_FLAG_ON_DO_PERIODIC)
     {
         if (EventProcFlag & PROC_FLAG_SUCCESSFUL_NEGATIVE_MAGIC_SPELL)
@@ -1415,7 +1268,6 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
         else if (EventProcFlag & PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL)
             return false;
     }
-
     if (procFlags & PROC_FLAG_ON_TAKE_PERIODIC)
     {
         if (EventProcFlag & PROC_FLAG_TAKEN_NEGATIVE_MAGIC_SPELL)
@@ -1431,16 +1283,13 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
     // Trap casts are active by default
     if (procFlags & PROC_FLAG_ON_TRAP_ACTIVATION)
         active = true;
-
     // Always trigger for this
     if (procFlags & (PROC_FLAG_KILLED | PROC_FLAG_KILL | PROC_FLAG_DEATH))
         return true;
-
     if (spellProcEvent)     // Exist event data
     {
         // Store extra req
         procEvent_procEx = spellProcEvent->procEx;
-
         // For melee triggers
         if (procSpell == NULL)
         {
@@ -1453,11 +1302,9 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
             // Check (if set) for school
             if(spellProcEvent->schoolMask && (spellProcEvent->schoolMask & procSpell->SchoolMask) == 0)
                 return false;
-
             // Check (if set) for spellFamilyName
             if(spellProcEvent->spellFamilyName && (spellProcEvent->spellFamilyName != procSpell->SpellFamilyName))
                 return false;
-
             // spellFamilyName is Ok need check for spellFamilyMask if present
             if(spellProcEvent->spellFamilyMask)
             {
@@ -1470,13 +1317,11 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
             }
         }
     }
-
     if (procExtra & (PROC_EX_INTERNAL_REQ_FAMILY))
     {
         if (!hasFamilyMask)
             return false;
     }
-
     // Check for extra req (if none) and hit/crit
     if (procEvent_procEx == PROC_EX_NONE)
     {
@@ -1507,114 +1352,80 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
     }
     return false;
 }
-
 void SpellMgr::LoadSpellElixirs()
 {
     mSpellElixirs.clear();                                  // need for reload case
-
     uint32 count = 0;
-
     //                                                0      1
     QueryResult *result = WorldDatabase.Query("SELECT entry, mask FROM spell_elixir");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell elixir definitions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
         uint8 mask = fields[1].GetUInt8();
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(entry);
-
         if (!spellInfo)
         {
             sLog.outErrorDb("Spell %u listed in `spell_elixir` does not exist", entry);
             continue;
         }
-
         mSpellElixirs[entry] = mask;
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell elixir definitions", count );
 }
-
 void SpellMgr::LoadSpellThreats()
 {
     mSpellThreatMap.clear();                                // need for reload case
-
     uint32 count = 0;
-
     //                                                0      1
     QueryResult *result = WorldDatabase.Query("SELECT entry, Threat FROM spell_threat");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u aggro generating spells", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 entry = fields[0].GetUInt32();
         uint16 Threat = fields[1].GetUInt16();
-
         if (!sSpellStore.LookupEntry(entry))
         {
             sLog.outErrorDb("Spell %u listed in `spell_threat` does not exist", entry);
             continue;
         }
-
         mSpellThreatMap[entry] = Threat;
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u aggro generating spells", count );
 }
-
 bool SpellMgr::IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellId_2) const
 {
     SpellEntry const *spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
     if(!spellInfo_1 || !spellInfo_2) return false;
     if(spellInfo_1->Id == spellId_2) return false;
-
     return GetFirstSpellInChain(spellInfo_1->Id)==GetFirstSpellInChain(spellId_2);
 }
-
 bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo)
 {
     if(IsPassiveSpell(spellInfo->Id))                       // ranked passive spell
@@ -1623,10 +1434,8 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo)
         return false;
     if(IsProfessionOrRidingSpell(spellInfo->Id))
         return false;
-
     if(spellmgr.IsSkillBonusSpell(spellInfo->Id))
         return false;
-
     // All stance spells. if any better way, change it.
     for (int i = 0; i < 3; ++i)
     {
@@ -1653,77 +1462,58 @@ bool SpellMgr::canStackSpellRanks(SpellEntry const *spellInfo)
     return true;
 }
 
-
 bool SpellMgr::IsProfessionOrRidingSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return false;
-
     if(spellInfo->Effect[1] != SPELL_EFFECT_SKILL)
         return false;
-
     uint32 skill = spellInfo->EffectMiscValue[1];
-
     return IsProfessionOrRidingSkill(skill);
 }
-
 bool SpellMgr::IsProfessionSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return false;
-
     if(spellInfo->Effect[1] != SPELL_EFFECT_SKILL)
         return false;
-
     uint32 skill = spellInfo->EffectMiscValue[1];
-
     return IsProfessionSkill(skill);
 }
-
 bool SpellMgr::IsPrimaryProfessionSpell(uint32 spellId)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return false;
-
     if(spellInfo->Effect[1] != SPELL_EFFECT_SKILL)
         return false;
-
     uint32 skill = spellInfo->EffectMiscValue[1];
-
     return IsPrimaryProfessionSkill(skill);
 }
-
 bool SpellMgr::IsPrimaryProfessionFirstRankSpell(uint32 spellId) const
 {
     return IsPrimaryProfessionSpell(spellId) && GetSpellRank(spellId)==1;
 }
-
 bool SpellMgr::IsSkillBonusSpell(uint32 spellId) const
 {
     SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
-
     for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
     {
         SkillLineAbilityEntry const *pAbility = _spell_idx->second;
         if (!pAbility || pAbility->learnOnGetSkill != ABILITY_LEARNED_ON_GET_PROFESSION_SKILL)
             continue;
-
         if(pAbility->req_skill_value > 0)
             return true;
     }
-
     return false;
 }
-
 SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spellInfo, uint32 playerLevel) const
 {
     // ignore passive spells
     if(IsPassiveSpell(spellInfo->Id))
         return spellInfo;
-
     bool needRankSelection = false;
     for(int i=0;i<3;++i)
     {
@@ -1737,33 +1527,26 @@ SpellEntry const* SpellMgr::SelectAuraRankForPlayerLevel(SpellEntry const* spell
             break;
         }
     }
-
     // not required
     if(!needRankSelection)
         return spellInfo;
-
     for(uint32 nextSpellId = spellInfo->Id; nextSpellId != 0; nextSpellId = GetPrevSpellInChain(nextSpellId))
     {
         SpellEntry const *nextSpellInfo = sSpellStore.LookupEntry(nextSpellId);
         if(!nextSpellInfo)
             break;
-
         // if found appropriate level
         if(playerLevel + 10 >= nextSpellInfo->spellLevel)
             return nextSpellInfo;
-
         // one rank less then
     }
-
     // not found
     return NULL;
 }
 
-
 void SpellMgr::LoadSpellLearnSkills()
 {
     mSpellLearnSkills.clear();                              // need for reload case
-
     // search auto-learned skills and add its to map also for use in unlearn spells/talents
     uint32 dbc_count = 0;
     barGoLink bar( sSpellStore.GetNumRows() );
@@ -1771,10 +1554,8 @@ void SpellMgr::LoadSpellLearnSkills()
     {
         bar.step();
         SpellEntry const* entry = sSpellStore.LookupEntry(spell);
-
         if(!entry)
             continue;
-
         for(int i = 0; i < 3; ++i)
         {
             if(entry->Effect[i]==SPELL_EFFECT_SKILL)
@@ -1786,86 +1567,67 @@ void SpellMgr::LoadSpellLearnSkills()
                 else
                     dbc_node.value = entry->CalculateSimpleValue(i)*75;
                 dbc_node.maxvalue = entry->CalculateSimpleValue(i)*75;
-
                 SpellLearnSkillNode const* db_node = GetSpellLearnSkill(spell);
-
                 mSpellLearnSkills[spell] = dbc_node;
                 ++dbc_count;
                 break;
             }
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %u Spell Learn Skills from DBC", dbc_count );
 }
-
 void SpellMgr::LoadSpellLearnSpells()
 {
     mSpellLearnSpells.clear();                              // need for reload case
-
     //                                                0      1        2
     QueryResult *result = WorldDatabase.Query("SELECT entry, SpellID, Active FROM spell_learn_spell");
     if(!result)
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded 0 spell learn spells" );
         sLog.outErrorDb("`spell_learn_spell` table is empty!");
         return;
     }
-
     uint32 count = 0;
-
     barGoLink bar( result->GetRowCount() );
     do
     {
         bar.step();
         Field *fields = result->Fetch();
-
         uint32 spell_id    = fields[0].GetUInt32();
-
         SpellLearnSpellNode node;
         node.spell      = fields[1].GetUInt32();
         node.active     = fields[2].GetBool();
         node.autoLearned= false;
-
         if(!sSpellStore.LookupEntry(spell_id))
         {
             sLog.outErrorDb("Spell %u listed in `spell_learn_spell` does not exist",spell_id);
             continue;
         }
-
         if(!sSpellStore.LookupEntry(node.spell))
         {
             sLog.outErrorDb("Spell %u listed in `spell_learn_spell` learning not existed spell %u",spell_id,node.spell);
             continue;
         }
-
         if(GetTalentSpellCost(node.spell))
         {
             sLog.outErrorDb("Spell %u listed in `spell_learn_spell` attempt learning talent spell %u, skipped",spell_id,node.spell);
             continue;
         }
-
         mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell_id,node));
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     // search auto-learned spells and add its to map also for use in unlearn spells/talents
     uint32 dbc_count = 0;
     for(uint32 spell = 0; spell < sSpellStore.GetNumRows(); ++spell)
     {
         SpellEntry const* entry = sSpellStore.LookupEntry(spell);
-
         if(!entry)
             continue;
-
         for(int i = 0; i < 3; ++i)
         {
             if(entry->Effect[i]==SPELL_EFFECT_LEARN_SPELL)
@@ -1873,18 +1635,14 @@ void SpellMgr::LoadSpellLearnSpells()
                 SpellLearnSpellNode dbc_node;
                 dbc_node.spell       = entry->EffectTriggerSpell[i];
                 dbc_node.active      = true;                // all dbc based learned spells is active (show in spell book or hide by client itself)
-
                 // ignore learning not existed spells (broken/outdated/or generic learnig spell 483
                 if(!sSpellStore.LookupEntry(dbc_node.spell))
                     continue;
-
                 // talent or passive spells or skill-step spells auto-casted and not need dependent learning,
                 // pet teaching spells don't must be dependent learning (casted)
                 // other required explicit dependent learning
                 dbc_node.autoLearned = entry->EffectImplicitTargetA[i] == TARGET_UNIT_PET || GetTalentSpellCost(spell) > 0 || IsPassiveSpell(spell) || IsSpellHaveEffect(entry,SPELL_EFFECT_SKILL_STEP);
-
                 SpellLearnSpellMapBounds db_node_bounds = GetSpellLearnSpellMapBounds(spell);
-
                 bool found = false;
                 for(SpellLearnSpellMap::const_iterator itr = db_node_bounds.first; itr != db_node_bounds.second; ++itr)
                 {
@@ -1896,7 +1654,6 @@ void SpellMgr::LoadSpellLearnSpells()
                         break;
                     }
                 }
-
                 if(!found)                                  // add new spell-spell pair if not found
                 {
                     mSpellLearnSpells.insert(SpellLearnSpellMap::value_type(spell,dbc_node));
@@ -1905,49 +1662,36 @@ void SpellMgr::LoadSpellLearnSpells()
             }
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell learn spells + %u found in DBC", count, dbc_count );
 }
-
 void SpellMgr::LoadSpellScriptTarget()
 {
     mSpellScriptTarget.clear();                             // need for reload case
-
     uint32 count = 0;
-
     QueryResult *result = WorldDatabase.Query("SELECT entry,type,targetEntry FROM spell_script_target");
-
     if(!result)
     {
         barGoLink bar(1);
-
         bar.step();
-
         sLog.outString();
         sLog.outErrorDb(">> Loaded 0 SpellScriptTarget. DB table `spell_script_target` is empty.");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     do
     {
         Field *fields = result->Fetch();
         bar.step();
-
         uint32 spellId     = fields[0].GetUInt32();
         uint32 type        = fields[1].GetUInt32();
         uint32 targetEntry = fields[2].GetUInt32();
-
         SpellEntry const* spellProto = sSpellStore.LookupEntry(spellId);
-
         if(!spellProto)
         {
             sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not exist.",spellId,targetEntry);
             continue;
         }
-
         /*bool targetfound = false;
         for(int i = 0; i <3; ++i)
         {
@@ -1965,20 +1709,17 @@ void SpellMgr::LoadSpellScriptTarget()
             sLog.outErrorDb("Table `spell_script_target`: spellId %u listed for TargetEntry %u does not have any implicit target TARGET_UNIT_NEARBY_ENTRY(38) or TARGET_DST_NEARBY_ENTRY (46).",spellId,targetEntry);
             continue;
         }*/
-
         if( type >= MAX_SPELL_TARGET_TYPE )
         {
             sLog.outErrorDb("Table `spell_script_target`: target type %u for TargetEntry %u is incorrect.",type,targetEntry);
             continue;
         }
-
         switch(type)
         {
             case SPELL_TARGET_TYPE_GAMEOBJECT:
             {
                 if( targetEntry==0 )
                     break;
-
                 if(!sGOStorage.LookupEntry<GameObjectInfo>(targetEntry))
                 {
                     sLog.outErrorDb("Table `spell_script_target`: gameobject template entry %u does not exist.",targetEntry);
@@ -2003,7 +1744,6 @@ void SpellMgr::LoadSpellScriptTarget()
                     continue;
                 }
                 const CreatureInfo* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(targetEntry);
-
                 if(spellId == 30427 && !cInfo->SkinLootId)
                 {
                     sLog.outErrorDb("Table `spell_script_target` has creature %u as a target of spellid 30427, but this creature has no skinlootid. Gas extraction will not work!", cInfo->Entry);
@@ -2012,21 +1752,16 @@ void SpellMgr::LoadSpellScriptTarget()
                 break;
             }
         }
-
         mSpellScriptTarget.insert(SpellScriptTarget::value_type(spellId,SpellTargetEntry(SpellScriptTargetType(type),targetEntry)));
-
         ++count;
     } while (result->NextRow());
-
     delete result;
-
     // Check all spells
     for(uint32 i = 1; i < sSpellStore.GetNumRows(); ++i)
     {
         SpellEntry const * spellInfo = sSpellStore.LookupEntry(i);
         if(!spellInfo)
             continue;
-
         bool found = false;
         for(int j = 0; j < 3; ++j)
         {
@@ -2062,44 +1797,32 @@ void SpellMgr::LoadSpellScriptTarget()
                 sLog.outDebug("Spell (ID: %u) does not have record in `spell_script_target`", i);
         }
     }
-
     sLog.outString();
     sLog.outString(">> Loaded %u Spell Script Targets", count);
 }
-
 void SpellMgr::LoadSpellPetAuras()
 {
     mSpellPetAuraMap.clear();                                  // need for reload case
-
     uint32 count = 0;
-
     //                                                0      1         2    3
     QueryResult *result = WorldDatabase.Query("SELECT spell, effectId, pet, aura FROM spell_pet_auras");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell pet auras", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 spell = fields[0].GetUInt32();
         uint8 eff = fields[1].GetUInt8();
         uint32 pet = fields[2].GetUInt32();
         uint32 aura = fields[3].GetUInt32();
-
         SpellPetAuraMap::iterator itr = mSpellPetAuraMap.find((spell<<8) + eff);
         if(itr != mSpellPetAuraMap.end())
         {
@@ -2120,82 +1843,63 @@ void SpellMgr::LoadSpellPetAuras()
                 sLog.outError("Spell %u listed in `spell_pet_auras` does not have dummy aura or dummy effect", spell);
                 continue;
             }
-
             SpellEntry const* spellInfo2 = sSpellStore.LookupEntry(aura);
             if (!spellInfo2)
             {
                 sLog.outErrorDb("Aura %u listed in `spell_pet_auras` does not exist", aura);
                 continue;
             }
-
             PetAura pa(pet, aura, spellInfo->EffectImplicitTargetA[eff] == TARGET_UNIT_PET, spellInfo->CalculateSimpleValue(eff));
             mSpellPetAuraMap[(spell<<8) + eff] = pa;
         }
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell pet auras", count );
 }
-
 void SpellMgr::LoadPetLevelupSpellMap()
 {
     mPetLevelupSpellMap.clear();                                   // need for reload case
-
     uint32 count = 0;
     uint32 family_count = 0;
-
     for (uint32 i = 0; i < sCreatureFamilyStore.GetNumRows(); ++i)
     {
         CreatureFamilyEntry const *creatureFamily = sCreatureFamilyStore.LookupEntry(i);
         if(!creatureFamily)                                 // not exist
             continue;
-
         for (uint8 j = 0; j < 2; ++j)
         {
             if (!creatureFamily->skillLine[j])
                 continue;
-
             for (uint32 k = 0; k < sSkillLineAbilityStore.GetNumRows(); ++k)
             {
                 SkillLineAbilityEntry const *skillLine = sSkillLineAbilityStore.LookupEntry(k);
                 if( !skillLine )
                     continue;
-
                 //if (skillLine->skillId!=creatureFamily->skillLine[0] &&
                 //    (!creatureFamily->skillLine[1] || skillLine->skillId!=creatureFamily->skillLine[1]))
                 //    continue;
-
                 if (skillLine->skillId!=creatureFamily->skillLine[j])
                     continue;
-
                 if(skillLine->learnOnGetSkill != ABILITY_LEARNED_ON_GET_RACE_OR_CLASS_SKILL)
                     continue;
-
                 SpellEntry const *spell = sSpellStore.LookupEntry(skillLine->spellId);
                 if(!spell) // not exist or triggered or talent
                     continue;
-
                 if(!spell->spellLevel)
                     continue;
-
             PetLevelupSpellSet& spellSet = mPetLevelupSpellMap[creatureFamily->ID];
             if(spellSet.empty())
                 ++family_count;
-
-            spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id)); 
+            spellSet.insert(PetLevelupSpellSet::value_type(spell->spellLevel,spell->Id));
                 count++;
             }
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded %u pet levelup and default spells for %u families", count, family_count );
 }
-
 bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntry& petDefSpells)
 {
     // skip empty list;
@@ -2210,7 +1914,6 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr
     }
     if(!have_spell)
         return false;
-
     // remove duplicates with levelupSpells if any
     if(PetLevelupSpellSet const *levelupSpells = cInfo->family ? spellmgr.GetPetLevelupSpellList(cInfo->family) : NULL)
     {
@@ -2218,7 +1921,6 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr
         {
             if(!petDefSpells.spellid[j])
                 continue;
-
             for(PetLevelupSpellSet::const_iterator itr = levelupSpells->begin(); itr != levelupSpells->end(); ++itr)
             {
                 if (itr->second == petDefSpells.spellid[j])
@@ -2229,7 +1931,6 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr
             }
         }
     }
-
     // skip empty list;
     have_spell = false;
     for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
@@ -2240,50 +1941,40 @@ bool LoadPetDefaultSpells_helper(CreatureInfo const* cInfo, PetDefaultSpellsEntr
             break;
         }
     }
-
     return have_spell;
 }
-
 void SpellMgr::LoadPetDefaultSpells()
 {
     mPetDefaultSpellsMap.clear();
-
     uint32 countCreature = 0;
     uint32 countData = 0;
-
     for(uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i )
     {
         CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(i);
         if(!cInfo)
             continue;
-
         if(!cInfo->PetSpellDataId)
             continue;
-
         // for creature with PetSpellDataId get default pet spells from dbc
         CreatureSpellDataEntry const* spellDataEntry = sCreatureSpellDataStore.LookupEntry(cInfo->PetSpellDataId);
         if(!spellDataEntry)
             continue;
-
         int32 petSpellsId = -(int32)cInfo->PetSpellDataId;
         PetDefaultSpellsEntry petDefSpells;
         for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
             petDefSpells.spellid[j] = spellDataEntry->spellId[j];
-
         if(LoadPetDefaultSpells_helper(cInfo, petDefSpells))
         {
             mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
             ++countData;
         }
     }
-
     // different summon spells
     for(uint32 i = 0; i < sSpellStore.GetNumRows(); ++i )
     {
         SpellEntry const* spellEntry = sSpellStore.LookupEntry(i);
         if(!spellEntry)
             continue;
-
         for(int k = 0; k < 3; ++k)
         {
             if(spellEntry->Effect[k]==SPELL_EFFECT_SUMMON || spellEntry->Effect[k]==SPELL_EFFECT_SUMMON_PET)
@@ -2292,20 +1983,16 @@ void SpellMgr::LoadPetDefaultSpells()
                 CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(creature_id);
                 if(!cInfo)
                     continue;
-
                 // already loaded
                 if(cInfo->PetSpellDataId)
                     continue;
-
                 // for creature without PetSpellDataId get default pet spells from creature_template
                 int32 petSpellsId = cInfo->Entry;
                 if(mPetDefaultSpellsMap.find(cInfo->Entry) != mPetDefaultSpellsMap.end())
                     continue;
-
                 PetDefaultSpellsEntry petDefSpells;
                 for(int j = 0; j < MAX_CREATURE_SPELL_DATA_SLOT; ++j)
                     petDefSpells.spellid[j] = cInfo->spells[j];
-
                 if(LoadPetDefaultSpells_helper(cInfo, petDefSpells))
                 {
                     mPetDefaultSpellsMap[petSpellsId] = petDefSpells;
@@ -2314,20 +2001,16 @@ void SpellMgr::LoadPetDefaultSpells()
             }
         }
     }
-
     sLog.outString();
     sLog.outString( ">> Loaded addition spells for %u pet spell data entries and %u summonable creature templates", countData, countCreature );
 }
-
 /// Some checks for spells, to prevent adding deprecated/broken spells for trainers, spell book, etc
 bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
 {
     // not exist
     if(!spellInfo)
         return false;
-
     bool need_check_reagents = false;
-
     // check effects
     for(int i=0; i<3; ++i)
     {
@@ -2335,7 +2018,6 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
         {
             case 0:
                 continue;
-
             // craft spell for crafting non-existed item (break client recipes list show)
             case SPELL_EFFECT_CREATE_ITEM:
             case SPELL_EFFECT_CREATE_ITEM_2:
@@ -2351,7 +2033,6 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
                     }
                     return false;
                 }
-
                 need_check_reagents = true;
                 break;
             }
@@ -2373,7 +2054,6 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
             }
         }
     }
-
     if(need_check_reagents)
     {
         for(int j = 0; j < 8; ++j)
@@ -2391,10 +2071,8 @@ bool SpellMgr::IsSpellValid(SpellEntry const* spellInfo, Player* pl, bool msg)
             }
         }
     }
-
     return true;
 }
-
 void SpellMgr::LoadSpellAreas()
 {
     mSpellAreaMap.clear();                                  // need for reload case
@@ -2402,31 +2080,22 @@ void SpellMgr::LoadSpellAreas()
     mSpellAreaForActiveQuestMap.clear();
     mSpellAreaForQuestEndMap.clear();
     mSpellAreaForAuraMap.clear();
-
     uint32 count = 0;
-
     //                                                0      1     2            3                   4          5           6         7       8
     QueryResult *result = WorldDatabase.Query("SELECT spell, area, quest_start, quest_start_active, quest_end, aura_spell, racemask, gender, autocast FROM spell_area");
-
     if( !result )
     {
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell area requirements", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 spell = fields[0].GetUInt32();
         SpellArea spellArea;
         spellArea.spellId             = spell;
@@ -2438,7 +2107,6 @@ void SpellMgr::LoadSpellAreas()
         spellArea.raceMask            = fields[6].GetUInt32();
         spellArea.gender              = Gender(fields[7].GetUInt8());
         spellArea.autocast            = fields[8].GetBool();
-
         if(const SpellEntry* spellInfo = sSpellStore.LookupEntry(spell))
         {
             if(spellArea.autocast)
@@ -2449,7 +2117,6 @@ void SpellMgr::LoadSpellAreas()
             sLog.outErrorDb("Spell %u listed in `spell_area` does not exist", spell);
             continue;
         }
-
         {
             bool ok = true;
             SpellAreaMapBounds sa_bounds = GetSpellAreaMapBounds(spellArea.spellId);
@@ -2467,32 +2134,26 @@ void SpellMgr::LoadSpellAreas()
                     continue;
                 if (spellArea.gender != itr->second.gender)
                     continue;
-
                 // duplicate by requirements
                 ok =false;
                 break;
             }
-
             if(!ok)
             {
                 sLog.outErrorDb("Spell %u listed in `spell_area` already listed with similar requirements.", spell);
                 continue;
             }
-
         }
-
         if(spellArea.areaId && !GetAreaEntryByAreaID(spellArea.areaId))
         {
             sLog.outErrorDb("Spell %u listed in `spell_area` have wrong area (%u) requirement", spell,spellArea.areaId);
             continue;
         }
-
         if(spellArea.questStart && !objmgr.GetQuestTemplate(spellArea.questStart))
         {
             sLog.outErrorDb("Spell %u listed in `spell_area` have wrong start quest (%u) requirement", spell,spellArea.questStart);
             continue;
         }
-
         if(spellArea.questEnd)
         {
             if(!objmgr.GetQuestTemplate(spellArea.questEnd))
@@ -2500,14 +2161,12 @@ void SpellMgr::LoadSpellAreas()
                 sLog.outErrorDb("Spell %u listed in `spell_area` have wrong end quest (%u) requirement", spell,spellArea.questEnd);
                 continue;
             }
-
             if(spellArea.questEnd==spellArea.questStart && !spellArea.questStartCanActive)
             {
                 sLog.outErrorDb("Spell %u listed in `spell_area` have quest (%u) requirement for start and end in same time", spell,spellArea.questEnd);
                 continue;
             }
         }
-
         if(spellArea.auraSpell)
         {
             SpellEntry const* spellInfo = sSpellStore.LookupEntry(abs(spellArea.auraSpell));
@@ -2516,7 +2175,6 @@ void SpellMgr::LoadSpellAreas()
                 sLog.outErrorDb("Spell %u listed in `spell_area` have wrong aura spell (%u) requirement", spell,abs(spellArea.auraSpell));
                 continue;
             }
-
             switch(spellInfo->EffectApplyAuraName[0])
             {
                 case SPELL_AURA_DUMMY:
@@ -2527,13 +2185,11 @@ void SpellMgr::LoadSpellAreas()
                     sLog.outErrorDb("Spell %u listed in `spell_area` have aura spell requirement (%u) without dummy/phase/ghost aura in effect 0", spell,abs(spellArea.auraSpell));
                     continue;
             }
-
             if(abs(spellArea.auraSpell)==spellArea.spellId)
             {
                 sLog.outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement for itself", spell,abs(spellArea.auraSpell));
                 continue;
             }
-
             // not allow autocast chains by auraSpell field (but allow use as alternative if not present)
             if(spellArea.autocast && spellArea.auraSpell > 0)
             {
@@ -2547,13 +2203,11 @@ void SpellMgr::LoadSpellAreas()
                         break;
                     }
                 }
-
                 if(chain)
                 {
                     sLog.outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell,spellArea.auraSpell);
                     continue;
                 }
-
                 SpellAreaMapBounds saBound2 = GetSpellAreaMapBounds(spellArea.auraSpell);
                 for(SpellAreaMap::const_iterator itr2 = saBound2.first; itr2 != saBound2.second; ++itr2)
                 {
@@ -2563,7 +2217,6 @@ void SpellMgr::LoadSpellAreas()
                         break;
                     }
                 }
-
                 if(chain)
                 {
                     sLog.outErrorDb("Spell %u listed in `spell_area` have aura spell (%u) requirement that itself autocast from aura", spell,spellArea.auraSpell);
@@ -2571,25 +2224,20 @@ void SpellMgr::LoadSpellAreas()
                 }
             }
         }
-
         if(spellArea.raceMask && (spellArea.raceMask & RACEMASK_ALL_PLAYABLE)==0)
         {
             sLog.outErrorDb("Spell %u listed in `spell_area` have wrong race mask (%u) requirement", spell,spellArea.raceMask);
             continue;
         }
-
         if(spellArea.gender!=GENDER_NONE && spellArea.gender!=GENDER_FEMALE && spellArea.gender!=GENDER_MALE)
         {
             sLog.outErrorDb("Spell %u listed in `spell_area` have wrong gender (%u) requirement", spell,spellArea.gender);
             continue;
         }
-
         SpellArea const* sa = &mSpellAreaMap.insert(SpellAreaMap::value_type(spell,spellArea))->second;
-
         // for search by current zone/subzone at zone/subzone change
         if(spellArea.areaId)
             mSpellAreaForAreaMap.insert(SpellAreaForAreaMap::value_type(spellArea.areaId,sa));
-
         // for search at quest start/reward
         if(spellArea.questStart)
         {
@@ -2598,24 +2246,18 @@ void SpellMgr::LoadSpellAreas()
             else
                 mSpellAreaForQuestMap.insert(SpellAreaForQuestMap::value_type(spellArea.questStart,sa));
         }
-
         // for search at quest start/reward
         if(spellArea.questEnd)
             mSpellAreaForQuestEndMap.insert(SpellAreaForQuestMap::value_type(spellArea.questEnd,sa));
-
         // for search at aura apply
         if(spellArea.auraSpell)
             mSpellAreaForAuraMap.insert(SpellAreaForAuraMap::value_type(abs(spellArea.auraSpell),sa));
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell area requirements", count );
 }
-
 SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spellInfo, uint32 map_id, uint32 zone_id, uint32 area_id, Player const* player)
 {
     // normal case
@@ -2633,11 +2275,9 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
             // Try search in next group
             groupEntry = sAreaGroupStore.LookupEntry(groupEntry->nextGroup);
         }
-        
         if (!found)
             return SPELL_FAILED_INCORRECT_AREA;
     }
-
     // continent limitation (virtual continent)
     if (spellInfo->AttributesEx4 & SPELL_ATTR_EX4_CAST_ONLY_IN_OUTLAND)
     {
@@ -2646,7 +2286,6 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
         if (!mapEntry || mapEntry->addon < 1 || !mapEntry->IsContinent())
             return SPELL_FAILED_INCORRECT_AREA;
     }
-
     // raid instance limitation
     if (spellInfo->AttributesEx6 & SPELL_ATTR_EX6_NOT_IN_RAID_INSTANCE)
     {
@@ -2654,7 +2293,6 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
         if (!mapEntry || mapEntry->IsRaid())
             return SPELL_FAILED_NOT_IN_RAID_INSTANCE;
     }
-
     // DB base check (if non empty then must fit at least single for allow)
     SpellAreaMapBounds saBounds = spellmgr.GetSpellAreaMapBounds(spellInfo->Id);
     if (saBounds.first != saBounds.second)
@@ -2666,7 +2304,6 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
         }
         return SPELL_FAILED_INCORRECT_AREA;
     }
-
     // bg spell checks
     switch(spellInfo->Id)
     {
@@ -2686,21 +2323,17 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
             MapEntry const* mapEntry = sMapStore.LookupEntry(map_id);
             if (!mapEntry)
                 return SPELL_FAILED_INCORRECT_AREA;
-
             return zone_id == 4197 || mapEntry->IsBattleGround() && player && player->InBattleGround() ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
         }
         case 44521:                                         // Preparation
         {
             if (!player)
                 return SPELL_FAILED_REQUIRES_AREA;
-
             MapEntry const* mapEntry = sMapStore.LookupEntry(map_id);
             if (!mapEntry)
                 return SPELL_FAILED_INCORRECT_AREA;
-
             if (!mapEntry->IsBattleGround())
                 return SPELL_FAILED_REQUIRES_AREA;
-
             BattleGround* bg = player->GetBattleGround();
             return bg && bg->GetStatus()==STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
         }
@@ -2712,26 +2345,21 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
             MapEntry const* mapEntry = sMapStore.LookupEntry(map_id);
             if (!mapEntry)
                 return SPELL_FAILED_INCORRECT_AREA;
-
             return mapEntry->IsBattleArena() && player && player->InBattleGround() ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
         }
         case 32727:                                         // Arena Preparation
         {
             if (!player)
                 return SPELL_FAILED_REQUIRES_AREA;
-
             MapEntry const* mapEntry = sMapStore.LookupEntry(map_id);
             if(!mapEntry)
                 return SPELL_FAILED_INCORRECT_AREA;
-
             if(!mapEntry->IsBattleArena())
                 return SPELL_FAILED_REQUIRES_AREA;
-
             BattleGround* bg = player->GetBattleGround();
             return bg && bg->GetStatus()==STATUS_WAIT_JOIN ? SPELL_CAST_OK : SPELL_FAILED_REQUIRES_AREA;
         }
     }
-
     // aura limitations
     for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
@@ -2745,32 +2373,25 @@ SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spell
             }
         }
     }
-
     return SPELL_CAST_OK;
 }
-
 void SpellMgr::LoadSkillLineAbilityMap()
 {
     mSkillLineAbilityMap.clear();
-
     barGoLink bar( sSkillLineAbilityStore.GetNumRows() );
     uint32 count = 0;
-
     for (uint32 i = 0; i < sSkillLineAbilityStore.GetNumRows(); ++i)
     {
         bar.step();
         SkillLineAbilityEntry const *SkillInfo = sSkillLineAbilityStore.LookupEntry(i);
         if(!SkillInfo)
             continue;
-
         mSkillLineAbilityMap.insert(SkillLineAbilityMap::value_type(SkillInfo->spellId,SkillInfo));
         ++count;
     }
-
     sLog.outString();
     sLog.outString(">> Loaded %u SkillLineAbility MultiMap Data", count);
 }
-
 DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto, bool triggered)
 {
     // Explicit Diminishing Groups
@@ -2873,7 +2494,6 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
         default:
             break;
     }
-
     // Get by mechanic
     uint32 mechanic = GetAllSpellMechanicMask(spellproto);
     if (mechanic == MECHANIC_NONE)          return DIMINISHING_NONE;
@@ -2893,7 +2513,6 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
                     (1<<MECHANIC_SAPPED)))  return DIMINISHING_KNOCKOUT;
     if (mechanic & (1<<MECHANIC_BANISH))    return DIMINISHING_BANISH;
     if (mechanic & (1<<MECHANIC_HORROR))    return DIMINISHING_DEATHCOIL;
-
     // Get by effect
     for (uint8 i = 0 ; i < MAX_SPELL_EFFECTS; ++i)
     {
@@ -2902,12 +2521,10 @@ DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto
     }
     return DIMINISHING_NONE;
 }
-
 int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry const* spellproto)
 {
     if(!IsDiminishingReturnsGroupDurationLimited(group))
         return 0;
-
     // Explicit diminishing duration
     switch(spellproto->SpellFamilyName)
     {
@@ -2942,10 +2559,8 @@ int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry cons
         default:
             break;
     }
-
     return 10 * IN_MILISECONDS;
 }
-
 bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
 {
     switch(group)
@@ -2969,7 +2584,6 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
     }
     return false;
 }
-
 DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
 {
     switch(group)
@@ -2995,10 +2609,8 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
         default:
             break;
     }
-
     return DRTYPE_NONE;
 }
-
 bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const
 {
     if(gender!=GENDER_NONE)
@@ -3007,35 +2619,30 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
         if(!player || gender != player->getGender())
             return false;
     }
-
     if(raceMask)
     {
         // not in expected race
         if(!player || !(raceMask & player->getRaceMask()))
             return false;
     }
-
     if(areaId)
     {
         // not in expected zone
         if(newZone!=areaId && newArea!=areaId)
             return false;
     }
-
     if(questStart)
     {
         // not in expected required quest state
         if(!player || (!questStartCanActive || !player->IsActiveQuest(questStart)) && !player->GetQuestRewardStatus(questStart))
             return false;
     }
-
     if(questEnd)
     {
         // not in expected forbidden quest state
         if(!player || player->GetQuestRewardStatus(questEnd))
             return false;
     }
-
     if(auraSpell)
     {
         // not have expected aura
@@ -3048,12 +2655,9 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
             // not have expected aura
             return !player->HasAura(-auraSpell);
     }
-
     return true;
 }
-
 //-----------TRINITY-------------
-
 bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *spellInfo_2, bool sameCaster) const
 {
     SpellSpecific spellSpec_1 = GetSpellSpecific(spellInfo_1->Id);
@@ -3062,16 +2666,13 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
         if (IsSingleFromSpellSpecificPerTarget(spellSpec_1, spellSpec_2)
             || sameCaster && IsSingleFromSpellSpecificPerCaster(spellSpec_1, spellSpec_2))
             return false;
-
     if(spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName)
         return true;
-
     if(!sameCaster)
     {
         if(spellInfo_1->AttributesEx & SPELL_ATTR_EX_STACK_FOR_DIFF_CASTERS
             || spellInfo_1->AttributesEx3 & SPELL_ATTR_EX3_STACK_FOR_DIFF_CASTERS)
             return true;
-            
         // check same periodic auras
         for(uint32 i = 0; i < 3; ++i)
         {
@@ -3079,12 +2680,10 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
             if(spellInfo_1->Effect[i] != SPELL_EFFECT_APPLY_AURA
                 && spellInfo_1->Effect[i] != SPELL_EFFECT_PERSISTENT_AREA_AURA)
                 continue;
-
             // not channeled AOE effects should not stack (blizzard should, but Consecration should not)
             if((IsAreaEffectTarget[spellInfo_1->EffectImplicitTargetA[i]] || IsAreaEffectTarget[spellInfo_1->EffectImplicitTargetB[i]])
                 && !IsChanneledSpell(spellInfo_1))
                 continue;
-
             switch(spellInfo_1->EffectApplyAuraName[i])
             {
                 // DOT or HOT from different casters will stack
@@ -3104,10 +2703,8 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
             }
         }
     }
-
     uint32 spellId_1 = GetLastSpellInChain(spellInfo_1->Id);
     uint32 spellId_2 = GetLastSpellInChain(spellInfo_2->Id);
-
     // same spell
     if (spellId_1 == spellId_2)
     {
@@ -3117,7 +2714,6 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
         // same spell with same caster should not stack
         return false;
     }
-
     // use icon to check generic spells
     if(!spellInfo_1->SpellFamilyName)
     {
@@ -3132,127 +2728,95 @@ bool SpellMgr::CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *sp
             || spellInfo_1->SpellFamilyFlags != spellInfo_2->SpellFamilyFlags)
             return true;
     }
-
     //use data of highest rank spell(needed for spells which ranks have different effects)
     spellInfo_1 = sSpellStore.LookupEntry(spellId_1);
     spellInfo_2 = sSpellStore.LookupEntry(spellId_2);
-
     //if spells do not have the same effect or aura or miscvalue, they will stack
     for(uint32 i = 0; i < 3; ++i)
         if(spellInfo_1->Effect[i] != spellInfo_2->Effect[i]
             || spellInfo_1->EffectApplyAuraName[i] != spellInfo_2->EffectApplyAuraName[i]
             || spellInfo_1->EffectMiscValue[i] != spellInfo_2->EffectMiscValue[i]) // paladin resist aura
             return true; // need itemtype check? need an example to add that check
-
     // different spells with same effect
     return false;
 }
-
 bool IsDispelableBySpell(SpellEntry const * dispelSpell, uint32 spellId, bool def)
 {
     if (!dispelSpell) return false;
     SpellEntry const *spellproto = sSpellStore.LookupEntry(spellId);
     if (!spellproto) return false;
-
     if (spellproto->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY)
         return false;
-
     if(dispelSpell->Attributes & SPELL_ATTR_UNAFFECTED_BY_INVULNERABILITY)
         return true;
-
     return def;
 }
-
 void SpellMgr::LoadSpellEnchantProcData()
 {
     mSpellEnchantProcEventMap.clear();                             // need for reload case
-
     uint32 count = 0;
-
     //                                                0      1             2          3
     QueryResult *result = WorldDatabase.Query("SELECT entry, customChance, PPMChance, procEx FROM spell_enchant_proc_data");
     if( !result )
     {
-
         barGoLink bar( 1 );
-
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u spell enchant proc event conditions", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         uint32 enchantId = fields[0].GetUInt32();
-
         SpellItemEnchantmentEntry const *ench = sSpellItemEnchantmentStore.LookupEntry(enchantId);
         if (!ench)
         {
             sLog.outErrorDb("Enchancment %u listed in `spell_enchant_proc_data` does not exist", enchantId);
             continue;
         }
-
         SpellEnchantProcEntry spe;
-
         spe.customChance = fields[1].GetUInt32();
         spe.PPMChance = fields[2].GetFloat();
         spe.procEx = fields[3].GetUInt32();
-
         mSpellEnchantProcEventMap[enchantId] = spe;
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString( ">> Loaded %u enchant proc data definitions", count);
 }
-
 void SpellMgr::LoadSpellRequired()
 {
     mSpellsReqSpell.clear();                                   // need for reload case
     mSpellReq.clear();                                         // need for reload case
-
     QueryResult *result = WorldDatabase.Query("SELECT spell_id, req_spell from spell_required");
-
     if(result == NULL)
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded 0 spell required records" );
         sLog.outErrorDb("`spell_required` table is empty!");
         return;
     }
     uint32 rows = 0;
-
     barGoLink bar( result->GetRowCount() );
     do
     {
         bar.step();
         Field *fields = result->Fetch();
-
         uint32 spell_id = fields[0].GetUInt32();
         uint32 spell_req = fields[1].GetUInt32();
-
         mSpellsReqSpell.insert (std::pair<uint32, uint32>(spell_req, spell_id));
         mSpellReq[spell_id] = spell_req;
         ++rows;
     } while( result->NextRow() );
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell required records", rows );
 }
-
 struct SpellRankEntry
 {
     uint32 SkillId;
@@ -3268,18 +2832,15 @@ struct SpellRankEntry
     flag96 Effect;
     flag96 Aura;
     uint16 TalentID;
-
     bool operator < (const SpellRankEntry & _Right) const
     {
         return (SkillId != _Right.SkillId ? SkillId < _Right.SkillId
             : SpellName!=_Right.SpellName ? SpellName < _Right.SpellName
             : ProcFlags!=_Right.ProcFlags ? ProcFlags < _Right.ProcFlags
-
             : Effect!=_Right.Effect ? Effect < _Right.Effect
             : Aura!=_Right.Aura ? Aura < _Right.Aura
             : TalentID!=_Right.TalentID ? TalentID < _Right.TalentID
             : (CastingTimeIndex!=_Right.CastingTimeIndex) && (!CastingTimeIndex || !_Right.CastingTimeIndex || CastingTimeIndex==1 || !_Right.CastingTimeIndex==1) ? CastingTimeIndex < _Right.CastingTimeIndex
-
             : SpellFamilyFlags!=_Right.SpellFamilyFlags ? SpellFamilyFlags < _Right.SpellFamilyFlags
             : (SpellVisual!=_Right.SpellVisual) && (!SpellVisual || !_Right.SpellVisual) ? SpellVisual < _Right.SpellVisual
             : (ManaCost!=_Right.ManaCost) && (!ManaCost || !_Right.ManaCost) ? ManaCost < _Right.ManaCost
@@ -3289,18 +2850,15 @@ struct SpellRankEntry
             );
     }
 };
-
 struct SpellRankValue
 {
     uint32 Id;
     char const *Rank;
     bool strict;
 };
-
 void SpellMgr::LoadSpellChains()
 {
     mSpellChains.clear();                                   // need for reload case
-
     std::vector<uint32> ChainedSpells;
     for (uint32 ability_id=0;ability_id<sSkillLineAbilityStore.GetNumRows();ability_id++)
     {
@@ -3311,15 +2869,12 @@ void SpellMgr::LoadSpellChains()
             continue;
         ChainedSpells.push_back(AbilityInfo->forward_spellid);
     }
-
     std::multimap<SpellRankEntry, SpellRankValue> RankMap;
-
     for (uint32 ability_id=0;ability_id<sSkillLineAbilityStore.GetNumRows();ability_id++)
     {
         SkillLineAbilityEntry const *AbilityInfo=sSkillLineAbilityStore.LookupEntry(ability_id);
         if (!AbilityInfo)
             continue;
-
         //get only spell with lowest ability_id to prevent doubles
         uint32 spell_id=AbilityInfo->spellId;
         bool found=false;
@@ -3330,7 +2885,6 @@ void SpellMgr::LoadSpellChains()
         }
         if (found)
             continue;
-
         if(mSkillLineAbilityMap.lower_bound(spell_id)->second->id!=ability_id)
             continue;
         SpellEntry const *SpellInfo=sSpellStore.LookupEntry(spell_id);
@@ -3342,7 +2896,6 @@ void SpellMgr::LoadSpellChains()
         //exception to polymorph spells-make pig and turtle other chain than sheep
         if ((SpellInfo->SpellFamilyName==SPELLFAMILY_MAGE) && (SpellInfo->SpellFamilyFlags[0] & 0x1000000) && (SpellInfo->SpellIconID!=82))
             continue;
-
         SpellRankEntry entry;
         SpellRankValue value;
         entry.SkillId=AbilityInfo->skillId;
@@ -3369,11 +2922,8 @@ void SpellMgr::LoadSpellChains()
                 break;
         }
     }
-
     barGoLink bar(RankMap.size());
-
     uint32 count=0;
-
     for (std::multimap<SpellRankEntry, SpellRankValue>::iterator itr = RankMap.begin();itr!=RankMap.end();)
     {
         SpellRankEntry entry=itr->first;
@@ -3384,7 +2934,6 @@ void SpellMgr::LoadSpellChains()
             bar.step();
             RankErrorMap.insert(std::pair<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>(itr2->second.Rank,itr2));
         }
-
         bool error=false;
         //if strict == true strict check is not needed
         if (!itr->second.strict)
@@ -3431,17 +2980,14 @@ void SpellMgr::LoadSpellChains()
                 currEntry.TargetAuraState=SpellInfo->TargetAuraState;
                 currEntry.SpellVisual=SpellInfo->SpellVisual[0];
                 currEntry.ManaCost=SpellInfo->manaCost;
-
                 //compare effects and casting time
                 currEntry.CastingTimeIndex=SpellInfo->CastingTimeIndex;
                 currEntry.Effect[0]=SpellInfo->Effect[0];
                 currEntry.Effect[1]=SpellInfo->Effect[1];
                 currEntry.Effect[2]=SpellInfo->Effect[2];
-
                 currEntry.Aura[0]=SpellInfo->EffectApplyAuraName[0];
                 currEntry.Aura[1]=SpellInfo->EffectApplyAuraName[1];
                 currEntry.Aura[2]=SpellInfo->EffectApplyAuraName[2];
-
                 SpellRankValue currValue;
                 currValue.Id=ConflictedSpells.front();
                 currValue.Rank=SpellInfo->Rank[sWorld.GetDefaultDbcLocale()];
@@ -3469,7 +3015,6 @@ void SpellMgr::LoadSpellChains()
                 else
                     itr2++;
             }
-
         //order spells by spellLevel
         std::list<uint32> RankedSpells;
         uint32 min_spell_lvl=0;
@@ -3488,7 +3033,6 @@ void SpellMgr::LoadSpellChains()
             RankedSpells.push_back(min_itr->second.Id);
             RankMap.erase(min_itr);
         }
-
         //use data from talent.dbc
         uint16 talent_id=0;
         for(std::list<uint32>::iterator itr2 = RankedSpells.begin();itr2!=RankedSpells.end();)
@@ -3511,14 +3055,11 @@ void SpellMgr::LoadSpellChains()
                     RankedSpells.push_front(TalentInfo->RankID[rank-1]);
             }
         }
-
         //do not proceed for spells with less than 2 ranks
         itr=RankMap.begin();
         if (RankedSpells.size()<2)
             continue;
-
         count++;
-
         uint32 spell_rank=1;
         for(std::list<uint32>::iterator itr2 = RankedSpells.begin();itr2!=RankedSpells.end();spell_rank++)
         {
@@ -3526,11 +3067,9 @@ void SpellMgr::LoadSpellChains()
             mSpellChains[spell_id].rank=spell_rank;
             mSpellChains[spell_id].first=RankedSpells.front();
             mSpellChains[spell_id].last=RankedSpells.back();
-
             itr2++;
             if (spell_rank<2)
                 mSpellChains[spell_id].prev=0;
-
             if (spell_id==RankedSpells.back())
                 mSpellChains[spell_id].next=0;
             else
@@ -3540,20 +3079,16 @@ void SpellMgr::LoadSpellChains()
             }
         }
     }
-
     //uncomment these two lines to print yourself list of spell_chains on startup
     //for (UNORDERED_MAP<uint32, SpellChainNode>::iterator itr=mSpellChains.begin();itr!=mSpellChains.end();itr++)
        //sLog.outString( "Id: %u, Rank: %d , %s, %u, %u, %u, %u",itr->first,itr->second.rank, sSpellStore.LookupEntry(itr->first)->Rank[sWorld.GetDefaultDbcLocale()], itr->second.first, itr->second.last,itr->second.next ,itr->second.prev);
-
     sLog.outString();
     sLog.outString( ">> Loaded %u spell chains",count);
 }
-
 // set data in core for now
 void SpellMgr::LoadSpellCustomAttr()
 {
     mSpellCustomAttr.resize(GetSpellStore()->GetNumRows());
-
     SpellEntry *spellInfo;
     for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
     {
@@ -3561,7 +3096,6 @@ void SpellMgr::LoadSpellCustomAttr()
         spellInfo = (SpellEntry*)GetSpellStore()->LookupEntry(i);
         if(!spellInfo)
             continue;
-
         for(uint32 j = 0; j < 3; ++j)
         {
             switch(spellInfo->EffectApplyAuraName[j])
@@ -3576,7 +3110,6 @@ void SpellMgr::LoadSpellCustomAttr()
                 default:
                     break;
             }
-
             switch(spellInfo->Effect[j])
             {
                 case SPELL_EFFECT_SCHOOL_DAMAGE:
@@ -3601,7 +3134,6 @@ void SpellMgr::LoadSpellCustomAttr()
                         spellInfo->Effect[j] = SPELL_EFFECT_TRIGGER_MISSILE;
                     break;
             }
-
             switch(SpellTargetType[spellInfo->EffectImplicitTargetA[j]])
             {
                 case TARGET_TYPE_UNIT_TARGET:
@@ -3614,7 +3146,6 @@ void SpellMgr::LoadSpellCustomAttr()
                 //    break;
             }
         }
-
         for(uint32 j = 0; j < 3; ++j)
         {
             switch(spellInfo->EffectApplyAuraName[j])
@@ -3630,20 +3161,16 @@ void SpellMgr::LoadSpellCustomAttr()
                     break;
             }
         }
-
         if(!_isPositiveEffect(i, 0, false))
             mSpellCustomAttr[i] |= SPELL_ATTR_CU_NEGATIVE_EFF0;
         if(!_isPositiveEffect(i, 1, false))
             mSpellCustomAttr[i] |= SPELL_ATTR_CU_NEGATIVE_EFF1;
         if(!_isPositiveEffect(i, 2, false))
             mSpellCustomAttr[i] |= SPELL_ATTR_CU_NEGATIVE_EFF2;
-
         if(spellInfo->SpellVisual[0] == 3879)
             mSpellCustomAttr[i] |= SPELL_ATTR_CU_CONE_BACK;
-
         if(spellInfo->activeIconID == 2158)  //flight
             spellInfo->Attributes |= SPELL_ATTR_PASSIVE;
-
         switch(i)
         {
         // Heart of the Crusader
@@ -3795,7 +3322,6 @@ void SpellMgr::LoadSpellCustomAttr()
         default:
             break;
         }
-
         switch(spellInfo->SpellFamilyName)
         {
             case SPELLFAMILY_WARRIOR:
@@ -3822,34 +3348,27 @@ void SpellMgr::LoadSpellCustomAttr()
                 break;
         }
     }
-
     SummonPropertiesEntry *properties = const_cast<SummonPropertiesEntry*>(sSummonPropertiesStore.LookupEntry(121));
     properties->Type = SUMMON_TYPE_TOTEM;
     properties = const_cast<SummonPropertiesEntry*>(sSummonPropertiesStore.LookupEntry(647)); // 52893
     properties->Type = SUMMON_TYPE_TOTEM;
-
     CreatureAI::FillAISpellInfo();
 }
-
 // Fill custom data about enchancments
 void SpellMgr::LoadEnchantCustomAttr()
 {
     uint32 size = sSpellItemEnchantmentStore.GetNumRows();
     mEnchantCustomAttr.resize(size);
-
     for (uint32 i = 0;i<size; ++i)
        mEnchantCustomAttr[i] = 0;
-
     for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i)
     {
         SpellEntry * spellInfo = (SpellEntry*)GetSpellStore()->LookupEntry(i);
         if(!spellInfo)
             continue;
-
         // TODO: find a better check
         if (!(spellInfo->AttributesEx2 & SPELL_ATTR_EX2_UNK13) || !(spellInfo->Attributes & SPELL_ATTR_NOT_SHAPESHIFT))
             continue;
-
         for(uint32 j = 0; j < 3; ++j)
         {
             if(spellInfo->Effect[j] == SPELL_EFFECT_ENCHANT_ITEM_TEMPORARY)
@@ -3864,23 +3383,18 @@ void SpellMgr::LoadEnchantCustomAttr()
         }
     }
 }
-
 bool SpellMgr::IsSkillTypeSpell(uint32 spellId, SkillType type) const
 {
     SkillLineAbilityMapBounds bounds = GetSkillLineAbilityMapBounds(spellId);
-
     for(SkillLineAbilityMap::const_iterator _spell_idx = bounds.first; _spell_idx != bounds.second; ++_spell_idx)
         if (_spell_idx->second->skillId == type)
             return true;
-
     return false;
 }
-
 void SpellMgr::LoadSpellLinked()
 {
     mSpellLinkedMap.clear();    // need for reload case
     uint32 count = 0;
-
     //                                                0              1             2
     QueryResult *result = WorldDatabase.Query("SELECT spell_trigger, spell_effect, type FROM spell_linked_spell");
     if( !result )
@@ -3891,19 +3405,14 @@ void SpellMgr::LoadSpellLinked()
         sLog.outString( ">> Loaded %u linked spells", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         Field *fields = result->Fetch();
-
         bar.step();
-
         int32 trigger = fields[0].GetInt32();
         int32 effect = fields[1].GetInt32();
         int32 type = fields[2].GetInt32();
-
         SpellEntry const* spellInfo = sSpellStore.LookupEntry(abs(trigger));
         if (!spellInfo)
         {
@@ -3916,7 +3425,6 @@ void SpellMgr::LoadSpellLinked()
             sLog.outErrorDb("Spell %u listed in `spell_linked_spell` does not exist", abs(effect));
             continue;
         }
-
         if(trigger > 0)
         {
             switch(type)
@@ -3930,7 +3438,6 @@ void SpellMgr::LoadSpellLinked()
         {
             mSpellCustomAttr[-trigger] |= SPELL_ATTR_CU_LINK_REMOVE;
         }
-
         if(type) //we will find a better way when more types are needed
         {
             if(trigger > 0)
@@ -3939,21 +3446,16 @@ void SpellMgr::LoadSpellLinked()
                 trigger -= SPELL_LINKED_MAX_SPELLS * type;
         }
         mSpellLinkedMap[trigger].push_back(effect);
-
         ++count;
     } while( result->NextRow() );
-
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u linked spells", count );
 }
-
 bool SpellMgr::CheckDB() const
 {
     SpellScriptTargetBounds bounds = spellmgr.GetSpellScriptTargetBounds(30531);
     if(bounds.first == bounds.second || bounds.first->second.targetEntry != 17256)
         return false;
-
     return true;
 }
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 9c7f4aca16a..767069df840 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -17,29 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _SPELLMGR_H
 #define _SPELLMGR_H
-
 // For static or at-server-startup loaded spell data
 // For more high level function for sSpellStore data
-
 #include "SharedDefines.h"
 #include "SpellAuraDefines.h"
 #include "DBCStructure.h"
 #include "DBCStores.h"
 #include "Database/SQLStorage.h"
-
 #include "Utilities/UnorderedMap.h"
-
 #include "Player.h"
-
 #include <map>
-
 class Player;
 class Spell;
 struct SpellModifier;
-
 // only used in code
 enum SpellCategories
 {
@@ -49,14 +41,12 @@ enum SpellCategories
     SPELLCATEGORY_FOOD             = 11,
     SPELLCATEGORY_DRINK            = 59,
 };
-
 enum SpellDisableTypes
 {
     SPELL_DISABLE_PLAYER = 1,
     SPELL_DISABLE_CREATURE = 2,
     SPELL_DISABLE_PET = 4
 };
-
 enum SpellEffectTargetTypes
 {
     SPELL_REQUIRE_NONE,
@@ -66,7 +56,6 @@ enum SpellEffectTargetTypes
     SPELL_REQUIRE_CASTER,
     SPELL_REQUIRE_GOBJECT,
 };
-
 enum SpellSelectTargetTypes
 {
     TARGET_TYPE_DEFAULT,
@@ -82,7 +71,6 @@ enum SpellSelectTargetTypes
     TARGET_TYPE_DEST_SPECIAL,
     TARGET_TYPE_CHANNEL,
 };
-
 //Some SpellFamilyFlags
 #define SPELLFAMILYFLAG_ROGUE_VANISH            0x00000800
 #define SPELLFAMILYFLAG_ROGUE_STEALTH           0x00400000
@@ -93,7 +81,6 @@ enum SpellSelectTargetTypes
 //#define SPELLFAMILYFLAG_ROGUE__FINISHING_MOVE   0x9003E0000LL
 #define SPELLFAMILYFLAG_WARRIOR_SUNDERARMOR     0x00004000
 #define SPELLFAMILYFLAG_SHAMAN_FROST_SHOCK      0x80000000
-
 // Spell clasification
 enum SpellSpecific
 {
@@ -128,9 +115,7 @@ enum SpellSpecific
     SPELL_HAND              = 28,
     SPELL_PHASE             = 29,
 };
-
 #define SPELL_LINKED_MAX_SPELLS  200000
-
 enum SpellLinkedType
 {
     SPELL_LINK_CAST     = 0,            // +: cast; -: remove
@@ -138,10 +123,8 @@ enum SpellLinkedType
     SPELL_LINK_AURA     = 2 * 200000,   // +: aura; -: immune
     SPELL_LINK_REMOVE   = 0,
 };
-
 SpellSpecific GetSpellSpecific(uint32 spellId);
 AuraState GetSpellAuraState(SpellEntry const * spellInfo);
-
 // Different spell properties
 inline float GetSpellRadiusForHostile(SpellRadiusEntry const *radius) { return (radius ? radius->radiusHostile : 0); }
 inline float GetSpellRadiusForFriend(SpellRadiusEntry const *radius) { return (radius ? radius->radiusFriend : 0); }
@@ -161,48 +144,41 @@ inline float GetSpellRadius(SpellEntry const *spellInfo, uint32 effectIdx, bool
         ? GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(spellInfo->EffectRadiusIndex[effectIdx]))
         : GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(spellInfo->EffectRadiusIndex[effectIdx]));
 }
-
 inline float GetSpellMaxRange(SpellEntry const *spellInfo, bool positive)
 {
     return positive
         ? GetSpellMaxRangeForFriend(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex))
         : GetSpellMaxRangeForHostile(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex));
 }
-
 inline float GetSpellMinRange(SpellEntry const *spellInfo, bool positive)
 {
     return positive
         ? GetSpellMinRangeForFriend(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex))
         : GetSpellMinRangeForHostile(sSpellRangeStore.LookupEntry(spellInfo->rangeIndex));
 }
-
 inline float GetSpellMinRange(uint32 id, bool positive)
 {
     SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(id);
     if(!spellInfo) return 0;
     return GetSpellMinRange(spellInfo, positive);
 }
-
 inline float GetSpellMaxRange(uint32 id, bool positive)
 {
     SpellEntry const *spellInfo = GetSpellStore()->LookupEntry(id);
     if(!spellInfo) return 0;
     return GetSpellMaxRange(spellInfo, positive);
 }
-
 /*struct DispelEntry
 {
     uint64 casterGuid;
     uint32 spellId;
     Unit * caster;
     uint8 stackAmount;
-
     bool operator < (const DispelEntry & _Right) const
     {
         return (spellId != _Right.spellId ? spellId < _Right.spellId : casterGuid < _Right.casterGuid);
     }
 };*/
-
 inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect)
 {
     for(int i= 0; i < 3; ++i)
@@ -210,7 +186,6 @@ inline bool IsSpellHaveEffect(SpellEntry const *spellInfo, SpellEffects effect)
             return true;
     return false;
 }
-
 inline bool IsSpellHaveAura(SpellEntry const *spellInfo, AuraType aura)
 {
     for(int i= 0; i < 3; ++i)
@@ -218,9 +193,7 @@ inline bool IsSpellHaveAura(SpellEntry const *spellInfo, AuraType aura)
             return true;
     return false;
 }
-
 //bool IsNoStackAuraDueToAura(uint32 spellId_1, uint32 effIndex_1, uint32 spellId_2, uint32 effIndex_2);
-
 inline bool IsSealSpell(SpellEntry const *spellInfo)
 {
     //Collection of all the seal family flags. No other paladin spell has any of those.
@@ -228,7 +201,6 @@ inline bool IsSealSpell(SpellEntry const *spellInfo)
         ( spellInfo->SpellFamilyFlags[1] & 0x26000C00
         || spellInfo->SpellFamilyFlags[0] & 0x0A000000 );
 }
-
 inline bool IsElementalShield(SpellEntry const *spellInfo)
 {
     // family flags 10 (Lightning), 42 (Earth), 37 (Water), proc shield from T2 8 pieces bonus
@@ -236,60 +208,48 @@ inline bool IsElementalShield(SpellEntry const *spellInfo)
         || spellInfo->SpellFamilyFlags[0] & 0x00000400)
         || spellInfo->Id == 23552;
 }
-
 inline bool IsExplicitDiscoverySpell(SpellEntry const *spellInfo)
 {
     return ((spellInfo->Effect[0] == SPELL_EFFECT_CREATE_RANDOM_ITEM
         && spellInfo->Effect[1] == SPELL_EFFECT_SCRIPT_EFFECT)
         || spellInfo->Id == 64323);                          // Book of Glyph Mastery (Effect0==SPELL_EFFECT_SCRIPT_EFFECT without any other data)
 }
-
 inline bool IsLootCraftingSpell(SpellEntry const *spellInfo)
 {
     return (spellInfo->Effect[0]==SPELL_EFFECT_CREATE_RANDOM_ITEM ||
         // different random cards from Inscription (121==Virtuoso Inking Set category)
         (spellInfo->Effect[0]==SPELL_EFFECT_CREATE_ITEM_2 && spellInfo->TotemCategory[0] == 121));
 }
-
 bool IsHigherHankOfSpell(uint32 spellId_1,uint32 spellId_2);
 bool IsSingleFromSpellSpecificPerCaster(SpellSpecific spellSpec1, SpellSpecific spellSpec2);
 bool IsSingleFromSpellSpecificPerTarget(SpellSpecific spellSpec1, SpellSpecific spellSpec2);
 bool IsPassiveSpell(uint32 spellId);
 bool IsAutocastableSpell(uint32 spellId);
-
 uint32 CalculatePowerCost(SpellEntry const * spellInfo, Unit const * caster, SpellSchoolMask schoolMask);
-
 inline bool IsPassiveSpellStackableWithRanks(SpellEntry const* spellProto)
 {
     if(!IsPassiveSpell(spellProto->Id))
         return false;
-
     return !IsSpellHaveEffect(spellProto,SPELL_EFFECT_APPLY_AURA);
 }
 
-
 inline bool IsDeathPersistentSpell(SpellEntry const *spellInfo)
 {
     return spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DEATH_PERSISTENT;
 }
-
 inline bool IsNonCombatSpell(SpellEntry const *spellInfo)
 {
     return (spellInfo->Attributes & SPELL_ATTR_CANT_USED_IN_COMBAT) != 0;
 }
-
 bool IsPositiveSpell(uint32 spellId);
 bool IsPositiveEffect(uint32 spellId, uint32 effIndex);
 bool IsPositiveTarget(uint32 targetA, uint32 targetB);
 bool IsDispelableBySpell(SpellEntry const * dispelSpell, uint32 spellId, bool def = false);
-
 bool IsSingleTargetSpell(SpellEntry const *spellInfo);
 bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellInfo2);
-
 extern bool IsAreaEffectTarget[TOTAL_SPELL_TARGETS];
 extern SpellEffectTargetTypes EffectTargetType[TOTAL_SPELL_EFFECTS];
 extern SpellSelectTargetTypes SpellTargetType[TOTAL_SPELL_TARGETS];
-
 inline bool IsCasterSourceTarget(uint32 target)
 {
     switch (SpellTargetType[target])
@@ -304,7 +264,6 @@ inline bool IsCasterSourceTarget(uint32 target)
     }
     return false;
 }
-
 inline bool IsPositionTarget(uint32 target)
 {
     switch (SpellTargetType[target])
@@ -318,7 +277,6 @@ inline bool IsPositionTarget(uint32 target)
     }
     return false;
 }
-
 inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo)
 {
     for(int i = 0; i < 3; ++i)
@@ -326,17 +284,14 @@ inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo)
         uint32 targetA = spellInfo->EffectImplicitTargetA[i];
         if(targetA && !IsCasterSourceTarget(targetA))
             return false;
-
         uint32 targetB = spellInfo->EffectImplicitTargetB[i];
         if(targetB && !IsCasterSourceTarget(targetB))
             return false;
-
         if(!targetA && !targetB)
             return false;
     }
     return true;
 }
-
 inline bool IsAreaOfEffectSpell(SpellEntry const *spellInfo)
 {
     if(IsAreaEffectTarget[spellInfo->EffectImplicitTargetA[0]] || IsAreaEffectTarget[spellInfo->EffectImplicitTargetB[0]])
@@ -347,7 +302,6 @@ inline bool IsAreaOfEffectSpell(SpellEntry const *spellInfo)
         return true;
     return false;
 }
-
 inline bool IsAreaAuraEffect(uint32 effect)
 {
     if( effect == SPELL_EFFECT_APPLY_AREA_AURA_PARTY    ||
@@ -368,7 +322,6 @@ inline bool IsDispel(SpellEntry const *spellInfo)
         return true;
     return false;
 }
-
 inline bool IsDispelSpell(SpellEntry const *spellInfo)
 {
     //spellsteal is also dispel
@@ -379,41 +332,33 @@ inline bool IsDispelSpell(SpellEntry const *spellInfo)
         return true;
     return false;
 }
-
 inline bool isSpellBreakStealth(SpellEntry const* spellInfo)
 {
     return !(spellInfo->AttributesEx & SPELL_ATTR_EX_NOT_BREAK_STEALTH);
 }
-
 inline bool IsAutoRepeatRangedSpell(SpellEntry const* spellInfo)
 {
     return spellInfo->AttributesEx2 & SPELL_ATTR_EX2_AUTOREPEAT_FLAG;
 }
-
 inline bool IsRangedWeaponSpell(SpellEntry const* spellInfo)
 {
     //spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED should be checked outside
     return (spellInfo->SpellFamilyName == SPELLFAMILY_HUNTER && !(spellInfo->SpellFamilyFlags[1] & 0x10000000)) // for 53352, cannot find better way
         || (spellInfo->EquippedItemSubClassMask & ITEM_SUBCLASS_MASK_WEAPON_RANGED);
 }
-
 SpellCastResult GetErrorAtShapeshiftedCast (SpellEntry const *spellInfo, uint32 form);
-
 inline bool IsChanneledSpell(SpellEntry const* spellInfo)
 {
     return (spellInfo->AttributesEx & (SPELL_ATTR_EX_CHANNELED_1 | SPELL_ATTR_EX_CHANNELED_2));
 }
-
 inline bool NeedsComboPoints(SpellEntry const* spellInfo)
 {
     return (spellInfo->AttributesEx & (SPELL_ATTR_EX_REQ_COMBO_POINTS1 | SPELL_ATTR_EX_REQ_COMBO_POINTS2));
 }
-
 inline SpellSchoolMask GetSpellSchoolMask(SpellEntry const* spellInfo)
 {
     return SpellSchoolMask(spellInfo->SchoolMask);
 }
-
 inline uint32 GetSpellMechanicMask(SpellEntry const* spellInfo, int32 effect)
 {
     uint32 mask = 0;
@@ -423,7 +368,6 @@ inline uint32 GetSpellMechanicMask(SpellEntry const* spellInfo, int32 effect)
         mask |= 1<<spellInfo->EffectMechanic[effect];
     return mask;
 }
-
 inline uint32 GetAllSpellMechanicMask(SpellEntry const* spellInfo)
 {
     uint32 mask = 0;
@@ -434,7 +378,6 @@ inline uint32 GetAllSpellMechanicMask(SpellEntry const* spellInfo)
             mask |= 1<<spellInfo->EffectMechanic[i];
     return mask;
 }
-
 inline Mechanics GetEffectMechanic(SpellEntry const* spellInfo, int32 effect)
 {
     if (spellInfo->EffectMechanic[effect])
@@ -443,7 +386,6 @@ inline Mechanics GetEffectMechanic(SpellEntry const* spellInfo, int32 effect)
         return Mechanics(spellInfo->Mechanic);
     return MECHANIC_NONE;
 }
-
 inline uint32 GetDispellMask(DispelType dispel)
 {
     // If dispel all
@@ -452,57 +394,41 @@ inline uint32 GetDispellMask(DispelType dispel)
     else
         return (1 << dispel);
 }
-
 // Diminishing Returns interaction with spells
 DiminishingGroup GetDiminishingReturnsGroupForSpell(SpellEntry const* spellproto, bool triggered);
 bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group);
 DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group);
 int32 GetDiminishingReturnsLimitDuration(DiminishingGroup group, SpellEntry const* spellproto);
-
 // Spell proc event related declarations (accessed using SpellMgr functions)
 enum ProcFlags
 {
    PROC_FLAG_NONE                            = 0x00000000,
-
    PROC_FLAG_KILLED                          = 0x00000001,    // 00 Killed by agressor
    PROC_FLAG_KILL                            = 0x00000002,    // 01 Kill target (in most cases need XP/Honor reward)
-
    PROC_FLAG_SUCCESSFUL_MELEE_HIT            = 0x00000004,    // 02 Successful melee auto attack
    PROC_FLAG_TAKEN_MELEE_HIT                 = 0x00000008,    // 03 Taken damage from melee auto attack hit
-
    PROC_FLAG_SUCCESSFUL_MELEE_SPELL_HIT      = 0x00000010,    // 04 Successful attack by Spell that use melee weapon
    PROC_FLAG_TAKEN_MELEE_SPELL_HIT           = 0x00000020,    // 05 Taken damage by Spell that use melee weapon
-
    PROC_FLAG_SUCCESSFUL_RANGED_HIT           = 0x00000040,    // 06 Successful Ranged auto attack
    PROC_FLAG_TAKEN_RANGED_HIT                = 0x00000080,    // 07 Taken damage from ranged auto attack
-
    PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT     = 0x00000100,    // 08 Successful Ranged attack by Spell that use ranged weapon
    PROC_FLAG_TAKEN_RANGED_SPELL_HIT          = 0x00000200,    // 09 Taken damage by Spell that use ranged weapon
-
    PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL_HIT   = 0x00000400,    // 10 Successful Positive spell hit
    PROC_FLAG_TAKEN_POSITIVE_SPELL            = 0x00000800,    // 11 Taken Positive spell hit
-
    PROC_FLAG_SUCCESSFUL_NEGATIVE_SPELL_HIT   = 0x00001000,    // 12 Successful Negative spell hit
    PROC_FLAG_TAKEN_NEGATIVE_SPELL_HIT        = 0x00002000,    // 13 Taken Negative spell hit
-
    PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL = 0x00004000,    // 14 Successful Positive Magic spell hit
    PROC_FLAG_TAKEN_POSITIVE_MAGIC_SPELL      = 0x00008000,    // 15 Taken Positive Magic spell hit
-
    PROC_FLAG_SUCCESSFUL_NEGATIVE_MAGIC_SPELL = 0x00010000,    // 16 Successful Negative Magic spell hit
    PROC_FLAG_TAKEN_NEGATIVE_MAGIC_SPELL      = 0x00020000,    // 17 Taken Negative Magic spell hit
-
    PROC_FLAG_ON_DO_PERIODIC                  = 0x00040000,    // 18 Successful do periodic (damage / healing, determined from 14,16 flags)
    PROC_FLAG_ON_TAKE_PERIODIC                = 0x00080000,    // 19 Taken spell periodic (damage / healing, determined from 15,17 flags)
-
    PROC_FLAG_TAKEN_ANY_DAMAGE                = 0x00100000,    // 20 Taken any damage
    PROC_FLAG_ON_TRAP_ACTIVATION              = 0x00200000,    // 21 On trap activation (possibly needs name change to ON_GAMEOBJECT_CAST or USE)
-
    PROC_FLAG_TAKEN_OFFHAND_HIT               = 0x00400000,    // 22 Taken off-hand melee attacks ( this is probably wrong )
    PROC_FLAG_SUCCESSFUL_OFFHAND_HIT          = 0x00800000,    // 23 Successful off-hand melee attacks ( this is probably wrong )
-
    PROC_FLAG_DEATH                           = 0x01000000     // 24 Died in any way
 };
-
 #define MELEE_BASED_TRIGGER_MASK (PROC_FLAG_SUCCESSFUL_MELEE_HIT        | \
                                   PROC_FLAG_TAKEN_MELEE_HIT             | \
                                   PROC_FLAG_SUCCESSFUL_MELEE_SPELL_HIT  | \
@@ -511,7 +437,6 @@ enum ProcFlags
                                   PROC_FLAG_TAKEN_RANGED_HIT            | \
                                   PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT | \
                                   PROC_FLAG_TAKEN_RANGED_SPELL_HIT)
-
 enum ProcFlagsEx
 {
    PROC_EX_NONE                = 0x0000000,                 // If none can tigger on Hit/Crit only (passive spells MUST defined by SpellFamily flag)
@@ -534,7 +459,6 @@ enum ProcFlagsEx
    PROC_EX_EX_TRIGGER_ALWAYS   = 0x0010000,                 // If set trigger always no matter of hit result
    PROC_EX_EX_ONE_TIME_TRIGGER = 0x0020000,                 // If set trigger always but only one time (not implemented yet)
    PROC_EX_ONLY_ACTIVE_SPELL   = 0x0040000,                 // Spell has to do damage/heal to proc
-
    // Flags for internal use - do not use these in db!
    PROC_EX_INTERNAL_CANT_PROC  = 0x0800000,
    PROC_EX_INTERNAL_DOT        = 0x1000000,
@@ -544,13 +468,11 @@ enum ProcFlagsEx
 };
 #define AURA_REMOVE_PROC_EX_MASK \
    (PROC_EX_AURA_REMOVE_DESTROY | PROC_EX_AURA_REMOVE_EXPIRE)
-
 #define AURA_SPELL_PROC_EX_MASK \
    (PROC_EX_NORMAL_HIT | PROC_EX_CRITICAL_HIT | PROC_EX_MISS | \
     PROC_EX_RESIST | PROC_EX_DODGE | PROC_EX_PARRY | PROC_EX_BLOCK | \
     PROC_EX_EVADE | PROC_EX_IMMUNE | PROC_EX_DEFLECT | \
     PROC_EX_ABSORB | PROC_EX_REFLECT | PROC_EX_INTERRUPT)
-
 struct SpellProcEventEntry
 {
     uint32      schoolMask;                                 // if nonzero - bit mask for matching proc condition based on spell candidate's school: Fire=2, Mask=1<<(2-1)=2
@@ -562,7 +484,6 @@ struct SpellProcEventEntry
     float       customChance;                               // Owerride chance (in most cases for debug only)
     uint32      cooldown;                                   // hidden cooldown used for some spell proc events, applied to _triggered_spell_
 };
-
 struct SpellBonusEntry
 {
     float  direct_damage;
@@ -570,29 +491,23 @@ struct SpellBonusEntry
     float  ap_bonus;
     float  ap_dot_bonus;
 };
-
 typedef UNORDERED_MAP<uint32, SpellProcEventEntry> SpellProcEventMap;
-
 struct SpellEnchantProcEntry
 {
     uint32      customChance;
     float       PPMChance;
     uint32      procEx;
 };
-
 typedef UNORDERED_MAP<uint32, SpellEnchantProcEntry> SpellEnchantProcEventMap;
 typedef UNORDERED_MAP<uint32, SpellBonusEntry>     SpellBonusMap;
-
 #define ELIXIR_BATTLE_MASK    0x01
 #define ELIXIR_GUARDIAN_MASK  0x02
 #define ELIXIR_FLASK_MASK     (ELIXIR_BATTLE_MASK|ELIXIR_GUARDIAN_MASK)
 #define ELIXIR_UNSTABLE_MASK  0x04
 #define ELIXIR_SHATTRATH_MASK 0x08
 #define ELIXIR_WELL_FED       0x10                          // Some foods have SPELLFAMILY_POTION
-
 typedef std::map<uint32, uint8> SpellElixirMap;
 typedef std::map<uint32, uint16> SpellThreatMap;
-
 // Spell script target related declarations (accessed using SpellMgr functions)
 enum SpellScriptTargetType
 {
@@ -601,19 +516,15 @@ enum SpellScriptTargetType
     SPELL_TARGET_TYPE_DEAD       = 2,
     SPELL_TARGET_TYPE_CONTROLLED = 3,
 };
-
 #define MAX_SPELL_TARGET_TYPE 4
-
 struct SpellTargetEntry
 {
     SpellTargetEntry(SpellScriptTargetType type_,uint32 targetEntry_) : type(type_), targetEntry(targetEntry_) {}
     SpellScriptTargetType type;
     uint32 targetEntry;
 };
-
 typedef std::multimap<uint32,SpellTargetEntry> SpellScriptTarget;
 typedef std::pair<SpellScriptTarget::const_iterator,SpellScriptTarget::const_iterator> SpellScriptTargetBounds;
-
 // coordinates for spells (accessed using SpellMgr functions)
 struct SpellTargetPosition
 {
@@ -623,9 +534,7 @@ struct SpellTargetPosition
     float  target_Z;
     float  target_Orientation;
 };
-
 typedef UNORDERED_MAP<uint32, SpellTargetPosition> SpellTargetPositionMap;
-
 // Spell pet auras
 class PetAura
 {
@@ -634,13 +543,11 @@ class PetAura
         {
             auras.clear();
         }
-
         PetAura(uint32 petEntry, uint32 aura, bool _removeOnChangePet, int _damage) :
         removeOnChangePet(_removeOnChangePet), damage(_damage)
         {
             auras[petEntry] = aura;
         }
-
         uint32 GetAura(uint32 petEntry) const
         {
             std::map<uint32, uint32>::const_iterator itr = auras.find(petEntry);
@@ -651,29 +558,24 @@ class PetAura
                 return itr2->second;
             return 0;
         }
-
         void AddAura(uint32 petEntry, uint32 aura)
         {
             auras[petEntry] = aura;
         }
-
         bool IsRemovedOnChangePet() const
         {
             return removeOnChangePet;
         }
-
         int32 GetDamage() const
         {
             return damage;
         }
-
     private:
         std::map<uint32, uint32> auras;
         bool removeOnChangePet;
         int32 damage;
 };
 typedef std::map<uint32, PetAura> SpellPetAuraMap;
-
 struct SpellArea
 {
     uint32 spellId;
@@ -685,11 +587,9 @@ struct SpellArea
     Gender gender;                                          // can be applied only to gender
     bool questStartCanActive;                               // if true then quest start can be active (not only rewarded)
     bool autocast;                                          // if true then auto applied at area enter, in other case just allowed to cast
-
     // helpers
     bool IsFitToRequirements(Player const* player, uint32 newZone, uint32 newArea) const;
 };
-
 typedef std::multimap<uint32,SpellArea> SpellAreaMap;
 typedef std::multimap<uint32,SpellArea const*> SpellAreaForQuestMap;
 typedef std::multimap<uint32,SpellArea const*> SpellAreaForAuraMap;
@@ -699,7 +599,6 @@ typedef std::pair<SpellAreaForQuestMap::const_iterator,SpellAreaForQuestMap::con
 typedef std::pair<SpellAreaForAuraMap::const_iterator, SpellAreaForAuraMap::const_iterator>  SpellAreaForAuraMapBounds;
 typedef std::pair<SpellAreaForAreaMap::const_iterator, SpellAreaForAreaMap::const_iterator>  SpellAreaForAreaMapBounds;
 
-
 // Spell rank chain  (accessed using SpellMgr functions)
 struct SpellChainNode
 {
@@ -709,14 +608,10 @@ struct SpellChainNode
     uint32 last;
     uint8  rank;
 };
-
 typedef UNORDERED_MAP<uint32, SpellChainNode> SpellChainMap;
-
 //                 spell_id  req_spell
 typedef UNORDERED_MAP<uint32, uint32> SpellRequiredMap;
-
 typedef std::multimap<uint32, uint32> SpellsRequiringSpellMap;
-
 // Spell learning properties (accessed using SpellMgr functions)
 struct SpellLearnSkillNode
 {
@@ -724,51 +619,39 @@ struct SpellLearnSkillNode
     uint32 value;                                           // 0  - max skill value for player level
     uint32 maxvalue;                                        // 0  - max skill value for player level
 };
-
 typedef std::map<uint32, SpellLearnSkillNode> SpellLearnSkillMap;
-
 struct SpellLearnSpellNode
 {
     uint32 spell;
     bool active;                                            // show in spellbook or not
     bool autoLearned;
 };
-
 typedef std::multimap<uint32, SpellLearnSpellNode> SpellLearnSpellMap;
 typedef std::pair<SpellLearnSpellMap::const_iterator,SpellLearnSpellMap::const_iterator> SpellLearnSpellMapBounds;
-
 typedef std::multimap<uint32, SkillLineAbilityEntry const*> SkillLineAbilityMap;
 typedef std::pair<SkillLineAbilityMap::const_iterator,SkillLineAbilityMap::const_iterator> SkillLineAbilityMapBounds;
-
 typedef std::multimap<uint32, uint32> PetLevelupSpellSet;
 typedef std::map<uint32, PetLevelupSpellSet> PetLevelupSpellMap;
-
 struct PetDefaultSpellsEntry
 {
     uint32 spellid[MAX_CREATURE_SPELL_DATA_SLOT];
 };
-
 // < 0 for petspelldata id, > 0 for creature_id
 typedef std::map<int32, PetDefaultSpellsEntry> PetDefaultSpellsMap;
 
-
 inline bool IsPrimaryProfessionSkill(uint32 skill)
 {
     SkillLineEntry const *pSkill = sSkillLineStore.LookupEntry(skill);
     if(!pSkill)
         return false;
-
     if(pSkill->categoryId != SKILL_CATEGORY_PROFESSION)
         return false;
-
     return true;
 }
-
 inline bool IsProfessionSkill(uint32 skill)
 {
     return  IsPrimaryProfessionSkill(skill) || skill == SKILL_FISHING || skill == SKILL_COOKING || skill == SKILL_FIRST_AID;
 }
-
 #define SPELL_ATTR_CU_CONE_BACK         0x00000002
 #define SPELL_ATTR_CU_CONE_LINE         0x00000004
 #define SPELL_ATTR_CU_SHARE_DAMAGE      0x00000008
@@ -785,40 +668,30 @@ inline bool IsProfessionSkill(uint32 skill)
 #define SPELL_ATTR_CU_NEGATIVE_EFF1     0x00020000
 #define SPELL_ATTR_CU_NEGATIVE_EFF2     0x00040000
 #define SPELL_ATTR_CU_NEGATIVE          0x00070000
-
 typedef std::vector<uint32> SpellCustomAttribute;
 typedef std::vector<bool> EnchantCustomAttribute;
-
 typedef std::map<int32, std::vector<int32> > SpellLinkedMap;
-
 inline bool IsProfessionOrRidingSkill(uint32 skill)
 {
     return  IsProfessionSkill(skill) || skill == SKILL_RIDING;
 }
-
 class SpellMgr
 {
     // Constructors
     public:
         SpellMgr();
         ~SpellMgr();
-
     // Accessors (const or static functions)
     public:
-
         bool IsAffectedByMod(SpellEntry const *spellInfo, SpellModifier *mod) const;
-
         SpellElixirMap const& GetSpellElixirMap() const { return mSpellElixirs; }
-
         uint32 GetSpellElixirMask(uint32 spellid) const
         {
             SpellElixirMap::const_iterator itr = mSpellElixirs.find(spellid);
             if(itr==mSpellElixirs.end())
                 return 0x0;
-
             return itr->second;
         }
-
         SpellSpecific GetSpellElixirSpecific(uint32 spellid) const
         {
             uint32 mask = GetSpellElixirMask(spellid);
@@ -833,16 +706,13 @@ class SpellMgr
             else
                 return SPELL_NORMAL;
         }
-
         uint16 GetSpellThreat(uint32 spellid) const
         {
             SpellThreatMap::const_iterator itr = mSpellThreatMap.find(spellid);
             if(itr==mSpellThreatMap.end())
                 return 0;
-
             return itr->second;
         }
-
         // Spell proc events
         SpellProcEventEntry const* GetSpellProcEvent(uint32 spellId) const
         {
@@ -851,9 +721,7 @@ class SpellMgr
                 return &itr->second;
             return NULL;
         }
-
         bool IsSpellProcEventCanTriggeredBy( SpellProcEventEntry const * spellProcEvent, uint32 EventProcFlag, SpellEntry const * procSpell, uint32 procFlags, uint32 procExtra, bool active);
-
         SpellEnchantProcEntry const* GetSpellEnchantProcEvent(uint32 enchId) const
         {
             SpellEnchantProcEventMap::const_iterator itr = mSpellEnchantProcEventMap.find(enchId);
@@ -861,7 +729,6 @@ class SpellMgr
                 return &itr->second;
             return NULL;
         }
-
         // Spell bonus data
         SpellBonusEntry const* GetSpellBonusData(uint32 spellId) const
         {
@@ -878,7 +745,6 @@ class SpellMgr
             }
             return NULL;
         }
-
         // Spell target coordinates
         SpellTargetPosition const* GetSpellTargetPosition(uint32 spell_id) const
         {
@@ -887,34 +753,27 @@ class SpellMgr
                 return &itr->second;
             return NULL;
         }
-
         // Spell ranks chains
         SpellChainNode const* GetSpellChainNode(uint32 spell_id) const
         {
             SpellChainMap::const_iterator itr = mSpellChains.find(spell_id);
             if(itr == mSpellChains.end())
                 return NULL;
-
             return &itr->second;
         }
-
         uint32 GetSpellRequired(uint32 spell_id) const
         {
             SpellRequiredMap::const_iterator itr = mSpellReq.find(spell_id);
             if(itr == mSpellReq.end())
                 return NULL;
-
             return itr->second;
         }
-
         uint32 GetFirstSpellInChain(uint32 spell_id) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->first;
-
             return spell_id;
         }
-
         uint32 GetSpellWithRank(uint32 spell_id, uint32 rank) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
@@ -924,70 +783,52 @@ class SpellMgr
             }
             return spell_id;
         }
-
         uint32 GetPrevSpellInChain(uint32 spell_id) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->prev;
-
             return 0;
         }
-
         uint32 GetNextSpellInChain(uint32 spell_id) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->next;
-
             return 0;
         }
-
         SpellsRequiringSpellMap const& GetSpellsRequiringSpell() const { return mSpellsReqSpell; }
-
         uint8 GetSpellRank(uint32 spell_id) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->rank;
-
             return 0;
         }
-
         uint32 GetLastSpellInChain(uint32 spell_id) const
         {
             if(SpellChainNode const* node = GetSpellChainNode(spell_id))
                 return node->last;
-
             return spell_id;
         }
-
         uint32 IsArenaAllowedEnchancment(uint32 ench_id) const
         {
             return mEnchantCustomAttr[ench_id];
         }
-
         uint8 IsHighRankOfSpell(uint32 spell1,uint32 spell2) const
         {
             SpellChainMap::const_iterator itr = mSpellChains.find(spell1);
-
             uint32 rank2 = GetSpellRank(spell2);
-
             // not ordered correctly by rank value
             if(itr == mSpellChains.end() || !rank2 || itr->second.rank <= rank2)
                 return false;
-
             // check present in same rank chain
             for(; itr != mSpellChains.end(); itr = mSpellChains.find(itr->second.prev))
                 if(itr->second.prev==spell2)
                     return true;
-
             return false;
         }
-
         bool IsRankSpellDueToSpell(SpellEntry const *spellInfo_1,uint32 spellId_2) const;
         static bool canStackSpellRanks(SpellEntry const *spellInfo);
         bool CanAurasStack(SpellEntry const *spellInfo_1, SpellEntry const *spellInfo_2, bool sameCaster) const;
-
         SpellEntry const* SelectAuraRankForPlayerLevel(SpellEntry const* spellInfo, uint32 playerLevel) const;
-
         // Spell learning
         SpellLearnSkillNode const* GetSpellLearnSkill(uint32 spell_id) const
         {
@@ -997,17 +838,14 @@ class SpellMgr
             else
                 return NULL;
         }
-
         bool IsSpellLearnSpell(uint32 spell_id) const
         {
             return mSpellLearnSpells.find(spell_id) != mSpellLearnSpells.end();
         }
-
         SpellLearnSpellMapBounds GetSpellLearnSpellMapBounds(uint32 spell_id) const
         {
             return SpellLearnSpellMapBounds(mSpellLearnSpells.lower_bound(spell_id),mSpellLearnSpells.upper_bound(spell_id));
         }
-
         bool IsSpellLearnToSpell(uint32 spell_id1,uint32 spell_id2) const
         {
             SpellLearnSpellMapBounds bounds = GetSpellLearnSpellMapBounds(spell_id1);
@@ -1016,30 +854,24 @@ class SpellMgr
                     return true;
             return false;
         }
-
         static bool IsProfessionOrRidingSpell(uint32 spellId);
         static bool IsProfessionSpell(uint32 spellId);
         static bool IsPrimaryProfessionSpell(uint32 spellId);
         bool IsPrimaryProfessionFirstRankSpell(uint32 spellId) const;
-
         bool IsSkillBonusSpell(uint32 spellId) const;
         bool IsSkillTypeSpell(uint32 spellId, SkillType type) const;
 
-
         // Spell script targets
         SpellScriptTargetBounds GetSpellScriptTargetBounds(uint32 spell_id) const
         {
             return SpellScriptTargetBounds(mSpellScriptTarget.lower_bound(spell_id),mSpellScriptTarget.upper_bound(spell_id));
         }
-
         // Spell correctess for client using
         static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true);
-
         SkillLineAbilityMapBounds GetSkillLineAbilityMapBounds(uint32 spell_id) const
         {
             return SkillLineAbilityMapBounds(mSkillLineAbilityMap.lower_bound(spell_id),mSkillLineAbilityMap.upper_bound(spell_id));
         }
-
         PetAura const* GetPetAura(uint32 spell_id, uint8 eff)
         {
             SpellPetAuraMap::const_iterator itr = mSpellPetAuraMap.find((spell_id<<8) + eff);
@@ -1048,7 +880,6 @@ class SpellMgr
             else
                 return NULL;
         }
-
         PetLevelupSpellSet const* GetPetLevelupSpellList(uint32 petFamily) const
         {
             PetLevelupSpellMap::const_iterator itr = mPetLevelupSpellMap.find(petFamily);
@@ -1057,7 +888,6 @@ class SpellMgr
             else
                 return NULL;
         }
-
         uint32 GetSpellCustomAttr(uint32 spell_id) const
         {
             if(spell_id >= mSpellCustomAttr.size())
@@ -1065,13 +895,11 @@ class SpellMgr
             else
                 return mSpellCustomAttr[spell_id];
         }
-
         const std::vector<int32> *GetSpellLinked(int32 spell_id) const
         {
             SpellLinkedMap::const_iterator itr = mSpellLinkedMap.find(spell_id);
             return itr != mSpellLinkedMap.end() ? &(itr->second) : NULL;
         }
-
         // < 0 for petspelldata id, > 0 for creature_id
         PetDefaultSpellsEntry const* GetPetDefaultSpellsEntry(int32 id) const
         {
@@ -1080,14 +908,11 @@ class SpellMgr
                 return &itr->second;
             return NULL;
         }
-
         SpellCastResult GetSpellAllowedInLocationError(SpellEntry const *spellInfo, uint32 map_id, uint32 zone_id, uint32 area_id, Player const* player = NULL);
-
         SpellAreaMapBounds GetSpellAreaMapBounds(uint32 spell_id) const
         {
             return SpellAreaMapBounds(mSpellAreaMap.lower_bound(spell_id),mSpellAreaMap.upper_bound(spell_id));
         }
-
         SpellAreaForQuestMapBounds GetSpellAreaForQuestMapBounds(uint32 quest_id, bool active) const
         {
             if(active)
@@ -1095,24 +920,19 @@ class SpellMgr
             else
                 return SpellAreaForQuestMapBounds(mSpellAreaForQuestMap.lower_bound(quest_id),mSpellAreaForQuestMap.upper_bound(quest_id));
         }
-
         SpellAreaForQuestMapBounds GetSpellAreaForQuestEndMapBounds(uint32 quest_id) const
         {
             return SpellAreaForQuestMapBounds(mSpellAreaForQuestEndMap.lower_bound(quest_id),mSpellAreaForQuestEndMap.upper_bound(quest_id));
         }
-
         SpellAreaForAuraMapBounds GetSpellAreaForAuraMapBounds(uint32 spell_id) const
         {
             return SpellAreaForAuraMapBounds(mSpellAreaForAuraMap.lower_bound(spell_id),mSpellAreaForAuraMap.upper_bound(spell_id));
         }
-
         SpellAreaForAreaMapBounds GetSpellAreaForAreaMapBounds(uint32 area_id) const
         {
             return SpellAreaForAreaMapBounds(mSpellAreaForAreaMap.lower_bound(area_id),mSpellAreaForAreaMap.upper_bound(area_id));
         }
-
         bool IsSrcTargetSpell(SpellEntry const *spellInfo) const;
-
         inline bool IsCasterSourceTarget(uint32 target)
         {
             switch (SpellTargetType[target])
@@ -1125,7 +945,6 @@ class SpellMgr
             }
             return true;
         }
-
         inline bool IsSpellWithCasterSourceTargetsOnly(SpellEntry const* spellInfo)
         {
             for(int i = 0; i < 3; ++i)
@@ -1134,11 +953,9 @@ class SpellMgr
                         return false;
             return true;
         }
-
     // Modifiers
     public:
         static SpellMgr& Instance();
-
         // Loading data at server startup
         void LoadSpellChains();
         void LoadSpellRequired();
@@ -1159,13 +976,10 @@ class SpellMgr
         void LoadPetLevelupSpellMap();
         void LoadPetDefaultSpells();
         void LoadSpellAreas();
-
         bool CheckDB() const;
-
     private:
         bool _isPositiveSpell(uint32 spellId, bool deep) const;
         bool _isPositiveEffect(uint32 spellId, uint32 effIndex, bool deep) const;
-
         SpellScriptTarget  mSpellScriptTarget;
         SpellChainMap      mSpellChains;
         SpellsRequiringSpellMap   mSpellsReqSpell;
@@ -1192,7 +1006,6 @@ class SpellMgr
         SpellAreaForAuraMap  mSpellAreaForAuraMap;
         SpellAreaForAreaMap  mSpellAreaForAreaMap;
 };
-
 #define spellmgr SpellMgr::Instance()
 #endif
 
diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp
index 56bde0e5442..cdbda70bdf7 100644
--- a/src/game/StatSystem.cpp
+++ b/src/game/StatSystem.cpp
@@ -17,37 +17,30 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Unit.h"
 #include "Player.h"
 #include "Pet.h"
 #include "Creature.h"
 #include "SharedDefines.h"
 #include "SpellAuras.h"
-
 /*#######################################
 ########                         ########
 ########   PLAYERS STAT SYSTEM   ########
 ########                         ########
 #######################################*/
-
 bool Player::UpdateStats(Stats stat)
 {
     if(stat > STAT_SPIRIT)
         return false;
-
     // value = ((base_value * base_pct) + total_value) * total_pct
     float value  = GetTotalStatValue(stat);
-
     SetStat(stat, int32(value));
-
     if(stat == STAT_STAMINA || stat == STAT_INTELLECT)
     {
         Pet *pet = GetPet();
         if(pet)
             pet->UpdateStats(stat);
     }
-
     switch(stat)
     {
         case STAT_STRENGTH:
@@ -64,14 +57,11 @@ bool Player::UpdateStats(Stats stat)
             UpdateAllSpellCritChances();
             UpdateArmor();                                  //SPELL_AURA_MOD_RESISTANCE_OF_INTELLECT_PERCENT, only armor currently
             break;
-
         case STAT_SPIRIT:
             break;
-
         default:
             break;
     }
-
     if (stat == STAT_STRENGTH)
     {
         UpdateAttackPowerAndDamage(false);
@@ -91,10 +81,8 @@ bool Player::UpdateStats(Stats stat)
         if (HasAuraTypeWithMiscvalue(SPELL_AURA_MOD_RANGED_ATTACK_POWER_OF_STAT_PERCENT, stat))
             UpdateAttackPowerAndDamage(true);
     }
-
     UpdateSpellDamageAndHealingBonus();
     UpdateManaRegen();
-
     // Update ratings in exist SPELL_AURA_MOD_RATING_FROM_STAT and only depends from stat
     uint32 mask = 0;
     AuraEffectList const& modRatingFromStat = GetAurasByType(SPELL_AURA_MOD_RATING_FROM_STAT);
@@ -109,17 +97,14 @@ bool Player::UpdateStats(Stats stat)
     }
     return true;
 }
-
 void Player::ApplySpellPowerBonus(int32 amount, bool apply)
 {
     m_baseSpellPower+=apply?amount:-amount;
-
     // For speed just update for client
     ApplyModUInt32Value(PLAYER_FIELD_MOD_HEALING_DONE_POS, amount, apply);
     for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
         ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, amount, apply);;
 }
-
 void Player::UpdateSpellDamageAndHealingBonus()
 {
     // Magic damage modifiers implemented in Unit::SpellDamageBonus
@@ -130,7 +115,6 @@ void Player::UpdateSpellDamageAndHealingBonus()
     for(int i = SPELL_SCHOOL_HOLY; i < MAX_SPELL_SCHOOL; ++i)
         SetStatInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS+i, SpellBaseDamageBonus(SpellSchoolMask(1 << i)));
 }
-
 bool Player::UpdateAllStats()
 {
     for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
@@ -138,15 +122,12 @@ bool Player::UpdateAllStats()
         float value = GetTotalStatValue(Stats(i));
         SetStat(Stats(i), (int32)value);
     }
-
     UpdateArmor();
     // calls UpdateAttackPowerAndDamage() in UpdateArmor for SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR
     UpdateAttackPowerAndDamage(true);
     UpdateMaxHealth();
-
     for(int i = POWER_MANA; i < MAX_POWERS; ++i)
         UpdateMaxPower(Powers(i));
-
     UpdateAllCritPercentages();
     UpdateAllSpellCritChances();
     UpdateDefenseBonusesMod();
@@ -158,17 +139,14 @@ bool Player::UpdateAllStats()
     RecalculateRating(CR_ARMOR_PENETRATION);
     for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
         UpdateResistances(i);
-
     return true;
 }
-
 void Player::UpdateResistances(uint32 school)
 {
     if(school > SPELL_SCHOOL_NORMAL)
     {
         float value  = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
         SetResistance(SpellSchools(school), int32(value));
-
         Pet *pet = GetPet();
         if(pet)
             pet->UpdateResistances(school);
@@ -176,17 +154,14 @@ void Player::UpdateResistances(uint32 school)
     else
         UpdateArmor();
 }
-
 void Player::UpdateArmor()
 {
     float value = 0.0f;
     UnitMods unitMod = UNIT_MOD_ARMOR;
-
     value  = GetModifierValue(unitMod, BASE_VALUE);         // base armor (from items)
     value *= GetModifierValue(unitMod, BASE_PCT);           // armor percent from items
     value += GetStat(STAT_AGILITY) * 2.0f;                  // armor bonus from stats
     value += GetModifierValue(unitMod, TOTAL_VALUE);
-
     //add dynamic flat mods
     AuraEffectList const& mResbyIntellect = GetAurasByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT);
     for(AuraEffectList::const_iterator i = mResbyIntellect.begin();i != mResbyIntellect.end(); ++i)
@@ -194,87 +169,64 @@ void Player::UpdateArmor()
         if((*i)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)
             value += int32(GetStat(Stats((*i)->GetMiscBValue())) * (*i)->GetAmount() / 100.0f);
     }
-
     value *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetArmor(int32(value));
-
     Pet *pet = GetPet();
     if(pet)
         pet->UpdateArmor();
-
     UpdateAttackPowerAndDamage();                           // armor dependent auras update for SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR
 }
-
 float Player::GetHealthBonusFromStamina()
 {
     float stamina = GetStat(STAT_STAMINA);
-
     float baseStam = stamina < 20 ? stamina : 20;
     float moreStam = stamina - baseStam;
-
     return baseStam + (moreStam*10.0f);
 }
-
 float Player::GetManaBonusFromIntellect()
 {
     float intellect = GetStat(STAT_INTELLECT);
-
     float baseInt = intellect < 20 ? intellect : 20;
     float moreInt = intellect - baseInt;
-
     return baseInt + (moreInt*15.0f);
 }
-
 void Player::UpdateMaxHealth()
 {
     UnitMods unitMod = UNIT_MOD_HEALTH;
-
     float value = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth();
     value *= GetModifierValue(unitMod, BASE_PCT);
     value += GetModifierValue(unitMod, TOTAL_VALUE) + GetHealthBonusFromStamina();
     value *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetMaxHealth((uint32)value);
 }
-
 void Player::UpdateMaxPower(Powers power)
 {
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
-
     float bonusPower = (power == POWER_MANA) ? GetManaBonusFromIntellect() : 0;
-
     float value = GetModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
     value *= GetModifierValue(unitMod, BASE_PCT);
     value += GetModifierValue(unitMod, TOTAL_VALUE) +  bonusPower;
     value *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetMaxPower(power, uint32(value));
 }
-
 void Player::ApplyFeralAPBonus(int32 amount, bool apply)
 {
     m_baseFeralAP+= apply ? amount:-amount;
     UpdateAttackPowerAndDamage();
 }
-
 void Player::UpdateAttackPowerAndDamage(bool ranged )
 {
     float val2 = 0.0f;
     float level = float(getLevel());
-
     UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
-
     uint16 index = UNIT_FIELD_ATTACK_POWER;
     uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
     uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
-
     if(ranged)
     {
         index = UNIT_FIELD_RANGED_ATTACK_POWER;
         index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
         index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
-
         switch(getClass())
         {
             case CLASS_HUNTER: val2 = level * 2.0f + GetStat(STAT_AGILITY) - 10.0f;    break;
@@ -329,7 +281,6 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
                     }
                     default: break;
                 }
-
                 switch(m_form)
                 {
                     case FORM_CAT:
@@ -349,12 +300,9 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
             case CLASS_WARLOCK: val2 =              GetStat(STAT_STRENGTH)                         - 10.0f; break;
         }
     }
-
     SetModifierValue(unitMod, BASE_VALUE, val2);
-
     float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
     float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
-
     //add dynamic flat mods
     if( ranged )
     {
@@ -370,19 +318,15 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
         AuraEffectList const& mAPbyStat = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_STAT_PERCENT);
         for(AuraEffectList::const_iterator i = mAPbyStat.begin();i != mAPbyStat.end(); ++i)
             attPowerMod += int32(GetStat(Stats((*i)->GetMiscValue())) * (*i)->GetAmount() / 100.0f);
-
         AuraEffectList const& mAPbyArmor = GetAurasByType(SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR);
         for(AuraEffectList::const_iterator iter = mAPbyArmor.begin(); iter != mAPbyArmor.end(); ++iter)
             // always: ((*i)->GetModifier()->m_miscvalue == 1 == SPELL_SCHOOL_MASK_NORMAL)
             attPowerMod += int32(GetArmor() / (*iter)->GetAmount());
     }
-
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
-
     SetInt32Value(index, (uint32)base_attPower);            //UNIT_FIELD_(RANGED)_ATTACK_POWER field
     SetInt32Value(index_mod, (uint32)attPowerMod);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
     SetFloatValue(index_mult, attPowerMultiplier);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
-
     Pet *pet = GetPet();                                //update pet's AP
     //automatically update weapon damage after attack power modification
     if(ranged)
@@ -398,22 +342,18 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
             UpdateDamagePhysical(OFF_ATTACK);
         if(getClass() == CLASS_SHAMAN)                      // mental quickness
             UpdateSpellDamageAndHealingBonus();
-
         if(pet && pet->IsPetGhoul()) // At ranged attack change for hunter pet
             pet->UpdateAttackPowerAndDamage();
     }
 }
-
 void Player::UpdateShieldBlockValue()
 {
     SetUInt32Value(PLAYER_SHIELD_BLOCK, GetShieldBlockValue());
 }
-
 void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bool addTotalPct, float& min_damage, float& max_damage)
 {
     UnitMods unitMod;
     UnitMods attPower;
-
     switch(attType)
     {
         case BASE_ATTACK:
@@ -430,22 +370,17 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo
             attPower = UNIT_MOD_ATTACK_POWER_RANGED;
             break;
     }
-
     float att_speed = GetAPMultiplier(attType,normalized);
-
     float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed;
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = addTotalPct ? GetModifierValue(unitMod, TOTAL_PCT) : 1.0f;
-
     float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
     float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
-
     if (IsInFeralForm())                                    //check if player is druid and in cat or bear forms
     {
         uint32 lvl = getLevel();
         if ( lvl > 60 ) lvl = 60;
-
         weapon_mindamage = lvl*0.85*att_speed;
         weapon_maxdamage = lvl*1.25*att_speed;
     }
@@ -466,18 +401,14 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo
         weapon_mindamage += GetAmmoDPS() * att_speed;
         weapon_maxdamage += GetAmmoDPS() * att_speed;
     }
-
     min_damage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct;
     max_damage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct;
 }
-
 void Player::UpdateDamagePhysical(WeaponAttackType attType)
 {
     float mindamage;
     float maxdamage;
-
     CalculateMinMaxDamage(attType, false, true, mindamage, maxdamage);
-
     switch(attType)
     {
         case BASE_ATTACK:
@@ -495,14 +426,12 @@ void Player::UpdateDamagePhysical(WeaponAttackType attType)
             break;
     }
 }
-
 void Player::UpdateDefenseBonusesMod()
 {
     UpdateBlockPercentage();
     UpdateParryPercentage();
     UpdateDodgePercentage();
 }
-
 void Player::UpdateBlockPercentage()
 {
     // No block
@@ -521,13 +450,11 @@ void Player::UpdateBlockPercentage()
     }
     SetStatFloatValue(PLAYER_BLOCK_PERCENTAGE, value);
 }
-
 void Player::UpdateCritPercentage(WeaponAttackType attType)
 {
     BaseModGroup modGroup;
     uint16 index;
     CombatRating cr;
-
     switch(attType)
     {
         case OFF_ATTACK:
@@ -547,27 +474,22 @@ void Player::UpdateCritPercentage(WeaponAttackType attType)
             cr = CR_CRIT_MELEE;
             break;
     }
-
     float value = GetTotalPercentageModValue(modGroup) + GetRatingBonusValue(cr);
     // Modify crit from weapon skill and maximized defense skill of same level victim difference
     value += (int32(GetWeaponSkillValue(attType)) - int32(GetMaxSkillValueForLevel())) * 0.04f;
     value = value < 0.0f ? 0.0f : value;
     SetStatFloatValue(index, value);
 }
-
 void Player::UpdateAllCritPercentages()
 {
     float value = GetMeleeCritFromAgility();
-
     SetBaseModValue(CRIT_PERCENTAGE, PCT_MOD, value);
     SetBaseModValue(OFFHAND_CRIT_PERCENTAGE, PCT_MOD, value);
     SetBaseModValue(RANGED_CRIT_PERCENTAGE, PCT_MOD, value);
-
     UpdateCritPercentage(BASE_ATTACK);
     UpdateCritPercentage(OFF_ATTACK);
     UpdateCritPercentage(RANGED_ATTACK);
 }
-
 void Player::UpdateParryPercentage()
 {
     // No parry
@@ -586,7 +508,6 @@ void Player::UpdateParryPercentage()
     }
     SetStatFloatValue(PLAYER_PARRY_PERCENTAGE, value);
 }
-
 void Player::UpdateDodgePercentage()
 {
     // Dodge from agility
@@ -600,7 +521,6 @@ void Player::UpdateDodgePercentage()
     value = value < 0.0f ? 0.0f : value;
     SetStatFloatValue(PLAYER_DODGE_PERCENTAGE, value);
 }
-
 void Player::UpdateSpellCritChance(uint32 school)
 {
     // For normal school set zero crit chance
@@ -621,50 +541,40 @@ void Player::UpdateSpellCritChance(uint32 school)
     crit += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_SPELL_CRIT_CHANCE_SCHOOL, 1<<school);
     // Increase crit from spell crit ratings
     crit += GetRatingBonusValue(CR_CRIT_SPELL);
-
     // Store crit value
     SetFloatValue(PLAYER_SPELL_CRIT_PERCENTAGE1 + school, crit);
 }
-
 void Player::UpdateArmorPenetration(int32 amount)
 {
     // Store Rating Value
     SetUInt32Value(PLAYER_FIELD_COMBAT_RATING_1 + CR_ARMOR_PENETRATION, amount);
 }
-
 void Player::UpdateMeleeHitChances()
 {
     m_modMeleeHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
     m_modMeleeHitChance+=  GetRatingBonusValue(CR_HIT_MELEE);
 }
-
 void Player::UpdateRangedHitChances()
 {
     m_modRangedHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_HIT_CHANCE);
     m_modRangedHitChance+= GetRatingBonusValue(CR_HIT_RANGED);
 }
-
 void Player::UpdateSpellHitChances()
 {
     m_modSpellHitChance = GetTotalAuraModifier(SPELL_AURA_MOD_SPELL_HIT_CHANCE);
     m_modSpellHitChance+= GetRatingBonusValue(CR_HIT_SPELL);
 }
-
 void Player::UpdateAllSpellCritChances()
 {
     for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
         UpdateSpellCritChance(i);
 }
-
 void Player::UpdateExpertise(WeaponAttackType attack)
 {
     if(attack==RANGED_ATTACK)
         return;
-
     int32 expertise = int32(GetRatingBonusValue(CR_EXPERTISE));
-
     Item *weapon = GetWeaponForAttack(attack);
-
     AuraEffectList const& expAuras = GetAurasByType(SPELL_AURA_MOD_EXPERTISE);
     for(AuraEffectList::const_iterator itr = expAuras.begin(); itr != expAuras.end(); ++itr)
     {
@@ -675,10 +585,8 @@ void Player::UpdateExpertise(WeaponAttackType attack)
         else if(weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
             expertise += (*itr)->GetAmount();
     }
-
     if(expertise < 0)
         expertise = 0;
-
     switch(attack)
     {
         case BASE_ATTACK: SetUInt32Value(PLAYER_EXPERTISE, expertise);         break;
@@ -686,13 +594,11 @@ void Player::UpdateExpertise(WeaponAttackType attack)
         default: break;
     }
 }
-
 void Player::ApplyManaRegenBonus(int32 amount, bool apply)
 {
     m_baseManaRegen+= apply ? amount : -amount;
     UpdateManaRegen();
 }
-
 void Player::UpdateManaRegen()
 {
     float Intellect = GetStat(STAT_INTELLECT);
@@ -700,76 +606,57 @@ void Player::UpdateManaRegen()
     float power_regen = sqrt(Intellect) * OCTRegenMPPerSpirit();
     // Apply PCT bonus from SPELL_AURA_MOD_POWER_REGEN_PERCENT aura on spirit base regen
     power_regen *= GetTotalAuraMultiplierByMiscValue(SPELL_AURA_MOD_POWER_REGEN_PERCENT, POWER_MANA);
-
     // Mana regen from SPELL_AURA_MOD_POWER_REGEN aura
     float power_regen_mp5 = (GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_POWER_REGEN, POWER_MANA) + m_baseManaRegen) / 5.0f;
-
     // Get bonus from SPELL_AURA_MOD_MANA_REGEN_FROM_STAT aura
     AuraEffectList const& regenAura = GetAurasByType(SPELL_AURA_MOD_MANA_REGEN_FROM_STAT);
     for(AuraEffectList::const_iterator i = regenAura.begin();i != regenAura.end(); ++i)
     {
         power_regen_mp5 += GetStat(Stats((*i)->GetMiscValue())) * (*i)->GetAmount() / 500.0f;
     }
-
     // Set regen rate in cast state apply only on spirit based regen
     int32 modManaRegenInterrupt = GetTotalAuraModifier(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT);
     if (modManaRegenInterrupt > 100)
         modManaRegenInterrupt = 100;
     SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, power_regen_mp5 + power_regen * modManaRegenInterrupt / 100.0f);
-
     SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, power_regen_mp5 + power_regen);
 }
-
 void Player::_ApplyAllStatBonuses()
 {
     SetCanModifyStats(false);
-
     _ApplyAllAuraMods();
     _ApplyAllItemMods();
-
     SetCanModifyStats(true);
-
     UpdateAllStats();
 }
-
 void Player::_RemoveAllStatBonuses()
 {
     SetCanModifyStats(false);
-
     _RemoveAllItemMods();
     _RemoveAllAuraMods();
-
     SetCanModifyStats(true);
-
     UpdateAllStats();
 }
-
 /*#######################################
 ########                         ########
 ########    MOBS STAT SYSTEM     ########
 ########                         ########
 #######################################*/
-
 bool Creature::UpdateStats(Stats /*stat*/)
 {
     return true;
 }
-
 bool Creature::UpdateAllStats()
 {
     UpdateMaxHealth();
     UpdateAttackPowerAndDamage();
     UpdateAttackPowerAndDamage(true);
-
     for(int i = POWER_MANA; i < MAX_POWERS; ++i)
         UpdateMaxPower(Powers(i));
-
     for(int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
         UpdateResistances(i);
-
     return true;
 }
-
 void Creature::UpdateResistances(uint32 school)
 {
     if(school > SPELL_SCHOOL_NORMAL)
@@ -780,50 +667,40 @@ void Creature::UpdateResistances(uint32 school)
     else
         UpdateArmor();
 }
-
 void Creature::UpdateArmor()
 {
     float value = GetTotalAuraModValue(UNIT_MOD_ARMOR);
     SetArmor(int32(value));
 }
-
 void Creature::UpdateMaxHealth()
 {
     float value = GetTotalAuraModValue(UNIT_MOD_HEALTH);
     SetMaxHealth((uint32)value);
 }
-
 void Creature::UpdateMaxPower(Powers power)
 {
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
-
     float value  = GetTotalAuraModValue(unitMod);
     SetMaxPower(power, uint32(value));
 }
-
 void Creature::UpdateAttackPowerAndDamage(bool ranged)
 {
     UnitMods unitMod = ranged ? UNIT_MOD_ATTACK_POWER_RANGED : UNIT_MOD_ATTACK_POWER;
-
     uint16 index = UNIT_FIELD_ATTACK_POWER;
     uint16 index_mod = UNIT_FIELD_ATTACK_POWER_MODS;
     uint16 index_mult = UNIT_FIELD_ATTACK_POWER_MULTIPLIER;
-
     if(ranged)
     {
         index = UNIT_FIELD_RANGED_ATTACK_POWER;
         index_mod = UNIT_FIELD_RANGED_ATTACK_POWER_MODS;
         index_mult = UNIT_FIELD_RANGED_ATTACK_POWER_MULTIPLIER;
     }
-
     float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
     float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
-
     SetInt32Value(index, (uint32)base_attPower);            //UNIT_FIELD_(RANGED)_ATTACK_POWER field
     SetInt32Value(index_mod, (uint32)attPowerMod);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
     SetFloatValue(index_mult, attPowerMultiplier);          //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
-
     //automatically update weapon damage after attack power modification
     if(ranged)
         UpdateDamagePhysical(RANGED_ATTACK);
@@ -833,7 +710,6 @@ void Creature::UpdateAttackPowerAndDamage(bool ranged)
         UpdateDamagePhysical(OFF_ATTACK);
     }
 }
-
 void Creature::UpdateDamagePhysical(WeaponAttackType attType)
 {
     UnitMods unitMod;
@@ -850,12 +726,9 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
             unitMod = UNIT_MOD_DAMAGE_RANGED;
             break;
     }
-
     //float att_speed = float(GetAttackTime(attType))/1000.0f;
-
     float weapon_mindamage = GetWeaponDamageRange(attType, MINDAMAGE);
     float weapon_maxdamage = GetWeaponDamageRange(attType, MAXDAMAGE);
-
     /* difference in AP between current attack power and base value from DB */
     float att_pwr_change = GetTotalAttackPowerValue(attType) - GetCreatureInfo()->attackpower;
     float base_value  = GetModifierValue(unitMod, BASE_VALUE) + (att_pwr_change * GetAPMultiplier(attType, false) / 14.0f);
@@ -863,16 +736,13 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
     float dmg_multiplier = GetCreatureInfo()->dmg_multiplier;
-
     if(!CanUseAttackType(attType))
     {
         weapon_mindamage = 0;
         weapon_maxdamage = 0;
     }
-
     float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value) * total_pct;
     float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value) * total_pct;
-
     switch(attType)
     {
         case BASE_ATTACK:
@@ -890,13 +760,11 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
             break;
     }
 }
-
 /*#######################################
 ########                         ########
 ########    PETS STAT SYSTEM     ########
 ########                         ########
 #######################################*/
-
 #define ENTRY_IMP               416
 #define ENTRY_VOIDWALKER        1860
 #define ENTRY_SUCCUBUS          1863
@@ -905,15 +773,12 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType)
 #define ENTRY_WATER_ELEMENTAL   510
 #define ENTRY_TREANT            1964
 #define ENTRY_FIRE_ELEMENTAL    15438
-
 bool Guardian::UpdateStats(Stats stat)
 {
     if(stat > STAT_SPIRIT)
         return false;
-
     // value = ((base_value * base_pct) + total_value) * total_pct
     float value  = GetTotalStatValue(stat);
-
     Unit *owner = GetOwner();
     if ( stat == STAT_STAMINA )
     {
@@ -933,9 +798,7 @@ bool Guardian::UpdateStats(Stats stat)
         if (IsPetGhoul())
             value += float(owner->GetStat(stat)) * 0.3f;
     }
-
     SetStat(stat, int32(value));
-
     switch(stat)
     {
         case STAT_STRENGTH:         UpdateAttackPowerAndDamage();        break;
@@ -946,64 +809,50 @@ bool Guardian::UpdateStats(Stats stat)
         default:
             break;
     }
-
     return true;
 }
-
 bool Guardian::UpdateAllStats()
 {
     for (int i = STAT_STRENGTH; i < MAX_STATS; ++i)
         UpdateStats(Stats(i));
-
     for(int i = POWER_MANA; i < MAX_POWERS; ++i)
         UpdateMaxPower(Powers(i));
-
     for (int i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i)
         UpdateResistances(i);
-
     return true;
 }
-
 void Guardian::UpdateResistances(uint32 school)
 {
     if(school > SPELL_SCHOOL_NORMAL)
     {
         float value  = GetTotalAuraModValue(UnitMods(UNIT_MOD_RESISTANCE_START + school));
-
         // hunter and warlock pets gain 40% of owner's resistance
         if(isPet())
             value += float(m_owner->GetResistance(SpellSchools(school))) * 0.4f;
-
         SetResistance(SpellSchools(school), int32(value));
     }
     else
         UpdateArmor();
 }
-
 void Guardian::UpdateArmor()
 {
     float value = 0.0f;
     float bonus_armor = 0.0f;
     UnitMods unitMod = UNIT_MOD_ARMOR;
-
     // hunter and warlock pets gain 35% of owner's armor value
     if(isPet())
         bonus_armor = 0.35f * float(m_owner->GetArmor());
-
     value  = GetModifierValue(unitMod, BASE_VALUE);
     value *= GetModifierValue(unitMod, BASE_PCT);
     value += GetStat(STAT_AGILITY) * 2.0f;
     value += GetModifierValue(unitMod, TOTAL_VALUE) + bonus_armor;
     value *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetArmor(int32(value));
 }
-
 void Guardian::UpdateMaxHealth()
 {
     UnitMods unitMod = UNIT_MOD_HEALTH;
     float stamina = GetStat(STAT_STAMINA) - GetCreateStat(STAT_STAMINA);
-
     float multiplicator;
     switch(GetEntry())
     {
@@ -1014,22 +863,17 @@ void Guardian::UpdateMaxHealth()
         case ENTRY_FELGUARD:    multiplicator = 11.0f;  break;
         default:                multiplicator = 10.0f;  break;
     }
-
     float value   = GetModifierValue(unitMod, BASE_VALUE) + GetCreateHealth();
     value  *= GetModifierValue(unitMod, BASE_PCT);
     value  += GetModifierValue(unitMod, TOTAL_VALUE) + stamina * multiplicator;
     value  *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetMaxHealth((uint32)value);
 }
-
 void Guardian::UpdateMaxPower(Powers power)
 {
     UnitMods unitMod = UnitMods(UNIT_MOD_POWER_START + power);
-
     float addValue = (power == POWER_MANA) ? GetStat(STAT_INTELLECT) - GetCreateStat(STAT_INTELLECT) : 0.0f;
     float multiplicator = 15.0f;
-
     switch(GetEntry())
     {
         case ENTRY_IMP:         multiplicator = 4.95f;  break;
@@ -1039,29 +883,23 @@ void Guardian::UpdateMaxPower(Powers power)
         case ENTRY_FELGUARD:    multiplicator = 11.5f;  break;
         default:                multiplicator = 15.0f;  break;
     }
-
     float value  = GetModifierValue(unitMod, BASE_VALUE) + GetCreatePowers(power);
     value *= GetModifierValue(unitMod, BASE_PCT);
     value += GetModifierValue(unitMod, TOTAL_VALUE) + addValue * multiplicator;
     value *= GetModifierValue(unitMod, TOTAL_PCT);
-
     SetMaxPower(power, uint32(value));
 }
-
 void Guardian::UpdateAttackPowerAndDamage(bool ranged)
 {
     if(ranged)
         return;
-
     float val = 0.0f;
     float bonusAP = 0.0f;
     UnitMods unitMod = UNIT_MOD_ATTACK_POWER;
-
     if(GetEntry() == ENTRY_IMP)                                   // imp's attack power
         val = GetStat(STAT_STRENGTH) - 10.0f;
     else
         val = 2 * GetStat(STAT_STRENGTH) - 20.0f;
-
     Unit* owner = GetOwner();
     if( owner && owner->GetTypeId()==TYPEID_PLAYER)
     {
@@ -1095,30 +933,24 @@ void Guardian::UpdateAttackPowerAndDamage(bool ranged)
             SetBonusDamage( int32(frost * 0.4f));
         }
     }
-
     SetModifierValue(UNIT_MOD_ATTACK_POWER, BASE_VALUE, val + bonusAP);
-
     //in BASE_VALUE of UNIT_MOD_ATTACK_POWER for creatures we store data of meleeattackpower field in DB
     float base_attPower  = GetModifierValue(unitMod, BASE_VALUE) * GetModifierValue(unitMod, BASE_PCT);
     float attPowerMod = GetModifierValue(unitMod, TOTAL_VALUE);
     float attPowerMultiplier = GetModifierValue(unitMod, TOTAL_PCT) - 1.0f;
-
     //UNIT_FIELD_(RANGED)_ATTACK_POWER field
     SetInt32Value(UNIT_FIELD_ATTACK_POWER, (int32)base_attPower);
     //UNIT_FIELD_(RANGED)_ATTACK_POWER_MODS field
     SetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS, (int32)attPowerMod);
     //UNIT_FIELD_(RANGED)_ATTACK_POWER_MULTIPLIER field
     SetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER, attPowerMultiplier);
-
     //automatically update weapon damage after attack power modification
     UpdateDamagePhysical(BASE_ATTACK);
 }
-
 void Guardian::UpdateDamagePhysical(WeaponAttackType attType)
 {
     if(attType > BASE_ATTACK)
         return;
-
     float bonusDamage = 0.0f;
     if(m_owner->GetTypeId() == TYPEID_PLAYER)
     {
@@ -1137,22 +969,16 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType)
                 bonusDamage = spellDmg * 0.4f;
         }
     }
-
     UnitMods unitMod = UNIT_MOD_DAMAGE_MAINHAND;
-
     float att_speed = float(GetAttackTime(BASE_ATTACK))/1000.0f;
-
     float base_value  = GetModifierValue(unitMod, BASE_VALUE) + GetTotalAttackPowerValue(attType)/ 14.0f * att_speed  + bonusDamage;
     float base_pct    = GetModifierValue(unitMod, BASE_PCT);
     float total_value = GetModifierValue(unitMod, TOTAL_VALUE);
     float total_pct   = GetModifierValue(unitMod, TOTAL_PCT);
-
     float weapon_mindamage = GetWeaponDamageRange(BASE_ATTACK, MINDAMAGE);
     float weapon_maxdamage = GetWeaponDamageRange(BASE_ATTACK, MAXDAMAGE);
-
     float mindamage = ((base_value + weapon_mindamage) * base_pct + total_value) * total_pct;
     float maxdamage = ((base_value + weapon_maxdamage) * base_pct + total_value) * total_pct;
-
     //  Pet's base damage changes depending on happiness
     if (isHunterPet() && attType == BASE_ATTACK)
     {
@@ -1173,7 +999,6 @@ void Guardian::UpdateDamagePhysical(WeaponAttackType attType)
                 break;
         }
     }
-
     SetStatFloatValue(UNIT_FIELD_MINDAMAGE, mindamage);
     SetStatFloatValue(UNIT_FIELD_MAXDAMAGE, maxdamage);
 }
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
index 3b001c1ed3c..344df244f0b 100644
--- a/src/game/TargetedMovementGenerator.cpp
+++ b/src/game/TargetedMovementGenerator.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ByteBuffer.h"
 #include "TargetedMovementGenerator.h"
 #include "Errors.h"
@@ -25,9 +24,7 @@
 #include "CreatureAI.h"
 #include "DestinationHolderImp.h"
 #include "World.h"
-
 #define SMALL_ALPHA 0.05f
-
 #include <cmath>
 /*
 struct StackCleaner
@@ -41,7 +38,6 @@ struct StackCleaner
     }
 };
 */
-
 template<class T>
 TargetedMovementGenerator<T>::TargetedMovementGenerator(Unit &target, float offset, float angle)
 : TargetedMovementGeneratorBase(target)
@@ -49,17 +45,14 @@ TargetedMovementGenerator<T>::TargetedMovementGenerator(Unit &target, float offs
 {
     target.GetPosition(i_targetX, i_targetY, i_targetZ);
 }
-
 template<class T>
 bool
 TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
 {
     if (!i_target.isValid() || !i_target->IsInWorld())
         return false;
-
     if( owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED) )
         return false;
-
     float x, y, z;
     Traveller<T> traveller(owner);
     if(i_destinationHolder.HasDestination())
@@ -96,7 +89,6 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
                 if(i_target->IsWithinDist(&owner, i_offset * 0.8f))
                     stop = true;
             }
-
             if(stop)
             {
                 owner.GetPosition(x, y, z);
@@ -106,11 +98,9 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
                 return false;
             }
         }
-
         if(i_target->GetExactDistSq(i_targetX, i_targetY, i_targetZ) < 0.01f)
             return false;
     }
-
     if(!i_offset)
     {
         // to nearest random contact position
@@ -126,7 +116,6 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
         // to at i_offset distance from target and i_angle from target facing
         i_target->GetClosePoint(x,y,z,owner.GetObjectSize(),i_offset,i_angle);
     }
-
     /*
         We MUST not check the distance difference and avoid setting the new location for smaller distances.
         By that we risk having far too many GetContactPoint() calls freezing the whole system.
@@ -137,7 +126,6 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
         we will calculate a new contact point each update loop, but will never move to it.
         The system will freeze.
         ralf
-
         //We don't update Mob Movement, if the difference between New destination and last destination is < BothObjectSize
         float  bothObjectSize = i_target->GetObjectSize() + owner.GetObjectSize() + CONTACT_DISTANCE;
         if( i_destinationHolder.HasDestination() && i_destinationHolder.GetDestinationDiff(x,y,z) < bothObjectSize )
@@ -148,7 +136,6 @@ TargetedMovementGenerator<T>::_setTargetLocation(T &owner)
     i_destinationHolder.StartTravel(traveller);
     return true;
 }
-
 template<class T>
 void
 TargetedMovementGenerator<T>::Initialize(T &owner)
@@ -157,37 +144,30 @@ TargetedMovementGenerator<T>::Initialize(T &owner)
         owner.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
     else
         owner.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-
     _setTargetLocation(owner);
 }
-
 template<class T>
 void
 TargetedMovementGenerator<T>::Finalize(T &owner)
 {
     owner.clearUnitState(UNIT_STAT_CHASE);
 }
-
 template<class T>
 void
 TargetedMovementGenerator<T>::Reset(T &owner)
 {
     Initialize(owner);
 }
-
 template<class T>
 bool
 TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
 {
     if (!i_target.isValid() || !i_target->IsInWorld())
         return false;
-
     if (!&owner || !owner.isAlive())
         return true;
-
     if (owner.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_FLEEING | UNIT_STAT_DISTRACTED))
         return true;
-
     // prevent movement while casting spells with cast time or channel time
     if (owner.hasUnitState(UNIT_STAT_CASTING))
     {
@@ -195,13 +175,10 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
             owner.StopMoving();
         return true;
     }
-
     // prevent crash after creature killed pet
     if (!owner.hasUnitState(UNIT_STAT_FOLLOW) && owner.getVictim() != i_target.getTarget())
         return true;
-
     Traveller<T> traveller(owner);
-
     if (!i_destinationHolder.HasDestination())
         _setTargetLocation(owner);
     else if (owner.IsStopped() && !i_destinationHolder.HasArrived())
@@ -210,13 +187,11 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
         i_destinationHolder.StartTravel(traveller);
         return true;
     }
-
     if (i_destinationHolder.UpdateTraveller(traveller, time_diff))
     {
         // put targeted movement generators on a higher priority
         //if (owner.GetObjectSize())
         //i_destinationHolder.ResetUpdate(50);
-
         // target moved
         if (i_targetX != i_target->GetPositionX() || i_targetY != i_target->GetPositionY()
             || i_targetZ != i_target->GetPositionZ())
@@ -225,44 +200,36 @@ TargetedMovementGenerator<T>::Update(T &owner, const uint32 & time_diff)
                 owner.SetInFront(i_target.getTarget());
             i_target->GetPosition(i_targetX, i_targetY, i_targetZ);
         }
-
         if ((owner.IsStopped() && !i_destinationHolder.HasArrived()) || i_recalculateTravel)
         {
             i_recalculateTravel = false;
             //Angle update will take place into owner.StopMoving()
             owner.SetInFront(i_target.getTarget());
-
             owner.StopMoving();
             if(owner.IsWithinMeleeRange(i_target.getTarget()) && !owner.hasUnitState(UNIT_STAT_FOLLOW))
                 owner.Attack(i_target.getTarget(),true);
         }
     }
-
     // Implemented for PetAI to handle resetting flags when pet owner reached
     if (i_destinationHolder.HasArrived())
         MovementInform(owner);
-
     return true;
 }
-
 template<class T>
 Unit*
 TargetedMovementGenerator<T>::GetTarget() const
 {
     return i_target.getTarget();
 }
-
 template<class T>
 void TargetedMovementGenerator<T>::MovementInform(T &unit)
 {
 }
-
 template <> void TargetedMovementGenerator<Creature>::MovementInform(Creature &unit)
 {
     // Pass back the GUIDLow of the target. If it is pet's owner then PetAI will handle
     unit.AI()->MovementInform(TARGETED_MOTION_TYPE, i_target.getTarget()->GetGUIDLow());
 }
-
 template void TargetedMovementGenerator<Player>::MovementInform(Player&); // Not implemented for players
 template TargetedMovementGenerator<Player>::TargetedMovementGenerator(Unit &target, float offset, float angle);
 template TargetedMovementGenerator<Creature>::TargetedMovementGenerator(Unit &target, float offset, float angle);
diff --git a/src/game/TargetedMovementGenerator.h b/src/game/TargetedMovementGenerator.h
index c6e7ef05812..c830dce8078 100644
--- a/src/game/TargetedMovementGenerator.h
+++ b/src/game/TargetedMovementGenerator.h
@@ -17,15 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_TARGETEDMOVEMENTGENERATOR_H
 #define TRINITY_TARGETEDMOVEMENTGENERATOR_H
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
 #include "FollowerReference.h"
-
 class TRINITY_DLL_SPEC TargetedMovementGeneratorBase
 {
     public:
@@ -34,7 +31,6 @@ class TRINITY_DLL_SPEC TargetedMovementGeneratorBase
     protected:
         FollowerReference i_target;
 };
-
 template<class T>
 class TRINITY_DLL_SPEC TargetedMovementGenerator
 : public MovementGeneratorMedium< T, TargetedMovementGenerator<T> >, public TargetedMovementGeneratorBase
@@ -42,29 +38,22 @@ class TRINITY_DLL_SPEC TargetedMovementGenerator
     public:
         TargetedMovementGenerator(Unit &target, float offset = 0, float angle = 0);
         ~TargetedMovementGenerator() {}
-
         void Initialize(T &);
         void Finalize(T &);
         void Reset(T &);
         bool Update(T &, const uint32 &);
         MovementGeneratorType GetMovementGeneratorType() { return TARGETED_MOTION_TYPE; }
-
         void MovementInform(T &);
-
         Unit* GetTarget() const;
-
         bool GetDestination(float &x, float &y, float &z) const
         {
             if(i_destinationHolder.HasArrived() || !i_destinationHolder.HasDestination()) return false;
             i_destinationHolder.GetDestination(x,y,z);
             return true;
         }
-
         void unitSpeedChanged() { i_recalculateTravel=true; }
     private:
-
         bool _setTargetLocation(T &);
-
         float i_offset;
         float i_angle;
         DestinationHolder< Traveller<T> > i_destinationHolder;
diff --git a/src/game/TaxiHandler.cpp b/src/game/TaxiHandler.cpp
index 45c3cbd871b..df6bf3c28a0 100644
--- a/src/game/TaxiHandler.cpp
+++ b/src/game/TaxiHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
@@ -30,17 +29,13 @@
 #include "Path.h"
 #include "WaypointMovementGenerator.h"
 #include "DestinationHolderImp.h"
-
 void WorldSession::HandleTaxiNodeStatusQueryOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_TAXINODE_STATUS_QUERY" );
-
     uint64 guid;
-
     recv_data >> guid;
     SendTaxiStatus( guid );
 }
-
 void WorldSession::SendTaxiStatus( uint64 guid )
 {
     // cheating checks
@@ -50,29 +45,22 @@ void WorldSession::SendTaxiStatus( uint64 guid )
         sLog.outDebug( "WorldSession::SendTaxiStatus - Unit (GUID: %u) not found.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     uint32 curloc = objmgr.GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer( )->GetTeam());
-
     // not found nearest
     if(curloc == 0)
         return;
-
     sLog.outDebug( "WORLD: current location %u ",curloc);
-
     WorldPacket data( SMSG_TAXINODE_STATUS, 9 );
     data << guid;
     data << uint8( GetPlayer( )->m_taxi.IsTaximaskNodeKnown(curloc) ? 1 : 0 );
     SendPacket( &data );
     sLog.outDebug( "WORLD: Sent SMSG_TAXINODE_STATUS" );
 }
-
 void WorldSession::HandleTaxiQueryAvailableNodes( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_TAXIQUERYAVAILABLENODES" );
-
     uint64 guid;
     recv_data >> guid;
-
     // cheating checks
     Creature *unit = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
     if (!unit)
@@ -80,92 +68,69 @@ void WorldSession::HandleTaxiQueryAvailableNodes( WorldPacket & recv_data )
         sLog.outDebug( "WORLD: HandleTaxiQueryAvailableNodes - Unit (GUID: %u) not found or you can't interact with him.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     // remove fake death
     if(GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     // unknown taxi node case
     if( SendLearnNewTaxiNode(unit) )
         return;
-
     // known taxi node case
     SendTaxiMenu( unit );
 }
-
 void WorldSession::SendTaxiMenu( Creature* unit )
 {
     // find current node
     uint32 curloc = objmgr.GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer( )->GetTeam());
-
     if ( curloc == 0 )
         return;
-
     bool lastTaxiCheaterState = GetPlayer()->isTaxiCheater();
     if(unit->GetEntry() == 29480) GetPlayer()->SetTaxiCheater(true); // Grimwing in Ebon Hold, special case. NOTE: Not perfect, Zul'Aman should not be included according to WoWhead, and I think taxicheat includes it.
-
     sLog.outDebug( "WORLD: CMSG_TAXINODE_STATUS_QUERY %u ",curloc);
-
     WorldPacket data( SMSG_SHOWTAXINODES, (4+8+4+8*4) );
     data << uint32( 1 );
     data << uint64( unit->GetGUID() );
     data << uint32( curloc );
     GetPlayer()->m_taxi.AppendTaximaskTo(data,GetPlayer()->isTaxiCheater());
     SendPacket( &data );
-
     sLog.outDebug( "WORLD: Sent SMSG_SHOWTAXINODES" );
-
     GetPlayer()->SetTaxiCheater(lastTaxiCheaterState);
 }
-
 void WorldSession::SendDoFlight( uint32 mountDisplayId, uint32 path, uint32 pathNode )
 {
     // remove fake death
     if (GetPlayer()->hasUnitState(UNIT_STAT_DIED))
         GetPlayer()->RemoveAurasByType(SPELL_AURA_FEIGN_DEATH);
-
     while(GetPlayer()->GetMotionMaster()->GetCurrentMovementGeneratorType()==FLIGHT_MOTION_TYPE)
         GetPlayer()->GetMotionMaster()->MovementExpired(false);
-
     if (mountDisplayId)
         GetPlayer()->Mount( mountDisplayId );
-
     GetPlayer()->GetMotionMaster()->MoveTaxiFlight(path,pathNode);
 }
-
 bool WorldSession::SendLearnNewTaxiNode( Creature* unit )
 {
     // find current node
     uint32 curloc = objmgr.GetNearestTaxiNode(unit->GetPositionX(),unit->GetPositionY(),unit->GetPositionZ(),unit->GetMapId(),GetPlayer( )->GetTeam());
-
     if ( curloc == 0 )
         return true;                                        // `true` send to avoid WorldSession::SendTaxiMenu call with one more curlock seartch with same false result.
-
     if( GetPlayer()->m_taxi.SetTaximaskNode(curloc) )
     {
         WorldPacket msg(SMSG_NEW_TAXI_PATH, 0);
         SendPacket( &msg );
-
         WorldPacket update( SMSG_TAXINODE_STATUS, 9 );
         update << uint64( unit->GetGUID() );
         update << uint8( 1 );
         SendPacket( &update );
-
         return true;
     }
     else
         return false;
 }
-
 void WorldSession::HandleActivateTaxiExpressOpcode ( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_ACTIVATETAXIEXPRESS" );
-
     uint64 guid;
     uint32 node_count, _totalcost;
-
     recv_data >> guid >> _totalcost >> node_count;
-
     Creature *npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
     if (!npc)
     {
@@ -173,26 +138,20 @@ void WorldSession::HandleActivateTaxiExpressOpcode ( WorldPacket & recv_data )
         return;
     }
     std::vector<uint32> nodes;
-
     for(uint32 i = 0; i < node_count; ++i)
     {
         uint32 node;
         recv_data >> node;
         nodes.push_back(node);
     }
-
     if(nodes.empty())
         return;
-
     sLog.outDebug( "WORLD: Received CMSG_ACTIVATETAXIEXPRESS from %d to %d" ,nodes.front(),nodes.back());
-
     GetPlayer()->ActivateTaxiPathTo(nodes, npc);
 }
-
 void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& /*recv_data*/)
 {
     sLog.outDebug( "WORLD: Received CMSG_MOVE_SPLINE_DONE" );
-
     // in taxi flight packet received in 2 case:
     // 1) end taxi path in far (multi-node) flight
     // 2) switch from one map to other in case multim-map taxi path
@@ -200,9 +159,7 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& /*recv_data*/)
     uint32 curDest = GetPlayer()->m_taxi.GetTaxiDestination();
     if(!curDest)
         return;
-
     TaxiNodesEntry const* curDestNode = sTaxiNodesStore.LookupEntry(curDest);
-
     // far teleport case
     if(curDestNode && curDestNode->map_id != GetPlayer()->GetMapId())
     {
@@ -210,22 +167,18 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& /*recv_data*/)
         {
             // short preparations to continue flight
             FlightPathMovementGenerator* flight = (FlightPathMovementGenerator*)(GetPlayer()->GetMotionMaster()->top());
-
             flight->SetCurrentNodeAfterTeleport();
             Path::PathNode const& node = flight->GetPath()[flight->GetCurrentNode()];
             flight->SkipCurrentNode();
-
             GetPlayer()->TeleportTo(curDestNode->map_id,node.x,node.y,node.z,GetPlayer()->GetOrientation());
         }
         return;
     }
-
     uint32 destinationnode = GetPlayer()->m_taxi.NextTaxiDestination();
     if ( destinationnode > 0 )                              // if more destinations to go
     {
         // current source node for next destination
         uint32 sourcenode = GetPlayer()->m_taxi.GetTaxiSource();
-
         // Add to taximask middle hubs in taxicheat mode (to prevent having player with disabled taxicheat and not having back flight path)
         if (GetPlayer()->isTaxiCheater())
         {
@@ -235,35 +188,27 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& /*recv_data*/)
                 _player->GetSession()->SendPacket( &data );
             }
         }
-
         sLog.outDebug( "WORLD: Taxi has to go from %u to %u", sourcenode, destinationnode );
-
         uint32 mountDisplayId = objmgr.GetTaxiMountDisplayId(sourcenode, GetPlayer()->GetTeam());
-
         uint32 path, cost;
         objmgr.GetTaxiPath( sourcenode, destinationnode, path, cost);
-
         if(path && mountDisplayId)
             SendDoFlight( mountDisplayId, path, 1 );        // skip start fly node
         else
             GetPlayer()->m_taxi.ClearTaxiDestinations();    // clear problematic path and next
         return;
     }
-
     GetPlayer()->CleanupAfterTaxiFlight();
     GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ());
     if(GetPlayer()->pvpInfo.inHostileArea)
         GetPlayer()->CastSpell(GetPlayer(), 2479, true);
 }
-
 void WorldSession::HandleActivateTaxiOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug( "WORLD: Received CMSG_ACTIVATETAXI" );
-
     uint64 guid;
     std::vector<uint32> nodes;
     nodes.resize(2);
-
     recv_data >> guid >> nodes[0] >> nodes[1];
     sLog.outDebug( "WORLD: Received CMSG_ACTIVATETAXI from %d to %d" ,nodes[0],nodes[1]);
     Creature *npc = GetPlayer()->GetNPCIfCanInteractWith(guid, UNIT_NPC_FLAG_FLIGHTMASTER);
@@ -272,7 +217,6 @@ void WorldSession::HandleActivateTaxiOpcode( WorldPacket & recv_data )
         sLog.outDebug( "WORLD: HandleActivateTaxiOpcode - Unit (GUID: %u) not found or you can't interact with it.", uint32(GUID_LOPART(guid)) );
         return;
     }
-
     GetPlayer()->ActivateTaxiPathTo(nodes, npc);
 }
 
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index 0b31eea9707..05ae270dabd 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "ObjectMgr.h"
 #include "TemporarySummon.h"
-
 TempSummon::TempSummon(SummonPropertiesEntry const *properties, Unit *owner) :
 Creature(), m_type(TEMPSUMMON_MANUAL_DESPAWN), m_timer(0), m_lifetime(0)
 , m_Properties(properties)
@@ -31,16 +29,13 @@ Creature(), m_type(TEMPSUMMON_MANUAL_DESPAWN), m_timer(0), m_lifetime(0)
     m_summonerGUID = owner ? owner->GetGUID() : 0;
     m_unitTypeMask |= UNIT_MASK_SUMMON;
 }
-
 Unit* TempSummon::GetSummoner() const
 {
     return m_summonerGUID ? ObjectAccessor::GetUnit(*this, m_summonerGUID) : NULL;
 }
-
 void TempSummon::Update( uint32 diff )
 {
     Creature::Update(diff);
-
     if (m_deathState == DEAD)
     {
         UnSummon();
@@ -57,7 +52,6 @@ void TempSummon::Update( uint32 diff )
                 UnSummon();
                 return;
             }
-
             m_timer -= diff;
             break;
         }
@@ -70,15 +64,12 @@ void TempSummon::Update( uint32 diff )
                     UnSummon();
                     return;
                 }
-
                 m_timer -= diff;
             }
             else if (m_timer != m_lifetime)
                 m_timer = m_lifetime;
-
             break;
         }
-
         case TEMPSUMMON_CORPSE_TIMED_DESPAWN:
         {
             if ( m_deathState == CORPSE)
@@ -88,7 +79,6 @@ void TempSummon::Update( uint32 diff )
                     UnSummon();
                     return;
                 }
-
                 m_timer -= diff;
             }
             break;
@@ -101,7 +91,6 @@ void TempSummon::Update( uint32 diff )
                 UnSummon();
                 return;
             }
-
             break;
         }
         case TEMPSUMMON_DEAD_DESPAWN:
@@ -121,7 +110,6 @@ void TempSummon::Update( uint32 diff )
                 UnSummon();
                 return;
             }
-
             if (!isInCombat())
             {
                 if (m_timer <= diff)
@@ -144,7 +132,6 @@ void TempSummon::Update( uint32 diff )
                 UnSummon();
                 return;
             }
-
             if (!isInCombat() && isAlive() )
             {
                 if (m_timer <= diff)
@@ -165,19 +152,14 @@ void TempSummon::Update( uint32 diff )
             break;
     }
 }
-
 void TempSummon::InitStats(uint32 duration)
 {
     assert(!isPet());
-
     m_timer = duration;
     m_lifetime = duration;
-
     if(m_type == TEMPSUMMON_MANUAL_DESPAWN)
         m_type = (duration == 0) ? TEMPSUMMON_DEAD_DESPAWN : TEMPSUMMON_TIMED_DESPAWN;
-
     Unit *owner = GetSummoner();
-
     if(owner && isTrigger() && m_spells[0])
     {
         setFaction(owner->getFaction());
@@ -185,10 +167,8 @@ void TempSummon::InitStats(uint32 duration)
         if(owner->GetTypeId() == TYPEID_PLAYER)
             m_ControlledByPlayer = true;
     }
-
     if(!m_Properties)
         return;
-
     if(owner)
     {
         if(uint32 slot = m_Properties->Slot)
@@ -202,13 +182,11 @@ void TempSummon::InitStats(uint32 duration)
             owner->m_SummonSlot[slot] = GetGUID();
         }
     }
-
     if(m_Properties->Faction)
         setFaction(m_Properties->Faction);
     else if(IsVehicle()) // properties should be vehicle
         setFaction(owner->getFaction());
 }
-
 void TempSummon::InitSummon()
 {
     Unit* owner = GetSummoner();
@@ -220,12 +198,10 @@ void TempSummon::InitSummon()
             AI()->IsSummonedBy(owner);
     }
 }
-
 void TempSummon::SetTempSummonType(TempSummonType type)
 {
     m_type = type;
 }
-
 void TempSummon::UnSummon()
 {
     //assert(!isPet());
@@ -235,19 +211,15 @@ void TempSummon::UnSummon()
         assert(!IsInWorld());
         return;
     }
-
     Unit* owner = GetSummoner();
     if(owner && owner->GetTypeId() == TYPEID_UNIT && ((Creature*)owner)->IsAIEnabled)
         ((Creature*)owner)->AI()->SummonedCreatureDespawn(this);
-
     AddObjectToRemoveList();
 }
-
 void TempSummon::RemoveFromWorld()
 {
     if(!IsInWorld())
         return;
-
     if(m_Properties)
     {
         if(uint32 slot = m_Properties->Slot)
@@ -259,17 +231,13 @@ void TempSummon::RemoveFromWorld()
             }
         }
     }
-
     //if(GetOwnerGUID())
     //    sLog.outError("Unit %u has owner guid when removed from world", GetEntry());
-
     Creature::RemoveFromWorld();
 }
-
 void TempSummon::SaveToDB()
 {
 }
-
 Minion::Minion(SummonPropertiesEntry const *properties, Unit *owner) : TempSummon(properties, owner)
 , m_owner(owner)
 {
@@ -277,33 +245,25 @@ Minion::Minion(SummonPropertiesEntry const *properties, Unit *owner) : TempSummo
     m_unitTypeMask |= UNIT_MASK_MINION;
     m_followAngle = PET_FOLLOW_ANGLE;
 }
-
 void Minion::InitStats(uint32 duration)
 {
     TempSummon::InitStats(duration);
-
     SetReactState(REACT_PASSIVE);
-
     SetCreatorGUID(m_owner->GetGUID());
     setFaction(m_owner->getFaction());
-
     m_owner->SetMinion(this, true);
 }
-
 void Minion::RemoveFromWorld()
 {
     if(!IsInWorld())
         return;
-
     m_owner->SetMinion(this, false);
     TempSummon::RemoveFromWorld();
 }
-
 bool Minion::IsGuardianPet() const
 {
     return isPet() || m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET;
 }
-
 Guardian::Guardian(SummonPropertiesEntry const *properties, Unit *owner) : Minion(properties, owner)
 , m_bonusdamage(0)
 {
@@ -314,50 +274,40 @@ Guardian::Guardian(SummonPropertiesEntry const *properties, Unit *owner) : Minio
         InitCharmInfo();
     }
 }
-
 void Guardian::InitStats(uint32 duration)
 {
     Minion::InitStats(duration);
-
     InitStatsForLevel(m_owner->getLevel());
-
     if(m_owner->GetTypeId() == TYPEID_PLAYER && HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
         m_charmInfo->InitCharmCreateSpells();
-
     SetReactState(REACT_AGGRESSIVE);
 }
-
 void Guardian::InitSummon()
 {
     TempSummon::InitSummon();
-
     if(m_owner->GetTypeId() == TYPEID_PLAYER
         && m_owner->GetMinionGUID() == GetGUID()
         && !m_owner->GetCharmGUID())
         ((Player*)m_owner)->CharmSpellInitialize();
 }
-
 Puppet::Puppet(SummonPropertiesEntry const *properties, Unit *owner) : Minion(properties, owner)
 {
     assert(owner->GetTypeId() == TYPEID_PLAYER);
     m_owner = (Player*)owner;
     m_unitTypeMask |= UNIT_MASK_PUPPET;
 }
-
 void Puppet::InitStats(uint32 duration)
 {
     Minion::InitStats(duration);
     SetLevel(m_owner->getLevel());
     SetReactState(REACT_PASSIVE);
 }
-
 void Puppet::InitSummon()
 {
     Minion::InitSummon();
     if (!SetCharmedBy(m_owner, CHARM_TYPE_POSSESS))
         assert(false);
 }
-
 void Puppet::Update(uint32 time)
 {
     Minion::Update(time);
@@ -371,12 +321,10 @@ void Puppet::Update(uint32 time)
         }
     }
 }
-
 void Puppet::RemoveFromWorld()
 {
     if(!IsInWorld())
         return;
-
     RemoveCharmedBy(NULL);
     Minion::RemoveFromWorld();
 }
diff --git a/src/game/TemporarySummon.h b/src/game/TemporarySummon.h
index e67a5573ce2..2ff56c6e74c 100644
--- a/src/game/TemporarySummon.h
+++ b/src/game/TemporarySummon.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_TEMPSUMMON_H
 #define TRINITYCORE_TEMPSUMMON_H
-
 #include "Creature.h"
-
 class TRINITY_DLL_SPEC TempSummon : public Creature
 {
     public:
@@ -37,7 +34,6 @@ class TRINITY_DLL_SPEC TempSummon : public Creature
         void SaveToDB();
         Unit* GetSummoner() const;
         uint64 const& GetSummonerGUID() { return m_summonerGUID; }
-
         const SummonPropertiesEntry * const m_Properties;
     private:
         TempSummonType m_type;
@@ -45,7 +41,6 @@ class TRINITY_DLL_SPEC TempSummon : public Creature
         uint32 m_lifetime;
         uint64 m_summonerGUID;
 };
-
 class Minion : public TempSummon
 {
     public:
@@ -61,7 +56,6 @@ class Minion : public TempSummon
         Unit * const m_owner;
         float m_followAngle;
 };
-
 class Guardian : public Minion
 {
     public:
@@ -69,7 +63,6 @@ class Guardian : public Minion
         void InitStats(uint32 duration);
         bool InitStatsForLevel(uint32 level);
         void InitSummon();
-
         bool UpdateStats(Stats stat);
         bool UpdateAllStats();
         void UpdateResistances(uint32 school);
@@ -78,13 +71,11 @@ class Guardian : public Minion
         void UpdateMaxPower(Powers power);
         void UpdateAttackPowerAndDamage(bool ranged = false);
         void UpdateDamagePhysical(WeaponAttackType attType);
-
         int32 GetBonusDamage() { return m_bonusdamage; }
         void SetBonusDamage(int32 damage) { m_bonusdamage = damage; }
     protected:
         int32   m_bonusdamage;
 };
-
 class Puppet : public Minion
 {
     public:
@@ -96,6 +87,5 @@ class Puppet : public Minion
     protected:
         Player *m_owner;
 };
-
 #endif
 
diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index 11e4f2ab61e..6e16125d348 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "ThreatManager.h"
 #include "Unit.h"
 #include "Creature.h"
@@ -26,26 +25,21 @@
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "UnitEvents.h"
-
 //==============================================================
 //================= ThreatCalcHelper ===========================
 //==============================================================
-
 // The pHatingUnit is not used yet
 float ThreatCalcHelper::calcThreat(Unit* pHatedUnit, Unit* pHatingUnit, float pThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell)
 {
     if (pThreatSpell)
         if (Player* modOwner = pHatedUnit->GetSpellModOwner())
             modOwner->ApplySpellMod(pThreatSpell->Id, SPELLMOD_THREAT, pThreat);
-
     float threat = pHatedUnit->ApplyTotalThreatModifier(pThreat, schoolMask);
     return threat;
 }
-
 //============================================================
 //================= HostilReference ==========================
 //============================================================
-
 HostilReference::HostilReference(Unit* pUnit, ThreatManager *pThreatManager, float pThreat)
 {
     iThreat = pThreat;
@@ -55,40 +49,32 @@ HostilReference::HostilReference(Unit* pUnit, ThreatManager *pThreatManager, flo
     iOnline = true;
     iAccessible = true;
 }
-
 //============================================================
 // Tell our refTo (target) object that we have a link
 void HostilReference::targetObjectBuildLink()
 {
     getTarget()->addHatedBy(this);
 }
-
 //============================================================
 // Tell our refTo (taget) object, that the link is cut
 void HostilReference::targetObjectDestroyLink()
 {
     getTarget()->removeHatedBy(this);
 }
-
 //============================================================
 // Tell our refFrom (source) object, that the link is cut (Target destroyed)
-
 void HostilReference::sourceObjectDestroyLink()
 {
     setOnlineOfflineState(false);
 }
-
 //============================================================
 // Inform the source, that the status of the reference changed
-
 void HostilReference::fireStatusChanged(ThreatRefStatusChangeEvent& pThreatRefStatusChangeEvent)
 {
     if(getSource())
         getSource()->processThreatEvent(&pThreatRefStatusChangeEvent);
 }
-
 //============================================================
-
 void HostilReference::addThreat(float pMod)
 {
     iThreat += pMod;
@@ -101,7 +87,6 @@ void HostilReference::addThreat(float pMod)
         ThreatRefStatusChangeEvent event(UEV_THREAT_REF_THREAT_CHANGE, this, pMod);
         fireStatusChanged(event);
     }
-
     if(isValid() && pMod >= 0)
     {
         Unit* victim_owner = getTarget()->GetCharmerOrOwner();
@@ -109,15 +94,12 @@ void HostilReference::addThreat(float pMod)
             getSource()->addThreat(victim_owner, 0.0f);     // create a threat to the owner of a pet, if the pet attacks
     }
 }
-
 //============================================================
 // check, if source can reach target and set the status
-
 void HostilReference::updateOnlineStatus()
 {
     bool online = false;
     bool accessible = false;
-
     if(!isValid())
     {
         Unit* target = ObjectAccessor::GetUnit(*getSourceUnit(), getUnitGuid());
@@ -141,15 +123,12 @@ void HostilReference::updateOnlineStatus()
         }
         else
             accessible = true;
-
     }
     setAccessibleState(accessible);
     setOnlineOfflineState(online);
 }
-
 //============================================================
 // set the status and fire the event on status change
-
 void HostilReference::setOnlineOfflineState(bool pIsOnline)
 {
     if(iOnline != pIsOnline)
@@ -157,48 +136,37 @@ void HostilReference::setOnlineOfflineState(bool pIsOnline)
         iOnline = pIsOnline;
         if(!iOnline)
             setAccessibleState(false);                      // if not online that not accessable as well
-
         ThreatRefStatusChangeEvent event(UEV_THREAT_REF_ONLINE_STATUS, this);
         fireStatusChanged(event);
     }
 }
-
 //============================================================
-
 void HostilReference::setAccessibleState(bool pIsAccessible)
 {
     if(iAccessible != pIsAccessible)
     {
         iAccessible = pIsAccessible;
-
         ThreatRefStatusChangeEvent event(UEV_THREAT_REF_ASSECCIBLE_STATUS, this);
         fireStatusChanged(event);
     }
 }
-
 //============================================================
 // prepare the reference for deleting
 // this is called be the target
-
 void HostilReference::removeReference()
 {
     invalidate();
-
     ThreatRefStatusChangeEvent event(UEV_THREAT_REF_REMOVE_FROM_LIST, this);
     fireStatusChanged(event);
 }
-
 //============================================================
-
 Unit* HostilReference::getSourceUnit()
 {
     return (getSource()->getOwner());
 }
-
 //============================================================
 //================ ThreatContainer ===========================
 //============================================================
-
 void ThreatContainer::clearReferences()
 {
     for(std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
@@ -208,13 +176,11 @@ void ThreatContainer::clearReferences()
     }
     iThreatList.clear();
 }
-
 //============================================================
 // Return the HostilReference of NULL, if not found
 HostilReference* ThreatContainer::getReferenceByTarget(Unit* pVictim)
 {
     HostilReference* result = NULL;
-        
     uint64 guid = pVictim->GetGUID();
     for(std::list<HostilReference*>::const_iterator i = iThreatList.begin(); i != iThreatList.end(); ++i)
     {
@@ -224,13 +190,10 @@ HostilReference* ThreatContainer::getReferenceByTarget(Unit* pVictim)
             break;
         }
     }
-
     return result;
 }
-
 //============================================================
 // Add the threat, if we find the reference
-
 HostilReference* ThreatContainer::addThreat(Unit* pVictim, float pThreat)
 {
     HostilReference* ref = getReferenceByTarget(pVictim);
@@ -238,26 +201,20 @@ HostilReference* ThreatContainer::addThreat(Unit* pVictim, float pThreat)
         ref->addThreat(pThreat);
     return ref;
 }
-
 //============================================================
-
 void ThreatContainer::modifyThreatPercent(Unit *pVictim, int32 pPercent)
 {
     if(HostilReference* ref = getReferenceByTarget(pVictim))
         ref->addThreatPercent(pPercent);
 }
-
 //============================================================
-
 bool HostilReferenceSortPredicate(const HostilReference* lhs, const HostilReference* rhs)
 {
     // std::list::sort ordering predicate must be: (Pred(x,y)&&Pred(y,x))==false
     return lhs->getThreat() > rhs->getThreat();             // reverse sorting
 }
-
 //============================================================
 // Check if the list is dirty and sort if necessary
-
 void ThreatContainer::update()
 {
     if(iDirty && iThreatList.size() >1)
@@ -266,27 +223,21 @@ void ThreatContainer::update()
     }
     iDirty = false;
 }
-
 //============================================================
 // return the next best victim
 // could be the current victim
-
 HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilReference* pCurrentVictim)
 {
     HostilReference* currentRef = NULL;
     bool found = false;
     bool noPriorityTargetFound = false;
-
     std::list<HostilReference*>::const_iterator lastRef = iThreatList.end();
     lastRef--;
-
     for(std::list<HostilReference*>::const_iterator iter = iThreatList.begin(); iter != iThreatList.end() && !found;)
     {
         currentRef = (*iter);
-
         Unit* target = currentRef->getTarget();
         assert(target);                                     // if the ref has status online the target must be there !
-
         // some units are prefered in comparison to others
         if(!noPriorityTargetFound && (target->IsImmunedToDamage(pAttacker->GetMeleeDamageSchoolMask()) || target->hasNegativeAuraWithInterruptFlag(AURA_INTERRUPT_FLAG_TAKE_DAMAGE)) )
         {
@@ -306,7 +257,6 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe
                 continue;
             }
         }
-
         if(pAttacker->canCreatureAttack(target))           // skip non attackable currently targets
         {
             if(pCurrentVictim)                              // select 1.3/1.1 better target in comparison current target
@@ -318,7 +268,6 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe
                     found = true;
                     break;
                 }
-
                 if (currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() ||
                     currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() &&
                     pAttacker->IsWithinMeleeRange(target))
@@ -337,20 +286,15 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe
     }
     if(!found)
         currentRef = NULL;
-
     return currentRef;
 }
-
 //============================================================
 //=================== ThreatManager ==========================
 //============================================================
-
 ThreatManager::ThreatManager(Unit* owner) : iCurrentVictim(NULL), iOwner(owner), iUpdateTimer(THREAT_UPDATE_INTERVAL)
 {
 }
-
 //============================================================
-
 void ThreatManager::clearReferences()
 {
     iThreatContainer.clearReferences();
@@ -358,32 +302,24 @@ void ThreatManager::clearReferences()
     iCurrentVictim = NULL;
     iUpdateTimer = THREAT_UPDATE_INTERVAL;
 }
-
 //============================================================
-
 void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask schoolMask, SpellEntry const *pThreatSpell)
 {
     //function deals with adding threat and adding players and pets into ThreatList
     //mobs, NPCs, guards have ThreatList and HateOfflineList
     //players and pets have only InHateListOf
     //HateOfflineList is used co contain unattackable victims (in-flight, in-water, GM etc.)
-
     // not to self
     if (pVictim == getOwner())
         return;
-
     // not to GM
     if(!pVictim || (pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->isGameMaster()) )
         return;
-
     // not to dead and not for dead
     if(!pVictim->isAlive() || !getOwner()->isAlive() )
         return;
-
     assert(getOwner()->GetTypeId()== TYPEID_UNIT);
-
     float threat = ThreatCalcHelper::calcThreat(pVictim, iOwner, pThreat, schoolMask, pThreatSpell);
-
     // must check > 0.0f, otherwise dead loop
     if(threat > 0.0f && pVictim->GetReducedThreatPercent())
     {
@@ -392,17 +328,14 @@ void ThreatManager::addThreat(Unit* pVictim, float pThreat, SpellSchoolMask scho
         if(Unit *unit = pVictim->GetMisdirectionTarget())
             _addThreat(unit, reducedThreat);
     }
-
     _addThreat(pVictim, threat);
 }
-
 void ThreatManager::_addThreat(Unit *pVictim, float threat)
 {
     HostilReference* ref = iThreatContainer.addThreat(pVictim, threat);
     // Ref is not in the online refs, search the offline refs next
     if(!ref)
         ref = iThreatOfflineContainer.addThreat(pVictim, threat);
-
     if(!ref)                                                // there was no ref => create a new one
     {
                                                             // threat has to be 0 here
@@ -413,16 +346,12 @@ void ThreatManager::_addThreat(Unit *pVictim, float threat)
             hostilReference->setOnlineOfflineState(false);  // GM is always offline
     }
 }
-
 //============================================================
-
 void ThreatManager::modifyThreatPercent(Unit *pVictim, int32 pPercent)
 {
     iThreatContainer.modifyThreatPercent(pVictim, pPercent);
 }
-
 //============================================================
-
 Unit* ThreatManager::getHostilTarget()
 {
     iThreatContainer.update();
@@ -430,9 +359,7 @@ Unit* ThreatManager::getHostilTarget()
     setCurrentVictim(nextVictim);
     return getCurrentVictim() != NULL ? getCurrentVictim()->getTarget() : NULL;
 }
-
 //============================================================
-
 float ThreatManager::getThreat(Unit *pVictim, bool pAlsoSearchOfflineList)
 {
     float threat = 0.0f;
@@ -443,9 +370,7 @@ float ThreatManager::getThreat(Unit *pVictim, bool pAlsoSearchOfflineList)
         threat = ref->getThreat();
     return threat;
 }
-
 //============================================================
-
 void ThreatManager::tauntApply(Unit* pTaunter)
 {
     HostilReference* ref = iThreatContainer.getReferenceByTarget(pTaunter);
@@ -456,18 +381,14 @@ void ThreatManager::tauntApply(Unit* pTaunter)
             ref->setTempThreat(getCurrentVictim()->getThreat());
     }
 }
-
 //============================================================
-
 void ThreatManager::tauntFadeOut(Unit *pTaunter)
 {
     HostilReference* ref = iThreatContainer.getReferenceByTarget(pTaunter);
     if(ref)
         ref->resetTempThreat();
 }
-
 //============================================================
-
 void ThreatManager::setCurrentVictim(HostilReference* pHostilReference)
 {
     if (pHostilReference && pHostilReference != iCurrentVictim)
@@ -476,17 +397,13 @@ void ThreatManager::setCurrentVictim(HostilReference* pHostilReference)
     }
     iCurrentVictim = pHostilReference;
 }
-
 //============================================================
 // The hated unit is gone, dead or deleted
 // return true, if the event is consumed
-
 void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStatusChangeEvent)
 {
     threatRefStatusChangeEvent->setThreatManager(this);     // now we can set the threat manager
-
     HostilReference* hostilReference = threatRefStatusChangeEvent->getReference();
-
     switch(threatRefStatusChangeEvent->getType())
     {
         case UEV_THREAT_REF_THREAT_CHANGE:
@@ -527,7 +444,6 @@ void ThreatManager::processThreatEvent(ThreatRefStatusChangeEvent* threatRefStat
             break;
     }
 }
-
 bool ThreatManager::isNeedUpdateToClient(uint32 time)
 {
     if (isThreatListEmpty())
diff --git a/src/game/ThreatManager.h b/src/game/ThreatManager.h
index 1dba6277cfc..db527d27c42 100644
--- a/src/game/ThreatManager.h
+++ b/src/game/ThreatManager.h
@@ -17,60 +17,43 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _THREATMANAGER
 #define _THREATMANAGER
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Utilities/LinkedReference/Reference.h"
 #include "UnitEvents.h"
-
 #include <list>
-
 //==============================================================
-
 class Unit;
 class Creature;
 class ThreatManager;
 struct SpellEntry;
-
 #define THREAT_UPDATE_INTERVAL 1 * IN_MILISECONDS    // Server should send threat update to client periodically each second
-
 //==============================================================
 // Class to calculate the real threat based
-
 class ThreatCalcHelper
 {
     public:
         static float calcThreat(Unit* pHatedUnit, Unit* pHatingUnit, float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *threatSpell = NULL);
 };
-
 //==============================================================
 class TRINITY_DLL_SPEC HostilReference : public Reference<Unit, ThreatManager>
 {
     public:
         HostilReference(Unit* pUnit, ThreatManager *pThreatManager, float pThreat);
-
         //=================================================
         void addThreat(float pMod);
-
         void setThreat(float pThreat) { addThreat(pThreat - getThreat()); }
-
         void addThreatPercent(int32 pPercent) { float tmpThreat = iThreat; tmpThreat = tmpThreat * (pPercent+100) / 100; addThreat(tmpThreat-iThreat); }
-
         float getThreat() const { return iThreat; }
-
         bool isOnline() const { return iOnline; }
-
         // The Unit might be in water and the creature can not enter the water, but has range attack
         // in this case online = true, but accessible = false
         bool isAccessible() const { return iAccessible; }
-
         // used for temporary setting a threat and reducting it later again.
         // the threat modification is stored
         void setTempThreat(float pThreat) { iTempThreatModifyer = pThreat - getThreat(); if(iTempThreatModifyer != 0.0f) addThreat(iTempThreatModifyer);  }
-
         void resetTempThreat()
         {
             if(iTempThreatModifyer != 0.0f)
@@ -78,47 +61,31 @@ class TRINITY_DLL_SPEC HostilReference : public Reference<Unit, ThreatManager>
                 addThreat(-iTempThreatModifyer);  iTempThreatModifyer = 0.0f;
             }
         }
-
         float getTempThreatModifyer() { return iTempThreatModifyer; }
-
         //=================================================
         // check, if source can reach target and set the status
         void updateOnlineStatus();
-
         void setOnlineOfflineState(bool pIsOnline);
-
         void setAccessibleState(bool pIsAccessible);
         //=================================================
-
         bool operator ==(const HostilReference& pHostilReference) const { return pHostilReference.getUnitGuid() == getUnitGuid(); }
-
         //=================================================
-
         uint64 getUnitGuid() const { return iUnitGuid; }
-
         //=================================================
         // reference is not needed anymore. realy delete it !
-
         void removeReference();
-
         //=================================================
-
         HostilReference* next() { return ((HostilReference* ) Reference<Unit, ThreatManager>::next()); }
-
         //=================================================
-
         // Tell our refTo (target) object that we have a link
         void targetObjectBuildLink();
-
         // Tell our refTo (taget) object, that the link is cut
         void targetObjectDestroyLink();
-
         // Tell our refFrom (source) object, that the link is cut (Target destroyed)
         void sourceObjectDestroyLink();
     private:
         // Inform the source, that the status of that reference was changed
         void fireStatusChanged(ThreatRefStatusChangeEvent& pThreatRefStatusChangeEvent);
-
         Unit* getSourceUnit();
     private:
         float iThreat;
@@ -127,10 +94,8 @@ class TRINITY_DLL_SPEC HostilReference : public Reference<Unit, ThreatManager>
         bool iOnline;
         bool iAccessible;
 };
-
 //==============================================================
 class ThreatManager;
-
 class TRINITY_DLL_SPEC ThreatContainer
 {
     private:
@@ -138,7 +103,6 @@ class TRINITY_DLL_SPEC ThreatContainer
         bool iDirty;
     protected:
         friend class ThreatManager;
-
         void remove(HostilReference* pRef) { iThreatList.remove(pRef); }
         void addReference(HostilReference* pHostilReference) { iThreatList.push_back(pHostilReference); }
         void clearReferences();
@@ -147,63 +111,37 @@ class TRINITY_DLL_SPEC ThreatContainer
     public:
         ThreatContainer() { iDirty = false; }
         ~ThreatContainer() { clearReferences(); }
-
         HostilReference* addThreat(Unit* pVictim, float pThreat);
-
         void modifyThreatPercent(Unit *pVictim, int32 percent);
-
         HostilReference* selectNextVictim(Creature* pAttacker, HostilReference* pCurrentVictim);
-
         void setDirty(bool pDirty) { iDirty = pDirty; }
-
         bool isDirty() { return iDirty; }
-
         bool empty() { return(iThreatList.empty()); }
-
         HostilReference* getMostHated() { return iThreatList.empty() ? NULL : iThreatList.front(); }
-
         HostilReference* getReferenceByTarget(Unit* pVictim);
-
         std::list<HostilReference*>& getThreatList() { return iThreatList; }
 };
-
 //=================================================
-
 class TRINITY_DLL_SPEC ThreatManager
 {
     public:
         friend class HostilReference;
-
         explicit ThreatManager(Unit *pOwner);
-
         ~ThreatManager() { clearReferences(); }
-
         void clearReferences();
-
         void addThreat(Unit* pVictim, float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *threatSpell = NULL);
         void modifyThreatPercent(Unit *pVictim, int32 pPercent);
-
         float getThreat(Unit *pVictim, bool pAlsoSearchOfflineList = false);
-
         bool isThreatListEmpty() { return iThreatContainer.empty();}
-
         void processThreatEvent(ThreatRefStatusChangeEvent* threatRefStatusChangeEvent);
-
         bool isNeedUpdateToClient(uint32 time);
-
         HostilReference* getCurrentVictim() { return iCurrentVictim; }
-
         Unit*  getOwner() { return iOwner; }
-
         Unit* getHostilTarget();
-
         void tauntApply(Unit* pTaunter);
         void tauntFadeOut(Unit *pTaunter);
-
         void setCurrentVictim(HostilReference* pHostilReference);
-
         void setDirty(bool pDirty) { iThreatContainer.setDirty(pDirty); }
-
         // methods to access the lists from the outside to do sume dirty manipulation (scriping and such)
         // I hope they are used as little as possible.
         std::list<HostilReference*>& getThreatList() { return iThreatContainer.getThreatList(); }
@@ -212,14 +150,12 @@ class TRINITY_DLL_SPEC ThreatManager
         ThreatContainer& getOfflineContainer() { return iThreatOfflineContainer; }
     private:
         void _addThreat(Unit *pVictim, float threat);
-
         HostilReference* iCurrentVictim;
         Unit* iOwner;
         uint32 iUpdateTimer;
         ThreatContainer iThreatContainer;
         ThreatContainer iThreatOfflineContainer;
 };
-
 //=================================================
 #endif
 
diff --git a/src/game/TicketHandler.cpp b/src/game/TicketHandler.cpp
index 2ac0c601edc..091b26519b9 100644
--- a/src/game/TicketHandler.cpp
+++ b/src/game/TicketHandler.cpp
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Language.h"
 #include "WorldPacket.h"
 #include "Common.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"
-
 void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
 {
     if(GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID()))
@@ -34,11 +32,9 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
         SendPacket( &data );
         return;
     }
-
     uint32 map;
     float x, y, z;
     std::string ticketText, ticketText2;
-
     WorldPacket data(SMSG_GMTICKET_CREATE, 4);
     recv_data >> map;
     recv_data >> x;
@@ -46,8 +42,7 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
     recv_data >> z;
     recv_data >> ticketText;
     recv_data >> ticketText2;
-
-    GM_Ticket *ticket = new GM_Ticket;    
+    GM_Ticket *ticket = new GM_Ticket;
     ticket->name = GetPlayer()->GetName();
     ticket->guid = objmgr.GenerateGMTicketId();
     ticket->playerGuid = GetPlayer()->GetGUID();
@@ -61,23 +56,16 @@ void WorldSession::HandleGMTicketCreateOpcode( WorldPacket & recv_data )
     ticket->closed = 0;
     ticket->assignedToGM = 0;
     ticket->comment = "";
-
     objmgr.AddOrUpdateGMTicket(*ticket, true);
-
     data << uint32(2);
     SendPacket(&data);
-
     sWorld.SendGMText(LANG_COMMAND_TICKETNEW, GetPlayer()->GetName(), ticket->guid);
-
 }
-
 void WorldSession::HandleGMTicketUpdateOpcode( WorldPacket & recv_data)
 {
     WorldPacket data(SMSG_GMTICKET_UPDATETEXT, 4);
-
     std::string message;
     recv_data >> message;
-
     GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID());
     if(!ticket)
     {
@@ -85,57 +73,44 @@ void WorldSession::HandleGMTicketUpdateOpcode( WorldPacket & recv_data)
         SendPacket(&data);
         return;
     }
-
     ticket->message = message;
     ticket->timestamp = time(NULL);
-
     objmgr.AddOrUpdateGMTicket(*ticket);
-
     data << uint32(2);
     SendPacket(&data);
-
     sWorld.SendGMText(LANG_COMMAND_TICKETUPDATED, GetPlayer()->GetName(), ticket->guid);
-
 }
-
 void WorldSession::HandleGMTicketDeleteOpcode( WorldPacket & /*recv_data*/)
 {
     GM_Ticket* ticket = objmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID());
-
     if(ticket)
     {
         WorldPacket data(SMSG_GMTICKET_DELETETICKET, 4);
         data << uint32(9);
         SendPacket(&data);
-
         sWorld.SendGMText(LANG_COMMAND_TICKETPLAYERABANDON, GetPlayer()->GetName(), ticket->guid );
         objmgr.RemoveGMTicket(ticket, GetPlayer()->GetGUID(), false);
         SendGMTicketGetTicket(0x0A, 0);
     }
 }
-
 void WorldSession::HandleGMTicketGetTicketOpcode( WorldPacket & /*recv_data*/)
 {
     WorldPacket data( SMSG_QUERY_TIME_RESPONSE, 4+4 );
     data << (uint32)time(NULL);
     data << (uint32)0;
     SendPacket( &data );
-
     GM_Ticket *ticket = objmgr.GetGMTicketByPlayer(GetPlayer()->GetGUID());
     if(ticket)
         SendGMTicketGetTicket(0x06, ticket->message.c_str());
     else
         SendGMTicketGetTicket(0x0A, 0);
-
 }
-
 void WorldSession::HandleGMTicketSystemStatusOpcode( WorldPacket & /*recv_data*/)
 {
     WorldPacket data(SMSG_GMTICKET_SYSTEMSTATUS, 4);
     data << uint32(1);
     SendPacket(&data);
 }
-
 void WorldSession::SendGMTicketGetTicket(uint32 status, char const* text)
 {
     int len = text ? strlen(text) : 0;
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index f841ac2fd9c..5a4a0d8714a 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Totem.h"
 #include "WorldPacket.h"
 #include "Log.h"
@@ -25,14 +24,12 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
-
 Totem::Totem(SummonPropertiesEntry const *properties, Unit *owner) : Minion(properties, owner)
 {
     m_unitTypeMask |= UNIT_MASK_TOTEM;
     m_duration = 0;
     m_type = TOTEM_PASSIVE;
 }
-
 void Totem::Update( uint32 time )
 {
     if (!m_owner->isAlive() || !isAlive())
@@ -40,7 +37,6 @@ void Totem::Update( uint32 time )
         UnSummon();                                         // remove self
         return;
     }
-
     if (m_duration <= time)
     {
         UnSummon();                                         // remove self
@@ -48,14 +44,11 @@ void Totem::Update( uint32 time )
     }
     else
         m_duration -= time;
-
     Creature::Update( time );
 }
-
 void Totem::InitStats(uint32 duration)
 {
     Minion::InitStats(duration);
-
     CreatureInfo const *cinfo = GetCreatureInfo();
     if(m_owner->GetTypeId() == TYPEID_PLAYER && cinfo)
     {
@@ -65,7 +58,6 @@ void Totem::InitStats(uint32 duration)
             display_id = minfo->modelid;
         SetDisplayId(display_id);
     }
-
     // Get spell casted by totem
     SpellEntry const * totemSpell = sSpellStore.LookupEntry(GetSpell());
     if (totemSpell)
@@ -74,36 +66,27 @@ void Totem::InitStats(uint32 duration)
         if (GetSpellCastTime(totemSpell))
             m_type = TOTEM_ACTIVE;
     }
-
     if(GetEntry() == SENTRY_TOTEM_ENTRY)
         SetReactState(REACT_AGGRESSIVE);
-
     m_duration = duration;
-
     SetLevel(m_owner->getLevel());
 }
-
 void Totem::InitSummon()
 {
     WorldPacket data(SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE, 8);
     data << GetGUID();
     SendMessageToSet(&data, true);
-
     if(m_type == TOTEM_PASSIVE)
-        CastSpell(this, GetSpell(), true); 
-
+        CastSpell(this, GetSpell(), true);
     // Some totems can have both instant effect and passive spell
     if (GetSpell(1))
         CastSpell(this, GetSpell(1), true);
 }
-
 void Totem::UnSummon()
 {
     SendObjectDeSpawnAnim(GetGUID());
-
     CombatStop();
     RemoveAurasDueToSpell(GetSpell());
-
     // clear owenr's totem slot
     for(int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i)
     {
@@ -113,9 +96,7 @@ void Totem::UnSummon()
             break;
         }
     }
-
     m_owner->RemoveAurasDueToSpell(GetSpell());
-
     //remove aura all party members too
     Group *pGroup = NULL;
     if (m_owner->GetTypeId() == TYPEID_PLAYER)
@@ -132,10 +113,8 @@ void Totem::UnSummon()
             }
         }
     }
-
     AddObjectToRemoveList();
 }
-
 bool Totem::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
 {
     // TODO: possibly all negative auras immune?
diff --git a/src/game/Totem.h b/src/game/Totem.h
index 6dbd699f1d2..1a1d28f2dc6 100644
--- a/src/game/Totem.h
+++ b/src/game/Totem.h
@@ -17,21 +17,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITYCORE_TOTEM_H
 #define TRINITYCORE_TOTEM_H
-
 #include "TemporarySummon.h"
-
 enum TotemType
 {
     TOTEM_PASSIVE    = 0,
     TOTEM_ACTIVE     = 1,
     TOTEM_STATUE     = 2 // copied straight from MaNGOS, may need more implementation to work
 };
-
 #define SENTRY_TOTEM_ENTRY  3968
-
 class Totem : public Minion
 {
     public:
@@ -44,7 +39,6 @@ class Totem : public Minion
         uint32 GetSpell(uint8 slot=0) const { return m_spells[slot]; }
         uint32 GetTotemDuration() const { return m_duration; }
         TotemType GetTotemType() const { return m_type; }
-
         bool UpdateStats(Stats /*stat*/) { return true; }
         bool UpdateAllStats() { return true; }
         void UpdateResistances(uint32 /*school*/) {}
@@ -53,9 +47,7 @@ class Totem : public Minion
         void UpdateMaxPower(Powers /*power*/) {}
         void UpdateAttackPowerAndDamage(bool /*ranged*/ ) {}
         void UpdateDamagePhysical(WeaponAttackType /*attType*/) {}
-
         bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
-
     protected:
         TotemType m_type;
         uint32 m_duration;
diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp
index 08c70308d1c..5dfbcf6bfdd 100644
--- a/src/game/TotemAI.cpp
+++ b/src/game/TotemAI.cpp
@@ -17,65 +17,51 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "TotemAI.h"
 #include "Totem.h"
 #include "Creature.h"
 #include "DBCStores.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
-
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
-
 int
 TotemAI::Permissible(const Creature *creature)
 {
     if( creature->isTotem() )
         return PERMIT_BASE_PROACTIVE;
-
     return PERMIT_BASE_NO;
 }
-
 TotemAI::TotemAI(Creature *c) : CreatureAI(c), i_victimGuid(0)
 {
     assert(c->isTotem());
 }
-
 void
 TotemAI::MoveInLineOfSight(Unit *)
 {
 }
-
 void TotemAI::EnterEvadeMode()
 {
     m_creature->CombatStop(true);
 }
-
 void
 TotemAI::UpdateAI(const uint32 /*diff*/)
 {
     if (((Totem*)m_creature)->GetTotemType() != TOTEM_ACTIVE)
         return;
-
     if (!m_creature->isAlive() || m_creature->IsNonMeleeSpellCasted(false))
         return;
-
     // Search spell
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(((Totem*)m_creature)->GetSpell());
     if (!spellInfo)
         return;
-
     // Get spell range
     SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
     float max_range = GetSpellMaxRangeForHostile(srange);
-
     // SPELLMOD_RANGE not applied in this place just because not existence range mods for attacking totems
-
     // pointer to appropriate target if found any
     Unit* victim = i_victimGuid ? ObjectAccessor::GetUnit(*m_creature, i_victimGuid) : NULL;
-
     // Search victim if no, not attackable, or out of range, or friendly (possible in case duel end)
     if( !victim ||
         !victim->isTargetableForAttack() || !m_creature->IsWithinDistInMap(victim, max_range) ||
@@ -86,13 +72,11 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
         Trinity::UnitLastSearcher<Trinity::NearestAttackableUnitInObjectRangeCheck> checker(m_creature, victim, u_check);
         m_creature->VisitNearbyObject(max_range, checker);
     }
-
     // If have target
     if (victim)
     {
         // remember
         i_victimGuid = victim->GetGUID();
-
         // attack
         m_creature->SetInFront(victim);                         // client change orientation by self
         m_creature->CastSpell(victim, ((Totem*)m_creature)->GetSpell(), false);
@@ -100,7 +84,6 @@ TotemAI::UpdateAI(const uint32 /*diff*/)
     else
         i_victimGuid = 0;
 }
-
 void
 TotemAI::AttackStart(Unit *)
 {
diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h
index 003f5d5ca13..4f652f23cce 100644
--- a/src/game/TotemAI.h
+++ b/src/game/TotemAI.h
@@ -17,29 +17,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_TOTEMAI_H
 #define TRINITY_TOTEMAI_H
-
 #include "CreatureAI.h"
 #include "Timer.h"
-
 class Creature;
 class Totem;
-
 class TRINITY_DLL_DECL TotemAI : public CreatureAI
 {
     public:
-
         explicit TotemAI(Creature *c);
-
         void MoveInLineOfSight(Unit *);
         void AttackStart(Unit *);
         void EnterEvadeMode();
-
         void UpdateAI(const uint32);
         static int Permissible(const Creature *);
-
     private:
         uint64 i_victimGuid;
 };
diff --git a/src/game/TradeHandler.cpp b/src/game/TradeHandler.cpp
index b4cc62ba39a..e7c87cef3e6 100644
--- a/src/game/TradeHandler.cpp
+++ b/src/game/TradeHandler.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
@@ -29,7 +28,6 @@
 #include "Item.h"
 #include "SocialMgr.h"
 #include "Language.h"
-
 enum TradeStatus
 {
     TRADE_STATUS_BUSY           = 0,
@@ -56,11 +54,9 @@ enum TradeStatus
     TRADE_STATUS_TRIAL_ACCOUNT  = 21,                       // Trial accounts can not perform that action
     TRADE_STATUS_ONLY_CONJURED  = 22                        // You can only trade conjured items... (cross realm BG related).
 };
-
 void WorldSession::SendTradeStatus(uint32 status)
 {
     WorldPacket data;
-
     switch(status)
     {
         case TRADE_STATUS_BEGIN_TRADE:
@@ -90,42 +86,34 @@ void WorldSession::SendTradeStatus(uint32 status)
             data << uint32(status);
             break;
     }
-
     SendPacket(&data);
 }
-
 void WorldSession::HandleIgnoreTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     sLog.outDebug( "WORLD: Ignore Trade %u",_player->GetGUIDLow());
     // recvPacket.print_storage();
 }
-
 void WorldSession::HandleBusyTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     sLog.outDebug( "WORLD: Busy Trade %u",_player->GetGUIDLow());
     // recvPacket.print_storage();
 }
-
 void WorldSession::SendUpdateTrade()
 {
     Item *item = NULL;
-
     if( !_player || !_player->pTrader )
         return;
-
     // reset trade status
     if (_player->acceptTrade)
     {
         _player->acceptTrade = false;
         SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
     }
-
     if (_player->pTrader->acceptTrade)
     {
         _player->pTrader->acceptTrade = false;
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
     }
-
     WorldPacket data(SMSG_TRADE_STATUS_EXTENDED, (100));    // guess size
     data << (uint8 ) 1;                                     // can be different (only seen 0 and 1)
     data << (uint32) 0;                                     // added in 2.4.0, this value must be equal to value from TRADE_STATUS_OPEN_WINDOW status packet (different value for different players to block multiple trades?)
@@ -133,13 +121,10 @@ void WorldSession::SendUpdateTrade()
     data << (uint32) TRADE_SLOT_COUNT;                      // trade slots count/number?, = prev field in most cases
     data << (uint32) _player->pTrader->tradeGold;           // trader gold
     data << (uint32) 0;                                     // spell casted on lowest slot item
-
     for(uint8 i = 0; i < TRADE_SLOT_COUNT; ++i)
     {
         item = (_player->pTrader->tradeItems[i] != NULL_SLOT ? _player->pTrader->GetItemByPos( _player->pTrader->tradeItems[i] ) : NULL);
-
         data << (uint8) i;                                  // trade slot number, if not specified, then end of packet
-
         if(item)
         {
             data << (uint32) item->GetProto()->ItemId;      // entry
@@ -173,10 +158,8 @@ void WorldSession::SendUpdateTrade()
     }
     SendPacket(&data);
 }
-
 //==============================================================
 // transfer the items to the players
-
 void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
 {
     for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i)
@@ -201,7 +184,6 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
                         myItems[i]->GetProto()->Name1,myItems[i]->GetEntry(),myItems[i]->GetCount(),
                         _player->pTrader->GetName(),_player->pTrader->GetSession()->GetAccountId());
                 }
-
                 // store
                 _player->pTrader->MoveItemToInventory( traderDst, myItems[i], true, true);
             }
@@ -216,7 +198,6 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
                         hisItems[i]->GetProto()->Name1,hisItems[i]->GetEntry(),hisItems[i]->GetCount(),
                         _player->GetName(),_player->GetSession()->GetAccountId());
                 }
-
                 // store
                 _player->MoveItemToInventory( playerDst, hisItems[i], true, true);
             }
@@ -247,18 +228,14 @@ void WorldSession::moveItems(Item* myItems[], Item* hisItems[])
         }
     }
 }
-
 //==============================================================
-
 void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     Item *myItems[TRADE_SLOT_TRADED_COUNT]  = { NULL, NULL, NULL, NULL, NULL, NULL };
     Item *hisItems[TRADE_SLOT_TRADED_COUNT] = { NULL, NULL, NULL, NULL, NULL, NULL };
     bool myCanCompleteTrade=true,hisCanCompleteTrade=true;
-
     if ( !GetPlayer()->pTrader )
         return;
-
     // not accept case incorrect money amount
     if( _player->tradeGold > _player->GetMoney() )
     {
@@ -267,7 +244,6 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
         _player->acceptTrade = false;
         return;
     }
-
     // not accept case incorrect money amount
     if( _player->pTrader->tradeGold > _player->pTrader->GetMoney() )
     {
@@ -276,7 +252,6 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
         _player->pTrader->acceptTrade = false;
         return;
     }
-
     // not accept if some items now can't be trade (cheating)
     for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i)
     {
@@ -303,13 +278,11 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
             }
         }
     }
-
     _player->acceptTrade = true;
     if (_player->pTrader->acceptTrade )
     {
         // inform partner client
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
-
         // store items in local list and set 'in-trade' flag
         for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i)
         {
@@ -330,18 +303,15 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
                     hisItems[i]->SetInTrade();
             }
         }
-
         // test if item will fit in each inventory
         hisCanCompleteTrade =  (_player->pTrader->CanStoreItems( myItems,TRADE_SLOT_TRADED_COUNT )== EQUIP_ERR_OK);
         myCanCompleteTrade = (_player->CanStoreItems( hisItems,TRADE_SLOT_TRADED_COUNT ) == EQUIP_ERR_OK);
-
         // clear 'in-trade' flag
         for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i)
         {
             if(myItems[i])  myItems[i]->SetInTrade(false);
             if(hisItems[i]) hisItems[i]->SetInTrade(false);
         }
-
         // in case of missing space report error
         if(!myCanCompleteTrade)
         {
@@ -359,7 +329,6 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
             _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
             return;
         }
-
         // execute trade: 1. remove
         for(int i=0; i<TRADE_SLOT_TRADED_COUNT; ++i)
         {
@@ -374,10 +343,8 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
                 _player->pTrader->MoveItemFromInventory(_player->pTrader->tradeItems[i] >> 8, _player->pTrader->tradeItems[i] & 255, true);
             }
         }
-
         // execute trade: 2. store
         moveItems(myItems, hisItems);
-
         // logging money
         if(sWorld.getConfig(CONFIG_GM_LOG_TRADE))
         {
@@ -396,25 +363,20 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
                     _player->GetName(),_player->GetSession()->GetAccountId());
             }
         }
-
         // update money
         _player->ModifyMoney( -int32(_player->tradeGold) );
         _player->ModifyMoney(_player->pTrader->tradeGold );
         _player->pTrader->ModifyMoney( -int32(_player->pTrader->tradeGold) );
         _player->pTrader->ModifyMoney(_player->tradeGold );
-
         _player->ClearTrade();
         _player->pTrader->ClearTrade();
-
         // desynchronized with the other saves here (SaveInventoryAndGoldToDB() not have own transaction guards)
         CharacterDatabase.BeginTransaction();
         _player->SaveInventoryAndGoldToDB();
         _player->pTrader->SaveInventoryAndGoldToDB();
         CharacterDatabase.CommitTransaction();
-
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
         SendTradeStatus(TRADE_STATUS_TRADE_COMPLETE);
-
         _player->pTrader->pTrader = NULL;
         _player->pTrader = NULL;
     }
@@ -423,175 +385,139 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/)
         _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_TRADE_ACCEPT);
     }
 }
-
 void WorldSession::HandleUnacceptTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     if ( !GetPlayer()->pTrader )
         return;
-
     _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_BACK_TO_TRADE);
     _player->acceptTrade = false;
 }
-
 void WorldSession::HandleBeginTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     if(!_player->pTrader)
         return;
-
     _player->pTrader->GetSession()->SendTradeStatus(TRADE_STATUS_OPEN_WINDOW);
     _player->pTrader->ClearTrade();
-
     SendTradeStatus(TRADE_STATUS_OPEN_WINDOW);
     _player->ClearTrade();
 }
-
 void WorldSession::SendCancelTrade()
 {
     SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
 }
-
 void WorldSession::HandleCancelTradeOpcode(WorldPacket& /*recvPacket*/)
 {
     // sended also after LOGOUT COMPLETE
     if(_player)                                             // needed because STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT
         _player->TradeCancel(true);
 }
-
 void WorldSession::HandleInitiateTradeOpcode(WorldPacket& recvPacket)
 {
     if (GetPlayer()->pTrader)
         return;
-
     uint64 ID;
-
     if (!GetPlayer()->isAlive())
     {
         SendTradeStatus(TRADE_STATUS_YOU_DEAD);
         return;
     }
-
     if (GetPlayer()->hasUnitState(UNIT_STAT_STUNNED))
     {
         SendTradeStatus(TRADE_STATUS_YOU_STUNNED);
         return;
     }
-
     if (isLogingOut())
     {
         SendTradeStatus(TRADE_STATUS_YOU_LOGOUT);
         return;
     }
-
     if (GetPlayer()->isInFlight())
     {
         SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR);
         return;
     }
-
     recvPacket >> ID;
-
     Player* pOther = ObjectAccessor::FindPlayer( ID );
-
     if (!pOther)
     {
         SendTradeStatus(TRADE_STATUS_NO_TARGET);
         return;
     }
-
     if (pOther == GetPlayer() || pOther->pTrader)
     {
         SendTradeStatus(TRADE_STATUS_BUSY);
         return;
     }
-
     if (!pOther->isAlive())
     {
         SendTradeStatus(TRADE_STATUS_TARGET_DEAD);
         return;
     }
-
     if (pOther->isInFlight())
     {
         SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR);
         return;
     }
-
     if (pOther->hasUnitState(UNIT_STAT_STUNNED))
     {
         SendTradeStatus(TRADE_STATUS_TARGET_STUNNED);
         return;
     }
-
     if (pOther->GetSession()->isLogingOut())
     {
         SendTradeStatus(TRADE_STATUS_TARGET_LOGOUT);
         return;
     }
-
     if (pOther->GetSocial()->HasIgnore(GetPlayer()->GetGUIDLow()))
     {
         SendTradeStatus(TRADE_STATUS_IGNORE_YOU);
         return;
     }
-
     if(!sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_TRADE) && pOther->GetTeam() !=_player->GetTeam() )
     {
         SendTradeStatus(TRADE_STATUS_WRONG_FACTION);
         return;
     }
-
     if (!pOther->IsWithinDistInMap(_player,10.0f,false))
     {
         SendTradeStatus(TRADE_STATUS_TARGET_TO_FAR);
         return;
     }
-
     // OK start trade
     _player->pTrader = pOther;
     pOther->pTrader =_player;
-
     WorldPacket data(SMSG_TRADE_STATUS, 12);
     data << (uint32) TRADE_STATUS_BEGIN_TRADE;
     data << (uint64)_player->GetGUID();
     _player->pTrader->GetSession()->SendPacket(&data);
 }
-
 void WorldSession::HandleSetTradeGoldOpcode(WorldPacket& recvPacket)
 {
     if(!_player->pTrader)
         return;
-
     uint32 gold;
-
     recvPacket >> gold;
-
     // gold can be incorrect, but this is checked at trade finished.
     _player->tradeGold = gold;
-
     _player->pTrader->GetSession()->SendUpdateTrade();
 }
-
 void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
 {
     if(!_player->pTrader)
         return;
-
     // send update
     uint8 tradeSlot;
     uint8 bag;
     uint8 slot;
-
     recvPacket >> tradeSlot;
     recvPacket >> bag;
     recvPacket >> slot;
-
     // invalid slot number
     if(tradeSlot >= TRADE_SLOT_COUNT)
     {
         SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
         return;
     }
-
     // check cheating, can't fail with correct client operations
     Item* item = _player->GetItemByPos(bag,slot);
     if (!item || (tradeSlot!=TRADE_SLOT_NONTRADED && !item->CanBeTraded()))
@@ -599,9 +525,7 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
         SendTradeStatus(TRADE_STATUS_TRADE_CANCELED);
         return;
     }
-
     uint16 pos = (bag << 8) | slot;
-
     // prevent place single item into many trade slots using cheating and client bugs
     for(int i = 0; i < TRADE_SLOT_COUNT; ++i)
     {
@@ -612,26 +536,19 @@ void WorldSession::HandleSetTradeItemOpcode(WorldPacket& recvPacket)
             return;
         }
     }
-
     _player->tradeItems[tradeSlot] = pos;
-
     _player->pTrader->GetSession()->SendUpdateTrade();
 }
-
 void WorldSession::HandleClearTradeItemOpcode(WorldPacket& recvPacket)
 {
     if(!_player->pTrader)
         return;
-
     uint8 tradeSlot;
     recvPacket >> tradeSlot;
-
     // invalid slot number
     if(tradeSlot >= TRADE_SLOT_COUNT)
         return;
-
     _player->tradeItems[tradeSlot] = NULL_SLOT;
-
     _player->pTrader->GetSession()->SendUpdateTrade();
 }
 
diff --git a/src/game/Transports.cpp b/src/game/Transports.cpp
index 25248b7b9d2..d55e50986b4 100644
--- a/src/game/Transports.cpp
+++ b/src/game/Transports.cpp
@@ -17,70 +17,51 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
-
 #include "Transports.h"
 #include "MapManager.h"
 #include "ObjectMgr.h"
 #include "Path.h"
-
 #include "WorldPacket.h"
 #include "DBCStores.h"
 #include "ProgressBar.h"
-
 #include "World.h"
-
 void MapManager::LoadTransports()
 {
     QueryResult *result = WorldDatabase.Query("SELECT entry, name, period FROM transports");
-
     uint32 count = 0;
-
     if( !result )
     {
         barGoLink bar( 1 );
         bar.step();
-
         sLog.outString();
         sLog.outString( ">> Loaded %u transports", count );
         return;
     }
-
     barGoLink bar( result->GetRowCount() );
-
     do
     {
         bar.step();
-
         Transport *t = new Transport;
-
         Field *fields = result->Fetch();
-
         uint32 entry = fields[0].GetUInt32();
         std::string name = fields[1].GetCppString();
         t->m_period = fields[2].GetUInt32();
-
         const GameObjectInfo *goinfo = objmgr.GetGameObjectInfo(entry);
-
         if(!goinfo)
         {
             sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template missing", entry, name.c_str());
             delete t;
             continue;
         }
-
         if(goinfo->type != GAMEOBJECT_TYPE_MO_TRANSPORT)
         {
             sLog.outErrorDb("Transport ID:%u, Name: %s, will not be loaded, gameobject_template type wrong", entry, name.c_str());
             delete t;
             continue;
         }
-
         // sLog.outString("Loading transport %d between %s, %s", entry, name.c_str(), goinfo->name);
-
         std::set<uint32> mapsUsed;
-
         if(!t->GenerateWaypoints(goinfo->moTransport.taxiPathId, mapsUsed))
             // skip transports with empty waypoints list
         {
@@ -88,34 +69,26 @@ void MapManager::LoadTransports()
             delete t;
             continue;
         }
-
         float x, y, z, o;
         uint32 mapid;
         x = t->m_WayPoints[0].x; y = t->m_WayPoints[0].y; z = t->m_WayPoints[0].z; mapid = t->m_WayPoints[0].mapid; o = 1;
-
          // creates the Gameobject
         if(!t->Create(entry, mapid, x, y, z, o, 100, 0))
         {
             delete t;
             continue;
         }
-
         m_Transports.insert(t);
-
         for (std::set<uint32>::const_iterator i = mapsUsed.begin(); i != mapsUsed.end(); ++i)
             m_TransportsByMap[*i].insert(t);
-
         //If we someday decide to use the grid to track transports, here:
         t->SetMap(MapManager::Instance().CreateMap(mapid, t, 0));
-
         //t->GetMap()->Add<GameObject>((GameObject *)t);
         ++count;
     } while(result->NextRow());
     delete result;
-
     sLog.outString();
     sLog.outString( ">> Loaded %u transports", count );
-
     // check transport data DB integrity
     result = WorldDatabase.Query("SELECT gameobject.guid,gameobject.id,transports.name FROM gameobject,transports WHERE gameobject.id = transports.entry");
     if(result)                                              // wrong data found
@@ -123,69 +96,52 @@ void MapManager::LoadTransports()
         do
         {
             Field *fields = result->Fetch();
-
             uint32 guid  = fields[0].GetUInt32();
             uint32 entry = fields[1].GetUInt32();
             std::string name = fields[2].GetCppString();
             sLog.outErrorDb("Transport %u '%s' have record (GUID: %u) in `gameobject`. Transports DON'T must have any records in `gameobject` or its behavior will be unpredictable/bugged.",entry,name.c_str(),guid);
         }
         while(result->NextRow());
-
         delete result;
     }
 }
-
 Transport::Transport() : GameObject()
 {
     m_updateFlag = (UPDATEFLAG_TRANSPORT | UPDATEFLAG_HIGHGUID | UPDATEFLAG_HAS_POSITION | UPDATEFLAG_ROTATION);
 }
-
 bool Transport::Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags)
 {
     Relocate(x,y,z,ang);
     // instance id and phaseMask isn't set to values different from std.
-
     if(!IsPositionValid())
     {
         sLog.outError("Transport (GUID: %u) not created. Suggested coordinates isn't valid (X: %f Y: %f)",
             guidlow,x,y);
         return false;
     }
-
     Object::_Create(guidlow, 0, HIGHGUID_MO_TRANSPORT);
-
     GameObjectInfo const* goinfo = objmgr.GetGameObjectInfo(guidlow);
-
     if (!goinfo)
     {
         sLog.outErrorDb("Transport not created: entry in `gameobject_template` not found, guidlow: %u map: %u  (X: %f Y: %f Z: %f) ang: %f",guidlow, mapid, x, y, z, ang);
         return false;
     }
-
     m_goInfo = goinfo;
-
     SetFloatValue(OBJECT_FIELD_SCALE_X, goinfo->size);
-
     SetUInt32Value(GAMEOBJECT_FACTION, goinfo->faction);
     //SetUInt32Value(GAMEOBJECT_FLAGS, goinfo->flags);
     SetUInt32Value(GAMEOBJECT_FLAGS, MAKE_PAIR32(0x28, 0x64));
     SetUInt32Value(GAMEOBJECT_LEVEL, m_period);
     SetEntry(goinfo->id);
-
     SetUInt32Value(GAMEOBJECT_DISPLAYID, goinfo->displayId);
-
     SetGoState(GO_STATE_READY);
     SetGoType(GameobjectTypes(goinfo->type));
-
     SetGoAnimProgress(animprogress);
     if(dynflags)
         SetUInt32Value(GAMEOBJECT_DYNAMIC, MAKE_PAIR32(0, dynflags));
-
     SetName(goinfo->name);
-
     return true;
 }
-
 struct keyFrame
 {
     keyFrame(float _x, float _y, float _z, uint32 _mapid, int _actionflag, int _delay)
@@ -193,7 +149,6 @@ struct keyFrame
         x = _x; y = _y; z = _z; mapid = _mapid; actionflag = _actionflag; delay = _delay; distFromPrev = -1; distSinceStop = -1; distUntilStop = -1;
         tFrom = 0; tTo = 0;
     }
-
     float x;
     float y;
     float z;
@@ -205,15 +160,12 @@ struct keyFrame
     float distFromPrev;
     float tFrom, tTo;
 };
-
 bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
 {
     TransportPath path;
     objmgr.GetTransportPathNodes(pathid, path);
-
     if (path.Empty())
         return false;
-
     std::vector<keyFrame> keyFrames;
     int mapChange = 0;
     mapids.clear();
@@ -237,17 +189,14 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
             --mapChange;
         }
     }
-
     int lastStop = -1;
     int firstStop = -1;
-
     // first cell is arrived at by teleportation :S
     keyFrames[0].distFromPrev = 0;
     if (keyFrames[0].actionflag == 2)
     {
         lastStop = 0;
     }
-
     // find the rest of the distances between key points
     for (size_t i = 1; i < keyFrames.size(); ++i)
     {
@@ -270,7 +219,6 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
             lastStop = i;
         }
     }
-
     float tmpDist = 0;
     for (size_t i = 0; i < keyFrames.size(); ++i)
     {
@@ -281,7 +229,6 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
             tmpDist += keyFrames[j].distFromPrev;
         keyFrames[j].distSinceStop = tmpDist;
     }
-
     for (int i = int(keyFrames.size()) - 1; i >= 0; i--)
     {
         int j = (i + (firstStop+1)) % keyFrames.size();
@@ -290,45 +237,37 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
         if (keyFrames[j].actionflag == 2)
             tmpDist = 0;
     }
-
     for (size_t i = 0; i < keyFrames.size(); ++i)
     {
         if (keyFrames[i].distSinceStop < (30 * 30 * 0.5f))
             keyFrames[i].tFrom = sqrt(2 * keyFrames[i].distSinceStop);
         else
             keyFrames[i].tFrom = ((keyFrames[i].distSinceStop - (30 * 30 * 0.5f)) / 30) + 30;
-
         if (keyFrames[i].distUntilStop < (30 * 30 * 0.5f))
             keyFrames[i].tTo = sqrt(2 * keyFrames[i].distUntilStop);
         else
             keyFrames[i].tTo = ((keyFrames[i].distUntilStop - (30 * 30 * 0.5f)) / 30) + 30;
-
         keyFrames[i].tFrom *= 1000;
         keyFrames[i].tTo *= 1000;
     }
-
     //    for (int i = 0; i < keyFrames.size(); ++i) {
     //        sLog.outString("%f, %f, %f, %f, %f, %f, %f", keyFrames[i].x, keyFrames[i].y, keyFrames[i].distUntilStop, keyFrames[i].distSinceStop, keyFrames[i].distFromPrev, keyFrames[i].tFrom, keyFrames[i].tTo);
     //    }
-
     // Now we're completely set up; we can move along the length of each waypoint at 100 ms intervals
     // speed = max(30, t) (remember x = 0.5s^2, and when accelerating, a = 1 unit/s^2
     int t = 0;
     bool teleport = false;
     if (keyFrames[keyFrames.size() - 1].mapid != keyFrames[0].mapid)
         teleport = true;
-
     WayPoint pos(keyFrames[0].mapid, keyFrames[0].x, keyFrames[0].y, keyFrames[0].z, teleport, 0);
     m_WayPoints[0] = pos;
     t += keyFrames[0].delay * 1000;
-
     uint32 cM = keyFrames[0].mapid;
     for (size_t i = 0; i < keyFrames.size() - 1; ++i)
     {
         float d = 0;
         float tFrom = keyFrames[i].tFrom;
         float tTo = keyFrames[i].tTo;
-
         // keep the generation of all these points; we use only a few now, but may need the others later
         if (((d < keyFrames[i + 1].distFromPrev) && (tTo > 0)))
         {
@@ -336,27 +275,23 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
             {
                 tFrom += 100;
                 tTo -= 100;
-
                 if (d > 0)
                 {
                     float newX, newY, newZ;
                     newX = keyFrames[i].x + (keyFrames[i + 1].x - keyFrames[i].x) * d / keyFrames[i + 1].distFromPrev;
                     newY = keyFrames[i].y + (keyFrames[i + 1].y - keyFrames[i].y) * d / keyFrames[i + 1].distFromPrev;
                     newZ = keyFrames[i].z + (keyFrames[i + 1].z - keyFrames[i].z) * d / keyFrames[i + 1].distFromPrev;
-
                     bool teleport = false;
                     if (keyFrames[i].mapid != cM)
                     {
                         teleport = true;
                         cM = keyFrames[i].mapid;
                     }
-
                     //                    sLog.outString("T: %d, D: %f, x: %f, y: %f, z: %f", t, d, newX, newY, newZ);
                     WayPoint pos(keyFrames[i].mapid, newX, newY, newZ, teleport, i);
                     if (teleport)
                         m_WayPoints[t] = pos;
                 }
-
                 if (tFrom < tTo)                            // caught in tFrom dock's "gravitational pull"
                 {
                     if (tFrom <= 30000)
@@ -385,21 +320,17 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
             }
             t -= 100;
         }
-
         if (keyFrames[i + 1].tFrom > keyFrames[i + 1].tTo)
             t += 100 - ((long)keyFrames[i + 1].tTo % 100);
         else
             t += (long)keyFrames[i + 1].tTo % 100;
-
         bool teleport = false;
         if ((keyFrames[i + 1].actionflag == 1) || (keyFrames[i + 1].mapid != keyFrames[i].mapid))
         {
             teleport = true;
             cM = keyFrames[i + 1].mapid;
         }
-
         WayPoint pos(keyFrames[i + 1].mapid, keyFrames[i + 1].x, keyFrames[i + 1].y, keyFrames[i + 1].z, teleport, i);
-
         //        sLog.outString("T: %d, x: %f, y: %f, z: %f, t:%d", t, pos.x, pos.y, pos.z, teleport);
 /*
         if(keyFrames[i+1].delay > 5)
@@ -407,25 +338,18 @@ bool Transport::GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids)
 */
         //if (teleport)
         m_WayPoints[t] = pos;
-
         t += keyFrames[i + 1].delay * 1000;
         //        sLog.outString("------");
     }
-
     uint32 timer = t;
-
     //    sLog.outDetail("    Generated %lu waypoints, total time %u.", (unsigned long)m_WayPoints.size(), timer);
-
     m_curr = m_WayPoints.begin();
     m_curr = GetNextWayPoint();
     m_next = GetNextWayPoint();
     m_pathTime = timer;
-
     m_nextNodeTime = m_curr->first;
-
     return true;
 }
-
 Transport::WayPointMap::const_iterator Transport::GetNextWayPoint()
 {
     WayPointMap::const_iterator iter = m_curr;
@@ -434,77 +358,64 @@ Transport::WayPointMap::const_iterator Transport::GetNextWayPoint()
         iter = m_WayPoints.begin();
     return iter;
 }
-
 void Transport::TeleportTransport(uint32 newMapid, float x, float y, float z)
 {
     Map const* oldMap = GetMap();
     Relocate(x, y, z);
-
     for(PlayerSet::const_iterator itr = m_passengers.begin(); itr != m_passengers.end();)
     {
         Player *plr = *itr;
         ++itr;
-
         if (plr->isDead() && !plr->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
         {
             plr->ResurrectPlayer(1.0);
         }
         plr->TeleportTo(newMapid, x, y, z, GetOrientation(), TELE_TO_NOT_LEAVE_TRANSPORT);
-
         //WorldPacket data(SMSG_811, 4);
         //data << uint32(0);
         //plr->GetSession()->SendPacket(&data);
     }
-
     //we need to create and save new Map object with 'newMapid' because if not done -> lead to invalid Map object reference...
     //player far teleport would try to create same instance, but we need it NOW for transport...
     //correct me if I'm wrong O.o
     //yes, you're right
-
     ResetMap();
     Map * newMap = MapManager::Instance().CreateMap(newMapid, this, 0);
     SetMap(newMap);
     assert (GetMap());
-
     if(oldMap != newMap)
     {
         UpdateForMap(oldMap);
         UpdateForMap(newMap);
     }
 }
-
 bool Transport::AddPassenger(Player* passenger)
 {
     if(m_passengers.insert(passenger).second)
         sLog.outDetail("Player %s boarded transport %s.", passenger->GetName(), GetName());
     return true;
 }
-
 bool Transport::RemovePassenger(Player* passenger)
 {
     if (m_passengers.erase(passenger))
         sLog.outDetail("Player %s removed from transport %s.", passenger->GetName(), GetName());
     return true;
 }
-
 void Transport::CheckForEvent(uint32 entry, uint32 wp_id)
 {
     uint32 key = entry*100+wp_id;
     if(objmgr.TransportEventMap.find(key) != objmgr.TransportEventMap.end())
         GetMap()->ScriptsStart(sEventScripts, objmgr.TransportEventMap[key], this, NULL);
 }
-
 void Transport::Update(uint32 /*p_time*/)
 {
     if (m_WayPoints.size() <= 1)
         return;
-
     m_timer = getMSTime() % m_period;
     while (((m_timer - m_curr->first) % m_pathTime) > ((m_next->first - m_curr->first) % m_pathTime))
     {
         m_curr = GetNextWayPoint();
         m_next = GetNextWayPoint();
-
         // first check help in case client-server transport coordinates de-synchronization
         if (m_curr->second.mapid != GetMapId() || m_curr->second.teleport)
         {
@@ -543,26 +454,20 @@ void Transport::Update(uint32 /*p_time*/)
             //(*it2)->SetPosition( m_curr->second.x + (*it2)->GetTransOffsetX(), m_curr->second.y + (*it2)->GetTransOffsetY(), m_curr->second.z + (*it2)->GetTransOffsetZ(), (*it2)->GetTransOffsetO() );
         }
         */
-
         m_nextNodeTime = m_curr->first;
-
         if (m_curr == m_WayPoints.begin() && (sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES)==0)
             sLog.outDetail(" ************ BEGIN ************** %s", this->m_name.c_str());
-
         if ((sLog.getLogFilter() & LOG_FILTER_TRANSPORT_MOVES)==0)
             sLog.outDetail("%s moved to %d %f %f %f %d", this->m_name.c_str(), m_curr->second.id, m_curr->second.x, m_curr->second.y, m_curr->second.z, m_curr->second.mapid);
-
         //Transport Event System
         CheckForEvent(this->GetEntry(), m_curr->second.id);
     }
 }
-
 void Transport::UpdateForMap(Map const* targetMap)
 {
     Map::PlayerList const& pl = targetMap->GetPlayers();
     if(pl.isEmpty())
         return;
-
     if(GetMapId()==targetMap->GetId())
     {
         for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
@@ -583,7 +488,6 @@ void Transport::UpdateForMap(Map const* targetMap)
         BuildOutOfRangeUpdateBlock(&transData);
         WorldPacket out_packet;
         transData.BuildPacket(&out_packet);
-
         for(Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr)
             if(this != itr->getSource()->GetTransport())
                 itr->getSource()->SendDirectMessage(&out_packet);
diff --git a/src/game/Transports.h b/src/game/Transports.h
index e05a6006971..d60fece4738 100644
--- a/src/game/Transports.h
+++ b/src/game/Transports.h
@@ -17,16 +17,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRANSPORTS_H
 #define TRANSPORTS_H
-
 #include "GameObject.h"
-
 #include <map>
 #include <set>
 #include <string>
-
 class TransportPath
 {
     public:
@@ -37,40 +33,32 @@ class TransportPath
             uint32 actionFlag;
             uint32 delay;
         };
-
         void SetLength(const unsigned int sz)
         {
             i_nodes.resize( sz );
         }
-
         unsigned int Size(void) const { return i_nodes.size(); }
         bool Empty(void) const { return i_nodes.empty(); }
         void Resize(unsigned int sz) { i_nodes.resize(sz); }
         void Clear(void) { i_nodes.clear(); }
         PathNode* GetNodes(void) { return static_cast<PathNode *>(&i_nodes[0]); }
-
         PathNode& operator[](const unsigned int idx) { return i_nodes[idx]; }
         const PathNode& operator()(const unsigned int idx) const { return i_nodes[idx]; }
-
     protected:
         std::vector<PathNode> i_nodes;
 };
-
 class Transport : public GameObject
 {
     public:
         explicit Transport();
-
         bool Create(uint32 guidlow, uint32 mapid, float x, float y, float z, float ang, uint32 animprogress, uint32 dynflags);
         bool GenerateWaypoints(uint32 pathid, std::set<uint32> &mapids);
         void Update(uint32 p_time);
         bool AddPassenger(Player* passenger);
         bool RemovePassenger(Player* passenger);
         void CheckForEvent(uint32 entry, uint32 wp_id);
-
         typedef std::set<Player*> PlayerSet;
         PlayerSet const& GetPassengers() const { return m_passengers; }
-
     private:
         struct WayPoint
         {
@@ -84,21 +72,16 @@ class Transport : public GameObject
             bool teleport;
             uint32 id;
         };
-
         typedef std::map<uint32, WayPoint> WayPointMap;
-
         WayPointMap::const_iterator m_curr;
         WayPointMap::const_iterator m_next;
         uint32 m_pathTime;
         uint32 m_timer;
-
         PlayerSet m_passengers;
-
     public:
         WayPointMap m_WayPoints;
         uint32 m_nextNodeTime;
         uint32 m_period;
-
     private:
         void TeleportTransport(uint32 newMapid, float x, float y, float z);
         void UpdateForMap(Map const* map);
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index 279af30428a..c77be90e38a 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -17,19 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_TRAVELLER_H
 #define TRINITY_TRAVELLER_H
-
 #include "Creature.h"
 #include "Player.h"
 #include <cassert>
-
 /** Traveller is a wrapper for units (creatures or players) that
  * travel from point A to point B using the destination holder.
  */
 #define PLAYER_FLIGHT_SPEED        32.0f
-
 template<class T>
 struct TRINITY_DLL_DECL Traveller
 {
@@ -42,23 +38,19 @@ struct TRINITY_DLL_DECL Traveller
         new (this) Traveller(obj);
         return *this;
     }
-
     operator T&(void) { return i_traveller; }
     operator const T&(void) { return i_traveller; }
     float GetPositionX() const { return i_traveller.GetPositionX(); }
     float GetPositionY() const { return i_traveller.GetPositionY(); }
     float GetPositionZ() const { return i_traveller.GetPositionZ(); }
     T& GetTraveller(void) { return i_traveller; }
-
     float Speed(void) { assert(false); return 0.0f; }
     float GetMoveDestinationTo(float x, float y, float z);
     uint32 GetTotalTrevelTimeTo(float x, float y, float z);
-
     void Relocation(float x, float y, float z, float orientation) {}
     void Relocation(float x, float y, float z) { Relocation(x, y, z, i_traveller.GetOrientation()); }
     void MoveTo(float x, float y, float z, uint32 t) {}
 };
-
 template<class T>
 inline uint32 Traveller<T>::GetTotalTrevelTimeTo(float x, float y, float z)
 {
@@ -70,7 +62,6 @@ inline uint32 Traveller<T>::GetTotalTrevelTimeTo(float x, float y, float z)
         speed *= 0.001f;   // speed is in seconds so convert from second to millisecond
     return static_cast<uint32>(dist/speed);
 }
-
 // specialization for creatures
 template<>
 inline float Traveller<Creature>::Speed()
@@ -84,34 +75,29 @@ inline float Traveller<Creature>::Speed()
     else
         return i_traveller.GetSpeed(MOVE_RUN);
 }
-
 template<>
 inline void Traveller<Creature>::Relocation(float x, float y, float z, float orientation)
 {
     i_traveller.GetMap()->CreatureRelocation(&i_traveller, x, y, z, orientation);
 }
-
 template<>
 inline float Traveller<Creature>::GetMoveDestinationTo(float x, float y, float z)
 {
     float dx = x - GetPositionX();
     float dy = y - GetPositionY();
     float dz = z - GetPositionZ();
-
     //if(i_traveller.HasUnitMovementFlag(MOVEMENTFLAG_FLYING))
         return sqrt((dx*dx) + (dy*dy) + (dz*dz));
     //else                                                    //Walking on the ground
     //    return sqrt((dx*dx) + (dy*dy));
 }
 
-
 template<>
 inline void Traveller<Creature>::MoveTo(float x, float y, float z, uint32 t)
 {
     //i_traveller.AI_SendMoveToPacket(x, y, z, t, i_traveller.GetUnitMovementFlags(), 0);
     i_traveller.SendMonsterMove(x, y, z, t);
 }
-
 // specialization for players
 template<>
 inline float Traveller<Player>::Speed()
@@ -123,33 +109,28 @@ inline float Traveller<Player>::Speed()
     else
         return i_traveller.GetSpeed(i_traveller.m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALK_MODE) ? MOVE_WALK : MOVE_RUN);
 }
-
 template<>
 inline float Traveller<Player>::GetMoveDestinationTo(float x, float y, float z)
 {
     float dx = x - GetPositionX();
     float dy = y - GetPositionY();
     float dz = z - GetPositionZ();
-
     //if (i_traveller.isInFlight())
         return sqrt((dx*dx) + (dy*dy) + (dz*dz));
     //else                                                    //Walking on the ground
     //    return sqrt((dx*dx) + (dy*dy));
 }
-
 template<>
 inline void Traveller<Player>::Relocation(float x, float y, float z, float orientation)
 {
     i_traveller.GetMap()->PlayerRelocation(&i_traveller, x, y, z, orientation);
 }
-
 template<>
 inline void Traveller<Player>::MoveTo(float x, float y, float z, uint32 t)
 {
     //Only send MOVEMENTFLAG_WALK_MODE, client has strange issues with other move flags
     i_traveller.SendMonsterMove(x, y, z, t);
 }
-
 typedef Traveller<Creature> CreatureTraveller;
 typedef Traveller<Player> PlayerTraveller;
 #endif
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 94a88fba710..4885d38585e 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -54,9 +53,7 @@
 #include "Vehicle.h"
 #include "Transports.h"
 #include "ScriptCalls.h"
-
 #include <math.h>
-
 float baseMoveSpeed[MAX_MOVE_TYPE] =
 {
     2.5f,                  // MOVE_WALK
@@ -80,7 +77,6 @@ float playerBaseMoveSpeed[MAX_MOVE_TYPE] = {
     4.5f,                  // MOVE_FLIGHT_BACK
     3.14f                  // MOVE_PITCH_RATE
 };
-
 // Used for prepare can/can`t triggr aura
 static bool InitTriggerAuraData();
 // Define can trigger auras
@@ -89,7 +85,6 @@ static bool isTriggerAura[TOTAL_AURAS];
 static bool isNonTriggerAura[TOTAL_AURAS];
 // Prepare lists
 static bool procPrepared = InitTriggerAuraData();
-
 Unit::Unit()
 : WorldObject(), i_motionMaster(this), m_ThreatManager(this), m_HostilRefManager(this)
 , m_NotifyListPos(-1), m_Notified(false), IsAIEnabled(false), NeedChangeAI(false)
@@ -99,47 +94,36 @@ Unit::Unit()
 {
     m_objectType |= TYPEMASK_UNIT;
     m_objectTypeId = TYPEID_UNIT;
-
     m_updateFlag = (UPDATEFLAG_HIGHGUID | UPDATEFLAG_LIVING | UPDATEFLAG_HAS_POSITION);
-
     m_attackTimer[BASE_ATTACK]   = 0;
     m_attackTimer[OFF_ATTACK]    = 0;
     m_attackTimer[RANGED_ATTACK] = 0;
     m_modAttackSpeedPct[BASE_ATTACK] = 1.0f;
     m_modAttackSpeedPct[OFF_ATTACK] = 1.0f;
     m_modAttackSpeedPct[RANGED_ATTACK] = 1.0f;
-
     m_extraAttacks = 0;
     m_canDualWield = false;
-
     m_state = 0;
     m_form = FORM_NONE;
     m_deathState = ALIVE;
-
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; i++)
         m_currentSpells[i] = NULL;
-
     m_addDmgOnce = 0;
-
     for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i)
         m_SummonSlot[i] = 0;
-
     m_ObjectSlot[0] = m_ObjectSlot[1] = m_ObjectSlot[2] = m_ObjectSlot[3] = 0;
     //m_Aura = NULL;
     //m_AurasCheck = 2000;
     //m_removeAuraTimer = 4;
     //tmpAura = NULL;
-
     m_AurasUpdateIterator = m_Auras.end();
     m_Visibility = VISIBILITY_ON;
-
     m_interruptMask = 0;
     m_detectInvisibilityMask = 0;
     m_invisibilityMask = 0;
     m_transform = 0;
     m_ShapeShiftFormSpellId = 0;
     m_canModifyStats = false;
-
     for (uint8 i = 0; i < MAX_SPELL_IMMUNITY; ++i)
         m_spellImmune[i].clear();
     for (uint8 i = 0; i < UNIT_MOD_END; ++i)
@@ -151,7 +135,6 @@ Unit::Unit()
     }
                                                             // implement 50% base damage from offhand
     m_auraModifiersGroup[UNIT_MOD_DAMAGE_OFFHAND][TOTAL_PCT] = 0.5f;
-
     for (uint8 i = 0; i < MAX_ATTACK; ++i)
     {
         m_weaponDamage[i][MINDAMAGE] = BASE_MINDAMAGE;
@@ -159,33 +142,27 @@ Unit::Unit()
     }
     for (uint8 i = 0; i < MAX_STATS; ++i)
         m_createStats[i] = 0.0f;
-
     m_attacking = NULL;
     m_modMeleeHitChance = 0.0f;
     m_modRangedHitChance = 0.0f;
     m_modSpellHitChance = 0.0f;
     m_baseSpellCritChance = 5;
-
     m_CombatTimer = 0;
     m_lastManaUse = 0;
-
     //m_victimThreat = 0.0f;
     for (uint8 i = 0; i < MAX_SPELL_SCHOOL; ++i)
         m_threatModifier[i] = 1.0f;
     m_isSorted = true;
     for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
         m_speed_rate[i] = 1.0f;
-
     m_charmInfo = NULL;
     //m_unit_movement_flags = 0;
     m_reducedThreatPercent = 0;
     m_misdirectionTargetGUID = 0;
-
     // remove aurastates allowing special moves
     for(uint8 i = 0; i < MAX_REACTIVE; ++i)
         m_reactiveTimer[i] = 0;
 }
-
 Unit::~Unit()
 {
     // set current spells as deletable
@@ -197,20 +174,16 @@ Unit::~Unit()
             m_currentSpells[i] = NULL;
         }
     }
-
     RemoveAllGameObjects();
     RemoveAllDynObjects();
     _DeleteAuras();
-
     if(m_charmInfo) delete m_charmInfo;
     if(m_vehicleKit) delete m_vehicleKit;
-
     assert(!m_attacking);
     assert(m_attackers.empty());
     assert(m_sharedVision.empty());
     assert(m_Controlled.empty());
 }
-
 void Unit::Update( uint32 p_time )
 {
     /*if(p_time > m_AurasCheck)
@@ -219,20 +192,16 @@ void Unit::Update( uint32 p_time )
     _UpdateAura();
     } else
     m_AurasCheck -= p_time;*/
-
     // WARNING! Order of execution here is important, do not change.
     // Spells must be processed with event system BEFORE they go to _UpdateSpells.
     // Or else we may have some SPELL_STATE_FINISHED spells stalled in pointers, that is bad.
     m_Events.Update( p_time );
     _UpdateSpells( p_time );
-
     // If this is set during update SetCantProc(false) call is missing somewhere in the code
     // Having this would prevent spells from being proced, so let's crash
     assert(!m_procDeep);
-
     if (CanHaveThreatList() && getThreatManager().isNeedUpdateToClient(p_time))
         SendThreatListUpdate();
-
     // update combat timer only for players and pets (only pets with PetAI)
     if (isInCombat() && (GetTypeId() == TYPEID_PLAYER || (((Creature *)this)->isPet() && IsControlledByPlayer())))
     {
@@ -248,7 +217,6 @@ void Unit::Update( uint32 p_time )
                 m_CombatTimer -= p_time;
         }
     }
-
     //not implemented before 3.0.2
     //if(!hasUnitState(UNIT_STAT_CASTING))
     {
@@ -259,17 +227,13 @@ void Unit::Update( uint32 p_time )
         if(uint32 off_att = getAttackTimer(OFF_ATTACK))
             setAttackTimer(OFF_ATTACK, (p_time >= off_att ? 0 : off_att - p_time) );
     }
-
     // update abilities available only for fraction of time
     UpdateReactives( p_time );
-
     ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, GetHealth() < GetMaxHealth()*0.20f);
     ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, GetHealth() < GetMaxHealth()*0.35f);
     ModifyAuraState(AURA_STATE_HEALTH_ABOVE_75_PERCENT, GetHealth() > GetMaxHealth()*0.75f);
-
     i_motionMaster.UpdateMotion(p_time);
 }
-
 bool Unit::haveOffhandWeapon() const
 {
     if(GetTypeId() == TYPEID_PLAYER)
@@ -277,14 +241,12 @@ bool Unit::haveOffhandWeapon() const
     else
         return m_canDualWield;
 }
-
 void Unit::SendMonsterMoveWithSpeedToCurrentDestination(Player* player)
 {
     float x, y, z;
     if(GetMotionMaster()->GetDestination(x, y, z))
         SendMonsterMoveWithSpeed(x, y, z, 0, player);
 }
-
 void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime, Player* player)
 {
     if (!transitTime)
@@ -303,7 +265,6 @@ void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTim
     //float orientation = (float)atan2((double)dy, (double)dx);
     SendMonsterMove(x, y, z, transitTime, player);
 }
-
 void Unit::SendMonsterStop()
 {
     WorldPacket data( SMSG_MONSTER_MOVE, (17 + GetPackGUID().size()) );
@@ -313,45 +274,35 @@ void Unit::SendMonsterStop()
     data << getMSTime();
     data << uint8(1);
     SendMessageToSet(&data, true);
-
     clearUnitState(UNIT_STAT_MOVE);
 }
-
 void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 Time, Player* player)
 {
     WorldPacket data( SMSG_MONSTER_MOVE, 1+12+4+1+4+4+4+12+GetPackGUID().size());
     data.append(GetPackGUID());
-
     data << uint8(0);                                       // new in 3.1
     data << GetPositionX() << GetPositionY() << GetPositionZ();
     data << getMSTime();
-
     data << uint8(0);
     data << uint32((GetUnitMovementFlags() & MOVEMENTFLAG_LEVITATING) ? MOVEFLAG_FLY : MOVEFLAG_WALK);
     data << Time;                                           // Time in between points
     data << uint32(1);                                      // 1 single waypoint
     data << NewPosX << NewPosY << NewPosZ;                  // the single waypoint Point B
-
     if(player)
         player->GetSession()->SendPacket(&data);
     else
         SendMessageToSet( &data, true );
-
     addUnitState(UNIT_STAT_MOVE);
 }
-
 void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 MoveFlags, uint32 time, float speedZ, Player *player)
 {
     WorldPacket data( SMSG_MONSTER_MOVE, 12+4+1+4+4+4+12+GetPackGUID().size());
     data.append(GetPackGUID());
-
     data << uint8(0);                                       // new in 3.1
     data << GetPositionX() << GetPositionY() << GetPositionZ();
     data << getMSTime();
-
     data << uint8(0);
     data << MoveFlags;
-
     if(MoveFlags & MOVEFLAG_JUMP)
     {
         data << time;
@@ -360,26 +311,21 @@ void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 M
     }
     else
         data << time;
-
     data << uint32(1);                                      // 1 single waypoint
     data << NewPosX << NewPosY << NewPosZ;                  // the single waypoint Point B
-
     if(player)
         player->GetSession()->SendPacket(&data);
     else
         SendMessageToSet( &data, true );
 }
-
 /*void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint8 type, uint32 MovementFlags, uint32 Time, Player* player)
 {
     float moveTime = Time;
-
     WorldPacket data( SMSG_MONSTER_MOVE, (41 + GetPackGUID().size()) );
     data.append(GetPackGUID());
     data << uint8(0);                                       // new in 3.1
     data << GetPositionX() << GetPositionY() << GetPositionZ();
     data << uint32(getMSTime());
-
     data << uint8(type);                                    // unknown
     switch(type)
     {
@@ -400,28 +346,21 @@ void Unit::SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 M
             data << float(0);                               // facing angle
             break;
     }
-
     data << uint32(MovementFlags);
-
     if(MovementFlags & MONSTER_MOVE_WALK)
         moveTime *= 1.05f;
-
     data << uint32(moveTime);                               // Time in between points
     data << uint32(1);                                      // 1 single waypoint
     data << NewPosX << NewPosY << NewPosZ;                  // the single waypoint Point B
-
     if(player)
         player->GetSession()->SendPacket(&data);
     else
         SendMessageToSet( &data, true );
 }*/
-
 void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end)
 {
     uint32 traveltime = uint32(path.GetTotalLength(start, end) * 32);
-
     uint32 pathSize = end - start;
-
     WorldPacket data( SMSG_MONSTER_MOVE, (GetPackGUID().size()+1+4+4+4+4+1+4+4+4+pathSize*4*3) );
     data.append(GetPackGUID());
     data << uint8(0);
@@ -438,7 +377,6 @@ void Unit::SendMonsterMoveByPath(Path const& path, uint32 start, uint32 end)
 //MONSTER_MOVE_SPLINE_FLY
     addUnitState(UNIT_STAT_MOVE);
 }
-
 void Unit::SendMonsterMoveTransport(Unit *vehicleOwner)
 {
     WorldPacket data(SMSG_MONSTER_MOVE_TRANSPORT, GetPackGUID().size()+vehicleOwner->GetPackGUID().size());
@@ -459,42 +397,32 @@ void Unit::SendMonsterMoveTransport(Unit *vehicleOwner)
     data << uint32(0);//GetTransOffsetZ();
     SendMessageToSet(&data, true);
 }
-
 void Unit::resetAttackTimer(WeaponAttackType type)
 {
     m_attackTimer[type] = uint32(GetAttackTime(type) * m_modAttackSpeedPct[type]);
 }
-
 bool Unit::IsWithinCombatRange(const Unit *obj, float dist2compare) const
 {
     if (!obj || !IsInMap(obj)) return false;
-
     float dx = GetPositionX() - obj->GetPositionX();
     float dy = GetPositionY() - obj->GetPositionY();
     float dz = GetPositionZ() - obj->GetPositionZ();
     float distsq = dx*dx + dy*dy + dz*dz;
-
     float sizefactor = GetCombatReach() + obj->GetCombatReach();
     float maxdist = dist2compare + sizefactor;
-
     return distsq < maxdist * maxdist;
 }
-
 bool Unit::IsWithinMeleeRange(const Unit *obj, float dist) const
 {
     if (!obj || !IsInMap(obj)) return false;
-
     float dx = GetPositionX() - obj->GetPositionX();
     float dy = GetPositionY() - obj->GetPositionY();
     float dz = GetPositionZ() - obj->GetPositionZ();
     float distsq = dx*dx + dy*dy + dz*dz;
-
     float sizefactor = GetMeleeReach() + obj->GetMeleeReach();
     float maxdist = dist + sizefactor;
-
     return distsq < maxdist * maxdist;
 }
-
 void Unit::GetRandomContactPoint( const Unit* obj, float &x, float &y, float &z, float distance2dMin, float distance2dMax ) const
 {
     float combat_reach = GetCombatReach();
@@ -510,12 +438,10 @@ void Unit::GetRandomContactPoint( const Unit* obj, float &x, float &y, float &z,
     GetNearPoint(obj,x,y,z,obj->GetCombatReach(), distance2dMin+(distance2dMax-distance2dMin)*rand_norm()
         , GetAngle(obj) + (attacker_number ? (M_PI/2 - M_PI * rand_norm()) * (float)attacker_number / combat_reach * 0.3 : 0));
 }
-
 void Unit::RemoveMovementImpairingAuras()
 {
     RemoveAurasWithMechanic((1<<MECHANIC_SNARE)|(1<<MECHANIC_ROOT));
     return;
-
     for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();)
     {
         if(spellmgr.GetSpellCustomAttr(iter->second->GetId()) & SPELL_ATTR_CU_MOVEMENT_IMPAIR)
@@ -524,12 +450,10 @@ void Unit::RemoveMovementImpairingAuras()
             ++iter;
     }
 }
-
 void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except)
 {
     if(!(m_interruptMask & flag))
         return;
-
     // interrupt auras
     for (AuraList::iterator iter = m_interruptableAuras.begin(); iter != m_interruptableAuras.end();)
     {
@@ -543,17 +467,14 @@ void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except)
                 iter = m_interruptableAuras.begin();
         }
     }
-
     // interrupt channeled spell
     if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL])
         if(spell->getState() == SPELL_STATE_CASTING
             && (spell->m_spellInfo->ChannelInterruptFlags & flag)
             && spell->m_spellInfo->Id != except)
             InterruptNonMeleeSpells(false);
-
     UpdateInterruptMask();
 }
-
 void Unit::RemoveAurasWithFamily(uint32 family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID)
 {
     for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();)
@@ -570,7 +491,6 @@ void Unit::RemoveAurasWithFamily(uint32 family, uint32 familyFlag1, uint32 famil
         ++iter;
     }
 }
-
 void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemode, uint32 except)
 {
     for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();)
@@ -586,18 +506,15 @@ void Unit::RemoveAurasWithMechanic(uint32 mechanic_mask, AuraRemoveMode removemo
         ++iter;
     }
 }
-
 void Unit::UpdateInterruptMask()
 {
     m_interruptMask = 0;
     for(AuraList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i)
         m_interruptMask |= (*i)->GetSpellProto()->AuraInterruptFlags;
-
     if(Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL])
         if(spell->getState() == SPELL_STATE_CASTING)
             m_interruptMask |= spell->m_spellInfo->ChannelInterruptFlags;
 }
-
 bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint32 familyFlags) const
 {
     if(!HasAuraType(auraType)) return false;
@@ -608,7 +525,6 @@ bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint
                 return true;
     return false;
 }
-
 void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
 {
     if (!pVictim->isAlive() || pVictim->hasUnitState(UNIT_STAT_UNATTACKABLE) || pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
@@ -618,7 +534,6 @@ void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
         damage = 0;
         return;
     }
-
     //You don't lose health from damage taken from another player while in a sanctuary
     //You still see it in the combat log though
     if(pVictim != this && IsControlledByPlayer() && pVictim->IsControlledByPlayer())
@@ -631,20 +546,16 @@ void Unit::DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb)
             damage = 0;
         }
     }
-
     uint32 originalDamage = damage;
-
     //Script Event damage Deal
     //if( GetTypeId()== TYPEID_UNIT && ((Creature *)this)->AI())
     //    ((Creature *)this)->AI()->DamageDeal(pVictim, damage);
     //Script Event damage taken
     //if( pVictim->GetTypeId()== TYPEID_UNIT && ((Creature *)pVictim)->IsAIEnabled )
     //    ((Creature *)pVictim)->AI()->DamageTaken(this, damage);
-
     if(absorb && originalDamage > damage)
         absorb += (originalDamage - damage);
 }
-
 uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage, DamageEffectType damagetype, SpellSchoolMask damageSchoolMask, SpellEntry const *spellProto, bool durabilityLoss)
 {
     if(pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsAIEnabled)
@@ -656,16 +567,13 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         // interrupting auras with AURA_INTERRUPT_FLAG_DAMAGE before checking !damage (absorbed damage breaks that type of auras)
         pVictim->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TAKE_DAMAGE, spellProto ? spellProto->Id : 0);
     }
-
     if(!damage)
     {
         // Rage from absorbed damage
         if(cleanDamage && cleanDamage->absorbed_damage && pVictim->getPowerType() == POWER_RAGE)
             pVictim->RewardRage(cleanDamage->absorbed_damage, 0, false);
-
         return 0;
     }
-
     // no xp,health if type 8 /critters/
     if(pVictim->GetTypeId() != TYPEID_PLAYER && pVictim->GetCreatureType() == CREATURE_TYPE_CRITTER)
     {
@@ -674,11 +582,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         {
             pVictim->setDeathState(JUST_DIED);
             pVictim->SetHealth(0);
-
             CreatureInfo const* cInfo = ((Creature*)pVictim)->GetCreatureInfo();
             if(cInfo && cInfo->lootid)
                 pVictim->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
-
             // some critters required for quests (need normal entry instead possible heroic in any cases)
             if(GetTypeId() == TYPEID_PLAYER)
                 if(CreatureInfo const* normalInfo = objmgr.GetCreatureTemplate(pVictim->GetEntry()))
@@ -686,15 +592,11 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         }
         else
             pVictim->ModifyHealth(- (int32)damage);
-
         return damage;
     }
-
     DEBUG_LOG("DealDamageStart");
-
     uint32 health = pVictim->GetHealth();
     sLog.outDetail("deal dmg:%d to health:%d ",damage,health);
-
     // duel ends when player has 1 or less hp
     bool duel_hasEnded = false;
     if(pVictim->GetTypeId() == TYPEID_PLAYER && ((Player*)pVictim)->duel && damage >= (health-1))
@@ -702,16 +604,13 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
         // prevent kill only if killed in duel and killed by opponent or opponent controlled creature
         if(((Player*)pVictim)->duel->opponent==this || ((Player*)pVictim)->duel->opponent->GetGUID() == GetOwnerGUID())
             damage = health-1;
-
         duel_hasEnded = true;
     }
-
     // Rage from Damage made (only from direct weapon damage)
     if(cleanDamage && damagetype==DIRECT_DAMAGE && this != pVictim && getPowerType() == POWER_RAGE)
     {
         uint32 weaponSpeedHitFactor;
         uint32 rage_damage = damage + cleanDamage->absorbed_damage;
-
         switch(cleanDamage->attackType)
         {
             case BASE_ATTACK:
@@ -720,9 +619,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                     weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 7);
                 else
                     weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 3.5f);
-
                 RewardRage(rage_damage, weaponSpeedHitFactor, true);
-
                 break;
             }
             case OFF_ATTACK:
@@ -731,20 +628,16 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                     weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 3.5f);
                 else
                     weaponSpeedHitFactor = uint32(GetAttackTime(cleanDamage->attackType)/1000.0f * 1.75f);
-
                 RewardRage(rage_damage, weaponSpeedHitFactor, true);
-
                 break;
             }
             case RANGED_ATTACK:
                 break;
         }
     }
-
     if (GetTypeId() == TYPEID_PLAYER && this != pVictim)
     {
         Player *killer = ((Player*)this);
-
         // in bg, count dmg if victim is also a player
         if (pVictim->GetTypeId()==TYPEID_PLAYER)
         {
@@ -754,32 +647,25 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                 bg->UpdatePlayerScore(killer, SCORE_DAMAGE_DONE, damage);
             }
         }
-
         killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_DAMAGE_DONE, damage, 0, pVictim);
         killer->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_DEALT, damage);
     }
-
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
         ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HIT_RECEIVED, damage);
-    else if(!pVictim->IsControlledByPlayer()) 
+    else if(!pVictim->IsControlledByPlayer())
     {
         //!pVictim->HasFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_OTHER_TAGGER)
         if(!((Creature*)pVictim)->hasLootRecipient())
             ((Creature*)pVictim)->SetLootRecipient(this);
-
         if(IsControlledByPlayer())
             ((Creature*)pVictim)->LowerPlayerDamageReq(health < damage ?  health : damage);
     }
-    
     if (health <= damage)
     {
         DEBUG_LOG("DealDamage: victim just died");
-
         if (pVictim->GetTypeId() == TYPEID_PLAYER)
             ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, health);
-
         Kill(pVictim, durabilityLoss);
-
         //Hook for OnPVPKill Event
         if (pVictim->GetTypeId() == TYPEID_PLAYER && this->GetTypeId() == TYPEID_PLAYER)
         {
@@ -797,12 +683,9 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
     else                                                    // if (health <= damage)
     {
         DEBUG_LOG("DealDamageAlive");
-
         if (pVictim->GetTypeId() == TYPEID_PLAYER)
             ((Player*)pVictim)->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_DAMAGE_RECEIVED, damage);
-
         pVictim->ModifyHealth(- (int32)damage);
-
         if(damagetype == DIRECT_DAMAGE || damagetype == SPELL_DIRECT_DAMAGE)
         {
             //TODO: This is from procflag, I do not know which spell needs this
@@ -826,14 +709,12 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                 ((Player*)pVictim)->DurabilityPointLossForEquipSlot(slot);
             }
         }
-
         // Rage from damage received
         if(this != pVictim && pVictim->getPowerType() == POWER_RAGE)
         {
             uint32 rage_damage = damage + (cleanDamage ? cleanDamage->absorbed_damage : 0);
             pVictim->RewardRage(rage_damage, 0, false);
         }
-
         if(GetTypeId()==TYPEID_PLAYER)
         {
             // random durability for items (HIT DONE)
@@ -843,7 +724,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                 ((Player*)this)->DurabilityPointLossForEquipSlot(slot);
             }
         }
-
         if (damagetype != NODAMAGE && damage)// && pVictim->GetTypeId() == TYPEID_PLAYER)
         {
             if(pVictim != this && pVictim->GetTypeId() == TYPEID_PLAYER) // does not support creature push_back
@@ -862,7 +742,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                         }
                     }
                 }
-
                 if(Spell* spell = pVictim->m_currentSpells[CURRENT_CHANNELED_SPELL])
                 {
                     if(spell->getState() == SPELL_STATE_CASTING)
@@ -874,50 +753,38 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                 }
             }
         }
-
         // last damage from duel opponent
         if(duel_hasEnded)
         {
             assert(pVictim->GetTypeId()==TYPEID_PLAYER);
             Player *he = (Player*)pVictim;
-
             assert(he->duel);
-
             he->SetHealth(1);
-
             he->duel->opponent->CombatStopWithPets(true);
             he->CombatStopWithPets(true);
-
             he->CastSpell(he, SPELL_ID_DUEL_BEG, true);                  // beg
             he->DuelComplete(DUEL_WON);
         }
     }
-
     DEBUG_LOG("DealDamageEnd returned %d damage", damage);
-
     return damage;
 }
-
 void Unit::CastStop(uint32 except_spellid)
 {
     for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++)
         if (m_currentSpells[i] && m_currentSpells[i]->m_spellInfo->Id!=except_spellid)
             InterruptSpell(CurrentSpellTypes(i),false);
 }
-
 void Unit::CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
-
     if(!spellInfo)
     {
         sLog.outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     CastSpell(Victim,spellInfo,triggered,castItem,triggeredByAura, originalCaster);
 }
-
 void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     if(!spellInfo)
@@ -925,11 +792,9 @@ void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, I
         sLog.outError("CastSpell: unknown spell by caster: %s %u)", (GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     if (!originalCaster && GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem() && IsControlledByPlayer())
         if (Unit * owner = GetOwner())
             originalCaster=owner->GetGUID();
-
     SpellCastTargets targets;
     uint32 targetMask = spellInfo->Targets;
     //if(targetMask & (TARGET_FLAG_UNIT|TARGET_FLAG_UNK2))
@@ -953,7 +818,6 @@ void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, I
         }
     }
     targets.setUnitTarget(Victim);
-
     if(targetMask & (TARGET_FLAG_SOURCE_LOCATION|TARGET_FLAG_DEST_LOCATION))
     {
         if(!Victim)
@@ -963,19 +827,14 @@ void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, I
         }
         targets.setDst(Victim);
     }
-
     if (castItem)
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
-
     if(!originalCaster && triggeredByAura)
         originalCaster = triggeredByAura->GetCasterGUID();
-
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
-
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
 }
-
 void Unit::CastCustomSpell(Unit* target, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     CustomSpellValues values;
@@ -984,14 +843,12 @@ void Unit::CastCustomSpell(Unit* target, uint32 spellId, int32 const* bp0, int32
     if(bp2) values.AddSpellMod(SPELLVALUE_BASE_POINT2, *bp2);
     CastCustomSpell(spellId, values, target, triggered, castItem, triggeredByAura, originalCaster);
 }
-
 void Unit::CastCustomSpell(uint32 spellId, SpellValueMod mod, int32 value, Unit* target, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     CustomSpellValues values;
     values.AddSpellMod(mod, value);
     CastCustomSpell(spellId, values, target, triggered, castItem, triggeredByAura, originalCaster);
 }
-
 void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit* Victim, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
@@ -1000,10 +857,8 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit*
         sLog.outError("CastSpell: unknown spell id %i by caster: %s %u)", spellId,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     SpellCastTargets targets;
     uint32 targetMask = spellInfo->Targets;
-
     //check unit target
     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
@@ -1019,7 +874,6 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit*
         }
     }
     targets.setUnitTarget(Victim);
-
     //check destination
     if(targetMask & (TARGET_FLAG_SOURCE_LOCATION|TARGET_FLAG_DEST_LOCATION))
     {
@@ -1030,43 +884,32 @@ void Unit::CastCustomSpell(uint32 spellId, CustomSpellValues const &value, Unit*
         }
         targets.setDst(Victim);
     }
-
     if(!originalCaster && triggeredByAura)
         originalCaster = triggeredByAura->GetCasterGUID();
-
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
-
     if(castItem)
     {
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
         spell->m_CastItem = castItem;
     }
-
     for(CustomSpellValues::const_iterator itr = value.begin(); itr != value.end(); ++itr)
         spell->SetSpellValue(itr->first, itr->second);
-
     spell->prepare(&targets, triggeredByAura);
 }
-
 // used for scripting
 void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster, Unit* OriginalVictim)
 {
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
-
     if(!spellInfo)
     {
         sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s %u)", spellId,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     if (castItem)
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
-
     if(!originalCaster && triggeredByAura)
         originalCaster = triggeredByAura->GetCasterGUID();
-
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
-
     SpellCastTargets targets;
     targets.setDst(x, y, z);
     if(OriginalVictim)
@@ -1074,41 +917,32 @@ void Unit::CastSpell(float x, float y, float z, uint32 spellId, bool triggered,
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
 }
-
 // used for scripting
 void Unit::CastSpell(GameObject *go, uint32 spellId, bool triggered, Item *castItem, AuraEffect* triggeredByAura, uint64 originalCaster)
 {
     if(!go)
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId );
-
     if(!spellInfo)
     {
         sLog.outError("CastSpell(x,y,z): unknown spell id %i by caster: %s %u)", spellId,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     if(!(spellInfo->Targets & ( TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_UNK)))
     {
         sLog.outError("CastSpell: spell id %i by caster: %s %u) is not gameobject spell", spellId,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
         return;
     }
-
     if (castItem)
         DEBUG_LOG("WORLD: cast Item spellId - %i", spellInfo->Id);
-
     if(!originalCaster && triggeredByAura)
         originalCaster = triggeredByAura->GetCasterGUID();
-
     Spell *spell = new Spell(this, spellInfo, triggered, originalCaster );
-
     SpellCastTargets targets;
     targets.setGOTarget(go);
     spell->m_CastItem = castItem;
     spell->prepare(&targets, triggeredByAura);
 }
-
 // Obsolete func need remove, here only for comotability vs another patches
 uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage)
 {
@@ -1121,22 +955,18 @@ uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage
     DealSpellDamage(&damageInfo, true);
     return damageInfo.damage;
 }
-
 void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType, bool crit)
 {
     if (damage < 0)
         return;
-
     if(spellInfo->AttributesEx4 & SPELL_ATTR_EX4_FIXED_DAMAGE)
     {
         damageInfo->damage = damage;
         return;
     }
-
     Unit *pVictim = damageInfo->target;
     if(!pVictim || !pVictim->isAlive())
         return;
-
     SpellSchoolMask damageSchoolMask = SpellSchoolMask(damageInfo->schoolMask);
     uint32 crTypeMask = pVictim->GetCreatureTypeMask();
     // Check spell crit chance
@@ -1155,18 +985,15 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
                 // Get blocked status
                 blocked = isSpellBlocked(pVictim, spellInfo, attackType);
             }
-
             if (crit)
             {
                 damageInfo->HitInfo|= SPELL_HIT_TYPE_CRIT;
-
                 // Calculate crit bonus
                 uint32 crit_bonus = damage;
                 // Apply crit_damage bonus for melee spells
                 if(Player* modOwner = GetSpellModOwner())
                     modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
                 damage += crit_bonus;
-
                 // Apply SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_DAMAGE or SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE
                 int32 critPctDamageMod=0;
                 if(attackType == RANGED_ATTACK)
@@ -1178,10 +1005,8 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
                 }
                 // Increase crit damage from SPELL_AURA_MOD_CRIT_PERCENT_VERSUS
                 critPctDamageMod += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, crTypeMask);
-
                 if (critPctDamageMod!=0)
                     damage = int32((damage) * float((100.0f + critPctDamageMod)/100.0f));
-
                 // Resilience - reduce crit damage
                 if (pVictim->GetTypeId()==TYPEID_PLAYER)
                     damage -= ((Player*)pVictim)->GetMeleeCritDamageReduction(damage);
@@ -1215,10 +1040,8 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
         }
         break;
     }
-
     if( damageSchoolMask & SPELL_SCHOOL_MASK_NORMAL )
         damage = CalcArmorReducedDamage(pVictim, damage, spellInfo, attackType);
-
     // Calculate absorb resist
     if(damage > 0)
     {
@@ -1229,27 +1052,21 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 dama
         damage = 0;
     damageInfo->damage = damage;
 }
-
 void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
 {
     if (damageInfo==0)
         return;
-
     Unit *pVictim = damageInfo->target;
-
     if(!pVictim)
         return;
-
     if (!pVictim->isAlive() || pVictim->hasUnitState(UNIT_STAT_UNATTACKABLE) || pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return;
-
     SpellEntry const *spellProto = sSpellStore.LookupEntry(damageInfo->SpellID);
     if (spellProto == NULL)
     {
         sLog.outDebug("Unit::DealSpellDamage have wrong damageInfo->SpellID: %u", damageInfo->SpellID);
         return;
     }
-
     //You don't lose health from damage taken from another player while in a sanctuary
     //You still see it in the combat log though
     if(pVictim != this && IsControlledByPlayer() && pVictim->IsControlledByPlayer())
@@ -1258,12 +1075,10 @@ void Unit::DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss)
         if(area && area->IsSanctuary())       // sanctuary
             return;
     }
-
     // Call default DealDamage
     CleanDamage cleanDamage(damageInfo->cleanDamage, damageInfo->absorb, BASE_ATTACK, MELEE_HIT_NORMAL);
     DealDamage(pVictim, damageInfo->damage, &cleanDamage, SPELL_DIRECT_DAMAGE, SpellSchoolMask(damageInfo->schoolMask), spellProto, durabilityLoss);
 }
-
 //TODO for melee need create structure as in
 void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *damageInfo, WeaponAttackType attackType)
 {
@@ -1276,19 +1091,16 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
     damageInfo->absorb           = 0;
     damageInfo->resist           = 0;
     damageInfo->blocked_amount   = 0;
-
     damageInfo->TargetState      = 0;
     damageInfo->HitInfo          = 0;
     damageInfo->procAttacker     = PROC_FLAG_NONE;
     damageInfo->procVictim       = PROC_FLAG_NONE;
     damageInfo->procEx           = PROC_EX_NONE;
     damageInfo->hitOutCome       = MELEE_HIT_EVADE;
-
     if(!pVictim)
         return;
     if(!this->isAlive() || !pVictim->isAlive())
         return;
-
     // Select HitInfo/procAttacker/procVictim flag based on attack type
     switch (attackType)
     {
@@ -1310,13 +1122,11 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
         default:
             break;
     }
-
     // Physical Immune check
     if(damageInfo->target->IsImmunedToDamage(SpellSchoolMask(damageInfo->damageSchoolMask)))
     {
        damageInfo->HitInfo       |= HITINFO_NORMALSWING;
        damageInfo->TargetState    = VICTIMSTATE_IS_IMMUNE;
-
        damageInfo->procEx |=PROC_EX_IMMUNE;
        damageInfo->damage         = 0;
        damageInfo->cleanDamage    = 0;
@@ -1328,23 +1138,19 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
     // Calculate armor reduction
     damageInfo->damage = CalcArmorReducedDamage(damageInfo->target, damage, NULL , damageInfo->attackType);
     damageInfo->cleanDamage += damage - damageInfo->damage;
-
     damageInfo->hitOutCome = RollMeleeOutcomeAgainst(damageInfo->target, damageInfo->attackType);
-
     // Disable parry or dodge for ranged attack
     if(damageInfo->attackType == RANGED_ATTACK)
     {
         if (damageInfo->hitOutCome == MELEE_HIT_PARRY) damageInfo->hitOutCome = MELEE_HIT_NORMAL;
         if (damageInfo->hitOutCome == MELEE_HIT_DODGE) damageInfo->hitOutCome = MELEE_HIT_MISS;
     }
-
     switch(damageInfo->hitOutCome)
     {
         case MELEE_HIT_EVADE:
         {
             damageInfo->HitInfo    |= HITINFO_MISS|HITINFO_SWINGNOHITSOUND;
             damageInfo->TargetState = VICTIMSTATE_EVADES;
-
             damageInfo->procEx|=PROC_EX_EVADE;
             damageInfo->damage = 0;
             damageInfo->cleanDamage = 0;
@@ -1354,7 +1160,6 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
         {
             damageInfo->HitInfo    |= HITINFO_MISS;
             damageInfo->TargetState = VICTIMSTATE_NORMAL;
-
             damageInfo->procEx|=PROC_EX_MISS;
             damageInfo->damage = 0;
             damageInfo->cleanDamage = 0;
@@ -1368,7 +1173,6 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
         {
             damageInfo->HitInfo     |= HITINFO_CRITICALHIT;
             damageInfo->TargetState  = VICTIMSTATE_NORMAL;
-
             damageInfo->procEx|=PROC_EX_CRITICAL_HIT;
             // Crit bonus calc
             damageInfo->damage += damageInfo->damage;
@@ -1381,14 +1185,11 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
                 mod += damageInfo->target->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_DAMAGE);
                 mod += GetTotalAuraModifier(SPELL_AURA_MOD_CRIT_DAMAGE_BONUS_MELEE);
             }
-
             uint32 crTypeMask = damageInfo->target->GetCreatureTypeMask();
-
             // Increase crit damage from SPELL_AURA_MOD_CRIT_PERCENT_VERSUS
             mod += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, crTypeMask);
             if (mod!=0)
                 damageInfo->damage = int32((damageInfo->damage) * float((100.0f + mod)/100.0f));
-
             // Resilience - reduce crit damage
             if (pVictim->GetTypeId()==TYPEID_PLAYER)
             {
@@ -1404,7 +1205,6 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
             damageInfo->cleanDamage += damageInfo->damage;
             damageInfo->damage = 0;
             break;
-
         case MELEE_HIT_DODGE:
             damageInfo->TargetState  = VICTIMSTATE_DODGE;
             damageInfo->procEx|=PROC_EX_DODGE;
@@ -1453,10 +1253,8 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
             break;
         }
         default:
-
             break;
     }
-
     // Calculate absorb resist
     if(int32(damageInfo->damage) > 0)
     {
@@ -1471,23 +1269,18 @@ void Unit::CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *da
         }
         if (damageInfo->resist)
             damageInfo->HitInfo|=HITINFO_RESIST;
-
     }
     else // Impossible get negative result but....
         damageInfo->damage = 0;
 }
-
 void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
 {
     if (damageInfo==0) return;
     Unit *pVictim = damageInfo->target;
-
     if(!pVictim)
         return;
-
     if (!pVictim->isAlive() || pVictim->hasUnitState(UNIT_STAT_UNATTACKABLE) || pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return;
-
     //You don't lose health from damage taken from another player while in a sanctuary
     //You still see it in the combat log though
     if(pVictim != this && IsControlledByPlayer() && pVictim->IsControlledByPlayer())
@@ -1496,13 +1289,11 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
         if(area && area->IsSanctuary())       // sanctuary
             return;
     }
-
     // Hmmmm dont like this emotes client must by self do all animations
     if (damageInfo->HitInfo&HITINFO_CRITICALHIT)
         pVictim->HandleEmoteCommand(EMOTE_ONESHOT_WOUNDCRITICAL);
     if(damageInfo->blocked_amount && damageInfo->TargetState!=VICTIMSTATE_BLOCKS)
         pVictim->HandleEmoteCommand(EMOTE_ONESHOT_PARRYSHIELD);
-
     if(damageInfo->TargetState == VICTIMSTATE_PARRY)
     {
         // Get attack timers
@@ -1538,11 +1329,9 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
             }
         }
     }
-
     // Call default DealDamage
     CleanDamage cleanDamage(damageInfo->cleanDamage,damageInfo->absorb,damageInfo->attackType,damageInfo->hitOutCome);
     DealDamage(pVictim, damageInfo->damage, &cleanDamage, DIRECT_DAMAGE, SpellSchoolMask(damageInfo->damageSchoolMask), NULL, durabilityLoss);
-
     // If this is a creature and it attacks from behind it has a probability to daze it's victim
     if( (damageInfo->hitOutCome==MELEE_HIT_CRIT || damageInfo->hitOutCome==MELEE_HIT_CRUSHING || damageInfo->hitOutCome==MELEE_HIT_NORMAL || damageInfo->hitOutCome==MELEE_HIT_GLANCING) &&
         GetTypeId() != TYPEID_PLAYER && !((Creature*)this)->IsControlledByPlayer() && !pVictim->HasInArc(M_PI, this)
@@ -1551,26 +1340,19 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
         // -probability is between 0% and 40%
         // 20% base chance
         float Probability = 20.0f;
-
         //there is a newbie protection, at level 10 just 7% base chance; assuming linear function
         if( pVictim->getLevel() < 30 )
             Probability = 0.65f*pVictim->getLevel()+0.5f;
-
         uint32 VictimDefense=pVictim->GetDefenseSkillValue();
         uint32 AttackerMeleeSkill=GetUnitMeleeSkill();
-
         Probability *= AttackerMeleeSkill/(float)VictimDefense;
-
         if(Probability > 40.0f)
             Probability = 40.0f;
-
         if(roll_chance_f(Probability))
             CastSpell(pVictim, 1604, true);
     }
-
     if(GetTypeId() == TYPEID_PLAYER)
         ((Player *)this)->CastItemCombatSpell(pVictim, damageInfo->attackType, damageInfo->procVictim, damageInfo->procEx);
-
     // Do effect if any damage done to target
     if (damageInfo->damage)
     {
@@ -1591,9 +1373,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
                //uint32 resist;
                //CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
                //damage-=absorb + resist;
-
                pVictim->DealDamageMods(this,damage,NULL);
-
                WorldPacket data(SMSG_SPELLDAMAGESHIELD,(8+8+4+4+4+4));
                data << uint64(pVictim->GetGUID());
                data << uint64(GetGUID());
@@ -1602,9 +1382,7 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
                data << uint32(0);                       // Overkill
                data << uint32(i_spellProto->SchoolMask);
                pVictim->SendMessageToSet(&data, true );
-
                pVictim->DealDamage(this, damage, 0, SPELL_DIRECT_DAMAGE, GetSpellSchoolMask(i_spellProto), i_spellProto, true);
-
                if (pVictim->m_removedAurasCount > removedAuras)
                {
                    removedAuras = pVictim->m_removedAurasCount;
@@ -1615,7 +1393,6 @@ void Unit::DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss)
     }
 }
 
-
 void Unit::HandleEmoteCommand(uint32 anim_id)
 {
     WorldPacket data( SMSG_EMOTE, 4 + 8 );
@@ -1623,19 +1400,15 @@ void Unit::HandleEmoteCommand(uint32 anim_id)
     data << uint64(GetGUID());
     SendMessageToSet(&data, true);
 }
-
 uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType)
 {
     uint32 newdamage = 0;
     float armor = pVictim->GetArmor();
-
     // Ignore enemy armor by SPELL_AURA_MOD_TARGET_RESISTANCE aura
     armor += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, SPELL_SCHOOL_MASK_NORMAL);
-
     if(spellInfo)
         if(Player *modOwner = GetSpellModOwner())
             modOwner->ApplySpellMod(spellInfo->Id, SPELLMOD_IGNORE_ARMOR, armor);
-
     AuraEffectList const& ResIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST);
     for(AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin();j != ResIgnoreAurasAb.end(); ++j)
     {
@@ -1643,14 +1416,12 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt
             && (*j)->isAffectedOnSpell(spellInfo))
             armor= int32(float(armor) * (float(100-(*j)->GetAmount())/100.0f));
     }
-
     AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST);
     for(AuraEffectList::const_iterator j = ResIgnoreAuras.begin();j != ResIgnoreAuras.end(); ++j)
     {
         if( (*j)->GetMiscValue() & SPELL_SCHOOL_MASK_NORMAL)
             armor= int32(float(armor) * (float(100-(*j)->GetAmount())/100.0f));
     }
-
     if ( GetTypeId() == TYPEID_PLAYER )
     {
         AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT);
@@ -1662,12 +1433,10 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt
                 armor= int32(float(armor) * (float(100-(*itr)->GetAmount())/100.0f));
                 continue;
             }
-
             // item dependent spell - check curent weapons
             for(int i = 0; i < MAX_ATTACK; ++i)
             {
                 Item *weapon = ((Player *)this)->GetWeaponForAttack(WeaponAttackType(i));
-
                 if(weapon && weapon->IsFitToSpellRequirements((*itr)->GetSpellProto()))
                 {
                     armor= int32(float(armor) * (float(100-(*itr)->GetAmount())/100.0f));
@@ -1676,7 +1445,6 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt
             }
         }
     }
-
     // Apply Player CR_ARMOR_PENETRATION rating
     if (GetTypeId()==TYPEID_PLAYER)
     {
@@ -1684,7 +1452,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt
         if (getLevel()<60)
             maxArmorPen=400+85*pVictim->getLevel();
         else
-            maxArmorPen=400+85*pVictim->getLevel()+4.5*85*(pVictim->getLevel()-59); 
+            maxArmorPen=400+85*pVictim->getLevel()+4.5*85*(pVictim->getLevel()-59);
         // Cap armor penetration to this number
         maxArmorPen = std::min(((armor+maxArmorPen)/3),armor);
         // Figure out how much armor do we ignore
@@ -1694,32 +1462,24 @@ uint32 Unit::CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEnt
     }
     // Ignore enemy armor by SPELL_AURA_MOD_TARGET_ARMOR_PCT
     //armor *= 1.0f - GetTotalAuraModifier(SPELL_AURA_MOD_ARMOR_PENETRATION_PCT) / 100.0f;
-        
     if (armor < 0.0f)
         armor = 0.0f;
-
     float levelModifier = getLevel();
     if (levelModifier > 59)
         levelModifier = levelModifier + (4.5f * (levelModifier-59));
-
     float tmpvalue = 0.1f * armor / (8.5f * levelModifier + 40);
     tmpvalue = tmpvalue/(1.0f + tmpvalue);
-
     if (tmpvalue < 0.0f)
         tmpvalue = 0.0f;
     if (tmpvalue > 0.75f)
         tmpvalue = 0.75f;
-
     newdamage = uint32(damage - (damage * tmpvalue));
-
     return (newdamage > 1) ? newdamage : 1;
 }
-
 void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32 *absorb, uint32 *resist, SpellEntry const *spellInfo)
 {
     if(!pVictim || !pVictim->isAlive() || !damage)
         return;
-
     // Magic damage, check for resists
     if ((schoolMask & SPELL_SCHOOL_MASK_NORMAL)==0)
     {
@@ -1727,7 +1487,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
         float tmpvalue2 = (float)pVictim->GetResistance(GetFirstSchoolInMask(schoolMask));
         // Ignore resistance by self SPELL_AURA_MOD_TARGET_RESISTANCE aura
         tmpvalue2 += (float)GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_TARGET_RESISTANCE, schoolMask);
-
         tmpvalue2 *= (float)(0.15f / getLevel());
         if (tmpvalue2 < 0.0f)
             tmpvalue2 = 0.0f;
@@ -1751,7 +1510,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             *resist += uint32(damage * m / 4);
         if(*resist > damage)
             *resist = damage;
-
         AuraEffectList const& ResIgnoreAurasAb = GetAurasByType(SPELL_AURA_MOD_ABILITY_IGNORE_TARGET_RESIST);
         for(AuraEffectList::const_iterator j = ResIgnoreAurasAb.begin();j != ResIgnoreAurasAb.end(); ++j)
         {
@@ -1759,7 +1517,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                 && (*j)->isAffectedOnSpell(spellInfo))
                 *resist= int32(float(*resist) * (float(100-(*j)->GetAmount())/100.0f));
         }
-
         AuraEffectList const& ResIgnoreAuras = GetAurasByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST);
         for(AuraEffectList::const_iterator j = ResIgnoreAuras.begin();j != ResIgnoreAuras.end(); ++j)
         {
@@ -1769,7 +1526,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
     }
     else
         *resist = 0;
-
     int32 RemainingDamage = damage - *resist;
     int32 TotalAbsorb = RemainingDamage;
     // Get unit state (need for some absorb check)
@@ -1786,12 +1542,9 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
     {
         if (!((*i)->GetMiscValue() & schoolMask))
             continue;
-
         SpellEntry const* spellProto = (*i)->GetSpellProto();
-
         // Max Amount can be absorbed by this aura
         int32  currentAbsorb = (*i)->GetAmount();
-
         // Found empty aura (impossible but..)
         if (currentAbsorb <=0)
         {
@@ -1891,7 +1644,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                     preventDeathAmount = (*i)->GetAmount();
                     continue;
                 }
-
                 // Power Word: Shield
                 if (spellProto->SpellFamilyFlags.IsEqual(0x1, 0, 0x400))
                 {
@@ -1907,7 +1659,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                         {
                             case 5065:                          // Rank 1
                             case 5064:                          // Rank 2
-                                triggeredSpells.push_back(TriggeredSpellInfo(33619, pVictim, this, 
+                                triggeredSpells.push_back(TriggeredSpellInfo(33619, pVictim, this,
                                     std::min(RemainingDamage, currentAbsorb) * aurEff->GetAmount() / 100, *i));
                                 break;
                             default:
@@ -1938,11 +1690,9 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                         if(Unit *caster = (*i)->GetCaster())
                         {
                             uint32 absorbed = uint32( currentAbsorb * caster->GetArmor() * 0.01f );
-
                             // Glyph of Unbreakable Armor
                             if (AuraEffect *aurEff = caster->GetAuraEffect(58635, 0))
                                 absorbed += uint32( absorbed * aurEff->GetAmount() / 100 );
-
                             RemainingDamage -= absorbed;
                         }
                         continue;
@@ -1965,7 +1715,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
                             int32 canabsorb = caster->GetHealth();
                             if (canabsorb < absorbed)
                                 absorbed = canabsorb;
-
                             RemainingDamage -= absorbed;
                             triggeredSpells.push_back(TriggeredSpellInfo(0, this, caster, absorbed, *i));
                         }
@@ -1978,21 +1727,17 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             default:
                 break;
         }
-
         // currentAbsorb - damage can be absorbed by shield
         // If need absorb less damage
         if (RemainingDamage < currentAbsorb)
             currentAbsorb = RemainingDamage;
-
         RemainingDamage -= currentAbsorb;
-
         // Reduce shield amount
         (*i)->SetAmount((*i)->GetAmount() -currentAbsorb);
         // Need remove it later
         if ((*i)->GetAmount()<=0)
             existExpired = true;
     }
-
     for(TriggeredSpellInfoVct::const_iterator itr = triggeredSpells.begin(); itr != triggeredSpells.end(); ++itr)
     {
         if(itr->spell)
@@ -2006,7 +1751,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             itr->source->DealDamage(itr->target, damage, NULL, damagetype, schoolMask, 0, false);
         }
     }
-
     // Remove all expired absorb auras
     if (existExpired)
     {
@@ -2024,44 +1768,35 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             }
         }
     }
-
     // absorb by mana cost
     AuraEffectList const& vManaShield = pVictim->GetAurasByType(SPELL_AURA_MANA_SHIELD);
     for(AuraEffectList::const_iterator i = vManaShield.begin(), next; i != vManaShield.end() && RemainingDamage > 0; i = next)
     {
         next = i; ++next;
-
         // check damage school mask
         if(((*i)->GetMiscValue() & schoolMask)==0)
             continue;
-
         int32 currentAbsorb;
         if (RemainingDamage >= (*i)->GetAmount())
             currentAbsorb = (*i)->GetAmount();
         else
             currentAbsorb = RemainingDamage;
-
         float manaMultiplier = (*i)->GetSpellProto()->EffectMultipleValue[(*i)->GetEffIndex()];
         if(Player *modOwner = pVictim->GetSpellModOwner())
             modOwner->ApplySpellMod((*i)->GetId(), SPELLMOD_MULTIPLE_VALUE, manaMultiplier);
-
         int32 maxAbsorb = int32(pVictim->GetPower(POWER_MANA) / manaMultiplier);
         if (currentAbsorb > maxAbsorb)
             currentAbsorb = maxAbsorb;
-
         (*i)->SetAmount((*i)->GetAmount()-currentAbsorb);
         if((*i)->GetAmount() <= 0)
         {
             pVictim->RemoveAura((*i)->GetParentAura(), AURA_REMOVE_BY_ENEMY_SPELL);
             next = vManaShield.begin();
         }
-
         int32 manaReduction = int32(currentAbsorb * manaMultiplier);
         pVictim->ApplyPowerMod(POWER_MANA, manaReduction, false);
-
         RemainingDamage -= currentAbsorb;
     }
-
     // only split damage if not damaging yourself
     if(pVictim != this)
     {
@@ -2069,63 +1804,47 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
         for(AuraEffectList::const_iterator i = vSplitDamageFlat.begin(), next; i != vSplitDamageFlat.end() && RemainingDamage >= 0; i = next)
         {
             next = i; ++next;
-
             // check damage school mask
             if(((*i)->GetMiscValue() & schoolMask)==0)
                 continue;
-
             // Damage can be splitted only if aura has an alive caster
             Unit *caster = (*i)->GetCaster();
             if(!caster || caster == pVictim || !caster->IsInWorld() || !caster->isAlive())
                 continue;
-
             int32 currentAbsorb;
             if (RemainingDamage >= (*i)->GetAmount())
                 currentAbsorb = (*i)->GetAmount();
             else
                 currentAbsorb = RemainingDamage;
-
             RemainingDamage -= currentAbsorb;
 
-
             uint32 splitted = currentAbsorb;
             uint32 splitted_absorb = 0;
             DealDamageMods(caster,splitted,&splitted_absorb);
-
             SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitted, schoolMask, splitted_absorb, 0, false, 0, false);
-
             CleanDamage cleanDamage = CleanDamage(splitted, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
             DealDamage(caster, splitted, &cleanDamage, DIRECT_DAMAGE, schoolMask, (*i)->GetSpellProto(), false);
         }
-
         AuraEffectList const& vSplitDamagePct = pVictim->GetAurasByType(SPELL_AURA_SPLIT_DAMAGE_PCT);
         for(AuraEffectList::const_iterator i = vSplitDamagePct.begin(), next; i != vSplitDamagePct.end() && RemainingDamage >= 0; i = next)
         {
             next = i; ++next;
-
             // check damage school mask
             if(((*i)->GetMiscValue() & schoolMask)==0)
                 continue;
-
             // Damage can be splitted only if aura has an alive caster
             Unit *caster = (*i)->GetCaster();
             if(!caster || caster == pVictim || !caster->IsInWorld() || !caster->isAlive())
                 continue;
-
             uint32 splitted = uint32(RemainingDamage * (*i)->GetAmount() / 100.0f);
-
             RemainingDamage -=  int32(splitted);
-
             uint32 split_absorb = 0;
             DealDamageMods(caster,splitted,&split_absorb);
-
             SendSpellNonMeleeDamageLog(caster, (*i)->GetSpellProto()->Id, splitted, schoolMask, split_absorb, 0, false, 0, false);
-
             CleanDamage cleanDamage = CleanDamage(splitted, 0, BASE_ATTACK, MELEE_HIT_NORMAL);
             DealDamage(caster, splitted, &cleanDamage, DIRECT_DAMAGE, schoolMask, (*i)->GetSpellProto(), false);
         }
     }
-
     TotalAbsorb = (TotalAbsorb - RemainingDamage > 0) ? TotalAbsorb - RemainingDamage : 0;
     // TODO: School should be checked for absorbing auras or for attacks?
     int32 auraAbsorbMod = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL);
@@ -2136,10 +1855,8 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             && (*i)->isAffectedOnSpell(spellInfo))
             auraAbsorbMod = (*i)->GetAmount();
     }
-
     // Ignore absorb - add reduced amount again to damage
     RemainingDamage += auraAbsorbMod * TotalAbsorb / 100;
-
     // Apply death prevention spells effects
     if (preventDeathSpell && RemainingDamage >= pVictim->GetHealth())
     {
@@ -2172,9 +1889,7 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             }
         }
     }
-
     *absorb = RemainingDamage > 0 ? (damage - RemainingDamage - *resist) : (damage - *resist);
-
     if (*absorb)
     {
         // Incanter's Absorption
@@ -2187,7 +1902,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
             for(AuraMap::const_iterator iter = range.first; iter != range.second; ++iter)
                 if (AuraEffect const * bonusEff = iter->second->GetPartAura(0))
                     current_dmg += bonusEff->GetAmount();
-
             int32 new_dmg = (int32)*absorb * aurEff->GetAmount() / 100;
             int32 max_dmg = (int32)pVictim->GetMaxHealth() * 5 / 100;
             // Do not apply more auras if more than 5% hp
@@ -2198,18 +1912,14 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe
         }
     }
 }
-
 void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool extra )
 {
     if(hasUnitState(UNIT_STAT_CANNOT_AUTOATTACK) || HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED) )
         return;
-
     if (!pVictim->isAlive())
         return;
-
     CombatStart(pVictim);
     RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MELEE_ATTACK);
-
     uint32 hitInfo;
     if (attType == BASE_ATTACK)
         hitInfo = HITINFO_NORMALSWING2;
@@ -2217,98 +1927,75 @@ void Unit::AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType, bool ex
         hitInfo = HITINFO_LEFTSWING;
     else
         return;                                             // ignore ranged case
-
     // melee attack spell casted at main hand attack only
     if (attType == BASE_ATTACK && m_currentSpells[CURRENT_MELEE_SPELL])
     {
         m_currentSpells[CURRENT_MELEE_SPELL]->cast();
         return;
     }
-
     // attack can be redirected to another target
     pVictim = SelectMagnetTarget(pVictim);
-
     CalcDamageInfo damageInfo;
     CalculateMeleeDamage(pVictim, 0, &damageInfo, attType);
     // Send log damage message to client
     DealDamageMods(pVictim,damageInfo.damage,&damageInfo.absorb);
     SendAttackStateUpdate(&damageInfo);
-
     ProcDamageAndSpell(damageInfo.target, damageInfo.procAttacker, damageInfo.procVictim, damageInfo.procEx, damageInfo.damage, damageInfo.attackType);
     DealMeleeDamage(&damageInfo,true);
-
     if (GetTypeId() == TYPEID_PLAYER)
         DEBUG_LOG("AttackerStateUpdate: (Player) %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
             GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);
     else
         DEBUG_LOG("AttackerStateUpdate: (NPC)    %u attacked %u (TypeId: %u) for %u dmg, absorbed %u, blocked %u, resisted %u.",
             GetGUIDLow(), pVictim->GetGUIDLow(), pVictim->GetTypeId(), damageInfo.damage, damageInfo.absorb, damageInfo.blocked_amount, damageInfo.resist);
-
     // if damage pVictim call AI reaction
     //if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->AI())
     //    ((Creature*)pVictim)->AI()->AttackedBy(this);
-
 }
-
 MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(const Unit *pVictim, WeaponAttackType attType) const
 {
     // This is only wrapper
-
     // Miss chance based on melee
     //float miss_chance = MeleeMissChanceCalc(pVictim, attType);
     float miss_chance = MeleeSpellMissChance(pVictim, attType, int32(GetWeaponSkillValue(attType,pVictim)) - int32(pVictim->GetDefenseSkillValue(this)), 0);
-
     // Critical hit chance
     float crit_chance = GetUnitCriticalChance(attType, pVictim);
-
     // stunned target cannot dodge and this is check in GetUnitDodgeChance() (returned 0 in this case)
     float dodge_chance = pVictim->GetUnitDodgeChance();
     float block_chance = pVictim->GetUnitBlockChance();
     float parry_chance = pVictim->GetUnitParryChance();
-
     // Useful if want to specify crit & miss chances for melee, else it could be removed
     DEBUG_LOG("MELEE OUTCOME: miss %f crit %f dodge %f parry %f block %f", miss_chance,crit_chance,dodge_chance,parry_chance,block_chance);
-
     return RollMeleeOutcomeAgainst(pVictim, attType, int32(crit_chance*100), int32(miss_chance*100), int32(dodge_chance*100),int32(parry_chance*100),int32(block_chance*100));
 }
-
 MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const
 {
     if(pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode())
         return MELEE_HIT_EVADE;
-
     int32 attackerMaxSkillValueForLevel = GetMaxSkillValueForLevel(pVictim);
     int32 victimMaxSkillValueForLevel = pVictim->GetMaxSkillValueForLevel(this);
-
     int32 attackerWeaponSkill = GetWeaponSkillValue(attType,pVictim);
     int32 victimDefenseSkill = pVictim->GetDefenseSkillValue(this);
-
     // bonus from skills is 0.04%
     int32    skillBonus  = 4 * ( attackerWeaponSkill - victimMaxSkillValueForLevel );
     int32    sum = 0, tmp = 0;
     int32    roll = urand (0, 10000);
-
     DEBUG_LOG ("RollMeleeOutcomeAgainst: skill bonus of %d for attacker", skillBonus);
     DEBUG_LOG ("RollMeleeOutcomeAgainst: rolled %d, miss %d, dodge %d, parry %d, block %d, crit %d",
         roll, miss_chance, dodge_chance, parry_chance, block_chance, crit_chance);
-
     tmp = miss_chance;
-
     if (tmp > 0 && roll < (sum += tmp ))
     {
         DEBUG_LOG ("RollMeleeOutcomeAgainst: MISS");
         return MELEE_HIT_MISS;
     }
-
     // always crit against a sitting target (except 0 crit chance)
     if( pVictim->GetTypeId() == TYPEID_PLAYER && crit_chance > 0 && !pVictim->IsStandState() )
     {
         DEBUG_LOG ("RollMeleeOutcomeAgainst: CRIT (sitting victim)");
         return MELEE_HIT_CRIT;
     }
-
     // Dodge chance
-
     // only players can't dodge if attacker is behind
     if (pVictim->GetTypeId() == TYPEID_PLAYER && !pVictim->HasInArc(M_PI,this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
     {
@@ -2319,11 +2006,9 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         // Reduce dodge chance by attacker expertise rating
         if (GetTypeId() == TYPEID_PLAYER)
             dodge_chance -= int32(((Player*)this)->GetExpertiseDodgeOrParryReduction(attType)*100);
-
         // Modify dodge chance by attacker SPELL_AURA_MOD_COMBAT_RESULT_CHANCE
         dodge_chance+= GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_COMBAT_RESULT_CHANCE, VICTIMSTATE_DODGE)*100;
         dodge_chance = int32 (float (dodge_chance) * GetTotalAuraMultiplier(SPELL_AURA_MOD_ENEMY_DODGE));
-
         tmp = dodge_chance;
         if (   (tmp > 0)                                        // check if unit _can_ dodge
             && ((tmp -= skillBonus) > 0)
@@ -2333,9 +2018,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
             return MELEE_HIT_DODGE;
         }
     }
-
     // parry & block chances
-
     // check if attack comes from behind, nobody can parry or block if attacker is behind
     if (!pVictim->HasInArc(M_PI,this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
     {
@@ -2346,7 +2029,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         // Reduce parry chance by attacker expertise rating
         if (GetTypeId() == TYPEID_PLAYER)
             parry_chance-= int32(((Player*)this)->GetExpertiseDodgeOrParryReduction(attType)*100);
-
         if(pVictim->GetTypeId()==TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_PARRY) )
         {
             int32 tmp2 = int32(parry_chance);
@@ -2358,7 +2040,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
                 return MELEE_HIT_PARRY;
             }
         }
-
         if(pVictim->GetTypeId()==TYPEID_PLAYER || !(((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK) )
         {
             tmp = block_chance;
@@ -2371,10 +2052,8 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
             }
         }
     }
-
     // Critical chance
     tmp = crit_chance;
-
     if (tmp > 0 && roll < (sum += tmp))
     {
         DEBUG_LOG ("RollMeleeOutcomeAgainst: CRIT <%d, %d)", sum-tmp, sum);
@@ -2383,7 +2062,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         else
             return MELEE_HIT_CRIT;
     }
-
     // Max 40% chance to score a glancing blow against mobs that are higher level (can do only players and pets and not with ranged weapon)
     if( attType != RANGED_ATTACK &&
         (GetTypeId() == TYPEID_PLAYER || ((Creature*)this)->isPet()) &&
@@ -2394,7 +2072,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
         int32 skill = attackerWeaponSkill;
         int32 maxskill = attackerMaxSkillValueForLevel;
         skill = (skill > maxskill) ? maxskill : skill;
-
         tmp = (10 + (victimDefenseSkill - skill)) * 100;
         tmp = tmp > 4000 ? 4000 : tmp;
         if (roll < (sum += tmp))
@@ -2403,7 +2080,6 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
             return MELEE_HIT_GLANCING;
         }
     }
-
     // mobs can score crushing blows if they're 4 or more levels above victim
     if (getLevelForTarget(pVictim) >= pVictim->getLevelForTarget(this) + 4 &&
         // can be from by creature (if can) or from controlled player that considered as creature
@@ -2428,15 +2104,12 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttack
             }
         }
     }
-
     DEBUG_LOG ("RollMeleeOutcomeAgainst: NORMAL");
     return MELEE_HIT_NORMAL;
 }
-
 uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized, bool addTotalPct)
 {
     float min_damage, max_damage;
-
     if (GetTypeId()==TYPEID_PLAYER && (normalized || !addTotalPct))
         ((Player*)this)->CalculateMinMaxDamage(attType,normalized,addTotalPct,min_damage, max_damage);
     else
@@ -2462,60 +2135,47 @@ uint32 Unit::CalculateDamage (WeaponAttackType attType, bool normalized, bool ad
                 break;
         }
     }
-
     if (min_damage > max_damage)
     {
         std::swap(min_damage,max_damage);
     }
-
     if(max_damage == 0.0f)
         max_damage = 5.0f;
-
     return urand((uint32)min_damage, (uint32)max_damage);
 }
-
 float Unit::CalculateLevelPenalty(SpellEntry const* spellProto) const
 {
     if(spellProto->spellLevel <= 0)
         return 1.0f;
-
     float LvlPenalty = 0.0f;
-
     if(spellProto->spellLevel < 20)
         LvlPenalty = 20.0f - spellProto->spellLevel * 3.75f;
     float LvlFactor = (float(spellProto->spellLevel) + 6.0f) / float(getLevel());
     if(LvlFactor > 1.0f)
         LvlFactor = 1.0f;
-
     return (100.0f - LvlPenalty) * LvlFactor / 100.0f;
 }
-
 void Unit::SendMeleeAttackStart(Unit* pVictim)
 {
     WorldPacket data( SMSG_ATTACKSTART, 8 + 8 );
     data << uint64(GetGUID());
     data << uint64(pVictim->GetGUID());
-
     SendMessageToSet(&data, true);
     DEBUG_LOG( "WORLD: Sent SMSG_ATTACKSTART" );
 }
-
 void Unit::SendMeleeAttackStop(Unit* victim)
 {
     if(!victim)
         return;
-
     WorldPacket data( SMSG_ATTACKSTOP, (4+16) );            // we guess size
     data.append(GetPackGUID());
     data.append(victim->GetPackGUID());                     // can be 0x00...
     data << uint32(0);                                      // can be 0x1
     SendMessageToSet(&data, true);
     sLog.outDetail("%s %u stopped attacking %s %u", (GetTypeId()==TYPEID_PLAYER ? "player" : "creature"), GetGUIDLow(), (victim->GetTypeId()==TYPEID_PLAYER ? "player" : "creature"),victim->GetGUIDLow());
-
     /*if(victim->GetTypeId() == TYPEID_UNIT)
     ((Creature*)victim)->AI().EnterEvadeMode(this);*/
 }
-
 bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, WeaponAttackType attackType)
 {
     if (pVictim->HasInArc(M_PI,this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
@@ -2531,12 +2191,10 @@ bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, Weap
                 return false;
         }
         */
-
         // Check creatures flags_extra for disable block
         if(pVictim->GetTypeId()==TYPEID_UNIT &&
            ((Creature*)pVictim)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_BLOCK )
                 return false;
-
         float blockChance = pVictim->GetUnitBlockChance();
         blockChance += (int32(GetWeaponSkillValue(attackType)) - int32(pVictim->GetMaxSkillValueForLevel()))*0.04f;
         if (roll_chance_f(blockChance))
@@ -2544,21 +2202,18 @@ bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, Weap
     }
     return false;
 }
-
 bool Unit::isBlockCritical()
 {
     if (roll_chance_i(GetTotalAuraModifier(SPELL_AURA_MOD_BLOCK_CRIT_CHANCE)))
         return true;
     return false;
 }
-
 // Melee based spells can be miss, parry or dodge on this step
 // Crit or block - determined on damage calculation phase! (and can be both in some time)
 /*float Unit::MeleeSpellMissChance(Unit *pVictim, WeaponAttackType attType, int32 skillDiff, SpellEntry const *spell)
 {
     // Calculate hit chance (more correct for chance mod)
     int32 HitChance;
-
     // PvP - PvE melee chances
     int32 lchance = pVictim->GetTypeId() == TYPEID_PLAYER ? 5 : 7;
     int32 leveldif = pVictim->getLevelForTarget(this) - getLevelForTarget(pVictim);
@@ -2566,29 +2221,23 @@ bool Unit::isBlockCritical()
         HitChance = 95 - leveldif;
     else
         HitChance = 93 - (leveldif - 2) * lchance;
-
     // Hit chance depends from victim auras
     if(attType == RANGED_ATTACK)
         HitChance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE);
     else
         HitChance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE);
-
     // Spellmod from SPELLMOD_RESIST_MISS_CHANCE
     if(Player *modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spell->Id, SPELLMOD_RESIST_MISS_CHANCE, HitChance);
-
     // Miss = 100 - hit
     float miss_chance= 100.0f - HitChance;
-
     // Bonuses from attacker aura and ratings
     if (attType == RANGED_ATTACK)
         miss_chance -= m_modRangedHitChance;
     else
         miss_chance -= m_modMeleeHitChance;
-
     // bonus from skills is 0.04%
     miss_chance -= skillDiff * 0.04f;
-
     // Limit miss chance from 0 to 60%
     if (miss_chance < 0.0f)
         return 0.0f;
@@ -2597,7 +2246,6 @@ bool Unit::isBlockCritical()
     return miss_chance;
 }*/
 
-
 int32 Unit::GetMechanicResistChance(const SpellEntry *spell)
 {
     if(!spell)
@@ -2617,36 +2265,29 @@ int32 Unit::GetMechanicResistChance(const SpellEntry *spell)
     }
     return resist_mech;
 }
-
 // Melee based spells hit result calculations
 SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
 {
     WeaponAttackType attType = BASE_ATTACK;
-
-    // Check damage class instead of attack type to correctly handle judgements 
+    // Check damage class instead of attack type to correctly handle judgements
     // - they are meele, but can't be dodged/parried/deflected because of ranged dmg class
     if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED)
         attType = RANGED_ATTACK;
-
     int32 attackerWeaponSkill;
     // skill value for these spells (for example judgements) is 5* level
     if (spell->DmgClass == SPELL_DAMAGE_CLASS_RANGED && !IsRangedWeaponSpell(spell))
         attackerWeaponSkill = getLevel() * 5;
     // bonus from skills is 0.04% per skill Diff
-    else 
+    else
         attackerWeaponSkill = int32(GetWeaponSkillValue(attType,pVictim));
-
     int32 skillDiff = attackerWeaponSkill - int32(pVictim->GetMaxSkillValueForLevel(this));
     int32 fullSkillDiff = attackerWeaponSkill - int32(pVictim->GetDefenseSkillValue(this));
-
     uint32 roll = urand (0, 10000);
-
     uint32 missChance = uint32(MeleeSpellMissChance(pVictim, attType, fullSkillDiff, spell->Id)*100.0f);
     // Roll miss
     uint32 tmp = missChance;
     if (roll < tmp)
         return SPELL_MISS_MISS;
-
     // Chance resist mechanic (select max value from every mechanic spell effect)
     int32 resist_mech = 0;
     // Get effects mechanic and chance
@@ -2664,21 +2305,17 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
     tmp += resist_mech;
     if (roll < tmp)
         return SPELL_MISS_RESIST;
-
     bool canDodge = true;
     bool canParry = true;
     bool canBlock = spell->AttributesEx3 & SPELL_ATTR_EX3_BLOCKABLE_SPELL;
-
     // Same spells cannot be parry/dodge
     if (spell->Attributes & SPELL_ATTR_IMPOSSIBLE_DODGE_PARRY_BLOCK)
         return SPELL_MISS_NONE;
-
     // Chance resist mechanic
     int32 resist_chance = pVictim->GetMechanicResistChance(spell)*100;
     tmp += resist_chance;
     if (roll < tmp)
         return SPELL_MISS_RESIST;
-
     // Ranged attacks can only miss, resist and deflect
     if (attType == RANGED_ATTACK)
     {
@@ -2692,7 +2329,6 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
         }
         return SPELL_MISS_NONE;
     }
-
     // Check for attack from behind
     if (!pVictim->HasInArc(M_PI,this) && !pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
     {
@@ -2729,7 +2365,6 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
                 break;
         }
     }
-
     if (canDodge)
     {
         // Roll dodge
@@ -2742,12 +2377,10 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
             dodgeChance-=int32(((Player*)this)->GetExpertiseDodgeOrParryReduction(attType) * 100.0f);
         if (dodgeChance < 0)
             dodgeChance = 0;
-
         tmp += dodgeChance;
         if (roll < tmp)
             return SPELL_MISS_DODGE;
     }
-
     if (canParry)
     {
         // Roll parry
@@ -2757,45 +2390,37 @@ SpellMissInfo Unit::MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell)
             parryChance-=int32(((Player*)this)->GetExpertiseDodgeOrParryReduction(attType) * 100.0f);
         if (parryChance < 0)
             parryChance = 0;
-
         tmp += parryChance;
         if (roll < tmp)
             return SPELL_MISS_PARRY;
     }
-
     if (canBlock)
     {
         int32 blockChance = int32(pVictim->GetUnitBlockChance()*100.0f)  - skillDiff * 4;
         if ( blockChance < 0 )
             blockChance = 0;
         tmp += blockChance;
-
         if (roll < tmp)
             return SPELL_MISS_BLOCK;
     }
-
     return SPELL_MISS_NONE;
 }
-
 // TODO need use unit spell resistances in calculations
 SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
 {
     // Can`t miss on dead target (on skinning for example)
     if (!pVictim->isAlive() && pVictim->GetTypeId() != TYPEID_PLAYER)
         return SPELL_MISS_NONE;
-
     SpellSchoolMask schoolMask = GetSpellSchoolMask(spell);
     // PvP - PvE spell misschances per leveldif > 2
     int32 lchance = pVictim->GetTypeId() == TYPEID_PLAYER ? 7 : 11;
     int32 leveldif = int32(pVictim->getLevelForTarget(this)) - int32(getLevelForTarget(pVictim));
-
     // Base hit chance from attacker and victim levels
     int32 modHitChance;
     if(leveldif < 3)
         modHitChance = 96 - leveldif;
     else
         modHitChance = 94 - (leveldif - 2) * lchance;
-
     // Spellmod from SPELLMOD_RESIST_MISS_CHANCE
     if(Player *modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spell->Id, SPELLMOD_RESIST_MISS_CHANCE, modHitChance);
@@ -2809,36 +2434,26 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
     // Reduce spell hit chance for dispel mechanic spells from victim SPELL_AURA_MOD_DISPEL_RESIST
     if (IsDispelSpell(spell))
         modHitChance-=pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_DISPEL_RESIST);
-
     int32 HitChance = modHitChance * 100;
     // Increase hit chance from attacker SPELL_AURA_MOD_SPELL_HIT_CHANCE and attacker ratings
     HitChance += int32(m_modSpellHitChance*100.0f);
-
     // Decrease hit chance from victim rating bonus
     if (pVictim->GetTypeId()==TYPEID_PLAYER)
         HitChance -= int32(((Player*)pVictim)->GetRatingBonusValue(CR_HIT_TAKEN_SPELL)*100.0f);
-
     if (HitChance <  100) HitChance =  100;
     if (HitChance > 10000) HitChance = 10000;
-
     int32 tmp = 10000 - HitChance;
-
     uint32 rand = urand(0,10000);
-
     if (rand < tmp)
         return SPELL_MISS_MISS;
-
     // Chance resist mechanic (select max value from every mechanic spell effect)
     int32 resist_chance = pVictim->GetMechanicResistChance(spell);
     tmp += resist_chance;
-    
     // Chance resist debuff
     tmp -= pVictim->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DEBUFF_RESISTANCE, int32(spell->Dispel));
-    
    // Roll chance
     if (rand < tmp)
         return SPELL_MISS_RESIST;
-        
     // cast by caster in front of victim
     if (pVictim->HasInArc(M_PI,this) || pVictim->HasAuraType(SPELL_AURA_IGNORE_HIT_DIRECTION))
     {
@@ -2847,10 +2462,8 @@ SpellMissInfo Unit::MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell)
         if (rand < tmp)
             return SPELL_MISS_DEFLECT;
     }
-
     return SPELL_MISS_NONE;
 }
-
 // Calculate spell hit result can be:
 // Every spell can: Evade/Immune/Reflect/Sucesful hit
 // For melee based spells:
@@ -2864,11 +2477,9 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
     // Return evade for units in evade mode
     if (pVictim->GetTypeId()==TYPEID_UNIT && ((Creature*)pVictim)->IsInEvadeMode() && this != pVictim)
         return SPELL_MISS_EVADE;
-
     // Check for immune
     if (pVictim->IsImmunedToSpell(spell))
         return SPELL_MISS_IMMUNE;
-
     // All positive spells can`t miss
     // TODO: client not show miss log for this spells - so need find info for this in dbc and use it!
     if (IsPositiveSpell(spell->Id)
@@ -2877,10 +2488,8 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
     // Check for immune
     if (pVictim->IsImmunedToDamage(spell))
         return SPELL_MISS_IMMUNE;
-
     if(this == pVictim)
         return SPELL_MISS_NONE;
-
     // Try victim reflect spell
     if (CanReflect)
     {
@@ -2896,7 +2505,6 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
             return SPELL_MISS_REFLECT;
         }
     }
-
     switch (spell->DmgClass)
     {
         case SPELL_DAMAGE_CLASS_RANGED:
@@ -2909,15 +2517,12 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
     }
     return SPELL_MISS_NONE;
 }
-
 /*float Unit::MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) const
 {
     if(!pVictim)
         return 0.0f;
-
     // Base misschance 5%
     float misschance = 5.0f;
-
     // DualWield - Melee spells and physical dmg spells - 5% , white damage 24%
     if (haveOffhandWeapon() && attType != RANGED_ATTACK)
     {
@@ -2935,26 +2540,21 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
         else
             misschance = 24.0f;
     }
-
     // PvP : PvE melee misschances per leveldif > 2
     int32 chance = pVictim->GetTypeId() == TYPEID_PLAYER ? 5 : 7;
-
     int32 leveldif = int32(pVictim->getLevelForTarget(this)) - int32(getLevelForTarget(pVictim));
     if(leveldif < 0)
         leveldif = 0;
-
     // Hit chance from attacker based on ratings and auras
     float m_modHitChance;
     if (attType == RANGED_ATTACK)
         m_modHitChance = m_modRangedHitChance;
     else
         m_modHitChance = m_modMeleeHitChance;
-
     if(leveldif < 3)
         misschance += (leveldif - m_modHitChance);
     else
         misschance += ((leveldif - 2) * chance - m_modHitChance);
-
     // Hit chance for victim based on ratings
     if (pVictim->GetTypeId()==TYPEID_PLAYER)
     {
@@ -2963,26 +2563,21 @@ SpellMissInfo Unit::SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool
         else
             misschance += ((Player*)pVictim)->GetRatingBonusValue(CR_HIT_TAKEN_MELEE);
     }
-
     // Modify miss chance by victim auras
     if(attType == RANGED_ATTACK)
         misschance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE);
     else
         misschance -= pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE);
-
     // Modify miss chance from skill difference ( bonus from skills is 0.04% )
     int32 skillBonus = int32(GetWeaponSkillValue(attType,pVictim)) - int32(pVictim->GetDefenseSkillValue(this));
     misschance -= skillBonus * 0.04f;
-
     // Limit miss chance from 0 to 60%
     if ( misschance < 0.0f)
         return 0.0f;
     if ( misschance > 60.0f)
         return 60.0f;
-
     return misschance;
 }*/
-
 uint32 Unit::GetDefenseSkillValue(Unit const* target) const
 {
     if(GetTypeId() == TYPEID_PLAYER)
@@ -2997,7 +2592,6 @@ uint32 Unit::GetDefenseSkillValue(Unit const* target) const
     else
         return GetUnitMeleeSkill(target);
 }
-
 float Unit::GetUnitDodgeChance() const
 {
     if(hasUnitState(UNIT_STAT_STUNNED))
@@ -3016,14 +2610,11 @@ float Unit::GetUnitDodgeChance() const
         }
     }
 }
-
 float Unit::GetUnitParryChance() const
 {
     if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNNED))
         return 0.0f;
-
     float chance = 0.0f;
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         Player const* player = (Player const*)this;
@@ -3032,7 +2623,6 @@ float Unit::GetUnitParryChance() const
             Item *tmpitem = player->GetWeaponForAttack(BASE_ATTACK,true);
             if(!tmpitem)
                 tmpitem = player->GetWeaponForAttack(OFF_ATTACK,true);
-
             if(tmpitem)
                 chance = GetFloatValue(PLAYER_PARRY_PERCENTAGE);
         }
@@ -3045,15 +2635,12 @@ float Unit::GetUnitParryChance() const
             chance += GetTotalAuraModifier(SPELL_AURA_MOD_PARRY_PERCENT);
         }
     }
-
     return chance > 0.0f ? chance : 0.0f;
 }
-
 float Unit::GetUnitBlockChance() const
 {
     if ( IsNonMeleeSpellCasted(false) || hasUnitState(UNIT_STAT_STUNNED))
         return 0.0f;
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         Player const* player = (Player const*)this;
@@ -3078,11 +2665,9 @@ float Unit::GetUnitBlockChance() const
         }
     }
 }
-
 float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVictim) const
 {
     float crit;
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         switch(attackType)
@@ -3108,15 +2693,12 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVict
         crit += GetTotalAuraModifier(SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
         crit += GetTotalAuraModifier(SPELL_AURA_MOD_CRIT_PCT);
     }
-
     // flat aura mods
     if(attackType == RANGED_ATTACK)
         crit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_CRIT_CHANCE);
     else
         crit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_CRIT_CHANCE);
-
     crit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_SPELL_AND_WEAPON_CRIT_CHANCE);
-
     // reduce crit chance from Rating for players
     if (pVictim->GetTypeId()==TYPEID_PLAYER)
     {
@@ -3125,32 +2707,25 @@ float Unit::GetUnitCriticalChance(WeaponAttackType attackType, const Unit *pVict
         else
             crit -= ((Player*)pVictim)->GetRatingBonusValue(CR_CRIT_TAKEN_MELEE);
     }
-
     // Apply crit chance from defence skill
     crit += (int32(GetMaxSkillValueForLevel(pVictim)) - int32(pVictim->GetDefenseSkillValue(this))) * 0.04f;
-
     if (crit < 0.0f)
         crit = 0.0f;
     return crit;
 }
-
 uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target) const
 {
     uint32 value = 0;
     if(GetTypeId() == TYPEID_PLAYER)
     {
         Item* item = ((Player*)this)->GetWeaponForAttack(attType,true);
-
         // feral or unarmed skill only for base attack
         if(attType != BASE_ATTACK && !item )
             return 0;
-
         if(IsInFeralForm())
             return GetMaxSkillValueForLevel();              // always maximized SKILL_FERAL_COMBAT in fact
-
         // weapon skill or (unarmed for base attack)
         uint32  skill = item ? item->GetSkill() : SKILL_UNARMED;
-
         // in PvP use full skill instead current skill value
         value = (target && target->IsControlledByPlayer())
             ? ((Player*)this)->GetMaxSkillValue(skill)
@@ -3168,7 +2743,6 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
         value = GetUnitMeleeSkill(target);
    return value;
 }
-
 void Unit::_DeleteAuras()
 {
     while(!m_removedAuras.empty())
@@ -3178,12 +2752,10 @@ void Unit::_DeleteAuras()
 //        sLog.outDebug("Aura %d is deleted from unit %d", Aur->GetId(), GetGUIDLow());
     }
 }
-
 void Unit::_UpdateSpells( uint32 time )
 {
     if(m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
         _UpdateAutoRepeatSpell();
-
     // remove finished spells from current pointers
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; ++i)
     {
@@ -3193,7 +2765,6 @@ void Unit::_UpdateSpells( uint32 time )
             m_currentSpells[i] = NULL;                      // remove pointer
         }
     }
-
     // update auras
     // m_AurasUpdateIterator can be updated in inderect called code at aura remove to skip next planned to update but removed auras
     for (m_AurasUpdateIterator = m_Auras.begin(); m_AurasUpdateIterator != m_Auras.end();)
@@ -3202,7 +2773,6 @@ void Unit::_UpdateSpells( uint32 time )
         ++m_AurasUpdateIterator;                            // need shift to next for allow update if need into aura update
         i_aura->Update(time);
     }
-
     // remove expired auras
     for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end();)
     {
@@ -3211,9 +2781,7 @@ void Unit::_UpdateSpells( uint32 time )
         else
             ++i;
     }
-
     _DeleteAuras();
-
     if(!m_gameObj.empty())
     {
         GameObjectList::iterator itr;
@@ -3231,7 +2799,6 @@ void Unit::_UpdateSpells( uint32 time )
         }
     }
 }
-
 void Unit::_UpdateAutoRepeatSpell()
 {
     //check "realtime" interrupts
@@ -3243,12 +2810,10 @@ void Unit::_UpdateAutoRepeatSpell()
         m_AutoRepeatFirstCast = true;
         return;
     }
-
     //apply delay
     if ( m_AutoRepeatFirstCast && getAttackTimer(RANGED_ATTACK) < 500 )
         setAttackTimer(RANGED_ATTACK,500);
     m_AutoRepeatFirstCast = false;
-
     //castroutine
     if (isAttackReady(RANGED_ATTACK))
     {
@@ -3258,27 +2823,20 @@ void Unit::_UpdateAutoRepeatSpell()
             InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
             return;
         }
-
         // we want to shoot
         Spell* spell = new Spell(this, m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo, true, 0);
         spell->prepare(&(m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_targets));
-
         // all went good, reset attack
         resetAttackTimer(RANGED_ATTACK);
     }
 }
-
 void Unit::SetCurrentCastedSpell( Spell * pSpell )
 {
     assert(pSpell);                                         // NULL may be never passed here, use InterruptSpell or InterruptNonMeleeSpells
-
     CurrentSpellTypes CSpellType = pSpell->GetCurrentContainer();
-
     if (pSpell == m_currentSpells[CSpellType]) return;      // avoid breaking self
-
     // break same type spell if it is not delayed
     InterruptSpell(CSpellType,false);
-
     // special breakage effects:
     switch (CSpellType)
     {
@@ -3286,7 +2844,6 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
         {
             // generic spells always break channeled not delayed spells
             InterruptSpell(CURRENT_CHANNELED_SPELL,false);
-
             // autorepeat breaking
             if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] )
             {
@@ -3297,20 +2854,17 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
             }
             addUnitState(UNIT_STAT_CASTING);
         } break;
-
         case CURRENT_CHANNELED_SPELL:
         {
             // channel spells always break generic non-delayed and any channeled spells
             InterruptSpell(CURRENT_GENERIC_SPELL,false);
             InterruptSpell(CURRENT_CHANNELED_SPELL);
-
             // it also does break autorepeat if not Auto Shot
             if ( m_currentSpells[CURRENT_AUTOREPEAT_SPELL] &&
                 m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != SPELL_ID_AUTOSHOT )
                 InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
             addUnitState(UNIT_STAT_CASTING);
         } break;
-
         case CURRENT_AUTOREPEAT_SPELL:
         {
             // only Auto Shoot does not break anything
@@ -3323,28 +2877,22 @@ void Unit::SetCurrentCastedSpell( Spell * pSpell )
             // special action: set first cast flag
             m_AutoRepeatFirstCast = true;
         } break;
-
         default:
         {
             // other spell types don't break anything now
         } break;
     }
-
     // current spell (if it is still here) may be safely deleted now
     if (m_currentSpells[CSpellType])
         m_currentSpells[CSpellType]->SetReferencedFromCurrent(false);
-
     // set new current spell
     m_currentSpells[CSpellType] = pSpell;
     pSpell->SetReferencedFromCurrent(true);
-
     pSpell->m_selfContainer = &(m_currentSpells[pSpell->GetCurrentContainer()]);
 }
-
 void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool withInstant)
 {
     assert(spellType < CURRENT_MAX_SPELL);
-
     //sLog.outDebug("Interrupt spell for unit %u.", GetEntry());
     Spell *spell = m_currentSpells[spellType];
     if(spell
@@ -3354,39 +2902,31 @@ void Unit::InterruptSpell(CurrentSpellTypes spellType, bool withDelayed, bool wi
         // for example, do not let self-stun aura interrupt itself
         if(!spell->IsInterruptable())
             return;
-
         m_currentSpells[spellType] = NULL;
-
         // send autorepeat cancel message for autorepeat spells
         if (spellType == CURRENT_AUTOREPEAT_SPELL)
         {
             if(GetTypeId() == TYPEID_PLAYER)
                 ((Player*)this)->SendAutoRepeatCancel(this);
         }
-
         if (spell->getState() != SPELL_STATE_FINISHED)
             spell->cancel();
         spell->SetReferencedFromCurrent(false);
     }
 }
-
 void Unit::FinishSpell(CurrentSpellTypes spellType, bool ok /*= true*/)
 {
     Spell* spell = m_currentSpells[spellType];
     if (!spell)
         return;
-
     if (spellType == CURRENT_CHANNELED_SPELL)
         spell->SendChannelUpdate(0);
-
     spell->finish(ok);
 }
-
 bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skipAutorepeat, bool isAutoshoot) const
 {
     // We don't do loop here to explicitly show that melee spell is excluded.
     // Maybe later some special spells will be excluded too.
-
     // generic spells are casted when they are not finished and not delayed
     if ( m_currentSpells[CURRENT_GENERIC_SPELL] &&
         (m_currentSpells[CURRENT_GENERIC_SPELL]->getState() != SPELL_STATE_FINISHED) &&
@@ -3405,25 +2945,20 @@ bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skip
     // autorepeat spells may be finished or delayed, but they are still considered casted
     else if ( !skipAutorepeat && m_currentSpells[CURRENT_AUTOREPEAT_SPELL] )
         return(true);
-
     return(false);
 }
-
 void Unit::InterruptNonMeleeSpells(bool withDelayed, uint32 spell_id, bool withInstant)
 {
     // generic spells are interrupted if they are not finished or delayed
     if (m_currentSpells[CURRENT_GENERIC_SPELL] && (!spell_id || m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id==spell_id))
         InterruptSpell(CURRENT_GENERIC_SPELL,withDelayed,withInstant);
-
     // autorepeat spells are interrupted if they are not finished or delayed
     if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL] && (!spell_id || m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id==spell_id))
         InterruptSpell(CURRENT_AUTOREPEAT_SPELL,withDelayed,withInstant);
-
     // channeled spells are interrupted if they are not finished, even if they are delayed
     if (m_currentSpells[CURRENT_CHANNELED_SPELL] && (!spell_id || m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->Id==spell_id))
         InterruptSpell(CURRENT_CHANNELED_SPELL,true,true);
 }
-
 Spell* Unit::FindCurrentSpellBySpellId(uint32 spell_id) const
 {
     for (uint32 i = 0; i < CURRENT_MAX_SPELL; i++)
@@ -3431,24 +2966,20 @@ Spell* Unit::FindCurrentSpellBySpellId(uint32 spell_id) const
             return m_currentSpells[i];
     return NULL;
 }
-
 int32 Unit::GetCurrentSpellCastTime(uint32 spell_id) const
 {
     if (Spell const * spell = FindCurrentSpellBySpellId(spell_id))
         return spell->GetCastTime();
     return 0;
 }
-
 bool Unit::isInFrontInMap(Unit const* target, float distance,  float arc) const
 {
     return IsWithinDistInMap(target, distance) && HasInArc( arc, target );
 }
-
 bool Unit::isInBackInMap(Unit const* target, float distance, float arc) const
 {
     return IsWithinDistInMap(target, distance) && !HasInArc( 2 * M_PI - arc, target );
 }
-
 bool Unit::isInAccessiblePlaceFor(Creature const* c) const
 {
     if(IsInWater())
@@ -3456,74 +2987,57 @@ bool Unit::isInAccessiblePlaceFor(Creature const* c) const
     else
         return c->canWalk() || c->canFly();
 }
-
 bool Unit::IsInWater() const
 {
     return GetBaseMap()->IsInWater(GetPositionX(),GetPositionY(), GetPositionZ());
 }
-
 bool Unit::IsUnderWater() const
 {
     return GetBaseMap()->IsUnderWater(GetPositionX(),GetPositionY(),GetPositionZ());
 }
-
 void Unit::DeMorph()
 {
     SetDisplayId(GetNativeDisplayId());
 }
-
 int32 Unit::GetTotalAuraModifier(AuraType auratype) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
         modifier += (*i)->GetAmount();
-
     return modifier;
 }
-
 float Unit::GetTotalAuraMultiplier(AuraType auratype) const
 {
     float multiplier = 1.0f;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
         multiplier *= (100.0f + (*i)->GetAmount())/100.0f;
-
     return multiplier;
 }
-
 int32 Unit::GetMaxPositiveAuraModifier(AuraType auratype)
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
         if ((*i)->GetAmount() > modifier)
             modifier = (*i)->GetAmount();
     }
-
     return modifier;
 }
-
 int32 Unit::GetMaxNegativeAuraModifier(AuraType auratype) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
         if ((*i)->GetAmount() < modifier)
             modifier = (*i)->GetAmount();
-
     return modifier;
 }
-
 int32 Unit::GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
@@ -3532,11 +3046,9 @@ int32 Unit::GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask)
     }
     return modifier;
 }
-
 float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const
 {
     float multiplier = 1.0f;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
@@ -3545,39 +3057,31 @@ float Unit::GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask
     }
     return multiplier;
 }
-
 int32 Unit::GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
         if ((*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() > modifier)
             modifier = (*i)->GetAmount();
     }
-
     return modifier;
 }
-
 int32 Unit::GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
         if ((*i)->GetMiscValue()& misc_mask && (*i)->GetAmount() < modifier)
             modifier = (*i)->GetAmount();
     }
-
     return modifier;
 }
-
 int32 Unit::GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
@@ -3586,11 +3090,9 @@ int32 Unit::GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value)
     }
     return modifier;
 }
-
 float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     float multiplier = 1.0f;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
@@ -3599,35 +3101,28 @@ float Unit::GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_valu
     }
     return multiplier;
 }
-
 int32 Unit::GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
         if ((*i)->GetMiscValue()== misc_value && (*i)->GetAmount() > modifier)
             modifier = (*i)->GetAmount();
     }
-
     return modifier;
 }
-
 int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const
 {
     int32 modifier = 0;
-
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
     for(AuraEffectList::const_iterator i = mTotalAuraList.begin();i != mTotalAuraList.end(); ++i)
     {
         if ((*i)->GetMiscValue()== misc_value && (*i)->GetAmount() < modifier)
             modifier = (*i)->GetAmount();
     }
-
     return modifier;
 }
-
 bool Unit::AddAura(Aura *Aur, bool handleEffects)
 {
     // aura doesn't apply effects-return
@@ -3636,9 +3131,7 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
         delete Aur;
         return false;
     }
-
     SpellEntry const* aurSpellInfo = Aur->GetSpellProto();
-
     // ghost spell check, allow apply any auras at player loading in ghost mode (will be cleanup after load)
     if( !isAlive() && !IsDeathPersistentSpell(aurSpellInfo) &&
         //Aur->GetId() != 2584 &&                             // Waiting to Resurrect (not have death persistence flag)
@@ -3647,7 +3140,6 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
         delete Aur;
         return false;
     }
-
     if(Aur->GetTarget() != this)
     {
         sLog.outError("Aura (spell %u) add to aura list of %s (lowguid: %u) but Aura target is %s (lowguid: %u)",
@@ -3656,9 +3148,7 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
         delete Aur;
         return false;
     }
-
     uint32 aurId = aurSpellInfo->Id;
-
     // passive and persistent and Incanter's Absorption auras can stack with themselves any number of times
     if (!Aur->IsPassive() && !Aur->IsPersistent() && aurId != 44413)
     {
@@ -3671,7 +3161,6 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
                 if (stackAmount > aurSpellInfo->StackAmount)
                     stackAmount = aurSpellInfo->StackAmount;
                 Aur->SetStackAmount(stackAmount, false);
-
                 // spell is triggered with only stackamount change but no amount change
                 switch(aurId)
                 {
@@ -3699,23 +3188,20 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
                     case 64821: // Fuse Armor (Razorscale)
                         if(stackAmount == aurSpellInfo->StackAmount)
                             CastSpell(this, 64774, true, NULL, NULL, Aur->GetCasterGUID());
-                        break;                        
+                        break;
                 }
             }
-
             // Use the new one to replace the old one
             // This is the only place where AURA_REMOVE_BY_STACK should be used
             RemoveAura(foundAura, AURA_REMOVE_BY_STACK);
         }
     }
-
     // passive auras not stacable with other ranks
     if (!RemoveNoStackAurasDueToAura(Aur))
     {
         delete Aur;
         return false;                                   // couldn't remove conflicting aura with higher rank
     }
-
     // update single target auras list (before aura add to aura list, to prevent unexpected remove recently added aura)
     if (Aur->IsSingleTarget())
     {
@@ -3724,7 +3210,6 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
         {
             Unit* caster = Aur->GetCaster();
             assert(caster);
-
             bool restart = false;
             AuraList& scAuras = caster->GetSingleCastAuras();
             for(AuraList::iterator itr = scAuras.begin(); itr != scAuras.end(); ++itr)
@@ -3737,7 +3222,6 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
                     break;
                 }
             }
-
             if(!restart)
             {
                 // done
@@ -3746,10 +3230,8 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
             }
         }
     }
-
     // add aura, register in lists and arrays
     Aur->_AddAura();
-
     //*****************************************************
     // Update target aura state flag
     //*****************************************************
@@ -3758,34 +3240,25 @@ bool Unit::AddAura(Aura *Aur, bool handleEffects)
         m_auraStateAuras.insert(AuraStateAurasMap::value_type(aState, Aur));
         ModifyAuraState(aState, true);
     }
-
     m_Auras.insert(AuraMap::value_type(aurId, Aur));
-
     if(aurSpellInfo->AuraInterruptFlags)
     {
         m_interruptableAuras.push_back(Aur);
         AddInterruptMask(aurSpellInfo->AuraInterruptFlags);
     }
-
     if (handleEffects)
         Aur->HandleEffects(true);
-
     sLog.outDebug("Aura %u now is in use", aurId);
     return true;
 }
-
 bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
 {
     SpellEntry const* spellProto = Aur->GetSpellProto();
-
     uint32 spellId = Aur->GetId();
-
     // passive spell special case (only non stackable with ranks)
     if(IsPassiveSpell(spellId) && IsPassiveSpellStackableWithRanks(spellProto))
         return true;
-
     //bool linked = spellmgr.GetSpellCustomAttr(spellId) & SPELL_ATTR_CU_LINK_AURA? true : false;
-
     bool remove = false;
     for(AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i)
     {
@@ -3794,22 +3267,18 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
             remove = false;
             i = m_Auras.begin();
         }
-
         SpellEntry const* i_spellProto = i->second->GetSpellProto();
         uint32 i_spellId = i_spellProto->Id;
         bool sameCaster = Aur->GetCasterGUID() == (*i).second->GetCasterGUID();
-
         if(IsPassiveSpell(i_spellId))
         {
             // passive non-stackable spells not stackable only for same caster
             if(!sameCaster)
                 continue;
-
             // passive non-stackable spells not stackable only with another rank of same spell
             if (!spellmgr.IsRankSpellDueToSpell(spellProto, i_spellId))
                 continue;
         }
-
         bool is_triggered_by_spell = false;
         // prevent triggering aura of removing aura that triggered it
         // prevent triggered aura of removing aura that triggering it (triggered effect early some aura of parent spell
@@ -3822,9 +3291,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
                 break;
             }
         }
-
         // check if they can stack
-
         /*// Dont remove by stack with linked auras
         // Not needed for now
         if(sameCaster && linked)
@@ -3837,13 +3304,10 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
                         break;
                     }
         }*/
-
         if (is_triggered_by_spell)
             continue;
-
         if(spellmgr.CanAurasStack(spellProto, i_spellProto, sameCaster))
             continue;
-
         //some spells should be not removed by lower rank of them (totem, paladin aura)
         if (!sameCaster
             &&(Aur->IsAreaAura())
@@ -3851,7 +3315,6 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
             &&(spellmgr.IsRankSpellDueToSpell(spellProto, i_spellId))
             &&(IsHigherHankOfSpell(spellId,i_spellId)))
             return false;
-
         // Remove all auras by aura caster
         RemoveAura(i, AURA_REMOVE_BY_DEFAULT);
         if(i == m_Auras.end())
@@ -3860,7 +3323,6 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur)
     }
     return true;
 }
-
 void Unit::RemoveAura(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode)
 {
     for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
@@ -3874,7 +3336,6 @@ void Unit::RemoveAura(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode)
             ++iter;
     }
 }
-
 void Unit::RemoveAura(Aura * aur ,AuraRemoveMode mode)
 {
     // no need to remove
@@ -3891,7 +3352,6 @@ void Unit::RemoveAura(Aura * aur ,AuraRemoveMode mode)
             ++iter;
     }
 }
-
 void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode)
 {
     for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
@@ -3905,7 +3365,6 @@ void Unit::RemoveAurasDueToSpell(uint32 spellId, uint64 caster ,AuraRemoveMode r
             ++iter;
     }
 }
-
 void Unit::RemoveAuraFromStack(uint32 spellId, uint64 caster ,AuraRemoveMode removeMode)
 {
     for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
@@ -3919,13 +3378,11 @@ void Unit::RemoveAuraFromStack(uint32 spellId, uint64 caster ,AuraRemoveMode rem
             ++iter;
     }
 }
-
 inline void Unit::RemoveAuraFromStack(AuraMap::iterator &iter,AuraRemoveMode removeMode)
 {
     if (iter->second->modStackAmount(-1))
         RemoveAura(iter, removeMode);
 }
-
 void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit *dispeler)
 {
     for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
@@ -3934,7 +3391,6 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit
         if (casterGUID == aur->GetCasterGUID())
         {
             RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);
-
             // Unstable Affliction (crash if before removeaura?)
             if (aur->GetSpellProto()->SpellFamilyName == SPELLFAMILY_WARLOCK && (aur->GetSpellProto()->SpellFamilyFlags[1] & 0x0100))
             {
@@ -3951,12 +3407,10 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit
             ++iter;
     }
 }
-
 void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit *stealer)
 {
     if (casterGUID == stealer->GetGUID())
         return;
-
     for(AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
     {
         Aura * aur = iter->second;
@@ -3973,7 +3427,6 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
             int32 dur = 2*MINUTE*IN_MILISECONDS < aur->GetAuraDuration() ? 2*MINUTE*IN_MILISECONDS : aur->GetAuraDuration();
             Aura * new_aur = new Aura(aur->GetSpellProto(),aur->GetEffectMask(), stealer, stealer, stealer);
             new_aur->SetLoadedState(aur->GetCasterGUID(), dur, dur, aur->GetAuraCharges(), aur->GetStackAmount(), &damage[0]);
-
             // Unregister _before_ adding to stealer
             aur->UnregisterSingleCastAura();
             // strange but intended behaviour: Stolen single target auras won't be treated as single targeted
@@ -3986,7 +3439,6 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
             ++iter;
     }
 }
-
 void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)
 {
     for (AuraMap::iterator iter = m_Auras.lower_bound(spellId); iter != m_Auras.upper_bound(spellId);)
@@ -4000,7 +3452,6 @@ void Unit::RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId)
             ++iter;
     }
 }
-
 void Unit::RemoveAurasByType(AuraType auraType, uint64 casterGUID, Aura * except, bool negative, bool positive)
 {
     for (AuraEffectList::const_iterator iter = m_modAuras[auraType].begin(); iter != m_modAuras[auraType].end();)
@@ -4017,7 +3468,6 @@ void Unit::RemoveAurasByType(AuraType auraType, uint64 casterGUID, Aura * except
         }
     }
 }
-
 void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
 {
     // single target auras from other casters
@@ -4039,7 +3489,6 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
         else
             ++iter;
     }
-
     // single target auras at other targets
     AuraList& scAuras = GetSingleCastAuras();
     for (AuraList::iterator iter = scAuras.begin(); iter != scAuras.end();)
@@ -4055,43 +3504,31 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
         }
     }
 }
-
 void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
 {
     Aura* Aur = i->second;
-
     // if unit currently update aura list then make safe update iterator shift to next
     if (m_AurasUpdateIterator == i)
         ++m_AurasUpdateIterator;
-
     // some ShapeshiftBoosts at remove trigger removing other auras including parent Shapeshift aura
     // remove aura from list before to prevent deleting it before
     m_Auras.erase(i);
-
     ++m_removedAurasCount;
-
     if(Aur->IsPersistent())
         if(DynamicObject *dynObj = ObjectAccessor::GetObjectInWorld(Aur->GetSourceGUID(), (DynamicObject*)NULL))
             dynObj->RemoveAffected(this);
-
     Aur->UnregisterSingleCastAura();
-
     if(Aur->GetSpellProto()->AuraInterruptFlags)
     {
         m_interruptableAuras.remove(Aur);
         UpdateInterruptMask();
     }
-
     Aur->SetRemoveMode(mode);
-
     sLog.outDebug("Aura %u now is remove mode %d", Aur->GetId(), mode);
     Aur->HandleEffects(false);
-
     // set aura to be removed during unit::_updatespells
     m_removedAuras.push_back(Aur);
-
     Aur->_RemoveAura();
-
     bool auraStateFound = false;
     if (AuraState auraState = GetSpellAuraState(Aur->GetSpellProto()))
     {
@@ -4113,26 +3550,22 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
         if (!auraStateFound)
             ModifyAuraState(auraState, false);
     }
-
     // Remove totem at next update if totem looses its aura
     if (Aur->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE && GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem()&& ((TempSummon*)this)->GetSummonerGUID()==Aur->GetCasterGUID())
     {
         if (((Totem*)this)->GetSpell()==Aur->GetId() && ((Totem*)this)->GetTotemType()==TOTEM_PASSIVE)
             ((Totem*)this)->setDeathState(JUST_DIED);
     }
-
     // only way correctly remove all auras from list
     //if(removedAuras != m_removedAurasCount) new aura may be casted
         i = m_Auras.begin();
 }
-
 void Unit::RemoveAllAuras()
 {
     AuraMap::iterator iter = m_Auras.begin();
     while (!m_Auras.empty())
         RemoveAura(iter);
 }
-
 void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negative /*=true*/, bool positive /*=true*/)
 {
     for(AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end();)
@@ -4144,7 +3577,6 @@ void Unit::RemoveAllAuras(uint64 casterGUID, Aura * except /*=NULL*/, bool negat
             ++iter;
     }
 }
-
 void Unit::RemoveArenaAuras(bool onleave)
 {
     // in join, remove positive buffs, on end, remove negative
@@ -4160,7 +3592,6 @@ void Unit::RemoveArenaAuras(bool onleave)
             ++iter;
     }
 }
-
 void Unit::RemoveAllAurasOnDeath()
 {
     // used just after dieing to remove all visible auras
@@ -4173,7 +3604,6 @@ void Unit::RemoveAllAurasOnDeath()
             ++iter;
     }
 }
-
 void Unit::DelayAura(uint32 spellId, uint64 caster, int32 delaytime)
 {
     if (Aura * aur = GetAura(spellId, caster))
@@ -4187,19 +3617,16 @@ void Unit::DelayAura(uint32 spellId, uint64 caster, int32 delaytime)
         sLog.outDebug("Aura %u partially interrupted on unit %u, new duration: %u ms",aur->GetId(), GetGUIDLow(), aur->GetAuraDuration());
     }
 }
-
 void Unit::_RemoveAllAuraMods()
 {
     for (AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i)
         (*i).second->ApplyAllModifiers(false);
 }
-
 void Unit::_ApplyAllAuraMods()
 {
     for (AuraMap::iterator i = m_Auras.begin(); i != m_Auras.end(); ++i)
         (*i).second->ApplyAllModifiers(true);
 }
-
 bool Unit::HasAuraTypeWithMiscvalue(AuraType auratype, uint32 miscvalue) const
 {
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
@@ -4208,7 +3635,6 @@ bool Unit::HasAuraTypeWithMiscvalue(AuraType auratype, uint32 miscvalue) const
             return true;
     return false;
 }
-
 bool Unit::HasAuraTypeWithValue(AuraType auratype, uint32 value) const
 {
     AuraEffectList const& mTotalAuraList = GetAurasByType(auratype);
@@ -4218,23 +3644,19 @@ bool Unit::HasAuraTypeWithValue(AuraType auratype, uint32 value) const
     return false;
 }
 
-
 bool Unit::HasAuraType(AuraType auraType) const
 {
     return (!m_modAuras[auraType].empty());
 }
-
 bool Unit::HasAura(uint32 spellId, uint64 caster) const
 {
     //Special case for non existing spell
     if (spellId==61988)
         return HasAura(61987, caster) || HasAura(25771, caster);
-
     if (Aura * aur = GetAura(spellId, caster))
         return true;
     return false;
 }
-
 bool Unit::HasAura(Aura * aur) const
 {
     // no need to find aura
@@ -4249,14 +3671,12 @@ bool Unit::HasAura(Aura * aur) const
     }
     return false;
 }
-
 bool Unit::HasAuraEffect(uint32 spellId, uint8 effIndex, uint64 caster) const
 {
     if (Aura * aur = GetAura(spellId, caster))
         return aur->HasEffect(effIndex);
     return false;
 }
-
 Aura * Unit::GetAura(uint32 spellId, uint64 caster) const
 {
     if (!caster)
@@ -4273,14 +3693,12 @@ Aura * Unit::GetAura(uint32 spellId, uint64 caster) const
         return NULL;
     }
 }
-
 AuraEffect * Unit::GetAuraEffect(uint32 spellId, uint8 effIndex, uint64 caster) const
 {
     if (Aura * aur = GetAura(spellId, caster))
         return aur->GetPartAura(effIndex);
     return false;
 }
-
 AuraEffect* Unit::GetAura(AuraType type, uint32 family, uint32 familyFlag1, uint32 familyFlag2, uint32 familyFlag3, uint64 casterGUID)
 {
     AuraEffectList const& auras = GetAurasByType(type);
@@ -4296,7 +3714,6 @@ AuraEffect* Unit::GetAura(AuraType type, uint32 family, uint32 familyFlag1, uint
     }
     return NULL;
 }
-
 AuraEffect * Unit::IsScriptOverriden(SpellEntry const * spell, int32 script) const
 {
     AuraEffectList const& auras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
@@ -4308,7 +3725,6 @@ AuraEffect * Unit::IsScriptOverriden(SpellEntry const * spell, int32 script) con
     }
     return NULL;
 }
-
 uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove)
 {
     static const AuraType diseaseAuraTypes[] =
@@ -4317,7 +3733,6 @@ uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove)
         SPELL_AURA_MOD_MECHANIC_DAMAGE_TAKEN_PERCENT,  // Crypt Fever and Ebon Plague
         SPELL_AURA_NONE
     };
-
     uint32 diseases=0;
     for(AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr)
     {
@@ -4328,7 +3743,6 @@ uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove)
                 && (*i)->GetCasterGUID()==casterGUID)
             {
                 ++diseases;
-
                 if (remove)
                 {
                     RemoveAura((*i)->GetId(), (*i)->GetCasterGUID());
@@ -4341,7 +3755,6 @@ uint32 Unit::GetDiseasesByCaster(uint64 casterGUID, bool remove)
     }
     return diseases;
 }
-
 uint32 Unit::GetDoTsByCaster(uint64 casterGUID) const
 {
     static const AuraType diseaseAuraTypes[] =
@@ -4350,7 +3763,6 @@ uint32 Unit::GetDoTsByCaster(uint64 casterGUID) const
         SPELL_AURA_PERIODIC_DAMAGE_PERCENT,
         SPELL_AURA_NONE
     };
-
     uint32 dots=0;
     for(AuraType const* itr = &diseaseAuraTypes[0]; itr && itr[0] != SPELL_AURA_NONE; ++itr)
     {
@@ -4364,12 +3776,10 @@ uint32 Unit::GetDoTsByCaster(uint64 casterGUID) const
     }
     return dots;
 }
-
 void Unit::AddDynObject(DynamicObject* dynObj)
 {
     m_dynObjGUIDs.push_back(dynObj->GetGUID());
 }
-
 void Unit::RemoveDynObject(uint32 spellid)
 {
     if(m_dynObjGUIDs.empty())
@@ -4390,7 +3800,6 @@ void Unit::RemoveDynObject(uint32 spellid)
             ++i;
     }
 }
-
 void Unit::RemoveAllDynObjects()
 {
     while(!m_dynObjGUIDs.empty())
@@ -4401,7 +3810,6 @@ void Unit::RemoveAllDynObjects()
         m_dynObjGUIDs.erase(m_dynObjGUIDs.begin());
     }
 }
-
 DynamicObject * Unit::GetDynObject(uint32 spellId)
 {
     for (DynObjectGUIDs::iterator i = m_dynObjGUIDs.begin(); i != m_dynObjGUIDs.end();)
@@ -4412,29 +3820,24 @@ DynamicObject * Unit::GetDynObject(uint32 spellId)
             i = m_dynObjGUIDs.erase(i);
             continue;
         }
-
         if (dynObj->GetSpellId() == spellId)
             return dynObj;
         ++i;
     }
     return NULL;
 }
-
 GameObject* Unit::GetGameObject(uint32 spellId) const
 {
     for (GameObjectList::const_iterator i = m_gameObj.begin(); i != m_gameObj.end(); ++i)
         if ((*i)->GetSpellId() == spellId)
             return *i;
-
     return NULL;
 }
-
 void Unit::AddGameObject(GameObject* gameObj)
 {
     assert(gameObj && gameObj->GetOwnerGUID()==0);
     m_gameObj.push_back(gameObj);
     gameObj->SetOwnerGUID(GetGUID());
-
     if ( GetTypeId()==TYPEID_PLAYER && gameObj->GetSpellId() )
     {
         SpellEntry const* createBySpell = sSpellStore.LookupEntry(gameObj->GetSpellId());
@@ -4444,13 +3847,10 @@ void Unit::AddGameObject(GameObject* gameObj)
             ((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell,0,NULL,true);
     }
 }
-
 void Unit::RemoveGameObject(GameObject* gameObj, bool del)
 {
     assert(gameObj && gameObj->GetOwnerGUID()==GetGUID());
-
     gameObj->SetOwnerGUID(0);
-
     for(uint32 i = 0; i < 4; ++i)
     {
         if(m_ObjectSlot[i] == gameObj->GetGUID())
@@ -4459,12 +3859,10 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
             break;
         }
     }
-
     // GO created by some spell
     if (uint32 spellid = gameObj->GetSpellId())
     {
         RemoveAurasDueToSpell(spellid);
-
         if (GetTypeId()==TYPEID_PLAYER)
         {
             SpellEntry const* createBySpell = sSpellStore.LookupEntry(spellid );
@@ -4474,16 +3872,13 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
                 ((Player*)this)->SendCooldownEvent(createBySpell);
         }
     }
-
     m_gameObj.remove(gameObj);
-
     if(del)
     {
         gameObj->SetRespawnTime(0);
         gameObj->Delete();
     }
 }
-
 void Unit::RemoveGameObject(uint32 spellid, bool del)
 {
     if(m_gameObj.empty())
@@ -4500,14 +3895,12 @@ void Unit::RemoveGameObject(uint32 spellid, bool del)
                 (*i)->SetRespawnTime(0);
                 (*i)->Delete();
             }
-
             next = m_gameObj.erase(i);
         }
         else
             ++next;
     }
 }
-
 void Unit::RemoveAllGameObjects()
 {
     // remove references to unit
@@ -4519,7 +3912,6 @@ void Unit::RemoveAllGameObjects()
         i = m_gameObj.erase(i);
     }
 }
-
 void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
 {
     WorldPacket data(SMSG_SPELLNONMELEEDAMAGELOG, (16+4+4+4+1+4+4+1+1+4+4+1)); // we guess size
@@ -4540,7 +3932,6 @@ void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)
     data << uint8 (0);                                      // flag to use extend data
     SendMessageToSet( &data, true );
 }
-
 void Unit::SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit)
 {
     SpellNonMeleeDamage log(this, target, SpellID, damageSchoolMask);
@@ -4554,7 +3945,6 @@ void Unit::SendSpellNonMeleeDamageLog(Unit *target, uint32 SpellID, uint32 Damag
         log.HitInfo |= SPELL_HIT_TYPE_CRIT;
     SendSpellNonMeleeDamageLog(&log);
 }
-
 void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell, SpellEntry const * procAura)
 {
      // Not much to do if no flags are set.
@@ -4565,11 +3955,9 @@ void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVic
     if(pVictim && pVictim->isAlive() && procVictim)
         pVictim->ProcDamageAndSpellFor(true,this,procVictim, procExtra, attType, procSpell, amount, procAura);
 }
-
 void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo)
 {
     AuraEffect *aura = pInfo->auraEff;
-
     WorldPacket data(SMSG_PERIODICAURALOG, 30);
     data.append(GetPackGUID());
     data.appendPackGUID(aura->GetCasterGUID());
@@ -4607,10 +3995,8 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo)
             sLog.outError("Unit::SendPeriodicAuraLog: unknown aura %u", uint32(aura->GetAuraName()));
             return;
     }
-
     SendMessageToSet(&data, true);
 }
-
 void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo)
 {
     WorldPacket data(SMSG_SPELLLOGMISS, (4+8+1+4+8+1));
@@ -4624,11 +4010,9 @@ void Unit::SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo)
     // end loop
     SendMessageToSet(&data, true);
 }
-
 void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
 {
     sLog.outDebug("WORLD: Sending SMSG_ATTACKERSTATEUPDATE");
-
     uint32 count = 1;
     WorldPacket data(SMSG_ATTACKERSTATEUPDATE, 16 + 45);    // we guess size
     data << uint32(damageInfo->HitInfo);
@@ -4638,36 +4022,29 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
     int32 overkill = damageInfo->damage - damageInfo->target->GetHealth();
     data << uint32(overkill < 0 ? 0 : overkill);            // Overkill
     data << uint8(count);                                   // Sub damage count
-
     for(uint32 i = 0; i < count; ++i)
     {
         data << uint32(damageInfo->damageSchoolMask);       // School of sub damage
         data << float(damageInfo->damage);                  // sub damage
         data << uint32(damageInfo->damage);                 // Sub Damage
     }
-
     if(damageInfo->HitInfo & (HITINFO_ABSORB | HITINFO_ABSORB2))
     {
         for(uint32 i = 0; i < count; ++i)
             data << uint32(damageInfo->absorb);             // Absorb
     }
-
     if(damageInfo->HitInfo & (HITINFO_RESIST | HITINFO_RESIST2))
     {
         for(uint32 i = 0; i < count; ++i)
             data << uint32(damageInfo->resist);             // Resist
     }
-
     data << uint8(damageInfo->TargetState);
     data << uint32(0);
     data << uint32(0);
-
     if(damageInfo->HitInfo & HITINFO_BLOCK)
         data << uint32(damageInfo->blocked_amount);
-
     if(damageInfo->HitInfo & HITINFO_UNK3)
         data << uint32(0);
-
     if(damageInfo->HitInfo & HITINFO_UNK1)
     {
         data << uint32(0);
@@ -4686,10 +4063,8 @@ void Unit::SendAttackStateUpdate(CalcDamageInfo *damageInfo)
         }
         data << uint32(0);
     }
-
     SendMessageToSet( &data, true );
 }
-
 void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount)
 {
     CalcDamageInfo dmgInfo;
@@ -4704,18 +4079,14 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType,
     dmgInfo.blocked_amount = BlockedAmount;
     SendAttackStateUpdate(&dmgInfo);
 }
-
 bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
 {
     SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto();
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
     Unit* target = pVictim;
     int32 basepoints0 = 0;
-
     switch(hasteSpell->SpellFamilyName)
     {
         case SPELLFAMILY_ROGUE:
@@ -4737,48 +4108,36 @@ bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             break;
         }
     }
-
     // processed charge only counting case
     if(!triggered_spell_id)
         return true;
-
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",hasteSpell->Id,triggered_spell_id);
         return false;
     }
-
     // default case
     if((!target && !spellmgr.IsSrcTargetSpell(triggerEntry)) || (target && target!=this && !target->isAlive()))
         return false;
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
-
     if(basepoints0)
         CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
-
 bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraEffect* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
 {
     SpellEntry const *triggeredByAuraSpell = triggeredByAura->GetSpellProto();
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
     Unit* target = pVictim;
     int32 basepoints0 = 0;
-
     switch(triggeredByAuraSpell->SpellFamilyName)
     {
         case SPELLFAMILY_MAGE:
@@ -4791,7 +4150,6 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraE
                     Unit* caster = triggeredByAura->GetCaster();
                     if(!caster)
                         return false;
-
                     triggered_spell_id = 54648;
                     target = caster;
                     break;
@@ -4799,51 +4157,39 @@ bool Unit::HandleSpellCritChanceAuraProc(Unit *pVictim, uint32 /*damage*/, AuraE
             }
         }
     }
-
     // processed charge only counting case
     if(!triggered_spell_id)
         return true;
-
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleHasteAuraProc: Spell %u have not existed triggered spell %u",triggeredByAuraSpell->Id,triggered_spell_id);
         return false;
     }
-
     // default case
     if(!target || target!=this && !target->isAlive())
         return false;
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
-
     if(basepoints0)
         CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
-
 bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
 {
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
     uint32 effIndex = triggeredByAura->GetEffIndex();
     int32  triggerAmount = triggeredByAura->GetAmount();
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
     Unit* target = pVictim;
     int32 basepoints0 = 0;
     uint64 originalCaster = 0;
-
     // Master of subtlety (checked here because ranks have different spellfamilynames)
     if (dummySpell->Id == 31223 || dummySpell->Id == 31221 || dummySpell->Id == 31222)
     {
@@ -4870,7 +4216,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         target = owner;
                         triggered_spell_id = 50454;
                         break;
-                    } 
+                    }
                     return false;
                 }
                 // Improved Divine Spirit
@@ -4909,7 +4255,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     basepoints0 = triggerAmount*int32(damage)/100;
                     if(basepoints0 > GetMaxHealth()/2)
                         basepoints0 = GetMaxHealth()/2;
-
                     triggered_spell_id = 25997;
                     break;
                 }
@@ -4920,7 +4265,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     target = SelectNearbyTarget();
                     if(!target)
                         return false;
-
                     triggered_spell_id = 26654;
                     break;
                 }
@@ -4945,11 +4289,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(!procSpell)
                         return false;
-
                     // find Mage Armor
                     if (!GetAura(SPELL_AURA_MOD_MANA_REGEN_INTERRUPT, SPELLFAMILY_MAGE, 0x10000000))
                         return false;
-
                     switch(GetFirstSchoolInMask(GetSpellSchoolMask(procSpell)))
                     {
                         case SPELL_SCHOOL_NORMAL:
@@ -4963,7 +4305,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         default:
                             return false;
                     }
-
                     target = this;
                     break;
                 }
@@ -4972,7 +4313,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(!procSpell)
                         return false;
-
                     switch(GetFirstSchoolInMask(GetSpellSchoolMask(procSpell)))
                     {
                         case SPELL_SCHOOL_NORMAL:
@@ -4986,7 +4326,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         default:
                             return false;
                     }
-
                     target = this;
                     break;
                 }
@@ -4997,7 +4336,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     target = GetOwner();
                     if(!target)
                         return false;
-
                     triggered_spell_id = 34650;
                     break;
                 }
@@ -5007,7 +4345,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // Cast finish spell at last charge
                     if (triggeredByAura->GetParentAura()->GetAuraCharges() > 1)
                         return false;
-
                     target = this;
                     triggered_spell_id = 33494;
                     break;
@@ -5022,7 +4359,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     basepoints0 = 3 * damage;               // 300%
                     if (basepoints0 < 0)
                         return false;
-
                     triggered_spell_id = 31285;
                     target = this;
                     break;
@@ -5043,7 +4379,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER || !this->isAlive())
                         return false;
-
                     // Select class defined buff
                     switch (getClass())
                     {
@@ -5079,7 +4414,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         default:
                             return false;
                     }
-
                     target = this;
                     if (roll_chance_i(10))
                         ((Player*)this)->Say("This is Madness!", LANG_UNIVERSAL);
@@ -5098,7 +4432,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     // Get Aldor reputation rank
                     if (((Player *)this)->GetReputationRank(932) == REP_EXALTED)
                     {
@@ -5123,7 +4456,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                             if(IsFriendlyTo(target))
                                 return false;
                         }
-
                         triggered_spell_id = 45429;
                         break;
                     }
@@ -5136,7 +4468,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     // Get Aldor reputation rank
                     if (((Player *)this)->GetReputationRank(932) == REP_EXALTED)
                     {
@@ -5159,7 +4490,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     // Get Aldor reputation rank
                     if (((Player *)this)->GetReputationRank(932) == REP_EXALTED)
                     {
@@ -5183,7 +4513,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     // Get Aldor reputation rank
                     if (((Player *)this)->GetReputationRank(932) == REP_EXALTED)
                     {
@@ -5235,7 +4564,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // Roll chane
                     if (!roll_chance_i(triggerAmount))
                         return false;
-
                     // Remove any stun effect on target
                     pVictim->RemoveAurasWithMechanic(1<<MECHANIC_STUN, AURA_REMOVE_BY_ENEMY_SPELL);
                     return true;
@@ -5250,7 +4578,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if (getPowerType() != POWER_MANA)
                     return false;
-
                 // mana reward
                 basepoints0 = (triggerAmount * GetMaxPower(POWER_MANA) / 100);
                 target = this;
@@ -5262,13 +4589,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!procSpell)
                     return false;
-
                 // mana cost save
                 int32 cost = procSpell->manaCost + procSpell->ManaCostPercentage * GetCreateMana() / 100;
                 basepoints0 = cost * triggerAmount/100;
                 if( basepoints0 <=0 )
                     return false;
-
                 target = this;
                 triggered_spell_id = 29077;
                 break;
@@ -5282,13 +4607,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 CastSpell(target, triggered_spell_id, true, 0, triggeredByAura);
                 return true;
             }
-
             // Arcane Potency
             if (dummySpell->SpellIconID == 2120)
             {
                 if(!procSpell)
                     return false;
-
                 target = this;
                 switch (dummySpell->Id)
                 {
@@ -5300,7 +4623,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 }
                 break;
             }
-
             // Hot Streak
             if (dummySpell->SpellIconID == 2999)
             {
@@ -5309,7 +4631,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 AuraEffect *counter = triggeredByAura->GetParentAura()->GetPartAura(1);
                 if (!counter)
                     return true;
-
                 // Count spell criticals in a row in second aura
                 if (procEx & PROC_EX_CRITICAL_HIT)
                 {
@@ -5328,7 +4649,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!procSpell)
                     return false;
-
                 int32 cost = procSpell->manaCost + procSpell->ManaCostPercentage * GetCreateMana() / 100;
                 basepoints0 = cost * triggerAmount/100;
                 if( basepoints0 <=0 )
@@ -5342,7 +4662,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(GetTypeId() != TYPEID_PLAYER)
                     return false;
-
                 target = this;
                 triggered_spell_id = 37436;
                 break;
@@ -5381,7 +4700,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                             sLog.outError("Unit::HandleDummyAuraProc: non handled spell id: %u (IG)",dummySpell->Id);
                             return false;
                     }
-
                     triggered_spell_id = 12654;
                     break;
                 }
@@ -5394,7 +4712,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         RemoveAurasDueToSpell(28682);       //-> remove Combustion auras
                         return true;                        // charge counting (will removed)
                     }
-
                     CastSpell(this, 28682, true, castItem, triggeredByAura);
                     return (procEx & PROC_EX_CRITICAL_HIT);// charge update only at crit hits, no hidden cooldowns
                 }
@@ -5403,7 +4720,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     SpellCooldowns const SpellCDs = ((Player*)this)->GetSpellCooldowns();
                     // remove cooldowns on all ranks of Frost Nova
                     for(SpellCooldowns::const_iterator itr = SpellCDs.begin(); itr != SpellCDs.end(); itr++)
@@ -5429,7 +4745,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     target = SelectNearbyTarget();
                     if(!target)
                         return false;
-
                     triggered_spell_id = 26654;
                     break;
                 }
@@ -5442,14 +4757,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     break;
                 }
             }
-
             // Retaliation
             if(dummySpell->SpellFamilyFlags[1] & 0x8)
             {
                 // check attack comes not from behind
                 if (!HasInArc(M_PI, pVictim))
                     return false;
-
                 triggered_spell_id = 22858;
                 break;
             }
@@ -5462,7 +4775,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 // Need stun or root mechanic
                 if (!(GetAllSpellMechanicMask(procSpell) & ((1<<MECHANIC_ROOT)|(1<<MECHANIC_STUN))))
                     return false;
-
                 switch (dummySpell->Id)
                 {
                     case 29838: triggered_spell_id=29842; break;
@@ -5472,7 +4784,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         sLog.outError("Unit::HandleDummyAuraProc: non handled spell id: %u (SW)",dummySpell->Id);
                     return false;
                 }
-
                 target = this;
                 break;
             }
@@ -5498,16 +4809,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     // remember guid before aura delete
                     uint64 casterGuid = triggeredByAura->GetCasterGUID();
-
                     // Remove aura (before cast for prevent infinite loop handlers)
                     RemoveAurasDueToSpell(triggeredByAura->GetId());
-
                     // Cast finish spell (triggeredByAura already not exist!)
                     if(Unit* caster = GetUnit(*this, casterGuid))
                         caster->CastSpell(this, 27285, true, castItem);
                     return true;                            // no hidden cooldown
                 }
-
                 // Damage counting
                 triggeredByAura->SetAmount(triggeredByAura->GetAmount() - damage);
                 return true;
@@ -5520,10 +4828,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     // remember guid before aura delete
                     uint64 casterGuid = triggeredByAura->GetCasterGUID();
-
                     // Remove aura (before cast for prevent infinite loop handlers)
                     RemoveAurasDueToSpell(triggeredByAura->GetId());
-
                     // Cast finish spell (triggeredByAura already not exist!)
                     if(Unit* caster = GetUnit(*this, casterGuid))
                         caster->CastSpell(this, 32865, true, castItem);
@@ -5630,7 +4936,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     target = GetGuardianPet();
                     if(!target)
                         return false;
-
                     // heal amount
                     basepoints0 = damage * triggerAmount/100;
                     triggered_spell_id = 37382;
@@ -5652,14 +4957,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!pVictim || !pVictim->isAlive())
                     return false;
-
                 if (effIndex!=0)
                     return false;
-
                 // pVictim is caster of aura
                 if(triggeredByAura->GetCasterGUID() != pVictim->GetGUID())
                     return false;
-
                 // Energize 0.25% of max. mana
                 pVictim->CastSpell(pVictim,57669,true,castItem,triggeredByAura);
                 return true;                                // no hidden cooldown
@@ -5678,11 +4980,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(!pVictim || !pVictim->isAlive())
                         return false;
-
                     // pVictim is caster of aura
                     if(triggeredByAura->GetCasterGUID() != pVictim->GetGUID())
                         return false;
-
                     // heal amount
                     int32 team = triggerAmount*damage/500;
                     int32 self = triggerAmount*damage/100 - team;
@@ -5700,7 +5000,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         triggered_spell_id = 40440;
                     else
                         return false;
-
                     target = this;
                     break;
                 }
@@ -5715,11 +5014,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 case 55680:
                 {
                     triggered_spell_id = 56161;
-
                     SpellEntry const* GoPoH = sSpellStore.LookupEntry(triggered_spell_id);
                     if(!GoPoH)
                         return false;
-
                     int EffIndex = 0;
                     for(uint8 i = 0; i < MAX_SPELL_EFFECTS; i++)
                     {
@@ -5732,7 +5029,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     int32 tickcount = GetSpellMaxDuration(GoPoH) / GoPoH->EffectAmplitude[EffIndex];
                     if(!tickcount)
                         return false;
-
                     basepoints0 = damage * triggerAmount / tickcount / 100;
                     break;
                 }
@@ -5742,7 +5038,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if (!roll_chance_i(triggerAmount))
                         return false;
-
                     RemoveMovementImpairingAuras();
                     break;
                 }
@@ -5759,7 +5054,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                             multiplier -= 0.5f;
                         else if (dummySpell->Id == 47537)
                             multiplier += 0.5f;
-
                         basepoints0 = (multiplier * GetMaxPower(POWER_MANA) / 100);
                         triggered_spell_id = 47755;
                         target = this;
@@ -5768,7 +5062,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     {
                         if (!roll_chance_i(triggerAmount))
                             return false;
-
                         switch(pVictim->getPowerType())
                         {
                             target = pVictim;
@@ -5791,7 +5084,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         return false;
                     if(!target->IsFriendlyTo(this))
                         return false;
-
                     basepoints0 = int32(target->GetMaxHealth() * triggerAmount / 100);
                     triggered_spell_id = 56131;
                     break;
@@ -5810,7 +5102,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(!procSpell || (GetSpellSchoolMask(procSpell) & (SPELL_SCHOOL_MASK_FROST | SPELL_SCHOOL_MASK_SHADOW))==0 )
                         return false;
-
                     // heal amount
                     basepoints0 = damage * triggerAmount/100;
                     target = this;
@@ -5844,7 +5135,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if (procSpell->SpellIconID != 62)
                         return false;
-
                     int32 mana_perc = triggeredByAura->GetSpellProto()->EffectBasePoints[triggeredByAura->GetEffIndex()]+1;
                     basepoints0 = uint32((GetPower(POWER_MANA) * mana_perc / 100) / 10);
                     triggered_spell_id = 54833;
@@ -5937,7 +5227,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 case 40442:
                 {
                     float  chance;
-
                     // Starfire
                     if( procSpell->SpellFamilyFlags[0] & 0x4 )
                     {
@@ -5958,10 +5247,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     else
                         return false;
-
                     if (!roll_chance_f(chance))
                         return false;
-
                     target = this;
                     break;
                 }
@@ -6050,7 +5337,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // Prevent cast Deadly Throw Interrupt on self from last effect (apply dummy) of Deadly Throw
                     if(this == pVictim)
                         return false;
-
                     triggered_spell_id = 32747;
                     break;
                 }
@@ -6078,12 +5364,10 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!procSpell)
                     return false;
-
                 // energy cost save
                 basepoints0 = procSpell->manaCost * triggerAmount/100;
                 if(basepoints0 <= 0)
                     return false;
-
                 target = this;
                 triggered_spell_id = 31663;
                 break;
@@ -6097,13 +5381,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!procSpell)
                     return false;
-
                 // mana cost save
                 int32 mana = procSpell->manaCost + procSpell->ManaCostPercentage * GetCreateMana() / 100;
                 basepoints0 = mana * 40/100;
                 if(basepoints0 <= 0)
                     return false;
-
                 target = this;
                 triggered_spell_id = 34720;
                 break;
@@ -6121,7 +5403,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 int32 chance = triggeredByAura->GetSpellProto()->EffectBasePoints[triggeredByAura->GetEffIndex()];
                 if(!roll_chance_i(chance))
                     return false;
-
                 triggered_spell_id = 24406;
                 break;
             }
@@ -6260,7 +5541,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(!pVictim)
                         return false;
-
                     // Set class defined buff
                     switch (pVictim->getClass())
                     {
@@ -6291,7 +5571,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(effIndex != 0)                       // effect 1,2 used by seal unleashing code
                         return false;
-
                     triggered_spell_id = 31803;
                     break;
                 }
@@ -6300,7 +5579,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(effIndex != 0)                       // effect 1,2 used by seal unleashing code
                         return false;
-
                     triggered_spell_id = 53742;
                     break;
                 }
@@ -6311,11 +5589,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // if healed by another unit (pVictim)
                     if(this == pVictim)
                         return false;
-
                     // heal amount
                     basepoints0 = triggerAmount*damage/100;
                     target = this;
-
                     if(basepoints0)
                         triggered_spell_id = 31786;
                     break;
@@ -6343,9 +5619,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if( !procSpell )
                         return false;
-
                     float  chance;
-
                     // Flash of light/Holy light
                     if( procSpell->SpellFamilyFlags[0] & 0xC0000000)
                     {
@@ -6360,10 +5634,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     else
                         return false;
-
                     if (!roll_chance_f(chance))
                         return false;
-
                     break;
                 }
                 // Glyph of Divinity
@@ -6420,7 +5692,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if( !pVictim )
                         return false;
-
                     // Set class defined buff
                     switch (pVictim->getClass())
                     {
@@ -6458,17 +5729,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if(GetTypeId()!=TYPEID_PLAYER)
                         return false;
-
                     if(!castItem || !castItem->IsEquipped())
                         return false;
-
                     // custom cooldown processing case
                     if( cooldown && ((Player*)this)->HasSpellCooldown(dummySpell->Id))
                         return false;
-
                     if(triggeredByAura->GetParentAura() && castItem->GetGUID() != triggeredByAura->GetParentAura()->GetCastItemGUID())
                         return false;
-
                     // Now amount of extra power stored in 1 effect of Enchant spell
                     // Get it by item enchant id
                     uint32 spellId;
@@ -6489,16 +5756,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                             return false;
                         }
                     }
-
                     SpellEntry const* windfurySpellEntry = sSpellStore.LookupEntry(spellId);
                     if(!windfurySpellEntry)
                     {
                         sLog.outError("Unit::HandleDummyAuraProc: non existed spell id: %u (Windfury)",spellId);
                         return false;
                     }
-
                     int32 extra_attack_power = CalculateSpellDamage(windfurySpellEntry, 1, windfurySpellEntry->EffectBasePoints[1], pVictim);
-
                     // Main-Hand case
                     if ( castItem->GetSlot() == EQUIPMENT_SLOT_MAINHAND && isAttackReady(BASE_ATTACK) )
                     {
@@ -6515,15 +5779,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     else
                         return false;
-
                     // apply cooldown before cast to prevent processing itself
                     if( cooldown )
                         ((Player*)this)->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown);
-
                     // Attack Twice
                     for ( uint32 i = 0; i<2; ++i )
                         CastCustomSpell(pVictim,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
-
                     return true;
                 }
                 // Shaman Tier 6 Trinket
@@ -6531,7 +5792,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 {
                     if( !procSpell )
                         return false;
-
                     float chance;
                     if (procSpell->SpellFamilyFlags[0] & 0x1)
                     {
@@ -6550,10 +5810,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     else
                         return false;
-
                     if (!roll_chance_f(chance))
                         return false;
-
                     target = this;
                     break;
                 }
@@ -6613,7 +5871,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 float chance = triggerAmount;
                 if (!roll_chance_f(chance))
                     return false;
-
                 triggered_spell_id = 63685;
                 break;
             }
@@ -6623,11 +5880,9 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 // Earthbind Totem summon only
                 if(procSpell->Id != 2484)
                     return false;
-
                 float chance = triggerAmount;
                 if (!roll_chance_f(chance))
                     return false;
-
                 triggered_spell_id = 64695;
                 break;
             }
@@ -6646,7 +5901,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 originalCaster = triggeredByAura->GetCasterGUID();
                 target = this;
                 basepoints0 = triggerAmount;
-
                 // Glyph of Earth Shield
                 if (AuraEffect* aur = GetAuraEffect(63279,0))
                 {
@@ -6661,43 +5915,33 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(GetTypeId()!=TYPEID_PLAYER)
                     return false;
-
                 if(!castItem || !castItem->IsEquipped())
                     return false;
-
                 //  firehit =  dummySpell->EffectBasePoints[0] / ((4*19.25) * 1.3);
                 float fire_onhit = dummySpell->EffectBasePoints[0] / 100.0;
-
                 float add_spellpower = SpellBaseDamageBonus(SPELL_SCHOOL_MASK_FIRE)
                                      + SpellBaseDamageBonusForVictim(SPELL_SCHOOL_MASK_FIRE, pVictim);
-
                 // 1.3speed = 5%, 2.6speed = 10%, 4.0 speed = 15%, so, 1.0speed = 3.84%
                 add_spellpower= add_spellpower / 100.0 * 3.84;
-
                 // Enchant on Off-Hand and ready?
                 if ( castItem->GetSlot() == EQUIPMENT_SLOT_OFFHAND && isAttackReady(OFF_ATTACK))
                 {
                     float BaseWeaponSpeed = GetAttackTime(OFF_ATTACK)/1000.0;
-
                     // Value1: add the tooltip damage by swingspeed + Value2: add spelldmg by swingspeed
                     basepoints0 = int32( (fire_onhit * BaseWeaponSpeed) + (add_spellpower * BaseWeaponSpeed) );
                     triggered_spell_id = 10444;
                 }
-
                 // Enchant on Main-Hand and ready?
                 else if ( castItem->GetSlot() == EQUIPMENT_SLOT_MAINHAND && isAttackReady(BASE_ATTACK))
                 {
                     float BaseWeaponSpeed = GetAttackTime(BASE_ATTACK)/1000.0;
-
                     // Value1: add the tooltip damage by swingspeed +  Value2: add spelldmg by swingspeed
                     basepoints0 = int32( (fire_onhit * BaseWeaponSpeed) + (add_spellpower * BaseWeaponSpeed) );
                     triggered_spell_id = 10444;
                 }
-
                 // If not ready, we should  return, shouldn't we?!
                 else
                     return false;
-
                 CastCustomSpell(pVictim,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
                 return true;
             }
@@ -6722,33 +5966,25 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             {
                 if(!procSpell || GetTypeId() != TYPEID_PLAYER || !pVictim )
                     return false;
-
                 // custom cooldown processing case
                 if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(dummySpell->Id))
                     return false;
-
                 uint32 spell;
                 if (procSpell->SpellFamilyFlags[0] & 0x2)
                     spell = 45297;
                 else
                     spell = 45284;
                 uint32 spellId = spellmgr.GetSpellWithRank(spell, spellmgr.GetSpellRank(procSpell->Id));
-
                 // Remove cooldown (Chain Lightning - have Category Recovery time)
                 if (procSpell->SpellFamilyFlags[0] & 0x2)
                     ((Player*)this)->RemoveSpellCooldown(spellId);
-
                 // do not reduce damage-spells have correct basepoints
                 int32 mod = 0;
-
                 // Apply spellmod
                 CastCustomSpell(this, 39805, NULL, &mod, NULL, true, castItem, triggeredByAura);
-
                 CastSpell(pVictim, spellId, true, castItem, triggeredByAura);
-
                 if( cooldown && GetTypeId()==TYPEID_PLAYER )
                     ((Player*)this)->AddSpellCooldown(dummySpell->Id,0,time(NULL) + cooldown);
-
                 return true;
             }
             // Static Shock
@@ -6857,16 +6093,13 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     // check if shown in spell book
                     if(!itr->second->active || itr->second->disabled || itr->second->state == PLAYERSPELL_REMOVED)
                         continue;
-
                     SpellEntry const *spellProto = sSpellStore.LookupEntry(itr->first);
                     if (!spellProto)
                         continue;
-
                     if (spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT
                         && spellProto->SpellFamilyFlags[0] & 0x2000)
                     {
                         SpellChainNode const* newChain = spellmgr.GetSpellChainNode(itr->first);
-
                         // No chain entry or entry lower than found entry
                         if (!chain || !newChain || (chain->rank < newChain->rank))
                         {
@@ -6903,7 +6136,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                         }
                         else
                             continue;
-
                         basepoints0 = CalculateSpellDamage(procSpell,i,procSpell->EffectBasePoints[i],this) * 0.4f;
                         CastCustomSpell(this,triggered_spell_id,&basepoints0,NULL,NULL,true,NULL,triggeredByAura);
                     }
@@ -6934,34 +6166,26 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
         default:
             break;
     }
-
     // processed charge only counting case
     if(!triggered_spell_id)
         return true;
-
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleDummyAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id);
         return false;
     }
-
     // default case
     if((!target && !spellmgr.IsSrcTargetSpell(triggerEntry)) || (target && target!=this && !target->isAlive()))
         return false;
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
-
     if(basepoints0)
         CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura, originalCaster);
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura, originalCaster);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
 bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown)
@@ -6969,14 +6193,11 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect*
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
     uint32 effIndex = triggeredByAura->GetEffIndex();
     int32  triggerAmount = triggeredByAura->GetAmount();
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
     Unit* target = pVictim;
     int32 basepoints0 = 0;
-
     switch(dummySpell->SpellFamilyName)
     {
         case SPELLFAMILY_HUNTER:
@@ -6996,27 +6217,22 @@ bool Unit::HandleObsModEnergyAuraProc(Unit *pVictim, uint32 damage, AuraEffect*
     // processed charge only counting case
     if(!triggered_spell_id)
         return true;
-
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     // Try handle unknown trigger spells
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleObsModEnergyAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id);
         return false;
     }
-
     // default case
     if((!target && !spellmgr.IsSrcTargetSpell(triggerEntry)) || (target && target!=this && !target->isAlive()))
         return false;
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
     if(basepoints0)
         CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
     return true;
@@ -7026,14 +6242,11 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 damage, AuraEff
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto ();
     uint32 effIndex = triggeredByAura->GetEffIndex();
     int32  triggerAmount = triggeredByAura->GetAmount();
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
     Unit* target = pVictim;
     int32 basepoints0 = 0;
-
     switch(dummySpell->SpellFamilyName)
     {
         case SPELLFAMILY_PALADIN:
@@ -7054,39 +6267,30 @@ bool Unit::HandleModDamagePctTakenAuraProc(Unit *pVictim, uint32 damage, AuraEff
     // processed charge only counting case
     if(!triggered_spell_id)
         return true;
-
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleModDamagePctTakenAuraProc: Spell %u have not existed triggered spell %u",dummySpell->Id,triggered_spell_id);
         return false;
     }
-
     // default case
     if((!target && !spellmgr.IsSrcTargetSpell(triggerEntry)) || (target && target!=this && !target->isAlive()))
         return false;
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
-
     if(basepoints0)
         CastCustomSpell(target,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
     else
         CastSpell(target,triggered_spell_id,true,castItem,triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
-
 // Used in case when access to whole aura is needed
 // All procs should be handled like this...
 bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown, bool * handled)
 {
     SpellEntry const *dummySpell = triggeredByAura->GetSpellProto();
-
     switch(dummySpell->SpellFamilyName)
     {
         case SPELLFAMILY_DEATHKNIGHT:
@@ -7112,12 +6316,10 @@ bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, S
                     // Reset amplitude - set death rune remove timer to 30s
                     aurEff->ResetPeriodicTimer();
                     uint32 runesLeft;
-
                     if (dummySpell->SpellIconID == 2622)
                         runesLeft = 2;
                     else
                         runesLeft = 1;
-
                     for (uint8 i=0;i<MAX_RUNES && runesLeft;++i)
                     {
                         if (dummySpell->SpellIconID == 2622)
@@ -7134,7 +6336,6 @@ bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, S
                         }
                         if (((Player*)this)->GetRuneCooldown(i) != RUNE_COOLDOWN)
                             continue;
-
                         --runesLeft;
                         // Mark aura as used
                         aurEff->SetAmount(aurEff->GetAmount() | (1<<i));
@@ -7144,7 +6345,6 @@ bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, S
                 }
                 return false;
             }
-
             switch(dummySpell->Id)
             {
                 // Hungering Cold aura drop
@@ -7160,27 +6360,20 @@ bool Unit::HandleAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, S
     }
     return false;
 }
-
 bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlags, uint32 procEx, uint32 cooldown)
 {
     // Get triggered aura spell info
     SpellEntry const* auraSpellInfo = triggeredByAura->GetSpellProto();
-
     // Basepoints of trigger aura
     int32 triggerAmount = triggeredByAura->GetAmount();
-
     // Set trigger spell id, target, custom basepoints
     uint32 trigger_spell_id = auraSpellInfo->EffectTriggerSpell[triggeredByAura->GetEffIndex()];
-
     Unit*  target = NULL;
     int32  basepoints0 = 0;
-
     if(triggeredByAura->GetAuraName() == SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE)
         basepoints0 = triggerAmount;
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
-        ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;      
-
+        ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
     // Try handle unknown trigger spells
     if (sSpellStore.LookupEntry(trigger_spell_id) == NULL)
     {
@@ -7377,12 +6570,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                             return false;
                         // stacking
                         CastSpell(this, 37658, true, NULL, triggeredByAura);
-
                         Aura * dummy = GetAura(37658);
                         // release at 3 aura in stack (cont contain in basepoint of trigger aura)
                         if(!dummy || dummy->GetStackAmount() < triggerAmount)
                             return false;
-
                         RemoveAurasDueToSpell(37658);
                         trigger_spell_id = 37661;
                         target = pVictim;
@@ -7395,13 +6586,11 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                             return false;
                         // stacking
                         CastSpell(this, 54842, true, NULL, triggeredByAura);
-
                         // counting
                         Aura * dummy = GetAura(54842);
                         // release at 3 aura in stack (cont contain in basepoint of trigger aura)
                         if(!dummy || dummy->GetStackAmount() < triggerAmount)
                             return false;
-
                         RemoveAurasDueToSpell(54842);
                         trigger_spell_id = 54843;
                         target = pVictim;
@@ -7488,10 +6677,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                             // Check health condition - should drop to less 30% (damage deal after this!)
                             if (!(10*(int32(GetHealth() - damage)) < 3 * GetMaxHealth()))
                                 return false;
-
                              if(pVictim && pVictim->isAlive())
                                  pVictim->getThreatManager().modifyThreatPercent(this,-10);
-
                             basepoints0 = triggerAmount * GetMaxHealth() / 100;
                             trigger_spell_id = 31616;
                             target = this;
@@ -7526,7 +6713,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                 {
                     if (GetTypeId() != TYPEID_PLAYER)
                         return false;
-
                     trigger_spell_id = 50475;
                     basepoints0 = damage * triggerAmount / 100;
                 }
@@ -7536,7 +6722,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                  break;
         }
     }
-
     // All ok. Check current trigger spell
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(trigger_spell_id);
     if ( triggerEntry == NULL )
@@ -7545,11 +6730,9 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
         // sLog.outError("Unit::HandleProcTriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",auraSpellInfo->Id,triggeredByAura->GetEffIndex());
         return false;
     }
-
     // not allow proc extra attack spell at extra attack
     if( m_extraAttacks && IsSpellHaveEffect(triggerEntry, SPELL_EFFECT_ADD_EXTRA_ATTACKS) )
         return false;
-
     // Custom requirements (not listed in procEx) Warning! damage dealing after this
     // Custom triggered spells
     switch (auraSpellInfo->Id)
@@ -7563,14 +6746,13 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
             trigger_spell_id = 26470;
             break;
         }
-        // Deflection 
+        // Deflection
         case 52420:
         {
             if(GetHealth()*100 / GetMaxHealth() >= 35)
             return false;
             break;
         }
-
         // Cheat Death
         case 28845:
         {
@@ -7585,7 +6767,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
             // whenever you deal damage to a target who is below 20% health.
             if (pVictim->GetHealth() > pVictim->GetMaxHealth() / 5)
                 return false;
-
             target = this;
             trigger_spell_id = 22588;
         }
@@ -7633,12 +6814,10 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                 return false;
             break;
     }
-
     // Blade Barrier
     if (auraSpellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && auraSpellInfo->SpellIconID == 85)
         if (this->GetTypeId() != TYPEID_PLAYER || !((Player*)this)->IsBaseRuneSlotsOnCooldown(RUNE_BLOOD))
             return false;
-
     // Custom basepoints/target for exist spell
     // dummy basepoints or other customs
     switch(trigger_spell_id)
@@ -7654,12 +6833,9 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
             target = triggeredByAura->GetParentAura()->GetCaster();
             if(!target)
                 return false;
-
             if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)target)->HasSpellCooldown(trigger_spell_id))
                 return false;
-
             target->CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura);
-
             if( cooldown && GetTypeId()==TYPEID_PLAYER )
                 ((Player*)this)->AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown);
             return true;
@@ -7745,7 +6921,7 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
         case 53817:
         {
             // have rank dependent proc chance, ignore too often cases
-            // PPM = 2.5 * (rank of talent), 
+            // PPM = 2.5 * (rank of talent),
             uint32 rank = spellmgr.GetSpellRank(auraSpellInfo->Id);
             // 5 rank -> 100% 4 rank -> 80% and etc from full rate
             if(!roll_chance_i(20*rank))
@@ -7757,7 +6933,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
         {
             if (procSpell == 0 || !(procEx & (PROC_EX_NORMAL_HIT|PROC_EX_CRITICAL_HIT)) || this == pVictim)
                 return false;
-
             // Need stun, fear or silence mechanic
             if (!(GetAllSpellMechanicMask(procSpell) & ((1<<MECHANIC_SILENCE)|(1<<MECHANIC_STUN)|(1<<MECHANIC_FEAR))))
                 return false;
@@ -7804,41 +6979,30 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
             break;
         }
     }
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(trigger_spell_id))
         return false;
-
     // try detect target manually if not set
     if ( target == NULL )
        target = !(procFlags & (PROC_FLAG_SUCCESSFUL_POSITIVE_MAGIC_SPELL | PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL_HIT)) && IsPositiveSpell(trigger_spell_id) ? this : pVictim;
-
     // default case
     if((!target && !spellmgr.IsSrcTargetSpell(triggerEntry)) || (target && target!=this && !target->isAlive()))
         return false;
-
     if(basepoints0)
         CastCustomSpell(target,trigger_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
     else
         CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(trigger_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
-
 bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraEffect *triggeredByAura, SpellEntry const *procSpell, uint32 cooldown)
 {
     int32 scriptId = triggeredByAura->GetMiscValue();
-
     if(!pVictim || !pVictim->isAlive())
         return false;
-
     Item* castItem = triggeredByAura->GetParentAura()->GetCastItemGUID() && GetTypeId()==TYPEID_PLAYER
         ? ((Player*)this)->GetItemByGuid(triggeredByAura->GetParentAura()->GetCastItemGUID()) : NULL;
-
     uint32 triggered_spell_id = 0;
-
     switch(scriptId)
     {
         case 836:                                           // Improved Blizzard (Rank 1)
@@ -7867,7 +7031,6 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraE
             // Chance 50%
             if (!roll_chance_i(50))
                 return false;
-
             switch (pVictim->getPowerType())
             {
                 case POWER_MANA:   triggered_spell_id = 28722; break;
@@ -7900,35 +7063,26 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraE
             break;
         }
     }
-
     // not processed
     if(!triggered_spell_id)
         return false;
-
     // standard non-dummy case
     SpellEntry const* triggerEntry = sSpellStore.LookupEntry(triggered_spell_id);
-
     if(!triggerEntry)
     {
         sLog.outError("Unit::HandleOverrideClassScriptAuraProc: Spell %u triggering for class script id %u",triggered_spell_id,scriptId);
         return false;
     }
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER && ((Player*)this)->HasSpellCooldown(triggered_spell_id))
         return false;
-
     CastSpell(pVictim, triggered_spell_id, true, castItem, triggeredByAura);
-
     if( cooldown && GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->AddSpellCooldown(triggered_spell_id,0,time(NULL) + cooldown);
-
     return true;
 }
-
 void Unit::setPowerType(Powers new_powertype)
 {
     SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype);
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         if(((Player*)this)->GetGroup())
@@ -7944,7 +7098,6 @@ void Unit::setPowerType(Powers new_powertype)
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_POWER_TYPE);
         }
     }
-
     switch(new_powertype)
     {
         default:
@@ -7968,14 +7121,12 @@ void Unit::setPowerType(Powers new_powertype)
             break;
     }
 }
-
 FactionTemplateEntry const* Unit::getFactionTemplateEntry() const
 {
     FactionTemplateEntry const* entry = sFactionTemplateStore.LookupEntry(getFaction());
     if(!entry)
     {
         static uint64 guid = 0;                             // prevent repeating spam same faction problem
-
         if(GetGUID() != guid)
         {
             if(GetTypeId() == TYPEID_PLAYER)
@@ -7987,7 +7138,6 @@ FactionTemplateEntry const* Unit::getFactionTemplateEntry() const
     }
     return entry;
 }
-
 bool Unit::IsHostileTo(Unit const* unit) const
 {
     if(!unit)
@@ -7995,78 +7145,60 @@ bool Unit::IsHostileTo(Unit const* unit) const
     // always non-hostile to self
     if(unit==this)
         return false;
-
     // always non-hostile to GM in GM mode
     if(unit->GetTypeId()==TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return false;
-
     // always hostile to enemy
     if(getVictim()==unit || unit->getVictim()==this)
         return true;
-
     // test pet/charm masters instead pers/charmeds
     Unit const* testerOwner = GetCharmerOrOwner();
     Unit const* targetOwner = unit->GetCharmerOrOwner();
-
     // always hostile to owner's enemy
     if(testerOwner && (testerOwner->getVictim()==unit || unit->getVictim()==testerOwner))
         return true;
-
     // always hostile to enemy owner
     if(targetOwner && (getVictim()==targetOwner || targetOwner->getVictim()==this))
         return true;
-
     // always hostile to owner of owner's enemy
     if(testerOwner && targetOwner && (testerOwner->getVictim()==targetOwner || targetOwner->getVictim()==testerOwner))
         return true;
-
     Unit const* tester = testerOwner ? testerOwner : this;
     Unit const* target = targetOwner ? targetOwner : unit;
-
     // always non-hostile to target with common owner, or to owner/pet
     if(tester==target)
         return false;
-
     // special cases (Duel, etc)
     if(tester->GetTypeId()==TYPEID_PLAYER && target->GetTypeId()==TYPEID_PLAYER)
     {
         Player const* pTester = (Player const*)tester;
         Player const* pTarget = (Player const*)target;
-
         // Duel
         if(pTester->duel && pTester->duel->opponent == pTarget && pTester->duel->startTime != 0)
             return true;
-
         // Group
         if(pTester->GetGroup() && pTester->GetGroup()==pTarget->GetGroup())
             return false;
-
         // Sanctuary
         if(pTarget->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY) && pTester->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY))
             return false;
-
         // PvP FFA state
         if(pTester->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP) && pTarget->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
             return true;
-
         //= PvP states
         // Green/Blue (can't attack)
         if(pTester->GetTeam()==pTarget->GetTeam())
             return false;
-
         // Red (can attack) if true, Blue/Yellow (can't attack) in another case
         return pTester->IsPvP() && pTarget->IsPvP();
     }
-
     // faction base cases
     FactionTemplateEntry const*tester_faction = tester->getFactionTemplateEntry();
     FactionTemplateEntry const*target_faction = target->getFactionTemplateEntry();
     if(!tester_faction || !target_faction)
         return false;
-
     if(target->isAttackingPlayer() && tester->IsContestedGuard())
         return true;
-
     // PvC forced reaction and reputation case
     if(tester->GetTypeId()==TYPEID_PLAYER)
     {
@@ -8075,7 +7207,6 @@ bool Unit::IsHostileTo(Unit const* unit) const
         {
             if(ReputationRank const* force =((Player*)tester)->GetReputationMgr().GetForcedRankIfAny(target_faction))
                 return *force <= REP_HOSTILE;
-
             // if faction have reputation then hostile state for tester at 100% dependent from at_war state
             if(FactionEntry const* raw_target_faction = sFactionStore.LookupEntry(target_faction->faction))
                 if(FactionState const* factionState = ((Player*)tester)->GetReputationMgr().GetState(raw_target_faction))
@@ -8090,95 +7221,74 @@ bool Unit::IsHostileTo(Unit const* unit) const
         {
             if(ReputationRank const* force = ((Player*)target)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
                 return *force <= REP_HOSTILE;
-
             // apply reputation state
             FactionEntry const* raw_tester_faction = sFactionStore.LookupEntry(tester_faction->faction);
             if(raw_tester_faction && raw_tester_faction->reputationListID >=0 )
                 return ((Player const*)target)->GetReputationMgr().GetRank(raw_tester_faction) <= REP_HOSTILE;
         }
     }
-
     // common faction based case (CvC,PvC,CvP)
     return tester_faction->IsHostileTo(*target_faction);
 }
-
 bool Unit::IsFriendlyTo(Unit const* unit) const
 {
     // always friendly to self
     if(unit==this)
         return true;
-
     // always friendly to GM in GM mode
     if(unit->GetTypeId()==TYPEID_PLAYER && ((Player const*)unit)->isGameMaster())
         return true;
-
     // always non-friendly to enemy
     if(getVictim()==unit || unit->getVictim()==this)
         return false;
-
     // test pet/charm masters instead pers/charmeds
     Unit const* testerOwner = GetCharmerOrOwner();
     Unit const* targetOwner = unit->GetCharmerOrOwner();
-
     // always non-friendly to owner's enemy
     if(testerOwner && (testerOwner->getVictim()==unit || unit->getVictim()==testerOwner))
         return false;
-
     // always non-friendly to enemy owner
     if(targetOwner && (getVictim()==targetOwner || targetOwner->getVictim()==this))
         return false;
-
     // always non-friendly to owner of owner's enemy
     if(testerOwner && targetOwner && (testerOwner->getVictim()==targetOwner || targetOwner->getVictim()==testerOwner))
         return false;
-
     Unit const* tester = testerOwner ? testerOwner : this;
     Unit const* target = targetOwner ? targetOwner : unit;
-
     // always friendly to target with common owner, or to owner/pet
     if(tester==target)
         return true;
-
     // special cases (Duel)
     if(tester->GetTypeId()==TYPEID_PLAYER && target->GetTypeId()==TYPEID_PLAYER)
     {
         Player const* pTester = (Player const*)tester;
         Player const* pTarget = (Player const*)target;
-
         // Duel
         if(pTester->duel && pTester->duel->opponent == target && pTester->duel->startTime != 0)
             return false;
-
         // Group
         if(pTester->GetGroup() && pTester->GetGroup()==pTarget->GetGroup())
             return true;
-
         // Sanctuary
         if(pTarget->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY) && pTester->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY))
             return true;
-
         // PvP FFA state
         if(pTester->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP) && pTarget->HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
             return false;
-
         //= PvP states
         // Green/Blue (non-attackable)
         if(pTester->GetTeam()==pTarget->GetTeam())
             return true;
-
         // Blue (friendly/non-attackable) if not PVP, or Yellow/Red in another case (attackable)
         return !pTarget->IsPvP();
     }
-
     // faction base cases
     FactionTemplateEntry const*tester_faction = tester->getFactionTemplateEntry();
     FactionTemplateEntry const*target_faction = target->getFactionTemplateEntry();
     if(!tester_faction || !target_faction)
         return false;
-
     if(target->isAttackingPlayer() && tester->IsContestedGuard())
         return false;
-
     // PvC forced reaction and reputation case
     if(tester->GetTypeId()==TYPEID_PLAYER)
     {
@@ -8187,7 +7297,6 @@ bool Unit::IsFriendlyTo(Unit const* unit) const
         {
             if(ReputationRank const* force =((Player*)tester)->GetReputationMgr().GetForcedRankIfAny(target_faction))
                 return *force >= REP_FRIENDLY;
-
             // if faction have reputation then friendly state for tester at 100% dependent from at_war state
             if(FactionEntry const* raw_target_faction = sFactionStore.LookupEntry(target_faction->faction))
                 if(FactionState const* factionState = ((Player*)tester)->GetReputationMgr().GetState(raw_target_faction))
@@ -8202,57 +7311,45 @@ bool Unit::IsFriendlyTo(Unit const* unit) const
         {
             if(ReputationRank const* force =((Player*)target)->GetReputationMgr().GetForcedRankIfAny(tester_faction))
                 return *force >= REP_FRIENDLY;
-
             // apply reputation state
             if(FactionEntry const* raw_tester_faction = sFactionStore.LookupEntry(tester_faction->faction))
                 if(raw_tester_faction->reputationListID >=0 )
                     return ((Player const*)target)->GetReputationMgr().GetRank(raw_tester_faction) >= REP_FRIENDLY;
         }
     }
-
     // common faction based case (CvC,PvC,CvP)
     return tester_faction->IsFriendlyTo(*target_faction);
 }
-
 bool Unit::IsHostileToPlayers() const
 {
     FactionTemplateEntry const* my_faction = getFactionTemplateEntry();
     if(!my_faction || !my_faction->faction)
         return false;
-
     FactionEntry const* raw_faction = sFactionStore.LookupEntry(my_faction->faction);
     if(raw_faction && raw_faction->reputationListID >=0 )
         return false;
-
     return my_faction->IsHostileToPlayers();
 }
-
 bool Unit::IsNeutralToAll() const
 {
     FactionTemplateEntry const* my_faction = getFactionTemplateEntry();
     if(!my_faction || !my_faction->faction)
         return true;
-
     FactionEntry const* raw_faction = sFactionStore.LookupEntry(my_faction->faction);
     if(raw_faction && raw_faction->reputationListID >=0 )
         return false;
-
     return my_faction->IsNeutralToAll();
 }
-
 bool Unit::Attack(Unit *victim, bool meleeAttack)
 {
     if(!victim || victim == this)
         return false;
-
     // dead units can neither attack nor be attacked
     if(!isAlive() || !victim->IsInWorld() || !victim->isAlive())
         return false;
-
     // player cannot attack in mount state
     if(GetTypeId()==TYPEID_PLAYER && IsMounted())
         return false;
-
     // nobody can attack GM in GM-mode
     if(victim->GetTypeId()==TYPEID_PLAYER)
     {
@@ -8264,11 +7361,9 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
         if(((Creature*)victim)->IsInEvadeMode())
             return false;
     }
-
     // remove SPELL_AURA_MOD_UNATTACKABLE at attack (in case non-interruptible spells stun aura applied also that not let attack)
     if(HasAuraType(SPELL_AURA_MOD_UNATTACKABLE))
         RemoveAurasByType(SPELL_AURA_MOD_UNATTACKABLE);
-
     if (m_attacking)
     {
         if (m_attacking == victim)
@@ -8291,29 +7386,22 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
             }
             return false;
         }
-
         //switch target
         InterruptSpell(CURRENT_MELEE_SPELL);
         if(!meleeAttack)
             clearUnitState(UNIT_STAT_MELEE_ATTACKING);
     }
-
     if(m_attacking)
         m_attacking->_removeAttacker(this);
-
     m_attacking = victim;
     m_attacking->_addAttacker(this);
-
     //Set our target
     SetUInt64Value(UNIT_FIELD_TARGET, victim->GetGUID());
-
     if(meleeAttack)
         addUnitState(UNIT_STAT_MELEE_ATTACKING);
-
     // set position before any AI calls/assistance
     //if(GetTypeId()==TYPEID_UNIT)
     //    ((Creature*)this)->SetCombatStartPosition(GetPositionX(), GetPositionY(), GetPositionZ());
-
     if(GetTypeId()==TYPEID_UNIT)
     {
         // should not let player enter combat by right clicking target
@@ -8321,92 +7409,69 @@ bool Unit::Attack(Unit *victim, bool meleeAttack)
         if(victim->GetTypeId() == TYPEID_PLAYER)
             victim->SetInCombatWith(this);
         AddThreat(victim, 0.0f);
-
         WorldPacket data(SMSG_AI_REACTION, 12);
         data << uint64(GetGUID());
         data << uint32(AI_REACTION_AGGRO);                  // Aggro sound
         ((WorldObject*)this)->SendMessageToSet(&data, true);
-
         ((Creature*)this)->CallAssistance();
     }
-
     // delay offhand weapon attack to next attack time
     if(haveOffhandWeapon())
         resetAttackTimer(OFF_ATTACK);
-
     if(meleeAttack)
         SendMeleeAttackStart(victim);
-
     return true;
 }
-
 bool Unit::AttackStop()
 {
     if (!m_attacking)
         return false;
-
     Unit* victim = m_attacking;
-
     m_attacking->_removeAttacker(this);
     m_attacking = NULL;
-
     //Clear our target
     SetUInt64Value(UNIT_FIELD_TARGET, 0);
-
     clearUnitState(UNIT_STAT_MELEE_ATTACKING);
-
     InterruptSpell(CURRENT_MELEE_SPELL);
-
     // reset only at real combat stop
     if(GetTypeId()==TYPEID_UNIT )
     {
         ((Creature*)this)->SetNoCallAssistance(false);
         ((Creature*)this)->SetNoSearchAssistance(false);
     }
-
     SendMeleeAttackStop(victim);
-
     return true;
 }
-
 void Unit::CombatStop(bool includingCast)
 {
     if (includingCast && IsNonMeleeSpellCasted(false))
         InterruptNonMeleeSpells(false);
-
     AttackStop();
     RemoveAllAttackers();
     if( GetTypeId()==TYPEID_PLAYER )
         ((Player*)this)->SendAttackSwingCancelAttack();     // melee and ranged forced attack cancel
     ClearInCombat();
 }
-
 void Unit::CombatStopWithPets(bool includingCast)
 {
     CombatStop(includingCast);
-
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
         (*itr)->CombatStop(includingCast);
 }
-
 bool Unit::isAttackingPlayer() const
 {
     if(hasUnitState(UNIT_STAT_ATTACK_PLAYER))
         return true;
-
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
         if((*itr)->isAttackingPlayer())
             return true;
-
     for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i)
         if(m_SummonSlot[i])
             if(Creature *summon = GetMap()->GetCreature(m_SummonSlot[i]))
                 if(summon->isAttackingPlayer())
                     return true;
-
     return false;
 }
-
 void Unit::RemoveAllAttackers()
 {
     while (!m_attackers.empty())
@@ -8419,7 +7484,6 @@ void Unit::RemoveAllAttackers()
         }
     }
 }
-
 void Unit::ModifyAuraState(AuraState flag, bool apply)
 {
     if (apply)
@@ -8446,7 +7510,6 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
         if (HasFlag(UNIT_FIELD_AURASTATE,1<<(flag-1)))
         {
             RemoveFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1));
-
             if (flag != AURA_STATE_ENRAGE)                  // enrage aura state triggering continues auras
             {
                 Unit::AuraMap& tAuras = GetAuras();
@@ -8464,7 +7527,6 @@ void Unit::ModifyAuraState(AuraState flag, bool apply)
         }
     }
 }
-
 uint32 Unit::BuildAuraStateUpdateForTarget(Unit * target) const
 {
     uint32 auraStates = GetUInt32Value(UNIT_FIELD_AURASTATE) &~(PER_CASTER_AURA_STATE_MASK);
@@ -8478,7 +7540,6 @@ uint32 Unit::BuildAuraStateUpdateForTarget(Unit * target) const
     }
     return auraStates;
 }
-
 bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const * Caster) const
 {
     if (Caster)
@@ -8500,10 +7561,8 @@ bool Unit::HasAuraState(AuraState flag, SpellEntry const *spellProto, Unit const
             return false;
         }
     }
-
     return HasFlag(UNIT_FIELD_AURASTATE, 1<<(flag-1));
 }
-
 Unit *Unit::GetOwner(bool inWorld) const
 {
     if(uint64 ownerid = GetOwnerGUID())
@@ -8514,23 +7573,19 @@ Unit *Unit::GetOwner(bool inWorld) const
     }
     return NULL;
 }
-
 Unit *Unit::GetCharmer() const
 {
     if(uint64 charmerid = GetCharmerGUID())
         return ObjectAccessor::GetUnit(*this, charmerid);
     return NULL;
 }
-
 Player* Unit::GetCharmerOrOwnerPlayerOrPlayerItself() const
 {
     uint64 guid = GetCharmerOrOwnerGUID();
     if(IS_PLAYER_GUID(guid))
         return ObjectAccessor::GetPlayer(*this, guid);
-
     return GetTypeId()==TYPEID_PLAYER ? (Player*)this : NULL;
 }
-
 Minion *Unit::GetFirstMinion() const
 {
     if(uint64 pet_guid = GetMinionGUID())
@@ -8538,14 +7593,11 @@ Minion *Unit::GetFirstMinion() const
         if(Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, pet_guid))
             if(pet->HasUnitTypeMask(UNIT_MASK_MINION))
                 return (Minion*)pet;
-
         sLog.outError("Unit::GetFirstMinion: Minion %u not exist.",GUID_LOPART(pet_guid));
         const_cast<Unit*>(this)->SetMinionGUID(0);
     }
-
     return NULL;
 }
-
 Guardian* Unit::GetGuardianPet() const
 {
     if(uint64 pet_guid = GetPetGUID())
@@ -8553,32 +7605,25 @@ Guardian* Unit::GetGuardianPet() const
         if(Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, pet_guid))
             if(pet->HasUnitTypeMask(UNIT_MASK_GUARDIAN))
                 return (Guardian*)pet;
-
         sLog.outCrash("Unit::GetGuardianPet: Guardian " I64FMT " not exist.", pet_guid);
         const_cast<Unit*>(this)->SetPetGUID(0);
     }
-
     return NULL;
 }
-
 Unit* Unit::GetCharm() const
 {
     if(uint64 charm_guid = GetCharmGUID())
     {
         if(Unit* pet = ObjectAccessor::GetUnit(*this, charm_guid))
             return pet;
-
         sLog.outError("Unit::GetCharm: Charmed creature %u not exist.",GUID_LOPART(charm_guid));
         const_cast<Unit*>(this)->SetUInt64Value(UNIT_FIELD_CHARM, 0);
     }
-
     return NULL;
 }
-
 void Unit::SetMinion(Minion *minion, bool apply)
 {
     sLog.outDebug("SetMinion %u for %u, apply %u", minion->GetEntry(), GetEntry(), apply);
-
     if(apply)
     {
         if(!minion->AddUInt64Value(UNIT_FIELD_SUMMONEDBY, GetGUID()))
@@ -8586,15 +7631,12 @@ void Unit::SetMinion(Minion *minion, bool apply)
             sLog.outCrash("SetMinion: Minion %u is not the minion of owner %u", minion->GetEntry(), GetEntry());
             return;
         }
-
         m_Controlled.insert(minion);
-
         if(GetTypeId() == TYPEID_PLAYER)
         {
             minion->m_ControlledByPlayer = true;
             minion->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
         }
-
         // Can only have one pet. If a new one is summoned, dismiss the old one.
         if(minion->IsGuardianPet())
         {
@@ -8617,7 +7659,6 @@ void Unit::SetMinion(Minion *minion, bool apply)
                 SetMinionGUID(0);
             }
         }
-
         if(minion->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
         {
             if(AddUInt64Value(UNIT_FIELD_SUMMON, minion->GetGUID()))
@@ -8626,21 +7667,17 @@ void Unit::SetMinion(Minion *minion, bool apply)
         }
         //else if(minion->m_Properties && minion->m_Properties->Type == SUMMON_TYPE_MINIPET)
         //    AddUInt64Value(UNIT_FIELD_CRITTER, minion->GetGUID());
-
         // PvP, FFAPvP
         minion->SetByteValue(UNIT_FIELD_BYTES_2, 1, GetByteValue(UNIT_FIELD_BYTES_2, 1));
-
         // FIXME: hack, speed must be set only at follow
         if(GetTypeId() == TYPEID_PLAYER && minion->isPet())
             for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
                 minion->SetSpeed(UnitMoveType(i), m_speed_rate[i], true);
-
         // Ghoul pets have energy instead of mana (is anywhere better place for this code?)
         if (minion->IsPetGhoul())
         {
             minion->setPowerType(POWER_ENERGY);
         }
-
         if (GetTypeId() == TYPEID_PLAYER)
         {
             // Send infinity cooldown - client does that automatically but after relog cooldown needs to be set again
@@ -8658,13 +7695,10 @@ void Unit::SetMinion(Minion *minion, bool apply)
             sLog.outCrash("SetMinion: Minion %u is not the minion of owner %u", minion->GetEntry(), GetEntry());
             return;
         }
-
         m_Controlled.erase(minion);
-
         if(minion->IsGuardianPet())
             if(GetPetGUID() == minion->GetGUID())
                 SetPetGUID(0);
-
         if (GetTypeId() == TYPEID_PLAYER)
         {
             SpellEntry const *spellInfo = sSpellStore.LookupEntry(minion->GetUInt32Value(UNIT_CREATED_BY_SPELL));
@@ -8674,7 +7708,6 @@ void Unit::SetMinion(Minion *minion, bool apply)
                 ((Player*)this)->SendCooldownEvent(spellInfo);
             }
         }
-
         //if(minion->HasUnitTypeMask(UNIT_MASK_GUARDIAN))
         {
             if(RemoveUInt64Value(UNIT_FIELD_SUMMON, minion->GetGUID()))
@@ -8686,7 +7719,6 @@ void Unit::SetMinion(Minion *minion, bool apply)
                     //if(GetCharmGUID() == (*itr)->GetGUID())
                     if(GetGUID() == (*itr)->GetCharmerGUID())
                         continue;
-
                     //assert((*itr)->GetOwnerGUID() == GetGUID());
                     if((*itr)->GetOwnerGUID() != GetGUID())
                     {
@@ -8695,10 +7727,8 @@ void Unit::SetMinion(Minion *minion, bool apply)
                         assert(false);
                     }
                     assert((*itr)->GetTypeId() == TYPEID_UNIT);
-
                     if(!(*itr)->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
                         continue;
-
                     if(AddUInt64Value(UNIT_FIELD_SUMMON, (*itr)->GetGUID()))
                     {
                         //show another pet bar if there is no charm bar
@@ -8714,11 +7744,10 @@ void Unit::SetMinion(Minion *minion, bool apply)
                 }
             }
         }
-        //else if(minion->m_Properties && minion->m_Properties->Type == SUMMON_TYPE_MINIPET)      
+        //else if(minion->m_Properties && minion->m_Properties->Type == SUMMON_TYPE_MINIPET)
         //    RemoveUInt64Value(UNIT_FIELD_CRITTER, minion->GetGUID());
     }
 }
-
 void Unit::GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry)
 {
     for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end();)
@@ -8730,7 +7759,6 @@ void Unit::GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry)
             Minions.push_back((Creature*)unit);
     }
 }
-
 void Unit::RemoveAllMinionsByEntry(uint32 entry)
 {
     for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end();)
@@ -8743,7 +7771,6 @@ void Unit::RemoveAllMinionsByEntry(uint32 entry)
         // i think this is safe because i have never heard that a despawned minion will trigger a same minion
     }
 }
-
 void Unit::SetCharm(Unit* charm, bool apply)
 {
     if(apply)
@@ -8752,26 +7779,21 @@ void Unit::SetCharm(Unit* charm, bool apply)
         {
             if(!AddUInt64Value(UNIT_FIELD_CHARM, charm->GetGUID()))
                 sLog.outCrash("Player %s is trying to charm unit %u, but it already has a charmed unit %u", GetName(), charm->GetEntry(), GetCharmGUID());
-
             charm->m_ControlledByPlayer = true;
             // TODO: maybe we can use this flag to check if controlled by player
             charm->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
         }
         else
             charm->m_ControlledByPlayer = false;
-
         // PvP, FFAPvP
         charm->SetByteValue(UNIT_FIELD_BYTES_2, 1, GetByteValue(UNIT_FIELD_BYTES_2, 1));
-
         if(!charm->AddUInt64Value(UNIT_FIELD_CHARMEDBY, GetGUID()))
             sLog.outCrash("Unit %u is being charmed, but it already has a charmer %u", charm->GetEntry(), charm->GetCharmerGUID());
-
         if(charm->HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
         {
             charm->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
             charm->SendMovementFlagUpdate();
         }
-
         m_Controlled.insert(charm);
     }
     else
@@ -8781,10 +7803,8 @@ void Unit::SetCharm(Unit* charm, bool apply)
             if(!RemoveUInt64Value(UNIT_FIELD_CHARM, charm->GetGUID()))
                 sLog.outCrash("Player %s is trying to uncharm unit %u, but it has another charmed unit %u", GetName(), charm->GetEntry(), GetCharmGUID());
         }
-
         if(!charm->RemoveUInt64Value(UNIT_FIELD_CHARMEDBY, GetGUID()))
             sLog.outCrash("Unit %u is being uncharmed, but it has another charmer %u", charm->GetEntry(), charm->GetCharmerGUID());
-
         if(charm->GetTypeId() == TYPEID_PLAYER)
         {
             charm->m_ControlledByPlayer = true;
@@ -8803,59 +7823,46 @@ void Unit::SetCharm(Unit* charm, bool apply)
             charm->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
             charm->SetByteValue(UNIT_FIELD_BYTES_2, 1, 0);
         }
-
         if(charm->GetTypeId() == TYPEID_PLAYER
             || !((Creature*)charm)->HasUnitTypeMask(UNIT_MASK_MINION)
             || charm->GetOwnerGUID() != GetGUID())
             m_Controlled.erase(charm);
     }
 }
-
 int32 Unit::DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellProto, bool critical)
 {
     int32 gain = pVictim->ModifyHealth(int32(addhealth));
-
     Unit* unit = this;
-
     if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem())
         unit = GetOwner();
-
     if (unit->GetTypeId()==TYPEID_PLAYER)
     {
         // overheal = addhealth - gain
         unit->SendHealSpellLog(pVictim, spellProto->Id, addhealth, addhealth - gain, critical);
-
         if (BattleGround *bg = ((Player*)unit)->GetBattleGround())
             bg->UpdatePlayerScore((Player*)unit, SCORE_HEALING_DONE, gain);
-
         // use the actual gain, as the overheal shall not be counted, skip gain 0 (it ignored anyway in to criteria)
         if (gain)
             ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HEALING_DONE, gain, 0, pVictim);
-
         ((Player*)unit)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEAL_CASTED, addhealth);
     }
-
     if (pVictim->GetTypeId()==TYPEID_PLAYER)
     {
         ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_TOTAL_HEALING_RECEIVED, gain);
         ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_HIGHEST_HEALING_RECEIVED, addhealth);
     }
-
     return gain;
 }
-
 Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo)
 {
     if(!victim)
         return NULL;
-
     // Magic case
     if(spellInfo && (spellInfo->DmgClass == SPELL_DAMAGE_CLASS_NONE || spellInfo->DmgClass == SPELL_DAMAGE_CLASS_MAGIC))
     {
         //I am not sure if this should be redirected.
         if(spellInfo->DmgClass == SPELL_DAMAGE_CLASS_NONE)
             return victim;
-
         Unit::AuraEffectList const& magnetAuras = victim->GetAurasByType(SPELL_AURA_SPELL_MAGNET);
         for(Unit::AuraEffectList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr)
             if(Unit* magnet = (*itr)->GetParentAura()->GetUnitSource())
@@ -8878,10 +7885,8 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo)
                         return magnet;
                     }
     }
-
     return victim;
 }
-
 Unit* Unit::GetFirstControlled() const
 {
     //Sequence: charmed, pet, other guardians
@@ -8893,13 +7898,11 @@ Unit* Unit::GetFirstControlled() const
     }
     return unit;
 }
-
 void Unit::RemoveAllControlled()
 {
     //possessed pet and vehicle
     if(GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->StopCastingCharm();
-
     while(!m_Controlled.empty())
     {
         Unit *target = *m_Controlled.begin();
@@ -8924,7 +7927,6 @@ void Unit::RemoveAllControlled()
     if(GetCharmGUID())
         sLog.outCrash("Unit %u is not able to release its charm " I64FMT, GetEntry(), GetCharmGUID());
 }
-
 Unit* Unit::GetNextRandomRaidMemberOrPet(float radius)
 {
     Player* player = NULL;
@@ -8933,7 +7935,6 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius)
     // Should we enable this also for charmed units?
     else if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->isPet())
         player=(Player*)GetOwner();
-
     if (!player)
         return NULL;
     Group *pGroup = player->GetGroup();
@@ -8950,34 +7951,27 @@ Unit* Unit::GetNextRandomRaidMemberOrPet(float radius)
         // We are owner now, return pet
         return IsWithinDistInMap(pet, radius) ? pet : NULL;
     }
-
     std::vector<Unit*> nearMembers;
     //reserve place for players and pets because resizing vector every unit push is unefficient (vector is reallocated then)
     nearMembers.reserve(pGroup->GetMembersCount()*2);
-
     for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
     {
         Player* Target = itr->getSource();
-
         // IsHostileTo check duel and controlled by enemy
         if( Target && Target !=this && Target->isAlive() && IsWithinDistInMap(Target, radius) &&
             !IsHostileTo(Target) )
             nearMembers.push_back(Target);
-
         // Push player's pet to vector
         Unit * pet = Target->GetGuardianPet();
         if (pet && pet !=this &&  pet->isAlive() && IsWithinDistInMap(pet, radius) &&
             !IsHostileTo(pet) )
             nearMembers.push_back(pet);
     }
-
     if (nearMembers.empty())
         return NULL;
-
     uint32 randTarget = urand(0,nearMembers.size()-1);
     return nearMembers[randTarget];
 }
-
 /*
 Player * Unit::GetMoverSource() const
 {
@@ -8989,7 +7983,6 @@ Player * Unit::GetMoverSource() const
     return NULL;
 }
 */
-
 //only called in Player::SetSeer
 void Unit::AddPlayerToVision(Player* plr)
 {
@@ -9000,7 +7993,6 @@ void Unit::AddPlayerToVision(Player* plr)
     }
     m_sharedVision.push_back(plr);
 }
-
 //only called in Player::SetSeer
 void Unit::RemovePlayerFromVision(Player* plr)
 {
@@ -9011,12 +8003,10 @@ void Unit::RemovePlayerFromVision(Player* plr)
         SetWorldObject(false);
     }
 }
-
 void Unit::RemoveBindSightAuras()
 {
     RemoveAurasByType(SPELL_AURA_BIND_SIGHT);
 }
-
 void Unit::RemoveCharmAuras()
 {
     RemoveAurasByType(SPELL_AURA_MOD_CHARM);
@@ -9024,20 +8014,17 @@ void Unit::RemoveCharmAuras()
     RemoveAurasByType(SPELL_AURA_MOD_POSSESS);
     RemoveAurasByType(SPELL_AURA_AOE_CHARM);
 }
-
 void Unit::UnsummonAllTotems()
 {
     for (int8 i = 0; i < MAX_SUMMON_SLOT; ++i)
     {
         if(!m_SummonSlot[i])
             continue;
-
         Creature *OldTotem = GetMap()->GetCreature(m_SummonSlot[i]);
         if(OldTotem && OldTotem->isSummon())
             ((TempSummon*)OldTotem)->UnSummon();
     }
 }
-
 void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical)
 {
     // we guess size
@@ -9051,7 +8038,6 @@ void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32
     data << uint8(0);                                       // unused in client?
     SendMessageToSet(&data, true);
 }
-
 void Unit::SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype)
 {
     WorldPacket data(SMSG_SPELLENERGIZELOG, (8+8+4+4+4+1));
@@ -9062,38 +8048,32 @@ void Unit::SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, Po
     data << uint32(Damage);
     SendMessageToSet(&data, true);
 }
-
 void Unit::EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype)
 {
     SendEnergizeSpellLog(pVictim, SpellID, Damage, powertype);
     // needs to be called after sending spell log
     pVictim->ModifyPower(powertype, Damage);
 }
-
 uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 pdamage, DamageEffectType damagetype, uint32 stack)
 {
     if(!spellProto || !pVictim || damagetype==DIRECT_DAMAGE )
         return pdamage;
-
     // For totems get damage bonus from owner
     if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem())
     {
         if(Unit* owner = GetOwner())
             return owner->SpellDamageBonus(pVictim, spellProto, pdamage, damagetype);
     }
-
     // Taken/Done total percent damage auras
     float DoneTotalMod = 1.0f;
     float TakenTotalMod = 1.0f;
     float ApCoeffMod = 1.0f;
     int32 DoneTotal = 0;
     int32 TakenTotal = 0;
-
     // ..done
     // Pet damage
     if( GetTypeId() == TYPEID_UNIT && !((Creature*)this)->isPet() )
         DoneTotalMod *= ((Creature*)this)->GetSpellDamageMod(((Creature*)this)->GetCreatureInfo()->rank);
-
     AuraEffectList const& mModDamagePercentDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
     for(AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
     {
@@ -9106,7 +8086,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             DoneTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
         }
     }
-
     uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
     // Add flat bonus from spell damage versus
     DoneTotal += GetTotalAuraModifierByMiscMask(SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS, creatureTypeMask);
@@ -9114,7 +8093,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
     for(AuraEffectList::const_iterator i = mDamageDoneVersus.begin();i != mDamageDoneVersus.end(); ++i)
         if(creatureTypeMask & uint32((*i)->GetMiscValue()))
             DoneTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
-
     // done scripted mod (take it from owner)
     Unit *owner = GetOwner();
     if (!owner) owner = this;
@@ -9233,7 +8211,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             }
         }
     }
-
     // Custom scripted damage
     switch(spellProto->SpellFamilyName)
     {
@@ -9244,7 +8221,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
                 if (pVictim->HasAuraState(AURA_STATE_FROZEN, spellProto, this))
                     DoneTotalMod *= 3.0f;
             }
-
             // Torment the weak
             if (spellProto->SpellFamilyFlags[0]&0x20200021 || spellProto->SpellFamilyFlags[1]& 0x9000)
                 if(pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED))
@@ -9269,7 +8245,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
                         DoneTotalMod *= (aurEff->GetAmount() + 100.0f) / 100.f;
             }
         break;
-
         case SPELLFAMILY_PALADIN:
             // Judgement of Vengeance/Judgement of Corruption
             if((spellProto->SpellFamilyFlags[1] & 0x400000) && spellProto->SpellIconID==2292)
@@ -9307,24 +8282,20 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             if (spellProto->SpellFamilyFlags[0] & 0x2)
                 if (AuraEffect * aurEff = GetDummyAura(SPELLFAMILY_DEATHKNIGHT, 2721, 0))
                     DoneTotalMod *= (100.0f + aurEff->GetAmount()) / 100.0f;
-
             // Glacier Rot
             if (spellProto->SpellFamilyFlags[0] & 0x2 || spellProto->SpellFamilyFlags[1] & 0x6)
                 if (AuraEffect * aurEff = GetDummyAura(SPELLFAMILY_DEATHKNIGHT, 196, 0))
                     DoneTotalMod *= (100.0f + aurEff->GetAmount()) / 100.0f;
-
             // This is not a typo - Impurity has SPELLFAMILY_DRUID
             if (AuraEffect * aurEff = GetDummyAura(SPELLFAMILY_DRUID, 1986, 0))
                 ApCoeffMod *= (100.0f + aurEff->GetAmount()) / 100.0f;
         break;
     }
-
     // ..taken
     AuraEffectList const& mModDamagePercentTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
     for(AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i)
         if( (*i)->GetMiscValue() & GetSpellSchoolMask(spellProto) )
             TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
-
     // .. taken pct: dummy auras
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
     {
@@ -9337,13 +8308,11 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             TakenTotalMod *= (mod+100.0f)/100.0f;
         }
     }
-
     // From caster spells
     AuraEffectList const& mOwnerTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_FROM_CASTER);
     for(AuraEffectList::const_iterator i = mOwnerTaken.begin(); i != mOwnerTaken.end(); ++i)
         if( (*i)->GetCasterGUID() == GetGUID() && (*i)->isAffectedOnSpell(spellProto))
             TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
-
     // Mod damage from spell mechanic
     if (uint32 mechanicMask = GetAllSpellMechanicMask(spellProto))
     {
@@ -9352,7 +8321,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
             if(mechanicMask & uint32(1<<((*i)->GetMiscValue())))
                 TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
     }
-
     // Taken/Done fixed damage bonus auras
     int32 DoneAdvertisedBenefit  = SpellBaseDamageBonus(GetSpellSchoolMask(spellProto));
     int32 TakenAdvertisedBenefit = SpellBaseDamageBonusForVictim(GetSpellSchoolMask(spellProto), pVictim);
@@ -9360,7 +8328,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
     // note that their spell damage is just gain of their own auras
     if (HasUnitTypeMask(UNIT_MASK_GUARDIAN))
         DoneAdvertisedBenefit += ((Guardian*)this)->GetBonusDamage();
-
     // Check for table values
     float coeff = 0;
     SpellBonusEntry const* bonus = spellmgr.GetSpellBonusData(spellProto->Id);
@@ -9421,7 +8388,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
         }
         // Distribute Damage over multiple effects, reduce by AoE
         CastingTime = GetCastingTimeForBonus( spellProto, damagetype, CastingTime );
-
         // 50% for damage and healing spells for leech spells from damage bonus and 0% from healing
         for(uint8 j = 0; j < MAX_SPELL_EFFECTS; ++j)
         {
@@ -9437,7 +8403,6 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
         else
             coeff = DotFactor;
         }
-
         float coeff2 = CalculateLevelPenalty(spellProto) * stack;
         if(spellProto->SpellFamilyName) //TODO: fix this
             TakenTotal+= TakenAdvertisedBenefit * coeff * coeff2;
@@ -9449,21 +8414,16 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
         }
         DoneTotal += DoneAdvertisedBenefit * coeff * coeff2;
     }
-
     float tmpDamage = (pdamage + DoneTotal) * DoneTotalMod;
     // apply spellmod to Done damage (flat and pct)
     if(Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, tmpDamage);
-
     tmpDamage = (tmpDamage + TakenTotal) * TakenTotalMod;
-
     return tmpDamage > 0 ? uint32(tmpDamage) : 0;
 }
-
 int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask)
 {
     int32 DoneAdvertisedBenefit = 0;
-
     // ..done
     AuraEffectList const& mDamageDone = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE);
     for(AuraEffectList::const_iterator i = mDamageDone.begin();i != mDamageDone.end(); ++i)
@@ -9473,12 +8433,10 @@ int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask)
         (*i)->GetSpellProto()->EquippedItemInventoryTypeMask == 0 )
                                                             // 0 == any inventory type (not wand then)
             DoneAdvertisedBenefit += (*i)->GetAmount();
-
     if (GetTypeId() == TYPEID_PLAYER)
     {
         // Base value
         DoneAdvertisedBenefit +=((Player*)this)->GetBaseSpellPowerBonus();
-
         // Damage bonus from stats
         AuraEffectList const& mDamageDoneOfStatPercent = GetAurasByType(SPELL_AURA_MOD_SPELL_DAMAGE_OF_STAT_PERCENT);
         for(AuraEffectList::const_iterator i = mDamageDoneOfStatPercent.begin();i != mDamageDoneOfStatPercent.end(); ++i)
@@ -9495,37 +8453,30 @@ int32 Unit::SpellBaseDamageBonus(SpellSchoolMask schoolMask)
         for(AuraEffectList::const_iterator i =mDamageDonebyAP.begin();i != mDamageDonebyAP.end(); ++i)
             if ((*i)->GetMiscValue() & schoolMask)
                 DoneAdvertisedBenefit += int32(GetTotalAttackPowerValue(BASE_ATTACK) * (*i)->GetAmount() / 100.0f);
-
     }
     return DoneAdvertisedBenefit;
 }
-
 int32 Unit::SpellBaseDamageBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim)
 {
     uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
-
     int32 TakenAdvertisedBenefit = 0;
     // ..done (for creature type by mask) in taken
     AuraEffectList const& mDamageDoneCreature = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE);
     for(AuraEffectList::const_iterator i = mDamageDoneCreature.begin();i != mDamageDoneCreature.end(); ++i)
         if(creatureTypeMask & uint32((*i)->GetMiscValue()))
             TakenAdvertisedBenefit += (*i)->GetAmount();
-
     // ..taken
     AuraEffectList const& mDamageTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_TAKEN);
     for(AuraEffectList::const_iterator i = mDamageTaken.begin();i != mDamageTaken.end(); ++i)
         if(((*i)->GetMiscValue() & schoolMask) != 0)
             TakenAdvertisedBenefit += (*i)->GetAmount();
-
     return TakenAdvertisedBenefit;
 }
-
 bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType) const
 {
     // not critting spell
     if((spellProto->AttributesEx2 & SPELL_ATTR_EX2_CANT_CRIT))
         return false;
-
     float crit_chance = 0.0f;
     switch(spellProto->DmgClass)
     {
@@ -9688,13 +8639,11 @@ bool Unit::isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolM
     // only players use intelligence for critical chance computations
     if(Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRITICAL_CHANCE, crit_chance);
-
     crit_chance = crit_chance > 0.0f ? crit_chance : 0.0f;
     if (roll_chance_f(crit_chance))
         return true;
     return false;
 }
-
 uint32 Unit::SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim)
 {
     // Calculate critical bonus
@@ -9710,23 +8659,18 @@ uint32 Unit::SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damag
             crit_bonus = damage / 2;                        // for spells is 50%
             break;
     }
-
     // adds additional damage to crit_bonus (from talents)
     if(Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
-
     if(pVictim)
     {
         uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
         crit_bonus = int32(crit_bonus * GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, creatureTypeMask));
     }
-
     if(crit_bonus > 0)
         damage += crit_bonus;
-
     return damage;
 }
-
 uint32 Unit::SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim)
 {
     // Calculate critical bonus
@@ -9742,40 +8686,32 @@ uint32 Unit::SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 dama
             crit_bonus = damage / 2;                        // for spells is 50%
             break;
     }
-
     if(pVictim)
     {
         uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
         crit_bonus = int32(crit_bonus * GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_CRIT_PERCENT_VERSUS, creatureTypeMask));
     }
-
     if(crit_bonus > 0)
         damage += crit_bonus;
-
     damage = int32(float(damage) * GetTotalAuraMultiplier(SPELL_AURA_MOD_CRITICAL_HEALING_AMOUNT));
-
     return damage;
 }
-
 uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint32 healamount, DamageEffectType damagetype, uint32 stack)
 {
     // For totems get healing bonus from owner (statue isn't totem in fact)
     if( GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem())
         if(Unit* owner = GetOwner())
             return owner->SpellHealingBonus(pVictim, spellProto, healamount, damagetype, stack);
-
     // Healing Done
     // Taken/Done total percent damage auras
     float  DoneTotalMod = 1.0f;
     float  TakenTotalMod = 1.0f;
     int32  DoneTotal = 0;
     int32  TakenTotal = 0;
-
     // Healing done percent
     AuraEffectList const& mHealingDonePct = GetAurasByType(SPELL_AURA_MOD_HEALING_DONE_PERCENT);
     for(AuraEffectList::const_iterator i = mHealingDonePct.begin();i != mHealingDonePct.end(); ++i)
         DoneTotalMod *= (100.0f + (*i)->GetAmount()) / 100.0f;
-
     // done scripted mod (take it from owner)
     Unit *owner = GetOwner();
     if (!owner) owner = this;
@@ -9836,13 +8772,10 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
                 break;
         }
     }
-
     // Taken/Done fixed damage bonus auras
     int32 DoneAdvertisedBenefit  = SpellBaseHealingBonus(GetSpellSchoolMask(spellProto));
     int32 TakenAdvertisedBenefit = SpellBaseHealingBonusForVictim(GetSpellSchoolMask(spellProto), pVictim);
-
     bool scripted = false;
-
     for (uint8 i=0;i<MAX_SPELL_EFFECTS;++i)
     {
         switch (spellProto->EffectApplyAuraName[i])
@@ -9854,7 +8787,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
                 break;
         }
     }
-
     // Check for table values
     SpellBonusEntry const* bonus = !scripted ? spellmgr.GetSpellBonusData(spellProto->Id) : NULL;
     float coeff = 0;
@@ -9904,7 +8836,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
             coeff = 0.0f;
         }
     }
-
     // Default calculation
     if (DoneAdvertisedBenefit || TakenAdvertisedBenefit)
     {
@@ -9958,7 +8889,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
             // As wowwiki says: C = (Cast Time / 3.5) * 1.88 (for healing spells)
             coeff = (CastingTime / 3500.0f) * DotFactor * 1.88f;
         }
-
         factorMod *= CalculateLevelPenalty(spellProto)* stack;
         TakenTotal += TakenAdvertisedBenefit * coeff * factorMod;
         if(Player* modOwner = GetSpellModOwner())
@@ -9969,13 +8899,11 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
         }
         DoneTotal += DoneAdvertisedBenefit * coeff * factorMod;
     }
-
     // use float as more appropriate for negative values and percent applying
     float heal = (healamount + DoneTotal)*DoneTotalMod;
     // apply spellmod to Done amount
     if(Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, damagetype == DOT ? SPELLMOD_DOT : SPELLMOD_DAMAGE, heal);
-
     // Nourish cast
     if (spellProto->SpellFamilyName == SPELLFAMILY_DRUID && spellProto->SpellFamilyFlags[1] & 0x2000000)
     {
@@ -9984,9 +8912,7 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
             //increase healing by 20%
             TakenTotalMod *= 1.2f;
     }
-
     // Taken mods
-
     // Healing Wave
     if (spellProto->SpellFamilyName == SPELLFAMILY_SHAMAN && spellProto->SpellFamilyFlags[0] & 0x40)
     {
@@ -9995,53 +8921,42 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
         if(HealingWay)
             TakenTotalMod *= (HealingWay->GetAmount() + 100.0f) / 100.0f;
     }
-
     // Healing taken percent
     float minval = pVictim->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT);
     if(minval)
         TakenTotalMod *= (100.0f + minval) / 100.0f;
-
     float maxval = pVictim->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HEALING_PCT);
     if(maxval)
         TakenTotalMod *= (100.0f + maxval) / 100.0f;
-
     if(damagetype==DOT)
     {
         // Healing over time taken percent
         float minval_hot = pVictim->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HOT_PCT);
         if(minval_hot)
             TakenTotalMod *= (100.0f + minval_hot) / 100.0f;
-
         float maxval_hot = pVictim->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_HOT_PCT);
         if(maxval_hot)
             TakenTotalMod *= (100.0f + maxval_hot) / 100.0f;
     }
-
     AuraEffectList const& mHealingGet= pVictim->GetAurasByType(SPELL_AURA_MOD_HEALING_RECEIVED);
     for(AuraEffectList::const_iterator i = mHealingGet.begin(); i != mHealingGet.end(); ++i)
         if (GetGUID()==(*i)->GetCasterGUID() && (*i)->isAffectedOnSpell(spellProto) )
             TakenTotalMod *= ((*i)->GetAmount() + 100.0f) / 100.0f;
-
     heal = (heal + TakenTotal) * TakenTotalMod;
-
     return heal < 0 ? 0 : uint32(heal);
 }
-
 int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask)
 {
     int32 AdvertisedBenefit = 0;
-
     AuraEffectList const& mHealingDone = GetAurasByType(SPELL_AURA_MOD_HEALING_DONE);
     for(AuraEffectList::const_iterator i = mHealingDone.begin();i != mHealingDone.end(); ++i)
         if(((*i)->GetMiscValue() & schoolMask) != 0)
             AdvertisedBenefit += (*i)->GetAmount();
-
     // Healing bonus of spirit, intellect and strength
     if (GetTypeId() == TYPEID_PLAYER)
     {
         // Base value
         AdvertisedBenefit +=((Player*)this)->GetBaseSpellPowerBonus();
-
         // Healing bonus from stats
         AuraEffectList const& mHealingDoneOfStatPercent = GetAurasByType(SPELL_AURA_MOD_SPELL_HEALING_OF_STAT_PERCENT);
         for(AuraEffectList::const_iterator i = mHealingDoneOfStatPercent.begin();i != mHealingDoneOfStatPercent.end(); ++i)
@@ -10050,7 +8965,6 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask)
             Stats usedStat = Stats((*i)->GetSpellProto()->EffectMiscValue[(*i)->GetEffIndex()]);
             AdvertisedBenefit += int32(GetStat(usedStat) * (*i)->GetAmount() / 100.0f);
         }
-
         // ... and attack power
         AuraEffectList const& mHealingDonebyAP = GetAurasByType(SPELL_AURA_MOD_SPELL_HEALING_OF_ATTACK_POWER);
         for(AuraEffectList::const_iterator i = mHealingDonebyAP.begin();i != mHealingDonebyAP.end(); ++i)
@@ -10059,7 +8973,6 @@ int32 Unit::SpellBaseHealingBonus(SpellSchoolMask schoolMask)
     }
     return AdvertisedBenefit;
 }
-
 int32 Unit::SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVictim)
 {
     int32 AdvertisedBenefit = 0;
@@ -10069,7 +8982,6 @@ int32 Unit::SpellBaseHealingBonusForVictim(SpellSchoolMask schoolMask, Unit *pVi
             AdvertisedBenefit += (*i)->GetAmount();
     return AdvertisedBenefit;
 }
-
 bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask)
 {
     //If m_immuneToSchool type contain this school type, IMMUNE damage.
@@ -10077,16 +8989,13 @@ bool Unit::IsImmunedToDamage(SpellSchoolMask shoolMask)
     for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr)
         if(itr->type & shoolMask)
             return true;
-
     //If m_immuneToDamage type contain magic, IMMUNE damage.
     SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE];
     for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
         if(itr->type & shoolMask)
             return true;
-
     return false;
 }
-
 bool Unit::IsImmunedToDamage(SpellEntry const* spellInfo)
 {
     uint32 shoolMask = GetSpellSchoolMask(spellInfo);
@@ -10098,27 +9007,22 @@ bool Unit::IsImmunedToDamage(SpellEntry const* spellInfo)
             if(itr->type & shoolMask &&!IsDispelableBySpell(spellInfo, itr->spellId))
                 return true;
     }
-
     //If m_immuneToDamage type contain magic, IMMUNE damage.
     SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE];
     for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr)
         if(itr->type & shoolMask)
             return true;
-
     return false;
 }
-
 bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
 {
     if (!spellInfo)
         return false;
-
     // Single spell immunity.
     SpellImmuneList const& idList = m_spellImmune[IMMUNITY_ID];
     for(SpellImmuneList::const_iterator itr = idList.begin(); itr != idList.end(); ++itr)
         if(itr->type == spellInfo->Id)
             return true;
-
     if(spellInfo->Dispel)
     {
         SpellImmuneList const& dispelList = m_spellImmune[IMMUNITY_DISPEL];
@@ -10126,7 +9030,6 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
             if(itr->type == spellInfo->Dispel)
                 return true;
     }
-
     if(spellInfo->Mechanic)
     {
         SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC];
@@ -10134,7 +9037,6 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
             if(itr->type == spellInfo->Mechanic)
                 return true;
     }
-
     if(spellInfo->Id != 42292 && spellInfo->Id !=59752)
     {
         SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL];
@@ -10144,10 +9046,8 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
                 && !IsDispelableBySpell(spellInfo, itr->spellId))
                 return true;
     }
-
     return false;
 }
-
 bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
 {
     if (!spellInfo)
@@ -10158,7 +9058,6 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con
     for (SpellImmuneList::const_iterator itr = effectList.begin(); itr != effectList.end(); ++itr)
         if(itr->type == effect)
             return true;
-
     if(uint32 mechanic = spellInfo->EffectMechanic[index])
     {
         SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC];
@@ -10166,7 +9065,6 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con
             if(itr->type == spellInfo->EffectMechanic[index])
                 return true;
     }
-
     if(uint32 aura = spellInfo->EffectApplyAuraName[index])
     {
         SpellImmuneList const& list = m_spellImmune[IMMUNITY_STATE];
@@ -10181,15 +9079,12 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con
                 !IsPositiveEffect(spellInfo->Id, index))                                  // Harmful
                 return true;
     }
-
     return false;
 }
-
 bool Unit::IsDamageToThreatSpell(SpellEntry const * spellInfo) const
 {
     if(!spellInfo)
         return false;
-
     switch(spellInfo->SpellFamilyName)
     {
         case SPELLFAMILY_WARLOCK:
@@ -10205,39 +9100,30 @@ bool Unit::IsDamageToThreatSpell(SpellEntry const * spellInfo) const
                 return true;
             break;
     }
-
     return false;
 }
-
 void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attType, SpellEntry const *spellProto)
 {
     if(!pVictim)
         return;
-
     if(*pdamage == 0)
         return;
-
     uint32 creatureTypeMask = pVictim->GetCreatureTypeMask();
-
     // Taken/Done fixed damage bonus auras
     int32 DoneFlatBenefit = 0;
     int32 TakenFlatBenefit = 0;
-
     // ..done (for creature type by mask) in taken
     AuraEffectList const& mDamageDoneCreature = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_CREATURE);
     for(AuraEffectList::const_iterator i = mDamageDoneCreature.begin();i != mDamageDoneCreature.end(); ++i)
         if(creatureTypeMask & uint32((*i)->GetMiscValue()))
             DoneFlatBenefit += (*i)->GetAmount();
-
     // ..done
     // SPELL_AURA_MOD_DAMAGE_DONE included in weapon damage
-
     // ..done (base at attack power for marked target and base at attack power for creature type)
     int32 APbonus = 0;
     if(attType == RANGED_ATTACK)
     {
         APbonus += pVictim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS);
-
         // ..done (base at attack power and creature type)
         AuraEffectList const& mCreatureAttackPower = GetAurasByType(SPELL_AURA_MOD_RANGED_ATTACK_POWER_VERSUS);
         for(AuraEffectList::const_iterator i = mCreatureAttackPower.begin();i != mCreatureAttackPower.end(); ++i)
@@ -10247,14 +9133,12 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
     else
     {
         APbonus += pVictim->GetTotalAuraModifier(SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS);
-
         // ..done (base at attack power and creature type)
         AuraEffectList const& mCreatureAttackPower = GetAurasByType(SPELL_AURA_MOD_MELEE_ATTACK_POWER_VERSUS);
         for(AuraEffectList::const_iterator i = mCreatureAttackPower.begin();i != mCreatureAttackPower.end(); ++i)
             if(creatureTypeMask & uint32((*i)->GetMiscValue()))
                 APbonus += (*i)->GetAmount();
     }
-
     if (APbonus!=0)                                         // Can be negative
     {
         bool normalized = false;
@@ -10272,40 +9156,32 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
         // This is not a typo - Impurity has SPELLFAMILY_DRUID
         if (AuraEffect const * aurEff = GetDummyAura(SPELLFAMILY_DRUID, 1986, 0))
             APbonus *= (100.0f + aurEff->GetAmount()) / 100.0f;
-
         DoneFlatBenefit += int32(APbonus/14.0f * GetAPMultiplier(attType,normalized));
     }
-
     // ..taken
     AuraEffectList const& mDamageTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_TAKEN);
     for(AuraEffectList::const_iterator i = mDamageTaken.begin();i != mDamageTaken.end(); ++i)
         if((*i)->GetMiscValue() & GetMeleeDamageSchoolMask())
             TakenFlatBenefit += (*i)->GetAmount();
-
     if(attType!=RANGED_ATTACK)
         TakenFlatBenefit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN);
     else
         TakenFlatBenefit += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_RANGED_DAMAGE_TAKEN);
-
     // Done/Taken total percent damage auras
     float DoneTotalMod = 1.0f;
     float TakenTotalMod = 1.0f;
-
     // ..done
     // SPELL_AURA_MOD_DAMAGE_PERCENT_DONE included in weapon damage
     // SPELL_AURA_MOD_OFFHAND_DAMAGE_PCT  included in weapon damage
-
     AuraEffectList const& mDamageDoneVersus = GetAurasByType(SPELL_AURA_MOD_DAMAGE_DONE_VERSUS);
     for(AuraEffectList::const_iterator i = mDamageDoneVersus.begin();i != mDamageDoneVersus.end(); ++i)
         if(creatureTypeMask & uint32((*i)->GetMiscValue()))
             DoneTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
-
     // ..taken
     AuraEffectList const& mModDamagePercentTaken = pVictim->GetAurasByType(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
     for(AuraEffectList::const_iterator i = mModDamagePercentTaken.begin(); i != mModDamagePercentTaken.end(); ++i)
         if((*i)->GetMiscValue() & GetMeleeDamageSchoolMask())
             TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
-
     // .. taken pct (special attacks)
     if (spellProto)
     {
@@ -10321,7 +9197,6 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
                     TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
         }
     }
-
     // .. taken pct: dummy auras
     AuraEffectList const& mDummyAuras = pVictim->GetAurasByType(SPELL_AURA_DUMMY);
     for(AuraEffectList::const_iterator i = mDummyAuras.begin(); i != mDummyAuras.end(); ++i)
@@ -10342,7 +9217,6 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
                 break;
         }
     }
-
     // .. taken pct: class scripts
     AuraEffectList const& mclassScritAuras = GetAurasByType(SPELL_AURA_OVERRIDE_CLASS_SCRIPTS);
     for(AuraEffectList::const_iterator i = mclassScritAuras.begin(); i != mclassScritAuras.end(); ++i)
@@ -10358,14 +9232,12 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
                         sLog.outError("Spell structure of DD (%u) changed.",(*i)->GetId());
                         continue;
                     }
-
                     // effect 0 have expected value but in negative state
                     TakenTotalMod *= (-eff0->GetAmount()+100.0f)/100.0f;
                 }
                 break;
         }
     }
-
     if(attType != RANGED_ATTACK)
     {
         AuraEffectList const& mModMeleeDamageTakenPercent = pVictim->GetAurasByType(SPELL_AURA_MOD_MELEE_DAMAGE_TAKEN_PCT);
@@ -10378,22 +9250,17 @@ void Unit::MeleeDamageBonus(Unit *pVictim, uint32 *pdamage,WeaponAttackType attT
         for(AuraEffectList::const_iterator i = mModRangedDamageTakenPercent.begin(); i != mModRangedDamageTakenPercent.end(); ++i)
             TakenTotalMod *= ((*i)->GetAmount()+100.0f)/100.0f;
     }
-
     float tmpDamage = float(int32(*pdamage) + DoneFlatBenefit) * DoneTotalMod;
-
     // apply spellmod to Done damage
     if(spellProto)
     {
         if(Player* modOwner = GetSpellModOwner())
             modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_DAMAGE, tmpDamage);
     }
-
     tmpDamage = (tmpDamage + TakenFlatBenefit)*TakenTotalMod;
-
     // bonus result can be negative
     *pdamage =  tmpDamage > 0 ? uint32(tmpDamage) : 0;
 }
-
 void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply)
 {
     if (apply)
@@ -10423,13 +9290,10 @@ void Unit::ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply)
             }
         }
     }
-
 }
-
 void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply)
 {
     ApplySpellImmune(spellProto->Id,IMMUNITY_DISPEL, type, apply);
-
     if (apply && spellProto->AttributesEx & SPELL_ATTR_EX_DISPEL_AURAS_ON_IMMUNITY)
     {
         // Create dispel mask by dispel type
@@ -10449,7 +9313,6 @@ void Unit::ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType ty
         }
     }
 }
-
 float Unit::GetWeaponProcChance() const
 {
     // normalized proc chance for weapon attack speed
@@ -10460,7 +9323,6 @@ float Unit::GetWeaponProcChance() const
         return (GetAttackTime(OFF_ATTACK) * 1.6f / 1000.0f);
     return 0;
 }
-
 float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellEntry * spellProto) const
 {
     // proc per minute chance calculation
@@ -10469,19 +9331,14 @@ float Unit::GetPPMProcChance(uint32 WeaponSpeed, float PPM, const SpellEntry * s
     if (spellProto)
         if(Player* modOwner = GetSpellModOwner())
             modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_PROC_PER_MINUTE,PPM);
-
     return uint32((WeaponSpeed * PPM) / 600.0f);   // result is chance in percents (probability = Speed_in_sec * (PPM / 60))
 }
-
 void Unit::Mount(uint32 mount)
 {
     RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOUNT);
-
     if(mount)
         SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, mount);
-
     SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT );
-
     // unsummon pet
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -10496,24 +9353,19 @@ void Unit::Mount(uint32 mount)
                 ((Player*)this)->UnsummonPetTemporaryIfAny();
         }
     }
-
 }
-
 void Unit::Unmount()
 {
     if(!IsMounted())
         return;
-
     RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_MOUNTED);
-
     SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0);
     RemoveFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT );
-
     // only resummon old pet if the player is already added to a map
     // this prevents adding a pet to a not created map which would otherwise cause a crash
     // (it could probably happen when logging in after a previous crash)
     if(GetTypeId() == TYPEID_PLAYER)
-    {    
+    {
         if(Pet *pPet = ((Player*)this)->GetPet())
         {
             if(pPet->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED) && !pPet->hasUnitState(UNIT_STAT_STUNNED))
@@ -10523,7 +9375,6 @@ void Unit::Unmount()
             ((Player*)this)->ResummonPetTemporaryUnSummonedIfAny();
     }
 }
-
 void Unit::SetInCombatWith(Unit* enemy)
 {
     Unit* eOwner = enemy->GetCharmerOrOwnerOrSelf();
@@ -10532,7 +9383,6 @@ void Unit::SetInCombatWith(Unit* enemy)
         SetInCombatState(true,enemy);
         return;
     }
-
     //check for duel
     if(eOwner->GetTypeId() == TYPEID_PLAYER && ((Player*)eOwner)->duel)
     {
@@ -10545,27 +9395,23 @@ void Unit::SetInCombatWith(Unit* enemy)
     }
     SetInCombatState(false,enemy);
 }
-
 void Unit::CombatStart(Unit* target, bool initialAggro)
 {
     if (initialAggro)
     {
         if(!target->IsStandState()/* && !target->hasUnitState(UNIT_STAT_STUNNED)*/)
             target->SetStandState(UNIT_STAND_STATE_STAND);
-
         if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
             && !((Creature*)target)->HasReactState(REACT_PASSIVE) && ((Creature*)target)->IsAIEnabled)
         {
             ((Creature*)target)->AI()->AttackStart(this);
         }
-
         SetInCombatWith(target);
         target->SetInCombatWith(this);
     }
     Unit *who = target->GetCharmerOrOwnerOrSelf();
     if(who->GetTypeId() == TYPEID_PLAYER)
         SetContestedPvP((Player*)who);
-
     Player *me = GetCharmerOrOwnerPlayerOrPlayerItself();
     if(me && who->IsPvP()
         && (who->GetTypeId() != TYPEID_PLAYER
@@ -10575,28 +9421,22 @@ void Unit::CombatStart(Unit* target, bool initialAggro)
         me->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
     }
 }
-
 void Unit::SetInCombatState(bool PvP, Unit* enemy)
 {
     // only alive units can be in combat
     if(!isAlive())
         return;
-
     if(PvP)
         m_CombatTimer = 5000;
-
     if(isInCombat() || hasUnitState(UNIT_STAT_EVADE))
         return;
-
     SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
-
     if(GetTypeId() != TYPEID_PLAYER)
     {
         // Set home position at place of engaging combat for escorted creatures
         if(( ((Creature*)this)->IsAIEnabled && ((Creature*)this)->AI()->IsEscorted() ) ||
             ((Creature*)this)->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE)
             ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation());
-
         if(enemy)
         {
             if(((Creature*)this)->IsAIEnabled)
@@ -10604,7 +9444,6 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             if(((Creature*)this)->GetFormation())
                 ((Creature*)this)->GetFormation()->MemberAttackStart((Creature*)this, enemy);
         }
-
         if(((Creature*)this)->isPet())
         {
             UpdateSpeed(MOVE_RUN, true);
@@ -10612,19 +9451,16 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
             UpdateSpeed(MOVE_FLIGHT, true);
         }
     }
-
     for(Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
     {
         (*itr)->SetInCombatState(PvP, enemy);
         (*itr)->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
     }
 }
-
 void Unit::ClearInCombat()
 {
     m_CombatTimer = 0;
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT);
-
     // Player's state will be cleared in Player::UpdateContestedPvP
     if(GetTypeId() != TYPEID_PLAYER)
     {
@@ -10634,7 +9470,6 @@ void Unit::ClearInCombat()
     }
     else
         ((Player*)this)->UpdatePotionCooldown();
-
     if(GetTypeId() != TYPEID_PLAYER && ((Creature*)this)->isPet())
     {
         if(Unit *owner = GetOwner())
@@ -10646,20 +9481,16 @@ void Unit::ClearInCombat()
     }
     else if(!isCharmed())
         return;
-
     RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PET_IN_COMBAT);
 }
-
 //TODO: remove this function
 bool Unit::isTargetableForAttack() const
 {
     return isAttackableByAOE() && !hasUnitState(UNIT_STAT_DIED);
 }
-
 bool Unit::canAttack(Unit const* target, bool force) const
 {
     assert(target);
-
     if(force)
     {
         if(IsFriendlyTo(target))
@@ -10667,61 +9498,45 @@ bool Unit::canAttack(Unit const* target, bool force) const
     }
     else if(!IsHostileTo(target))
         return false;
-
     //if(m_Vehicle && m_Vehicle == target->m_Vehicle)
     //    return true;
-
     if(!target->isAttackableByAOE() || target->hasUnitState(UNIT_STAT_DIED))
         return false;
-
     // shaman totem quests: spell 8898, shaman can detect elementals but elementals cannot see shaman
     if(m_invisibilityMask || target->m_invisibilityMask)
         if(!canDetectInvisibilityOf(target) && !target->canDetectInvisibilityOf(this))
             return false;
-
     if(target->GetVisibility() == VISIBILITY_GROUP_STEALTH && !canDetectStealthOf(target, GetDistance(target)))
         return false;
-
     if(m_vehicle)
-        if(IsOnVehicle(target) || m_vehicle->GetBase()->IsOnVehicle(target)) 
+        if(IsOnVehicle(target) || m_vehicle->GetBase()->IsOnVehicle(target))
             return false;
-
     return true;
 }
-
 bool Unit::isAttackableByAOE() const
 {
     if(!isAlive())
         return false;
-
     if(HasFlag(UNIT_FIELD_FLAGS,
         UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE))
         return false;
-
     if(GetTypeId()==TYPEID_PLAYER && ((Player *)this)->isGameMaster())
         return false;
-
     return !hasUnitState(UNIT_STAT_UNATTACKABLE);
 }
-
 int32 Unit::ModifyHealth(int32 dVal)
 {
     int32 gain = 0;
-
     if(dVal==0)
         return 0;
-
     int32 curHealth = (int32)GetHealth();
-
     int32 val = dVal + curHealth;
     if(val <= 0)
     {
         SetHealth(0);
         return -curHealth;
     }
-
     int32 maxHealth = (int32)GetMaxHealth();
-
     if(val < maxHealth)
     {
         SetHealth(val);
@@ -10732,27 +9547,20 @@ int32 Unit::ModifyHealth(int32 dVal)
         SetHealth(maxHealth);
         gain = maxHealth - curHealth;
     }
-
     return gain;
 }
-
 int32 Unit::GetHealthGain(int32 dVal)
 {
     int32 gain = 0;
-
     if(dVal==0)
         return 0;
-
     int32 curHealth = (int32)GetHealth();
-
     int32 val = dVal + curHealth;
     if(val <= 0)
     {
         return -curHealth;
     }
-
     int32 maxHealth = (int32)GetMaxHealth();
-
     if(val < maxHealth)
     {
         gain = dVal;
@@ -10761,28 +9569,21 @@ int32 Unit::GetHealthGain(int32 dVal)
     {
         gain = maxHealth - curHealth;
     }
-
     return gain;
 }
-
 int32 Unit::ModifyPower(Powers power, int32 dVal)
 {
     int32 gain = 0;
-
     if(dVal==0)
         return 0;
-
     int32 curPower = (int32)GetPower(power);
-
     int32 val = dVal + curPower;
     if(val <= 0)
     {
         SetPower(power,0);
         return -curPower;
     }
-
     int32 maxPower = (int32)GetMaxPower(power);
-
     if(val < maxPower)
     {
         SetPower(power,val);
@@ -10793,23 +9594,18 @@ int32 Unit::ModifyPower(Powers power, int32 dVal)
         SetPower(power,maxPower);
         gain = maxPower - curPower;
     }
-
     return gain;
 }
-
 bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const
 {
     if(!u || !IsInMap(u))
         return false;
-
     return u->canSeeOrDetect(this, detect, inVisibleList, is3dDistance);
 }
-
 bool Unit::canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList, bool is3dDistance) const
 {
     return true;
 }
-
 bool Unit::canDetectInvisibilityOf(Unit const* u) const
 {
     if(m_invisibilityMask & u->m_invisibilityMask) // same group
@@ -10818,21 +9614,18 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const
     for(AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
         if((*iter)->GetCasterGUID()==GetGUID())
             return true;
-
     if(uint32 mask = (m_detectInvisibilityMask & u->m_invisibilityMask))
     {
         for(uint32 i = 0; i < 10; ++i)
         {
             if(((1 << i) & mask)==0)
                 continue;
-
             // find invisibility level
             uint32 invLevel = 0;
             Unit::AuraEffectList const& iAuras = u->GetAurasByType(SPELL_AURA_MOD_INVISIBILITY);
             for(Unit::AuraEffectList::const_iterator itr = iAuras.begin(); itr != iAuras.end(); ++itr)
                 if(((*itr)->GetMiscValue())==i && invLevel < (*itr)->GetAmount())
                     invLevel = (*itr)->GetAmount();
-
             // find invisibility detect level
             uint32 detectLevel = 0;
             if(i==6 && GetTypeId()==TYPEID_PLAYER)          // special drunk detection case
@@ -10846,15 +9639,12 @@ bool Unit::canDetectInvisibilityOf(Unit const* u) const
                     if(((*itr)->GetMiscValue())==i && detectLevel < (*itr)->GetAmount())
                         detectLevel = (*itr)->GetAmount();
             }
-
             if(invLevel <= detectLevel)
                 return true;
         }
     }
-
     return false;
 }
-
 bool Unit::canDetectStealthOf(Unit const* target, float distance) const
 {
     if(hasUnitState(UNIT_STAT_STUNNED))
@@ -10865,12 +9655,10 @@ bool Unit::canDetectStealthOf(Unit const* target, float distance) const
         return false;
     if(HasAuraType(SPELL_AURA_DETECT_STEALTH))
         return true;
-
     AuraEffectList const& auras = target->GetAurasByType(SPELL_AURA_MOD_STALKED); // Hunter mark
     for(AuraEffectList::const_iterator iter = auras.begin(); iter != auras.end(); ++iter)
         if((*iter)->GetCasterGUID()==GetGUID())
             return true;
-
     //Visible distance based on stealth value (stealth rank 4 300MOD, 10.5 - 3 = 7.5)
     float visibleDistance = 10.5f - target->GetTotalAuraModifier(SPELL_AURA_MOD_STEALTH) / 100.0f;
     //Visible distance is modified by -Level Diff (every level diff = 1.0f in visible distance)
@@ -10879,26 +9667,20 @@ bool Unit::canDetectStealthOf(Unit const* target, float distance) const
     //based on wowwiki every 5 mod we have 1 more level diff in calculation
     visibleDistance += (float)(GetTotalAuraModifier(SPELL_AURA_MOD_DETECT) - target->GetTotalAuraModifier(SPELL_AURA_MOD_STEALTH_LEVEL)) / 5.0f;
     visibleDistance = visibleDistance > MAX_PLAYER_STEALTH_DETECT_RANGE ? MAX_PLAYER_STEALTH_DETECT_RANGE : visibleDistance;
-
     return distance < visibleDistance;
 }
-
 void Unit::SetVisibility(UnitVisibility x)
 {
     m_Visibility = x;
-
     SetToNotify();
-
     if(x == VISIBILITY_GROUP_STEALTH)
         DestroyForNearbyPlayers();
 }
-
 void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
 {
     int32 main_speed_mod  = 0;
     float stack_bonus     = 1.0f;
     float non_stack_bonus = 1.0f;
-
     switch(mtype)
     {
         // Only apply debuffs
@@ -10935,13 +9717,10 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
             {
                 main_speed_mod  = GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED);
                 stack_bonus     = GetTotalAuraMultiplier(SPELL_AURA_MOD_VEHICLE_SPEED_ALWAYS);
-
                 // for some spells this mod is applied on vehicle owner
                 uint32 owner_speed_mod = 0;
-
                 if (Unit * owner = GetCharmer())
                     uint32 owner_speed_mod  = owner->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED);
-
                 main_speed_mod = main_speed_mod>owner_speed_mod ? main_speed_mod : owner_speed_mod;
             }
             else if (IsMounted())
@@ -10951,9 +9730,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
             }
             else             // Use not mount (shapeshift for example) auras (should stack)
                 main_speed_mod  = GetTotalAuraModifier(SPELL_AURA_MOD_INCREASE_FLIGHT_SPEED);
-
             non_stack_bonus = (100.0 + GetMaxPositiveAuraModifier(SPELL_AURA_MOD_FLIGHT_SPEED_NOT_STACK))/100.0f;
-
             // Update speed for vehicle if available
             if (GetTypeId()==TYPEID_PLAYER && GetVehicle())
                 GetVehicleBase()->UpdateSpeed(MOVE_FLIGHT, true);
@@ -10963,12 +9740,9 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
             sLog.outError("Unit::UpdateSpeed: Unsupported move type (%d)", mtype);
             return;
     }
-
     float bonus = non_stack_bonus > stack_bonus ? non_stack_bonus : stack_bonus;
-
     // now we ready for speed calculation
     float speed  = main_speed_mod ? bonus*(100.0f + main_speed_mod)/100.0f : bonus;
-
     switch(mtype)
     {
         case MOVE_RUN:
@@ -10978,7 +9752,6 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
             // Set creature speed rate from CreatureInfo
             if (GetTypeId() == TYPEID_UNIT)
                 speed *= ((Creature*)this)->GetCreatureInfo()->speed;
-
             // Normalize speed by 191 aura SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED if need
             // TODO: possible affect only on MOVE_RUN
             if(int32 normalization = GetMaxPositiveAuraModifier(SPELL_AURA_USE_NORMAL_MOVEMENT_SPEED))
@@ -10993,32 +9766,25 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
         default:
             break;
     }
-
     // Apply strongest slow aura mod to speed
     int32 slow = GetMaxNegativeAuraModifier(SPELL_AURA_MOD_DECREASE_SPEED);
     if (slow)
         speed *=(100.0f + slow)/100.0f;
     SetSpeed(mtype, speed, forced);
 }
-
 float Unit::GetSpeed( UnitMoveType mtype ) const
 {
     return m_speed_rate[mtype]*(IsControlledByPlayer() ? playerBaseMoveSpeed[mtype] : baseMoveSpeed[mtype]);
 }
-
 void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
 {
     if (rate < 0)
         rate = 0.0f;
-
     // Update speed only on change
     if (m_speed_rate[mtype] == rate)
         return;
-
     m_speed_rate[mtype] = rate;
-
     propagateSpeedChange();
-
     WorldPacket data;
     if(!forced)
     {
@@ -11055,7 +9821,6 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
                 sLog.outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.",mtype);
                 return;
         }
-
         data.append(GetPackGUID());
         data << uint32(0);                                  // movement flags
         data << uint16(0);                                  // unk flags
@@ -11075,12 +9840,10 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
             // register forced speed changes for WorldSession::HandleForceSpeedChangeAck
             // and do it only for real sent packets and use run for run/mounted as client expected
             ++((Player*)this)->m_forced_speed_changes[mtype];
-
             if(!isInCombat())
                 if(Pet* pet = ((Player*)this)->GetPet())
                     pet->SetSpeed(mtype, m_speed_rate[mtype], forced);
         }
-
         switch(mtype)
         {
             case MOVE_WALK:
@@ -11122,7 +9885,6 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
         SendMessageToSet( &data, true );
     }
 }
-
 void Unit::SetHover(bool on)
 {
     if(on)
@@ -11130,7 +9892,6 @@ void Unit::SetHover(bool on)
     else
         RemoveAurasDueToSpell(11010);
 }
-
 void Unit::setDeathState(DeathState s)
 {
     if (s != ALIVE && s!= JUST_ALIVED)
@@ -11139,16 +9900,13 @@ void Unit::setDeathState(DeathState s)
         DeleteThreatList();
         getHostilRefManager().deleteReferences();
         ClearComboPointHolders();                           // any combo points pointed to unit lost at it death
-
         if(IsNonMeleeSpellCasted(false))
             InterruptNonMeleeSpells(false);
-
         UnsummonAllTotems();
         RemoveAllControlled();
         RemoveAllAurasOnDeath();
         ExitVehicle();
     }
-
     if (s == JUST_DIED)
     {
         ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
@@ -11167,7 +9925,6 @@ void Unit::setDeathState(DeathState s)
     {
         RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); // clear skinnable for creature and player (at battleground)
     }
-
     if (m_deathState != ALIVE && s == ALIVE)
     {
         //_ApplyAllAuraMods();
@@ -11176,7 +9933,6 @@ void Unit::setDeathState(DeathState s)
     }
     m_deathState = s;
 }
-
 /*########################################
 ########                          ########
 ########       AGGRO SYSTEM       ########
@@ -11187,111 +9943,81 @@ bool Unit::CanHaveThreatList() const
     // only creatures can have threat list
     if( GetTypeId() != TYPEID_UNIT )
         return false;
-
     // only alive units can have threat list
     if( !isAlive() )
         return false;
-
     // totems can not have threat list
     if( ((Creature*)this)->isTotem() )
         return false;
-
     // vehicles can not have threat list
     //if( ((Creature*)this)->IsVehicle() )
     //    return false;
-
     // summons can not have a threat list, unless they are controlled by a creature
     if( HasUnitTypeMask(UNIT_MASK_MINION | UNIT_MASK_GUARDIAN | UNIT_MASK_CONTROLABLE_GUARDIAN) && IS_PLAYER_GUID(((Pet*)this)->GetOwnerGUID()) )
         return false;
-
     return true;
 }
-
 //======================================================================
-
 float Unit::ApplyTotalThreatModifier(float threat, SpellSchoolMask schoolMask)
 {
     if(!HasAuraType(SPELL_AURA_MOD_THREAT))
         return threat;
-
     SpellSchools school = GetFirstSchoolInMask(schoolMask);
-
     return threat * m_threatModifier[school];
 }
-
 //======================================================================
-
 void Unit::AddThreat(Unit* pVictim, float threat, SpellSchoolMask schoolMask, SpellEntry const *threatSpell)
 {
     // Only mobs can manage threat lists
     if(CanHaveThreatList())
         m_ThreatManager.addThreat(pVictim, threat, schoolMask, threatSpell);
 }
-
 //======================================================================
-
 void Unit::DeleteThreatList()
 {
     if(CanHaveThreatList() && !m_ThreatManager.isThreatListEmpty())
         SendClearThreatListOpcode();
     m_ThreatManager.clearReferences();
 }
-
 //======================================================================
-
 void Unit::TauntApply(Unit* taunter)
 {
     assert(GetTypeId()== TYPEID_UNIT);
-
     if(!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && ((Player*)taunter)->isGameMaster()))
         return;
-
     if(!CanHaveThreatList())
         return;
-
     if(((Creature*)this)->HasReactState(REACT_PASSIVE))
         return;
-
     Unit *target = getVictim();
     if(target && target == taunter)
         return;
-
     SetInFront(taunter);
     if (((Creature*)this)->IsAIEnabled)
         ((Creature*)this)->AI()->AttackStart(taunter);
-
     //m_ThreatManager.tauntApply(taunter);
 }
-
 //======================================================================
-
 void Unit::TauntFadeOut(Unit *taunter)
 {
     assert(GetTypeId()== TYPEID_UNIT);
-
     if(!taunter || (taunter->GetTypeId() == TYPEID_PLAYER && ((Player*)taunter)->isGameMaster()))
         return;
-
     if(!CanHaveThreatList())
         return;
-
     if(((Creature*)this)->HasReactState(REACT_PASSIVE))
         return;
-
     Unit *target = getVictim();
     if(!target || target != taunter)
         return;
-
     if(m_ThreatManager.isThreatListEmpty())
     {
         if(((Creature*)this)->IsAIEnabled)
             ((Creature*)this)->AI()->EnterEvadeMode();
         return;
     }
-
     //m_ThreatManager.tauntFadeOut(taunter);
     target = m_ThreatManager.getHostilTarget();
-
     if (target && target != taunter)
     {
         SetInFront(target);
@@ -11299,22 +10025,18 @@ void Unit::TauntFadeOut(Unit *taunter)
             ((Creature*)this)->AI()->AttackStart(target);
     }
 }
-
 //======================================================================
-
 Unit* Creature::SelectVictim()
 {
     //function provides main threat functionality
     //next-victim-selection algorithm and evade mode are called
     //threat list sorting etc.
-
     Unit* target = NULL;
     // First checking if we have some taunt on us
     const AuraEffectList& tauntAuras = GetAurasByType(SPELL_AURA_MOD_TAUNT);
     if ( !tauntAuras.empty() )
     {
         Unit* caster;
-
         // The last taunt aura caster is alive an we are happy to attack him
         if ( (caster = tauntAuras.back()->GetCaster()) && caster->isAlive() )
             return getVictim();
@@ -11322,7 +10044,6 @@ Unit* Creature::SelectVictim()
         {
             // We do not have last taunt aura caster but we have more taunt auras,
             // so find first available target
-
             // Auras are pushed_back, last caster will be on the end
             AuraEffectList::const_iterator aura = --tauntAuras.end();
             do
@@ -11339,7 +10060,6 @@ Unit* Creature::SelectVictim()
         else
             target = getVictim();
     }
-
     if (CanHaveThreatList())
     {
         if ( !target && !m_ThreatManager.isThreatListEmpty() )
@@ -11372,13 +10092,11 @@ Unit* Creature::SelectVictim()
     }
     else
         return NULL;
-
     if(target && _IsTargetAcceptable(target))
     {
         SetInFront(target);
         return target;
     }
-
     // last case when creature don't must go to evade mode:
     // it in combat but attacker not make any damage and not enter to aggro radius to have record in threat list
     // for example at owner command to pet attack some far away creature
@@ -11389,17 +10107,14 @@ Unit* Creature::SelectVictim()
           && !((Creature*)(*itr))->HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN))
             return NULL;
     }
-
     // TODO: a vehicle may eat some mob, so mob should not evade
     if(GetVehicle())
         return NULL;
-
     // search nearby enemy before enter evade mode
     if(HasReactState(REACT_AGGRESSIVE))
         if(target = SelectNearestTarget())
             if(_IsTargetAcceptable(target))
                 return target;
-
     if(m_invisibilityMask)
     {
         Unit::AuraEffectList const& iAuras = GetAurasByType(SPELL_AURA_MOD_INVISIBILITY);
@@ -11411,17 +10126,13 @@ Unit* Creature::SelectVictim()
             }
         return NULL;
     }
-
     // enter in evade mode in other case
     AI()->EnterEvadeMode();
-
     return NULL;
 }
-
 //======================================================================
 //======================================================================
 //======================================================================
-
 int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_index, int32 effBasePoints, Unit const* /*target*/)
 {
     int32 level = int32(getLevel());
@@ -11430,17 +10141,14 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_inde
     else if (level < (int32)spellProto->baseLevel)
         level = (int32)spellProto->baseLevel;
     level-= (int32)spellProto->spellLevel;
-
     float basePointsPerLevel = spellProto->EffectRealPointsPerLevel[effect_index];
     float randomPointsPerLevel = spellProto->EffectDicePerLevel[effect_index];
     int32 basePoints = int32(effBasePoints + level * basePointsPerLevel);
     int32 randomPoints = int32(spellProto->EffectDieSides[effect_index] + level * randomPointsPerLevel);
-
     // range can have possitive and negative values, so order its for irand
     int32 randvalue = int32(spellProto->EffectBaseDice[effect_index]) >= randomPoints
         ? irand(randomPoints, int32(spellProto->EffectBaseDice[effect_index]))
         : irand(int32(spellProto->EffectBaseDice[effect_index]), randomPoints);
-
     int32 value = basePoints + randvalue;
     //random damage
     //if(comboDamage != 0 && unitPlayer /*&& target && (target->GetGUID() == unitPlayer->GetComboTarget())*/)
@@ -11448,7 +10156,6 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_inde
         if(uint8 comboPoints = m_movedPlayer->GetComboPoints())
             if(float comboDamage = spellProto->EffectPointsPerComboPoint[effect_index])
                 value += (int32)(comboDamage * comboPoints);
-
     if(Player* modOwner = GetSpellModOwner())
     {
         modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_ALL_EFFECTS, value);
@@ -11465,7 +10172,6 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_inde
                 break;
         }
     }
-
     if(!basePointsPerLevel && (spellProto->Attributes & SPELL_ATTR_LEVEL_DAMAGE_CALCULATION && spellProto->spellLevel) &&
             spellProto->Effect[effect_index] != SPELL_EFFECT_WEAPON_PERCENT_DAMAGE &&
             spellProto->Effect[effect_index] != SPELL_EFFECT_KNOCK_BACK &&
@@ -11476,42 +10182,32 @@ int32 Unit::CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_inde
             //there are many more: slow speed, -healing pct
         value = int32(value*0.25f*exp(getLevel()*(70-spellProto->spellLevel)/1000.0f));
         //value = int32(value * (int32)getLevel() / (int32)(spellProto->spellLevel ? spellProto->spellLevel : 1));
-
     return value;
 }
-
 int32 Unit::CalcSpellDuration(SpellEntry const* spellProto)
 {
     uint8 comboPoints = m_movedPlayer ? m_movedPlayer->GetComboPoints() : 0;
-
     int32 minduration = GetSpellDuration(spellProto);
     int32 maxduration = GetSpellMaxDuration(spellProto);
-
     int32 duration;
-
     if(comboPoints && minduration != -1 && minduration != maxduration)
         duration = minduration + int32((maxduration - minduration) * comboPoints / 5);
     else
         duration = minduration;
-
     return duration;
 }
-
 int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, int32 duration, bool positive)
 {
     //don't mod permament auras duration
     if (duration<0)
         return duration;
-
     //cut duration only of negative effects
     if (!positive)
     {
         int32 mechanic = GetAllSpellMechanicMask(spellProto);
-
         int32 durationMod;
         int32 durationMod_always = 0;
         int32 durationMod_not_stack = 0;
-
         for (uint8 i = 1;i<=MECHANIC_ENRAGED;++i)
         {
             if (!(mechanic & 1<<i))
@@ -11526,32 +10222,26 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
             if (new_durationMod_not_stack < durationMod_not_stack)
                 durationMod_not_stack = new_durationMod_not_stack;
         }
-
         // Select strongest negative mod
         if (durationMod_always > durationMod_not_stack)
             durationMod = durationMod_not_stack;
         else
             durationMod = durationMod_always;
-
         if (durationMod != 0)
             duration = int32( float (duration) * float(100.0f+durationMod) /100.0f);
-
         // there are only negative mods currently
         durationMod_always =target->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL, spellProto->Dispel);
         durationMod_not_stack=target->GetMaxNegativeAuraModifierByMiscValue(SPELL_AURA_MOD_AURA_DURATION_BY_DISPEL_NOT_STACK, spellProto->Dispel);
-
         durationMod=0;
         if (durationMod_always > durationMod_not_stack)
             durationMod += durationMod_not_stack;
         else
             durationMod += durationMod_always;
-
         if (durationMod != 0)
             duration = int32( float (duration) * float(100.0f+durationMod) /100.0f);
     }
     //else positive mods here, there are no currently
     //when there will be, change GetTotalAuraModifierByMiscValue to GetTotalPositiveAuraModifierByMiscValue
-
     // Glyphs which increase duration of selfcasted buffs
     if (target == this)
     {
@@ -11583,7 +10273,6 @@ int32 Unit::ModSpellDuration(SpellEntry const* spellProto, Unit const* target, i
     }
     return duration>0 ? duration : 0;
 }
-
 void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell * spell)
 {
     if (!spellProto || castTime<0)
@@ -11591,7 +10280,6 @@ void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spel
     //called from caster
     if(Player* modOwner = GetSpellModOwner())
         modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CASTING_TIME, castTime, spell);
-
     if( !(spellProto->Attributes & (SPELL_ATTR_UNK4|SPELL_ATTR_TRADESPELL)) && spellProto->DmgClass == SPELL_DAMAGE_CLASS_MAGIC && spellProto->SpellFamilyName)
         castTime = int32( float(castTime) * GetFloatValue(UNIT_MOD_CAST_SPEED));
     else
@@ -11600,20 +10288,16 @@ void Unit::ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spel
             castTime = int32 (float(castTime) * m_modAttackSpeedPct[RANGED_ATTACK]);
     }
 }
-
 DiminishingLevels Unit::GetDiminishing(DiminishingGroup group)
 {
     for(Diminishing::iterator i = m_Diminishing.begin(); i != m_Diminishing.end(); ++i)
     {
         if(i->DRGroup != group)
             continue;
-
         if(!i->hitCount)
             return DIMINISHING_LEVEL_1;
-
         if(!i->hitTime)
             return DIMINISHING_LEVEL_1;
-
         // If last spell was casted more than 15 seconds ago - reset the count.
         if(i->stack==0 && getMSTimeDiff(i->hitTime,getMSTime()) > 15000)
         {
@@ -11628,7 +10312,6 @@ DiminishingLevels Unit::GetDiminishing(DiminishingGroup group)
     }
     return DIMINISHING_LEVEL_1;
 }
-
 void Unit::IncrDiminishing(DiminishingGroup group)
 {
     // Checking for existing in the table
@@ -11642,28 +10325,22 @@ void Unit::IncrDiminishing(DiminishingGroup group)
     }
     m_Diminishing.push_back(DiminishingReturn(group,getMSTime(),DIMINISHING_LEVEL_2));
 }
-
 void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Unit* caster,DiminishingLevels Level, int32 limitduration)
 {
     if(duration == -1 || group == DIMINISHING_NONE || caster->IsFriendlyTo(this) )
         return;
-
     // test pet/charm masters instead pets/charmeds
     Unit const* targetOwner = GetCharmerOrOwner();
     Unit const* casterOwner = caster->GetCharmerOrOwner();
-
     // Duration of crowd control abilities on pvp target is limited by 10 sec. (2.2.0)
     if(limitduration > 0 && duration > limitduration)
     {
         Unit const* target = targetOwner ? targetOwner : this;
         Unit const* source = casterOwner ? casterOwner : caster;
-
         if(target->GetTypeId() == TYPEID_PLAYER && source->GetTypeId() == TYPEID_PLAYER)
             duration = limitduration;
     }
-
     float mod = 1.0f;
-
     // Some diminishings applies to mobs too (for example, Stun)
     if((GetDiminishingReturnsGroupType(group) == DRTYPE_PLAYER && (targetOwner ? (targetOwner->GetTypeId() == TYPEID_PLAYER) : (GetTypeId() == TYPEID_PLAYER))) || GetDiminishingReturnsGroupType(group) == DRTYPE_ALL)
     {
@@ -11677,10 +10354,8 @@ void Unit::ApplyDiminishingToDuration(DiminishingGroup group, int32 &duration,Un
             default: break;
         }
     }
-
     duration = int32(duration * mod);
 }
-
 void Unit::ApplyDiminishingAura( DiminishingGroup group, bool apply )
 {
     // Checking for existing in the table
@@ -11688,7 +10363,6 @@ void Unit::ApplyDiminishingAura( DiminishingGroup group, bool apply )
     {
         if(i->DRGroup != group)
             continue;
-
         if(apply)
             i->stack += 1;
         else if(i->stack)
@@ -11701,7 +10375,6 @@ void Unit::ApplyDiminishingAura( DiminishingGroup group, bool apply )
         break;
     }
 }
-
 uint32 Unit::GetSpellMaxRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry)
 {
     if (!rangeEntry)
@@ -11732,27 +10405,22 @@ uint32 Unit::GetSpellRadiusForTarget(Unit* target,const SpellRadiusEntry * radiu
         return radiusEntry->radiusHostile;
     return radiusEntry->radiusFriend;
 };
-
 Unit* Unit::GetUnit(WorldObject& object, uint64 guid)
 {
     return ObjectAccessor::GetUnit(object,guid);
 }
-
 Player* Unit::GetPlayer(uint64 guid)
 {
     return ObjectAccessor::FindPlayer(guid);
 }
-
 Creature* Unit::GetCreature(WorldObject& object, uint64 guid)
 {
     return object.GetMap()->GetCreature(guid);
 }
-
 bool Unit::isVisibleForInState( Player const* u, bool inVisibleList ) const
 {
     return u->canSeeOrDetect(this, false, inVisibleList, false);
 }
-
 uint32 Unit::GetCreatureType() const
 {
     if(GetTypeId() == TYPEID_PLAYER)
@@ -11766,13 +10434,11 @@ uint32 Unit::GetCreatureType() const
     else
         return ((Creature*)this)->GetCreatureInfo()->type;
 }
-
 /*#######################################
 ########                         ########
 ########       STAT SYSTEM       ########
 ########                         ########
 #######################################*/
-
 bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply)
 {
     if(unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
@@ -11780,9 +10446,7 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
         sLog.outError("ERROR in HandleStatModifier(): non existed UnitMods or wrong UnitModifierType!");
         return false;
     }
-
     float val = 1.0f;
-
     switch(modifierType)
     {
         case BASE_VALUE:
@@ -11793,18 +10457,14 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
         case TOTAL_PCT:
             if(amount <= -100.0f)                           //small hack-fix for -100% modifiers
                 amount = -200.0f;
-
             val = (100.0f + amount) / 100.0f;
             m_auraModifiersGroup[unitMod][modifierType] *= apply ? val : (1.0f/val);
             break;
-
         default:
             break;
     }
-
     if(!CanModifyStats())
         return false;
-
     switch(unitMod)
     {
         case UNIT_MOD_STAT_STRENGTH:
@@ -11812,10 +10472,8 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
         case UNIT_MOD_STAT_STAMINA:
         case UNIT_MOD_STAT_INTELLECT:
         case UNIT_MOD_STAT_SPIRIT:         UpdateStats(GetStatByAuraGroup(unitMod));  break;
-
         case UNIT_MOD_ARMOR:               UpdateArmor();           break;
         case UNIT_MOD_HEALTH:              UpdateMaxHealth();       break;
-
         case UNIT_MOD_MANA:
         case UNIT_MOD_RAGE:
         case UNIT_MOD_FOCUS:
@@ -11823,28 +10481,22 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
         case UNIT_MOD_HAPPINESS:
         case UNIT_MOD_RUNE:
         case UNIT_MOD_RUNIC_POWER:          UpdateMaxPower(GetPowerTypeByAuraGroup(unitMod));          break;
-
         case UNIT_MOD_RESISTANCE_HOLY:
         case UNIT_MOD_RESISTANCE_FIRE:
         case UNIT_MOD_RESISTANCE_NATURE:
         case UNIT_MOD_RESISTANCE_FROST:
         case UNIT_MOD_RESISTANCE_SHADOW:
         case UNIT_MOD_RESISTANCE_ARCANE:   UpdateResistances(GetSpellSchoolByAuraGroup(unitMod));      break;
-
         case UNIT_MOD_ATTACK_POWER:        UpdateAttackPowerAndDamage();         break;
         case UNIT_MOD_ATTACK_POWER_RANGED: UpdateAttackPowerAndDamage(true);     break;
-
         case UNIT_MOD_DAMAGE_MAINHAND:     UpdateDamagePhysical(BASE_ATTACK);    break;
         case UNIT_MOD_DAMAGE_OFFHAND:      UpdateDamagePhysical(OFF_ATTACK);     break;
         case UNIT_MOD_DAMAGE_RANGED:       UpdateDamagePhysical(RANGED_ATTACK);  break;
-
         default:
             break;
     }
-
     return true;
 }
-
 float Unit::GetModifierValue(UnitMods unitMod, UnitModifierType modifierType) const
 {
     if( unitMod >= UNIT_MOD_END || modifierType >= MODIFIER_TYPE_END)
@@ -11852,29 +10504,22 @@ float Unit::GetModifierValue(UnitMods unitMod, UnitModifierType modifierType) co
         sLog.outError("trial to access non existed modifier value from UnitMods!");
         return 0.0f;
     }
-
     if(modifierType == TOTAL_PCT && m_auraModifiersGroup[unitMod][modifierType] <= 0.0f)
         return 0.0f;
-
     return m_auraModifiersGroup[unitMod][modifierType];
 }
-
 float Unit::GetTotalStatValue(Stats stat) const
 {
     UnitMods unitMod = UnitMods(UNIT_MOD_STAT_START + stat);
-
     if(m_auraModifiersGroup[unitMod][TOTAL_PCT] <= 0.0f)
         return 0.0f;
-
     // value = ((base_value * base_pct) + total_value) * total_pct
     float value  = m_auraModifiersGroup[unitMod][BASE_VALUE] + GetCreateStat(stat);
     value *= m_auraModifiersGroup[unitMod][BASE_PCT];
     value += m_auraModifiersGroup[unitMod][TOTAL_VALUE];
     value *= m_auraModifiersGroup[unitMod][TOTAL_PCT];
-
     return value;
 }
-
 float Unit::GetTotalAuraModValue(UnitMods unitMod) const
 {
     if(unitMod >= UNIT_MOD_END)
@@ -11882,22 +10527,17 @@ float Unit::GetTotalAuraModValue(UnitMods unitMod) const
         sLog.outError("trial to access non existed UnitMods in GetTotalAuraModValue()!");
         return 0.0f;
     }
-
     if(m_auraModifiersGroup[unitMod][TOTAL_PCT] <= 0.0f)
         return 0.0f;
-
     float value  = m_auraModifiersGroup[unitMod][BASE_VALUE];
     value *= m_auraModifiersGroup[unitMod][BASE_PCT];
     value += m_auraModifiersGroup[unitMod][TOTAL_VALUE];
     value *= m_auraModifiersGroup[unitMod][TOTAL_PCT];
-
     return value;
 }
-
 SpellSchools Unit::GetSpellSchoolByAuraGroup(UnitMods unitMod) const
 {
     SpellSchools school = SPELL_SCHOOL_NORMAL;
-
     switch(unitMod)
     {
         case UNIT_MOD_RESISTANCE_HOLY:     school = SPELL_SCHOOL_HOLY;          break;
@@ -11906,18 +10546,14 @@ SpellSchools Unit::GetSpellSchoolByAuraGroup(UnitMods unitMod) const
         case UNIT_MOD_RESISTANCE_FROST:    school = SPELL_SCHOOL_FROST;         break;
         case UNIT_MOD_RESISTANCE_SHADOW:   school = SPELL_SCHOOL_SHADOW;        break;
         case UNIT_MOD_RESISTANCE_ARCANE:   school = SPELL_SCHOOL_ARCANE;        break;
-
         default:
             break;
     }
-
     return school;
 }
-
 Stats Unit::GetStatByAuraGroup(UnitMods unitMod) const
 {
     Stats stat = STAT_STRENGTH;
-
     switch(unitMod)
     {
         case UNIT_MOD_STAT_STRENGTH:    stat = STAT_STRENGTH;      break;
@@ -11925,14 +10561,11 @@ Stats Unit::GetStatByAuraGroup(UnitMods unitMod) const
         case UNIT_MOD_STAT_STAMINA:     stat = STAT_STAMINA;       break;
         case UNIT_MOD_STAT_INTELLECT:   stat = STAT_INTELLECT;     break;
         case UNIT_MOD_STAT_SPIRIT:      stat = STAT_SPIRIT;        break;
-
         default:
             break;
     }
-
     return stat;
 }
-
 Powers Unit::GetPowerTypeByAuraGroup(UnitMods unitMod) const
 {
     switch(unitMod)
@@ -11946,10 +10579,8 @@ Powers Unit::GetPowerTypeByAuraGroup(UnitMods unitMod) const
         case UNIT_MOD_RUNIC_POWER:return POWER_RUNIC_POWER;
         default:                  return POWER_MANA;
     }
-
     return POWER_MANA;
 }
-
 float Unit::GetTotalAttackPowerValue(WeaponAttackType attType) const
 {
     if (attType == RANGED_ATTACK)
@@ -11967,24 +10598,19 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType) const
         return ap * (1.0f + GetFloatValue(UNIT_FIELD_ATTACK_POWER_MULTIPLIER));
     }
 }
-
 float Unit::GetWeaponDamageRange(WeaponAttackType attType ,WeaponDamageRange type) const
 {
     if (attType == OFF_ATTACK && !haveOffhandWeapon())
         return 0.0f;
-
     return m_weaponDamage[attType][type];
 }
-
 void Unit::SetLevel(uint32 lvl)
 {
     SetUInt32Value(UNIT_FIELD_LEVEL, lvl);
-
     // group update
     if ((GetTypeId() == TYPEID_PLAYER) && ((Player*)this)->GetGroup())
         ((Player*)this)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_LEVEL);
 }
-
 void Unit::SetHealth(uint32 val)
 {
     if(getDeathState() == JUST_DIED)
@@ -11997,9 +10623,7 @@ void Unit::SetHealth(uint32 val)
         if(maxHealth < val)
             val = maxHealth;
     }
-
     SetUInt32Value(UNIT_FIELD_HEALTH, val);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12017,14 +10641,11 @@ void Unit::SetHealth(uint32 val)
         }
     }
 }
-
 void Unit::SetMaxHealth(uint32 val)
 {
     if(!val) val = 1;
-
     uint32 health = GetHealth();
     SetUInt32Value(UNIT_FIELD_MAXHEALTH, val);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12041,28 +10662,22 @@ void Unit::SetMaxHealth(uint32 val)
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_HP);
         }
     }
-
     if(val < health)
         SetHealth(val);
 }
-
 void Unit::SetPower(Powers power, uint32 val)
 {
     if(GetPower(power) == val)
         return;
-
     uint32 maxPower = GetMaxPower(power);
     if(maxPower < val)
         val = maxPower;
-
     SetStatInt32Value(UNIT_FIELD_POWER1 + power, val);
-
     WorldPacket data(SMSG_POWER_UPDATE);
     data.append(GetPackGUID());
     data << uint8(power);
     data << uint32(val);
     SendMessageToSet(&data, GetTypeId() == TYPEID_PLAYER ? true : false);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12078,18 +10693,15 @@ void Unit::SetPower(Powers power, uint32 val)
             if(owner && (owner->GetTypeId() == TYPEID_PLAYER) && ((Player*)owner)->GetGroup())
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_CUR_POWER);
         }
-
         // Update the pet's character sheet with happiness damage bonus
         if(pet->getPetType() == HUNTER_PET && power == POWER_HAPPINESS)
             pet->UpdateDamagePhysical(BASE_ATTACK);
     }
 }
-
 void Unit::SetMaxPower(Powers power, uint32 val)
 {
     uint32 cur_power = GetPower(power);
     SetStatInt32Value(UNIT_FIELD_MAXPOWER1 + power, val);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12106,15 +10718,12 @@ void Unit::SetMaxPower(Powers power, uint32 val)
                 ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MAX_POWER);
         }
     }
-
     if(val < cur_power)
         SetPower(power, val);
 }
-
 void Unit::ApplyPowerMod(Powers power, uint32 val, bool apply)
 {
     ApplyModUInt32Value(UNIT_FIELD_POWER1+power, val, apply);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12132,11 +10741,9 @@ void Unit::ApplyPowerMod(Powers power, uint32 val, bool apply)
         }
     }
 }
-
 void Unit::ApplyMaxPowerMod(Powers power, uint32 val, bool apply)
 {
     ApplyModUInt32Value(UNIT_FIELD_MAXPOWER1+power, val, apply);
-
     // group update
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -12154,7 +10761,6 @@ void Unit::ApplyMaxPowerMod(Powers power, uint32 val, bool apply)
         }
     }
 }
-
 uint32 Unit::GetCreatePowers( Powers power ) const
 {
     // POWER_FOCUS and POWER_HAPPINESS only have hunter pet
@@ -12169,10 +10775,8 @@ uint32 Unit::GetCreatePowers( Powers power ) const
         case POWER_RUNE:      return 0;
         case POWER_HEALTH:    return 0;
     }
-
     return 0;
 }
-
 void Unit::AddToWorld()
 {
     if(!IsInWorld())
@@ -12184,34 +10788,27 @@ void Unit::AddToWorld()
         SetToNotify();
     }
 }
-
 void Unit::RemoveFromWorld()
 {
     // cleanup
     assert(GetGUID());
-
     if(IsInWorld())
     {
         if(IsVehicle())
             GetVehicleKit()->Uninstall();
-
         RemoveCharmAuras();
         RemoveBindSightAuras();
         RemoveNotOwnSingleTargetAuras();
-
         ExitVehicle();
         UnsummonAllTotems();
         RemoveAllControlled();
-
         if(m_NotifyListPos >= 0)
             GetMap()->RemoveUnitFromNotify(this);
-
         if(GetCharmerGUID())
         {
             sLog.outCrash("Unit %u has charmer guid when removed from world", GetEntry());
             assert(false);
         }
-
         if(Unit *owner = GetOwner())
         {
             if(owner->m_Controlled.find(this) != owner->m_Controlled.end())
@@ -12220,15 +10817,12 @@ void Unit::RemoveFromWorld()
                 assert(false);
             }
         }
-
         WorldObject::RemoveFromWorld();
     }
 }
-
 void Unit::CleanupsBeforeDelete()
 {
     assert(GetGUID());
-
     //A unit may be in removelist and not in world, but it is still in grid
     //and may have some references during delete
     RemoveAllAuras();
@@ -12241,16 +10835,13 @@ void Unit::CleanupsBeforeDelete()
     RemoveAllGameObjects();
     RemoveAllDynObjects();
     GetMotionMaster()->Clear(false);                    // remove different non-standard movement generators.
-
     if(IsInWorld())
         RemoveFromWorld();
 }
-
 void Unit::UpdateCharmAI()
 {
     if(GetTypeId() == TYPEID_PLAYER)
         return;
-
     if(i_disabledAI) // disabled AI must be primary AI
     {
         if(!isCharmed())
@@ -12272,38 +10863,30 @@ void Unit::UpdateCharmAI()
         }
     }
 }
-
 CharmInfo* Unit::InitCharmInfo()
 {
     if(!m_charmInfo)
         m_charmInfo = new CharmInfo(this);
-
     return m_charmInfo;
 }
-
 void Unit::DeleteCharmInfo()
 {
     if(!m_charmInfo)
         return;
-
     delete m_charmInfo;
     m_charmInfo = NULL;
 }
-
 CharmInfo::CharmInfo(Unit* unit)
 : m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_petnumber(0), m_barInit(false)
 {
     for(uint8 i = 0; i < MAX_SPELL_CHARM; ++i)
         m_charmspells[i].SetActionAndType(0,ACT_DISABLED);
-
     if(m_unit->GetTypeId() == TYPEID_UNIT)
     {
         m_oldReactState = ((Creature*)m_unit)->GetReactState();
         ((Creature*)m_unit)->SetReactState(REACT_PASSIVE);
     }
-
 }
-
 CharmInfo::~CharmInfo()
 {
     if(m_unit->GetTypeId() == TYPEID_UNIT)
@@ -12311,22 +10894,18 @@ CharmInfo::~CharmInfo()
         ((Creature*)m_unit)->SetReactState(m_oldReactState);
     }
 }
-
 void CharmInfo::InitPetActionBar()
 {
     // the first 3 SpellOrActions are attack, follow and stay
     for(uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_START - ACTION_BAR_INDEX_START; ++i)
         SetActionBar(ACTION_BAR_INDEX_START + i,COMMAND_ATTACK - i,ACT_COMMAND);
-
     // middle 4 SpellOrActions are spells/special attacks/abilities
     for(uint32 i = 0; i < ACTION_BAR_INDEX_PET_SPELL_END-ACTION_BAR_INDEX_PET_SPELL_START; ++i)
         SetActionBar(ACTION_BAR_INDEX_PET_SPELL_START + i,0,ACT_PASSIVE);
-
     // last 3 SpellOrActions are reactions
     for(uint32 i = 0; i < ACTION_BAR_INDEX_END - ACTION_BAR_INDEX_PET_SPELL_END; ++i)
         SetActionBar(ACTION_BAR_INDEX_PET_SPELL_END + i,COMMAND_ATTACK - i,ACT_REACTION);
 }
-
 void CharmInfo::InitEmptyActionBar(bool withAttack)
 {
     if(withAttack)
@@ -12336,7 +10915,6 @@ void CharmInfo::InitEmptyActionBar(bool withAttack)
     for(uint32 x = ACTION_BAR_INDEX_START+1; x < ACTION_BAR_INDEX_END; ++x)
         SetActionBar(x,0,ACT_PASSIVE);
 }
-
 void CharmInfo::InitPossessCreateSpells()
 {
     InitEmptyActionBar();
@@ -12355,7 +10933,6 @@ void CharmInfo::InitPossessCreateSpells()
         }
     }
 }
-
 void CharmInfo::InitCharmCreateSpells()
 {
     if(m_unit->GetTypeId() == TYPEID_PLAYER)                //charmed players don't have spells
@@ -12363,22 +10940,18 @@ void CharmInfo::InitCharmCreateSpells()
         InitEmptyActionBar();
         return;
     }
-
     InitPetActionBar();
-
     for(uint32 x = 0; x < MAX_SPELL_CHARM; ++x)
     {
         uint32 spellId = ((Creature*)m_unit)->m_spells[x];
         SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
         if(spellInfo && spellInfo->Attributes & SPELL_ATTR_CASTABLE_WHILE_DEAD)
             spellId = 0;
-
         if(!spellId)
         {
             m_charmspells[x].SetActionAndType(spellId,ACT_DISABLED);
             continue;
         }
-
         if (IsPassiveSpell(spellId))
         {
             m_unit->CastSpell(m_unit, spellId, true);
@@ -12387,7 +10960,6 @@ void CharmInfo::InitCharmCreateSpells()
         else
         {
             m_charmspells[x].SetActionAndType(spellId,ACT_DISABLED);
-
             ActiveStates newstate;
             if(spellInfo)
             {
@@ -12399,7 +10971,6 @@ void CharmInfo::InitCharmCreateSpells()
                     for(uint32 i = 0; i < MAX_SPELL_EFFECTS && !autocast; ++i)
                         if(SpellTargetType[spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET)
                             autocast = true;
-
                     if(autocast)
                     {
                         newstate = ACT_ENABLED;
@@ -12409,16 +10980,13 @@ void CharmInfo::InitCharmCreateSpells()
                         newstate = ACT_DISABLED;
                 }
             }
-
             AddSpellToActionBar(spellId, newstate);
         }
     }
 }
-
 bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate)
 {
     uint32 first_id = spellmgr.GetFirstSpellInChain(spell_id);
-
     // new spell rank can be already listed
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
     {
@@ -12431,7 +10999,6 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate)
             }
         }
     }
-
     // or use empty slot in other case
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
     {
@@ -12443,11 +11010,9 @@ bool CharmInfo::AddSpellToActionBar(uint32 spell_id, ActiveStates newstate)
     }
     return false;
 }
-
 bool CharmInfo::RemoveSpellFromActionBar(uint32 spell_id)
 {
     uint32 first_id = spellmgr.GetFirstSpellInChain(spell_id);
-
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
     {
         if (uint32 action = PetActionBar[i].GetAction())
@@ -12459,20 +11024,16 @@ bool CharmInfo::RemoveSpellFromActionBar(uint32 spell_id)
             }
         }
     }
-
     return false;
 }
-
 void CharmInfo::ToggleCreatureAutocast(uint32 spellid, bool apply)
 {
     if(IsPassiveSpell(spellid))
         return;
-
     for(uint32 x = 0; x < MAX_SPELL_CHARM; ++x)
         if(spellid == m_charmspells[x].GetAction())
             m_charmspells[x].SetType(apply ? ACT_ENABLED : ACT_DISABLED);
 }
-
 void CharmInfo::SetPetNumber(uint32 petnumber, bool statwindow)
 {
     m_petnumber = petnumber;
@@ -12481,16 +11042,12 @@ void CharmInfo::SetPetNumber(uint32 petnumber, bool statwindow)
     else
         m_unit->SetUInt32Value(UNIT_FIELD_PETNUMBER, 0);
 }
-
 void CharmInfo::LoadPetActionBar(const std::string& data )
 {
     InitPetActionBar();
-
     Tokens tokens = StrSplit(data, " ");
-
     if (tokens.size() != (ACTION_BAR_INDEX_PET_SPELL_END-ACTION_BAR_INDEX_PET_SPELL_START)*2)
         return;                                             // non critical, will reset to default
-
     uint8 index;
     Tokens::iterator iter;
     for(iter = tokens.begin(), index = ACTION_BAR_INDEX_PET_SPELL_START; index < ACTION_BAR_INDEX_PET_SPELL_END; ++iter, ++index )
@@ -12499,9 +11056,7 @@ void CharmInfo::LoadPetActionBar(const std::string& data )
         uint8 type  = atol((*iter).c_str());
         ++iter;
         uint32 action = atol((*iter).c_str());
-
         PetActionBar[index].SetActionAndType(action,ActiveStates(type));
-
         // check correctness
         if(PetActionBar[index].IsActionBarForSpell())
         {
@@ -12512,13 +11067,11 @@ void CharmInfo::LoadPetActionBar(const std::string& data )
         }
     }
 }
-
 void CharmInfo::BuildActionBar( WorldPacket* data )
 {
     for(uint32 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
         *data << uint32(PetActionBar[i].packedData);
 }
-
 void CharmInfo::SetSpellAutocast( uint32 spell_id, bool state )
 {
     for(uint8 i = 0; i < MAX_UNIT_ACTION_BAR_INDEX; ++i)
@@ -12530,12 +11083,10 @@ void CharmInfo::SetSpellAutocast( uint32 spell_id, bool state )
         }
     }
 }
-
 bool Unit::isFrozen() const
 {
     return HasAuraState(AURA_STATE_FROZEN);
 }
-
 struct ProcTriggeredData
 {
     ProcTriggeredData(Aura* _aura)
@@ -12548,9 +11099,7 @@ struct ProcTriggeredData
     Aura * aura;
     uint32 effMask;
 };
-
 typedef std::list< ProcTriggeredData > ProcTriggeredList;
-
 // List of auras that CAN be trigger but may not exist in spell_proc_event
 // in most case need for drop charges
 // in some types of aura need do additional check
@@ -12597,13 +11146,10 @@ bool InitTriggerAuraData()
     isTriggerAura[SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE] = true;
     isTriggerAura[SPELL_AURA_MOD_DAMAGE_FROM_CASTER] = true;
     isTriggerAura[SPELL_AURA_MOD_SPELL_CRIT_CHANCE] = true;
-
     isNonTriggerAura[SPELL_AURA_MOD_POWER_REGEN]=true;
     isNonTriggerAura[SPELL_AURA_REDUCE_PUSHBACK]=true;
-
     return true;
 }
-
 uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missCondition)
 {
     uint32 procEx = PROC_EX_NONE;
@@ -12641,7 +11187,6 @@ uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missC
     }
     return procEx;
 }
-
 void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage , SpellEntry const * procAura)
 {
     // Player is loaded now - do not allow passive spell casts to proc
@@ -12712,7 +11257,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
             }
         }
     }
-
     ProcTriggeredList procTriggered;
     // Fill procTriggered list
     for(AuraMap::const_iterator itr = GetAuras().begin(); itr!= GetAuras().end(); ++itr)
@@ -12721,12 +11265,10 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
         if (procAura && procAura->Id == itr->first)
             continue;
         ProcTriggeredData triggerData(itr->second);
-
         // Defensive procs are active on absorbs (so absorption effects are not a hindrance)
         bool active = (damage > 0) || ((procExtra & PROC_EX_ABSORB) && isVictim);
         if(!IsTriggeredAtSpellProcEvent(pTarget, triggerData.aura, procSpell, procFlag, procExtra, attType, isVictim, active, triggerData.spellProcEvent))
             continue;
-
         for (uint8 i=0; i<MAX_SPELL_EFFECTS;++i)
         {
             if (AuraEffect * aurEff = itr->second->GetPartAura(i))
@@ -12743,34 +11285,27 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
         if (triggerData.effMask)
             procTriggered.push_front(triggerData);
     }
-
     // Nothing found
     if (procTriggered.empty())
         return;
-
     if (procExtra & (PROC_EX_INTERNAL_TRIGGERED | PROC_EX_INTERNAL_CANT_PROC))
         SetCantProc(true);
-
     // Handle effects proceed this time
     for(ProcTriggeredList::const_iterator i = procTriggered.begin(); i != procTriggered.end(); ++i)
     {
         // look for aura in auras list, it may be removed while proc event processing
         if (!HasAura(i->aura))
             continue;
-
         bool useCharges= i->aura->GetAuraCharges()>0;
         bool takeCharges = false;
         SpellEntry const *spellInfo = i->aura->GetSpellProto();
         uint32 Id = i->aura->GetId();
-
         // For players set spell cooldown if need
         uint32 cooldown = 0;
         if (GetTypeId() == TYPEID_PLAYER && i->spellProcEvent && i->spellProcEvent->cooldown)
             cooldown = i->spellProcEvent->cooldown;
-
         if (spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DISABLE_PROC)
             SetCantProc(true);
-
         // This bool is needed till separate aura effect procs are still here
         bool handled = false;
         if (HandleAuraProc(pTarget, damage, i->aura, procSpell, procFlag, procExtra, cooldown, &handled))
@@ -12778,16 +11313,13 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
             sLog.outDebug("ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), Id);
             takeCharges = true;
         }
-
         if (!handled)
         for (uint8 effIndex = 0; effIndex<MAX_SPELL_EFFECTS;++effIndex)
         {
             if (!(i->effMask & (1<<effIndex)))
                 continue;
-
             AuraEffect *triggeredByAura = i->aura->GetPartAura(effIndex);
             assert(triggeredByAura);
-
             switch(triggeredByAura->GetAuraName())
             {
                 case SPELL_AURA_PROC_TRIGGER_SPELL:
@@ -12846,7 +11378,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
                 {
                     sLog.outDebug("ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
                         (isVictim?"a victim's":"an attacker's"),triggeredByAura->GetId());
-
                     HandleAuraRaidProcFromChargeWithValue(triggeredByAura);
                     takeCharges=true;
                     break;
@@ -12855,7 +11386,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
                 {
                     sLog.outDebug("ProcDamageAndSpell: casting mending (triggered by %s dummy aura of spell %u)",
                         (isVictim?"a victim's":"an attacker's"),triggeredByAura->GetId());
-
                     HandleAuraRaidProcFromCharge(triggeredByAura);
                     takeCharges=true;
                     break;
@@ -12863,7 +11393,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
                 case SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE:
                 {
                     sLog.outDebug("ProcDamageAndSpell: casting spell %u (triggered with value by %s aura of spell %u)", spellInfo->Id,(isVictim?"a victim's":"an attacker's"), triggeredByAura->GetId());
-
                     if (HandleProcTriggerSpell(pTarget, damage, triggeredByAura, procSpell, procFlag, procExtra, cooldown))
                         takeCharges=true;
                     break;
@@ -12945,17 +11474,14 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
         if (spellInfo->AttributesEx3 & SPELL_ATTR_EX3_DISABLE_PROC)
             SetCantProc(false);
     }
-
     // Cleanup proc requirements
     if (procExtra & (PROC_EX_INTERNAL_TRIGGERED | PROC_EX_INTERNAL_CANT_PROC))
         SetCantProc(false);
 }
-
 SpellSchoolMask Unit::GetMeleeDamageSchoolMask() const
 {
     return SPELL_SCHOOL_MASK_NORMAL;
 }
-
 Player* Unit::GetSpellModOwner() const
 {
     if(GetTypeId()==TYPEID_PLAYER)
@@ -12968,17 +11494,14 @@ Player* Unit::GetSpellModOwner() const
     }
     return NULL;
 }
-
 ///----------Pet responses methods-----------------
 void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
 {
     if(msg == SPELL_CAST_OK)
         return;
-
     Unit *owner = GetCharmerOrOwner();
     if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data(SMSG_PET_CAST_FAILED, 1 + 4 + 1);
     data << uint8(0);                                       // cast count?
     data << uint32(spellid);
@@ -12987,70 +11510,57 @@ void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
     // uint32 for some reason
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
-
 void Unit::SendPetActionFeedback (uint8 msg)
 {
     Unit* owner = GetOwner();
     if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data(SMSG_PET_ACTION_FEEDBACK, 1);
     data << uint8(msg);
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
-
 void Unit::SendPetTalk (uint32 pettalk)
 {
     Unit* owner = GetOwner();
     if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data(SMSG_PET_ACTION_SOUND, 8 + 4);
     data << uint64(GetGUID());
     data << uint32(pettalk);
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
-
 void Unit::SendPetAIReaction(uint64 guid)
 {
     Unit* owner = GetOwner();
     if(!owner || owner->GetTypeId() != TYPEID_PLAYER)
         return;
-
     WorldPacket data(SMSG_AI_REACTION, 8 + 4);
     data << uint64(guid);
     data << uint32(AI_REACTION_AGGRO);
     ((Player*)owner)->GetSession()->SendPacket(&data);
 }
-
 ///----------End of Pet responses methods----------
-
 void Unit::StopMoving()
 {
     clearUnitState(UNIT_STAT_MOVING);
-
     // send explicit stop packet
     // rely on vmaps here because for example stormwind is in air
     //float z = MapManager::Instance().GetBaseMap(GetMapId())->GetHeight(GetPositionX(), GetPositionY(), GetPositionZ(), true);
     //if (fabs(GetPositionZ() - z) < 2.0f)
     //    Relocate(GetPositionX(), GetPositionY(), z);
     //Relocate(GetPositionX(), GetPositionY(),GetPositionZ());
-
     SendMonsterStop();
-
     // update position and orientation;
     WorldPacket data;
     BuildHeartBeatMsg(&data);
     SendMessageToSet(&data,false);
 }
-
 void Unit::SendMovementFlagUpdate()
 {
     WorldPacket data;
     BuildHeartBeatMsg(&data);
     SendMessageToSet(&data, false);
 }
-
 bool Unit::IsSitState() const
 {
     uint8 s = getStandState();
@@ -13059,20 +11569,16 @@ bool Unit::IsSitState() const
         s == UNIT_STAND_STATE_SIT_MEDIUM_CHAIR || s == UNIT_STAND_STATE_SIT_HIGH_CHAIR ||
         s == UNIT_STAND_STATE_SIT;
 }
-
 bool Unit::IsStandState() const
 {
     uint8 s = getStandState();
     return !IsSitState() && s != UNIT_STAND_STATE_SLEEP && s != UNIT_STAND_STATE_KNEEL;
 }
-
 void Unit::SetStandState(uint8 state)
 {
     SetByteValue(UNIT_FIELD_BYTES_1, 0, state);
-
     if (IsStandState())
        RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_NOT_SEATED);
-
     if(GetTypeId()==TYPEID_PLAYER)
     {
         WorldPacket data(SMSG_STANDSTATE_UPDATE, 1);
@@ -13080,16 +11586,13 @@ void Unit::SetStandState(uint8 state)
         ((Player*)this)->GetSession()->SendPacket(&data);
     }
 }
-
 bool Unit::IsPolymorphed() const
 {
     return GetSpellSpecific(getTransForm())==SPELL_MAGE_POLYMORPH;
 }
-
 void Unit::SetDisplayId(uint32 modelId)
 {
     SetUInt32Value(UNIT_FIELD_DISPLAYID, modelId);
-
     if(GetTypeId() == TYPEID_UNIT && ((Creature*)this)->isPet())
     {
         Pet *pet = ((Pet*)this);
@@ -13100,13 +11603,11 @@ void Unit::SetDisplayId(uint32 modelId)
             ((Player*)owner)->SetGroupUpdateFlag(GROUP_UPDATE_FLAG_PET_MODEL_ID);
     }
 }
-
 void Unit::ClearComboPointHolders()
 {
     while(!m_ComboPointHolders.empty())
     {
         uint32 lowguid = *m_ComboPointHolders.begin();
-
         Player* plr = objmgr.GetPlayer(MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER));
         if(plr && plr->GetComboTarget()==GetGUID())         // recheck for safe
             plr->ClearComboPoints();                        // remove also guid from m_ComboPointHolders;
@@ -13114,12 +11615,10 @@ void Unit::ClearComboPointHolders()
             m_ComboPointHolders.erase(lowguid);             // or remove manually
     }
 }
-
 void Unit::ClearAllReactives()
 {
     for(uint8 i=0; i < MAX_REACTIVE; ++i)
         m_reactiveTimer[i] = 0;
-
     if (HasAuraState( AURA_STATE_DEFENSE))
         ModifyAuraState(AURA_STATE_DEFENSE, false);
     if (getClass() == CLASS_HUNTER && HasAuraState( AURA_STATE_HUNTER_PARRY))
@@ -13127,20 +11626,16 @@ void Unit::ClearAllReactives()
     if(getClass() == CLASS_WARRIOR && GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->ClearComboPoints();
 }
-
 void Unit::UpdateReactives( uint32 p_time )
 {
     for(uint8 i = 0; i < MAX_REACTIVE; ++i)
     {
         ReactiveType reactive = ReactiveType(i);
-
         if(!m_reactiveTimer[reactive])
             continue;
-
         if ( m_reactiveTimer[reactive] <= p_time)
         {
             m_reactiveTimer[reactive] = 0;
-
             switch ( reactive )
             {
                 case REACTIVE_DEFENSE:
@@ -13165,18 +11660,15 @@ void Unit::UpdateReactives( uint32 p_time )
         }
     }
 }
-
 Unit* Unit::SelectNearbyTarget(float dist) const
 {
     std::list<Unit *> targets;
     Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(this, this, dist);
     Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(this, targets, u_check);
     VisitNearbyObject(dist, searcher);
-
     // remove current target
     if(getVictim())
         targets.remove(getVictim());
-
     // remove not LoS targets
     for(std::list<Unit *>::iterator tIter = targets.begin(); tIter != targets.end();)
     {
@@ -13189,20 +11681,16 @@ Unit* Unit::SelectNearbyTarget(float dist) const
         else
             ++tIter;
     }
-
     // no appropriate targets
     if(targets.empty())
         return NULL;
-
     // select random
     uint32 rIdx = urand(0,targets.size()-1);
     std::list<Unit *>::const_iterator tcIter = targets.begin();
     for(uint32 i = 0; i < rIdx; ++i)
         ++tcIter;
-
     return *tcIter;
 }
-
 bool Unit::hasNegativeAuraWithInterruptFlag(uint32 flag)
 {
     for (AuraMap::iterator iter = m_Auras.begin(); iter != m_Auras.end(); ++iter)
@@ -13212,7 +11700,6 @@ bool Unit::hasNegativeAuraWithInterruptFlag(uint32 flag)
     }
     return false;
 }
-
 void Unit::ApplyAttackTimePercentMod( WeaponAttackType att,float val, bool apply )
 {
     float remainingTimePct = (float)m_attackTimer[att] / (GetAttackTime(att) * m_modAttackSpeedPct[att]);
@@ -13228,7 +11715,6 @@ void Unit::ApplyAttackTimePercentMod( WeaponAttackType att,float val, bool apply
     }
     m_attackTimer[att] = uint32(GetAttackTime(att) * m_modAttackSpeedPct[att] * remainingTimePct);
 }
-
 void Unit::ApplyCastTimePercentMod(float val, bool apply )
 {
     if(val > 0)
@@ -13236,24 +11722,19 @@ void Unit::ApplyCastTimePercentMod(float val, bool apply )
     else
         ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED,-val,apply);
 }
-
 uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectType damagetype, uint32 CastingTime )
 {
     // Not apply this to creature casted spells with casttime==0
     if(CastingTime==0 && GetTypeId()==TYPEID_UNIT && !((Creature*)this)->isPet())
         return 3500;
-
     if (CastingTime > 7000) CastingTime = 7000;
     if (CastingTime < 1500) CastingTime = 1500;
-
     if(damagetype == DOT && !IsChanneledSpell(spellProto))
         CastingTime = 3500;
-
     int32 overTime    = 0;
     uint8 effects     = 0;
     bool DirectDamage = false;
     bool AreaEffect   = false;
-
     for ( uint32 i=0; i<MAX_SPELL_EFFECTS;i++)
     {
         switch ( spellProto->Effect[i] )
@@ -13283,11 +11764,9 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT
             default:
                 break;
         }
-
         if(IsAreaEffectTarget[spellProto->EffectImplicitTargetA[i]] || IsAreaEffectTarget[spellProto->EffectImplicitTargetB[i]])
             AreaEffect = true;
     }
-
     // Combined Spells with Both Over Time and Direct Damage
     if ( overTime > 0 && CastingTime > 0 && DirectDamage )
     {
@@ -13297,7 +11776,6 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT
         if (OriginalCastTime < 1500) OriginalCastTime = 1500;
         // Portion to Over Time
         float PtOT = (overTime / 15000.0f) / ((overTime / 15000.0f) + (OriginalCastTime / 3500.0f));
-
         if ( damagetype == DOT )
             CastingTime = uint32(CastingTime * PtOT);
         else if ( PtOT < 1.0f )
@@ -13305,11 +11783,9 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT
         else
             CastingTime = 0;
     }
-
     // Area Effect Spells receive only half of bonus
     if ( AreaEffect )
         CastingTime /= 2;
-
     // -5% of total per any additional effect
     for ( uint8 i=0; i<effects; ++i)
     {
@@ -13323,10 +11799,8 @@ uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectT
             break;
         }
     }
-
     return CastingTime;
 }
-
 void Unit::UpdateAuraForGroup(uint8 slot)
 {
     if(slot >= MAX_AURAS)                        // slot not found, return
@@ -13354,16 +11828,13 @@ void Unit::UpdateAuraForGroup(uint8 slot)
         }
     }
 }
-
 float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized)
 {
     if (!normalized || GetTypeId() != TYPEID_PLAYER)
         return float(GetAttackTime(attType))/1000.0f;
-
     Item *Weapon = ((Player*)this)->GetWeaponForAttack(attType);
     if (!Weapon)
         return 2.4;                                         // fist attack
-
     switch (Weapon->GetProto()->InventoryType)
     {
         case INVTYPE_2HWEAPON:
@@ -13379,7 +11850,6 @@ float Unit::GetAPMultiplier(WeaponAttackType attType, bool normalized)
             return Weapon->GetProto()->SubClass==ITEM_SUBCLASS_WEAPON_DAGGER ? 1.7 : 2.4;
     }
 }
-
 AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 iconId, uint8 effIndex) const
 {
     Unit::AuraEffectList const& mDummy = GetAurasByType(type);
@@ -13394,19 +11864,15 @@ AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 ico
     }
     return NULL;
 }
-
 bool Unit::IsUnderLastManaUseEffect() const
 {
     return  getMSTimeDiff(m_lastManaUse,getMSTime()) < 5000;
 }
-
 void Unit::SetContestedPvP(Player *attackedPlayer)
 {
     Player* player = GetCharmerOrOwnerPlayerOrPlayerItself();
-
     if(!player || attackedPlayer && (attackedPlayer == player || player->duel && player->duel->opponent == attackedPlayer))
         return;
-
     player->SetContestedPvPTimer(30000);
     if(!player->hasUnitState(UNIT_STAT_ATTACK_PLAYER))
     {
@@ -13422,72 +11888,56 @@ void Unit::SetContestedPvP(Player *attackedPlayer)
         SetVisibility(GetVisibility());
     }
 }
-
 void Unit::AddPetAura(PetAura const* petSpell)
 {
     if(GetTypeId() != TYPEID_PLAYER)
         return;
-
     m_petAuras.insert(petSpell);
     if(Pet* pet = ((Player*)this)->GetPet())
         pet->CastPetAura(petSpell);
 }
-
 void Unit::RemovePetAura(PetAura const* petSpell)
 {
     if(GetTypeId() != TYPEID_PLAYER)
         return;
-
     m_petAuras.erase(petSpell);
     if(Pet* pet = ((Player*)this)->GetPet())
         pet->RemoveAurasDueToSpell(petSpell->GetAura(pet->GetEntry()));
 }
-
 Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id)
 {
     if(GetTypeId()!=TYPEID_PLAYER)
         return NULL;
-
     Pet* pet = new Pet((Player*)this, HUNTER_PET);
-
     if(!pet->CreateBaseAtCreature(creatureTarget))
     {
         delete pet;
         return NULL;
     }
-
     pet->SetCreatorGUID(GetGUID());
     pet->setFaction(getFaction());
     pet->SetUInt32Value(UNIT_CREATED_BY_SPELL, spell_id);
-
     if(GetTypeId()==TYPEID_PLAYER)
         pet->SetUInt32Value(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP_ATTACKABLE);
-
     uint32 level = (creatureTarget->getLevel() < (getLevel() - 5)) ? (getLevel() - 5) : creatureTarget->getLevel();
-
     if(!pet->InitStatsForLevel(level))
     {
         sLog.outError("Pet::InitStatsForLevel() failed for creature (Entry: %u)!",creatureTarget->GetEntry());
         delete pet;
         return NULL;
     }
-
     pet->GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
     // this enables pet details window (Shift+P)
     pet->InitPetCreateSpells();
     //pet->InitLevelupSpellsForLevel();
     pet->SetHealth(pet->GetMaxHealth());
-
     return pet;
 }
-
 bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry const* procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const *& spellProcEvent )
 {
     SpellEntry const* spellProto = aura->GetSpellProto ();
-
     // Get proc Event Entry
     spellProcEvent = spellmgr.GetSpellProcEvent(spellProto->Id);
-
     // Get EventProcFlag
     uint32 EventProcFlag;
     if (spellProcEvent && spellProcEvent->procFlags) // if exist get custom spellProcEvent->procFlags
@@ -13497,14 +11947,12 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
     // Continue if no trigger exist
     if (!EventProcFlag)
         return false;
-
     // Additional checks for triggered spells (ignore trap casts)
     if (procExtra & PROC_EX_INTERNAL_TRIGGERED && !(procFlag & PROC_FLAG_ON_TRAP_ACTIVATION))
     {
         if (!(spellProto->AttributesEx3 & SPELL_ATTR_EX3_CAN_PROC_TRIGGERED))
             return false;
     }
-
     // Check spellProcEvent data requirements
     if(!spellmgr.IsSpellProcEventCanTriggeredBy(spellProcEvent, EventProcFlag, procSpell, procFlag, procExtra, active))
         return false;
@@ -13520,10 +11968,9 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
     }
     // Aura added by spell can`t trigger from self (prevent drop charges/do triggers)
     // But except periodic and kill triggers (can triggered from self)
-    if(procSpell && procSpell->Id == spellProto->Id 
+    if(procSpell && procSpell->Id == spellProto->Id
         && !(spellProto->procFlags&(PROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_KILL)))
         return false;
-
     // Check if current equipment allows aura to proc
     if(!isVictim && GetTypeId() == TYPEID_PLAYER)
     {
@@ -13536,10 +11983,8 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
                 item = ((Player*)this)->GetUseableItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
             else
                 item = ((Player*)this)->GetUseableItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_RANGED);
-
             if (((Player*)this)->IsInFeralForm())
                 return false;
-
             if(!item || item->IsBroken() || item->GetProto()->Class != ITEM_CLASS_WEAPON || !((1<<item->GetProto()->SubClass) & spellProto->EquippedItemSubClassMask))
                 return false;
         }
@@ -13577,7 +12022,6 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
     }
     return roll_chance_f(chance);
 }
-
 bool Unit::HandleAuraRaidProcFromChargeWithValue( AuraEffect* triggeredByAura )
 {
     // aura can be deleted at casts
@@ -13585,7 +12029,6 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue( AuraEffect* triggeredByAura )
     uint32 effIdx = triggeredByAura->GetEffIndex();
     int32 heal = triggeredByAura->GetAmount();
     uint64 caster_guid = triggeredByAura->GetCasterGUID();
-
     //Currently only Prayer Of Mending
     if (!(spellProto->SpellFamilyName==SPELLFAMILY_PRIEST && spellProto->SpellFamilyFlags[1] & 0x20))
     {
@@ -13594,10 +12037,8 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue( AuraEffect* triggeredByAura )
     }
     // jumps
     int32 jumps = triggeredByAura->GetParentAura()->GetAuraCharges()-1;
-
     // current aura expire
     triggeredByAura->GetParentAura()->SetAuraCharges(1);             // will removed at next charges decrease
-
     // next target selection
     if(jumps > 0 && IS_PLAYER_GUID(caster_guid))
     {
@@ -13606,11 +12047,9 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue( AuraEffect* triggeredByAura )
             radius = GetSpellRadiusForTarget(triggeredByAura->GetCaster(), sSpellRadiusStore.LookupEntry(spellProto->EffectRadiusIndex[effIdx]));
         else
             radius = GetSpellMaxRangeForTarget(triggeredByAura->GetCaster() ,sSpellRangeStore.LookupEntry(spellProto->rangeIndex));
-
         if(Player* caster = ((Player*)triggeredByAura->GetCaster()))
         {
             caster->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius,NULL);
-
             if (Unit* target= GetNextRandomRaidMemberOrPet(radius))
             {
                 CastCustomSpell(target,spellProto->Id,&heal,NULL,NULL,true,NULL,triggeredByAura,caster->GetGUID());
@@ -13620,7 +12059,6 @@ bool Unit::HandleAuraRaidProcFromChargeWithValue( AuraEffect* triggeredByAura )
             }
         }
     }
-
     // heal
     CastCustomSpell(this,33110,&heal,NULL,NULL,true,NULL,NULL,caster_guid);
     return true;
@@ -13629,7 +12067,6 @@ bool Unit::HandleAuraRaidProcFromCharge( AuraEffect* triggeredByAura )
 {
     // aura can be deleted at casts
     SpellEntry const* spellProto = triggeredByAura->GetSpellProto();
-
     uint32 damageSpellId;
     switch(spellProto->Id)
     {
@@ -13647,16 +12084,12 @@ bool Unit::HandleAuraRaidProcFromCharge( AuraEffect* triggeredByAura )
         sLog.outError("Unit::HandleAuraRaidProcFromCharge, received not handled spell: %u", spellProto->Id);
         return false;
     }
-
     uint64 caster_guid = triggeredByAura->GetCasterGUID();
     uint32 effIdx = triggeredByAura->GetEffIndex();
-
     // jumps
     int32 jumps = triggeredByAura->GetParentAura()->GetAuraCharges()-1;
-
     // current aura expire
     triggeredByAura->GetParentAura()->SetAuraCharges(1);             // will removed at next charges decrease
-
     // next target selection
     if(jumps > 0 && IS_PLAYER_GUID(caster_guid))
     {
@@ -13665,11 +12098,9 @@ bool Unit::HandleAuraRaidProcFromCharge( AuraEffect* triggeredByAura )
             radius = GetSpellRadiusForTarget(triggeredByAura->GetCaster(), sSpellRadiusStore.LookupEntry(spellProto->EffectRadiusIndex[effIdx]));
         else
             radius = GetSpellMaxRangeForTarget(triggeredByAura->GetCaster() ,sSpellRangeStore.LookupEntry(spellProto->rangeIndex));
-
         if(Player* caster = ((Player*)triggeredByAura->GetCaster()))
         {
             caster->ApplySpellMod(spellProto->Id, SPELLMOD_RADIUS, radius,NULL);
-
             if (Unit* target= GetNextRandomRaidMemberOrPet(radius))
             {
                 CastSpell(target, spellProto, true,NULL,triggeredByAura,caster_guid);
@@ -13678,42 +12109,32 @@ bool Unit::HandleAuraRaidProcFromCharge( AuraEffect* triggeredByAura )
             }
         }
     }
-
     CastSpell(this, damageSpellId, true,NULL,triggeredByAura,caster_guid);
-
     return true;
 }
 /*-----------------------TRINITY-----------------------------*/
-
 void Unit::SetToNotify()
 {
     // it is called somewhere when obj is not in world (crash when log in instance)
     if(m_NotifyListPos < 0)
         GetMap()->AddUnitToNotify(this);
 }
-
 void Unit::Kill(Unit *pVictim, bool durabilityLoss)
 {
     // Prevent killing unit twice (and giving reward from kill twice)
     if (!pVictim->GetHealth())
         return;
-
     // Inform pets (if any) when player kills target)
     if (this->GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetPet())
     {
         Pet *pPet = ((Player *)this)->GetPet();
-
         if (pPet && pPet->isAlive() && pPet->isControlled())
             pPet->AI()->KilledUnit(pVictim);
     }
-
     //sLog.outError("%u kill %u", GetEntry(), pVictim->GetEntry());
-
     pVictim->SetHealth(0);
-
     // find player: owner of controlled `this` or `this` itself maybe
     Player *player = GetCharmerOrOwnerPlayerOrPlayerItself();
-
     bool bRewardIsAllowed = true;
     if(pVictim->GetTypeId() == TYPEID_UNIT)
     {
@@ -13721,7 +12142,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
         if(!bRewardIsAllowed)
             ((Creature*)pVictim)->SetLootRecipient(NULL);
     }
-    
     if(bRewardIsAllowed && pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->GetLootRecipient())
         player = ((Creature*)pVictim)->GetLootRecipient();
     // Reward player, his pets, and group/raid members
@@ -13733,10 +12153,8 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
         else
             player->ProcDamageAndSpell(pVictim, PROC_FLAG_NONE, PROC_FLAG_KILLED,PROC_EX_NONE, 0);
     }
-
     // Proc auras on death - must be before aura/combat remove
     pVictim->ProcDamageAndSpell(NULL, PROC_FLAG_DEATH, PROC_FLAG_NONE, PROC_EX_NONE, 0, BASE_ATTACK, 0);
-
     // if talent known but not triggered (check priest class for speedup check)
     bool SpiritOfRedemption = false;
     if(pVictim->GetTypeId()==TYPEID_PLAYER && pVictim->getClass()==CLASS_PRIEST)
@@ -13754,7 +12172,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
                 pVictim->RemoveAllAurasOnDeath();
                 // restore for use at real death
                 pVictim->SetUInt32Value(PLAYER_SELF_RES_SPELL,ressSpellId);
-
                 // FORM_SPIRITOFREDEMPTION and related auras
                 pVictim->CastSpell(pVictim,27827,true,NULL,*itr);
                 SpiritOfRedemption = true;
@@ -13762,13 +12179,11 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
             }
         }
     }
-
     if(!SpiritOfRedemption)
     {
         DEBUG_LOG("SET JUST_DIED");
         pVictim->setDeathState(JUST_DIED);
     }
-
     // 10% durability loss on death
     // clean InHateListOf
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
@@ -13776,7 +12191,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
         // remember victim PvP death for corpse type and corpse reclaim delay
         // at original death (not at SpiritOfRedemtionTalent timeout)
         ((Player*)pVictim)->SetPvPDeath(player!=NULL);
-
         // only if not player and not controlled by player pet. And not at BG
         if ( (durabilityLoss && !player && !((Player*)pVictim)->InBattleGround()) || ( player && sWorld.getConfig(CONFIG_DURABILITY_LOSS_IN_PVP) ) )
         {
@@ -13789,7 +12203,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
         // Call KilledUnit for creatures
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsAIEnabled)
             ((Creature*)this)->AI()->KilledUnit(pVictim);
-
         // last damage from non duel opponent or opponent controlled creature
         if(((Player*)pVictim)->duel)
         {
@@ -13802,7 +12215,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
     {
         DEBUG_LOG("DealDamageNotPlayer");
         Creature *cVictim = (Creature*)pVictim;
-
         if(!cVictim->isPet())
         {
             cVictim->DeleteThreatList();
@@ -13810,22 +12222,18 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
             if (cInfo && (cInfo->lootid || cInfo->maxgold > 0))
                 cVictim->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
         }
-
         // Call KilledUnit for creatures, this needs to be called after the lootable flag is set
         if (GetTypeId() == TYPEID_UNIT && ((Creature*)this)->IsAIEnabled)
             ((Creature*)this)->AI()->KilledUnit(pVictim);
-
         // Call creature just died function
         if (cVictim->IsAIEnabled)
             cVictim->AI()->JustDied(this);
-
         // Dungeon specific stuff, only applies to players killing creatures
         if(cVictim->GetInstanceId())
         {
             Map *m = cVictim->GetMap();
             Player *creditedPlayer = GetCharmerOrOwnerPlayerOrPlayerItself();
             // TODO: do instance binding anyway if the charmer/owner is offline
-
             if(m->IsDungeon() && creditedPlayer)
             {
                 if(m->IsRaid() || m->IsHeroic())
@@ -13844,17 +12252,14 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
             }
         }
     }
-
     // outdoor pvp things, do these after setting the death state, else the player activity notify won't work... doh...
     // handle player kill only if not suicide (spirit of redemption for example)
     if(player && this != pVictim)
         if(OutdoorPvP * pvp = player->GetOutdoorPvP())
             pvp->HandleKill(player, pVictim);
-
     //if(pVictim->GetTypeId() == TYPEID_PLAYER)
     //    if(OutdoorPvP * pvp = ((Player*)pVictim)->GetOutdoorPvP())
     //        pvp->HandlePlayerActivityChanged((Player*)pVictim);
-
     // battleground things (do this at the end, so the death state flag will be properly set to handle in the bg->handlekill)
     if(player && player->InBattleGround())
     {
@@ -13866,7 +12271,6 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
                 bg->HandleKillUnit((Creature*)pVictim, player);
         }
     }
-
     // achievement stuff
     if (pVictim->GetTypeId() == TYPEID_PLAYER)
     {
@@ -13876,16 +12280,13 @@ void Unit::Kill(Unit *pVictim, bool durabilityLoss)
             ((Player*)pVictim)->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILLED_BY_PLAYER, 1, ((Player*)this)->GetTeam());
     }
 }
-
 void Unit::SetControlled(bool apply, UnitState state)
 {
     if(apply)
     {
         if(hasUnitState(state))
             return;
-
         addUnitState(state);
-
         switch(state)
         {
         case UNIT_STAT_STUNNED:
@@ -13921,16 +12322,13 @@ void Unit::SetControlled(bool apply, UnitState state)
                                     else    SetFeared(false);     break;
             default: return;
         }
-
         clearUnitState(state);
-
         if(hasUnitState(UNIT_STAT_STUNNED))
             SetStunned(true);
         else
         {
             if(hasUnitState(UNIT_STAT_ROOT))
                 SetRooted(true);
-
             if(hasUnitState(UNIT_STAT_CONFUSED))
                 SetConfused(true);
             else if(hasUnitState(UNIT_STAT_FLEEING))
@@ -13938,7 +12336,6 @@ void Unit::SetControlled(bool apply, UnitState state)
         }
     }
 }
-
 void Unit::SetStunned(bool apply)
 {
     if(apply)
@@ -13947,13 +12344,11 @@ void Unit::SetStunned(bool apply)
         SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
         CastStop();
         AddUnitMovementFlag(MOVEMENTFLAG_ROOT);
-
         // Creature specific
         if(GetTypeId() != TYPEID_PLAYER)
             ((Creature*)this)->StopMoving();
         else
             SetStandState(UNIT_STAND_STATE_STAND);
-
         WorldPacket data(SMSG_FORCE_MOVE_ROOT, 8);
         data.append(GetPackGUID());
         data << uint32(0);
@@ -13963,35 +12358,29 @@ void Unit::SetStunned(bool apply)
     {
         if(isAlive() && getVictim())
             SetUInt64Value(UNIT_FIELD_TARGET, getVictim()->GetGUID());
-
         // don't remove UNIT_FLAG_STUNNED for pet when owner is mounted (disabled pet's interface)
         Unit *pOwner = GetOwner();
         if(!pOwner || (pOwner->GetTypeId() == TYPEID_PLAYER && !((Player *)pOwner)->IsMounted()))
             RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
-
         if(!hasUnitState(UNIT_STAT_ROOT))         // prevent allow move if have also root effect
         {
             WorldPacket data(SMSG_FORCE_MOVE_UNROOT, 8+4);
             data.append(GetPackGUID());
             data << uint32(0);
             SendMessageToSet(&data,true);
-
             RemoveUnitMovementFlag(MOVEMENTFLAG_ROOT);
         }
     }
 }
-
 void Unit::SetRooted(bool apply)
 {
     if(apply)
     {
         AddUnitMovementFlag(MOVEMENTFLAG_ROOT);
-
         WorldPacket data(SMSG_FORCE_MOVE_ROOT, 10);
         data.append(GetPackGUID());
         data << (uint32)2;
         SendMessageToSet(&data,true);
-
         if(GetTypeId() != TYPEID_PLAYER)
             ((Creature *)this)->StopMoving();
     }
@@ -14003,18 +12392,15 @@ void Unit::SetRooted(bool apply)
             data.append(GetPackGUID());
             data << (uint32)2;
             SendMessageToSet(&data,true);
-
             RemoveUnitMovementFlag(MOVEMENTFLAG_ROOT);
         }
     }
 }
-
 void Unit::SetFeared(bool apply)
 {
     if(apply)
     {
         SetUInt64Value(UNIT_FIELD_TARGET, 0);
-
         Unit *caster = NULL;
         Unit::AuraEffectList const& fearAuras = GetAurasByType(SPELL_AURA_MOD_FEAR);
         if(!fearAuras.empty())
@@ -14033,11 +12419,9 @@ void Unit::SetFeared(bool apply)
                 SetUInt64Value(UNIT_FIELD_TARGET, getVictim()->GetGUID());
         }
     }
-
     if (GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->SetClientControl(this, !apply);
 }
-
 void Unit::SetConfused(bool apply)
 {
     if(apply)
@@ -14055,72 +12439,58 @@ void Unit::SetConfused(bool apply)
                 SetUInt64Value(UNIT_FIELD_TARGET, getVictim()->GetGUID());
         }
     }
-
     if(GetTypeId() == TYPEID_PLAYER)
         ((Player*)this)->SetClientControl(this, !apply);
 }
-
 bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
 {
     if(!charmer)
         return false;
-
     assert(type != CHARM_TYPE_POSSESS || charmer->GetTypeId() == TYPEID_PLAYER);
     assert((type == CHARM_TYPE_VEHICLE) == IsVehicle());
-
     sLog.outDebug("SetCharmedBy: charmer %u, charmed %u, type %u.", charmer->GetEntry(), GetEntry(), (uint32)type);
-
     if(this == charmer)
     {
         sLog.outCrash("Unit::SetCharmedBy: Unit %u is trying to charm itself!", GetEntry());
         return false;
     }
-
     //if(hasUnitState(UNIT_STAT_UNATTACKABLE))
     //    return false;
-
     if(GetTypeId() == TYPEID_PLAYER && ((Player*)this)->GetTransport())
     {
         sLog.outCrash("Unit::SetCharmedBy: Player on transport is trying to charm %u", GetEntry());
         return false;
     }
-
     // Already charmed
     if(GetCharmerGUID())
     {
         sLog.outCrash("Unit::SetCharmedBy: %u has already been charmed but %u is trying to charm it!", GetEntry(), charmer->GetEntry());
         return false;
     }
-
     CastStop();
     CombatStop(); //TODO: CombatStop(true) may cause crash (interrupt spells)
     DeleteThreatList();
-
     // Charmer stop charming
     if(charmer->GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)charmer)->StopCastingCharm();
         ((Player*)charmer)->StopCastingBindSight();
     }
-
     // Charmed stop charming
     if(GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)this)->StopCastingCharm();
         ((Player*)this)->StopCastingBindSight();
     }
-
     // StopCastingCharm may remove a possessed pet?
     if(!IsInWorld())
     {
         sLog.outCrash("Unit::SetCharmedBy: %u is not in world but %u is trying to charm it!", GetEntry(), charmer->GetEntry());
         return false;
     }
-
     // Set charmed
     setFaction(charmer->getFaction());
     charmer->SetCharm(this, true);
-
     if(GetTypeId() == TYPEID_UNIT)
     {
         ((Creature*)this)->AI()->OnCharmed(true);
@@ -14132,7 +12502,6 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
             ((Player*)this)->ToggleAFK();
         ((Player*)this)->SetClientControl(this, 0);
     }
-
     // Pets already have a properly initialized CharmInfo, don't overwrite it.
     if(type != CHARM_TYPE_VEHICLE && !GetCharmInfo())
     {
@@ -14142,7 +12511,6 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
         else
             charmInfo->InitCharmCreateSpells();
     }
-
     if(charmer->GetTypeId() == TYPEID_PLAYER)
     {
         switch(type)
@@ -14169,11 +12537,9 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
                     {
                         //to prevent client crash
                         SetByteValue(UNIT_FIELD_BYTES_0, 1, (uint8)CLASS_MAGE);
-
                         //just to enable stat window
                         if(GetCharmInfo())
                             GetCharmInfo()->SetPetNumber(objmgr.GeneratePetNumber(), true);
-
                         //if charmed two demons the same session, the 2nd gets the 1st one's name
                         SetUInt32Value(UNIT_FIELD_PET_NAME_TIMESTAMP, time(NULL));
                     }
@@ -14187,12 +12553,10 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type)
     }
     return true;
 }
-
 void Unit::RemoveCharmedBy(Unit *charmer)
 {
     if(!isCharmed())
         return;
-
     if(!charmer)
         charmer = GetCharmer();
     if(charmer != GetCharmer()) // one aura overrides another?
@@ -14202,7 +12566,6 @@ void Unit::RemoveCharmedBy(Unit *charmer)
 //        assert(false);
         return;
     }
-
     CharmType type;
     if(hasUnitState(UNIT_STAT_POSSESSED))
         type = CHARM_TYPE_POSSESS;
@@ -14210,20 +12573,17 @@ void Unit::RemoveCharmedBy(Unit *charmer)
         type = CHARM_TYPE_VEHICLE;
     else
         type = CHARM_TYPE_CHARM;
-
     CastStop();
     CombatStop(); //TODO: CombatStop(true) may cause crash (interrupt spells)
     getHostilRefManager().deleteReferences();
     DeleteThreatList();
     RestoreFaction();
     GetMotionMaster()->InitDefault();
-
     if(type == CHARM_TYPE_POSSESS)
     {
         clearUnitState(UNIT_STAT_POSSESSED);
         RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
     }
-
     if(GetTypeId() == TYPEID_UNIT)
     {
         ((Creature*)this)->AI()->OnCharmed(false);
@@ -14241,16 +12601,12 @@ void Unit::RemoveCharmedBy(Unit *charmer)
     }
     else
         ((Player*)this)->SetClientControl(this, 1);
-
     // If charmer still exists
     if(!charmer)
         return;
-
     assert(type != CHARM_TYPE_POSSESS || charmer->GetTypeId() == TYPEID_PLAYER);
     assert(type != CHARM_TYPE_VEHICLE || GetTypeId() == TYPEID_UNIT && IsVehicle());
-
     charmer->SetCharm(this, false);
-
     if(charmer->GetTypeId() == TYPEID_PLAYER)
     {
         switch(type)
@@ -14283,14 +12639,12 @@ void Unit::RemoveCharmedBy(Unit *charmer)
                 break;
         }
     }
-
     //a guardian should always have charminfo
     if(charmer->GetTypeId() == TYPEID_PLAYER && this != charmer->GetFirstControlled())
         ((Player*)charmer)->SendRemoveControlBar();
     else if(GetTypeId() == TYPEID_PLAYER || GetTypeId() == TYPEID_UNIT && !((Creature*)this)->isGuardian())
         DeleteCharmInfo();
 }
-
 void Unit::RestoreFaction()
 {
     if(GetTypeId() == TYPEID_PLAYER)
@@ -14305,7 +12659,6 @@ void Unit::RestoreFaction()
                 return;
             }
         }
-
         if(CreatureInfo const *cinfo = ((Creature*)this)->GetCreatureInfo())  // normal creature
         {
             FactionTemplateEntry const *faction = getFactionTemplateEntry();
@@ -14313,24 +12666,20 @@ void Unit::RestoreFaction()
         }
     }
 }
-
 bool Unit::CreateVehicleKit(uint32 id)
 {
     VehicleEntry const *vehInfo = sVehicleStore.LookupEntry(id);
     if(!vehInfo)
         return false;
-
     m_vehicleKit = new Vehicle(this, vehInfo);
     m_updateFlag |= UPDATEFLAG_VEHICLE;
     m_unitTypeMask |= UNIT_MASK_VEHICLE;
     return true;
 }
-
 Unit *Unit::GetVehicleBase() const
 {
     return m_vehicle ? m_vehicle->GetBase() : NULL;
 }
-
 Creature *Unit::GetVehicleCreatureBase() const
 {
     Unit *veh = GetVehicleBase();
@@ -14338,57 +12687,47 @@ Creature *Unit::GetVehicleCreatureBase() const
         return (Creature*)veh;
     return NULL;
 }
-
 bool Unit::IsInPartyWith(Unit const *unit) const
 {
     if(this == unit)
         return true;
-
     const Unit *u1 = GetCharmerOrOwnerOrSelf();
     const Unit *u2 = unit->GetCharmerOrOwnerOrSelf();
     if(u1 == u2)
         return true;
-
     if(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
         return ((Player*)u1)->IsInSameGroupWith((Player*)u2);
     else
         return false;
 }
-
 bool Unit::IsInRaidWith(Unit const *unit) const
 {
     if(this == unit)
         return true;
-
     const Unit *u1 = GetCharmerOrOwnerOrSelf();
     const Unit *u2 = unit->GetCharmerOrOwnerOrSelf();
     if(u1 == u2)
         return true;
-
     if(u1->GetTypeId() == TYPEID_PLAYER && u2->GetTypeId() == TYPEID_PLAYER)
         return ((Player*)u1)->IsInSameRaidWith((Player*)u2);
     else
         return false;
 }
-
 void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius)
 {
     Player *owner = GetCharmerOrOwnerPlayerOrPlayerItself();
     if(!owner)
         return;
-
     Group *pGroup = owner->GetGroup();
     if(pGroup)
     {
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* Target = itr->getSource();
-
             if( Target && !IsHostileTo(Target) )
             {
                 if(Target->isAlive() && IsWithinDistInMap(Target, radius) )
                     nearMembers.push_back(Target);
-
                 if(Guardian* pet = Target->GetGuardianPet())
                     if(pet->isAlive() &&  IsWithinDistInMap(pet, radius) )
                         nearMembers.push_back(pet);
@@ -14404,28 +12743,23 @@ void Unit::GetRaidMember(std::list<Unit*> &nearMembers, float radius)
                 nearMembers.push_back(pet);
     }
 }
-
 void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius)
 {
     Unit *owner = GetCharmerOrOwnerOrSelf();
     Group *pGroup = NULL;
     if (owner->GetTypeId() == TYPEID_PLAYER)
         pGroup = ((Player*)owner)->GetGroup();
-
     if(pGroup)
     {
         uint8 subgroup = ((Player*)owner)->GetSubGroup();
-
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* Target = itr->getSource();
-
             // IsHostileTo check duel and controlled by enemy
             if( Target && Target->GetSubGroup()==subgroup && !IsHostileTo(Target) )
             {
                 if(Target->isAlive() && IsWithinDistInMap(Target, radius) )
                     TagUnitMap.push_back(Target);
-
                 if(Guardian* pet = Target->GetGuardianPet())
                     if(pet->isAlive() &&  IsWithinDistInMap(pet, radius) )
                         TagUnitMap.push_back(pet);
@@ -14441,28 +12775,23 @@ void Unit::GetPartyMemberInDist(std::list<Unit*> &TagUnitMap, float radius)
                 TagUnitMap.push_back(pet);
     }
 }
-
 void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap)
 {
     Unit *owner = GetCharmerOrOwnerOrSelf();
     Group *pGroup = NULL;
     if (owner->GetTypeId() == TYPEID_PLAYER)
         pGroup = ((Player*)owner)->GetGroup();
-
     if(pGroup)
     {
         uint8 subgroup = ((Player*)owner)->GetSubGroup();
-
         for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
         {
             Player* Target = itr->getSource();
-
             // IsHostileTo check duel and controlled by enemy
             if( Target && Target->GetSubGroup()==subgroup && !IsHostileTo(Target) )
             {
                 if(Target->isAlive() && IsInMap(Target) )
                     TagUnitMap.push_back(Target);
-
                 if(Guardian* pet = Target->GetGuardianPet())
                     if(pet->isAlive() && IsInMap(Target) )
                         TagUnitMap.push_back(pet);
@@ -14478,7 +12807,6 @@ void Unit::GetPartyMembers(std::list<Unit*> &TagUnitMap)
                 TagUnitMap.push_back(pet);
     }
 }
-
 void Unit::HandleAuraEffect(AuraEffect * aureff, bool apply)
 {
     if (aureff->GetParentAura()->IsRemoved())
@@ -14487,7 +12815,6 @@ void Unit::HandleAuraEffect(AuraEffect * aureff, bool apply)
     {
         if (aureff->IsApplied())
             return;
-
         aureff->SetApplied(true);
         m_modAuras[aureff->GetAuraName()].push_back(aureff);
         aureff->ApplyModifier(true, true);
@@ -14496,32 +12823,25 @@ void Unit::HandleAuraEffect(AuraEffect * aureff, bool apply)
     {
         if (!aureff->IsApplied())
             return;
-
         aureff->SetApplied(false);
         // remove from list before mods removing (prevent cyclic calls, mods added before including to aura list - use reverse order)
         m_modAuras[aureff->GetAuraName()].remove(aureff);
         aureff->ApplyModifier(false, true);
-
         // Remove all triggered by aura spells vs unlimited duration
         aureff->CleanupTriggeredSpells();
     }
 }
-
 void Unit::AddAura(uint32 spellId, Unit *target)
 {
     if(!target || !target->isAlive())
         return;
-
     SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellId);
     if(!spellInfo)
         return;
-
     if (target->IsImmunedToSpell(spellInfo))
         return;
-
     uint8 eff_mask=0;
     Unit * source = this;
-
     for(uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
     {
         if(spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AURA || IsAreaAuraEffect(spellInfo->Effect[i]))
@@ -14529,21 +12849,17 @@ void Unit::AddAura(uint32 spellId, Unit *target)
             // Area auras applied as linked should have target as source (otherwise they'll be removed after first aura update)
             if (spellInfo->Effect[i] != SPELL_EFFECT_APPLY_AURA)
                 source = target;
-
             if(target->IsImmunedToSpellEffect(spellInfo, i))
                 continue;
             eff_mask|=1<<i;
         }
     }
-
     if (!eff_mask)
         return;
-
     // Because source is not give, use caster as source
     Aura *Aur = new Aura(spellInfo, eff_mask, target, source, this);
     target->AddAura(Aur);
 }
-
 void Unit::SetAuraStack(uint32 spellId, Unit *target, uint32 stack)
 {
     Aura *aur = target->GetAura(spellId, GetGUID());
@@ -14555,16 +12871,13 @@ void Unit::SetAuraStack(uint32 spellId, Unit *target, uint32 stack)
     if(aur && stack)
         aur->SetStackAmount(stack);
 }
-
 // This function is only used for area aura and creature addon
 // it should be removed in the future
 Aura * Unit::AddAuraEffect(const SpellEntry * spellInfo, uint8 effIndex, WorldObject *source, Unit* caster, int32 * basePoints)
 {
     // can't do that for passive auras - they stack from same caster so there is no way to get exact aura which should get effect
     //assert (!IsPassiveSpell(spellInfo));
-
     sLog.outDebug("AddAuraEffect: spell id: %u, effect index: %u", spellInfo->Id, (uint32)effIndex);
-
     Aura *aur = GetAura(spellInfo->Id, caster->GetGUID());
     // without this it may crash when shaman refresh totem? source is NULL
     if(aur && aur->GetSourceGUID() != source->GetGUID())
@@ -14572,7 +12885,6 @@ Aura * Unit::AddAuraEffect(const SpellEntry * spellInfo, uint8 effIndex, WorldOb
         RemoveAura(aur);
         aur = NULL;
     }
-
     if(aur)
     {
         if(AuraEffect *aurEffect = CreateAuraEffect(aur, effIndex, basePoints))
@@ -14589,20 +12901,17 @@ Aura * Unit::AddAuraEffect(const SpellEntry * spellInfo, uint8 effIndex, WorldOb
         }
         else
             aur = new Aura(spellInfo, 1<<effIndex, this, source, caster, NULL, NULL);
-
         if(!AddAura(aur))
             return NULL;
     }
     return aur;
 }
-
 // Melee based spells can be miss, parry or dodge on this step
 // Crit or block - determined on damage calculation phase! (and can be both in some time)
 float Unit::MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const
 {
     // Calculate hit chance (more correct for chance mod)
     int32 HitChance;
-
     // PvP - PvE melee chances
     /*int32 lchance = pVictim->GetTypeId() == TYPEID_PLAYER ? 5 : 7;
     int32 leveldif = pVictim->getLevelForTarget(this) - getLevelForTarget(pVictim);
@@ -14614,29 +12923,24 @@ float Unit::MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType,
         HitChance = 95.0f;
     else
         HitChance = 76.0f;
-
     // Hit chance depends from victim auras
     if(attType == RANGED_ATTACK)
         HitChance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_RANGED_HIT_CHANCE);
     else
         HitChance += pVictim->GetTotalAuraModifier(SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE);
-
     // Spellmod from SPELLMOD_RESIST_MISS_CHANCE
     if(spellId)
     {
         if(Player *modOwner = GetSpellModOwner())
             modOwner->ApplySpellMod(spellId, SPELLMOD_RESIST_MISS_CHANCE, HitChance);
     }
-
     // Miss = 100 - hit
     float miss_chance= 100.0f - HitChance;
-
     // Bonuses from attacker aura and ratings
     if (attType == RANGED_ATTACK)
         miss_chance -= m_modRangedHitChance;
     else
         miss_chance -= m_modMeleeHitChance;
-
     // bonus from skills is 0.04%
     //miss_chance -= skillDiff * 0.04f;
     int32 diff = -skillDiff;
@@ -14644,7 +12948,6 @@ float Unit::MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType,
         miss_chance += diff > 0 ? diff * 0.04 : diff * 0.02;
     else
         miss_chance += diff > 10 ? 2 + (diff - 10) * 0.4 : diff * 0.1;
-
     // Limit miss chance from 0 to 60%
     if (miss_chance < 0.0f)
         return 0.0f;
@@ -14652,30 +12955,23 @@ float Unit::MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType,
         return 60.0f;
     return miss_chance;
 }
-
 void Unit::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
     if(newPhaseMask==GetPhaseMask())
         return;
-
     if(IsInWorld())
         RemoveNotOwnSingleTargetAuras(newPhaseMask);        // we can lost access to caster or target
-
     WorldObject::SetPhaseMask(newPhaseMask,update);
-
     if(!IsInWorld())
         return;
-
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
         if((*itr)->GetTypeId() == TYPEID_UNIT)
             (*itr)->SetPhaseMask(newPhaseMask,true);
-
     for(uint8 i = 0; i < MAX_SUMMON_SLOT; ++i)
         if(m_SummonSlot[i])
             if(Creature *summon = GetMap()->GetCreature(m_SummonSlot[i]))
                 summon->SetPhaseMask(newPhaseMask,true);
 }
-
 void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
 {
     Player *player = NULL;
@@ -14687,7 +12983,6 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
         if(player && player->m_mover != this)
             player = NULL;
     }
-
     if(!player)
     {
         GetMotionMaster()->MoveKnockbackFrom(x, y, speedXY, speedZ);
@@ -14696,7 +12991,6 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
     {
         float vcos, vsin;
         GetSinCos(x, y, vsin, vcos);
-
         WorldPacket data(SMSG_MOVE_KNOCK_BACK, (8+4+4+4+4+4));
         data.append(GetPackGUID());
         data << uint32(0);                                      // Sequence
@@ -14704,11 +12998,9 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
         data << float(vsin);                                    // y direction
         data << float(speedXY);                                 // Horizontal speed
         data << float(-speedZ);                                 // Z Movement speed (vertical)
-
         player->GetSession()->SendPacket(&data);
     }
 }
-
 void Unit::JumpTo(float speedXY, float speedZ, bool forward)
 {
     float angle = forward ? 0 : M_PI;
@@ -14720,7 +13012,6 @@ void Unit::JumpTo(float speedXY, float speedZ, bool forward)
     {
         float vcos = cos(angle+GetOrientation());
         float vsin = sin(angle+GetOrientation());
-
         WorldPacket data(SMSG_MOVE_KNOCK_BACK, (8+4+4+4+4+4));
         data.append(GetPackGUID());
         data << uint32(0);                                      // Sequence
@@ -14728,11 +13019,9 @@ void Unit::JumpTo(float speedXY, float speedZ, bool forward)
         data << float(vsin);                                    // y direction
         data << float(speedXY);                                 // Horizontal speed
         data << float(-speedZ);                                 // Z Movement speed (vertical)
-
         ((Player*)this)->GetSession()->SendPacket(&data);
     }
 }
-
 void Unit::JumpTo(WorldObject *obj, float speedZ)
 {
     float x, y, z;
@@ -14740,12 +13029,10 @@ void Unit::JumpTo(WorldObject *obj, float speedZ)
     float speedXY = GetExactDist2d(x, y) * 10.0f / speedZ;
     GetMotionMaster()->MoveJump(x, y, z, speedXY, speedZ);
 }
-
 void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
 {
     if(!isAlive() || GetVehicleKit() == vehicle)
         return;
-
     if(m_vehicle)
     {
         if(m_vehicle == vehicle)
@@ -14763,7 +13050,6 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
             ExitVehicle();
         }
     }
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         ((Player*)this)->StopCastingCharm();
@@ -14771,7 +13057,6 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
         ((Player*)this)->Unmount();
         ((Player*)this)->RemoveAurasByType(SPELL_AURA_MOUNTED);
     }
-
     assert(!m_vehicle);
     m_vehicle = vehicle;
     if(!m_vehicle->AddPassenger(this, seatId))
@@ -14779,11 +13064,9 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
         m_vehicle = NULL;
         return;
     }
-
     SetControlled(true, UNIT_STAT_ROOT);
     //movementInfo is set in AddPassenger
     //packets are sent in AddPassenger
-
     if(GetTypeId() == TYPEID_PLAYER)
     {
         //((Player*)this)->SetClientControl(vehicle, 1);
@@ -14791,12 +13074,10 @@ void Unit::EnterVehicle(Vehicle *vehicle, int8 seatId)
         ((Player*)this)->GetSession()->SendPacket(&data);
     }
 }
-
 void Unit::ChangeSeat(int8 seatId, bool next)
 {
     if(!m_vehicle)
         return;
-
     if(seatId < 0)
     {
         seatId = m_vehicle->GetNextEmptySeat(GetTransSeat(), next);
@@ -14805,17 +13086,14 @@ void Unit::ChangeSeat(int8 seatId, bool next)
     }
     else if(seatId == GetTransSeat() || !m_vehicle->HasEmptySeat(seatId))
         return;
-
     m_vehicle->RemovePassenger(this);
     if(!m_vehicle->AddPassenger(this, seatId))
         assert(false);
 }
-
 void Unit::ExitVehicle()
 {
     if(!m_vehicle)
         return;
-
     Unit *vehicleBase = m_vehicle->GetBase();
     const AuraEffectList &modAuras = vehicleBase->GetAurasByType(SPELL_AURA_CONTROL_VEHICLE);
     for(AuraEffectList::const_iterator itr = modAuras.begin(); itr != modAuras.end(); ++itr)
@@ -14826,20 +13104,14 @@ void Unit::ExitVehicle()
             break; // there should be no case that a vehicle has two auras for one source
         }
     }
-
     if(!m_vehicle)
         return;
-
     //sLog.outError("exit vehicle");
-
     m_vehicle->RemovePassenger(this);
-
     // This should be done before dismiss, because there may be some aura removal
     Vehicle *vehicle = m_vehicle;
     m_vehicle = NULL;
-
     SetControlled(false, UNIT_STAT_ROOT);
-
     RemoveUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
     m_movementInfo.t_x = 0;
     m_movementInfo.t_y = 0;
@@ -14847,9 +13119,7 @@ void Unit::ExitVehicle()
     m_movementInfo.t_o = 0;
     m_movementInfo.t_time = 0;
     m_movementInfo.t_seat = 0;
-
     Relocate(vehicle->GetBase());
-
     //Send leave vehicle, not correct
     if(GetTypeId() == TYPEID_PLAYER)
     {
@@ -14860,12 +13130,10 @@ void Unit::ExitVehicle()
     WorldPacket data;
     BuildHeartBeatMsg(&data);
     SendMessageToSet(&data, false);
-
     if(vehicle->GetBase()->HasUnitTypeMask(UNIT_MASK_MINION))
         if(((Minion*)vehicle->GetBase())->GetOwner() == this)
             vehicle->Dismiss();
 }
-
 void Unit::BuildMovementPacket(ByteBuffer *data) const
 {
     switch(GetTypeId())
@@ -14884,7 +13152,6 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
             }
             break;
     }
-
     *data << uint32(GetUnitMovementFlags()); // movement flags
     *data << uint16(m_movementInfo.unk1);    // 2.3.0
     *data << uint32(getMSTime());                           // time
@@ -14892,7 +13159,6 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
     *data << GetPositionY();
     *data << GetPositionZ();
     *data << GetOrientation();
-
     // 0x00000200
     if(GetUnitMovementFlags() & MOVEMENTFLAG_ONTRANSPORT)
     {
@@ -14912,14 +13178,11 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
         *data << uint32(GetTransTime());
         *data << uint8 (GetTransSeat());
     }
-
     // 0x02200000
     if((GetUnitMovementFlags() & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING))
         || (m_movementInfo.unk1 & 0x20))
         *data << (float)m_movementInfo.s_pitch;
-
     *data << (uint32)m_movementInfo.fallTime;
-
     // 0x00001000
     if(GetUnitMovementFlags() & MOVEMENTFLAG_JUMPING)
     {
@@ -14928,18 +13191,15 @@ void Unit::BuildMovementPacket(ByteBuffer *data) const
         *data << (float)m_movementInfo.j_cosAngle;
         *data << (float)m_movementInfo.j_xyspeed;
     }
-
     // 0x04000000
     if(GetUnitMovementFlags() & MOVEMENTFLAG_SPLINE)
         *data << (float)m_movementInfo.u_unk1;
-
     /*if(GetTypeId() == TYPEID_PLAYER)
     {
         sLog.outString("Send MovementInfo:");
         OutMovementInfo();
     }*/
 }
-
 void Unit::OutMovementInfo() const
 {
     sLog.outString("MovementInfo for %u: Flag %u, Unk1 %u, Time %u, Pos %f %f %f %f, Fall %u", GetEntry(), m_movementInfo.flags, (uint32)m_movementInfo.unk1, m_movementInfo.time, GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation(), m_movementInfo.fallTime);
@@ -14952,7 +13212,6 @@ void Unit::OutMovementInfo() const
     if(m_movementInfo.flags & MOVEMENTFLAG_SPLINE)
         sLog.outString("Spline: %f", m_movementInfo.u_unk1);
 }
-
 void Unit::SetFlying(bool apply)
 {
     if(apply)
@@ -14966,7 +13225,6 @@ void Unit::SetFlying(bool apply)
         RemoveUnitMovementFlag(MOVEMENTFLAG_FLY_MODE + MOVEMENTFLAG_FLYING);
     }
 }
-
 void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool casting /*= false*/ )
 {
     if(GetTypeId() == TYPEID_PLAYER)
@@ -14986,13 +13244,10 @@ void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool ca
         data << uint32 (0);
         // Other information here: jumping angle etc
         SendMessageToSet(&data, false);*/
-
         // FIXME: this interrupts spell visual
         DestroyForNearbyPlayers();
-
         GetMap()->CreatureRelocation((Creature*)this, x, y, z, orientation);
         //ObjectAccessor::UpdateObjectVisibility(this);
-
         //WorldPacket data;
         // Work strange for many spells: triggered active mover set for targeted player to creature
         //BuildTeleportAckMsg(&data, x, y, z, orientation);
@@ -15000,7 +13255,6 @@ void Unit::NearTeleportTo( float x, float y, float z, float orientation, bool ca
         //SendMessageToSet(&data, false);
     }
 }
-
 void Unit::SendThreatListUpdate()
 {
     if (uint32 count = getThreatManager().getThreatList().size())
@@ -15019,7 +13273,6 @@ void Unit::SendThreatListUpdate()
     }
 }
 
-
 void Unit::SendChangeCurrentVictimOpcode(HostilReference* pHostilReference)
 {
     if (uint32 count = getThreatManager().getThreatList().size())
@@ -15038,7 +13291,6 @@ void Unit::SendChangeCurrentVictimOpcode(HostilReference* pHostilReference)
         SendMessageToSet(&data, false);
     }
 }
-
 void Unit::SendClearThreatListOpcode()
 {
     sLog.outDebug( "WORLD: Send SMSG_THREAT_CLEAR Message" );
@@ -15046,7 +13298,6 @@ void Unit::SendClearThreatListOpcode()
     data.append(GetPackGUID());
     SendMessageToSet(&data, false);
 }
-
 void Unit::SendRemoveFromThreatListOpcode(HostilReference* pHostilReference)
 {
     sLog.outDebug( "WORLD: Send SMSG_THREAT_REMOVE Message" );
@@ -15055,60 +13306,47 @@ void Unit::SendRemoveFromThreatListOpcode(HostilReference* pHostilReference)
     data.appendPackGUID(pHostilReference->getUnitGuid());
     SendMessageToSet(&data, false);
 }
-
 void Unit::RewardRage( uint32 damage, uint32 weaponSpeedHitFactor, bool attacker )
 {
     float addRage;
-
     float rageconversion = ((0.0091107836 * getLevel()*getLevel())+3.225598133*getLevel())+4.2652911;
-
     // Unknown if correct, but lineary adjust rage conversion above level 70
     if (getLevel() > 70)
         rageconversion += 13.27f*(getLevel()-70);
-
     if(attacker)
     {
         addRage = ((damage/rageconversion*7.5 + weaponSpeedHitFactor)/2);
-
         // talent who gave more rage on attack
         addRage *= 1.0f + GetTotalAuraModifier(SPELL_AURA_MOD_RAGE_FROM_DAMAGE_DEALT) / 100.0f;
     }
     else
     {
         addRage = damage/rageconversion*2.5;
-
         // Berserker Rage effect
         if(HasAura(18499))
             addRage *= 2.0;
     }
-
     addRage *= sWorld.getRate(RATE_POWER_RAGE_INCOME);
-
     ModifyPower(POWER_RAGE, uint32(addRage*10));
 }
-
 void Unit::OutDebugInfo() const
 {
     sLog.outError("Unit::OutDebugInfo");
     sLog.outString("GUID "UI64FMTD", entry %u, type %u, name %s", GetGUID(), GetEntry(), (uint32)GetTypeId(), GetName());
     sLog.outString("OwnerGUID "UI64FMTD", MinionGUID "UI64FMTD", CharmerGUID "UI64FMTD", CharmedGUID "UI64FMTD, GetOwnerGUID(), GetMinionGUID(), GetCharmerGUID(), GetCharmGUID());
     sLog.outString("In world %u, unit type mask %u", (uint32)(IsInWorld() ? 1 : 0), m_unitTypeMask);
-
     sLog.outStringInLine("Summon Slot: ");
     for(uint32 i = 0; i < MAX_SUMMON_SLOT; ++i)
         sLog.outStringInLine(UI64FMTD", ", m_SummonSlot[i]);
     sLog.outString();
-
     sLog.outStringInLine("Controlled List: ");
     for(ControlList::const_iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
         sLog.outStringInLine(UI64FMTD", ", (*itr)->GetGUID());
     sLog.outString();
-
     sLog.outStringInLine("Aura List: ");
     for(AuraMap::const_iterator itr = m_Auras.begin(); itr != m_Auras.end(); ++itr)
         sLog.outStringInLine("%u, ", itr->first);
     sLog.outString();
-
     if(IsVehicle())
     {
         sLog.outStringInLine("Passenger List: ");
@@ -15117,59 +13355,48 @@ void Unit::OutDebugInfo() const
                 sLog.outStringInLine(UI64FMTD", ", passenger->GetGUID());
         sLog.outString();
     }
-
     if(GetVehicle())
         sLog.outString("On vehicle %u.", GetVehicleBase()->GetEntry());
 }
-
 // MrSmite 09-05-2009 PetAI_v1.0
 void CharmInfo::SetIsCommandAttack(bool val)
 {
     m_isCommandAttack = val;
 }
-
 bool CharmInfo::IsCommandAttack()
 {
     return m_isCommandAttack;
 }
-
 void CharmInfo::SaveStayPosition()
 {
     m_unit->GetPosition(m_stayX, m_stayY, m_stayZ);
 }
-
 void CharmInfo::GetStayPosition(float &x, float &y, float &z)
 {
     x = m_stayX;
     y = m_stayY;
     z = m_stayZ;
 }
-
 void CharmInfo::SetIsAtStay(bool val)
 {
     m_isAtStay = val;
 }
-
 bool CharmInfo::IsAtStay()
 {
     return m_isAtStay;
 }
-
 void CharmInfo::SetIsFollowing(bool val)
 {
     m_isFollowing = val;
 }
-
 bool CharmInfo::IsFollowing()
 {
     return m_isFollowing;
 }
-
 void CharmInfo::SetIsReturning(bool val)
 {
     m_isReturning = val;
 }
-
 bool CharmInfo::IsReturning()
 {
     return m_isReturning;
diff --git a/src/game/Unit.h b/src/game/Unit.h
index efe615d5c17..7785e0ee0e9 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -17,10 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef __UNIT_H
 #define __UNIT_H
-
 #include "Common.h"
 #include "Object.h"
 #include "Opcodes.h"
@@ -36,9 +34,7 @@
 #include "DBCStructure.h"
 #include <list>
 
-
 #define WORLD_TRIGGER   12999
-
 enum SpellInterruptFlags
 {
     SPELL_INTERRUPT_FLAG_MOVEMENT     = 0x01, // why need this for instant?
@@ -48,7 +44,6 @@ enum SpellInterruptFlags
     SPELL_INTERRUPT_FLAG_ABORT_ON_DMG = 0x10,               // _complete_ interrupt on direct damage
     //SPELL_INTERRUPT_UNK             = 0x20                // unk, 564 of 727 spells having this spell start with "Glyph"
 };
-
 enum SpellChannelInterruptFlags
 {
     CHANNEL_FLAG_DAMAGE      = 0x0002,
@@ -58,7 +53,6 @@ enum SpellChannelInterruptFlags
     CHANNEL_FLAG_ONLY_IN_WATER = 0x0100,
     CHANNEL_FLAG_DELAY       = 0x4000
 };
-
 enum SpellAuraInterruptFlags
 {
     AURA_INTERRUPT_FLAG_HITBYSPELL          = 0x00000001,   // 0    removed when getting hit by a negative spell?
@@ -86,10 +80,8 @@ enum SpellAuraInterruptFlags
     AURA_INTERRUPT_FLAG_TELEPORTED          = 0x00400000,   // 22
     AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT    = 0x00800000,   // 23   removed by entering pvp combat
     AURA_INTERRUPT_FLAG_DIRECT_DAMAGE       = 0x01000000,   // 24   removed by any direct damage
-
     AURA_INTERRUPT_FLAG_NOT_VICTIM = (AURA_INTERRUPT_FLAG_HITBYSPELL | AURA_INTERRUPT_FLAG_TAKE_DAMAGE | AURA_INTERRUPT_FLAG_DIRECT_DAMAGE),
 };
-
 enum SpellModOp
 {
     SPELLMOD_DAMAGE                 = 0,
@@ -124,9 +116,7 @@ enum SpellModOp
     SPELLMOD_CRIT_DAMAGE_BONUS_2    = 29, //one not used spell
     SPELLMOD_SPELL_COST_REFUND_ON_FAIL = 30
 };
-
 #define MAX_SPELLMOD 32
-
 enum SpellValueMod
 {
     SPELLVALUE_BASE_POINT0,
@@ -135,7 +125,6 @@ enum SpellValueMod
     SPELLVALUE_RADIUS_MOD,
     SPELLVALUE_MAX_TARGETS,
 };
-
 typedef std::pair<SpellValueMod, int32>     CustomSpellValueMod;
 class CustomSpellValues : public std::vector<CustomSpellValueMod>
 {
@@ -145,16 +134,13 @@ class CustomSpellValues : public std::vector<CustomSpellValueMod>
             push_back(std::make_pair(mod, value));
         }
 };
-
 enum SpellFacingFlags
 {
     SPELL_FACING_FLAG_INFRONT = 0x0001
 };
-
 #define BASE_MINDAMAGE 1.0f
 #define BASE_MAXDAMAGE 2.0f
 #define BASE_ATTACK_TIME 2000
-
 // byte value (UNIT_FIELD_BYTES_1,0)
 enum UnitStandStateType
 {
@@ -168,14 +154,12 @@ enum UnitStandStateType
     UNIT_STAND_STATE_DEAD              = 7,
     UNIT_STAND_STATE_KNEEL             = 8
 };
-
 // byte flag value (UNIT_FIELD_BYTES_1,2)
 enum UnitStandFlags
 {
     UNIT_STAND_FLAGS_CREEP        = 0x02,
     UNIT_STAND_FLAGS_ALL          = 0xFF
 };
-
 // byte flags value (UNIT_FIELD_BYTES_1,3)
 enum UnitBytes1_Flags
 {
@@ -183,7 +167,6 @@ enum UnitBytes1_Flags
     UNIT_BYTE1_FLAG_UNTRACKABLE  = 0x04,
     UNIT_BYTE1_FLAG_ALL          = 0xFF
 };
-
 // high byte (3 from 0..3) of UNIT_FIELD_BYTES_2
 enum ShapeshiftForm
 {
@@ -214,7 +197,6 @@ enum ShapeshiftForm
     FORM_MOONKIN            = 0x1F,
     FORM_SPIRITOFREDEMPTION = 0x20
 };
-
 // low byte ( 0 from 0..3 ) of UNIT_FIELD_BYTES_2
 enum SheathState
 {
@@ -222,9 +204,7 @@ enum SheathState
     SHEATH_STATE_MELEE    = 1,                              // prepared melee weapon
     SHEATH_STATE_RANGED   = 2                               // prepared ranged weapon
 };
-
 #define MAX_SHEATH_STATE    3
-
 // byte (1 from 0..3) of UNIT_FIELD_BYTES_2
 enum UnitBytes2_Flags
 {
@@ -237,27 +217,23 @@ enum UnitBytes2_Flags
     UNIT_BYTE2_FLAG_UNK6        = 0x40,
     UNIT_BYTE2_FLAG_UNK7        = 0x80
 };
-
 // byte (2 from 0..3) of UNIT_FIELD_BYTES_2
 enum UnitRename
 {
     UNIT_RENAME_NOT_ALLOWED = 0x02,
     UNIT_RENAME_ALLOWED     = 0x03
 };
-
 #define CREATURE_MAX_SPELLS     8
 #define MAX_SPELL_CHARM         4
 #define MAX_SPELL_VEHICLE       6
 #define MAX_SPELL_POSSESS       8
 #define MAX_SPELL_CONTROL_BAR   10
-
 enum Swing
 {
     NOSWING                    = 0,
     SINGLEHANDEDSWING          = 1,
     TWOHANDEDSWING             = 2
 };
-
 enum VictimState
 {
     VICTIMSTATE_UNKNOWN1       = 0,
@@ -270,7 +246,6 @@ enum VictimState
     VICTIMSTATE_IS_IMMUNE      = 7,
     VICTIMSTATE_DEFLECTS       = 8
 };
-
 enum HitInfo
 {
     HITINFO_NORMALSWING         = 0x00000000,
@@ -299,18 +274,15 @@ enum HitInfo
     // 0x00400000
     HITINFO_UNK3                = 0x00800000
 };
-
 //i would like to remove this: (it is defined in item.h
 enum InventorySlot
 {
     NULL_BAG                   = 0,
     NULL_SLOT                  = 255
 };
-
 struct FactionTemplateEntry;
 struct SpellEntry;
 struct SpellValue;
-
 class Aura;
 class AuraEffect;
 class Creature;
@@ -326,15 +298,12 @@ class Guardian;
 class UnitAI;
 class Transport;
 class Vehicle;
-
 struct SpellImmune
 {
     uint32 type;
     uint32 spellId;
 };
-
 typedef std::list<SpellImmune> SpellImmuneList;
-
 enum UnitModifierType
 {
     BASE_VALUE = 0,
@@ -343,20 +312,17 @@ enum UnitModifierType
     TOTAL_PCT = 3,
     MODIFIER_TYPE_END = 4
 };
-
 enum WeaponDamageRange
 {
     MINDAMAGE,
     MAXDAMAGE
 };
-
 enum DamageTypeToSchool
 {
     RESISTANCE,
     DAMAGE_DEALT,
     DAMAGE_TAKEN
 };
-
 enum AuraRemoveMode
 {
     AURA_REMOVE_BY_DEFAULT=0,           // scripted remove, remove by stack with aura with different ids and sc aura remove
@@ -366,7 +332,6 @@ enum AuraRemoveMode
     AURA_REMOVE_BY_EXPIRE,              // dispel and absorb aura destroy
     AURA_REMOVE_BY_DEATH
 };
-
 enum UnitMods
 {
     UNIT_MOD_STAT_STRENGTH,                                 // UNIT_MOD_STAT_STRENGTH..UNIT_MOD_STAT_SPIRIT must be in existed order, it's accessed by index values of Stats enum.
@@ -403,7 +368,6 @@ enum UnitMods
     UNIT_MOD_POWER_START = UNIT_MOD_MANA,
     UNIT_MOD_POWER_END = UNIT_MOD_RUNIC_POWER + 1
 };
-
 enum BaseModGroup
 {
     CRIT_PERCENTAGE,
@@ -412,15 +376,12 @@ enum BaseModGroup
     SHIELD_BLOCK_VALUE,
     BASEMOD_END
 };
-
 enum BaseModType
 {
     FLAT_MOD,
     PCT_MOD
 };
-
 #define MOD_END (PCT_MOD+1)
-
 enum DeathState
 {
     ALIVE       = 0,
@@ -430,7 +391,6 @@ enum DeathState
     JUST_ALIVED = 4,
     DEAD_FALLING= 5
 };
-
 enum UnitState
 {
     UNIT_STAT_DIED            = 0x00000001,
@@ -465,7 +425,6 @@ enum UnitState
     UNIT_STAT_CANNOT_TURN     = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_ROTATING),
     UNIT_STAT_ALL_STATE       = 0xffffffff                      //(UNIT_STAT_STOPPED | UNIT_STAT_MOVING | UNIT_STAT_IN_COMBAT | UNIT_STAT_IN_FLIGHT)
 };
-
 enum UnitMoveType
 {
     MOVE_WALK           = 0,
@@ -478,12 +437,9 @@ enum UnitMoveType
     MOVE_FLIGHT_BACK    = 7,
     MOVE_PITCH_RATE     = 8
 };
-
 #define MAX_MOVE_TYPE     9
-
 extern float baseMoveSpeed[MAX_MOVE_TYPE];
 extern float playerBaseMoveSpeed[MAX_MOVE_TYPE];
-
 enum WeaponAttackType
 {
     BASE_ATTACK   = 0,
@@ -491,7 +447,6 @@ enum WeaponAttackType
     RANGED_ATTACK = 2,
     MAX_ATTACK
 };
-
 enum CombatRating
 {
     CR_WEAPON_SKILL             = 0,
@@ -520,9 +475,7 @@ enum CombatRating
     CR_EXPERTISE                = 23,
     CR_ARMOR_PENETRATION        = 24
 };
-
 #define MAX_COMBAT_RATING         25
-
 enum DamageEffectType
 {
     DIRECT_DAMAGE           = 0,                            // used for normal weapon damage (not for class abilities or spells)
@@ -532,7 +485,6 @@ enum DamageEffectType
     NODAMAGE                = 4,                            // used also in case when damage applied to health but not applied to spell channelInterruptFlags/etc
     SELF_DAMAGE             = 5
 };
-
 enum UnitVisibility
 {
     VISIBILITY_OFF                = 0,                      // absolute, not detectable, GM-like, can see all other
@@ -542,7 +494,6 @@ enum UnitVisibility
     //VISIBILITY_GROUP_NO_DETECT    = 4,                      // state just at stealth apply for update Grid state. Don't remove, otherwise stealth spells will break
     VISIBILITY_RESPAWN            = 5                       // special totally not detectable visibility for force delete object at respawn command
 };
-
 // Value masks for UNIT_FIELD_FLAGS
 enum UnitFlags
 {
@@ -579,7 +530,6 @@ enum UnitFlags
     UNIT_FLAG_SHEATHE               = 0x40000000,
     UNIT_FLAG_UNK_31                = 0x80000000
 };
-
 // Value masks for UNIT_FIELD_FLAGS_2
 enum UnitFlags2
 {
@@ -592,7 +542,6 @@ enum UnitFlags2
     UNIT_FLAG2_DISARM_RANGED    = 0x00000400,               //this does not disable ranged weapon display (maybe additional flag needed?)
     UNIT_FLAG2_REGENERATE_POWER = 0x00000800
 };
-
 /// Non Player Character flags
 enum NPCFlags
 {
@@ -625,7 +574,6 @@ enum NPCFlags
     UNIT_NPC_FLAG_GUARD                 = 0x10000000,       // custom flag for guards
     UNIT_NPC_FLAG_OUTDOORPVP            = 0x20000000,       // custom flag for outdoor pvp creatures
 };
-
 enum MoveFlags
 {
     MOVEFLAG_JUMP               = 0x00000800,
@@ -634,7 +582,6 @@ enum MoveFlags
     MOVEFLAG_GLIDE              = 0x00003000, // dragon
     MOVEFLAG_ENTER_TRANSPORT    = 0x00800000,
 };
-
 enum MovementFlags
 {
     MOVEMENTFLAG_NONE           = 0x00000000,
@@ -664,16 +611,14 @@ enum MovementFlags
     MOVEMENTFLAG_WATERWALKING   = 0x10000000,               // prevent unit from falling through water
     MOVEMENTFLAG_SAFE_FALL      = 0x20000000,               // active rogue safe fall spell (passive)
     MOVEMENTFLAG_HOVER          = 0x40000000,               // hover, cannot jump
-
     MOVEMENTFLAG_MOVING         =
         MOVEMENTFLAG_FORWARD |MOVEMENTFLAG_BACKWARD  |MOVEMENTFLAG_STRAFE_LEFT|MOVEMENTFLAG_STRAFE_RIGHT|
         MOVEMENTFLAG_PITCH_UP|MOVEMENTFLAG_PITCH_DOWN|MOVEMENTFLAG_FALL_DAMAGE|
         MOVEMENTFLAG_JUMPING |MOVEMENTFLAG_FALLING   |MOVEMENTFLAG_ASCEND     |
         MOVEMENTFLAG_SPLINE,
     MOVEMENTFLAG_TURNING        =
-        MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT,        
+        MOVEMENTFLAG_LEFT | MOVEMENTFLAG_RIGHT,
 };
-
 /*
 enum MonsterMovementFlags
 {
@@ -706,12 +651,10 @@ enum MonsterMovementFlags
     MONSTER_MOVE_UNK11          = 0x10000000,               // run
     MONSTER_MOVE_UNK12          = 0x20000000,               // run
     MONSTER_MOVE_UNK13          = 0x40000000,               // levitating
-
     // masks
     MONSTER_MOVE_SPLINE_FLY     = 0x00003000,               // fly by points
 };
 */
-
 struct MovementInfo
 {
     // common
@@ -732,7 +675,6 @@ struct MovementInfo
     float   j_zspeed, j_sinAngle, j_cosAngle, j_xyspeed;
     // spline
     float   u_unk1;
-
     MovementInfo()
     {
         flags = 0;
@@ -741,12 +683,10 @@ struct MovementInfo
         x = y = z = o = t_x = t_y = t_z = t_o = s_pitch = j_zspeed = j_sinAngle = j_cosAngle = j_xyspeed = u_unk1 = 0.0f;
         t_guid = 0;
     }
-
     uint32 GetMovementFlags() { return flags; }
     void AddMovementFlag(uint32 flag) { flags |= flag; }
     bool HasMovementFlag(uint32 flag) const { return flags & flag; }
 };
-
 enum UnitTypeMask
 {
     UNIT_MASK_NONE                  = 0x00000000,
@@ -761,7 +701,6 @@ enum UnitTypeMask
     UNIT_MASK_CONTROLABLE_GUARDIAN  = 0x00000100,
     UNIT_MASK_ACCESSORY             = 0x00000200,
 };
-
 enum DiminishingLevels
 {
     DIMINISHING_LEVEL_1             = 0,
@@ -769,37 +708,30 @@ enum DiminishingLevels
     DIMINISHING_LEVEL_3             = 2,
     DIMINISHING_LEVEL_IMMUNE        = 3
 };
-
 struct DiminishingReturn
 {
     DiminishingReturn(DiminishingGroup group, uint32 t, uint32 count)
         : DRGroup(group), stack(0), hitTime(t), hitCount(count)
     {}
-
     DiminishingGroup        DRGroup:16;
     uint16                  stack:16;
     uint32                  hitTime;
     uint32                  hitCount;
 };
-
 enum MeleeHitOutcome
 {
     MELEE_HIT_EVADE, MELEE_HIT_MISS, MELEE_HIT_DODGE, MELEE_HIT_BLOCK, MELEE_HIT_PARRY,
     MELEE_HIT_GLANCING, MELEE_HIT_CRIT, MELEE_HIT_CRUSHING, MELEE_HIT_NORMAL
 };
-
 struct CleanDamage
 {
     CleanDamage(uint32 mitigated, uint32 absorbed, WeaponAttackType _attackType, MeleeHitOutcome _hitOutCome) :
     mitigated_damage(mitigated), absorbed_damage(absorbed), attackType(_attackType), hitOutCome(_hitOutCome) {}
-
     uint32 absorbed_damage;
     uint32 mitigated_damage;
-
     WeaponAttackType attackType;
     MeleeHitOutcome hitOutCome;
 };
-
 // Struct for use in Unit::CalculateMeleeDamage
 // Need create structure like in SMSG_ATTACKERSTATEUPDATE opcode
 struct CalcDamageInfo
@@ -821,14 +753,12 @@ struct CalcDamageInfo
     uint32 cleanDamage;          // Used only for rage calculation
     MeleeHitOutcome hitOutCome;  // TODO: remove this field (need use TargetState)
 };
-
 // Spell damage info structure based on structure sending in SMSG_SPELLNONMELEEDAMAGELOG opcode
 struct SpellNonMeleeDamage{
     SpellNonMeleeDamage(Unit *_attacker, Unit *_target, uint32 _SpellID, uint32 _schoolMask)
         : target(_target), attacker(_attacker), SpellID(_SpellID), damage(0), overkill(0), schoolMask(_schoolMask),
         absorb(0), resist(0), physicalLog(false), unused(false), blocked(0), HitInfo(0), cleanDamage(0)
     {}
-
     Unit   *target;
     Unit   *attacker;
     uint32 SpellID;
@@ -844,12 +774,10 @@ struct SpellNonMeleeDamage{
     // Used for help
     uint32 cleanDamage;
 };
-
 struct SpellPeriodicAuraLogInfo
 {
     SpellPeriodicAuraLogInfo(AuraEffect *_auraEff, uint32 _damage, uint32 _overDamage, uint32 _absorb, uint32 _resist, float _multiplier, bool _critical)
         : auraEff(_auraEff), damage(_damage), overDamage(_overDamage), absorb(_absorb), resist(_resist), multiplier(_multiplier), critical(_critical){}
-
     AuraEffect *auraEff;
     uint32 damage;
     uint32 overDamage;                                      // overkill/overheal
@@ -858,7 +786,6 @@ struct SpellPeriodicAuraLogInfo
     float  multiplier;
     bool   critical;
 };
-
 struct TriggeredSpellInfo
 {
     TriggeredSpellInfo(uint32 _spell, Unit *_source, Unit *_target, int32 _amount = 0, AuraEffect *_auraEff = NULL)
@@ -868,18 +795,13 @@ struct TriggeredSpellInfo
     Unit *source, *target;
     AuraEffect *auraEff;
 };
-
 typedef std::vector<TriggeredSpellInfo> TriggeredSpellInfoVct;
-
 uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missCondition);
-
 #define MAX_DECLINED_NAME_CASES 5
-
 struct DeclinedName
 {
     std::string name[MAX_DECLINED_NAME_CASES];
 };
-
 enum CurrentSpellTypes
 {
     CURRENT_MELEE_SPELL             = 0,
@@ -887,11 +809,9 @@ enum CurrentSpellTypes
     CURRENT_AUTOREPEAT_SPELL        = 2,
     CURRENT_CHANNELED_SPELL         = 3
 };
-
 #define CURRENT_FIRST_NON_MELEE_SPELL 1
 #define CURRENT_MAX_SPELL             4
 
-
 enum ActiveStates
 {
     ACT_PASSIVE  = 0x01,                                    // 0x01 - passive
@@ -901,14 +821,12 @@ enum ActiveStates
     ACT_REACTION = 0x06,                                    // 0x02 | 0x04
     ACT_DECIDE   = 0x00                                     // custom
 };
-
 enum ReactStates
 {
     REACT_PASSIVE    = 0,
     REACT_DEFENSIVE  = 1,
     REACT_AGGRESSIVE = 2
 };
-
 enum CommandStates
 {
     COMMAND_STAY    = 0,
@@ -916,18 +834,14 @@ enum CommandStates
     COMMAND_ATTACK  = 2,
     COMMAND_ABANDON = 3
 };
-
 #define UNIT_ACTION_BUTTON_ACTION(X) (uint32(X) & 0x00FFFFFF)
 #define UNIT_ACTION_BUTTON_TYPE(X)   ((uint32(X) & 0xFF000000) >> 24)
 #define MAX_UNIT_ACTION_BUTTON_ACTION_VALUE (0x00FFFFFF+1)
 #define MAKE_UNIT_ACTION_BUTTON(A,T) (uint32(A) | (uint32(T) << 24))
-
 struct UnitActionBarEntry
 {
     UnitActionBarEntry() : packedData(uint32(ACT_DISABLED) << 24) {}
-
     uint32 packedData;
-
     // helper
     ActiveStates GetType() const { return ActiveStates(UNIT_ACTION_BUTTON_TYPE(packedData)); }
     uint32 GetAction() const { return UNIT_ACTION_BUTTON_ACTION(packedData); }
@@ -936,25 +850,20 @@ struct UnitActionBarEntry
         ActiveStates Type = GetType();
         return Type == ACT_DISABLED || Type == ACT_ENABLED || Type == ACT_PASSIVE;
     }
-
     void SetActionAndType(uint32 action, ActiveStates type)
     {
         packedData = MAKE_UNIT_ACTION_BUTTON(action,type);
     }
-
     void SetType(ActiveStates type)
     {
         packedData = MAKE_UNIT_ACTION_BUTTON(UNIT_ACTION_BUTTON_ACTION(packedData),type);
     }
-
     void SetAction(uint32 action)
     {
         packedData = (packedData & 0xFF000000) | UNIT_ACTION_BUTTON_ACTION(action);
     }
 };
-
 typedef std::list<Player*> SharedVisionList;
-
 enum CharmType
 {
     CHARM_TYPE_CHARM,
@@ -962,9 +871,7 @@ enum CharmType
     CHARM_TYPE_VEHICLE,
     CHARM_TYPE_CONVERT,
 };
-
 typedef UnitActionBarEntry CharmSpellEntry;
-
 enum ActionBarIndex
 {
     ACTION_BAR_INDEX_START = 0,
@@ -972,9 +879,7 @@ enum ActionBarIndex
     ACTION_BAR_INDEX_PET_SPELL_END = 7,
     ACTION_BAR_INDEX_END = 10,
 };
-
 #define MAX_UNIT_ACTION_BAR_INDEX (ACTION_BAR_INDEX_END-ACTION_BAR_INDEX_START)
-
 struct CharmInfo
 {
     public:
@@ -982,19 +887,16 @@ struct CharmInfo
         ~CharmInfo();
         uint32 GetPetNumber() const { return m_petnumber; }
         void SetPetNumber(uint32 petnumber, bool statwindow);
-
         void SetCommandState(CommandStates st) { m_CommandState = st; }
         CommandStates GetCommandState() { return m_CommandState; }
         bool HasCommandState(CommandStates state) { return (m_CommandState == state); }
         //void SetReactState(ReactStates st) { m_reactState = st; }
         //ReactStates GetReactState() { return m_reactState; }
         //bool HasReactState(ReactStates state) { return (m_reactState == state); }
-
         void InitPossessCreateSpells();
         void InitCharmCreateSpells();
         void InitPetActionBar();
         void InitEmptyActionBar(bool withAttack = true);
-
                                                             //return true if successful
         bool AddSpellToActionBar(uint32 spellid, ActiveStates newstate = ACT_DECIDE);
         bool RemoveSpellFromActionBar(uint32 spell_id);
@@ -1006,11 +908,8 @@ struct CharmInfo
             PetActionBar[index].SetActionAndType(spellOrAction,type);
         }
         UnitActionBarEntry const* GetActionBarEntry(uint8 index) const { return &(PetActionBar[index]); }
-
         void ToggleCreatureAutocast(uint32 spellid, bool apply);
-
         CharmSpellEntry* GetCharmSpell(uint8 index) { return &(m_charmspells[index]); }
-
         void SetIsCommandAttack(bool val);
         bool IsCommandAttack();
         void SetIsAtStay(bool val);
@@ -1021,9 +920,7 @@ struct CharmInfo
         bool IsReturning();
         void SaveStayPosition();
         void GetStayPosition(float &x, float &y, float &z);
-
     private:
-
         Unit* m_unit;
         UnitActionBarEntry PetActionBar[MAX_UNIT_ACTION_BAR_INDEX];
         CharmSpellEntry m_charmspells[4];
@@ -1031,10 +928,8 @@ struct CharmInfo
         //ReactStates     m_reactState;
         uint32          m_petnumber;
         bool            m_barInit;
-
         //for restoration after charmed
         ReactStates     m_oldReactState;
-
         bool m_isCommandAttack;
         bool m_isAtStay;
         bool m_isFollowing;
@@ -1043,17 +938,14 @@ struct CharmInfo
         float m_stayY;
         float m_stayZ;
 };
-
 // for clearing special attacks
 #define REACTIVE_TIMER_START 4000
-
 enum ReactiveType
 {
     REACTIVE_DEFENSE      = 0,
     REACTIVE_HUNTER_PARRY = 1,
     REACTIVE_OVERPOWER    = 2
 };
-
 #define MAX_REACTIVE 3
 #define SUMMON_SLOT_PET     0
 #define SUMMON_SLOT_TOTEM   1
@@ -1061,13 +953,10 @@ enum ReactiveType
 #define SUMMON_SLOT_MINIPET 5
 #define SUMMON_SLOT_QUEST   6
 #define MAX_SUMMON_SLOT     7
-
 // delay time next attack to prevent client attack animation problems
 #define ATTACK_DISPLAY_DELAY 200
 #define MAX_PLAYER_STEALTH_DETECT_RANGE 45.0f               // max distance for detection targets by player
-
 struct SpellProcEventEntry;                                 // used only privately
-
 class TRINITY_DLL_SPEC Unit : public WorldObject
 {
     public:
@@ -1080,29 +969,21 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         typedef std::list<Aura *> AuraList;
         typedef std::list<DiminishingReturn> Diminishing;
         typedef std::set<uint32> ComboPointHolderSet;
-
         typedef std::map<uint8, Aura*> VisibleAuraMap;
-
         virtual ~Unit ( );
-
         void AddToWorld();
         void RemoveFromWorld();
-
         void CleanupsBeforeDelete();                        // used in ~Creature/~Player (or before mass creature delete to remove cross-references to already deleted units)
-
         DiminishingLevels GetDiminishing(DiminishingGroup  group);
         void IncrDiminishing(DiminishingGroup group);
         void ApplyDiminishingToDuration(DiminishingGroup  group, int32 &duration,Unit* caster, DiminishingLevels Level, int32 limitduration);
         void ApplyDiminishingAura(DiminishingGroup  group, bool apply);
         void ClearDiminishings() { m_Diminishing.clear(); }
-
         //target dependent range checks
         uint32 GetSpellMaxRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry);
         uint32 GetSpellMinRangeForTarget(Unit* target,const SpellRangeEntry * rangeEntry);
         uint32 GetSpellRadiusForTarget(Unit* target,const SpellRadiusEntry * radiusEntry);
-
         virtual void Update( uint32 time );
-
         void setAttackTimer(WeaponAttackType type, uint32 time) { m_attackTimer[type] = time; }
         void resetAttackTimer(WeaponAttackType type = BASE_ATTACK);
         uint32 getAttackTimer(WeaponAttackType type) const { return m_attackTimer[type]; }
@@ -1117,7 +998,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void GetRandomContactPoint( const Unit* target, float &x, float &y, float &z, float distance2dMin, float distance2dMax ) const;
         uint32 m_extraAttacks;
         bool m_canDualWield;
-
         void _addAttacker(Unit *pAttacker)                  // must be called only from Unit::Attack(Unit*)
         {
             m_attackers.insert(pAttacker);
@@ -1130,10 +1010,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         {
             if (getVictim() != NULL)
                 return getVictim();
-
             if (!m_attackers.empty())
                 return *(m_attackers.begin());
-
             return NULL;
         }
         bool Attack(Unit *victim, bool meleeAttack);
@@ -1143,14 +1021,12 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         AttackerSet const& getAttackers() const { return m_attackers; }
         bool isAttackingPlayer() const;
         Unit* getVictim() const { return m_attacking; }
-
         void CombatStop(bool includingCast = false);
         void CombatStopWithPets(bool includingCast = false);
         Unit* SelectNearbyTarget(float dist = NOMINAL_MELEE_RANGE) const;
         bool hasNegativeAuraWithInterruptFlag(uint32 flag);
         void SendMeleeAttackStop(Unit* victim);
         void SendMeleeAttackStart(Unit* pVictim);
-
         void addUnitState(uint32 f) { m_state |= f; }
         bool hasUnitState(const uint32 f) const { return (m_state & f); }
         void clearUnitState(uint32 f) { m_state &= ~f; }
@@ -1159,7 +1035,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
             return !hasUnitState(UNIT_STAT_CONFUSED | UNIT_STAT_FLEEING | UNIT_STAT_IN_FLIGHT |
                 UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED ) && GetOwnerGUID()==0;
         }
-
         uint32 HasUnitTypeMask(uint32 mask) const { return mask & m_unitTypeMask; }
         void AddUnitTypeMask(uint32 mask) { m_unitTypeMask |= mask; }
         bool isSummon() const   { return m_unitTypeMask & UNIT_MASK_SUMMON; }
@@ -1168,7 +1043,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool isHunterPet() const{ return m_unitTypeMask & UNIT_MASK_HUNTER_PET; }
         bool isTotem() const    { return m_unitTypeMask & UNIT_MASK_TOTEM; }
         bool IsVehicle() const  { return m_unitTypeMask & UNIT_MASK_VEHICLE; }
-
         uint32 getLevel() const { return GetUInt32Value(UNIT_FIELD_LEVEL); }
         virtual uint32 getLevelForTarget(Unit const* /*target*/) const { return getLevel(); }
         void SetLevel(uint32 lvl);
@@ -1177,22 +1051,18 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         uint8 getClass() const { return GetByteValue(UNIT_FIELD_BYTES_0, 1); }
         uint32 getClassMask() const { return 1 << (getClass()-1); }
         uint8 getGender() const { return GetByteValue(UNIT_FIELD_BYTES_0, 2); }
-
         float GetStat(Stats stat) const { return float(GetUInt32Value(UNIT_FIELD_STAT0+stat)); }
         void SetStat(Stats stat, int32 val) { SetStatInt32Value(UNIT_FIELD_STAT0+stat, val); }
         uint32 GetArmor() const { return GetResistance(SPELL_SCHOOL_NORMAL) ; }
         void SetArmor(int32 val) { SetResistance(SPELL_SCHOOL_NORMAL, val); }
-
         uint32 GetResistance(SpellSchools school) const { return GetUInt32Value(UNIT_FIELD_RESISTANCES+school); }
         void SetResistance(SpellSchools school, int32 val) { SetStatInt32Value(UNIT_FIELD_RESISTANCES+school,val); }
-
         uint32 GetHealth()    const { return GetUInt32Value(UNIT_FIELD_HEALTH); }
         uint32 GetMaxHealth() const { return GetUInt32Value(UNIT_FIELD_MAXHEALTH); }
         void SetHealth(   uint32 val);
         void SetMaxHealth(uint32 val);
         int32 ModifyHealth(int32 val);
         int32 GetHealthGain(int32 dVal);
-
         Powers getPowerType() const { return Powers(GetByteValue(UNIT_FIELD_BYTES_0, 3)); }
         void setPowerType(Powers power);
         uint32 GetPower(   Powers power) const { return GetUInt32Value(UNIT_FIELD_POWER1   +power); }
@@ -1202,20 +1072,16 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         int32 ModifyPower(Powers power, int32 val);
         void ApplyPowerMod(Powers power, uint32 val, bool apply);
         void ApplyMaxPowerMod(Powers power, uint32 val, bool apply);
-
         uint32 GetAttackTime(WeaponAttackType att) const
         {
            float f_BaseAttackTime = GetFloatValue(UNIT_FIELD_BASEATTACKTIME+att) / m_modAttackSpeedPct[att];
            return (uint32)f_BaseAttackTime;
         }
-            
         void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att,val*m_modAttackSpeedPct[att]); }
         void ApplyAttackTimePercentMod(WeaponAttackType att,float val, bool apply);
         void ApplyCastTimePercentMod(float val, bool apply);
-
         SheathState GetSheath() const { return SheathState(GetByteValue(UNIT_FIELD_BYTES_2, 0)); }
         virtual void SetSheath( SheathState sheathed ) { SetByteValue(UNIT_FIELD_BYTES_2, 0, sheathed); }
-
         // faction template id
         uint32 getFaction() const { return GetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE); }
         void setFaction(uint32 faction) { SetUInt32Value(UNIT_FIELD_FACTIONTEMPLATE, faction ); }
@@ -1233,7 +1099,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         {
             if(FactionTemplateEntry const* entry = getFactionTemplateEntry())
                 return entry->IsContestedGuardFaction();
-
             return false;
         }
         bool IsPvP() const { return HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP); }
@@ -1250,45 +1115,34 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
             uint32 creatureType = GetCreatureType();
             return (creatureType >= 1) ? (1 << (creatureType - 1)) : 0;
         }
-
         uint8 getStandState() const { return GetByteValue(UNIT_FIELD_BYTES_1, 0); }
         bool IsSitState() const;
         bool IsStandState() const;
         void SetStandState(uint8 state);
-
         void  SetStandFlags(uint8 flags) { SetByteFlag(UNIT_FIELD_BYTES_1, 2,flags); }
         void  RemoveStandFlags(uint8 flags) { RemoveByteFlag(UNIT_FIELD_BYTES_1, 2,flags); }
-
         bool IsMounted() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_MOUNT ); }
         uint32 GetMountID() const { return GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID); }
         void Mount(uint32 mount);
         void Unmount();
-
         uint16 GetMaxSkillValueForLevel(Unit const* target = NULL) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; }
         void DealDamageMods(Unit *pVictim, uint32 &damage, uint32* absorb);
         uint32 DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDamage = NULL, DamageEffectType damagetype = DIRECT_DAMAGE, SpellSchoolMask damageSchoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *spellProto = NULL, bool durabilityLoss = true);
         void Kill(Unit *pVictim, bool durabilityLoss = true);
         int32 DealHeal(Unit *pVictim, uint32 addhealth, SpellEntry const *spellProto, bool critical = false);
-
         void ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procEx, uint32 amount, WeaponAttackType attType = BASE_ATTACK, SpellEntry const *procSpell = NULL, SpellEntry const * procAura = NULL);
         void ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, SpellEntry const * procSpell, uint32 damage , SpellEntry const * procAura = NULL);
-
         void HandleEmoteCommand(uint32 anim_id);
         void AttackerStateUpdate (Unit *pVictim, WeaponAttackType attType = BASE_ATTACK, bool extra = false );
-
         //float MeleeMissChanceCalc(const Unit *pVictim, WeaponAttackType attType) const;
-
         void CalculateMeleeDamage(Unit *pVictim, uint32 damage, CalcDamageInfo *damageInfo, WeaponAttackType attackType = BASE_ATTACK);
         void DealMeleeDamage(CalcDamageInfo *damageInfo, bool durabilityLoss);
-
         void CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType = BASE_ATTACK, bool crit = false);
         void DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss);
-
         float MeleeSpellMissChance(const Unit *pVictim, WeaponAttackType attType, int32 skillDiff, uint32 spellId) const;
         SpellMissInfo MeleeSpellHitResult(Unit *pVictim, SpellEntry const *spell);
         SpellMissInfo MagicSpellHitResult(Unit *pVictim, SpellEntry const *spell);
         SpellMissInfo SpellHitResult(Unit *pVictim, SpellEntry const *spell, bool canReflect = false);
-
         float GetUnitDodgeChance()    const;
         float GetUnitParryChance()    const;
         float GetUnitBlockChance()    const;
@@ -1304,17 +1158,14 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
             }
             return true;
         }
-
         virtual uint32 GetShieldBlockValue() const =0;
         uint32 GetUnitMeleeSkill(Unit const* target = NULL) const { return (target ? getLevelForTarget(target) : getLevel()) * 5; }
         uint32 GetDefenseSkillValue(Unit const* target = NULL) const;
         uint32 GetWeaponSkillValue(WeaponAttackType attType, Unit const* target = NULL) const;
         float GetWeaponProcChance() const;
         float GetPPMProcChance(uint32 WeaponSpeed, float PPM,  const SpellEntry * spellProto) const;
-
         MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType) const;
         MeleeHitOutcome RollMeleeOutcomeAgainst (const Unit *pVictim, WeaponAttackType attType, int32 crit_chance, int32 miss_chance, int32 dodge_chance, int32 parry_chance, int32 block_chance) const;
-
         bool isVendor()       const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_VENDOR ); }
         bool isTrainer()      const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_TRAINER ); }
         bool isQuestGiver()   const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER ); }
@@ -1338,37 +1189,29 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
                 UNIT_NPC_FLAG_SPIRITGUIDE | UNIT_NPC_FLAG_TABARDDESIGNER | UNIT_NPC_FLAG_AUCTIONEER );
         }
         bool isSpiritService() const { return HasFlag( UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPIRITHEALER | UNIT_NPC_FLAG_SPIRITGUIDE ); }
-
         //Need fix or use this
         bool isGuard() const  { return HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GUARD); }
-
         bool isInFlight()  const { return hasUnitState(UNIT_STAT_IN_FLIGHT); }
-
         bool isInCombat()  const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IN_COMBAT); }
         void CombatStart(Unit* target, bool initialAggro = true);
         void SetInCombatState(bool PvP, Unit* enemy = NULL);
         void SetInCombatWith(Unit* enemy);
         void ClearInCombat();
         uint32 GetCombatTimer() const { return m_CombatTimer; }
-
         bool HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint32 familyFlags) const;
         bool virtual HasSpell(uint32 /*spellID*/) const { return false; }
-
         bool HasStealthAura()      const { return HasAuraType(SPELL_AURA_MOD_STEALTH); }
         bool HasInvisibilityAura() const { return HasAuraType(SPELL_AURA_MOD_INVISIBILITY); }
         bool isFeared()  const { return HasAuraType(SPELL_AURA_MOD_FEAR); }
         bool isInRoots() const { return HasAuraType(SPELL_AURA_MOD_ROOT); }
         bool IsPolymorphed() const;
-
         bool isFrozen() const;
-
         bool isTargetableForAttack() const;
         bool isAttackableByAOE() const;
         bool canAttack(Unit const* target, bool force = true) const;
         virtual bool IsInWater() const;
         virtual bool IsUnderWater() const;
         bool isInAccessiblePlaceFor(Creature const* c) const;
-
         void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, bool critical = false);
         void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype);
         void EnergizeBySpell(Unit *pVictim, uint32 SpellID, uint32 Damage, Powers powertype);
@@ -1384,24 +1227,18 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void SetAuraStack(uint32 spellId, Unit *target, uint32 stack);
         void HandleAuraEffect(AuraEffect * aureff, bool apply);
         Aura *AddAuraEffect(const SpellEntry *spellInfo, uint8 effIndex, WorldObject *source, Unit *caster, int32 *basePoints = NULL);
-
         bool IsDamageToThreatSpell(SpellEntry const * spellInfo) const;
-
         void DeMorph();
-
         void SendAttackStateUpdate(CalcDamageInfo *damageInfo);
         void SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType, SpellSchoolMask damageSchoolMask, uint32 Damage, uint32 AbsorbDamage, uint32 Resist, VictimState TargetState, uint32 BlockedAmount);
         void SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log);
         void SendSpellNonMeleeDamageLog(Unit *target,uint32 SpellID, uint32 Damage, SpellSchoolMask damageSchoolMask, uint32 AbsorbedDamage, uint32 Resist, bool PhysicalDamage, uint32 Blocked, bool CriticalHit = false);
         void SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo);
         void SendSpellMiss(Unit *target, uint32 spellID, SpellMissInfo missInfo);
-
         void NearTeleportTo(float x, float y, float z, float orientation, bool casting = false);
-
         void KnockbackFrom(float x, float y, float speedXY, float speedZ);
         void JumpTo(float speedXY, float speedZ, bool forward = true);
         void JumpTo(WorldObject *obj, float speedZ);
-
         void SendMonsterStop();
         void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 Time, Player* player = NULL);
         void SendMonsterMove(float NewPosX, float NewPosY, float NewPosZ, uint32 MoveFlags, uint32 time, float speedZ, Player *player = NULL);
@@ -1411,20 +1248,16 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime = 0, Player* player = NULL);
         void SendMonsterMoveWithSpeedToCurrentDestination(Player* player = NULL);
         void SendMovementFlagUpdate();
-
         void SendChangeCurrentVictimOpcode(HostilReference* pHostilReference);
         void SendClearThreatListOpcode();
         void SendRemoveFromThreatListOpcode(HostilReference* pHostilReference);
         void SendThreatListUpdate();
-
         void BuildHeartBeatMsg(WorldPacket *data) const;
         void OutMovementInfo() const;
-
         bool isAlive() const { return (m_deathState == ALIVE); };
         bool isDead() const { return ( m_deathState == DEAD || m_deathState == CORPSE ); };
         DeathState getDeathState() { return m_deathState; };
         virtual void setDeathState(DeathState s);           // overwrited in Creature/Player/Pet
-
         uint64 GetOwnerGUID() const { return  GetUInt64Value(UNIT_FIELD_SUMMONEDBY); }
         uint64 GetCreatorGUID() const { return GetUInt64Value(UNIT_FIELD_CREATEDBY); }
         void SetCreatorGUID(uint64 creator) { SetUInt64Value(UNIT_FIELD_CREATEDBY, creator); }
@@ -1435,7 +1268,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         uint64 GetCharmGUID() const { return  GetUInt64Value(UNIT_FIELD_CHARM); }
         void SetPetGUID(uint64 guid) { m_SummonSlot[SUMMON_SLOT_PET] = guid; }
         uint64 GetPetGUID() const { return m_SummonSlot[SUMMON_SLOT_PET]; }
-
         bool IsControlledByPlayer() const { return m_ControlledByPlayer; }
         uint64 GetCharmerOrOwnerGUID() const { return GetCharmerGUID() ? GetCharmerGUID() : GetOwnerGUID(); }
         uint64 GetCharmerOrOwnerOrOwnGUID() const
@@ -1445,9 +1277,7 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
             return GetGUID();
         }
         bool isCharmedOwnedByPlayerOrPlayer() const { return IS_PLAYER_GUID(GetCharmerOrOwnerOrOwnGUID()); }
-
         Player* GetSpellModOwner() const;
-
         Unit* GetOwner(bool inWorld = true) const;
         Guardian *GetGuardianPet() const;
         Minion *GetFirstMinion() const;
@@ -1458,11 +1288,9 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         {
             if(Unit *u = GetCharmerOrOwner())
                 return u;
-
             return (Unit*)this;
         }
         Player* GetCharmerOrOwnerPlayerOrPlayerItself() const;
-
         void SetMinion(Minion *minion, bool apply);
         void GetAllMinionsByEntry(std::list<Creature*>& Minions, uint32 entry);
         void RemoveAllMinionsByEntry(uint32 entry);
@@ -1471,11 +1299,9 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool SetCharmedBy(Unit* charmer, CharmType type);
         void RemoveCharmedBy(Unit* charmer);
         void RestoreFaction();
-
         ControlList m_Controlled;
         Unit* GetFirstControlled() const;
         void RemoveAllControlled();
-
         bool isCharmed() const { return GetCharmerGUID() != 0; }
         bool isPossessed() const { return hasUnitState(UNIT_STAT_POSSESSED); }
         bool isPossessedByPlayer() const { return hasUnitState(UNIT_STAT_POSSESSED) && IS_PLAYER_GUID(GetCharmerGUID()); }
@@ -1487,7 +1313,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
                 return false;
         }
         bool isPossessing(Unit* u) const { return u->isPossessed() && GetCharmGUID() == u->GetGUID(); }
-
         CharmInfo* GetCharmInfo() { return m_charmInfo; }
         CharmInfo* InitCharmInfo();
         void       DeleteCharmInfo();
@@ -1500,11 +1325,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool HasSharedVision() const { return !m_sharedVision.empty(); }
         void RemoveBindSightAuras();
         void RemoveCharmAuras();
-
         Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0);
-
         bool AddAura(Aura *aur, bool handleEffects = true);
-
         void RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
         void RemoveAura(uint32 spellId, uint64 caster = 0 ,AuraRemoveMode removeMode = AURA_REMOVE_BY_DEFAULT);
         void RemoveAura(Aura * aur, AuraRemoveMode mode = AURA_REMOVE_BY_DEFAULT);
@@ -1516,7 +1338,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void RemoveAurasDueToItemSpell(Item* castItem,uint32 spellId);
         void RemoveAurasByType(AuraType auraType, uint64 casterGUID = 0, Aura * except = NULL, bool negative = true, bool positive = true);
         void RemoveNotOwnSingleTargetAuras(uint32 newPhase = 0x0);
-
         void RemoveRankAurasDueToSpell(uint32 spellId);
         bool RemoveNoStackAurasDueToAura(Aura *Aur);
         void RemoveAurasWithInterruptFlags(uint32 flag, uint32 except = NULL);
@@ -1528,7 +1349,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void RemoveArenaAuras(bool onleave = false);
         void RemoveAllAurasOnDeath();
         void DelayAura(uint32 spellId, uint64 caster, int32 delaytime);
-
         float GetResistanceBuffMods(SpellSchools school, bool positive) const { return GetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school ); }
         void SetResistanceBuffMods(SpellSchools school, bool positive, float val) { SetFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school,val); }
         void ApplyResistanceBuffModsMod(SpellSchools school, bool positive, float val, bool apply) { ApplyModSignedFloatValue(positive ? UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE+school : UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE+school, val, apply); }
@@ -1553,47 +1373,37 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         float GetPosStat(Stats stat) const { return GetFloatValue(UNIT_FIELD_POSSTAT0+stat); }
         float GetNegStat(Stats stat) const { return GetFloatValue(UNIT_FIELD_NEGSTAT0+stat); }
         float GetCreateStat(Stats stat) const { return m_createStats[stat]; }
-
         void SetCurrentCastedSpell(Spell * pSpell);
         virtual void ProhibitSpellScholl(SpellSchoolMask /*idSchoolMask*/, uint32 /*unTimeMs*/ ) { }
         void InterruptSpell(CurrentSpellTypes spellType, bool withDelayed = true, bool withInstant = true);
         void FinishSpell(CurrentSpellTypes spellType, bool ok = true);
-
         // set withDelayed to true to account delayed spells as casted
         // delayed+channeled spells are always accounted as casted
         // we can skip channeled or delayed checks using flags
         bool IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled = false, bool skipAutorepeat = false, bool isAutoshoot = false) const;
-
         // set withDelayed to true to interrupt delayed spells too
         // delayed+channeled spells are always interrupted
         void InterruptNonMeleeSpells(bool withDelayed, uint32 spellid = 0, bool withInstant = true);
-
         Spell* GetCurrentSpell(CurrentSpellTypes spellType) const { return m_currentSpells[spellType]; }
         Spell* GetCurrentSpell(uint32 spellType) const { return m_currentSpells[spellType]; }
         Spell* FindCurrentSpellBySpellId(uint32 spell_id) const;
         int32 GetCurrentSpellCastTime(uint32 spell_id) const;
-
         uint32 m_addDmgOnce;
         uint64 m_SummonSlot[MAX_SUMMON_SLOT];
         uint64 m_ObjectSlot[4];
         uint32 m_detectInvisibilityMask;
         uint32 m_invisibilityMask;
-
         uint32 m_ShapeShiftFormSpellId;
         ShapeshiftForm m_form;
         bool IsInFeralForm() const { return m_form == FORM_CAT || m_form == FORM_BEAR || m_form == FORM_DIREBEAR; }
-
         float m_modMeleeHitChance;
         float m_modRangedHitChance;
         float m_modSpellHitChance;
         int32 m_baseSpellCritChance;
-
         float m_threatModifier[MAX_SPELL_SCHOOL];
         float m_modAttackSpeedPct[3];
-
         // Event handler
         EventProcessor m_Events;
-
         // stat system
         bool HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, float amount, bool apply);
         void SetModifierValue(UnitMods unitMod, UnitModifierType modifierType, float value) { m_auraModifiersGroup[unitMod][modifierType] = value; }
@@ -1616,7 +1426,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         float GetTotalAttackPowerValue(WeaponAttackType attType) const;
         float GetWeaponDamageRange(WeaponAttackType attType ,WeaponDamageRange type) const;
         void SetBaseWeaponDamage(WeaponAttackType attType ,WeaponDamageRange damageRange, float value) { m_weaponDamage[attType][damageRange] = value; }
-
         bool isInFrontInMap(Unit const* target,float distance, float arc = M_PI) const;
         void SetInFront(Unit const* target)
         {
@@ -1624,27 +1433,22 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
                 SetOrientation(GetAngle(target));
         }
         bool isInBackInMap(Unit const* target, float distance, float arc = M_PI) const;
-
         // Visibility system
         UnitVisibility GetVisibility() const { return m_Visibility; }
         void SetVisibility(UnitVisibility x);
-
         // common function for visibility checks for player/creatures with detection code
         virtual bool canSeeOrDetect(Unit const* u, bool detect, bool inVisibleList = false, bool is3dDistance = true) const = 0;
         bool isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList = false, bool is3dDistance = true) const;
         bool canDetectInvisibilityOf(Unit const* u) const;
         bool canDetectStealthOf(Unit const* u, float distance) const;
         void SetPhaseMask(uint32 newPhaseMask, bool update);// overwrite WorldObject::SetPhaseMask
-
         // virtual functions for all world objects types
         bool isVisibleForInState(Player const* u, bool inVisibleList) const;
         // function for low level grid visibility checks in player/creature cases
         virtual bool IsVisibleInGridForPlayer(Player const* pl) const = 0;
-
         AuraList      & GetSingleCastAuras()       { return m_scAuras; }
         AuraList const& GetSingleCastAuras() const { return m_scAuras; }
         SpellImmuneList m_spellImmune[MAX_SPELL_IMMUNITY];
-
         // Threat related methods
         bool CanHaveThreatList() const;
         void AddThreat(Unit* pVictim, float threat, SpellSchoolMask schoolMask = SPELL_SCHOOL_MASK_NORMAL, SpellEntry const *threatSpell = NULL);
@@ -1656,7 +1460,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         void addHatedBy(HostilReference* pHostilReference) { m_HostilRefManager.insertFirst(pHostilReference); };
         void removeHatedBy(HostilReference* /*pHostilReference*/ ) { /* nothing to do yet */ }
         HostilRefManager& getHostilRefManager() { return m_HostilRefManager; }
-
         VisibleAuraMap const *GetVisibleAuras() { return &m_visibleAuras; }
         Aura * GetVisibleAura(uint8 slot)
         {
@@ -1667,11 +1470,9 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         }
         void SetVisibleAura(uint8 slot, Aura * aur){ m_visibleAuras[slot]=aur; }
         void RemoveVisibleAura(uint8 slot){ m_visibleAuras.erase(slot); }
-
         AuraMap      & GetAuras()       { return m_Auras; }
         AuraMap const& GetAuras() const { return m_Auras; }
         AuraEffectList const& GetAurasByType(AuraType type) const { return m_modAuras[type]; }
-
         AuraEffect * GetAuraEffect(uint32 spellId, uint8 effIndex, uint64 casterGUID = 0) const;
         Aura * GetAura(uint32 spellId, uint64 casterGUID = 0) const;
         AuraEffect * GetAura(AuraType type, uint32 family, uint32 familyFlag1 , uint32 familyFlag2=0, uint32 familyFlag3=0, uint64 casterGUID=0);
@@ -1686,45 +1487,37 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         AuraEffect* GetAuraEffect(AuraType type, SpellFamilyNames name, uint32 iconId, uint8 effIndex) const;
         uint32 GetDiseasesByCaster(uint64 casterGUID, bool remove = false);
         uint32 GetDoTsByCaster(uint64 casterGUID) const;
-
         int32 GetTotalAuraModifier(AuraType auratype) const;
         float GetTotalAuraMultiplier(AuraType auratype) const;
         int32 GetMaxPositiveAuraModifier(AuraType auratype);
         int32 GetMaxNegativeAuraModifier(AuraType auratype) const;
-
         int32 GetTotalAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
         float GetTotalAuraMultiplierByMiscMask(AuraType auratype, uint32 misc_mask) const;
         int32 GetMaxPositiveAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
         int32 GetMaxNegativeAuraModifierByMiscMask(AuraType auratype, uint32 misc_mask) const;
-
         int32 GetTotalAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
         float GetTotalAuraMultiplierByMiscValue(AuraType auratype, int32 misc_value) const;
         int32 GetMaxPositiveAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
         int32 GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_value) const;
-
         uint32 GetInterruptMask() const { return m_interruptMask; }
         void AddInterruptMask(uint32 mask) { m_interruptMask |= mask; }
         void UpdateInterruptMask();
-
         uint32 GetDisplayId() { return GetUInt32Value(UNIT_FIELD_DISPLAYID); }
         void SetDisplayId(uint32 modelId);
         uint32 GetNativeDisplayId() { return GetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID); }
         void SetNativeDisplayId(uint32 modelId) { SetUInt32Value(UNIT_FIELD_NATIVEDISPLAYID, modelId); }
         void setTransForm(uint32 spellid) { m_transform = spellid;}
         uint32 getTransForm() const { return m_transform;}
-
         DynamicObject* GetDynObject(uint32 spellId);
         void AddDynObject(DynamicObject* dynObj);
         void RemoveDynObject(uint32 spellid);
         void RemoveDynObjectWithGUID(uint64 guid) { m_dynObjGUIDs.remove(guid); }
         void RemoveAllDynObjects();
-
         GameObject* GetGameObject(uint32 spellId) const;
         void AddGameObject(GameObject* gameObj);
         void RemoveGameObject(GameObject* gameObj, bool del);
         void RemoveGameObject(uint32 spellid, bool del);
         void RemoveAllGameObjects();
-
         uint32 CalculateDamage(WeaponAttackType attType, bool normalized, bool addTotalPct);
         float GetAPMultiplier(WeaponAttackType attType, bool normalized);
         void ModifyAuraState(AuraState flag, bool apply);
@@ -1743,15 +1536,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool   isSpellCrit(Unit *pVictim, SpellEntry const *spellProto, SpellSchoolMask schoolMask, WeaponAttackType attackType = BASE_ATTACK) const;
         uint32 SpellCriticalDamageBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);
         uint32 SpellCriticalHealingBonus(SpellEntry const *spellProto, uint32 damage, Unit *pVictim);
-
         void SetLastManaUse(uint32 spellCastTime) { m_lastManaUse = spellCastTime; }
         bool IsUnderLastManaUseEffect() const;
-
         void SetContestedPvP(Player *attackedPlayer = NULL);
-
         void MeleeDamageBonus(Unit *pVictim, uint32 *damage, WeaponAttackType attType, SpellEntry const *spellProto = NULL);
         uint32 GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectType damagetype, uint32 CastingTime );
-
         void ApplySpellImmune(uint32 spellId, uint32 op, uint32 type, bool apply);
         void ApplySpellDispelImmunity(const SpellEntry * spellProto, DispelType type, bool apply);
         virtual bool IsImmunedToSpell(SpellEntry const* spellInfo);
@@ -1760,68 +1549,52 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool IsImmunedToDamage(SpellEntry const* spellInfo);
         virtual bool IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const;
                                                             // redefined in Creature
-
         uint32 CalcArmorReducedDamage(Unit* pVictim, const uint32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType=MAX_ATTACK);
         void CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEffectType damagetype, const uint32 damage, uint32 *absorb, uint32 *resist, SpellEntry const *spellInfo = NULL);
-
         void  UpdateSpeed(UnitMoveType mtype, bool forced);
         float GetSpeed( UnitMoveType mtype ) const;
         float GetSpeedRate( UnitMoveType mtype ) const { return m_speed_rate[mtype]; }
         void SetSpeed(UnitMoveType mtype, float rate, bool forced = false);
         float m_TempSpeed;
-
         void SetHover(bool on);
         bool isHover() const { return HasAuraType(SPELL_AURA_HOVER); }
-
         void _RemoveAllAuraMods();
         void _ApplyAllAuraMods();
-
         int32 CalculateSpellDamage(SpellEntry const* spellProto, uint8 effect_index, int32 basePoints, Unit const* target);
         int32 CalcSpellDuration(SpellEntry const* spellProto);
         int32 ModSpellDuration(SpellEntry const* spellProto, Unit const* target, int32 duration, bool positive);
         void  ModSpellCastTime(SpellEntry const* spellProto, int32 & castTime, Spell * spell=NULL);
         float CalculateLevelPenalty(SpellEntry const* spellProto) const;
-
         void addFollower(FollowerReference* pRef) { m_FollowingRefManager.insertFirst(pRef); }
         void removeFollower(FollowerReference* /*pRef*/ ) { /* nothing to do yet */ }
         static Unit* GetUnit(WorldObject& object, uint64 guid);
         static Player* GetPlayer(uint64 guid);
         static Creature* GetCreature(WorldObject& object, uint64 guid);
-
         MotionMaster* GetMotionMaster() { return &i_motionMaster; }
-
         bool IsStopped() const { return !(hasUnitState(UNIT_STAT_MOVING)); }
         void StopMoving();
-
         void AddUnitMovementFlag(uint32 f) { m_movementInfo.flags |= f; }
         void RemoveUnitMovementFlag(uint32 f) { m_movementInfo.flags &= ~f; }
         uint32 HasUnitMovementFlag(uint32 f) const { return m_movementInfo.flags & f; }
         uint32 GetUnitMovementFlags() const { return m_movementInfo.flags; }
         void SetUnitMovementFlags(uint32 f) { m_movementInfo.flags = f; }
-
         void SetControlled(bool apply, UnitState state);
-
         void AddComboPointHolder(uint32 lowguid) { m_ComboPointHolders.insert(lowguid); }
         void RemoveComboPointHolder(uint32 lowguid) { m_ComboPointHolders.erase(lowguid); }
         void ClearComboPointHolders();
-
         ///----------Pet responses methods-----------------
         void SendPetCastFail(uint32 spellid, SpellCastResult msg);
         void SendPetActionFeedback (uint8 msg);
         void SendPetTalk (uint32 pettalk);
         void SendPetAIReaction(uint64 guid);
         ///----------End of Pet responses methods----------
-
         void propagateSpeedChange() { GetMotionMaster()->propagateSpeedChange(); }
-
         // reactive attacks
         void ClearAllReactives();
         void StartReactiveTimer( ReactiveType reactive ) { m_reactiveTimer[reactive] = REACTIVE_TIMER_START;}
         void UpdateReactives(uint32 p_time);
-
         // group updates
         void UpdateAuraForGroup(uint8 slot);
-
         // proc trigger system
         bool CanProc(){return !m_procDeep;}
         void SetCantProc( bool apply)
@@ -1834,19 +1607,16 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
                 --m_procDeep;
             }
         }
-
         // pet auras
         typedef std::set<PetAura const*> PetAuraSet;
         PetAuraSet m_petAuras;
         void AddPetAura(PetAura const* petSpell);
         void RemovePetAura(PetAura const* petSpell);
-
         // relocation notification
         void SetToNotify();
         bool m_Notified;
         int32 m_NotifyListPos;
         float oldX, oldY;
-
         void SetReducedThreatPercent(uint32 pct, uint64 guid)
         {
             m_reducedThreatPercent = pct;
@@ -1854,7 +1624,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         }
         uint32 GetReducedThreatPercent() { return m_reducedThreatPercent; }
         Unit *GetMisdirectionTarget() { return m_misdirectionTargetGUID ? GetUnit(*this, m_misdirectionTargetGUID) : NULL; }
-
         bool IsAIEnabled, NeedChangeAI;
         MovementInfo m_movementInfo;
         bool CreateVehicleKit(uint32 id);
@@ -1869,101 +1638,70 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         float GetTransOffsetO() const { return m_movementInfo.t_o; }
         uint32 GetTransTime()   const { return m_movementInfo.t_time; }
         int8 GetTransSeat()     const { return m_movementInfo.t_seat; }
-
         bool m_ControlledByPlayer;
-
         void EnterVehicle(Unit *base, int8 seatId = -1) { EnterVehicle(base->GetVehicleKit(), seatId); }
         void EnterVehicle(Vehicle *vehicle, int8 seatId = -1);
         void ExitVehicle();
         void ChangeSeat(int8 seatId, bool next = true);
-
         // Transports
         Transport * GetTransport() const { return m_transport; }
         void SetTransport(Transport * t) { m_transport = t; }
-
         void BuildMovementPacket(ByteBuffer *data) const;
-
         bool isMoving() const   { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_MOVING); }
         bool isTurning() const  { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_TURNING); }
         bool canFly() const     { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FLY_MODE); }
         bool IsFlying() const   { return m_movementInfo.HasMovementFlag(MOVEMENTFLAG_FLYING); }
         void SetFlying(bool apply);
-
         void RewardRage( uint32 damage, uint32 weaponSpeedHitFactor, bool attacker );
-
         virtual float GetFollowAngle() const { return M_PI/2; }
-
         void OutDebugInfo() const;
         virtual bool isBeingLoaded() const { return false;}
     protected:
         explicit Unit ();
-
         UnitAI *i_AI, *i_disabledAI;
-
         // Transports
         Transport * m_transport;
-
         void _UpdateSpells(uint32 time);
         void _DeleteAuras();
-
         void _UpdateAutoRepeatSpell();
-
         bool m_AutoRepeatFirstCast;
-
         uint32 m_attackTimer[MAX_ATTACK];
-
         float m_createStats[MAX_STATS];
-
         AttackerSet m_attackers;
         Unit* m_attacking;
-
         DeathState m_deathState;
-
         AuraMap m_Auras;
         AuraMap::iterator m_AurasUpdateIterator;
         uint32 m_removedAurasCount;
         int32 m_procDeep;
-
         typedef std::list<uint64> DynObjectGUIDs;
         DynObjectGUIDs m_dynObjGUIDs;
-
         typedef std::list<GameObject*> GameObjectList;
         GameObjectList m_gameObj;
         bool m_isSorted;
         uint32 m_transform;
-
         AuraEffectList m_modAuras[TOTAL_AURAS];
         AuraList m_scAuras;                        // casted singlecast auras
         AuraList m_interruptableAuras;
         AuraList m_removedAuras;
         AuraStateAurasMap m_auraStateAuras;                 // Used for improve performance of aura state checks on aura apply/remove
         uint32 m_interruptMask;
-
         float m_auraModifiersGroup[UNIT_MOD_END][MODIFIER_TYPE_END];
         float m_weaponDamage[MAX_ATTACK][2];
         bool m_canModifyStats;
         VisibleAuraMap m_visibleAuras;
-
         float m_speed_rate[MAX_MOVE_TYPE];
-
         CharmInfo *m_charmInfo;
         SharedVisionList m_sharedVision;
-
         virtual SpellSchoolMask GetMeleeDamageSchoolMask() const;
-
         MotionMaster i_motionMaster;
         //uint32 m_unit_movement_flags;
-
         uint32 m_reactiveTimer[MAX_REACTIVE];
         uint32 m_regenTimer;
-
         ThreatManager m_ThreatManager;
-
         Vehicle *m_vehicle;
         Vehicle *m_vehicleKit;
-
         uint32 m_unitTypeMask;
-
     private:
         bool IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura* aura, SpellEntry const * procSpell, uint32 procFlag, uint32 procExtra, WeaponAttackType attType, bool isVictim, bool active, SpellProcEventEntry const *& spellProcEvent );
         bool HandleDummyAuraProc(   Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 procFlag, uint32 procEx, uint32 cooldown);
@@ -1976,34 +1714,25 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
         bool HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, AuraEffect* triggeredByAura, SpellEntry const *procSpell, uint32 cooldown);
         bool HandleAuraRaidProcFromChargeWithValue(AuraEffect* triggeredByAura);
         bool HandleAuraRaidProcFromCharge(AuraEffect* triggeredByAura);
-
         void SetFeared(bool apply);
         void SetConfused(bool apply);
         void SetStunned(bool apply);
         void SetRooted(bool apply);
-
         uint32 m_state;                                     // Even derived shouldn't modify
         uint32 m_CombatTimer;
         uint32 m_lastManaUse;                               // msecs
-
         Spell* m_currentSpells[CURRENT_MAX_SPELL];
-
         UnitVisibility m_Visibility;
-
         Diminishing m_Diminishing;
         // Manage all Units threatening us
 //        ThreatManager m_ThreatManager;
         // Manage all Units that are threatened by us
         HostilRefManager m_HostilRefManager;
-
         FollowerRefManager m_FollowingRefManager;
-
         ComboPointHolderSet m_ComboPointHolders;
-
         uint32 m_reducedThreatPercent;
         uint64 m_misdirectionTargetGUID;
 };
-
 namespace Trinity
 {
     template<class T>
@@ -2017,6 +1746,5 @@ namespace Trinity
         }
     }
 }
-
 #endif
 
diff --git a/src/game/UnitAI.cpp b/src/game/UnitAI.cpp
index 728e6f36916..a295d2d29b7 100644
--- a/src/game/UnitAI.cpp
+++ b/src/game/UnitAI.cpp
@@ -17,31 +17,26 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "UnitAI.h"
 #include "Player.h"
 #include "Creature.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
 #include "CreatureAIImpl.h"
-
 void UnitAI::AttackStart(Unit *victim)
 {
     if(victim && me->Attack(victim, true))
         me->GetMotionMaster()->MoveChase(victim);
 }
-
 void UnitAI::AttackStartCaster(Unit *victim, float dist)
 {
     if(victim && me->Attack(victim, false))
         me->GetMotionMaster()->MoveChase(victim, dist);
 }
-
 void UnitAI::DoMeleeAttackIfReady()
 {
     if(me->hasUnitState(UNIT_STAT_CASTING))
         return;
-
     //Make sure our attack is ready and we aren't currently casting before checking distance
     if (me->isAttackReady())
     {
@@ -62,12 +57,10 @@ void UnitAI::DoMeleeAttackIfReady()
         }
     }
 }
-
 bool UnitAI::DoSpellAttackIfReady(uint32 spell)
 {
     if(me->hasUnitState(UNIT_STAT_CASTING))
         return true;
-
     if(me->isAttackReady())
     {
         if(me->IsWithinCombatRange(me->getVictim(), GetSpellMaxRange(spell, false)))
@@ -80,15 +73,12 @@ bool UnitAI::DoSpellAttackIfReady(uint32 spell)
     }
     return true;
 }
-
 inline bool SelectTargetHelper(const Unit * me, const Unit * target, const bool &playerOnly, const float &dist, const int32 &aura)
 {
     if(playerOnly && (!target || target->GetTypeId() != TYPEID_PLAYER))
         return false;
-
     if(dist && (!me || !target || !me->IsWithinCombatRange(target, dist)))
         return false;
-
     if(aura)
     {
         if(aura > 0)
@@ -102,10 +92,8 @@ inline bool SelectTargetHelper(const Unit * me, const Unit * target, const bool
                 return false;
         }
     }
-
     return true;
 }
-
 struct TargetDistanceOrder : public std::binary_function<const Unit *, const Unit *, bool>
 {
     const Unit * me;
@@ -116,7 +104,6 @@ struct TargetDistanceOrder : public std::binary_function<const Unit *, const Uni
         return (me->GetExactDistSq(_Left) < me->GetExactDistSq(_Right));
     }
 };
-
 Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float dist, bool playerOnly, int32 aura)
 {
     if(targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST)
@@ -124,17 +111,13 @@ Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float
         std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
         if(position >= m_threatlist.size())
             return NULL;
-
         std::list<Unit*> targetList;
         for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
             if(SelectTargetHelper(me, (*itr)->getTarget(), playerOnly, dist, aura))
                 targetList.push_back((*itr)->getTarget());
-
         if(position >= targetList.size())
             return NULL;
-
         targetList.sort(TargetDistanceOrder(me));
-
         if(targetType == SELECT_TARGET_NEAREST)
         {
             std::list<Unit*>::iterator i = targetList.begin();
@@ -176,17 +159,14 @@ Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float
                     }
                 }
             }
-
             if(SelectTargetHelper(me, (*i)->getTarget(), playerOnly, dist, aura))
                 return (*i)->getTarget();
             else
                 m_threatlist.erase(i);
         }
     }
-
     return NULL;
 }
-
 void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAggroTarget targetType, float dist, bool playerOnly, int32 aura)
 {
     if(targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST)
@@ -194,11 +174,9 @@ void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAg
         std::list<HostilReference*> &m_threatlist = me->getThreatManager().getThreatList();
         if(m_threatlist.empty())
             return;
-
         for(std::list<HostilReference*>::iterator itr = m_threatlist.begin(); itr!= m_threatlist.end(); ++itr)
             if(SelectTargetHelper(me, (*itr)->getTarget(), playerOnly, dist, aura))
                 targetList.push_back((*itr)->getTarget());
-
         targetList.sort(TargetDistanceOrder(me));
         targetList.resize(num);
         if(targetType == SELECT_TARGET_FARTHEST)
@@ -221,7 +199,6 @@ void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAg
                 if(targetType == SELECT_TARGET_RANDOM)
                     advance(i, rand()%m_threatlist.size());
             }
-
             if(SelectTargetHelper(me, (*i)->getTarget(), playerOnly, dist, aura))
             {
                 targetList.push_back((*i)->getTarget());
@@ -231,12 +208,10 @@ void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAg
         }
     }
 }
-
 float UnitAI::DoGetSpellMaxRange(uint32 spellId, bool positive)
 {
     return GetSpellMaxRange(spellId, positive);
 }
-
 void UnitAI::DoCast(uint32 spellId)
 {
     Unit *target = NULL;
@@ -270,36 +245,28 @@ void UnitAI::DoCast(uint32 spellId)
             break;
         }
     }
-
     if(target)
         me->CastSpell(target, spellId, false);
 }
-
 #define UPDATE_TARGET(a) {if(AIInfo->target<a) AIInfo->target=a;}
-
 void UnitAI::FillAISpellInfo()
 {
     AISpellInfo = new AISpellInfoType[GetSpellStore()->GetNumRows()];
-
     AISpellInfoType *AIInfo = AISpellInfo;
     const SpellEntry * spellInfo;
-
     for(uint32 i = 0; i < GetSpellStore()->GetNumRows(); ++i, ++AIInfo)
     {
         spellInfo = GetSpellStore()->LookupEntry(i);
         if(!spellInfo)
             continue;
-
         if(spellInfo->Attributes & SPELL_ATTR_CASTABLE_WHILE_DEAD)
             AIInfo->condition = AICOND_DIE;
         else if(IsPassiveSpell(i) || GetSpellDuration(spellInfo) == -1)
             AIInfo->condition = AICOND_AGGRO;
         else
             AIInfo->condition = AICOND_COMBAT;
-
         if(AIInfo->cooldown < spellInfo->RecoveryTime)
             AIInfo->cooldown = spellInfo->RecoveryTime;
-
         if(!GetSpellMaxRange(spellInfo, false))
             UPDATE_TARGET(AITARGET_SELF)
         else
@@ -307,13 +274,11 @@ void UnitAI::FillAISpellInfo()
             for(uint32 j = 0; j < 3; ++j)
             {
                 uint32 targetType = spellInfo->EffectImplicitTargetA[j];
-
                 if(targetType == TARGET_UNIT_TARGET_ENEMY
                     || targetType == TARGET_DST_TARGET_ENEMY)
                     UPDATE_TARGET(AITARGET_VICTIM)
                 else if(targetType == TARGET_UNIT_AREA_ENEMY_DST)
                     UPDATE_TARGET(AITARGET_ENEMY)
-
                 if(spellInfo->Effect[j] == SPELL_EFFECT_APPLY_AURA)
                 {
                     if(targetType == TARGET_UNIT_TARGET_ENEMY)
@@ -329,14 +294,11 @@ void UnitAI::FillAISpellInfo()
             AIInfo->maxRange = srange->maxRangeHostile * 3 / 4;
     }
 }
-
 //Enable PlayerAI when charmed
 void PlayerAI::OnCharmed(bool apply) { me->IsAIEnabled = apply; }
-
 void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/)
 {
     Creature *charmer = (Creature*)me->GetCharmer();
-
     //kill self if charm aura has infinite duration
     if(charmer->IsInEvadeMode())
     {
@@ -348,10 +310,8 @@ void SimpleCharmedAI::UpdateAI(const uint32 /*diff*/)
                 return;
             }
     }
-
     if(!charmer->isInCombat())
         me->GetMotionMaster()->MoveFollow(charmer, PET_FOLLOW_DIST, me->GetFollowAngle());
-
     Unit *target = me->getVictim();
     if(!target || !charmer->canAttack(target))
         AttackStart(charmer->SelectNearestTarget());
diff --git a/src/game/UnitAI.h b/src/game/UnitAI.h
index c5e02b07d1b..93992724c08 100644
--- a/src/game/UnitAI.h
+++ b/src/game/UnitAI.h
@@ -17,18 +17,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_UNITAI_H
 #define TRINITY_UNITAI_H
-
 #include "Platform/Define.h"
 #include <list>
 #include "Unit.h"
-
 class Unit;
 class Player;
 struct AISpellInfoType;
-
 //Selection method used by SelectTarget
 enum SelectAggroTarget
 {
@@ -38,7 +34,6 @@ enum SelectAggroTarget
     SELECT_TARGET_NEAREST,
     SELECT_TARGET_FARTHEST,
 };
-
 class TRINITY_DLL_SPEC UnitAI
 {
     protected:
@@ -48,54 +43,40 @@ class TRINITY_DLL_SPEC UnitAI
         virtual bool CanAIAttack(const Unit *who) const { return true; }
         virtual void AttackStart(Unit *);
         virtual void UpdateAI(const uint32 diff) = 0;
-
         virtual void InitializeAI() { if(!me->isDead()) Reset(); }
-
         virtual void Reset() {};
-
         // Called when unit is charmed
         virtual void OnCharmed(bool apply) = 0;
-
         // Pass parameters between AI
         virtual void DoAction(const int32 param = 0) {}
         virtual uint32 GetData(uint32 id = 0) { return 0; }
         virtual void SetData(uint32 id, uint32 value) {}
         virtual void SetGUID(const uint64 &guid, int32 id = 0) {}
         virtual uint64 GetGUID(int32 id = 0) { return 0; }
-
         Unit* SelectTarget(SelectAggroTarget target, uint32 position = 0, float dist = 0, bool playerOnly = false, int32 aura = 0);
         void SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAggroTarget target, float dist = 0, bool playerOnly = false, int32 aura = 0);
-
         void AttackStartCaster(Unit *victim, float dist);
-
         void DoCast(uint32 spellId);
         void DoCast(Unit* victim, uint32 spellId, bool triggered = false);
         void DoCastVictim(uint32 spellId, bool triggered = false);
         void DoCastAOE(uint32 spellId, bool triggered = false);
-
         float DoGetSpellMaxRange(uint32 spellId, bool positive = false);
-
         void DoMeleeAttackIfReady();
         bool DoSpellAttackIfReady(uint32 spell);
-
         static AISpellInfoType *AISpellInfo;
         static void FillAISpellInfo();
 };
-
 class TRINITY_DLL_SPEC PlayerAI : public UnitAI
 {
     protected:
         Player* const me;
     public:
         explicit PlayerAI(Player *p) : UnitAI((Unit*)p), me(p) {}
-
         void OnCharmed(bool apply);
 };
-
 class TRINITY_DLL_SPEC SimpleCharmedAI : public PlayerAI
 {
     public:
         void UpdateAI(const uint32 diff);
 };
-
 #endif
diff --git a/src/game/UnitEvents.h b/src/game/UnitEvents.h
index 67f8d01f0d6..a4046ea46b8 100644
--- a/src/game/UnitEvents.h
+++ b/src/game/UnitEvents.h
@@ -17,58 +17,41 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef _UNITEVENTS
 #define _UNITEVENTS
-
 #include "Common.h"
-
 class ThreatContainer;
 class ThreatManager;
 class HostilReference;
-
 //==============================================================
 //==============================================================
-
 enum UNIT_EVENT_TYPE
 {
     // Player/Pet changed on/offline status
     UEV_THREAT_REF_ONLINE_STATUS        = 1<<0,
-
     // Threat for Player/Pet changed
     UEV_THREAT_REF_THREAT_CHANGE        = 1<<1,
-
     // Player/Pet will be removed from list (dead) [for internal use]
     UEV_THREAT_REF_REMOVE_FROM_LIST     = 1<<2,
-
     // Player/Pet entered/left  water or some other place where it is/was not accessible for the creature
     UEV_THREAT_REF_ASSECCIBLE_STATUS    = 1<<3,
-
     // Threat list is going to be sorted (if dirty flag is set)
     UEV_THREAT_SORT_LIST                = 1<<4,
-
     // New target should be fetched, could tbe the current target as well
     UEV_THREAT_SET_NEXT_TARGET          = 1<<5,
-
     // A new victim (target) was set. Could be NULL
     UEV_THREAT_VICTIM_CHANGED           = 1<<6,
-
     // Future use
     //UEV_UNIT_KILLED                   = 1<<7,
-
     //Future use
     //UEV_UNIT_HEALTH_CHANGE            = 1<<8,
 };
-
 #define UEV_THREAT_REF_EVENT_MASK ( UEV_THREAT_REF_ONLINE_STATUS | UEV_THREAT_REF_THREAT_CHANGE | UEV_THREAT_REF_REMOVE_FROM_LIST | UEV_THREAT_REF_ASSECCIBLE_STATUS)
 #define UEV_THREAT_MANAGER_EVENT_MASK (UEV_THREAT_SORT_LIST | UEV_THREAT_SET_NEXT_TARGET | UEV_THREAT_VICTIM_CHANGED)
 #define UEV_ALL_EVENT_MASK (0xffffffff)
-
 // Future use
 //#define UEV_UNIT_EVENT_MASK (UEV_UNIT_KILLED | UEV_UNIT_HEALTH_CHANGE)
-
 //==============================================================
-
 class TRINITY_DLL_SPEC UnitBaseEvent
 {
     private:
@@ -77,13 +60,9 @@ class TRINITY_DLL_SPEC UnitBaseEvent
         UnitBaseEvent(uint32 pType) { iType = pType; }
         uint32 getType() const { return iType; }
         bool matchesTypeMask(uint32 pMask) const { return iType & pMask; }
-
         void setType(uint32 pType) { iType = pType; }
-
 };
-
 //==============================================================
-
 class TRINITY_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent
 {
     private:
@@ -97,30 +76,18 @@ class TRINITY_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent
         ThreatManager* iThreatManager;
     public:
         ThreatRefStatusChangeEvent(uint32 pType) : UnitBaseEvent(pType) { iHostilReference = NULL; }
-
         ThreatRefStatusChangeEvent(uint32 pType, HostilReference* pHostilReference) : UnitBaseEvent(pType) { iHostilReference = pHostilReference; }
-
         ThreatRefStatusChangeEvent(uint32 pType, HostilReference* pHostilReference, float pValue) : UnitBaseEvent(pType) { iHostilReference = pHostilReference; iFValue = pValue; }
-
         ThreatRefStatusChangeEvent(uint32 pType, HostilReference* pHostilReference, bool pValue) : UnitBaseEvent(pType) { iHostilReference = pHostilReference; iBValue = pValue; }
-
         int32 getIValue() const { return iIValue; }
-
         float getFValue() const { return iFValue; }
-
         bool getBValue() const { return iBValue; }
-
         void setBValue(bool pValue) { iBValue = pValue; }
-
         HostilReference* getReference() const { return iHostilReference; }
-
         void setThreatManager(ThreatManager* pThreatManager) { iThreatManager = pThreatManager; }
-
         ThreatManager* getThreatManager() const { return iThreatManager; }
 };
-
 //==============================================================
-
 class TRINITY_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent
 {
     private:
@@ -128,12 +95,9 @@ class TRINITY_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent
     public:
         ThreatManagerEvent(uint32 pType) : ThreatRefStatusChangeEvent(pType) {}
         ThreatManagerEvent(uint32 pType, HostilReference* pHostilReference) : ThreatRefStatusChangeEvent(pType, pHostilReference) {}
-
         void setThreatContainer(ThreatContainer* pThreatContainer) { iThreatContainer = pThreatContainer; }
-
         ThreatContainer* getThreatContainer() const { return iThreatContainer; }
 };
-
 //==============================================================
 #endif
 
diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp
index e461d63e248..7b2c86cd49a 100644
--- a/src/game/UpdateData.cpp
+++ b/src/game/UpdateData.cpp
@@ -17,7 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "ByteBuffer.h"
 #include "WorldPacket.h"
@@ -26,35 +25,28 @@
 #include "Opcodes.h"
 #include "World.h"
 #include <zlib/zlib.h>
-
 UpdateData::UpdateData() : m_blockCount(0)
 {
 }
-
 void UpdateData::AddOutOfRangeGUID(std::set<uint64>& guids)
 {
     m_outOfRangeGUIDs.insert(guids.begin(),guids.end());
 }
-
 void UpdateData::AddOutOfRangeGUID(const uint64 &guid)
 {
     m_outOfRangeGUIDs.insert(guid);
 }
-
 void UpdateData::AddUpdateBlock(const ByteBuffer &block)
 {
     m_data.append(block);
     ++m_blockCount;
 }
-
 void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
 {
     z_stream c_stream;
-
     c_stream.zalloc = (alloc_func)0;
     c_stream.zfree = (free_func)0;
     c_stream.opaque = (voidpf)0;
-
     // default Z_BEST_SPEED (1)
     int z_res = deflateInit(&c_stream, sWorld.getConfig(CONFIG_COMPRESSION));
     if (z_res != Z_OK)
@@ -63,12 +55,10 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
         *dst_size = 0;
         return;
     }
-
     c_stream.next_out = (Bytef*)dst;
     c_stream.avail_out = *dst_size;
     c_stream.next_in = (Bytef*)src;
     c_stream.avail_in = (uInt)src_size;
-
     z_res = deflate(&c_stream, Z_NO_FLUSH);
     if (z_res != Z_OK)
     {
@@ -76,14 +66,12 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
         *dst_size = 0;
         return;
     }
-
     if (c_stream.avail_in != 0)
     {
         sLog.outError("Can't compress update packet (zlib: deflate not greedy)");
         *dst_size = 0;
         return;
     }
-
     z_res = deflate(&c_stream, Z_FINISH);
     if (z_res != Z_STREAM_END)
     {
@@ -91,7 +79,6 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
         *dst_size = 0;
         return;
     }
-
     z_res = deflateEnd(&c_stream);
     if (z_res != Z_OK)
     {
@@ -99,43 +86,32 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
         *dst_size = 0;
         return;
     }
-
     *dst_size = c_stream.total_out;
 }
-
 bool UpdateData::BuildPacket(WorldPacket *packet)
 {
     ASSERT(packet->empty());                                // shouldn't happen
-
     ByteBuffer buf(4 + (m_outOfRangeGUIDs.empty() ? 0 : 1 + 4 + 9 * m_outOfRangeGUIDs.size()) + m_data.wpos());
-
     buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount);
-
     if(!m_outOfRangeGUIDs.empty())
     {
         buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS;
         buf << (uint32) m_outOfRangeGUIDs.size();
-
         for(std::set<uint64>::const_iterator i = m_outOfRangeGUIDs.begin(); i != m_outOfRangeGUIDs.end(); ++i)
         {
             buf.appendPackGUID(*i);
         }
     }
-
     buf.append(m_data);
-
     size_t pSize = buf.wpos();                              // use real used data size
-
     if (pSize > 100 )                                       // compress large packets
     {
         uint32 destsize = compressBound(pSize);
         packet->resize( destsize + sizeof(uint32) );
-
         packet->put<uint32>(0, pSize);
         Compress(const_cast<uint8*>(packet->contents()) + sizeof(uint32), &destsize, (void*)buf.contents(), pSize);
         if (destsize == 0)
             return false;
-
         packet->resize( destsize + sizeof(uint32) );
         packet->SetOpcode( SMSG_COMPRESSED_UPDATE_OBJECT );
     }
@@ -144,10 +120,8 @@ bool UpdateData::BuildPacket(WorldPacket *packet)
         packet->append( buf );
         packet->SetOpcode( SMSG_UPDATE_OBJECT );
     }
-
     return true;
 }
-
 void UpdateData::Clear()
 {
     m_data.clear();
diff --git a/src/game/UpdateData.h b/src/game/UpdateData.h
index 282ea566c7a..d5052d50315 100644
--- a/src/game/UpdateData.h
+++ b/src/game/UpdateData.h
@@ -17,13 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __UPDATEDATA_H
 #define __UPDATEDATA_H
-
 #include "ByteBuffer.h"
 class WorldPacket;
-
 enum OBJECT_UPDATE_TYPE
 {
     UPDATETYPE_VALUES               = 0,
@@ -33,7 +30,6 @@ enum OBJECT_UPDATE_TYPE
     UPDATETYPE_OUT_OF_RANGE_OBJECTS = 4,
     UPDATETYPE_NEAR_OBJECTS         = 5
 };
-
 enum OBJECT_UPDATE_FLAGS
 {
     UPDATEFLAG_NONE         = 0x0000,
@@ -48,26 +44,21 @@ enum OBJECT_UPDATE_FLAGS
     UPDATEFLAG_POSITION     = 0x0100,
     UPDATEFLAG_ROTATION     = 0x0200
 };
-
 class UpdateData
 {
     public:
         UpdateData();
-
         void AddOutOfRangeGUID(std::set<uint64>& guids);
         void AddOutOfRangeGUID(const uint64 &guid);
         void AddUpdateBlock(const ByteBuffer &block);
         bool BuildPacket(WorldPacket *packet);
         bool HasData() { return m_blockCount > 0 || !m_outOfRangeGUIDs.empty(); }
         void Clear();
-
         std::set<uint64> const& GetOutOfRangeGUIDs() const { return m_outOfRangeGUIDs; }
-
     protected:
         uint32 m_blockCount;
         std::set<uint64> m_outOfRangeGUIDs;
         ByteBuffer m_data;
-
         void Compress(void* dst, uint32 *dst_size, void* src, int src_size);
 };
 #endif
diff --git a/src/game/UpdateFields.h b/src/game/UpdateFields.h
index 8fa05a4cb86..7d245c9a41f 100644
--- a/src/game/UpdateFields.h
+++ b/src/game/UpdateFields.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef _UPDATEFIELDS_AUTO_H
 #define _UPDATEFIELDS_AUTO_H
-
 // Auto generated for version 3, 1, 3, 9947
-
 enum EObjectFields
 {
     OBJECT_FIELD_GUID                         = 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
@@ -32,7 +29,6 @@ enum EObjectFields
     OBJECT_FIELD_PADDING                      = 0x0005, // Size: 1, Type: INT, Flags: NONE
     OBJECT_END                                = 0x0006,
 };
-
 enum EItemFields
 {
     ITEM_FIELD_OWNER                          = OBJECT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
@@ -75,7 +71,6 @@ enum EItemFields
     ITEM_FIELD_PAD                            = OBJECT_END + 0x0039, // Size: 1, Type: INT, Flags: NONE
     ITEM_END                                  = OBJECT_END + 0x003A,
 };
-
 enum EContainerFields
 {
     CONTAINER_FIELD_NUM_SLOTS                 = ITEM_END + 0x0000, // Size: 1, Type: INT, Flags: PUBLIC
@@ -83,7 +78,6 @@ enum EContainerFields
     CONTAINER_FIELD_SLOT_1                    = ITEM_END + 0x0002, // Size: 72, Type: LONG, Flags: PUBLIC
     CONTAINER_END                             = ITEM_END + 0x004A,
 };
-
 enum EUnitFields
 {
     UNIT_FIELD_CHARM                          = OBJECT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
@@ -176,7 +170,6 @@ enum EUnitFields
     UNIT_FIELD_HOVERHEIGHT                    = OBJECT_END + 0x008C, // Size: 1, Type: FLOAT, Flags: PUBLIC
     UNIT_FIELD_PADDING                        = OBJECT_END + 0x008D, // Size: 1, Type: INT, Flags: NONE
     UNIT_END                                  = OBJECT_END + 0x008E,
-
     PLAYER_DUEL_ARBITER                       = UNIT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
     PLAYER_FLAGS                              = UNIT_END + 0x0002, // Size: 1, Type: INT, Flags: PUBLIC
     PLAYER_GUILDID                            = UNIT_END + 0x0003, // Size: 1, Type: INT, Flags: PUBLIC
@@ -390,7 +383,6 @@ enum EUnitFields
     PLAYER_GLYPHS_ENABLED                     = UNIT_END + 0x0479, // Size: 1, Type: INT, Flags: PRIVATE
     PLAYER_END                                = UNIT_END + 0x047A,
 };
-
 enum EGameObjectFields
 {
     OBJECT_FIELD_CREATED_BY                   = OBJECT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
@@ -403,7 +395,6 @@ enum EGameObjectFields
     GAMEOBJECT_BYTES_1                        = OBJECT_END + 0x000B, // Size: 1, Type: BYTES, Flags: PUBLIC
     GAMEOBJECT_END                            = OBJECT_END + 0x000C,
 };
-
 enum EDynamicObjectFields
 {
     DYNAMICOBJECT_CASTER                      = OBJECT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
@@ -417,7 +408,6 @@ enum EDynamicObjectFields
     DYNAMICOBJECT_CASTTIME                    = OBJECT_END + 0x0009, // Size: 1, Type: INT, Flags: PUBLIC
     DYNAMICOBJECT_END                         = OBJECT_END + 0x000A,
 };
-
 enum ECorpseFields
 {
     CORPSE_FIELD_OWNER                        = OBJECT_END + 0x0000, // Size: 2, Type: LONG, Flags: PUBLIC
diff --git a/src/game/UpdateMask.h b/src/game/UpdateMask.h
index 66a6947fc37..895b27dd348 100644
--- a/src/game/UpdateMask.h
+++ b/src/game/UpdateMask.h
@@ -17,107 +17,84 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef __UPDATEMASK_H
 #define __UPDATEMASK_H
-
 #include "UpdateFields.h"
 #include "Errors.h"
-
 class UpdateMask
 {
     public:
         UpdateMask( ) : mCount( 0 ), mBlocks( 0 ), mUpdateMask( 0 ) { }
         UpdateMask( const UpdateMask& mask ) : mUpdateMask( 0 ) { *this = mask; }
-
         ~UpdateMask( )
         {
             if(mUpdateMask)
                 delete [] mUpdateMask;
         }
-
         void SetBit (uint32 index)
         {
             ( (uint8 *)mUpdateMask )[ index >> 3 ] |= 1 << ( index & 0x7 );
         }
-
         void UnsetBit (uint32 index)
         {
             ( (uint8 *)mUpdateMask )[ index >> 3 ] &= (0xff ^ (1 <<  ( index & 0x7 ) ) );
         }
-
         bool GetBit (uint32 index) const
         {
             return ( ( (uint8 *)mUpdateMask)[ index >> 3 ] & ( 1 << ( index & 0x7 ) )) != 0;
         }
-
         uint32 GetBlockCount() const { return mBlocks; }
         uint32 GetLength() const { return mBlocks << 2; }
         uint32 GetCount() const { return mCount; }
         uint8* GetMask() { return (uint8*)mUpdateMask; }
-
         void SetCount (uint32 valuesCount)
         {
             if(mUpdateMask)
                 delete [] mUpdateMask;
-
             mCount = valuesCount;
             mBlocks = (valuesCount + 31) / 32;
-
             mUpdateMask = new uint32[mBlocks];
             memset(mUpdateMask, 0, mBlocks << 2);
         }
-
         void Clear()
         {
             if (mUpdateMask)
                 memset(mUpdateMask, 0, mBlocks << 2);
         }
-
         UpdateMask& operator = ( const UpdateMask& mask )
         {
             SetCount(mask.mCount);
             memcpy(mUpdateMask, mask.mUpdateMask, mBlocks << 2);
-
             return *this;
         }
-
         void operator &= ( const UpdateMask& mask )
         {
             ASSERT(mask.mCount <= mCount);
             for (uint32 i = 0; i < mBlocks; ++i)
                 mUpdateMask[i] &= mask.mUpdateMask[i];
         }
-
         void operator |= ( const UpdateMask& mask )
         {
             ASSERT(mask.mCount <= mCount);
             for (uint32 i = 0; i < mBlocks; ++i)
                 mUpdateMask[i] |= mask.mUpdateMask[i];
         }
-
         UpdateMask operator & ( const UpdateMask& mask ) const
         {
             ASSERT(mask.mCount <= mCount);
-
             UpdateMask newmask;
             newmask = *this;
             newmask &= mask;
-
             return newmask;
         }
-
         UpdateMask operator | ( const UpdateMask& mask ) const
         {
             ASSERT(mask.mCount <= mCount);
-
             UpdateMask newmask;
             newmask = *this;
             newmask |= mask;
-
             return newmask;
         }
-
     private:
         uint32 mCount;
         uint32 mBlocks;
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index 50236430bbe..a8c8d5fa785 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #include "Common.h"
 #include "Log.h"
 #include "ObjectMgr.h"
@@ -23,10 +22,8 @@
 #include "Unit.h"
 #include "Util.h"
 #include "WorldPacket.h"
-
 #include "CreatureAI.h"
 #include "ZoneScript.h"
-
 Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleInfo(vehInfo), m_usableSeatNum(0)
 {
     for(uint32 i = 0; i < 8; ++i)
@@ -37,17 +34,15 @@ Vehicle::Vehicle(Unit *unit, VehicleEntry const *vehInfo) : me(unit), m_vehicleI
                 m_Seats.insert(std::make_pair(i, VehicleSeat(veSeat)));
                 if(veSeat->IsUsable())
                     ++m_usableSeatNum;
-            }                    
+            }
     }
     assert(!m_Seats.empty());
 }
-
 Vehicle::~Vehicle()
 {
     for(SeatMap::const_iterator itr = m_Seats.begin(); itr != m_Seats.end(); ++itr)
         assert(!itr->second.passenger);
 }
-
 void Vehicle::Install()
 {
     if(Creature *cre = dynamic_cast<Creature*>(me))
@@ -68,14 +63,11 @@ void Vehicle::Install()
             {
                 if(!cre->m_spells[i])
                     continue;
-
                 SpellEntry const *spellInfo = sSpellStore.LookupEntry(cre->m_spells[i]);
                 if(!spellInfo)
                     continue;
-
                 if(spellInfo->powerType == POWER_MANA)
                     break;
-
                 if(spellInfo->powerType == POWER_ENERGY)
                 {
                     me->setPowerType(POWER_ENERGY);
@@ -85,10 +77,8 @@ void Vehicle::Install()
             }
         }
     }
-
     Reset();
 }
-
 void Vehicle::InstallAllAccessories()
 {
     switch(me->GetEntry())
@@ -117,7 +107,6 @@ void Vehicle::InstallAllAccessories()
         case 33214:InstallAccessory(33218,1,false);break; // Mechanolift 304-A
     }
 }
-
 void Vehicle::Uninstall()
 {
     sLog.outDebug("Vehicle::Uninstall %u", me->GetEntry());
@@ -127,7 +116,6 @@ void Vehicle::Uninstall()
                 ((TempSummon*)passenger)->UnSummon();
     RemoveAllPassengers();
 }
-
 void Vehicle::Die()
 {
     sLog.outDebug("Vehicle::Die %u", me->GetEntry());
@@ -137,7 +125,6 @@ void Vehicle::Die()
                 passenger->setDeathState(JUST_DIED);
     RemoveAllPassengers();
 }
-
 void Vehicle::Reset()
 {
     sLog.outDebug("Vehicle::Reset");
@@ -145,7 +132,6 @@ void Vehicle::Reset()
     if(m_usableSeatNum)
         me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
 }
-
 void Vehicle::RemoveAllPassengers()
 {
     sLog.outDebug("Vehicle::RemoveAllPassengers");
@@ -165,21 +151,18 @@ void Vehicle::RemoveAllPassengers()
             }
         }
 }
-
 bool Vehicle::HasEmptySeat(int8 seatId) const
 {
     SeatMap::const_iterator seat = m_Seats.find(seatId);
     if(seat == m_Seats.end()) return false;
     return !seat->second.passenger;
 }
-
 Unit *Vehicle::GetPassenger(int8 seatId) const
 {
     SeatMap::const_iterator seat = m_Seats.find(seatId);
     if(seat == m_Seats.end()) return NULL;
     return seat->second.passenger;
 }
-
 int8 Vehicle::GetNextEmptySeat(int8 seatId, bool next) const
 {
     SeatMap::const_iterator seat = m_Seats.find(seatId);
@@ -203,7 +186,6 @@ int8 Vehicle::GetNextEmptySeat(int8 seatId, bool next) const
     }
     return seat->first;
 }
-
 void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion)
 {
     if(Unit *passenger = GetPassenger(seatId))
@@ -218,7 +200,6 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion)
         }
         passenger->ExitVehicle(); // this should not happen
     }
-
     //TODO: accessory should be minion
     if(Creature *accessory = me->SummonCreature(entry, *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000))
     {
@@ -229,19 +210,16 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion)
         accessory->SendMovementFlagUpdate();
     }
 }
-
 bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
 {
     if(unit->GetVehicle() != this)
         return false;
-
     SeatMap::iterator seat;
     if(seatId < 0) // no specific seat requirement
     {
         for(seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
             if(!seat->second.passenger && seat->second.seatInfo->IsUsable())
                 break;
-
         if(seat == m_Seats.end()) // no available seat
             return false;
     }
@@ -250,15 +228,11 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
         seat = m_Seats.find(seatId);
         if(seat == m_Seats.end())
             return false;
-
         if(seat->second.passenger)
             seat->second.passenger->ExitVehicle();
-
         assert(!seat->second.passenger);
     }
-
     sLog.outDebug("Unit %s enter vehicle entry %u id %u dbguid %u seat %d", unit->GetName(), me->GetEntry(), m_vehicleInfo->m_ID, me->GetGUIDLow(), (int32)seat->first);
-
     seat->second.passenger = unit;
     if(seat->second.seatInfo->IsUsable())
     {
@@ -267,12 +241,9 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
         if(!m_usableSeatNum)
             me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
     }
-
     if(seat->second.seatInfo->m_flags && !(seat->second.seatInfo->m_flags & 0x400))
         unit->addUnitState(UNIT_STAT_ONVEHICLE);
-
     //SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PLAYER_CONTROLLED);
-
     unit->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
     VehicleSeatEntry const *veSeat = seat->second.seatInfo;
     unit->m_movementInfo.t_x = veSeat->m_attachmentOffsetX;
@@ -281,11 +252,9 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
     unit->m_movementInfo.t_o = 0;
     unit->m_movementInfo.t_time = 0; // 1 for player
     unit->m_movementInfo.t_seat = seat->first;
-
     if(unit->GetTypeId() == TYPEID_PLAYER && seat->first == 0 && seat->second.seatInfo->m_flags & 0x800) // not right
         if (!me->SetCharmedBy(unit, CHARM_TYPE_VEHICLE))
             assert(false);
-
     if(me->GetTypeId() == TYPEID_UNIT)
     {
         if(me->IsInWorld())
@@ -294,32 +263,24 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId)
             // move self = move all passengers
             me->GetMap()->CreatureRelocation((Creature*)me, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
         }
-
         if(((Creature*)me)->IsAIEnabled)
             ((Creature*)me)->AI()->PassengerBoarded(unit, seat->first, true);
     }
-
     //if(unit->GetTypeId() == TYPEID_PLAYER)
     //    ((Player*)unit)->SendTeleportAckMsg();
     //unit->SendMovementFlagUpdate();
-
     return true;
 }
-
 void Vehicle::RemovePassenger(Unit *unit)
 {
     if(unit->GetVehicle() != this)
         return;
-
     SeatMap::iterator seat;
     for(seat = m_Seats.begin(); seat != m_Seats.end(); ++seat)
         if(seat->second.passenger == unit)
             break;
-
     assert(seat != m_Seats.end());
-
     sLog.outDebug("Unit %s exit vehicle entry %u id %u dbguid %u seat %d", unit->GetName(), me->GetEntry(), m_vehicleInfo->m_ID, me->GetGUIDLow(), (int32)seat->first);
-
     seat->second.passenger = NULL;
     if(seat->second.seatInfo->IsUsable())
     {
@@ -327,21 +288,15 @@ void Vehicle::RemovePassenger(Unit *unit)
             me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
         ++m_usableSeatNum;
     }
-
     unit->clearUnitState(UNIT_STAT_ONVEHICLE);
-
     //SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);
-
     if(unit->GetTypeId() == TYPEID_PLAYER && seat->first == 0 && seat->second.seatInfo->m_flags & 0x800)
         me->RemoveCharmedBy(unit);
-
     if(me->GetTypeId() == TYPEID_UNIT && ((Creature*)me)->IsAIEnabled)
         ((Creature*)me)->AI()->PassengerBoarded(unit, seat->first, false);
-
     // only for flyable vehicles?
     //CastSpell(this, 45472, true);                           // Parachute
 }
-
 void Vehicle::Dismiss()
 {
     sLog.outDebug("Vehicle::Dismiss %u", me->GetEntry());
diff --git a/src/game/Vehicle.h b/src/game/Vehicle.h
index 620f194a15b..2a85912b7b6 100644
--- a/src/game/Vehicle.h
+++ b/src/game/Vehicle.h
@@ -15,46 +15,36 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 #ifndef MANGOSSERVER_VEHICLE_H
 #define MANGOSSERVER_VEHICLE_H
-
 #include "ObjectDefines.h"
-
 struct VehicleEntry;
 struct VehicleSeatEntry;
 class Unit;
-
 enum PowerType
 {
     POWER_STEAM     = 61,
     POWER_PYRITE    = 41,
 };
-
 struct VehicleSeat
 {
     explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {}
     VehicleSeatEntry const *seatInfo;
     Unit* passenger;
 };
-
 typedef std::map<int8, VehicleSeat> SeatMap;
-
 class TRINITY_DLL_SPEC Vehicle
 {
     public:
         explicit Vehicle(Unit *unit, VehicleEntry const *vehInfo);
         virtual ~Vehicle();
-
         void Install();
         void Uninstall();
         void Reset();
         void Die();
         void InstallAllAccessories();
-
         Unit *GetBase() const { return me; }
         VehicleEntry const *GetVehicleInfo() { return m_vehicleInfo; }
-
         bool HasEmptySeat(int8 seatId) const;
         Unit *GetPassenger(int8 seatId) const;
         int8 GetNextEmptySeat(int8 seatId, bool next) const;
@@ -62,14 +52,11 @@ class TRINITY_DLL_SPEC Vehicle
         void RemovePassenger(Unit *passenger);
         void RemoveAllPassengers();
         void Dismiss();
-
         SeatMap m_Seats;
-
     protected:
         Unit *me;
         VehicleEntry const *m_vehicleInfo;
         uint32 m_usableSeatNum;
-
         void InstallAccessory(uint32 entry, int8 seatId, bool minion = true);
 };
 #endif
diff --git a/src/game/VoiceChatHandler.cpp b/src/game/VoiceChatHandler.cpp
index 6023233c444..2c9c42b459f 100644
--- a/src/game/VoiceChatHandler.cpp
+++ b/src/game/VoiceChatHandler.cpp
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-
 void WorldSession::HandleVoiceSessionEnableOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_VOICE_SESSION_ENABLE");
@@ -32,14 +30,12 @@ void WorldSession::HandleVoiceSessionEnableOpcode( WorldPacket & recv_data )
     recv_data.read_skip<uint8>();
     recv_data.hexlike();
 }
-
 void WorldSession::HandleChannelVoiceOnOpcode( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_CHANNEL_VOICE_ON");
     // Enable Voice button in channel context menu
     recv_data.hexlike();
 }
-
 void WorldSession::HandleSetActiveVoiceChannel( WorldPacket & recv_data )
 {
     sLog.outDebug("WORLD: CMSG_SET_ACTIVE_VOICE_CHANNEL");
diff --git a/src/game/WaypointManager.cpp b/src/game/WaypointManager.cpp
index b9fb027d9c5..add7cd8998d 100644
--- a/src/game/WaypointManager.cpp
+++ b/src/game/WaypointManager.cpp
@@ -17,21 +17,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Database/DatabaseEnv.h"
 #include "GridDefines.h"
 #include "WaypointManager.h"
 #include "ProgressBar.h"
 #include "MapManager.h"
-
 UNORDERED_MAP<uint32, WaypointPath*> waypoint_map;
 WaypointStore WaypointMgr;
-
 void WaypointStore::Free()
 {
     waypoint_map.clear();
 }
-
 void WaypointStore::Load()
 {
     QueryResult *result = WorldDatabase.PQuery("SELECT COUNT(id) FROM waypoint_data");
@@ -40,42 +36,33 @@ void WaypointStore::Load()
         sLog.outError("an error occured while loading the table `waypoint_data` (maybe it doesn't exist ?)");
         exit(1);                                            // Stop server at loading non exited table or not accessable table
     }
-
     records = (*result)[0].GetUInt32();
     delete result;
-
     result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data ORDER BY id, point");
     if(!result)
     {
         sLog.outErrorDb("The table `waypoint_data` is empty or corrupted");
         return;
     }
-
     WaypointPath* path_data;
     uint32 total_records = result->GetRowCount();
-
     barGoLink bar( total_records);
     Field *fields;
     uint32 last_id = 0;
-
     do
     {
         fields = result->Fetch();
         uint32 id = fields[0].GetUInt32();
         bar.step();
         WaypointData *wp = new WaypointData;
-
         if(last_id != id)
             path_data = new WaypointPath;
-
         float x,y,z;
         x = fields[2].GetFloat();
         y = fields[3].GetFloat();
         z = fields[4].GetFloat();
-
         Trinity::NormalizeMapCoord(x);
         Trinity::NormalizeMapCoord(y);
-
         wp->id = fields[1].GetUInt32();
         wp->x = x;
         wp->y = y;
@@ -84,50 +71,35 @@ void WaypointStore::Load()
         wp->delay = fields[6].GetUInt32();
         wp->event_id = fields[7].GetUInt32();
         wp->event_chance = fields[8].GetUInt8();
-
         path_data->push_back(wp);
-
         if(id != last_id)
             waypoint_map[id] = path_data;
-
         last_id = id;
-
     } while(result->NextRow()) ;
-
     delete result;
 }
-
 void WaypointStore::UpdatePath(uint32 id)
 {
     if(waypoint_map.find(id)!= waypoint_map.end())
         waypoint_map[id]->clear();
-    
     QueryResult *result;
-
     result = WorldDatabase.PQuery("SELECT id,point,position_x,position_y,position_z,move_flag,delay,action,action_chance FROM waypoint_data WHERE id = %u ORDER BY point", id);
-
     if(!result)
         return;
-
     WaypointPath* path_data;
     path_data = new WaypointPath;
     Field *fields;
-
     do
     {
         fields = result->Fetch();
         uint32 id = fields[0].GetUInt32();
-
         WaypointData *wp = new WaypointData;
-
         float x,y,z;
         x = fields[2].GetFloat();
         y = fields[3].GetFloat();
         z = fields[4].GetFloat();
-
         Trinity::NormalizeMapCoord(x);
         Trinity::NormalizeMapCoord(y);
-
         wp->id = fields[1].GetUInt32();
         wp->x = x;
         wp->y = y;
@@ -136,14 +108,10 @@ void WaypointStore::UpdatePath(uint32 id)
         wp->delay = fields[6].GetUInt32();
         wp->event_id = fields[7].GetUInt32();
         wp->event_chance = fields[8].GetUInt8();
-
         path_data->push_back(wp);
-
     }
     while (result->NextRow());
-
     waypoint_map[id] = path_data;
-
     delete result;
 }
 
diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h
index 85f8b765d45..0423aeb90c6 100644
--- a/src/game/WaypointManager.h
+++ b/src/game/WaypointManager.h
@@ -17,12 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_WAYPOINTMANAGER_H
 #define TRINITY_WAYPOINTMANAGER_H
-
 #include <vector>
-
 struct WaypointData
 {
     uint32 id;
@@ -32,31 +29,24 @@ struct WaypointData
     uint32 event_id;
     uint8 event_chance;
 };
-
 typedef std::vector<WaypointData*> WaypointPath;
 extern UNORDERED_MAP<uint32, WaypointPath*> waypoint_map;
-
 class WaypointStore
 {
     private :
         uint32  records;
-
     public:
         void UpdatePath(uint32 id);
         void Load();
         void Free();
-
         WaypointPath* GetPath(uint32 id)
         {
             if(waypoint_map.find(id) != waypoint_map.end())
                 return waypoint_map[id];
             else return 0;
         }
-
         inline uint32 GetRecordsCount() { return records; }
 };
-
 extern WaypointStore WaypointMgr;
-
 #endif
 
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index cba005a78d9..990bfd46084 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -28,67 +28,53 @@
 #include "CreatureGroups.h"
 //Player-specific
 #include "Player.h"
-
 template<class T>
 void
 WaypointMovementGenerator<T>::Initialize(T &u){}
-
 template<>
 void
 WaypointMovementGenerator<Creature>::Finalize(Creature &u){}
-
 template<>
 void
 WaypointMovementGenerator<Player>::Finalize(Player &u){}
-
 template<class T>
 void
 WaypointMovementGenerator<T>::MovementInform(T &unit){}
-
 template<>
 void WaypointMovementGenerator<Creature>::MovementInform(Creature &unit)
 {
     unit.AI()->MovementInform(WAYPOINT_MOTION_TYPE, i_currentNode);
 }
-
 template<>
 bool WaypointMovementGenerator<Creature>::GetDestination(float &x, float &y, float &z) const
 {
     if(i_destinationHolder.HasArrived())
         return false;
-    
     i_destinationHolder.GetDestination(x, y, z);
     return true;
 }
-
 template<>
 bool WaypointMovementGenerator<Player>::GetDestination(float &x, float &y, float &z) const
 {
     return false;
 }
-
 template<>
 void WaypointMovementGenerator<Creature>::Reset(Creature &unit)
 {
     StopedByPlayer = true;
     i_nextMoveTime.Reset(0);
 }
-
 template<>
 void WaypointMovementGenerator<Player>::Reset(Player &unit){}
-
 template<>
 void WaypointMovementGenerator<Creature>::InitTraveller(Creature &unit, const WaypointData &node)
 {
     node.run ? unit.RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE):
         unit.AddUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-
     unit.SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
     unit.SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
-
     unit.addUnitState(UNIT_STAT_ROAMING);
 }
-
 template<>
 void
 WaypointMovementGenerator<Creature>::Initialize(Creature &u)
@@ -108,7 +94,6 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u)
         InitTraveller(u, *node);
         i_destinationHolder.SetDestination(traveller, node->x, node->y, node->z);
         i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
-
         //Call for creature group update
         if(u.GetFormation() && u.GetFormation()->getLeader() == &u)
             u.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
@@ -116,41 +101,32 @@ WaypointMovementGenerator<Creature>::Initialize(Creature &u)
     else
         node = NULL;
 }
-
 template<>
 void WaypointMovementGenerator<Player>::InitTraveller(Player &unit, const WaypointData &node){}
-
 template<class T>
 bool
 WaypointMovementGenerator<T>::Update(T &unit, const uint32 &diff)
 {
     return false;
 }
-
 template<>
 bool
 WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
 {
     if(!&unit)
         return true;
-
     if(!path_id)
         return false;
-
     // Waypoint movement can be switched on/off
     // This is quite handy for escort quests and other stuff
     if(unit.hasUnitState(UNIT_STAT_ROOT | UNIT_STAT_STUNNED | UNIT_STAT_DISTRACTED))
         return true;
-
     // Clear the generator if the path doesn't exist
     if(!waypoints || !waypoints->size())
         return false;
-
     Traveller<Creature> traveller(unit);
-
     i_nextMoveTime.Update(diff);
     i_destinationHolder.UpdateTraveller(traveller, diff, true);
-
     if(i_nextMoveTime.Passed())
     {
         if(unit.IsStopped())
@@ -164,7 +140,6 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
                 StopedByPlayer = false;
                 return true;
             }
-
             if(i_currentNode == waypoints->size() - 1) //If that's our last waypoint
             {
                 if(repeating) //If the movement is repeating
@@ -178,12 +153,10 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
             }
             else
                 ++i_currentNode;
-
             node = waypoints->at(i_currentNode);
             InitTraveller(unit, *node);
             i_destinationHolder.SetDestination(traveller, node->x, node->y, node->z);
             i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
-
             //Call for creature group update
             if(unit.GetFormation() && unit.GetFormation()->getLeader() == &unit)
                 unit.GetFormation()->LeaderMoveTo(node->x, node->y, node->z);
@@ -193,11 +166,9 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
             //Determine waittime
             if(node->delay)
                 i_nextMoveTime.Reset(node->delay);
-
             //note: disable "start" for mtmap
             if(node->event_id && urand(0,99) < node->event_chance)
                 unit.GetMap()->ScriptsStart(sWaypointScripts, node->event_id, &unit, NULL/*, false*/);
-
             MovementInform(unit);
             unit.UpdateWaypointID(i_currentNode);
             unit.clearUnitState(UNIT_STAT_ROAMING);
@@ -218,32 +189,26 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
     }
     return true;
 }
-
 template void WaypointMovementGenerator<Player>::Initialize(Player &);
 template bool WaypointMovementGenerator<Player>::Update(Player &, const uint32 &);
 template void WaypointMovementGenerator<Player>::MovementInform(Player &);
-
 //----------------------------------------------------//
 void FlightPathMovementGenerator::LoadPath(Player &)
 {
     objmgr.GetTaxiPathNodes(i_pathId, i_path,i_mapIds);
 }
-
 uint32 FlightPathMovementGenerator::GetPathAtMapEnd() const
 {
     if(i_currentNode >= i_mapIds.size())
         return i_mapIds.size();
-
     uint32 curMapId = i_mapIds[i_currentNode];
     for(uint32 i = i_currentNode; i < i_mapIds.size(); ++i)
     {
         if(i_mapIds[i] != curMapId)
             return i;
     }
-
     return i_mapIds.size();
 }
-
 void FlightPathMovementGenerator::Initialize(Player &player)
 {
     player.getHostilRefManager().setOnlineOfflineState(false);
@@ -253,31 +218,23 @@ void FlightPathMovementGenerator::Initialize(Player &player)
     Traveller<Player> traveller(player);
     // do not send movement, it was sent already
     i_destinationHolder.SetDestination(traveller, i_path[i_currentNode].x, i_path[i_currentNode].y, i_path[i_currentNode].z, false);
-
     player.SendMonsterMoveByPath(GetPath(),GetCurrentNode(),GetPathAtMapEnd());
-
 	// Storage to preload flightmaster grid at end of flight. For multi-stop flights, this will
 	// be reinitialized for each flightmaster at the end of each spline (or stop) in the flight.
-
 	uint32 nodeCount = i_mapIds.size();		// Get the number of nodes in the path. i_path and i_mapIds are the
 											//  same size when loaded in ObjectMgr::GetTaxiPathNodes, called from LoadPath()
-
 	m_endMapId = i_mapIds[nodeCount -1];	// Get the map ID from the last node
 	m_preloadTargetNode = nodeCount / 2;	// Split the number of nodes in half to preload the flightmaster half-way through the flight
 	m_endGridX = i_path[nodeCount -1].x;	// Get the X position from the last node
 	m_endGridY = i_path[nodeCount -1].y;	// Get tye Y position from the last node
-
 }
-
 void FlightPathMovementGenerator::Finalize(Player & player)
 {
     player.clearUnitState(UNIT_STAT_IN_FLIGHT);
-
     float x, y, z;
     i_destinationHolder.GetLocationNow(player.GetBaseMap(), x, y, z);
     player.SetPosition(x, y, z, player.GetOrientation());
 }
-
 bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
 {
     if( MovementInProgress() )
@@ -298,7 +255,6 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
                         // do not send movement, it was sent already
                         i_destinationHolder.SetDestination(traveller, i_path[i_currentNode].x, i_path[i_currentNode].y, i_path[i_currentNode].z, false);
                     }
-
 					// check if it's time to preload the flightmaster grid
 					// at path end
 					if (i_currentNode == m_preloadTargetNode)
@@ -315,16 +271,13 @@ bool FlightPathMovementGenerator::Update(Player &player, const uint32 &diff)
         else
             return true;
     }
-
     // we have arrived at the end of the path
     return false;
 }
-
 void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
 {
     if(i_mapIds.empty())
         return;
-
     uint32 map0 = i_mapIds[0];
     for(size_t i = 1; i < i_mapIds.size(); ++i)
     {
@@ -335,12 +288,10 @@ void FlightPathMovementGenerator::SetCurrentNodeAfterTeleport()
         }
     }
 }
-
 void FlightPathMovementGenerator::PreloadEndGrid()
 {
 	// used to preload the final grid where the flightmaster is
 	Map *endMap = MapManager::Instance().FindMap(m_endMapId);
-
 	// Load the grid
 	if (endMap)
 	{
@@ -351,17 +302,12 @@ void FlightPathMovementGenerator::PreloadEndGrid()
 	{
 		sLog.outDetail("Unable to determine map to preload flightmaster grid");
 	}
-
 }
-
 //
 // Unique1's ASTAR Pathfinding Code... For future use & reference...
 //
-
 #ifdef __PATHFINDING__
-
 int GetFCost(int to, int num, int parentNum, float *gcost); // Below...
-
 int ShortenASTARRoute(short int *pathlist, int number)
 {                                                           // Wrote this to make the routes a little smarter (shorter)... No point looping back to the same places... Unique1
     short int temppathlist[MAX_PATHLIST_NODES];
@@ -370,24 +316,19 @@ int ShortenASTARRoute(short int *pathlist, int number)
     int temp, temp2;
     int link;
     int upto = 0;
-
     for (temp = number; temp >= 0; temp--)
     {
         qboolean shortened = qfalse;
-
         for (temp2 = 0; temp2 < temp; temp2++)
         {
             for (link = 0; link < nodes[pathlist[temp]].enodenum; link++)
             {
                 if (nodes[pathlist[temp]].links[link].flags & PATH_BLOCKED)
                     continue;
-
                 //if ((bot->client->ps.eFlags & EF_TANK) && nodes[bot->current_node].links[link].flags & PATH_NOTANKS)    //if this path is blocked, skip it
                 //    continue;
-
                 //if (nodes[nodes[pathlist[temp]].links[link].targetNode].origin[2] > nodes[pathlist[temp]].origin[2] + 32)
                 //    continue;
-
                 if (nodes[pathlist[temp]].links[link].targetNode == pathlist[temp2])
                 {                                           // Found a shorter route...
                     //if (OrgVisible(nodes[pathlist[temp2]].origin, nodes[pathlist[temp]].origin, -1))
@@ -400,26 +341,21 @@ int ShortenASTARRoute(short int *pathlist, int number)
                 }
             }
         }
-
         if (!shortened)
         {
             temppathlist[count] = pathlist[temp];
             ++count;
         }
     }
-
     upto = count;
-
     for (temp = 0; temp < count; temp++)
     {
         pathlist[temp] = temppathlist[upto];
         --upto;
     }
-
     G_Printf("ShortenASTARRoute: Path size reduced from %i to %i nodes...n", number, count);
     return count;
 }
-
 /*
 ===========================================================================
 CreatePathAStar
@@ -440,7 +376,6 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
     int fcost[MAX_NODES];
     char list[MAX_NODES];                                   //0 is neither, 1 is open, 2 is closed - char because it's the smallest data type
     short int parent[MAX_NODES];
-
     short int numOpen = 0;
     short int atNode, temp, newnode=-1;
     qboolean found = qfalse;
@@ -448,23 +383,19 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
     float gc;
     int i, u, v, m;
     vec3_t vec;
-
     //clear out all the arrays
     memset(openlist, 0, sizeof(short int)*(MAX_NODES+1));
     memset(fcost, 0, sizeof(int)*MAX_NODES);
     memset(list, 0, sizeof(char)*MAX_NODES);
     memset(parent, 0, sizeof(short int)*MAX_NODES);
     memset(gcost, -1, sizeof(float)*MAX_NODES);
-
     //make sure we have valid data before calculating everything
     if ((from == NODE_INVALID) || (to == NODE_INVALID) || (from >= MAX_NODES) || (to >= MAX_NODES) || (from == to))
         return -1;
-
     openlist[1] = from;                                     //add the starting node to the open list
     ++numOpen;
     gcost[from] = 0;                                        //its f and g costs are obviously 0
     fcost[from] = 0;
-
     while (1)
     {
         if (numOpen != 0)                                   //if there are still items in the open list
@@ -473,10 +404,8 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
             atNode = openlist[1];
             list[atNode] = 2;                               //put the node on the closed list so we don't check it again
             --numOpen;
-
             openlist[1] = openlist[numOpen+1];              //move the last item in the list to the top position
             v = 1;
-
             //this while loop reorders the list so that the new lowest fcost is at the top again
             while (1)
             {
@@ -496,7 +425,6 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
                             v = 2*u;
                     }
                 }
-
                 if (u != v)                                 //if they're out of order, swap this item with its parent
                 {
                     temp = openlist[u];
@@ -506,11 +434,9 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
                 else
                     break;
             }
-
             for (i = 0; i < nodes[atNode].enodenum; ++i)    //loop through all the links for this node
             {
                 newnode = nodes[atNode].links[i].targetNode;
-
                 //if this path is blocked, skip it
                 if (nodes[atNode].links[i].flags & PATH_BLOCKED)
                     continue;
@@ -522,22 +448,17 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
                     continue;
                 if (bot->client && (nodes[newnode].type & NODE_AXIS_UNREACHABLE) && (bot->client->sess.sessionTeam == TEAM_AXIS))
                     continue;
-
                 if (list[newnode] == 2)                     //if this node is on the closed list, skip it
                     continue;
-
                 if (list[newnode] != 1)                     //if this node is not already on the open list
                 {
                     openlist[++numOpen] = newnode;          //add the new node to the open list
                     list[newnode] = 1;
                     parent[newnode] = atNode;               //record the node's parent
-
                     if (newnode == to)                      //if we've found the goal, don't keep computing paths!
                         break;                              //this will break the 'for' and go all the way to 'if (list[to] == 1)'
-
                     //store it's f cost value
                     fcost[newnode] = GetFCost(to, newnode, parent[newnode], gcost);
-
                     //this loop re-orders the heap so that the lowest fcost is at the top
                     m = numOpen;
                     while (m != 1)                          //while this item isn't at the top of the heap already
@@ -559,19 +480,16 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
                     gc = gcost[atNode];
                     VectorSubtract(nodes[newnode].origin, nodes[atNode].origin, vec);
                     gc += VectorLength(vec);                //calculate what the gcost would be if we reached this node along the current path
-
                     if (gc < gcost[newnode])                //if the new gcost is less (ie, this path is shorter than what we had before)
                     {
                         parent[newnode] = atNode;           //set the new parent for this node
                         gcost[newnode] = gc;                //and the new g cost
-
                         for (i = 1; i < numOpen; ++i)       //loop through all the items on the open list
                         {
                             if (openlist[i] == newnode)     //find this node in the list
                             {
                                 //calculate the new fcost and store it
                                 fcost[newnode] = GetFCost(to, newnode, parent[newnode], gcost);
-
                                 //reorder the list again, with the lowest fcost item on top
                                 m = i;
                                 while (m != 1)
@@ -599,28 +517,23 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
             found = qfalse;                                 //there is no path between these nodes
             break;
         }
-
         if (list[to] == 1)                                  //if the destination node is on the open list, we're done
         {
             found = qtrue;
             break;
         }
     }                                                       //while (1)
-
     if (found == qtrue)                                     //if we found a path
     {
         //G_Printf("%s - path found!n", bot->client->pers.netname);
         count = 0;
-
         temp = to;                                          //start at the end point
         while (temp != from)                                //travel along the path (backwards) until we reach the starting point
         {
             pathlist[count++] = temp;                       //add the node to the pathlist and increment the count
             temp = parent[temp];                            //move to the parent of this node to continue the path
         }
-
         pathlist[count++] = from;                           //add the beginning node to the end of the pathlist
-
         #ifdef __BOT_SHORTEN_ROUTING__
         count = ShortenASTARRoute(pathlist, count);         // This isn't working... Dunno why.. Unique1
         #endif                                              //__BOT_SHORTEN_ROUTING__
@@ -629,7 +542,6 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
     {
         //G_Printf("^1*** ^4BOT DEBUG^5: (CreatePathAStar) There is no route between node ^7%i^5 and node ^7%i^5.n", from, to);
         count = CreateDumbRoute(from, to, pathlist);
-
         if (count > 0)
         {
             #ifdef __BOT_SHORTEN_ROUTING__
@@ -638,10 +550,8 @@ int CreatePathAStar(gentity_t *bot, int from, int to, short int *pathlist)
             return count;
         }
     }
-
     return count;                                           //return the number of nodes in the path, -1 if not found
 }
-
 /*
 ===========================================================================
 GetFCost
@@ -659,7 +569,6 @@ int GetFCost(int to, int num, int parentNum, float *gcost)
     float gc = 0;
     float hc = 0;
     vec3_t v;
-
     if (gcost[num] == -1)
     {
         if (parentNum != -1)
@@ -672,10 +581,8 @@ int GetFCost(int to, int num, int parentNum, float *gcost)
     }
     else
         gc = gcost[num];
-
     VectorSubtract(nodes[to].origin, nodes[num].origin, v);
     hc = VectorLength(v);
-
     return (int)(gc + hc);
 }
 #endif                                                      //__PATHFINDING__
diff --git a/src/game/WaypointMovementGenerator.h b/src/game/WaypointMovementGenerator.h
index 4e64229b524..1f0f0b9e2e0 100644
--- a/src/game/WaypointMovementGenerator.h
+++ b/src/game/WaypointMovementGenerator.h
@@ -17,58 +17,45 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_WAYPOINTMOVEMENTGENERATOR_H
 #define TRINITY_WAYPOINTMOVEMENTGENERATOR_H
-
 /** @page PathMovementGenerator is used to generate movements
  * of waypoints and flight paths.  Each serves the purpose
  * of generate activities so that it generates updated
  * packets for the players.
  */
-
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "WaypointManager.h"
 #include "Path.h"
 #include "Traveller.h"
-
 #include "Player.h"
-
 #include <vector>
 #include <set>
-
 #define FLIGHT_TRAVEL_UPDATE  100
 #define STOP_TIME_FOR_PLAYER  3 * MINUTE * IN_MILISECONDS           // 3 Minutes
-
 template<class T, class P = Path>
 class TRINITY_DLL_SPEC PathMovementBase
 {
     public:
         PathMovementBase() : i_currentNode(0) {}
         virtual ~PathMovementBase() {};
-
         bool MovementInProgress(void) const { return i_currentNode < i_path.Size(); }
-
         void LoadPath(T &);
         void ReloadPath(T &);
         uint32 GetCurrentNode() const { return i_currentNode; }
-
     protected:
         uint32 i_currentNode;
         DestinationHolder< Traveller<T> > i_destinationHolder;
         P i_path;
 };
-
 template<class T>
-
 class TRINITY_DLL_SPEC WaypointMovementGenerator
     : public MovementGeneratorMedium< T, WaypointMovementGenerator<T> >, public PathMovementBase<T>
 {
     public:
         WaypointMovementGenerator(uint32 _path_id = 0, bool _repeating = true) :
           i_nextMoveTime(0), path_id(_path_id), repeating(_repeating), StopedByPlayer(false), node(NULL) {}
-
         void Initialize(T &);
         void Finalize(T &);
         void MovementInform(T &);
@@ -78,7 +65,6 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator
         bool Update(T &, const uint32 &);
         bool GetDestination(float &x, float &y, float &z) const;
         MovementGeneratorType GetMovementGeneratorType() { return WAYPOINT_MOTION_TYPE; }
-
     private:
         WaypointData *node;
         uint32 path_id;
@@ -86,7 +72,6 @@ class TRINITY_DLL_SPEC WaypointMovementGenerator
         WaypointPath *waypoints;
         bool repeating, StopedByPlayer;
 };
-
 /** FlightPathMovementGenerator generates movement of the player for the paths
  * and hence generates ground and activities for the player.
  */
@@ -103,17 +88,14 @@ public PathMovementBase<Player>
         void Reset(Player &) {}
         bool Update(Player &, const uint32 &);
         MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; }
-
         void LoadPath(Player &);
         void ReloadPath(Player &) { /* don't reload flight path */ }
-
         Path& GetPath() { return i_path; }
         uint32 GetPathAtMapEnd() const;
         bool HasArrived() const { return (i_currentNode >= i_path.Size()); }
         void SetCurrentNodeAfterTeleport();
         void SkipCurrentNode() { ++i_currentNode; }
         bool GetDestination(float& x, float& y, float& z) const { i_destinationHolder.GetDestination(x,y,z); return true; }
-
 	private:
 		// storage for preloading the flightmaster grid at end
 		// before reaching final waypoint
diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp
index 5d8d1fbd9ba..9eb8e523997 100644
--- a/src/game/Weather.cpp
+++ b/src/game/Weather.cpp
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /** \file
     \ingroup world
 */
-
 #include "Weather.h"
 #include "WorldPacket.h"
 #include "Player.h"
@@ -29,24 +27,20 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Util.h"
-
 /// Create the Weather object
 Weather::Weather(uint32 zone, WeatherZoneChances const* weatherChances) : m_zone(zone), m_weatherChances(weatherChances)
 {
     m_timer.SetInterval(sWorld.getConfig(CONFIG_INTERVAL_CHANGEWEATHER));
     m_type = WEATHER_TYPE_FINE;
     m_grade = 0;
-
     sLog.outDetail("WORLD: Starting weather system for zone %u (change every %u minutes).", m_zone, (uint32)(m_timer.GetInterval() / (MINUTE*IN_MILISECONDS)) );
 }
-
 /// Launch a weather update
 bool Weather::Update(uint32 diff)
 {
     if (m_timer.GetCurrent()>=0)
         m_timer.Update(diff);
     else m_timer.SetCurrent(0);
-
     ///- If the timer has passed, ReGenerate the weather
     if(m_timer.Passed())
     {
@@ -61,7 +55,6 @@ bool Weather::Update(uint32 diff)
     }
     return true;
 }
-
 /// Calculate the new weather
 bool Weather::ReGenerate()
 {
@@ -71,56 +64,45 @@ bool Weather::ReGenerate()
         m_grade = 0.0f;
         return false;
     }
-
     /// Weather statistics:
     ///- 30% - no change
     ///- 30% - weather gets better (if not fine) or change weather type
     ///- 30% - weather worsens (if not fine)
     ///- 10% - radical change (if not fine)
     uint32 u = urand(0, 99);
-
     if (u < 30)
         return false;
-
     // remember old values
     WeatherType old_type = m_type;
     float old_grade = m_grade;
-
     //78 days between January 1st and March 20nd; 365/4=91 days by season
     // season source http://aa.usno.navy.mil/data/docs/EarthSeasons.html
     time_t gtime = sWorld.GetGameTime();
     struct tm * ltime = localtime(&gtime);
     uint32 season = ((ltime->tm_yday - 78 + 365)/91)%4;
-
     static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" };
-
     sLog.outDebug("Generating a change in %s weather for zone %u.", seasonName[season], m_zone);
-
     if ((u < 60) && (m_grade < 0.33333334f))                // Get fair
     {
         m_type = WEATHER_TYPE_FINE;
         m_grade = 0.0f;
     }
-
     if ((u < 60) && (m_type != WEATHER_TYPE_FINE))          // Get better
     {
         m_grade -= 0.33333334f;
         return true;
     }
-
     if ((u < 90) && (m_type != WEATHER_TYPE_FINE))          // Get worse
     {
         m_grade += 0.33333334f;
         return true;
     }
-
     if (m_type != WEATHER_TYPE_FINE)
     {
         /// Radical change:
         ///- if light -> heavy
         ///- if medium -> change weather type
         ///- if heavy -> 50% light, 50% change weather type
-
         if (m_grade < 0.33333334f)
         {
             m_grade = 0.9999f;                              // go nuts
@@ -142,12 +124,10 @@ bool Weather::ReGenerate()
             m_grade = 0;
         }
     }
-
     // At this point, only weather that isn't doing anything remains but that have weather data
     uint32 chance1 =          m_weatherChances->data[season].rainChance;
     uint32 chance2 = chance1+ m_weatherChances->data[season].snowChance;
     uint32 chance3 = chance2+ m_weatherChances->data[season].stormChance;
-
     uint32 rnd = urand(0, 99);
     if(rnd <= chance1)
         m_type = WEATHER_TYPE_RAIN;
@@ -157,13 +137,11 @@ bool Weather::ReGenerate()
         m_type = WEATHER_TYPE_STORM;
     else
         m_type = WEATHER_TYPE_FINE;
-
     /// New weather statistics (if not fine):
     ///- 85% light
     ///- 7% medium
     ///- 7% heavy
     /// If fine 100% sun (no fog)
-
     if (m_type == WEATHER_TYPE_FINE)
     {
         m_grade = 0.0f;
@@ -181,46 +159,36 @@ bool Weather::ReGenerate()
         else
             m_grade = rand_norm() * 0.3333f + 0.6667f;
     }
-
     // return true only in case weather changes
     return m_type != old_type || m_grade != old_grade;
 }
-
 void Weather::SendWeatherUpdateToPlayer(Player *player)
 {
     WorldPacket data( SMSG_WEATHER, (4+4+4) );
-
     data << uint32(GetWeatherState()) << (float)m_grade << uint8(0);
     player->GetSession()->SendPacket( &data );
 }
-
 void Weather::SendFineWeatherUpdateToPlayer(Player *player)
 {
     WorldPacket data( SMSG_WEATHER, (4+4+4) );
-
     data << (uint32)WEATHER_STATE_FINE << (float)0.0f << uint8(0);
     player->GetSession()->SendPacket( &data );
 }
-
 /// Send the new weather to all players in the zone
 bool Weather::UpdateWeather()
 {
     Player* player = sWorld.FindPlayerInZone(m_zone);
     if(!player)
         return false;
-
     ///- Send the weather packet to all players in this zone
     if (m_grade >= 1)
         m_grade = 0.9999f;
     else if (m_grade < 0)
         m_grade = 0.0001f;
-
     WeatherState state = GetWeatherState();
-
     WorldPacket data( SMSG_WEATHER, (4+4+4) );
     data << uint32(state) << (float)m_grade << uint8(0);
     player->SendMessageToSet( &data, true );
-
     ///- Log the event
     char const* wthstr;
     switch(state)
@@ -264,27 +232,22 @@ bool Weather::UpdateWeather()
             break;
     }
     sLog.outDetail("Change the weather of zone %u to %s.", m_zone, wthstr);
-
     return true;
 }
-
 /// Set the weather
 void Weather::SetWeather(WeatherType type, float grade)
 {
     if(m_type == type && m_grade == grade)
         return;
-
     m_type = type;
     m_grade = grade;
     UpdateWeather();
 }
-
 /// Get the sound number associated with the current weather
 WeatherState Weather::GetWeatherState() const
 {
     if (m_grade<0.27f)
         return WEATHER_STATE_FINE;
-
     switch(m_type)
     {
         case WEATHER_TYPE_RAIN:
diff --git a/src/game/Weather.h b/src/game/Weather.h
index e312f004060..2e4e49a52db 100644
--- a/src/game/Weather.h
+++ b/src/game/Weather.h
@@ -17,20 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /// \addtogroup world
 /// @{
 /// \file
-
 #ifndef __WEATHER_H
 #define __WEATHER_H
-
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Timer.h"
-
 class Player;
-
 enum WeatherState
 {
     WEATHER_STATE_FINE              = 0,
@@ -46,9 +41,7 @@ enum WeatherState
     WEATHER_STATE_THUNDERS          = 86,
     WEATHER_STATE_BLACKRAIN         = 90
 };
-
 struct WeatherZoneChances;
-
 /// Weather for one zone
 class Weather
 {
diff --git a/src/game/Wintergrasp.cpp b/src/game/Wintergrasp.cpp
index ea336ec870e..f05ac4deada 100644
--- a/src/game/Wintergrasp.cpp
+++ b/src/game/Wintergrasp.cpp
@@ -15,34 +15,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #include "Wintergrasp.h"
 #include "SpellAuras.h"
 #include "Vehicle.h"
 #include "ObjectMgr.h"
 #include "World.h"
-
 typedef uint32 TeamPair[2];
-
 enum WintergraspQuest
 {
     SLAY_THEM_ALL_1 = 13180, //Horde Quest
     SLAY_THEM_ALL_2 = 13178, //Horde Quest
-
     NO_MERCY_MERCILESS = 13177,   //Alliance Quest
     NO_MERCY_MERCILESS_1 = 13179, //Alliance Quest
-
     A_VICTORY_IN_WG = 13181,
     H_VICTORY_IN_WG = 13183
 };
-
 enum CreatureEntry
 {
     CRE_ENG_A = 30499,
     CRE_ENG_H = 30400,
     CRE_PVP_KILL = 31086 //Quest Objective
 };
-
 const TeamPair CreatureEntryPair[] =
 {
     {32307, 32308}, // Guards
@@ -58,14 +51,12 @@ const TeamPair CreatureEntryPair[] =
     {32615, 32626}, // Warbringer & Brigadier General
     {0,0}
 };
-
 const TeamPair GODisplayPair[] =
 {
     {5651, 5652},
     {8256, 8257},
     {0,0}
 };
-
 void LoadTeamPair(TeamPairMap &pairMap, const TeamPair *pair)
 {
     while((*pair)[0])
@@ -75,27 +66,21 @@ void LoadTeamPair(TeamPairMap &pairMap, const TeamPair *pair)
         ++pair;
     }
 }
-
 #define REMOVE_WARTIME_AURAS(p) (p)->RemoveAura(SPELL_RECRUIT);\
     (p)->RemoveAura(SPELL_CORPORAL);(p)->RemoveAura(SPELL_LIEUTENANT)
 #define REMOVE_TENACITY_AURA(p) CastTenacity(p, 0)
-
 // Visual defines, easier to understand code
 #define getDefenderTeam() m_defender
 #define getAttackerTeam() OTHER_TEAM(m_defender)
-
 typedef std::list<const AreaPOIEntry *> AreaPOIList;
-
 bool OPvPWintergrasp::SetupOutdoorPvP()
 {
     if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
         return false;
-
     m_defender = TeamId(rand()%2);
     m_changeDefender = false;
     m_workshopCount[TEAM_ALLIANCE] = 0;
     m_workshopCount[TEAM_HORDE] = 0;
-
     // Select POI
     AreaPOIList areaPOIs;
     float minX = 9999, minY = 9999, maxX = -9999, maxY = -9999;
@@ -112,7 +97,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         }
     }
     minX -= 20; minY -= 20; maxX += 20; maxY += 20;
-
     // Coords: 4290.330078, 1790.359985 - 5558.379883, 4048.889893
     QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM gameobject,gameobject_template"
         " WHERE gameobject.map=571"
@@ -123,16 +107,13 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         minX, minY, maxX, maxY);
     if (!result)
         return false;
-
     do
     {
         Field *fields = result->Fetch();
-
         uint32 guid = fields[0].GetUInt32();
         GameObjectData const * goData = objmgr.GetGOData(guid);
         if (!goData) // this should not happen
             continue;
-
         float x = goData->posX, y = goData->posY;
         float minDist = 100;
         AreaPOIList::iterator poi = areaPOIs.end();
@@ -140,7 +121,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         {
             if (!(*itr)->icon[1]) // note: may for other use
                 continue;
-
             float dist = (abs((*itr)->x - x) + abs((*itr)->y - y));
             if (minDist > dist)
             {
@@ -148,20 +128,16 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
                 poi = itr;
             }
         }
-
         if (poi == areaPOIs.end())
             continue;
-
         // add building to the list
         TeamId teamId = x > POS_X_CENTER ? getDefenderTeam() : getAttackerTeam();
         m_buildingStates[guid] = new BuildingState((*poi)->worldState, teamId, getDefenderTeam() != TEAM_ALLIANCE);
         if ((*poi)->id == 2246)
             m_gate = m_buildingStates[guid];
         areaPOIs.erase(poi);
-
         // add capture point
         uint32 capturePointEntry = 0;
-
         switch(goData->id)
         {
             case 192028: // NW
@@ -179,17 +155,14 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         if (capturePointEntry)
         {
             uint32 engGuid = 0;
-
             QueryResult *result = WorldDatabase.PQuery("SELECT guid FROM creature"
                 " WHERE creature.map=571"
                 " AND creature.id IN (%u, %u);", CRE_ENG_A, CRE_ENG_H);
-
             if (!result)
             {
                 sLog.outError("Cannot find siege workshop master in creature!");
                 continue;
             }
-
             float minDist = 100;
             do
             {
@@ -198,7 +171,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
                 const CreatureData *creData = objmgr.GetCreatureData(guid);
                 if (!creData)
                     continue;
-
                 float dist = (abs(creData->posX - x) + abs(creData->posY - y));
                 if (minDist > dist)
                 {
@@ -207,13 +179,11 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
                 }
             }while(result->NextRow());
             delete result;
-
             if (!engGuid)
             {
                 sLog.outError("Cannot find nearby siege workshop master!");
                 continue;
             }
-
             SiegeWorkshop *workshop = new SiegeWorkshop(this, m_buildingStates[guid]);
             if (!workshop->SetCapturePointData(capturePointEntry, goData->mapid, goData->posX + 40 * cos(goData->orientation + M_PI / 2), goData->posY + 40 * sin(goData->orientation + M_PI / 2), goData->posZ))
             {
@@ -224,7 +194,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
             const CreatureData *creData = objmgr.GetCreatureData(engGuid);
             if (!creData)
                 continue;
-
             workshop->m_engEntry = const_cast<uint32*>(&creData->id);
             const_cast<CreatureData*>(creData)->displayid = 0;
             workshop->m_workshopGuid = guid;
@@ -238,13 +207,11 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         }
     }while(result->NextRow());
     delete result;
-
     if (!m_gate)
     {
         sLog.outError("Cannot find wintergrasp fortress gate!");
         return false;
     }
-
     // Load Graveyard
     GraveYardMap::const_iterator graveLow  = objmgr.mGraveYardMap.lower_bound(ZONE_WINTERGRASP);
     GraveYardMap::const_iterator graveUp   = objmgr.mGraveYardMap.upper_bound(ZONE_WINTERGRASP);
@@ -259,7 +226,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
                 ++itr;
                 continue;
             }
-
             GraveYardMap::const_iterator graveItr;
             for (graveItr = graveLow; graveItr != graveUp; ++graveItr)
                 if (graveItr->second.safeLocId == loc->ID)
@@ -271,7 +237,6 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
                 graveData.team = 0;
                 graveItr = objmgr.mGraveYardMap.insert(std::make_pair(ZONE_WINTERGRASP, graveData));
             }
-
             for (BuildingStateMap::iterator stateItr = m_buildingStates.begin(); stateItr != m_buildingStates.end(); ++stateItr)
             {
                 if (stateItr->second->worldState == (*itr)->worldState)
@@ -285,28 +250,21 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         else
             ++itr;
     }
-
     //for (AreaPOIList::iterator itr = areaPOIs.begin(); itr != areaPOIs.end(); ++itr)
     //    sLog.outError("not assigned %u %f %f", (*itr)->id, (*itr)->x, (*itr)->y);
-
     //gameeventmgr.StartInternalEvent(GameEventWintergraspDefender[getDefenderTeam()]);
-
     //Titan Relic eventid = 19982
     objmgr.AddGOData(192829, 571, 5440, 2840.8, 420.43 + 10, 0);
-
     LoadTeamPair(m_goDisplayPair, GODisplayPair);
     LoadTeamPair(m_creEntryPair, CreatureEntryPair);
-
     m_wartime = false;
     m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME) * MINUTE * IN_MILISECONDS;
-
     m_towerCount[getDefenderTeam()][DAMAGE_INTACT] = 4;
     m_towerCount[getAttackerTeam()][DAMAGE_INTACT] = 3;
     m_towerCount[TEAM_ALLIANCE][DAMAGE_DAMAGED] = 0;
     m_towerCount[TEAM_HORDE][DAMAGE_DAMAGED] = 0;
     m_towerCount[TEAM_ALLIANCE][DAMAGE_DESTROYED] = 0;
     m_towerCount[TEAM_HORDE][DAMAGE_DESTROYED] = 0;
-
     // Load custom rewards
     if (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR))
     {
@@ -317,13 +275,10 @@ bool OPvPWintergrasp::SetupOutdoorPvP()
         m_customHonorReward[DAMAGED_BUILDING] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING);
         m_customHonorReward[INTACT_BUILDING] = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING);
     }
-
     RemoveOfflinePlayerWGAuras();
-
     RegisterZone(ZONE_WINTERGRASP);
     return true;
 }
-
 void OPvPWintergrasp::ProcessEvent(GameObject *obj, uint32 eventId)
 {
     if (eventId == 19982)
@@ -343,14 +298,12 @@ void OPvPWintergrasp::ProcessEvent(GameObject *obj, uint32 eventId)
             if (eventId == obj->GetGOInfo()->building.damagedEvent)
             {
                 state->damageState = DAMAGE_DAMAGED;
-
                 if (state->type == BUILDING_TOWER)
                     ++m_towerCount[state->GetTeam()][DAMAGE_DAMAGED];
             }
             else if (eventId == obj->GetGOInfo()->building.destroyedEvent)
             {
                 state->damageState = DAMAGE_DESTROYED;
-
                 if (state->type == BUILDING_WORKSHOP)
                     ModifyWorkshopCount(state->GetTeam(), false);
                 else if (state->type == BUILDING_TOWER)
@@ -363,29 +316,24 @@ void OPvPWintergrasp::ProcessEvent(GameObject *obj, uint32 eventId)
         }
     }
 }
-
 void OPvPWintergrasp::RemoveOfflinePlayerWGAuras()
 {
     // if server crashed while in battle there could be players with rank or tenacity
     CharacterDatabase.PExecute("DELETE FROM character_aura WHERE spell IN (%u,%u,%u, %u)",
         SPELL_RECRUIT, SPELL_CORPORAL, SPELL_LIEUTENANT, SPELL_TENACITY);
 }
-
 void OPvPWintergrasp::ModifyWorkshopCount(TeamId team, bool add)
 {
     if (team == TEAM_NEUTRAL)
         return;
-
     if (add)
         ++m_workshopCount[team];
     else if (m_workshopCount[team])
         --m_workshopCount[team];
     else
         sLog.outError("OPvPWintergrasp::ModifyWorkshopCount: negative workshop count!");
-
     SendUpdateWorldState(MaxVehNumWorldState[team], m_workshopCount[team] * MAX_VEHICLE_PER_WORKSHOP);
 }
-
 uint32 OPvPWintergrasp::GetCreatureEntry(uint32 guidlow, const CreatureData *data)
 {
     if (getDefenderTeam() == TEAM_ALLIANCE)
@@ -399,7 +347,6 @@ uint32 OPvPWintergrasp::GetCreatureEntry(uint32 guidlow, const CreatureData *dat
     }
     return data->id;
 }
-
 WintergraspCreType OPvPWintergrasp::GetCreatureType(uint32 entry) const
 {
     // VEHICLES, GUARDS and TURRETS gives kill credit
@@ -438,7 +385,6 @@ WintergraspCreType OPvPWintergrasp::GetCreatureType(uint32 entry) const
             return CREATURE_OTHER; // Revenants, Elementals, etc
     }
 }
-
 void OPvPWintergrasp::OnCreatureCreate(Creature *creature, bool add)
 {
     uint32 entry = creature->GetEntry();
@@ -448,7 +394,6 @@ void OPvPWintergrasp::OnCreatureCreate(Creature *creature, bool add)
         {
             if (!creature->isSummon())
                 return;
-
             TeamId team;
             if (add)
             {
@@ -458,7 +403,6 @@ void OPvPWintergrasp::OnCreatureCreate(Creature *creature, bool add)
                     team = TEAM_HORDE;
                 else
                     return;
-
                 if (uint32 engLowguid = GUID_LOPART(((TempSummon*)creature)->GetSummonerGUID()))
                 {
                     if (SiegeWorkshop *workshop = GetWorkshopByEngGuid(engLowguid))
@@ -476,7 +420,6 @@ void OPvPWintergrasp::OnCreatureCreate(Creature *creature, bool add)
                         }
                     }
                 }
-
                 if (m_tenacityStack > 0)
                 {
                     if (team == TEAM_ALLIANCE)
@@ -521,11 +464,9 @@ void OPvPWintergrasp::OnCreatureCreate(Creature *creature, bool add)
             break;
     }
 }
-
 void OPvPWintergrasp::OnGameObjectCreate(GameObject *go, bool add)
 {
     OutdoorPvP::OnGameObjectCreate(go, add);
-
     if (UpdateGameObjectInfo(go))
     {
         if (add) m_gobjects.insert(go);
@@ -553,7 +494,6 @@ void OPvPWintergrasp::OnGameObjectCreate(GameObject *go, bool add)
         }
     }
 }
-
 void OPvPWintergrasp::UpdateAllWorldObject()
 {
     // update cre and go factions
@@ -561,16 +501,13 @@ void OPvPWintergrasp::UpdateAllWorldObject()
         UpdateGameObjectInfo(*itr);
     for (CreatureSet::iterator itr = m_creatures.begin(); itr != m_creatures.end(); ++itr)
         UpdateCreatureInfo(*itr);
-
     // rebuild and update building states
     RebuildAllBuildings();
-
     // update capture points
     for (OPvPCapturePointMap::iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
         if (SiegeWorkshop *workshop = dynamic_cast<SiegeWorkshop*>(itr->second))
             workshop->SetTeamByBuildingState();
 }
-
 void OPvPWintergrasp::RebuildAllBuildings()
 {
     for (BuildingStateMap::const_iterator itr = m_buildingStates.begin(); itr != m_buildingStates.end(); ++itr)
@@ -583,17 +520,14 @@ void OPvPWintergrasp::RebuildAllBuildings()
         }
         else
             itr->second->health = 0;
-
         if (itr->second->damageState == DAMAGE_DESTROYED)
         {
             if (itr->second->type == BUILDING_WORKSHOP)
                 ModifyWorkshopCount(itr->second->GetTeam(), true);
         }
-
         itr->second->damageState = DAMAGE_INTACT;
         itr->second->SetTeam(getDefenderTeam() == TEAM_ALLIANCE ? OTHER_TEAM(itr->second->defaultTeam) : itr->second->defaultTeam);
     }
-
     m_towerCount[getDefenderTeam()][DAMAGE_INTACT] = 4;
     m_towerCount[getAttackerTeam()][DAMAGE_INTACT] = 3;
     m_towerCount[TEAM_ALLIANCE][DAMAGE_DAMAGED] = 0;
@@ -601,7 +535,6 @@ void OPvPWintergrasp::RebuildAllBuildings()
     m_towerCount[TEAM_ALLIANCE][DAMAGE_DESTROYED] = 0;
     m_towerCount[TEAM_HORDE][DAMAGE_DESTROYED] = 0;
 }
-
 void OPvPWintergrasp::SendInitWorldStatesTo(Player *player) const
 {
     WorldPacket data(SMSG_INIT_WORLD_STATES, (4+4+4+2+(m_buildingStates.size()*8)));
@@ -609,29 +542,23 @@ void OPvPWintergrasp::SendInitWorldStatesTo(Player *player) const
     data << uint32(ZONE_WINTERGRASP);
     data << uint32(0);
     data << uint16(4+5+4+m_buildingStates.size());
-
     data << uint32(3803) << uint32(getDefenderTeam() == TEAM_ALLIANCE ? 1 : 0);
     data << uint32(3802) << uint32(getDefenderTeam() != TEAM_ALLIANCE ? 1 : 0);
     data << uint32(3801) << uint32(isWarTime() ? 0 : 1);
     data << uint32(3710) << uint32(isWarTime() ? 1 : 0);
-
     for (uint32 i = 0; i < 5; ++i)
         data << ClockWorldState[i] << m_clock[i];
-
     data << uint32(3490) << uint32(m_vehicles[TEAM_HORDE].size());
     data << uint32(3491) << m_workshopCount[TEAM_HORDE] * MAX_VEHICLE_PER_WORKSHOP;
     data << uint32(3680) << uint32(m_vehicles[TEAM_ALLIANCE].size());
     data << uint32(3681) << m_workshopCount[TEAM_ALLIANCE] * MAX_VEHICLE_PER_WORKSHOP;
-
     for (BuildingStateMap::const_iterator itr = m_buildingStates.begin(); itr != m_buildingStates.end(); ++itr)
         itr->second->FillData(data);
-
     if (player)
         player->GetSession()->SendPacket(&data);
     else
         BroadcastPacket(data);
 }
-
 void OPvPWintergrasp::BroadcastStateChange(BuildingState *state) const
 {
     if (m_sendUpdate)
@@ -639,7 +566,6 @@ void OPvPWintergrasp::BroadcastStateChange(BuildingState *state) const
             for (PlayerSet::const_iterator p_itr = m_players[team].begin(); p_itr != m_players[team].end(); ++p_itr)
                 state->SendUpdate(*p_itr);
 }
-
 // Called at Start and Battle End
 bool OPvPWintergrasp::UpdateCreatureInfo(Creature *creature) const
 {
@@ -680,7 +606,6 @@ bool OPvPWintergrasp::UpdateCreatureInfo(Creature *creature) const
             creature->DisappearAndDie();
             return false;
     }
-
     TeamPairMap::const_iterator itr = m_creEntryPair.find(creature->GetCreatureData()->id);
     if (itr != m_creEntryPair.end())
     {
@@ -691,20 +616,17 @@ bool OPvPWintergrasp::UpdateCreatureInfo(Creature *creature) const
     }
     return false;
 }
-
 // Return false = Need to rebuild at battle End/Start
 //        true  = no need to rebuild (ie: Banners or teleporters)
 bool OPvPWintergrasp::UpdateGameObjectInfo(GameObject *go) const
 {
     uint32 attFaction = 35;
     uint32 defFaction = 35;
-
     if (isWarTime())
     {
         attFaction = WintergraspFaction[getAttackerTeam()];
         defFaction = WintergraspFaction[getDefenderTeam()];
     }
-
     switch(go->GetGOInfo()->displayId)
     {
         case 8244: // Defender's Portal - Vehicle Teleporter
@@ -713,7 +635,6 @@ bool OPvPWintergrasp::UpdateGameObjectInfo(GameObject *go) const
         case 7967: // Titan relic
             go->SetUInt32Value(GAMEOBJECT_FACTION, attFaction);
             return true;
-
         case 8165: // Wintergrasp Keep Door
         case 7877: // Wintergrasp Fortress Wall
         case 7878: // Wintergrasp Keep Tower
@@ -730,7 +651,6 @@ bool OPvPWintergrasp::UpdateGameObjectInfo(GameObject *go) const
                 go->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[workshop->m_buildingState->GetTeam()]);
             return false;
     }
-
     // Note: this is only for test, still need db support
     TeamPairMap::const_iterator itr = m_goDisplayPair.find(go->GetGOInfo()->displayId);
     if (itr != m_goDisplayPair.end())
@@ -741,18 +661,15 @@ bool OPvPWintergrasp::UpdateGameObjectInfo(GameObject *go) const
     }
     return false;
 }
-
 void OPvPWintergrasp::HandlePlayerEnterZone(Player * plr, uint32 zone)
 {
     if (isWarTime() && !plr->HasAura(SPELL_RECRUIT) && !plr->HasAura(SPELL_CORPORAL)
         && !plr->HasAura(SPELL_LIEUTENANT))
         plr->CastSpell(plr, SPELL_RECRUIT, true);
-
     SendInitWorldStatesTo(plr);
     OutdoorPvP::HandlePlayerEnterZone(plr, zone);
     UpdateTenacityStack();
 }
-
 void OPvPWintergrasp::HandlePlayerLeaveZone(Player * plr, uint32 zone)
 {
     if (!plr->GetSession()->PlayerLogout())
@@ -765,7 +682,6 @@ void OPvPWintergrasp::HandlePlayerLeaveZone(Player * plr, uint32 zone)
     OutdoorPvP::HandlePlayerLeaveZone(plr, zone);
     UpdateTenacityStack();
 }
-
 void OPvPWintergrasp::PromotePlayer(Player *killer) const
 {
     Aura *aur;
@@ -792,7 +708,6 @@ void OPvPWintergrasp::PromotePlayer(Player *killer) const
     else if (killer->HasAura(SPELL_LIEUTENANT))
         killer->CastSpell(killer, SPELL_LIEUTENANT, true);
 }
-
 void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
 {
     bool ok = false;
@@ -800,7 +715,6 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
     {
         if (victim->getLevel() >= 70)
             ok = true;
-
         if(killer->GetQuestStatus(SLAY_THEM_ALL_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(SLAY_THEM_ALL_2) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS_1) == QUEST_STATUS_INCOMPLETE || killer->GetQuestStatus(NO_MERCY_MERCILESS) == QUEST_STATUS_INCOMPLETE)
             killer->KilledMonsterCredit(CRE_PVP_KILL,0);
     }
@@ -815,7 +729,6 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
                 break;
         }
     }
-
     if (ok)
     {
         if (Group *pGroup = killer->GetGroup())
@@ -828,15 +741,12 @@ void OPvPWintergrasp::HandleKill(Player *killer, Unit *victim)
             PromotePlayer(killer);
     }
 }
-
 // Cast or removes Tenacity. MaxHP Modified, HP keeps it's % ratio
 void OPvPWintergrasp::CastTenacity(Unit *unit, int32 newStack)
 {
     if (!unit)
         return;
-
     uint32 spellId = unit->GetTypeId() == TYPEID_PLAYER ? SPELL_TENACITY : SPELL_TENACITY_VEHICLE;
-
     if (newStack)
         unit->SetAuraStack(spellId, unit, newStack);
     else
@@ -844,18 +754,15 @@ void OPvPWintergrasp::CastTenacity(Unit *unit, int32 newStack)
     if (unit->GetTypeId() != TYPEID_PLAYER || unit->isAlive())
         unit->SetHealth(uint32(unit->GetMaxHealth()*((float)unit->GetHealth()) / unit->GetMaxHealth()));
 }
-
 // Recalculates Tenacity and applies it to Players / Vehicles
 void OPvPWintergrasp::UpdateTenacityStack()
 {
     if (!isWarTime())
         return;
-
     TeamId team = TEAM_NEUTRAL;
     uint32 allianceNum = m_players[TEAM_ALLIANCE].size();;
     uint32 hordeNum = m_players[TEAM_HORDE].size();;
     int32 newStack = 0;
-
     if (allianceNum && hordeNum)
     {
         if (allianceNum < hordeNum)
@@ -863,44 +770,35 @@ void OPvPWintergrasp::UpdateTenacityStack()
         else if (allianceNum > hordeNum)
             newStack = (1 - int32(allianceNum / hordeNum))*4; // negative, should cast on horde
     }
-
     if (newStack == m_tenacityStack)
         return;
-
     if (m_tenacityStack > 0 && newStack <= 0) // old buff was on alliance
         team = TEAM_ALLIANCE;
     else if (m_tenacityStack < 0 && newStack >= 0) // old buff was on horde
         team = TEAM_HORDE;
-
     m_tenacityStack = newStack;
-
     // Remove old buff
     if (team != TEAM_NEUTRAL)
     {
         for (PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
             if ((*itr)->getLevel() > 69)
                 REMOVE_TENACITY_AURA((*itr));
-
         for (CreatureSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
             REMOVE_TENACITY_AURA((*itr));
     }
-
     // Apply new buff
     if (newStack)
     {
         team = newStack > 0 ? TEAM_ALLIANCE : TEAM_HORDE;
         if (newStack < 0) newStack = -newStack;
         int32 auraStack = newStack > 20 ? 20 : newStack; // Dont let it be higher than 20
-
         for (PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
             if ((*itr)->getLevel() > 69)
                 CastTenacity((*itr), auraStack);
-
         for (CreatureSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
             CastTenacity((*itr), auraStack);
     }
 }
-
 void OPvPWintergrasp::VehicleCastSpell(TeamId team, int32 spellId) const
 {
     if (spellId > 0)
@@ -910,14 +808,12 @@ void OPvPWintergrasp::VehicleCastSpell(TeamId team, int32 spellId) const
         for (CreatureSet::const_iterator itr = m_vehicles[team].begin(); itr != m_vehicles[team].end(); ++itr)
             (*itr)->RemoveAura((uint32)-spellId); // by stack?
 }
-
 void OPvPWintergrasp::LieutenantCastSpell(TeamId team, int32 spellId) const
 {
     for (PlayerSet::const_iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
         if ((*itr)->HasAura(SPELL_LIEUTENANT) && ((*itr)->getLevel() > 69))
             (*itr)->CastSpell(*itr, (uint32)spellId, true);
 }
-
 void OPvPWintergrasp::UpdateClockDigit(uint32 &timer, uint32 digit, uint32 mod)
 {
     uint32 value = timer%mod;
@@ -928,7 +824,6 @@ void OPvPWintergrasp::UpdateClockDigit(uint32 &timer, uint32 digit, uint32 mod)
         SendUpdateWorldState(ClockWorldState[digit], value);
     }
 }
-
 void OPvPWintergrasp::UpdateClock()
 {
     uint32 timer = m_timer / 1000;
@@ -939,25 +834,20 @@ void OPvPWintergrasp::UpdateClock()
     if (!isWarTime())
         UpdateClockDigit(timer, 4, 10);
 }
-
 bool OPvPWintergrasp::Update(uint32 diff)
 {
     if(!sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED))
         return false;
-
     if (m_timer > diff)
     {
         m_timer -= diff;
-
         if (isWarTime())
             OutdoorPvP::Update(diff); // update capture points
-
         UpdateClock();
     }
     else
     {
         m_sendUpdate = false;
-
         if (isWarTime())
         {
             if (m_changeDefender)
@@ -976,7 +866,6 @@ bool OPvPWintergrasp::Update(uint32 diff)
                 else
                     sWorld.SendZoneText(ZONE_WINTERGRASP, "Horde has successfully defended the fortress!");
             }
-
             EndBattle();
         }
         else
@@ -984,33 +873,26 @@ bool OPvPWintergrasp::Update(uint32 diff)
             sWorld.SendZoneText(ZONE_WINTERGRASP, "Battle begins!");
             StartBattle();
         }
-
         UpdateAllWorldObject();
         UpdateClock();
-
         SendInitWorldStatesTo();
         m_sendUpdate = true;
     }
-
     return false;
 }
-
 void OPvPWintergrasp::StartBattle()
 {
     m_wartime = true;
     m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME) * MINUTE * IN_MILISECONDS;
-
     // Add recruit Aura, Add Tenacity
     TeamCastSpell(getDefenderTeam(), SPELL_RECRUIT);
     TeamCastSpell(getAttackerTeam(), SPELL_RECRUIT);
     UpdateTenacityStack();
 }
-
 void OPvPWintergrasp::EndBattle()
 {
     m_wartime = false;
     m_timer = sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL) * MINUTE * IN_MILISECONDS;
-
     for (uint32 team = 0; team < 2; ++team)
     {
         // destroyed all vehicles
@@ -1020,10 +902,8 @@ void OPvPWintergrasp::EndBattle()
             m_vehicles[team].erase(m_vehicles[team].begin());
             veh->setDeathState(JUST_DIED);
         }
-
         if (m_players[team].empty())
             continue;
-
         // calculate rewards
         uint32 intactNum = 0;
         uint32 damagedNum = 0;
@@ -1034,26 +914,22 @@ void OPvPWintergrasp::EndBattle()
                         ++damagedNum;
                     else if (workshop->m_buildingState->damageState == DAMAGE_INTACT)
                         ++intactNum;
-
         uint32 spellRewardId = team == getDefenderTeam() ? SPELL_VICTORY_REWARD : SPELL_DEFEAT_REWARD;
         uint32 baseHonor = 0;
         uint32 marks = 0;
         uint32 playersWithRankNum = 0;
-
         if (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR))
         {
             // Calculate Level 70+ with Corporal or Lieutenant rank
             for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
                 if ((*itr)->getLevel() > 69 && ((*itr)->HasAura(SPELL_LIEUTENANT) || (*itr)->HasAura(SPELL_CORPORAL)))
                     ++playersWithRankNum;
-
             baseHonor = m_customHonorReward[(team == getDefenderTeam()) ? WIN_BATTLE : LOSE_BATTLE];
             baseHonor += (m_customHonorReward[DAMAGED_TOWER] * m_towerCount[OTHER_TEAM(team)][DAMAGED_TOWER]);
             baseHonor += (m_customHonorReward[DESTROYED_TOWER] * m_towerCount[OTHER_TEAM(team)][DAMAGED_TOWER]);
             baseHonor += (m_customHonorReward[INTACT_BUILDING] * intactNum);
             baseHonor += (m_customHonorReward[DAMAGED_BUILDING] * damagedNum);
         }
-
         // Revive players, remove auras and give rewards
         for (PlayerSet::iterator itr = m_players[team].begin(); itr != m_players[team].end(); ++itr)
         {
@@ -1064,10 +940,8 @@ void OPvPWintergrasp::EndBattle()
                 (*itr)->ResurrectPlayer(1.0f);
                 ObjectAccessor::Instance().ConvertCorpseForPlayer((*itr)->GetGUID());
             }
-
             if ((*itr)->getLevel() < 70)
                 continue; // No rewards for level <70
-
             // give rewards
             if (sWorld.getConfig(CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR))
             {
@@ -1132,45 +1006,37 @@ void OPvPWintergrasp::EndBattle()
                 if((*itr)->HasAura(SPELL_LIEUTENANT) || (*itr)->HasAura(SPELL_CORPORAL))
                     (*itr)->AreaExploredOrEventHappens(A_VICTORY_IN_WG);
                     (*itr)->AreaExploredOrEventHappens(H_VICTORY_IN_WG);
-
             }
             REMOVE_WARTIME_AURAS(*itr);
             REMOVE_TENACITY_AURA(*itr);
             (*itr)->CombatStop(true);
         }
     }
-
     //3.2.0: TeamCastSpell(getAttackerTeam(), SPELL_TELEPORT_DALARAN);
     RemoveOfflinePlayerWGAuras();
 }
-
 void OPvPWintergrasp::SetData(uint32 id, uint32 value)
 {
     //if (id == DATA_ENGINEER_DIE)
     //    if (SiegeWorkshop *workshop = GetWorkshopByEngGuid(value))
     //        workshop->DespawnAllVehicles();
 }
-
 bool OPvPWintergrasp::CanBuildVehicle(SiegeWorkshop *workshop) const
 {
     TeamId team = workshop->m_buildingState->GetTeam();
     if (team == TEAM_NEUTRAL)
         return false;
-
     return isWarTime()
         && workshop->m_buildingState->damageState != DAMAGE_DESTROYED
         && m_vehicles[team].size() < m_workshopCount[team] * MAX_VEHICLE_PER_WORKSHOP;
 }
-
 uint32 OPvPWintergrasp::GetData(uint32 id)
 {
     // if can build more vehicles
     if (SiegeWorkshop *workshop = GetWorkshopByEngGuid(id))
         return CanBuildVehicle(workshop) ? 1 : 0;
-
     return 0;
 }
-
 void OPvPWintergrasp::RewardMarkOfHonor(Player *plr, uint32 count)
 {
     // 'Inactive' this aura prevents the player from gaining honor points and battleground tokens
@@ -1178,32 +1044,26 @@ void OPvPWintergrasp::RewardMarkOfHonor(Player *plr, uint32 count)
         return;
     if (count == 0)
         return;
-
     ItemPosCountVec dest;
     uint32 no_space_count = 0;
     uint8 msg = plr->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, WG_MARK_OF_HONOR, count, &no_space_count);
-
     if (msg == EQUIP_ERR_ITEM_NOT_FOUND)
     {
         sLog.outErrorDb("Wintergrasp reward item (Entry %u) not exist in `item_template`.", WG_MARK_OF_HONOR);
         return;
     }
-
     if (msg != EQUIP_ERR_OK) // convert to possible store amount
         count -= no_space_count;
-
     if (count != 0 && !dest.empty()) // can add some
         if (Item* item = plr->StoreNewItem(dest, WG_MARK_OF_HONOR, true, 0))
             plr->SendNewItem(item, count, true, false);
 }
-
 SiegeWorkshop *OPvPWintergrasp::GetWorkshop(uint32 lowguid) const
 {
     if (OPvPCapturePoint *cp = GetCapturePoint(lowguid))
         return dynamic_cast<SiegeWorkshop*>(cp);
     return NULL;
 }
-
 SiegeWorkshop *OPvPWintergrasp::GetWorkshopByEngGuid(uint32 lowguid) const
 {
     for (OutdoorPvP::OPvPCapturePointMap::const_iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
@@ -1212,7 +1072,6 @@ SiegeWorkshop *OPvPWintergrasp::GetWorkshopByEngGuid(uint32 lowguid) const
                 return workshop;
     return NULL;
 }
-
 SiegeWorkshop *OPvPWintergrasp::GetWorkshopByGOGuid(uint32 lowguid) const
 {
     for (OutdoorPvP::OPvPCapturePointMap::const_iterator itr = m_capturePoints.begin(); itr != m_capturePoints.end(); ++itr)
@@ -1221,17 +1080,14 @@ SiegeWorkshop *OPvPWintergrasp::GetWorkshopByGOGuid(uint32 lowguid) const
                 return workshop;
     return NULL;
 }
-
 /*######
 ##SiegeWorkshop
 ######*/
-
 SiegeWorkshop::SiegeWorkshop(OPvPWintergrasp *opvp, BuildingState *state)
 : OPvPCapturePoint(opvp), m_buildingState(state), m_wintergrasp(opvp)
 , m_engineer(NULL), m_engGuid(0)
 {
 }
-
 void SiegeWorkshop::SetTeamByBuildingState()
 {
     if (m_buildingState->GetTeam() == TEAM_ALLIANCE)
@@ -1249,17 +1105,14 @@ void SiegeWorkshop::SetTeamByBuildingState()
         m_value = 0;
         m_State = OBJECTIVESTATE_NEUTRAL;
     }
-
     if (m_team != m_buildingState->GetTeam())
     {
         TeamId oldTeam = m_team;
         m_team = m_buildingState->GetTeam();
         ChangeTeam(oldTeam);
     }
-
     SendChangePhase();
 }
-
 void SiegeWorkshop::ChangeTeam(TeamId oldTeam)
 {
     uint32 entry = 0;
@@ -1270,20 +1123,15 @@ void SiegeWorkshop::ChangeTeam(TeamId oldTeam)
         entry = m_team == TEAM_ALLIANCE ? CRE_ENG_A : CRE_ENG_H;
         m_wintergrasp->ModifyWorkshopCount(m_team, true);
     }
-
     GameObject::SetGoArtKit(CapturePointArtKit[m_team], m_capturePoint, m_capturePointGUID);
-
     m_buildingState->SetTeam(m_team);
     // TODO: this may be sent twice
     m_wintergrasp->BroadcastStateChange(m_buildingState);
-
     if (m_buildingState->building)
         m_buildingState->building->SetUInt32Value(GAMEOBJECT_FACTION, WintergraspFaction[m_team]);
-
     if (entry)
     {
         *m_engEntry = entry;
-
         if (m_engineer)
         {
             m_engineer->SetOriginalEntry(entry);
@@ -1297,6 +1145,5 @@ void SiegeWorkshop::ChangeTeam(TeamId oldTeam)
     }
     else if (m_engineer)
         m_engineer->SetVisibility(VISIBILITY_OFF);
-
     sLog.outDebug("Wintergrasp workshop now belongs to %u.", (uint32)m_buildingState->GetTeam());
 }
diff --git a/src/game/Wintergrasp.h b/src/game/Wintergrasp.h
index 92a7b2acd9b..291a80a5e1d 100644
--- a/src/game/Wintergrasp.h
+++ b/src/game/Wintergrasp.h
@@ -15,33 +15,25 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef TRINITY_WINTERGRASP_H
 #define TRINITY_WINTERGRASP_H
-
 #include "OutdoorPvPImpl.h"
-
 #define ZONE_WINTERGRASP         4197
 #define POS_X_CENTER             4700
 #define MAX_VEHICLE_PER_WORKSHOP    4
-
 const uint32 WintergraspFaction[3] = {1732, 1735, 35};
 const uint32 WG_MARK_OF_HONOR = 43589;
 const uint32 VehNumWorldState[2] = {3680,3490};
 const uint32 MaxVehNumWorldState[2] = {3681,3491};
 const uint32 ClockWorldState[5] = {3785,3784,3782,3976,3975};
-
 enum WintergraspSpell
 {
     SPELL_RECRUIT           = 37795,
     SPELL_CORPORAL          = 33280,
     SPELL_LIEUTENANT        = 55629,
-
     SPELL_TENACITY          = 58549,
     SPELL_TENACITY_VEHICLE  = 59911,
-
     SPELL_TELEPORT_DALARAN  = 53360,
-
     SPELL_TOWER_CONTROL     = 62064,
     SPELL_VICTORY_REWARD    = 56902,
     SPELL_DEFEAT_REWARD     = 58494,
@@ -54,7 +46,6 @@ enum WintergraspSpell
 //    SPELL_RULERS_OF_WG      = 52108,
 //    SPELL_ESSENCE_OF_WG     = 58045,
 };
-
 enum WintergraspRewardEvent
 {
     WIN_BATTLE,
@@ -66,11 +57,8 @@ enum WintergraspRewardEvent
     WG_REWARD_EVENT_MAX,
 };
 
-
 /* Not used / Not implemented
-
 const uint16 GameEventWintergraspDefender[2] = {50, 51};
-
 enum OutdoorPvP_WG_Sounds
 {
     OutdoorPvP_WG_SOUND_KEEP_CLAIMED            = 8192,
@@ -80,12 +68,10 @@ enum OutdoorPvP_WG_Sounds
     OutdoorPvP_WG_SOUND_KEEP_ASSAULTED_HORDE    = 8174,
     OutdoorPvP_WG_SOUND_NEAR_VICTORY            = 8456
 };
-
 enum DataId
 {
     DATA_ENGINEER_DIE,
 };
-
 enum OutdoorPvP_WG_KeepStatus
 {
     OutdoorPvP_WG_KEEP_TYPE_NEUTRAL             = 0,
@@ -97,7 +83,6 @@ enum OutdoorPvP_WG_KeepStatus
     OutdoorPvP_WG_KEEP_STATUS_HORDE_OCCUPIED    = 4
 };
 */
-
 enum WintergraspCreType
 {
     CREATURE_OTHER,
@@ -107,23 +92,19 @@ enum WintergraspCreType
     CREATURE_GUARD,
     CREATURE_SPECIAL,
 };
-
 enum BuildingType
 {
     BUILDING_WALL,
     BUILDING_WORKSHOP,
     BUILDING_TOWER,
 };
-
 enum DamageState
 {
     DAMAGE_INTACT,
     DAMAGE_DAMAGED,
     DAMAGE_DESTROYED,
 };
-
 const uint32 AreaPOIIconId[3][3] = {{7,8,9},{4,5,6},{1,2,3}};
-
 struct BuildingState
 {
     explicit BuildingState(uint32 _worldState, TeamId _team, bool asDefault)
@@ -138,17 +119,14 @@ struct BuildingState
     GameObject *building;
     uint32 *graveTeam;
     BuildingType type;
-
     void SendUpdate(Player *player) const
     {
         player->SendUpdateWorldState(worldState, AreaPOIIconId[team][damageState]);
     }
-
     void FillData(WorldPacket &data) const
     {
         data << worldState << AreaPOIIconId[team][damageState];
     }
-
     TeamId GetTeam() const { return team; }
     void SetTeam(TeamId t)
     {
@@ -156,15 +134,11 @@ struct BuildingState
         if(graveTeam)
             *graveTeam = TeamId2Team[t];
     }
-
 private:
     TeamId team;
 };
-
 typedef std::map<uint32, uint32> TeamPairMap;
-
 class SiegeWorkshop;
-
 class OPvPWintergrasp : public OutdoorPvP
 {
     protected:
@@ -174,26 +148,18 @@ class OPvPWintergrasp : public OutdoorPvP
     public:
         explicit OPvPWintergrasp() : m_tenacityStack(0), m_gate(NULL) {}
         bool SetupOutdoorPvP();
-
         uint32 GetCreatureEntry(uint32 guidlow, const CreatureData *data);
         //uint32 GetGameObjectEntry(uint32 guidlow, uint32 entry);
-
         void OnCreatureCreate(Creature *creature, bool add);
         void OnGameObjectCreate(GameObject *go, bool add);
-
         void ProcessEvent(GameObject *obj, uint32 eventId);
-
         void HandlePlayerEnterZone(Player *plr, uint32 zone);
         void HandlePlayerLeaveZone(Player *plr, uint32 zone);
         void HandleKill(Player *killer, Unit *victim);
-
         bool Update(uint32 diff);
-
         void BroadcastStateChange(BuildingState *state) const;
-
         uint32 GetData(uint32 id);
         void SetData(uint32 id, uint32 value);
-
         void ModifyWorkshopCount(TeamId team, bool add);
         uint32 GetTimer() const { return m_timer / 1000; };
         TeamId GetTeam() const { return m_defender; };
@@ -201,32 +167,24 @@ class OPvPWintergrasp : public OutdoorPvP
     protected:
         TeamId m_defender;
         int32 m_tenacityStack;
-
         BuildingStateMap m_buildingStates;
         BuildingState *m_gate;
-
         CreatureSet m_creatures;
         CreatureSet m_vehicles[2];
         GameObjectSet m_gobjects;
-
         TeamPairMap m_creEntryPair, m_goDisplayPair;
-
         bool m_wartime;
         bool m_changeDefender;
         uint32 m_timer;
         uint32 m_clock[5];
         uint32 m_workshopCount[2];
         uint32 m_towerCount[2][2];
-
         uint32 m_customHonorReward[WG_REWARD_EVENT_MAX];
-
         SiegeWorkshop *GetWorkshop(uint32 lowguid) const;
         SiegeWorkshop *GetWorkshopByEngGuid(uint32 lowguid) const;
         SiegeWorkshop *GetWorkshopByGOGuid(uint32 lowguid) const;
-
         void StartBattle();
         void EndBattle();
-
         void UpdateClock();
         void UpdateClockDigit(uint32 &timer, uint32 digit, uint32 mod);
         void PromotePlayer(Player *player) const;
@@ -235,20 +193,15 @@ class OPvPWintergrasp : public OutdoorPvP
         void UpdateAllWorldObject();
         bool UpdateCreatureInfo(Creature *creature) const;
         bool UpdateGameObjectInfo(GameObject *go) const;
-
         bool CanBuildVehicle(SiegeWorkshop *workshop) const;
         WintergraspCreType GetCreatureType(uint32 entry) const;
-
         void RebuildAllBuildings();
-
         void LieutenantCastSpell(TeamId team, int32 spellId) const;
         void VehicleCastSpell(TeamId team, int32 spellId) const;
-
         void SendInitWorldStatesTo(Player *player = NULL) const;
         void RemoveOfflinePlayerWGAuras();
         void RewardMarkOfHonor(Player *player, uint32 count);
 };
-
 class SiegeWorkshop : public OPvPCapturePoint
 {
     public:
@@ -257,9 +210,7 @@ class SiegeWorkshop : public OPvPCapturePoint
         void ChangeState() {}
         void ChangeTeam(TeamId oldteam);
         //void DespawnAllVehicles();
-
         //bool CanBuildVehicle() const { return m_vehicles.size() < MAX_VEHICLE_PER_WORKSHOP && m_buildingState->damageState != DAMAGE_DESTROYED; }
-
         uint32 *m_engEntry;
         uint32 m_engGuid;
         Creature *m_engineer;
@@ -269,5 +220,4 @@ class SiegeWorkshop : public OPvPCapturePoint
     protected:
         OPvPWintergrasp *m_wintergrasp;
 };
-
 #endif
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 17b2529002f..f73eacc4720 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /** \file
     \ingroup world
 */
-
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Config/ConfigEnv.h"
@@ -68,22 +66,17 @@
 #include "CreatureGroups.h"
 #include "Transports.h"
 #include "ProgressBar.h"
-
 INSTANTIATE_SINGLETON_1(World);
-
 volatile bool World::m_stopEvent = false;
 uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
 volatile uint32 World::m_worldLoopCounter = 0;
-
 float World::m_MaxVisibleDistanceOnContinents = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_MaxVisibleDistanceInInstances  = DEFAULT_VISIBILITY_INSTANCE;
 float World::m_MaxVisibleDistanceInBGArenas   = DEFAULT_VISIBILITY_BGARENAS;
 float World::m_MaxVisibleDistanceForObject    = DEFAULT_VISIBILITY_DISTANCE;
-
 float World::m_MaxVisibleDistanceInFlight     = DEFAULT_VISIBILITY_DISTANCE;
 float World::m_VisibleUnitGreyDistance        = 0;
 float World::m_VisibleObjectGreyDistance      = 0;
-
 /// World constructor
 World::World()
 {
@@ -101,16 +94,12 @@ World::World()
     m_resultQueue = NULL;
     m_NextDailyQuestReset = 0;
     m_scheduledScripts = 0;
-
     m_defaultDbcLocale = LOCALE_enUS;
     m_availableDbcLocaleMask = 0;
-
     m_updateTimeSum = 0;
     m_updateTimeCount = 0;
-
     m_isClosed = false;
 }
-
 /// World destructor
 World::~World()
 {
@@ -121,24 +110,17 @@ World::~World()
         delete m_sessions.begin()->second;
         m_sessions.erase(m_sessions.begin());
     }
-
     ///- Empty the WeatherMap
     for (WeatherMap::const_iterator itr = m_weathers.begin(); itr != m_weathers.end(); ++itr)
         delete itr->second;
-
     m_weathers.clear();
-
     CliCommandHolder* command;
     while (cliCmdQueue.next(command))
         delete command;
-
     VMAP::VMapFactory::clear();
-
     if (m_resultQueue) delete m_resultQueue;
-
     //TODO free addSessQueue
 }
-
 /// Find a player in a specified zone
 Player* World::FindPlayerInZone(uint32 zone)
 {
@@ -159,46 +141,37 @@ Player* World::FindPlayerInZone(uint32 zone)
     }
     return NULL;
 }
-
 /// Find a session by its id
 WorldSession* World::FindSession(uint32 id) const
 {
     SessionMap::const_iterator itr = m_sessions.find(id);
-
     if (itr != m_sessions.end())
         return itr->second;                                 // also can return NULL for kicked session
     else
         return NULL;
 }
-
 /// Remove a given session
 bool World::RemoveSession(uint32 id)
 {
     ///- Find the session, kick the user, but we can't delete session at this moment to prevent iterator invalidation
     SessionMap::const_iterator itr = m_sessions.find(id);
-
     if (itr != m_sessions.end() && itr->second)
     {
         if (itr->second->PlayerLoading())
             return false;
         itr->second->KickPlayer();
     }
-
     return true;
 }
-
 void World::AddSession(WorldSession* s)
 {
     addSessQueue.add(s);
 }
-
 void
 World::AddSession_ (WorldSession* s)
 {
     ASSERT (s);
-
     //NOTE - Still there is race condition in WorldSession* being used in the Sockets
-
     ///- kick already loaded player with same account (if any) and remove session
     ///- if player is in loading and want to load again, return
     if (!RemoveSession (s->GetAccountId ()))
@@ -207,15 +180,12 @@ World::AddSession_ (WorldSession* s)
         delete s;                                           // session not added yet in session list, so not listed in queue
         return;
     }
-
     // decrease session counts only at not reconnection case
     bool decrease_session = true;
-
     // if session already exist, prepare to it deleting at next world update
     // NOTE - KickPlayer() should be called on "old" in RemoveSession()
     {
         SessionMap::const_iterator old = m_sessions.find(s->GetAccountId ());
-
         if (old != m_sessions.end())
         {
             // prevent decrease sessions count if session queued
@@ -225,18 +195,14 @@ World::AddSession_ (WorldSession* s)
             delete old->second;
         }
     }
-
     m_sessions[s->GetAccountId ()] = s;
-
     uint32 Sessions = GetActiveAndQueuedSessionCount ();
     uint32 pLimit = GetPlayerAmountLimit ();
     uint32 QueueSize = GetQueueSize ();                     //number of players in the queue
-
     //so we don't count the user trying to
     //login as a session and queue the socket that we are using
     if (decrease_session)
         --Sessions;
-
     if (pLimit > 0 && Sessions >= pLimit && s->GetSecurity () == SEC_PLAYER && !HasRecentlyDisconnected(s))
     {
         AddQueuedPlayer (s);
@@ -244,7 +210,6 @@ World::AddSession_ (WorldSession* s)
         sLog.outDetail ("PlayerQueue: Account id %u is in Queue Position (%u).", s->GetAccountId (), ++QueueSize);
         return;
     }
-
     WorldPacket packet(SMSG_AUTH_RESPONSE, 1 + 4 + 1 + 4 + 1);
     packet << uint8 (AUTH_OK);
     packet << uint32 (0);                                   // BillingTimeRemaining
@@ -252,17 +217,12 @@ World::AddSession_ (WorldSession* s)
     packet << uint32 (0);                                   // BillingTimeRested
     packet << uint8 (s->Expansion());                       // 0 - normal, 1 - TBC, must be set in database manually for each account
     s->SendPacket (&packet);
-
     s->SendAddonsInfo();
-
     WorldPacket pkt(SMSG_CLIENTCACHE_VERSION, 4);
     pkt << uint32(sWorld.getConfig(CONFIG_CLIENTCACHE_VERSION));
     s->SendPacket(&pkt);
-
     s->SendTutorialsData();
-
     UpdateMaxSessionCounters ();
-
     // Updates the population
     if (pLimit > 0)
     {
@@ -273,11 +233,9 @@ World::AddSession_ (WorldSession* s)
         sLog.outDetail ("Server Population (%f).", popu);
     }
 }
-
 bool World::HasRecentlyDisconnected(WorldSession* session)
 {
     if (!session) return false;
-
     if (uint32 tolerance = getConfig(CONFIG_INTERVAL_DISCONNECT_TOLERANCE))
     {
         for (DisconnectMap::iterator i = m_disconnects.begin(); i != m_disconnects.end();)
@@ -294,23 +252,18 @@ bool World::HasRecentlyDisconnected(WorldSession* session)
     }
     return false;
  }
-
 int32 World::GetQueuePos(WorldSession* sess)
 {
     uint32 position = 1;
-
     for (Queue::const_iterator iter = m_QueuedPlayer.begin(); iter != m_QueuedPlayer.end(); ++iter, ++position)
         if ((*iter) == sess)
             return position;
-
     return 0;
 }
-
 void World::AddQueuedPlayer(WorldSession* sess)
 {
     sess->SetInQueue(true);
     m_QueuedPlayer.push_back (sess);
-
     // The 1st SMSG_AUTH_RESPONSE needs to contain other info too.
     WorldPacket packet (SMSG_AUTH_RESPONSE, 1 + 4 + 1 + 4 + 1);
     packet << uint8 (AUTH_WAIT_QUEUE);
@@ -320,21 +273,16 @@ void World::AddQueuedPlayer(WorldSession* sess)
     packet << uint8 (sess->Expansion () ? 1 : 0);                    // 0 - normal, 1 - TBC, must be set in database manually for each account
     packet << uint32(GetQueuePos (sess));
     sess->SendPacket (&packet);
-
     //sess->SendAuthWaitQue (GetQueuePos (sess));
 }
-
 bool World::RemoveQueuedPlayer(WorldSession* sess)
 {
     // sessions count including queued to remove (if removed_session set)
     uint32 sessions = GetActiveSessionCount();
-
     uint32 position = 1;
     Queue::iterator iter = m_QueuedPlayer.begin();
-
     // search to remove and count skipped positions
     bool found = false;
-
     for (;iter != m_QueuedPlayer.end(); ++iter, ++position)
     {
         if (*iter==sess)
@@ -345,14 +293,11 @@ bool World::RemoveQueuedPlayer(WorldSession* sess)
             break;
         }
     }
-
     // iter point to next socked after removed or end()
     // position store position of removed socket and then new position next socket after removed
-
     // if session not queued then we need decrease sessions count
     if (!found && sessions)
         --sessions;
-
     // accept first in queue
     if ((!m_playerLimit || sessions < m_playerLimit) && !m_QueuedPlayer.empty())
     {
@@ -360,60 +305,49 @@ bool World::RemoveQueuedPlayer(WorldSession* sess)
         pop_sess->SetInQueue(false);
         pop_sess->SendAuthWaitQue(0);
         m_QueuedPlayer.pop_front();
-
         // update iter to point first queued socket or end() if queue is empty now
         iter = m_QueuedPlayer.begin();
         position = 1;
     }
-
     // update position from iter to end()
     // iter point to first not updated socket, position store new position
     for (; iter != m_QueuedPlayer.end(); ++iter, ++position)
         (*iter)->SendAuthWaitQue(position);
-
     return found;
 }
-
 /// Find a Weather object by the given zoneid
 Weather* World::FindWeather(uint32 id) const
 {
     WeatherMap::const_iterator itr = m_weathers.find(id);
-
     if (itr != m_weathers.end())
         return itr->second;
     else
         return 0;
 }
-
 /// Remove a Weather object for the given zoneid
 void World::RemoveWeather(uint32 id)
 {
     // not called at the moment. Kept for completeness
     WeatherMap::iterator itr = m_weathers.find(id);
-
     if (itr != m_weathers.end())
     {
         delete itr->second;
         m_weathers.erase(itr);
     }
 }
-
 /// Add a Weather object to the list
 Weather* World::AddWeather(uint32 zone_id)
 {
     WeatherZoneChances const* weatherChances = objmgr.GetWeatherChances(zone_id);
-
     // zone not have weather, ignore
     if (!weatherChances)
         return NULL;
-
     Weather* w = new Weather(zone_id,weatherChances);
     m_weathers[w->GetZone()] = w;
     w->ReGenerate();
     w->UpdateWeather();
     return w;
 }
-
 /// Initialize config values
 void World::LoadConfigSettings(bool reload)
 {
@@ -426,17 +360,13 @@ void World::LoadConfigSettings(bool reload)
         }
         //TODO Check if config is outdated
     }
-
     ///- Read the player limit and the Message of the day from the config file
     SetPlayerLimit(sConfig.GetIntDefault("PlayerLimit", DEFAULT_PLAYER_LIMIT), true);
     SetMotd(sConfig.GetStringDefault("Motd", "Welcome to a Trinity Core Server."));
-
     ///- Get string for new logins (newly created characters)
     SetNewCharString(sConfig.GetStringDefault("PlayerStart.String", ""));
-
     ///- Send server info on login?
     m_configs[CONFIG_ENABLE_SINFO_LOGIN] = sConfig.GetIntDefault("Server.LoginInfo", 0);
-
     ///- Read all rates from the config file
     rate_values[RATE_HEALTH]      = sConfig.GetFloatDefault("Rate.Health", 1);
     if (rate_values[RATE_HEALTH] < 0)
@@ -528,7 +458,6 @@ void World::LoadConfigSettings(bool reload)
     }
     for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i) playerBaseMoveSpeed[i] = baseMoveSpeed[i] * rate_values[RATE_MOVESPEED];
     rate_values[RATE_CORPSE_DECAY_LOOTED] = sConfig.GetFloatDefault("Rate.Corpse.Decay.Looted",0.5f);
-
     rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = sConfig.GetFloatDefault("TargetPosRecalculateRange",1.5f);
     if (rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] < CONTACT_DISTANCE)
     {
@@ -541,7 +470,6 @@ void World::LoadConfigSettings(bool reload)
             rate_values[RATE_TARGET_POS_RECALCULATION_RANGE],NOMINAL_MELEE_RANGE,NOMINAL_MELEE_RANGE);
         rate_values[RATE_TARGET_POS_RECALCULATION_RANGE] = NOMINAL_MELEE_RANGE;
     }
-
     rate_values[RATE_DURABILITY_LOSS_ON_DEATH]  = sConfig.GetFloatDefault("DurabilityLoss.OnDeath", 10.0f);
     if (rate_values[RATE_DURABILITY_LOSS_ON_DEATH] < 0.0f)
     {
@@ -554,7 +482,6 @@ void World::LoadConfigSettings(bool reload)
         rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = 0.0f;
     }
     rate_values[RATE_DURABILITY_LOSS_ON_DEATH] = rate_values[RATE_DURABILITY_LOSS_ON_DEATH] / 100.0f;
-
     rate_values[RATE_DURABILITY_LOSS_DAMAGE] = sConfig.GetFloatDefault("DurabilityLossChance.Damage",0.5f);
     if (rate_values[RATE_DURABILITY_LOSS_DAMAGE] < 0.0f)
     {
@@ -579,11 +506,8 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("DurabilityLossChance.Block (%f) must be >=0. Using 0.0 instead.",rate_values[RATE_DURABILITY_LOSS_BLOCK]);
         rate_values[RATE_DURABILITY_LOSS_BLOCK] = 0.0f;
     }
-
     ///- Read other configuration items from the config file
-
     m_configs[CONFIG_DURABILITY_LOSS_IN_PVP] = sConfig.GetBoolDefault("DurabilityLoss.InPvP", false);
-
     m_configs[CONFIG_COMPRESSION] = sConfig.GetIntDefault("Compression", 1);
     if (m_configs[CONFIG_COMPRESSION] < 1 || m_configs[CONFIG_COMPRESSION] > 9)
     {
@@ -594,7 +518,6 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_GRID_UNLOAD] = sConfig.GetBoolDefault("GridUnload", true);
     m_configs[CONFIG_INTERVAL_SAVE] = sConfig.GetIntDefault("PlayerSaveInterval", 15 * MINUTE * IN_MILISECONDS);
     m_configs[CONFIG_INTERVAL_DISCONNECT_TOLERANCE] = sConfig.GetIntDefault("DisconnectToleranceInterval", 0);
-
     m_configs[CONFIG_INTERVAL_GRIDCLEAN] = sConfig.GetIntDefault("GridCleanUpDelay", 5 * MINUTE * IN_MILISECONDS);
     if (m_configs[CONFIG_INTERVAL_GRIDCLEAN] < MIN_GRID_DELAY)
     {
@@ -603,7 +526,6 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
         MapManager::Instance().SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
-
     m_configs[CONFIG_INTERVAL_MAPUPDATE] = sConfig.GetIntDefault("MapUpdateInterval", 100);
     if (m_configs[CONFIG_INTERVAL_MAPUPDATE] < MIN_MAP_UPDATE_DELAY)
     {
@@ -612,9 +534,7 @@ void World::LoadConfigSettings(bool reload)
     }
     if (reload)
         MapManager::Instance().SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
-
     m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
@@ -623,7 +543,6 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_PORT_WORLD] = sConfig.GetIntDefault("WorldServerPort", DEFAULT_WORLDSERVER_PORT);
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
@@ -632,12 +551,10 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_SOCKET_SELECTTIME] = sConfig.GetIntDefault("SocketSelectTime", DEFAULT_SOCKET_SELECT_TIME);
-
     m_configs[CONFIG_GROUP_XP_DISTANCE] = sConfig.GetIntDefault("MaxGroupXPDistance", 74);
     /// \todo Add MonsterSight and GuarderSight (with meaning) in Trinityd.conf or put them as define
     m_configs[CONFIG_SIGHT_MONSTER] = sConfig.GetIntDefault("MonsterSight", 50);
     m_configs[CONFIG_SIGHT_GUARDER] = sConfig.GetIntDefault("GuarderSight", 50);
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("GameType", 0);
@@ -646,7 +563,6 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_GAME_TYPE] = sConfig.GetIntDefault("GameType", 0);
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
@@ -655,7 +571,6 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_REALM_ZONE] = sConfig.GetIntDefault("RealmZone", REALM_ZONE_DEVELOPMENT);
-
     m_configs[CONFIG_ALLOW_TWO_SIDE_ACCOUNTS]            = sConfig.GetBoolDefault("AllowTwoSide.Accounts", false);
     m_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHAT]    = sConfig.GetBoolDefault("AllowTwoSide.Interaction.Chat",false);
     m_configs[CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL] = sConfig.GetBoolDefault("AllowTwoSide.Interaction.Channel",false);
@@ -669,37 +584,31 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_STRICT_PLAYER_NAMES]                = sConfig.GetIntDefault ("StrictPlayerNames",  0);
     m_configs[CONFIG_STRICT_CHARTER_NAMES]               = sConfig.GetIntDefault ("StrictCharterNames", 0);
     m_configs[CONFIG_STRICT_PET_NAMES]                   = sConfig.GetIntDefault ("StrictPetNames",     0);
-
     m_configs[CONFIG_MIN_PLAYER_NAME]                    = sConfig.GetIntDefault ("MinPlayerName",  2);
     if (m_configs[CONFIG_MIN_PLAYER_NAME] < 1 || m_configs[CONFIG_MIN_PLAYER_NAME] > MAX_PLAYER_NAME)
     {
         sLog.outError("MinPlayerName (%i) must be in range 1..%u. Set to 2.",m_configs[CONFIG_MIN_PLAYER_NAME],MAX_PLAYER_NAME);
         m_configs[CONFIG_MIN_PLAYER_NAME] = 2;
     }
-
     m_configs[CONFIG_MIN_CHARTER_NAME]                   = sConfig.GetIntDefault ("MinCharterName", 2);
     if (m_configs[CONFIG_MIN_CHARTER_NAME] < 1 || m_configs[CONFIG_MIN_CHARTER_NAME] > MAX_CHARTER_NAME)
     {
         sLog.outError("MinCharterName (%i) must be in range 1..%u. Set to 2.",m_configs[CONFIG_MIN_CHARTER_NAME],MAX_CHARTER_NAME);
         m_configs[CONFIG_MIN_CHARTER_NAME] = 2;
     }
-
     m_configs[CONFIG_MIN_PET_NAME]                       = sConfig.GetIntDefault ("MinPetName",     2);
     if (m_configs[CONFIG_MIN_PET_NAME] < 1 || m_configs[CONFIG_MIN_PET_NAME] > MAX_PET_NAME)
     {
         sLog.outError("MinPetName (%i) must be in range 1..%u. Set to 2.",m_configs[CONFIG_MIN_PET_NAME],MAX_PET_NAME);
         m_configs[CONFIG_MIN_PET_NAME] = 2;
     }
-
     m_configs[CONFIG_CHARACTERS_CREATING_DISABLED]       = sConfig.GetIntDefault ("CharactersCreatingDisabled", 0);
-
     m_configs[CONFIG_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("CharactersPerRealm", 10);
     if (m_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_configs[CONFIG_CHARACTERS_PER_REALM] > 10)
     {
         sLog.outError("CharactersPerRealm (%i) must be in range 1..10. Set to 10.",m_configs[CONFIG_CHARACTERS_PER_REALM]);
         m_configs[CONFIG_CHARACTERS_PER_REALM] = 10;
     }
-
     // must be after CONFIG_CHARACTERS_PER_REALM
     m_configs[CONFIG_CHARACTERS_PER_ACCOUNT] = sConfig.GetIntDefault("CharactersPerAccount", 50);
     if (m_configs[CONFIG_CHARACTERS_PER_ACCOUNT] < m_configs[CONFIG_CHARACTERS_PER_REALM])
@@ -707,23 +616,19 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("CharactersPerAccount (%i) can't be less than CharactersPerRealm (%i).",m_configs[CONFIG_CHARACTERS_PER_ACCOUNT],m_configs[CONFIG_CHARACTERS_PER_REALM]);
         m_configs[CONFIG_CHARACTERS_PER_ACCOUNT] = m_configs[CONFIG_CHARACTERS_PER_REALM];
     }
-
     m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = sConfig.GetIntDefault("HeroicCharactersPerRealm", 1);
     if (int32(m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]) < 0 || m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] > 10)
     {
         sLog.outError("HeroicCharactersPerRealm (%i) must be in range 0..10. Set to 1.",m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM]);
         m_configs[CONFIG_HEROIC_CHARACTERS_PER_REALM] = 1;
     }
-
     m_configs[CONFIG_MIN_LEVEL_FOR_HEROIC_CHARACTER_CREATING] = sConfig.GetIntDefault("MinLevelForHeroicCharacterCreating", 55);
-
     m_configs[CONFIG_SKIP_CINEMATICS] = sConfig.GetIntDefault("SkipCinematics", 0);
     if (int32(m_configs[CONFIG_SKIP_CINEMATICS]) < 0 || m_configs[CONFIG_SKIP_CINEMATICS] > 2)
     {
         sLog.outError("SkipCinematics (%i) must be in range 0..2. Set to 0.",m_configs[CONFIG_SKIP_CINEMATICS]);
         m_configs[CONFIG_SKIP_CINEMATICS] = 0;
     }
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL);
@@ -732,15 +637,12 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_MAX_PLAYER_LEVEL] = sConfig.GetIntDefault("MaxPlayerLevel", DEFAULT_MAX_LEVEL);
-
     if (m_configs[CONFIG_MAX_PLAYER_LEVEL] > MAX_LEVEL)
     {
         sLog.outError("MaxPlayerLevel (%i) must be in range 1..%u. Set to %u.",m_configs[CONFIG_MAX_PLAYER_LEVEL],MAX_LEVEL,MAX_LEVEL);
         m_configs[CONFIG_MAX_PLAYER_LEVEL] = MAX_LEVEL;
     }
-
     m_configs[CONFIG_MIN_DUALSPEC_LEVEL] = sConfig.GetIntDefault("MinDualSpecLevel", 40);
-
     m_configs[CONFIG_START_PLAYER_LEVEL] = sConfig.GetIntDefault("StartPlayerLevel", 1);
     if (m_configs[CONFIG_START_PLAYER_LEVEL] < 1)
     {
@@ -752,7 +654,6 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("StartPlayerLevel (%i) must be in range 1..MaxPlayerLevel(%u). Set to %u.",m_configs[CONFIG_START_PLAYER_LEVEL],m_configs[CONFIG_MAX_PLAYER_LEVEL],m_configs[CONFIG_MAX_PLAYER_LEVEL]);
         m_configs[CONFIG_START_PLAYER_LEVEL] = m_configs[CONFIG_MAX_PLAYER_LEVEL];
     }
-
     m_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] = sConfig.GetIntDefault("StartHeroicPlayerLevel", 55);
     if (m_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] < 1)
     {
@@ -766,7 +667,6 @@ void World::LoadConfigSettings(bool reload)
             m_configs[CONFIG_START_HEROIC_PLAYER_LEVEL],m_configs[CONFIG_MAX_PLAYER_LEVEL],m_configs[CONFIG_MAX_PLAYER_LEVEL]);
         m_configs[CONFIG_START_HEROIC_PLAYER_LEVEL] = m_configs[CONFIG_MAX_PLAYER_LEVEL];
     }
-
     m_configs[CONFIG_START_PLAYER_MONEY] = sConfig.GetIntDefault("StartPlayerMoney", 0);
     if (int32(m_configs[CONFIG_START_PLAYER_MONEY]) < 0)
     {
@@ -779,14 +679,12 @@ void World::LoadConfigSettings(bool reload)
             m_configs[CONFIG_START_PLAYER_MONEY],MAX_MONEY_AMOUNT,MAX_MONEY_AMOUNT);
         m_configs[CONFIG_START_PLAYER_MONEY] = MAX_MONEY_AMOUNT;
     }
-
     m_configs[CONFIG_MAX_HONOR_POINTS] = sConfig.GetIntDefault("MaxHonorPoints", 75000);
     if (int32(m_configs[CONFIG_MAX_HONOR_POINTS]) < 0)
     {
         sLog.outError("MaxHonorPoints (%i) can't be negative. Set to 0.",m_configs[CONFIG_MAX_HONOR_POINTS]);
         m_configs[CONFIG_MAX_HONOR_POINTS] = 0;
     }
-
     m_configs[CONFIG_START_HONOR_POINTS] = sConfig.GetIntDefault("StartHonorPoints", 0);
     if (int32(m_configs[CONFIG_START_HONOR_POINTS]) < 0)
     {
@@ -800,14 +698,12 @@ void World::LoadConfigSettings(bool reload)
             m_configs[CONFIG_START_HONOR_POINTS],m_configs[CONFIG_MAX_HONOR_POINTS],m_configs[CONFIG_MAX_HONOR_POINTS]);
         m_configs[CONFIG_START_HONOR_POINTS] = m_configs[CONFIG_MAX_HONOR_POINTS];
     }
-
     m_configs[CONFIG_MAX_ARENA_POINTS] = sConfig.GetIntDefault("MaxArenaPoints", 5000);
     if (int32(m_configs[CONFIG_MAX_ARENA_POINTS]) < 0)
     {
         sLog.outError("MaxArenaPoints (%i) can't be negative. Set to 0.",m_configs[CONFIG_MAX_ARENA_POINTS]);
         m_configs[CONFIG_MAX_ARENA_POINTS] = 0;
     }
-
     m_configs[CONFIG_START_ARENA_POINTS] = sConfig.GetIntDefault("StartArenaPoints", 0);
     if (int32(m_configs[CONFIG_START_ARENA_POINTS]) < 0)
     {
@@ -821,17 +717,13 @@ void World::LoadConfigSettings(bool reload)
             m_configs[CONFIG_START_ARENA_POINTS],m_configs[CONFIG_MAX_ARENA_POINTS],m_configs[CONFIG_MAX_ARENA_POINTS]);
         m_configs[CONFIG_START_ARENA_POINTS] = m_configs[CONFIG_MAX_ARENA_POINTS];
     }
-
     m_configs[CONFIG_ALL_TAXI_PATHS] = sConfig.GetBoolDefault("AllFlightPaths", false);
     m_configs[CONFIG_INSTANT_TAXI] = sConfig.GetBoolDefault("InstantFlightPaths", false);
-
     m_configs[CONFIG_INSTANCE_IGNORE_LEVEL] = sConfig.GetBoolDefault("Instance.IgnoreLevel", false);
     m_configs[CONFIG_INSTANCE_IGNORE_RAID]  = sConfig.GetBoolDefault("Instance.IgnoreRaid", false);
-
     m_configs[CONFIG_CAST_UNSTUCK] = sConfig.GetBoolDefault("CastUnstuck", true);
     m_configs[CONFIG_INSTANCE_RESET_TIME_HOUR]  = sConfig.GetIntDefault("Instance.ResetTimeHour", 4);
     m_configs[CONFIG_INSTANCE_UNLOAD_DELAY] = sConfig.GetIntDefault("Instance.UnloadDelay", 30 * MINUTE * IN_MILISECONDS);
-
     m_configs[CONFIG_MAX_PRIMARY_TRADE_SKILL] = sConfig.GetIntDefault("MaxPrimaryTradeSkill", 2);
     m_configs[CONFIG_MIN_PETITION_SIGNS] = sConfig.GetIntDefault("MinPetitionSigns", 9);
     if (m_configs[CONFIG_MIN_PETITION_SIGNS] > 9)
@@ -839,13 +731,11 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("MinPetitionSigns (%i) must be in range 0..9. Set to 9.", m_configs[CONFIG_MIN_PETITION_SIGNS]);
         m_configs[CONFIG_MIN_PETITION_SIGNS] = 9;
     }
-
     m_configs[CONFIG_GM_LOGIN_STATE]       = sConfig.GetIntDefault("GM.LoginState", 2);
     m_configs[CONFIG_GM_VISIBLE_STATE]     = sConfig.GetIntDefault("GM.Visible", 2);
     //m_configs[CONFIG_GM_ACCEPT_TICKETS]    = sConfig.GetIntDefault("GM.AcceptTickets", 2);
     m_configs[CONFIG_GM_CHAT]              = sConfig.GetIntDefault("GM.Chat", 2);
     m_configs[CONFIG_GM_WISPERING_TO]      = sConfig.GetIntDefault("GM.WhisperingTo", 2);
-
     m_configs[CONFIG_GM_LEVEL_IN_GM_LIST]  = sConfig.GetIntDefault("GM.InGMList.Level", SEC_ADMINISTRATOR);
     m_configs[CONFIG_GM_LEVEL_IN_WHO_LIST] = sConfig.GetIntDefault("GM.InWhoList.Level", SEC_ADMINISTRATOR);
     m_configs[CONFIG_GM_LOG_TRADE]         = sConfig.GetBoolDefault("GM.LogTrade", false);
@@ -865,11 +755,8 @@ void World::LoadConfigSettings(bool reload)
     }
     m_configs[CONFIG_GM_LOWER_SECURITY] = sConfig.GetBoolDefault("GM.LowerSecurity", false);
     m_configs[CONFIG_GM_ALLOW_ACHIEVEMENT_GAINS] = sConfig.GetBoolDefault("GM.AllowAchievementGain", true);
-
     m_configs[CONFIG_GROUP_VISIBILITY] = sConfig.GetIntDefault("Visibility.GroupMode",0);
-
     m_configs[CONFIG_MAIL_DELIVERY_DELAY] = sConfig.GetIntDefault("MailDeliveryDelay",HOUR);
-
     m_configs[CONFIG_UPTIME_UPDATE] = sConfig.GetIntDefault("UpdateUptimeInterval", 10);
     if (int32(m_configs[CONFIG_UPTIME_UPDATE])<=0)
     {
@@ -881,7 +768,6 @@ void World::LoadConfigSettings(bool reload)
         m_timers[WUPDATE_UPTIME].SetInterval(m_configs[CONFIG_UPTIME_UPDATE]*MINUTE*IN_MILISECONDS);
         m_timers[WUPDATE_UPTIME].Reset();
     }
-
     // log db cleanup interval
     m_configs[CONFIG_LOGDB_CLEARINTERVAL] = sConfig.GetIntDefault("LogDB.Opt.ClearInterval", 10);
     if (int32(m_configs[CONFIG_LOGDB_CLEARINTERVAL]) <= 0)
@@ -897,60 +783,48 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_LOGDB_CLEARTIME] = sConfig.GetIntDefault("LogDB.Opt.ClearTime", 1209600); // 14 days default
     sLog.outString("Will clear `logs` table of entries older than %i seconds every %u minutes.",
         m_configs[CONFIG_LOGDB_CLEARTIME], m_configs[CONFIG_LOGDB_CLEARINTERVAL]);
-
     m_configs[CONFIG_SKILL_CHANCE_ORANGE] = sConfig.GetIntDefault("SkillChance.Orange",100);
     m_configs[CONFIG_SKILL_CHANCE_YELLOW] = sConfig.GetIntDefault("SkillChance.Yellow",75);
     m_configs[CONFIG_SKILL_CHANCE_GREEN]  = sConfig.GetIntDefault("SkillChance.Green",25);
     m_configs[CONFIG_SKILL_CHANCE_GREY]   = sConfig.GetIntDefault("SkillChance.Grey",0);
-
     m_configs[CONFIG_SKILL_CHANCE_MINING_STEPS]  = sConfig.GetIntDefault("SkillChance.MiningSteps",75);
     m_configs[CONFIG_SKILL_CHANCE_SKINNING_STEPS]   = sConfig.GetIntDefault("SkillChance.SkinningSteps",75);
-
     m_configs[CONFIG_SKILL_PROSPECTING] = sConfig.GetBoolDefault("SkillChance.Prospecting",false);
     m_configs[CONFIG_SKILL_MILLING] = sConfig.GetBoolDefault("SkillChance.Milling",false);
-
     m_configs[CONFIG_SKILL_GAIN_CRAFTING]  = sConfig.GetIntDefault("SkillGain.Crafting", 1);
     if (m_configs[CONFIG_SKILL_GAIN_CRAFTING] < 0)
     {
         sLog.outError("SkillGain.Crafting (%i) can't be negative. Set to 1.",m_configs[CONFIG_SKILL_GAIN_CRAFTING]);
         m_configs[CONFIG_SKILL_GAIN_CRAFTING] = 1;
     }
-
     m_configs[CONFIG_SKILL_GAIN_DEFENSE]  = sConfig.GetIntDefault("SkillGain.Defense", 1);
     if (m_configs[CONFIG_SKILL_GAIN_DEFENSE] < 0)
     {
         sLog.outError("SkillGain.Defense (%i) can't be negative. Set to 1.",m_configs[CONFIG_SKILL_GAIN_DEFENSE]);
         m_configs[CONFIG_SKILL_GAIN_DEFENSE] = 1;
     }
-
     m_configs[CONFIG_SKILL_GAIN_GATHERING]  = sConfig.GetIntDefault("SkillGain.Gathering", 1);
     if (m_configs[CONFIG_SKILL_GAIN_GATHERING] < 0)
     {
         sLog.outError("SkillGain.Gathering (%i) can't be negative. Set to 1.",m_configs[CONFIG_SKILL_GAIN_GATHERING]);
         m_configs[CONFIG_SKILL_GAIN_GATHERING] = 1;
     }
-
     m_configs[CONFIG_SKILL_GAIN_WEAPON]  = sConfig.GetIntDefault("SkillGain.Weapon", 1);
     if (m_configs[CONFIG_SKILL_GAIN_WEAPON] < 0)
     {
         sLog.outError("SkillGain.Weapon (%i) can't be negative. Set to 1.",m_configs[CONFIG_SKILL_GAIN_WEAPON]);
         m_configs[CONFIG_SKILL_GAIN_WEAPON] = 1;
     }
-
     m_configs[CONFIG_MAX_OVERSPEED_PINGS] = sConfig.GetIntDefault("MaxOverspeedPings",2);
     if (m_configs[CONFIG_MAX_OVERSPEED_PINGS] != 0 && m_configs[CONFIG_MAX_OVERSPEED_PINGS] < 2)
     {
         sLog.outError("MaxOverspeedPings (%i) must be in range 2..infinity (or 0 to disable check). Set to 2.",m_configs[CONFIG_MAX_OVERSPEED_PINGS]);
         m_configs[CONFIG_MAX_OVERSPEED_PINGS] = 2;
     }
-
     m_configs[CONFIG_SAVE_RESPAWN_TIME_IMMEDIATELY] = sConfig.GetBoolDefault("SaveRespawnTimeImmediately",true);
     m_configs[CONFIG_WEATHER] = sConfig.GetBoolDefault("ActivateWeather",true);
-
     m_configs[CONFIG_DISABLE_BREATHING] = sConfig.GetIntDefault("DisableWaterBreath", SEC_CONSOLE);
-
     m_configs[CONFIG_ALWAYS_MAX_SKILL_FOR_LEVEL] = sConfig.GetBoolDefault("AlwaysMaxSkillForLevel", false);
-
     if (reload)
     {
         uint32 val = sConfig.GetIntDefault("Expansion",1);
@@ -959,20 +833,15 @@ void World::LoadConfigSettings(bool reload)
     }
     else
         m_configs[CONFIG_EXPANSION] = sConfig.GetIntDefault("Expansion",1);
-
     m_configs[CONFIG_CHATFLOOD_MESSAGE_COUNT] = sConfig.GetIntDefault("ChatFlood.MessageCount",10);
     m_configs[CONFIG_CHATFLOOD_MESSAGE_DELAY] = sConfig.GetIntDefault("ChatFlood.MessageDelay",1);
     m_configs[CONFIG_CHATFLOOD_MUTE_TIME]     = sConfig.GetIntDefault("ChatFlood.MuteTime",10);
-
     m_configs[CONFIG_EVENT_ANNOUNCE] = sConfig.GetIntDefault("Event.Announce",0);
-
     m_configs[CONFIG_CREATURE_FAMILY_FLEE_ASSISTANCE_RADIUS] = sConfig.GetIntDefault("CreatureFamilyFleeAssistanceRadius",30);
     m_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_RADIUS] = sConfig.GetIntDefault("CreatureFamilyAssistanceRadius",10);
     m_configs[CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY]  = sConfig.GetIntDefault("CreatureFamilyAssistanceDelay",1500);
     m_configs[CONFIG_CREATURE_FAMILY_FLEE_DELAY]        = sConfig.GetIntDefault("CreatureFamilyFleeDelay",7000);
-
     m_configs[CONFIG_WORLD_BOSS_LEVEL_DIFF] = sConfig.GetIntDefault("WorldBossLevelDiff",3);
-
     // note: disable value (-1) will assigned as 0xFFFFFFF, to prevent overflow at calculations limit it to max possible player level MAX_LEVEL(100)
     m_configs[CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF] = sConfig.GetIntDefault("Quests.LowLevelHideDiff", 4);
     if (m_configs[CONFIG_QUEST_LOW_LEVEL_HIDE_DIFF] > MAX_LEVEL)
@@ -980,41 +849,31 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] = sConfig.GetIntDefault("Quests.HighLevelHideDiff", 7);
     if (m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] > MAX_LEVEL)
         m_configs[CONFIG_QUEST_HIGH_LEVEL_HIDE_DIFF] = MAX_LEVEL;
-
     m_configs[CONFIG_DETECT_POS_COLLISION] = sConfig.GetBoolDefault("DetectPosCollision", true);
-
     m_configs[CONFIG_RESTRICTED_LFG_CHANNEL]      = sConfig.GetBoolDefault("Channel.RestrictedLfg", true);
     m_configs[CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL] = sConfig.GetBoolDefault("Channel.SilentlyGMJoin", false);
-
     m_configs[CONFIG_TALENTS_INSPECTING]           = sConfig.GetBoolDefault("TalentsInspecting", true);
     m_configs[CONFIG_CHAT_FAKE_MESSAGE_PREVENTING] = sConfig.GetBoolDefault("ChatFakeMessagePreventing", false);
     m_configs[CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY] = sConfig.GetIntDefault("ChatStrictLinkChecking.Severity", 0);
     m_configs[CONFIG_CHAT_STRICT_LINK_CHECKING_KICK] = sConfig.GetIntDefault("ChatStrictLinkChecking.Kick", 0);
-
     m_configs[CONFIG_CORPSE_DECAY_NORMAL]    = sConfig.GetIntDefault("Corpse.Decay.NORMAL", 60);
     m_configs[CONFIG_CORPSE_DECAY_RARE]      = sConfig.GetIntDefault("Corpse.Decay.RARE", 300);
     m_configs[CONFIG_CORPSE_DECAY_ELITE]     = sConfig.GetIntDefault("Corpse.Decay.ELITE", 300);
     m_configs[CONFIG_CORPSE_DECAY_RAREELITE] = sConfig.GetIntDefault("Corpse.Decay.RAREELITE", 300);
     m_configs[CONFIG_CORPSE_DECAY_WORLDBOSS] = sConfig.GetIntDefault("Corpse.Decay.WORLDBOSS", 3600);
-
     m_configs[CONFIG_DEATH_SICKNESS_LEVEL]           = sConfig.GetIntDefault ("Death.SicknessLevel", 11);
     m_configs[CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVP] = sConfig.GetBoolDefault("Death.CorpseReclaimDelay.PvP", true);
     m_configs[CONFIG_DEATH_CORPSE_RECLAIM_DELAY_PVE] = sConfig.GetBoolDefault("Death.CorpseReclaimDelay.PvE", true);
     m_configs[CONFIG_DEATH_BONES_WORLD]              = sConfig.GetBoolDefault("Death.Bones.World", true);
     m_configs[CONFIG_DEATH_BONES_BG_OR_ARENA]        = sConfig.GetBoolDefault("Death.Bones.BattlegroundOrArena", true);
-
     m_configs[CONFIG_DIE_COMMAND_MODE] = sConfig.GetBoolDefault("Die.Command.Mode", true);
-
     m_configs[CONFIG_THREAT_RADIUS] = sConfig.GetIntDefault("ThreatRadius", 60);
-
     // always use declined names in the russian client
     m_configs[CONFIG_DECLINED_NAMES_USED] =
         (m_configs[CONFIG_REALM_ZONE] == REALM_ZONE_RUSSIAN) ? true : sConfig.GetBoolDefault("DeclinedNames", false);
-
     m_configs[CONFIG_LISTEN_RANGE_SAY]       = sConfig.GetIntDefault("ListenRange.Say", 25);
     m_configs[CONFIG_LISTEN_RANGE_TEXTEMOTE] = sConfig.GetIntDefault("ListenRange.TextEmote", 25);
     m_configs[CONFIG_LISTEN_RANGE_YELL]      = sConfig.GetIntDefault("ListenRange.Yell", 300);
-
     m_configs[CONFIG_BATTLEGROUND_CAST_DESERTER]                = sConfig.GetBoolDefault("Battleground.CastDeserter", true);
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_ENABLE]       = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.Enable", false);
     m_configs[CONFIG_BATTLEGROUND_QUEUE_ANNOUNCER_PLAYERONLY]   = sConfig.GetBoolDefault("Battleground.QueueAnnouncer.PlayerOnly", false);
@@ -1029,9 +888,7 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_ARENA_QUEUE_ANNOUNCER_PLAYERONLY]          = sConfig.GetBoolDefault("Arena.QueueAnnouncer.PlayerOnly", false);
     m_configs[CONFIG_ARENA_SEASON_ID]                           = sConfig.GetIntDefault ("Arena.ArenaSeason.ID", 1);
     m_configs[CONFIG_ARENA_SEASON_IN_PROGRESS]                  = sConfig.GetBoolDefault("Arena.ArenaSeason.InProgress", true);
-
     m_configs[CONFIG_OFFHAND_CHECK_AT_SPELL_UNLEARN] = sConfig.GetBoolDefault("OffhandCheckAtSpellUnlearn", false);
-
     if (int clientCacheId = sConfig.GetIntDefault("ClientCacheVersion", 0))
     {
         // overwrite DB/old value
@@ -1043,16 +900,13 @@ void World::LoadConfigSettings(bool reload)
         else
             sLog.outError("ClientCacheVersion can't be negative %d, ignored.", clientCacheId);
     }
-
     m_configs[CONFIG_INSTANT_LOGOUT] = sConfig.GetIntDefault("InstantLogout", SEC_MODERATOR);
-
     m_configs[CONFIG_GUILD_EVENT_LOG_COUNT] = sConfig.GetIntDefault("Guild.EventLogRecordsCount", GUILD_EVENTLOG_MAX_RECORDS);
     if (m_configs[CONFIG_GUILD_EVENT_LOG_COUNT] < GUILD_EVENTLOG_MAX_RECORDS)
         m_configs[CONFIG_GUILD_EVENT_LOG_COUNT] = GUILD_EVENTLOG_MAX_RECORDS;
     m_configs[CONFIG_GUILD_BANK_EVENT_LOG_COUNT] = sConfig.GetIntDefault("Guild.BankEventLogRecordsCount", GUILD_BANK_MAX_LOGS);
     if (m_configs[CONFIG_GUILD_BANK_EVENT_LOG_COUNT] < GUILD_BANK_MAX_LOGS)
         m_configs[CONFIG_GUILD_BANK_EVENT_LOG_COUNT] = GUILD_BANK_MAX_LOGS;
-
     m_VisibleUnitGreyDistance = sConfig.GetFloatDefault("Visibility.Distance.Grey.Unit", 1);
     if (m_VisibleUnitGreyDistance >  MAX_VISIBILITY_DISTANCE)
     {
@@ -1065,7 +919,6 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("Visibility.Distance.Grey.Object can't be greater %f",MAX_VISIBILITY_DISTANCE);
         m_VisibleObjectGreyDistance = MAX_VISIBILITY_DISTANCE;
     }
-
     //visibility on continents
     m_MaxVisibleDistanceOnContinents = sConfig.GetFloatDefault("Visibility.Distance.Continents", DEFAULT_VISIBILITY_DISTANCE);
     if(m_MaxVisibleDistanceOnContinents < 45*sWorld.getRate(RATE_CREATURE_AGGRO))
@@ -1078,7 +931,6 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("Visibility.Distance.Continents can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceOnContinents = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
- 
     //visibility in instances
     m_MaxVisibleDistanceInInstances = sConfig.GetFloatDefault("Visibility.Distance.Instances", DEFAULT_VISIBILITY_INSTANCE);
     if(m_MaxVisibleDistanceInInstances < 45*sWorld.getRate(RATE_CREATURE_AGGRO))
@@ -1091,7 +943,6 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("Visibility.Distance.Instances can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceInInstances = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
- 
     //visibility in BG/Arenas
     m_MaxVisibleDistanceInBGArenas = sConfig.GetFloatDefault("Visibility.Distance.BGArenas", DEFAULT_VISIBILITY_BGARENAS);
     if(m_MaxVisibleDistanceInBGArenas < 45*sWorld.getRate(RATE_CREATURE_AGGRO))
@@ -1104,7 +955,6 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("Visibility.Distance.BGArenas can't be greater %f",MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance);
         m_MaxVisibleDistanceInBGArenas = MAX_VISIBILITY_DISTANCE - m_VisibleUnitGreyDistance;
     }
-
     m_MaxVisibleDistanceForObject = sConfig.GetFloatDefault("Visibility.Distance.Object", DEFAULT_VISIBILITY_DISTANCE);
     if(m_MaxVisibleDistanceForObject < INTERACTION_DISTANCE)
     {
@@ -1122,12 +972,10 @@ void World::LoadConfigSettings(bool reload)
         sLog.outError("Visibility.Distance.InFlight can't be greater %f",MAX_VISIBILITY_DISTANCE-m_VisibleObjectGreyDistance);
         m_MaxVisibleDistanceInFlight = MAX_VISIBILITY_DISTANCE - m_VisibleObjectGreyDistance;
     }
-
     ///- Read the "Data" directory from the config file
     std::string dataPath = sConfig.GetStringDefault("DataDir","./");
     if (dataPath.at(dataPath.length()-1)!='/' && dataPath.at(dataPath.length()-1)!='\\')
         dataPath.append("/");
-
     if (reload)
     {
         if (dataPath!=m_dataPath)
@@ -1138,7 +986,6 @@ void World::LoadConfigSettings(bool reload)
         m_dataPath = dataPath;
         sLog.outString("Using DataDir %s",m_dataPath.c_str());
     }
-
     bool enableLOS = sConfig.GetBoolDefault("vmap.enableLOS", false);
     bool enableHeight = sConfig.GetBoolDefault("vmap.enableHeight", false);
     std::string ignoreMapIds = sConfig.GetStringDefault("vmap.ignoreMapIds", "");
@@ -1151,7 +998,6 @@ void World::LoadConfigSettings(bool reload)
     sLog.outString("WORLD: VMap data directory is: %svmaps",m_dataPath.c_str());
     sLog.outString("WORLD: VMap config keys are: vmap.enableLOS, vmap.enableHeight, vmap.ignoreMapIds, vmap.ignoreSpellIds");
 
-
     m_configs[CONFIG_MAX_WHO] = sConfig.GetIntDefault("MaxWhoListReturns", 49);
     m_configs[CONFIG_PET_LOS] = sConfig.GetBoolDefault("vmap.petLOS", false);
     m_configs[CONFIG_BG_START_MUSIC] = sConfig.GetBoolDefault("MusicInBattleground", false);
@@ -1168,10 +1014,9 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_PVP_TOKEN_COUNT] = sConfig.GetIntDefault("PvPToken.ItemCount", 1);
     if (m_configs[CONFIG_PVP_TOKEN_COUNT] < 1)
         m_configs[CONFIG_PVP_TOKEN_COUNT] = 1;
-
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED]          = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.Enabled", true);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME]       = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.StartTime", 30);
-    m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME]      = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30); 
+    m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME]      = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL]         = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.Interval", 150);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR]     = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.CustomHonorRewards", false);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE]       = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorBattleWin", 3000);
@@ -1180,14 +1025,12 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_DESTROYED_TOWER]  = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorDestroyedTower", 750);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorDamagedBuilding", 750);
     m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING]  = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorIntactBuilding", 1500);
-
     m_configs[CONFIG_NO_RESET_TALENT_COST] = sConfig.GetBoolDefault("NoResetTalentsCost", false);
     m_configs[CONFIG_SHOW_KICK_IN_WORLD] = sConfig.GetBoolDefault("ShowKickInWorld", false);
     m_configs[CONFIG_INTERVAL_LOG_UPDATE] = sConfig.GetIntDefault("RecordUpdateTimeDiffInterval", 60000);
     m_configs[CONFIG_MIN_LOG_UPDATE] = sConfig.GetIntDefault("MinRecordUpdateTimeDiff", 10);
     m_configs[CONFIG_CHECK_DB] = sConfig.GetBoolDefault("CheckDB", true);
     m_configs[CONFIG_NUMTHREADS] = sConfig.GetIntDefault("MapUpdate.Threads",1);
-
     std::string forbiddenmaps = sConfig.GetStringDefault("ForbiddenMaps", "");
     char * forbiddenMaps = new char[forbiddenmaps.length() + 1];
     forbiddenMaps[forbiddenmaps.length()] = 0;
@@ -1201,7 +1044,6 @@ void World::LoadConfigSettings(bool reload)
         token = strtok(NULL,delim);
     }
     delete[] forbiddenMaps;
-
     // chat logging
     m_configs[CONFIG_CHATLOG_CHANNEL] = sConfig.GetBoolDefault("ChatLogs.Channel", false);
     m_configs[CONFIG_CHATLOG_WHISPER] = sConfig.GetBoolDefault("ChatLogs.Whisper", false);
@@ -1213,19 +1055,15 @@ void World::LoadConfigSettings(bool reload)
     m_configs[CONFIG_CHATLOG_ADDON] = sConfig.GetBoolDefault("ChatLogs.Addon", false);
     m_configs[CONFIG_CHATLOG_BGROUND] = sConfig.GetBoolDefault("ChatLogs.BattleGround", false);
 }
-
 /// Initialize the World
 void World::SetInitialWorldSettings()
 {
     ///- Initialize the random number generator
     srand((unsigned int)time(NULL));
-
     ///- Initialize config settings
     LoadConfigSettings();
-
     ///- Init highest guids before any table loading to prevent using not initialized guids in some code.
     objmgr.SetHighestGuids();
-
     ///- Check the existence of the map files for all races' startup areas.
     if (!MapManager::ExistMapAndVMap(0,-6240.32f, 331.033f)
         ||!MapManager::ExistMapAndVMap(0,-8949.95f,-132.493f)
@@ -1240,45 +1078,34 @@ void World::SetInitialWorldSettings()
         sLog.outError("Correct *.map files not found in path '%smaps' or *.vmap/*vmdir files in '%svmaps'. Please place *.map/*.vmap/*.vmdir files in appropriate directories or correct the DataDir value in the Trinityd.conf file.",m_dataPath.c_str(),m_dataPath.c_str());
         exit(1);
     }
-
     ///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
     sLog.outString();
     sLog.outString("Loading Trinity strings...");
     if (!objmgr.LoadTrinityStrings())
         exit(1);                                            // Error message displayed in function already
-
     ///- Update the realm entry in the database with the realm type from the config file
     //No SQL injection as values are treated as integers
-
     // not send custom type REALM_FFA_PVP to realm list
     uint32 server_type = IsFFAPvPRealm() ? REALM_TYPE_PVP : getConfig(CONFIG_GAME_TYPE);
     uint32 realm_zone = getConfig(CONFIG_REALM_ZONE);
     loginDatabase.PExecute("UPDATE realmlist SET icon = %u, timezone = %u WHERE id = '%d'", server_type, realm_zone, realmID);
-
     ///- Remove the bones after a restart
     CharacterDatabase.PExecute("DELETE FROM corpse WHERE corpse_type = '0'");
-
     ///- Load the DBC files
     sLog.outString("Initialize data stores...");
     LoadDBCStores(m_dataPath);
     DetectDBCLang();
-
     sLog.outString("Loading Script Names...");
     objmgr.LoadScriptNames();
-
     sLog.outString("Loading InstanceTemplate...");
     objmgr.LoadInstanceTemplate();
-
     sLog.outString("Loading SkillLineAbilityMultiMap Data...");
     spellmgr.LoadSkillLineAbilityMap();
-
     ///- Clean up and pack instances
     sLog.outString("Cleaning up instances...");
     sInstanceSaveManager.CleanupInstances();                // must be called before `creature_respawn`/`gameobject_respawn` tables
-
     sLog.outString("Packing instances...");
     sInstanceSaveManager.PackInstances();
-
     sLog.outString();
     sLog.outString("Loading Localization strings...");
     objmgr.LoadCreatureLocales();
@@ -1292,202 +1119,141 @@ void World::SetInitialWorldSettings()
     objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale());        // Get once for all the locale index of DBC language (console/broadcasts)
     sLog.outString(">>> Localization strings loaded");
     sLog.outString();
-
     sLog.outString("Loading Page Texts...");
     objmgr.LoadPageTexts();
-
     sLog.outString("Loading Player info in cache...");
     objmgr.LoadPlayerInfoInCache();
-
     sLog.outString("Loading Game Object Templates...");   // must be after LoadPageTexts
     objmgr.LoadGameobjectInfo();
-
     sLog.outString("Loading Spell Chain Data...");
     spellmgr.LoadSpellChains();
-
     sLog.outString("Loading Spell Required Data...");
     spellmgr.LoadSpellRequired();
-
     sLog.outString("Loading Spell Elixir types...");
     spellmgr.LoadSpellElixirs();
-
     sLog.outString("Loading Spell Learn Skills...");
     spellmgr.LoadSpellLearnSkills();                        // must be after LoadSpellChains
-
     sLog.outString("Loading Spell Learn Spells...");
     spellmgr.LoadSpellLearnSpells();
-
     sLog.outString("Loading Spell Proc Event conditions...");
     spellmgr.LoadSpellProcEvents();
-
     sLog.outString("Loading Spell Bonus Data...");
     spellmgr.LoadSpellBonusess();
-
     sLog.outString("Loading Aggro Spells Definitions...");
     spellmgr.LoadSpellThreats();
-
     sLog.outString("Loading NPC Texts...");
     objmgr.LoadGossipText();
-
     sLog.outString("Loading Enchant Spells Proc datas...");
     spellmgr.LoadSpellEnchantProcData();
-
     sLog.outString("Loading Item Random Enchantments Table...");
     LoadRandomEnchantmentsTable();
-
     sLog.outString("Loading Items...");                   // must be after LoadRandomEnchantmentsTable and LoadPageTexts
     objmgr.LoadItemPrototypes();
-
     sLog.outString("Loading Item Texts...");
     objmgr.LoadItemTexts();
-
     sLog.outString("Loading Creature Model Based Info Data...");
     objmgr.LoadCreatureModelInfo();
-
     sLog.outString("Loading Equipment templates...");
     objmgr.LoadEquipmentTemplates();
-
     sLog.outString("Loading Creature templates...");
     objmgr.LoadCreatureTemplates();
-
     sLog.outString("Loading SpellsScriptTarget...");
     spellmgr.LoadSpellScriptTarget();                       // must be after LoadCreatureTemplates and LoadGameobjectInfo
-
     sLog.outString("Loading ItemRequiredTarget...");
     objmgr.LoadItemRequiredTarget();
-
     sLog.outString("Loading Creature Reputation OnKill Data...");
     objmgr.LoadReputationOnKill();
-
     sLog.outString("Loading Points Of Interest Data...");
     objmgr.LoadPointsOfInterest();
-
     sLog.outString("Loading Creature Data...");
     objmgr.LoadCreatures();
-
     sLog.outString("Loading Creature Linked Respawn...");
     objmgr.LoadCreatureLinkedRespawn();                     // must be after LoadCreatures()
-
     sLog.outString("Loading pet levelup spells...");
     spellmgr.LoadPetLevelupSpellMap();
-
     sLog.outString("Loading pet default spell additional to levelup spells...");
     spellmgr.LoadPetDefaultSpells();
-
     sLog.outString("Loading Creature Addon Data...");
     sLog.outString();
     objmgr.LoadCreatureAddons();                            // must be after LoadCreatureTemplates() and LoadCreatures()
     sLog.outString(">>> Creature Addon Data loaded");
     sLog.outString();
-
     sLog.outString("Loading Creature Respawn Data...");   // must be after PackInstances()
     objmgr.LoadCreatureRespawnTimes();
-
     sLog.outString("Loading Gameobject Data...");
     objmgr.LoadGameobjects();
-
     sLog.outString("Loading Gameobject Respawn Data..."); // must be after PackInstances()
     objmgr.LoadGameobjectRespawnTimes();
-
     sLog.outString("Loading Objects Pooling Data...");
     poolhandler.LoadFromDB();
-
     sLog.outString("Loading Game Event Data...");
     sLog.outString();
     gameeventmgr.LoadFromDB();
     sLog.outString(">>> Game Event Data loaded");
     sLog.outString();
-
     sLog.outString("Loading Weather Data...");
     objmgr.LoadWeatherZoneChances();
-
     sLog.outString("Loading Quests...");
     objmgr.LoadQuests();                                    // must be loaded after DBCs, creature_template, item_template, gameobject tables
-
     sLog.outString("Loading Quests Relations...");
     sLog.outString();
     objmgr.LoadQuestRelations();                            // must be after quest load
     sLog.outString(">>> Quests Relations loaded");
     sLog.outString();
-
     sLog.outString("Loading UNIT_NPC_FLAG_SPELLCLICK Data...");
     objmgr.LoadNPCSpellClickSpells();
-
     sLog.outString("Loading SpellArea Data...");          // must be after quest load
     spellmgr.LoadSpellAreas();
-
     sLog.outString("Loading AreaTrigger definitions...");
     objmgr.LoadAreaTriggerTeleports();
-
     sLog.outString("Loading Access Requirements...");
     objmgr.LoadAccessRequirements();                        // must be after item template load
-
     sLog.outString("Loading Quest Area Triggers...");
     objmgr.LoadQuestAreaTriggers();                         // must be after LoadQuests
-
     sLog.outString("Loading Tavern Area Triggers...");
     objmgr.LoadTavernAreaTriggers();
-
     sLog.outString("Loading AreaTrigger script names...");
     objmgr.LoadAreaTriggerScripts();
-
     sLog.outString("Loading Graveyard-zone links...");
     objmgr.LoadGraveyardZones();
-
     sLog.outString("Loading Spell target coordinates...");
     spellmgr.LoadSpellTargetPositions();
-
     sLog.outString("Loading spell pet auras...");
     spellmgr.LoadSpellPetAuras();
-
     sLog.outString("Loading spell extra attributes...(TODO)");
     spellmgr.LoadSpellCustomAttr();
-
     sLog.outString("Loading enchant custom attributes...");
     spellmgr.LoadEnchantCustomAttr();
-
     sLog.outString("Loading linked spells...");
     spellmgr.LoadSpellLinked();
-
     sLog.outString("Loading Player Create Info & Level Stats...");
     sLog.outString();
     objmgr.LoadPlayerInfo();
     sLog.outString(">>> Player Create Info & Level Stats loaded");
     sLog.outString();
-
     sLog.outString("Loading Exploration BaseXP Data...");
     objmgr.LoadExplorationBaseXP();
-
     sLog.outString("Loading Pet Name Parts...");
     objmgr.LoadPetNames();
-
     sLog.outString("Loading the max pet number...");
     objmgr.LoadPetNumber();
-
     sLog.outString("Loading pet level stats...");
     objmgr.LoadPetLevelInfo();
-
     sLog.outString("Loading Player Corpses...");
     objmgr.LoadCorpses();
-
     sLog.outString("Loading Disabled Spells...");
     objmgr.LoadSpellDisabledEntrys();
-
     sLog.outString("Loading Loot Tables...");
     sLog.outString();
     LoadLootTables();
     sLog.outString(">>> Loot Tables loaded");
     sLog.outString();
-
     sLog.outString("Loading Skill Discovery Table...");
     LoadSkillDiscoveryTable();
-
     sLog.outString("Loading Skill Extra Item Table...");
     LoadSkillExtraItemTable();
-
     sLog.outString("Loading Skill Fishing base level requirements...");
     objmgr.LoadFishingBaseSkillLevel();
-
     sLog.outString("Loading Achievements...");
     sLog.outString();
     achievementmgr.LoadAchievementReferenceList();
@@ -1498,7 +1264,6 @@ void World::SetInitialWorldSettings()
     achievementmgr.LoadCompletedAchievements();
     sLog.outString(">>> Achievements loaded");
     sLog.outString();
-
     ///- Load dynamic data tables from the database
     sLog.outString("Loading Auctions...");
     sLog.outString();
@@ -1506,57 +1271,40 @@ void World::SetInitialWorldSettings()
     auctionmgr.LoadAuctions();
     sLog.outString(">>> Auctions loaded");
     sLog.outString();
-
     sLog.outString("Loading Guilds...");
     objmgr.LoadGuilds();
-
     sLog.outString("Loading ArenaTeams...");
     objmgr.LoadArenaTeams();
-
     sLog.outString("Loading Groups...");
     objmgr.LoadGroups();
-
     sLog.outString("Loading ReservedNames...");
     objmgr.LoadReservedPlayersNames();
-
     sLog.outString("Loading GameObjects for quests...");
     objmgr.LoadGameObjectForQuests();
-
     sLog.outString("Loading BattleMasters...");
     sBattleGroundMgr.LoadBattleMastersEntry();
-
     sLog.outString("Loading GameTeleports...");
     objmgr.LoadGameTele();
-
     sLog.outString("Loading Npc Text Id...");
     objmgr.LoadNpcTextId();                                 // must be after load Creature and NpcText
-
     sLog.outString("Loading Npc Options...");
     objmgr.LoadNpcOptions();
-
     sLog.outString("Loading Vendors...");
     objmgr.LoadVendors();                                   // must be after load CreatureTemplate and ItemTemplate
-
     sLog.outString("Loading Trainers...");
     objmgr.LoadTrainerSpell();                              // must be after load CreatureTemplate
-
     sLog.outString("Loading Waypoints...");
     sLog.outString();
     WaypointMgr.Load();
-
     sLog.outString("Loading Creature Formations...");
     formation_mgr.LoadCreatureFormations();
-
     sLog.outString("Loading GM tickets...");
     objmgr.LoadGMTickets();
-
     ///- Handle outdated emails (delete/return)
     sLog.outString("Returning old mails...");
     objmgr.ReturnOrDeleteOldMails(false);
-
     sLog.outString("Loading Autobroadcasts...");
     LoadAutobroadcasts();
-
     ///- Load and initialize scripts
     sLog.outString("Loading Scripts...");
     sLog.outString();
@@ -1568,23 +1316,17 @@ void World::SetInitialWorldSettings()
     objmgr.LoadWaypointScripts();
     sLog.outString(">>> Scripts loaded");
     sLog.outString();
-
     sLog.outString("Loading Scripts text locales...");    // must be after Load*Scripts calls
     objmgr.LoadDbScriptStrings();
-
     sLog.outString("Loading CreatureEventAI Texts...");
     CreatureEAI_Mgr.LoadCreatureEventAI_Texts();
-
     sLog.outString("Loading CreatureEventAI Summons...");
     CreatureEAI_Mgr.LoadCreatureEventAI_Summons();
-
     sLog.outString("Loading CreatureEventAI Scripts...");
     CreatureEAI_Mgr.LoadCreatureEventAI_Scripts();
-
     sLog.outString("Initializing Scripts...");
     if (!LoadScriptingModule())
         exit(1);
-
     /// Check db
     if (m_configs[CONFIG_CHECK_DB])
     {
@@ -1597,12 +1339,10 @@ void World::SetInitialWorldSettings()
     }
     else
         sLog.outError("You have disabled DB check. We strongly recommend you to enable it to prevent unpredictable bugs and crashes.");
-
     ///- Initialize game time and timers
     sLog.outDebug("DEBUG:: Initialize game time and timers");
     m_gameTime = time(NULL);
     m_startTime=m_gameTime;
-
     tm local;
     time_t curr;
     time(&curr);
@@ -1610,10 +1350,8 @@ void World::SetInitialWorldSettings()
     char isoDate[128];
     sprintf(isoDate, "%04d-%02d-%02d %02d:%02d:%02d",
         local.tm_year+1900, local.tm_mon+1, local.tm_mday, local.tm_hour, local.tm_min, local.tm_sec);
-
     loginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, startstring, uptime, revision) VALUES('%u', " UI64FMTD ", '%s', 0, '%s')",
         realmID, uint64(m_startTime), isoDate, _FULLVERSION);
-
     static uint32 abtimer = 0;
     abtimer = sConfig.GetIntDefault("AutoBroadcast.Timer", 60000);
     m_timers[WUPDATE_OBJECTS].SetInterval(IN_MILISECONDS/2);
@@ -1627,7 +1365,6 @@ void World::SetInitialWorldSettings()
     m_timers[WUPDATE_CLEANDB].SetInterval(m_configs[CONFIG_LOGDB_CLEARINTERVAL]*MINUTE*IN_MILISECONDS);
                                                             // clean logs table every 14 days by default
     m_timers[WUPDATE_AUTOBROADCAST].SetInterval(abtimer);
-
     //to set mailtimer to return mails every day between 4 and 5 am
     //mailtimer is increased when updating auctions
     //one second is 1000 -(tested on win system)
@@ -1635,47 +1372,35 @@ void World::SetInitialWorldSettings()
                                                             //1440
     mail_timer_expires = ((DAY * IN_MILISECONDS) / (m_timers[WUPDATE_AUCTIONS].GetInterval()));
     sLog.outDebug("Mail timer set to: %u, mail return is called every %u minutes", mail_timer, mail_timer_expires);
-
     ///- Initilize static helper structures
     AIRegistry::Initialize();
     Player::InitVisibleBits();
-
     ///- Initialize MapManager
     sLog.outString("Starting Map System");
     MapManager::Instance().Initialize();
-
     sLog.outString("Starting Game Event system...");
     uint32 nextGameEvent = gameeventmgr.Initialize();
     m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);    //depend on next event
-
     ///- Initialize Battlegrounds
     sLog.outString("Starting BattleGround System");
     sBattleGroundMgr.CreateInitialBattleGrounds();
     sBattleGroundMgr.InitAutomaticArenaPointDistribution();
-
     ///- Initialize outdoor pvp
     sLog.outString("Starting Outdoor PvP System");
     sOutdoorPvPMgr.InitOutdoorPvP();
-
     //Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
     sLog.outString("Loading Transports...");
     MapManager::Instance().LoadTransports();
-
     sLog.outString("Loading Transports Events...");
     objmgr.LoadTransportEvents();
-
     sLog.outString("Deleting expired bans...");
     loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
-
     sLog.outString("Calculate next daily quest reset time...");
     InitDailyQuestResetTime();
-
     sLog.outString("Starting objects Pooling system...");
     poolhandler.Initialize();
-
     sLog.outString("Initialize AuctionHouseBot...");
     auctionbot.Initialize();
-
     // possibly enable db logging; avoid massive startup spam by doing it here.
     if (sLog.GetLogDBLater())
     {
@@ -1688,26 +1413,19 @@ void World::SetInitialWorldSettings()
         sLog.SetLogDB(false);
         sLog.SetLogDBLater(false);
     }
-
     Script->OnServerStartup();
-
     sLog.outString("WORLD: World initialized");
 }
-
 void World::DetectDBCLang()
 {
     uint32 m_lang_confid = sConfig.GetIntDefault("DBC.Locale", 255);
-
     if (m_lang_confid != 255 && m_lang_confid >= MAX_LOCALE)
     {
         sLog.outError("Incorrect DBC.Locale! Must be >= 0 and < %d (set to 0)",MAX_LOCALE);
         m_lang_confid = LOCALE_enUS;
     }
-
     ChrRacesEntry const* race = sChrRacesStore.LookupEntry(1);
-
     std::string availableLocalsStr;
-
     int default_locale = MAX_LOCALE;
     for (int i = MAX_LOCALE-1; i >= 0; --i)
     {
@@ -1719,25 +1437,20 @@ void World::DetectDBCLang()
             availableLocalsStr += " ";
         }
     }
-
     if (default_locale != m_lang_confid && m_lang_confid < MAX_LOCALE &&
         (m_availableDbcLocaleMask & (1 << m_lang_confid)))
     {
         default_locale = m_lang_confid;
     }
-
     if (default_locale >= MAX_LOCALE)
     {
         sLog.outError("Unable to determine your DBC Locale! (corrupt DBC?)");
         exit(1);
     }
-
     m_defaultDbcLocale = LocaleConstant(default_locale);
-
     sLog.outString("Using %s DBC Locale as default. All available DBC locales: %s",localeNames[m_defaultDbcLocale],availableLocalsStr.empty() ? "<none>" : availableLocalsStr.c_str());
     sLog.outString();
 }
-
 void World::RecordTimeDiff(const char *text, ...)
 {
     if (m_updateTimeCount != 1)
@@ -1747,10 +1460,8 @@ void World::RecordTimeDiff(const char *text, ...)
         m_currentTime = getMSTime();
         return;
     }
-
     uint32 thisTime = getMSTime();
     uint32 diff = getMSTimeDiff(m_currentTime, thisTime);
-
     if (diff > m_configs[CONFIG_MIN_LOG_UPDATE])
     {
         va_list ap;
@@ -1760,49 +1471,34 @@ void World::RecordTimeDiff(const char *text, ...)
         va_end(ap);
         sLog.outDetail("Difftime %s: %u.", str, diff);
     }
-
     m_currentTime = thisTime;
 }
-
 void World::LoadAutobroadcasts()
 {
     m_Autobroadcasts.clear();
-
     QueryResult *result = WorldDatabase.Query("SELECT text FROM autobroadcast");
-
     if (!result)
     {
         barGoLink bar(1);
         bar.step();
-
         sLog.outString();
         sLog.outString(">> Loaded 0 autobroadcasts definitions");
         return;
     }
-
     barGoLink bar(result->GetRowCount());
-
     uint32 count = 0;
-
     do
     {
         bar.step();
-
         Field *fields = result->Fetch();
-
         std::string message = fields[0].GetCppString();
-
         m_Autobroadcasts.push_back(message);
-
         count++;
     } while(result->NextRow());
-
     delete result;
-
     sLog.outString();
     sLog.outString(">> Loaded %u autobroadcasts definitions", count);
 }
-
 /// Update the World !
 void World::Update(uint32 diff)
 {
@@ -1821,29 +1517,24 @@ void World::Update(uint32 diff)
             ++m_updateTimeCount;
         }
     }
-
     ///- Update the different timers
     for (int i = 0; i < WUPDATE_COUNT; ++i)
         if (m_timers[i].GetCurrent()>=0)
             m_timers[i].Update(diff);
     else m_timers[i].SetCurrent(0);
-
     ///- Update the game time and check for shutdown time
     _UpdateGameTime();
-
     /// Handle daily quests reset time
     if (m_gameTime > m_NextDailyQuestReset)
     {
         ResetDailyQuests();
         m_NextDailyQuestReset += DAY;
     }
-
     /// <ul><li> Handle auctions when the timer has passed
     if (m_timers[WUPDATE_AUCTIONS].Passed())
     {
         auctionbot.Update();
         m_timers[WUPDATE_AUCTIONS].Reset();
-
         ///- Update mails (return old mails with item, or delete them)
         //(tested... works on win)
         if (++mail_timer > mail_timer_expires)
@@ -1851,28 +1542,23 @@ void World::Update(uint32 diff)
             mail_timer = 0;
             objmgr.ReturnOrDeleteOldMails(true);
         }
-
         ///- Handle expired auctions
         auctionmgr.Update();
     }
-
     /// <li> Handle session updates when the timer has passed
     RecordTimeDiff(NULL);
     UpdateSessions(diff);
     RecordTimeDiff("UpdateSessions");
-
     /// <li> Handle weather updates when the timer has passed
     if (m_timers[WUPDATE_WEATHERS].Passed())
     {
         m_timers[WUPDATE_WEATHERS].Reset();
-
         ///- Send an update signal to Weather objects
         WeatherMap::iterator itr, next;
         for (itr = m_weathers.begin(); itr != m_weathers.end(); itr = next)
         {
             next = itr;
             ++next;
-
             ///- and remove Weather objects for zones with no player
                                                             //As interval > WorldTick
             if (!itr->second->Update(m_timers[WUPDATE_WEATHERS].GetInterval()))
@@ -1887,11 +1573,9 @@ void World::Update(uint32 diff)
     {
         uint32 tmpDiff = (m_gameTime - m_startTime);
         uint32 maxClientsNum = GetMaxActiveSessionCount();
-
         m_timers[WUPDATE_UPTIME].Reset();
         loginDatabase.PExecute("UPDATE uptime SET uptime = %u, maxplayers = %u WHERE realmid = %u AND starttime = " UI64FMTD, tmpDiff, maxClientsNum, realmID, uint64(m_startTime));
     }
-
     /// <li> Clean logs table
     if (sWorld.getConfig(CONFIG_LOGDB_CLEARTIME) > 0) // if not enabled, ignore the timer
     {
@@ -1899,23 +1583,19 @@ void World::Update(uint32 diff)
         {
             uint32 tmpDiff = (m_gameTime - m_startTime);
             uint32 maxClientsNum = sWorld.GetMaxActiveSessionCount();
-
             m_timers[WUPDATE_CLEANDB].Reset();
             loginDatabase.PExecute("DELETE FROM logs WHERE (time + %u) < "UI64FMTD";",
                 sWorld.getConfig(CONFIG_LOGDB_CLEARTIME), uint64(time(0)));
         }
     }
-
     /// <li> Handle all other objects
     ///- Update objects when the timer has passed (maps, transport, creatures,...)
     MapManager::Instance().Update(diff);                // As interval = 0
-
     /*if (m_timers[WUPDATE_OBJECTS].Passed())
     {
         m_timers[WUPDATE_OBJECTS].Reset();
         MapManager::Instance().DoDelayedMovesAndRemoves();
     }*/
-
     static uint32 autobroadcaston = 0;
     autobroadcaston = sConfig.GetIntDefault("AutoBroadcast.On", 0);
     if (autobroadcaston == 1)
@@ -1926,27 +1606,21 @@ void World::Update(uint32 diff)
           SendRNDBroadcast();
        }
     }
-
     sBattleGroundMgr.Update(diff);
     RecordTimeDiff("UpdateBattleGroundMgr");
 
-
     sOutdoorPvPMgr.Update(diff);
     RecordTimeDiff("UpdateOutdoorPvPMgr");
 
-
     // execute callbacks from sql queries that were queued recently
     UpdateResultQueue();
     RecordTimeDiff("UpdateResultQueue");
-
     ///- Erase corpses once every 20 minutes
     if (m_timers[WUPDATE_CORPSES].Passed())
     {
         m_timers[WUPDATE_CORPSES].Reset();
-
         CorpsesErase();
     }
-
     ///- Process Game events when necessary
     if (m_timers[WUPDATE_EVENTS].Passed())
     {
@@ -1955,14 +1629,11 @@ void World::Update(uint32 diff)
         m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);
         m_timers[WUPDATE_EVENTS].Reset();
     }
-
     // update the instance reset times
     sInstanceSaveManager.Update();
-
     // And last, but not least handle the issued cli commands
     ProcessCliCommands();
 }
-
 void World::ForceGameEventUpdate()
 {
     m_timers[WUPDATE_EVENTS].Reset();                   // to give time for Update() to be processed
@@ -1970,7 +1641,6 @@ void World::ForceGameEventUpdate()
     m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);
     m_timers[WUPDATE_EVENTS].Reset();
 }
-
 /// Send a packet to all players (except self if mentioned)
 void World::SendGlobalMessage(WorldPacket *packet, WorldSession *self, uint32 team)
 {
@@ -1987,7 +1657,6 @@ void World::SendGlobalMessage(WorldPacket *packet, WorldSession *self, uint32 te
         }
     }
 }
-
 /// Send a packet to all GMs (except self if mentioned)
 void World::SendGlobalGMMessage(WorldPacket *packet, WorldSession *self, uint32 team)
 {
@@ -2005,7 +1674,6 @@ void World::SendGlobalGMMessage(WorldPacket *packet, WorldSession *self, uint32
         }
     }
 }
-
 namespace MaNGOS
 {
     class WorldWorldTextBuilder
@@ -2016,17 +1684,14 @@ namespace MaNGOS
             void operator()(WorldPacketList& data_list, int32 loc_idx)
             {
                 char const* text = objmgr.GetMangosString(i_textId,loc_idx);
-
                 if (i_args)
                 {
                     // we need copy va_list before use or original va_list will corrupted
                     va_list ap;
                     va_copy(ap,*i_args);
-
                     char str [2048];
                     vsnprintf(str,2048,text, ap);
                     va_end(ap);
-
                     do_helper(data_list,&str[0]);
                 }
                 else
@@ -2037,13 +1702,10 @@ namespace MaNGOS
             void do_helper(WorldPacketList& data_list, char* text)
             {
                 char* pos = text;
-
                 while(char* line = lineFromMessage(pos))
                 {
                     WorldPacket* data = new WorldPacket();
-
                     uint32 lineLength = (line ? strlen(line) : 0) + 1;
-
                     data->Initialize(SMSG_MESSAGECHAT, 100);                // guess size
                     *data << uint8(CHAT_MSG_SYSTEM);
                     *data << uint32(LANG_UNIVERSAL);
@@ -2053,75 +1715,59 @@ namespace MaNGOS
                     *data << uint32(lineLength);
                     *data << line;
                     *data << uint8(0);
-
                     data_list.push_back(data);
                 }
             }
-
             int32 i_textId;
             va_list* i_args;
     };
 }                                                           // namespace MaNGOS
-
 /// Send a System Message to all players (except self if mentioned)
 void World::SendWorldText(int32 string_id, ...)
 {
     va_list ap;
     va_start(ap, string_id);
-
     MaNGOS::WorldWorldTextBuilder wt_builder(string_id, &ap);
     MaNGOS::LocalizedPacketListDo<MaNGOS::WorldWorldTextBuilder> wt_do(wt_builder);
     for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
     {
         if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld())
             continue;
-
         wt_do(itr->second->GetPlayer());
     }
-
     va_end(ap);
 }
-
 /// Send a System Message to all GMs (except self if mentioned)
 void World::SendGMText(int32 string_id, ...)
 {
     va_list ap;
     va_start(ap, string_id);
-
     MaNGOS::WorldWorldTextBuilder wt_builder(string_id, &ap);
     MaNGOS::LocalizedPacketListDo<MaNGOS::WorldWorldTextBuilder> wt_do(wt_builder);
     for (SessionMap::iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
     {
         if (!itr->second || !itr->second->GetPlayer() || !itr->second->GetPlayer()->IsInWorld())
             continue;
-
         if (itr->second->GetSecurity() < SEC_MODERATOR)
             continue;
-
         wt_do(itr->second->GetPlayer());
     }
-
     va_end(ap);
 }
-
 /// DEPRICATED, only for debug purpose. Send a System Message to all players (except self if mentioned)
 void World::SendGlobalText(const char* text, WorldSession *self)
 {
     WorldPacket data;
-
     // need copy to prevent corruption by strtok call in LineFromMessage original string
     char* buf = strdup(text);
     char* pos = buf;
-
     while(char* line = ChatHandler::LineFromMessage(pos))
     {
         ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, NULL, 0, line, NULL);
         SendGlobalMessage(&data, self);
     }
-
     free(buf);
 }
-
 /// Send a packet to all players (or players selected team) in the zone (except self if mentioned)
 void World::SendZoneMessage(uint32 zone, WorldPacket *packet, WorldSession *self, uint32 team)
 {
@@ -2139,7 +1785,6 @@ void World::SendZoneMessage(uint32 zone, WorldPacket *packet, WorldSession *self
         }
     }
 }
-
 /// Send a System Message to all players in the zone (except self if mentioned)
 void World::SendZoneText(uint32 zone, const char* text, WorldSession *self, uint32 team)
 {
@@ -2147,17 +1792,14 @@ void World::SendZoneText(uint32 zone, const char* text, WorldSession *self, uint
     ChatHandler::FillMessageData(&data, NULL, CHAT_MSG_SYSTEM, LANG_UNIVERSAL, NULL, 0, text, NULL);
     SendZoneMessage(zone, &data, self,team);
 }
-
 /// Kick (and save) all players
 void World::KickAll()
 {
     m_QueuedPlayer.clear();                                 // prevent send queue update packet and login queued sessions
-
     // session not removed at kick and will removed in next update tick
     for (SessionMap::const_iterator itr = m_sessions.begin(); itr != m_sessions.end(); ++itr)
         itr->second->KickPlayer();
 }
-
 /// Kick (and save) all players with security level less `sec`
 void World::KickAllLess(AccountTypes sec)
 {
@@ -2166,7 +1808,6 @@ void World::KickAllLess(AccountTypes sec)
         if (itr->second->GetSecurity() < sec)
             itr->second->KickPlayer();
 }
-
 /// Ban an account or ban an IP address, duration will be parsed using TimeStringToSecs if it is positive, otherwise permban
 BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string duration, std::string reason, std::string author)
 {
@@ -2174,10 +1815,8 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string dura
     loginDatabase.escape_string(reason);
     std::string safe_author=author;
     loginDatabase.escape_string(safe_author);
-
     uint32 duration_secs = TimeStringToSecs(duration);
     QueryResult *resultAccounts = NULL;                     //used for kicking
-
     ///- Update the database with ban information
     switch(mode)
     {
@@ -2197,7 +1836,6 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string dura
         default:
             return BAN_SYNTAX_ERROR;
     }
-
     if (!resultAccounts)
     {
         if (mode==BAN_IP)
@@ -2205,30 +1843,25 @@ BanReturn World::BanAccount(BanMode mode, std::string nameOrIP, std::string dura
         else
             return BAN_NOTFOUND;                                // Nobody to ban
     }
-
     ///- Disconnect all affected players (for IP it can be several)
     do
     {
         Field* fieldsAccount = resultAccounts->Fetch();
         uint32 account = fieldsAccount->GetUInt32();
-
         if (mode!=BAN_IP)
         {
             //No SQL injection as strings are escaped
             loginDatabase.PExecute("INSERT INTO account_banned VALUES ('%u', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+%u, '%s', '%s', '1')",
                 account,duration_secs,safe_author.c_str(),reason.c_str());
         }
-
         if (WorldSession* sess = FindSession(account))
             if (std::string(sess->GetPlayerName()) != author)
                 sess->KickPlayer();
     }
     while(resultAccounts->NextRow());
-
     delete resultAccounts;
     return BAN_SUCCESS;
 }
-
 /// Remove a ban from an account or IP address
 bool World::RemoveBanAccount(BanMode mode, std::string nameOrIP)
 {
@@ -2244,16 +1877,13 @@ bool World::RemoveBanAccount(BanMode mode, std::string nameOrIP)
             account = accmgr.GetId (nameOrIP);
         else if (mode == BAN_CHARACTER)
             account = objmgr.GetPlayerAccountIdByPlayerName (nameOrIP);
-
         if (!account)
             return false;
-
         //NO SQL injection as account is uint32
         loginDatabase.PExecute("UPDATE account_banned SET active = '0' WHERE id = '%u'",account);
     }
     return true;
 }
-
 /// Update the game time
 void World::_UpdateGameTime()
 {
@@ -2261,7 +1891,6 @@ void World::_UpdateGameTime()
     time_t thisTime = time(NULL);
     uint32 elapsed = uint32(thisTime - m_gameTime);
     m_gameTime = thisTime;
-
     ///- if there is a shutdown timer
     if (!m_stopEvent && m_ShutdownTimer > 0 && elapsed > 0)
     {
@@ -2277,22 +1906,18 @@ void World::_UpdateGameTime()
         else
         {
             m_ShutdownTimer -= elapsed;
-
             ShutdownMsg();
         }
     }
 }
-
 /// Shutdown the server
 void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode)
 {
     // ignore if server shutdown at next tick
     if (m_stopEvent)
         return;
-
     m_ShutdownMask = options;
     m_ExitCode = exitcode;
-
     ///- If the shutdown time is 0, set m_stopEvent (except if shutdown is 'idle' with remaining sessions)
     if (time==0)
     {
@@ -2307,17 +1932,14 @@ void World::ShutdownServ(uint32 time, uint32 options, uint8 exitcode)
         m_ShutdownTimer = time;
         ShutdownMsg(true);
     }
-
     Script->OnServerShutdown();
 }
-
 /// Display a shutdown message to the user(s)
 void World::ShutdownMsg(bool show, Player* player)
 {
     // not show messages for idle shutdown mode
     if (m_ShutdownMask & SHUTDOWN_MASK_IDLE)
         return;
-
     ///- Display a message every 12 hours, hours, 5 minutes, minute, 5 seconds and finally seconds
     if (show ||
         (m_ShutdownTimer < 10) ||
@@ -2333,31 +1955,24 @@ void World::ShutdownMsg(bool show, Player* player)
         (m_ShutdownTimer>12*HOUR   && (m_ShutdownTimer % (12*HOUR))==0))
     {
         std::string str = secsToTimeString(m_ShutdownTimer);
-
         ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_TIME : SERVER_MSG_SHUTDOWN_TIME;
-
         SendServerMessage(msgid,str.c_str(),player);
         DEBUG_LOG("Server is %s in %s",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"),str.c_str());
     }
 }
-
 /// Cancel a planned server shutdown
 void World::ShutdownCancel()
 {
     // nothing cancel or too later
     if (!m_ShutdownTimer || m_stopEvent)
         return;
-
     ServerMessageType msgid = (m_ShutdownMask & SHUTDOWN_MASK_RESTART) ? SERVER_MSG_RESTART_CANCELLED : SERVER_MSG_SHUTDOWN_CANCELLED;
-
     m_ShutdownMask = 0;
     m_ShutdownTimer = 0;
     m_ExitCode = SHUTDOWN_EXIT_CODE;                       // to default value
     SendServerMessage(msgid);
-
     DEBUG_LOG("Server %s cancelled.",(m_ShutdownMask & SHUTDOWN_MASK_RESTART ? "restart" : "shuttingdown"));
 }
-
 /// Send a server message to the user(s)
 void World::SendServerMessage(ServerMessageType type, const char *text, Player* player)
 {
@@ -2365,29 +1980,24 @@ void World::SendServerMessage(ServerMessageType type, const char *text, Player*
     data << uint32(type);
     if (type <= SERVER_MSG_STRING)
         data << text;
-
     if (player)
         player->GetSession()->SendPacket(&data);
     else
         SendGlobalMessage(&data);
 }
-
 void World::UpdateSessions(uint32 diff)
 {
     ///- Add new sessions
     WorldSession* sess;
     while(addSessQueue.next(sess))
         AddSession_ (sess);
-
     ///- Then send an update signal to remaining ones
     for (SessionMap::iterator itr = m_sessions.begin(), next; itr != m_sessions.end(); itr = next)
     {
         next = itr;
         ++next;
-
         if (!itr->second)
             continue;
-
         ///- and remove not active sessions from the list
         if (!itr->second->Update(diff))                      // As interval = 0
         {
@@ -2398,12 +2008,10 @@ void World::UpdateSessions(uint32 diff)
         }
     }
 }
-
 // This handles the issued and queued CLI commands
 void World::ProcessCliCommands()
 {
     CliCommandHolder::Print* zprint = NULL;
-
     CliCommandHolder* command;
     while (cliCmdQueue.next(command))
     {
@@ -2412,29 +2020,23 @@ void World::ProcessCliCommands()
         CliHandler(zprint).ParseCommands(command->m_command);
         delete command;
     }
-
     // print the console message here so it looks right
     if (zprint)
         zprint("TC> ");
 }
-
 void World::SendRNDBroadcast()
 {
     if (m_Autobroadcasts.empty())
         return;
-
     std::string msg;
-
     std::list<std::string>::const_iterator itr = m_Autobroadcasts.begin();
     std::advance(itr, rand() % m_Autobroadcasts.size());
     msg = *itr;
-
     static uint32 abcenter = 0;
     abcenter = sConfig.GetIntDefault("AutoBroadcast.Center", 0);
     if (abcenter == 0)
     {
         sWorld.SendWorldText(LANG_AUTO_BROADCAST, msg.c_str());
-
         sLog.outString("AutoBroadcast: '%s'",msg.c_str());
     }
     if (abcenter == 1)
@@ -2442,38 +2044,31 @@ void World::SendRNDBroadcast()
         WorldPacket data(SMSG_NOTIFICATION, (msg.size()+1));
         data << msg;
         sWorld.SendGlobalMessage(&data);
-
         sLog.outString("AutoBroadcast: '%s'",msg.c_str());
     }
     if (abcenter == 2)
     {
         sWorld.SendWorldText(LANG_AUTO_BROADCAST, msg.c_str());
-
         WorldPacket data(SMSG_NOTIFICATION, (msg.size()+1));
         data << msg;
         sWorld.SendGlobalMessage(&data);
-
         sLog.outString("AutoBroadcast: '%s'",msg.c_str());
     }
 }
-
 void World::InitResultQueue()
 {
     m_resultQueue = new SqlResultQueue;
     CharacterDatabase.SetResultQueue(m_resultQueue);
 }
-
 void World::UpdateResultQueue()
 {
     m_resultQueue->Update();
 }
-
 void World::UpdateRealmCharCount(uint32 accountId)
 {
     CharacterDatabase.AsyncPQuery(this, &World::_UpdateRealmCharCount, accountId,
         "SELECT COUNT(guid) FROM characters WHERE account = '%u'", accountId);
 }
-
 void World::_UpdateRealmCharCount(QueryResult *resultCharCount, uint32 accountId)
 {
     if (resultCharCount)
@@ -2485,22 +2080,18 @@ void World::_UpdateRealmCharCount(QueryResult *resultCharCount, uint32 accountId
         loginDatabase.PExecute("INSERT INTO realmcharacters (numchars, acctid, realmid) VALUES (%u, %u, %u)", charCount, accountId, realmID);
     }
 }
-
 void World::InitDailyQuestResetTime()
 {
     time_t mostRecentQuestTime;
-
     QueryResult* result = CharacterDatabase.Query("SELECT MAX(time) FROM character_queststatus_daily");
     if (result)
     {
         Field *fields = result->Fetch();
-
         mostRecentQuestTime = (time_t)fields[0].GetUInt64();
         delete result;
     }
     else
         mostRecentQuestTime = 0;
-
     // client built-in time for reset is 6:00 AM
     // FIX ME: client not show day start time
     time_t curTime = time(NULL);
@@ -2508,13 +2099,10 @@ void World::InitDailyQuestResetTime()
     localTm.tm_hour = 6;
     localTm.tm_min  = 0;
     localTm.tm_sec  = 0;
-
     // current day reset time
     time_t curDayResetTime = mktime(&localTm);
-
     // last reset time before current moment
     time_t resetTime = (curTime < curDayResetTime) ? curDayResetTime - DAY : curDayResetTime;
-
     // need reset (if we have quest time before last reset time (not processed by some reason)
     if (mostRecentQuestTime && mostRecentQuestTime <= resetTime)
         m_NextDailyQuestReset = mostRecentQuestTime;
@@ -2524,7 +2112,6 @@ void World::InitDailyQuestResetTime()
         m_NextDailyQuestReset = (curTime >= curDayResetTime) ? curDayResetTime + DAY : curDayResetTime;
     }
 }
-
 void World::ResetDailyQuests()
 {
     sLog.outDetail("Daily quests reset for all characters.");
@@ -2533,7 +2120,6 @@ void World::ResetDailyQuests()
         if (itr->second->GetPlayer())
             itr->second->GetPlayer()->ResetDailyQuestStatus();
 }
-
 void World::UpdateAllowedSecurity()
 {
     QueryResult *result = loginDatabase.PQuery("SELECT allowedSecurityLevel from realmlist WHERE id = '%d'", realmID);
@@ -2544,18 +2130,15 @@ void World::UpdateAllowedSecurity()
         delete result;
     }
 }
-
 void World::SetPlayerLimit(int32 limit, bool needUpdate)
 {
     m_playerLimit = limit;
 }
-
 void World::UpdateMaxSessionCounters()
 {
     m_maxActiveSessionCount = std::max(m_maxActiveSessionCount,uint32(m_sessions.size()-m_QueuedPlayer.size()));
     m_maxQueuedSessionCount = std::max(m_maxQueuedSessionCount,uint32(m_QueuedPlayer.size()));
 }
-
 void World::LoadDBVersion()
 {
     QueryResult* result = WorldDatabase.Query("SELECT db_version, script_version, cache_id FROM version LIMIT 1");
@@ -2563,18 +2146,14 @@ void World::LoadDBVersion()
     if (result)
     {
         Field* fields = result->Fetch();
-
         m_DBVersion              = fields[0].GetCppString();
         m_CreatureEventAIVersion = fields[1].GetCppString();
-
         // will be overwrite by config values if different and non-0
         m_configs[CONFIG_CLIENTCACHE_VERSION] = fields[2].GetUInt32();
         delete result;
     }
-
     if (m_DBVersion.empty())
         m_DBVersion = "Unknown world database.";
-
     if (m_CreatureEventAIVersion.empty())
         m_CreatureEventAIVersion = "Unknown creature EventAI.";
 }
diff --git a/src/game/World.h b/src/game/World.h
index 5e64e74661e..ef38a893e16 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -17,24 +17,19 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /// \addtogroup world The World
 /// @{
 /// \file
-
 #ifndef __WORLD_H
 #define __WORLD_H
-
 #include "Common.h"
 #include "Timer.h"
 #include "Policies/Singleton.h"
 #include "SharedDefines.h"
 #include "ace/Atomic_Op.h"
-
 #include <map>
 #include <set>
 #include <list>
-
 class Object;
 class WorldPacket;
 class WorldSession;
@@ -45,7 +40,6 @@ struct ScriptInfo;
 class SqlResultQueue;
 class QueryResult;
 class WorldSocket;
-
 // ServerMessages.dbc
 enum ServerMessageType
 {
@@ -55,20 +49,17 @@ enum ServerMessageType
     SERVER_MSG_SHUTDOWN_CANCELLED = 4,
     SERVER_MSG_RESTART_CANCELLED  = 5
 };
-
 enum ShutdownMask
 {
     SHUTDOWN_MASK_RESTART = 1,
     SHUTDOWN_MASK_IDLE    = 2,
 };
-
 enum ShutdownExitCode
 {
     SHUTDOWN_EXIT_CODE = 0,
     ERROR_EXIT_CODE    = 1,
     RESTART_EXIT_CODE  = 2,
 };
-
 /// Timers for different object refresh rates
 enum WorldTimers
 {
@@ -83,7 +74,6 @@ enum WorldTimers
     WUPDATE_AUTOBROADCAST = 8,
     WUPDATE_COUNT       = 9
 };
-
 /// Configuration elements
 enum WorldConfigs
 {
@@ -254,7 +244,7 @@ enum WorldConfigs
     CONFIG_MIN_LOG_UPDATE,
     CONFIG_CHECK_DB,
     CONFIG_ENABLE_SINFO_LOGIN,
-    CONFIG_PET_LOS,   
+    CONFIG_PET_LOS,
     CONFIG_NUMTHREADS,
     CONFIG_OFFHAND_CHECK_AT_SPELL_UNLEARN,
     CONFIG_CHATLOG_CHANNEL,
@@ -273,7 +263,6 @@ enum WorldConfigs
     CONFIG_GUILD_BANK_EVENT_LOG_COUNT,
     CONFIG_VALUE_COUNT
 };
-
 /// Server rates
 enum Rates
 {
@@ -339,7 +328,6 @@ enum Rates
     RATE_MOVESPEED,
     MAX_RATES
 };
-
 /// Type of server
 enum RealmType
 {
@@ -351,7 +339,6 @@ enum RealmType
     REALM_TYPE_FFA_PVP = 16                                 // custom, free for all pvp mode like arena PvP in all zones except rest activated places and sanctuaries
                                                             // replaced by REALM_PVP in realm list
 };
-
 enum RealmZone
 {
     REALM_ZONE_UNKNOWN       = 0,                           // any language
@@ -385,7 +372,6 @@ enum RealmZone
     REALM_ZONE_QA_SERVER     = 28,                          // any language
     REALM_ZONE_CN9           = 29                           // basic-Latin at create, any at login
 };
-
 // DB scripting commands
 #define SCRIPT_COMMAND_TALK                  0              // source = unit, target=any, datalong (0=say, 1=whisper, 2=yell, 3=emote text, 4=boss emote text)
 #define SCRIPT_COMMAND_EMOTE                 1              // source = unit, datalong = anim_id
@@ -406,15 +392,12 @@ enum RealmZone
 #define SCRIPT_COMMAND_LOAD_PATH            20              // source = unit, path = datalong, repeatable datalong2
 #define SCRIPT_COMMAND_CALLSCRIPT_TO_UNIT   21              // datalong scriptid, lowguid datalong2, dataint table
 #define SCRIPT_COMMAND_KILL                 22              // datalong removecorpse
-
 /// Storage class for commands issued for delayed execution
 struct CliCommandHolder
 {
     typedef void Print(const char*);
-
     char *m_command;
     Print* m_print;
-
     CliCommandHolder(const char *command, Print* zprint)
         : m_print(zprint)
     {
@@ -422,19 +405,15 @@ struct CliCommandHolder
         m_command = new char[len];
         memcpy(m_command, command, len);
     }
-
     ~CliCommandHolder() { delete[] m_command; }
 };
-
 /// The World
 class World
 {
     public:
         static volatile uint32 m_worldLoopCounter;
-
         World();
         ~World();
-
         WorldSession* FindSession(uint32 id) const;
         void AddSession(WorldSession *s);
         void SendRNDBroadcast();
@@ -457,25 +436,19 @@ class World
             m_MaxPlayerCount = std::max(m_MaxPlayerCount, m_PlayerCount);
         }
         inline void DecreasePlayerCount() { m_PlayerCount--; }
-
         Player* FindPlayerInZone(uint32 zone);
         Weather* FindWeather(uint32 id) const;
         Weather* AddWeather(uint32 zone_id);
         void RemoveWeather(uint32 zone_id);
-
         /// Deny clients?
         bool IsClosed() { return m_isClosed; }
-
         /// Close world
         void SetClosed(bool val) { m_isClosed = val; }
-
         /// Get the active session server limit (or security level limitations)
         uint32 GetPlayerAmountLimit() const { return m_playerLimit >= 0 ? m_playerLimit : 0; }
         AccountTypes GetPlayerSecurityLimit() const { return m_allowedSecurityLevel < 0 ? SEC_PLAYER : m_allowedSecurityLevel; }
-
         /// Set the active session server limit (or security level limitation)
         void SetPlayerLimit(int32 limit, bool needUpdate = false);
-
         //player Queue
         typedef std::list<WorldSession*> Queue;
         void AddQueuedPlayer(WorldSession*);
@@ -483,28 +456,22 @@ class World
         int32 GetQueuePos(WorldSession*);
         bool HasRecentlyDisconnected(WorldSession*);
         uint32 GetQueueSize() const { return m_QueuedPlayer.size(); }
-
         /// \todo Actions on m_allowMovement still to be implemented
         /// Is movement allowed?
         bool getAllowMovement() const { return m_allowMovement; }
         /// Allow/Disallow object movements
         void SetAllowMovement(bool allow) { m_allowMovement = allow; }
-
         /// Set a new Message of the Day
         void SetMotd(const std::string& motd) { m_motd = motd; }
         /// Get the current Message of the Day
         const char* GetMotd() const { return m_motd.c_str(); }
-
         /// Set the string for new characters (first login)
         void SetNewCharString(std::string str) { m_newCharString = str; }
         /// Get the string for new characters (first login)
         const std::string& GetNewCharString() const { return m_newCharString; }
-
         LocaleConstant GetDefaultDbcLocale() const { return m_defaultDbcLocale; }
-
         /// Get the path where data (dbc, maps) are stored on disk
         std::string GetDataPath() const { return m_dataPath; }
-
         /// When server started?
         time_t const& GetStartTime() const { return m_startTime; }
         /// What time is it?
@@ -514,17 +481,14 @@ class World
         /// Update time
         uint32 GetUpdateTime() const { return m_updateTime; }
         void SetRecordDiffInterval(int32 t) { if(t >= 0) m_configs[CONFIG_INTERVAL_LOG_UPDATE] = (uint32)t; }
-
         /// Get the maximum skill level a player can reach
         uint16 GetConfigMaxSkillValue() const
         {
             uint32 lvl = getConfig(CONFIG_MAX_PLAYER_LEVEL);
             return lvl > 60 ? 300 + ((lvl - 60) * 75) / 10 : lvl*5;
         }
-
         void SetInitialWorldSettings();
         void LoadConfigSettings(bool reload = false);
-
         void SendWorldText(int32 string_id, ...);
         void SendGlobalText(const char* text, WorldSession *self);
         void SendGMText(int32 string_id, ...);
@@ -533,7 +497,6 @@ class World
         void SendZoneMessage(uint32 zone, WorldPacket *packet, WorldSession *self = 0, uint32 team = 0);
         void SendZoneText(uint32 zone, const char *text, WorldSession *self = 0, uint32 team = 0);
         void SendServerMessage(ServerMessageType type, const char *text = "", Player* player = NULL);
-
         /// Are we in the middle of a shutdown?
         bool IsShutdowning() const { return m_ShutdownTimer > 0; }
         void ShutdownServ(uint32 time, uint32 options, uint8 exitcode);
@@ -542,22 +505,18 @@ class World
         static uint8 GetExitCode() { return m_ExitCode; }
         static void StopNow(uint8 exitcode) { m_stopEvent = true; m_ExitCode = exitcode; }
         static bool IsStopped() { return m_stopEvent; }
-
         void Update(uint32 diff);
-
         void UpdateSessions( uint32 diff );
         /// Set a server rate (see #Rates)
         void setRate(Rates rate,float value) { rate_values[rate]=value; }
         /// Get a server rate (see #Rates)
         float getRate(Rates rate) const { return rate_values[rate]; }
-
         /// Set a server configuration element (see #WorldConfigs)
         void setConfig(uint32 index,uint32 value)
         {
             if(index<CONFIG_VALUE_COUNT)
                 m_configs[index]=value;
         }
-
         /// Get a server configuration element (see #WorldConfigs)
         uint32 getConfig(uint32 index) const
         {
@@ -566,64 +525,47 @@ class World
             else
                 return 0;
         }
-
         /// Are we on a "Player versus Player" server?
         bool IsPvPRealm() { return (getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_PVP || getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_RPPVP || getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP); }
         bool IsFFAPvPRealm() { return getConfig(CONFIG_GAME_TYPE) == REALM_TYPE_FFA_PVP; }
-
         void KickAll();
         void KickAllLess(AccountTypes sec);
         BanReturn BanAccount(BanMode mode, std::string nameOrIP, std::string duration, std::string reason, std::string author);
         bool RemoveBanAccount(BanMode mode, std::string nameOrIP);
-
         uint32 IncreaseScheduledScriptsCount() { return (uint32)++m_scheduledScripts; }
         uint32 DecreaseScheduledScriptCount() { return (uint32)--m_scheduledScripts; }
         uint32 DecreaseScheduledScriptCount(size_t count) { return (uint32)(m_scheduledScripts -= count); }
         bool IsScriptScheduled() const { return m_scheduledScripts > 0; }
-
         bool IsAllowedMap(uint32 mapid) { return m_forbiddenMapIds.count(mapid) == 0 ;}
-
         // for max speed access
         static float GetMaxVisibleDistanceOnContinents()    { return m_MaxVisibleDistanceOnContinents; }
         static float GetMaxVisibleDistanceInInstances()     { return m_MaxVisibleDistanceInInstances;  }
         static float GetMaxVisibleDistanceInBGArenas()      { return m_MaxVisibleDistanceInBGArenas;   }
         static float GetMaxVisibleDistanceForObject()       { return m_MaxVisibleDistanceForObject;    }
- 
         static float GetMaxVisibleDistanceInFlight()        { return m_MaxVisibleDistanceInFlight;     }
         static float GetVisibleUnitGreyDistance()           { return m_VisibleUnitGreyDistance;        }
         static float GetVisibleObjectGreyDistance()         { return m_VisibleObjectGreyDistance;      }
-
         void ProcessCliCommands();
         void QueueCliCommand( CliCommandHolder::Print* zprintf, char const* input ) { cliCmdQueue.add(new CliCommandHolder(input, zprintf)); }
-
         void UpdateResultQueue();
         void InitResultQueue();
-
         void ForceGameEventUpdate();
-
         void UpdateRealmCharCount(uint32 accid);
-
         void UpdateAllowedSecurity();
-
         LocaleConstant GetAvailableDbcLocale(LocaleConstant locale) const { if(m_availableDbcLocaleMask & (1 << locale)) return locale; else return m_defaultDbcLocale; }
-
         //used World DB version
         void LoadDBVersion();
         char const* GetDBVersion() { return m_DBVersion.c_str(); }
         char const* GetCreatureEventAIVersion() { return m_CreatureEventAIVersion.c_str(); }
-
         //used Script version
         void SetScriptsVersion(char const* version) { m_ScriptsVersion = version ? version : "unknown scripting library"; }
         char const* GetScriptsVersion() { return m_ScriptsVersion.c_str(); }
-
         void RecordTimeDiff(const char * text, ...);
-
         void LoadAutobroadcasts();
     protected:
         void _UpdateGameTime();
         // callback for UpdateRealmCharacters
         void _UpdateRealmCharCount(QueryResult *resultCharCount, uint32 accountId);
-
         void InitDailyQuestResetTime();
         void ResetDailyQuests();
     private:
@@ -631,12 +573,9 @@ class World
         static uint8 m_ExitCode;
         uint32 m_ShutdownTimer;
         uint32 m_ShutdownMask;
-
         bool m_isClosed;
-
         //atomic op counter for active scripts amount
         ACE_Atomic_Op<ACE_Thread_Mutex, long> m_scheduledScripts;
-
         time_t m_startTime;
         time_t m_gameTime;
         IntervalTimer m_timers[WUPDATE_COUNT];
@@ -645,7 +584,6 @@ class World
         uint32 m_updateTime, m_updateTimeSum;
         uint32 m_updateTimeCount;
         uint32 m_currentTime;
-
         typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
         WeatherMap m_weathers;
         typedef UNORDERED_MAP<uint32, WorldSession*> SessionMap;
@@ -656,9 +594,7 @@ class World
         uint32 m_maxQueuedSessionCount;
         uint32 m_PlayerCount;
         uint32 m_MaxPlayerCount;
-
         std::string m_newCharString;
-
         float rate_values[MAX_RATES];
         uint32 m_configs[CONFIG_VALUE_COUNT];
         int32 m_playerLimit;
@@ -670,41 +606,31 @@ class World
         std::string m_motd;
         std::string m_dataPath;
         std::set<uint32> m_forbiddenMapIds;
-
         // for max speed access
         static float m_MaxVisibleDistanceOnContinents;
         static float m_MaxVisibleDistanceInInstances;
         static float m_MaxVisibleDistanceInBGArenas;
         static float m_MaxVisibleDistanceForObject;
- 
         static float m_MaxVisibleDistanceInFlight;
         static float m_VisibleUnitGreyDistance;
         static float m_VisibleObjectGreyDistance;
-
         // CLI command holder to be thread safe
         ACE_Based::LockedQueue<CliCommandHolder*,ACE_Thread_Mutex> cliCmdQueue;
         SqlResultQueue *m_resultQueue;
-
         // next daily quests reset time
         time_t m_NextDailyQuestReset;
-
         //Player Queue
         Queue m_QueuedPlayer;
-
         //sessions that are added async
         void AddSession_(WorldSession* s);
         ACE_Based::LockedQueue<WorldSession*, ACE_Thread_Mutex> addSessQueue;
-
         //used versions
         std::string m_DBVersion;
         std::string m_CreatureEventAIVersion;
         std::string m_ScriptsVersion;
-
         std::list<std::string> m_Autobroadcasts;
 };
-
 extern uint32 realmID;
-
 #define sWorld Trinity::Singleton<World>::Instance()
 #endif
 /// @}
diff --git a/src/game/WorldLog.cpp b/src/game/WorldLog.cpp
index 435e3279948..377b8758d9f 100644
--- a/src/game/WorldLog.cpp
+++ b/src/game/WorldLog.cpp
@@ -17,69 +17,56 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /** \file
     \ingroup u2w
 */
-
 #include "WorldLog.h"
 #include "Policies/SingletonImp.h"
 #include "Config/ConfigEnv.h"
 #include "Log.h"
-
 #define CLASS_LOCK MaNGOS::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>
 INSTANTIATE_SINGLETON_2(WorldLog, CLASS_LOCK);
 INSTANTIATE_CLASS_MUTEX(WorldLog, ACE_Thread_Mutex);
-
 WorldLog::WorldLog() : i_file(NULL)
 {
     Initialize();
 }
-
 WorldLog::~WorldLog()
 {
     if( i_file != NULL )
         fclose(i_file);
     i_file = NULL;
 }
-
 /// Open the log file (if specified so in the configuration file)
 void WorldLog::Initialize()
 {
     std::string logsDir = sConfig.GetStringDefault("LogsDir","");
-
     if(!logsDir.empty())
     {
         if((logsDir.at(logsDir.length()-1)!='/') && (logsDir.at(logsDir.length()-1)!='\\'))
             logsDir.append("/");
     }
-
     std::string logname = sConfig.GetStringDefault("WorldLogFile", "");
     if(!logname.empty())
     {
         i_file = fopen((logsDir+logname).c_str(), "w");
     }
-
     m_dbWorld = sConfig.GetBoolDefault("LogDB.World", false); // can be VERY heavy if enabled
 }
-
 void WorldLog::outTimestampLog(char const *fmt, ...)
 {
     if( LogWorld() )
     {
         Guard guard(*this);
         ASSERT(i_file);
-
         Log::outTimestamp(i_file);
         va_list args;
         va_start(args, fmt);
         vfprintf(i_file, fmt, args);
         //fprintf(i_file, "\n" );
         va_end(args);
-
         fflush(i_file);
     }
-
     if (sLog.GetLogDB() && m_dbWorld)
     {
         va_list ap2;
@@ -90,23 +77,19 @@ void WorldLog::outTimestampLog(char const *fmt, ...)
         va_end(ap2);
     }
 }
-
 void WorldLog::outLog(char const *fmt, ...)
 {
     if( LogWorld() )
     {
         Guard guard(*this);
         ASSERT(i_file);
-
         va_list args;
         va_start(args, fmt);
         vfprintf(i_file, fmt, args);
         //fprintf(i_file, "\n" );
         va_end(args);
-
         fflush(i_file);
     }
-
     if (sLog.GetLogDB() && m_dbWorld)
     {
         va_list ap2;
@@ -117,6 +100,5 @@ void WorldLog::outLog(char const *fmt, ...)
         va_end(ap2);
     }
 }
-
 #define sWorldLog WorldLog::Instance()
 
diff --git a/src/game/WorldLog.h b/src/game/WorldLog.h
index e6b72e654f7..29d07c77df1 100644
--- a/src/game/WorldLog.h
+++ b/src/game/WorldLog.h
@@ -17,20 +17,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /// \addtogroup u2w
 /// @{
 /// \file
-
 #ifndef TRINITY_WORLDLOG_H
 #define TRINITY_WORLDLOG_H
-
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Errors.h"
-
 #include <stdarg.h>
-
 /// %Log packets to a file
 class MANGOS_DLL_DECL WorldLog : public MaNGOS::Singleton<WorldLog, MaNGOS::ClassLevelLockable<WorldLog, ACE_Thread_Mutex> >
 {
@@ -39,10 +34,8 @@ class MANGOS_DLL_DECL WorldLog : public MaNGOS::Singleton<WorldLog, MaNGOS::Clas
     WorldLog(const WorldLog &);
     WorldLog& operator=(const WorldLog &);
     typedef MaNGOS::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>::Lock Guard;
-
     /// Close the file in destructor
     ~WorldLog();
-
     public:
         void Initialize();
         /// Is the world logger active?
@@ -50,13 +43,10 @@ class MANGOS_DLL_DECL WorldLog : public MaNGOS::Singleton<WorldLog, MaNGOS::Clas
         /// %Log to the file
         void outLog(char const *fmt, ...);
         void outTimestampLog(char const *fmt, ...);
-
     private:
         FILE *i_file;
-
         bool m_dbWorld;
 };
-
 #define sWorldLog WorldLog::Instance()
 #endif
 /// @}
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index f5515bf78c1..41164032a3a 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /** \file
     \ingroup u2w
 */
-
 #include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
@@ -41,7 +39,6 @@
 #include "SocialMgr.h"
 #include "zlib/zlib.h"
 #include "ScriptCalls.h"
-
 /// WorldSession constructor
 WorldSession::WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, uint8 expansion, time_t mute_time, LocaleConstant locale) :
 LookingForGroup_auto_join(false), LookingForGroup_auto_add(false), m_muteTime(mute_time),
@@ -57,14 +54,12 @@ m_latency(0), m_TutorialsChanged(false)
         loginDatabase.PExecute("UPDATE account SET online = 1 WHERE id = %u;", GetAccountId());
     }
 }
-
 /// WorldSession destructor
 WorldSession::~WorldSession()
 {
     ///- unload player if not unloaded
     if (_player)
         LogoutPlayer (true);
-
     /// - If have unclosed socket, close it
     if (m_Socket)
     {
@@ -72,53 +67,41 @@ WorldSession::~WorldSession()
         m_Socket->RemoveReference ();
         m_Socket = NULL;
     }
-
     ///- empty incoming packet queue
     WorldPacket* packet;
     while(_recvQueue.next(packet))
         delete packet;
-
     loginDatabase.PExecute("UPDATE account SET online = 0 WHERE id = %u;", GetAccountId());
     CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = %u;", GetAccountId());
 }
-
 void WorldSession::SizeError(WorldPacket const& packet, uint32 size) const
 {
     sLog.outError("Client (account %u) send packet %s (%u) with size " SIZEFMTD " but expected %u (attempt crash server?), skipped",
         GetAccountId(),LookupOpcodeName(packet.GetOpcode()),packet.GetOpcode(),packet.size(),size);
 }
-
 /// Get the player name
 char const* WorldSession::GetPlayerName() const
 {
     return GetPlayer() ? GetPlayer()->GetName() : "<none>";
 }
-
 /// Send a packet to the client
 void WorldSession::SendPacket(WorldPacket const* packet)
 {
     if (!m_Socket)
         return;
-
     #ifdef TRINITY_DEBUG
-
     // Code for network use statistic
     static uint64 sendPacketCount = 0;
     static uint64 sendPacketBytes = 0;
-
     static time_t firstTime = time(NULL);
     static time_t lastTime = firstTime;                     // next 60 secs start time
-
     static uint64 sendLastPacketCount = 0;
     static uint64 sendLastPacketBytes = 0;
-
     time_t cur_time = time(NULL);
-
     if((cur_time - lastTime) < 60)
     {
         sendPacketCount+=1;
         sendPacketBytes+=packet->size();
-
         sendLastPacketCount+=1;
         sendLastPacketBytes+=packet->size();
     }
@@ -128,24 +111,19 @@ void WorldSession::SendPacket(WorldPacket const* packet)
         uint64 fullTime = uint64(lastTime - firstTime);
         sLog.outDetail("Send all time packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f time: %u",sendPacketCount,sendPacketBytes,float(sendPacketCount)/fullTime,float(sendPacketBytes)/fullTime,uint32(fullTime));
         sLog.outDetail("Send last min packets count: " UI64FMTD " bytes: " UI64FMTD " avr.count/sec: %f avr.bytes/sec: %f",sendLastPacketCount,sendLastPacketBytes,float(sendLastPacketCount)/minTime,float(sendLastPacketBytes)/minTime);
-
         lastTime = cur_time;
         sendLastPacketCount = 1;
         sendLastPacketBytes = packet->wpos();               // wpos is real written size
     }
-
     #endif                                                  // !TRINITY_DEBUG
-
     if (m_Socket->SendPacket (*packet) == -1)
         m_Socket->CloseSocket ();
 }
-
 /// Add an incoming packet to the queue
 void WorldSession::QueuePacket(WorldPacket* new_packet)
 {
     _recvQueue.add(new_packet);
 }
-
 /// Logging helper for unexpected opcodes
 void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, const char *reason)
 {
@@ -154,7 +132,6 @@ void WorldSession::LogUnexpectedOpcode(WorldPacket* packet, const char *reason)
         packet->GetOpcode(),
         reason);
 }
-
 /// Logging helper for unexpected opcodes
 void WorldSession::LogUnprocessedTail(WorldPacket *packet)
 {
@@ -162,10 +139,8 @@ void WorldSession::LogUnprocessedTail(WorldPacket *packet)
         LookupOpcodeName(packet->GetOpcode()),
         packet->GetOpcode(),
         packet->rpos(),packet->wpos());
-     
         packet->print_storage();
 }
-
 /// Update the WorldSession (triggered by World update)
 bool WorldSession::Update(uint32 /*diff*/)
 {
@@ -179,7 +154,6 @@ bool WorldSession::Update(uint32 /*diff*/)
                         LookupOpcodeName(packet->GetOpcode()),
                         packet->GetOpcode());
         #endif*/
-
         if(packet->GetOpcode() >= NUM_MSG_TYPES)
         {
             sLog.outError( "SESSION: received non-existed opcode %s (0x%.4X)",
@@ -240,12 +214,10 @@ bool WorldSession::Update(uint32 /*diff*/)
                             LogUnexpectedOpcode(packet, "the player not pass queue yet");
                             break;
                         }
-
                         // single from authed time opcodes send in to after logout time
                         // and before other STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT opcodes.
                         if (packet->GetOpcode() != CMSG_SET_ACTIVE_VOICE_CHANNEL)
                             m_playerRecentlyLogout = false;
-
                         (this->*opHandle.handler)(*packet);
                         if (sLog.IsOutDebug() && packet->rpos() < packet->wpos())
                             LogUnprocessedTail(packet);
@@ -269,42 +241,33 @@ bool WorldSession::Update(uint32 /*diff*/)
                 }
             }
         }
-
         delete packet;
     }
-
     ///- Cleanup socket pointer if need
     if (m_Socket && m_Socket->IsClosed ())
     {
         m_Socket->RemoveReference ();
         m_Socket = NULL;
     }
-
     ///- If necessary, log the player out
     time_t currTime = time(NULL);
     if (!m_Socket || (ShouldLogOut(currTime) && !m_playerLoading))
         LogoutPlayer(true);
-
     if (!m_Socket)
         return false;                                       //Will remove this session from the world session map
-
     return true;
 }
-
 /// %Log the player out
 void WorldSession::LogoutPlayer(bool Save)
 {
     // finish pending transfers before starting the logout
     while(_player && _player->IsBeingTeleportedFar())
         HandleMoveWorldportAckOpcode();
-
     m_playerLogout = true;
-
     if (_player)
     {
         if (uint64 lguid = GetPlayer()->GetLootGUID())
             DoLootRelease(lguid);
-
         ///- If the player just died before logging out, make him appear as a ghost
         //FIXME: logout must be delayed in case lost connection with client in time of combat
         if (_player->GetDeathTimer())
@@ -318,7 +281,6 @@ void WorldSession::LogoutPlayer(bool Save)
             _player->CombatStop();
             _player->getHostilRefManager().setOnlineOfflineState(false);
             _player->RemoveAllAurasOnDeath();
-
             // build set of player who attack _player or who have pet attacking of _player
             std::set<Player*> aset;
             for(Unit::AttackerSet::const_iterator itr = _player->getAttackers().begin(); itr != _player->getAttackers().end(); ++itr)
@@ -333,16 +295,13 @@ void WorldSession::LogoutPlayer(bool Save)
                 if((*itr)->GetTypeId()==TYPEID_PLAYER)
                     aset.insert((Player*)(*itr));
             }
-
             _player->SetPvPDeath(!aset.empty());
             _player->KillPlayer();
             _player->BuildPlayerRepop();
             _player->RepopAtGraveyard();
-
             // give honor to all attackers from set like group case
             for(std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr)
                 (*itr)->RewardHonor(_player,aset.size());
-
             // give bg rewards and update counters like kill by first from attackers
             // this can't be called for all attackers.
             if(!aset.empty())
@@ -361,13 +320,10 @@ void WorldSession::LogoutPlayer(bool Save)
         //drop a flag if player is carrying it
         if(BattleGround *bg = _player->GetBattleGround())
             bg->EventPlayerLoggedOut(_player);
-
         ///- Teleport to home if the player is in an invalid instance
         if(!_player->m_InstanceValid && !_player->isGameMaster())
             _player->TeleportTo(_player->m_homebindMapId, _player->m_homebindX, _player->m_homebindY, _player->m_homebindZ, _player->GetOrientation());
-
         sOutdoorPvPMgr.HandlePlayerLeaveZone(_player,_player->GetZoneId());
-
         for (int i=0; i < PLAYER_MAX_BATTLEGROUND_QUEUES; ++i)
         {
             if(BattleGroundQueueTypeId bgQueueTypeId = _player->GetBattleGroundQueueTypeId(i))
@@ -376,19 +332,16 @@ void WorldSession::LogoutPlayer(bool Save)
                 sBattleGroundMgr.m_BattleGroundQueues[ bgQueueTypeId ].RemovePlayer(_player->GetGUID(), true);
             }
         }
-
         // Repop at GraveYard or other player far teleport will prevent saving player because of not present map
         // Teleport player immediately for correct player save
         while(_player->IsBeingTeleportedFar())
             HandleMoveWorldportAckOpcode();
-
         ///- If the player is in a guild, update the guild roster and broadcast a logout message to other guild members
         Guild *guild = objmgr.GetGuildById(_player->GetGuildId());
         if(guild)
         {
             guild->SetMemberStats(_player->GetGUID());
             guild->UpdateLogoutTime(_player->GetGUID());
-
             WorldPacket data(SMSG_GUILD_EVENT, (1+1+12+8)); // name limited to 12 in character table.
             data<<(uint8)GE_SIGNED_OFF;
             data<<(uint8)1;
@@ -396,10 +349,8 @@ void WorldSession::LogoutPlayer(bool Save)
             data<<_player->GetGUID();
             guild->BroadcastPacket(&data);
         }
-
         ///- Remove pet
         _player->RemovePet(NULL,PET_SAVE_AS_CURRENT, true);
-
         ///- empty buyback items and save the player in the database
         // some save parts only correctly work in case player present in map/player_lists (pets, etc)
         if(Save)
@@ -414,26 +365,20 @@ void WorldSession::LogoutPlayer(bool Save)
             }
             _player->SaveToDB();
         }
-
         ///- Leave all channels before player delete...
         _player->CleanupChannels();
-
         ///- If the player is in a group (or invited), remove him. If the group if then only 1 person, disband the group.
         _player->UninviteFromGroup();
-
         // remove player from the group if he is:
         // a) in group; b) not in raid group; c) logging out normally (not being kicked or disconnected)
         if(_player->GetGroup() && !_player->GetGroup()->isRaidGroup() && m_Socket)
             _player->RemoveFromGroup();
-
         ///- Send update to group
         if(_player->GetGroup())
             _player->GetGroup()->SendUpdate();
-
         ///- Broadcast a logout message to the player's friends
         sSocialMgr.SendFriendStatus(_player, FRIEND_OFFLINE, _player->GetGUIDLow(), true);
         sSocialMgr.RemovePlayerSocial (_player->GetGUIDLow ());
-
         ///- Remove the player from the world
         // the player may not be in the world when logging out
         // e.g if he got disconnected during a transfer to another map
@@ -442,52 +387,42 @@ void WorldSession::LogoutPlayer(bool Save)
         Map* _map = _player->GetMap();
         _map->Remove(_player, true);
         SetPlayer(NULL);                                    // deleted in Remove call
-
         ///- Send the 'logout complete' packet to the client
         WorldPacket data( SMSG_LOGOUT_COMPLETE, 0 );
         SendPacket( &data );
-
         ///- Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
         //No SQL injection as AccountId is uint32
         CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'",
             GetAccountId());
         sLog.outDebug( "SESSION: Sent SMSG_LOGOUT_COMPLETE Message" );
     }
-
     //Hook for OnLogout Event
     Script->OnLogout(_player);
-
     m_playerLogout = false;
     m_playerRecentlyLogout = true;
     LogoutRequest(0);
 }
-
 /// Kick a player out of the World
 void WorldSession::KickPlayer()
 {
     if (m_Socket)
         m_Socket->CloseSocket ();
 }
-
 /// Cancel channeling handler
-
 void WorldSession::SendAreaTriggerMessage(const char* Text, ...)
 {
     va_list ap;
     char szStr [1024];
     szStr[0] = '\0';
-
     va_start(ap, Text);
     vsnprintf( szStr, 1024, Text, ap );
     va_end(ap);
-
     uint32 length = strlen(szStr)+1;
     WorldPacket data(SMSG_AREA_TRIGGER_MESSAGE, 4+length);
     data << length;
     data << szStr;
     SendPacket(&data);
 }
-
 void WorldSession::SendNotification(const char *format,...)
 {
     if(format)
@@ -498,13 +433,11 @@ void WorldSession::SendNotification(const char *format,...)
         va_start(ap, format);
         vsnprintf( szStr, 1024, format, ap );
         va_end(ap);
-
         WorldPacket data(SMSG_NOTIFICATION, (strlen(szStr)+1));
         data << szStr;
         SendPacket(&data);
     }
 }
-
 void WorldSession::SendNotification(int32 string_id,...)
 {
     char const* format = GetTrinityString(string_id);
@@ -516,53 +449,45 @@ void WorldSession::SendNotification(int32 string_id,...)
         va_start(ap, string_id);
         vsnprintf( szStr, 1024, format, ap );
         va_end(ap);
-
         WorldPacket data(SMSG_NOTIFICATION, (strlen(szStr)+1));
         data << szStr;
         SendPacket(&data);
     }
 }
-
 void WorldSession::SendSetPhaseShift(uint32 PhaseShift)
 {
     WorldPacket data(SMSG_SET_PHASE_SHIFT, 4);
     data << uint32(PhaseShift);
     SendPacket(&data);
 }
-
 const char * WorldSession::GetTrinityString( int32 entry ) const
 {
     return objmgr.GetTrinityString(entry,GetSessionDbLocaleIndex());
 }
-
 void WorldSession::Handle_NULL( WorldPacket& recvPacket )
 {
     sLog.outError( "SESSION: received unhandled opcode %s (0x%.4X)",
         LookupOpcodeName(recvPacket.GetOpcode()),
         recvPacket.GetOpcode());
 }
-
 void WorldSession::Handle_EarlyProccess( WorldPacket& recvPacket )
 {
     sLog.outError( "SESSION: received opcode %s (0x%.4X) that must be processed in WorldSocket::OnRead",
         LookupOpcodeName(recvPacket.GetOpcode()),
         recvPacket.GetOpcode());
 }
-
 void WorldSession::Handle_ServerSide( WorldPacket& recvPacket )
 {
     sLog.outError( "SESSION: received server-side opcode %s (0x%.4X)",
         LookupOpcodeName(recvPacket.GetOpcode()),
         recvPacket.GetOpcode());
 }
-
 void WorldSession::Handle_Deprecated( WorldPacket& recvPacket )
 {
     sLog.outError( "SESSION: received deprecated opcode %s (0x%.4X)",
         LookupOpcodeName(recvPacket.GetOpcode()),
         recvPacket.GetOpcode());
 }
-
 void WorldSession::SendAuthWaitQue(uint32 position)
 {
     if(position == 0)
@@ -579,7 +504,6 @@ void WorldSession::SendAuthWaitQue(uint32 position)
         SendPacket(&packet);
     }
 }
-
 void WorldSession::LoadGlobalAccountData()
 {
     LoadAccountData(
@@ -587,20 +511,16 @@ void WorldSession::LoadGlobalAccountData()
         GLOBAL_CACHE_MASK
     );
 }
-
 void WorldSession::LoadAccountData(QueryResult* result, uint32 mask)
 {
     for (uint32 i = 0; i < NUM_ACCOUNT_DATA_TYPES; ++i)
         if (mask & (1 << i))
             m_accountData[i] = AccountData();
-
     if(!result)
         return;
-
     do
     {
         Field *fields = result->Fetch();
-
         uint32 type = fields[0].GetUInt32();
         if (type >= NUM_ACCOUNT_DATA_TYPES)
         {
@@ -608,28 +528,22 @@ void WorldSession::LoadAccountData(QueryResult* result, uint32 mask)
                 mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data", type);
             continue;
         }
-
         if ((mask & (1 << type))==0)
         {
             sLog.outError("Table `%s` have non appropriate for table  account data type (%u), ignore.",
                 mask == GLOBAL_CACHE_MASK ? "account_data" : "character_account_data", type);
             continue;
         }
-
         m_accountData[type].Time = fields[1].GetUInt32();
         m_accountData[type].Data = fields[2].GetCppString();
-
     } while (result->NextRow());
-
     delete result;
 }
-
 void WorldSession::SetAccountData(AccountDataType type, time_t time_, std::string data)
 {
     if ((1 << type) & GLOBAL_CACHE_MASK)
     {
         uint32 acc = GetAccountId();
-
         CharacterDatabase.BeginTransaction ();
         CharacterDatabase.PExecute("DELETE FROM account_data WHERE account='%u' AND type='%u'", acc, type);
         CharacterDatabase.escape_string(data);
@@ -641,18 +555,15 @@ void WorldSession::SetAccountData(AccountDataType type, time_t time_, std::strin
         // _player can be NULL and packet received after logout but m_GUID still store correct guid
         if(!m_GUIDLow)
             return;
-
         CharacterDatabase.BeginTransaction ();
         CharacterDatabase.PExecute("DELETE FROM character_account_data WHERE guid='%u' AND type='%u'", m_GUIDLow, type);
         CharacterDatabase.escape_string(data);
         CharacterDatabase.PExecute("INSERT INTO character_account_data VALUES ('%u','%u','%u','%s')", m_GUIDLow, type, (uint32)time_, data.c_str());
         CharacterDatabase.CommitTransaction ();
     }
-
     m_accountData[type].Time = time_;
     m_accountData[type].Data = data;
 }
-
 void WorldSession::SendAccountDataTimes()
 {
     WorldPacket data( SMSG_ACCOUNT_DATA_TIMES, 4+1+8*4 );   // changed in WotLK
@@ -662,31 +573,24 @@ void WorldSession::SendAccountDataTimes()
         data << uint32(m_accountData[i].Time);              // also unix time
     SendPacket(&data);
 }
-
 void WorldSession::LoadTutorialsData()
 {
     for ( int aX = 0 ; aX < 8 ; ++aX )
         m_Tutorials[ aX ] = 0;
-
     QueryResult *result = CharacterDatabase.PQuery("SELECT tut0,tut1,tut2,tut3,tut4,tut5,tut6,tut7 FROM character_tutorial WHERE account = '%u'", GetAccountId());
-
     if(result)
     {
         do
         {
             Field *fields = result->Fetch();
-
             for (int iI = 0; iI < 8; ++iI)
                 m_Tutorials[iI] = fields[iI].GetUInt32();
         }
         while( result->NextRow() );
-
         delete result;
     }
-
     m_TutorialsChanged = false;
 }
-
 void WorldSession::SendTutorialsData()
 {
     WorldPacket data(SMSG_TUTORIAL_FLAGS, 4*8);
@@ -694,12 +598,10 @@ void WorldSession::SendTutorialsData()
         data << m_Tutorials[i];
     SendPacket(&data);
 }
-
 void WorldSession::SaveTutorialsData()
 {
     if(!m_TutorialsChanged)
         return;
-
     uint32 Rows=0;
     // it's better than rebuilding indexes multiple times
     QueryResult *result = CharacterDatabase.PQuery("SELECT count(*) AS r FROM character_tutorial WHERE account = '%u'", GetAccountId());
@@ -708,7 +610,6 @@ void WorldSession::SaveTutorialsData()
         Rows = result->Fetch()[0].GetUInt32();
         delete result;
     }
-
     if (Rows)
     {
         CharacterDatabase.PExecute("UPDATE character_tutorial SET tut0='%u', tut1='%u', tut2='%u', tut3='%u', tut4='%u', tut5='%u', tut6='%u', tut7='%u' WHERE account = '%u'",
@@ -718,10 +619,8 @@ void WorldSession::SaveTutorialsData()
     {
         CharacterDatabase.PExecute("INSERT INTO character_tutorial (account,tut0,tut1,tut2,tut3,tut4,tut5,tut6,tut7) VALUES ('%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u')", GetAccountId(), m_Tutorials[0], m_Tutorials[1], m_Tutorials[2], m_Tutorials[3], m_Tutorials[4], m_Tutorials[5], m_Tutorials[6], m_Tutorials[7]);
     }
-
     m_TutorialsChanged = false;
 }
-
 void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
 {
     data >> mi->flags;
@@ -731,12 +630,10 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
     data >> mi->y;
     data >> mi->z;
     data >> mi->o;
-
     if(mi->flags & MOVEMENTFLAG_ONTRANSPORT)
     {
         if(!data.readPackGUID(mi->t_guid))
             return;
-
         data >> mi->t_x;
         data >> mi->t_y;
         data >> mi->t_z;
@@ -744,14 +641,11 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
         data >> mi->t_time;
         data >> mi->t_seat;
     }
-
     if((mi->flags & (MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_FLYING)) || (mi->unk1 & 0x20))
     {
         data >> mi->s_pitch;
     }
-
     data >> mi->fallTime;
-
     if(mi->flags & MOVEMENTFLAG_JUMPING)
     {
         data >> mi->j_zspeed;
@@ -759,70 +653,53 @@ void WorldSession::ReadMovementInfo(WorldPacket &data, MovementInfo *mi)
         data >> mi->j_cosAngle;
         data >> mi->j_xyspeed;
     }
-
     if(mi->flags & MOVEMENTFLAG_SPLINE)
     {
         data >> mi->u_unk1;
     }
 }
-
 void WorldSession::ReadAddonsInfo(WorldPacket &data)
 {
     if (data.rpos() + 4 > data.size())
         return;
     uint32 size;
     data >> size;
-
     if(!size)
         return;
-
     if(size > 0xFFFFF)
     {
         sLog.outError("WorldSession::ReadAddonsInfo addon info too big, size %u", size);
         return;
     }
-
     uLongf uSize = size;
-
     uint32 pos = data.rpos();
-
     ByteBuffer addonInfo;
     addonInfo.resize(size);
-
     if (uncompress(const_cast<uint8*>(addonInfo.contents()), &uSize, const_cast<uint8*>(data.contents() + pos), data.size() - pos) == Z_OK)
     {
         uint32 addonsCount;
         addonInfo >> addonsCount;                         // addons count
-
         for(uint32 i = 0; i < addonsCount; ++i)
         {
             std::string addonName;
             uint8 enabled;
             uint32 crc, unk1;
-
             // check next addon data format correctness
             if(addonInfo.rpos()+1 > addonInfo.size())
                 return;
-
             addonInfo >> addonName;
-
             addonInfo >> enabled >> crc >> unk1;
-
             sLog.outDebug("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk1);
-
             m_addonsList.push_back(AddonInfo(addonName, enabled, crc));
         }
-
         uint32 unk2;
         addonInfo >> unk2;
-
         if(addonInfo.rpos() != addonInfo.size())
             sLog.outDebug("packet under read!");
     }
     else
         sLog.outError("Addon packet uncompress error!");
 }
-
 void WorldSession::SendAddonsInfo()
 {
     unsigned char tdata[256] =
@@ -844,14 +721,11 @@ void WorldSession::SendAddonsInfo()
         0xC3, 0xFB, 0x1B, 0x8C, 0x29, 0xEF, 0x8E, 0xE5, 0x34, 0xCB, 0xD1, 0x2A, 0xCE, 0x79, 0xC3, 0x9A,
         0x0D, 0x36, 0xEA, 0x01, 0xE0, 0xAA, 0x91, 0x20, 0x54, 0xF0, 0x72, 0xD8, 0x1E, 0xC7, 0x89, 0xD2
     };
-
     WorldPacket data(SMSG_ADDON_INFO, 4);
-
     for(AddonsList::iterator itr = m_addonsList.begin(); itr != m_addonsList.end(); ++itr)
     {
         uint8 state = 2;                                    // 2 is sent here
         data << uint8(state);
-
         uint8 unk1 = 1;                                     // 1 is sent here
         data << uint8(unk1);
         if (unk1)
@@ -860,10 +734,8 @@ void WorldSession::SendAddonsInfo()
             data << uint8(unk2);
             if (unk2)                                       // if CRC is wrong, add public key (client need it)
                 data.append(tdata, sizeof(tdata));
-
             data << uint32(0);
         }
-
         uint8 unk3 = 0;                                     // 0 is sent here
         data << uint8(unk3);
         if (unk3)
@@ -872,9 +744,7 @@ void WorldSession::SendAddonsInfo()
             data << uint8(0);
         }
     }
-
     m_addonsList.clear();
-
     uint32 count = 0;
     data << uint32(count);
     /*for(uint32 i = 0; i < count; ++i)
@@ -884,15 +754,12 @@ void WorldSession::SendAddonsInfo()
         string (16 bytes)
         uint32
     }*/
-
     SendPacket(&data);
 }
-
 void WorldSession::SetPlayer( Player *plr )
 {
     _player = plr;
-
     // set m_GUID that can be used while player loggined and later until m_playerRecentlyLogout not reset
     if(_player)
         m_GUIDLow = _player->GetGUIDLow();
-}
\ No newline at end of file
+}
diff --git a/src/game/WorldSession.h b/src/game/WorldSession.h
index b26f5ba4933..761f7ff4446 100644
--- a/src/game/WorldSession.h
+++ b/src/game/WorldSession.h
@@ -17,23 +17,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /// \addtogroup u2w
 /// @{
 /// \file
-
 #ifndef __WORLDSESSION_H
 #define __WORLDSESSION_H
-
 #include "Common.h"
 #include "SharedDefines.h"
-
 class MailItemsInfo;
 struct ItemPrototype;
 struct AuctionEntry;
 struct DeclinedName;
 struct MovementInfo;
-
 class Creature;
 class Item;
 class Object;
@@ -47,7 +42,6 @@ class QueryResult;
 class LoginQueryHolder;
 class CharacterHandler;
 struct AreaTableEntry;
-
 enum AccountDataType
 {
     GLOBAL_CONFIG_CACHE             = 0,                    // 0x01 g
@@ -59,20 +53,15 @@ enum AccountDataType
     PER_CHARACTER_LAYOUT_CACHE      = 6,                    // 0x40 p
     PER_CHARACTER_CHAT_CACHE        = 7,                    // 0x80 p
 };
-
 #define NUM_ACCOUNT_DATA_TYPES        8
-
 #define GLOBAL_CACHE_MASK           0x15
 #define PER_CHARACTER_CACHE_MASK    0xEA
-
 struct AccountData
 {
     AccountData() : Time(0), Data("") {}
-
     time_t Time;
     std::string Data;
 };
-
 struct AddonInfo
 {
     AddonInfo(const std::string& name, uint8 enabled, uint32 crc)
@@ -81,20 +70,16 @@ struct AddonInfo
         Enabled = enabled;
         CRC = crc;
     }
-
     std::string Name;
     uint8 Enabled;
     uint32 CRC;
 };
-
 typedef std::list<AddonInfo> AddonsList;
-
 enum PartyOperation
 {
     PARTY_OP_INVITE = 0,
     PARTY_OP_LEAVE = 2
 };
-
 enum PartyResult
 {
     PARTY_RESULT_OK                   = 0,
@@ -109,7 +94,6 @@ enum PartyResult
     PARTY_RESULT_TARGET_IGNORE_YOU    = 9,
     PARTY_RESULT_INVITE_RESTRICTED    = 13
 };
-
 /// Player session in the World
 class TRINITY_DLL_SPEC WorldSession
 {
@@ -117,17 +101,12 @@ class TRINITY_DLL_SPEC WorldSession
     public:
         WorldSession(uint32 id, WorldSocket *sock, AccountTypes sec, uint8 expansion, time_t mute_time, LocaleConstant locale);
         ~WorldSession();
-
         bool PlayerLoading() const { return m_playerLoading; }
         bool PlayerLogout() const { return m_playerLogout; }
-
         void SizeError(WorldPacket const& packet, uint32 size) const;
-
         void ReadAddonsInfo(WorldPacket &data);
         void SendAddonsInfo();
-
         void ReadMovementInfo(WorldPacket &data, MovementInfo *mi);
-
         void SendPacket(WorldPacket const* packet);
         void SendNotification(const char *format,...) ATTR_PRINTF(2,3);
         void SendNotification(int32 string_id,...);
@@ -137,7 +116,6 @@ class TRINITY_DLL_SPEC WorldSession
         void SendPartyResult(PartyOperation operation, const std::string& member, PartyResult res);
         void SendAreaTriggerMessage(const char* Text, ...) ATTR_PRINTF(2,3);
         void SendSetPhaseShift(uint32 phaseShift);
-
         AccountTypes GetSecurity() const { return _security; }
         uint32 GetAccountId() const { return _accountId; }
         Player* GetPlayer() const { return _player; }
@@ -146,39 +124,30 @@ class TRINITY_DLL_SPEC WorldSession
         std::string const& GetRemoteAddress() { return m_Address; }
         void SetPlayer(Player *plr);
         uint8 Expansion() const { return m_expansion; }
-
         /// Session in auth.queue currently
         void SetInQueue(bool state) { m_inQueue = state; }
-
         /// Is the user engaged in a log out process?
         bool isLogingOut() const { return _logoutTime || m_playerLogout; }
-
         /// Engage the logout process for the user
         void LogoutRequest(time_t requestTime)
         {
             _logoutTime = requestTime;
         }
-
         /// Is logout cooldown expired?
         bool ShouldLogOut(time_t currTime) const
         {
             return (_logoutTime > 0 && currTime >= _logoutTime + 20);
         }
-
         void LogoutPlayer(bool Save);
         void KickPlayer();
-
         void QueuePacket(WorldPacket* new_packet);
         bool Update(uint32 diff);
-
         /// Handle the authentication waiting queue (to be completed)
         void SendAuthWaitQue(uint32 position);
-
         //void SendTestCreatureQueryOpcode( uint32 entry, uint64 guid, uint32 testvalue );
         void SendNameQueryOpcode(Player* p);
         void SendNameQueryOpcodeFromDB(uint64 guid);
         static void SendNameQueryOpcodeFromDBCallBack(QueryResult *result, uint32 accountId);
-
         void SendTrainerList( uint64 guid );
         void SendTrainerList( uint64 guid, const std::string& strTitle );
         void SendListInventory( uint64 guid );
@@ -186,21 +155,15 @@ class TRINITY_DLL_SPEC WorldSession
         void SendTabardVendorActivate( uint64 guid );
         void SendSpiritResurrect();
         void SendBindPoint(Creature* npc);
-
         void SendAttackStop(Unit const* enemy);
-
         void SendBattlegGroundList( uint64 guid, BattleGroundTypeId bgTypeId );
-
         void SendTradeStatus(uint32 status);
         void SendCancelTrade();
-
         void SendStablePet(uint64 guid );
         void SendPetitionQueryOpcode( uint64 petitionguid);
         void SendUpdateTrade();
-
         //pet
         void SendPetNameQuery(uint64 guid, uint32 petnumber);
-
         // Account Data
         AccountData *GetAccountData(AccountDataType type) { return &m_accountData[type]; }
         void SetAccountData(AccountDataType type, time_t time_, std::string data);
@@ -214,7 +177,6 @@ class TRINITY_DLL_SPEC WorldSession
         {
             return m_Tutorials[intId];
         }
-
         void SetTutorialInt(uint32 intId, uint32 value)
         {
             if(m_Tutorials[intId] != value)
@@ -223,13 +185,11 @@ class TRINITY_DLL_SPEC WorldSession
                 m_TutorialsChanged = true;
             }
         }
-
         //mail
                                                             //used with item_page table
         bool SendItemInfo( uint32 itemid, WorldPacket data );
         static void SendReturnToSender(uint8 messageType, uint32 sender_acc, uint32 sender_guid, uint32 receiver_guid, const std::string& subject, uint32 itemTextId, MailItemsInfo *mi, uint32 money, uint16 mailTemplateId = 0);
         static void SendMailTo(Player* receiver, uint8 messageType, uint8 stationery, uint32 sender_guidlow_or_entry, uint32 received_guidlow, std::string subject, uint32 itemTextId, MailItemsInfo* mi, uint32 money, uint32 COD, uint32 checked, uint32 deliver_delay = 0, uint16 mailTemplateId = 0);
-
         //auction
         void SendAuctionHello( uint64 guid, Creature * unit );
         void SendAuctionCommandResult( uint32 auctionId, uint32 Action, uint32 ErrorCode, uint32 bidError = 0);
@@ -237,17 +197,14 @@ class TRINITY_DLL_SPEC WorldSession
         void SendAuctionOwnerNotification( AuctionEntry * auction );
         void SendAuctionOutbiddedMail( AuctionEntry * auction, uint32 newPrice );
         void SendAuctionCancelledToBidderMail( AuctionEntry* auction );
-
         //Item Enchantment
         void SendEnchantmentLog(uint64 Target, uint64 Caster,uint32 ItemID,uint32 SpellID);
         void SendItemEnchantTimeUpdate(uint64 Playerguid, uint64 Itemguid,uint32 slot,uint32 Duration);
-
         //Taxi
         void SendTaxiStatus( uint64 guid );
         void SendTaxiMenu( Creature* unit );
         void SendDoFlight( uint32 mountDisplayId, uint32 path, uint32 pathNode = 0 );
         bool SendLearnNewTaxiNode( Creature* unit );
-
         // Guild/Arena Team
         void SendGuildCommandResult(uint32 typecmd, const std::string& str, uint32 cmdresult);
         void SendArenaTeamCommandResult(uint32 team_action, const std::string& team, const std::string& player, uint32 error_id);
@@ -256,76 +213,55 @@ class TRINITY_DLL_SPEC WorldSession
         void SendPetitionShowList( uint64 guid );
         void SendSaveGuildEmblem( uint32 msg );
         void SendBattleGroundOrArenaJoinError(uint8 err);
-
         // Looking For Group
         // TRUE values set by client sending CMSG_LFG_SET_AUTOJOIN and CMSG_LFM_CLEAR_AUTOFILL before player login
         bool LookingForGroup_auto_join;
         bool LookingForGroup_auto_add;
-
         void BuildPartyMemberStatsChangedPacket(Player *player, WorldPacket *data);
-
         void DoLootRelease( uint64 lguid );
-
         // Account mute time
         time_t m_muteTime;
-
         // Locales
         LocaleConstant GetSessionDbcLocale() const { return m_sessionDbcLocale; }
         int GetSessionDbLocaleIndex() const { return m_sessionDbLocaleIndex; }
         const char *GetTrinityString(int32 entry) const;
-
         uint32 GetLatency() const { return m_latency; }
         void SetLatency(uint32 latency) { m_latency = latency; }
         uint32 getDialogStatus(Player *pPlayer, Object* questgiver, uint32 defstatus);
-
     public:                                                 // opcodes handlers
-
         void Handle_NULL(WorldPacket& recvPacket);          // not used
         void Handle_EarlyProccess( WorldPacket& recvPacket);// just mark packets processed in WorldSocket::OnRead
         void Handle_ServerSide(WorldPacket& recvPacket);    // sever side only, can't be accepted from client
         void Handle_Deprecated(WorldPacket& recvPacket);    // never used anymore by client
-
         void HandleCharEnumOpcode(WorldPacket& recvPacket);
         void HandleCharDeleteOpcode(WorldPacket& recvPacket);
         void HandleCharCreateOpcode(WorldPacket& recvPacket);
         void HandlePlayerLoginOpcode(WorldPacket& recvPacket);
         void HandleCharEnum(QueryResult * result);
         void HandlePlayerLogin(LoginQueryHolder * holder);
-
         // played time
         void HandlePlayedTime(WorldPacket& recvPacket);
-
         // new
         void HandleMoveUnRootAck(WorldPacket& recvPacket);
         void HandleMoveRootAck(WorldPacket& recvPacket);
         void HandleLookingForGroup(WorldPacket& recvPacket);
-
         // new inspect
         void HandleInspectOpcode(WorldPacket& recvPacket);
-
         // new party stats
         void HandleInspectHonorStatsOpcode(WorldPacket& recvPacket);
-
         void HandleMoveWaterWalkAck(WorldPacket& recvPacket);
         void HandleFeatherFallAck(WorldPacket &recv_data);
-
         void HandleMoveHoverAck( WorldPacket & recv_data );
-
         void HandleMountSpecialAnimOpcode(WorldPacket &recvdata);
-
         // character view
         void HandleShowingHelmOpcode(WorldPacket& recv_data);
         void HandleShowingCloakOpcode(WorldPacket& recv_data);
-
         // repair
         void HandleRepairItemOpcode(WorldPacket& recvPacket);
-
         // Knockback
         void HandleMoveKnockBackAck(WorldPacket& recvPacket);
-
         void HandleMoveTeleportAck(WorldPacket& recvPacket);
         void HandleForceSpeedChangeAck( WorldPacket & recv_data );
-
         void HandlePingOpcode(WorldPacket& recvPacket);
         void HandleAuthSessionOpcode(WorldPacket& recvPacket);
         void HandleRepopRequestOpcode(WorldPacket& recvPacket);
@@ -338,7 +274,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleLogoutRequestOpcode(WorldPacket& recvPacket);
         void HandlePlayerLogoutOpcode(WorldPacket& recvPacket);
         void HandleLogoutCancelOpcode(WorldPacket& recvPacket);
-
         // GM Ticket opcodes
         void HandleGMTicketCreateOpcode(WorldPacket& recvPacket);
         void HandleGMTicketUpdateOpcode(WorldPacket& recvPacket);
@@ -346,11 +281,8 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleGMTicketGetTicketOpcode(WorldPacket& recvPacket);
         void HandleGMTicketSystemStatusOpcode(WorldPacket& recvPacket);
         void SendGMTicketGetTicket(uint32 status, char const* text);
-
         //void HandleGMSurveySubmit(WorldPacket& recvPacket);
-
         void HandleTogglePvP(WorldPacket& recvPacket);
-
         void HandleZoneUpdateOpcode(WorldPacket& recvPacket);
         void HandleSetTargetOpcode(WorldPacket& recvPacket);
         void HandleSetSelectionOpcode(WorldPacket& recvPacket);
@@ -367,33 +299,23 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleBugOpcode(WorldPacket& recvPacket);
         void HandleSetAmmoOpcode(WorldPacket& recvPacket);
         void HandleItemNameQueryOpcode(WorldPacket& recvPacket);
-
         void HandleAreaTriggerOpcode(WorldPacket& recvPacket);
-
         void HandleSetFactionAtWar( WorldPacket & recv_data );
         void HandleSetFactionCheat( WorldPacket & recv_data );
         void HandleSetWatchedFactionOpcode(WorldPacket & recv_data);
         void HandleSetFactionInactiveOpcode(WorldPacket & recv_data);
-
         void HandleUpdateAccountData(WorldPacket& recvPacket);
         void HandleRequestAccountData(WorldPacket& recvPacket);
         void HandleSetActionButtonOpcode(WorldPacket& recvPacket);
-
         void HandleGameObjectUseOpcode(WorldPacket& recPacket);
         void HandleMeetingStoneInfo(WorldPacket& recPacket);
         void HandleGameobjectReportUse(WorldPacket& recvPacket);
-
         void HandleNameQueryOpcode(WorldPacket& recvPacket);
-
         void HandleQueryTimeOpcode(WorldPacket& recvPacket);
-
         void HandleCreatureQueryOpcode(WorldPacket& recvPacket);
-
         void HandleGameObjectQueryOpcode(WorldPacket& recvPacket);
-
         void HandleMoveWorldportAckOpcode(WorldPacket& recvPacket);
         void HandleMoveWorldportAckOpcode();                // for server-side calls
-
         void HandleMovementOpcodes(WorldPacket& recvPacket);
         void HandleSetActiveMoverOpcode(WorldPacket &recv_data);
         void HandleMoveNotActiveMover(WorldPacket &recv_data);
@@ -401,12 +323,9 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleRequestVehicleExit(WorldPacket &recv_data);
         void HandleChangeSeatsOnControlledVehicle(WorldPacket &recv_data);
         void HandleMoveTimeSkippedOpcode(WorldPacket &recv_data);
-
         void HandleRequestRaidInfoOpcode( WorldPacket & recv_data );
-
         void HandleBattlefieldStatusOpcode(WorldPacket &recv_data);
         void HandleBattleMasterHelloOpcode(WorldPacket &recv_data);
-
         void HandleGroupInviteOpcode(WorldPacket& recvPacket);
         //void HandleGroupCancelOpcode(WorldPacket& recvPacket);
         void HandleGroupAcceptOpcode(WorldPacket& recvPacket);
@@ -426,7 +345,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleGroupChangeSubGroupOpcode( WorldPacket & recv_data );
         void HandleGroupAssistantLeaderOpcode( WorldPacket & recv_data );
         void HandlePartyAssignmentOpcode( WorldPacket & recv_data );
-
         void HandlePetitionBuyOpcode(WorldPacket& recv_data);
         void HandlePetitionShowSignOpcode(WorldPacket& recv_data);
         void HandlePetitionQueryOpcode(WorldPacket& recv_data);
@@ -435,7 +353,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandlePetitionDeclineOpcode(WorldPacket& recv_data);
         void HandleOfferPetitionOpcode(WorldPacket& recv_data);
         void HandleTurnInPetitionOpcode(WorldPacket& recv_data);
-
         void HandleGuildQueryOpcode(WorldPacket& recvPacket);
         void HandleGuildCreateOpcode(WorldPacket& recvPacket);
         void HandleGuildInviteOpcode(WorldPacket& recvPacket);
@@ -458,13 +375,11 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleGuildDelRankOpcode(WorldPacket& recvPacket);
         void HandleGuildChangeInfoTextOpcode(WorldPacket& recvPacket);
         void HandleSaveGuildEmblemOpcode(WorldPacket& recvPacket);
-
         void HandleTaxiNodeStatusQueryOpcode(WorldPacket& recvPacket);
         void HandleTaxiQueryAvailableNodes(WorldPacket& recvPacket);
         void HandleActivateTaxiOpcode(WorldPacket& recvPacket);
         void HandleActivateTaxiExpressOpcode(WorldPacket& recvPacket);
         void HandleMoveSplineDoneOpcode(WorldPacket& recvPacket);
-
         void HandleTabardVendorActivateOpcode(WorldPacket& recvPacket);
         void HandleBankerActivateOpcode(WorldPacket& recvPacket);
         void HandleBuyBankSlotOpcode(WorldPacket& recvPacket);
@@ -482,10 +397,8 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleBuyStableSlot(WorldPacket& recvPacket);
         void HandleStableRevivePet(WorldPacket& recvPacket);
         void HandleStableSwapPet(WorldPacket& recvPacket);
-
         void HandleDuelAcceptedOpcode(WorldPacket& recvPacket);
         void HandleDuelCancelledOpcode(WorldPacket& recvPacket);
-
         void HandleAcceptTradeOpcode(WorldPacket& recvPacket);
         void HandleBeginTradeOpcode(WorldPacket& recvPacket);
         void HandleBusyTradeOpcode(WorldPacket& recvPacket);
@@ -496,7 +409,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleSetTradeGoldOpcode(WorldPacket& recvPacket);
         void HandleSetTradeItemOpcode(WorldPacket& recvPacket);
         void HandleUnacceptTradeOpcode(WorldPacket& recvPacket);
-
         void HandleAuctionHelloOpcode(WorldPacket& recvPacket);
         void HandleAuctionListItems( WorldPacket & recv_data );
         void HandleAuctionListBidderItems( WorldPacket & recv_data );
@@ -505,7 +417,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleAuctionListOwnerItems( WorldPacket & recv_data );
         void HandleAuctionPlaceBid( WorldPacket & recv_data );
         void HandleAuctionListPendingSales( WorldPacket & recv_data );
-
         void HandleGetMailList( WorldPacket & recv_data );
         void HandleSendMail( WorldPacket & recv_data );
         void HandleMailTakeMoney( WorldPacket & recv_data );
@@ -517,7 +428,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleMailCreateTextItem(WorldPacket & recv_data );
         void HandleQueryNextMailTime(WorldPacket & recv_data );
         void HandleCancelChanneling(WorldPacket & recv_data );
-
         void SendItemPageInfo( ItemPrototype *itemProto );
         void HandleSplitItemOpcode(WorldPacket& recvPacket);
         void HandleSwapInvItemOpcode(WorldPacket& recvPacket);
@@ -536,11 +446,9 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleAutoBankItemOpcode(WorldPacket& recvPacket);
         void HandleAutoStoreBankItemOpcode(WorldPacket& recvPacket);
         void HandleWrapItemOpcode(WorldPacket& recvPacket);
-
         void HandleAttackSwingOpcode(WorldPacket& recvPacket);
         void HandleAttackStopOpcode(WorldPacket& recvPacket);
         void HandleSetSheathedOpcode(WorldPacket& recvPacket);
-
         void HandleUseItemOpcode(WorldPacket& recvPacket);
         void HandleOpenItemOpcode(WorldPacket& recvPacket);
         void HandleCastSpellOpcode(WorldPacket& recvPacket);
@@ -548,12 +456,10 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleCancelAuraOpcode(WorldPacket& recvPacket);
         void HandleCancelGrowthAuraOpcode(WorldPacket& recvPacket);
         void HandleCancelAutoRepeatSpellOpcode(WorldPacket& recvPacket);
-
         void HandleLearnTalentOpcode(WorldPacket& recvPacket);
         void HandleLearnPreviewTalents(WorldPacket& recvPacket);
         void HandleTalentWipeConfirmOpcode(WorldPacket& recvPacket);
         void HandleUnlearnSkillOpcode(WorldPacket& recvPacket);
-
         void HandleQuestgiverStatusQueryOpcode(WorldPacket& recvPacket);
         void HandleQuestgiverStatusMultipleQuery(WorldPacket& recvPacket);
         void HandleQuestgiverHelloOpcode(WorldPacket& recvPacket);
@@ -570,17 +476,14 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleQuestgiverQuestAutoLaunch(WorldPacket& recvPacket);
         void HandlePushQuestToParty(WorldPacket& recvPacket);
         void HandleQuestPushResult(WorldPacket& recvPacket);
-
         bool processChatmessageFurtherAfterSecurityChecks(std::string&, uint32);
         void HandleMessagechatOpcode(WorldPacket& recvPacket);
         void HandleTextEmoteOpcode(WorldPacket& recvPacket);
         void HandleChatIgnoredOpcode(WorldPacket& recvPacket);
-
         void HandleReclaimCorpseOpcode( WorldPacket& recvPacket );
         void HandleCorpseQueryOpcode( WorldPacket& recvPacket );
         void HandleResurrectResponseOpcode(WorldPacket& recvPacket);
         void HandleSummonResponseOpcode(WorldPacket& recv_data);
-
         void HandleJoinChannel(WorldPacket& recvPacket);
         void HandleLeaveChannel(WorldPacket& recvPacket);
         void HandleChannelList(WorldPacket& recvPacket);
@@ -601,17 +504,13 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleChannelDisplayListQuery(WorldPacket& recvPacket);
         void HandleGetChannelMemberCount(WorldPacket& recvPacket);
         void HandleSetChannelWatch(WorldPacket& recvPacket);
-
         void HandleCompleteCinematic(WorldPacket& recvPacket);
         void HandleNextCinematicCamera(WorldPacket& recvPacket);
-
         void HandlePageQuerySkippedOpcode(WorldPacket& recvPacket);
         void HandlePageTextQueryOpcode(WorldPacket& recvPacket);
-
         void HandleTutorialFlag ( WorldPacket & recv_data );
         void HandleTutorialClear( WorldPacket & recv_data );
         void HandleTutorialReset( WorldPacket & recv_data );
-
         //Pet
         void HandlePetAction( WorldPacket & recv_data );
         void HandlePetActionHelper(Unit *pet, uint64 guid1, uint16 spellid, uint16 flag, uint64 guid2);
@@ -625,15 +524,11 @@ class TRINITY_DLL_SPEC WorldSession
         void HandlePetCastSpellOpcode( WorldPacket& recvPacket );
         void HandlePetLearnTalent( WorldPacket& recvPacket );
         void HandleLearnPreviewTalentsPet( WorldPacket& recvPacket );
-
         void HandleSetActionBarToggles(WorldPacket& recv_data);
-
         void HandleCharRenameOpcode(WorldPacket& recv_data);
         static void HandleChangePlayerNameOpcodeCallBack(QueryResult *result, uint32 accountId, std::string newname);
         void HandleSetPlayerDeclinedNames(WorldPacket& recv_data);
-
         void HandleTotemDestroyed(WorldPacket& recv_data);
-
         //BattleGround
         void HandleBattlemasterHelloOpcode(WorldPacket &recv_data);
         void HandleBattlemasterJoinOpcode(WorldPacket &recv_data);
@@ -644,7 +539,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleLeaveBattlefieldOpcode( WorldPacket &recv_data );
         void HandleBattlemasterJoinArena( WorldPacket &recv_data );
         void HandleReportPvPAFK( WorldPacket &recv_data );
-
         void HandleWardenDataOpcode(WorldPacket& recv_data);
         void HandleWorldTeleportOpcode(WorldPacket& recv_data);
         void HandleMinimapPingOpcode(WorldPacket& recv_data);
@@ -667,7 +561,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleTimeSyncResp(WorldPacket& recv_data);
         void HandleWhoisOpcode(WorldPacket& recv_data);
         void HandleResetInstancesOpcode(WorldPacket& recv_data);
-
         // Arena Team
         void HandleInspectArenaTeamsOpcode(WorldPacket& recv_data);
         void HandleArenaTeamQueryOpcode(WorldPacket& recv_data);
@@ -679,24 +572,19 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleArenaTeamRemoveOpcode(WorldPacket& recv_data);
         void HandleArenaTeamDisbandOpcode(WorldPacket& recv_data);
         void HandleArenaTeamLeaderOpcode(WorldPacket& recv_data);
-
         void HandleAreaSpiritHealerQueryOpcode(WorldPacket& recv_data);
         void HandleAreaSpiritHealerQueueOpcode(WorldPacket& recv_data);
         void HandleCancelMountAuraOpcode(WorldPacket& recv_data);
         void HandleSelfResOpcode(WorldPacket& recv_data);
         void HandleComplainOpcode(WorldPacket& recv_data);
         void HandleRequestPetInfoOpcode(WorldPacket& recv_data);
-
         // Socket gem
         void HandleSocketOpcode(WorldPacket& recv_data);
-
         void HandleCancelTempEnchantmentOpcode(WorldPacket& recv_data);
-
         void HandleChannelVoiceOnOpcode(WorldPacket & recv_data);
         void HandleVoiceSessionEnableOpcode(WorldPacket& recv_data);
         void HandleSetActiveVoiceChannel(WorldPacket& recv_data);
         void HandleSetTaxiBenchmarkOpcode(WorldPacket& recv_data);
-
         // Guild Bank
         void HandleGuildPermissions(WorldPacket& recv_data);
         void HandleGuildBankMoneyWithdrawn(WorldPacket& recv_data);
@@ -706,12 +594,10 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleGuildBankDepositMoney(WorldPacket& recv_data);
         void HandleGuildBankWithdrawMoney(WorldPacket& recv_data);
         void HandleGuildBankSwapItems(WorldPacket& recv_data);
-
         void HandleGuildBankUpdateTab(WorldPacket& recv_data);
         void HandleGuildBankBuyTab(WorldPacket& recv_data);
         void HandleQueryGuildBankTabText(WorldPacket& recv_data);
         void HandleSetGuildBankTabText(WorldPacket& recv_data);
-
         // Calendar
         void HandleCalendarGetCalendar(WorldPacket& recv_data);
         void HandleCalendarGetEvent(WorldPacket& recv_data);
@@ -728,7 +614,6 @@ class TRINITY_DLL_SPEC WorldSession
         void HandleCalendarEventModeratorStatus(WorldPacket& recv_data);
         void HandleCalendarComplain(WorldPacket& recv_data);
         void HandleCalendarGetNumPending(WorldPacket& recv_data);
-
         void HandleSpellClick(WorldPacket& recv_data);
         void HandleMirrrorImageDataRequest( WorldPacket & recv_data );
         void HandleAlterAppearance(WorldPacket& recv_data);
@@ -750,20 +635,16 @@ class TRINITY_DLL_SPEC WorldSession
     private:
         // private trade methods
         void moveItems(Item* myItems[], Item* hisItems[]);
-
         // logging helper
         void LogUnexpectedOpcode(WorldPacket *packet, const char * reason);
         void LogUnprocessedTail(WorldPacket *packet);
-
         uint32 m_GUIDLow;                                   // set loggined or recently logout player (while m_playerRecentlyLogout set)
         Player *_player;
         WorldSocket *m_Socket;
         std::string m_Address;
-
         AccountTypes _security;
         uint32 _accountId;
         uint8 m_expansion;
-
         time_t _logoutTime;
         bool m_inQueue;                                     // session wait in auth.queue
         bool m_playerLoading;                               // code processed in LoginPlayer
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 1b63ec01421..16df744e8fa 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -17,7 +17,6 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-
 #include <ace/Message_Block.h>
 #include <ace/OS_NS_string.h>
 #include <ace/OS_NS_unistd.h>
@@ -28,10 +27,8 @@
 #include <ace/OS_NS_string.h>
 #include <ace/Reactor.h>
 #include <ace/Auto_Ptr.h>
-
 #include "WorldSocket.h"
 #include "Common.h"
-
 #include "Util.h"
 #include "World.h"
 #include "WorldPacket.h"
@@ -45,13 +42,11 @@
 #include "WorldSocketMgr.h"
 #include "Log.h"
 #include "WorldLog.h"
-
 #if defined( __GNUC__ )
 #pragma pack(1)
 #else
 #pragma pack(push,1)
 #endif
-
 struct ServerPktHeader
 {
     /**
@@ -67,38 +62,31 @@ struct ServerPktHeader
         }
         header[headerIndex++] = 0xFF &(size>>8);
         header[headerIndex++] = 0xFF &size;
-
         header[headerIndex++] = 0xFF & cmd;
         header[headerIndex++] = 0xFF & (cmd>>8);
     }
-
     uint8 getHeaderLength()
     {
         // cmd = 2 bytes, size= 2||3bytes
         return 2+(isLargePacket()?3:2);
     }
-
     bool isLargePacket()
     {
         return size > 0x7FFF;
     }
-
     const uint32 size;
     uint8 header[5];
 };
-
 struct ClientPktHeader
 {
     uint16 size;
     uint32 cmd;
 };
-
 #if defined( __GNUC__ )
 #pragma pack()
 #else
 #pragma pack(pop)
 #endif
-
 WorldSocket::WorldSocket (void) :
 WorldHandler (),
 m_Session (0),
@@ -114,60 +102,45 @@ m_LastPingTime (ACE_Time_Value::zero)
 {
     reference_counting_policy ().value (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
-
 WorldSocket::~WorldSocket (void)
 {
     if (m_RecvWPct)
         delete m_RecvWPct;
-
     if (m_OutBuffer)
         m_OutBuffer->release ();
-
     closing_ = true;
-
     peer ().close ();
-
     WorldPacket* pct;
     while (m_PacketQueue.dequeue_head (pct) == 0)
         delete pct;
 }
-
 bool WorldSocket::IsClosed (void) const
 {
     return closing_;
 }
-
 void WorldSocket::CloseSocket (void)
 {
     {
         ACE_GUARD (LockType, Guard, m_OutBufferLock);
-
         if (closing_)
             return;
-
         closing_ = true;
         peer ().close_writer ();
     }
-
     {
         ACE_GUARD (LockType, Guard, m_SessionLock);
-
         m_Session = NULL;
     }
 }
-
 const std::string& WorldSocket::GetRemoteAddress (void) const
 {
     return m_Address;
 }
-
 int WorldSocket::SendPacket (const WorldPacket& pct)
 {
     ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
-
     if (closing_)
         return -1;
-
     // Dump outgoing packet.
     if (sWorldLog.LogWorld ())
     {
@@ -176,24 +149,19 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
                      pct.size (),
                      LookupOpcodeName (pct.GetOpcode ()),
                      pct.GetOpcode ());
-
         uint32 p = 0;
         while (p < pct.size ())
         {
             for (uint32 j = 0; j < 16 && p < pct.size (); j++)
                 sWorldLog.outLog ("%.2X ", const_cast<WorldPacket&>(pct)[p++]);
-
             sWorldLog.outLog ("\n");
         }
         sWorldLog.outLog ("\n");
     }
-
     if (iSendPacket (pct) == -1)
     {
         WorldPacket* npct;
-
         ACE_NEW_RETURN (npct, WorldPacket (pct), -1);
-
         // NOTE maybe check of the size of the queue can be good ?
         // to make it bounded instead of unbounded
         if (m_PacketQueue.enqueue_tail (npct) == -1)
@@ -203,86 +171,64 @@ int WorldSocket::SendPacket (const WorldPacket& pct)
             return -1;
         }
     }
-
     return 0;
 }
-
 long WorldSocket::AddReference (void)
 {
     return static_cast<long> (add_reference ());
 }
-
 long WorldSocket::RemoveReference (void)
 {
     return static_cast<long> (remove_reference ());
 }
-
 int WorldSocket::open (void *a)
 {
     ACE_UNUSED_ARG (a);
-
     // Prevent double call to this func.
     if (m_OutBuffer)
         return -1;
-
     // This will also prevent the socket from being Updated
     // while we are initializing it.
     m_OutActive = true;
-
     // Hook for the manager.
     if (sWorldSocketMgr->OnSocketOpen (this) == -1)
         return -1;
-
     // Allocate the buffer.
     ACE_NEW_RETURN (m_OutBuffer, ACE_Message_Block (m_OutBufferSize), -1);
-
     // Store peer address.
     ACE_INET_Addr remote_addr;
-
     if (peer ().get_remote_addr (remote_addr) == -1)
     {
         sLog.outError ("WorldSocket::open: peer ().get_remote_addr errno = %s", ACE_OS::strerror (errno));
         return -1;
     }
-
     m_Address = remote_addr.get_host_addr ();
-
     // Send startup packet.
     WorldPacket packet (SMSG_AUTH_CHALLENGE, 4);
     packet << m_Seed;
-
     if (SendPacket (packet) == -1)
         return -1;
-
     // Register with ACE Reactor
     if (reactor ()->register_handler(this, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::WRITE_MASK) == -1)
     {
         sLog.outError ("WorldSocket::open: unable to register client handler errno = %s", ACE_OS::strerror (errno));
         return -1;
     }
-
     // reactor takes care of the socket from now on
     remove_reference ();
-
     return 0;
 }
-
 int WorldSocket::close (int)
 {
     shutdown ();
-
     closing_ = true;
-
     remove_reference ();
-
     return 0;
 }
-
 int WorldSocket::handle_input (ACE_HANDLE)
 {
     if (closing_)
         return -1;
-
     switch (handle_input_missing_data ())
     {
         case -1 :
@@ -292,16 +238,13 @@ int WorldSocket::handle_input (ACE_HANDLE)
             {
                 return Update ();                           // interesting line ,isn't it ?
             }
-
             DEBUG_LOG ("WorldSocket::handle_input: Peer error closing connection errno = %s", ACE_OS::strerror (errno));
-
             errno = ECONNRESET;
             return -1;
         }
         case 0:
         {
             DEBUG_LOG ("WorldSocket::handle_input: Peer has closed connection");
-
             errno = ECONNRESET;
             return -1;
         }
@@ -310,118 +253,87 @@ int WorldSocket::handle_input (ACE_HANDLE)
         default:
             return Update ();                               // another interesting line ;)
     }
-
     ACE_NOTREACHED(return -1);
 }
-
 int WorldSocket::handle_output (ACE_HANDLE)
 {
     ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
-
     if (closing_)
         return -1;
-
     const size_t send_len = m_OutBuffer->length ();
-
     if (send_len == 0)
         return cancel_wakeup_output (Guard);
-
 #ifdef MSG_NOSIGNAL
     ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len, MSG_NOSIGNAL);
 #else
     ssize_t n = peer ().send (m_OutBuffer->rd_ptr (), send_len);
 #endif // MSG_NOSIGNAL
-
     if (n == 0)
         return -1;
     else if (n == -1)
     {
         if (errno == EWOULDBLOCK || errno == EAGAIN)
             return schedule_wakeup_output (Guard);
-
         return -1;
     }
     else if (n < send_len) //now n > 0
     {
         m_OutBuffer->rd_ptr (static_cast<size_t> (n));
-
         // move the data to the base of the buffer
         m_OutBuffer->crunch ();
-
         return schedule_wakeup_output (Guard);
     }
     else //now n == send_len
     {
         m_OutBuffer->reset ();
-
         if (!iFlushPacketQueue ())
             return cancel_wakeup_output (Guard);
         else
             return schedule_wakeup_output (Guard);
     }
-
     ACE_NOTREACHED (return 0);
 }
-
 int WorldSocket::handle_close (ACE_HANDLE h, ACE_Reactor_Mask)
 {
     // Critical section
     {
         ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, -1);
-
         closing_ = true;
-
         if (h == ACE_INVALID_HANDLE)
             peer ().close_writer ();
     }
-
     // Critical section
     {
         ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
-
         m_Session = NULL;
     }
-
     return 0;
 }
-
 int WorldSocket::Update (void)
 {
     if (closing_)
         return -1;
-
     if (m_OutActive || m_OutBuffer->length () == 0)
         return 0;
-
     return handle_output (get_handle ());
 }
-
 int WorldSocket::handle_input_header (void)
 {
     ACE_ASSERT (m_RecvWPct == NULL);
-
     ACE_ASSERT (m_Header.length () == sizeof (ClientPktHeader));
-
     m_Crypt.DecryptRecv ((uint8*) m_Header.rd_ptr (), sizeof (ClientPktHeader));
-
     ClientPktHeader& header = *((ClientPktHeader*) m_Header.rd_ptr ());
-
     EndianConvertReverse(header.size);
     EndianConvert(header.cmd);
-
     if ((header.size < 4) || (header.size > 10240) || (header.cmd  > 10240))
     {
         sLog.outError ("WorldSocket::handle_input_header: client sent malformed packet size = %d , cmd = %d",
                        header.size, header.cmd);
-
         errno = EINVAL;
         return -1;
     }
-
     header.size -= 4;
-
     ACE_NEW_RETURN (m_RecvWPct, WorldPacket ((uint16) header.cmd, header.size), -1);
-
     if(header.size > 0)
     {
         m_RecvWPct->resize (header.size);
@@ -431,37 +343,27 @@ int WorldSocket::handle_input_header (void)
     {
         ACE_ASSERT(m_RecvPct.space() == 0);
     }
-
     return 0;
 }
-
 int WorldSocket::handle_input_payload (void)
 {
     // set errno properly here on error !!!
     // now have a header and payload
-
     ACE_ASSERT (m_RecvPct.space () == 0);
     ACE_ASSERT (m_Header.space () == 0);
     ACE_ASSERT (m_RecvWPct != NULL);
-
     const int ret = ProcessIncoming (m_RecvWPct);
-
     m_RecvPct.base (NULL, 0);
     m_RecvPct.reset ();
     m_RecvWPct = NULL;
-
     m_Header.reset ();
-
     if (ret == -1)
         errno = EINVAL;
-
     return ret;
 }
-
 int WorldSocket::handle_input_missing_data (void)
 {
     char buf [4096];
-
     ACE_Data_Block db ( sizeof (buf),
                         ACE_Message_Block::MB_DATA,
                         buf,
@@ -469,21 +371,15 @@ int WorldSocket::handle_input_missing_data (void)
                         0,
                         ACE_Message_Block::DONT_DELETE,
                         0);
-
     ACE_Message_Block message_block(&db,
                                     ACE_Message_Block::DONT_DELETE,
                                     0);
-
     const size_t recv_size = message_block.space ();
-
     const ssize_t n = peer ().recv (message_block.wr_ptr (),
                                           recv_size);
-
     if (n <= 0)
         return n;
-
     message_block.wr_ptr (n);
-
     while (message_block.length () > 0)
     {
         if (m_Header.space () > 0)
@@ -492,7 +388,6 @@ int WorldSocket::handle_input_missing_data (void)
             const size_t to_header = (message_block.length () > m_Header.space () ? m_Header.space () : message_block.length ());
             m_Header.copy (message_block.rd_ptr (), to_header);
             message_block.rd_ptr (to_header);
-
             if (m_Header.space () > 0)
             {
                 // Couldn't receive the whole header this time.
@@ -500,7 +395,6 @@ int WorldSocket::handle_input_missing_data (void)
                 errno = EWOULDBLOCK;
                 return -1;
             }
-
             // We just received nice new header
             if (handle_input_header () == -1)
             {
@@ -508,7 +402,6 @@ int WorldSocket::handle_input_missing_data (void)
                 return -1;
             }
         }
-
         // Its possible on some error situations that this happens
         // for example on closing when epoll receives more chunked data and stuff
         // hope this is not hack ,as proper m_RecvWPct is asserted around
@@ -518,7 +411,6 @@ int WorldSocket::handle_input_missing_data (void)
             errno = EINVAL;
             return -1;
         }
-
         // We have full read header, now check the data payload
         if (m_RecvPct.space () > 0)
         {
@@ -526,7 +418,6 @@ int WorldSocket::handle_input_missing_data (void)
             const size_t to_data = (message_block.length () > m_RecvPct.space () ? m_RecvPct.space () : message_block.length ());
             m_RecvPct.copy (message_block.rd_ptr (), to_data);
             message_block.rd_ptr (to_data);
-
             if (m_RecvPct.space () > 0)
             {
                 // Couldn't receive the whole data this time.
@@ -535,7 +426,6 @@ int WorldSocket::handle_input_missing_data (void)
                 return -1;
             }
         }
-
         //just received fresh new payload
         if (handle_input_payload () == -1)
         {
@@ -543,19 +433,14 @@ int WorldSocket::handle_input_missing_data (void)
             return -1;
         }
     }
-
     return n == recv_size ? 1 : 2;
 }
-
 int WorldSocket::cancel_wakeup_output (GuardType& g)
 {
     if (!m_OutActive)
         return 0;
-
     m_OutActive = false;
-
     g.release ();
-
     if (reactor ()->cancel_wakeup
         (this, ACE_Event_Handler::WRITE_MASK) == -1)
     {
@@ -563,41 +448,30 @@ int WorldSocket::cancel_wakeup_output (GuardType& g)
         sLog.outError ("WorldSocket::cancel_wakeup_output");
         return -1;
     }
-
     return 0;
 }
-
 int WorldSocket::schedule_wakeup_output (GuardType& g)
 {
     if (m_OutActive)
         return 0;
-
     m_OutActive = true;
-
     g.release ();
-
     if (reactor ()->schedule_wakeup
         (this, ACE_Event_Handler::WRITE_MASK) == -1)
     {
         sLog.outError ("WorldSocket::schedule_wakeup_output");
         return -1;
     }
-
     return 0;
 }
-
 int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
 {
     ACE_ASSERT (new_pct);
-
     // manage memory ;)
     ACE_Auto_Ptr<WorldPacket> aptr (new_pct);
-
     const ACE_UINT16 opcode = new_pct->GetOpcode ();
-
     if (closing_)
         return -1;
-
     // Dump received packet.
     if (sWorldLog.LogWorld ())
     {
@@ -606,18 +480,15 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
                      new_pct->size (),
                      LookupOpcodeName (new_pct->GetOpcode ()),
                      new_pct->GetOpcode ());
-
         uint32 p = 0;
         while (p < new_pct->size ())
         {
             for (uint32 j = 0; j < 16 && p < new_pct->size (); j++)
                 sWorldLog.outLog ("%.2X ", (*new_pct)[p++]);
-
             sWorldLog.outLog ("\n");
         }
         sWorldLog.outLog ("\n");
     }
-
     try {
         switch(opcode)
         {
@@ -629,16 +500,13 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
                     sLog.outError ("WorldSocket::ProcessIncoming: Player send CMSG_AUTH_SESSION again");
                     return -1;
                 }
-
                 return HandleAuthSession (*new_pct);
             case CMSG_KEEP_ALIVE:
                 DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: %d", new_pct->size ());
-
                 return 0;
             default:
             {
                 ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
-
                 if (m_Session != NULL)
                 {
                     // OK ,give the packet to WorldSession
@@ -665,13 +533,10 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
             sLog.outDebug("Dumping error causing packet:");
             new_pct->hexlike();
         }
-
         return -1;
     }
-
     ACE_NOTREACHED (return 0);
 }
-
 int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
 {
     // NOTE: ATM the socket is singlethread, have this in mind ...
@@ -686,19 +551,15 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     Sha1Hash sha1;
     BigNumber v, s, g, N;
     WorldPacket packet, SendAddonPacked;
-
     BigNumber K;
-
     if(sWorld.IsClosed())
     {
         packet.Initialize(SMSG_AUTH_RESPONSE, 1);
         packet << uint8(AUTH_REJECT);
         SendPacket (packet);
-
         sLog.outError ("WorldSocket::HandleAuthSession: World closed, denying client (%s).", m_Session->GetRemoteAddress().c_str());
         return -1;
     }
-
     // Read the content of the packet
     recvPacket >> BuiltNumberClient;                        // for now no use
     recvPacket >> unk2;
@@ -706,19 +567,16 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     recvPacket >> unk3;
     recvPacket >> clientSeed;
     recvPacket.read (digest, 20);
-
     DEBUG_LOG ("WorldSocket::HandleAuthSession: client %u, unk2 %u, account %s, unk3 %u, clientseed %u",
                 BuiltNumberClient,
                 unk2,
                 account.c_str (),
                 unk3,
                 clientSeed);
-
     // Get the account information from the realmd database
     std::string safe_account = account; // Duplicate, else will screw the SHA hash verification below
     loginDatabase.escape_string (safe_account);
     // No SQL injection, username escaped.
-
     QueryResult *result =
           loginDatabase.PQuery ("SELECT "
                                 "id, "                      //0
@@ -734,43 +592,32 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
                                 "FROM account "
                                 "WHERE username = '%s'",
                                 safe_account.c_str ());
-
     // Stop if the account is not found
     if (!result)
     {
         packet.Initialize (SMSG_AUTH_RESPONSE, 1);
         packet << uint8 (AUTH_UNKNOWN_ACCOUNT);
-
         SendPacket (packet);
-
         sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (unknown account).");
         return -1;
     }
-
     Field* fields = result->Fetch ();
-
     uint8 expansion = fields[7].GetUInt8();
     uint32 world_expansion = sWorld.getConfig(CONFIG_EXPANSION);
     if(expansion > world_expansion)
         expansion = world_expansion;
     //expansion = ((sWorld.getConfig(CONFIG_EXPANSION) > fields[7].GetUInt8()) ? fields[7].GetUInt8() : sWorld.getConfig(CONFIG_EXPANSION));
-
     N.SetHexStr ("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7");
     g.SetDword (7);
-
     v.SetHexStr(fields[5].GetString());
     s.SetHexStr (fields[6].GetString ());
-
     const char* sStr = s.AsHexStr ();                       //Must be freed by OPENSSL_free()
     const char* vStr = v.AsHexStr ();                       //Must be freed by OPENSSL_free()
-
     DEBUG_LOG ("WorldSocket::HandleAuthSession: (s,v) check s: %s v: %s",
                 sStr,
                 vStr);
-
     OPENSSL_free ((void*) sStr);
     OPENSSL_free ((void*) vStr);
-
     ///- Re-check ip locking (same check as in realmd).
     if (fields[4].GetUInt8 () == 1) // if ip is locked
     {
@@ -779,49 +626,38 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
             packet.Initialize (SMSG_AUTH_RESPONSE, 1);
             packet << uint8 (AUTH_FAILED);
             SendPacket (packet);
-
             delete result;
             sLog.outBasic ("WorldSocket::HandleAuthSession: Sent Auth Response (Account IP differs).");
             return -1;
         }
     }
-
     id = fields[0].GetUInt32 ();
     security = fields[1].GetUInt16 ();
     /*
     if(security > SEC_ADMINISTRATOR)                        // prevent invalid security settings in DB
         security = SEC_ADMINISTRATOR;
         */
-
     K.SetHexStr (fields[2].GetString ());
-
     time_t mutetime = time_t (fields[8].GetUInt64 ());
-
     locale = LocaleConstant (fields[9].GetUInt8 ());
     if (locale >= MAX_LOCALE)
         locale = LOCALE_enUS;
-
     delete result;
-
     // Re-check account ban (same check as in realmd)
     QueryResult *banresult =
           loginDatabase.PQuery ("SELECT 1 FROM account_banned WHERE id = %u AND active = 1 "
                                 "UNION "
                                 "SELECT 1 FROM ip_banned WHERE ip = '%s'",
                                 id, GetRemoteAddress().c_str());
-
     if (banresult) // if account banned
     {
         packet.Initialize (SMSG_AUTH_RESPONSE, 1);
         packet << uint8 (AUTH_BANNED);
         SendPacket (packet);
-
         delete banresult;
-
         sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (Account banned).");
         return -1;
     }
-
     // Check locked state for server
     sWorld.UpdateAllowedSecurity();
     AccountTypes allowedAccountType = sWorld.GetPlayerSecurityLimit ();
@@ -830,79 +666,58 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     {
         WorldPacket Packet (SMSG_AUTH_RESPONSE, 1);
         Packet << uint8 (AUTH_UNAVAILABLE);
-
         SendPacket (packet);
-
         sLog.outDetail ("WorldSocket::HandleAuthSession: User tries to login but his security level is not enough");
         return -1;
     }
-
     // Check that Key and account name are the same on client and server
     Sha1Hash sha;
-
     uint32 t = 0;
     uint32 seed = m_Seed;
-
     sha.UpdateData (account);
     sha.UpdateData ((uint8 *) & t, 4);
     sha.UpdateData ((uint8 *) & clientSeed, 4);
     sha.UpdateData ((uint8 *) & seed, 4);
     sha.UpdateBigNumbers (&K, NULL);
     sha.Finalize ();
-
     if (memcmp (sha.GetDigest (), digest, 20))
     {
         packet.Initialize (SMSG_AUTH_RESPONSE, 1);
         packet << uint8 (AUTH_FAILED);
-
         SendPacket (packet);
-
         sLog.outError ("WorldSocket::HandleAuthSession: Sent Auth Response (authentification failed).");
         return -1;
     }
-
     std::string address = GetRemoteAddress ();
-
     DEBUG_LOG ("WorldSocket::HandleAuthSession: Client '%s' authenticated successfully from %s.",
                 account.c_str (),
                 address.c_str ());
-
     // Update the last_ip in the database
     // No SQL injection, username escaped.
     loginDatabase.escape_string (address);
-
     loginDatabase.PExecute ("UPDATE account "
                             "SET last_ip = '%s' "
                             "WHERE username = '%s'",
                             address.c_str (),
                             safe_account.c_str ());
-
     // NOTE ATM the socket is single-threaded, have this in mind ...
     ACE_NEW_RETURN (m_Session, WorldSession (id, this, AccountTypes(security), expansion, mutetime, locale), -1);
-
     m_Crypt.Init(&K);
-
     m_Session->LoadGlobalAccountData();
     m_Session->LoadTutorialsData();
     m_Session->ReadAddonsInfo(recvPacket);
-
     // In case needed sometime the second arg is in microseconds 1 000 000 = 1 sec
     ACE_OS::sleep (ACE_Time_Value (0, 10000));
-
     sWorld.AddSession (m_Session);
-
     return 0;
 }
-
 int WorldSocket::HandlePing (WorldPacket& recvPacket)
 {
     uint32 ping;
     uint32 latency;
-
     // Get the ping packet content
     recvPacket >> ping;
     recvPacket >> latency;
-
     if (m_LastPingTime == ACE_Time_Value::zero)
         m_LastPingTime = ACE_OS::gettimeofday (); // for 1st ping
     else
@@ -911,23 +726,18 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket)
         ACE_Time_Value diff_time (cur_time);
         diff_time -= m_LastPingTime;
         m_LastPingTime = cur_time;
-
         if (diff_time < ACE_Time_Value (27))
         {
             ++m_OverSpeedPings;
-
             uint32 max_count = sWorld.getConfig (CONFIG_MAX_OVERSPEED_PINGS);
-
             if (max_count && m_OverSpeedPings > max_count)
             {
                 ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
-
                 if (m_Session && m_Session->GetSecurity () == SEC_PLAYER)
                 {
                     sLog.outError  ("WorldSocket::HandlePing: Player kicked for "
                                     "over-speed pings address = %s",
                                     GetRemoteAddress ().c_str ());
-
                     return -1;
                 }
             }
@@ -935,11 +745,9 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket)
         else
             m_OverSpeedPings = 0;
     }
-
     // critical section
     {
         ACE_GUARD_RETURN (LockType, Guard, m_SessionLock, -1);
-
         if (m_Session)
             m_Session->SetLatency (latency);
         else
@@ -951,12 +759,10 @@ int WorldSocket::HandlePing (WorldPacket& recvPacket)
              return -1;
         }
     }
-
     WorldPacket packet (SMSG_PONG, 4);
     packet << ping;
     return SendPacket (packet);
 }
-
 int WorldSocket::iSendPacket (const WorldPacket& pct)
 {
     ServerPktHeader header(pct.size()+2, pct.GetOpcode());
@@ -965,25 +771,19 @@ int WorldSocket::iSendPacket (const WorldPacket& pct)
         errno = ENOBUFS;
         return -1;
     }
- 
- 
+
     m_Crypt.EncryptSend ( header.header, header.getHeaderLength());
- 
     if (m_OutBuffer->copy ((char*) header.header, header.getHeaderLength()) == -1)
         ACE_ASSERT (false);
-
     if (!pct.empty ())
         if (m_OutBuffer->copy ((char*) pct.contents (), pct.size ()) == -1)
             ACE_ASSERT (false);
-
     return 0;
 }
-
 bool WorldSocket::iFlushPacketQueue ()
 {
     WorldPacket *pct;
     bool haveone = false;
-
     while (m_PacketQueue.dequeue_head (pct) == 0)
     {
         if (iSendPacket (*pct) == -1)
@@ -994,7 +794,6 @@ bool WorldSocket::iFlushPacketQueue ()
                 sLog.outError ("WorldSocket::iFlushPacketQueue m_PacketQueue->enqueue_head");
                 return false;
             }
-
             break;
         }
         else
@@ -1003,7 +802,6 @@ bool WorldSocket::iFlushPacketQueue ()
             delete pct;
         }
     }
-
     return haveone;
 }
 
diff --git a/src/game/WorldSocket.h b/src/game/WorldSocket.h
index 94f57d8d636..6847185cc8f 100644
--- a/src/game/WorldSocket.h
+++ b/src/game/WorldSocket.h
@@ -17,16 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
 /** \addtogroup u2w User to World Communication
  * @{
  * \file WorldSocket.h
  * \author Derex <derex101@gmail.com>
  */
-
 #ifndef _WORLDSOCKET_H
 #define _WORLDSOCKET_H
-
 #include <ace/Basic_Types.h>
 #include <ace/Synch_Traits.h>
 #include <ace/Svc_Handler.h>
@@ -37,21 +34,16 @@
 #include <ace/Guard_T.h>
 #include <ace/Unbounded_Queue.h>
 #include <ace/Message_Block.h>
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "Common.h"
 #include "Auth/AuthCrypt.h"
-
 class ACE_Message_Block;
 class WorldPacket;
 class WorldSession;
-
 /// Handler that can communicate over stream sockets.
 typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> WorldHandler;
-
 /**
  * WorldSocket.
  *
@@ -95,142 +87,102 @@ class WorldSocket : protected WorldHandler
         friend class ACE_Acceptor< WorldSocket, ACE_SOCK_ACCEPTOR >;
         friend class WorldSocketMgr;
         friend class ReactorRunnable;
-
         /// Declare the acceptor for this class
         typedef ACE_Acceptor< WorldSocket, ACE_SOCK_ACCEPTOR > Acceptor;
-
         /// Mutex type used for various synchronizations.
         typedef ACE_Thread_Mutex LockType;
         typedef ACE_Guard<LockType> GuardType;
-
         /// Queue for storing packets for which there is no space.
         typedef ACE_Unbounded_Queue< WorldPacket* > PacketQueueT;
-
         /// Check if socket is closed.
         bool IsClosed (void) const;
-
         /// Close the socket.
         void CloseSocket (void);
-
         /// Get address of connected peer.
         const std::string& GetRemoteAddress (void) const;
-
         /// Send A packet on the socket, this function is reentrant.
         /// @param pct packet to send
         /// @return -1 of failure
         int SendPacket (const WorldPacket& pct);
-
         /// Add reference to this object.
         long AddReference (void);
-
         /// Remove reference to this object.
         long RemoveReference (void);
-
     protected:
         /// things called by ACE framework.
         WorldSocket (void);
         virtual ~WorldSocket (void);
-
         /// Called on open ,the void* is the acceptor.
         virtual int open (void *);
-
         /// Called on failures inside of the acceptor, don't call from your code.
         virtual int close (int);
-
         /// Called when we can read from the socket.
         virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-
         /// Called when the socket can write.
         virtual int handle_output (ACE_HANDLE = ACE_INVALID_HANDLE);
-
         /// Called when connection is closed or error happens.
         virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
             ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
-
         /// Called by WorldSocketMgr/ReactorRunnable.
         int Update (void);
-
     private:
         /// Helper functions for processing incoming data.
         int handle_input_header (void);
         int handle_input_payload (void);
         int handle_input_missing_data (void);
-
         /// Help functions to mark/unmark the socket for output.
         /// @param g the guard is for m_OutBufferLock, the function will release it
         int cancel_wakeup_output (GuardType& g);
         int schedule_wakeup_output (GuardType& g);
-
         /// process one incoming packet.
         /// @param new_pct received packet ,note that you need to delete it.
         int ProcessIncoming (WorldPacket* new_pct);
-
         /// Called by ProcessIncoming() on CMSG_AUTH_SESSION.
         int HandleAuthSession (WorldPacket& recvPacket);
-
         /// Called by ProcessIncoming() on CMSG_PING.
         int HandlePing (WorldPacket& recvPacket);
-
         /// Try to write WorldPacket to m_OutBuffer ,return -1 if no space
         /// Need to be called with m_OutBufferLock lock held
         int iSendPacket (const WorldPacket& pct);
-
         /// Flush m_PacketQueue if there are packets in it
         /// Need to be called with m_OutBufferLock lock held
         /// @return true if it wrote to the buffer ( AKA you need
         /// to mark the socket for output ).
         bool iFlushPacketQueue ();
-
     private:
         /// Time in which the last ping was received
         ACE_Time_Value m_LastPingTime;
-
         /// Keep track of over-speed pings ,to prevent ping flood.
         uint32 m_OverSpeedPings;
-
         /// Address of the remote peer
         std::string m_Address;
-
         /// Class used for managing encryption of the headers
         AuthCrypt m_Crypt;
-
         /// Mutex lock to protect m_Session
         LockType m_SessionLock;
-
         /// Session to which received packets are routed
         WorldSession* m_Session;
-
         /// here are stored the fragments of the received data
         WorldPacket* m_RecvWPct;
-
         /// This block actually refers to m_RecvWPct contents,
         /// which allows easy and safe writing to it.
         /// It wont free memory when its deleted. m_RecvWPct takes care of freeing.
         ACE_Message_Block m_RecvPct;
-
         /// Fragment of the received header.
         ACE_Message_Block m_Header;
-
         /// Mutex for protecting output related data.
         LockType m_OutBufferLock;
-
         /// Buffer used for writing output.
         ACE_Message_Block *m_OutBuffer;
-
         /// Size of the m_OutBuffer.
         size_t m_OutBufferSize;
-
         /// Here are stored packets for which there was no space on m_OutBuffer,
         /// this allows not-to kick player if its buffer is overflowed.
         PacketQueueT m_PacketQueue;
-
         /// True if the socket is registered with the reactor for output
         bool m_OutActive;
-
         uint32 m_Seed;
 };
-
 #endif  /* _WORLDSOCKET_H */
-
 /// @}
 
diff --git a/src/game/WorldSocketMgr.cpp b/src/game/WorldSocketMgr.cpp
index cc08962efa5..9b7f50bfc57 100644
--- a/src/game/WorldSocketMgr.cpp
+++ b/src/game/WorldSocketMgr.cpp
@@ -17,14 +17,11 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-
 /** \file WorldSocketMgr.cpp
 *  \ingroup u2w
 *  \author Derex <derex101@gmail.com>
 */
-
 #include "WorldSocketMgr.h"
-
 #include <ace/ACE.h>
 #include <ace/Log_Msg.h>
 #include <ace/Reactor.h>
@@ -37,15 +34,12 @@
 #include <ace/os_include/netinet/os_tcp.h>
 #include <ace/os_include/sys/os_types.h>
 #include <ace/os_include/sys/os_socket.h>
-
 #include <set>
-
 #include "Log.h"
 #include "Common.h"
 #include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldSocket.h"
-
 /**
 * This is a helper class to WorldSocketMgr ,that manages
 * network threads, and assigning connections from acceptor thread
@@ -54,90 +48,66 @@
 class ReactorRunnable : protected ACE_Task_Base
 {
     public:
-
         ReactorRunnable () :
             m_ThreadId (-1),
             m_Connections (0),
             m_Reactor (0)
         {
             ACE_Reactor_Impl* imp = 0;
-
             #if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-
             imp = new ACE_Dev_Poll_Reactor ();
-
             imp->max_notify_iterations (128);
             imp->restart (1);
-
             #else
-
             imp = new ACE_TP_Reactor ();
             imp->max_notify_iterations (128);
-
             #endif
-
             m_Reactor = new ACE_Reactor (imp, 1);
         }
-
         virtual ~ReactorRunnable ()
         {
             Stop ();
             Wait ();
-
             if (m_Reactor)
                 delete m_Reactor;
         }
-
         void Stop ()
         {
             m_Reactor->end_reactor_event_loop ();
         }
-
         int Start ()
         {
             if (m_ThreadId != -1)
                 return -1;
-
             return (m_ThreadId = activate ());
         }
-
         void Wait () { ACE_Task_Base::wait (); }
-
         long Connections ()
         {
             return static_cast<long> (m_Connections.value ());
         }
-
         int AddSocket (WorldSocket* sock)
         {
             ACE_GUARD_RETURN (ACE_Thread_Mutex, Guard, m_NewSockets_Lock, -1);
-
             ++m_Connections;
             sock->AddReference();
             sock->reactor (m_Reactor);
             m_NewSockets.insert (sock);
-
             return 0;
         }
-
         ACE_Reactor* GetReactor ()
         {
             return m_Reactor;
         }
-
     protected:
-
         void AddNewSockets ()
         {
             ACE_GUARD (ACE_Thread_Mutex, Guard, m_NewSockets_Lock);
-
             if (m_NewSockets.empty ())
                 return;
-
             for (SocketSet::const_iterator i = m_NewSockets.begin (); i != m_NewSockets.end (); ++i)
             {
                 WorldSocket* sock = (*i);
-
                 if (sock->IsClosed ())
                 {
                     sock->RemoveReference ();
@@ -146,31 +116,22 @@ class ReactorRunnable : protected ACE_Task_Base
                 else
                     m_Sockets.insert (sock);
             }
-
             m_NewSockets.clear ();
         }
-
         virtual int svc ()
         {
             DEBUG_LOG ("Network Thread Starting");
-
             WorldDatabase.ThreadStart ();
-
             ACE_ASSERT (m_Reactor);
-
             SocketSet::iterator i, t;
-
             while (!m_Reactor->reactor_event_loop_done ())
             {
                 // dont be too smart to move this outside the loop
                 // the run_reactor_event_loop will modify interval
                 ACE_Time_Value interval (0, 10000);
-
                 if (m_Reactor->run_reactor_event_loop (interval) == -1)
                     break;
-
                 AddNewSockets ();
-
                 for (i = m_Sockets.begin (); i != m_Sockets.end ();)
                 {
                     if ((*i)->Update () == -1)
@@ -186,28 +147,20 @@ class ReactorRunnable : protected ACE_Task_Base
                         ++i;
                 }
             }
-
             WorldDatabase.ThreadEnd ();
-
             DEBUG_LOG ("Network Thread Exitting");
-
             return 0;
         }
-
     private:
         typedef ACE_Atomic_Op<ACE_SYNCH_MUTEX, long> AtomicInt;
         typedef std::set<WorldSocket*> SocketSet;
-
         ACE_Reactor* m_Reactor;
         AtomicInt m_Connections;
         int m_ThreadId;
-
         SocketSet m_Sockets;
-
         SocketSet m_NewSockets;
         ACE_Thread_Mutex m_NewSockets_Lock;
 };
-
 WorldSocketMgr::WorldSocketMgr () :
     m_NetThreadsCount (0),
     m_NetThreads (0),
@@ -217,95 +170,71 @@ WorldSocketMgr::WorldSocketMgr () :
     m_Acceptor (0)
 {
 }
-
 WorldSocketMgr::~WorldSocketMgr ()
 {
     if (m_NetThreads)
         delete [] m_NetThreads;
-
     if(m_Acceptor)
         delete m_Acceptor;
 }
-
 int
 WorldSocketMgr::StartReactiveIO (ACE_UINT16 port, const char* address)
 {
     m_UseNoDelay = sConfig.GetBoolDefault ("Network.TcpNodelay", true);
-
     int num_threads = sConfig.GetIntDefault ("Network.Threads", 1);
-
     if (num_threads <= 0)
     {
         sLog.outError ("Network.Threads is wrong in your config file");
         return -1;
     }
-
     m_NetThreadsCount = static_cast<size_t> (num_threads + 1);
-
     m_NetThreads = new ReactorRunnable[m_NetThreadsCount];
-
     sLog.outBasic ("Max allowed socket connections %d",ACE::max_handles ());
-
     // -1 means use default
     m_SockOutKBuff = sConfig.GetIntDefault ("Network.OutKBuff", -1);
-
     m_SockOutUBuff = sConfig.GetIntDefault ("Network.OutUBuff", 65536);
-
     if ( m_SockOutUBuff <= 0 )
     {
         sLog.outError ("Network.OutUBuff is wrong in your config file");
         return -1;
     }
-
     WorldSocket::Acceptor *acc = new WorldSocket::Acceptor;
     m_Acceptor = acc;
-
     ACE_INET_Addr listen_addr (port, address);
-
     if (acc->open (listen_addr, m_NetThreads[0].GetReactor (), ACE_NONBLOCK) == -1)
     {
         sLog.outError ("Failed to open acceptor ,check if the port is free");
         return -1;
     }
-
     for (size_t i = 0; i < m_NetThreadsCount; ++i)
         m_NetThreads[i].Start ();
-
     return 0;
 }
-
 int
 WorldSocketMgr::StartNetwork (ACE_UINT16 port, const char* address)
 {
     if (!sLog.IsOutDebug ())
         ACE_Log_Msg::instance ()->priority_mask (LM_ERROR, ACE_Log_Msg::PROCESS);
-
     if (StartReactiveIO (port, address) == -1)
         return -1;
-
     return 0;
 }
-
 void
 WorldSocketMgr::StopNetwork ()
 {
     if (m_Acceptor)
     {
         WorldSocket::Acceptor* acc = dynamic_cast<WorldSocket::Acceptor*> (m_Acceptor);
-
         if (acc)
             acc->close ();
     }
-
     if (m_NetThreadsCount != 0)
     {
         for (size_t i = 0; i < m_NetThreadsCount; ++i)
             m_NetThreads[i].Stop ();
     }
-
     Wait ();
 }
-
 void
 WorldSocketMgr::Wait ()
 {
@@ -315,7 +244,6 @@ WorldSocketMgr::Wait ()
             m_NetThreads[i].Wait ();
     }
 }
-
 int
 WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
 {
@@ -331,9 +259,7 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
             return -1;
         }
     }
-
     static const int ndoption = 1;
-
     // Set TCP_NODELAY.
     if (m_UseNoDelay)
     {
@@ -346,21 +272,15 @@ WorldSocketMgr::OnSocketOpen (WorldSocket* sock)
             return -1;
         }
     }
-
     sock->m_OutBufferSize = static_cast<size_t> (m_SockOutUBuff);
-
     // we skip the Acceptor Thread
     size_t min = 1;
-
     ACE_ASSERT (m_NetThreadsCount >= 1);
-
     for (size_t i = 1; i < m_NetThreadsCount; ++i)
         if (m_NetThreads[i].Connections () < m_NetThreads[min].Connections ())
             min = i;
-
     return m_NetThreads[min].AddSocket (sock);
 }
-
 WorldSocketMgr*
 WorldSocketMgr::Instance ()
 {
diff --git a/src/game/WorldSocketMgr.h b/src/game/WorldSocketMgr.h
index 94cfa78324c..0ad8574a2fb 100644
--- a/src/game/WorldSocketMgr.h
+++ b/src/game/WorldSocketMgr.h
@@ -17,64 +17,47 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 /** \addtogroup u2w User to World Communication
  *  @{
  *  \file WorldSocketMgr.h
  *  \author Derex <derex101@gmail.com>
  */
-
 #ifndef __WORLDSOCKETMGR_H
 #define __WORLDSOCKETMGR_H
-
 #include <ace/Basic_Types.h>
 #include <ace/Singleton.h>
 #include <ace/Thread_Mutex.h>
-
 class WorldSocket;
 class ReactorRunnable;
 class ACE_Event_Handler;
-
 /// Manages all sockets connected to peers and network threads
 class WorldSocketMgr
 {
 public:
   friend class WorldSocket;
   friend class ACE_Singleton<WorldSocketMgr,ACE_Thread_Mutex>;
-
   /// Start network, listen at address:port .
   int StartNetwork (ACE_UINT16 port, const char* address);
-
   /// Stops all network threads, It will wait for all running threads .
   void StopNetwork ();
-
   /// Wait untill all network threads have "joined" .
   void Wait ();
-
   /// Make this class singleton .
   static WorldSocketMgr* Instance ();
-
 private:
   int OnSocketOpen(WorldSocket* sock);
-
   int StartReactiveIO(ACE_UINT16 port, const char* address);
-
 private:
   WorldSocketMgr ();
   virtual ~WorldSocketMgr ();
-
   ReactorRunnable* m_NetThreads;
   size_t m_NetThreadsCount;
-
   int m_SockOutKBuff;
   int m_SockOutUBuff;
   bool m_UseNoDelay;
-
   ACE_Event_Handler* m_Acceptor;
 };
-
 #define sWorldSocketMgr WorldSocketMgr::Instance ()
-
 #endif
 /// @}
 
diff --git a/src/game/ZoneScript.h b/src/game/ZoneScript.h
index 6ace3c36474..9e81ae341b9 100644
--- a/src/game/ZoneScript.h
+++ b/src/game/ZoneScript.h
@@ -15,37 +15,27 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
 #ifndef ZONE_SCRIPT_H_
 #define ZONE_SCRIPT_H_
-
 #include "Common.h"
 #include "Creature.h"
-
 //struct CreatureData;
 class Creature;
 class GameObject;
-
 class TRINITY_DLL_SPEC ZoneScript
 {
     public:
         explicit ZoneScript() {}
-
         virtual uint32 GetCreatureEntry(uint32 guidlow, const CreatureData *data) { return data->id; }
         virtual uint32 GetGameObjectEntry(uint32 guidlow, uint32 entry) { return entry; }
-
         virtual void OnCreatureCreate(Creature *, bool add) {}
         virtual void OnGameObjectCreate(GameObject *go, bool add) {}
-
         //All-purpose data storage 64 bit
         virtual uint64 GetData64(uint32 /*DataId*/) { return 0; }
         virtual void SetData64(uint32 /*DataId*/, uint64 /*Value*/) {}
-
         //All-purpose data storage 32 bit
         virtual uint32 GetData(uint32 /*DataId*/) { return 0; }
         virtual void SetData(uint32 /*DataId*/, uint32 /*Value*/) {}
-
         virtual void ProcessEvent(GameObject *obj, uint32 eventId) {}
 };
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/game/pchdef.h b/src/game/pchdef.h
index 7252e980e7d..a5d445675e0 100644
--- a/src/game/pchdef.h
+++ b/src/game/pchdef.h
@@ -1,7 +1,6 @@
 //add here most rarely modified headers to speed up debug build compilation
 #include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
-
 #include "MapManager.h"
 #include "Log.h"
 #include "ObjectAccessor.h"