chore: merge #9

Fix preloading incorrect chunks in Schematic#build() implementations
HyperaDev · May 7, 2022 · 329521c · 329521c
2 parents c7952bf + 9cbd93b
commit 329521c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.github.Minestom</groupId>
             <artifactId>Minestom</artifactId>
-            <version>d7d6721474</version>
+            <version>64de8f87c0</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/net/crystalgames/scaffolding/schematic/impl/MCEditSchematic.java b/src/main/java/net/crystalgames/scaffolding/schematic/impl/MCEditSchematic.java
@@ -126,11 +126,11 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
 
             List<CompletableFuture<Void>> futures = new ArrayList<>();
             for (Region.Block regionBlock : regionBlocks) {
-                Pos blockPosition = regionBlock.position();
+                Pos absoluteBlockPosition = regionBlock.position().add(position);
                 short stateId = regionBlock.stateId();
 
                 Block block = Block.fromStateId(stateId);
-                if (block != null) futures.add(instance.loadOptionalChunk(blockPosition).thenRun(() -> blockBatch.setBlock(blockPosition.add(position), block)));
+                if (block != null) futures.add(instance.loadOptionalChunk(absoluteBlockPosition).thenRun(() -> blockBatch.setBlock(absoluteBlockPosition, block)));
             }
 
             CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();

diff --git a/src/main/java/net/crystalgames/scaffolding/schematic/impl/SpongeSchematic.java b/src/main/java/net/crystalgames/scaffolding/schematic/impl/SpongeSchematic.java
@@ -146,11 +146,11 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
 
             List<CompletableFuture<Void>> futures = new ArrayList<>();
             for (Region.Block regionBlock : regionBlocks) {
-                Pos blockPosition = regionBlock.position();
+                Pos absoluteBlockPosition = regionBlock.position().add(position);
                 short stateId = regionBlock.stateId();
 
                 Block block = Block.fromStateId(stateId);
-                if (block != null) futures.add(instance.loadOptionalChunk(blockPosition).thenRun(() -> blockBatch.setBlock(blockPosition.add(position), block)));
+                if (block != null) futures.add(instance.loadOptionalChunk(absoluteBlockPosition).thenRun(() -> blockBatch.setBlock(absoluteBlockPosition, block)));
             }
 
             CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();