From f1443f2945ca35db6f2b1a82595698a1ffb61fcf Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 6 Mar 2022 00:02:02 -0600
Subject: [PATCH] Some config fixes

---
 scripts/server/config.js    | 16 ++++++++--------
 scripts/server/startup.js   |  3 ++-
 scripts/server/timers.js    |  8 --------
 scripts/server/utilities.js | 38 +++++++++++++++++++++++++++----------
 4 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/scripts/server/config.js b/scripts/server/config.js
index d258e5e7..3c3aebe5 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -7,10 +7,10 @@
 // TYPE: Server (JavaScript)
 // ===========================================================================
 
-let serverConfig = {};
-let databaseConfig = {};
-let emailConfig = {};
-let gameConfig = {};
+let serverConfig = false;
+let databaseConfig = false;
+let emailConfig = false;
+let gameConfig = false;
 
 // ===========================================================================
 
@@ -222,10 +222,10 @@ function saveServerConfigToDatabase() {
  * @return {ServerData} - Server configuration data
  *
  */
-function getServerConfig(serverId = getServerId()) {
-	if(serverId != getServerId()) {
-		return loadServerConfigFromId(serverId);
-	}
+function getServerConfig() {
+	//if(serverId != getServerId()) {
+	//	return loadServerConfigFromId(serverId);
+	//}
 	return serverConfig;
 }
 
diff --git a/scripts/server/startup.js b/scripts/server/startup.js
index bed6dc3d..6f051d32 100644
--- a/scripts/server/startup.js
+++ b/scripts/server/startup.js
@@ -40,11 +40,12 @@ function initServerScripts() {
 	initLocaleScript();
 
 	initCommandScript();
-	initTimers();
 
 	serverStartTime = getCurrentUnixTimestamp();
 
 	initAllClients();
+
+	initTimers();
 }
 
 // ===========================================================================
diff --git a/scripts/server/timers.js b/scripts/server/timers.js
index 75a96ef1..699ffa6b 100644
--- a/scripts/server/timers.js
+++ b/scripts/server/timers.js
@@ -11,14 +11,6 @@ let serverTimers = {};
 
 // ===========================================================================
 
-function updateTimeRule() {
-	if(isTimeSupported()) {
-		server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
-	}
-}
-
-// ===========================================================================
-
 function saveAllServerDataToDatabase() {
 	if(getServerConfig().pauseSavingToDatabase) {
 		return false;
diff --git a/scripts/server/utilities.js b/scripts/server/utilities.js
index 4238cefc..373979d3 100644
--- a/scripts/server/utilities.js
+++ b/scripts/server/utilities.js
@@ -80,22 +80,30 @@ function initAllClients() {
 
 function updateServerRules() {
 	logToConsole(LOG_DEBUG, `[VRR.Utilities]: Updating all server rules ...`);
+	
+	logToConsole(LOG_DEBUG, `[VRR.Utilities]: Time support: ${isTimeSupported()}`);
 	if(isTimeSupported()) {
-		let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute);
-		logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Time" as ${value}`);
-		server.setRule("Time", value);
+		if(getServerConfig() != false) {
+			let value = makeReadableTime(getServerConfig().hour, getServerConfig().minute);
+			logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Time" as ${value}`);
+			server.setRule("Time", value);
+		}
 	}
 
 	if(isWeatherSupported()) {
-		let value = getGameData().weatherNames[getServerGame()][getServerConfig().weather];
-		logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Weather" as ${value}`);
-		server.setRule("Weather", value);
+		if(getServerConfig() != false) {
+			let value = getGameData().weatherNames[getServerGame()][getServerConfig().weather];
+			logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Weather" as ${value}`);
+			server.setRule("Weather", value);
+		}
 	}
 
 	if(isSnowSupported()) {
-		let value = getYesNoFromBool(getServerConfig().fallingSnow);
-		logToConsole(LOG_DEBUG, `[VRR.Utilities]: Setting server rule "Snowing" as ${value}`);
-		server.setRule("Snowing", value);
+		if(getServerConfig() != false) {
+			let value = getYesNoFromBool(getServerConfig().fallingSnow);
+			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!`);
 }
@@ -437,4 +445,14 @@ function kickAllClients() {
     getClients().forEach((client) => {
         client.disconnect();
     })
-}
\ No newline at end of file
+}
+
+// ===========================================================================
+
+function updateTimeRule() {
+	if(isTimeSupported()) {
+		server.setRule("Time", makeReadableTime(game.time.hour, game.time.minute));
+	}
+}
+
+// ===========================================================================
\ No newline at end of file