2022-08-03 23:14:04 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
2024-04-19 22:03:32 +02:00
|
|
|
index 6d10396347b69d9243ab902ecc68ede93fa17b7d..af219df5267589300f0ad1d30fa5c81a1f50234f 100644
|
2022-08-03 23:14:04 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
2024-04-19 22:03:32 +02:00
|
|
|
@@ -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 {
|
2022-08-03 23:14:04 +02:00
|
|
|
public boolean isValidTool(ItemStack itemStack) {
|
|
|
|
return getDrops(itemStack).size() != 0;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void tick() {
|
2024-04-19 22:03:32 +02:00
|
|
|
+ final ServerLevel level = this.world.getMinecraftWorld();
|
|
|
|
+ this.getNMS().tick(level, this.position, level.random);
|
|
|
|
+ }
|
|
|
|
+
|
2022-08-03 23:14:04 +02:00
|
|
|
+
|
2024-04-19 22:03:32 +02:00
|
|
|
+ @Override
|
|
|
|
+ public void fluidTick() {
|
|
|
|
+ this.getNMSFluid().tick(this.world.getMinecraftWorld(), this.position);
|
2022-08-03 23:14:04 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void randomTick() {
|
2024-04-19 22:03:32 +02:00
|
|
|
+ final ServerLevel level = this.world.getMinecraftWorld();
|
|
|
|
+ this.getNMS().randomTick(level, this.position, level.random);
|
2022-08-03 23:14:04 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
2024-04-24 22:32:38 +02:00
|
|
|
index 48e8d0cc267706d3d8e29333d7fd6b89fdd88553..841b6cabd319229bff9f830c2fe4de102ad74906 100644
|
2022-08-03 23:14:04 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
2024-04-24 22:32:38 +02:00
|
|
|
@@ -736,4 +736,11 @@ public class CraftBlockData implements BlockData {
|
2023-08-25 19:57:11 +02:00
|
|
|
return speed;
|
2022-08-03 23:14:04 +02:00
|
|
|
}
|
2023-08-25 19:57:11 +02:00
|
|
|
// Paper end - destroy speed API
|
2023-03-20 09:47:10 +01:00
|
|
|
+
|
2022-08-03 23:14:04 +02:00
|
|
|
+ // Paper start - Block tick API
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isRandomlyTicked() {
|
|
|
|
+ return this.state.isRandomlyTicking();
|
|
|
|
+ }
|
2023-08-25 19:57:11 +02:00
|
|
|
+ // Paper end - Block tick API
|
2022-08-03 23:14:04 +02:00
|
|
|
}
|