diff options
Diffstat (limited to 'patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch')
-rw-r--r-- | patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch new file mode 100644 index 0000000000..2f90dea41c --- /dev/null +++ b/patches/server/0579-Added-firing-of-PlayerChangeBeaconEffectEvent.patch @@ -0,0 +1,40 @@ +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 995a43ddcce8afb64404ef85641badd8035c6e3c..64e1571fab5f07cfe1b5203b36754f536b303f27 100644 +--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java ++++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java +@@ -158,13 +158,27 @@ public class BeaconMenu extends AbstractContainerMenu { + public MobEffect getSecondaryEffect() { + return MobEffect.byId(this.beaconData.get(2)); + } ++ // Paper start ++ private static @Nullable org.bukkit.potion.PotionEffectType convert(Optional<MobEffect> effect) { ++ return effect.flatMap(net.minecraft.core.Registry.MOB_EFFECT::getResourceKey).map(key -> { ++ return org.bukkit.potion.PotionEffectType.getByKey(org.bukkit.craftbukkit.util.CraftNamespacedKey.fromMinecraft(key.location())); ++ }).orElse(null); ++ } ++ // Paper end + + public void updateEffects(Optional<MobEffect> primary, Optional<MobEffect> secondary) { + if (this.paymentSlot.hasItem()) { +- this.beaconData.set(1, (Integer) primary.map(MobEffect::getId).orElse(-1)); +- this.beaconData.set(2, (Integer) secondary.map(MobEffect::getId).orElse(-1)); ++ // Paper start ++ io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), convert(primary), convert(secondary), this.access.getLocation().getBlock()); ++ if (event.callEvent()) { ++ this.beaconData.set(1, event.getPrimary() == null ? -1 : event.getPrimary().getId()); ++ this.beaconData.set(2, event.getSecondary() == null ? -1 : event.getSecondary().getId()); ++ if (event.willConsumeItem()) { ++ // Paper end + this.paymentSlot.remove(1); ++ } + this.access.execute(Level::blockEntityChanged); ++ } // Paper end + } + + } |