From 9f64f0d22a39a5356e2a31f84eeb1b3ef60fe3cf Mon Sep 17 00:00:00 2001 From: Parker Hawke Date: Tue, 27 Jun 2023 07:36:06 +1000 Subject: [PATCH] #1221: Add methods to get/set FallingBlock CancelDrop --- .../world/entity/item/EntityFallingBlock.patch | 10 +++++++++- .../bukkit/craftbukkit/entity/CraftFallingBlock.java | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch b/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch index db4e674df..9e43bec5c 100644 --- a/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch +++ b/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/item/EntityFallingBlock.java +++ b/net/minecraft/world/entity/item/EntityFallingBlock.java -@@ -49,6 +49,10 @@ +@@ -49,13 +49,17 @@ import net.minecraft.world.phys.Vec3D; import org.slf4j.Logger; @@ -11,6 +11,14 @@ public class EntityFallingBlock extends Entity { private static final Logger LOGGER = LogUtils.getLogger(); + private IBlockData blockState; + public int time; + public boolean dropItem; +- private boolean cancelDrop; ++ public boolean cancelDrop; // PAIL private -> public + public boolean hurtEntities; + public int fallDamageMax; + public float fallDamagePerDistance; @@ -83,10 +87,17 @@ } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java index c78c13e2f..59314c0c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java @@ -50,6 +50,16 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock { getHandle().dropItem = drop; } + @Override + public boolean getCancelDrop() { + return getHandle().cancelDrop; + } + + @Override + public void setCancelDrop(boolean cancelDrop) { + getHandle().cancelDrop = cancelDrop; + } + @Override public boolean canHurtEntities() { return getHandle().hurtEntities;