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

Fix veh rent timer, add game time fix

Browse Source
This commit is contained in:
Vortrex
2021-07-13 00:56:17 -05:00
parent de5e16a857
commit fa1bda0429
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
scripts/server/timers.js
View File

@@ -34,11 +34,12 @@ function saveAllServerDataToDatabase() {
function initTimers() { function initTimers() {
//if(!isDevelopmentServer()) { //if(!isDevelopmentServer()) {
serverTimers.saveDataIntervalTimer = setInterval(saveAllServerDataToDatabase, 600000); serverTimers.saveDataIntervalTimer = setInterval(saveAllServerDataToDatabase, 600000);
serverTimers.updateTimeRuleTimer = setInterval(updateTimeRule, 1000); //serverTimers.updateTimeRuleTimer = setInterval(updateTimeRule, 1000);
serverTimers.updatePingsTimer = setInterval(updatePings, 5000); serverTimers.updatePingsTimer = setInterval(updatePings, 5000);
serverTimers.vehicleRentTimer = setInterval(vehicleRentCheck, 60000); serverTimers.vehicleRentTimer = setInterval(vehicleRentCheck, 60000);
serverTimers.garbageCollectorTimer = setInterval(collectAllGarbage, 60000); serverTimers.garbageCollectorTimer = setInterval(collectAllGarbage, 60000);
serverTimers.payDayTimer = setInterval(checkPayDays, 30000); serverTimers.payDayTimer = setInterval(checkPayDays, 30000);
serverTimers.gameTime = setInterval(checkServerGameTime, 60000);
//} //}
} }
@@ -48,13 +49,15 @@ function vehicleRentCheck() {
for(let i in getServerData().vehicles) { for(let i in getServerData().vehicles) {
if(getServerData().vehicles[i] != null) { if(getServerData().vehicles[i] != null) {
if(getServerData().vehicles[i].rentPrice > 0) { if(getServerData().vehicles[i].rentPrice > 0) {
if(getServerData().vehicles[i].rentedBy) { if(getServerData().vehicles[i].rentedBy != false) {
let rentedBy = getServerData().vehicles[i].rentedBy; let rentedBy = getServerData().vehicles[i].rentedBy;
if(getPlayerCurrentSubAccount(rentedBy).cash < getServerData().vehicles[i].rentPrice) { if(getPlayerData(rentedBy) != false) {
messagePlayerAlert(rentedBy, `You do not have enough money to continue renting this vehicle!`); if(getPlayerCurrentSubAccount(rentedBy).cash < getServerData().vehicles[i].rentPrice) {
stopRentingVehicle(rentedBy); messagePlayerAlert(rentedBy, `You do not have enough money to continue renting this vehicle!`);
} else { stopRentingVehicle(rentedBy);
takePlayerCash(rentedBy, getServerData().vehicles[i].rentPrice); } else {
takePlayerCash(rentedBy, getServerData().vehicles[i].rentPrice);
}
} }
} }
} }
@@ -75,6 +78,23 @@ function updatePings() {
// =========================================================================== // ===========================================================================
function checkServerGameTime() {
if(getServerConfig().minute >= 59) {
getServerConfig().minute = 0;
if(getServerConfig().hour >= 23) {
getServerConfig().hour = 0;
} else {
getServerConfig().hour = getServerConfig().hour + 1;
}
} else {
getServerConfig().minute = getServerConfig().minute + 1;
}
updateTimeRule();
}
// ===========================================================================
function checkPayDays() { function checkPayDays() {
let clients = getClients(); let clients = getClients();
for(let i in clients) { for(let i in clients) {