Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Correct order of permission checking for the root command.

Browse Source
This commit is contained in:
asofold 2013-06-12 01:08:10 +02:00
parent ae2d6142d9
commit 00696c1624
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NCPCore/src/main/java/fr/neatmonster/nocheatplus/command/NoCheatPlusCommand.java
View File

@ -134,17 +134,26 @@ public class NoCheatPlusCommand extends BaseCommand{
final boolean protectPlugins = ConfigManager.getConfigFile().getBoolean(ConfPaths.MISCELLANEOUS_PROTECTPLUGINS);
if (args.length > 0){
AbstractCommand<?> subCommand = subCommands.get(args[0].trim().toLowerCase());
if (subCommand != null && sender.hasPermission(subCommand.permission)){
// Sender has permission to run the command.
return subCommand.onCommand(sender, command, commandLabel, args);
// Bit crude workaround.
// TODO: Replace this by checking a permission set as child permission of each and every child command.
boolean hasSomePermission = false;
for (AbstractCommand<?> cmd : subCommands.values()){
if (sender.hasPermission(cmd.permission)){
hasSomePermission = true;
}
}
// Bit crude workaround. TODO: Add chuld permission to commands permissions and check that one.
for (AbstractCommand<?> cmd : subCommands.values()){
if (sender.hasPermission(cmd.permission)) return false;
if (hasSomePermission){
// Check sub-commands.
if (args.length > 0){
AbstractCommand<?> subCommand = subCommands.get(args[0].trim().toLowerCase());
if (subCommand != null && sender.hasPermission(subCommand.permission)){
// Sender has permission to run the command.
return subCommand.onCommand(sender, command, commandLabel, args);
}
}
// No sub command worked, print usage.
return false;
}
if (protectPlugins){