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

Fix some veh stuff

Browse Source
This commit is contained in:
Vortrex
2021-12-22 23:35:37 -06:00
parent 55443e9d09
commit 8564557edf
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/server/vehicle.js
View File

@@ -215,8 +215,13 @@ function createVehicleCommand(command, params, client) {
return false; return false;
} }
let heading = getPlayerHeading(client);
if(getGame() == VRR_GAME_MAFIA_ONE) {
heading = degToRad(getPlayerHeading(client));
}
let frontPos = getPosInFrontOfPos(getPlayerPosition(client), getPlayerHeading(client), getGlobalConfig().spawnCarDistance); let frontPos = getPosInFrontOfPos(getPlayerPosition(client), getPlayerHeading(client), getGlobalConfig().spawnCarDistance);
let vehicle = createPermanentVehicle(modelIndex, frontPos, getPlayerHeading(client), getPlayerInterior(client), getPlayerDimension(client)); let vehicle = createPermanentVehicle(modelIndex, frontPos, heading, getPlayerInterior(client), getPlayerDimension(client));
messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}created a {vehiclePurple}${getVehicleName(vehicle)}!`); messageAdmins(`{ALTCOLOUR}${getPlayerName(client)} {MAINCOLOUR}created a {vehiclePurple}${getVehicleName(vehicle)}!`);
} }
@@ -1172,7 +1177,11 @@ function spawnVehicle(vehicleData) {
let vehicle = createGameVehicle(vehicleData.model, vehicleData.spawnPosition, vehicleData.spawnRotation); let vehicle = createGameVehicle(vehicleData.model, vehicleData.spawnPosition, vehicleData.spawnRotation);
addToWorld(vehicle); addToWorld(vehicle);
if(isSnowSupported()) { if(!vehicle) {
return false;
}
if(isGameFeatureSupported("vehicleColours")) {
if(vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) { if(vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) {
vehicle.setRGBColours(vehicleData.colour1RGBA, vehicleData.colour2RGBA); vehicle.setRGBColours(vehicleData.colour1RGBA, vehicleData.colour2RGBA);
} else { } else {
@@ -1181,24 +1190,17 @@ function spawnVehicle(vehicleData) {
vehicle.colour3 = vehicleData.colour3; vehicle.colour3 = vehicleData.colour3;
vehicle.colour4 = vehicleData.colour4; vehicle.colour4 = vehicleData.colour4;
} }
if(vehicleData.spawnLocked == true) {
vehicle.engine = false;
} else {
vehicle.engine = intToBool(vehicleData.engine);
}
vehicle.locked = intToBool(vehicleData.locked);
//vehicle.lights = intToBool(vehicleData.lights);
//vehicle.health = vehicleData.health;
//vehicle.position = vehicleData.spawnPosition;
vehicle.heading = vehicleData.spawnRotation;
vehicle.dimension = vehicleData.dimension;
} }
if(vehicleData.spawnLocked == true) {
vehicle.engine = false;
} else {
vehicle.engine = intToBool(vehicleData.engine);
}
vehicle.locked = intToBool(vehicleData.locked);
vehicle.dimension = vehicleData.dimension;
vehicleData.vehicle = vehicle; vehicleData.vehicle = vehicle;
setEntityData(vehicle, "vrr.livery", vehicleData.livery, true); setEntityData(vehicle, "vrr.livery", vehicleData.livery, true);