From 46b0f6df11aeb9cbc7c705984e39b65b31fc5348 Mon Sep 17 00:00:00 2001
From: MegadreamsBE <sleeubusjordy@gmail.com>
Date: Mon, 10 Jun 2024 11:50:41 -0400
Subject: [PATCH] Remove object contact checks

---
 Server/mods/deathmatch/logic/CMainConfig.cpp         |  1 -
 .../logic/packets/CPlayerPuresyncPacket.cpp          | 12 +++++-------
 Server/mods/deathmatch/mtaserver.conf                |  4 ----
 Server/mods/deathmatch/mtaserver.conf.template       |  4 ----
 Shared/mods/deathmatch/logic/CTickRateSettings.h     |  2 --
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Server/mods/deathmatch/logic/CMainConfig.cpp b/Server/mods/deathmatch/logic/CMainConfig.cpp
index 5f73f811dc9..f524dc4abc3 100644
--- a/Server/mods/deathmatch/logic/CMainConfig.cpp
+++ b/Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -1456,7 +1456,6 @@ const std::vector<SIntSetting>& CMainConfig::GetIntSettingList()
         {true, true, 50, 100, 400, "ped_syncer_distance", &g_TickRateSettings.iPedSyncerDistance, &CMainConfig::OnTickRateChange},
         {true, true, 50, 130, 400, "unoccupied_vehicle_syncer_distance", &g_TickRateSettings.iUnoccupiedVehicleSyncerDistance, &CMainConfig::OnTickRateChange},
         {true, true, 0, 30, 130, "vehicle_contact_sync_radius", &g_TickRateSettings.iVehicleContactSyncRadius, &CMainConfig::OnTickRateChange},
-        {true, true, 0, 200, 300, "object_contact_sync_radius", &g_TickRateSettings.iObjectContactSyncRadius, &CMainConfig::OnTickRateChange},
         {false, false, 0, 1, 2, "compact_internal_databases", &m_iCompactInternalDatabases, NULL},
         {true, true, 0, 1, 2, "minclientversion_auto_update", &m_iMinClientVersionAutoUpdate, NULL},
         {true, true, 0, 0, 100, "server_logic_fps_limit", &m_iServerLogicFpsLimit, NULL},
diff --git a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
index e710cd75db0..399d3c0b353 100644
--- a/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
+++ b/Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
@@ -74,10 +74,9 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
 
         // Player position
         SPositionSync position(false);
-        if (!BitStream.Read(&position))
-            return false;
+        bool          positionRead = BitStream.Read(&position);
 
-        if (pContactElement != nullptr)
+        if (positionRead && pContactElement != nullptr)
         {
             int32_t radius = -1;
 
@@ -87,10 +86,6 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
                     if (((CVehicle*)pContactElement)->GetSyncer() != pSourcePlayer)
                         radius = g_TickRateSettings.iVehicleContactSyncRadius;
                     break;
-                case CElement::OBJECT:
-                    if (((CObject*)pContactElement)->GetSyncer() != pSourcePlayer)
-                        radius = g_TickRateSettings.iObjectContactSyncRadius;
-                    break;
             }
 
             if (radius > -1 && 
@@ -122,6 +117,9 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
             pSourcePlayer->CallEvent("onPlayerContact", Arguments);
         }
 
+        if (!positionRead)
+            return false;
+
         if (pContactElement)
         {
             pSourcePlayer->SetContactPosition(position.data.vecPosition);
diff --git a/Server/mods/deathmatch/mtaserver.conf b/Server/mods/deathmatch/mtaserver.conf
index 7cb87cbb5f7..19fe4a05d83 100644
--- a/Server/mods/deathmatch/mtaserver.conf
+++ b/Server/mods/deathmatch/mtaserver.conf
@@ -139,10 +139,6 @@
          Available range: 0 to 130. Default - 30 -->
     <vehicle_contact_sync_radius>30</vehicle_contact_sync_radius>
 
-    <!-- This parameter specifies the radius in which any contact with a object will turn the player into its syncer.
-         Available range: 0 to 300. Default - 200 -->
-    <object_contact_sync_radius>200</object_contact_sync_radius>
-
     <!-- This parameter sets the amount of extrapolation that clients will apply to remote vehicles. This can reduce
          some of the latency induced location disparency by predicting where the remote vehicles will probably be.
          Depending on the gamemode, an incorrect prediction may have a negative effect. Therefore this setting
diff --git a/Server/mods/deathmatch/mtaserver.conf.template b/Server/mods/deathmatch/mtaserver.conf.template
index bafe216d9f7..faf1c71a6d2 100644
--- a/Server/mods/deathmatch/mtaserver.conf.template
+++ b/Server/mods/deathmatch/mtaserver.conf.template
@@ -140,10 +140,6 @@
          Available range: 0 to 130. Default - 30 -->
     <vehicle_contact_sync_radius>30</vehicle_contact_sync_radius>
 
-    <!-- This parameter specifies the radius in which any contact with a object will turn the player into its syncer.
-         Available range: 0 to 300. Default - 200 -->
-    <object_contact_sync_radius>200</object_contact_sync_radius>
-
     <!-- This parameter sets the amount of extrapolation that clients will apply to remote vehicles. This can reduce
          some of the latency induced location disparency by predicting where the remote vehicles will probably be.
          Depending on the gamemode, an incorrect prediction may have a negative effect. Therefore this setting
diff --git a/Shared/mods/deathmatch/logic/CTickRateSettings.h b/Shared/mods/deathmatch/logic/CTickRateSettings.h
index f371ecc6813..0a199af241e 100644
--- a/Shared/mods/deathmatch/logic/CTickRateSettings.h
+++ b/Shared/mods/deathmatch/logic/CTickRateSettings.h
@@ -26,7 +26,6 @@ struct CTickRateSettings
         iPedSyncerDistance = 100;
         iUnoccupiedVehicleSyncerDistance = 130;
         iVehicleContactSyncRadius = 30;
-        iObjectContactSyncRadius = 200;
     }
 
     int iPureSync;
@@ -42,7 +41,6 @@ struct CTickRateSettings
     int iPedSyncerDistance;
     int iUnoccupiedVehicleSyncerDistance;
     int iVehicleContactSyncRadius;
-    int iObjectContactSyncRadius;
 };
 
 extern CTickRateSettings g_TickRateSettings;