2018-07-19 12:42:43 +08:00
From fbe8dee64d19c1cf190701395ebc83d94de3d92d Mon Sep 17 00:00:00 2001
2016-03-01 07:09:49 +08:00
From: Byteflux <byte@byteflux.net>
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
2018-07-15 09:53:17 +08:00
index c0db08f61..32b53bcae 100644
2016-03-01 07:09:49 +08:00
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
2018-07-15 09:53:17 +08:00
@@ -16,6 +16,12 @@ import org.bukkit.entity.HumanEntity;
2016-07-27 08:30:03 +08:00
import org.bukkit.potion.PotionEffect;
2016-03-01 07:09:49 +08:00
// CraftBukkit end
+// Paper start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.entity.Player;
+import com.destroystokyo.paper.event.block.BeaconEffectEvent;
+// Paper end
+
2018-07-15 09:53:17 +08:00
public class TileEntityBeacon extends TileEntityContainer implements IWorldInventory, ITickable {
2016-03-01 07:09:49 +08:00
public static final MobEffectList[][] a = new MobEffectList[][] { { MobEffects.FASTER_MOVEMENT, MobEffects.FASTER_DIG}, { MobEffects.RESISTANCE, MobEffects.JUMP}, { MobEffects.INCREASE_DAMAGE}, { MobEffects.REGENERATION}};
2018-07-15 09:53:17 +08:00
@@ -130,14 +136,30 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
2016-07-27 08:30:03 +08:00
}
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();
2016-03-01 07:09:49 +08:00
EntityHuman entityhuman;
2016-07-27 08:30:03 +08:00
+ // Paper start - BeaconEffectEvent
2016-03-01 07:09:49 +08:00
+ org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
2016-07-27 08:30:03 +08:00
+ PotionEffect effect = CraftPotionUtil.toBukkit(new MobEffect(effects, i, b0, true, true));
2016-03-01 07:09:49 +08:00
+ // Paper end
+
while (iterator.hasNext()) {
entityhuman = (EntityHuman) iterator.next();
2016-07-27 08:30:03 +08:00
- entityhuman.addEffect(new MobEffect(effects, i, b0, true, true));
2016-03-01 07:09:49 +08:00
+ // Paper start - BeaconEffectEvent
2016-07-27 08:30:03 +08:00
+ BeaconEffectEvent event = new BeaconEffectEvent(block, effect, (Player) entityhuman.getBukkitEntity(), isPrimary);
2016-03-01 07:09:49 +08:00
+ if (CraftEventFactory.callEvent(event).isCancelled()) continue;
2016-07-27 08:30:03 +08:00
+ PotionEffect eventEffect = event.getEffect();
+ entityhuman.getBukkitEntity().addPotionEffect(eventEffect, true);
2016-03-01 07:09:49 +08:00
+ // Paper end
}
2016-07-27 08:30:03 +08:00
}
}
2018-07-15 09:53:17 +08:00
@@ -159,10 +181,10 @@ public class TileEntityBeacon extends TileEntityContainer implements IWorldInven
2016-07-27 08:30:03 +08:00
int i = getLevel();
List list = getHumansInRange();
2016-03-01 07:09:49 +08:00
2016-11-17 10:23:38 +08:00
- applyEffect(list, this.primaryEffect, i, b0);
+ applyEffect(list, this.primaryEffect, i, b0, true); // Paper - BeaconEffectEvent
2016-03-01 07:09:49 +08:00
2016-07-27 08:30:03 +08:00
if (hasSecondaryEffect()) {
2016-11-17 10:23:38 +08:00
- applyEffect(list, this.secondaryEffect, i, 0);
+ applyEffect(list, this.secondaryEffect, i, 0, false); // Paper - BeaconEffectEvent
2016-03-01 07:09:49 +08:00
}
}
2016-07-27 08:30:03 +08:00
2016-03-01 07:09:49 +08:00
--
2018-07-04 15:55:24 +08:00
2.18.0
2016-03-01 07:09:49 +08:00