From 922f8ddf685c18126ce26ea5931f3f22e4b738f8 Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Thu, 22 Apr 2021 09:29:57 -0500 Subject: [PATCH] Remove old create blip util, add conn log utils --- scripts/server/utilities.js | 41 +++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js index 76dd1b38..ef0b0b09 100644 --- a/scripts/server/utilities.js +++ b/scripts/server/utilities.js @@ -533,17 +533,6 @@ function getPlayerData(client) { // =========================================================================== -function createAllLocationBlips() { - createAllPoliceStationBlips(); - createAllFireStationBlips(); - createAllHospitalBlips(); - createAllPayAndSprayBlips(); - createAllFuelStationBlips(); - createAllAmmunationBlips(); -} - -// =========================================================================== - function createAllPoliceStationBlips() { if(getGameConfig().blipSprites[getServerGame()].policeStation != -1) { for(let i in getServerData().policeStations[getServerGame()]) { @@ -988,8 +977,8 @@ function getPlayerIsland(client) { // =========================================================================== function isAtPayAndSpray(position) { - for(let i in payAndSprays[getServerGame()]) { - if(getDistance(position, payAndSprays[getServerGame()][i]) <= getGlobalConfig().payAndSprayDistance) { + for(let i in getGameData().payAndSprays[getServerGame()]) { + if(getDistance(position, getGameData().payAndSprays[getServerGame()][i]) <= getGlobalConfig().payAndSprayDistance) { return true; } } @@ -1452,8 +1441,6 @@ function getSyncerFromId(syncerId) { // =========================================================================== -// =========================================================================== - function arrayBufferToString(arrayBuffer) { return String.fromCharCode.apply(null, new Uint8Array(arrayBuffer)); } @@ -1549,4 +1536,28 @@ function isConsole(client) { return client.console; } +// =========================================================================== + +function updateConnectionLogOnQuit(client, quitReasonId) { + quickDatabaseQuery(`UPDATE conn_main SET conn_when_disconnect=UNIX_TIMESTAMP(), conn_how_disconnect=${quitReasonId} WHERE conn_id = ${toInteger(getEntityData(client, "ag.connection"))}`); +} + +// =========================================================================== + +function updateConnectionLogOnAuth(client, authId) { + quickDatabaseQuery(`UPDATE conn_main SET conn_auth=${authId} WHERE conn_id = ${toInteger(getEntityData(client, "ag.connection"))}`); +} + +// =========================================================================== + +function updateConnectionLogOnClientInfoReceive(client, clientVersion, screenWidth, screenHeight) { + let dbConnection = connectToDatabase(); + if(dbConnection) { + let safeClientVersion = escapeDatabaseString(dbConnection, clientVersion); + let safeScreenWidth = escapeDatabaseString(dbConnection, toString(screenWidth)); + let safeScreenHeight = escapeDatabaseString(dbConnection, toString(screenHeight)); + quickDatabaseQuery(`UPDATE conn_main SET conn_client_version='${safeClientVersion}', conn_screen_width='${safeScreenWidth}', conn_screen_height='${safeScreenHeight}' WHERE conn_id = ${toInteger(getEntityData(client, "ag.connection"))}`); + } +} + // =========================================================================== \ No newline at end of file