mirror of
https://github.com/Minestom/Minestom.git
synced 2024-09-29 15:07:36 +02:00
Small style cleanup
This commit is contained in:
parent
ba32acbd04
commit
eed97fd472
@ -80,7 +80,8 @@ public class AbsoluteBlockBatch implements Batch<Runnable> {
|
|||||||
*
|
*
|
||||||
* @param instance The instance in which the batch should be applied
|
* @param instance The instance in which the batch should be applied
|
||||||
* @param callback The callback to be executed when the batch is applied
|
* @param callback The callback to be executed when the batch is applied
|
||||||
* @param safeCallback If true, the callback will be executed in the next instance update. Otherwise it will be executed immediately upon completion
|
* @param safeCallback If true, the callback will be executed in the next instance update.
|
||||||
|
* Otherwise it will be executed immediately upon completion
|
||||||
*/
|
*/
|
||||||
protected void apply(@NotNull Instance instance, @Nullable Runnable callback, boolean safeCallback) {
|
protected void apply(@NotNull Instance instance, @Nullable Runnable callback, boolean safeCallback) {
|
||||||
synchronized (chunkBatchesMap) {
|
synchronized (chunkBatchesMap) {
|
||||||
|
@ -97,7 +97,8 @@ public class ChunkBatch implements Batch<ChunkCallback> {
|
|||||||
public void apply(@NotNull Instance instance, int chunkX, int chunkZ, @Nullable ChunkCallback callback) {
|
public void apply(@NotNull Instance instance, int chunkX, int chunkZ, @Nullable ChunkCallback callback) {
|
||||||
final Chunk chunk = instance.getChunk(chunkX, chunkZ);
|
final Chunk chunk = instance.getChunk(chunkX, chunkZ);
|
||||||
if (chunk == null) {
|
if (chunk == null) {
|
||||||
LOGGER.warn("Unable to apply ChunkBatch to unloaded chunk ({}, {}) in {}.", chunkX, chunkZ, instance.getUniqueId());
|
LOGGER.warn("Unable to apply ChunkBatch to unloaded chunk ({}, {}) in {}.",
|
||||||
|
chunkX, chunkZ, instance.getUniqueId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
apply(instance, chunk, callback);
|
apply(instance, chunk, callback);
|
||||||
@ -132,23 +133,29 @@ public class ChunkBatch implements Batch<ChunkCallback> {
|
|||||||
* @param instance The instance in which the batch should be applied
|
* @param instance The instance in which the batch should be applied
|
||||||
* @param chunk The target chunk
|
* @param chunk The target chunk
|
||||||
* @param callback The callback to be executed when the batch is applied
|
* @param callback The callback to be executed when the batch is applied
|
||||||
* @param safeCallback If true, the callback will be executed in the next instance update. Otherwise it will be executed immediately upon completion
|
* @param safeCallback If true, the callback will be executed in the next instance update.
|
||||||
|
* Otherwise it will be executed immediately upon completion
|
||||||
*/
|
*/
|
||||||
protected void apply(@NotNull Instance instance, @NotNull Chunk chunk, @Nullable ChunkCallback callback, boolean safeCallback) {
|
protected void apply(@NotNull Instance instance,
|
||||||
|
@NotNull Chunk chunk, @Nullable ChunkCallback callback,
|
||||||
|
boolean safeCallback) {
|
||||||
BLOCK_BATCH_POOL.execute(() -> singleThreadFlush(instance, chunk, callback, safeCallback));
|
BLOCK_BATCH_POOL.execute(() -> singleThreadFlush(instance, chunk, callback, safeCallback));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies this batch in the current thread, executing the callback upon completion.
|
* Applies this batch in the current thread, executing the callback upon completion.
|
||||||
*/
|
*/
|
||||||
private void singleThreadFlush(Instance instance, Chunk chunk, @Nullable ChunkCallback callback, boolean safeCallback) {
|
private void singleThreadFlush(Instance instance,
|
||||||
|
Chunk chunk, @Nullable ChunkCallback callback,
|
||||||
|
boolean safeCallback) {
|
||||||
if (blocks.isEmpty()) {
|
if (blocks.isEmpty()) {
|
||||||
OptionalCallback.execute(callback, chunk);
|
OptionalCallback.execute(callback, chunk);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!chunk.isLoaded()) {
|
if (!chunk.isLoaded()) {
|
||||||
LOGGER.warn("Unable to apply ChunkBatch to unloaded chunk ({}, {}) in {}.", chunk.getChunkX(), chunk.getChunkZ(), instance.getUniqueId());
|
LOGGER.warn("Unable to apply ChunkBatch to unloaded chunk ({}, {}) in {}.",
|
||||||
|
chunk.getChunkX(), chunk.getChunkZ(), instance.getUniqueId());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
|
|||||||
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
|
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
|
||||||
import net.minestom.server.data.Data;
|
import net.minestom.server.data.Data;
|
||||||
import net.minestom.server.instance.Instance;
|
import net.minestom.server.instance.Instance;
|
||||||
import net.minestom.server.instance.InstanceContainer;
|
|
||||||
import net.minestom.server.utils.BlockPosition;
|
import net.minestom.server.utils.BlockPosition;
|
||||||
import net.minestom.server.utils.validate.Check;
|
import net.minestom.server.utils.validate.Check;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
Loading…
Reference in New Issue
Block a user