mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 16:29:45 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
48 lines
2.0 KiB
Diff
48 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MelnCat <melncatuwu@gmail.com>
|
|
Date: Fri, 12 Aug 2022 23:24:53 -0700
|
|
Subject: [PATCH] Add getDrops to BlockState
|
|
|
|
Originally added isPreferredTool to BlockData but
|
|
upstream added that.
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
|
|
index c439cf0bb6c50db2b3304c60e50046f096392f9f..ef35316fa66ac8d9c7836b9c8af56dcefbf6ff2e 100644
|
|
--- a/src/main/java/org/bukkit/block/BlockState.java
|
|
+++ b/src/main/java/org/bukkit/block/BlockState.java
|
|
@@ -243,5 +243,34 @@ public interface BlockState extends Metadatable {
|
|
* @return true if collidable
|
|
*/
|
|
boolean isCollidable();
|
|
+
|
|
+ /**
|
|
+ * Returns an immutable list of items which would drop by destroying this block state.
|
|
+ *
|
|
+ * @return an immutable list of dropped items for the block state
|
|
+ */
|
|
+ @NotNull
|
|
+ java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops();
|
|
+
|
|
+ /**
|
|
+ * Returns an immutable list of items which would drop by destroying this block state
|
|
+ * with a specific tool
|
|
+ *
|
|
+ * @param tool The tool or item in hand used for digging
|
|
+ * @return an immutable list of dropped items for the block state
|
|
+ */
|
|
+ @NotNull
|
|
+ java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops(@Nullable org.bukkit.inventory.ItemStack tool);
|
|
+
|
|
+ /**
|
|
+ * Returns an immutable list of items which would drop by the entity destroying this
|
|
+ * block state with a specific tool
|
|
+ *
|
|
+ * @param tool The tool or item in hand used for digging
|
|
+ * @param entity the entity destroying the block
|
|
+ * @return an immutable list of dropped items for the block state
|
|
+ */
|
|
+ @NotNull
|
|
+ java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops(@Nullable org.bukkit.inventory.ItemStack tool, @Nullable org.bukkit.entity.Entity entity);
|
|
// Paper end
|
|
}
|