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

Use job id from db id util in job type check

Browse Source
This commit is contained in:
Vortrex
2021-04-22 09:28:28 -05:00
parent c08486eab3
commit 132870b388
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/job.js
View File

@@ -698,7 +698,6 @@ function jobDepartmentRadioCommand(command, params, client) {
return false; return false;
} }
return true; return true;
} }
@@ -711,7 +710,7 @@ function getJobType(jobId) {
// =========================================================================== // ===========================================================================
function doesPlayerHaveJobType(client, jobType) { function doesPlayerHaveJobType(client, jobType) {
return (getJobType(getPlayerCurrentSubAccount(client).job) == jobType) ? true : false; return (getJobType(getJobIdFromDatabaseId(getPlayerCurrentSubAccount(client).job)) == jobType) ? true : false;
} }
// =========================================================================== // ===========================================================================
@@ -728,7 +727,7 @@ function getJobData(jobId) {
function quitJob(client) { function quitJob(client) {
stopWorking(client); stopWorking(client);
getPlayerCurrentSubAccount(client).job = AG_JOB_NONE; getPlayerCurrentSubAccount(client).job = 0;
sendPlayerJobType(client, -1); sendPlayerJobType(client, -1);
} }
@@ -1125,15 +1124,10 @@ function stopJobRoute(client, successful = false, alertPlayer = true) {
// =========================================================================== // ===========================================================================
function isPlayerOnJobRoute(client) { function isPlayerOnJobRoute(client) {
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) { if(typeof getPlayerData(client).jobRoute == "number") {
if(getPlayerData(client).busRoute) { return true;
return true;
}
} else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
if(getPlayerData(client).garbageRoute) {
return true;
}
} }
return false; return false;
} }
@@ -1144,11 +1138,7 @@ function getPlayerJobRouteVehicle(client) {
return false; return false;
} }
if(doesPlayerHaveJobType(client, AG_JOB_BUS)) { return getPlayerData(client).jobRouteVehicle;
return getPlayerData(client).busRouteVehicle;
} else if(doesPlayerHaveJobType(client, AG_JOB_GARBAGE)) {
return getPlayerData(client).garbageRouteVehicle;
}
} }
// =========================================================================== // ===========================================================================