*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 300 insertions, 2 deletions

diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 72c47eb5a1f..56070f27e19 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -17,6 +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 "Common.h"
 #include "Language.h"
 #include "Database/DatabaseEnv.h"
@@ -46,12 +47,16 @@
 #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
@@ -62,19 +67,24 @@ 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
@@ -82,6 +92,7 @@ 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))
@@ -107,9 +118,11 @@ 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)
@@ -131,23 +144,31 @@ 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;
@@ -155,37 +176,49 @@ 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)
@@ -195,29 +228,37 @@ 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)
         {
@@ -226,27 +267,34 @@ 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)
         {
@@ -264,6 +312,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
         }
         if (!s_show)
             continue;
+
         data << pname;                                      // player name
         data << gname;                                      // guild name
         data << uint32( lvl );                              // player level
@@ -271,21 +320,27 @@ 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
@@ -301,6 +356,7 @@ 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))
@@ -308,32 +364,40 @@ 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())
     {
@@ -342,13 +406,17 @@ 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
@@ -364,6 +432,7 @@ 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)
@@ -374,52 +443,67 @@ 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" );
@@ -428,37 +512,52 @@ 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)
@@ -486,43 +585,65 @@ 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
@@ -532,24 +653,34 @@ 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");
@@ -558,96 +689,127 @@ 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
@@ -662,16 +824,21 @@ 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;
@@ -685,8 +852,10 @@ 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) )
     {
@@ -697,62 +866,81 @@ 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)
     {
@@ -760,34 +948,49 @@ 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)
@@ -796,14 +999,17 @@ 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)
     {
@@ -834,18 +1040,22 @@ 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>();
     /*
@@ -854,6 +1064,7 @@ 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 )
@@ -861,10 +1072,12 @@ 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
@@ -872,18 +1085,23 @@ 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
@@ -891,30 +1109,39 @@ 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>();
@@ -924,29 +1151,36 @@ 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);
@@ -958,19 +1192,24 @@ 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));
@@ -980,23 +1219,28 @@ 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;
@@ -1004,40 +1248,49 @@ 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())
@@ -1048,17 +1301,23 @@ 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;
@@ -1083,20 +1342,26 @@ 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
@@ -1108,12 +1373,15 @@ 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:
@@ -1136,11 +1404,14 @@ 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)
     {
@@ -1149,17 +1420,23 @@ 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");
@@ -1172,18 +1449,23 @@ 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())
@@ -1191,6 +1473,7 @@ 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();
@@ -1210,36 +1493,46 @@ 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 */)
 {
     /*
@@ -1247,19 +1540,24 @@ 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);
 }