From dd1d136714a6db8b5da6d0ff2f86f76b3693e5aa Mon Sep 17 00:00:00 2001 From: hydrant Date: Mon, 31 May 2021 09:45:18 +0200 Subject: [PATCH] =?UTF-8?q?User-Vehicle=20nur=20mit=20Besitzer=20in=20N?= =?UTF-8?q?=C3=A4he=20durchsuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Managers/InteractionManager.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs index 9c04f95f..2a953e97 100644 --- a/ReallifeGamemode.Server/Managers/InteractionManager.cs +++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs @@ -859,18 +859,22 @@ namespace ReallifeGamemode.Server.Managers return; } + if (serverVehicle is UserVehicle userVehicle) + { + Player owner = PlayerService.GetPlayerByNameOrId(dbContext.Users.Where(u => u.Id == userVehicle.UserId).Select(u => u.Name).First()); + if (owner == null || !owner.IsLoggedIn() || player.Position.DistanceTo(owner.Position) > 15) + { + player.SendNotification("~r~Der Besitzer des Fahrzeugs ist nicht in der Nähe"); + return; + } + } + if (serverVehicle.Model == VehicleHash.Riot) { player.SendNotification("~r~Der Riot muss zur Asservatenkammer gefahren werden"); return; } - if (VehicleStreaming.GetLockState(vehicle) || serverVehicle.Locked) - { - player.SendNotification("~r~Dieses Fahrzeug ist abgeschlossen"); - return; - } - var targetItems = InventoryManager.GetVehicleItems(vehicle); List illItemsList = new List(); bool illegalItemsFound = false;