mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
5c7081fecc
* 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes:4090d01fSPIGOT-5047: Correct slot types for 1.14 inventoriese8c08362SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks.d445af3bSPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
114 lines
3.4 KiB
Diff
114 lines
3.4 KiB
Diff
From 5ab789847092498cb922959f046373d0c2976d13 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
|
|
|