From f44b1b48c7cca1ab1e7a118e479209cd956b9e85 Mon Sep 17 00:00:00 2001
From: Jordan <dordsor21@gmail.com>
Date: Mon, 18 Dec 2023 14:58:53 +0000
Subject: [PATCH] chore: add a more informative error when parsing block
 properties (#2524)

---
 .../worldedit/world/block/BlockState.java     | 27 ++++++++++++++++---
 .../src/main/resources/lang/strings.json      |  1 +
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
index f08675fc5..5059c737a 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockState.java
@@ -178,9 +178,18 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
             String name = property.getName();
 
             charSequence.setSubstring(propStrStart + name.length() + 2, state.length() - 1);
-            int index = charSequence.length() <= 0 ? -1 : property.getIndexFor(charSequence);
-            if (index != -1) {
-                return type.withPropertyId(index);
+            try {
+                int index = charSequence.length() <= 0 ? -1 : property.getIndexFor(charSequence);
+                if (index != -1) {
+                    return type.withPropertyId(index);
+                }
+            } catch (Exception e) {
+                throw new InputParseException(Caption.of(
+                        "fawe.error.invalid-block-state-property",
+                        TextComponent.of(charSequence.toString()),
+                        TextComponent.of(name),
+                        TextComponent.of(state)
+                ), e);
             }
         }
         int stateId;
@@ -200,7 +209,17 @@ public class BlockState implements BlockStateHolder<BlockState>, Pattern {
                 case ',': {
                     charSequence.setSubstring(last, i);
                     if (property != null) {
-                        int index = property.getIndexFor(charSequence);
+                        int index;
+                        try {
+                            index = property.getIndexFor(charSequence);
+                        } catch (Exception e) {
+                            throw new InputParseException(Caption.of(
+                                    "fawe.error.invalid-block-state-property",
+                                    TextComponent.of(charSequence.toString()),
+                                    TextComponent.of(property.getName()),
+                                    TextComponent.of(state)
+                            ), e);
+                        }
                         if (index == -1) {
                             throw SuggestInputParseException.of(charSequence.toString(), (List<Object>) property.getValues());
                         }
diff --git a/worldedit-core/src/main/resources/lang/strings.json b/worldedit-core/src/main/resources/lang/strings.json
index d702ead53..3d1295ab0 100644
--- a/worldedit-core/src/main/resources/lang/strings.json
+++ b/worldedit-core/src/main/resources/lang/strings.json
@@ -92,6 +92,7 @@
   "fawe.error.parser.invalid-data": "Invalid data: {0}",
   "fawe.error.unsupported": "Unsupported!",
   "fawe.error.invalid-block-type": "Does not match a valid block type: {0}",
+  "fawe.error.invalid-block-state-property": "Cannot parse value `{0}` for property `{1}`, block state: `{2}`",
   "fawe.error.nbt.forbidden": "You are not allowed to use nbt. Lacking permission: {0}",
   "fawe.error.invalid-arguments": "Invalid amount of arguments. Expected: {0}",
   "fawe.error.unrecognised-tag": "Unrecognised tag: {0} {1}",