2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-09-29 21:52:13 +02:00
|
|
|
index 0000000000000000000000000000000000000000..380538656e675fdfaf9077da8ff48dc5c427a657
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java
|
2024-09-29 21:52:13 +02:00
|
|
|
@@ -0,0 +1,41 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+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;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-29 21:52:13 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Called when a beacon is activated.
|
|
|
|
+ * Activation occurs when the beacon beam becomes visible.
|
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+@NullMarked
|
2021-06-11 14:02:28 +02:00
|
|
|
+public class BeaconActivatedEvent extends BlockEvent {
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
|
|
|
+ @ApiStatus.Internal
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public BeaconActivatedEvent(final Block block) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ super(block);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the beacon that was activated.
|
|
|
|
+ *
|
|
|
|
+ * @return the beacon that was activated.
|
|
|
|
+ */
|
|
|
|
+ public Beacon getBeacon() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return (Beacon) this.block.getState();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return HANDLER_LIST;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static HandlerList getHandlerList() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return HANDLER_LIST;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
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
|
2024-09-29 21:52:13 +02:00
|
|
|
index 0000000000000000000000000000000000000000..4e5b2b2413e2aae03132ecd76123cd93dfbd77ce
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java
|
2024-09-29 21:52:13 +02:00
|
|
|
@@ -0,0 +1,44 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+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;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-29 21:52:13 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
|
|
|
+import org.jspecify.annotations.Nullable;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Called when a beacon is deactivated, either because its base block(s) or itself were destroyed.
|
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+@NullMarked
|
2021-06-11 14:02:28 +02:00
|
|
|
+public class BeaconDeactivatedEvent extends BlockEvent {
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
|
|
|
+ @ApiStatus.Internal
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public BeaconDeactivatedEvent(final Block block) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ super(block);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the beacon that was deactivated.
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * This will return {@code null} if the beacon does not exist.
|
2021-06-11 14:02:28 +02:00
|
|
|
+ * (which can occur after the deactivation of a now broken beacon)
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return The beacon that got deactivated, or {@code null} if it does not exist.
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public @Nullable Beacon getBeacon() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.block.getType() == Material.BEACON ? (Beacon) this.block.getState() : null;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return HANDLER_LIST;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static HandlerList getHandlerList() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return HANDLER_LIST;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|