mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-02 09:44:50 +02:00
03a4e7ac75
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: 37262de8 PR-812: Add Registry#match(String) d6b40162 SPIGOT-4569: Add more BlockData API f9691891 PR-809: Throw a more clear error for BlockIterators with zero direction, add Vector#isZero() 91e79e19 PR-804: Added methods to get translation keys for materials, itemstacks and more 426b00d3 PR-795: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 0e91ea52 SPIGOT-7224: Add events for brewing stands and campfires starting their actions CraftBukkit Changes: a50301aa5 Fix issues with fluid tag conversion and fluid #isTagged 6aeb5e4c3 SPIGOT-4569: Implement more BlockData API 7dbf862c2 PR-1131: Added methods to get translation keys for materials, itemstacks and more 7167588b1 PR-1117: Add new BiomeParameterPoint passed to BiomeProvider#getBiome 7c44152eb SPIGOT-7224: Add events for brewing stands and campfires starting their actions
69 lines
2.7 KiB
Diff
69 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 2 Jan 2020 12:25:16 -0600
|
|
Subject: [PATCH] Improve Block#breakNaturally API
|
|
|
|
Adds bool param to trigger world particle effects
|
|
|
|
Adds bool param to trigger exp drops for blocks
|
|
|
|
Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
index 3107abe94bb94b03b2e285c75ab0b7fdc7c0bc87..06ef9e133125d80127e1dbd6ae0eda89fa08a1d7 100644
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
@@ -481,6 +481,52 @@ public interface Block extends Metadatable, Translatable {
|
|
*/
|
|
boolean breakNaturally(@Nullable ItemStack tool);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Breaks the block and spawns item drops as if a player had broken it
|
|
+ *
|
|
+ * @param triggerEffect Play the block break particle effect and sound
|
|
+ * @return true if the block was destroyed
|
|
+ * @see #breakNaturally(boolean, boolean) to trigger exp drops
|
|
+ */
|
|
+ default boolean breakNaturally(boolean triggerEffect) {
|
|
+ return this.breakNaturally(triggerEffect, false);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Breaks the block and spawns item drops as if a player had broken it
|
|
+ *
|
|
+ * @param triggerEffect Play the block break particle effect and sound
|
|
+ * @param dropExperience drop exp if the block normally does so
|
|
+ * @return true if the block was destroyed
|
|
+ */
|
|
+ boolean breakNaturally(boolean triggerEffect, boolean dropExperience);
|
|
+
|
|
+ /**
|
|
+ * Breaks the block and spawns item drops as if a player had broken it
|
|
+ * with a specific tool
|
|
+ *
|
|
+ * @param tool The tool or item in hand used for digging
|
|
+ * @param triggerEffect Play the block break particle effect and sound
|
|
+ * @return true if the block was destroyed
|
|
+ * @see #breakNaturally(ItemStack, boolean, boolean) to trigger exp drops
|
|
+ */
|
|
+ default boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect) {
|
|
+ return this.breakNaturally(tool, triggerEffect, false);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Breaks the block and spawns item drops as if a player had broken it
|
|
+ * with a specific tool
|
|
+ *
|
|
+ * @param tool The tool or item in hand used for digging
|
|
+ * @param triggerEffect Play the block break particle effect and sound
|
|
+ * @param dropExperience drop exp if the block normally does so
|
|
+ * @return true if the block was destroyed
|
|
+ */
|
|
+ boolean breakNaturally(@NotNull ItemStack tool, boolean triggerEffect, boolean dropExperience);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Simulate bone meal application to this block (if possible).
|
|
*
|