Paper/nms-patches/TileEntityConduit.patch

57 lines
2.7 KiB
Diff
Raw Normal View History

--- a/net/minecraft/server/TileEntityConduit.java
+++ b/net/minecraft/server/TileEntityConduit.java
2018-12-25 22:00:00 +01:00
@@ -6,6 +6,10 @@
import java.util.Random;
import java.util.UUID;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+// CraftBukkit end
public class TileEntityConduit extends TileEntity implements ITickable {
2018-12-25 22:00:00 +01:00
@@ -151,7 +155,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-12-25 22:00:00 +01:00
@@ -168,7 +172,7 @@
2018-10-22 21:00:00 +02:00
this.target = this.l();
this.k = null;
2018-10-22 21:00:00 +02:00
} else if (this.target == null) {
2018-12-25 22:00:00 +01:00
- List<EntityLiving> list = this.world.a(EntityLiving.class, this.k(), (entityliving1) -> {
+ List<EntityLiving> list = this.world.a(EntityLiving.class, this.k(), (java.util.function.Predicate<EntityLiving>) (entityliving1) -> { // CraftBukkit - decompile error
return entityliving1 instanceof IMonster && entityliving1.ao();
});
2018-12-25 22:00:00 +01:00
@@ -180,8 +184,13 @@
}
2018-10-22 21:00:00 +02:00
if (this.target != null) {
- this.world.a((EntityHuman) null, this.target.locX, this.target.locY, this.target.locZ, SoundEffects.BLOCK_CONDUIT_ATTACK_TARGET, SoundCategory.BLOCKS, 1.0F, 1.0F);
- this.target.damageEntity(DamageSource.MAGIC, 4.0F);
+ // CraftBukkit start
+ CraftEventFactory.blockDamage = CraftBlock.at(this.world, this.position);
2018-10-22 21:00:00 +02:00
+ if (this.target.damageEntity(DamageSource.MAGIC, 4.0F)) {
+ this.world.a((EntityHuman) null, this.target.locX, this.target.locY, this.target.locZ, SoundEffects.BLOCK_CONDUIT_ATTACK_TARGET, SoundCategory.BLOCKS, 1.0F, 1.0F);
+ }
+ CraftEventFactory.blockDamage = null;
+ // CraftBukkit end
}
2018-10-22 21:00:00 +02:00
if (entityliving != this.target) {
2018-12-25 22:00:00 +01:00
@@ -214,7 +223,7 @@
@Nullable
private EntityLiving l() {
2018-12-25 22:00:00 +01:00
- List<EntityLiving> list = this.world.a(EntityLiving.class, this.k(), (entityliving) -> {
+ List<EntityLiving> list = this.world.a(EntityLiving.class, this.k(), (java.util.function.Predicate<EntityLiving>) (entityliving) -> { // CraftBukkit - decompile error
return entityliving.getUniqueID().equals(this.k);
});