Server save script improvements (#3192)

otland · Sep 20, 2021 · c9a65a8 · c9a65a8
1 parent 7b8e41f
commit c9a65a8
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/data/globalevents/scripts/serversave.lua b/data/globalevents/scripts/serversave.lua
@@ -1,14 +1,21 @@
 local function ServerSave()
-	if configManager.getBoolean(configKeys.SERVER_SAVE_CLEAN_MAP) then
-		cleanMap()
-	end
-
-	if configManager.getBoolean(configKeys.SERVER_SAVE_CLOSE) then
-		Game.setGameState(GAME_STATE_CLOSED)
-	end
-
 	if configManager.getBoolean(configKeys.SERVER_SAVE_SHUTDOWN) then
 		Game.setGameState(GAME_STATE_SHUTDOWN)
+	else
+		local closeAtServerSave = configManager.getBoolean(configKeys.SERVER_SAVE_CLOSE)
+		if closeAtServerSave then
+			Game.setGameState(GAME_STATE_CLOSED)
+		end
+
+		saveServer()
+
+		if configManager.getBoolean(configKeys.SERVER_SAVE_CLEAN_MAP) then
+			cleanMap()
+		end
+
+		if closeAtServerSave then
+			Game.setGameState(GAME_STATE_NORMAL)
+		end
 	end
 end