twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-30 19:52:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw NPE for unplaced blockstate on #getDrops (#10366)

Browse Source
This commit is contained in:
Lulu13022002
2024-04-06 23:26:56 +02:00
parent 8a2bd44f1f
commit 2089697232
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/api/Add-getDrops-to-BlockState.patch
View File

@@ -19,9 +19,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * 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
+ * @throws IllegalStateException if this block state is not placed
+ */
+ @NotNull
+ java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops();
+ default java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops() {
+ return this.getDrops(null);
+ }
+
+ /**
+ * Returns an immutable list of items which would drop by destroying this block state
@@ -29,9 +32,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @param tool The tool or item in hand used for digging
+ * @return an immutable list of dropped items for the block state
+ * @throws IllegalStateException if this block state is not placed
+ */
+ @NotNull
+ java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops(@Nullable org.bukkit.inventory.ItemStack tool);
+ default java.util.@org.jetbrains.annotations.Unmodifiable Collection<org.bukkit.inventory.ItemStack> getDrops(@Nullable org.bukkit.inventory.ItemStack tool) {
+ return this.getDrops(tool, null);
+ }
+
+ /**
+ * Returns an immutable list of items which would drop by the entity destroying this
@@ -40,6 +46,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ * @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
+ * @throws IllegalStateException if this block state is not placed
+ */
+ @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);