Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 15:07:36 +02:00
Code Issues Projects Releases Wiki Activity

InstanceContainer#setBlock should load chunks automatically if Instance#hasEnabledAutoChunkLoad returns true

Browse Source
This commit is contained in:
themode 2020-10-01 19:57:19 +02:00
parent 51530b8c61
commit 5d6145bb20
2 changed files with 44 additions and 3 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

@ -239,7 +239,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
protected abstract void createChunk(int chunkX, int chunkZ, ChunkCallback callback);
/**
* When set to true, chunks will load with players moving closer
* When set to true, chunks will load automatically when requested.
* Otherwise using {@link #loadChunk(int, int)} will be required to even spawn a player
*
* @param enable enable the auto chunk load
@ -247,7 +247,7 @@ public abstract class Instance implements BlockModifier, EventHandler, DataConta
public abstract void enableAutoChunkLoad(boolean enable);
/**
* Get if the instance should auto load chunks
* Get if the instance should auto load chunks.
*
* @return true if auto chunk load is enabled, false otherwise
*/

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

@ -106,9 +106,50 @@ public class InstanceContainer extends Instance {
setBlock(x, y, z, blockStateId, customBlock, data);
}
/**
* Set a block at the position
* <p>
* Verifies if the {@link Chunk} at the position is loaded, place the block if yes.
* Otherwise, check if {@link #hasEnabledAutoChunkLoad()} is true to load the chunk automatically and place the block.
*
* @param x the block X
* @param y the block Y
* @param z the block Z
* @param blockStateId the block state id
* @param customBlock the {@link CustomBlock}, null if none
* @param data the {@link Data}, null if none
*/
private synchronized void setBlock(int x, int y, int z, short blockStateId, CustomBlock customBlock, Data data) {
final Chunk chunk = getChunkAt(x, z);
Check.stateCondition(!ChunkUtils.isLoaded(chunk), "The chunk at " + x + " : " + z + " is not loaded!");
if (ChunkUtils.isLoaded(chunk)) {
UNSAFE_setBlock(chunk, x, y, z, blockStateId, customBlock, data);
} else {
if (hasEnabledAutoChunkLoad()) {
final int chunkX = ChunkUtils.getChunkCoordinate((int) x);
final int chunkZ = ChunkUtils.getChunkCoordinate((int) z);
loadChunk(chunkX, chunkZ, c -> {
UNSAFE_setBlock(c, x, y, z, blockStateId, customBlock, data);
});
} else {
throw new IllegalStateException("Tried to set a block to an unloaded chunk with auto chunk load disabled");
}
}
}
/**
* Set a block at the position
* <p>
* Unsafe because the method is not synchronized and it does not verify if the chunk is loaded or not
*
* @param chunk the {@link Chunk} which should be loaded
* @param x the block X
* @param y the block Y
* @param z the block Z
* @param blockStateId the block state id
* @param customBlock the {@link CustomBlock}, null if none
* @param data the {@link Data}, null if none
*/
private void UNSAFE_setBlock(Chunk chunk, int x, int y, int z, short blockStateId, CustomBlock customBlock, Data data) {
synchronized (chunk) {
final boolean isCustomBlock = customBlock != null;