diff --git a/src/main/java/net/minestom/server/instance/InstanceContainer.java b/src/main/java/net/minestom/server/instance/InstanceContainer.java index 4e11ae7de..2cb5cfd4d 100644 --- a/src/main/java/net/minestom/server/instance/InstanceContainer.java +++ b/src/main/java/net/minestom/server/instance/InstanceContainer.java @@ -74,7 +74,7 @@ public class InstanceContainer extends Instance { // Set the block if (isCustomBlock) { - data = BLOCK_MANAGER.getCustomBlock(customBlockId).createData(x, y, z, data); + data = BLOCK_MANAGER.getCustomBlock(customBlockId).createData(blockPosition, data); chunk.UNSAFE_setCustomBlock(x, y, z, customBlockId, data); } else { chunk.UNSAFE_setBlock(x, y, z, blockId, data); diff --git a/src/main/java/net/minestom/server/instance/block/CustomBlock.java b/src/main/java/net/minestom/server/instance/block/CustomBlock.java index e57667db4..20de0f38e 100644 --- a/src/main/java/net/minestom/server/instance/block/CustomBlock.java +++ b/src/main/java/net/minestom/server/instance/block/CustomBlock.java @@ -68,13 +68,12 @@ public abstract class CustomBlock { /** * Initialises data for this block - * @param x X position of the block - * @param y Y position of the block - * @param z Z position of the block - * @param data data given to 'setBlock', can be null + * + * @param blockPosition the position of the targeted block + * @param data data given to 'setBlock', can be null * @return Data for this block. Can be null, 'data', or a new object */ - public Data createData(int x, int y, int z, Data data) { + public Data createData(BlockPosition blockPosition, Data data) { return data; } } diff --git a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java index 7d4e1b55f..703c3482b 100644 --- a/src/main/java/net/minestom/server/listener/BlockPlacementListener.java +++ b/src/main/java/net/minestom/server/listener/BlockPlacementListener.java @@ -78,7 +78,7 @@ public class BlockPlacementListener { } if (!intersect) { - PlayerBlockPlaceEvent playerBlockPlaceEvent = new PlayerBlockPlaceEvent(material.getBlock().getBlockId(), (short)0, blockPosition, packet.hand); + PlayerBlockPlaceEvent playerBlockPlaceEvent = new PlayerBlockPlaceEvent(block.getBlockId(), (short) 0, blockPosition, packet.hand); playerBlockPlaceEvent.consumeBlock(player.getGameMode() != GameMode.CREATIVE); // BlockPlacementRule check