diff --git a/src/main/java/net/minestom/server/instance/Chunk.java b/src/main/java/net/minestom/server/instance/Chunk.java
index 92ce4df3b..c8b6ed4ff 100644
--- a/src/main/java/net/minestom/server/instance/Chunk.java
+++ b/src/main/java/net/minestom/server/instance/Chunk.java
@@ -11,6 +11,7 @@ import net.minestom.server.event.player.PlayerChunkLoadEvent;
 import net.minestom.server.event.player.PlayerChunkUnloadEvent;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.instance.block.BlockGetter;
+import net.minestom.server.instance.block.BlockSetter;
 import net.minestom.server.network.packet.server.play.ChunkDataPacket;
 import net.minestom.server.network.packet.server.play.UpdateLightPacket;
 import net.minestom.server.network.player.PlayerConnection;
@@ -45,7 +46,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * You generally want to avoid storing references of this object as this could lead to a huge memory leak,
  * you should store the chunk coordinates instead.
  */
-public abstract class Chunk implements BlockGetter, Viewable, Tickable, DataContainer {
+public abstract class Chunk implements BlockGetter, BlockSetter, Viewable, Tickable, DataContainer {
 
     protected static final BiomeManager BIOME_MANAGER = MinecraftServer.getBiomeManager();
 
@@ -103,7 +104,8 @@ public abstract class Chunk implements BlockGetter, Viewable, Tickable, DataCont
      * @param z     the block Z
      * @param block the block to place
      */
-    public abstract void UNSAFE_setBlock(int x, int y, int z, @NotNull Block block);
+    @Override
+    public abstract void setBlock(int x, int y, int z, @NotNull Block block);
 
     /**
      * Executes a chunk tick.
diff --git a/src/main/java/net/minestom/server/instance/DynamicChunk.java b/src/main/java/net/minestom/server/instance/DynamicChunk.java
index f858a482c..6ef15e156 100644
--- a/src/main/java/net/minestom/server/instance/DynamicChunk.java
+++ b/src/main/java/net/minestom/server/instance/DynamicChunk.java
@@ -71,7 +71,7 @@ public class DynamicChunk extends Chunk {
     }
 
     @Override
-    public void UNSAFE_setBlock(int x, int y, int z, @NotNull Block block) {
+    public void setBlock(int x, int y, int z, @NotNull Block block) {
         final short blockStateId = block.getStateId();
         final BlockHandler handler = block.getHandler();
         final NBTCompound nbt = null; // TODO
@@ -305,7 +305,7 @@ public class DynamicChunk extends Chunk {
                     Block block = Block.fromStateId(blockStateId);
                     // TODO read other data
 
-                    UNSAFE_setBlock(x, y, z, block);
+                    setBlock(x, y, z, block);
                 }
 
                 // Finished reading
diff --git a/src/main/java/net/minestom/server/instance/InstanceContainer.java b/src/main/java/net/minestom/server/instance/InstanceContainer.java
index cbf63ea92..9bea531da 100644
--- a/src/main/java/net/minestom/server/instance/InstanceContainer.java
+++ b/src/main/java/net/minestom/server/instance/InstanceContainer.java
@@ -154,7 +154,7 @@ public class InstanceContainer extends Instance {
             block = executeBlockPlacementRule(block, blockPosition);
 
             // Set the block
-            chunk.UNSAFE_setBlock(x, y, z, block);
+            chunk.setBlock(x, y, z, block);
 
             // Refresh neighbors since a new block has been placed
             executeNeighboursBlockPlacementRule(blockPosition);
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 e907870a8..42254d6e6 100644
--- a/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
+++ b/src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
@@ -215,7 +215,7 @@ public class ChunkBatch implements Batch<ChunkCallback> {
             Block prevBlock = chunk.getBlock(x, y, z);
             inverse.setBlock(x, y, z, prevBlock);
         }
-        chunk.UNSAFE_setBlock(x, y, z, block);
+        chunk.setBlock(x, y, z, block);
         return ChunkUtils.getSectionAt(y);
     }
 
diff --git a/src/main/java/net/minestom/server/instance/batch/ChunkGenerationBatch.java b/src/main/java/net/minestom/server/instance/batch/ChunkGenerationBatch.java
index d66e3a710..2add11811 100644
--- a/src/main/java/net/minestom/server/instance/batch/ChunkGenerationBatch.java
+++ b/src/main/java/net/minestom/server/instance/batch/ChunkGenerationBatch.java
@@ -20,7 +20,7 @@ public class ChunkGenerationBatch extends ChunkBatch {
 
     @Override
     public void setBlock(int x, int y, int z, @NotNull Block block) {
-        chunk.UNSAFE_setBlock(x, y, z, block);
+        chunk.setBlock(x, y, z, block);
     }
 
     public void generate(@NotNull ChunkGenerator chunkGenerator, @Nullable ChunkCallback callback) {