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_(); }