Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-29 07:37:46 +02:00
Code Issues Projects Releases Wiki Activity

Improve Util#matchEntityType to check for an exact match first

Browse Source
This commit is contained in:
fullwall 2013-08-08 18:21:35 +08:00
parent 5df6499dae
commit 5a3f616fe1
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/net/citizensnpcs/util/Util.java
View File

@ -107,18 +107,19 @@ public class Util {
}
public static <T extends Enum<?>> T matchEnum(T[] values, String toMatch) {
T type = null;
toMatch = toMatch.toLowerCase();
toMatch = toMatch.toLowerCase().replace('-', '_').replace(' ', '_');
for (T check : values) {
String name = check.name().toLowerCase();
if (name.matches(toMatch) || name.equals(toMatch) || name.replace("_", "").equals(toMatch)
|| name.replace('_', ' ').equals(toMatch) || name.replace('_', '-').equals(toMatch)
|| name.replace('_', ' ').equals(toMatch) || name.startsWith(toMatch)) {
type = check;
break;
if (toMatch.equals(check.name().toLowerCase())) {
return check; // check for an exact match first
}
}
return type;
for (T check : values) {
String name = check.name().toLowerCase();
if (name.replace("_", "").equals(toMatch) || name.matches(toMatch) || name.startsWith(toMatch)) {
return check;
}
}
return null;
}
public static boolean matchesItemInHand(Player player, String setting) {