diff --git a/docs/acf-bukkit/co/aikar/commands/BukkitRegisteredCommand.html b/docs/acf-bukkit/co/aikar/commands/BukkitRegisteredCommand.html
index 34f41b1e..22ce5735 100644
--- a/docs/acf-bukkit/co/aikar/commands/BukkitRegisteredCommand.html
+++ b/docs/acf-bukkit/co/aikar/commands/BukkitRegisteredCommand.html
@@ -162,7 +162,7 @@ extends co.aikar.commands.RegisteredCommand&lt;<a href="../../../co/aikar/comman
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;co.aikar.commands.RegisteredCommand</h3>
-<code>addSubcommand, addSubcommands, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
+<code>addSubcommand, addSubcommands, getAnnotation, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/acf-bungee/co/aikar/commands/BungeeRegisteredCommand.html b/docs/acf-bungee/co/aikar/commands/BungeeRegisteredCommand.html
index e4e4492a..6f1e64a0 100644
--- a/docs/acf-bungee/co/aikar/commands/BungeeRegisteredCommand.html
+++ b/docs/acf-bungee/co/aikar/commands/BungeeRegisteredCommand.html
@@ -162,7 +162,7 @@ extends co.aikar.commands.RegisteredCommand&lt;<a href="../../../co/aikar/comman
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;co.aikar.commands.RegisteredCommand</h3>
-<code>addSubcommand, addSubcommands, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
+<code>addSubcommand, addSubcommands, getAnnotation, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/docs/acf-core/co/aikar/commands/RegisteredCommand.html b/docs/acf-core/co/aikar/commands/RegisteredCommand.html
index f73986f0..14c503ed 100644
--- a/docs/acf-core/co/aikar/commands/RegisteredCommand.html
+++ b/docs/acf-core/co/aikar/commands/RegisteredCommand.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":42,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":42,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -108,7 +108,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.51">RegisteredCommand</a>&lt;CEC extends <a href="../../../co/aikar/commands/CommandExecutionContext.html" title="class in co.aikar.commands">CommandExecutionContext</a>&lt;CEC,? extends <a href="../../../co/aikar/commands/CommandIssuer.html" title="interface in co.aikar.commands">CommandIssuer</a>&gt;&gt;
+<pre>public class <a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.52">RegisteredCommand</a>&lt;CEC extends <a href="../../../co/aikar/commands/CommandExecutionContext.html" title="class in co.aikar.commands">CommandExecutionContext</a>&lt;CEC,? extends <a href="../../../co/aikar/commands/CommandIssuer.html" title="interface in co.aikar.commands">CommandIssuer</a>&gt;&gt;
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -156,44 +156,48 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#addSubcommands-java.util.Collection-">addSubcommands</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;cmd)</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getCommand--">getCommand</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>&lt;T extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>&gt;<br>T</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getAnnotation-java.lang.Class-">getAnnotation</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;annotation)</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getHelpText--">getHelpText</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getCommand--">getCommand</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getHelpText--">getHelpText</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getPermission--">getPermission</a></span>()</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;&nbsp;</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getPrefSubCommand--">getPrefSubCommand</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getRequiredPermissions--">getRequiredPermissions</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#getSyntaxText--">getSyntaxText</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#isPrivate--">isPrivate</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#postCommand--">postCommand</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#preCommand--">preCommand</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../co/aikar/commands/RegisteredCommand.html#requiresPermission-java.lang.String-">requiresPermission</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;permission)</code>&nbsp;</td>
 </tr>
@@ -225,7 +229,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>helpSearchTags</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.65">helpSearchTags</a></pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.66">helpSearchTags</a></pre>
 </li>
 </ul>
 </li>
@@ -242,7 +246,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>preCommand</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.156">preCommand</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.157">preCommand</a>()</pre>
 </li>
 </ul>
 <a name="postCommand--">
@@ -251,7 +255,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>postCommand</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.159">postCommand</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.160">postCommand</a>()</pre>
 </li>
 </ul>
 <a name="getPermission--">
@@ -261,7 +265,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <li class="blockList">
 <h4>getPermission</h4>
 <pre><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Deprecated.html?is-external=true" title="class or interface in java.lang">@Deprecated</a>
-public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.284">getPermission</a>()</pre>
+public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.285">getPermission</a>()</pre>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -275,7 +279,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>getRequiredPermissions</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.299">getRequiredPermissions</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.300">getRequiredPermissions</a>()</pre>
 </li>
 </ul>
 <a name="requiresPermission-java.lang.String-">
@@ -284,7 +288,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>requiresPermission</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.303">requiresPermission</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;permission)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.304">requiresPermission</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;permission)</pre>
 </li>
 </ul>
 <a name="getPrefSubCommand--">
@@ -293,7 +297,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>getPrefSubCommand</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.307">getPrefSubCommand</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.308">getPrefSubCommand</a>()</pre>
 </li>
 </ul>
 <a name="getSyntaxText--">
@@ -302,7 +306,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>getSyntaxText</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.311">getSyntaxText</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.312">getSyntaxText</a>()</pre>
 </li>
 </ul>
 <a name="getHelpText--">
@@ -311,7 +315,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>getHelpText</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.315">getHelpText</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.316">getHelpText</a>()</pre>
 </li>
 </ul>
 <a name="isPrivate--">
@@ -320,7 +324,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>isPrivate</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.319">isPrivate</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.320">isPrivate</a>()</pre>
 </li>
 </ul>
 <a name="getCommand--">
@@ -329,7 +333,7 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>getCommand</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.323">getCommand</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.324">getCommand</a>()</pre>
 </li>
 </ul>
 <a name="addSubcommand-java.lang.String-">
@@ -338,16 +342,25 @@ public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.
 <ul class="blockList">
 <li class="blockList">
 <h4>addSubcommand</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.327">addSubcommand</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;cmd)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.328">addSubcommand</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;cmd)</pre>
 </li>
 </ul>
 <a name="addSubcommands-java.util.Collection-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>addSubcommands</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.331">addSubcommands</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;cmd)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.332">addSubcommands</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&gt;&nbsp;cmd)</pre>
+</li>
+</ul>
+<a name="getAnnotation-java.lang.Class-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAnnotation</h4>
+<pre>public&nbsp;&lt;T extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/annotation/Annotation.html?is-external=true" title="class or interface in java.lang.annotation">Annotation</a>&gt;&nbsp;T&nbsp;<a href="../../../src-html/co/aikar/commands/RegisteredCommand.html#line.336">getAnnotation</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html?is-external=true" title="class or interface in java.lang">Class</a>&lt;T&gt;&nbsp;annotation)</pre>
 </li>
 </ul>
 </li>
diff --git a/docs/acf-core/index-all.html b/docs/acf-core/index-all.html
index 26771837..67de3bc2 100644
--- a/docs/acf-core/index-all.html
+++ b/docs/acf-core/index-all.html
@@ -496,6 +496,8 @@
 <div class="block"><span class="deprecationComment">Use <a href="co/aikar/commands/CommandOperationContext.html#getAnnotationValue-java.lang.Class-"><code>CommandOperationContext.getAnnotationValue(Class)</code></a></span></div>
 </div>
 </dd>
+<dt><span class="memberNameLink"><a href="co/aikar/commands/RegisteredCommand.html#getAnnotation-java.lang.Class-">getAnnotation(Class&lt;T&gt;)</a></span> - Method in class co.aikar.commands.<a href="co/aikar/commands/RegisteredCommand.html" title="class in co.aikar.commands">RegisteredCommand</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="co/aikar/commands/CommandExecutionContext.html#getAnnotationValue-java.lang.Class-">getAnnotationValue(Class&lt;T&gt;)</a></span> - Method in class co.aikar.commands.<a href="co/aikar/commands/CommandExecutionContext.html" title="class in co.aikar.commands">CommandExecutionContext</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="co/aikar/commands/CommandExecutionContext.html#getAnnotationValue-java.lang.Class-int-">getAnnotationValue(Class&lt;T&gt;, int)</a></span> - Method in class co.aikar.commands.<a href="co/aikar/commands/CommandExecutionContext.html" title="class in co.aikar.commands">CommandExecutionContext</a></dt>
diff --git a/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html b/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
index 3d695a37..ec164034 100644
--- a/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
+++ b/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
@@ -42,304 +42,309 @@
 <span class="sourceLineNo">034</span>import co.aikar.commands.contexts.ContextResolver;<a name="line.34"></a>
 <span class="sourceLineNo">035</span>import org.jetbrains.annotations.Nullable;<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>import java.lang.reflect.InvocationTargetException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import java.lang.reflect.Method;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import java.lang.reflect.Parameter;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import java.util.ArrayList;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import java.util.Arrays;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import java.util.Collection;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import java.util.HashSet;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import java.util.LinkedHashMap;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import java.util.List;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import java.util.Map;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import java.util.Set;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import java.util.stream.Collectors;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>@SuppressWarnings("WeakerAccess")<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public class RegisteredCommand&lt;CEC extends CommandExecutionContext&lt;CEC, ? extends CommandIssuer&gt;&gt; {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    final BaseCommand scope;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    final Method method;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    final CommandParameter&lt;CEC&gt;[] parameters;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    final CommandManager manager;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    final List&lt;String&gt; registeredSubcommands = new ArrayList&lt;&gt;();<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>    String command;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    String prefSubCommand;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    String syntaxText;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    String helpText;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    String permission;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    String complete;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    String conditions;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    public String helpSearchTags;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>    boolean isPrivate;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    final int requiredResolvers;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    final int consumeInputResolvers;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    final int doesNotConsumeInputResolvers;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    final int optionalResolvers;<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    final Set&lt;String&gt; permissions = new HashSet&lt;&gt;();<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>    RegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        this.scope = scope;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        this.manager = this.scope.manager;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>        final Annotations annotations = this.manager.getAnnotations();<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>        if (BaseCommand.CATCHUNKNOWN.equals(prefSubCommand) || BaseCommand.DEFAULT.equals(prefSubCommand)) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>            prefSubCommand = "";<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            command = command.trim();<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        }<a name="line.84"></a>
-<span class="sourceLineNo">085</span>        this.command = command + (!annotations.hasAnnotation(method, CommandAlias.class, false) &amp;&amp; !prefSubCommand.isEmpty() ? prefSubCommand : "");<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        this.method = method;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        this.prefSubCommand = prefSubCommand;<a name="line.87"></a>
-<span class="sourceLineNo">088</span><a name="line.88"></a>
-<span class="sourceLineNo">089</span>        this.permission = annotations.getAnnotationValue(method, CommandPermission.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        this.complete = annotations.getAnnotationValue(method, CommandCompletion.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        this.helpText = annotations.getAnnotationValue(method, Description.class, Annotations.REPLACEMENTS | Annotations.DEFAULT_EMPTY);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>        this.conditions = annotations.getAnnotationValue(method, Conditions.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        this.helpSearchTags = annotations.getAnnotationValue(method, HelpSearchTags.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>        Parameter[] parameters = method.getParameters();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        //noinspection unchecked<a name="line.96"></a>
-<span class="sourceLineNo">097</span>        this.parameters = new CommandParameter[parameters.length];<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>        this.isPrivate = annotations.hasAnnotation(method, Private.class);<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>        int requiredResolvers = 0;<a name="line.101"></a>
-<span class="sourceLineNo">102</span>        int consumeInputResolvers = 0;<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        int doesNotConsumeInputResolvers = 0;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        int optionalResolvers = 0;<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        StringBuilder syntaxBuilder = new StringBuilder(64);<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>        for (int i = 0; i &lt; parameters.length; i++) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>            CommandParameter&lt;CEC&gt; parameter = this.parameters[i] = new CommandParameter&lt;&gt;(this, parameters[i], i);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>            if (!parameter.isCommandIssuer()) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>                if (!parameter.requiresInput()) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                    optionalResolvers++;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>                } else {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>                    requiredResolvers++;<a name="line.113"></a>
-<span class="sourceLineNo">114</span>                }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>                if (parameter.canConsumeInput()) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>                    consumeInputResolvers++;<a name="line.116"></a>
-<span class="sourceLineNo">117</span>                } else {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>                    doesNotConsumeInputResolvers++;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>                }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>            }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            if (parameter.getSyntax() != null) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>                if (syntaxBuilder.length() &gt; 0) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>                    syntaxBuilder.append(' ');<a name="line.123"></a>
-<span class="sourceLineNo">124</span>                }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>                syntaxBuilder.append(parameter.getSyntax());<a name="line.125"></a>
-<span class="sourceLineNo">126</span>            }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        String syntaxText = syntaxBuilder.toString().trim();<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        final String syntaxStr = annotations.getAnnotationValue(method, Syntax.class);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>        this.syntaxText = syntaxStr != null ? ACFUtil.replace(syntaxStr, "@syntax", syntaxText) : syntaxText;<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        this.requiredResolvers = requiredResolvers;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        this.consumeInputResolvers = consumeInputResolvers;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        this.doesNotConsumeInputResolvers = doesNotConsumeInputResolvers;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        this.optionalResolvers = optionalResolvers;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        this.computePermissions();<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">037</span>import java.lang.annotation.Annotation;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import java.lang.reflect.InvocationTargetException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.lang.reflect.Method;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import java.lang.reflect.Parameter;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import java.util.ArrayList;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import java.util.Arrays;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import java.util.Collection;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import java.util.HashSet;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import java.util.LinkedHashMap;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import java.util.List;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import java.util.Map;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import java.util.Set;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import java.util.stream.Collectors;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>@SuppressWarnings("WeakerAccess")<a name="line.51"></a>
+<span class="sourceLineNo">052</span>public class RegisteredCommand&lt;CEC extends CommandExecutionContext&lt;CEC, ? extends CommandIssuer&gt;&gt; {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    final BaseCommand scope;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    final Method method;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    final CommandParameter&lt;CEC&gt;[] parameters;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    final CommandManager manager;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    final List&lt;String&gt; registeredSubcommands = new ArrayList&lt;&gt;();<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>    String command;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    String prefSubCommand;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    String syntaxText;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    String helpText;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    String permission;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    String complete;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    String conditions;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    public String helpSearchTags;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    boolean isPrivate;<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    final int requiredResolvers;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    final int consumeInputResolvers;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    final int doesNotConsumeInputResolvers;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    final int optionalResolvers;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    final Set&lt;String&gt; permissions = new HashSet&lt;&gt;();<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>    RegisteredCommand(BaseCommand scope, String command, Method method, String prefSubCommand) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>        this.scope = scope;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        this.manager = this.scope.manager;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        final Annotations annotations = this.manager.getAnnotations();<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>        if (BaseCommand.CATCHUNKNOWN.equals(prefSubCommand) || BaseCommand.DEFAULT.equals(prefSubCommand)) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>            prefSubCommand = "";<a name="line.83"></a>
+<span class="sourceLineNo">084</span>            command = command.trim();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        }<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        this.command = command + (!annotations.hasAnnotation(method, CommandAlias.class, false) &amp;&amp; !prefSubCommand.isEmpty() ? prefSubCommand : "");<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        this.method = method;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        this.prefSubCommand = prefSubCommand;<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>        this.permission = annotations.getAnnotationValue(method, CommandPermission.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>        this.complete = annotations.getAnnotationValue(method, CommandCompletion.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        this.helpText = annotations.getAnnotationValue(method, Description.class, Annotations.REPLACEMENTS | Annotations.DEFAULT_EMPTY);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        this.conditions = annotations.getAnnotationValue(method, Conditions.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        this.helpSearchTags = annotations.getAnnotationValue(method, HelpSearchTags.class, Annotations.REPLACEMENTS | Annotations.NO_EMPTY);<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>        Parameter[] parameters = method.getParameters();<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        //noinspection unchecked<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        this.parameters = new CommandParameter[parameters.length];<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>        this.isPrivate = annotations.hasAnnotation(method, Private.class);<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>        int requiredResolvers = 0;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>        int consumeInputResolvers = 0;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        int doesNotConsumeInputResolvers = 0;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        int optionalResolvers = 0;<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        StringBuilder syntaxBuilder = new StringBuilder(64);<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>        for (int i = 0; i &lt; parameters.length; i++) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            CommandParameter&lt;CEC&gt; parameter = this.parameters[i] = new CommandParameter&lt;&gt;(this, parameters[i], i);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>            if (!parameter.isCommandIssuer()) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                if (!parameter.requiresInput()) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>                    optionalResolvers++;<a name="line.112"></a>
+<span class="sourceLineNo">113</span>                } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>                    requiredResolvers++;<a name="line.114"></a>
+<span class="sourceLineNo">115</span>                }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>                if (parameter.canConsumeInput()) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>                    consumeInputResolvers++;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>                } else {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>                    doesNotConsumeInputResolvers++;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>                }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>            }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            if (parameter.getSyntax() != null) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span>                if (syntaxBuilder.length() &gt; 0) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>                    syntaxBuilder.append(' ');<a name="line.124"></a>
+<span class="sourceLineNo">125</span>                }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>                syntaxBuilder.append(parameter.getSyntax());<a name="line.126"></a>
+<span class="sourceLineNo">127</span>            }<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        String syntaxText = syntaxBuilder.toString().trim();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        final String syntaxStr = annotations.getAnnotationValue(method, Syntax.class);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        this.syntaxText = syntaxStr != null ? ACFUtil.replace(syntaxStr, "@syntax", syntaxText) : syntaxText;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        this.requiredResolvers = requiredResolvers;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        this.consumeInputResolvers = consumeInputResolvers;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        this.doesNotConsumeInputResolvers = doesNotConsumeInputResolvers;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        this.optionalResolvers = optionalResolvers;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        this.computePermissions();<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
 <span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>    void invoke(CommandIssuer sender, List&lt;String&gt; args, CommandOperationContext context) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        if (!scope.canExecute(sender, this)) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>            return;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        preCommand();<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        try {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>            this.manager.conditions.validateConditions(context);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>            Map&lt;String, Object&gt; passedArgs = resolveContexts(sender, args);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>            if (passedArgs == null) return;<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>            method.invoke(scope, passedArgs.values().toArray());<a name="line.149"></a>
-<span class="sourceLineNo">150</span>        } catch (Exception e) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>            handleException(sender, args, e);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>        postCommand();<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>    public void preCommand() {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    public void postCommand() {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    void handleException(CommandIssuer sender, List&lt;String&gt; args, Exception e) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        if (e instanceof InvocationTargetException &amp;&amp; e.getCause() instanceof InvalidCommandArgument) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>            e = (Exception) e.getCause();<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        if (e instanceof ShowCommandHelp) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>            ShowCommandHelp showHelp = (ShowCommandHelp) e;<a name="line.167"></a>
-<span class="sourceLineNo">168</span>            CommandHelp commandHelp = manager.generateCommandHelp();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>            if (showHelp.search) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>                commandHelp.setSearch(showHelp.searchArgs == null ? args : showHelp.searchArgs);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>            }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>            commandHelp.showHelp(sender);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        } else if (e instanceof InvalidCommandArgument) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>            InvalidCommandArgument invalidCommandArg = (InvalidCommandArgument) e;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>            if (invalidCommandArg.key != null) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>                sender.sendMessage(MessageType.ERROR, invalidCommandArg.key, invalidCommandArg.replacements);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>            } else if (e.getMessage() != null &amp;&amp; !e.getMessage().isEmpty()) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>                sender.sendMessage(MessageType.ERROR, MessageKeys.ERROR_PREFIX, "{message}", e.getMessage());<a name="line.178"></a>
-<span class="sourceLineNo">179</span>            }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>            if (invalidCommandArg.showSyntax) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>                scope.showSyntax(sender, this);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>            }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>        } else {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>            try {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>                if (!this.manager.handleUncaughtException(scope, this, sender, args, e)) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>                    sender.sendMessage(MessageType.ERROR, MessageKeys.ERROR_PERFORMING_COMMAND);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>                }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>                boolean hasExceptionHandler = this.manager.defaultExceptionHandler != null || this.scope.getExceptionHandler() != null;<a name="line.188"></a>
-<span class="sourceLineNo">189</span>                if (!hasExceptionHandler || this.manager.logUnhandledExceptions) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>                    this.manager.log(LogLevel.ERROR, "Exception in command: " + command + " " + ACFUtil.join(args), e);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>                }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>            } catch (Exception e2) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>                this.manager.log(LogLevel.ERROR, "Exception in handleException for command: " + command + " " + ACFUtil.join(args), e);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>                this.manager.log(LogLevel.ERROR, "Exception triggered by exception handler:", e2);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>        }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    @Nullable<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    Map&lt;String, Object&gt; resolveContexts(CommandIssuer sender, List&lt;String&gt; args) throws InvalidCommandArgument {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        return resolveContexts(sender, args, parameters.length);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>    @Nullable<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    Map&lt;String, Object&gt; resolveContexts(CommandIssuer sender, List&lt;String&gt; args, int argLimit) throws InvalidCommandArgument {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>        args = new ArrayList&lt;&gt;(args);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>        String[] origArgs = args.toArray(new String[args.size()]);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        Map&lt;String, Object&gt; passedArgs = new LinkedHashMap&lt;&gt;();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        int remainingRequired = requiredResolvers;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>        CommandOperationContext opContext = CommandManager.getCurrentCommandOperationContext();<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        for (int i = 0; i &lt; parameters.length &amp;&amp; i &lt; argLimit; i++) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>            boolean isLast = i == parameters.length - 1;<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            boolean allowOptional = remainingRequired == 0;<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            final CommandParameter&lt;CEC&gt; parameter = parameters[i];<a name="line.214"></a>
-<span class="sourceLineNo">215</span>            if (!parameter.canConsumeInput()) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>                argLimit++;<a name="line.216"></a>
-<span class="sourceLineNo">217</span>            }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>            final String parameterName = parameter.getName();<a name="line.218"></a>
-<span class="sourceLineNo">219</span>            final Class&lt;?&gt; type = parameter.getType();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>            //noinspection unchecked<a name="line.220"></a>
-<span class="sourceLineNo">221</span>            final ContextResolver&lt;?, CEC&gt; resolver = parameter.getResolver();<a name="line.221"></a>
-<span class="sourceLineNo">222</span>            //noinspection unchecked<a name="line.222"></a>
-<span class="sourceLineNo">223</span>            CEC context = (CEC) this.manager.createCommandContext(this, parameter, sender, args, i, passedArgs);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>            boolean requiresInput = parameter.requiresInput();<a name="line.224"></a>
-<span class="sourceLineNo">225</span>            if (requiresInput &amp;&amp; remainingRequired &gt; 0) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>                remainingRequired--;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>            }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>            if (args.isEmpty() &amp;&amp; !(isLast &amp;&amp; type == String[].class)) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span>                if (allowOptional &amp;&amp; parameter.getDefaultValue() != null) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span>                    args.add(parameter.getDefaultValue());<a name="line.230"></a>
-<span class="sourceLineNo">231</span>                } else if (allowOptional &amp;&amp; parameter.isOptional()) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>                    Object value = parameter.isOptionalResolver() ? resolver.getContext(context) : null;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>                    if (value == null &amp;&amp; parameter.getClass().isPrimitive()) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>                        throw new IllegalStateException("Parameter " + parameter.getName() + " is primitive and does not support Optional.");<a name="line.234"></a>
-<span class="sourceLineNo">235</span>                    }<a name="line.235"></a>
-<span class="sourceLineNo">236</span>                    //noinspection unchecked<a name="line.236"></a>
-<span class="sourceLineNo">237</span>                    this.manager.conditions.validateConditions(context, value);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>                    passedArgs.put(parameterName, value);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>                    //noinspection UnnecessaryContinue<a name="line.239"></a>
-<span class="sourceLineNo">240</span>                    continue;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>                } else if (requiresInput) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>                    scope.showSyntax(sender, this);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>                    return null;<a name="line.243"></a>
-<span class="sourceLineNo">244</span>                }<a name="line.244"></a>
-<span class="sourceLineNo">245</span>            }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>            if (parameter.getValues() != null) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>                String arg = !args.isEmpty() ? args.get(0) : "";<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>                Set&lt;String&gt; possible = new HashSet&lt;&gt;();<a name="line.249"></a>
-<span class="sourceLineNo">250</span>                CommandCompletions commandCompletions = this.manager.getCommandCompletions();<a name="line.250"></a>
-<span class="sourceLineNo">251</span>                for (String s : parameter.getValues()) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span>                    //noinspection unchecked<a name="line.252"></a>
-<span class="sourceLineNo">253</span>                    List&lt;String&gt; check = commandCompletions.getCompletionValues(this, sender, s, origArgs, opContext.isAsync());<a name="line.253"></a>
-<span class="sourceLineNo">254</span>                    if (!check.isEmpty()) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span>                        possible.addAll(check.stream().map(String::toLowerCase).collect(Collectors.toList()));<a name="line.255"></a>
-<span class="sourceLineNo">256</span>                    } else {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>                        possible.add(s.toLowerCase());<a name="line.257"></a>
-<span class="sourceLineNo">258</span>                    }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>                }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>                if (!possible.contains(arg.toLowerCase())) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span>                    throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_ONE_OF,<a name="line.262"></a>
-<span class="sourceLineNo">263</span>                            "{valid}", ACFUtil.join(possible, ", "));<a name="line.263"></a>
-<span class="sourceLineNo">264</span>                }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>            }<a name="line.265"></a>
-<span class="sourceLineNo">266</span>            Object paramValue = resolver.getContext(context);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>            //noinspection unchecked<a name="line.267"></a>
-<span class="sourceLineNo">268</span>            this.manager.conditions.validateConditions(context, paramValue);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>            passedArgs.put(parameterName, paramValue);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        }<a name="line.270"></a>
-<span class="sourceLineNo">271</span>        return passedArgs;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>    boolean hasPermission(CommandIssuer issuer) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>        return (permission == null || permission.isEmpty() || scope.manager.hasPermission(issuer, permission)) &amp;&amp; scope.hasPermission(issuer);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    void invoke(CommandIssuer sender, List&lt;String&gt; args, CommandOperationContext context) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        if (!scope.canExecute(sender, this)) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>            return;<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        }<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        preCommand();<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        try {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            this.manager.conditions.validateConditions(context);<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            Map&lt;String, Object&gt; passedArgs = resolveContexts(sender, args);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>            if (passedArgs == null) return;<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>            method.invoke(scope, passedArgs.values().toArray());<a name="line.150"></a>
+<span class="sourceLineNo">151</span>        } catch (Exception e) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>            handleException(sender, args, e);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        postCommand();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    public void preCommand() {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>    public void postCommand() {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>    void handleException(CommandIssuer sender, List&lt;String&gt; args, Exception e) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        if (e instanceof InvocationTargetException &amp;&amp; e.getCause() instanceof InvalidCommandArgument) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span>            e = (Exception) e.getCause();<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        if (e instanceof ShowCommandHelp) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>            ShowCommandHelp showHelp = (ShowCommandHelp) e;<a name="line.168"></a>
+<span class="sourceLineNo">169</span>            CommandHelp commandHelp = manager.generateCommandHelp();<a name="line.169"></a>
+<span class="sourceLineNo">170</span>            if (showHelp.search) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>                commandHelp.setSearch(showHelp.searchArgs == null ? args : showHelp.searchArgs);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>            }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>            commandHelp.showHelp(sender);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>        } else if (e instanceof InvalidCommandArgument) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>            InvalidCommandArgument invalidCommandArg = (InvalidCommandArgument) e;<a name="line.175"></a>
+<span class="sourceLineNo">176</span>            if (invalidCommandArg.key != null) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>                sender.sendMessage(MessageType.ERROR, invalidCommandArg.key, invalidCommandArg.replacements);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>            } else if (e.getMessage() != null &amp;&amp; !e.getMessage().isEmpty()) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>                sender.sendMessage(MessageType.ERROR, MessageKeys.ERROR_PREFIX, "{message}", e.getMessage());<a name="line.179"></a>
+<span class="sourceLineNo">180</span>            }<a name="line.180"></a>
+<span class="sourceLineNo">181</span>            if (invalidCommandArg.showSyntax) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>                scope.showSyntax(sender, this);<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            }<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        } else {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>            try {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>                if (!this.manager.handleUncaughtException(scope, this, sender, args, e)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>                    sender.sendMessage(MessageType.ERROR, MessageKeys.ERROR_PERFORMING_COMMAND);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>                }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>                boolean hasExceptionHandler = this.manager.defaultExceptionHandler != null || this.scope.getExceptionHandler() != null;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>                if (!hasExceptionHandler || this.manager.logUnhandledExceptions) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>                    this.manager.log(LogLevel.ERROR, "Exception in command: " + command + " " + ACFUtil.join(args), e);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>                }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>            } catch (Exception e2) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>                this.manager.log(LogLevel.ERROR, "Exception in handleException for command: " + command + " " + ACFUtil.join(args), e);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>                this.manager.log(LogLevel.ERROR, "Exception triggered by exception handler:", e2);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>            }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>    @Nullable<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    Map&lt;String, Object&gt; resolveContexts(CommandIssuer sender, List&lt;String&gt; args) throws InvalidCommandArgument {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        return resolveContexts(sender, args, parameters.length);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>    @Nullable<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    Map&lt;String, Object&gt; resolveContexts(CommandIssuer sender, List&lt;String&gt; args, int argLimit) throws InvalidCommandArgument {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        args = new ArrayList&lt;&gt;(args);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        String[] origArgs = args.toArray(new String[args.size()]);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>        Map&lt;String, Object&gt; passedArgs = new LinkedHashMap&lt;&gt;();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        int remainingRequired = requiredResolvers;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        CommandOperationContext opContext = CommandManager.getCurrentCommandOperationContext();<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        for (int i = 0; i &lt; parameters.length &amp;&amp; i &lt; argLimit; i++) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>            boolean isLast = i == parameters.length - 1;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            boolean allowOptional = remainingRequired == 0;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>            final CommandParameter&lt;CEC&gt; parameter = parameters[i];<a name="line.215"></a>
+<span class="sourceLineNo">216</span>            if (!parameter.canConsumeInput()) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>                argLimit++;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>            }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>            final String parameterName = parameter.getName();<a name="line.219"></a>
+<span class="sourceLineNo">220</span>            final Class&lt;?&gt; type = parameter.getType();<a name="line.220"></a>
+<span class="sourceLineNo">221</span>            //noinspection unchecked<a name="line.221"></a>
+<span class="sourceLineNo">222</span>            final ContextResolver&lt;?, CEC&gt; resolver = parameter.getResolver();<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            //noinspection unchecked<a name="line.223"></a>
+<span class="sourceLineNo">224</span>            CEC context = (CEC) this.manager.createCommandContext(this, parameter, sender, args, i, passedArgs);<a name="line.224"></a>
+<span class="sourceLineNo">225</span>            boolean requiresInput = parameter.requiresInput();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>            if (requiresInput &amp;&amp; remainingRequired &gt; 0) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>                remainingRequired--;<a name="line.227"></a>
+<span class="sourceLineNo">228</span>            }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>            if (args.isEmpty() &amp;&amp; !(isLast &amp;&amp; type == String[].class)) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>                if (allowOptional &amp;&amp; parameter.getDefaultValue() != null) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span>                    args.add(parameter.getDefaultValue());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>                } else if (allowOptional &amp;&amp; parameter.isOptional()) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>                    Object value = parameter.isOptionalResolver() ? resolver.getContext(context) : null;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>                    if (value == null &amp;&amp; parameter.getClass().isPrimitive()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>                        throw new IllegalStateException("Parameter " + parameter.getName() + " is primitive and does not support Optional.");<a name="line.235"></a>
+<span class="sourceLineNo">236</span>                    }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>                    //noinspection unchecked<a name="line.237"></a>
+<span class="sourceLineNo">238</span>                    this.manager.conditions.validateConditions(context, value);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>                    passedArgs.put(parameterName, value);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>                    //noinspection UnnecessaryContinue<a name="line.240"></a>
+<span class="sourceLineNo">241</span>                    continue;<a name="line.241"></a>
+<span class="sourceLineNo">242</span>                } else if (requiresInput) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>                    scope.showSyntax(sender, this);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>                    return null;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>                }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>            }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>            if (parameter.getValues() != null) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>                String arg = !args.isEmpty() ? args.get(0) : "";<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>                Set&lt;String&gt; possible = new HashSet&lt;&gt;();<a name="line.250"></a>
+<span class="sourceLineNo">251</span>                CommandCompletions commandCompletions = this.manager.getCommandCompletions();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>                for (String s : parameter.getValues()) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>                    //noinspection unchecked<a name="line.253"></a>
+<span class="sourceLineNo">254</span>                    List&lt;String&gt; check = commandCompletions.getCompletionValues(this, sender, s, origArgs, opContext.isAsync());<a name="line.254"></a>
+<span class="sourceLineNo">255</span>                    if (!check.isEmpty()) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>                        possible.addAll(check.stream().map(String::toLowerCase).collect(Collectors.toList()));<a name="line.256"></a>
+<span class="sourceLineNo">257</span>                    } else {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>                        possible.add(s.toLowerCase());<a name="line.258"></a>
+<span class="sourceLineNo">259</span>                    }<a name="line.259"></a>
+<span class="sourceLineNo">260</span>                }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>                if (!possible.contains(arg.toLowerCase())) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>                    throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_ONE_OF,<a name="line.263"></a>
+<span class="sourceLineNo">264</span>                            "{valid}", ACFUtil.join(possible, ", "));<a name="line.264"></a>
+<span class="sourceLineNo">265</span>                }<a name="line.265"></a>
+<span class="sourceLineNo">266</span>            }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>            Object paramValue = resolver.getContext(context);<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            //noinspection unchecked<a name="line.268"></a>
+<span class="sourceLineNo">269</span>            this.manager.conditions.validateConditions(context, paramValue);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>            passedArgs.put(parameterName, paramValue);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>        }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>        return passedArgs;<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    boolean hasPermission(CommandIssuer issuer) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span>        return (permission == null || permission.isEmpty() || scope.manager.hasPermission(issuer, permission)) &amp;&amp; scope.hasPermission(issuer);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
 <span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span>     * @see #getRequiredPermissions()<a name="line.280"></a>
-<span class="sourceLineNo">281</span>     * @deprecated<a name="line.281"></a>
-<span class="sourceLineNo">282</span>     */<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    @Deprecated<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    public String getPermission() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>        if (this.permission == null || this.permission.isEmpty()) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>            return null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        return ACFPatterns.COMMA.split(this.permission)[0];<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    private void computePermissions() {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        this.permissions.clear();<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        this.permissions.addAll(this.scope.getRequiredPermissions());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        if (this.permission != null &amp;&amp; !this.permission.isEmpty()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span>            this.permissions.addAll(Arrays.asList(ACFPatterns.COMMA.split(this.permission)));<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        }<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>    public Set&lt;String&gt; getRequiredPermissions() {<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        return this.permissions;<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    }<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span>    public boolean requiresPermission(String permission) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        return getRequiredPermissions().contains(permission);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>    public String getPrefSubCommand() {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>        return prefSubCommand;<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>    public String getSyntaxText() {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        return syntaxText;<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span>    public String getHelpText() {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        return helpText != null ? helpText : "";<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>    public boolean isPrivate() {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>        return isPrivate;<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    public String getCommand() {<a name="line.323"></a>
-<span class="sourceLineNo">324</span>        return command;<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>    public void addSubcommand(String cmd) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        this.registeredSubcommands.add(cmd);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>    public void addSubcommands(Collection&lt;String&gt; cmd) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>        this.registeredSubcommands.addAll(cmd);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>}<a name="line.334"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    /**<a name="line.280"></a>
+<span class="sourceLineNo">281</span>     * @see #getRequiredPermissions()<a name="line.281"></a>
+<span class="sourceLineNo">282</span>     * @deprecated<a name="line.282"></a>
+<span class="sourceLineNo">283</span>     */<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    @Deprecated<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    public String getPermission() {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        if (this.permission == null || this.permission.isEmpty()) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>            return null;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        }<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        return ACFPatterns.COMMA.split(this.permission)[0];<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    private void computePermissions() {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        this.permissions.clear();<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        this.permissions.addAll(this.scope.getRequiredPermissions());<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        if (this.permission != null &amp;&amp; !this.permission.isEmpty()) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>            this.permissions.addAll(Arrays.asList(ACFPatterns.COMMA.split(this.permission)));<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        }<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    public Set&lt;String&gt; getRequiredPermissions() {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        return this.permissions;<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    }<a name="line.302"></a>
+<span class="sourceLineNo">303</span><a name="line.303"></a>
+<span class="sourceLineNo">304</span>    public boolean requiresPermission(String permission) {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        return getRequiredPermissions().contains(permission);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>    public String getPrefSubCommand() {<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        return prefSubCommand;<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    }<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>    public String getSyntaxText() {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        return syntaxText;<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span>    public String getHelpText() {<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        return helpText != null ? helpText : "";<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public boolean isPrivate() {<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        return isPrivate;<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    public String getCommand() {<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        return command;<a name="line.325"></a>
+<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span>    public void addSubcommand(String cmd) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span>        this.registeredSubcommands.add(cmd);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    public void addSubcommands(Collection&lt;String&gt; cmd) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        this.registeredSubcommands.addAll(cmd);<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>    public &lt;T extends Annotation&gt; T getAnnotation(Class&lt;T&gt; annotation) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>        return method.getAnnotation(annotation);<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>}<a name="line.339"></a>
 
 
 
diff --git a/docs/acf-sponge/co/aikar/commands/SpongeRegisteredCommand.html b/docs/acf-sponge/co/aikar/commands/SpongeRegisteredCommand.html
index 6f3046a4..d50e2d38 100644
--- a/docs/acf-sponge/co/aikar/commands/SpongeRegisteredCommand.html
+++ b/docs/acf-sponge/co/aikar/commands/SpongeRegisteredCommand.html
@@ -162,7 +162,7 @@ extends co.aikar.commands.RegisteredCommand&lt;<a href="../../../co/aikar/comman
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;co.aikar.commands.RegisteredCommand</h3>
-<code>addSubcommand, addSubcommands, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
+<code>addSubcommand, addSubcommands, getAnnotation, getCommand, getHelpText, getPermission, getPrefSubCommand, getRequiredPermissions, getSyntaxText, isPrivate, requiresPermission</code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">