From 35680c2f1ff941d0aa6e0483e60f6e407e209025 Mon Sep 17 00:00:00 2001
From: kaelima <kaelima@live.se>
Date: Mon, 5 Sep 2011 13:58:49 +0200
Subject: [PATCH] Core/Channels: Properly fix "opcode CMSG_MESSAGECHAT have
 unprocessed tail data".

---
 .../game/Server/Protocol/Handlers/ChannelHandler.cpp      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
index 93042a69eb..841ed7ee33 100755
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -28,6 +28,9 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
     std::string channelname, pass;
 
     recvPacket >> channel_id;
+    recvPacket >> unknown1 >> unknown2;
+    recvPacket >> channelname;
+    recvPacket >> pass;
 
     if (channel_id)
     {
@@ -43,14 +46,9 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
             return;
     }
 
-    recvPacket >> unknown1 >> unknown2;
-    recvPacket >> channelname;
-
     if (channelname.empty())
         return;
 
-    recvPacket >> pass;
-
     if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
     {
         cMgr->team = _player->GetTeam();