From c0dee692e04d10e1615533369d54c070e26b81ad Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 14 Aug 2022 11:00:42 -0500
Subject: [PATCH] Check for vehicle before setting transient + cleanup

---
 scripts/server/vehicle.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 6b3d0ecb..30be3981 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1468,8 +1468,6 @@ function respawnVehicle(vehicle) {
 function spawnVehicle(vehicleData) {
 	logToConsole(LOG_DEBUG, `[VRR.Vehicle]: Spawning ${getVehicleNameFromModel(vehicleData.model)} at ${vehicleData.spawnPosition.x}, ${vehicleData.spawnPosition.y}, ${vehicleData.spawnPosition.z} with heading ${vehicleData.spawnRotation}`);
 	let vehicle = createGameVehicle(vehicleData.model, vehicleData.spawnPosition, vehicleData.spawnRotation);
-	setVehicleHeading(vehicle, vehicleData.spawnRotation);
-	setElementTransient(vehicle, false);
 
 	if (!vehicle) {
 		return false;
@@ -1497,7 +1495,8 @@ function spawnVehicle(vehicleData) {
 		setVehicleEngine(vehicle, false);
 		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to OFF`);
 	} else {
-		setVehicleEngine(vehicle, intToBool(vehicleData.engine)); logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
+		setVehicleEngine(vehicle, intToBool(vehicleData.engine));
+		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
 	}
 
 	if (typeof vehicle.locked != "undefined") {
@@ -1514,6 +1513,7 @@ function spawnVehicle(vehicleData) {
 	setEntityData(vehicle, "agrp.engine", vehicleData.engine, true);
 
 	forcePlayerToSyncElementProperties(null, vehicle);
+	setElementTransient(vehicle, false);
 
 	return vehicle;
 }