Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/PacketIO: Named PVPInfo/bracket fields

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/19990a966b7e9c0b3382509b01d9af47501547e1)
This commit is contained in:
hondacrx
2021-06-05 19:59:03 -04:00
parent 4f3d0c0ac6
commit 134b0e3287
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/Update/UpdateFields.cs
+28 -28
View File
@@ -3015,29 +3015,29 @@ namespace Game.Entities
public class PVPInfo : BaseUpdateData<Player> public class PVPInfo : BaseUpdateData<Player>
{ {
public UpdateField<bool> Field_20 = new(0, 1); public UpdateField<bool> Disqualified = new(0, 1);
public UpdateField<uint> Field_0 = new(0, 2); public UpdateField<uint> WeeklyPlayed = new(0, 2);
public UpdateField<uint> Field_4 = new(0, 3); public UpdateField<uint> WeeklyWon = new(0, 3);
public UpdateField<uint> Field_8 = new(0, 4); public UpdateField<uint> SeasonPlayed = new(0, 4);
public UpdateField<uint> Field_C = new(0, 5); public UpdateField<uint> SeasonWon = new(0, 5);
public UpdateField<uint> Rating = new(0, 6); public UpdateField<uint> Rating = new(0, 6);
public UpdateField<uint> Field_14 = new(0, 7); public UpdateField<uint> WeeklyBestRating = new(0, 7);
public UpdateField<uint> Field_18 = new(0, 8); public UpdateField<uint> SeasonBestRating = new(0, 8);
public UpdateField<uint> PvpTierID = new(0, 9); public UpdateField<uint> PvpTierID = new(0, 9);
public PVPInfo() : base(10) { } public PVPInfo() : base(10) { }
public void WriteCreate(WorldPacket data, Player owner, Player receiver) public void WriteCreate(WorldPacket data, Player owner, Player receiver)
{ {
data.WriteUInt32(Field_0); data.WriteUInt32(WeeklyPlayed);
data.WriteUInt32(Field_4); data.WriteUInt32(WeeklyWon);
data.WriteUInt32(Field_8); data.WriteUInt32(SeasonPlayed);
data.WriteUInt32(Field_C); data.WriteUInt32(SeasonWon);
data.WriteUInt32(Rating); data.WriteUInt32(Rating);
data.WriteUInt32(Field_14); data.WriteUInt32(WeeklyBestRating);
data.WriteUInt32(Field_18); data.WriteUInt32(SeasonBestRating);
data.WriteUInt32(PvpTierID); data.WriteUInt32(PvpTierID);
data.WriteBit((bool)Field_20); data.WriteBit(Disqualified);
data.FlushBits(); data.FlushBits();
} }
@@ -3053,7 +3053,7 @@ namespace Game.Entities
{ {
if (changesMask[1]) if (changesMask[1])
{ {
data.WriteBit(Field_20); data.WriteBit(Disqualified);
} }
} }
data.FlushBits(); data.FlushBits();
@@ -3061,19 +3061,19 @@ namespace Game.Entities
{ {
if (changesMask[2]) if (changesMask[2])
{ {
data.WriteUInt32(Field_0); data.WriteUInt32(WeeklyPlayed);
} }
if (changesMask[3]) if (changesMask[3])
{ {
data.WriteUInt32(Field_4); data.WriteUInt32(WeeklyWon);
} }
if (changesMask[4]) if (changesMask[4])
{ {
data.WriteUInt32(Field_8); data.WriteUInt32(SeasonPlayed);
} }
if (changesMask[5]) if (changesMask[5])
{ {
data.WriteUInt32(Field_C); data.WriteUInt32(SeasonWon);
} }
if (changesMask[6]) if (changesMask[6])
{ {
@@ -3081,11 +3081,11 @@ namespace Game.Entities
} }
if (changesMask[7]) if (changesMask[7])
{ {
data.WriteUInt32(Field_14); data.WriteUInt32(WeeklyBestRating);
} }
if (changesMask[8]) if (changesMask[8])
{ {
data.WriteUInt32(Field_18); data.WriteUInt32(SeasonBestRating);
} }
if (changesMask[9]) if (changesMask[9])
{ {
@@ -3097,14 +3097,14 @@ namespace Game.Entities
public override void ClearChangesMask() public override void ClearChangesMask()
{ {
ClearChangesMask(Field_20); ClearChangesMask(Disqualified);
ClearChangesMask(Field_0); ClearChangesMask(WeeklyPlayed);
ClearChangesMask(Field_4); ClearChangesMask(WeeklyWon);
ClearChangesMask(Field_8); ClearChangesMask(SeasonPlayed);
ClearChangesMask(Field_C); ClearChangesMask(SeasonWon);
ClearChangesMask(Rating); ClearChangesMask(Rating);
ClearChangesMask(Field_14); ClearChangesMask(WeeklyBestRating);
ClearChangesMask(Field_18); ClearChangesMask(SeasonBestRating);
ClearChangesMask(PvpTierID); ClearChangesMask(PvpTierID);
_changesMask.ResetAll(); _changesMask.ResetAll();
} }
Source/Game/Networking/Packets/BattleGroundPackets.cs
+2 -2
View File
@@ -530,7 +530,7 @@ namespace Game.Networking.Packets
public int BestSeasonRating; public int BestSeasonRating;
public int PvpTierID; public int PvpTierID;
public int Unused3; public int Unused3;
public bool Unused4; public bool Disqualified;
public void Write(WorldPacket data) public void Write(WorldPacket data)
{ {
@@ -547,7 +547,7 @@ namespace Game.Networking.Packets
data.WriteInt32(BestSeasonRating); data.WriteInt32(BestSeasonRating);
data.WriteInt32(PvpTierID); data.WriteInt32(PvpTierID);
data.WriteInt32(Unused3); data.WriteInt32(Unused3);
data.WriteBit(Unused4); data.WriteBit(Disqualified);
data.FlushBits(); data.FlushBits();
} }
} }
Source/Game/Networking/Packets/InspectPackets.cs
+6 -6
View File
@@ -297,9 +297,9 @@ namespace Game.Networking.Packets
data.WriteInt32(SeasonPlayed); data.WriteInt32(SeasonPlayed);
data.WriteInt32(SeasonWon); data.WriteInt32(SeasonWon);
data.WriteInt32(WeeklyBestRating); data.WriteInt32(WeeklyBestRating);
data.WriteInt32(Unk710); data.WriteInt32(SeasonBestRating);
data.WriteInt32(Unk801_1); data.WriteInt32(PvpTierID);
data.WriteBit(Unk801_2); data.WriteBit(Disqualified);
data.FlushBits(); data.FlushBits();
} }
@@ -310,10 +310,10 @@ namespace Game.Networking.Packets
public int SeasonPlayed; public int SeasonPlayed;
public int SeasonWon; public int SeasonWon;
public int WeeklyBestRating; public int WeeklyBestRating;
public int Unk710; public int SeasonBestRating;
public int Unk801_1; public int PvpTierID;
public byte Bracket; public byte Bracket;
public bool Unk801_2; public bool Disqualified;
} }
public struct AzeriteEssenceData public struct AzeriteEssenceData