diff --git a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java index 969017471..f58cf5972 100644 --- a/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java +++ b/common/src/main/java/me/lucko/luckperms/common/commands/misc/VerboseCommand.java @@ -35,7 +35,7 @@ import java.util.stream.Collectors; public class VerboseCommand extends SingleMainCommand { public VerboseCommand() { - super("Verbose", "/%s verbose [filters]", 1, Permission.VERBOSE); + super("Verbose", "/%s verbose [filters...]", 1, Permission.VERBOSE); } @Override @@ -58,7 +58,7 @@ public class VerboseCommand extends SingleMainCommand { List filters = new ArrayList<>(); if (args.size() != 1) { - filters.addAll(args.subList(1, args.size() + 1)); + filters.addAll(args.subList(1, args.size())); } diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/DebugHandler.java b/common/src/main/java/me/lucko/luckperms/common/utils/DebugHandler.java index 29cfd7315..c35ce5d6b 100644 --- a/common/src/main/java/me/lucko/luckperms/common/utils/DebugHandler.java +++ b/common/src/main/java/me/lucko/luckperms/common/utils/DebugHandler.java @@ -39,22 +39,18 @@ public class DebugHandler { private final Map> listeners = new ConcurrentHashMap<>(); public void printOutput(String checked, String node, Tristate value) { + all: for (Map.Entry> e : listeners.entrySet()) { - List filters = e.getValue(); - - find: - if (!filters.isEmpty()) { - for (String filter : filters) { - if (node.toLowerCase().startsWith(filter.toLowerCase())) { - break find; - } - - if (checked.equalsIgnoreCase(filter)) { - break find; - } + for (String filter : e.getValue()) { + if (node.toLowerCase().startsWith(filter.toLowerCase())) { + continue; } - continue; + if (checked.equalsIgnoreCase(filter)) { + continue; + } + + continue all; } Message.LOG.send(e.getKey().getSender(), "&7Checking &a" + checked + "&7 for: &a" + node + " &f(&7" + value.toString() + "&f)"); diff --git a/default-lang.yml b/default-lang.yml index b40787087..2060d1243 100644 --- a/default-lang.yml +++ b/default-lang.yml @@ -46,7 +46,7 @@ use-uninherit-command: "Use the 'parent remove' command instead of specifying th verbose-on: "&bVerbose checking output set to &aTRUE &bfor all permissions." -verbose-on_query: "&bVerbose checking output set to &aTRUE &bfor permissions starting with &f\"{0}\"&b." +verbose-on_query: "&bVerbose checking output set to &aTRUE &bfor permissions matching the following filters: &f{0}" verbose-off: "&bVerbose checking output set to &cFALSE&b." create-success: "&b{0}&a was successfully created."