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

Merge branch 'master' into nightly

Browse Source
This commit is contained in:
Vortrex
2023-02-08 18:00:29 -06:00
parent 66109a8fe9 529a6bb3a0
commit 77114a14a3
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/client/scoreboard.js
View File

@@ -17,10 +17,10 @@ let scoreboardKey = SDLK_TAB;
// =========================================================================== // ===========================================================================
function initScoreBoardScript() { function initScoreBoardScript() {
logToConsole(LOG_DEBUG, "[AGRP.ScoreBoard]: Initializing scoreboard script ..."); logToConsole(LOG_DEBUG, "[V.RP.ScoreBoard]: Initializing scoreboard script ...");
scoreBoardTitleFont = initScoreBoardTitleFont(); scoreBoardTitleFont = initScoreBoardTitleFont();
scoreBoardListFont = initScoreBoardListFont(); scoreBoardListFont = initScoreBoardListFont();
logToConsole(LOG_DEBUG, "[AGRP.ScoreBoard]: Scoreboard script initialized!"); logToConsole(LOG_DEBUG, "[V.RP.ScoreBoard]: Scoreboard script initialized!");
} }
// =========================================================================== // ===========================================================================

2
scripts/server/subaccount.js
View File

@@ -686,7 +686,7 @@ function createDefaultSubAccountServerData(databaseId) {
let serversAssoc = fetchQueryAssoc(dbConnection, "SELECT * FROM svr_main"); let serversAssoc = fetchQueryAssoc(dbConnection, "SELECT * FROM svr_main");
for (let i in serversAssoc) { for (let i in serversAssoc) {
let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${i}, ${serversAssoc[i]["svr_newchar_skin"]})`; let dbQueryString = `INSERT INTO sacct_svr (sacct_svr_sacct, sacct_svr_server, sacct_svr_skin) VALUES (${databaseId}, ${serversAssoc[i]["svr_id"]}, ${serversAssoc[i]["svr_newchar_skin"]})`;
quickDatabaseQuery(dbQueryString); quickDatabaseQuery(dbQueryString);
} }
} }

5
scripts/server/vehicle.js
View File

@@ -1453,7 +1453,10 @@ function stopRentingVehicle(client) {
let vehicle = getPlayerData(client).rentingVehicle; let vehicle = getPlayerData(client).rentingVehicle;
getPlayerData(client).rentingVehicle = false; getPlayerData(client).rentingVehicle = false;
getVehicleData(vehicle).rentedBy = false; getVehicleData(vehicle).rentedBy = false;
respawnVehicle(vehicle); removeAllOccupantsFromVehicle(vehicle);
setTimeout(function () {
respawnVehicle(vehicle);
}, 1000);
} }
// =========================================================================== // ===========================================================================