diff --git a/scripts/server/account.js b/scripts/server/account.js index 57894572..39f664bc 100644 --- a/scripts/server/account.js +++ b/scripts/server/account.js @@ -190,7 +190,7 @@ function switchCharacterCommand(command, params, client) { saveSubAccountToDatabase(tempSubAccount); client.despawnPlayer(); - triggerNetworkEvent("ag.connectCamera", client, serverConfig.connectCameraPosition[server.game], serverConfig.connectCameraLookAt[server.game]); + triggerNetworkEvent("ag.connectCamera", client, serverConfig.connectCameraPosition[getServerGame()], serverConfig.connectCameraLookAt[getServerGame()]); triggerNetworkEvent("ag.showCharacterSelect", client, tempSubAccount.firstName, tempSubAccount.lastName, tempSubAccount.placeOfOrigin, tempSubAccount.dateOfBirth, tempSubAccount.skin); } @@ -235,15 +235,15 @@ function isAccountPasswordCorrect(accountData, password) { function loadAccountFromName(accountName) { let dbConnection = connectToDatabase(); if(dbConnection) { - accountName = dbConnection.escapeString(accountName); + accountName = escapeDatabaseString(dbConnection, accountName); let dbQueryString = `SELECT * FROM acct_main WHERE acct_name = '${accountName}' LIMIT 1;`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { if(dbQuery.numRows > 0) { - let dbAssoc = dbQuery.fetchAssoc(); + let dbAssoc = fetchQueryAssoc(dbQuery); let tempAccountData = new serverClasses.accountData(dbAssoc); - dbQuery.free(); + freeDatabaseQuery(dbQuery); return tempAccountData; } } @@ -259,10 +259,10 @@ function loadAccountFromId(accountId) { let dbConnection = connectToDatabase(); if(dbConnection) { let dbQueryString = `SELECT * FROM acct_main WHERE acct_id = ${accountId} LIMIT 1;`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { - let dbAssoc = dbQuery.fetchAssoc(); - dbQuery.free(); + let dbAssoc = fetchQueryAssoc(dbQuery); + freeDatabaseQuery(dbQuery); return new serverClasses.accountData(dbAssoc); } disconnectFromDatabase(dbConnection); @@ -276,13 +276,13 @@ function loadAccountFromId(accountId) { function loadSubAccountFromName(firstName, lastName) { let dbConnection = connectToDatabase(); if(dbConnection) { - firstName = dbConnection.escapeString(firstName); - lastName = dbConnection.escapeString(lastName); + firstName = escapeDatabaseString(dbConnection, firstName); + lastName = escapeDatabaseString(dbConnection, lastName); let dbQueryString = `SELECT * FROM sacct_main WHERE sacct_name_first = '${firstName}' AND sacct_name_last = '${lastName}' LIMIT 1;`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { - let dbAssoc = dbQuery.fetchAssoc(); - dbQuery.free(); + let dbAssoc = fetchQueryAssoc(dbQuery); + freeDatabaseQuery(dbQuery); return new serverClasses.subAccountData(dbAssoc); } disconnectFromDatabase(dbConnection); @@ -297,10 +297,10 @@ function loadSubAccountFromId(subAccountId) { let dbConnection = connectToDatabase(); if(dbConnection) { let dbQueryString = `SELECT * FROM sacct_main WHERE sacct_id = ${subAccountId} LIMIT 1;`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { - let dbAssoc = dbQuery.fetchAssoc(); - dbQuery.free(); + let dbAssoc = fetchQueryAssoc(dbQuery); + freeDatabaseQuery(dbQuery); return new serverClasses.subAccountData(dbAssoc); } disconnectFromDatabase(dbConnection); @@ -318,13 +318,13 @@ function loadSubAccountsFromAccount(accountId) { let dbConnection = connectToDatabase(); if(dbConnection) { let dbQueryString = `SELECT * FROM sacct_main WHERE sacct_acct = ${accountId};`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { - while(dbAssoc = dbQuery.fetchAssoc()) { + while(dbAssoc = fetchQueryAssoc(dbQuery)) { let tempSubAccount = new serverClasses.subAccountData(dbAssoc); tempSubAccounts.push(tempSubAccount); } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } @@ -414,14 +414,14 @@ function loginSuccess(client) { function saveAccountToDatabase(accountData) { let dbConnection = connectToDatabase(); if(dbConnection) { - let safePassword = dbConnection.escapeString(accountData.password); - let safeStaffTitle = dbConnection.escapeString(accountData.staffTitle); - let safeEmailAddress = dbConnection.escapeString(accountData.emailAddress); + let safePassword = escapeDatabaseString(dbConnection, accountData.password); + let safeStaffTitle = escapeDatabaseString(dbConnection, accountData.staffTitle); + let safeEmailAddress = escapeDatabaseString(dbConnection, accountData.emailAddress); //let safeIRCAccount = dbConnection.escapeString(accountData.ircAccount); let dbQueryString = `UPDATE acct_main SET acct_pass='${safePassword}', acct_settings=${accountData.settings}, acct_staff_flags=${accountData.flags.admin}, acct_staff_title='${safeStaffTitle}', acct_mod_flags=${String(accountData.flags.moderation)}, acct_discord=${String(accountData.discordAccount)}, acct_email='${safeEmailAddress}' WHERE acct_id=${accountData.databaseId}`; - let dbQuery = dbConnection.query(dbQueryString); - //dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, dbQueryString); + //freeDatabaseQuery(dbQuery); disconnectFromDatabase(dbConnection); } } @@ -433,8 +433,8 @@ function saveSubAccountToDatabase(subAccountData) { if(dbConnection) { let dbQueryString = `UPDATE sacct_main SET sacct_pos_x=${subAccountData.spawnPosition.x}, sacct_pos_y=${subAccountData.spawnPosition.y}, sacct_pos_z=${subAccountData.spawnPosition.z}, sacct_angle=${subAccountData.spawnHeading}, sacct_skin=${subAccountData.skin}, sacct_cash=${subAccountData.cash} WHERE sacct_id=${subAccountData.databaseId}`; - let dbQuery = dbConnection.query(dbQueryString); - //dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, dbQueryString); + //freeDatabaseQuery(dbQuery); disconnectFromDatabase(dbConnection); } } @@ -446,12 +446,12 @@ function createAccount(name, password, email = "") { if(dbConnection) { let hashedPassword = hashAccountPassword(name, password); - let safeName = dbConnection.escapeString(name); - let safeEmail = dbConnection.escapeString(email); + let safeName = escapeDatabaseString(dbConnection, name); + let safeEmail = escapeDatabaseString(dbConnection, email); - let dbQuery = dbConnection.query(`INSERT INTO acct_main (acct_name, acct_pass, acct_email) VALUES ('${safeName}', '${hashedPassword}', '${safeEmail}')`); - if(dbConnection.insertId > 0) { - return loadAccountFromId(dbConnection.insertId); + let dbQuery = queryDatabase(dbConnection, `INSERT INTO acct_main (acct_name, acct_pass, acct_email) VALUES ('${safeName}', '${hashedPassword}', '${safeEmail}')`); + if(getDatabaseInsertId(dbConnection) > 0) { + return loadAccountFromId(getDatabaseInsertId(dbConnection)); } } @@ -464,13 +464,13 @@ function createSubAccount(accountId, firstName, lastName, skinId, dateOfBirth, p let dbConnection = connectToDatabase(); if(dbConnection) { - let safeFirstName = dbConnection.escapeString(firstName); - let safeLastName = dbConnection.escapeString(lastName); - let safePlaceOfOrigin = dbConnection.escapeString(placeOfOrigin); + let safeFirstName = escapeDatabaseString(dbConnection, firstName); + let safeLastName = escapeDatabaseString(dbConnection, lastName); + let safePlaceOfOrigin = escapeDatabaseString(dbConnection, placeOfOrigin); - let dbQuery = dbConnection.query(`INSERT INTO sacct_main (sacct_acct, sacct_name_first, sacct_name_last, sacct_skin, sacct_origin, sacct_when_born, sacct_pos_x, sacct_pos_y, sacct_pos_z, sacct_cash) VALUES (${accountId}, '${safeFirstName}', '${safeLastName}', ${skinId}, '${safePlaceOfOrigin}', '${dateOfBirth}', ${serverConfig.newCharacter.spawnPosition.x}, ${serverConfig.newCharacter.spawnPosition.y}, ${serverConfig.newCharacter.spawnPosition.z}, ${serverConfig.newCharacter.money})`); - if(dbConnection.insertId > 0) { - return loadSubAccountFromId(dbConnection.insertId); + let dbQuery = queryDatabase(dbConnection, `INSERT INTO sacct_main (sacct_acct, sacct_name_first, sacct_name_last, sacct_skin, sacct_origin, sacct_when_born, sacct_pos_x, sacct_pos_y, sacct_pos_z, sacct_cash) VALUES (${accountId}, '${safeFirstName}', '${safeLastName}', ${skinId}, '${safePlaceOfOrigin}', '${dateOfBirth}', ${serverConfig.newCharacter.spawnPosition.x}, ${serverConfig.newCharacter.spawnPosition.y}, ${serverConfig.newCharacter.spawnPosition.z}, ${serverConfig.newCharacter.money})`); + if(getDatabaseInsertId(dbConnection) > 0) { + return loadSubAccountFromId(getDatabaseInsertId(dbConnection)); } disconnectFromDatabase(dbConnection); } @@ -671,6 +671,10 @@ addNetworkHandler("ag.selectCharacter", function(client) { let subAccountId = getClientData(client).currentSubAccount; let tempSubAccount = getClientData(client).subAccounts[subAccountId]; spawnPlayer(client, tempSubAccount.spawnPosition, tempSubAccount.spawnHeading, tempSubAccount.skin); + + messageClientNormal(client, "Welcome to Asshat Gaming Roleplay!", getColourByName("white")); + messageClientNormal(client, "This server is in early development and may restart at any time for updates.", getColourByName("orange")); + messageClientNormal(client, "Please report any bugs using /bug and suggestions using /idea", getColourByName("yellow")); }); // --------------------------------------------------------------------------- @@ -717,7 +721,7 @@ function saveClientToDatabase(client) { // --------------------------------------------------------------------------- function initClient(client) { - triggerNetworkEvent("ag.connectCamera", client, serverConfig.connectCameraPosition[server.game], serverConfig.connectCameraLookAt[server.game]); + triggerNetworkEvent("ag.connectCamera", client, serverConfig.connectCameraPosition[getServerGame()], serverConfig.connectCameraLookAt[getServerGame()]); let tempAccountData = loadAccountFromName(client.name); let tempSubAccounts = loadSubAccountsFromAccount(tempAccountData.databaseId); diff --git a/scripts/server/ban.js b/scripts/server/ban.js index bba77cd9..d66dc5e5 100644 --- a/scripts/server/ban.js +++ b/scripts/server/ban.js @@ -126,8 +126,8 @@ function banAccount(accountId, adminAccountId, reason) { let dbConnection = connectToDatabase(); if(dbConnection) { let safeReason = dbConnection.escapeString(reason); - let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.account}, ${accountId}, ${adminAccountId}, '${safeReason}');`); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, `INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.account}, ${accountId}, ${adminAccountId}, '${safeReason}');`); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } @@ -141,8 +141,8 @@ function banSubAccount(subAccountId, adminAccountId, reason) { let dbConnection = connectToDatabase(); if(dbConnection) { let safeReason = dbConnection.escapeString(reason); - let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.subAccount}, ${subAccountId}, ${adminAccountId}, '${safeReason}');`); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, `INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.subAccount}, ${subAccountId}, ${adminAccountId}, '${safeReason}');`); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } @@ -156,8 +156,8 @@ function banIPAddress(ipAddress, adminAccountId, reason) { let dbConnection = connectToDatabase(); if(dbConnection) { let safeReason = dbConnection.escapeString(reason); - let dbQuery = dbConnection.query(`INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.ipAddress}, INET_ATON(${ipAddress}), ${adminAccountId}, '${safeReason}');`); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, `INSERT INTO ban_main (ban_type, ban_detail, ban_who_banned, ban_reason) VALUES (${banType.ipAddress}, INET_ATON(${ipAddress}), ${adminAccountId}, '${safeReason}');`); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } @@ -170,8 +170,8 @@ function banIPAddress(ipAddress, adminAccountId, reason) { function unbanAccount(accountId, adminAccountId) { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.account + " AND ban_detail` = " + accountId + " AND `ban_removed` = 0"); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, "UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.account + " AND ban_detail` = " + accountId + " AND `ban_removed` = 0"); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } @@ -184,8 +184,8 @@ function unbanAccount(accountId, adminAccountId) { function unbanSubAccount(subAccountId, adminAccountId) { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.subAccount + " AND ban_detail` = " + subAccountId + " AND `ban_removed` = 0"); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, "UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.subAccount + " AND ban_detail` = " + subAccountId + " AND `ban_removed` = 0"); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } @@ -198,8 +198,8 @@ function unbanSubAccount(subAccountId, adminAccountId) { function unbanIPAddress(ipAddress, adminAccountId) { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.ipAddress + " AND ban_detail` = " + ipAddress + " AND `ban_removed` = 0"); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, "UPDATE `ban_main` SET `ban_who_removed` = " + adminAccountId + ", `ban_removed` = 1 WHERE `ban_type` = " + banType.ipAddress + " AND ban_detail` = " + ipAddress + " AND `ban_removed` = 0"); + freeDatabaseQuery(dbQuery); dbConnection.close(); return true; } diff --git a/scripts/server/business.js b/scripts/server/business.js index 94f652d9..876e2c93 100644 --- a/scripts/server/business.js +++ b/scripts/server/business.js @@ -39,16 +39,16 @@ function loadBusinessesFromDatabase() { let dbQuery = null; if(dbConnection) { - dbQuery = dbConnection.query("SELECT * FROM `biz_main` WHERE `biz_server` = " + String(serverId)); + dbQuery = queryDatabase(dbConnection, "SELECT * FROM `biz_main` WHERE `biz_server` = " + String(serverId)); if(dbQuery) { if(dbQuery.numRows > 0) { - while(dbFetchAssoc = dbQuery.fetchAssoc()) { + while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) { let tempBusinessData = businessData(dbFetchAssoc); tempBusinesses.push(tempBusinessData); console.log(`[Asshat.Business]: Business '${tempBusinessData.name}' loaded from database successfully!`); } } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } @@ -100,8 +100,8 @@ function createBusiness(name, entrancePosition, interiorId, virtualWorld) { let escapedName = name; if(dbConnection) { - escapedName = dbConnection.escapeString(escapedName) - let dbQuery = dbConnection.query("INSERT INTO `biz_main` (`biz_server`, `biz_name`, `biz_entrance_x`, `biz_entrance_y`, `biz_entrance_z`, `biz_entrance_int`, `biz_entrance_vw`) VALUES (" + String(serverId) + ", '" + escapedName + "', " + String(entrancePosition.x) + ", " + String(entrancePosition.y) + ", " + String(entrancePosition.z) + ", " + String(interiorId) + ", " + String(virtualWorld) + ")"); + escapedName = escapeDatabaseString(dbConnection, escapedName) + let dbQuery = queryDatabase(dbConnection, "INSERT INTO `biz_main` (`biz_server`, `biz_name`, `biz_entrance_x`, `biz_entrance_y`, `biz_entrance_z`, `biz_entrance_int`, `biz_entrance_vw`) VALUES (" + String(serverId) + ", '" + escapedName + "', " + String(entrancePosition.x) + ", " + String(entrancePosition.y) + ", " + String(entrancePosition.z) + ", " + String(interiorId) + ", " + String(virtualWorld) + ")"); disconnectFromDatabase(dbConnection); let tempBusinessData = loadBusinessFromDatabaseById(dbConnection.insertID); diff --git a/scripts/server/clan.js b/scripts/server/clan.js index 3aca8db2..3d123ba2 100644 --- a/scripts/server/clan.js +++ b/scripts/server/clan.js @@ -37,10 +37,10 @@ function loadClansFromDatabase() { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("SELECT * FROM `clan_main` WHERE `clan_server` = " + String(serverId)); + let dbQuery = queryDatabase(dbConnection, "SELECT * FROM `clan_main` WHERE `clan_server` = " + String(serverId)); if(dbQuery) { if(dbQuery.numRows > 0) { - while(dbFetchAssoc = dbQuery.fetchAssoc()) { + while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) { let tempClanData = getClasses().clanData(dbFetchAssoc); tempClanData.members = loadClanMembersFromDatabase(tempClanData.databaseId); tempClanData.ranks = loadClanRanksFromDatabase(tempClanData.databaseId); @@ -48,7 +48,7 @@ function loadClansFromDatabase() { console.log(`[Asshat.Clan]: Clan '${tempClanData.name}' loaded from database successfully!`); } } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } @@ -440,11 +440,11 @@ function createClan(name) { let escapedName = name; if(dbConnection) { - escapedName = dbConnection.escapeString(escapedName) - let dbQuery = dbConnection.query("INSERT INTO `clan_main` (`clan_server`, `clan_name`) VALUES (" + String(serverId) + ", '" + escapedName + "')"); + escapedName = escapeDatabaseString(dbConnection, escapedName) + let dbQuery = queryDatabase(dbConnection, `INSERT INTO clan_main (clan_server, clan_name) VALUES (${serverId}, '${escapedName}')`); disconnectFromDatabase(dbConnection); - let tempClanData = loadClanFromDatabaseById(dbConnection.insertID); + let tempClanData = loadClanFromDatabaseById(getDatabaseInsertId(dbConnection)); if(tempClanData != false) { let tempClan = serverClasses.clanData(tempClanData); serverData.clans.push(tempClan); @@ -460,8 +460,8 @@ function deleteClan(clanId) { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("DELETE FROM `clan_main` WHERE `clan_id` = " + clanId); - dbQuery.free(); + let dbQuery = queryDatabase(dbConnection, `UPDATE clan_main SET clan_deleted = 1 WHERE clan_id = ${clanId}`); + freeDatabaseQuery(dbQuery); disconnectFromDatabase(dbConnection); reloadAllClans(); @@ -530,9 +530,9 @@ function saveClansToDatabase() { function saveClanToDatabase(clanData) { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQueryString = "UPDATE `clan_main` SET `clan_name` = '" + dbConnection.escapeString(clanData.name) + "', `clan_owner` = " + clanData.ownerId; - let dbQuery = dbConnection.query(dbQueryString); - dbQuery.free(); + let dbQueryString = `UPDATE clan_main SET clan_name = '${escapeDatabaseString(dbConnection, clanData.name)}', clan_owner = ${clanData.ownerId}`; + let dbQuery = queryDatabase(dbConnection, dbQueryString); + freeDatabaseQuery(dbQuery); disconnectFromDatabase(dbConnection); return true; } diff --git a/scripts/server/faction.js b/scripts/server/faction.js index 86127705..c151cbab 100644 --- a/scripts/server/faction.js +++ b/scripts/server/faction.js @@ -36,10 +36,10 @@ function loadFactionsFromDatabase() { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("SELECT * FROM `fac_main` WHERE `fac_server` = " + String(serverId)); + let dbQuery = queryDatabase(dbConnection, `SELECT * FROM fac_main WHERE fac_server = ${getServerGame()}`); if(dbQuery) { if(dbQuery.numRows > 0) { - while(dbFetchAssoc = dbQuery.fetchAssoc()) { + while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) { let tempFactionData = getClasses().clanData(dbFetchAssoc); tempFactionData.members = loadFactionMembersFromDatabase(tempFactionData.databaseId); tempFactionData.ranks = loadFactionRanksFromDatabase(tempFactionData.databaseId); @@ -47,7 +47,7 @@ function loadFactionsFromDatabase() { console.log(`[Asshat.Faction]: Faction '${tempFactionData.name}' loaded from database successfully!`); } } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } dbConnection.close(); } diff --git a/scripts/server/house.js b/scripts/server/house.js index db6620e4..022c3f38 100644 --- a/scripts/server/house.js +++ b/scripts/server/house.js @@ -37,16 +37,16 @@ function loadHousesFromDatabase() { let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("SELECT * FROM `house_main` WHERE `house_server` = " + String(serverId)) + let dbQuery = queryDatabase(dbConnection, "SELECT * FROM `house_main` WHERE `house_server` = " + String(serverId)) if(dbQuery) { if(dbQuery.numRows > 0) { - while(dbFetchAssoc = dbQuery.fetchAssoc()) { + while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) { let tempHouseData = getClasses().houseData(dbFetchAssoc); tempHouses.push(tempHouseData); console.log("[Asshat.House]: Houses '" + String(tempHouseData.databaseId) + "' loaded!"); } } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } diff --git a/scripts/server/item.js b/scripts/server/item.js index d1f36355..9ef86ea5 100644 --- a/scripts/server/item.js +++ b/scripts/server/item.js @@ -24,15 +24,15 @@ function loadItemsFromDatabase() { let tempItems = []; let dbConnection = connectToDatabase(); if(dbConnection) { - let dbQuery = dbConnection.query("SELECT * FROM `item_main` WHERE `item_server` = " + getServerGame()) + let dbQuery = queryDatabase(dbConnection, "SELECT * FROM `item_main` WHERE `item_server` = " + getServerGame()) if(dbQuery) { if(dbQuery.numRows > 0) { - while(dbFetchAssoc = dbQuery.fetchAssoc()) { + while(dbFetchAssoc = fetchQueryAssoc(dbQuery)) { let tempItemData = getClasses().itemData(dbFetchAssoc); tempItems.push(tempItemData); } } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } diff --git a/scripts/server/vehicle.js b/scripts/server/vehicle.js index 18aad21a..11917126 100644 --- a/scripts/server/vehicle.js +++ b/scripts/server/vehicle.js @@ -39,13 +39,13 @@ function loadVehiclesFromDatabase() { let dbAssoc; if(dbConnection) { let dbQueryString = `SELECT * FROM veh_main WHERE veh_server = ${serverId}`; - let dbQuery = dbConnection.query(dbQueryString); + let dbQuery = queryDatabase(dbConnection, dbQueryString); if(dbQuery) { - while(dbAssoc = dbQuery.fetchAssoc()) { + while(dbAssoc = fetchQueryAssoc(dbQuery)) { let tempVehicleData = new serverClasses.vehicleData(dbAssoc); tempVehicles.push(tempVehicleData); } - dbQuery.free(); + freeDatabaseQuery(dbQuery); } disconnectFromDatabase(dbConnection); } @@ -81,19 +81,19 @@ function saveVehicleToDatabase(vehicleData) { // dbQueryColourValues = vehicleData.colour1Red, `veh_col1_g`, `veh_col1_b`, `veh_col1_a`, `veh_col2_r`, `veh_col2_g`, `veh_col2_b`, `veh_col2_a`, `veh_col3_r`, `veh_col3_g`, `veh_col3_b`, `veh_col3_a`, `veh_col4_r`, `veh_col4_g`, `veh_col4_b`, `veh_col4_a`,"; //} let dbQueryString = `INSERT INTO veh_main (veh_model, veh_pos_x, veh_pos_y, veh_pos_z, veh_rot_z, veh_owner_type, veh_owner_id) VALUES (${vehicleData.model}, ${vehicleData.spawnPosition.x}, ${vehicleData.spawnPosition.y}, ${vehicleData.spawnPosition.z}, ${vehicleData.spawnRotation}, ${vehicleData.ownerType}, ${vehicleData.ownerId})`; - dbConnection.query(dbQueryString); - if(dbConnection.error) { - console.warn(`[Asshat.Vehicle]: There was a problem saving vehicle ${vehicleData.vehicle.id} to the database (INSERT). Error: ${dbConnection.error}`); - return false; - } - getVehicleData(vehicleData.vehicle).databaseId = dbConnection.insertId; + queryDatabase(dbConnection, dbQueryString); + //if(getDatabaseError(dbConnection)) { + // console.warn(`[Asshat.Vehicle]: There was a problem saving vehicle ${vehicleData.vehicle.id} to the database (INSERT). Error: ${getDatabaseError(dbConnection)}`); + // return false; + //} + getVehicleData(vehicleData.vehicle).databaseId = getDatabaseInsertId(dbConnection); } else { let dbQueryString = `UPDATE veh_main SET veh_model=${vehicleData.model}, veh_pos_x=${vehicleData.spawnPosition.x}, veh_pos_y=${vehicleData.spawnPosition.y}, veh_pos_z=${vehicleData.spawnPosition.z}, veh_rot_z=${vehicleData.spawnRotation}, veh_owner_type=${vehicleData.ownerType}, veh_owner_id=${vehicleData.ownerId} WHERE veh_id=${vehicleData.databaseId}`; - dbConnection.query(dbQueryString); - if(dbConnection.error) { - console.warn(`[Asshat.Vehicle]: There was a problem saving vehicle ${vehicleData.vehicle.id} to the database (UPDATE). Error: ${dbConnection.error}`); - return false; - } + queryDatabase(dbConnection, dbQueryString); + //if(getDatabaseError(dbConnection)) { + // console.warn(`[Asshat.Vehicle]: There was a problem saving vehicle ${vehicleData.vehicle.id} to the database (UPDATE). Error: ${getDatabaseError(dbConnection)}`); + // return false; + //} } disconnectFromDatabase(dbConnection); return true;