From 16f47e8a4e06f36d58de6343c1d5553013d906fb Mon Sep 17 00:00:00 2001 From: Nay Date: Wed, 8 Aug 2012 15:41:32 +0100 Subject: Core/Chat: Correct HandleChannelPassword and HandleChannelInvite --- src/server/game/Handlers/ChannelHandler.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index dba4645e2b5..4a5169a91bd 100755 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -95,11 +95,11 @@ void WorldSession::HandleChannelList(WorldPacket& recvPacket) void WorldSession::HandleChannelPassword(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - uint32 passLength = recvPacket.ReadBits(8); - uint32 nameLength = recvPacket.ReadBits(7); - - std::string pass = recvPacket.ReadString(passLength); + uint32 nameLength = recvPacket.ReadBits(8); + uint32 passLength = recvPacket.ReadBits(7); + std::string channelname = recvPacket.ReadString(nameLength); + std::string pass = recvPacket.ReadString(passLength); if (ChannelMgr* cMgr = channelMgr(_player->GetTeam())) if (Channel* chn = cMgr->GetChannel(channelname, _player)) @@ -209,12 +209,12 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket) void WorldSession::HandleChannelInvite(WorldPacket& recvPacket) { sLog->outDebug(LOG_FILTER_NETWORKIO, "Opcode %u", recvPacket.GetOpcode()); - uint32 channelLength = recvPacket.ReadBits(7); - uint32 nameLength = recvPacket.ReadBits(8); - - std::string channelname = recvPacket.ReadString(channelLength); + uint32 nameLength = recvPacket.ReadBits(7); + uint32 channelLength = recvPacket.ReadBits(8); + std::string otp = recvPacket.ReadString(nameLength); - + std::string channelname = recvPacket.ReadString(channelLength); + if (!normalizePlayerName(otp)) return; -- cgit v1.2.3