42 lines
2.1 KiB
Diff
42 lines
2.1 KiB
Diff
|
From 6e4b13bf79a67d16ff7c429afa6e9d7cc8673a35 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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/server/World.java b/src/main/java/net/minecraft/server/World.java
|
||
|
|
index ac14f562d4..8da2c3196b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
||
|
|
@@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
||
|
|
return false;
|
||
|
|
} else {
|
||
|
|
Fluid fluid = this.getFluid(blockposition);
|
||
|
|
+ // 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, blockposition), fluid.i().createCraftBlockData(), flag);
|
||
|
|
+ if (!event.callEvent()) {
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ playEffect = event.playEffect();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
|
||
|
|
- this.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata));
|
||
|
|
+ if (playEffect) this.triggerEffect(2001, blockposition, Block.getCombinedId(iblockdata)); // Paper
|
||
|
|
if (flag) {
|
||
|
|
iblockdata.a(this, blockposition, 0);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|