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

Check if job has any ranks before resetting

Browse Source
This commit is contained in:
Vortrex
2022-07-28 03:18:40 -05:00
parent 2c6401e9ed
commit 2c28b17047
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/server/subaccount.js
View File

@@ -197,7 +197,9 @@ function loadSubAccountsFromAccount(accountId) {
} else { } else {
let clanRankIndex = getClanRankIndexFromDatabaseId(clanIndex, tempSubAccount.clanRank); let clanRankIndex = getClanRankIndexFromDatabaseId(clanIndex, tempSubAccount.clanRank);
if (!getClanRankData(clanIndex, clanRankIndex)) { if (!getClanRankData(clanIndex, clanRankIndex)) {
tempSubAccount.clanRank = 0; let newClanRankIndex = getLowestClanRank(clanIndex);
tempSubAccount.clanRank = getClanRankData(clanIndex, newClanRankIndex).databaseId
tempSubAccount.clanRankIndex = newClanRankIndex;
} else { } else {
tempSubAccount.clanRankIndex = clanRankIndex; tempSubAccount.clanRankIndex = clanRankIndex;
} }
@@ -215,13 +217,18 @@ function loadSubAccountsFromAccount(accountId) {
tempSubAccount.jobIndex = -1; tempSubAccount.jobIndex = -1;
tempSubAccount.jobRankIndex = -1; tempSubAccount.jobRankIndex = -1;
} else { } else {
let jobRankIndex = getJobRankIndexFromDatabaseId(jobIndex, tempSubAccount.jobRank); if (getJobData(jobIndex).ranks.length > 0) {
if (!getJobRankData(jobIndex, jobRankIndex)) { let jobRankIndex = getJobRankIndexFromDatabaseId(jobIndex, tempSubAccount.jobRank);
let jobRankIndex = getLowestJobRank(jobIndex); if (!getJobRankData(jobIndex, jobRankIndex)) {
tempSubAccount.jobRank = getJobRankData(jobIndex, jobRankIndex).databaseId; let newJobRankIndex = getLowestJobRank(jobIndex);
tempSubAccount.jobRankIndex = jobRankIndex; console.log(`[VRR.SubAccount]: Job ${jobIndex} has no rank ${tempSubAccount.jobRank}! Using lowest rank ${newJobRankIndex} instead.`);
tempSubAccount.jobRank = getJobRankData(jobIndex, newJobRankIndex).databaseId;
tempSubAccount.jobRankIndex = newJobRankIndex;
} else {
tempSubAccount.jobRankIndex = jobRankIndex;
}
} else { } else {
tempSubAccount.jobRankIndex = jobRankIndex; tempSubAccount.jobRankIndex = -1;
} }
tempSubAccount.jobIndex = jobIndex; tempSubAccount.jobIndex = jobIndex;