SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14-pre5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
paper-server/nms-patches/TileEntityConduit.patch
View File

@@ -11,25 +11,25 @@
public class TileEntityConduit extends TileEntity implements ITickable {
@@ -151,7 +155,7 @@
@@ -158,7 +162,7 @@
EntityHuman entityhuman = (EntityHuman) iterator.next();
if (this.position.m(new BlockPosition(entityhuman)) <= (double) j && entityhuman.ao()) {
if (this.position.a((BaseBlockPosition) (new BlockPosition(entityhuman)), (double) j) && entityhuman.isInWaterOrRain()) {
- 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
}
}
@@ -168,7 +172,7 @@
this.target = this.l();
@@ -175,7 +179,7 @@
this.target = this.v();
this.k = null;
} else if (this.target == null) {
- 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();
- List<EntityLiving> list = this.world.a(EntityLiving.class, this.u(), (entityliving1) -> {
+ List<EntityLiving> list = this.world.a(EntityLiving.class, this.u(), (java.util.function.Predicate<EntityLiving>) (entityliving1) -> { // CraftBukkit - decompile error
return entityliving1 instanceof IMonster && entityliving1.isInWaterOrRain();
});
@@ -180,8 +184,13 @@
@@ -187,8 +191,13 @@
}
if (this.target != null) {
@@ -45,12 +45,12 @@
}
if (entityliving != this.target) {
@@ -214,7 +223,7 @@
@@ -221,7 +230,7 @@
@Nullable
private EntityLiving l() {
- 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
private EntityLiving v() {
- List<EntityLiving> list = this.world.a(EntityLiving.class, this.u(), (entityliving) -> {
+ List<EntityLiving> list = this.world.a(EntityLiving.class, this.u(), (java.util.function.Predicate<EntityLiving>) (entityliving) -> { // CraftBukkit - decompile error
return entityliving.getUniqueID().equals(this.k);
});