aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0297-BlockDestroyEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0297-BlockDestroyEvent.patch')
-rw-r--r--patches/server/0297-BlockDestroyEvent.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/patches/server/0297-BlockDestroyEvent.patch b/patches/server/0297-BlockDestroyEvent.patch
new file mode 100644
index 0000000000..6671426322
--- /dev/null
+++ b/patches/server/0297-BlockDestroyEvent.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 6 Feb 2019 00:20:33 -0500
+Subject: [PATCH] BlockDestroyEvent
+
+Adds an event for when the server is going to destroy a current block,
+potentially causing it to drop. This event can be cancelled to avoid
+the block destruction, such as preventing signs from popping when
+floating in the air.
+
+This can replace many uses of BlockPhysicsEvent
+
+diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
+index dc2235824853a0d7ccbff51dd26a71e97fe90ba7..a00b4c84cc27678c07d0195a90f38dc458a11862 100644
+--- a/src/main/java/net/minecraft/world/level/Level.java
++++ b/src/main/java/net/minecraft/world/level/Level.java
+@@ -29,6 +29,7 @@ import net.minecraft.nbt.CompoundTag;
+ import net.minecraft.network.protocol.Packet;
+ import net.minecraft.resources.ResourceKey;
+ import net.minecraft.resources.ResourceLocation;
++import net.minecraft.server.MCUtil;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.level.ChunkHolder;
+ import net.minecraft.server.level.ServerLevel;
+@@ -563,8 +564,20 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+ return false;
+ } else {
+ FluidState fluid = this.getFluidState(pos);
++ // Paper start - while the above setAir method is named same and looks very similar
++ // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent,
++ // it doesn't imply destruction of a block that plays a sound effect / drops an item.
++ boolean playEffect = true;
++ if (com.destroystokyo.paper.event.block.BlockDestroyEvent.getHandlerList().getRegisteredListeners().length > 0) {
++ com.destroystokyo.paper.event.block.BlockDestroyEvent event = new com.destroystokyo.paper.event.block.BlockDestroyEvent(MCUtil.toBukkitBlock(this, pos), fluid.createLegacyBlock().createCraftBlockData(), drop);
++ if (!event.callEvent()) {
++ return false;
++ }
++ playEffect = event.playEffect();
++ }
++ // Paper end
+
+- if (!(iblockdata.getBlock() instanceof BaseFireBlock)) {
++ if (playEffect && !(iblockdata.getBlock() instanceof BaseFireBlock)) { // Paper
+ this.levelEvent(2001, pos, Block.getId(iblockdata));
+ }
+