From 59d41f8482eb35f7bde3f4621ddf0e6d41d73fd1 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 18 Dec 2022 14:35:39 -0600 Subject: [PATCH] New query system to ease port for RageMP --- scripts/server/account.js | 46 +++++++++++++++--------------- scripts/server/business.js | 16 +++++------ scripts/server/clan.js | 12 ++++---- scripts/server/client.js | 2 +- scripts/server/config.js | 20 ++++++------- scripts/server/developer.js | 4 +-- scripts/server/gate.js | 4 +-- scripts/server/house.js | 4 +-- scripts/server/item.js | 8 +++--- scripts/server/job.js | 34 +++++++++++----------- scripts/server/native/connected.js | 2 +- scripts/server/npc.js | 14 ++++----- scripts/server/prompt.js | 1 + scripts/server/property.js | 10 +++---- scripts/server/radio.js | 5 ++-- scripts/server/subaccount.js | 12 ++++---- scripts/server/vehicle.js | 4 +-- 17 files changed, 99 insertions(+), 99 deletions(-) diff --git a/scripts/server/account.js b/scripts/server/account.js index cd073418..6f0db57b 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -715,20 +715,20 @@ function isAccountPasswordCorrect(accountData, password) { // =========================================================================== -async function loadAccountFromName(accountName, fullLoad = false) { +function loadAccountFromName(accountName, fullLoad = false) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { accountName = escapeDatabaseString(dbConnection, accountName); let dbQueryString = `SELECT acct_main.*, acct_svr.* FROM acct_main INNER JOIN acct_svr ON acct_svr.acct_svr_acct = acct_main.acct_id AND acct_svr.acct_svr_svr = ${getServerId()} WHERE acct_name = '${accountName}' LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { let tempAccountData = new AccountData(dbAssoc[0]); if (fullLoad) { - tempAccountData.messages = await loadAccountMessagesFromDatabase(tempAccountData.databaseId); - tempAccountData.notes = await loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); - tempAccountData.contacts = await loadAccountContactsFromDatabase(tempAccountData.databaseId); + tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId); + tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); + tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId); } return tempAccountData; } @@ -739,19 +739,19 @@ async function loadAccountFromName(accountName, fullLoad = false) { // =========================================================================== -async function loadAccountFromId(accountId, fullLoad = false) { +function loadAccountFromId(accountId, fullLoad = false) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT acct_main.*, acct_svr.* FROM acct_main INNER JOIN acct_svr ON acct_svr.acct_svr_acct = acct_main.acct_id AND acct_svr.acct_svr_svr = ${getServerId()} WHERE acct_id = ${accountId} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { let tempAccountData = new AccountData(dbAssoc[0]); if (fullLoad) { - tempAccountData.messages = await loadAccountMessagesFromDatabase(tempAccountData.databaseId); - tempAccountData.notes = await loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); - tempAccountData.contacts = await loadAccountContactsFromDatabase(tempAccountData.databaseId); + tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId); + tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); + tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId); } return tempAccountData; @@ -804,7 +804,7 @@ function getAccountHashingFunction() { // =========================================================================== async function isNameRegistered(name) { - let accountData = await loadAccountFromName(name, true); + let accountData = loadAccountFromName(name, true); if (accountData.databaseId > 0) { return true; } @@ -1046,11 +1046,11 @@ async function createAccount(name, password, email = "") { if (getDatabaseInsertId(dbConnection) > 0) { let insertId = getDatabaseInsertId(dbConnection); createDefaultAccountServerData(insertId); - let tempAccountData = await loadAccountFromId(insertId, false); + let tempAccountData = loadAccountFromId(insertId, false); - tempAccountData.messages = await loadAccountMessagesFromDatabase(tempAccountData.databaseId); - tempAccountData.notes = await loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); - tempAccountData.contacts = await loadAccountContactsFromDatabase(tempAccountData.databaseId); + tempAccountData.messages = loadAccountMessagesFromDatabase(tempAccountData.databaseId); + tempAccountData.notes = loadAccountStaffNotesFromDatabase(tempAccountData.databaseId); + tempAccountData.contacts = loadAccountContactsFromDatabase(tempAccountData.databaseId); tempAccountData.flags.admin = 0; return tempAccountData; } @@ -1472,7 +1472,7 @@ function createDefaultAccountServerData(accountDatabaseId) { // =========================================================================== -async function loadAccountKeybindsFromDatabase(accountDatabaseID) { +function loadAccountKeybindsFromDatabase(accountDatabaseID) { logToConsole(LOG_DEBUG, `[AGRP.Account]: Loading account keybinds for account ${accountDatabaseID} from database ...`); let tempAccountKeybinds = []; @@ -1491,7 +1491,7 @@ async function loadAccountKeybindsFromDatabase(accountDatabaseID) { if (accountDatabaseID != 0 && typeof accountDatabaseId != "undefined") { if (dbConnection) { let dbQueryString = `SELECT * FROM acct_hotkey WHERE acct_hotkey_enabled = 1 AND acct_hotkey_acct = ${accountDatabaseID} AND acct_hotkey_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempAccountKeyBindData = new KeyBindData(dbAssoc[i]); @@ -1509,7 +1509,7 @@ async function loadAccountKeybindsFromDatabase(accountDatabaseID) { // =========================================================================== -async function loadAccountStaffNotesFromDatabase(accountDatabaseID) { +function loadAccountStaffNotesFromDatabase(accountDatabaseID) { logToConsole(LOG_DEBUG, `[AGRP.Account]: Loading account staff notes for account ${accountDatabaseID} from database ...`); let tempAccountStaffNotes = []; @@ -1518,7 +1518,7 @@ async function loadAccountStaffNotesFromDatabase(accountDatabaseID) { if (dbConnection) { let dbQueryString = "SELECT * FROM `acct_note` WHERE `acct_note_deleted` = 0 AND `acct_note_acct` = " + toString(accountDatabaseID); - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempAccountStaffNoteData = new AccountStaffNoteData(dbAssoc[i]); @@ -1535,7 +1535,7 @@ async function loadAccountStaffNotesFromDatabase(accountDatabaseID) { // =========================================================================== -async function loadAccountContactsFromDatabase(accountDatabaseID) { +function loadAccountContactsFromDatabase(accountDatabaseID) { logToConsole(LOG_DEBUG, `[AGRP.Account]: Loading account contacts for account ${accountDatabaseID} from database ...`); let tempAccountContacts = []; @@ -1544,7 +1544,7 @@ async function loadAccountContactsFromDatabase(accountDatabaseID) { if (dbConnection) { let dbQueryString = "SELECT * FROM `acct_contact` WHERE `acct_contact_deleted` = 0 AND `acct_contact_acct` = " + toString(accountDatabaseID); - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempAccountContactData = new AccountContactData(dbAssoc[i]); @@ -1561,7 +1561,7 @@ async function loadAccountContactsFromDatabase(accountDatabaseID) { // =========================================================================== -async function loadAccountMessagesFromDatabase(accountDatabaseID) { +function loadAccountMessagesFromDatabase(accountDatabaseID) { logToConsole(LOG_DEBUG, `[AGRP.Account]: Loading account messages for account ${accountDatabaseID} from database ...`); let tempAccountMessages = []; @@ -1570,7 +1570,7 @@ async function loadAccountMessagesFromDatabase(accountDatabaseID) { if (dbConnection) { let dbQueryString = "SELECT * FROM`acct_msg` WHERE `acct_msg_deleted` = 0 AND`acct_msg_acct` = " + toString(accountDatabaseID); - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempAccountMessageData = new AccountContactData(dbAssoc[i]); diff --git a/scripts/server/business.js b/scripts/server/business.js index c8232992..37d75705 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -196,11 +196,11 @@ function initBusinessScript() { // =========================================================================== -async function loadBusinessFromId(businessId) { +function loadBusinessFromId(businessId) { let dbConnection = connectToDatabase(); if (dbConnection) { let dbQueryString = `SELECT * FROM biz_main WHERE biz_id = ${businessId} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { return new BusinessData(dbAssoc[0]); } @@ -212,7 +212,7 @@ async function loadBusinessFromId(businessId) { // =========================================================================== -async function loadBusinessesFromDatabase() { +function loadBusinessesFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Business]: Loading businesses from database ..."); let tempBusinesses = []; @@ -221,7 +221,7 @@ async function loadBusinessesFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM biz_main WHERE biz_deleted = 0 AND biz_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempBusinessData = new BusinessData(dbAssoc[i]); @@ -241,7 +241,7 @@ async function loadBusinessesFromDatabase() { // =========================================================================== -async function loadBusinessLocationsFromDatabase(businessId) { +function loadBusinessLocationsFromDatabase(businessId) { logToConsole(LOG_VERBOSE, `[AGRP.Business]: Loading business locations for business ${businessId} from database ...`); let tempBusinessLocations = []; @@ -251,7 +251,7 @@ async function loadBusinessLocationsFromDatabase(businessId) { if (dbConnection) { dbQueryString = `SELECT * FROM biz_loc WHERE biz_loc_biz = ${businessId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempBusinessLocationData = new BusinessLocationData(dbAssoc[i]); @@ -269,7 +269,7 @@ async function loadBusinessLocationsFromDatabase(businessId) { // =========================================================================== /* -async function loadBusinessGameScriptsFromDatabase(businessId) { +function loadBusinessGameScriptsFromDatabase(businessId) { logToConsole(LOG_VERBOSE, `[AGRP.Business]: Loading business game scripts for business ${businessId} from database ...`); let tempBusinessGameScripts = []; @@ -280,7 +280,7 @@ async function loadBusinessGameScriptsFromDatabase(businessId) { if(dbConnection) { dbQueryString = `SELECT * FROM biz_script WHERE biz_script_biz = ${businessId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempBusinessGameScriptData = new BusinessGameScriptData(dbAssoc[i]); diff --git a/scripts/server/clan.js b/scripts/server/clan.js index 3519fd88..287a3ce9 100644 --- a/scripts/server/clan.js +++ b/scripts/server/clan.js @@ -117,7 +117,7 @@ function initClanScript() { // =========================================================================== -async function loadClansFromDatabase() { +function loadClansFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Clan]: Loading clans from database ..."); let tempClans = []; @@ -126,7 +126,7 @@ async function loadClansFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM clan_main WHERE clan_deleted = 0 AND clan_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempClanData = new ClanData(dbAssoc[i]); @@ -145,7 +145,7 @@ async function loadClansFromDatabase() { // =========================================================================== -async function loadClanMembersFromDatabase() { +function loadClanMembersFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Clan]: Loading clans from database ..."); let tempClans = []; @@ -154,7 +154,7 @@ async function loadClanMembersFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM clan_main WHERE clan_deleted = 0 AND clan_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempClanData = new ClanData(dbAssoc[i]); @@ -171,7 +171,7 @@ async function loadClanMembersFromDatabase() { // =========================================================================== -async function loadClanRanksFromDatabase(clanDatabaseId) { +function loadClanRanksFromDatabase(clanDatabaseId) { logToConsole(LOG_INFO, `[AGRP.Clan]: Loading ranks for clan ${clanDatabaseId} from database ...`); let dbConnection = connectToDatabase(); @@ -180,7 +180,7 @@ async function loadClanRanksFromDatabase(clanDatabaseId) { if (dbConnection) { let dbQueryString = `SELECT * FROM clan_rank WHERE clan_rank_clan = ${clanDatabaseId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempClanRankData = new ClanRankData(dbAssoc[i]); diff --git a/scripts/server/client.js b/scripts/server/client.js index eb29856e..6d937b82 100644 --- a/scripts/server/client.js +++ b/scripts/server/client.js @@ -144,7 +144,7 @@ class ClientData { this.jobRouteEditNextLocationDelay = 0; this.jobRouteEditNextLocationArriveMessage = ""; this.jobRouteEditNextLocationGotoMessage = ""; - this.jobRouteEditNextLocationType = AGRP_JOB_ROUTE_LOCATION_TYPE_NONE; + this.jobRouteEditNextLocationType = AGRP_JOB_ROUTE_LOC_TYPE_NONE; // Casino Stuff this.casinoChips = 0; // This might become an item with a useId of a business (for chips belonging to specific casinos) diff --git a/scripts/server/config.js b/scripts/server/config.js index 05871a23..c4967986 100644 --- a/scripts/server/config.js +++ b/scripts/server/config.js @@ -314,13 +314,13 @@ function loadGlobalConfig() { // =========================================================================== -async function loadServerConfigFromGameAndPort(gameId, port) { +function loadServerConfigFromGameAndPort(gameId, port) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM svr_main WHERE svr_game = ${gameId} AND svr_port = ${port} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { let tempServerConfigData = new ServerConfigData(dbAssoc[0]); return tempServerConfigData; @@ -332,13 +332,13 @@ async function loadServerConfigFromGameAndPort(gameId, port) { // =========================================================================== -async function loadServerConfigFromGame(gameId) { +function loadServerConfigFromGame(gameId) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM svr_main WHERE svr_game = ${gameId} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { let tempServerConfigData = new ServerConfigData(dbAssoc[0]); return tempServerConfigData; @@ -350,13 +350,13 @@ async function loadServerConfigFromGame(gameId) { // =========================================================================== -async function loadServerConfigFromId(tempServerId) { +function loadServerConfigFromId(tempServerId) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM svr_main WHERE svr_id = ${tempServerId} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { let tempServerConfigData = new ServerConfigData(dbAssoc[0]); return tempServerConfigData; @@ -890,7 +890,7 @@ function setServerRealWorldTimeZoneCommand(command, params, client) { * */ async function reloadServerConfigurationCommand(command, params, client) { - serverConfig = await loadServerConfigFromGameAndPort(server.game, server.port); + serverConfig = loadServerConfigFromGameAndPort(server.game, server.port); applyConfigToServer(serverConfig); updateServerRules(); @@ -1122,18 +1122,18 @@ function getDatabaseConfig() { // =========================================================================== -async function loadServerConfig() { +function loadServerConfig() { logToConsole(LOG_DEBUG, "[AGRP.Config] Loading server configuration"); if (toInteger(server.getCVar("agrp_devserver")) == 1) { - serverConfig = await loadServerConfigFromGame(getGame()); + serverConfig = loadServerConfigFromGame(getGame()); if (serverConfig == false) { logToConsole(LOG_ERROR, `[AGRP.Config] Could not load server configuration for game ${getGame()}`); server.shutdown(); } } else { - serverConfig = await loadServerConfigFromGameAndPort(getGame(), getServerPort()); + serverConfig = loadServerConfigFromGameAndPort(getGame(), getServerPort()); if (serverConfig == false) { logToConsole(LOG_ERROR, `[AGRP.Config] Could not load server configuration for game ${getGame()} and port ${getServerPort()}`); diff --git a/scripts/server/developer.js b/scripts/server/developer.js index 9c3a1d9d..98b67fb8 100644 --- a/scripts/server/developer.js +++ b/scripts/server/developer.js @@ -555,7 +555,7 @@ async function migrateSubAccountsToPerServerData() { if (dbConnection) { let dbQueryString = `SELECT * FROM sacct_main`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { createDefaultSubAccountServerData(dbAssoc[0]["sacct_id"]); @@ -576,7 +576,7 @@ async function resetAllAccountsHotkeysToDefault() { if (dbConnection) { let dbQueryString = `SELECT acct_id FROM acct_main`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { createDefaultKeybindsForAccount(dbAssoc[0]["acct_id"]); } diff --git a/scripts/server/gate.js b/scripts/server/gate.js index 6f2912da..7be83a68 100644 --- a/scripts/server/gate.js +++ b/scripts/server/gate.js @@ -235,7 +235,7 @@ function saveGateToDatabase(gateId) { // =========================================================================== -async function loadGatesFromDatabase() { +function loadGatesFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Gate]: Loading gates from database ..."); let tempGates = []; @@ -244,7 +244,7 @@ async function loadGatesFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM gate_main WHERE gate_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempGateData = new GateData(dbAssoc[i]); diff --git a/scripts/server/house.js b/scripts/server/house.js index eb5687a0..7c22f867 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -175,7 +175,7 @@ function initHouseScript() { // =========================================================================== -async function loadHousesFromDatabase() { +function loadHousesFromDatabase() { logToConsole(LOG_INFO, "[AGRP.House]: Loading houses from database ..."); let tempHouses = []; let dbConnection = connectToDatabase(); @@ -183,7 +183,7 @@ async function loadHousesFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM house_main WHERE house_deleted = 0 AND house_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempHouseData = new HouseData(dbAssoc[i]); diff --git a/scripts/server/item.js b/scripts/server/item.js index 93d51a9c..828b0d60 100644 --- a/scripts/server/item.js +++ b/scripts/server/item.js @@ -288,14 +288,14 @@ function initItemScript() { // =========================================================================== -async function loadItemsFromDatabase() { +function loadItemsFromDatabase() { logToConsole(LOG_DEBUG, `[AGRP.Item]: Loading items from database ...`); let tempItems = []; let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM item_main WHERE item_deleted = 0 AND item_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempItemData = new ItemData(dbAssoc[i]); @@ -311,7 +311,7 @@ async function loadItemsFromDatabase() { // =========================================================================== -async function loadItemTypesFromDatabase() { +function loadItemTypesFromDatabase() { logToConsole(LOG_DEBUG, `[AGRP.Item]: Loading item types from database ...`); let tempItemTypes = []; let dbConnection = connectToDatabase(); @@ -319,7 +319,7 @@ async function loadItemTypesFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM item_type WHERE item_type_deleted = 0 AND item_type_enabled = 1 AND item_type_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempItemTypeData = new ItemTypeData(dbAssoc[i]); diff --git a/scripts/server/job.js b/scripts/server/job.js index 11b566f4..e7282d39 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -536,7 +536,7 @@ function initJobScript() { // =========================================================================== -async function loadJobsFromDatabase() { +function loadJobsFromDatabase() { logToConsole(LOG_DEBUG, "[AGRP.Job]: Loading jobs from database ..."); let tempJobs = []; @@ -545,7 +545,7 @@ async function loadJobsFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM job_main WHERE job_deleted = 0 AND job_enabled = 1 AND job_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobData = new JobData(dbAssoc[i]); @@ -599,7 +599,7 @@ function loadAllJobLocationsFromDatabase() { // =========================================================================== -async function loadJobRanksFromDatabase(jobDatabaseId) { +function loadJobRanksFromDatabase(jobDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading ranks for job ${jobDatabaseId} from database ...`); let tempJobRanks = []; @@ -608,7 +608,7 @@ async function loadJobRanksFromDatabase(jobDatabaseId) { if (dbConnection) { let dbQueryString = `SELECT * FROM job_rank WHERE job_rank_deleted = 0 AND job_rank_enabled = 1 AND job_rank_job = ${jobDatabaseId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobRankData = new JobRankData(dbAssoc[i]); @@ -625,7 +625,7 @@ async function loadJobRanksFromDatabase(jobDatabaseId) { // =========================================================================== -async function loadJobRoutesFromDatabase(jobDatabaseId) { +function loadJobRoutesFromDatabase(jobDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading job routes for job ${jobDatabaseId} from database ...`); let tempJobRoutes = []; @@ -634,7 +634,7 @@ async function loadJobRoutesFromDatabase(jobDatabaseId) { if (dbConnection) { let dbQueryString = `SELECT * FROM job_route WHERE job_route_deleted = 0 AND job_route_enabled = 1 AND job_route_job = ${jobDatabaseId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobRouteData = new JobRouteData(dbAssoc[i]); @@ -652,7 +652,7 @@ async function loadJobRoutesFromDatabase(jobDatabaseId) { // =========================================================================== -async function loadJobRouteLocationsFromDatabase(jobRouteId) { +function loadJobRouteLocationsFromDatabase(jobRouteId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading locations for job route ${jobRouteId} from database ...`); let tempJobRouteLocations = []; @@ -661,7 +661,7 @@ async function loadJobRouteLocationsFromDatabase(jobRouteId) { if (dbConnection) { let dbQueryString = `SELECT * FROM job_route_loc WHERE job_route_loc_deleted = 0 AND job_route_loc_enabled = 1 AND job_route_loc_route = ${jobRouteId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobRouteLocationData = new JobRouteLocationData(dbAssoc[i]); @@ -678,7 +678,7 @@ async function loadJobRouteLocationsFromDatabase(jobRouteId) { // =========================================================================== -async function loadJobEquipmentsFromDatabase(jobDatabaseId) { +function loadJobEquipmentsFromDatabase(jobDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading job equipments for job ${jobDatabaseId} from database ...`); let tempJobEquipments = []; @@ -687,7 +687,7 @@ async function loadJobEquipmentsFromDatabase(jobDatabaseId) { if (dbConnection) { let dbQueryString = `SELECT * FROM job_equip WHERE job_equip_deleted = 0 AND job_equip_enabled = 1 AND job_equip_job = ${jobDatabaseId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobEquipmentData = new JobEquipmentData(dbAssoc[i]); @@ -705,7 +705,7 @@ async function loadJobEquipmentsFromDatabase(jobDatabaseId) { // =========================================================================== -async function loadJobLocationsFromDatabase(jobDatabaseId) { +function loadJobLocationsFromDatabase(jobDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading job locations for job ${jobDatabaseId} from database ...`); let tempJobLocations = []; @@ -714,7 +714,7 @@ async function loadJobLocationsFromDatabase(jobDatabaseId) { if (dbConnection) { let dbQueryString = `SELECT * FROM job_loc WHERE job_loc_deleted = 0 AND job_loc_enabled = 1 AND job_loc_job = ${jobDatabaseId}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobLocationData = new JobLocationData(dbAssoc[i]); @@ -731,7 +731,7 @@ async function loadJobLocationsFromDatabase(jobDatabaseId) { // =========================================================================== -async function loadJobUniformsFromDatabase(jobDatabaseId) { +function loadJobUniformsFromDatabase(jobDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading job uniforms for job ${jobDatabaseId} from database ...`); let tempJobUniforms = []; @@ -740,7 +740,7 @@ async function loadJobUniformsFromDatabase(jobDatabaseId) { if (dbConnection) { let dbQueryString = "SELECT * FROM `job_uniform` WHERE `job_uniform_enabled` = 1 AND `job_uniform_job` = " + toString(jobDatabaseId); - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobUniformData = new JobUniformData(dbAssoc[i]); @@ -757,7 +757,7 @@ async function loadJobUniformsFromDatabase(jobDatabaseId) { // =========================================================================== -async function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) { +function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.Job]: Loading job equipment items for job equipment ${jobEquipmentDatabaseId} from database ...`); let tempJobEquipmentItems = []; @@ -766,7 +766,7 @@ async function loadJobEquipmentItemsFromDatabase(jobEquipmentDatabaseId) { if (dbConnection) { let dbQueryString = "SELECT * FROM `job_equip_item` WHERE `job_equip_item_enabled` = 1 AND `job_equip_item_equip` = " + toString(jobEquipmentDatabaseId) - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempJobEquipmentItemData = new JobEquipmentItemData(dbAssoc[i]); @@ -3597,7 +3597,7 @@ function createJobRoute(routeName, closestJobLocation, whoCreated = defaultNoAcc // =========================================================================== -function createJobRouteLocation(routeLocationName, position, jobRouteData, whoCreated = defaultNoAccountId, delay = 0, arriveMessage = "", gotoMessage = "", type = AGRP_JOB_ROUTE_LOCATION_TYPE_NONE) { +function createJobRouteLocation(routeLocationName, position, jobRouteData, whoCreated = defaultNoAccountId, delay = 0, arriveMessage = "", gotoMessage = "", type = AGRP_JOB_ROUTE_LOC_TYPE_NONE) { let tempJobRouteLocationData = new JobRouteLocationData(false); tempJobRouteLocationData.name = routeLocationName; tempJobRouteLocationData.routeId = jobRouteData.databaseId; diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index 3c5277d9..834eaef4 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -917,7 +917,7 @@ function freeDatabaseQuery(dbQuery) { // =========================================================================== -async function fetchQueryAssoc(dbConnection, queryString) { +function fetchQueryAssoc(dbConnection, queryString) { let assocArray = []; let dbAssoc = null; diff --git a/scripts/server/npc.js b/scripts/server/npc.js index b24e1a6b..9fc804e4 100644 --- a/scripts/server/npc.js +++ b/scripts/server/npc.js @@ -246,14 +246,14 @@ function createNPCCommand(command, params, client) { // =========================================================================== -async function loadNPCsFromDatabase() { +function loadNPCsFromDatabase() { logToConsole(LOG_DEBUG, `[AGRP.NPC]: Loading NPCs from database ...`); let dbConnection = connectToDatabase(); let tempNPCs = []; let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM npc_main WHERE npc_server = ${getServerId()} AND npc_enabled = 1`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempNPCData = new NPCData(dbAssoc[i]); @@ -270,14 +270,14 @@ async function loadNPCsFromDatabase() { // =========================================================================== -async function loadNPCTriggersFromDatabase(npcDatabaseId) { +function loadNPCTriggersFromDatabase(npcDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.NPC]: Loading NPC triggers for NPC ${npcDatabaseId} from database ...`); let dbConnection = connectToDatabase(); let tempNPCTriggers = []; let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM npc_trig WHERE npc_trig_npc = ${npcDatabaseId} AND npc_trig_enabled = 1`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempNPCTriggerData = new NPCTriggerData(dbAssoc[i]); @@ -295,14 +295,14 @@ async function loadNPCTriggersFromDatabase(npcDatabaseId) { // =========================================================================== -async function loadNPCTriggerConditionsFromDatabase(npcTriggerDatabaseId) { +function loadNPCTriggerConditionsFromDatabase(npcTriggerDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.NPC]: Loading NPC trigger conditions for trigger ${npcTriggerDatabaseId} from database ...`); let dbConnection = connectToDatabase(); let tempNPCTriggerConditions = []; let dbAssoc; if (dbConnection) { let dbQueryString = `SELECT * FROM npc_cond WHERE npc_cond_trig = ${npcTriggerDatabaseId} AND npc_cond_enabled = 1`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempNPCTriggerConditionData = new NPCTriggerConditionData(dbAssoc[i]); @@ -318,7 +318,7 @@ async function loadNPCTriggerConditionsFromDatabase(npcTriggerDatabaseId) { // =========================================================================== -async function loadNPCTriggerResponsesFromDatabase(npcTriggerDatabaseId) { +function loadNPCTriggerResponsesFromDatabase(npcTriggerDatabaseId) { logToConsole(LOG_DEBUG, `[AGRP.NPC]: Loading NPC trigger responses for trigger ${npcTriggerDatabaseId} from database ...`); let dbConnection = connectToDatabase(); let tempNPCTriggerResponses = []; diff --git a/scripts/server/prompt.js b/scripts/server/prompt.js index 86efdcdf..d0deb478 100644 --- a/scripts/server/prompt.js +++ b/scripts/server/prompt.js @@ -238,6 +238,7 @@ function playerPromptAnswerYes(client) { getBusinessData(businessId).buyPrice = 0; getBusinessData(businessId).needsSaved = true; updateBusinessPickupLabelData(businessId); + takePlayerCash(client, getBusinessData(businessId).buyPrice); messageDiscordEventChannel(`🏢 ${getCharacterFullName(client)} is now the owner of *${getBusinessData(businessId).name}*!`); messagePlayerSuccess(client, getLocaleString(client, "BusinessPurchased", `{businessBlue}${getBusinessData(businessId).name}{MAINCOLOUR}`)); diff --git a/scripts/server/property.js b/scripts/server/property.js index 9aa832a1..fd1d9b4f 100644 --- a/scripts/server/property.js +++ b/scripts/server/property.js @@ -159,12 +159,12 @@ function initPropertyScript() { // =========================================================================== -async function loadPropertyFromId(propertyIndex) { +function loadPropertyFromId(propertyIndex) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM prop_main WHERE prop_id = ${propertyIndex} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { return new PropertyData(dbAssoc[0]); } @@ -176,7 +176,7 @@ async function loadPropertyFromId(propertyIndex) { // =========================================================================== -async function loadPropertiesFromDatabase() { +function loadPropertiesFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Property]: Loading properties from database ..."); let tempProperties = []; @@ -185,7 +185,7 @@ async function loadPropertiesFromDatabase() { if (dbConnection) { let dbQueryString = `SELECT * FROM prop_main WHERE prop_deleted = 0 AND prop_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempPropertyData = new PropertyData(dbAssoc[i]); @@ -203,7 +203,7 @@ async function loadPropertiesFromDatabase() { // =========================================================================== -async function loadPropertyLocationsFromDatabase(propertyIndex) { +function loadPropertyLocationsFromDatabase(propertyIndex) { logToConsole(LOG_VERBOSE, `[AGRP.Property]: Loading property locations for property ${propertyIndex} from database ...`); let tempPropertyLocations = []; diff --git a/scripts/server/radio.js b/scripts/server/radio.js index 4e2953aa..d6c69cdb 100644 --- a/scripts/server/radio.js +++ b/scripts/server/radio.js @@ -37,20 +37,19 @@ function initRadioScript() { // =========================================================================== -async function loadRadioStationsFromDatabase() { +function loadRadioStationsFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Radio]: Loading radio stations from database ..."); let dbConnection = connectToDatabase(); let tempRadioStations = []; let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM radio_main`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempRadioStationData = new RadioStationData(dbAssoc[i]); tempRadioStations.push(tempRadioStationData); } - freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } diff --git a/scripts/server/subaccount.js b/scripts/server/subaccount.js index e18701ef..3632fa8b 100644 --- a/scripts/server/subaccount.js +++ b/scripts/server/subaccount.js @@ -129,7 +129,7 @@ function initSubAccountScript() { // =========================================================================== -async function loadSubAccountFromName(firstName, lastName) { +function loadSubAccountFromName(firstName, lastName) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { @@ -137,7 +137,7 @@ async function loadSubAccountFromName(firstName, lastName) { lastName = escapeDatabaseString(dbConnection, lastName); let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_name_first = '${firstName}' AND sacct_name_last = '${lastName}' LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { freeDatabaseQuery(dbQuery); return new SubAccountData(dbAssoc[0]); @@ -150,12 +150,12 @@ async function loadSubAccountFromName(firstName, lastName) { // =========================================================================== -async function loadSubAccountFromId(subAccountId) { +function loadSubAccountFromId(subAccountId) { let dbConnection = connectToDatabase(); let dbAssoc = []; if (dbConnection) { let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_id = ${subAccountId} LIMIT 1;`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { return new SubAccountData(dbAssoc[0]); } @@ -167,14 +167,14 @@ async function loadSubAccountFromId(subAccountId) { // =========================================================================== -async function loadSubAccountsFromAccount(accountId) { +function loadSubAccountsFromAccount(accountId) { let tempSubAccounts = []; let dbAssoc = false; if (accountId > 0) { let dbConnection = connectToDatabase(); if (dbConnection) { let dbQueryString = `SELECT * FROM sacct_main INNER JOIN sacct_svr ON sacct_svr.sacct_svr_sacct=sacct_main.sacct_id AND sacct_svr.sacct_svr_server=${getServerId()} WHERE sacct_acct = ${accountId} AND sacct_server = ${getServerId()}`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempSubAccount = new SubAccountData(dbAssoc[i]); diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js index 0b76ea1e..5ecf3e17 100644 --- a/scripts/server/vehicle.js +++ b/scripts/server/vehicle.js @@ -177,14 +177,14 @@ function initVehicleScript() { // =========================================================================== -async function loadVehiclesFromDatabase() { +function loadVehiclesFromDatabase() { logToConsole(LOG_INFO, "[AGRP.Vehicle]: Loading vehicles from database ..."); let dbConnection = connectToDatabase(); let tempVehicles = []; let dbAssoc; if (dbConnection) { let dbQueryString = `SELECT * FROM veh_main WHERE veh_server = ${getServerId()} AND veh_deleted = 0`; - dbAssoc = await fetchQueryAssoc(dbConnection, dbQueryString); + dbAssoc = fetchQueryAssoc(dbConnection, dbQueryString); if (dbAssoc.length > 0) { for (let i in dbAssoc) { let tempVehicleData = new VehicleData(dbAssoc[i]);