Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 23:17:44 +02:00
Code Issues Projects Releases Wiki Activity

Make beacons force secondary potion effect application

Browse Source 
Fixes GH-273
Missed case from earlier fix 52f462d52d
This commit is contained in:
Zach Brown 2016-05-08 15:33:53 -05:00
parent c10df228a7
commit 442d190103
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0047-Add-BeaconEffectEvent.patch
View File

@ -1,11 +1,11 @@
From 0ef61deea4cab7fac10e7ece97a0811d5ac83113 Mon Sep 17 00:00:00 2001 From e1c0beb6e759e4ba5f108b9f1ac5f9c3fdd4b154 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 23:30:53 -0600 Date: Wed, 2 Mar 2016 23:30:53 -0600
Subject: [PATCH] Add BeaconEffectEvent Subject: [PATCH] Add BeaconEffectEvent
diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
index ed5b374..048f5bb 100644 index ed5b374..85b1441 100644
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
+++ b/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; @@ -13,6 +13,15 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@ -55,11 +55,11 @@ index ed5b374..048f5bb 100644
+ BeaconEffectEvent event = new BeaconEffectEvent(block, secondaryEffect, (Player) entityhuman.getBukkitEntity(), false); + BeaconEffectEvent event = new BeaconEffectEvent(block, secondaryEffect, (Player) entityhuman.getBukkitEntity(), false);
+ if (CraftEventFactory.callEvent(event).isCancelled()) continue; + if (CraftEventFactory.callEvent(event).isCancelled()) continue;
+ PotionEffect effect = event.getEffect(); + PotionEffect effect = event.getEffect();
+ entityhuman.getBukkitEntity().addPotionEffect(effect); + entityhuman.getBukkitEntity().addPotionEffect(effect, true);
+ // Paper end + // Paper end
} }
} }
} }
-- --
2.8.0 2.8.2