Fixed players and caseSensitive commands

divios · Feb 18, 2022 · 1220d44 · 1220d44
1 parent d6fbcd0
commit 1220d44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/io/github/divios/jcommands/JCommandListener.java b/src/main/java/io/github/divios/jcommands/JCommandListener.java
@@ -78,12 +78,23 @@ private ValueMap wrapArgs(JCommand command, String[] args) {
         Map<String, Value> valueMap = new LinkedHashMap<>();
         List<Argument> arguments = command.getArguments();
 
-        String[] validArgs = Arrays.copyOfRange(args, ArrayUtils.indexOf(args, command.getName()) + 1, args.length);
+        String[] validArgs = Arrays.copyOfRange(args, indexOf(args, command.getName()) + 1, args.length);
 
         for (int i = 0; i < arguments.size(); i++)
             valueMap.put(arguments.get(i).getName(), Value.ofString(validArgs[i]));
 
         return ValueMap.of(valueMap);
     }
 
+    private int indexOf(String[] args, String s) {
+        int i = 0;
+        for (String arg : args) {
+            if (arg.equalsIgnoreCase(s))
+                return i;
+            i++;
+        }
+
+        return -1;
+    }
+
 }
diff --git a/src/main/java/io/github/divios/jcommands/util/Primitives.java b/src/main/java/io/github/divios/jcommands/util/Primitives.java
@@ -84,7 +84,7 @@ public static boolean getAsBoolean(String s) {
 
     public static boolean isPlayer(String s) {
         return Bukkit.getOnlinePlayers().stream()
-                .anyMatch(player -> ChatColor.stripColor(player.getDisplayName()).equalsIgnoreCase(s));
+                .anyMatch(player -> player.getName().equalsIgnoreCase(s));
     }
 
     public static Player getAsPlayer(String s) {