*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 278 insertions, 0 deletions

diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp
index cc9e514c823..c11ad11766b 100644
--- a/src/game/GuildHandler.cpp
+++ b/src/game/GuildHandler.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 "WorldPacket.h"
 #include "WorldSession.h"
@@ -27,108 +28,142 @@
 #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)
@@ -136,20 +171,24 @@ 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
@@ -157,44 +196,56 @@ 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();
@@ -202,23 +253,32 @@ 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)
     {
@@ -230,18 +290,22 @@ 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
@@ -250,7 +314,9 @@ 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
@@ -258,56 +324,72 @@ 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
@@ -316,11 +398,14 @@ 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)
     {
@@ -332,28 +417,37 @@ 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)
     {
@@ -365,51 +459,68 @@ 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)
     {
@@ -421,54 +532,73 @@ 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)
     {
@@ -480,25 +610,33 @@ 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)
     {
@@ -506,76 +644,100 @@ 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));
@@ -583,36 +745,48 @@ 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)
     {
@@ -621,14 +795,17 @@ 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)
     {
@@ -636,60 +813,79 @@ 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
@@ -705,6 +901,7 @@ 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 )
 {
@@ -712,8 +909,10 @@ 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))
@@ -722,8 +921,10 @@ 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 )
 {
@@ -731,94 +932,127 @@ 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;
@@ -827,6 +1061,7 @@ void WorldSession::HandleGuildBankSwapItems( WorldPacket & recv_data )
     uint32 ItemEntry, unk1;
     uint32 AutoStoreCount = 0;
     uint32 SplitedAmount = 0;
+
     recv_data >> GoGuid >> BankToBank;
     if (BankToBank)
     {
@@ -838,6 +1073,7 @@ 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
@@ -863,68 +1099,87 @@ 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));
@@ -933,6 +1188,7 @@ 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)");
@@ -941,67 +1197,89 @@ 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);