Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 04:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x

Browse Source 
Conflicts:
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Instances/InstanceScript.h
This commit is contained in:
kaelima
2012-05-30 08:03:08 +02:00
parent 3d14384c32 34442e83b0
commit f40e0d0a9a
8 changed files with 90 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/server/game/Handlers/GuildHandler.cpp
View File

@@ -134,13 +134,13 @@ void WorldSession::HandleGuildRosterOpcode(WorldPacket& recvPacket)
ByteBuffer bytes(8, true);
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]);
recvPacket.ReadXorByte(mask[3], bytes[5]);
recvPacket.ReadXorByte(mask[4], bytes[4]);
recvPacket.ReadXorByte(mask[5], bytes[0]);
recvPacket.ReadXorByte(mask[6], bytes[1]);
recvPacket.ReadXorByte(mask[1], bytes[2]);
recvPacket.ReadXorByte(mask[2], bytes[6]);
recvPacket.ReadXorByte(mask[7], bytes[3]);
uint64 guildGuid = BitConverter::ToUInt64(bytes);
@@ -576,7 +576,7 @@ void WorldSession::HandleQueryGuildBankTabText(WorldPacket &recv_data)
guild->SendBankTabText(this, tabId);
}
void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data)
void WorldSession::HandleSetGuildBankTabText(WorldPacket& recv_data)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_SET_GUILD_BANK_TEXT");
@@ -589,3 +589,27 @@ void WorldSession::HandleSetGuildBankTabText(WorldPacket &recv_data)
if (Guild* guild = _GetPlayerGuild(this))
guild->SetBankTabText(tabId, text);
}
void WorldSession::HandleGuildQueryXPOpcode(WorldPacket& recv_data)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_QUERY_GUILD_XP");
/*
Bitstream is correct, it just needs a proper guild implementation
uint64 playerGuid = 0;
BitStream mask = recv_data.ReadBitStream(8);
ByteBuffer bytes(8, true);
recv_data.ReadXorByte(mask[5], bytes[6]);
recv_data.ReadXorByte(mask[1], bytes[2]);
recv_data.ReadXorByte(mask[7], bytes[1]);
recv_data.ReadXorByte(mask[4], bytes[4]);
recv_data.ReadXorByte(mask[0], bytes[0]);
recv_data.ReadXorByte(mask[6], bytes[3]);
recv_data.ReadXorByte(mask[3], bytes[5]);
recv_data.ReadXorByte(mask[2], bytes[7]);
playerGuid = BitConverter::ToUInt64(bytes);
*/
}