From b39104566e8b8df8a0c7b76c9a64107817a26dc3 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Wed, 14 Jul 2021 19:23:46 -0500
Subject: [PATCH] Check for global svr cfg pickups/blips enabled

---
 scripts/server/business.js | 16 ++++++++++++++++
 scripts/server/house.js    | 16 ++++++++++++++++
 scripts/server/job.js      |  8 ++++++++
 3 files changed, 40 insertions(+)

diff --git a/scripts/server/business.js b/scripts/server/business.js
index be7b7bf3..ab99239b 100644
--- a/scripts/server/business.js
+++ b/scripts/server/business.js
@@ -1002,6 +1002,10 @@ function createAllBusinessBlips() {
 // ===========================================================================
 
 function createBusinessEntrancePickup(businessId) {
+	if(!getServerConfig().createBusinessPickups) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).entrancePickupModel != -1) {
 		let pickupModelId = getGameConfig().pickupModels[getServerGame()].business;
 
@@ -1020,6 +1024,10 @@ function createBusinessEntrancePickup(businessId) {
 // ===========================================================================
 
 function createBusinessEntranceBlip(businessId) {
+	if(!getServerConfig().createBusinessBlips) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).entranceBlipModel != -1) {
 		let blipModelId = getGameConfig().blipSprites[getServerGame()].business;
 
@@ -1040,6 +1048,10 @@ function createBusinessEntranceBlip(businessId) {
 // ===========================================================================
 
 function createBusinessExitPickup(businessId) {
+	if(!getServerConfig().createBusinessPickups) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).hasInterior) {
 		if(getBusinessData(businessId).exitPickupModel != -1) {
 			let pickupModelId = getGameConfig().pickupModels[getServerGame()].exit;
@@ -1060,6 +1072,10 @@ function createBusinessExitPickup(businessId) {
 // ===========================================================================
 
 function createBusinessExitBlip(businessId) {
+	if(!getServerConfig().createBusinessBlips) {
+		return false;
+	}
+
 	if(getBusinessData(businessId).hasInterior) {
 		if(getBusinessData(businessId).exitBlipModel != -1) {
 			let blipModelId = getGameConfig().blipSprites[getServerGame()].business;
diff --git a/scripts/server/house.js b/scripts/server/house.js
index 0f82a8d6..7348deb8 100644
--- a/scripts/server/house.js
+++ b/scripts/server/house.js
@@ -499,6 +499,10 @@ function createAllHouseBlips() {
 // ===========================================================================
 
 function createHouseEntrancePickup(houseId) {
+	if(!getServerConfig().createHousePickups) {
+		return false;
+	}
+
 	if(getHouseData(houseId).entrancePickupModel != -1) {
 		let pickupModelId = getGameConfig().pickupModels[getServerGame()].house;
 
@@ -524,6 +528,10 @@ function createHouseEntrancePickup(houseId) {
 // ===========================================================================
 
 function createHouseEntranceBlip(houseId) {
+	if(!getServerConfig().createHouseBlips) {
+		return false;
+	}
+
 	if(getHouseData(houseId).entranceBlipModel != -1) {
 		let blipModelId = getGameConfig().blipSprites[getServerGame()].house;
 
@@ -543,6 +551,10 @@ function createHouseEntranceBlip(houseId) {
 // ===========================================================================
 
 function createHouseExitPickup(houseId) {
+	if(!getServerConfig().createHousePickups) {
+		return false;
+	}
+
 	if(getHouseData(houseId).hasInterior) {
 		if(getHouseData(houseId).exitPickupModel != -1) {
 			let pickupModelId = getGameConfig().pickupModels[getServerGame()].exit;
@@ -565,6 +577,10 @@ function createHouseExitPickup(houseId) {
 // ===========================================================================
 
 function createHouseExitBlip(houseId) {
+	if(!getServerConfig().createHouseBlips) {
+		return false;
+	}
+
 	if(getHouseData(houseId).hasInterior) {
 		if(getHouseData(houseId).exitBlipModel != -1) {
 			let blipModelId = getGameConfig().blipSprites[getServerGame()].house;
diff --git a/scripts/server/job.js b/scripts/server/job.js
index 1cd8e99e..643e09d8 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -1489,6 +1489,10 @@ function deleteJobLocationPickup(jobId, locationId) {
 // ===========================================================================
 
 function createJobLocationPickup(jobId, locationId) {
+	if(!getServerConfig().createJobPickups) {
+		return false;
+	}
+
 	if(getJobData(jobId).pickupModel != -1) {
 		let pickupModelId = getGameConfig().pickupModels[getServerGame()].job;
 
@@ -1510,6 +1514,10 @@ function createJobLocationPickup(jobId, locationId) {
 // ===========================================================================
 
 function createJobLocationBlip(jobId, locationId) {
+	if(!getServerConfig().createJobBlips) {
+		return false;
+	}
+
 	if(getJobData(jobId).blipModel != -1) {
 		let blipModelId = getGameConfig().blipSprites[getServerGame()].job;