josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/PacketIO: Named PVPInfo/bracket fields

Browse Source
This commit is contained in:
Shauren
2021-06-05 13:16:54 +02:00
parent d1ef8f28b0
commit 19990a966b
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Object/Updates/UpdateFields.cpp
+21 -21
View File
@@ -2547,15 +2547,15 @@ void RestInfo::ClearChangesMask()
void PVPInfo::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const
{
data << uint32(Field_0);
data << uint32(Field_4);
data << uint32(Field_8);
data << uint32(Field_C);
data << uint32(WeeklyPlayed);
data << uint32(WeeklyWon);
data << uint32(SeasonPlayed);
data << uint32(SeasonWon);
data << uint32(Rating);
data << uint32(Field_14);
data << uint32(Field_18);
data << uint32(WeeklyBestRating);
data << uint32(SeasonBestRating);
data << uint32(PvpTierID);
data.WriteBit(Field_20);
data.WriteBit(Disqualified);
data.FlushBits();
}
@@ -2571,7 +2571,7 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const
{
if (changesMask[1])
{
data.WriteBit(Field_20);
data.WriteBit(Disqualified);
}
}
data.FlushBits();
@@ -2579,19 +2579,19 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const
{
if (changesMask[2])
{
data << uint32(Field_0);
data << uint32(WeeklyPlayed);
}
if (changesMask[3])
{
data << uint32(Field_4);
data << uint32(WeeklyWon);
}
if (changesMask[4])
{
data << uint32(Field_8);
data << uint32(SeasonPlayed);
}
if (changesMask[5])
{
data << uint32(Field_C);
data << uint32(SeasonWon);
}
if (changesMask[6])
{
@@ -2599,11 +2599,11 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const
}
if (changesMask[7])
{
data << uint32(Field_14);
data << uint32(WeeklyBestRating);
}
if (changesMask[8])
{
data << uint32(Field_18);
data << uint32(SeasonBestRating);
}
if (changesMask[9])
{
@@ -2615,14 +2615,14 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const
void PVPInfo::ClearChangesMask()
{
Base::ClearChangesMask(Field_20);
Base::ClearChangesMask(Field_0);
Base::ClearChangesMask(Field_4);
Base::ClearChangesMask(Field_8);
Base::ClearChangesMask(Field_C);
Base::ClearChangesMask(Disqualified);
Base::ClearChangesMask(WeeklyPlayed);
Base::ClearChangesMask(WeeklyWon);
Base::ClearChangesMask(SeasonPlayed);
Base::ClearChangesMask(SeasonWon);
Base::ClearChangesMask(Rating);
Base::ClearChangesMask(Field_14);
Base::ClearChangesMask(Field_18);
Base::ClearChangesMask(WeeklyBestRating);
Base::ClearChangesMask(SeasonBestRating);
Base::ClearChangesMask(PvpTierID);
_changesMask.ResetAll();
}
src/server/game/Entities/Object/Updates/UpdateFields.h
+7 -7
View File
@@ -522,14 +522,14 @@ struct RestInfo : public IsUpdateFieldStructureTag, public HasChangesMask<3>
struct PVPInfo : public IsUpdateFieldStructureTag, public HasChangesMask<10>
{
UpdateField<bool, 0, 1> Field_20;
UpdateField<uint32, 0, 2> Field_0;
UpdateField<uint32, 0, 3> Field_4;
UpdateField<uint32, 0, 4> Field_8;
UpdateField<uint32, 0, 5> Field_C;
UpdateField<bool, 0, 1> Disqualified;
UpdateField<uint32, 0, 2> WeeklyPlayed;
UpdateField<uint32, 0, 3> WeeklyWon;
UpdateField<uint32, 0, 4> SeasonPlayed;
UpdateField<uint32, 0, 5> SeasonWon;
UpdateField<uint32, 0, 6> Rating;
UpdateField<uint32, 0, 7> Field_14;
UpdateField<uint32, 0, 8> Field_18;
UpdateField<uint32, 0, 7> WeeklyBestRating;
UpdateField<uint32, 0, 8> SeasonBestRating;
UpdateField<uint32, 0, 9> PvpTierID;
void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const;
src/server/game/Server/Packets/BattlegroundPackets.cpp
+1 -1
View File
@@ -325,7 +325,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedPvpInf
data << int32(bracketInfo.BestSeasonRating);
data << int32(bracketInfo.PvpTierID);
data << int32(bracketInfo.Unused3);
data.WriteBit(bracketInfo.Unused4);
data.WriteBit(bracketInfo.Disqualified);
data.FlushBits();
return data;
src/server/game/Server/Packets/BattlegroundPackets.h
+1 -1
View File
@@ -448,7 +448,7 @@ namespace WorldPackets
int32 BestSeasonRating = 0;
int32 PvpTierID = 0;
int32 Unused3 = 0;
bool Unused4 = false;
bool Disqualified = false;
} Bracket[6];
};
src/server/game/Server/Packets/InspectPackets.cpp
+3 -3
View File
@@ -129,9 +129,9 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Inspect::PVPBracketData c
data << int32(bracket.SeasonPlayed);
data << int32(bracket.SeasonWon);
data << int32(bracket.WeeklyBestRating);
data << int32(bracket.Unk710);
data << int32(bracket.Unk801_1);
data.WriteBit(bracket.Unk801_2);
data << int32(bracket.SeasonBestRating);
data << int32(bracket.PvpTierID);
data.WriteBit(bracket.Disqualified);
data.FlushBits();
return data;
src/server/game/Server/Packets/InspectPackets.h
+3 -3
View File
@@ -102,10 +102,10 @@ namespace WorldPackets
int32 SeasonPlayed = 0;
int32 SeasonWon = 0;
int32 WeeklyBestRating = 0;
int32 Unk710 = 0;
int32 Unk801_1 = 0;
int32 SeasonBestRating = 0;
int32 PvpTierID = 0;
uint8 Bracket = 0;
bool Unk801_2 = false;
bool Disqualified = false;
};
class InspectResult final : public ServerPacket