From a5c77a6934cd424eacf2771c11ec3ffbc50df94f Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Fri, 25 Dec 2020 02:44:32 -0600 Subject: [PATCH] Change getClientData to getPlayerData --- scripts/server/account.js | 78 ++++++++++++++++++------------------ scripts/server/ban.js | 12 +++--- scripts/server/developer.js | 4 +- scripts/server/job/bus.js | 12 +++--- scripts/server/subaccount.js | 46 ++++++++++----------- scripts/server/timers.js | 4 +- 6 files changed, 78 insertions(+), 78 deletions(-) diff --git a/scripts/server/account.js b/scripts/server/account.js index aa6ffbfb..3b865dca 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -35,11 +35,11 @@ function loginCommand(command, params, client) { function autoLoginByIPCommand(command, params, client) { let flagValue = getAccountSettingsFlagValue("autoLoginIP"); - if(isAccountAutoIPLoginEnabled(getClientData(client).accountData)) { - getClientData(client).accountData.settings = getClientData(client).accountData.settings & ~flagValue; + if(isAccountAutoIPLoginEnabled(getPlayerData(client).accountData)) { + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings & ~flagValue; messageClientSuccess(client, `You will not be automatically logged in via your current IP (${client.ip})`); } else { - getClientData(client).accountData.settings = getClientData(client).accountData.settings | flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings | flagValue; messageClientSuccess(client, `You will now be automatically logged in from your current IP (${client.ip})`); } return true; @@ -51,10 +51,10 @@ function autoSelectLastCharacterCommand(command, params, client) { let flagValue = getAccountSettingsFlagValue("autoSelectLastCharacter"); if(doesPlayerHaveAutoSelectLastCharacterEnabled(client)) { - getClientData(client).accountData.settings = getClientData(client).accountData.settings & ~flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings & ~flagValue; messageClientSuccess(client, `You will not be automatically spawned as your last used character`); } else { - getClientData(client).accountData.settings = getClientData(client).accountData.settings | flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings | flagValue; messageClientSuccess(client, `You will now be automatically spawned as your last used character`); } return true; @@ -66,17 +66,17 @@ function toggleAccountGUICommand(command, params, client) { let flagValue = getAccountSettingsFlagValue("noGUI"); if(!doesPlayerHaveGUIEnabled(client)) { - getClientData(client).accountData.settings = getClientData(client).accountData.settings & ~flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings & ~flagValue; messageClientSuccess(client, `You will now be shown GUI (if enabled on current server)`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled GUI for their account ON.`); } else { - getClientData(client).accountData.settings = getClientData(client).accountData.settings | flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings | flagValue; messageClientSuccess(client, `You will not be shown GUI anymore. Any GUI stuff will be shown as messages in the chatbox instead.`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled GUI for their account OFF.`); } if(!isClientLoggedIn(client)) { - if(getClientData().accountData.databaseId != 0) { + if(getPlayerData().accountData.databaseId != 0) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { triggerNetworkEvent("ag.showLogin", client); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the login GUI`); @@ -103,12 +103,12 @@ function toggleAccountServerLogoCommand(command, params, client) { let flagValue = getAccountSettingsFlagValue("noServerLogo"); if(!doesPlayerHaveLogoEnabled(client)) { - getClientData(client).accountData.settings = getClientData(client).accountData.settings & ~flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings & ~flagValue; messageClientSuccess(client, `You will now be shown the server logo (if enabled on current server)`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled the server logo ON for their account`); triggerNetworkEvent("ag.logo", client, true); } else { - getClientData(client).accountData.settings = getClientData(client).accountData.settings | flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings | flagValue; messageClientSuccess(client, `You will not be shown the server logo.`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled the server logo OFF for their account`); triggerNetworkEvent("ag.logo", client, false); @@ -124,24 +124,24 @@ function toggleAccountServerLogoCommand(command, params, client) { function toggleAccountTwoFactorAuthCommand(command, params, client) { let flagValue = getAccountSettingsFlagValue("twoStepAuth"); - if(getClientData(client).emailAddress != "") { + if(getPlayerData(client).emailAddress != "") { messageClientError(client, "You need to add your email to your account to use two-factor authentication."); messageClientTip(client, "[#FFFFFF]Use [#AAAAAA]/setemail [#FFFFFF]to add your email."); return false; } - if(!isValidEmailAddress(getClientData(client).emailAddress)) { + if(!isValidEmailAddress(getPlayerData(client).emailAddress)) { messageClientError(client, "The email you previously added is not valid."); messageClientTip(client, "[#FFFFFF]Use [#AAAAAA]/setemail [#FFFFFF]to add a valid email."); return false; } if(!doesPlayerHaveTwoFactorAuthEnabled(client)) { - getClientData(client).accountData.settings = getClientData(client).accountData.settings & ~flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings & ~flagValue; messageClientSuccess(client, `[#FFFFFF]Use this code to add your account into your authenticator app: [#AAAAAA]${addtoAuthenticatorCode}`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled two-factor authentication ON for their account`); } else { - getClientData(client).accountData.settings = getClientData(client).accountData.settings | flagValue; + getPlayerData(client).accountData.settings = getPlayerData(client).accountData.settings | flagValue; messageClientSuccess(client, `You have turned off two-factor authentication for login.`); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} has toggled two-factor authentication OFF for their account`); } @@ -162,7 +162,7 @@ function registerCommand(command, params, client) { } checkRegistration(client, params); - //getClientData(client).accountData = accountData; + //getPlayerData(client).accountData = accountData; //messageClientSuccess(client, "Your account has been created!"); //messageClientAlert(client, "To play on the server, you will need to make a character."); } @@ -179,7 +179,7 @@ function changePasswordCommand(command, params, client) { let oldPassword = splitParams[0]; let newPassword = splitParams[1]; - if(isAccountPasswordCorrect(getClientData(client).accountData, hashAccountPassword(client.name, oldPassword))) { + if(isAccountPasswordCorrect(getPlayerData(client).accountData, hashAccountPassword(client.name, oldPassword))) { messageClientError(client, "The old password is invalid!"); return false; } @@ -190,7 +190,7 @@ function changePasswordCommand(command, params, client) { return false; } - getClientData(client).accountData.password = hashAccountPassword(getClientData(client).accountData.name, params); + getPlayerData(client).accountData.password = hashAccountPassword(getPlayerData(client).accountData.name, params); messageClientSuccess(client, "Your password has been changed!"); } @@ -214,7 +214,7 @@ function setAccountEmailCommand(command, params, client) { } // TO-DO: Command (like /verifyemail or use this one for second step too) to input verification code sent to email. - //getClientData(client).accountData.emailAddress = emailAddress; + //getPlayerData(client).accountData.emailAddress = emailAddress; messageClientSuccess(client, "Your password has been changed!"); } @@ -238,7 +238,7 @@ function setAccountDiscordCommand(command, params, client) { } // TO-DO: Command (like /verifyemail or use this one for second step too) to input verification code sent to email. - //getClientData(client).accountData.emailAddress = emailAddress; + //getPlayerData(client).accountData.emailAddress = emailAddress; //messageClientSuccess(client, "Your discord account has been attached to your game account!"); } @@ -249,8 +249,8 @@ function isClientLoggedIn(client) { return true; } - if(getClientData(client) != null) { - return getClientData(client).loggedIn; + if(getPlayerData(client) != null) { + return getPlayerData(client).loggedIn; } return false; @@ -263,8 +263,8 @@ function isClientRegistered(client) { return true; } - if(getClientData(client).accountData != false) { - if(getClientData(client).accountData.databaseId != 0) { + if(getPlayerData(client).accountData != false) { + if(getPlayerData(client).accountData.databaseId != 0) { return true; } } @@ -411,14 +411,14 @@ function saltAccountInfo(name, password) { function loginSuccess(client) { console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} successfully logged in.`); - getClientData(client).loggedIn = true; + getPlayerData(client).loggedIn = true; if(doesClientHaveStaffPermission(client, "developer") || doesClientHaveStaffPermission(client, "manageServer")) { console.warn(`[Asshat.Account] ${getClientDisplayForConsole(client)} has needed permissions and is being given administrator access`); client.administrator = true; } - if(getClientData(client).subAccounts.length == 0) { + if(getPlayerData(client).subAccounts.length == 0) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { triggerNetworkEvent("ag.showPrompt", client, "You have no characters. Would you like to make one?", "No characters"); setEntityData(client, "ag.prompt", AG_PROMPT_CREATEFIRSTCHAR, false); @@ -431,7 +431,7 @@ function loginSuccess(client) { showCharacterSelectToClient(client); } - getClientData(client).accountData.ipAddress = client.ip; + getPlayerData(client).accountData.ipAddress = client.ip; sendRemovedWorldObjectsToPlayer(client); sendAllBusinessLabelsToPlayer(client); @@ -577,7 +577,7 @@ function checkLogin(client, password) { return false; } - if(!isAccountPasswordCorrect(getClientData(client).accountData, hashAccountPassword(client.name, password))) { + if(!isAccountPasswordCorrect(getPlayerData(client).accountData, hashAccountPassword(client.name, password))) { console.warn(`[Asshat.Account] ${getClientDisplayForConsole(client)} attempted to login but failed (wrong password). ${loginAttemptsRemaining} login attempts remaining`); if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { triggerNetworkEvent("ag.loginFailed", client, `Invalid password! ${loginAttemptsRemaining} tries remaining.`); @@ -679,8 +679,8 @@ function checkRegistration(client, password, confirmPassword = "", emailAddress return false; } - getClientData(client).accountData = accountData; - getClientData(client).loggedIn = true; + getPlayerData(client).accountData = accountData; + getPlayerData(client).loggedIn = true; messageClientSuccess(client, "Your account has been created!"); messageClientAlert(client, "To play on the server, you will need to make a character."); @@ -706,24 +706,24 @@ function isValidEmailAddress(emailAddress) { function saveAllClientsToDatabase() { console.log("[Asshat.Account]: Saving all clients to database ..."); getClients().forEach(function(client) { - saveClientToDatabase(client); + savePlayerToDatabase(client); }); console.log("[Asshat.Account]: All clients saved to database successfully!"); } // --------------------------------------------------------------------------- -function saveClientToDatabase(client) { - if(getClientData(client) == null) { +function savePlayerToDatabase(client) { + if(getPlayerData(client) == null) { return false; } - if(!getClientData(client).loggedIn) { + if(!getPlayerData(client).loggedIn) { return false; } console.log(`[Asshat.Account]: Saving client ${client.name} to database ...`); - saveAccountToDatabase(getClientData(client).accountData); + saveAccountToDatabase(getPlayerData(client).accountData); let subAccountData = getClientCurrentSubAccount(client); @@ -758,7 +758,7 @@ function initClient(client) { getServerData().clients[client.index] = new serverClasses.clientData(client, tempAccountData, tempSubAccounts); if(tempAccountData != false) { - if(isAccountAutoIPLoginEnabled(tempAccountData) && getClientData(client).accountData.ipAddress == client.ip) { + if(isAccountAutoIPLoginEnabled(tempAccountData) && getPlayerData(client).accountData.ipAddress == client.ip) { messageClientAlert(client, "You have been automatically logged in via IP!"); loginSuccess(client); } else { @@ -930,7 +930,7 @@ addNetworkHandler("ag.clientReady", function(client) { // --------------------------------------------------------------------------- function doesPlayerHaveGUIEnabled(client) { - if(hasBitFlag(getClientData(client).accountData.settings, getAccountSettingsFlagValue("noGUI"))) { + if(hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("noGUI"))) { return false; } @@ -940,7 +940,7 @@ function doesPlayerHaveGUIEnabled(client) { // --------------------------------------------------------------------------- function doesPlayerHaveLogoEnabled(client) { - if(hasBitFlag(getClientData(client).accountData.settings, getAccountSettingsFlagValue("noServerLogo"))) { + if(hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("noServerLogo"))) { return false; } @@ -950,7 +950,7 @@ function doesPlayerHaveLogoEnabled(client) { // --------------------------------------------------------------------------- function doesPlayerHaveAutoLoginByIPEnabled(client) { - if(hasBitFlag(getClientData(client).accountData.settings, getAccountSettingsFlagValue("autoLoginIP"))) { + if(hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("autoLoginIP"))) { return true; } @@ -960,7 +960,7 @@ function doesPlayerHaveAutoLoginByIPEnabled(client) { // --------------------------------------------------------------------------- function doesPlayerHaveAutoSelectLastCharacterEnabled(client) { - if(hasBitFlag(getClientData(client).accountData.settings, getAccountSettingsFlagValue("autoSelectLastCharacter"))) { + if(hasBitFlag(getPlayerData(client).accountData.settings, getAccountSettingsFlagValue("autoSelectLastCharacter"))) { return true; } diff --git a/scripts/server/ban.js b/scripts/server/ban.js index d63958e5..d080bd5f 100644 --- a/scripts/server/ban.js +++ b/scripts/server/ban.js @@ -37,8 +37,8 @@ function accountBanCommand(command, params, client, fromDiscord) { return false; } - messageAdminAction(`${getClientData(targetClient).accountData.name} has been banned from the server (account ban).`); - banAccount(getClientData(targetClient).accountData.databaseId, getClientData(client).accountData.databaseId, ""); + messageAdminAction(`${getPlayerData(targetClient).accountData.name} has been banned from the server (account ban).`); + banAccount(getPlayerData(targetClient).accountData.databaseId, getPlayerData(client).accountData.databaseId, ""); targetClient.disconnect(); } @@ -60,8 +60,8 @@ function subAccountBanCommand(command, params, client, fromDiscord) { let targetClient = getClientFromParams(splitParams[0]); let reason = splitParams.slice(1).join(" "); - messageAdminAction(`${getClientData(targetClient).currentSubAccountData.name} has been banned from the server (character ban).`); - banSubAccount(getClientData(targetClient).currentSubAccountData.databaseId, getClientData(client).accountData.databaseId, reason); + messageAdminAction(`${getPlayerData(targetClient).currentSubAccountData.name} has been banned from the server (character ban).`); + banSubAccount(getPlayerData(targetClient).currentSubAccountData.databaseId, getPlayerData(client).accountData.databaseId, reason); targetClient.disconnect(); } @@ -84,7 +84,7 @@ function ipBanCommand(command, params, client, fromDiscord) { let reason = splitParams.slice(1).join(" "); messageAdminAction(`${targetClient.name} has been banned from the server (IP ban).`); - banIPAddress(targetClient.ip, getClientData(client).accountData.databaseId, reason); + banIPAddress(targetClient.ip, getPlayerData(client).accountData.databaseId, reason); server.banIP(targetClient.ip); targetClient.disconnect(); } @@ -109,7 +109,7 @@ function subNetBanCommand(command, params, client, fromDiscord) { let reason = splitParams.slice(2).join(" "); messageAdminAction(`${targetClient.name} has been banned from the server (subnet ban).`); - banSubNet(targetClient.ip, getSubNet(targetClient.ip, octetAmount), getClientData(client).accountData.databaseId, reason); + banSubNet(targetClient.ip, getSubNet(targetClient.ip, octetAmount), getPlayerData(client).accountData.databaseId, reason); } // --------------------------------------------------------------------------- diff --git a/scripts/server/developer.js b/scripts/server/developer.js index e09533e1..9959ecf0 100644 --- a/scripts/server/developer.js +++ b/scripts/server/developer.js @@ -196,7 +196,7 @@ function submitIdea(client, ideaText) { if(client.console) { databaseId = -1 } else { - databaseId = getClientData(client).accountData.databaseId; + databaseId = getPlayerData(client).accountData.databaseId; } let dbConnection = connectToDatabase(); @@ -229,7 +229,7 @@ function submitBugReport(client, bugText) { if(client.console) { databaseId = -1 } else { - databaseId = getClientData(client).accountData.databaseId; + databaseId = getPlayerData(client).accountData.databaseId; } let dbConnection = connectToDatabase(); diff --git a/scripts/server/job/bus.js b/scripts/server/job/bus.js index 1feb3297..df62bae7 100644 --- a/scripts/server/job/bus.js +++ b/scripts/server/job/bus.js @@ -110,12 +110,12 @@ function getRandomBusRoute(island) { // --------------------------------------------------------------------------- function getNextStopOnBusRoute(client) { - if(getClientData(client).busRoute && getClientData(client).lastBusStop) { + if(getPlayerData(client).busRoute && getPlayerData(client).lastBusStop) { if(!isGoingToLastStopOnBusRoute(client)) { - return busRoutes[getServerGame()][getClientData(client).busRoute].positions[getClientData(client).lastBusStop+1]; + return busRoutes[getServerGame()][getPlayerData(client).busRoute].positions[getPlayerData(client).lastBusStop+1]; } else { - let slot = busRoutes[getServerGame()][getClientData(client).busRoute].length-1; - return busRoutes[getServerGame()][getClientData(client).busRoute].positions[slot]; + let slot = busRoutes[getServerGame()][getPlayerData(client).busRoute].length-1; + return busRoutes[getServerGame()][getPlayerData(client).busRoute].positions[slot]; } } } @@ -123,8 +123,8 @@ function getNextStopOnBusRoute(client) { // --------------------------------------------------------------------------- function isGoingToLastStopOnBusRoute(client) { - if(getClientData(client).busRoute && getClientData(client).lastBusStop) { - if(getClientData(client).lastBusStop+1 == busRoutes[getServerGame()][getClientData(client).busRoute].length-1) { + if(getPlayerData(client).busRoute && getPlayerData(client).lastBusStop) { + if(getPlayerData(client).lastBusStop+1 == busRoutes[getServerGame()][getPlayerData(client).busRoute].length-1) { return true; } } diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js index 2e2227f0..b39b85f5 100644 --- a/scripts/server/subaccount.js +++ b/scripts/server/subaccount.js @@ -113,8 +113,8 @@ function createSubAccount(accountId, firstName, lastName, skinId, dateOfBirth, p function showCharacterSelectToClient(client) { if(doesPlayerHaveAutoSelectLastCharacterEnabled(client)) { - if(getClientData().subAccounts != null) { - if(getClientData().subAccounts.length > 0) { + if(getPlayerData().subAccounts != null) { + if(getPlayerData().subAccounts.length > 0) { selectCharacter(client, getPlayerLastUsedSubAccount(client)); return true; } @@ -122,8 +122,8 @@ function showCharacterSelectToClient(client) { } if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { - getClientData(client).currentSubAccount = 0; - let tempSubAccount = getClientData(client).subAccounts[0]; + getPlayerData(client).currentSubAccount = 0; + let tempSubAccount = getPlayerData(client).subAccounts[0]; triggerNetworkEvent("ag.showCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the character select GUI`); } else { @@ -131,7 +131,7 @@ function showCharacterSelectToClient(client) { //let emojiNumbers = ["①", "②", "③", "④", "⑤", "⑥", "⑦", "⑧", "⑨"]; //let emojiNumbers = ["1️⃣", "2️⃣", "3️⃣", "4️⃣", "5️⃣", "6️⃣", "7️⃣", "8️⃣", "9️⃣"]; messageClientNormal(client, `You have the following characters. Use /usechar to select one:`, getColourByName("teal")); - getClientData(client).subAccounts.forEach(function(subAccount, index) { + getPlayerData(client).subAccounts.forEach(function(subAccount, index) { messageClientNormal(client, `${index+1} • [#AAAAAA]${subAccount.firstName} ${subAccount.lastName}`); }); console.log(`[Asshat.Account] ${getClientDisplayForConsole(client)} is being shown the character select/list message (GUI disabled)`); @@ -168,7 +168,7 @@ function checkNewCharacter(client, firstName, lastName, dateOfBirth, placeOfOrig return false; } - let subAccountData = createSubAccount(getClientData(client).accountData.databaseId, firstName, lastName, skinId, dateOfBirth, placeOfOrigin); + let subAccountData = createSubAccount(getPlayerData(client).accountData.databaseId, firstName, lastName, skinId, dateOfBirth, placeOfOrigin); if(!subAccountData) { if(getServerConfig().useGUI && doesPlayerHaveGUIEnabled(client)) { triggerNetworkEvent("ag.newCharacterFailed", client, "Something went wrong. Your character could not be created!"); @@ -179,9 +179,9 @@ function checkNewCharacter(client, firstName, lastName, dateOfBirth, placeOfOrig return false; } - getClientData(client).subAccounts = loadSubAccountsFromAccount(getClientData(client).accountData.databaseId); - getClientData(client).currentSubAccount = 0; - let tempSubAccount = getClientData(client).subAccounts[0]; + getPlayerData(client).subAccounts = loadSubAccountsFromAccount(getPlayerData(client).accountData.databaseId); + getPlayerData(client).currentSubAccount = 0; + let tempSubAccount = getPlayerData(client).subAccounts[0]; showCharacterSelectToClient(client); } addNetworkHandler("ag.checkNewCharacter", checkNewCharacter); @@ -189,15 +189,15 @@ addNetworkHandler("ag.checkNewCharacter", checkNewCharacter); // --------------------------------------------------------------------------- addNetworkHandler("ag.previousCharacter", function(client) { - if(getClientData(client).subAccounts.length > 1) { - if(getClientData(client).currentSubAccount <= 0) { - getClientData(client).currentSubAccount = getClientData(client).subAccounts.length-1; + if(getPlayerData(client).subAccounts.length > 1) { + if(getPlayerData(client).currentSubAccount <= 0) { + getPlayerData(client).currentSubAccount = getPlayerData(client).subAccounts.length-1; } else { - getClientData(client).currentSubAccount--; + getPlayerData(client).currentSubAccount--; } - let subAccountId = getClientData(client).currentSubAccount; - let tempSubAccount = getClientData(client).subAccounts[subAccountId]; + let subAccountId = getPlayerData(client).currentSubAccount; + let tempSubAccount = getPlayerData(client).subAccounts[subAccountId]; triggerNetworkEvent("ag.switchCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin); } }); @@ -205,15 +205,15 @@ addNetworkHandler("ag.previousCharacter", function(client) { // --------------------------------------------------------------------------- addNetworkHandler("ag.nextCharacter", function(client) { - if(getClientData(client).subAccounts.length > 1) { - if(getClientData(client).currentSubAccount >= getClientData(client).subAccounts.length-1) { - getClientData(client).currentSubAccount = 0; + if(getPlayerData(client).subAccounts.length > 1) { + if(getPlayerData(client).currentSubAccount >= getPlayerData(client).subAccounts.length-1) { + getPlayerData(client).currentSubAccount = 0; } else { - getClientData(client).currentSubAccount++; + getPlayerData(client).currentSubAccount++; } - let subAccountId = getClientData(client).currentSubAccount; - let tempSubAccount = getClientData(client).subAccounts[subAccountId]; + let subAccountId = getPlayerData(client).currentSubAccount; + let tempSubAccount = getPlayerData(client).subAccounts[subAccountId]; triggerNetworkEvent("ag.switchCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin); } }); @@ -226,7 +226,7 @@ function selectCharacter(client, characterId = -1) { } if(characterId != -1) { - getClientData(client).currentSubAccount = characterId; + getPlayerData(client).currentSubAccount = characterId; } let tempSubAccount = getClientCurrentSubAccount(client); @@ -300,7 +300,7 @@ function useCharacterCommand(command, params, client) { // --------------------------------------------------------------------------- function getPlayerLastUsedSubAccount(client) { - let subAccounts = getClientData(client).subAccounts; + let subAccounts = getPlayerData(client).subAccounts; lastUsed = 0; for(let i in subAccounts) { if(subAccounts[i].lastLogin > subAccounts[lastUsed].lastLogin) { diff --git a/scripts/server/timers.js b/scripts/server/timers.js index 45ce3e1d..e2847f80 100644 --- a/scripts/server/timers.js +++ b/scripts/server/timers.js @@ -46,11 +46,11 @@ function vehicleRentCheck() { if(getServerData().vehicles[i].rentPrice > 0) { if(getServerData().vehicles[i].rentedBy) { let rentedBy = getServerData().vehicles[i].rentedBy; - if(getClientData(rentedBy).cash < getServerData().vehicles[i].rentPrice) { + if(getPlayerData(rentedBy).cash < getServerData().vehicles[i].rentPrice) { messageClientAlert(rentedBy, `You do not have enough money to continue renting this vehicle!`); stopRentingVehicle(rentedBy); } else { - getClientData(rentedBy).cash -= getServerData().vehicles[i].rentPrice; + getPlayerData(rentedBy).cash -= getServerData().vehicles[i].rentPrice; } } }