mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
32 lines
1.6 KiB
Diff
32 lines
1.6 KiB
Diff
|
--- 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<EntityLiving>) (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>) (entityliving) -> { // CraftBukkit - decompile error
|
||
|
|
return entityliving.getUniqueID().equals(this.k);
|
||
|
|
});
|
||
|
|
|