mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call onRemove logic for breakNaturally (#6854)

Browse source
This commit is contained in:
Jake Potrebic 2021-11-12 18:28:08 -08:00 committed by GitHub
parent f8992ee9b5
commit db0bff9c6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
patches/server/0843-Call-onRemove-logic-for-breakNaturally.patch Normal file
View file

@ -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