hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable job route when creating, enable when finished

Browse Source
This commit is contained in:
Vortrex
2022-05-10 17:55:06 -05:00
parent 8e643e376c
commit 7a7ef0f5af
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/server/job.js
View File

@@ -1691,6 +1691,11 @@ function jobStopRouteCommand(command, params, client) {
return false; return false;
} }
if(!getJobRouteData(getPlayerJob(client), getPlayerJobRoute(client)).enabled) {
setAllJobDataIndexes();
getJobRouteData(getPlayerJob(client), getPlayerJobRoute(client)).enabled = true;
}
stopJobRoute(client, false, false); stopJobRoute(client, false, false);
return true; return true;
} }
@@ -2682,7 +2687,7 @@ function createJobRoute(routeName, closestJobLocation) {
tempJobRouteData.name = routeName; tempJobRouteData.name = routeName;
tempJobRouteData.jobId = closestJobLocation.jobId; tempJobRouteData.jobId = closestJobLocation.jobId;
tempJobRouteData.locationId = closestJobLocation.databaseId; tempJobRouteData.locationId = closestJobLocation.databaseId;
tempJobRouteData.enabled = true; tempJobRouteData.enabled = false;
tempJobRouteData.needsSaved = true; tempJobRouteData.needsSaved = true;
tempJobRouteData.vehicleColour1 = 1; tempJobRouteData.vehicleColour1 = 1;
tempJobRouteData.vehicleColour2 = 1; tempJobRouteData.vehicleColour2 = 1;
@@ -2711,8 +2716,8 @@ function createJobRouteLocation(routeLocationName, position, jobRouteData) {
tempJobRouteLocationData.routeIndex = jobRouteData.index; tempJobRouteLocationData.routeIndex = jobRouteData.index;
getJobData(jobRouteData.jobIndex).routes[jobRouteData.index].locations.push(tempJobRouteLocationData); getJobData(jobRouteData.jobIndex).routes[jobRouteData.index].locations.push(tempJobRouteLocationData);
saveJobRouteLocationToDatabase(tempJobRouteLocationData); //saveJobRouteLocationToDatabase(tempJobRouteLocationData);
setAllJobDataIndexes(); //setAllJobDataIndexes();
} }
// =========================================================================== // ===========================================================================
@@ -2905,6 +2910,9 @@ function getRandomJobRouteForLocation(closestJobLocation) {
if(closestJobLocation.routeCache.length > 0) { if(closestJobLocation.routeCache.length > 0) {
let randomRoute = getRandom(0, closestJobLocation.routeCache.length-1); let randomRoute = getRandom(0, closestJobLocation.routeCache.length-1);
let routeId = closestJobLocation.routeCache[randomRoute]; let routeId = closestJobLocation.routeCache[randomRoute];
if(!getJobRouteData(closestJobLocation.jobIndex, routeId).enabled) {
return getRandomJobRouteForLocation(closestJobLocation);
}
return getJobRouteData(closestJobLocation.jobIndex, routeId).index; return getJobRouteData(closestJobLocation.jobIndex, routeId).index;
} }
return -1; return -1;