From 187876ceb565304a4d88e507a0bff800d0062cd8 Mon Sep 17 00:00:00 2001
From: Hondacrx <prelude_20032002@yahoo.com>
Date: Mon, 25 Aug 2025 22:08:58 -0400
Subject: [PATCH] Core/PacketIO: Fixed updatefields structure for 11.2.0

Port From (https://github.com/TrinityCore/TrinityCore/commit/88e49b1e12603f98674b130e8823470a2e2754fc)
---
 Source/Game/Entities/Object/Update/UpdateFields.cs | 14 +++++++-------
 .../Networking/Packets/MythicPlusPacketsCommon.cs  |  2 ++
 .../Packets/PerksPorgramPacketsCommon.cs           |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Source/Game/Entities/Object/Update/UpdateFields.cs b/Source/Game/Entities/Object/Update/UpdateFields.cs
index 153e729e8..e23128db7 100644
--- a/Source/Game/Entities/Object/Update/UpdateFields.cs
+++ b/Source/Game/Entities/Object/Update/UpdateFields.cs
@@ -4303,14 +4303,14 @@ namespace Game.Entities
 
     public class CompletedProject() : HasChangesMask(4)
     {
-        public UpdateField<uint> ProjectID = new(0, 1);
-        public UpdateField<long> FirstCompleted = new(0, 2);
+        public UpdateField<long> FirstCompleted = new(0, 1);
+        public UpdateField<uint> ProjectID = new(0, 2);
         public UpdateField<uint> CompletionCount = new(0, 3);
 
         public void WriteCreate(WorldPacket data, Player owner, Player receiver)
         {
-            data.WriteUInt32(ProjectID);
             data.WriteInt64(FirstCompleted);
+            data.WriteUInt32(ProjectID);
             data.WriteUInt32(CompletionCount);
         }
 
@@ -4327,11 +4327,11 @@ namespace Game.Entities
             {
                 if (changesMask[1])
                 {
-                    data.WriteUInt32(ProjectID);
+                    data.WriteInt64(FirstCompleted);
                 }
                 if (changesMask[2])
                 {
-                    data.WriteInt64(FirstCompleted);
+                    data.WriteUInt32(ProjectID);
                 }
                 if (changesMask[3])
                 {
@@ -9349,7 +9349,7 @@ namespace Game.Entities
             {
                 ShapeData.Get<AreaTriggerBox>().WriteCreate(data, owner, receiver);
             }
-            if (ShapeType == 3)
+            if (ShapeType == 2 || ShapeType == 3 || ShapeType == 5 || ShapeType == 6)
             {
                 ShapeData.Get<AreaTriggerPolygon>().WriteCreate(data, owner, receiver);
             }
@@ -9532,7 +9532,7 @@ namespace Game.Entities
                     {
                         ShapeData.Get<AreaTriggerBox>().WriteUpdate(data, ignoreNestedChangesMask, owner, receiver);
                     }
-                    if (ShapeType == 3)
+                    if (ShapeType == 2 || ShapeType == 3 || ShapeType == 5 || ShapeType == 6)
                     {
                         ShapeData.Get<AreaTriggerPolygon>().WriteUpdate(data, ignoreNestedChangesMask, owner, receiver);
                     }
diff --git a/Source/Game/Networking/Packets/MythicPlusPacketsCommon.cs b/Source/Game/Networking/Packets/MythicPlusPacketsCommon.cs
index 3d2d453d1..94907cc10 100644
--- a/Source/Game/Networking/Packets/MythicPlusPacketsCommon.cs
+++ b/Source/Game/Networking/Packets/MythicPlusPacketsCommon.cs
@@ -84,6 +84,7 @@ namespace Game.Networking.Packets
         public int Season;
         public List<MythicPlusMember> Members = new();
         public float RunScore;
+        public int Unknown_1120;
         public int[] KeystoneAffixIDs = new int[4];
 
         public void Write(WorldPacket data)
@@ -99,6 +100,7 @@ namespace Game.Networking.Packets
 
             data.WriteInt32(Members.Count);
             data.WriteFloat(RunScore);
+            data.WriteInt32(Unknown_1120);
             foreach (var member in Members)
                 member.Write(data);
 
diff --git a/Source/Game/Networking/Packets/PerksPorgramPacketsCommon.cs b/Source/Game/Networking/Packets/PerksPorgramPacketsCommon.cs
index 8ba1072c1..ac43a6d5a 100644
--- a/Source/Game/Networking/Packets/PerksPorgramPacketsCommon.cs
+++ b/Source/Game/Networking/Packets/PerksPorgramPacketsCommon.cs
@@ -21,6 +21,7 @@ namespace Game.Networking.Packets
 
         public void Write(WorldPacket data)
         {
+            data.WriteInt64(AvailableUntil);
             data.WriteInt32(VendorItemID);
             data.WriteInt32(MountID);
             data.WriteInt32(BattlePetSpeciesID);
@@ -30,7 +31,6 @@ namespace Game.Networking.Packets
             data.WriteInt32(ToyID);
             data.WriteInt32(Price);
             data.WriteInt32(OriginalPrice);
-            data.WriteInt64(AvailableUntil);
             data.WriteInt32(WarbandSceneID);
             data.WriteBit(Disabled);
             data.WriteBit(DoesNotExpire);