From bc548cfae00fa0dc1a15acfecf04c6a0cd774ee0 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:13:18 -0500
Subject: [PATCH] Update GeoIP database + move to folder

---
 scripts/server/config.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/scripts/server/config.js b/scripts/server/config.js
index beb0feb1..c3a1ed8e 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -194,8 +194,8 @@ let globalConfig = {
 	subAccountNameAllowedCharacters: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
 	emailValidationRegex: /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
 	itemActionDelayExtraTimeout: 1000,
-	geoIPCountryDatabaseFilePath: "geoip-country.mmdb",
-	geoIPCityDatabaseFilePath: "geoip-city.mmdb",
+	geoIPCountryDatabaseFilePath: "modules/geoip/geoip-country.mmdb",
+	geoIPCityDatabaseFilePath: "modules/geoip/geoip-city.mmdb",
 	randomTipInterval: 600000,
 	weaponEquippableTypes: [
 		AGRP_ITEM_USE_TYPE_WEAPON,
@@ -1128,19 +1128,24 @@ function getDatabaseConfig() {
 
 function loadServerConfig() {
 	logToConsole(LOG_DEBUG, "[AGRP.Config] Loading server configuration");
-	try {
-		if (toInteger(server.getCVar("agrp_devserver")) == 1) {
-			serverConfig = loadServerConfigFromGame(getGame());
-		} else {
-			serverConfig = loadServerConfigFromGameAndPort(getGame(), getServerPort());
-		}
 
-	} catch (error) {
-		logToConsole(LOG_ERROR, `[AGRP.Config] Could not load server configuration for game ${getGame()} and port ${getServerPort}`);
-		thisResource.stop();
+	if (toInteger(server.getCVar("agrp_devserver")) == 1) {
+		serverConfig = loadServerConfigFromGame(getGame());
+
+		if (serverConfig == false) {
+			logToConsole(LOG_ERROR, `[AGRP.Config] Could not load server configuration for game ${getGame()}`);
+			server.shutdown();
+		}
+	} else {
+		serverConfig = loadServerConfigFromGameAndPort(getGame(), getServerPort());
+
+		if (serverConfig == false) {
+			logToConsole(LOG_ERROR, `[AGRP.Config] Could not load server configuration for game ${getGame()} and port ${getServerPort()}`);
+			server.shutdown();
+		}
 	}
 
-	logToConsole(LOG_DEBUG | LOG_WARN, `Server ID: ${serverConfig.databaseId}`);
+	//logToConsole(LOG_DEBUG | LOG_WARN, `Server ID: ${serverConfig.databaseId}`);
 }
 
 // ===========================================================================
\ No newline at end of file