From 60c46c4b52e613ea75a7bae2fe179dc3fffb0410 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Tue, 27 Jun 2023 07:36:06 +1000 Subject: [PATCH] #1221: Add methods to get/set FallingBlock CancelDrop By: Parker Hawke --- .../world/entity/item/EntityFallingBlock.patch | 10 +++++++++- .../bukkit/craftbukkit/entity/CraftFallingBlock.java | 10 ++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch b/paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch index db4e674df76..9e43bec5cc8 100644 --- a/paper-server/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch +++ b/paper-server/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/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java index c78c13e2f07..59314c0c26b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java +++ b/paper-server/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;