From 91802f0e551b7287303f60eb052b635f404cf758 Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Sun, 10 Jul 2011 14:23:44 -0600
Subject: [PATCH] Move the filtering of commands out of the Handler

---
 lib/commandhandler                                        | 2 +-
 .../MultiverseCore/command/commands/HelpCommand.java      | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/commandhandler b/lib/commandhandler
index a7cbc0f0..b555fd75 160000
--- a/lib/commandhandler
+++ b/lib/commandhandler
@@ -1 +1 @@
-Subproject commit a7cbc0f047c8ef06216ea45e1966e0c0914f2658
+Subproject commit b555fd75d72ded08ae4f78e014ff3ed73759ac06
diff --git a/src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java
index 8f29d197..fbd1e5e7 100644
--- a/src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java
+++ b/src/com/onarandombox/MultiverseCore/command/commands/HelpCommand.java
@@ -1,6 +1,7 @@
 // This file is no longer licensed under that silly CC license. I have blanked it out and will start implementaiton of my own in a few days. For now there is no help.
 package com.onarandombox.MultiverseCore.command.commands;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.bukkit.ChatColor;
@@ -38,7 +39,12 @@ public class HelpCommand extends Command {
             }
         }
 
-        List<Command> availableCommands = ((MultiverseCore) this.plugin).getCommandHandler().getCommands(sender);
+        List<Command> availableCommands = new ArrayList<Command> (((MultiverseCore) this.plugin).getCommandHandler().getAllCommands());
+        for(Command c : availableCommands) {
+            if(!((MultiverseCore) this.plugin).getPermissions().hasPermission(sender, c.getPermission(), c.isOpRequired())) {
+                availableCommands.remove(c);
+            }
+        }
         int totalPages = (int) Math.ceil(availableCommands.size() / ( CMDS_PER_PAGE + 0.0));
 
         if (page > totalPages) {