Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-03 23:17:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix callback when no chunk generator is defined

Browse Source
This commit is contained in:
Felix Cravic 2020-08-03 11:26:10 +02:00
parent 8333eb9f70
commit 40d4af31c8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/instance/Instance.java
View File

@ -776,7 +776,9 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
}); });
} }
final Chunk chunk = getChunkAt(entity.getPosition()); final Position entityPosition = entity.getPosition();
final Chunk chunk = getChunkAt(entityPosition);
Check.notNull(chunk, "You tried to spawn an entity in an unloaded chunk, " + entityPosition);
addEntityToChunk(entity, chunk); addEntityToChunk(entity, chunk);
}); });
} }

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

@ -453,6 +453,10 @@ public class InstanceContainer extends Instance {
final ChunkBatch chunkBatch = createChunkBatch(chunk); final ChunkBatch chunkBatch = createChunkBatch(chunk);
chunkBatch.flushChunkGenerator(chunkGenerator, callback); chunkBatch.flushChunkGenerator(chunkGenerator, callback);
} else {
// No chunk generator, execute the callback with the empty chunk
if (callback != null)
callback.accept(chunk);
} }
callChunkLoadEvent(chunkX, chunkZ); callChunkLoadEvent(chunkX, chunkZ);