From 63ca8a93025405480361ae683ec7875f93b0511f Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 26 Dec 2021 13:23:46 -0500 Subject: [PATCH] Block Ticking API --- .../bukkit/craftbukkit/block/CraftBlock.java | 24 +++++++++++++++++++ .../block/data/CraftBlockData.java | 7 ++++++ 2 files changed, 31 insertions(+) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java index 68fcec0853..7afb933782 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -78,6 +78,12 @@ public class CraftBlock implements Block { return this.world.getBlockState(this.position); } + // Paper start + public net.minecraft.world.level.material.FluidState getNMSFluid() { + return this.world.getFluidState(this.position); + } + // Paper end + public BlockPos getPosition() { return this.position; } @@ -709,5 +715,23 @@ public class CraftBlock implements Block { public boolean isValidTool(ItemStack itemStack) { return getDrops(itemStack).size() != 0; } + + @Override + public void tick() { + final ServerLevel level = this.world.getMinecraftWorld(); + this.getNMS().tick(level, this.position, level.random); + } + + + @Override + public void fluidTick() { + this.getNMSFluid().tick(this.world.getMinecraftWorld(), this.position, this.getNMS()); + } + + @Override + public void randomTick() { + final ServerLevel level = this.world.getMinecraftWorld(); + this.getNMS().randomTick(level, this.position, level.random); + } // Paper end } diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java index 78071859e9..fd941d9e38 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -761,4 +761,11 @@ public class CraftBlockData implements BlockData { return speed; } // Paper end - destroy speed API + + // Paper start - Block tick API + @Override + public boolean isRandomlyTicked() { + return this.state.isRandomlyTicking(); + } + // Paper end - Block tick API }