aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch')
-rw-r--r--patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
new file mode 100644
index 0000000000..0c470fc8f2
--- /dev/null
+++ b/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Wed, 24 Jun 2020 15:14:51 -0600
+Subject: [PATCH] Added firing of PlayerChangeBeaconEffectEvent
+
+
+diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
+index 063998751c21b4f75cf3bfff6c51c4e8c42bd5f3..a515898e718effe92c91fd0ac45fbb70ddb5d626 100644
+--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
++++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
+@@ -160,10 +160,16 @@ public class BeaconMenu extends AbstractContainerMenu {
+
+ public void updateEffects(int primaryEffectId, int secondaryEffectId) {
+ if (this.paymentSlot.hasItem()) {
+- this.beaconData.set(1, primaryEffectId);
+- this.beaconData.set(2, secondaryEffectId);
++ // Paper start
++ io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), org.bukkit.potion.PotionEffectType.getById(primaryEffectId), org.bukkit.potion.PotionEffectType.getById(secondaryEffectId), this.access.getLocation().getBlock());
++ if (event.callEvent()) {
++ this.beaconData.set(1, event.getPrimary() == null ? 0 : event.getPrimary().getId());
++ this.beaconData.set(2, event.getSecondary() == null ? 0 : event.getSecondary().getId());
++ if (!event.willConsumeItem()) return;
+ this.paymentSlot.remove(1);
+ this.access.execute(Level::blockEntityChanged);
++ }
++ // Paper end
+ }
+
+ }