From 8ac14e057a3569e9cb82b5cef68bd558f8ed10da Mon Sep 17 00:00:00 2001 From: kookroach Date: Mon, 5 Apr 2021 17:54:21 +0200 Subject: [PATCH] Fix --- ReallifeGamemode.Client/Jobs/RefuseCollector.ts | 4 ++-- ReallifeGamemode.Server/Managers/JobManager.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts index 7fc01490..f5a9f4d7 100644 --- a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts +++ b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts @@ -29,7 +29,7 @@ for (var i = 0; i < posArr.length; i++) { let pos = new mp.Vector3(posArr[i].x, posArr[i].y, posArr[i].z - 1) - let newBlip = mp.blips.new(1, new mp.Vector3(pos.x, pos.y, pos.z), { name: 'Mülltonne', color: 45, shortRange: false }); + let newBlip = mp.blips.new(1, new mp.Vector3(pos.x, pos.y, pos.z), { name: 'Mülltonne', color: 5, shortRange: false, scale: 0.5 }); let newColShape = mp.colshapes.newSphere(posArr[i].x, posArr[i].y, posArr[i].z + 0.5, 1.75); newBlip.setPriority(1000); @@ -38,7 +38,7 @@ garbageToCollect.set(i, { blip: newBlip, colshape: newColShape }); } - blipBase = mp.blips.new(1, new mp.Vector3(-442.3999, -1701.5234, 18.933002 - 1), { name: 'Recylinganlage', color: 5, shortRange: false }); + blipBase = mp.blips.new(515, new mp.Vector3(-442.3999, -1701.5234, 18.933002 - 1), { name: 'Recylinganlage', color: 24, shortRange: false }); markerBase = mp.markers.new(1, new mp.Vector3(-442.3999, -1701.5234, 18.933002 - 1), 10, { direction: new mp.Vector3(-235.5747, -1685.475, 32.7207), color: [255, 255, 0, 150], visible: true, dimension: 0 }); colshapeBase = mp.colshapes.newSphere(-442.3999, -1701.5234, 18.933002 - 1, 10); }); diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index a7b4df6d..9cfe6ae4 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -343,7 +343,7 @@ namespace ReallifeGamemode.Server.Managers player.Heading = (57.03f); } Vehicle LastVehicle = player.GetData("LastVehicle"); - if (LastVehicle != null) + if (LastVehicle != null && job.Id != GetJob().Id) { LastVehicle.ResetData("timerJobVehicleRespawn"); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(LastVehicle);