From 2a93f8c6367a68109e650b3805e51a8b03ee168a Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Tue, 15 Dec 2020 22:10:01 +0100 Subject: [PATCH] default commands no longer check permission --- .../endermite/commandwhitelist/api/CommandsList.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java b/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java index cff3ff7..2cdc046 100644 --- a/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java +++ b/src/main/java/eu/endermite/commandwhitelist/api/CommandsList.java @@ -13,9 +13,10 @@ public class CommandsList { public static List getCommands(Player player) { List commandList = new ArrayList<>(); for (Map.Entry> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { - if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { + if (s.getKey().equalsIgnoreCase("default")) commandList.addAll(s.getValue()); - } + else if (player.hasPermission("commandwhitelist.commands." + s.getKey())) + commandList.addAll(s.getValue()); } return commandList; } @@ -23,9 +24,10 @@ public class CommandsList { public static List getCommands(ProxiedPlayer player) { List commandList = new ArrayList<>(); for (Map.Entry> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) { - if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { + if (s.getKey().equalsIgnoreCase("default")) + commandList.addAll(s.getValue()); + else if (player.hasPermission("commandwhitelist.commands." + s.getKey())) commandList.addAll(s.getValue()); - } } return commandList; }