mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 07:09:21 +08:00
Call onRemove logic for breakNaturally (#6854)
This commit is contained in:
parent
f8992ee9b5
commit
db0bff9c6a
@ -0,0 +1,26 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Sun, 31 Oct 2021 14:49:43 -0700
|
||||||
|
Subject: [PATCH] Call onRemove logic for breakNaturally
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
|
index 5154cfffc414e1f6039e55f1a256bbaacb56bc55..6f01af8cc3f9ed4d2eaa3304990ca33f8692a453 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
|
@@ -513,8 +513,14 @@ public class CraftBlock implements Block {
|
||||||
|
if (triggerEffect) world.levelEvent(org.bukkit.Effect.STEP_SOUND.getId(), position, net.minecraft.world.level.block.Block.getId(block.defaultBlockState())); // Paper
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
+ // Paper start
|
||||||
|
+ net.minecraft.world.level.block.state.BlockState newBlockState = Blocks.AIR.defaultBlockState();
|
||||||
|
+ if (this.world instanceof net.minecraft.world.level.Level level) {
|
||||||
|
+ iblockdata.onRemove(level, position, newBlockState, false);
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
|
||||||
|
- return this.setTypeAndData(Blocks.AIR.defaultBlockState(), true) && result;
|
||||||
|
+ return this.setTypeAndData(newBlockState, true) && result; // Paper
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
Loading…
Reference in New Issue
Block a user