Skip to content

Commit d4f6020

Browse files
committed
Fix errors if a world doesn't have a session.lock
1 parent 9e706f9 commit d4f6020

2 files changed

Lines changed: 7 additions & 13 deletions

File tree

src/main/java/io/github/notstirred/chunkyeditor/minecraft/WorldLock.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ public static WorldLock of(@NotNull Path worldPath, Function<Boolean, Boolean> u
8282
Path sessionLockFile = worldPath.resolve("session.lock");
8383

8484
File lockFile = sessionLockFile.toFile();
85-
if (!lockFile.exists()) {
86-
throw new FileNotFoundException();
87-
}
88-
8985
return new WorldLock(lockFile, userConfirmationFunction);
9086
}
9187
}

src/main/java/io/github/notstirred/chunkyeditor/state/vanilla/VanillaWorldState.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import io.github.notstirred.chunkyeditor.minecraft.WorldLock;
77
import io.github.notstirred.chunkyeditor.state.State;
88
import javafx.application.Platform;
9-
import se.llbit.chunky.world.Chunk;
10-
import se.llbit.chunky.world.ChunkPosition;
11-
import se.llbit.chunky.world.EmptyChunk;
12-
import se.llbit.chunky.world.World;
9+
import se.llbit.chunky.world.*;
1310
import se.llbit.chunky.world.region.MCRegion;
1411
import se.llbit.chunky.world.region.Region;
1512
import se.llbit.log.Log;
@@ -129,16 +126,17 @@ private CompletableFuture<Void> deleteChunks(Executor taskExecutor, Map<VanillaR
129126
}, taskExecutor);
130127

131128
// update the map view with the newly deleted chunks
132-
deletionFuture.whenCompleteAsync((v, throwable) ->
129+
deletionFuture.whenCompleteAsync((_, throwable) ->
133130
regionSelection.forEach((regionPos, chunkPositions) -> {
134-
Region region = world.getRegion(new ChunkPosition(regionPos.x(), regionPos.z()));
131+
Dimension dimension = world.currentDimension();
132+
Region region = dimension.getRegion(new ChunkPosition(regionPos.x(), regionPos.z()));
135133
for (ChunkPosition chunkPos : chunkPositions) {
136-
Chunk chunk = world.getChunk(chunkPos);
134+
Chunk chunk = dimension.getChunk(chunkPos);
137135
if (!chunk.isEmpty()) {
138136
chunk.reset();
139137
Accessor.invoke_MCRegion$setChunk((MCRegion) region, chunkPos, EmptyChunk.INSTANCE);
140-
world.chunkUpdated(chunkPos);
141-
world.chunkDeleted(chunkPos);
138+
dimension.chunkUpdated(chunkPos);
139+
dimension.chunkDeleted(chunkPos);
142140
}
143141
}
144142
}), Platform::runLater

0 commit comments

Comments
 (0)