33 lines
1.7 KiB
Diff
33 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index 5bff313dbbb3049105874846d995883e827fbc00..05f0833f762436bf8f5f5875c7e3cfed1da11e1c 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||
|
|
@@ -630,6 +630,13 @@ public class CraftBlock implements Block {
|
||
|
|
|
||
|
|
@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
|
||
|
|
net.minecraft.world.level.block.state.BlockState iblockdata = this.getNMS();
|
||
|
|
net.minecraft.world.level.block.Block block = iblockdata.getBlock();
|
||
|
|
@@ -639,6 +646,7 @@ public class CraftBlock implements Block {
|
||
|
|
// Modelled off EntityHuman#hasBlock
|
||
|
|
if (block != Blocks.AIR && (item == null || !iblockdata.requiresCorrectToolForDrops() || nmsItem.isCorrectToolForDrops(iblockdata))) {
|
||
|
|
net.minecraft.world.level.block.Block.dropResources(iblockdata, world.getLevel(), position, world.getBlockEntity(position), null, nmsItem);
|
||
|
|
+ if (triggerEffect) world.levelEvent(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.world.level.block.Block.getId(block.defaultBlockState())); // Paper
|
||
|
|
result = true;
|
||
|
|
}
|
||
|
|
|