From 5ac25a0ea16c5596da57d29a473fad1488b70b6b Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java index 536afe5312..df2d6c3b07 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -14,6 +14,11 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil; import org.bukkit.entity.HumanEntity; import org.bukkit.potion.PotionEffect; // CraftBukkit end +// Paper start +import org.bukkit.craftbukkit.event.CraftEventFactory; +import org.bukkit.entity.Player; +import com.destroystokyo.paper.event.block.BeaconEffectEvent; +// Paper end public class TileEntityBeacon extends TileEntity implements ITileInventory, ITickable { @@ -242,14 +247,31 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic } private void applyEffect(List list, MobEffectList effects, int i, int b0) { + // Paper - BeaconEffectEvent + applyEffect(list, effects, i, b0, true); + } + + private void applyEffect(List list, MobEffectList effects, int i, int b0, boolean isPrimary) { + // Paper - BeaconEffectEvent { Iterator iterator = list.iterator(); EntityHuman entityhuman; + // Paper start - BeaconEffectEvent + org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()); + PotionEffect effect = CraftPotionUtil.toBukkit(new MobEffect(effects, i, b0, true, true)); + // Paper end + while (iterator.hasNext()) { entityhuman = (EntityHuman) iterator.next(); - entityhuman.addEffect(new MobEffect(effects, i, b0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON); + + // 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); + // Paper end } } } @@ -272,10 +294,10 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic int i = getLevel(); List list = getHumansInRange(); - applyEffect(list, this.primaryEffect, i, b0); + applyEffect(list, this.primaryEffect, i, b0, true); // Paper - BeaconEffectEvent if (hasSecondaryEffect()) { - applyEffect(list, this.secondaryEffect, i, 0); + applyEffect(list, this.secondaryEffect, i, 0, false); // Paper - BeaconEffectEvent } } -- 2.25.1