Fix incorrect inputQueue usage in some argument types

jpenilla · jpenilla · commit 541d9c45a9b3 · 2022-01-06T11:51:26.000-08:00
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/BooleanArgument.java
@@ -181,14 +181,15 @@ public BooleanParser(final boolean liberal) {
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             if (!this.liberal) {
                 if (input.equalsIgnoreCase("true")) {
+                    inputQueue.remove();
                     return ArgumentParseResult.success(true);
                 }
 
                 if (input.equalsIgnoreCase("false")) {
+                    inputQueue.remove();
                     return ArgumentParseResult.success(false);
                 }
 
@@ -198,10 +199,12 @@ public BooleanParser(final boolean liberal) {
             final String uppercaseInput = input.toUpperCase();
 
             if (LIBERAL_TRUE.contains(uppercaseInput)) {
+                inputQueue.remove();
                 return ArgumentParseResult.success(true);
             }
 
             if (LIBERAL_FALSE.contains(uppercaseInput)) {
+                inputQueue.remove();
                 return ArgumentParseResult.success(false);
             }
 
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/CharArgument.java
@@ -141,6 +141,7 @@ public static final class CharacterParser<C> implements ArgumentParser<C, Charac
                 return ArgumentParseResult.failure(new CharParseException(input, commandContext));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(input.charAt(0));
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/OfflinePlayerArgument.java
@@ -159,14 +159,14 @@ public static final class OfflinePlayerParser<C> implements ArgumentParser<C, Of
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             final OfflinePlayer player = Bukkit.getOfflinePlayer(input);
 
             if (!player.hasPlayedBefore() && !player.isOnline()) {
                 return ArgumentParseResult.failure(new OfflinePlayerParseException(input, commandContext));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(player);
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/PlayerArgument.java
@@ -151,14 +151,14 @@ public static final class PlayerParser<C> implements ArgumentParser<C, Player> {
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             Player player = Bukkit.getPlayer(input);
 
             if (player == null) {
                 return ArgumentParseResult.failure(new PlayerParseException(input, commandContext));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(player);
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultipleEntitySelectorArgument.java
@@ -148,7 +148,6 @@ public static final class MultipleEntitySelectorParser<C> implements ArgumentPar
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             List<Entity> entities;
             try {
@@ -162,6 +161,7 @@ public static final class MultipleEntitySelectorParser<C> implements ArgumentPar
                 ));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(new MultipleEntitySelector(input, entities));
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/MultiplePlayerSelectorArgument.java
@@ -144,7 +144,6 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(
                     CloudBukkitCapabilities.BRIGADIER)) {
@@ -154,6 +153,7 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar
                 if (player == null) {
                     return ArgumentParseResult.failure(new PlayerArgument.PlayerParseException(input, commandContext));
                 }
+                inputQueue.remove();
                 return ArgumentParseResult.success(new MultiplePlayerSelector(input, ImmutableList.of(player)));
             }
 
@@ -180,6 +180,7 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar
                 }
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(new MultiplePlayerSelector(input, entities));
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SingleEntitySelectorArgument.java
@@ -154,7 +154,6 @@ public static final class SingleEntitySelectorParser<C> implements ArgumentParse
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             List<Entity> entities;
             try {
@@ -177,6 +176,7 @@ public static final class SingleEntitySelectorParser<C> implements ArgumentParse
                 ));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(new SingleEntitySelector(input, entities));
         }
 
diff --git a/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java b/cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/selector/SinglePlayerSelectorArgument.java
@@ -150,7 +150,6 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(
                     CloudBukkitCapabilities.BRIGADIER)) {
@@ -160,6 +159,7 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse
                 if (player == null) {
                     return ArgumentParseResult.failure(new PlayerArgument.PlayerParseException(input, commandContext));
                 }
+                inputQueue.remove();
                 return ArgumentParseResult.success(new SinglePlayerSelector(input, ImmutableList.of(player)));
             }
 
@@ -194,6 +194,7 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse
                 ));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(new SinglePlayerSelector(input, entities));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -181,14 +181,15 @@ public BooleanParser(final boolean liberal) {`
`181`	`181`	`commandContext`
`182`	`182`	`));`
`183`	`183`	`}`
`184`		`- inputQueue.remove();`
`185`	`184`
`186`	`185`	`if (!this.liberal) {`
`187`	`186`	`if (input.equalsIgnoreCase("true")) {`
	`187`	`+ inputQueue.remove();`
`188`	`188`	`return ArgumentParseResult.success(true);`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`if (input.equalsIgnoreCase("false")) {`
	`192`	`+ inputQueue.remove();`
`192`	`193`	`return ArgumentParseResult.success(false);`
`193`	`194`	`}`
`194`	`195`
`@@ -198,10 +199,12 @@ public BooleanParser(final boolean liberal) {`
`198`	`199`	`final String uppercaseInput = input.toUpperCase();`
`199`	`200`
`200`	`201`	`if (LIBERAL_TRUE.contains(uppercaseInput)) {`
	`202`	`+ inputQueue.remove();`
`201`	`203`	`return ArgumentParseResult.success(true);`
`202`	`204`	`}`
`203`	`205`
`204`	`206`	`if (LIBERAL_FALSE.contains(uppercaseInput)) {`
	`207`	`+ inputQueue.remove();`
`205`	`208`	`return ArgumentParseResult.success(false);`
`206`	`209`	`}`
`207`	`210`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ public static final class CharacterParser<C> implements ArgumentParser<C, Charac`
`141`	`141`	`return ArgumentParseResult.failure(new CharParseException(input, commandContext));`
`142`	`142`	`}`
`143`	`143`
	`144`	`+ inputQueue.remove();`
`144`	`145`	`return ArgumentParseResult.success(input.charAt(0));`
`145`	`146`	`}`
`146`	`147`
Original file line number	Diff line number	Diff line change
`@@ -159,14 +159,14 @@ public static final class OfflinePlayerParser<C> implements ArgumentParser<C, Of`
`159`	`159`	`commandContext`
`160`	`160`	`));`
`161`	`161`	`}`
`162`		`- inputQueue.remove();`
`163`	`162`
`164`	`163`	`final OfflinePlayer player = Bukkit.getOfflinePlayer(input);`
`165`	`164`
`166`	`165`	`if (!player.hasPlayedBefore() && !player.isOnline()) {`
`167`	`166`	`return ArgumentParseResult.failure(new OfflinePlayerParseException(input, commandContext));`
`168`	`167`	`}`
`169`	`168`
	`169`	`+ inputQueue.remove();`
`170`	`170`	`return ArgumentParseResult.success(player);`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -151,14 +151,14 @@ public static final class PlayerParser<C> implements ArgumentParser<C, Player> {`
`151`	`151`	`commandContext`
`152`	`152`	`));`
`153`	`153`	`}`
`154`		`- inputQueue.remove();`
`155`	`154`
`156`	`155`	`Player player = Bukkit.getPlayer(input);`
`157`	`156`
`158`	`157`	`if (player == null) {`
`159`	`158`	`return ArgumentParseResult.failure(new PlayerParseException(input, commandContext));`
`160`	`159`	`}`
`161`	`160`
	`161`	`+ inputQueue.remove();`
`162`	`162`	`return ArgumentParseResult.success(player);`
`163`	`163`	`}`
`164`	`164`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ public static final class MultipleEntitySelectorParser<C> implements ArgumentPar`
`148`	`148`	`commandContext`
`149`	`149`	`));`
`150`	`150`	`}`
`151`		`- inputQueue.remove();`
`152`	`151`
`153`	`152`	`List<Entity> entities;`
`154`	`153`	`try {`
`@@ -162,6 +161,7 @@ public static final class MultipleEntitySelectorParser<C> implements ArgumentPar`
`162`	`161`	`));`
`163`	`162`	`}`
`164`	`163`
	`164`	`+ inputQueue.remove();`
`165`	`165`	`return ArgumentParseResult.success(new MultipleEntitySelector(input, entities));`
`166`	`166`	`}`
`167`	`167`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar`
`144`	`144`	`commandContext`
`145`	`145`	`));`
`146`	`146`	`}`
`147`		`- inputQueue.remove();`
`148`	`147`
`149`	`148`	`if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(`
`150`	`149`	`CloudBukkitCapabilities.BRIGADIER)) {`
`@@ -154,6 +153,7 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar`
`154`	`153`	`if (player == null) {`
`155`	`154`	`return ArgumentParseResult.failure(new PlayerArgument.PlayerParseException(input, commandContext));`
`156`	`155`	`}`
	`156`	`+ inputQueue.remove();`
`157`	`157`	`return ArgumentParseResult.success(new MultiplePlayerSelector(input, ImmutableList.of(player)));`
`158`	`158`	`}`
`159`	`159`
`@@ -180,6 +180,7 @@ public static final class MultiplePlayerSelectorParser<C> implements ArgumentPar`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
	`183`	`+ inputQueue.remove();`
`183`	`184`	`return ArgumentParseResult.success(new MultiplePlayerSelector(input, entities));`
`184`	`185`	`}`
`185`	`186`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,6 @@ public static final class SingleEntitySelectorParser<C> implements ArgumentParse`
`154`	`154`	`commandContext`
`155`	`155`	`));`
`156`	`156`	`}`
`157`		`- inputQueue.remove();`
`158`	`157`
`159`	`158`	`List<Entity> entities;`
`160`	`159`	`try {`
`@@ -177,6 +176,7 @@ public static final class SingleEntitySelectorParser<C> implements ArgumentParse`
`177`	`176`	`));`
`178`	`177`	`}`
`179`	`178`
	`179`	`+ inputQueue.remove();`
`180`	`180`	`return ArgumentParseResult.success(new SingleEntitySelector(input, entities));`
`181`	`181`	`}`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,6 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse`
`150`	`150`	`commandContext`
`151`	`151`	`));`
`152`	`152`	`}`
`153`		`- inputQueue.remove();`
`154`	`153`
`155`	`154`	`if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(`
`156`	`155`	`CloudBukkitCapabilities.BRIGADIER)) {`
`@@ -160,6 +159,7 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse`
`160`	`159`	`if (player == null) {`
`161`	`160`	`return ArgumentParseResult.failure(new PlayerArgument.PlayerParseException(input, commandContext));`
`162`	`161`	`}`
	`162`	`+ inputQueue.remove();`
`163`	`163`	`return ArgumentParseResult.success(new SinglePlayerSelector(input, ImmutableList.of(player)));`
`164`	`164`	`}`
`165`	`165`
`@@ -194,6 +194,7 @@ public static final class SinglePlayerSelectorParser<C> implements ArgumentParse`
`194`	`194`	`));`
`195`	`195`	`}`
`196`	`196`
	`197`	`+ inputQueue.remove();`
`197`	`198`	`return ArgumentParseResult.success(new SinglePlayerSelector(input, entities));`
`198`	`199`	`}`
`199`	`200`