aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0876-Add-getDrops-to-BlockState.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0876-Add-getDrops-to-BlockState.patch')
-rw-r--r--patches/server/0876-Add-getDrops-to-BlockState.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/server/0876-Add-getDrops-to-BlockState.patch b/patches/server/0876-Add-getDrops-to-BlockState.patch
new file mode 100644
index 0000000000..7f9d14aad9
--- /dev/null
+++ b/patches/server/0876-Add-getDrops-to-BlockState.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MelnCat <[email protected]>
+Date: Fri, 12 Aug 2022 23:24:37 -0700
+Subject: [PATCH] Add getDrops to BlockState
+
+Originally added isPreferredTool to BlockData but
+upstream added that.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+index 792bfc7eab33b26462e76a1912bd712e8af70073..b1abb332eca597b23888bca42d21d5b587f61b13 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+@@ -323,5 +323,33 @@ public class CraftBlockState implements BlockState {
+ public boolean isCollidable() {
+ return this.data.getBlock().hasCollision;
+ }
++
++ @Override
++ public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops() {
++ return this.getDrops(null);
++ }
++
++ @Override
++ public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item) {
++ return this.getDrops(item, null);
++ }
++
++ @Override
++ public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) {
++ net.minecraft.world.item.ItemStack nms = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(item);
++
++ // Modelled off EntityHuman#hasBlock
++ if (item == null || !data.requiresCorrectToolForDrops() || nms.isCorrectToolForDrops(data)) {
++ return net.minecraft.world.level.block.Block.getDrops(
++ data,
++ world.getHandle(),
++ position,
++ world.getHandle().getBlockEntity(position), entity == null ? null :
++ ((org.bukkit.craftbukkit.entity.CraftEntity) entity).getHandle(), nms
++ ).stream().map(org.bukkit.craftbukkit.inventory.CraftItemStack::asBukkitCopy).toList();
++ } else {
++ return java.util.Collections.emptyList();
++ }
++ }
+ // Paper end
+ }