diff options
Diffstat (limited to 'defaults/src/main')
| -rw-r--r-- | defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/conditions/ConditionNBT.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/conditions/ConditionNBT.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/conditions/ConditionNBT.java index a64f141..a21ccbc 100644 --- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/conditions/ConditionNBT.java +++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/cit/conditions/ConditionNBT.java @@ -19,6 +19,8 @@ public class ConditionNBT extends CITCondition { public static final CITConditionContainer<ConditionNBT> CONTAINER = new CITConditionContainer<>(ConditionNBT.class, ConditionNBT::new, "nbt"); + private static final Pattern jsonBeginPattern = Pattern.compile("^[ \t\n]*\\{"); + protected String[] path; protected StringMatcher matchString = null; @@ -123,9 +125,12 @@ public class ConditionNBT extends CITCondition { private boolean testValue(NbtElement element) { try { - if (element instanceof NbtString nbtString) //noinspection ConstantConditions - return matchString.matches(nbtString.asString()) || matchString.matches(Text.Serializer.fromJson(nbtString.asString()).getString()); - else if (element instanceof NbtInt nbtInt && matchInteger != null) + if (element instanceof NbtString nbtString) { //noinspection ConstantConditions + var asString = nbtString.asString(); + return matchString.matches(asString) || + (jsonBeginPattern.matcher(asString).matches() + && matchString.matches(Text.Serializer.fromJson(asString).getString())); + } else if (element instanceof NbtInt nbtInt && matchInteger != null) return nbtInt.equals(matchInteger); else if (element instanceof NbtByte nbtByte && matchByte != null) return nbtByte.equals(matchByte); |