From 8d5912b6bc3fc6a463dd98445d8ad7d93fd2deac Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sat, 11 Dec 2021 20:19:31 -0600
Subject: [PATCH] Add job pickup/blip utils, check svr enabled

---
 scripts/server/job.js | 63 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/scripts/server/job.js b/scripts/server/job.js
index d0e26cc2..2fe7a7e0 100644
--- a/scripts/server/job.js
+++ b/scripts/server/job.js
@@ -11,13 +11,8 @@ function initJobScript() {
 	logToConsole(LOG_INFO, "[VRR.Job]: Initializing job script ...");
 	getServerData().jobs = loadJobsFromDatabase();
 
-	if(getServerConfig().createJobPickups) {
-		createAllJobPickups();
-	}
-
-	if(getServerConfig().createJobBlips) {
-		createAllJobBlips();
-	}
+	createAllJobPickups();
+	createAllJobBlips();
 
 	setAllJobDataIndexes();
 	logToConsole(LOG_INFO, "[VRR.Job]: Job script initialized successfully!");
@@ -200,6 +195,10 @@ function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) {
 // ===========================================================================
 
 function createAllJobBlips() {
+	if(!getServerConfig().createJobBlips) {
+		return false;
+	}
+
 	logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location blips ...`);
 	for(let i in getServerData().jobs) {
 		for(let j in getServerData().jobs[i].locations) {
@@ -214,6 +213,10 @@ function createAllJobBlips() {
 // ===========================================================================
 
 function createAllJobPickups() {
+	if(!getServerConfig().createJobPickups) {
+		return false;
+	}
+
 	logToConsole(LOG_DEBUG, `[VRR.Job] Spawning all job location pickups ...`);
 	let pickupCount = 0;
 	for(let i in getServerData().jobs) {
@@ -1730,4 +1733,50 @@ function respawnPlayerLastJobVehicle(client) {
 	respawnVehicle(getPlayerCurrentSubAccount(client).lastJobVehicle);
 }
 
+// ===========================================================================
+
+function resetAllJobBlips() {
+	deleteAllJobBlips();
+	createAllJobBlips();
+}
+
+// ===========================================================================
+
+function resetAllJobPickups() {
+	deleteAllJobPickups();
+	createAllJobPickups();
+}
+
+// ===========================================================================
+
+function deleteAllJobBlips() {
+	for(let i in getServerData().jobs) {
+		deleteJobBlips(i);
+	}
+}
+
+// ===========================================================================
+
+function deleteAllJobPickups() {
+	for(let i in getServerData().jobs) {
+		deleteJobPickups(i);
+	}
+}
+
+// ===========================================================================
+
+function deleteJobBlips(jobId) {
+	for(let j in getServerData().jobs[jobId].locations) {
+		deleteJobLocationBlip(jobId, j);
+	}
+}
+
+// ===========================================================================
+
+function deleteJobPickups(jobId) {
+	for(let j in getServerData().jobs[jobId].locations) {
+		deleteJobLocationPickup(jobId, j);
+	}
+}
+
 // ===========================================================================
\ No newline at end of file