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

Use exterior business entrance for closest job point

Browse Source
This commit is contained in:
Vortrex
2022-05-04 13:03:56 -05:00
parent c104024cef
commit 24ddb20739
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/server/house.js
View File

@@ -1521,3 +1521,21 @@ function updateHousePickupLabelData(houseId) {
} }
// =========================================================================== // ===========================================================================
function deleteAllHouseBlips() {
for(let i in getServerData().houses) {
deleteHouseEntranceBlip(i);
deleteHouseExitBlip(i);
}
}
// ===========================================================================
function deleteAllHousePickups() {
for(let i in getServerData().houses) {
deleteHouseEntrancePickup(i);
deleteHouseExitPickup(i);
}
}
// ===========================================================================

14
scripts/server/job.js
View File

@@ -2635,8 +2635,6 @@ function createJobRouteLocationCommand(command, params, client) {
return false; return false;
} }
if(!isPlayerOnJobRoute(client)) { if(!isPlayerOnJobRoute(client)) {
messagePlayerError(client, getLocaleString(client, "NeedToBeOnJobRoute", "{ALTCOLOUR}/startroute{MAINCOLOUR}")); messagePlayerError(client, getLocaleString(client, "NeedToBeOnJobRoute", "{ALTCOLOUR}/startroute{MAINCOLOUR}"));
return false; return false;
@@ -2843,9 +2841,17 @@ function getClosestJobLocation(position) {
let closestJobLocation = false; let closestJobLocation = false;
for(let i in getServerData().jobs) { for(let i in getServerData().jobs) {
for(let j in getServerData().jobs[i].locations) { for(let j in getServerData().jobs[i].locations) {
if(!closestJobLocation || getServerData().jobs[i].locations[j].position.distance(position) < closestJobLocation.position.distance(position)) { if(getServerData().jobs[i].locations[j].interior != getGameConfig().mainWorldInterior[getGame()] || getServerData().jobs[i].locations[j].dimension != getGameConfig().mainWorldDimension[getGame()]) {
closestJobLocation = getServerData().jobs[i].locations[j]; let businessId = getBusinessFromInteriorAndDimension(getServerData().jobs[i].locations[j].dimension, getServerData().jobs[i].locations[j].interior);
if(getBusinessData(businessId) != false) {
position = getBusinessData(businessId).entrancePosition;
}
if(!closestJobLocation || getServerData().jobs[i].locations[j].position.distance(position) < closestJobLocation.position.distance(position)) {
closestJobLocation = getServerData().jobs[i].locations[j];
}
} }
} }
} }
return closestJobLocation; return closestJobLocation;