testserver/patches/server/0636-Introduce-beacon-activ...

38 lines
2.0 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Spyridon Pagkalos <spyridon@ender.gr>
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/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
index 008d486f4166d9f384e3aab48af6d66a255f3564..423560afba1bc03c0bb2b7d5d028451f34e59ec5 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
@@ -205,6 +205,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
2021-06-15 02:59:31 +00:00
BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
2021-06-11 12:02:28 +00:00
}
}
+ // Paper start - beacon activation/deactivation events
2021-06-15 02:59:31 +00:00
+ if (i1 <= 0 && blockEntity.levels > 0) {
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
2021-06-11 12:02:28 +00:00
+ new io.papermc.paper.event.block.BeaconActivatedEvent(block).callEvent();
2021-06-15 02:59:31 +00:00
+ } else if (i1 > 0 && blockEntity.levels <= 0) {
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
2021-06-11 12:02:28 +00:00
+ new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
+ }
+ // Paper end
2021-06-15 02:59:31 +00:00
if (blockEntity.lastCheckY >= l) {
blockEntity.lastCheckY = world.getMinBuildHeight() - 1;
@@ -262,6 +271,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
2021-06-11 12:02:28 +00:00
@Override
public void setRemoved() {
+ // Paper start - BeaconDeactivatedEvent
+ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(level, worldPosition);
+ new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
+ // Paper end
2021-06-15 02:59:31 +00:00
BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
2021-06-11 12:02:28 +00:00
super.setRemoved();
}