71c84c8132
Upstream has released updates that appear 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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
108 Zeilen
3.3 KiB
Diff
108 Zeilen
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spyridon Pagkalos <spyridon@ender.gr>
|
|
Date: Thu, 25 Mar 2021 20:25:47 +0200
|
|
Subject: [PATCH] Introduce beacon activation/deactivation events
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java b/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..05609ec9df637c9aa53528218cbc8cda30f0aea1
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
|
|
@@ -0,0 +1,43 @@
|
|
+package io.papermc.paper.event.block;
|
|
+
|
|
+import org.bukkit.block.Beacon;
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a beacon is activated.
|
|
+ * Activation occurs when the beacon beam becomes visible.
|
|
+ */
|
|
+public class BeaconActivatedEvent extends BlockEvent {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public BeaconActivatedEvent(@NotNull Block block) {
|
|
+ super(block);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the beacon that was activated.
|
|
+ *
|
|
+ * @return the beacon that was activated.
|
|
+ */
|
|
+ @NotNull
|
|
+ public Beacon getBeacon() {
|
|
+ return (Beacon) this.block.getState();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java b/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..dc106d6bfbd9d0ab84b17597d71381a5c0b07d64
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
|
|
@@ -0,0 +1,46 @@
|
|
+package io.papermc.paper.event.block;
|
|
+
|
|
+import org.bukkit.Material;
|
|
+import org.bukkit.block.Beacon;
|
|
+import org.bukkit.block.Block;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.block.BlockEvent;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+/**
|
|
+ * Called when a beacon is deactivated, either because its base block(s) or itself were destroyed.
|
|
+ */
|
|
+public class BeaconDeactivatedEvent extends BlockEvent {
|
|
+
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public BeaconDeactivatedEvent(@NotNull Block block) {
|
|
+ super(block);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the beacon that was deactivated.
|
|
+ * This will return {@code null} if the beacon does not exist.
|
|
+ * (which can occur after the deactivation of a now broken beacon)
|
|
+ *
|
|
+ * @return The beacon that got deactivated, or {@code null} if it does not exist.
|
|
+ */
|
|
+ @Nullable
|
|
+ public Beacon getBeacon() {
|
|
+ return this.block.getType() == Material.BEACON ? (Beacon) this.block.getState() : null;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|