diff options
author | kaelima <kaelima@live.se> | 2012-08-10 14:25:04 +0200 |
---|---|---|
committer | kaelima <kaelima@live.se> | 2012-08-10 14:25:04 +0200 |
commit | 878f88b25062f97553274aa3d3448e99bdcc1a0a (patch) | |
tree | 84a05a8cdb05eecd3d6f9b479376f518ca347354 /src/server/game/Handlers/GuildHandler.cpp | |
parent | 9538fb6d5a508adbebc9dd94ce25cbca6bd48789 (diff) |
Core/PacketIO:
- Enable a bunch of spline packets.
- Correct emblems written in SMSG_GUILD_INVITE
- Revert changes in GuildCommandType and add more errors to GuildCommandError
- Rename Powers to match names in Lua code from client
Diffstat (limited to 'src/server/game/Handlers/GuildHandler.cpp')
-rwxr-xr-x | src/server/game/Handlers/GuildHandler.cpp | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 2eb95dbba87..5bb7259a1cf 100755 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -36,7 +36,7 @@ inline Guild* _GetPlayerGuild(WorldSession* session, bool sendError = false) if (Guild* guild = sGuildMgr->GetGuildById(guildId)) // Find guild by id return guild; if (sendError) - Guild::SendCommandResult(session, GUILD_CREATE, ERR_GUILD_PLAYER_NOT_IN_GUILD); + Guild::SendCommandResult(session, GUILD_CREATE_S, ERR_GUILD_PLAYER_NOT_IN_GUILD); return NULL; } @@ -55,7 +55,7 @@ void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket) return; } - Guild::SendCommandResult(this, GUILD_CREATE, ERR_GUILD_PLAYER_NOT_IN_GUILD); + Guild::SendCommandResult(this, GUILD_CREATE_S, ERR_GUILD_PLAYER_NOT_IN_GUILD); } void WorldSession::HandleGuildCreateOpcode(WorldPacket& recvPacket) @@ -460,7 +460,7 @@ void WorldSession::HandleGuildBankerActivate(WorldPacket& recvData) if (Guild* guild = _GetPlayerGuild(this)) guild->SendBankTabsInfo(this); else - Guild::SendCommandResult(this, GUILD_VIEW_TAB, ERR_GUILD_PLAYER_NOT_IN_GUILD); + Guild::SendCommandResult(this, GUILD_UNK1, ERR_GUILD_PLAYER_NOT_IN_GUILD); } } @@ -738,3 +738,31 @@ void WorldSession::HandleGuildSetRankPermissionsOpcode(WorldPacket& recvPacket) guild->HandleSetRankInfo(this, rankId, rankName, newRights, moneyPerDay, rightsAndSlots); } + +void WorldSession::HandleGuildRequestPartyState(WorldPacket& recvData) +{ + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Received CMSG_GUILD_REQUEST_PARTY_STATE"); + + ObjectGuid guildGuid; + + guildGuid[0] = recvData.ReadBit(); + guildGuid[6] = recvData.ReadBit(); + guildGuid[7] = recvData.ReadBit(); + guildGuid[3] = recvData.ReadBit(); + guildGuid[5] = recvData.ReadBit(); + guildGuid[1] = recvData.ReadBit(); + guildGuid[2] = recvData.ReadBit(); + guildGuid[4] = recvData.ReadBit(); + + recvData.ReadByteSeq(guildGuid[6]); + recvData.ReadByteSeq(guildGuid[3]); + recvData.ReadByteSeq(guildGuid[2]); + recvData.ReadByteSeq(guildGuid[1]); + recvData.ReadByteSeq(guildGuid[5]); + recvData.ReadByteSeq(guildGuid[0]); + recvData.ReadByteSeq(guildGuid[7]); + recvData.ReadByteSeq(guildGuid[4]); + + if (Guild* guild = sGuildMgr->GetGuildByGuid(guildGuid)) + guild->HandleGuildPartyRequest(this); +} |