From 5c08a0e72cc80e249c204d2562fb9674de934f1f Mon Sep 17 00:00:00 2001 From: triagonal <10545540+triagonal@users.noreply.github.com> Date: Fri, 2 Jul 2021 02:30:08 +1000 Subject: [PATCH] Ignore case when matching custom item aliases (#4295) Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com> --- .../essentials/items/CustomItemResolver.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java b/Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java index 6e49feb19..ac8e196db 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java +++ b/Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java @@ -25,7 +25,8 @@ public class CustomItemResolver implements IItemDb.ItemResolver, IConf { } @Override - public ItemStack apply(final String item) { + public ItemStack apply(String item) { + item = item.toLowerCase(); if (map.containsKey(item)) { try { return ess.getItemDb().get(map.get(item)); @@ -62,19 +63,21 @@ public class CustomItemResolver implements IItemDb.ItemResolver, IConf { return; } - for (final Map.Entry alias : section.entrySet()) { - if (!(alias.getValue() instanceof String)) { + for (final Map.Entry entry : section.entrySet()) { + if (!(entry.getValue() instanceof String)) { continue; } - final String target = (String) alias.getValue(); + final String alias = entry.getKey().toLowerCase(); + final String target = (String) entry.getValue(); if (existsInItemDb(target)) { - map.put(alias.getKey(), target); + map.put(alias, target); } } } - public void setAlias(final String alias, final String target) { + public void setAlias(String alias, final String target) { + alias = alias.toLowerCase(); if (map.containsKey(alias) && map.get(alias).equalsIgnoreCase(target)) { return; } @@ -84,7 +87,7 @@ public class CustomItemResolver implements IItemDb.ItemResolver, IConf { } public void removeAlias(final String alias) { - if (map.remove(alias) != null) { + if (map.remove(alias.toLowerCase()) != null) { save(); } }