From da785f44ce68dda7bfc559da73e4700f19647704 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 28 Apr 2022 11:33:10 -0500
Subject: [PATCH] Load server config before loading data

---
 scripts/server/startup.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/server/startup.js b/scripts/server/startup.js
index 6146477d..46b7edbb 100644
--- a/scripts/server/startup.js
+++ b/scripts/server/startup.js
@@ -40,16 +40,18 @@ function initServerScripts() {
 	initLocaleScript();
 	initCommandScript();
 
-	// Load config, commands, and data
+	// Load config and stuff
 	loadGlobalConfig();
-	loadCommands();
+	loadServerConfig();
+	applyConfigToServer(getServerConfig());
+
+	// Load all the server data
 	loadServerDataFromDatabase();
 
 	// Set indexes and cache necessary data
 	setAllServerDataIndexes();
 	createAllServerElements();
 
-	applyConfigToServer(serverConfig);
 	initAllClients();
 	initTimers();
 
@@ -114,8 +116,7 @@ function checkForAllRequiredModules() {
 // ===========================================================================
 
 function loadServerDataFromDatabase() {
-	logToConsole(LOG_INFO, "[VRR.Config]: Loading server config ...");
-	serverConfig = loadServerConfigFromGameAndPort(server.game, server.port, getMultiplayerMod());
+	logToConsole(LOG_INFO, "[VRR.Config]: Loading server data ...");
 
 	// Always load these regardless of "test server" status
 	getServerData().itemTypes = loadItemTypesFromDatabase();
@@ -141,7 +142,6 @@ function loadServerDataFromDatabase() {
 	}
 
 	getServerData().commands = loadCommands();
-	allowedSkins = getAllowedSkins(getGame());
 }
 
 // ===========================================================================