mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
bc127ea819
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: eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent 205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron CraftBukkit Changes: b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket 4f34a67b #891: Fix scheduler task ID overflow and duplication issues Spigot Changes: d03d7f12 BUILDTOOLS-604: Rebuild patches
29 lines
1.7 KiB
Diff
29 lines
1.7 KiB
Diff
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] 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 6647cda859006f7afc9aae14f5c305e428b3c5c6..6a198f2590563577877ec8510bbdbab72c359aa7 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/BeaconMenu.java
|
|
@@ -160,9 +160,15 @@ 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);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
|
|
}
|