From 65643fbd422780671c388ec8bada17b133f185ad Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Tue, 29 Dec 2020 00:21:32 -0600
Subject: [PATCH] Change order of data save & add dev server check

---
 scripts/server/timers.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/server/timers.js b/scripts/server/timers.js
index 6329cf05..990258fb 100644
--- a/scripts/server/timers.js
+++ b/scripts/server/timers.js
@@ -20,22 +20,24 @@ function updateTimeRule() {
 
 function saveAllServerDataToDatabase() {
 	console.log("[Asshat.Utilities]: Saving all server data to database ...");
-	saveAllClientsToDatabase();
-	saveAllVehiclesToDatabase();
+	saveAllClansToDatabase();
 	saveAllHousesToDatabase();
 	saveAllBusinessesToDatabase();
-	saveAllClansToDatabase();
 	saveServerConfigToDatabase(getServerConfig());
+	saveAllVehiclesToDatabase();	
+	saveAllClientsToDatabase();
 	console.log("[Asshat.Utilities]: Saved all server data to database!");
 }
 
 // ---------------------------------------------------------------------------
 
 function initTimers() {
-    serverTimers.saveDataIntervalTimer = setInterval(saveAllServerDataToDatabase, 600000);
-	serverTimers.updateTimeRuleTimer = setInterval(updateTimeRule, 1000);
-	serverTimers.updatePingsTimer = setInterval(updatePings, 5000);
-	serverTimers.vehicleRentTimer = setInterval(vehicleRentCheck, 60000);
+	if(!isDevelopmentServer()) {
+		serverTimers.saveDataIntervalTimer = setInterval(saveAllServerDataToDatabase, 600000);
+		serverTimers.updateTimeRuleTimer = setInterval(updateTimeRule, 1000);
+		serverTimers.updatePingsTimer = setInterval(updatePings, 5000);
+		serverTimers.vehicleRentTimer = setInterval(vehicleRentCheck, 60000);
+	}
 }
 
 // ---------------------------------------------------------------------------