diff options
| -rw-r--r-- | src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp | 16 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/GuildHandler.cpp | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp index b645f3e4527..6479c6b6386 100644 --- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp @@ -820,14 +820,14 @@ void WorldSession::HandlePlayerLoginOpcode(WorldPacket & recv_data) ByteBuffer bytes(8, true); - if (mask[6]) bytes[5] = recv_data.ReadUInt8() ^ 1; - if (mask[0]) bytes[0] = recv_data.ReadUInt8() ^ 1; - if (mask[4]) bytes[3] = recv_data.ReadUInt8() ^ 1; - if (mask[1]) bytes[4] = recv_data.ReadUInt8() ^ 1; - if (mask[2]) bytes[7] = recv_data.ReadUInt8() ^ 1; - if (mask[5]) bytes[2] = recv_data.ReadUInt8() ^ 1; - if (mask[7]) bytes[6] = recv_data.ReadUInt8() ^ 1; - if (mask[3]) bytes[1] = recv_data.ReadUInt8() ^ 1; + recv_data.ReadXorByte(mask[6], bytes[5]); + recv_data.ReadXorByte(mask[0], bytes[0]); + recv_data.ReadXorByte(mask[4], bytes[3]); + recv_data.ReadXorByte(mask[1], bytes[4]); + recv_data.ReadXorByte(mask[2], bytes[7]); + recv_data.ReadXorByte(mask[5], bytes[2]); + recv_data.ReadXorByte(mask[7], bytes[6]); + recv_data.ReadXorByte(mask[3], bytes[1]); playerGuid = BitConverter::ToUInt64(bytes); diff --git a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp index e5198e26bd9..fff068a0a04 100755 --- a/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/GuildHandler.cpp @@ -132,15 +132,15 @@ void WorldSession::HandleGuildRosterOpcode(WorldPacket& recvPacket) BitStream mask = recvPacket.ReadBitStream(8); ByteBuffer bytes(8, true); - - if (mask[0]) bytes[7] = recvPacket.ReadUInt8() ^ 1; - if (mask[5]) bytes[4] = recvPacket.ReadUInt8() ^ 1; - if (mask[4]) bytes[5] = recvPacket.ReadUInt8() ^ 1; - if (mask[7]) bytes[0] = recvPacket.ReadUInt8() ^ 1; - if (mask[3]) bytes[1] = recvPacket.ReadUInt8() ^ 1; - if (mask[2]) bytes[2] = recvPacket.ReadUInt8() ^ 1; - if (mask[1]) bytes[6] = recvPacket.ReadUInt8() ^ 1; - if (mask[6]) bytes[3] = recvPacket.ReadUInt8() ^ 1; + + recvPacket.ReadXorByte(mask[0], bytes[7]); + recvPacket.ReadXorByte(mask[5], bytes[4]); + recvPacket.ReadXorByte(mask[4], bytes[5]); + recvPacket.ReadXorByte(mask[7], bytes[0]); + recvPacket.ReadXorByte(mask[3], bytes[1]); + recvPacket.ReadXorByte(mask[2], bytes[2]); + recvPacket.ReadXorByte(mask[1], bytes[6]); + recvPacket.ReadXorByte(mask[6], bytes[3]); uint64 guildGuid = BitConverter::ToUInt64(bytes); |