From 07d5fa671ca8af777a1b8b724bdc8563ab9351d7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 26 Mar 2019 17:50:07 -0400
Subject: [PATCH] Fix some bugs with RegisteredCommand

---
 .../java/co/aikar/commands/RegisteredCommand.java    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
index f2cd93cc..e0f0d3fe 100644
--- a/core/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -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.");