From 52f462d52d9d1a12199dbfc20c048650a53d0118 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 18 Mar 2016 20:45:22 -0500 Subject: [PATCH] Force potion effect application in BeaconEffectEvent --- Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch index da166d6961..ba4a0d297a 100644 --- a/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0046-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From 7d6d6ae6378901555401aa1b5c8667fe447733e7 Mon Sep 17 00:00:00 2001 +From 9d6d73c8bd8d97bdce92acec5e0da22a0755a336 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 ed5b374..f490dca 100644 +index ed5b374..048f5bb 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -13,6 +13,15 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -40,7 +40,7 @@ index ed5b374..f490dca 100644 + BeaconEffectEvent event = new BeaconEffectEvent(block, primaryEffect, (Player) entityhuman.getBukkitEntity(), true); + if (CraftEventFactory.callEvent(event).isCancelled()) continue; + PotionEffect effect = event.getEffect(); -+ entityhuman.getBukkitEntity().addPotionEffect(effect); ++ entityhuman.getBukkitEntity().addPotionEffect(effect, true); + // Paper end } @@ -61,5 +61,5 @@ index ed5b374..f490dca 100644 } } -- -2.7.2 +2.7.3