4cdbb0c86c
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 044d4ee9 SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 57b73d57 PR-913: Deprecate Projectile#doesBounce() and #setBounce() 43373c44 PR-904: Update FeatureFlag for 1.20.2 a7bbbf0c PR-911: Expand DataPack API with 1.20.2 pack version methods 0341e3a0 SPIGOT-7489: Add TeleportDuration to Display Entity bcd8d2aa PR-912: Update Minecraft Wiki URLs CraftBukkit Changes: 99aafc222 Increase outdated build delay dab849f08 SPIGOT-7283, SPIGOT-7318: Add AsyncStructureGenerateEvent and BlockState cloning 041b29ae3 Upgrade specialsource-maven-plugin 851a32cff PR-1263: Remove unused implementation of AbstractProjectile#doesBounce() and #setBounce() 251af0da3 PR-1261: Expand DataPack API with 1.20.2 pack version methods 46e4ba627 Upgrade specialsource-maven-plugin df3738a24 SPIGOT-7489: Add TeleportDuration to Display Entity 8d0fea457 PR-1262: Update Minecraft Wiki URLs e62905aab SPIGOT-7490: Fix entity equipment updates Spigot Changes: a0f3d486 Rebuild patches
47 Zeilen
2.1 KiB
Diff
47 Zeilen
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MelnCat <melncatuwu@gmail.com>
|
|
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 1308720c6f3072a5442b93d495e03735419d59eb..cfd1c68d7ad23ef20242306d7d8148921d697ca5 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
|
|
@@ -337,5 +337,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
|
|
}
|