From 1f98de0099b08463d90e312fbbf79e552a31017d Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sat, 2 Jan 2021 22:54:46 -0600 Subject: [PATCH] Make add/del job pickup/blip utils --- scripts/server/job.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/scripts/server/job.js b/scripts/server/job.js index cc63d963..c9c0ab3f 100644 --- a/scripts/server/job.js +++ b/scripts/server/job.js @@ -1448,12 +1448,9 @@ function createJobLocationPickup(jobId, locationId) { pickupModelId = getJobData(jobId).pickupModel; } - getJobData(jobId).locations[locationId].pickup = gta.createPickup(pickupModelId, getJobData(jobId).locations[locationId].position); + getJobData(jobId).locations[locationId].blip = gta.createPickup(pickupModelId, getJobData(jobId).locations[locationId].position, getGameConfig().pickupTypes[getServerGame()].job); getJobData(jobId).locations[locationId].pickup.onAllDimensions = false; getJobData(jobId).locations[locationId].pickup.dimension = getJobData(jobId).locations[locationId].dimension; - getJobData(jobId).locations[locationId].pickup.setData("ag.owner.type", AG_PICKUP_JOB, false); - getJobData(jobId).locations[locationId].pickup.setData("ag.owner.id", jobId, false); - getJobData(jobId).locations[locationId].pickup.setData("ag.label.type", AG_LABEL_JOB, true); addToWorld(getJobData(jobId).locations[locationId].pickup); } } @@ -1469,9 +1466,9 @@ function createJobLocationBlip(jobId, locationId) { } getJobData(jobId).locations[locationId].blip = gta.createBlip(getJobData(jobId).locations[locationId].position, blipModelId, getColourByType("job")); - getJobData(jobId).locations[locationId].pickup.onAllDimensions = false; - getJobData(jobId).locations[locationId].pickup.dimension = getJobData(jobId).locations[locationId].dimension; - addToWorld(getJobData(jobId).locations[locationId].pickup); + getJobData(jobId).locations[locationId].blip.onAllDimensions = false; + getJobData(jobId).locations[locationId].blip.dimension = getJobData(jobId).locations[locationId].dimension; + addToWorld(getJobData(jobId).locations[locationId].blip); } }