Try not to enable legacy material compatibility layer (#1316)

EngineHub · Jul 2, 2023 · 5d8b919 · 5d8b919
1 parent 6a10e04
commit 5d8b919
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/com/sk89q/craftbook/util/BlockSyntax.java b/src/main/java/com/sk89q/craftbook/util/BlockSyntax.java
@@ -39,6 +39,8 @@ public class BlockSyntax {
 
     private static Set<String> knownBadLines = new HashSet<>();
 
+    private static boolean matchLegacyMaterials = false;
+
     static {
         BLOCK_CONTEXT.setPreferringWildcard(true);
         BLOCK_CONTEXT.setRestricted(false);
@@ -63,7 +65,10 @@ public static BaseBlock getBlock(String line, boolean wild) {
 
         if (blockState == null) {
             String[] dataSplit = RegexUtil.COLON_PATTERN.split(line.replace("\\:", ":"), 2);
-            Material material = Material.getMaterial(dataSplit[0], true);
+            Material material = Material.getMaterial(dataSplit[0], matchLegacyMaterials);
+            if (material == null && !matchLegacyMaterials) {
+                material = Material.getMaterial(dataSplit[0], matchLegacyMaterials = true);
+            }
             if (material != null) {
                 int data = 0;
                 if (dataSplit.length > 1) {