From 814c742554e40554a30cee1915b42457081000c6 Mon Sep 17 00:00:00 2001 From: kaenganxt Date: Fri, 20 Jul 2018 16:04:37 +1000 Subject: SPIGOT-840, SPIGOT-2522: [Draft] Add EntityPotionEffectChangeEvent Discussion ongoing in PR #449 --- nms-patches/TileEntityConduit.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 nms-patches/TileEntityConduit.patch (limited to 'nms-patches/TileEntityConduit.patch') diff --git a/nms-patches/TileEntityConduit.patch b/nms-patches/TileEntityConduit.patch new file mode 100644 index 00000000..23d9e0fa --- /dev/null +++ b/nms-patches/TileEntityConduit.patch @@ -0,0 +1,31 @@ +--- a/net/minecraft/server/TileEntityConduit.java ++++ b/net/minecraft/server/TileEntityConduit.java +@@ -154,7 +154,7 @@ + EntityHuman entityhuman = (EntityHuman) iterator.next(); + + if (this.position.m(new BlockPosition(entityhuman)) <= (double) j && entityhuman.ao()) { +- entityhuman.addEffect(new MobEffect(MobEffects.CONDUIT_POWER, 260, 0, true, true)); ++ entityhuman.addEffect(new MobEffect(MobEffects.CONDUIT_POWER, 260, 0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.CONDUIT); // CraftBukkit + } + } + +@@ -171,8 +171,8 @@ + this.j = this.l(); + this.k = null; + } else if (this.j == null) { +- List list = this.world.a(EntityLiving.class, this.k(), (entityliving) -> { +- return entityliving instanceof IMonster && entityliving.ao(); ++ List list = this.world.a(EntityLiving.class, this.k(), (Predicate) (entitylivingx) -> { // CraftBukkit - decompile error ++ return entitylivingx instanceof IMonster && entitylivingx.ao(); // CraftBukkit - decompile error + }); + + if (!list.isEmpty()) { +@@ -217,7 +217,7 @@ + + @Nullable + private EntityLiving l() { +- List list = this.world.a(EntityLiving.class, this.k(), (entityliving) -> { ++ List list = this.world.a(EntityLiving.class, this.k(), (Predicate) (entityliving) -> { // CraftBukkit - decompile error + return entityliving.getUniqueID().equals(this.k); + }); + -- cgit v1.2.3