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

Fix Optional parameters being resolved (#51)

Browse Source
This commit is contained in:
William Braecky
2017-06-22 15:27:29 +02:00
committed by Daniel Ennis
parent 6c374c78c2
commit 17996955e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/RegisteredCommand.java
+5 -1
View File
@@ -126,6 +126,10 @@ public class RegisteredCommand <R extends CommandExecutionContext<? extends Comm
|| parameter.getAnnotation(Default.class) != null;
}
private boolean isSenderAwareResolver(ContextResolver<?, R> resolver) {
return resolver instanceof IssuerAwareContextResolver || resolver instanceof IssuerOnlyContextResolver;
}
void invoke(CommandIssuer sender, List<String> args) {
if (!scope.canExecute(sender, this)) {
return;
@@ -193,7 +197,7 @@ public class RegisteredCommand <R extends CommandExecutionContext<? extends Comm
if (allowOptional && def != null) {
args.add(scope.manager.getCommandReplacements().replace(def.value()));
} else if (allowOptional && opt != null) {
passedArgs.put(parameterName, isOptionalResolver ? resolver.getContext(context) : null);
passedArgs.put(parameterName, isSenderAwareResolver(resolver) ? resolver.getContext(context) : null);
//noinspection UnnecessaryContinue
continue;
} else if (!isOptionalResolver) {