From 70ba9e99b35f0d3763182306151e8aea294540b8 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 2 Jan 2022 20:07:57 -0600
Subject: [PATCH] Element transient

---
 scripts/server/house.js            |  5 ++++-
 scripts/server/native/connected.js | 12 ++++++++++++
 scripts/server/vehicle.js          |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/server/house.js b/scripts/server/house.js
index 8ac3b0ff..15adb883 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -863,7 +863,7 @@ function createHouseEntrancePickup(houseId) {
 		setElementDimension(getHouseData(houseId).entrancePickup, getHouseData(houseId).entranceDimension);
 		setElementStreamInDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamInDistance);
 		setElementStreamOutDistance(getBusinessData(businessId).entrancePickup, getGlobalConfig().housePickupStreamOutDistance);
-
+		setElementTransient(getHouseData(houseId).entrancePickup, false);
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.type", VRR_PICKUP_HOUSE_ENTRANCE, false);
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.owner.id", houseId, false);
 		setEntityData(getHouseData(houseId).entrancePickup, "vrr.label.type", VRR_LABEL_HOUSE, true);
@@ -902,6 +902,7 @@ function createHouseEntranceBlip(houseId) {
 		setElementOnAllDimensions(getHouseData(houseId).entranceBlip, false);
 		setElementStreamInDistance(getBusinessData(businessId).entranceBlip, getGlobalConfig().houseBlipStreamInDistance);
 		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);
@@ -928,6 +929,7 @@ function createHouseExitPickup(houseId) {
 			setElementOnAllDimensions(getHouseData(houseId).exitPickup, false);
 			setElementStreamInDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamInDistance);
 			setElementStreamOutDistance(getBusinessData(businessId).exitPickup, getGlobalConfig().housePickupStreamOutDistance);
+			setElementTransient(getHouseData(houseId).exitPickup, false);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.type", VRR_PICKUP_HOUSE_EXIT, false);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.owner.id", houseId, false);
 			setEntityData(getHouseData(houseId).exitPickup, "vrr.label.type", VRR_LABEL_EXIT, true);
@@ -956,6 +958,7 @@ function createHouseExitBlip(houseId) {
 			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);
diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js
index e0f36a8e..553a8f5c 100644
--- a/scripts/server/native/connected.js
+++ b/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);
 }
diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js
index 7baa250c..63608796 100644
--- a/scripts/server/vehicle.js
+++ b/scripts/server/vehicle.js
@@ -1178,6 +1178,8 @@ 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) {