From b49cbffb328e8a44098d6a23234aa77480fd085b Mon Sep 17 00:00:00 2001
From: kookroach <moungos.lukas@gmail.com>
Date: Mon, 5 Apr 2021 15:55:41 +0200
Subject: [PATCH] try fix Job

---
 .../Jobs/RefuseCollector.ts                   | 26 +++++++++++--------
 .../Job/RefuseCollectorJob.cs                 |  4 +--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
index bfa1b73c..22cd3d2c 100644
--- a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
+++ b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
@@ -43,9 +43,9 @@
     });
     mp.events.add('SERVER:MuellmannBCSEntfernen', () => {
         garbageToCollect.forEach((colshape, blip) => {
-            if (colshape)
+            if (colshape && mp.colshapes.exists(colshape))
                 colshape.destroy();
-            if (blip)
+            if (blip && mp.blips.exists(blip))
                 blip.destroy();
         });
 
@@ -76,7 +76,7 @@
             if (hasBinBag) { mp.gui.chat.push("Du trägst bereits einen Müllsack!"); return; }
 
             if (!dumptruckIsFull) {
-                mp.events.callRemote('CLIENT:MuellmannImShape', JSON.stringify(blip));
+                mp.events.callRemote('CLIENT:MuellmannImShape', blip.getCoords());
                 hasBinBag = true;
 
                 if (colshape)
@@ -113,18 +113,22 @@
             dumptruckIsFull = false;
         }
     });
-    mp.events.add("MuellmannUpdateColshape", (jsonIdentifier) => {
-        var blip = JSON.parse(jsonIdentifier);
-        if (!garbageToCollect.has(blip)) return;
+    mp.events.add("MuellmannUpdateColshape", (vector3) => {
+        let currBlip;
+        garbageToCollect.forEach((colShape, blip) => {
+            if (blip.getCoords == vector3) currBlip = blip;
+        });
 
-        var colShape = garbageToCollect.get(blip);
+        if (!garbageToCollect.has(currBlip)) return;
 
-        if (blip)
-            blip.destroy();
-        if (colShape)
+        var colShape = garbageToCollect.get(currBlip);
+
+        if (currBlip && mp.blips.exists(currBlip))
+            currBlip.destroy();
+        if (colShape && mp.colshapes.exists(colShape))
             colShape.destroy();
 
-        garbageToCollect.delete(blip);
+        garbageToCollect.delete(currBlip);
     });
 
     mp.events.add("SERVER:MuellmannZuBase", () => {
diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
index b6296482..204b6010 100644
--- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
+++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
@@ -209,13 +209,13 @@ namespace ReallifeGamemode.Server.Job
     }
 
     [RemoteEvent("CLIENT:MuellmannImShape")]
-    public void MuellmannImShape(Player player, string jsonIdentifier)
+    public void MuellmannImShape(Player player, Vector3 blipCoords)
     {
       foreach (var data in muellmanData)
       {
         if (data.getDataFromClient(player) == null) continue;
         Player target = data.getPartnerClient(player);
-        if (target != null) target.TriggerEvent("MuellmannUpdateColshape", jsonIdentifier);
+        if (target != null) target.TriggerEvent("MuellmannUpdateColshape", blipCoords);
         player.TriggerEvent("renderTextOnScreen", "Wirf den Müllsack in den Müllwagen.");
         player.AddAttachment("binbag", false);
         return;