From 89280e1f857c89e6386f3e3ada3c1e0e907376a1 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sat, 29 May 2021 03:15:58 +0200 Subject: [PATCH] fix vehicle death inventory clear --- .../Managers/VehicleManager.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 4ed7b84e..b3939ebc 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -1122,10 +1122,17 @@ namespace ReallifeGamemode.Server.Managers { using (var dbContext = new DatabaseContext()) { - Vehicle vehicle = NAPI.Pools.GetAllVehicles().Find(v => v.Id == id); ServerVehicle sV = vehicle.GetServerVehicle(dbContext); + var items = InventoryManager.GetVehicleItems(vehicle); + if (items.Any()) + { + string itemsStr = string.Join(", ", items.Select(i => $"{i.ItemId} (amount: {i.Amount})")); + logger.LogInformation("Vehicle {0} died and lost the items: {1}", sV.Id, itemsStr); + InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); + } + if (sV is UserVehicle uV) { @@ -1154,14 +1161,6 @@ namespace ReallifeGamemode.Server.Managers Vehicle newVeh = sV.Spawn(vehicle); newVeh.Repair(); } - - var items = InventoryManager.GetVehicleItems(vehicle); - if (items.Any()) - { - string itemsStr = string.Join(", ", items.Select(i => $"{i.ItemId} (amount: {i.Amount})")); - logger.LogInformation("Vehicle {0} died and lost the items: {1}", sV.Id, itemsStr); - InventoryManager.RemoveAllItemsfromVehicleInventory(vehicle); - } } }