Removing badonothing, in favor of an argument on bareload

Ne0nx3r0 · Feb 6, 2013 · d4ae745 · d4ae745
1 parent 58cb889
commit d4ae745
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/com/ne0nx3r0/betteralias/BetterAlias.java b/com/ne0nx3r0/betteralias/BetterAlias.java
@@ -20,8 +20,5 @@ public void onEnable()
         BetterAliasCommandExecutor betterAliasCommandExecutor = new BetterAliasCommandExecutor(this);
 
         this.getCommand("bareload").setExecutor(betterAliasCommandExecutor);
-
-        //Filler command to null things to since console commands are not cancellable
-        this.getCommand("badonothing").setExecutor(betterAliasCommandExecutor);
     }
 }
diff --git a/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java b/com/ne0nx3r0/betteralias/listener/BetterAliasCommandListener.java
@@ -71,7 +71,7 @@ public void onConsoleCommand(ServerCommandEvent e)
         {
             if(plugin.aliasManager.sendAliasCommands(alias,e.getSender(),sCommand))
             {
-                e.setCommand("badonothing");
+                e.setCommand("bareload donothing");
             }
         }
     }

diff --git a/com/ne0nx3r0/betteralias/listener/command/BetterAliasCommandExecutor.java b/com/ne0nx3r0/betteralias/listener/command/BetterAliasCommandExecutor.java
@@ -17,14 +17,16 @@ public BetterAliasCommandExecutor(BetterAlias plugin)
 
     @Override
     public boolean onCommand(CommandSender cs, Command cmnd, String alias, String[] args)
-    {
-        if(cmnd.getName().equalsIgnoreCase("badonothing"))
+    {   
+        // To allow nulling server commands out
+        if(args.length == 1 && args[0].equalsIgnoreCase("donothing"))
         {
             return true;
         }
 
         if(cs.hasPermission("BetterAlias.reload") || cs.isOp())
         {
+
             cs.sendMessage(ChatColor.GOLD+"Reloading aliases...");
 
             if(plugin.aliasManager.loadAliases())

diff --git a/plugin.yml b/plugin.yml
@@ -5,9 +5,7 @@ database: false
 description: Command alias system
 commands:
    bareload:
-      description: Reloads the aliases.yml file   
-   badonothing:
-      description: Filler command, since console commands are not cancellable
+      description: Reloads the aliases.yml file
 permissions:
     BetterAlias.reload:
       description: Allows reloading BetterAlias
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ public void onConsoleCommand(ServerCommandEvent e) @@
             {
                 if(plugin.aliasManager.sendAliasCommands(alias,e.getSender(),sCommand))
                 {
-                    e.setCommand("badonothing");
+                    e.setCommand("bareload donothing");
                 }
             }
         }
@@ Expand Down @@