From 472e6c7177e6bcb7022b08c09294c0a6ac62d018 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Thu, 29 Sep 2022 11:11:55 -0500
Subject: [PATCH] Fix Mafia 1 map day/night cycle

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

diff --git a/scripts/server/timers.js b/scripts/server/timers.js
index 25d5b248..904f0a23 100644
--- a/scripts/server/timers.js
+++ b/scripts/server/timers.js
@@ -226,7 +226,7 @@ function checkServerGameTime() {
 	}
 
 	if (getGame() == AGRP_GAME_MAFIA_ONE) {
-		if (server.mapName == "FREERIDE") {
+		if (getGameConfig().mainWorldScene[getGame()] == "FREERIDE") {
 			if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
 				sendMapChangeWarningToPlayer(null, true);
 			}
@@ -236,27 +236,23 @@ function checkServerGameTime() {
 				removeAllPlayersFromProperties();
 				removeAllPlayersFromVehicles();
 				saveServerDataToDatabase();
-				game.changeMap(getGameConfig().mainWorldScene[getGame()]);
 				logToConsole(LOG_INFO | LOG_WARN, `[AGRP.Timers] Changing server map to night`);
 				messageDiscordEventChannel("🌙 Changing server map to night");
-				updateTimeRule();
-			} else {
-				getGameConfig().mainWorldScene[getGame()] = "FREERIDE";
-				removeAllPlayersFromProperties();
-				removeAllPlayersFromVehicles();
-				saveServerDataToDatabase();
 				game.changeMap(getGameConfig().mainWorldScene[getGame()]);
-				logToConsole(LOG_INFO | LOG_WARN, `[AGRP.Timers] Changing server map to day`);
-				messageDiscordEventChannel("🌞 Changing server map to day");
-				updateTimeRule();
 			}
-		} else {
+		} else if (getGameConfig().mainWorldScene[getGame()] == "FREERIDENOC") {
 			if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
 				sendMapChangeWarningToPlayer(null, true);
 			}
 
 			if (!isNightTime(getServerConfig().hour)) {
-
+				getGameConfig().mainWorldScene[getGame()] = "FREERIDE";
+				removeAllPlayersFromProperties();
+				removeAllPlayersFromVehicles();
+				saveServerDataToDatabase();
+				logToConsole(LOG_INFO | LOG_WARN, `[AGRP.Timers] Changing server map to day`);
+				messageDiscordEventChannel("🌞 Changing server map to day");
+				game.changeMap(getGameConfig().mainWorldScene[getGame()]);
 			}
 		}
 	}