From eed97fd472a5c55b8eb2b173e6c8a7cc1b140856 Mon Sep 17 00:00:00 2001
From: themode <themode@outlook.fr>
Date: Fri, 8 Jan 2021 15:45:36 +0100
Subject: [PATCH] Small style cleanup

---
 .../instance/batch/AbsoluteBlockBatch.java      |  3 ++-
 .../server/instance/batch/ChunkBatch.java       | 17 ++++++++++++-----
 .../instance/batch/RelativeBlockBatch.java      |  1 -
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/minestom/server/instance/batch/AbsoluteBlockBatch.java b/src/main/java/net/minestom/server/instance/batch/AbsoluteBlockBatch.java
index d5bac04b5..fb0dbe00f 100644
--- a/src/main/java/net/minestom/server/instance/batch/AbsoluteBlockBatch.java
+++ b/src/main/java/net/minestom/server/instance/batch/AbsoluteBlockBatch.java
@@ -80,7 +80,8 @@ public class AbsoluteBlockBatch implements Batch<Runnable> {
      *
      * @param instance     The instance in which the batch should be 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) {
         synchronized (chunkBatchesMap) {
diff --git a/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
index 9b7381ce5..6e270a130 100644
--- a/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
+++ b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
@@ -97,7 +97,8 @@ public class ChunkBatch implements Batch<ChunkCallback> {
     public void apply(@NotNull Instance instance, int chunkX, int chunkZ, @Nullable ChunkCallback callback) {
         final Chunk chunk = instance.getChunk(chunkX, chunkZ);
         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;
         }
         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 chunk        The target chunk
      * @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));
     }
 
     /**
      * 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()) {
             OptionalCallback.execute(callback, chunk);
             return;
         }
 
         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;
         }
 
diff --git a/src/main/java/net/minestom/server/instance/batch/RelativeBlockBatch.java b/src/main/java/net/minestom/server/instance/batch/RelativeBlockBatch.java
index 76e833d06..99ab524aa 100644
--- a/src/main/java/net/minestom/server/instance/batch/RelativeBlockBatch.java
+++ b/src/main/java/net/minestom/server/instance/batch/RelativeBlockBatch.java
@@ -6,7 +6,6 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import net.minestom.server.data.Data;
 import net.minestom.server.instance.Instance;
-import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.utils.BlockPosition;
 import net.minestom.server.utils.validate.Check;
 import org.jetbrains.annotations.NotNull;