Match enums with spaces in them

CitizensDev · Jul 27, 2013 · 757ad83 · 757ad83
1 parent 66570d1
commit 757ad83
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/net/citizensnpcs/util/Util.java b/src/main/java/net/citizensnpcs/util/Util.java
@@ -103,12 +103,12 @@ public static EntityType matchEntityType(String toMatch) {
 
     public static <T extends Enum<?>> T matchEnum(T[] values, String toMatch) {
         T type = null;
+        toMatch = toMatch.toLowerCase();
         for (T check : values) {
-            String name = check.name();
-            if (name.matches(toMatch) || name.equalsIgnoreCase(toMatch)
-                    || name.replace("_", "").equalsIgnoreCase(toMatch)
-                    || name.replace('_', '-').equalsIgnoreCase(toMatch)
-                    || name.replace('_', ' ').equalsIgnoreCase(toMatch) || name.startsWith(toMatch)) {
+            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;
             }