Check for vehicle before setting transient + cleanup

This commit is contained in:
Vortrex
2022-08-14 11:00:42 -05:00
parent 744eca3b9d
commit c0dee692e0

View File

@@ -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;
}