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

Fix job labels

Browse Source
This commit is contained in:
Vortrex
2020-12-28 01:26:27 -06:00
parent 0308535a4e
commit d10c6f419f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/server/job.js
View File

@@ -986,6 +986,9 @@ function isPlayerInJobVehicle(client) {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function isPlayerWorking(client) { function isPlayerWorking(client) {
if(!getClientCurrentSubAccount(client)) {
return false;
}
return getClientCurrentSubAccount(client).isWorking; return getClientCurrentSubAccount(client).isWorking;
} }
@@ -1102,12 +1105,12 @@ function stopReturnToJobVehicleCountdown(client) {
function sendAllJobLabelsToPlayer(client) { function sendAllJobLabelsToPlayer(client) {
let tempJobLocations = []; let tempJobLocations = [];
for(let k in getServerData().jobs) { for(let k in getServerData().jobs) {
for(m in getServerData().jobs[i].locations) { for(let m in getServerData().jobs[k].locations) {
tempJobLocations.push({ tempJobLocations.push({
id: getServerData().jobs[i].locations[j].databaseId, id: getServerData().jobs[k].locations[m].databaseId,
jobType: getServerData().jobs[i].jobType, jobType: getServerData().jobs[k].jobType,
name: getServerData().jobs[i].name, name: getServerData().jobs[k].name,
position: getServerData().jobs[i].locations[j].position, position: getServerData().jobs[k].locations[m].position,
}); });
} }
} }
@@ -1119,10 +1122,10 @@ function sendAllJobLabelsToPlayer(client) {
for(let i = 0 ; i < totalNetworkEvents ; i++) { for(let i = 0 ; i < totalNetworkEvents ; i++) {
for(let j = 0 ; j < jobLocationsPerNetworkEvent ; j++) { for(let j = 0 ; j < jobLocationsPerNetworkEvent ; j++) {
let tempJobLocationId = (i*jobLocationsPerNetworkEvent)+j; let tempJobLocationId = (i*jobLocationsPerNetworkEvent)+j;
if(typeof getServerData().jobs[k] != "undefined") { //if(typeof getServerData().jobs[i] != "undefined") {
let tempJobLabels = []; let tempJobLabels = [];
tempJobLabels.push([tempJobLocations[i].id, tempJobLocations[i].position, getGameConfig().propertyLabelHeight[getServerGame()], tempJobLocations[i].name, tempJobLocations[i].jobType, false]); tempJobLabels.push([tempJobLocations[i].id, tempJobLocations[i].position, getGameConfig().propertyLabelHeight[getServerGame()], tempJobLocations[i].name, tempJobLocations[i].jobType, false]);
} //}
} }
triggerNetworkEvent("ag.joblabel.all", client, tempJobLabels); triggerNetworkEvent("ag.joblabel.all", client, tempJobLabels);
tempJobLabels = []; tempJobLabels = [];