aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2022-03-13 08:47:54 +0100
committerGitHub <[email protected]>2022-03-13 08:47:54 +0100
commit1358d1e9146ca80d0ff84a644c7796d20b39765c (patch)
treeb387981c9a67bfad7e649813c1f1ea30fecfb4d9 /patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
parentab03538fa1af67a941ad0a9de75d367f13046c8d (diff)
downloadPaper-1358d1e9146ca80d0ff84a644c7796d20b39765c.tar.gz
Paper-1358d1e9146ca80d0ff84a644c7796d20b39765c.zip
Updated Upstream (CraftBukkit/Spigot) (#7580)
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: 881e06e5 PR-725: Add Item Unlimited Lifetime APIs CraftBukkit Changes: 74c08312 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall 64db5126 SPIGOT-6959: Make /loot command ignore empty items for spawn 2d760831 Increase outdated build delay 9ed7e4fb SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel fc4ad813 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent 59733a2e SPIGOT-6961: Actually return a copy of the ItemMeta Spigot Changes: ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue e19ddabd PR-1011: Add Item Unlimited Lifetime APIs 34d40b0e SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication
Diffstat (limited to 'patches/server/0635-Introduce-beacon-activation-deactivation-events.patch')
-rw-r--r--patches/server/0635-Introduce-beacon-activation-deactivation-events.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
new file mode 100644
index 0000000000..4858e0f40b
--- /dev/null
+++ b/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spyridon Pagkalos <[email protected]>
+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 82976b3675f581a9f3ccb9e23048bd44864203f8..8d5c9813010a0256bd2712a1eabbc91f0f473a41 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
+@@ -204,6 +204,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
+ BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
+ }
+ }
++ // Paper start - beacon activation/deactivation events
++ if (i1 <= 0 && blockEntity.levels > 0) {
++ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
++ new io.papermc.paper.event.block.BeaconActivatedEvent(block).callEvent();
++ } else if (i1 > 0 && blockEntity.levels <= 0) {
++ org.bukkit.block.Block block = org.bukkit.craftbukkit.block.CraftBlock.at(world, pos);
++ new io.papermc.paper.event.block.BeaconDeactivatedEvent(block).callEvent();
++ }
++ // Paper end
+
+ if (blockEntity.lastCheckY >= l) {
+ blockEntity.lastCheckY = world.getMinBuildHeight() - 1;
+@@ -261,6 +270,10 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider {
+
+ @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
+ BeaconBlockEntity.playSound(this.level, this.worldPosition, SoundEvents.BEACON_DEACTIVATE);
+ super.setRemoved();
+ }