diff options
12 files changed, 20 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.cpp b/src/server/game/Server/Packets/BattlegroundPackets.cpp index 70a09262cdb..e516c3272f1 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.cpp +++ b/src/server/game/Server/Packets/BattlegroundPackets.cpp @@ -326,6 +326,8 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedPvpInf data << int32(bracketInfo.PvpTierID); data << int32(bracketInfo.Unused3); data << int32(bracketInfo.WeeklyBestWinPvpTierID); + data << int32(bracketInfo.Unused4); + data << int32(bracketInfo.Rank); data.WriteBit(bracketInfo.Disqualified); data.FlushBits(); diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h index 65281fce20b..e1d5041cca6 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.h +++ b/src/server/game/Server/Packets/BattlegroundPackets.h @@ -449,6 +449,8 @@ namespace WorldPackets int32 PvpTierID = 0; int32 Unused3 = 0; int32 WeeklyBestWinPvpTierID = 0; + int32 Unused4 = 0; + int32 Rank = 0; bool Disqualified = false; } Bracket[6]; }; diff --git a/src/server/game/Server/Packets/InspectPackets.cpp b/src/server/game/Server/Packets/InspectPackets.cpp index 35055ebe414..4939d7c95b0 100644 --- a/src/server/game/Server/Packets/InspectPackets.cpp +++ b/src/server/game/Server/Packets/InspectPackets.cpp @@ -132,6 +132,8 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Inspect::PVPBracketData c data << int32(bracket.SeasonBestRating); data << int32(bracket.PvpTierID); data << int32(bracket.WeeklyBestWinPvpTierID); + data << int32(bracket.Unused1); + data << int32(bracket.Unused2); data.WriteBit(bracket.Disqualified); data.FlushBits(); diff --git a/src/server/game/Server/Packets/InspectPackets.h b/src/server/game/Server/Packets/InspectPackets.h index c472920ea14..94411ef5e07 100644 --- a/src/server/game/Server/Packets/InspectPackets.h +++ b/src/server/game/Server/Packets/InspectPackets.h @@ -105,6 +105,8 @@ namespace WorldPackets int32 SeasonBestRating = 0; int32 PvpTierID = 0; int32 WeeklyBestWinPvpTierID = 0; + int32 Unused1 = 0; + int32 Unused2 = 0; uint8 Bracket = 0; bool Disqualified = false; }; diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp index cb998d0b62d..4f1f7217e8c 100644 --- a/src/server/game/Server/Packets/MiscPackets.cpp +++ b/src/server/game/Server/Packets/MiscPackets.cpp @@ -155,6 +155,7 @@ WorldPacket const* WorldPackets::Misc::TriggerMovie::Write() WorldPacket const* WorldPackets::Misc::TriggerCinematic::Write() { _worldPacket << uint32(CinematicID); + _worldPacket << ConversationGuid; return &_worldPacket; } diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h index ebad7696cc2..882658cd05a 100644 --- a/src/server/game/Server/Packets/MiscPackets.h +++ b/src/server/game/Server/Packets/MiscPackets.h @@ -195,6 +195,7 @@ namespace WorldPackets WorldPacket const* Write() override; uint32 CinematicID = 0; + ObjectGuid ConversationGuid; }; class TriggerMovie final : public ServerPacket diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp index e4bda90f24c..77a5342ab21 100644 --- a/src/server/game/Server/Packets/PartyPackets.cpp +++ b/src/server/game/Server/Packets/PartyPackets.cpp @@ -47,12 +47,13 @@ void WorldPackets::Party::PartyInviteClient::Read() uint32 targetNameLen, targetRealmLen; _worldPacket >> PartyIndex; - _worldPacket >> ProposedRoles; - _worldPacket >> TargetGUID; targetNameLen = _worldPacket.ReadBits(9); targetRealmLen = _worldPacket.ReadBits(9); + _worldPacket >> ProposedRoles; + _worldPacket >> TargetGUID; + TargetName = _worldPacket.ReadString(targetNameLen); TargetRealm = _worldPacket.ReadString(targetRealmLen); } diff --git a/src/server/game/Server/Packets/QueryPackets.cpp b/src/server/game/Server/Packets/QueryPackets.cpp index 9a9f7233376..15314ab3221 100644 --- a/src/server/game/Server/Packets/QueryPackets.cpp +++ b/src/server/game/Server/Packets/QueryPackets.cpp @@ -182,6 +182,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Query::PlayerGuidLookupDa data << uint8(lookupData.Sex); data << uint8(lookupData.ClassID); data << uint8(lookupData.Level); + data << uint8(lookupData.Unused915); data.WriteString(lookupData.Name); return data; @@ -204,7 +205,6 @@ void WorldPackets::Query::QueryPageText::Read() _worldPacket >> ItemGUID; } - ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Query::QueryPageTextResponse::PageTextInfo const& page) { data << uint32(page.ID); diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h index 693000219b3..75d8b1f3d88 100644 --- a/src/server/game/Server/Packets/QueryPackets.h +++ b/src/server/game/Server/Packets/QueryPackets.h @@ -135,6 +135,7 @@ namespace WorldPackets uint8 Sex = GENDER_NONE; uint8 ClassID = CLASS_NONE; uint8 Level = 0; + uint8 Unused915 = 0; DeclinedName DeclinedNames; }; diff --git a/src/server/game/Server/Packets/SocialPackets.cpp b/src/server/game/Server/Packets/SocialPackets.cpp index a86a8f4c706..d899536bb48 100644 --- a/src/server/game/Server/Packets/SocialPackets.cpp +++ b/src/server/game/Server/Packets/SocialPackets.cpp @@ -130,7 +130,9 @@ void WorldPackets::Social::SetContactNotes::Read() void WorldPackets::Social::AddIgnore::Read() { - Name = _worldPacket.ReadString(_worldPacket.ReadBits(9)); + uint32 nameLength = _worldPacket.ReadBits(9); + _worldPacket >> AccountGUID; + Name = _worldPacket.ReadString(nameLength); } void WorldPackets::Social::DelIgnore::Read() diff --git a/src/server/game/Server/Packets/SocialPackets.h b/src/server/game/Server/Packets/SocialPackets.h index 37b52c54319..e553aa692f8 100644 --- a/src/server/game/Server/Packets/SocialPackets.h +++ b/src/server/game/Server/Packets/SocialPackets.h @@ -134,6 +134,7 @@ namespace WorldPackets void Read() override; std::string Name; + ObjectGuid AccountGUID; }; class DelIgnore final : public ClientPacket diff --git a/src/server/game/Server/Packets/TicketPackets.cpp b/src/server/game/Server/Packets/TicketPackets.cpp index dd595eac2d7..ec29dcf20ca 100644 --- a/src/server/game/Server/Packets/TicketPackets.cpp +++ b/src/server/game/Server/Packets/TicketPackets.cpp @@ -217,7 +217,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT data >> lfgListSearchResult->ListingCreatorGuid; data >> lfgListSearchResult->Unknown735; - uint32 titleLength = data.ReadBits(8); + uint32 titleLength = data.ReadBits(10); uint32 descriptionLength = data.ReadBits(11); uint32 voiceChatLength = data.ReadBits(8); |