From 8bce24bb61fb50419dced7197382d1b738cc806f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Mon, 12 Dec 2011 19:26:00 +0100 Subject: [PATCH] Added isVisibleTo --- src/com/massivecraft/mcore1/cmd/MCommand.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/massivecraft/mcore1/cmd/MCommand.java b/src/com/massivecraft/mcore1/cmd/MCommand.java index f56e7783..dc130f7a 100644 --- a/src/com/massivecraft/mcore1/cmd/MCommand.java +++ b/src/com/massivecraft/mcore1/cmd/MCommand.java @@ -186,8 +186,6 @@ public abstract class MCommand if ( ! validCall(this.sender, this.args)) return; - if ( ! this.isEnabled()) return; - perform(); } @@ -222,9 +220,11 @@ public abstract class MCommand return true; } - public boolean isEnabled() + public boolean visibleTo(CommandSender sender) { - return true; + if (this.getVisibilityMode() == VisibilityMode.VISIBLE) return true; + if (this.getVisibilityMode() == VisibilityMode.INVISIBLE) return false; + return this.requirementsAreMet(sender, false); } public boolean requirementsAreMet(CommandSender sender, boolean informSenderIfNot)