PaperMC/Spigot-Server-Patches/0041-Add-BeaconEffectEvent.patch

74 lines
3.2 KiB
Diff
Raw Normal View History

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