2020-05-06 09:48:49 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2020-01-19 02:10:06 +00:00
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Jan 2020 12:25:07 -0600
Subject: [PATCH] Add effect to block break naturally
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
2020-09-10 23:47:58 +00:00
index 41bd71a55626b933c948e5c7e7b8af534eb896c4..f787238575ed7ac9108a2fd9782af55056219767 100644
2020-01-19 02:10:06 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
2020-08-27 13:37:37 +00:00
@@ -632,6 +632,13 @@ public class CraftBlock implements Block {
2020-01-19 02:10:06 +00:00
@Override
public boolean breakNaturally(ItemStack item) {
+ // Paper start
+ return breakNaturally(item, false);
+ }
+
+ @Override
+ public boolean breakNaturally(ItemStack item, boolean triggerEffect) {
+ // Paper end
// Order matters here, need to drop before setting to air so skulls can get their data
2020-05-12 05:27:03 +00:00
net.minecraft.server.IBlockData iblockdata = this.getNMS();
net.minecraft.server.Block block = iblockdata.getBlock();
2020-08-27 13:37:37 +00:00
@@ -641,6 +648,7 @@ public class CraftBlock implements Block {
2020-05-12 05:27:03 +00:00
// Modelled off EntityHuman#hasBlock
2020-08-25 02:22:08 +00:00
if (block != Blocks.AIR && (item == null || !iblockdata.isRequiresSpecialTool() || nmsItem.canDestroySpecialBlock(iblockdata))) {
2020-05-12 05:27:03 +00:00
net.minecraft.server.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);
2020-01-19 02:10:06 +00:00
+ if (triggerEffect) world.triggerEffect(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.server.Block.getCombinedId(block.getBlockData())); // Paper
result = true;
}