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

Fix day/night cycle element spawning

Browse Source
This commit is contained in:
Vortrex
2023-03-01 01:17:27 -06:00
parent 3da2507cf7
commit 793b764469
1 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
scripts/server/timers.js
View File

@@ -242,7 +242,6 @@ function checkServerGameTime() {
getServerConfig().minute = dateTime.getMinutes(); getServerConfig().minute = dateTime.getMinutes();
} }
/*
if (getGame() == V_GAME_MAFIA_ONE) { if (getGame() == V_GAME_MAFIA_ONE) {
if (getGameConfig().mainWorldScene[getGame()] == "FREERIDE") { if (getGameConfig().mainWorldScene[getGame()] == "FREERIDE") {
if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) { if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
@@ -250,19 +249,21 @@ function checkServerGameTime() {
} }
if (isNightTime(getServerConfig().hour)) { if (isNightTime(getServerConfig().hour)) {
getGameConfig().mainWorldScene[getGame()] = "FREERIDENOC";
removeAllPlayersFromProperties();
removeAllPlayersFromVehicles();
saveServerDataToDatabase();
logToConsole(LOG_INFO | LOG_WARN, `[V.RP.Timers] Changing server map to night`); logToConsole(LOG_INFO | LOG_WARN, `[V.RP.Timers] Changing server map to night`);
messageDiscordEventChannel("🌙 Changing server map to night"); messageDiscordEventChannel("🌙 Changing server map to night");
despawnAllVehicles(); getGameConfig().mainWorldScene[getGame()] = "FREERIDENOC";
despawnAllNPCs(); if (!serverStarting) {
despawnAllGroundItemObjects(); removeAllPlayersFromProperties();
removeAllPlayersFromVehicles();
saveServerDataToDatabase();
despawnAllServerElements();
}
game.changeMap(getGameConfig().mainWorldScene[getGame()]); game.changeMap(getGameConfig().mainWorldScene[getGame()]);
spawnAllVehicles(); spawnAllServerElements();
spawnAllNPCs(); } else {
spawnAllGroundItemObjects(); if (serverStarting) {
spawnAllServerElements();
}
} }
} else if (getGameConfig().mainWorldScene[getGame()] == "FREERIDENOC") { } else if (getGameConfig().mainWorldScene[getGame()] == "FREERIDENOC") {
if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) { if (isServerGoingToChangeMapsSoon(getServerConfig().hour, getServerConfig().minute)) {
@@ -270,23 +271,24 @@ function checkServerGameTime() {
} }
if (!isNightTime(getServerConfig().hour)) { if (!isNightTime(getServerConfig().hour)) {
getGameConfig().mainWorldScene[getGame()] = "FREERIDE";
removeAllPlayersFromProperties();
removeAllPlayersFromVehicles();
saveServerDataToDatabase();
logToConsole(LOG_INFO | LOG_WARN, `[V.RP.Timers] Changing server map to day`); logToConsole(LOG_INFO | LOG_WARN, `[V.RP.Timers] Changing server map to day`);
messageDiscordEventChannel("🌞 Changing server map to day"); messageDiscordEventChannel("🌞 Changing server map to day");
despawnAllVehicles(); getGameConfig().mainWorldScene[getGame()] = "FREERIDE";
despawnAllNPCs(); if (!serverStarting) {
despawnAllGroundItemObjects(); removeAllPlayersFromProperties();
removeAllPlayersFromVehicles();
saveServerDataToDatabase();
despawnAllServerElements();
}
game.changeMap(getGameConfig().mainWorldScene[getGame()]); game.changeMap(getGameConfig().mainWorldScene[getGame()]);
spawnAllVehicles(); spawnAllServerElements();
spawnAllNPCs(); } else {
spawnAllGroundItemObjects(); if (serverStarting) {
spawnAllServerElements();
}
} }
} }
} }
*/
if (isGameFeatureSupported("time")) { if (isGameFeatureSupported("time")) {
game.time.hour = getServerConfig().hour; game.time.hour = getServerConfig().hour;
@@ -320,7 +322,7 @@ function checkPayDays() {
for (let i in getServerData().businesses) { for (let i in getServerData().businesses) {
if (getBusinessData(i).ownerType != V_BIZ_OWNER_NONE && getBusinessData(i).ownerType != V_BIZ_OWNER_PUBLIC && getBusinessData(i).ownerType != V_BIZ_OWNER_FACTION) { if (getBusinessData(i).ownerType != V_BIZ_OWNER_NONE && getBusinessData(i).ownerType != V_BIZ_OWNER_PUBLIC && getBusinessData(i).ownerType != V_BIZ_OWNER_FACTION) {
let addToTill = getGlobalConfig().economy.passiveIncomePerPayDay; let addToTill = getServerConfig().economy.passiveIncomePerPayDay;
if (isDoubleBonusActive()) { if (isDoubleBonusActive()) {
addToTill = addToTill * 2; addToTill = addToTill * 2;
} }