hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix offset id for gotoveh, fix forceskin to allow multi-word

Browse Source
This commit is contained in:
Vortrex
2021-11-28 22:48:36 -06:00
parent 3e05d5748b
commit 1e3a8be579
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/server/moderation.js
View File

@@ -237,11 +237,11 @@ function gotoVehicleCommand(command, params, client) {
return false; return false;
} }
if(typeof getServerData().vehicles[toInteger(params)-1] == "undefined") { if(typeof getServerData().vehicles[toInteger(params)] == "undefined") {
messagePlayerError(client, "That vehicle ID doesn't exist!"); messagePlayerError(client, "That vehicle ID doesn't exist!");
} }
let vehicle = getServerData().vehicles[toInteger(params)-1].vehicle; let vehicle = getServerData().vehicles[toInteger(params)].vehicle;
setPlayerVelocity(client, toVector3(0.0, 0.0, 0.0)); setPlayerVelocity(client, toVector3(0.0, 0.0, 0.0));
setPlayerPosition(client, getPosAbovePos(getVehiclePosition(vehicle), 3.0)); setPlayerPosition(client, getPosAbovePos(getVehiclePosition(vehicle), 3.0));
@@ -427,21 +427,17 @@ function gotoPositionCommand(command, params, client) {
} }
params = params.replace(",", ""); params = params.replace(",", "");
splitParams = params.split(" "); let splitParams = params.split(" ");
let x = splitParams[0] || getPlayerPosition(client).x; let x = splitParams[0];
let y = splitParams[1] || getPlayerPosition(client).y; let y = splitParams[1];
let z = splitParams[2] || getPlayerPosition(client).z; let z = splitParams[2];
let int = splitParams[3] || getPlayerInterior(client); let int = splitParams[3];
let vw = splitParams[4] || getPlayerDimension(client); let vw = splitParams[4];
let newPosition = toVector3(toInteger(x), toInteger(y), toInteger(z));
let jobId = getJobFromParams(splitParams[0]) || getClosestJobLocation(getPlayerPosition(client)).job;
client.player.velocity = toVector3(0.0, 0.0, 0.0); client.player.velocity = toVector3(0.0, 0.0, 0.0);
setPlayerPosition(client, newPosition);
setPlayerInterior(client, toInteger(int)); setPlayerInterior(client, toInteger(int));
setPlayerDimension(client, toInteger(vw)); setPlayerDimension(client, toInteger(vw));
setPlayerPosition(client, toVector3(toFloat(x), toFloat(y), toFloat(z)));
updateInteriorLightsForPlayer(client, true); updateInteriorLightsForPlayer(client, true);
messagePlayerSuccess(client, `You teleported to coordinates {ALTCOLOUR}${x}, ${y}, ${z} with interior ${int} and dimension ${vw}`); messagePlayerSuccess(client, `You teleported to coordinates {ALTCOLOUR}${x}, ${y}, ${z} with interior ${int} and dimension ${vw}`);
@@ -973,7 +969,7 @@ function forcePlayerSkinCommand(command, params, client) {
let splitParams = params.split(" "); let splitParams = params.split(" ");
let targetClient = getPlayerFromParams(splitParams[0]); let targetClient = getPlayerFromParams(splitParams[0]);
let skinIndex = getSkinModelIndexFromParams(splitParams[1]); let skinIndex = getSkinModelIndexFromParams(splitParams.slice(1).join(" "));
if(!targetClient) { if(!targetClient) {
messagePlayerError(client, "That player is not connected!"); messagePlayerError(client, "That player is not connected!");