Merge branch 'openmultiplayer:master' into master

Author: Lasho4

Dockerfile

@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh && \
 
 # Node
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION 16.13.2
+ENV NODE_VERSION 18.20.5
 
 RUN mkdir -p $NVM_DIR && \
     curl --silent -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash \

app/transports/api/launcher/api.go

@@ -38,8 +38,8 @@ func Build() fx.Option {
 
 			launcherInfo := map[string]string{
 				"version":           cfg.LauncherVersion,
-				"download":          "https://github.com/openmultiplayer/launcher/releases",
-				"ompPluginChecksum": "b81c9553157075942c9522678f4baadf",
+				"download":          "https://github.com/openmultiplayer/launcher/releases/latest",
+				"ompPluginChecksum": "ca45d1dfc7d0a5cdcea680da6be5390a",
 				"ompPluginDownload": "https://assets.open.mp/omp-client.dll",
 				"changelog": `|- Build 1 - 2023/10/08
 Release beta version`,

docs/client/ClientOnLinux.md

@@ -5,7 +5,7 @@
 
 
 To get the client to run you need to download the launcher, and [omp-client.dll](https://assets.open.mp/omp-client.dll). \
-Then you need to put omp-client.dll in the AppData\Local\com.open.mp\omp\ folder of your prefix.\
+Then you need to put omp-client.dll in the AppData\Local\mp.open.launcher\omp\ folder of your prefix.\
 After that, you can execute the open mp launcher through the cli, or make a batch file like the one below, so that you can add it to your launcher of choice.
 
 ### Here is a sample .bat file for editing

docs/scripting/functions/IsPlayerUsingOfficialClient.md

@@ -35,4 +35,5 @@ public OnPlayerConnect(playerid)
 
 ## Related Functions
 
+- [IsPlayerUsingOmp](IsPlayerUsingOmp): Check if the player is using the open.mp launcher.
 - [SendClientCheck](SendClientCheck): Perform a memory check on the client.

docs/scripting/functions/IsPlayerUsingOmp.md

@@ -0,0 +1,46 @@
+---
+title: IsPlayerUsingOmp
+description: Check if the player is using the open.mp launcher.
+tags: ["player"]
+---
+
+<VersionWarn version='omp 1.4.0.2779' />
+
+## Description
+
+Check if the player is using the open.mp launcher.
+
+| Name     | Description                                                 |
+| -------- | ----------------------------------------------------------- |
+| playerid | The ID of the player to check.       |
+
+## Returns
+
+Returns 1 if the player is using the open.mp launcher, otherwise 0.
+
+## Examples
+
+```c
+public OnPlayerConnect(playerid)
+{
+    // Player is using the open.mp launcher
+    if(IsPlayerUsingOmp(playerid))
+    {
+        SendClientMessage(playerid, -1, "You are using the open.mp launcher.");
+    }
+
+    // Player is not using the open.mp launcher
+    else
+    {
+        SendClientMessage(playerid, 0xFF0000FF, "[KICK]: You don't seem to be using the open.mp launcher");
+        Kick(playerid);
+    }
+
+    return 1;
+}
+```
+
+## Related Functions
+
+- [IsPlayerUsingOfficialClient](IsPlayerUsingOfficialClient): Check if the player is using the official SA-MP client.
+- [SendClientCheck](SendClientCheck): Perform a memory check on the client.

docs/scripting/functions/PutPlayerInVehicle.md

@@ -18,16 +18,48 @@ Puts a player in a vehicle.
 
 **true** - The function was executed successfully.
 
-**false** - The function failed to execute. The player or vehicle don't exist.
+**false** - The function failed to execute. The player or vehicle doesn't exist.
 
 ## Examples
 
 ```c
-public OnPlayerEnterVehicle(playerid, vehicleid, ispassanger)
+// Global array to track which vehicle belongs to each player.
+// INVALID_VEHICLE_ID is used as a placeholder for players without a vehicle.
+static s_PlayerVehicle[MAX_PLAYERS] = { INVALID_VEHICLE_ID, ... };
+
+public OnPlayerSpawn(playerid)
 {
-    PutPlayerInVehicle(playerid, vehicleid, 0);
+    // Check if the player already has a valid vehicle.
+    if (!IsValidVehicle(s_PlayerVehicle[playerid]))
+    {
+        // If not, create a new vehicle for the player and store its ID.
+        s_PlayerVehicle[playerid] = CreateVehicle(411, 0.0, 0.0, 3.5, 0.0, -1, -1, -1);
+    }
+
+    // Mark that the player should be placed in their vehicle once it is fully loaded.
+    // This avoids issues where the vehicle might not yet be loaded on the client's side.
+    SetPVarInt(playerid, "PutPlayerInVehicle", 1);
+
     return 1;
 }
+
+public OnVehicleStreamIn(vehicleid, forplayerid)
+{
+    // This callback is triggered when a vehicle streams in for the player (i.e. when it is loaded into memory).
+    // Check if the streamed-in vehicle is the player's and if they need to be placed in it.
+    if (vehicleid == s_PlayerVehicle[forplayerid] && GetPVarInt(forplayerid, "PutPlayerInVehicle"))
+    {
+        // Put the player into the vehicle.
+        PutPlayerInVehicle(forplayerid, vehicleid, 0);
+
+        // Clear the marker to prevent repeatedly putting the player into the vehicle
+        // (e.g., if the player leaves the vehicle and it streams in again later).
+        DeletePVar(forplayerid, "PutPlayerInVehicle");
+    }
+
+    return 1;
+}
+
 ```
 
 | ID  | Seat                         |
@@ -48,7 +80,9 @@ You can use [GetPlayerVehicleSeat](GetPlayerVehicleSeat) in a loop to check if a
 
 :::warning
 
-If the seat is invalid or is taken, will cause a crash when they EXIT the vehicle.
+* If the seat is invalid or already taken, the client will crash when they EXIT the vehicle.
+* Putting a player into a vehicle that is not streamed in can be unreliable. This is due to a potential client-side issue where the vehicle may not have fully loaded into memory yet.
+* This also applies when attempting to put a player into a vehicle that was just created.
 
 :::
 

docs/scripting/functions/SendClientCheck.md

@@ -64,6 +64,7 @@ public OnClientCheckResponse(playerid, actionid, memaddr, retndata)
 ## Related Functions
 
 - [IsPlayerUsingOfficialClient](IsPlayerUsingOfficialClient): Check if the player is using the official SA-MP client.
+- [IsPlayerUsingOmp](IsPlayerUsingOmp): Check if the player is using the open.mp launcher.
 
 ## Related Callbacks
 

docs/scripting/functions/SetPlayerAttachedObject.md

@@ -54,7 +54,7 @@ This function is separate from the CreateObject / CreatePlayerObject pools.
 
 :::warning
 
-Atleast 10 objects can be attached to a single player (index 0-9)
+Up to 10 objects can be attached to a single player (index 0-9)
 
 :::