dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
64 Zeilen
2.3 KiB
Diff
64 Zeilen
2.3 KiB
Diff
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
|
|
index 6d10396347b69d9243ab902ecc68ede93fa17b7d..af219df5267589300f0ad1d30fa5c81a1f50234f 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
|
+++ b/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);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void randomTick() {
|
|
+ final ServerLevel level = this.world.getMinecraftWorld();
|
|
+ this.getNMS().randomTick(level, this.position, level.random);
|
|
+ }
|
|
// 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
|
|
index 33869e725c3b3f2120fa36ca468019a78321e862..64ddd6d1c40dc91b6e7fc3118403415bb4533d97 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
|
|
@@ -752,4 +752,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
|
|
}
|