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

Some config fixes

Browse Source
This commit is contained in:
Vortrex
2022-03-06 00:02:02 -06:00
parent 47d7ba1af2
commit f1443f2945
4 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/server/config.js
View File

@@ -7,10 +7,10 @@
// TYPE: Server (JavaScript) // TYPE: Server (JavaScript)
// =========================================================================== // ===========================================================================
let serverConfig = {}; let serverConfig = false;
let databaseConfig = {}; let databaseConfig = false;
let emailConfig = {}; let emailConfig = false;
let gameConfig = {}; let gameConfig = false;
// =========================================================================== // ===========================================================================
@@ -222,10 +222,10 @@ function saveServerConfigToDatabase() {
* @return {ServerData} - Server configuration data * @return {ServerData} - Server configuration data
* *
*/ */
function getServerConfig(serverId = getServerId()) { function getServerConfig() {
if(serverId != getServerId()) { //if(serverId != getServerId()) {
return loadServerConfigFromId(serverId); // return loadServerConfigFromId(serverId);
} //}
return serverConfig; return serverConfig;
} }

3
scripts/server/startup.js
View File

@@ -40,11 +40,12 @@ function initServerScripts() {
initLocaleScript(); initLocaleScript();
initCommandScript(); initCommandScript();
initTimers();
serverStartTime = getCurrentUnixTimestamp(); serverStartTime = getCurrentUnixTimestamp();
initAllClients(); initAllClients();
initTimers();
} }
// =========================================================================== // ===========================================================================

8
scripts/server/timers.js
View File

@@ -11,14 +11,6 @@ let serverTimers = {};
// =========================================================================== // ===========================================================================
function updateTimeRule() {
if(isTimeSupported()) {
server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
}
}
// ===========================================================================
function saveAllServerDataToDatabase() { function saveAllServerDataToDatabase() {
if(getServerConfig().pauseSavingToDatabase) { if(getServerConfig().pauseSavingToDatabase) {
return false; return false;

38
scripts/server/utilities.js
View File

@@ -80,22 +80,30 @@ function initAllClients() {
function updateServerRules() { function updateServerRules() {
logToConsole(LOG_DEBUG, `[VRR.Utilities]: Updating all server rules ...`); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Updating all server rules ...`);
logToConsole(LOG_DEBUG, `[VRR.Utilities]: Time support: ${isTimeSupported()}`);
if(isTimeSupported()) { if(isTimeSupported()) {
let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute); if(getServerConfig() != false) {
logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Time" as ${value}`); let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute);
server.setRule("Time", value); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Time" as ${value}`);
server.setRule("Time", value);
}
} }
if(isWeatherSupported()) { if(isWeatherSupported()) {
let value = getGameData().weatherNames[getServerGame()][getServerConfig().weather]; if(getServerConfig() != false) {
logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Weather" as ${value}`); let value = getGameData().weatherNames[getServerGame()][getServerConfig().weather];
server.setRule("Weather", value); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Weather" as ${value}`);
server.setRule("Weather", value);
}
} }
if(isSnowSupported()) { if(isSnowSupported()) {
let value = getYesNoFromBool(getServerConfig().fallingSnow); if(getServerConfig() != false) {
logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Snowing" as ${value}`); let value = getYesNoFromBool(getServerConfig().fallingSnow);
server.setRule("Snowing", value); logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Snowing" as ${value}`);
server.setRule("Snowing", value);
}
} }
logToConsole(LOG_DEBUG, `[VRR.Utilities]: All server rules updated successfully!`); logToConsole(LOG_DEBUG, `[VRR.Utilities]: All server rules updated successfully!`);
} }
@@ -437,4 +445,14 @@ function kickAllClients() {
getClients().forEach((client) => { getClients().forEach((client) => {
client.disconnect(); client.disconnect();
}) })
} }
// ===========================================================================
function updateTimeRule() {
if(isTimeSupported()) {
server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
}
}
// ===========================================================================