Business/house blips & pickups for IV

scripts/server/business.js

@@ -1335,11 +1335,7 @@ function createAllBusinessBlips() {
 
 // ===========================================================================
 
-function createBusinessEntrancePickup(businessId) {
-	if(!areServerElementsSupported()) {
-		return false;
-	}
-	
+function createBusinessEntrancePickup(businessId) {	
 	if(!getServerConfig().createBusinessPickups) {
 		return false;
 	}
@@ -1359,6 +1355,8 @@ function createBusinessEntrancePickup(businessId) {
 			setElementDimension(getBusinessData(businessId).entrancePickup, getBusinessData(businessId).entranceDimension);
 			updateBusinessPickupLabelData(businessId);
 			addToWorld(getBusinessData(businessId).entrancePickup);
+		} else {
+			sendBusinessEntranceToPlayer(null, businessId, getBusinessData(businessId), getBusinessData(businessId).entrancePosition, getBusinessData(businessId).entranceBlipModel, getBusinessData(businessId).entrancePickupModel, getBusinessData(businessId).hasInterior, false);
 		}
 	}
 }
@@ -1388,6 +1386,8 @@ function createBusinessEntranceBlip(businessId) {
 			setElementOnAllDimensions(getBusinessData(businessId).entranceBlip, false);
 			setElementDimension(getBusinessData(businessId).entranceBlip, getBusinessData(businessId).entranceDimension);
 			addToWorld(getBusinessData(businessId).entranceBlip);
+		} else {
+			sendBusinessEntranceToPlayer(null, businessId, getBusinessData(businessId).name, getBusinessData(businessId).entrancePosition, blipModelId, getBusinessData(businessId).entrancePickupModel, getBusinessData(businessId).hasInterior, false);
 		}
 	}
 }
@@ -1551,6 +1551,10 @@ function doesBusinessHaveInterior(businessId) {
 // ===========================================================================
 
 function deleteBusinessEntrancePickup(businessId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).entrancePickup != null) {
 		//removeFromWorld(getBusinessData(businessId).entrancePickup);
 		deleteGameElement(getBusinessData(businessId).entrancePickup);
@@ -1561,6 +1565,10 @@ function deleteBusinessEntrancePickup(businessId) {
 // ===========================================================================
 
 function deleteBusinessExitPickup(businessId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).exitPickup != null) {
 		//removeFromWorld(getBusinessData(businessId).exitPickup);
 		deleteGameElement(getBusinessData(businessId).exitPickup);
@@ -1571,6 +1579,10 @@ function deleteBusinessExitPickup(businessId) {
 // ===========================================================================
 
 function deleteBusinessEntranceBlip(businessId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).entranceBlip != null) {
 		//removeFromWorld(getBusinessData(businessId).entranceBlip);
 		deleteGameElement(getBusinessData(businessId).entranceBlip);
@@ -1581,6 +1593,10 @@ function deleteBusinessEntranceBlip(businessId) {
 // ===========================================================================
 
 function deleteBusinessExitBlip(businessId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).exitBlip != null) {
 		//removeFromWorld(getBusinessData(businessId).exitBlip);
 		deleteGameElement(getBusinessData(businessId).exitBlip);

scripts/server/client.js

@@ -1146,4 +1146,32 @@ function sendHouseEntranceToPlayer(client, houseId, entrancePosition, blipModel,
     sendNetworkEventToPlayer("vrr.house", client, houseId, entrancePosition, blipModel, pickupModel, hasInterior);
 }
 
+// ==========================================================================
+
+function sendAllBusinessEntrancesToPlayer(client) {
+    let businesses = getServerData().businesses;
+    for(let i in businesses) {
+        if(businesses[i].entranceBlipModel > 0) {
+            sendBusinessEntranceToPlayer(client, businesses[i].index, businesses[i].name, businesses[i].entrancePosition, businesses[i].entranceBlipModel, businesses[i].entrancePickupModel, businesses[i].hasInterior, false);
+        }
+    }
+}
+
+// ==========================================================================
+
+function sendAllHouseEntrancesToPlayer(client) {
+    let houses = getServerData().houses;
+    for(let i in houses) {
+        if(houses[i].entranceBlipModel > 0) {
+            sendBusinessEntranceToPlayer(client, businesses[i].index, houses[i].entrancePosition, houses[i].entranceBlipModel, houses[i].entrancePickupModel, houses[i].hasInterior);
+        }
+    }
+}
+
+// ==========================================================================
+
+function makePlayerHoldObjectModel(client, modelIndex) {
+    sendNetworkEventToPlayer("vrr.holdObject", client, modelIndex);
+}
+
 // ==========================================================================

scripts/server/event.js

@@ -596,6 +596,12 @@ function onPlayerSpawn(client) {
         logToConsole(LOG_DEBUG, `[VRR.Event] Updating all player name tags`);
         updateAllPlayerNameTags();
 
+        if(!areServerElementsSupported()) {
+            sendAllBusinessEntrancesToPlayer(client);
+            sendAllHouseEntrancesToPlayer(client);
+            //sendAllJobLocationsToPlayer(client);
+        }
+
         getPlayerData(client).payDayTickStart = sdl.ticks;
     //}
 }

scripts/server/house.js

@@ -1140,6 +1140,10 @@ function doesHouseHaveInterior(houseId) {
 // ===========================================================================
 
 function deleteHouseEntrancePickup(houseId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getHouseData(houseId).entrancePickup != null) {
 		//removeFromWorld(getHouseData(houseId).entrancePickup);
 		deleteGameElement(getHouseData(houseId).entrancePickup);
@@ -1150,6 +1154,10 @@ function deleteHouseEntrancePickup(houseId) {
 // ===========================================================================
 
 function deleteHouseExitPickup(houseId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getHouseData(houseId).exitPickup != null) {
 		//removeFromWorld(getHouseData(houseId).exitPickup);
 		deleteGameElement(getHouseData(houseId).exitPickup);
@@ -1160,6 +1168,10 @@ function deleteHouseExitPickup(houseId) {
 // ===========================================================================
 
 function deleteHouseEntranceBlip(houseId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getHouseData(houseId).entranceBlip != null) {
 		//removeFromWorld(getHouseData(houseId).entranceBlip);
 		deleteGameElement(getHouseData(houseId).entranceBlip);
@@ -1170,6 +1182,10 @@ function deleteHouseEntranceBlip(houseId) {
 // ===========================================================================
 
 function deleteHouseExitBlip(houseId) {
+	if(!areServerElementsSupported()) {
+		return false;
+	}
+
 	if(getHouseData(houseId).exitBlip != null) {
 		//removeFromWorld(getHouseData(houseId).exitBlip);
 		deleteGameElement(getHouseData(houseId).exitBlip);