From 0cb0358bd2cc364a212dfed5fb5ab98b7af1f6c0 Mon Sep 17 00:00:00 2001 From: zml2008 Date: Thu, 19 Apr 2012 21:45:32 -0700 Subject: [PATCH] Make testPermission correctly check WEPIF/whatevermethodthecommandsmanagerisusing for permissions in the command --- .../bukkit/util/DynamicPluginCommand.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java b/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java index ae81710ce..7140302fe 100644 --- a/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java +++ b/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java @@ -19,7 +19,10 @@ package com.sk89q.bukkit.util; +import com.sk89q.minecraft.util.commands.CommandsManager; import com.sk89q.util.StringUtil; +import com.sk89q.wepif.PermissionsResolverManager; +import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.command.PluginIdentifiableCommand; @@ -72,4 +75,31 @@ public class DynamicPluginCommand extends org.bukkit.command.Command implements public Plugin getPlugin() { return owningPlugin; } + + @Override + public boolean testPermissionSilent(CommandSender sender) { + if (permissions == null || permissions.length == 0) { + return true; + } + + if (registeredWith instanceof CommandsManager) { + try { + for (String permission : permissions) { + if (((CommandsManager) registeredWith).hasPermission(sender, permission)) { + return true; + } + } + return false; + } catch (Throwable ignore) { + } + } else if (PermissionsResolverManager.isInitialized() && sender instanceof OfflinePlayer) { + for (String permission : permissions) { + if (PermissionsResolverManager.getInstance().hasPermission((OfflinePlayer) sender, permission)) { + return true; + } + } + return false; + } + return super.testPermissionSilent(sender); + } }