diff --git a/core/src/main/java/co/aikar/commands/BaseCommand.java b/core/src/main/java/co/aikar/commands/BaseCommand.java index 2996f2c2..e63b2b42 100644 --- a/core/src/main/java/co/aikar/commands/BaseCommand.java +++ b/core/src/main/java/co/aikar/commands/BaseCommand.java @@ -308,7 +308,7 @@ public abstract class BaseCommand { } public void execute(CommandIssuer sender, String commandLabel, String[] args) { - if (!this.testPermission(sender)) { + if (!this.hasPermission(sender)) { sender.sendMessage(permissionMessage); return; } @@ -428,7 +428,7 @@ public abstract class BaseCommand { } private List completeCommand(CommandIssuer sender, RegisteredCommand cmd, String[] args, String commandLabel) { - if (!this.testPermission(sender) || !cmd.hasPermission(sender) || args.length > cmd.requiredResolvers + cmd.optionalResolvers || args.length == 0 + if (!this.hasPermission(sender) || !cmd.hasPermission(sender) || args.length > cmd.requiredResolvers + cmd.optionalResolvers || args.length == 0 || cmd.complete == null) { return ImmutableList.of(); } @@ -494,11 +494,11 @@ public abstract class BaseCommand { sender.sendMessage("&cUsage: /" + cmd.command + " " + cmd.syntaxText); } - public boolean testPermission(Object sender) { - return testPermission(manager.getCommandIssuer(sender)); + public boolean hasPermission(Object sender) { + return hasPermission(manager.getCommandIssuer(sender)); } - public boolean testPermission(CommandIssuer sender) { + public boolean hasPermission(CommandIssuer sender) { return permission == null || permission.isEmpty() || sender.hasPermission(permission); } diff --git a/core/src/main/java/co/aikar/commands/ForwardingCommand.java b/core/src/main/java/co/aikar/commands/ForwardingCommand.java index c90152ae..5a0f8922 100644 --- a/core/src/main/java/co/aikar/commands/ForwardingCommand.java +++ b/core/src/main/java/co/aikar/commands/ForwardingCommand.java @@ -38,8 +38,8 @@ public class ForwardingCommand extends BaseCommand { } @Override - public boolean testPermission(CommandIssuer sender) { - return command.testPermission(sender); + public boolean hasPermission(CommandIssuer sender) { + return command.hasPermission(sender); } @Override diff --git a/sponge/src/main/java/co/aikar/commands/SpongeRootCommand.java b/sponge/src/main/java/co/aikar/commands/SpongeRootCommand.java index 79806bb7..d66014c8 100644 --- a/sponge/src/main/java/co/aikar/commands/SpongeRootCommand.java +++ b/sponge/src/main/java/co/aikar/commands/SpongeRootCommand.java @@ -26,7 +26,6 @@ package co.aikar.commands; import co.aikar.commands.apachecommonslang.ApacheCommonsLangUtil; import org.spongepowered.api.command.CommandCallable; import org.spongepowered.api.command.CommandException; -import org.spongepowered.api.command.CommandMapping; import org.spongepowered.api.command.CommandResult; import org.spongepowered.api.command.CommandSource; import org.spongepowered.api.text.Text; @@ -72,7 +71,7 @@ public class SpongeRootCommand implements CommandCallable, RootCommand { @Override public boolean testPermission(CommandSource source) { - return this.defCommand.testPermission(source); + return this.defCommand.hasPermission(source); } @Override