From bee853f11f9a06fdd97641d6be7f6c4893865095 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Thu, 5 Feb 2026 11:15:26 +0100
Subject: [PATCH] Core/PacketIO: Fix some DifficultyID types in packets

---
 src/server/game/Server/Packets/CalendarPackets.cpp | 4 ++--
 src/server/game/Server/Packets/CalendarPackets.h   | 4 ++--
 src/server/game/Server/Packets/ScenarioPackets.cpp | 2 +-
 src/server/game/Server/Packets/ScenarioPackets.h   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/server/game/Server/Packets/CalendarPackets.cpp b/src/server/game/Server/Packets/CalendarPackets.cpp
index ac9bb48b28..129fbd5832 100644
--- a/src/server/game/Server/Packets/CalendarPackets.cpp
+++ b/src/server/game/Server/Packets/CalendarPackets.cpp
@@ -40,10 +40,10 @@ ByteBuffer& operator<<(ByteBuffer& data, CalendarSendCalendarEventInfo const& ev
 
 ByteBuffer& operator<<(ByteBuffer& data, CalendarSendCalendarRaidLockoutInfo const& lockoutInfo)
 {
-    data << uint64(lockoutInfo.InstanceID);
     data << int32(lockoutInfo.MapID);
-    data << uint32(lockoutInfo.DifficultyID);
+    data << int16(lockoutInfo.DifficultyID);
     data << int32(lockoutInfo.ExpireTime);
+    data << uint64(lockoutInfo.InstanceID);
 
     return data;
 }
diff --git a/src/server/game/Server/Packets/CalendarPackets.h b/src/server/game/Server/Packets/CalendarPackets.h
index a2dff4edbb..452f72c5e6 100644
--- a/src/server/game/Server/Packets/CalendarPackets.h
+++ b/src/server/game/Server/Packets/CalendarPackets.h
@@ -173,10 +173,10 @@ namespace WorldPackets
 
         struct CalendarSendCalendarRaidLockoutInfo
         {
-            uint64 InstanceID = 0;
             int32 MapID = 0;
-            uint32 DifficultyID = 0;
+            int16 DifficultyID = 0;
             int32 ExpireTime = 0;
+            uint64 InstanceID = 0;
         };
 
         struct CalendarSendCalendarEventInfo
diff --git a/src/server/game/Server/Packets/ScenarioPackets.cpp b/src/server/game/Server/Packets/ScenarioPackets.cpp
index 62268a909d..8c74808e5d 100644
--- a/src/server/game/Server/Packets/ScenarioPackets.cpp
+++ b/src/server/game/Server/Packets/ScenarioPackets.cpp
@@ -44,7 +44,7 @@ WorldPacket const* ScenarioState::Write()
     _worldPacket << ScenarioGUID;
     _worldPacket << int32(ScenarioID);
     _worldPacket << int32(CurrentStep);
-    _worldPacket << uint32(DifficultyID);
+    _worldPacket << int16(DifficultyID);
     _worldPacket << uint32(WaveCurrent);
     _worldPacket << uint32(WaveMax);
     _worldPacket << uint32(TimerDuration);
diff --git a/src/server/game/Server/Packets/ScenarioPackets.h b/src/server/game/Server/Packets/ScenarioPackets.h
index 5f38dd18be..aefda95115 100644
--- a/src/server/game/Server/Packets/ScenarioPackets.h
+++ b/src/server/game/Server/Packets/ScenarioPackets.h
@@ -50,7 +50,8 @@ public:
     ObjectGuid ScenarioGUID;
     int32 ScenarioID = 0;
     int32 CurrentStep = -1;
-    uint32 DifficultyID = 0;
+    bool ScenarioComplete = false;
+    int16 DifficultyID = 0;
     uint32 WaveCurrent = 0;
     uint32 WaveMax = 0;
     uint32 TimerDuration = 0;
@@ -59,7 +60,6 @@ public:
     std::vector<uint32> PickedSteps;
     std::vector<ScenarioSpellUpdate> Spells;
     ObjectGuid PlayerGUID;
-    bool ScenarioComplete = false;
 };
 
 class ScenarioProgressUpdate final : public ServerPacket