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

Use new native util functions

Browse Source
This commit is contained in:
Vortrex
2020-12-12 06:11:16 -06:00
parent df178de9e6
commit d4efdcd096
9 changed files with 83 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/server/job/bus.js
View File

@@ -102,12 +102,12 @@ let busRoutes = [
// ---------------------------------------------------------------------------
function getNextStopOnBusRoute(client) {
if(client.getData("ag.busRoute") && client.getData("ag.lastBusStop")) {
if(getEntityData(client, "ag.busRoute") && getEntityData(client, "ag.lastBusStop")) {
if(!isGoingToLastStopOnBusRoute(client)) {
return busRoutes[server.game][client.getData("ag.busRoute")][client.getData("ag.lastBusStop")+1];
return busRoutes[server.game][getEntityData(client, "ag.busRoute")][getEntityData(client, "ag.lastBusStop")+1];
} else {
let slot = busRoutes[server.game][client.getData("ag.busRoute")].length-1;
return busRoutes[server.game][client.getData("ag.busRoute")][slot];
let slot = busRoutes[server.game][getEntityData(client, "ag.busRoute")].length-1;
return busRoutes[server.game][getEntityData(client, "ag.busRoute")][slot];
}
}
}
@@ -115,8 +115,8 @@ function getNextStopOnBusRoute(client) {
// ---------------------------------------------------------------------------
function isGoingToLastStopOnBusRoute(client) {
if(client.getData("ag.busRoute") && client.getData("ag.lastBusStop")) {
if(client.getData("ag.lastBusStop")+1 == busRoutes[server.game][client.getData("ag.busRoute")].length-1) {
if(getEntityData(client, "ag.busRoute") && getEntityData(client, "ag.lastBusStop")) {
if(getEntityData(client, "ag.lastBusStop")+1 == busRoutes[server.game][getEntityData(client, "ag.busRoute")].length-1) {
return true;
}
}