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

Exclude blank code + 3 pass reset code attempts

Browse Source
This commit is contained in:
Vortrex
2022-05-22 23:34:34 -05:00
parent 5fab7c3162
commit 9d30a02568
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/server/account.js
View File

@@ -1034,14 +1034,21 @@ function checkAccountResetPasswordRequest(client, inputText) {
} }
case VRR_RESETPASS_STATE_CODEINPUT: { case VRR_RESETPASS_STATE_CODEINPUT: {
if(getPlayerData(client).passwordResetCode == toUpperCase(inputText)) { if(inputText != "") {
getPlayerData(client).passwordResetState = VRR_RESETPASS_STATE_SETPASS; if(getPlayerData(client).passwordResetCode == toUpperCase(inputText)) {
showPlayerChangePasswordGUI(client, getLocaleString(client)); getPlayerData(client).passwordResetState = VRR_RESETPASS_STATE_SETPASS;
logToConsole(LOG_INFO, `${getPlayerDisplayForConsole(client)} entered the correct reset password verification code. Awaiting new password input ...`); showPlayerChangePasswordGUI(client, getLocaleString(client));
} else { logToConsole(LOG_INFO, `${getPlayerDisplayForConsole(client)} entered the correct reset password verification code. Awaiting new password input ...`);
getPlayerData(client).passwordResetState = VRR_RESETPASS_STATE_NONE; } else {
disconnectPlayer(client); getPlayerData(client).passwordResetState = VRR_RESETPASS_STATE_NONE;
logToConsole(LOG_INFO|LOG_WARN, `${getPlayerDisplayForConsole(client)} failed to reset their password (verification code not correct)`); getPlayerData(client).passwordResetAttemptsRemaining = getPlayerData(client).passwordResetAttemptsRemaining - 1;
logToConsole(LOG_INFO|LOG_WARN, `${getPlayerDisplayForConsole(client)} failed to reset their password (verification code not correct, ${getPlayerData(client).passwordResetAttemptsRemaining} attempts remaining)`);
if(getPlayerData(client).passwordResetAttemptsRemaining <= 0) {
logToConsole(LOG_INFO|LOG_WARN, `${getPlayerDisplayForConsole(client)} failed to reset their password (verification code not correct, no more attempts remaining, kicking ...)`);
disconnectPlayer(client);
return false;
}
}
} }
break; break;
} }

17
scripts/server/business.js
View File

@@ -2499,10 +2499,19 @@ function cacheBusinessItems(businessId) {
clearArray(getBusinessData(businessId).floorItemCache); clearArray(getBusinessData(businessId).floorItemCache);
clearArray(getBusinessData(businessId).storageItemCache); clearArray(getBusinessData(businessId).storageItemCache);
let businessData = getBusinessData(businessId); //let businessData = getBusinessData(businessId);
logToConsole(LOG_VERBOSE, `[VRR.Business] Caching business items for business ${businessId} (${businessData.name}) ...`); //logToConsole(LOG_VERBOSE, `[VRR.Business] Caching business items for business ${businessId} (${businessData.name}) ...`);
getBusinessData(businessId).floorItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZFLOOR && item.ownerId == businessData.databaseId); //getBusinessData(businessId).floorItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZFLOOR && item.ownerId == businessData.databaseId).map(i => i.index);
getBusinessData(businessId).storageItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZSTORAGE && item.ownerId == businessData.databaseId); //getBusinessData(businessId).storageItemCache = getServerData().items.filter(item => item.ownerType == VRR_ITEM_OWNER_BIZSTORAGE && item.ownerId == businessData.databaseId);
logToConsole(LOG_VERBOSE, `[VRR.Business] Caching business items for business ${businessId} (${getBusinessData(businessId).name}) ...`);
for(let i in getServerData().items) {
if(getItemData(i).ownerType == VRR_ITEM_OWNER_BIZFLOOR && getItemData(i).ownerId == getBusinessData(businessId).databaseId) {
getBusinessData(businessId).floorItemCache.push(i);
} else if(getItemData(i).ownerType == VRR_ITEM_OWNER_BIZSTORAGE && getItemData(i).ownerId == getBusinessData(businessId).databaseId) {
getBusinessData(businessId).storageItemCache.push(i);
}
}
logToConsole(LOG_VERBOSE, `[VRR.Business] Successfully cached ${getBusinessData(businessId).floorItemCache.length} floor items and ${getBusinessData(businessId).storageItemCache} storage items for business ${businessId} (${getBusinessData(businessId).name})!`); logToConsole(LOG_VERBOSE, `[VRR.Business] Successfully cached ${getBusinessData(businessId).floorItemCache.length} floor items and ${getBusinessData(businessId).storageItemCache} storage items for business ${businessId} (${getBusinessData(businessId).name})!`);
} }