Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
f97bb11e4b
* Account for splash water bottles now extinguishing entities * improvements and javadocs * reorder patches * rename event to WaterBottleSplashEvent Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
67 Zeilen
2.9 KiB
Diff
67 Zeilen
2.9 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 and isPreferredTool to BlockData
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java
|
|
index 10cbe71917bc32cca61748bcb0aa3395c554dbf8..37ca7b6b0fcee8bec12026ec3715dcc47400cc11 100644
|
|
--- a/src/main/java/org/bukkit/block/BlockState.java
|
|
+++ b/src/main/java/org/bukkit/block/BlockState.java
|
|
@@ -233,5 +233,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(@NotNull org.bukkit.inventory.ItemStack tool, @Nullable org.bukkit.entity.Entity entity);
|
|
// Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/block/data/BlockData.java b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
index bd987bd0a29618dfe07de50b194fd6fa694628ec..b166d053b3c44f06cb1f5b643e7f7e117eb21d17 100644
|
|
--- a/src/main/java/org/bukkit/block/data/BlockData.java
|
|
+++ b/src/main/java/org/bukkit/block/data/BlockData.java
|
|
@@ -160,5 +160,16 @@ public interface BlockData extends Cloneable {
|
|
* @return is ticked randomly
|
|
*/
|
|
boolean isRandomlyTicked();
|
|
+
|
|
+ /**
|
|
+ * Returns if the given item is a preferred choice to break this block.
|
|
+ *
|
|
+ * In some cases this determines if a block will drop anything or extra
|
|
+ * loot.
|
|
+ *
|
|
+ * @param tool The tool or item used for breaking this block
|
|
+ * @return true if the tool is preferred for breaking this block
|
|
+ */
|
|
+ boolean isPreferredTool(@NotNull org.bukkit.inventory.ItemStack tool);
|
|
// Paper end
|
|
}
|