Fixed tab completes of expel command showing hidden players regardles…

…s of the tab-complete hide vanished settings
BG-Software-LLC · Aug 25, 2022 · 523e1a2 · 523e1a2
1 parent eef1fe8
commit 523e1a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandTabCompletes.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/CommandTabCompletes.java
@@ -109,8 +109,8 @@ public static List<String> getIslandWarps(Island island, String argument) {
         return filterByArgument(island.getIslandWarps().keySet(), argument.toLowerCase(Locale.ENGLISH));
     }
 
-    public static List<String> getIslandVisitors(Island island, String argument) {
-        return getPlayers(island.getIslandVisitors(), argument);
+    public static List<String> getIslandVisitors(Island island, String argument, boolean hideVanish) {
+        return getPlayers(island.getIslandVisitors(!hideVanish), argument);
     }
 
     public static List<String> getCustomComplete(String argument, String... tabVariables) {

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdExpel.java b/src/main/java/com/bgsoftware/superiorskyblock/commands/player/CmdExpel.java
@@ -107,7 +107,8 @@ public void execute(SuperiorSkyblockPlugin plugin, SuperiorPlayer superiorPlayer
 
     @Override
     public List<String> tabComplete(SuperiorSkyblockPlugin plugin, SuperiorPlayer superiorPlayer, Island island, String[] args) {
-        return args.length != 2 ? Collections.emptyList() : island != null ? CommandTabCompletes.getIslandVisitors(island, args[1]) :
+        return args.length != 2 ? Collections.emptyList() : island != null ?
+                CommandTabCompletes.getIslandVisitors(island, args[1], plugin.getSettings().isTabCompleteHideVanished()) :
                 CommandTabCompletes.getOnlinePlayers(plugin, args[1], plugin.getSettings().isTabCompleteHideVanished(),
                         onlinePlayer -> plugin.getGrid().getIslandAt(onlinePlayer.getLocation()) != null);
     }