fix: /tp TAB not serving players in arg 0, close #675

WiIIiam278 · Aug 22, 2024 · 7029b50 · 7029b50
1 parent 3b7bb27
commit 7029b50
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/common/src/main/java/net/william278/huskhomes/command/TpCommand.java b/common/src/main/java/net/william278/huskhomes/command/TpCommand.java
@@ -128,7 +128,6 @@ private void execute(@NotNull CommandUser executor, @NotNull Teleportable telepo
     public final List<String> suggest(@NotNull CommandUser user, @NotNull String[] args) {
         final Position relative = getBasePosition(user);
         final boolean serveCoordinateCompletions = user.hasPermission(getPermission("coordinates"));
-        final boolean servePlayerCompletions = user.hasPermission(getPermission("other"));
         switch (args.length) {
             case 0, 1 -> {
                 final ArrayList<String> completions = Lists.newArrayList(serveCoordinateCompletions
@@ -137,9 +136,7 @@ public final List<String> suggest(@NotNull CommandUser user, @NotNull String[] a
                         ((int) relative.getX() + " " + (int) relative.getY()),
                         ((int) relative.getX() + " " + (int) relative.getY() + " " + (int) relative.getZ()))
                         : List.of());
-                if (servePlayerCompletions) {
-                    completions.addAll(plugin.getPlayerList(false));
-                }
+                completions.addAll(plugin.getPlayerList(false));
                 return completions.stream()
                         .filter(s -> s.toLowerCase().startsWith(args.length == 1 ? args[0].toLowerCase() : ""))
                         .sorted().collect(Collectors.toList());
@@ -157,7 +154,7 @@ public final List<String> suggest(@NotNull CommandUser user, @NotNull String[] a
                             ((int) relative.getX() + " " + (int) relative.getY() + " " + (int) relative.getZ()))
                             : List.of()
                     );
-                    if (servePlayerCompletions) {
+                    if (user.hasPermission(getPermission("other"))) {
                         completions.addAll(plugin.getPlayerList(false));
                     }
                 }