2021-08-25 03:42:23 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
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
|
2023-06-08 04:04:01 +02:00
|
|
|
index 36b196c8834c4eb873bfca0b12f1fc2b421ea071..9522e646529f3d849471931b4b3c0d133e7fcfc5 100644
|
2021-08-25 03:42:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/Block.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
|
2023-06-08 04:04:01 +02:00
|
|
|
@@ -319,6 +319,23 @@ public class Block extends BlockBehaviour implements ItemLike {
|
2021-08-25 03:42:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
+ // 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));
|
|
|
|
+ }
|
2022-06-08 14:19:54 +02:00
|
|
|
+ state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY, true);
|
2021-08-25 03:42:23 +02:00
|
|
|
+ }
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
|
2023-06-08 04:04:01 +02:00
|
|
|
public static void dropResources(BlockState state, Level world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
|
2021-08-25 03:42:23 +02:00
|
|
|
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
|
2023-06-08 04:04:01 +02:00
|
|
|
index 9abae63e06c1dde9b8434d32bac8798808428d10..9b3d253c4224410719bf778a4688fce13c12069d 100644
|
2021-08-25 03:42:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
|
2023-06-08 04:04:01 +02:00
|
|
|
@@ -401,7 +401,7 @@ public class PistonBaseBlock extends DirectionalBlock {
|
2021-08-25 03:42:23 +02:00
|
|
|
iblockdata1 = world.getBlockState(blockposition3);
|
|
|
|
BlockEntity tileentity = iblockdata1.hasBlockEntity() ? world.getBlockEntity(blockposition3) : null;
|
|
|
|
|
2021-11-25 02:24:51 +01:00
|
|
|
- dropResources(iblockdata1, world, blockposition3, tileentity);
|
|
|
|
+ dropResources(iblockdata1, world, blockposition3, tileentity, pos); // Paper
|
2021-08-25 03:42:23 +02:00
|
|
|
world.setBlock(blockposition3, Blocks.AIR.defaultBlockState(), 18);
|
2022-06-08 12:20:57 +02:00
|
|
|
world.gameEvent(GameEvent.BLOCK_DESTROY, blockposition3, GameEvent.Context.of(iblockdata1));
|
2022-03-01 06:43:03 +01:00
|
|
|
if (!iblockdata1.is(BlockTags.FIRE)) {
|
2021-08-25 03:42:23 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
2023-06-08 04:04:01 +02:00
|
|
|
index fbf699e777d45db3dcf1606d34f509ca1a5bbb7a..37fcbca0c56b7707a0c9f5d3ae874aff7268f6fc 100644
|
2021-08-25 03:42:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
|
2023-06-08 04:04:01 +02:00
|
|
|
@@ -292,7 +292,7 @@ public abstract class FlowingFluid extends Fluid {
|
2021-08-25 03:42:23 +02:00
|
|
|
((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);
|
2023-06-08 04:04:01 +02:00
|
|
|
@@ -300,6 +300,7 @@ public abstract class FlowingFluid extends Fluid {
|
2021-08-25 03:42:23 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
+ 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);
|
|
|
|
|
2023-06-08 04:04:01 +02:00
|
|
|
private static short getCacheKey(BlockPos from, BlockPos to) {
|
2021-08-25 03:42:23 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
2022-12-07 21:16:54 +01:00
|
|
|
index 1897c0012800d5ba9d2fc386f3e2bf57c9d878bb..82e85fbbd45244d02df90fa00c9046e7f51275a2 100644
|
2021-08-25 03:42:23 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
|
2022-12-07 21:16:54 +01:00
|
|
|
@@ -64,6 +64,13 @@ public abstract class WaterFluid extends FlowingFluid {
|
|
|
|
return world.getGameRules().getBoolean(GameRules.RULE_WATER_SOURCE_CONVERSION);
|
2021-08-25 03:42:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // 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;
|