Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make testPermission correctly check WEPIF/whatevermethodthecommandsmanagerisusing for permissions in the command

Browse Source
This commit is contained in:
zml2008 2012-04-19 21:45:32 -07:00
parent b938aa0be3
commit 0cb0358bd2
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java
View File

@ -19,7 +19,10 @@
package com.sk89q.bukkit.util; package com.sk89q.bukkit.util;
import com.sk89q.minecraft.util.commands.CommandsManager;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.command.PluginIdentifiableCommand;
@ -72,4 +75,31 @@ public class DynamicPluginCommand extends org.bukkit.command.Command implements
public Plugin getPlugin() { public Plugin getPlugin() {
return owningPlugin; 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);
}
} }