From e06a2a3f341ce2d51e8b65eaaea4f64950bbb44e Mon Sep 17 00:00:00 2001 From: Lennart Kampshoff Date: Sun, 28 Oct 2018 00:58:09 +0200 Subject: [PATCH] Fixed dumb error, case-insensitive item name --- Server/Commands/Admin.cs | 15 +++++++++++++-- Server/Managers/InventoryManager.cs | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Server/Commands/Admin.cs b/Server/Commands/Admin.cs index 1d22b1eb..2319cb8a 100644 --- a/Server/Commands/Admin.cs +++ b/Server/Commands/Admin.cs @@ -38,12 +38,23 @@ namespace reallife_gamemode.Server.Commands IItem iItem = InventoryManager.GetItemByName(item); + if(iItem == null) + { + player.SendChatMessage("Dieses Essen existiert nicht."); + return; + } + List itemList = player.GetUser().GetItems(); UserItem eatItem = itemList.FirstOrDefault(i => i.ItemId == iItem.Id); - if(eatItem is IUsableItem) + if(eatItem == null) + { + player.SendChatMessage("Du hast dieses Item nicht"); + return; + } + + if(iItem is IUsableItem usableItemObj) { - var usableItemObj = eatItem as IUsableItem; usableItemObj.Use(eatItem, player); } } diff --git a/Server/Managers/InventoryManager.cs b/Server/Managers/InventoryManager.cs index 2e07c628..5d904061 100644 --- a/Server/Managers/InventoryManager.cs +++ b/Server/Managers/InventoryManager.cs @@ -50,7 +50,7 @@ namespace reallife_gamemode.Server.Managers public static IItem GetItemByName(string name) { - return itemList.Find(i => i.Name == name); + return itemList.Find(i => i.Name.ToLower() == name.ToLower()); } public static void RemoveUserItem(Entities.User user, UserItem item)