Fix bad input parsing in the region parsers

md5sha256 · Mar 2, 2024 · d445c6d · d445c6d
1 parent 8cc497d
commit d445c6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/BuyRegionParser.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/BuyRegionParser.java
@@ -2,6 +2,7 @@
 
 import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.GeneralRegion;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.context.CommandInput;
@@ -20,12 +21,13 @@ public BuyRegionParser(@NonNull IFileManager fileManager) {
     @Override
     public @NonNull ArgumentParseResult<@NonNull BuyRegion> parse(@NonNull CommandContext<@NonNull C> commandContext,
                                                                   @NonNull CommandInput commandInput) {
-        String input = commandInput.readInput();
+        String input = commandInput.peekString();
         BuyRegion region = this.fileManager.getBuy(input);
         if (region != null) {
+            commandInput.readString();
             return ArgumentParseResult.success(region);
         }
-        AreaShopCommandException exception = new AreaShopCommandException("buy-notBuyable");
+        AreaShopCommandException exception = new AreaShopCommandException("buy-noBuyable", input);
         return ArgumentParseResult.failure(exception);
     }
 

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/GeneralRegionParser.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/GeneralRegionParser.java
@@ -21,12 +21,13 @@ public GeneralRegionParser(@NonNull IFileManager fileManager) {
     @Override
     public @NonNull ArgumentParseResult<@NonNull GeneralRegion> parse(@NonNull CommandContext<@NonNull C> commandContext,
                                                                       @NonNull CommandInput commandInput) {
-        String input = commandInput.readInput();
+        String input = commandInput.peekString();
         GeneralRegion region = this.fileManager.getRegion(input);
         if (region != null) {
+            commandInput.readString();
             return ArgumentParseResult.success(region);
         }
-        AreaShopCommandException exception = new AreaShopCommandException("cmd-notRegistered");
+        AreaShopCommandException exception = new AreaShopCommandException("cmd-notRegistered", input);
         return ArgumentParseResult.failure(exception);
     }
 

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/RentRegionParser.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/util/RentRegionParser.java
@@ -21,12 +21,13 @@ public RentRegionParser(@NonNull IFileManager fileManager) {
     @Override
     public @NonNull ArgumentParseResult<@NonNull RentRegion> parse(@NonNull CommandContext<@NonNull C> commandContext,
                                                                    @NonNull CommandInput commandInput) {
-        String input = commandInput.readInput();
+        String input = commandInput.peekString();
         RentRegion region = this.fileManager.getRent(input);
         if (region != null) {
+            commandInput.readString();
             return ArgumentParseResult.success(region);
         }
-        AreaShopCommandException exception = new AreaShopCommandException("buy-notBuyable");
+        AreaShopCommandException exception = new AreaShopCommandException("buy-notBuyable", input);
         return ArgumentParseResult.failure(exception);
     }