Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix nullability on Block#breakNaturally (#6651)

Browse Source
This commit is contained in:
booky10 2021-09-30 19:42:44 +02:00
parent 7e3620fce5
commit e3ec51968c
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/Add-effect-to-block-break-naturally.patch
View File

@ -14,8 +14,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start + // Paper start
+ /** + /**
+ * Breaks the block and spawns items as if a player had digged it with a + * Breaks the block and spawns item drops as if a player had broken it
+ * specific tool + *
+ * @param triggerEffect Play the block break particle effect and sound
+ * @return true if the block was destroyed
+ */
+ boolean breakNaturally(boolean triggerEffect);
+
+ /**
+ * 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 tool The tool or item in hand used for digging
+ * @param triggerEffect Play the block break particle effect and sound + * @param triggerEffect Play the block break particle effect and sound

5
patches/server/Add-effect-to-block-break-naturally.patch
View File

@ -17,6 +17,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @Override + @Override
+ public boolean breakNaturally(boolean triggerEffect) {
+ return breakNaturally(null, triggerEffect);
+ }
+
+ @Override
+ public boolean breakNaturally(ItemStack item, boolean triggerEffect) { + public boolean breakNaturally(ItemStack item, boolean triggerEffect) {
+ // Paper end + // Paper end
// Order matters here, need to drop before setting to air so skulls can get their data // Order matters here, need to drop before setting to air so skulls can get their data