From c73bc7a481829563103e71f219c650274ebf6242 Mon Sep 17 00:00:00 2001
From: VegaZ <manuel.lampe@hotmail.de>
Date: Sun, 14 Feb 2021 15:36:51 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20M=C3=BCllsack=20aus=20dem=20Fahrzeug=20a?=
 =?UTF-8?q?ufheben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
index 17215784..e3a73646 100644
--- a/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
+++ b/ReallifeGamemode.Client/Jobs/RefuseCollector.ts
@@ -66,25 +66,30 @@
         //mp.events.callRemote('CLIENT:ImShape', JSON.stringify(Shape));
         for (var i = 0; i < ShapeTonne.length; i++) {
             if (Shape != ShapeTonne[i]) continue;
-            if (!Traegt) {
-                if (!HintenVoll) {
-                    mp.events.callRemote('CLIENT:MuellmannImShape', i);
-                    Traegt = true;
-                    BlipTonne[i].destroy();
-                    BlipTonne[i] = null;
-                    ShapeTonne[i].destroy();
-                    ShapeTonne[i] = null;
+            if (!mp.players.local.vehicle) {
+                if (!Traegt) {
+                    if (!HintenVoll) {                       
+                        mp.events.callRemote('CLIENT:MuellmannImShape', i);
+                        Traegt = true;
+                        BlipTonne[i].destroy();
+                        BlipTonne[i] = null;
+                        ShapeTonne[i].destroy();
+                        ShapeTonne[i] = null;
 
-                    interval = setInterval(function () { createMarker(); }, 2);
+                        interval = setInterval(function () { createMarker(); }, 2);
+                    }
+                    else {
+                        mp.gui.chat.push("Der Müllwagen ist bereits voll! Fahre zur Base und lade ab!");
+                        return;
+                    }
                 }
                 else {
-                    mp.gui.chat.push("Der Müllwagen ist bereits voll! Fahre zur Base und lade ab!");
+                    mp.gui.chat.push(`Du trägst bereits einen Müllsack!`);
                     return;
                 }
             }
             else {
-                mp.gui.chat.push(`Du trägst bereits einen Müllsack!`);
-                return;
+                mp.events.call("renderTextOnScreen", "Steige aus dem Müllwagen aus um den Müllsack zu entnehmen.");
             }
         }
         if (Shape == ShapeTonneHinten) {
diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
index c61abbda..10e3e038 100644
--- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
+++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs
@@ -202,11 +202,6 @@ namespace ReallifeGamemode.Server.Job
     [RemoteEvent("CLIENT:MuellmannImShape")]
     public void MuellmannImShape(Player player, int colshapeIndex)
     {
-      if (player.IsInVehicle)
-      {
-        return;
-      }
-
       foreach (var data in muellmanData)
       {
         if (data.getDataFromClient(player) == null) continue;