ea855e2b46
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 Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Also, restore a patch that was dropped in the last upstream Bukkit Changes: 279eeab3 Fix command description not being set 96e2bb18 Remove debug print from SyntheticEventTest CraftBukkit Changes:d3ed1516Fix dangerously threaded beacons217a293dDon't relocate joptsimple to allow --help to work.1be05a21Prepare for imminent Java 12 releasea49270b2Mappings Update5259d80cSPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports Spigot Changes: e6eb36f2 Rebuild patches
114 Zeilen
3.4 KiB
Diff
114 Zeilen
3.4 KiB
Diff
From b8447c34438a04b863e11cfa7a0ddf0524eca24f Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Wed, 6 Feb 2019 00:19: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/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
|
|
new file mode 100644
|
|
index 000000000..3aee12f1c
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java
|
|
@@ -0,0 +1,92 @@
|
|
+package com.destroystokyo.paper.event.block;
|
|
+
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.block.data.BlockData;
|
|
+import org.bukkit.event.Cancellable;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Fired anytime the server intends to 'destroy' a block through some triggering reason.
|
|
+ * This does not fire anytime a block is set to air, but only with more direct triggers such
|
|
+ * as physics updates, pistons, Entities changing blocks, commands set to "Destroy".
|
|
+ *
|
|
+ * This event is associated with the game playing a sound effect at the block in question, when
|
|
+ * something can be described as "intend to destroy what is there",
|
|
+ *
|
|
+ * Events such as leaves decaying, pistons retracting (where the block is moving), does NOT fire this event.
|
|
+ *
|
|
+ */
|
|
+public class BlockDestroyEvent extends BlockEvent implements Cancellable {
|
|
+
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ @NotNull private final BlockData newState;
|
|
+ private final boolean willDrop;
|
|
+ private boolean playEffect;
|
|
+
|
|
+ private boolean cancelled = false;
|
|
+
|
|
+ public BlockDestroyEvent(@NotNull Block block, @NotNull BlockData newState, boolean willDrop) {
|
|
+ super(block);
|
|
+ this.newState = newState;
|
|
+ this.willDrop = willDrop;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return The new state of this block (Air, or a Fluid type)
|
|
+ */
|
|
+ @NotNull
|
|
+ public BlockData getNewState() {
|
|
+ return newState;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return If the server is going to drop the block in question with this destroy event
|
|
+ */
|
|
+ public boolean willDrop() {
|
|
+ return this.willDrop;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return If the server is going to play the sound effect for this destruction
|
|
+ */
|
|
+ public boolean playEffect() {
|
|
+ return this.playEffect;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @param playEffect If the server should play the sound effect for this destruction
|
|
+ */
|
|
+ public void setPlayEffect(boolean playEffect) {
|
|
+ this.playEffect = playEffect;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @return If the event is cancelled, meaning the block will not be destroyed
|
|
+ */
|
|
+ @Override
|
|
+ public boolean isCancelled() {
|
|
+ return cancelled;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * If the event is cancelled, the block will remain in its previous state.
|
|
+ * @param cancel true if you wish to cancel this event
|
|
+ */
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
--
|
|
2.21.0
|
|
|