diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java index c02f8f9c..1cb09468 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/compound/FlagArgument.java @@ -218,7 +218,7 @@ public final class FlagArgument extends CommandArgument { final List strings = new LinkedList<>(); /* Recommend "primary" flags */ for (final CommandFlag flag : this.flags) { - if (usedFlags.contains(flag) || !commandContext.hasPermission(flag.getCommandPermission())) { + if (usedFlags.contains(flag) || !commandContext.hasPermission(flag.permission())) { continue; } strings.add( @@ -231,7 +231,7 @@ public final class FlagArgument extends CommandArgument { /* Recommend aliases */ final boolean suggestCombined = input.length() > 1 && input.charAt(0) == '-' && input.charAt(1) != '-'; for (final CommandFlag flag : this.flags) { - if (usedFlags.contains(flag) || !commandContext.hasPermission(flag.getCommandPermission())) { + if (usedFlags.contains(flag) || !commandContext.hasPermission(flag.permission())) { continue; } for (final String alias : flag.getAliases()) { @@ -280,7 +280,7 @@ public final class FlagArgument extends CommandArgument { } } if (currentFlag != null - && commandContext.hasPermission(currentFlag.getCommandPermission()) + && commandContext.hasPermission(currentFlag.permission()) && currentFlag.getCommandArgument() != null) { return (List) ((BiFunction) currentFlag.getCommandArgument().getSuggestionsProvider()) .apply(commandContext, input); @@ -355,7 +355,7 @@ public final class FlagArgument extends CommandArgument { FailureReason.DUPLICATE_FLAG, commandContext )); - } else if (!commandContext.hasPermission(flag.getCommandPermission())) { + } else if (!commandContext.hasPermission(flag.permission())) { return ArgumentParseResult.failure(new FlagParseException( string, FailureReason.NO_PERMISSION, @@ -402,7 +402,7 @@ public final class FlagArgument extends CommandArgument { FailureReason.DUPLICATE_FLAG, commandContext )); - } else if (!commandContext.hasPermission(currentFlag.getCommandPermission())) { + } else if (!commandContext.hasPermission(currentFlag.permission())) { return ArgumentParseResult.failure(new FlagParseException( string, FailureReason.NO_PERMISSION, diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java index b7a0111b..74d75f24 100644 --- a/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java +++ b/cloud-core/src/main/java/cloud/commandframework/arguments/flags/CommandFlag.java @@ -97,7 +97,6 @@ public final class CommandFlag { /** * Get the flag description - *

* * @return Flag description * @deprecated for removal since 1.4.0. Use {@link #getArgumentDescription()} instead. @@ -131,12 +130,12 @@ public final class CommandFlag { } /** - * Get the command permission, if it exists + * Get the permission required to use this flag, if it exists * * @return Command permission, or {@code null} * @since 1.6.0 */ - public CommandPermission getCommandPermission() { + public CommandPermission permission() { return this.permission; }