Core/PacketIO: Fix some DifficultyID types in packets

Signed-off-by: luis <[email protected]>
2026-02-06 14:08:04 -03:00
parent 18d20a2193
commit f4065e2724
4 changed files with 7 additions and 7 deletions
@@ -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;
 }
@@ -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
@@ -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);
@@ -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