diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-11-02 18:14:49 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-11-02 18:14:49 +0100 |
| commit | edc94e8ae8c5ddd46b53c706161a5511b3a3bcc3 (patch) | |
| tree | a213cd06b8d16b4714b5c0b2ef164fac7715078d /src/server/game/Server | |
| parent | 6305b290c9cd3076437565356cb6307d35b5131f (diff) | |
Core/GuildFinder: Remove as preparation for 9.1.5
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/AllPackets.h | 1 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GuildFinderPackets.cpp | 174 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/GuildFinderPackets.h | 239 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Opcodes.cpp | 15 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 21 |
5 files changed, 0 insertions, 450 deletions
diff --git a/src/server/game/Server/Packets/AllPackets.h b/src/server/game/Server/Packets/AllPackets.h index a6416d2e37c..6b2898d9655 100644 --- a/src/server/game/Server/Packets/AllPackets.h +++ b/src/server/game/Server/Packets/AllPackets.h @@ -46,7 +46,6 @@ #include "EquipmentSetPackets.h" #include "GameObjectPackets.h" #include "GarrisonPackets.h" -#include "GuildFinderPackets.h" #include "GuildPackets.h" #include "HotfixPackets.h" #include "InspectPackets.h" diff --git a/src/server/game/Server/Packets/GuildFinderPackets.cpp b/src/server/game/Server/Packets/GuildFinderPackets.cpp deleted file mode 100644 index d130ac76968..00000000000 --- a/src/server/game/Server/Packets/GuildFinderPackets.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/* - * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "GuildFinderPackets.h" -#include "PacketUtilities.h" - -void WorldPackets::GuildFinder::LFGuildAddRecruit::Read() -{ - _worldPacket >> GuildGUID; - _worldPacket >> PlayStyle; - _worldPacket >> Availability; - _worldPacket >> ClassRoles; - Comment = _worldPacket.ReadString(_worldPacket.ReadBits(10)); -} - -void WorldPackets::GuildFinder::LFGuildBrowse::Read() -{ - _worldPacket >> PlayStyle; - _worldPacket >> Availability; - _worldPacket >> ClassRoles; - _worldPacket >> CharacterLevel; -} - -ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::GuildFinder::LFGuildBrowseData const& guildData) -{ - data.WriteBits(guildData.GuildName.length(), 7); - data.WriteBits(guildData.Comment.length(), 10); - data << guildData.GuildGUID; - data << uint32(guildData.GuildVirtualRealm); - data << int32(guildData.GuildMembers); - data << int32(guildData.GuildAchievementPoints); - data << int32(guildData.PlayStyle); - data << int32(guildData.Availability); - data << int32(guildData.ClassRoles); - data << int32(guildData.LevelRange); - data << int32(guildData.EmblemStyle); - data << int32(guildData.EmblemColor); - data << int32(guildData.BorderStyle); - data << int32(guildData.BorderColor); - data << int32(guildData.Background); - data << int8(guildData.Cached); - data << int8(guildData.MembershipRequested); - data.WriteString(guildData.GuildName); - data.WriteString(guildData.Comment); - return data; -} - -WorldPacket const* WorldPackets::GuildFinder::LFGuildBrowseResult::Write() -{ - _worldPacket << uint32(Post.size()); - for (LFGuildBrowseData const& guildData : Post) - _worldPacket << guildData; - - return &_worldPacket; -} - -void WorldPackets::GuildFinder::LFGuildDeclineRecruit::Read() -{ - _worldPacket >> RecruitGUID; -} - -ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::GuildFinder::LFGuildApplicationData const& application) -{ - data << application.GuildGUID; - data << uint32(application.GuildVirtualRealm); - data << int32(application.ClassRoles); - data << int32(application.PlayStyle); - data << int32(application.Availability); - data << uint32(application.SecondsSinceCreated); - data << uint32(application.SecondsUntilExpiration); - data.WriteBits(application.GuildName.length(), 7); - data.WriteBits(application.Comment.length(), 10); - data.FlushBits(); - data.WriteString(application.GuildName); - data.WriteString(application.Comment); - return data; -} - -WorldPacket const* WorldPackets::GuildFinder::LFGuildApplications::Write() -{ - _worldPacket << int32(NumRemaining); - _worldPacket << uint32(Application.size()); - for (LFGuildApplicationData const& application : Application) - _worldPacket << application; - - return &_worldPacket; -} - -ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::GuildFinder::GuildPostData const& post) -{ - data.WriteBit(post.Active); - data.WriteBits(post.Comment.length(), 10); - data << int32(post.PlayStyle); - data << int32(post.Availability); - data << int32(post.ClassRoles); - data << int32(post.LevelRange); - data << post.SecondsRemaining; - data.WriteString(post.Comment); - return data; -} - -WorldPacket const* WorldPackets::GuildFinder::LFGuildPost::Write() -{ - _worldPacket.WriteBit(Post.is_initialized()); - _worldPacket.FlushBits(); - if (Post) - _worldPacket << *Post; - - return &_worldPacket; -} - -void WorldPackets::GuildFinder::LFGuildGetRecruits::Read() -{ - _worldPacket >> LastUpdate; -} - -ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::GuildFinder::LFGuildRecruitData const& recruit) -{ - data << recruit.RecruitGUID; - data << uint32(recruit.RecruitVirtualRealm); - data << int32(recruit.CharacterClass); - data << int32(recruit.CharacterGender); - data << int32(recruit.CharacterLevel); - data << int32(recruit.ClassRoles); - data << int32(recruit.PlayStyle); - data << int32(recruit.Availability); - data << uint32(recruit.SecondsSinceCreated); - data << uint32(recruit.SecondsUntilExpiration); - data.WriteBits(recruit.Name.length(), 6); - data.WriteBits(recruit.Comment.length(), 10); - data.FlushBits(); - data.WriteString(recruit.Name); - data.WriteString(recruit.Comment); - return data; -} - -WorldPacket const* WorldPackets::GuildFinder::LFGuildRecruits::Write() -{ - _worldPacket << uint32(Recruits.size()); - _worldPacket << UpdateTime; - for (LFGuildRecruitData const& recruit : Recruits) - _worldPacket << recruit; - - return &_worldPacket; -} - -void WorldPackets::GuildFinder::LFGuildRemoveRecruit::Read() -{ - _worldPacket >> GuildGUID; -} - -void WorldPackets::GuildFinder::LFGuildSetGuildPost::Read() -{ - _worldPacket >> PlayStyle; - _worldPacket >> Availability; - _worldPacket >> ClassRoles; - _worldPacket >> LevelRange; - Active = _worldPacket.ReadBit(); - Comment = _worldPacket.ReadString(_worldPacket.ReadBits(10)); -} diff --git a/src/server/game/Server/Packets/GuildFinderPackets.h b/src/server/game/Server/Packets/GuildFinderPackets.h deleted file mode 100644 index 8742d5b221c..00000000000 --- a/src/server/game/Server/Packets/GuildFinderPackets.h +++ /dev/null @@ -1,239 +0,0 @@ -/* - * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef GuildFinderPackets_h__ -#define GuildFinderPackets_h__ - -#include "Packet.h" -#include "ObjectGuid.h" -#include "Optional.h" -#include "PacketUtilities.h" - -namespace WorldPackets -{ - namespace GuildFinder - { - class LFGuildAddRecruit final : public ClientPacket - { - public: - LFGuildAddRecruit(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_ADD_RECRUIT, std::move(packet)) { } - - void Read() override; - - ObjectGuid GuildGUID; - int32 Availability = 0; - int32 ClassRoles = 0; - int32 PlayStyle = 0; - std::string Comment; - }; - - class LFGuildApplicationsListChanged final : public ServerPacket - { - public: - LFGuildApplicationsListChanged() : ServerPacket(SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED, 0) { } - - WorldPacket const* Write() override { return &_worldPacket; } - }; - - class LFGuildApplicantListChanged final : public ServerPacket - { - public: - LFGuildApplicantListChanged() : ServerPacket(SMSG_LF_GUILD_APPLICANT_LIST_CHANGED, 0) { } - - WorldPacket const* Write() override { return &_worldPacket; } - }; - - class LFGuildBrowse final : public ClientPacket - { - public: - LFGuildBrowse(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_BROWSE, std::move(packet)) { } - - void Read() override; - - int32 CharacterLevel = 0; - int32 Availability = 0; - int32 ClassRoles = 0; - int32 PlayStyle = 0; - }; - - struct LFGuildBrowseData - { - std::string GuildName; - ObjectGuid GuildGUID; - uint32 GuildVirtualRealm = 0; - int32 GuildMembers = 0; - int32 GuildAchievementPoints = 0; - int32 PlayStyle = 0; - int32 Availability = 0; - int32 ClassRoles = 0; - int32 LevelRange = 0; - int32 EmblemStyle = 0; - int32 EmblemColor = 0; - int32 BorderStyle = 0; - int32 BorderColor = 0; - int32 Background = 0; - std::string Comment; - int8 Cached = 0; - int8 MembershipRequested = 0; - }; - - class LFGuildBrowseResult final : public ServerPacket - { - public: - LFGuildBrowseResult() : ServerPacket(SMSG_LF_GUILD_BROWSE) { } - - WorldPacket const* Write() override; - - std::vector<LFGuildBrowseData> Post; - }; - - class LFGuildDeclineRecruit final : public ClientPacket - { - public: - LFGuildDeclineRecruit(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_DECLINE_RECRUIT, std::move(packet)) { } - - void Read() override; - - ObjectGuid RecruitGUID; - }; - - class LFGuildGetApplications final : public ClientPacket - { - public: - LFGuildGetApplications(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_GET_APPLICATIONS, std::move(packet)) { } - - void Read() override { } - }; - - struct LFGuildApplicationData - { - ObjectGuid GuildGUID; - uint32 GuildVirtualRealm = 0; - std::string GuildName; - int32 ClassRoles = 0; - int32 PlayStyle = 0; - int32 Availability = 0; - uint32 SecondsSinceCreated = 0; - uint32 SecondsUntilExpiration = 0; - std::string Comment; - }; - - class LFGuildApplications final : public ServerPacket - { - public: - LFGuildApplications() : ServerPacket(SMSG_LF_GUILD_APPLICATIONS) { } - - WorldPacket const* Write() override; - - std::vector<LFGuildApplicationData> Application; - int32 NumRemaining = 0; - }; - - class LFGuildGetGuildPost final : public ClientPacket - { - public: - LFGuildGetGuildPost(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_GET_GUILD_POST, std::move(packet)) { } - - void Read() override { } - }; - - struct GuildPostData - { - bool Active = false; - int32 PlayStyle = 0; - int32 Availability = 0; - int32 ClassRoles = 0; - int32 LevelRange = 0; - Duration<Seconds> SecondsRemaining; - std::string Comment; - }; - - class LFGuildPost final : public ServerPacket - { - public: - LFGuildPost() : ServerPacket(SMSG_LF_GUILD_POST, 1 + 1 + 4 + 4 + 4 + 4 + 4 + 255) { } - - WorldPacket const* Write() override; - - Optional<GuildPostData> Post; - }; - - class LFGuildGetRecruits final : public ClientPacket - { - public: - LFGuildGetRecruits(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_GET_RECRUITS, std::move(packet)) { } - - void Read() override; - - Timestamp<> LastUpdate; - }; - - struct LFGuildRecruitData - { - ObjectGuid RecruitGUID; - std::string Name; - uint32 RecruitVirtualRealm = 0; - std::string Comment; - int32 CharacterClass = 0; - int32 CharacterGender = 0; - int32 CharacterLevel = 0; - int32 ClassRoles = 0; - int32 PlayStyle = 0; - int32 Availability = 0; - uint32 SecondsSinceCreated = 0; - uint32 SecondsUntilExpiration = 0; - }; - - class LFGuildRecruits final : public ServerPacket - { - public: - LFGuildRecruits() : ServerPacket(SMSG_LF_GUILD_RECRUITS) { } - - WorldPacket const* Write() override; - - std::vector<LFGuildRecruitData> Recruits; - Timestamp<> UpdateTime; - }; - - class LFGuildRemoveRecruit final : public ClientPacket - { - public: - LFGuildRemoveRecruit(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_REMOVE_RECRUIT, std::move(packet)) { } - - void Read() override; - - ObjectGuid GuildGUID; - }; - - class LFGuildSetGuildPost final : public ClientPacket - { - public: - LFGuildSetGuildPost(WorldPacket&& packet) : ClientPacket(CMSG_LF_GUILD_SET_GUILD_POST, std::move(packet)) { } - - void Read() override; - - int32 Availability = 0; - int32 PlayStyle = 0; - int32 ClassRoles = 0; - int32 LevelRange = 0; - bool Active = false; - std::string Comment; - }; - } -} - -#endif // GuildFinderPackets_h__ diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 73ed0d7f593..7e73a22593b 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -514,14 +514,6 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_LFG_LIST_LEAVE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_LFG_LIST_SEARCH, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_LFG_LIST_UPDATE_REQUEST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_LF_GUILD_ADD_RECRUIT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderAddRecruit); - DEFINE_HANDLER(CMSG_LF_GUILD_BROWSE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderBrowse); - DEFINE_HANDLER(CMSG_LF_GUILD_DECLINE_RECRUIT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderDeclineRecruit); - DEFINE_HANDLER(CMSG_LF_GUILD_GET_APPLICATIONS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderGetApplications); - DEFINE_HANDLER(CMSG_LF_GUILD_GET_GUILD_POST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderGetGuildPost); - DEFINE_HANDLER(CMSG_LF_GUILD_GET_RECRUITS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderGetRecruits); - DEFINE_HANDLER(CMSG_LF_GUILD_REMOVE_RECRUIT, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderRemoveRecruit); - DEFINE_HANDLER(CMSG_LF_GUILD_SET_GUILD_POST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildFinderSetGuildPost); DEFINE_HANDLER(CMSG_LIST_INVENTORY, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleListInventoryOpcode); DEFINE_HANDLER(CMSG_LIVE_REGION_ACCOUNT_RESTORE, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_LIVE_REGION_CHARACTER_COPY, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL); @@ -1508,13 +1500,6 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_SLOT_INVALID, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_TELEPORT_DENIED, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_LFG_UPDATE_STATUS, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_APPLICANT_LIST_CHANGED, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_APPLICATIONS, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_APPLICATIONS_LIST_CHANGED, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_BROWSE, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_COMMAND_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_POST, STATUS_NEVER, CONNECTION_TYPE_REALM); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_LF_GUILD_RECRUITS, STATUS_NEVER, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_ACCOUNT_RESTORE_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_CHARACTER_COPY_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); DEFINE_SERVER_OPCODE_HANDLER(SMSG_LIVE_REGION_GET_ACCOUNT_CHARACTER_LIST_RESULT, STATUS_UNHANDLED, CONNECTION_TYPE_REALM); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index c9e36d54e88..ab81603d380 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -392,18 +392,6 @@ namespace WorldPackets class GuildSetAchievementTracking; } - namespace GuildFinder - { - class LFGuildAddRecruit; - class LFGuildBrowse; - class LFGuildDeclineRecruit; - class LFGuildGetApplications; - class LFGuildGetGuildPost; - class LFGuildGetRecruits; - class LFGuildRemoveRecruit; - class LFGuildSetGuildPost; - } - namespace Hotfix { class DBQueryBulk; @@ -1360,15 +1348,6 @@ class TC_GAME_API WorldSession void HandleGuildChallengeUpdateRequest(WorldPackets::Guild::GuildChallengeUpdateRequest& packet); void HandleDeclineGuildInvites(WorldPackets::Guild::DeclineGuildInvites& packet); - void HandleGuildFinderAddRecruit(WorldPackets::GuildFinder::LFGuildAddRecruit& lfGuildAddRecruit); - void HandleGuildFinderBrowse(WorldPackets::GuildFinder::LFGuildBrowse& lfGuildBrowse); - void HandleGuildFinderDeclineRecruit(WorldPackets::GuildFinder::LFGuildDeclineRecruit& lfGuildDeclineRecruit); - void HandleGuildFinderGetApplications(WorldPackets::GuildFinder::LFGuildGetApplications& lfGuildGetApplications); - void HandleGuildFinderGetGuildPost(WorldPackets::GuildFinder::LFGuildGetGuildPost& lfGuildGetGuildPost); - void HandleGuildFinderGetRecruits(WorldPackets::GuildFinder::LFGuildGetRecruits& lfGuildGetRecruits); - void HandleGuildFinderRemoveRecruit(WorldPackets::GuildFinder::LFGuildRemoveRecruit& lfGuildRemoveRecruit); - void HandleGuildFinderSetGuildPost(WorldPackets::GuildFinder::LFGuildSetGuildPost& lfGuildSetGuildPost); - void HandleEnableTaxiNodeOpcode(WorldPackets::Taxi::EnableTaxiNode& enableTaxiNode); void HandleTaxiNodeStatusQueryOpcode(WorldPackets::Taxi::TaxiNodeStatusQuery& taxiNodeStatusQuery); void HandleTaxiQueryAvailableNodesOpcode(WorldPackets::Taxi::TaxiQueryAvailableNodes& taxiQueryAvailableNodes); |
