From a4c67f66a2bbdb413a87d380d678183a46883073 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Thu, 8 Mar 2018 22:39:31 +0100
Subject: [PATCH] make sure to only treat a type as sender if its not annotated
 with "other"

---
 .../co/aikar/commands/RegisteredCommand.java  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/co/aikar/commands/RegisteredCommand.java b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
index 3fcf2151..d5d2b223 100644
--- a/core/src/main/java/co/aikar/commands/RegisteredCommand.java
+++ b/core/src/main/java/co/aikar/commands/RegisteredCommand.java
@@ -28,6 +28,7 @@ import co.aikar.commands.annotation.CommandCompletion;
 import co.aikar.commands.annotation.CommandPermission;
 import co.aikar.commands.annotation.Default;
 import co.aikar.commands.annotation.Description;
+import co.aikar.commands.annotation.Flags;
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Syntax;
 import co.aikar.commands.annotation.Values;
@@ -105,11 +106,23 @@ public class RegisteredCommand <CEC extends CommandExecutionContext<CEC, ? exten
             if (resolver != null) {
                 resolvers[i] = resolver;
 
-                if (!scope.manager.isCommandIssuer(type)) {
+                Flags flags = parameter.getAnnotation(Flags.class);
+                // check if type is a command issuer and actually the sender of this command
+                if (!scope.manager.isCommandIssuer(type) || (flags != null && flags.value().equals("other"))) {
                     String name = parameter.getName();
                     if (isOptionalResolver(resolver, parameter)) {
-                        optionalResolvers++;
-                        if (!(resolver instanceof IssuerOnlyContextResolver)) {
+                        if(resolver instanceof  IssuerAwareContextResolver){
+                            // if its a issuer, but he has the other flag, its actually not an optional resolver!
+                            if(flags != null && flags.value().equals("other")){
+                                requiredResolvers++;
+                                syntaxB.append('<').append(name).append("> ");
+                            }else{
+                                // optional issuer aware context resolver
+                                optionalResolvers++;
+                            }
+                        }else{
+                            // some other optional resolver
+                            optionalResolvers++;
                             syntaxB.append('[').append(name).append("] ");
                         }
                     } else {