From 92f3f280d49c435e8b79d86a8f8f06d86068cecb Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Tue, 18 May 2021 01:43:46 -0700 Subject: [PATCH] Actually use extended/ambient in BeaconEffectEvent (#5647) --- Spigot-Server-Patches/Add-BeaconEffectEvent.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch index 7a0ea7cbfc..33bffdc9aa 100644 --- a/Spigot-Server-Patches/Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/Add-BeaconEffectEvent.patch @@ -47,8 +47,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper start - BeaconEffectEvent + BeaconEffectEvent event = new BeaconEffectEvent(block, effect, (Player) entityhuman.getBukkitEntity(), isPrimary); + if (CraftEventFactory.callEvent(event).isCancelled()) continue; -+ PotionEffect eventEffect = event.getEffect(); -+ entityhuman.addEffect(new MobEffect(MobEffectList.fromId(eventEffect.getType().getId()), eventEffect.getDuration(), eventEffect.getAmplifier(), true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON); ++ entityhuman.addEffect(new MobEffect(CraftPotionUtil.fromBukkit(event.getEffect())), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON); + // Paper end } }