From c26fbcb6fce853413dafe4abff2494ce22d25c54 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:51:26 -0800
Subject: [PATCH] Fix incorrect inputQueue usage in some argument types

---
 .../commandframework/arguments/standard/BooleanArgument.java | 5 ++++-
 .../commandframework/arguments/standard/CharArgument.java    | 1 +
 .../bukkit/parsers/OfflinePlayerArgument.java                | 2 +-
 .../commandframework/bukkit/parsers/PlayerArgument.java      | 2 +-
 .../parsers/selector/MultipleEntitySelectorArgument.java     | 2 +-
 .../parsers/selector/MultiplePlayerSelectorArgument.java     | 3 ++-
 .../parsers/selector/SingleEntitySelectorArgument.java       | 2 +-
 .../parsers/selector/SinglePlayerSelectorArgument.java       | 3 ++-
 8 files changed, 13 insertions(+), 7 deletions(-)

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
index f1163c5a..7049c6d4 100644
--- 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 final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
                         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 final class BooleanArgument<C> extends CommandArgument<C, Boolean> {
             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
index 49076bf6..55715f52 100644
--- 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 final class CharArgument<C> extends CommandArgument<C, Character> {
                 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
index 0c9b9318..b463f1f7 100644
--- 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,7 +159,6 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             final OfflinePlayer player = Bukkit.getOfflinePlayer(input);
 
@@ -167,6 +166,7 @@ public final class OfflinePlayerArgument<C> extends CommandArgument<C, OfflinePl
                 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
index afbd813b..59ea657f 100644
--- 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,7 +151,6 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             Player player = Bukkit.getPlayer(input);
 
@@ -159,6 +158,7 @@ public final class PlayerArgument<C> extends CommandArgument<C, Player> {
                 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
index 69fd7888..8a846d92 100644
--- 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 final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             List<Entity> entities;
             try {
@@ -162,6 +161,7 @@ public final class MultipleEntitySelectorArgument<C> extends CommandArgument<C,
                 ));
             }
 
+            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
index cbf1fbaf..d53be67f 100644
--- 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 final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(
                     CloudBukkitCapabilities.BRIGADIER)) {
@@ -154,6 +153,7 @@ public final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
                 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 final class MultiplePlayerSelectorArgument<C> extends CommandArgument<C,
                 }
             }
 
+            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
index b5ca5086..2f89d512 100644
--- 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 final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             List<Entity> entities;
             try {
@@ -177,6 +176,7 @@ public final class SingleEntitySelectorArgument<C> extends CommandArgument<C, Si
                 ));
             }
 
+            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
index 1fc41ec0..69835eec 100644
--- 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 final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
                         commandContext
                 ));
             }
-            inputQueue.remove();
 
             if (!commandContext.get(BukkitCommandContextKeys.CLOUD_BUKKIT_CAPABILITIES).contains(
                     CloudBukkitCapabilities.BRIGADIER)) {
@@ -160,6 +159,7 @@ public final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
                 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 final class SinglePlayerSelectorArgument<C> extends CommandArgument<C, Si
                 ));
             }
 
+            inputQueue.remove();
             return ArgumentParseResult.success(new SinglePlayerSelector(input, entities));
         }