Merge branch '1.4.0-prep' into ragemp

scripts/server/house.js

@@ -877,6 +877,9 @@ function createHouseEntrancePickup(houseId) {
 			getHouseData(houseId).entrancePickup = createGamePickup(pickupModelId, getHouseData(houseId).entrancePosition, getGameConfig().pickupTypes[getServerGame()].house);
 			setElementOnAllDimensions(getHouseData(houseId).entrancePickup, false);
 			setElementDimension(getHouseData(houseId).entrancePickup, getHouseData(houseId).entranceDimension);
+			setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamInDistance);
+			setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamOutDistance);
+			setElementTransient(getHouseData(houseId).entrancePickup, false);
 			addToWorld(getHouseData(houseId).entrancePickup);
 		}
 		updateHousePickupLabelData(houseId);
@@ -901,8 +904,9 @@ function createHouseEntranceBlip(houseId) {
 			getHouseData(houseId).entranceBlip = createGameBlip(getHouseData(houseId).entrancePosition, blipModelId, 1, getColourByName("houseGreen"));
 			setElementDimension(getHouseData(houseId).entranceBlip, getHouseData(houseId).entranceDimension);
 			setElementOnAllDimensions(getHouseData(houseId).entranceBlip, false);
-			//getHouseData(houseId).entranceBlip.streamInDistance = 300;
+			setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamInDistance);
-			//getHouseData(houseId).entranceBlip.streamOutDistance = 350;
+			setElementStreamOutDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamOutDistance);
+			setElementTransient(getHouseData(houseId).entranceBlip, false);
 			setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.type", VRR_BLIP_HOUSE_ENTRANCE, false);
 			setEntityData(getHouseData(houseId).entranceBlip, "vrr.owner.id", houseId, false);
 			addToWorld(getHouseData(houseId).entranceBlip);
@@ -929,6 +933,9 @@ function createHouseExitPickup(houseId) {
 				getHouseData(houseId).exitPickup = createGamePickup(pickupModelId, getHouseData(houseId).exitPosition, getGameConfig().pickupTypes[getServerGame()].house);
 				setElementDimension(getHouseData(houseId).exitPickup, getHouseData(houseId).exitDimension);
 				setElementOnAllDimensions(getHouseData(houseId).exitPickup, false);
+				setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamInDistance);
+				setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamOutDistance);
+				setElementTransient(getHouseData(houseId).exitPickup, false);
 				addToWorld(getHouseData(houseId).exitPickup);
 			}
 			updateHousePickupLabelData(houseId);
@@ -955,6 +962,9 @@ function createHouseExitBlip(houseId) {
 				getHouseData(houseId).exitBlip = createGameBlip(blipModelId, getHouseData(houseId).exitPosition, 1, getColourByName("houseGreen"));
 				setElementDimension(getHouseData(houseId).exitBlip, getHouseData(houseId).entranceDimension);
 				setElementOnAllDimensions(getHouseData(houseId).exitBlip, false);
+				setElementStreamInDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamInDistance);
+				setElementStreamOutDistance(getBusinessData(businessId).exitBlip, getGlobalConfig().houseBlipStreamOutDistance);
+				setElementTransient(getHouseData(houseId).exitBlip, false);
 				setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.type", VRR_BLIP_HOUSE_EXIT, false);
 				setEntityData(getHouseData(houseId).exitBlip, "vrr.owner.id", houseId, false);
 				addToWorld(getHouseData(houseId).exitBlip);

scripts/server/job.js

@@ -39,7 +39,7 @@ function loadJobsFromDatabase() {
 					tempJobData.locations = loadJobLocationsFromDatabase(tempJobData.databaseId);
 					tempJobData.equipment = loadJobEquipmentsFromDatabase(tempJobData.databaseId);
 					tempJobData.uniforms = loadJobUniformsFromDatabase(tempJobData.databaseId);
-					tempJobData.routes = loadJobRoutesFromDatabase(tempJobData.databaseId);
+					//tempJobData.routes = loadJobRoutesFromDatabase(tempJobData.databaseId);
 					tempJobs.push(tempJobData);
 					logToConsole(LOG_DEBUG, `[VRR.Job]: Job '${tempJobData.name}' loaded from database successfully!`);
 				}

scripts/server/native/connected.js

@@ -155,6 +155,18 @@ function setVehicleHeading(vehicle, heading) {
 
 // ===========================================================================
 
+function getElementTransient(element) {
+    return element.transient;
+}
+
+// ===========================================================================
+
+function setElementTransient(element, state) {
+    return element.transient = state;
+}
+
+// ===========================================================================
+
 function getVehicleSyncer(vehicle) {
     return getElementSyncer(vehicle);
 }
@@ -342,7 +354,7 @@ function setElementDimension(element, dimension) {
 // ===========================================================================
 
 function setElementRotation(element, rotation) {
-    return element.setRotation(rotation);
+    return element.rotation = rotation;
 }
 
 // ===========================================================================
@@ -500,7 +512,7 @@ function getVehicleEngine(vehicle) {
 // ===========================================================================
 
 function getVehicleLocked(vehicle) {
-	return vehicle.locked;
+	return vehicle.lockedStatus;
 }
 
 // ===========================================================================

scripts/server/vehicle.js

@@ -1227,6 +1227,9 @@ 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);
+	addToWorld(vehicle);
 
 	if(!vehicle) {
 		return false;
@@ -1253,17 +1256,15 @@ 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));
+		setVehicleEngine(vehicle, intToBool(vehicleData.engine));logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
-		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s engine to ${toUpperCase(getOnOffFromBool(getVehicleEngine(vehicle)))}`);
 	}
 
 	if(typeof vehicle.locked != "undefined") {
 		setVehicleLocked(vehicle, intToBool(vehicleData.locked));
-		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s lock state to ${toUpperCase(getOnOffFromBool(getVehicleLocked(vehicle)))}`);
+		logToConsole(LOG_VERBOSE, `[VRR.Vehicle]: Setting vehicle ${vehicle.id}'s lock state to ${toUpperCase(getOnOffFromBool(getVehicleLockState(vehicle)))}`);
 	}
 
-	setElementDimension(vehicle, vehicleData.dimension);
+	setElementDimension(vehicle.dimension, vehicleData.dimension);
-
 	//setVehicleHealth(vehicle, 1000);
 	repairVehicle(vehicle);