Merge branch 'multitheftauto:master' into attach

Author: Nico8340

Client/loader/Install.cpp

@@ -765,6 +765,9 @@ static int RunInstall()
                     // If the first attempt didn't work, check if any process is locking one of the files.
                     TerminateFileLockingProcesses(file.targetFile.absolutePath, file.relativePath);
                     TerminateFileLockingProcesses(file.sourceFile.absolutePath, file.relativePath);
+
+                    // Ensure the checksum of the source file is correct (in case the archive reported checksum is invalid).
+                    file.sourceFile.ComputeChecksum();
                 }
 
                 Sleep(OPERATION_RETRY_DELAY_IN_MS);

Client/mods/deathmatch/logic/CNetAPI.cpp

@@ -2262,6 +2262,8 @@ void CNetAPI::ReadBulletsync(CClientPlayer* pPlayer, NetBitStreamInterface& BitS
     // Read the bulletsync data
     uchar ucWeapon = 0;
     BitStream.Read(ucWeapon);
+    if (!CClientPickupManager::IsValidWeaponID(ucWeapon))
+        return;
     eWeaponType weaponType = (eWeaponType)ucWeapon;
 
     CVector vecStart, vecEnd;

Server/dbconmy/CDatabaseConnectionMySql.cpp

@@ -80,13 +80,16 @@ CDatabaseConnectionMySql::CDatabaseConnectionMySql(CDatabaseType* pManager, cons
                                                    const SString& strOptions)
     : m_iRefCount(1), m_pManager(pManager)
 {
+    int getServerPublicKey;
+
     // Parse options string
     CArgMap optionsMap("=", ";");
     optionsMap.SetFromString(strOptions);
     optionsMap.Get("autoreconnect", m_bAutomaticReconnect, 1);
     optionsMap.Get("batch", m_bAutomaticTransactionsEnabled, 1);
     optionsMap.Get("multi_statements", m_bMultipleStatements, 0);
     optionsMap.Get("use_ssl", m_bUseSSL, 0);
+    optionsMap.Get("get_server_public_key", getServerPublicKey, 1);
 
     SString strHostname;
     SString strDatabaseName;
@@ -115,6 +118,8 @@ CDatabaseConnectionMySql::CDatabaseConnectionMySql(CDatabaseType* pManager, cons
             mysql_options(m_handle, MYSQL_SET_CHARSET_NAME, strCharset);
         if (m_bMultipleStatements)
             ulClientFlags |= CLIENT_MULTI_STATEMENTS;
+        bool getServerPublicKeyOpt = (getServerPublicKey != 0);
+        mysql_options(m_handle, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &getServerPublicKeyOpt);
 
         if (mysql_real_connect(m_handle, strHostname, strUsername, strPassword, strDatabaseName, iPort, strUnixSocket, ulClientFlags))
             m_bOpened = true;

Server/mods/deathmatch/logic/CMainConfig.cpp

@@ -1456,6 +1456,7 @@ 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},

Server/mods/deathmatch/logic/net/CSimBulletsyncPacket.cpp

@@ -9,6 +9,7 @@
 
 #include "StdInc.h"
 #include "SimHeaders.h"
+#include "CPickupManager.h"
 
 CSimBulletsyncPacket::CSimBulletsyncPacket(ElementID PlayerID) : m_PlayerID(PlayerID)
 {
@@ -25,11 +26,9 @@ bool CSimBulletsyncPacket::Read(NetBitStreamInterface& BitStream)
 {
     char cWeaponType;
     BitStream.Read(cWeaponType);
-    auto weaponType = static_cast<eWeaponType>(cWeaponType);
-    if (!(weaponType >= WEAPONTYPE_UNARMED && weaponType < WEAPONTYPE_LAST_WEAPONTYPE))
+    if (!CPickupManager::IsValidWeaponID(cWeaponType))
         return false;
-
-    m_Cache.weaponType = weaponType;
+    m_Cache.weaponType = (eWeaponType)cWeaponType;
 
     BitStream.Read((char*)&m_Cache.vecStart, sizeof(CVector));
     BitStream.Read((char*)&m_Cache.vecEnd, sizeof(CVector));

Server/mods/deathmatch/logic/net/CSimPlayerManager.cpp

@@ -358,8 +358,11 @@ bool CSimPlayerManager::HandleBulletSync(const NetServerPlayerID& Socket, NetBit
 
         if (pPacket->Read(*BitStream))
         {
-            // Relay it to nearbyers
-            Broadcast(*pPacket, pSourceSimPlayer->GetPuresyncSendList());
+            // Relay it to nearbyers, if the player really has this weapon
+            if (pSourceSimPlayer->m_pRealPlayer->HasWeaponType(pPacket->m_Cache.weaponType))
+            {
+                Broadcast(*pPacket, pSourceSimPlayer->GetPuresyncSendList());
+            }
         }
 
         delete pPacket;

Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp

@@ -77,13 +77,30 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
         if (!BitStream.Read(&position))
             return false;
 
-        if (pContactElement != nullptr &&
-            (!IsPointNearPoint3D(pSourcePlayer->GetPosition(), pContactElement->GetPosition(), g_TickRateSettings.iVehicleContactSyncRadius) ||
-                pSourcePlayer->GetDimension() != pContactElement->GetDimension()))
+        if (pContactElement != nullptr)
         {
-            pContactElement = nullptr;
-            // Use current player position. They are not reporting their absolute position so we have to disregard it.
-            position.data.vecPosition = pSourcePlayer->GetPosition();
+            int32_t radius = -1;
+
+            switch (pContactElement->GetType())
+            {
+                case CElement::VEHICLE:
+                    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 && 
+                (!IsPointNearPoint3D(pSourcePlayer->GetPosition(), pContactElement->GetPosition(), radius) ||
+                    pSourcePlayer->GetDimension() != pContactElement->GetDimension()))
+            {
+                pContactElement = nullptr;
+                // Use current player position. They are not reporting their absolute position so we have to disregard it.
+                position.data.vecPosition = pSourcePlayer->GetPosition();
+            }
         }
 
         CElement* pPreviousContactElement = pSourcePlayer->GetContactElement();

Server/mods/deathmatch/mtaserver.conf

@@ -139,6 +139,10 @@
          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

Server/mods/deathmatch/mtaserver.conf.template

@@ -140,6 +140,10 @@
          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

Shared/data/MTA San Andreas/MTA/locale/en_US/client.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MTA San Andreas 1.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-23 17:55+0000\n"
+"POT-Creation-Date: 2024-06-06 17:33+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -437,11 +437,11 @@ msgid ""
 "I want my PC to lag and be part of a botnet."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:901 Client/loader/Install.cpp:849
+#: Client/loader/Dialogs.cpp:901 Client/loader/Install.cpp:852
 msgid "Installing update..."
 msgstr ""
 
-#: Client/loader/Dialogs.cpp:909 Client/loader/Install.cpp:931
+#: Client/loader/Dialogs.cpp:909 Client/loader/Install.cpp:934
 msgid "Extracting files..."
 msgstr ""