aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0688-Add-BlockBreakBlockEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0688-Add-BlockBreakBlockEvent.patch')
-rw-r--r--patches/server/0688-Add-BlockBreakBlockEvent.patch86
1 files changed, 86 insertions, 0 deletions
diff --git a/patches/server/0688-Add-BlockBreakBlockEvent.patch b/patches/server/0688-Add-BlockBreakBlockEvent.patch
new file mode 100644
index 0000000000..a69de03ab7
--- /dev/null
+++ b/patches/server/0688-Add-BlockBreakBlockEvent.patch
@@ -0,0 +1,86 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 3 Jan 2021 17:58:11 -0800
+Subject: [PATCH] Add BlockBreakBlockEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
+index 2db7b9f145b53df5ef79ae235a0de7ccff50db7e..2e65b44f10aeb44fd524a58e7eb815a566c1ad61 100644
+--- a/src/main/java/net/minecraft/world/level/block/Block.java
++++ b/src/main/java/net/minecraft/world/level/block/Block.java
+@@ -333,6 +333,23 @@ public class Block extends BlockBehaviour implements ItemLike {
+ }
+
+ }
++ // Paper start
++ public static boolean dropResources(BlockState state, LevelAccessor world, BlockPos pos, @Nullable BlockEntity blockEntity, BlockPos source) {
++ if (world instanceof ServerLevel) {
++ List<org.bukkit.inventory.ItemStack> items = com.google.common.collect.Lists.newArrayList();
++ for (net.minecraft.world.item.ItemStack drop : net.minecraft.world.level.block.Block.getDrops(state, world.getMinecraftWorld(), pos, blockEntity)) {
++ items.add(org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(drop));
++ }
++ io.papermc.paper.event.block.BlockBreakBlockEvent event = new io.papermc.paper.event.block.BlockBreakBlockEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, pos), org.bukkit.craftbukkit.block.CraftBlock.at(world, source), items);
++ event.callEvent();
++ for (var drop : event.getDrops()) {
++ popResource(world.getMinecraftWorld(), pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
++ }
++ state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY, true);
++ }
++ return true;
++ }
++ // Paper end
+
+ public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, Entity entity, ItemStack stack) {
+ if (world instanceof ServerLevel) {
+diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+index 8d73893100884c08aa552ff41c2a07a3e714df47..24a822ade17849a083161216c184f02c30b5cb1f 100644
+--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+@@ -400,7 +400,7 @@ public class PistonBaseBlock extends DirectionalBlock {
+ iblockdata1 = world.getBlockState(blockposition3);
+ BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
+
+- dropResources(iblockdata1, world, blockposition3, tileentity);
++ dropResources(iblockdata1, world, blockposition3, tileentity, pos); // Paper
+ world.setBlock(blockposition3, Blocks.AIR.defaultBlockState(), 18);
+ world.gameEvent(GameEvent.BLOCK_DESTROY, blockposition3, GameEvent.Context.of(iblockdata1));
+ if (!iblockdata1.is(BlockTags.FIRE)) {
+diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+index 02be7c3d104fe3b3a2772201f5ebdfb6d16e9b49..ff40fe323964f173561a6838fb443e79abf9df38 100644
+--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
++++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
+@@ -294,7 +294,7 @@ public abstract class FlowingFluid extends Fluid {
+ ((LiquidBlockContainer) state.getBlock()).placeLiquid(world, pos, state, fluidState);
+ } else {
+ if (!state.isAir()) {
+- this.beforeDestroyingBlock(world, pos, state);
++ this.beforeDestroyingBlock(world, pos, state, pos.relative(direction.getOpposite())); // Paper
+ }
+
+ world.setBlock(pos, fluidState.createLegacyBlock(), 3);
+@@ -302,6 +302,7 @@ public abstract class FlowingFluid extends Fluid {
+
+ }
+
++ protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { beforeDestroyingBlock(world, pos, state); } // Paper - add source parameter
+ protected abstract void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state);
+
+ private static short getCacheKey(BlockPos blockposition, BlockPos blockposition1) {
+diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
+index a10b6a6b0ff9c104a94be3e9d0d1757333d81a00..ac33ba631f4b0ae0e08bff5748440ef5b76c2117 100644
+--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
++++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
+@@ -63,6 +63,13 @@ public abstract class WaterFluid extends FlowingFluid {
+ return true;
+ }
+
++ // Paper start
++ @Override
++ protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) {
++ BlockEntity tileentity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
++ Block.dropResources(state, world, pos, tileentity, source);
++ }
++ // Paper end
+ @Override
+ protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state) {
+ BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;