Core/Channels: Properly fix "opcode CMSG_MESSAGECHAT have unprocessed tail data".

1 files 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 93042a69eb2..841ed7ee331 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();