From db8a22ac8aa85e6f8df1288f89495993d580b9d2 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 7 Nov 2021 17:08:15 -0500 Subject: [PATCH] Core/PacketIO: Updated account data packets to 9.1.5 Port From (https://github.com/TrinityCore/TrinityCore/commit/966ae04f02608a42d3903b63772c07f5e83b81c5) --- Source/Framework/Constants/AccountConst.cs | 11 ++++++++--- Source/Game/Networking/Packets/ClientConfigPackets.cs | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Source/Framework/Constants/AccountConst.cs b/Source/Framework/Constants/AccountConst.cs index 8bcf92627..af605441a 100644 --- a/Source/Framework/Constants/AccountConst.cs +++ b/Source/Framework/Constants/AccountConst.cs @@ -27,10 +27,15 @@ namespace Framework.Constants PerCharacterMacrosCache = 0x05, PerCharacterLayoutCache = 0x06, PerCharacterChatCache = 0x07, - Max = 8, + GlobalTtsCache = 8, + PerCharacterTtsCache = 9, + GlobalFlaggedCache = 10, + PerCharacterFlaggedCache = 11, - GlobalCacheMask = 0x15, - PerCharacterCacheMask = 0xEA + Max = 12, + + GlobalCacheMask = 0x515, + PerCharacterCacheMask = 0xAEA } public enum TutorialAction diff --git a/Source/Game/Networking/Packets/ClientConfigPackets.cs b/Source/Game/Networking/Packets/ClientConfigPackets.cs index 3fcabdad0..fc702bb9b 100644 --- a/Source/Game/Networking/Packets/ClientConfigPackets.cs +++ b/Source/Game/Networking/Packets/ClientConfigPackets.cs @@ -58,7 +58,7 @@ namespace Game.Networking.Packets public override void Read() { PlayerGuid = _worldPacket.ReadPackedGuid(); - DataType = (AccountDataTypes)_worldPacket.ReadBits(3); + DataType = (AccountDataTypes)_worldPacket.ReadBits(4); } public ObjectGuid PlayerGuid; @@ -74,7 +74,7 @@ namespace Game.Networking.Packets _worldPacket.WritePackedGuid(Player); _worldPacket.WriteInt64(Time); _worldPacket.WriteUInt32(Size); - _worldPacket.WriteBits(DataType, 3); + _worldPacket.WriteBits(DataType, 4); if (CompressedData == null) _worldPacket.WriteUInt32(0); @@ -102,7 +102,7 @@ namespace Game.Networking.Packets PlayerGuid = _worldPacket.ReadPackedGuid(); Time = _worldPacket.ReadInt64(); Size = _worldPacket.ReadUInt32(); - DataType = (AccountDataTypes)_worldPacket.ReadBits(3); + DataType = (AccountDataTypes)_worldPacket.ReadBits(4); uint compressedSize = _worldPacket.ReadUInt32(); if (compressedSize != 0)