Skip to content
This repository was archived by the owner on May 27, 2023. It is now read-only.

Commit 329521c

Browse files
authored
chore: merge #9
Fix preloading incorrect chunks in Schematic#build() implementations
2 parents c7952bf + 9cbd93b commit 329521c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>com.github.Minestom</groupId>
2626
<artifactId>Minestom</artifactId>
27-
<version>d7d6721474</version>
27+
<version>64de8f87c0</version>
2828
<scope>provided</scope>
2929
<exclusions>
3030
<exclusion>

src/main/java/net/crystalgames/scaffolding/schematic/impl/MCEditSchematic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
126126

127127
List<CompletableFuture<Void>> futures = new ArrayList<>();
128128
for (Region.Block regionBlock : regionBlocks) {
129-
Pos blockPosition = regionBlock.position();
129+
Pos absoluteBlockPosition = regionBlock.position().add(position);
130130
short stateId = regionBlock.stateId();
131131

132132
Block block = Block.fromStateId(stateId);
133-
if (block != null) futures.add(instance.loadOptionalChunk(blockPosition).thenRun(() -> blockBatch.setBlock(blockPosition.add(position), block)));
133+
if (block != null) futures.add(instance.loadOptionalChunk(absoluteBlockPosition).thenRun(() -> blockBatch.setBlock(absoluteBlockPosition, block)));
134134
}
135135

136136
CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();

src/main/java/net/crystalgames/scaffolding/schematic/impl/SpongeSchematic.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
146146

147147
List<CompletableFuture<Void>> futures = new ArrayList<>();
148148
for (Region.Block regionBlock : regionBlocks) {
149-
Pos blockPosition = regionBlock.position();
149+
Pos absoluteBlockPosition = regionBlock.position().add(position);
150150
short stateId = regionBlock.stateId();
151151

152152
Block block = Block.fromStateId(stateId);
153-
if (block != null) futures.add(instance.loadOptionalChunk(blockPosition).thenRun(() -> blockBatch.setBlock(blockPosition.add(position), block)));
153+
if (block != null) futures.add(instance.loadOptionalChunk(absoluteBlockPosition).thenRun(() -> blockBatch.setBlock(absoluteBlockPosition, block)));
154154
}
155155

156156
CompletableFuture.allOf(futures.toArray(new CompletableFuture[]{})).join();

0 commit comments

Comments
 (0)