Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-02 14:38:26 +01:00
Code Issues Projects Releases Wiki Activity

Do not run chunk load callback in the instance thread

Browse Source
This commit is contained in:
TheMode 2021-08-22 16:44:24 +02:00
parent 91983e16eb
commit 253c059614
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -271,15 +271,16 @@ public class InstanceContainer extends Instance {
final Runnable retriever = () -> loader.loadChunk(this, chunkX, chunkZ) final Runnable retriever = () -> loader.loadChunk(this, chunkX, chunkZ)
// create the chunk from scratch (with the generator) if the loader couldn't // create the chunk from scratch (with the generator) if the loader couldn't
.thenCompose(chunk -> chunk != null ? CompletableFuture.completedFuture(chunk) : createChunk(chunkX, chunkZ)) .thenCompose(chunk -> chunk != null ? CompletableFuture.completedFuture(chunk) : createChunk(chunkX, chunkZ))
// cache the retrieved chunk (in the next instance tick for thread-safety) // cache the retrieved chunk
.whenComplete((chunk, throwable) -> scheduleNextTick(instance -> { .whenComplete((chunk, throwable) -> {
// TODO run in the instance thread?
cacheChunk(chunk); cacheChunk(chunk);
EventDispatcher.call(new InstanceChunkLoadEvent(this, chunkX, chunkZ), GlobalHandles.INSTANCE_CHUNK_LOAD); EventDispatcher.call(new InstanceChunkLoadEvent(this, chunkX, chunkZ), GlobalHandles.INSTANCE_CHUNK_LOAD);
synchronized (loadingChunks) { synchronized (loadingChunks) {
this.loadingChunks.remove(ChunkUtils.getChunkIndex(chunk)); this.loadingChunks.remove(ChunkUtils.getChunkIndex(chunk));
} }
completableFuture.complete(chunk); completableFuture.complete(chunk);
})); });
if (loader.supportsParallelLoading()) { if (loader.supportsParallelLoading()) {
CompletableFuture.runAsync(retriever); CompletableFuture.runAsync(retriever);
} else { } else {