diff --git a/Spigot-API-Patches/0291-Introduce-beacon-activation-deactivation-events.patch b/Spigot-API-Patches/0291-Introduce-beacon-activation-deactivation-events.patch new file mode 100644 index 0000000000..776ee50cb6 --- /dev/null +++ b/Spigot-API-Patches/0291-Introduce-beacon-activation-deactivation-events.patch @@ -0,0 +1,101 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spyridon Pagkalos +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..a907015c769c754a1599325068259ca0f109489a +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/block/BeaconActivatedEvent.java +@@ -0,0 +1,40 @@ ++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.NotNull; ++ ++/** ++ * Called when a beacon is activated. ++ * Activation occurs when the beacon activation sound is played, and the beam becomes visible. ++ */ ++public class BeaconActivatedEvent extends BlockEvent { ++ private static final HandlerList handlers = new HandlerList(); ++ ++ 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) block.getState(); ++ } ++ ++ @NotNull ++ @Override ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} +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..34f18468b4cfc08717cc3442778c9e85124e5a22 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/block/BeaconDeactivatedEvent.java +@@ -0,0 +1,43 @@ ++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.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 handlers = new HandlerList(); ++ ++ public BeaconDeactivatedEvent(@NotNull Block block) { ++ super(block); ++ } ++ ++ /** ++ * Returns the beacon that was deactivated. ++ * This will return 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 null if it does not exist. ++ */ ++ @Nullable ++ public Beacon getBeacon() { ++ return block.getType() == Material.BEACON ? (Beacon) block.getState() : null; ++ } ++ ++ @NotNull ++ @Override ++ public HandlerList getHandlers() { ++ return handlers; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return handlers; ++ } ++} diff --git a/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch b/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch new file mode 100644 index 0000000000..d765b73ca2 --- /dev/null +++ b/Spigot-Server-Patches/0718-Introduce-beacon-activation-deactivation-events.patch @@ -0,0 +1,52 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spyridon Pagkalos +Date: Thu, 25 Mar 2021 20:28:04 +0200 +Subject: [PATCH] Introduce beacon activation/deactivation events + + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java +index 8dfb9eb12d07c2d4737ecf3de1ae7f6de31891bf..732398fb0ae6427c776d8a56aed9afd4a5b70e30 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityBeacon.java +@@ -46,6 +47,8 @@ import org.bukkit.potion.PotionEffect; + import org.bukkit.craftbukkit.event.CraftEventFactory; + import org.bukkit.entity.Player; + import com.destroystokyo.paper.event.block.BeaconEffectEvent; ++import io.papermc.paper.event.block.BeaconActivatedEvent; ++import io.papermc.paper.event.block.BeaconDeactivatedEvent; + // Paper end + + public class TileEntityBeacon extends TileEntity implements ITileInventory, ITickable { +@@ -211,6 +214,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic + boolean flag1 = this.levels > 0; + + if (!flag && flag1) { ++ // Paper start - BeaconActivatedEvent ++ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, position); ++ new BeaconActivatedEvent(block).callEvent(); ++ // Paper end + this.a(SoundEffects.BLOCK_BEACON_ACTIVATE); + Iterator iterator = this.world.a(EntityPlayer.class, (new AxisAlignedBB((double) i, (double) j, (double) k, (double) i, (double) (j - 4), (double) k)).grow(10.0D, 5.0D, 10.0D)).iterator(); + +@@ -220,6 +227,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic + CriterionTriggers.l.a(entityplayer, this); + } + } else if (flag && !flag1) { ++ // Paper start - BeaconDeactivatedEvent ++ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, position); ++ new BeaconDeactivatedEvent(block).callEvent(); ++ // Paper end + this.a(SoundEffects.BLOCK_BEACON_DEACTIVATE); + } + } +@@ -257,6 +268,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic + + @Override + public void al_() { ++ // Paper start - BeaconDeactivatedEvent ++ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, position); ++ new BeaconDeactivatedEvent(block).callEvent(); ++ // Paper end + this.a(SoundEffects.BLOCK_BEACON_DEACTIVATE); + super.al_(); + }