Merge pull request #3384 from Multiverse/fix/issuer-aware

Fix ambiguous error message with issue aware args is not found by using maxArgForAware

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/commands/EntitySpawnConfigCommand.java

@@ -52,7 +52,7 @@ final class EntitySpawnConfigCommand extends CoreCommand {
     void onInfoCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             MultiverseWorld world,
 
@@ -91,7 +91,7 @@ private List<String> getEntitySpawnConfigList(MultiverseWorld world) {
     void onModifyCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=4")
             @Syntax("[world]")
             MultiverseWorld world,
 

src/main/java/org/mvplugins/multiverse/core/commands/InfoCommand.java

@@ -61,8 +61,8 @@ class InfoCommand extends CoreCommand {
     public void onInfoCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
-            @Syntax("<world>")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
+            @Syntax("[world]")
             @Description("{@@mv-core.info.description.world}")
             LoadedMultiverseWorld world,
 

src/main/java/org/mvplugins/multiverse/core/commands/ModifyCommand.java

@@ -49,12 +49,12 @@ class ModifyCommand extends CoreCommand {
             "@propsmodifyaction:notByIssuerForArg=arg1|@mvworldpropsname:byIssuerForArg=arg1 " +
             "@mvworldpropsname:notByIssuerForArg=arg1|@mvworldpropsvalue:byIssuerForArg=arg1 " +
             "@mvworldpropsvalue:notByIssuerForArg=arg1")
-    @Syntax("[world] <set|add|remove|reset> <property> <value>")
+    @Syntax("[world] <set|add|remove|reset> <property> [value]")
     @Description("{@@mv-core.modify.description}")
     void onModifyCommand(// SUPPRESS CHECKSTYLE: ParameterNumber
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=3")
             @Syntax("[world]")
             @Description("{@@mv-core.modify.world.description}")
             @NotNull MultiverseWorldValue worldValue,

src/main/java/org/mvplugins/multiverse/core/commands/PurgeAllEntitiesCommand.java

@@ -33,7 +33,7 @@ final class PurgeAllEntitiesCommand extends CoreCommand {
     void onPurgeAllEntitiesCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=1")
             @Syntax("[world]")
             LoadedMultiverseWorld world,
 

src/main/java/org/mvplugins/multiverse/core/commands/PurgeEntitiesCommand.java

@@ -28,7 +28,7 @@ final class PurgeEntitiesCommand extends CoreCommand {
     void onPurgeEntityCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {

src/main/java/org/mvplugins/multiverse/core/commands/WhoCommand.java

@@ -74,12 +74,12 @@ void onWhoAllCommand(
     @Subcommand("who")
     @CommandPermission("multiverse.core.list.who")
     @CommandCompletion("@mvworlds:scope=both @flags:groupName=" + PageFilterFlags.NAME)
-    @Syntax("<world> [--page <page>] [--filter <filter>]")
+    @Syntax("[world] [--page <page>] [--filter <filter>]")
     @Description("{@@mv-core.who.description}")
     void onWhoCommand(
             MVCommandIssuer issuer,
-            @Flags("resolve=issuerAware")
-            @Syntax("<world>")
+            @Flags("resolve=issuerAware,maxArgForAware=")
+            @Syntax("[world]")
             @Description("{@@mv-core.who.world.description}")
             LoadedMultiverseWorld inputtedWorld,
 

src/main/java/org/mvplugins/multiverse/core/commands/WorldBorderCommand.java

@@ -35,7 +35,7 @@ void onWorldBorderAdd(
             @Syntax("[time]")
             int time,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -54,7 +54,7 @@ void onWorldBorderCenter(
             @Syntax("[z]")
             double z,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -79,7 +79,7 @@ void onWorldBorderDamageAmount(
             @Syntax("<damage>")
             double damage,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -103,7 +103,7 @@ void onWorldBorderDamageBuffer(
             @Syntax("<distance>")
             double distance,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -124,7 +124,7 @@ void onWorldBorderDamageBuffer(
     void onWorldBorderGet(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -147,7 +147,7 @@ void onWorldBorderSet(
             @Syntax("[time]")
             int time,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -179,7 +179,7 @@ void onWorldBorderWarningDistance(
             @Syntax("<distance>")
             int distance,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {
@@ -203,7 +203,7 @@ void onWorldBorderWarningTime(
             @Syntax("<time>")
             int time,
 
-            @Flags("resolve=issuerAware")
+            @Flags("resolve=issuerAware,maxArgForAware=0")
             @Syntax("[world]")
             LoadedMultiverseWorld world
     ) {