Add Hanf items, some inventory mess removed

This commit is contained in:
hydrant
2021-05-22 14:52:29 +02:00
parent 467e0a4248
commit 34033eb875
20 changed files with 126 additions and 135 deletions

View File

@@ -2231,26 +2231,19 @@ namespace ReallifeGamemode.Server.Commands
return;
}
var invWeight = 0;
var invWeight = InventoryManager.GetUserInventoryWeight(target);
using (var context = new DatabaseContext())
{
List<UserItem> userItems = context.UserItems.ToList().FindAll(i => i.UserId == target.GetUser().Id);
foreach (var uItem in userItems)
{
invWeight += uItem.Amount * InventoryManager.GetItemById(uItem.ItemId).Gewicht;
}
}
IItem item = InventoryManager.GetItemById(itemId);
if (invWeight + (amount * InventoryManager.GetItemById(itemId).Gewicht) > 40000)
if (invWeight + (amount * item.Gewicht) > InventoryManager.MAX_USER_INVENTORY)
{
ChatService.SendMessage(player, "~y~" + target.Name + " ~s~hat nicht mehr genug Platz in seinem Inventar.");
}
else
{
UserItem item = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount };
InventoryManager.AddItemToInventory(target, item.ItemId, item.Amount);
ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~" + amount + "~s~ mal das Item gegeben.");
UserItem userItem = new UserItem() { ItemId = itemId, UserId = target.GetUser().Id, Amount = amount };
InventoryManager.AddItemToInventory(target, userItem.ItemId, userItem.Amount);
ChatService.SendMessage(player, $"~b~[ADMIN]~s~ Du hast ~y~{target.Name}~y~ ~y~{amount}~s~ mal das Item ~y~{item.Name}~s~ gegeben.");
}
}
@@ -2340,7 +2333,7 @@ namespace ReallifeGamemode.Server.Commands
}
[Command("inventory", "~m~Benutzung: ~s~/inventory [Spieler]")]
public void CmdAdminGiveItem(Player player, string targetname)
public void CmdAdminInventory(Player player, string targetname)
{
if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
{