From f36c4d9061e937effd4d295542670da02d5dcc72 Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Mon, 2 Nov 2020 04:25:27 +0100 Subject: [PATCH] cleaned up tab completion and fixed typo --- .../commandwhitelist/spigot/command/MainCommand.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java index e2516f1..d5d83db 100644 --- a/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java +++ b/src/main/java/eu/endermite/commandwhitelist/spigot/command/MainCommand.java @@ -78,20 +78,19 @@ public class MainCommand implements TabExecutor { public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { List list = new ArrayList<>(); if (args.length == 1) { - if ("restart".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) { + if ("reload".startsWith(args[0]) && sender.hasPermission("commandwhitelist.reload")) { list.add("reload"); } if ("add".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) { list.add("add"); - } - if ("remove".startsWith(args[0]) && sender.hasPermission("commandwhitelist.admin")) { list.add("remove"); } } else if (args.length == 2) { - if (args[0].equalsIgnoreCase("add") || args[0].equalsIgnoreCase("remove")) { + if (!sender.hasPermission("commandwhitelist.admin")) + return list; for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { - if (s.getKey().startsWith(args[1]) && sender.hasPermission("commandwhitelist.admin")) { + if (s.getKey().startsWith(args[1])) { list.add(s.getKey()); } } @@ -130,10 +129,8 @@ public class MainCommand implements TabExecutor { list.add(cmd); } } - return list; } - } return list; }