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

Check if job has any ranks before checking level

Browse Source
This commit is contained in:
Vortrex
2022-07-28 03:17:55 -05:00
parent bb4b821db7
commit 2c6401e9ed
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/server/job.js
View File

@@ -1278,10 +1278,12 @@ function jobUniformCommand(command, params, client) {
let uniformData = getJobUniformData(jobIndex, uniformId - 1); let uniformData = getJobUniformData(jobIndex, uniformId - 1);
if (jobData.ranks.length > 0) {
if (jobRankData.level < uniformData.requiredRank) { if (jobRankData.level < uniformData.requiredRank) {
messagePlayerError(client, getLocaleString(client, "JobRankTooLow", jobRankData.level, uniformData.requiredRank)); messagePlayerError(client, getLocaleString(client, "JobRankTooLow", jobRankData.level, uniformData.requiredRank));
return false; return false;
} }
}
setPlayerSkin(client, uniformData.skin); setPlayerSkin(client, uniformData.skin);
meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(uniformData.name)} ${uniformData.name} uniform`); meActionToNearbyPlayers(client, `puts on ${getProperDeterminerForName(uniformData.name)} ${uniformData.name} uniform`);
@@ -1375,10 +1377,12 @@ function jobEquipmentCommand(command, params, client) {
let jobEquipmentData = getJobEquipmentData(jobIndex, equipmentId - 1) let jobEquipmentData = getJobEquipmentData(jobIndex, equipmentId - 1)
if (jobData.ranks.length > 0) {
if (jobRankData.level < jobEquipmentData.requiredRank) { if (jobRankData.level < jobEquipmentData.requiredRank) {
messagePlayerError(client, getLocaleString(client, "JobRankTooLow", jobRankData.level, jobEquipmentData.requiredRank)); messagePlayerError(client, getLocaleString(client, "JobRankTooLow", jobRankData.level, jobEquipmentData.requiredRank));
return false; return false;
} }
}
deleteJobItems(client); deleteJobItems(client);
givePlayerJobEquipment(client, equipmentId - 1); givePlayerJobEquipment(client, equipmentId - 1);
@@ -3941,10 +3945,10 @@ function getJobRouteLocationTypeFromParams(params) {
// =========================================================================== // ===========================================================================
function getLowestJobRank(jobId) { function getLowestJobRank(jobIndex) {
let lowestRank = 0; let lowestRank = 0;
for (let i in getServerData().jobs[jobId].ranks) { for (let i in getServerData().jobs[jobIndex].ranks) {
if (getServerData().jobs[jobId].ranks[i].level < getServerData().jobs[jobId].ranks[lowestRank].level) { if (getJobRankData(jobIndex, i).level < getJobRankData(jobIndex, lowestRank).level) {
lowestRank = i; lowestRank = i;
} }
} }