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

Fix some bugs with RegisteredCommand

Browse Source
This commit is contained in:
Aikar
2019-03-26 17:50:07 -04:00
parent 8f58676213
commit 07d5fa671c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/co/aikar/commands/RegisteredCommand.java
+7 -5
View File
@@ -150,8 +150,9 @@ public class RegisteredCommand<CEC extends CommandExecutionContext<CEC, ? extend
method.invoke(scope, passedArgs.values().toArray());
} catch (Exception e) {
handleException(sender, args, e);
} finally {
postCommand();
}
postCommand();
}
public void preCommand() {
@@ -232,11 +233,12 @@ public class RegisteredCommand<CEC extends CommandExecutionContext<CEC, ? extend
if (allowOptional && parameter.getDefaultValue() != null) {
args.add(parameter.getDefaultValue());
} else if (allowOptional && parameter.isOptional()) {
if (!this.manager.hasPermission(sender, parameterPermissions)) {
sender.sendMessage(MessageType.ERROR, MessageKeys.PERMISSION_DENIED_PARAMETER, "{param}", parameterName);
throw new InvalidCommandArgument(false);
Object value;
if (!parameter.isOptionalResolver() || !this.manager.hasPermission(sender, parameterPermissions)) {
value = null;
} else {
value = resolver.getContext(context);
}
Object value = parameter.isOptionalResolver() ? resolver.getContext(context) : null;
if (value == null && parameter.getClass().isPrimitive()) {
throw new IllegalStateException("Parameter " + parameter.getName() + " is primitive and does not support Optional.");