PaperMC/nms-patches/TileEntityConduit.patch

32 lines
1.6 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/TileEntityConduit.java
+++ b/net/minecraft/server/TileEntityConduit.java
2018-08-26 04:00:00 +02:00
@@ -152,7 +152,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
}
}
2018-08-26 04:00:00 +02:00
@@ -169,8 +169,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<EntityLiving>) (entitylivingx) -> { // CraftBukkit - decompile error
+ return entitylivingx instanceof IMonster && entitylivingx.ao(); // CraftBukkit - decompile error
});
if (!list.isEmpty()) {
2018-08-26 04:00:00 +02:00
@@ -215,7 +215,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>) (entityliving) -> { // CraftBukkit - decompile error
return entityliving.getUniqueID().equals(this.k);
});