diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 2d64abadeb..6cf5082bdb 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -4162,7 +4162,7 @@ void Guild::HandleNewsSetSticky(WorldSession* session, uint32 newsId, bool stick void Guild::SendKnownRecipes(Player const* player) { - WorldPackets::Guild::KnownRecipes packet; + WorldPackets::Guild::GuildKnownRecipes packet; std::set uniqueProfessions; std::unordered_map> uniqueBitsMap; @@ -4196,3 +4196,31 @@ void Guild::SendKnownRecipes(Player const* player) player->SendDirectMessage(packet.Write()); } + +void Guild::SendMembersForRecipe(Player const* player, uint32 skillLineId, uint32 spellId, uint32 uniqueBit) +{ + WorldPackets::Guild::GuildMembersWithRecipe packet; + for (auto itr : m_members) + { + Member* member = itr.second; + for (uint8 i = 0; i < GUILD_PROFESSION_COUNT; i++) + { + GuildMemberProfessionData prof = member->GetProfessionData(i); + if (prof.SkillId == skillLineId) + { + uint16 index = uniqueBit / 8; + uint8 offset = uniqueBit % 8; + uint8 bit = 1 << offset; + if (prof.RecipeUniqueBits[index] & bit) + packet.Members.push_back(member->GetGUID()); + } + } + } + + if (packet.Members.empty()) + return; + + packet.SkillLineID = skillLineId; + packet.SpellID = spellId; + player->SendDirectMessage(packet.Write()); +} diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 2708210858..df88674c48 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -399,7 +399,6 @@ private: void SetTrackedCriteriaIds(std::set criteriaIds) { m_trackedCriteriaIds.swap(criteriaIds); } bool IsTrackingCriteriaId(uint32 criteriaId) const { return m_trackedCriteriaIds.find(criteriaId) != m_trackedCriteriaIds.end(); } - void ChangeRank(SQLTransaction& trans, uint8 newRank); inline void UpdateLogoutTime() { m_logoutTime = ::time(nullptr); } @@ -896,6 +895,7 @@ public: } void SendKnownRecipes(Player const* player); + void SendMembersForRecipe(Player const* player, uint32 skillLineId, uint32 spellId, uint32 uniqueBit); protected: ObjectGuid::LowType m_id; diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 02d20b1da6..3a0020b3d3 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -909,11 +909,18 @@ void WorldSession::HandleGuildRenameCallback(std::string newName, PreparedQueryR void WorldSession::HandleGuildQueryRecipesOpcode(WorldPackets::Guild::GuildQueryRecipes& packet) { - if (Guild * guild = sGuildMgr->GetGuildByGuid(packet.GuildGUID)) + if (Guild* guild = sGuildMgr->GetGuildByGuid(packet.GuildGUID)) if (guild->IsMember(_player->GetGUID())) guild->SendKnownRecipes(_player); } +void WorldSession::HandleGuildQueryMembersForRecipe(WorldPackets::Guild::GuildQueryMembersForRecipe& packet) +{ + if (Guild* guild = sGuildMgr->GetGuildByGuid(packet.GuildGUID)) + if (guild->IsMember(_player->GetGUID())) + guild->SendMembersForRecipe(_player, packet.SkillLineID, packet.SpellID, packet.UniqueBit); +} + /* void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket) { diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index 0192c52e3d..10ab6dee8b 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -347,7 +347,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Guild::GuildRosterMemberD return data; } -WorldPacket const* WorldPackets::Guild::KnownRecipes::Write() +WorldPacket const* WorldPackets::Guild::GuildKnownRecipes::Write() { _worldPacket.WriteBits(Recipes.size(), 16); @@ -360,3 +360,64 @@ WorldPacket const* WorldPackets::Guild::KnownRecipes::Write() return &_worldPacket; } + +void WorldPackets::Guild::GuildQueryMembersForRecipe::Read() +{ + _worldPacket >> SpellID; + _worldPacket >> SkillLineID; + _worldPacket >> UniqueBit; + + GuildGUID[4] = _worldPacket.ReadBit(); + GuildGUID[1] = _worldPacket.ReadBit(); + GuildGUID[0] = _worldPacket.ReadBit(); + GuildGUID[3] = _worldPacket.ReadBit(); + GuildGUID[6] = _worldPacket.ReadBit(); + GuildGUID[7] = _worldPacket.ReadBit(); + GuildGUID[5] = _worldPacket.ReadBit(); + GuildGUID[2] = _worldPacket.ReadBit(); + + _worldPacket.ReadByteSeq(GuildGUID[1]); + _worldPacket.ReadByteSeq(GuildGUID[6]); + _worldPacket.ReadByteSeq(GuildGUID[5]); + _worldPacket.ReadByteSeq(GuildGUID[0]); + _worldPacket.ReadByteSeq(GuildGUID[3]); + _worldPacket.ReadByteSeq(GuildGUID[7]); + _worldPacket.ReadByteSeq(GuildGUID[2]); + _worldPacket.ReadByteSeq(GuildGUID[4]); +} + +WorldPacket const* WorldPackets::Guild::GuildMembersWithRecipe::Write() +{ + _worldPacket.WriteBits(Members.size(), 26); + + for (ObjectGuid guid : Members) + { + _worldPacket.WriteBit(guid[2]); + _worldPacket.WriteBit(guid[3]); + _worldPacket.WriteBit(guid[1]); + _worldPacket.WriteBit(guid[6]); + _worldPacket.WriteBit(guid[0]); + _worldPacket.WriteBit(guid[7]); + _worldPacket.WriteBit(guid[4]); + _worldPacket.WriteBit(guid[3]); + } + + _worldPacket.FlushBits(); + + for (ObjectGuid guid : Members) + { + _worldPacket.WriteByteSeq(guid[1]); + _worldPacket.WriteByteSeq(guid[5]); + _worldPacket.WriteByteSeq(guid[6]); + _worldPacket.WriteByteSeq(guid[7]); + _worldPacket.WriteByteSeq(guid[2]); + _worldPacket.WriteByteSeq(guid[3]); + _worldPacket.WriteByteSeq(guid[0]); + _worldPacket.WriteByteSeq(guid[4]); + } + + _worldPacket << int32(SpellID); + _worldPacket << uint32(SkillLineID); + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index 0aa29fe0e9..1c79a94c95 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -343,15 +343,40 @@ namespace WorldPackets std::array SkillLineBitArray; }; - class KnownRecipes final : public ServerPacket + class GuildKnownRecipes final : public ServerPacket { public: - KnownRecipes() : ServerPacket(SMSG_GUILD_KNOWN_RECIPES, 4) { } + GuildKnownRecipes() : ServerPacket(SMSG_GUILD_KNOWN_RECIPES, 4) { } WorldPacket const* Write() override; std::vector Recipes; }; + + class GuildQueryMembersForRecipe : public ClientPacket + { + public: + GuildQueryMembersForRecipe(WorldPacket&& packet) : ClientPacket(CMSG_GUILD_QUERY_MEMBERS_FOR_RECIPE, std::move(packet)) { } + + void Read() override; + + ObjectGuid GuildGUID; + int32 UniqueBit = 0; + int32 SkillLineID = 0; + int32 SpellID = 0; + }; + + class GuildMembersWithRecipe final : public ServerPacket + { + public: + GuildMembersWithRecipe() : ServerPacket(SMSG_GUILD_MEMBERS_WITH_RECIPE, 8) { } + + WorldPacket const* Write() override; + + int32 SpellID = 0; + std::vector Members; + int32 SkillLineID = 0; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 70bddeafcd..4b30d0b4b4 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -348,6 +348,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_GUILD_QUERY_NEWS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryNewsOpcode ); DEFINE_HANDLER(CMSG_GUILD_QUERY_RANKS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryRanksOpcode ); DEFINE_HANDLER(CMSG_GUILD_QUERY_RECIPES, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryRecipesOpcode ); + DEFINE_HANDLER(CMSG_GUILD_QUERY_MEMBERS_FOR_RECIPE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryMembersForRecipe); DEFINE_HANDLER(CMSG_GUILD_REMOVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRemoveOpcode ); DEFINE_HANDLER(CMSG_GUILD_REPLACE_GUILD_MASTER, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_GUILD_REQUEST_CHALLENGE_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRequestChallengeUpdate); @@ -492,7 +493,6 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_PUSHQUESTTOPARTY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePushQuestToParty ); DEFINE_HANDLER(CMSG_PVP_LOG_DATA, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandlePVPLogDataOpcode ); DEFINE_HANDLER(CMSG_QUERY_BATTLEFIELD_STATE, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleBattlegroundStateQuery ); - DEFINE_HANDLER(CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_QUERY_GUILD_MEMBER_RECIPES, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_QUERY_GUILD_REWARDS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleGuildRewardsQueryOpcode ); DEFINE_HANDLER(CMSG_QUERY_INSPECT_ACHIEVEMENTS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleQueryInspectAchievements ); @@ -940,7 +940,7 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_INVITE, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_INVITE_CANCEL, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MAX_DAILY_XP, STATUS_NEVER); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBERS_FOR_RECIPE, STATUS_UNHANDLED); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBERS_WITH_RECIPE, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_DAILY_RESET, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_RECIPES, STATUS_UNHANDLED); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_MEMBER_UPDATE_NOTE, STATUS_NEVER); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index f0945d3520..40052c260b 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -264,6 +264,8 @@ enum Opcodes : uint16 CMSG_GUILD_QUERY = 0x4426, CMSG_GUILD_QUERY_NEWS = 0x3020, CMSG_GUILD_QUERY_RANKS = 0x1026, + CMSG_GUILD_QUERY_RECIPES = 0x3033, + CMSG_GUILD_QUERY_MEMBERS_FOR_RECIPE = 0x1036, CMSG_GUILD_REMOVE = 0x1231, CMSG_GUILD_REPLACE_GUILD_MASTER = 0x1034, CMSG_GUILD_REQUEST_CHALLENGE_UPDATE = 0x1224, @@ -418,9 +420,7 @@ enum Opcodes : uint16 CMSG_PUSHQUESTTOPARTY = 0x4B14, CMSG_PVP_LOG_DATA = 0x7308, CMSG_QUERY_BATTLEFIELD_STATE = 0x7202, - CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE = 0x1036, CMSG_QUERY_GUILD_MEMBER_RECIPES = 0x1037, - CMSG_GUILD_QUERY_RECIPES = 0x3033, CMSG_QUERY_GUILD_REWARDS = 0x3012, CMSG_QUERY_INSPECT_ACHIEVEMENTS = 0x4D27, CMSG_QUERY_QUESTS_COMPLETED = 0x2317, @@ -913,7 +913,7 @@ enum Opcodes : uint16 SMSG_GUILD_INVITE_CANCEL = 0x0606, SMSG_GUILD_KNOWN_RECIPES = 0x10B3, SMSG_GUILD_MAX_DAILY_XP = 0x79B5, - SMSG_GUILD_MEMBERS_FOR_RECIPE = 0x1CB7, + SMSG_GUILD_MEMBERS_WITH_RECIPE = 0x1CB7, SMSG_GUILD_MEMBER_DAILY_RESET = 0x10A5, SMSG_GUILD_MEMBER_RECIPES = 0x1CB0, SMSG_GUILD_MEMBER_UPDATE_NOTE = 0x7CA0, diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 2efc9955ba..91a5e447b1 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -115,6 +115,7 @@ namespace WorldPackets class GuildXPQuery; class GuildGetRoster; class GuildQueryRecipes; + class GuildQueryMembersForRecipe; } } @@ -721,6 +722,7 @@ class TC_GAME_API WorldSession void HandleGuildQueryRanksOpcode(WorldPacket& recvPacket); void HandleGuildQueryNewsOpcode(WorldPacket& recvPacket); void HandleGuildQueryRecipesOpcode(WorldPackets::Guild::GuildQueryRecipes& packet); + void HandleGuildQueryMembersForRecipe(WorldPackets::Guild::GuildQueryMembersForRecipe& packet); void HandleGuildSetRankPermissionsOpcode(WorldPacket& recvPacket); void HandleGuildAddRankOpcode(WorldPacket& recvPacket); void HandleGuildDelRankOpcode(WorldPacket& recvPacket);