fix: don't require WEOrigin / WEOffset in MCEdit schematics (#2936)

IntellectualSites · Oct 6, 2024 · be3ae1a · be3ae1a
1 parent 7192e14
commit be3ae1a
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/...dit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java b/...dit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java
@@ -57,6 +57,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
 /**
@@ -126,18 +127,25 @@ public Clipboard read() throws IOException {
         short height = schematicTag.getTag("Height", LinTagType.shortTag()).valueAsShort();
         short length = schematicTag.getTag("Length", LinTagType.shortTag()).valueAsShort();
 
-        int originX = schematicTag.getTag("WEOriginX", LinTagType.intTag()).valueAsInt();
-        int originY = schematicTag.getTag("WEOriginY", LinTagType.intTag()).valueAsInt();
-        int originZ = schematicTag.getTag("WEOriginZ", LinTagType.intTag()).valueAsInt();
-        BlockVector3 min = BlockVector3.at(originX, originY, originZ);
+        try {
+            int originX = schematicTag.getTag("WEOriginX", LinTagType.intTag()).valueAsInt();
+            int originY = schematicTag.getTag("WEOriginY", LinTagType.intTag()).valueAsInt();
+            int originZ = schematicTag.getTag("WEOriginZ", LinTagType.intTag()).valueAsInt();
+            BlockVector3 min = BlockVector3.at(originX, originY, originZ);
+
+            int offsetX = schematicTag.getTag("WEOffsetX", LinTagType.intTag()).valueAsInt();
+            int offsetY = schematicTag.getTag("WEOffsetY", LinTagType.intTag()).valueAsInt();
+            int offsetZ = schematicTag.getTag("WEOffsetZ", LinTagType.intTag()).valueAsInt();
+            BlockVector3 offset = BlockVector3.at(offsetX, offsetY, offsetZ);
+
+            origin = min.subtract(offset);
+            region = new CuboidRegion(min, min.add(width, height, length).subtract(BlockVector3.ONE));
+        } catch (NoSuchElementException e) {
+            origin = BlockVector3.ZERO;
+            region = new CuboidRegion(origin, origin.add(width, height, length).subtract(BlockVector3.ONE));
+        }
 
-        int offsetX = schematicTag.getTag("WEOffsetX", LinTagType.intTag()).valueAsInt();
-        int offsetY = schematicTag.getTag("WEOffsetY", LinTagType.intTag()).valueAsInt();
-        int offsetZ = schematicTag.getTag("WEOffsetZ", LinTagType.intTag()).valueAsInt();
-        BlockVector3 offset = BlockVector3.at(offsetX, offsetY, offsetZ);
 
-        origin = min.subtract(offset);
-        region = new CuboidRegion(min, min.add(width, height, length).subtract(BlockVector3.ONE));
 
         // ====================================================================
         // Blocks