From 48b4cc22a7564eac38a8bef4160a35d713a104af Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 27 May 2021 21:12:44 +0200 Subject: [PATCH] fix merge --- ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs index 4a5bfe40..896ee597 100644 --- a/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs +++ b/ReallifeGamemode.Server/Inventory/Items/Notfallkit.cs @@ -46,18 +46,16 @@ namespace ReallifeGamemode.Server.Inventory.Items return false; } - if((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) + if ((VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_GANG_VEHICLE_HASH || (VehicleHash)veh.Model == WeaponDealManager.WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH) { player.SendNotification("Du kannst den Waffentransporter nicht reparieren!"); - return false; + return false; } using (var dbContext = new DatabaseContext()) { Vector3 position = veh.Position; - player.SendNotification("Du hast ~g~" + InventoryManager.GetItemById(uItem.ItemId).Name + " ~s~verwendet", false); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); - InventoryManager.RemoveUserItem(player.GetUser(), uItem, 1); + player.SendNotification("Du hast ~g~" + Name + " ~s~verwendet", false); ServerVehicle serverVehicle = veh.GetServerVehicle(dbContext); serverVehicle.Spawn(veh).Position = position; Vehicle newVeh = serverVehicle.Spawn(veh);