aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix inventorysystem

Browse Source
This commit is contained in:
Michael
2020-06-09 22:10:05 +02:00
parent ee90e85ebd
commit cb694a6de2
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -320,7 +320,7 @@ namespace ReallifeGamemode.Server.Managers
using (var context = new DatabaseContext()) using (var context = new DatabaseContext())
{ {
UserItem item = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == itemID && u.Amount <= itemAmount).FirstOrDefault(); UserItem item = context.UserItems.Where(u => u.UserId == user.Id && u.ItemId == itemID && u.Amount >= itemAmount).FirstOrDefault();
if (item == null) if (item == null)
{ {
@@ -328,27 +328,30 @@ namespace ReallifeGamemode.Server.Managers
return; return;
} }
RemoveUserItem(user, item, itemAmount);
if (!vehicleItems.ContainsKey(player)) /*
{ if (!vehicleItems.ContainsKey(player))
player.TriggerEvent("Error", "Transfer nicht möglich."); {
return; player.TriggerEvent("Error", "Transfer nicht möglich.");
} return;
}
if (!vehicleItems.ContainsKey(player))
vehicleItems.Add(player, new List<InventoryItem>());
Vehicle veh = null;
if (vehicleItems[player].Count != 0)
veh = vehicleItems[player].FirstOrDefault().vehicle;
if (!vehicleItems.ContainsKey(player))
vehicleItems.Add(player, new List<InventoryItem>());
Vehicle veh = null;
if (vehicleItems[player].Count != 0)
veh = vehicleItems[player].FirstOrDefault().vehicle;
*/
Vehicle veh = NAPI.Pools.GetAllVehicles().ToList().Where(v => v.Position.DistanceTo(player.Position) <= 2).FirstOrDefault();
if (veh == null) if (veh == null)
{ {
player.TriggerEvent("Error", "Transfer nicht möglich."); player.TriggerEvent("Error", "Transfer nicht möglich.");
return; return;
} }
AddItemToVehicleInventory(veh, itemID, itemAmount); AddItemToVehicleInventory(veh, itemID, itemAmount);
SetVehicleItems(player); SetVehicleItems(player);
VehicleItem vehicleItem = context.VehicleItems.Where(f => f.ItemId == itemID && f.Vehicle == VehicleManager.GetServerVehicleFromVehicle(veh, context)).FirstOrDefault(); VehicleItem vehicleItem = context.VehicleItems.Where(f => f.ItemId == itemID && f.Vehicle == VehicleManager.GetServerVehicleFromVehicle(veh, context)).FirstOrDefault();
context.SaveChanges(); context.SaveChanges();