3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 11:30:06 +01:00
Paper/patches/unapplied/server/0513-Add-PlayerChangeBeaconEffectEvent.patch

38 Zeilen
2.4 KiB
Diff

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-02-01 10:15:57 +01:00
index e6a4e8dcdbc49b427c2802f1a358f8f9ad04d0f0..b670c0cb3886c99d38a91b5c13aa2cefaae702cf 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-02-01 10:15:57 +01:00
@@ -170,12 +170,24 @@ 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-02-01 10:15:57 +01:00
+ private static @Nullable org.bukkit.potion.PotionEffectType convert(Optional<MobEffect> optionalEffect) {
+ 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
+
2022-06-08 09:30:41 +02:00
public void updateEffects(Optional<MobEffect> primary, Optional<MobEffect> secondary) {
if (this.paymentSlot.hasItem()) {
2023-09-22 07:41:27 +02:00
- this.beaconData.set(1, BeaconMenu.encodeEffect((MobEffect) primary.orElse(null))); // CraftBukkit - decompile error
- this.beaconData.set(2, BeaconMenu.encodeEffect((MobEffect) 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()) {
2023-09-22 07:41:27 +02:00
+ this.beaconData.set(1, BeaconMenu.encodeEffect(event.getPrimary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraft(event.getPrimary())));
+ this.beaconData.set(2, BeaconMenu.encodeEffect(event.getSecondary() == null ? null : org.bukkit.craftbukkit.potion.CraftPotionEffectType.bukkitToMinecraft(event.getSecondary())));
+ if (event.willConsumeItem()) {
2022-06-08 09:30:41 +02:00
this.paymentSlot.remove(1);
2023-09-22 07:41:27 +02:00
+ }
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
}
}