hamyack/GTA4RP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Mafia 1 map day/night cycle

Browse Source
This commit is contained in:
Vortrex
2022-09-29 11:11:55 -05:00
parent 8ba392e834
commit 472e6c7177
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/server/timers.js
View File

@@ -226,7 +226,7 @@ function checkServerGameTime() {
} }
if (getGame() == AGRP_GAME_MAFIA_ONE) { if (getGame() == AGRP_GAME_MAFIA_ONE) {
if (server.mapName == "FREERIDE") { if (getGameConfig().mainWorldScene[getGame()] == "FREERIDE") {
if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) { if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
sendMapChangeWarningToPlayer(null, true); sendMapChangeWarningToPlayer(null, true);
} }
@@ -236,27 +236,23 @@ function checkServerGameTime() {
removeAllPlayersFromProperties(); removeAllPlayersFromProperties();
removeAllPlayersFromVehicles(); removeAllPlayersFromVehicles();
saveServerDataToDatabase(); saveServerDataToDatabase();
game.changeMap(getGameConfig().mainWorldScene[getGame()]);
logToConsole(LOG_INFO | LOG_WARN, `[AGRP.Timers] Changing server map to night`); logToConsole(LOG_INFO | LOG_WARN, `[AGRP.Timers] Changing server map to night`);
messageDiscordEventChannel("🌙 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()]); 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)) { if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
sendMapChangeWarningToPlayer(null, true); sendMapChangeWarningToPlayer(null, true);
} }
if (!isNightTime(getServerConfig().hour)) { 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()]);
} }
} }
} }