From 17481001b0de1073c602b627f41a61b88e790a08 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 28 Jul 2022 03:20:51 -0500 Subject: [PATCH] Check if job has any ranks before setting lowest on takejob --- scripts/server/job.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/server/job.js b/scripts/server/job.js index 78fdce22..38e7078a 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -1473,11 +1473,16 @@ function quitJob(client) { // =========================================================================== function takeJob(client, jobId) { - let rankId = getLowestJobRank(jobId); + let rankIndex = -1; + let rankId = 0; + if (getJobData(jobId).ranks.length > 0) { + rankIndex = getLowestJobRank(jobId); + rankId = getJobRankData(jobId, rankId).databaseId; + } getPlayerCurrentSubAccount(client).job = getJobData(jobId).databaseId; - getPlayerCurrentSubAccount(client).jobRank = getJobRankData(jobId, rankId).databaseId; + getPlayerCurrentSubAccount(client).jobRank = rankId; getPlayerCurrentSubAccount(client).jobIndex = jobId; - getPlayerCurrentSubAccount(client).jobRankIndex = rankId + getPlayerCurrentSubAccount(client).jobRankIndex = rankIndex; sendPlayerJobType(client, getJobData(jobId).databaseId); updateJobBlipsForPlayer(client); }