OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/Spigot-Server-Patches/0342-BlockDestroyEvent.patch

42 lines
2.1 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-02 00:03:47 +02:00
From f884455c12a245c1c9d3e8d77fd1d1f855c67d2b Mon Sep 17 00:00:00 2001
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
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
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-02 00:03:47 +02:00
index f861957842..a3fbdf5db5 100644
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 7361a62e SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) 1dc91b15 Add specific notes about what is not API 2b05ef88 #484: Allow statistics to be accessed for offline players CraftBukkit Changes: f7d6ad53 SPIGOT-5603: Use LootContext#lootingModifier in CraftLootTable 5838285d SPIGOT-5657: BlockPlaceEvent not cancelling for tripwire hooks f325b9be SPIGOT-5641: Add Block.getDrops(ItemStack, Entity) e25a2272 Fix some formatting in CraftHumanEntity 498540e0 Add Merchant slot delegate b2de47d5 SPIGOT-5621: Add missing container types for opening InventoryView aa3a2f27 #645: Allow statistics to be accessed for offline players 2122c0b1 #649: CraftBell should implement Bell
2020-04-08 09:49:15 +02:00
@@ -452,8 +452,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
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) {
Fix some compile errors
2019-05-06 01:24:37 +02:00
+ com.destroystokyo.paper.event.block.BlockDestroyEvent event = new com.destroystokyo.paper.event.block.BlockDestroyEvent(MCUtil.toBukkitBlock(this, blockposition), fluid.getBlockData().createCraftBlockData(), flag);
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
+ 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) {
More 1.14 patches now we can rebase
2019-05-05 19:19:34 +02:00
TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null;
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
--
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
2020-05-02 00:03:47 +02:00
2.26.2
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, as this will not fire with the same velocity as BPE.
2019-02-26 02:40:23 +01:00
Reference in a new issue Copy permalink