Synchronize changes from 1.6 master branch [ci skip]

4000ea4 Add new event onPlayerTeleport. (#3941)

Author: github-actions[bot]

Server/mods/deathmatch/logic/CGame.cpp

@@ -1641,6 +1641,7 @@ void CGame::AddBuiltInEvents()
     m_Events.AddEvent("onPlayerTriggerInvalidEvent", "eventName, isAdded, isRemote", nullptr, false);
     m_Events.AddEvent("onPlayerChangesProtectedData", "element, key, value", nullptr, false);
     m_Events.AddEvent("onPlayerChangesWorldSpecialProperty", "property, enabled", nullptr, false);
+    m_Events.AddEvent("onPlayerTeleport", "", nullptr, false);
 
     // Ped events
     m_Events.AddEvent("onPedVehicleEnter", "vehicle, seat, jacked", NULL, false);

Server/mods/deathmatch/logic/CMainConfig.cpp

@@ -1520,6 +1520,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, 5, 100, 500, "player_teleport_alert", &g_TickRateSettings.playerTeleportAlert, &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/CPlayer.h

@@ -265,6 +265,9 @@ class CPlayer final : public CPed, public CClient
     void SetRedirecting(bool bRedirecting) noexcept { m_bIsRedirecting = bRedirecting; }
     bool IsRedirecting() const noexcept { return m_bIsRedirecting; }
 
+    bool GetTeleported() const noexcept { return m_teleported; }
+    void SetTeleported(bool state) noexcept { m_teleported = state; }
+
 protected:
     bool ReadSpecialData(const int iLine) override { return true; }
 
@@ -465,4 +468,6 @@ class CPlayer final : public CPed, public CClient
 
     ushort  m_usPrevDimension;
     SString m_strQuitReasonForLog;
+
+    bool m_teleported = false;
 };

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -1274,6 +1274,12 @@ bool CStaticFunctionDefinitions::SetElementPosition(CElement* pElement, const CV
     assert(pElement);
     RUN_CHILDREN(SetElementPosition(*iter, vecPosition, bWarp))
 
+    if (IS_PLAYER(pElement)) 
+    {
+        CPlayer* player = static_cast<CPlayer*>(pElement);
+        player->SetTeleported(true);
+    }
+
     // Update our position for that entity.
     pElement->SetPosition(vecPosition);
 

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

@@ -132,6 +132,17 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
             position.data.vecPosition += vecTempPos;
         }
 
+        CVector playerPosition = pSourcePlayer->GetPosition();
+        float playerDistancePosition = DistanceBetweenPoints3D(playerPosition, position.data.vecPosition);
+        if (playerDistancePosition >= g_TickRateSettings.playerTeleportAlert) {
+            if (!pSourcePlayer->GetTeleported()) {
+                CLuaArguments arguments;
+                pSourcePlayer->CallEvent("onPlayerTeleport", arguments, nullptr);
+            }
+
+            pSourcePlayer->SetTeleported(false);
+        }
+
         pSourcePlayer->SetPosition(position.data.vecPosition);
 
         // Player rotation

Server/mods/deathmatch/mtaserver.conf

@@ -161,6 +161,10 @@
          Available range: 0 to 130. Default - 30 -->
     <vehicle_contact_sync_radius>30</vehicle_contact_sync_radius>
 
+    <!-- This parameter specifies the player position limit change alert.
+         Available range: 5 to 500. Default - 100 -->
+    <player_teleport_alert>100</player_teleport_alert>
+
     <!-- 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

@@ -162,6 +162,10 @@
          Available range: 0 to 130. Default - 30 -->
     <vehicle_contact_sync_radius>30</vehicle_contact_sync_radius>
 
+    <!-- This parameter specifies the player position limit change alert.
+         Available range: 5 to 500. Default - 100 -->
+    <player_teleport_alert>100</player_teleport_alert>
+
     <!-- 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/mods/deathmatch/logic/CTickRateSettings.h

@@ -26,6 +26,7 @@ struct CTickRateSettings
         iPedSyncerDistance = 100;
         iUnoccupiedVehicleSyncerDistance = 130;
         iVehicleContactSyncRadius = 30;
+        playerTeleportAlert = 100;
     }
 
     int iPureSync;
@@ -41,6 +42,7 @@ struct CTickRateSettings
     int iPedSyncerDistance;
     int iUnoccupiedVehicleSyncerDistance;
     int iVehicleContactSyncRadius;
+    int playerTeleportAlert;
 };
 
 extern CTickRateSettings g_TickRateSettings;