From af5b6968e0a28dbde7d92f3828dead0f1a936eec Mon Sep 17 00:00:00 2001
From: nweb <168659728+nweb@users.noreply.github.com>
Date: Fri, 22 Nov 2024 08:15:51 +1000
Subject: [PATCH] Fixed a bug with desynchronization of the values of some
 fields of the CTickRateSettings structure. (#3863)

---
 Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp             | 2 ++
 Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp
index d92ba4788b..fd305f6955 100644
--- a/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp
+++ b/Client/mods/deathmatch/logic/rpc/CWorldRPCs.cpp
@@ -619,6 +619,8 @@ void CWorldRPCs::SetSyncIntervals(NetBitStreamInterface& bitStream)
     bitStream.Read(g_TickRateSettings.iObjectSync);
     bitStream.Read(g_TickRateSettings.iKeySyncRotation);
     bitStream.Read(g_TickRateSettings.iKeySyncAnalogMove);
+    bitStream.Read(g_TickRateSettings.iPedSyncerDistance);
+    bitStream.Read(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
 }
 
 void CWorldRPCs::SetMoonSize(NetBitStreamInterface& bitStream)
diff --git a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
index b4d1de641f..930e814879 100644
--- a/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
+++ b/Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -10861,6 +10861,8 @@ bool CStaticFunctionDefinitions::SendSyncIntervals(CPlayer* pPlayer)
     BitStream.pBitStream->Write(g_TickRateSettings.iObjectSync);
     BitStream.pBitStream->Write(g_TickRateSettings.iKeySyncRotation);
     BitStream.pBitStream->Write(g_TickRateSettings.iKeySyncAnalogMove);
+    BitStream.pBitStream->Write(g_TickRateSettings.iPedSyncerDistance);
+    BitStream.pBitStream->Write(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
     if (pPlayer)
         pPlayer->Send(CLuaPacket(SET_SYNC_INTERVALS, *BitStream.pBitStream));
     else