*Backed out changeset 3be01fb200a5

--HG--
branch : trunk

1 files changed, 59 insertions, 0 deletions

diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index d50c579cd9b..abf73e0e274 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -18,19 +18,26 @@
  * 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()))
     {
@@ -39,16 +46,20 @@ 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))
@@ -56,40 +67,50 @@ 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());
@@ -100,110 +121,144 @@ 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());
@@ -214,6 +269,7 @@ 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());
@@ -224,6 +280,7 @@ 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());
@@ -234,6 +291,7 @@ 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());
@@ -252,6 +310,7 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
         }
     }
 }
+
 void WorldSession::HandleSetChannelWatch(WorldPacket &recvPacket)
 {
     sLog.outDebug("Opcode %u", recvPacket.GetOpcode());