From c81f511448e6435aaf721b226cd46957a3bbbf77 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 15 May 2022 05:02:09 -0500
Subject: [PATCH] Fix job blips

---
 scripts/client/gps.js    |  2 +-
 scripts/client/job.js    | 17 +++++++++++------
 scripts/server/config.js |  4 ++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/client/gps.js b/scripts/client/gps.js
index 8b2bbbbe..ee6415e9 100644
--- a/scripts/client/gps.js
+++ b/scripts/client/gps.js
@@ -57,7 +57,7 @@ function blinkGPSBlip(times, position, colour) {
 			gpsBlipBlinkAmount = 0;
 			gpsBlipBlinkTimes = 0;
 			gpsBlip = game.createBlip(position, 0, 2, colour);
-			destroyTimer(gpsBlipBlinkTimer);
+			clearInterval(gpsBlipBlinkTimer);
 		}
 	}, gpsBlipBlinkInterval);
 }
diff --git a/scripts/client/job.js b/scripts/client/job.js
index 17d665e9..9c49adcb 100644
--- a/scripts/client/job.js
+++ b/scripts/client/job.js
@@ -80,14 +80,19 @@ function showJobRouteLocation(position, colour) {
 function enteredJobRouteSphere() {
 	logToConsole(LOG_DEBUG, `[VRR.Job] Entered job route sphere`);
 
-	destroyTimer(jobBlipBlinkTimer);
+	clearInterval(jobBlipBlinkTimer);
 	jobBlipBlinkAmount = 0;
 	jobBlipBlinkTimes = 0;
 
-	destroyElement(jobRouteLocationSphere);
-	destroyElement(jobRouteLocationBlip);
-	jobRouteLocationSphere = null;
-	jobRouteLocationBlip = null;
+	if(jobRouteLocationBlip != null) {
+		destroyElement(jobRouteLocationBlip);
+		jobRouteLocationBlip = null;
+	}
+
+	if(jobRouteLocationSphere != null) {
+		destroyElement(jobRouteLocationSphere);
+		jobRouteLocationSphere = null;
+	}
 
 	tellServerPlayerArrivedAtJobRouteLocation();
 }
@@ -113,7 +118,7 @@ function blinkJobRouteLocationBlip(times, position, colour) {
 			jobBlipBlinkAmount = 0;
 			jobBlipBlinkTimes = 0;
 			jobRouteLocationBlip = game.createBlip(position, 0, 2, colour);
-			destroyTimer(jobBlipBlinkTimer);
+			clearInterval(jobBlipBlinkTimer);
 		}
 	}, jobBlipBlinkInterval);
 }
diff --git a/scripts/server/config.js b/scripts/server/config.js
index 548229d5..a7e5f392 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -83,8 +83,8 @@ let globalConfig = {
 	businessBlipStreamOutDistance: 200,
 	houseBlipStreamInDistance: 100,
 	houseBlipStreamOutDistance: 120,
-	jobBlipStreamInDistance: 300,
-	jobBlipStreamOutDistance: 320,
+	jobBlipStreamInDistance: 2000,
+	jobBlipStreamOutDistance: 2500,
 	handcuffPlayerDistance: 3,
 };