Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore case when matching custom item aliases (#4295) 

Co-authored-by: Josh Roy <10731363+JRoy@users.noreply.github.com>
This commit is contained in:
triagonal 2021-07-02 02:30:08 +10:00 committed by GitHub
parent 9c451271e0
commit 5c08a0e72c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/main/java/com/earth2me/essentials/items/CustomItemResolver.java
View File

@ -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<String, Object> alias : section.entrySet()) {
if (!(alias.getValue() instanceof String)) {
for (final Map.Entry<String, Object> 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();
}
}