From 8564557edf1c46bef748df2892940915b34dd144 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 22 Dec 2021 23:35:37 -0600
Subject: [PATCH] Fix some veh stuff

---
 scripts/server/vehicle.js | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index add78354..0fd77bb9 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -215,8 +215,13 @@ function createVehicleCommand(command, params, client) {
 		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 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)}!`);
 }
@@ -1172,7 +1177,11 @@ function spawnVehicle(vehicleData) {
 	let vehicle = createGameVehicle(vehicleData.model, vehicleData.spawnPosition, vehicleData.spawnRotation);
 	addToWorld(vehicle);
 
-	if(isSnowSupported()) {
+	if(!vehicle) {
+		return false;
+	}
+
+	if(isGameFeatureSupported("vehicleColours")) {
 		if(vehicleData.colour1IsRGBA && vehicleData.colour2IsRGBA) {
 			vehicle.setRGBColours(vehicleData.colour1RGBA, vehicleData.colour2RGBA);
 		} else {
@@ -1181,24 +1190,17 @@ function spawnVehicle(vehicleData) {
 			vehicle.colour3 = vehicleData.colour3;
 			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;
 
 	setEntityData(vehicle, "vrr.livery", vehicleData.livery, true);