Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-16 13:11:40 +01:00
Code Issues Projects Releases Wiki Activity

Replaced the queue by an ArrayDeque

Browse Source
This commit is contained in:
themode 2020-10-22 23:31:09 +02:00
parent 1c28272cb7
commit d2eff4abbc
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.instance.batch;
import kotlin.collections.ArrayDeque;
import net.minestom.server.data.Data;
import net.minestom.server.instance.*;
import net.minestom.server.instance.block.CustomBlock;
@ -7,7 +8,6 @@ import net.minestom.server.utils.block.CustomBlockUtils;
import net.minestom.server.utils.chunk.ChunkCallback;
import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
* Used when all the blocks you want to place can be contained within only one {@link Chunk},
@ -20,11 +20,13 @@ import java.util.concurrent.ConcurrentLinkedQueue;
*/
public class ChunkBatch implements InstanceBatch {
private static final int INITIAL_SIZE = (Chunk.CHUNK_SIZE_X * Chunk.CHUNK_SIZE_Y * Chunk.CHUNK_SIZE_Z) / 2;
private final InstanceContainer instance;
private final Chunk chunk;
// Using a linked queue because we do not need to access data at a specific index
private final ConcurrentLinkedQueue<BlockData> dataList = new ConcurrentLinkedQueue<>();
// Need to be synchronized manually
private final ArrayDeque<BlockData> dataList = new ArrayDeque<>(INITIAL_SIZE);
public ChunkBatch(InstanceContainer instance, Chunk chunk) {
this.instance = instance;
@ -50,8 +52,10 @@ public class ChunkBatch implements InstanceBatch {
private void addBlockData(byte x, int y, byte z, short blockStateId, short customBlockId, Data data) {
// TODO store a single long with bitwise operators (xyz;boolean,short,short,boolean) with the data in a map
final BlockData blockData = new BlockData(x, y, z, blockStateId, customBlockId, data);
synchronized (dataList) {
this.dataList.add(blockData);
}
}
public void flushChunkGenerator(ChunkGenerator chunkGenerator, ChunkCallback callback) {
BLOCK_BATCH_POOL.execute(() -> {
@ -99,8 +103,10 @@ public class ChunkBatch implements InstanceBatch {
* Resets the chunk batch by removing all the entries.
*/
public void clearData() {
synchronized (dataList) {
this.dataList.clear();
}
}
/**
* Executes the batch in the current thread.
@ -113,9 +119,11 @@ public class ChunkBatch implements InstanceBatch {
if (!chunk.isLoaded())
return;
synchronized (dataList) {
for (BlockData data : dataList) {
data.apply(chunk);
}
}
// Refresh chunk for viewers
chunk.sendChunkUpdate();