more permission refactoring

This commit is contained in:
YouHaveTrouble
2021-07-06 16:55:28 +02:00
parent 0642abd51e
commit 1e4de5709d
3 changed files with 3 additions and 4 deletions
@@ -99,7 +99,7 @@ public class CommandWhitelistBukkit extends JavaPlugin {
for (Map.Entry<String, CWGroup> s : groups.entrySet()) { for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
if (s.getKey().equalsIgnoreCase("default")) if (s.getKey().equalsIgnoreCase("default"))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
else if (player.hasPermission("commandwhitelist.group." + s.getKey())) else if (player.hasPermission(s.getValue().getPermission()))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
} }
return commandList; return commandList;
@@ -50,7 +50,6 @@ public class CommandWhitelistVelocity {
configCache = new ConfigCache(new File(String.valueOf(folder), "config.yml"), false, logger); configCache = new ConfigCache(new File(String.valueOf(folder), "config.yml"), false, logger);
else else
configCache.reloadConfig(); configCache.reloadConfig();
} }
public static void reloadConfig(CommandSource source) { public static void reloadConfig(CommandSource source) {
@@ -108,7 +107,7 @@ public class CommandWhitelistVelocity {
for (Map.Entry<String, CWGroup> s : groups.entrySet()) { for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
if (s.getKey().equalsIgnoreCase("default")) if (s.getKey().equalsIgnoreCase("default"))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
else if (player.hasPermission("commandwhitelist.group." + s.getKey())) else if (player.hasPermission(s.getValue().getPermission()))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
} }
return commandList; return commandList;
@@ -81,7 +81,7 @@ public final class CommandWhitelistWaterfall extends Plugin {
for (Map.Entry<String, CWGroup> s : groups.entrySet()) { for (Map.Entry<String, CWGroup> s : groups.entrySet()) {
if (s.getKey().equalsIgnoreCase("default")) if (s.getKey().equalsIgnoreCase("default"))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
else if (player.hasPermission("commandwhitelist.group." + s.getKey())) else if (player.hasPermission(s.getValue().getPermission()))
commandList.addAll(s.getValue().getCommands()); commandList.addAll(s.getValue().getCommands());
} }
return commandList; return commandList;