funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-06-25 16:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename testPermission to hasPermission

Browse Source
This commit is contained in:
Aikar
2017-06-07 23:51:42 -04:00
parent 5d3678b1b1
commit bd19a78ec1
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/BaseCommand.java
+5 -5
View File
@@ -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<String> 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);
}
core/src/main/java/co/aikar/commands/ForwardingCommand.java
+2 -2
View File
@@ -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
sponge/src/main/java/co/aikar/commands/SpongeRootCommand.java
+1 -2
View File
@@ -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