Paper/patches/server/0497-Add-PlayerChangeBeaconEffectEvent.patch

39 lines
2.6 KiB
Diff
Raw Normal View History

2022-06-08 09:30:41 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Wed, 24 Jun 2020 15:14:51 -0600
Subject: [PATCH] Add PlayerChangeBeaconEffectEvent
2022-06-08 09:30:41 +02:00
diff --git a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
2024-04-24 15:46:45 +02:00
index c2fa423e14fc08c10483415baa2148af269c3758..866dd476829bd59501021a8c24bde6d8e8778963 100644
2022-06-08 09:30:41 +02:00
--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
2024-04-24 15:46:45 +02:00
@@ -171,12 +171,25 @@ public class BeaconMenu extends AbstractContainerMenu {
2023-09-22 07:41:27 +02:00
return BeaconMenu.decodeEffect(this.beaconData.get(2));
2022-06-08 09:30:41 +02:00
}
2024-02-01 10:15:57 +01:00
+ // Paper start - Add PlayerChangeBeaconEffectEvent
2024-04-24 15:46:45 +02:00
+ private static @Nullable org.bukkit.potion.PotionEffectType convert(Optional<Holder<MobEffect>> optionalEffect) {
2024-02-01 10:15:57 +01:00
+ return optionalEffect.map(org.bukkit.craftbukkit.potion.CraftPotionEffectType::minecraftToBukkit).orElse(null);
2022-06-08 09:30:41 +02:00
+ }
+ // Paper end - Add PlayerChangeBeaconEffectEvent
2024-02-01 10:15:57 +01:00
+
2024-04-24 15:46:45 +02:00
public void updateEffects(Optional<Holder<MobEffect>> primary, Optional<Holder<MobEffect>> secondary) {
2022-06-08 09:30:41 +02:00
if (this.paymentSlot.hasItem()) {
2024-04-24 15:46:45 +02:00
- this.beaconData.set(1, BeaconMenu.encodeEffect((Holder) primary.orElse(null)));// CraftBukkit - decompile error
- this.beaconData.set(2, BeaconMenu.encodeEffect((Holder) secondary.orElse(null)));// CraftBukkit - decompile error
+ // Paper start - Add PlayerChangeBeaconEffectEvent
2022-06-08 09:30:41 +02:00
+ 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()) {
2024-04-24 15:46:45 +02:00
+ // Paper end - Add PlayerChangeBeaconEffectEvent
+ this.beaconData.set(1, BeaconMenu.encodeEffect(event.getPrimary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraftHolder(event.getPrimary())));// CraftBukkit - decompile error
+ this.beaconData.set(2, BeaconMenu.encodeEffect(event.getSecondary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraftHolder(event.getSecondary())));// CraftBukkit - decompile error
+ if (event.willConsumeItem()) { // Paper
2022-06-08 09:30:41 +02:00
this.paymentSlot.remove(1);
2024-04-24 15:46:45 +02:00
+ } // Paper
2022-06-08 09:30:41 +02:00
this.access.execute(Level::blockEntityChanged);
+ } // Paper end - Add PlayerChangeBeaconEffectEvent
2022-06-08 09:30:41 +02:00
}
}