Core: Updated to 10.0.5

Port From (https://github.com/TrinityCore/TrinityCore/commit/4bec7233badf9d3ab71dbdde8b24f66f7c4eedfb)
This commit is contained in:
hondacrx
2023-01-30 10:07:42 -05:00
parent e982be523a
commit 08fcedaf21
25 changed files with 1684 additions and 1470 deletions
@@ -478,7 +478,11 @@ namespace Game.Networking.Packets
_worldPacket.WriteUInt32(BattlemasterListID);
_worldPacket.WriteBit(Registered);
_worldPacket.WriteBit(AffectsRating);
_worldPacket.WriteBit(DeserterPenalty != null);
_worldPacket.FlushBits();
if (DeserterPenalty != null)
DeserterPenalty.Write(_worldPacket);
}
public enum MatchState
@@ -492,6 +496,7 @@ namespace Game.Networking.Packets
public MatchState State = MatchState.Inactive;
public long StartTime;
public int Duration;
public RatedMatchDeserterPenalty DeserterPenalty;
public byte ArenaFaction;
public uint BattlemasterListID;
public bool Registered;
@@ -598,6 +603,20 @@ namespace Game.Networking.Packets
}
}
class RatedMatchDeserterPenalty
{
public int PersonalRatingChange;
public int QueuePenaltySpellID;
public int QueuePenaltyDuration;
public void Write(WorldPacket data)
{
data.WriteInt32(PersonalRatingChange);
data.WriteInt32(QueuePenaltySpellID);
data.WriteInt32(QueuePenaltyDuration);
}
}
public class PVPMatchStatistics
{
public List<PVPMatchPlayerStatistics> Statistics = new();
@@ -21,11 +21,12 @@ namespace Game.Networking.Packets
class CraftingData
{
public int CraftingQualityID;
public int field_4;
public int field_8;
public float QualityProgress;
public int SkillLineAbilityID;
public int CraftingDataID;
public int Multicraft;
public int field_10;
public int field_14;
public int SkillFromReagents;
public int Skill;
public int CritBonusSkill;
public float field_1C;
public ulong field_20;
@@ -44,11 +45,12 @@ namespace Game.Networking.Packets
public void Write(WorldPacket data)
{
data.WriteInt32(CraftingQualityID);
data.WriteInt32(field_4);
data.WriteInt32(field_8);
data.WriteFloat(QualityProgress);
data.WriteInt32(SkillLineAbilityID);
data.WriteInt32(CraftingDataID);
data.WriteInt32(Multicraft);
data.WriteInt32(field_10);
data.WriteInt32(field_14);
data.WriteInt32(SkillFromReagents);
data.WriteInt32(Skill);
data.WriteInt32(CritBonusSkill);
data.WriteFloat(field_1C);
data.WriteUInt64(field_20);
+27 -27
View File
@@ -49,7 +49,7 @@ namespace Game.Networking.Packets
}
public ObjectGuid Mailbox;
public uint MailID;
public ulong MailID;
}
public class SendMail : ClientPacket
@@ -115,20 +115,20 @@ namespace Game.Networking.Packets
public override void Write()
{
_worldPacket.WriteUInt32(MailID);
_worldPacket.WriteUInt32(Command);
_worldPacket.WriteUInt32(ErrorCode);
_worldPacket.WriteUInt32(BagResult);
_worldPacket.WriteUInt32(AttachID);
_worldPacket.WriteUInt32(QtyInInventory);
_worldPacket.WriteUInt64(MailID);
_worldPacket.WriteInt32(Command);
_worldPacket.WriteInt32(ErrorCode);
_worldPacket.WriteInt32(BagResult);
_worldPacket.WriteUInt64(AttachID);
_worldPacket.WriteInt32(QtyInInventory);
}
public uint MailID;
public uint Command;
public uint ErrorCode;
public uint BagResult;
public uint AttachID;
public uint QtyInInventory;
public ulong MailID;
public int Command;
public int ErrorCode;
public int BagResult;
public ulong AttachID;
public int QtyInInventory;
}
public class MailReturnToSender : ClientPacket
@@ -141,7 +141,7 @@ namespace Game.Networking.Packets
SenderGUID = _worldPacket.ReadPackedGuid();
}
public uint MailID;
public ulong MailID;
public ObjectGuid SenderGUID;
}
@@ -156,7 +156,7 @@ namespace Game.Networking.Packets
}
public ObjectGuid Mailbox;
public uint MailID;
public ulong MailID;
}
public class MailDelete : ClientPacket
@@ -169,7 +169,7 @@ namespace Game.Networking.Packets
DeleteReason = _worldPacket.ReadInt32();
}
public uint MailID;
public ulong MailID;
public int DeleteReason;
}
@@ -185,8 +185,8 @@ namespace Game.Networking.Packets
}
public ObjectGuid Mailbox;
public uint MailID;
public uint AttachID;
public ulong MailID;
public ulong AttachID;
}
public class MailTakeMoney : ClientPacket
@@ -197,12 +197,12 @@ namespace Game.Networking.Packets
{
Mailbox = _worldPacket.ReadPackedGuid();
MailID = _worldPacket.ReadUInt32();
Money = _worldPacket.ReadInt64();
Money = _worldPacket.ReadUInt64();
}
public ObjectGuid Mailbox;
public uint MailID;
public long Money;
public ulong MailID;
public ulong Money;
}
public class MailQueryNextMailTime : ClientPacket
@@ -285,7 +285,7 @@ namespace Game.Networking.Packets
public MailAttachedItem(Item item, byte pos)
{
Position = pos;
AttachID = (int)item.GetGUID().GetCounter();
AttachID = item.GetGUID().GetCounter();
Item = new ItemInstance(item);
Count = item.GetCount();
Charges = item.GetSpellCharges();
@@ -318,7 +318,7 @@ namespace Game.Networking.Packets
public void Write(WorldPacket data)
{
data.WriteUInt8(Position);
data.WriteInt32(AttachID);
data.WriteUInt64(AttachID);
data.WriteUInt32(Count);
data.WriteInt32(Charges);
data.WriteUInt32(MaxDurability);
@@ -337,7 +337,7 @@ namespace Game.Networking.Packets
}
public byte Position;
public int AttachID;
public ulong AttachID;
public ItemInstance Item;
public uint Count;
public int Charges;
@@ -352,7 +352,7 @@ namespace Game.Networking.Packets
{
public MailListEntry(Mail mail, Player player)
{
MailID = (int)mail.messageID;
MailID = mail.messageID;
SenderType = (byte)mail.messageType;
switch (mail.messageType)
@@ -387,7 +387,7 @@ namespace Game.Networking.Packets
public void Write(WorldPacket data)
{
data.WriteInt32(MailID);
data.WriteUInt64(MailID);
data.WriteUInt8(SenderType);
data.WriteUInt64(Cod);
data.WriteInt32(StationeryID);
@@ -415,7 +415,7 @@ namespace Game.Networking.Packets
data.WriteString(Body);
}
public int MailID;
public ulong MailID;
public byte SenderType;
public ObjectGuid? SenderCharacter;
public uint? AltSenderID;
@@ -0,0 +1,34 @@
// Copyright (c) CypherCore <http://github.com/CypherCore> All rights reserved.
// Licensed under the GNU GENERAL PUBLIC LICENSE. See LICENSE file in the project root for full license information.
namespace Game.Networking.Packets
{
public struct PerksVendorItem
{
public int VendorItemID;
public int MountID;
public int BattlePetSpeciesID;
public int TransmogSetID;
public int ItemModifiedAppearanceID;
public int Field_14;
public int Field_18;
public int Price;
public long AvailableUntil;
public bool Disabled;
public void Write(WorldPacket data)
{
data.WriteInt32(VendorItemID);
data.WriteInt32(MountID);
data.WriteInt32(BattlePetSpeciesID);
data.WriteInt32(TransmogSetID);
data.WriteInt32(ItemModifiedAppearanceID);
data.WriteInt32(Field_14);
data.WriteInt32(Field_18);
data.WriteInt32(Price);
data.WriteInt64(AvailableUntil);
data.WriteBit(Disabled);
data.FlushBits();
}
}
}
@@ -28,6 +28,21 @@ namespace Game.Networking.Packets
public override void Read() { }
}
class QuestGiverStatusTrackedQuery : ClientPacket
{
public List<ObjectGuid> QuestGiverGUIDs = new();
public QuestGiverStatusTrackedQuery(WorldPacket packet) : base(packet) { }
public override void Read()
{
uint guidCount = _worldPacket.ReadUInt32();
for (uint i = 0; i < guidCount; ++i)
QuestGiverGUIDs.Add(_worldPacket.ReadPackedGuid());
}
}
public class QuestGiverStatusPkt : ServerPacket
{
public QuestGiverStatusPkt() : base(ServerOpcodes.QuestGiverStatus, ConnectionType.Instance)
@@ -899,11 +899,9 @@ namespace Game.Networking.Packets
public override void Read()
{
UnitGUID = _worldPacket.ReadPackedGuid();
DisplayID = _worldPacket.ReadUInt32();
}
public ObjectGuid UnitGUID;
public uint DisplayID;
}
class MirrorImageComponentedData : ServerPacket
@@ -17,9 +17,6 @@ namespace Game.Networking.Packets
{
_worldPacket.WriteUInt8(ComplaintStatus);
_worldPacket.WriteUInt32(ScrollOfResurrectionRequestsRemaining);
_worldPacket.WriteUInt32(ScrollOfResurrectionMaxRequestsPerDay);
_worldPacket.WriteUInt32(CfgRealmID);
_worldPacket.WriteInt32(CfgRealmRecID);
@@ -51,7 +48,6 @@ namespace Game.Networking.Packets
_worldPacket.WriteBit(VoiceEnabled);
_worldPacket.WriteBit(EuropaTicketSystemStatus.HasValue);
_worldPacket.WriteBit(ScrollOfResurrectionEnabled);
_worldPacket.WriteBit(BpayStoreEnabled);
_worldPacket.WriteBit(BpayStoreAvailable);
_worldPacket.WriteBit(BpayStoreDisabledByParentalControls);
@@ -140,10 +136,7 @@ namespace Game.Networking.Packets
public bool BpayStoreAvailable;
public bool BpayStoreEnabled;
public SessionAlertConfig? SessionAlert;
public uint ScrollOfResurrectionMaxRequestsPerDay;
public bool ScrollOfResurrectionEnabled;
public EuropaTicketConfig? EuropaTicketSystemStatus;
public uint ScrollOfResurrectionRequestsRemaining;
public uint CfgRealmID;
public byte ComplaintStatus;
public int CfgRealmRecID;
+10 -10
View File
@@ -328,7 +328,7 @@ namespace Game.Networking.Packets
{
public void Read(WorldPacket data)
{
MailID = data.ReadInt32();
MailID = data.ReadUInt64();
uint bodyLength = data.ReadBits<uint>(13);
uint subjectLength = data.ReadBits<uint>(9);
@@ -336,7 +336,7 @@ namespace Game.Networking.Packets
MailSubject = data.ReadString(subjectLength);
}
public int MailID;
public ulong MailID;
public string MailSubject;
public string MailBody;
}
@@ -479,7 +479,7 @@ namespace Game.Networking.Packets
switch (ComplaintType)
{
case SupportSpamType.Mail:
MailID = _worldPacket.ReadUInt32();
MailID = _worldPacket.ReadUInt64();
break;
case SupportSpamType.Chat:
Chat.Read(_worldPacket);
@@ -492,14 +492,14 @@ namespace Game.Networking.Packets
}
public SupportSpamType ComplaintType;
ComplaintOffender Offender;
uint MailID;
ComplaintChat Chat;
public ComplaintOffender Offender;
public ulong MailID;
public ComplaintChat Chat;
ulong EventGuid;
ulong InviteGuid;
public ulong EventGuid;
public ulong InviteGuid;
struct ComplaintOffender
public struct ComplaintOffender
{
public void Read(WorldPacket data)
{
@@ -513,7 +513,7 @@ namespace Game.Networking.Packets
public uint TimeSinceOffence;
}
struct ComplaintChat
public struct ComplaintChat
{
public void Read(WorldPacket data)
{