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

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-26 08:00:00 +11:00
parent 239b2828db
commit d7e312278d
120 changed files with 878 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
--- a/net/minecraft/server/TileEntityConduit.java
+++ b/net/minecraft/server/TileEntityConduit.java
@@ -7,6 +7,10 @@
@@ -6,6 +6,10 @@
import java.util.Random;
import java.util.UUID;
import java.util.function.Predicate;
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.block.CraftBlock;
@@ -11,7 +11,7 @@
public class TileEntityConduit extends TileEntity implements ITickable {
@@ -152,7 +156,7 @@
@@ -151,7 +155,7 @@
EntityHuman entityhuman = (EntityHuman) iterator.next();
if (this.position.m(new BlockPosition(entityhuman)) <= (double) j && entityhuman.ao()) {
@@ -20,18 +20,16 @@
}
}
@@ -169,8 +173,8 @@
@@ -168,7 +172,7 @@
this.target = this.l();
this.k = null;
} else if (this.target == 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
- 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();
});
if (!list.isEmpty()) {
@@ -181,8 +185,13 @@
@@ -180,8 +184,13 @@
}
if (this.target != null) {
@@ -47,12 +45,12 @@
}
if (entityliving != this.target) {
@@ -215,7 +224,7 @@
@@ -214,7 +223,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
- 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);
});