diff options
author | Spottedleaf <[email protected]> | 2024-07-17 10:24:53 -0700 |
---|---|---|
committer | Spottedleaf <[email protected]> | 2024-07-17 10:28:32 -0700 |
commit | 00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6 (patch) | |
tree | 82639515bc5e9ae00c1e639e72137ed51e1ac688 /patches/server/0749-Add-getDrops-to-BlockState.patch | |
parent | 967f98aa81da851740aeb429778e46159fd188df (diff) | |
download | Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.tar.gz Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.zip |
Remove Moonrise utils to MCUtils, remove duplicated/unused utils
Diffstat (limited to 'patches/server/0749-Add-getDrops-to-BlockState.patch')
-rw-r--r-- | patches/server/0749-Add-getDrops-to-BlockState.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/server/0749-Add-getDrops-to-BlockState.patch b/patches/server/0749-Add-getDrops-to-BlockState.patch new file mode 100644 index 0000000000..ea12f69bde --- /dev/null +++ b/patches/server/0749-Add-getDrops-to-BlockState.patch @@ -0,0 +1,37 @@ +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 e96023b71845526383288917e8d7c5759a4c0e9b..fa63a6cfcfcc4eee4503a82d85333c139c8c8b2b 100644 +--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java ++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +@@ -347,5 +347,24 @@ public class CraftBlockState implements BlockState { + public boolean isCollidable() { + return this.data.getBlock().hasCollision; + } ++ ++ @Override ++ public java.util.Collection<org.bukkit.inventory.ItemStack> getDrops(org.bukkit.inventory.ItemStack item, org.bukkit.entity.Entity entity) { ++ this.requirePlaced(); ++ 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 + } |