Merge pull request #516 from ghost/master

Pass permissions to bungee's Command constructor

Author: DevLeoko

bukkit/src/main/java/me/leoko/advancedban/bukkit/BukkitMethods.java

@@ -157,14 +157,14 @@ public File getDataFolder() {
     }
 
     @Override
-    public void setCommandExecutor(String cmd, TabCompleter tabCompleter) {
+    public void setCommandExecutor(String cmd, String permission, TabCompleter tabCompleter) {
         boolean friendly = getBoolean(getConfig(), "Friendly Register Commands", false);
         PluginCommand command = (friendly) ? getPlugin().getCommand(cmd) : Bukkit.getPluginCommand(cmd);
         if (command != null) {
             command.setExecutor(CommandReceiver.get());
             if (tabCompleter != null)
                 command.setTabCompleter((commandSender, c, s, args) -> {
-                    if (command.getPermission() != null && !hasPerms(commandSender, command.getPermission()))
+                    if (permission != null && !hasPerms(commandSender, permission))
                         return Collections.emptyList();
                     return tabCompleter.onTabComplete(commandSender, args);
                 });
@@ -186,7 +186,7 @@ public boolean hasPerms(Object player, String perms) {
     @Override
     public Permissionable getOfflinePermissionPlayer(String name) {
         OfflinePlayer player = Bukkit.getOfflinePlayer(name);
-        if(permissionVault == null || player == null || !player.hasPlayedBefore())
+        if (permissionVault == null || player == null || !player.hasPlayedBefore())
             return permission -> false;
 
         return permission -> permissionVault.apply(player, permission);

bungee/src/main/java/me/leoko/advancedban/bungee/BungeeMethods.java

@@ -178,8 +178,8 @@ public File getDataFolder() {
     }
 
     @Override
-    public void setCommandExecutor(String cmd, TabCompleter tabCompleter) {
-        ProxyServer.getInstance().getPluginManager().registerCommand(getPlugin(), new CommandReceiverBungee(cmd));
+    public void setCommandExecutor(String cmd, String permission, TabCompleter tabCompleter) {
+        ProxyServer.getInstance().getPluginManager().registerCommand(getPlugin(), new CommandReceiverBungee(cmd, permission));
     }
 
     @SuppressWarnings("deprecation")

bungee/src/main/java/me/leoko/advancedban/bungee/listener/CommandReceiverBungee.java

@@ -11,8 +11,12 @@
 
 public class CommandReceiverBungee extends Command {
 
-    public CommandReceiverBungee(String name) {
-        super(name);
+    /**
+     * @param name       name of the command
+     * @param permission permission required to use the command. May be null
+     */
+    public CommandReceiverBungee(String name, String permission) {
+        super(name, permission);
     }
 
     @Override

core/src/main/java/me/leoko/advancedban/MethodInterface.java

@@ -92,7 +92,7 @@ public interface MethodInterface {
      * @param cmd the cmd
      * @param tabCompleter behaviour when tab completion is triggered
      */
-    void setCommandExecutor(String cmd, TabCompleter tabCompleter);
+    void setCommandExecutor(String cmd, String permission, TabCompleter tabCompleter);
 
     /**
      * Send a message to a specific player.

core/src/main/java/me/leoko/advancedban/Universal.java

@@ -80,7 +80,7 @@ public void setup(MethodInterface mi) {
 
         for (Command command : Command.values()) {
             for (String commandName : command.getNames()) {
-                mi.setCommandExecutor(commandName, command.getTabCompleter());
+                mi.setCommandExecutor(commandName, command.getPermission(), command.getTabCompleter());
             }
         }
 

core/src/test/java/me/leoko/advancedban/TestMethods.java

@@ -87,7 +87,7 @@ public File getDataFolder() {
     }
 
     @Override
-    public void setCommandExecutor(String cmd, TabCompleter tabCompleter) {
+    public void setCommandExecutor(String cmd, String permission, TabCompleter tabCompleter) {
         //Command executors are not being registered for testing
     }