From 10939c6f0cfc1cbc92afc552ad5f7fd41688dbda Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Mon, 5 Apr 2021 14:25:39 +0200
Subject: [PATCH] item aufheben E

---
 ReallifeGamemode.Server/Events/Key.cs           | 10 ++++++++--
 ReallifeGamemode.Server/Inventory/GroundItem.cs |  5 ++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index b70039f2..41e08be7 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -198,6 +198,14 @@ namespace ReallifeGamemode.Server.Events
         return;
       }
 
+      if(!player.IsInVehicle)
+      {
+        if(GroundItem.PickUpGroundItem(player))
+        {
+          return;
+        }
+      }
+
       DutyPoint nearestDuty = PositionManager.DutyPoints.Find(d => d.Position.DistanceTo(player.Position) <= 1.5 && d.FactionId == user.FactionId);
       WeaponPoint nearestWeapon = PositionManager.WeaponPoints.Find(w => w.Position.DistanceTo(player.Position) <= 1.5 && w.FactionId == user.FactionId);
       JailReleasePoint nearestJailReleasePoint = PositionManager.JailReleasePoints.Find(j => j.Position.DistanceTo(player.Position) <= 1.5 && (user.FactionId == 1 || user.FactionId == 3) && user.GetData<bool>("duty"));
@@ -875,8 +883,6 @@ namespace ReallifeGamemode.Server.Events
       if (!player.IsInVehicle)
       {
         Vehicle.VehicleMenuLockCarEvent(player);
-
-        GroundItem.PickUpGroundItem(player);
       }
 
       if (player.IsInVehicle && player.VehicleSeat == 0)
diff --git a/ReallifeGamemode.Server/Inventory/GroundItem.cs b/ReallifeGamemode.Server/Inventory/GroundItem.cs
index 25f8dcb6..253c1ab4 100644
--- a/ReallifeGamemode.Server/Inventory/GroundItem.cs
+++ b/ReallifeGamemode.Server/Inventory/GroundItem.cs
@@ -26,7 +26,7 @@ namespace ReallifeGamemode.Server.Inventory
       GroundTextLabels.Add(grndTextLabel);
     }
 
-    public static void PickUpGroundItem(Player player)
+    public static bool PickUpGroundItem(Player player)
     {
       GroundItem nearest = GroundItems.FirstOrDefault(d => d.Position.DistanceTo(player.Position) <= 1.2);
       if (nearest != null)
@@ -106,7 +106,10 @@ namespace ReallifeGamemode.Server.Inventory
             NAPI.Player.SetPlayerCurrentWeapon(player, WeaponHash.Unarmed);
           }
         }
+        return true;
       }
+
+      return false;
     }
 
     public static void RemoveGroundItem(GroundItem grndItem, GTANetworkAPI.Object grndObject, TextLabel grndTextLabel)