From 7a7ef0f5afc2961134cc13f88c6e9e0301950477 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Tue, 10 May 2022 17:55:06 -0500 Subject: [PATCH] Disable job route when creating, enable when finished --- scripts/server/job.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/scripts/server/job.js b/scripts/server/job.js index 35140d43..bd81fb7b 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -1691,6 +1691,11 @@ function jobStopRouteCommand(command, params, client) { return false; } + if(!getJobRouteData(getPlayerJob(client), getPlayerJobRoute(client)).enabled) { + setAllJobDataIndexes(); + getJobRouteData(getPlayerJob(client), getPlayerJobRoute(client)).enabled = true; + } + stopJobRoute(client, false, false); return true; } @@ -2682,7 +2687,7 @@ function createJobRoute(routeName, closestJobLocation) { tempJobRouteData.name = routeName; tempJobRouteData.jobId = closestJobLocation.jobId; tempJobRouteData.locationId = closestJobLocation.databaseId; - tempJobRouteData.enabled = true; + tempJobRouteData.enabled = false; tempJobRouteData.needsSaved = true; tempJobRouteData.vehicleColour1 = 1; tempJobRouteData.vehicleColour2 = 1; @@ -2711,8 +2716,8 @@ function createJobRouteLocation(routeLocationName, position, jobRouteData) { tempJobRouteLocationData.routeIndex = jobRouteData.index; getJobData(jobRouteData.jobIndex).routes[jobRouteData.index].locations.push(tempJobRouteLocationData); - saveJobRouteLocationToDatabase(tempJobRouteLocationData); - setAllJobDataIndexes(); + //saveJobRouteLocationToDatabase(tempJobRouteLocationData); + //setAllJobDataIndexes(); } // =========================================================================== @@ -2905,6 +2910,9 @@ function getRandomJobRouteForLocation(closestJobLocation) { if(closestJobLocation.routeCache.length > 0) { let randomRoute = getRandom(0, closestJobLocation.routeCache.length-1); let routeId = closestJobLocation.routeCache[randomRoute]; + if(!getJobRouteData(closestJobLocation.jobIndex, routeId).enabled) { + return getRandomJobRouteForLocation(closestJobLocation); + } return getJobRouteData(closestJobLocation.jobIndex, routeId).index; } return -1;