Fix JDK compiler issue, apparently eclipse compiles this ambiguityo

Spigot-Server-Patches/0003-MC-Dev-fixes.patch

@@ -1,11 +1,11 @@
-From 7d151ab9a57541eb1cace4e484d444406f66f86f Mon Sep 17 00:00:00 2001
+From 0202a335eb1fefb24399d469f9e6e29b7e94d8a9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a19..9f3aa2459 100644
+index 002da2a191..9f3aa24590 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -150,7 +150,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -58,8 +58,21 @@ index 002da2a19..9f3aa2459 100644
                              ++this.g.d;
                          }
  
+diff --git a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
+index 1697e19e7a..699a9bea6a 100644
+--- a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
++++ b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
+@@ -67,7 +67,7 @@ public class BlockRedstoneComparator extends BlockDiodeAbstract implements ITile
+ 
+     @Nullable
+     private EntityItemFrame a(World world, EnumDirection enumdirection, BlockPosition blockposition) {
+-        List list = world.a(EntityItemFrame.class, new AxisAlignedBB((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 1), (double) (blockposition.getZ() + 1)), (entityitemframe) -> {
++        List list = world.a(EntityItemFrame.class, new AxisAlignedBB((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), (double) (blockposition.getX() + 1), (double) (blockposition.getY() + 1), (double) (blockposition.getZ() + 1)), (Predicate<EntityItemFrame>)(entityitemframe) -> { // Paper - Fix compile issue
+             return entityitemframe != null && entityitemframe.getDirection() == enumdirection;
+         });
+ 
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 650ef1475..35aea4829 100644
+index 650ef14758..35aea4829f 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -15,7 +15,7 @@ public class ChunkSection {
@@ -72,7 +85,7 @@ index 650ef1475..35aea4829 100644
          if (flag) {
              this.skyLight = new NibbleArray();
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index a661789c1..785a1a218 100644
+index a661789c1e..785a1a2184 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -88,7 +88,7 @@ public class DefinedStructure {
@@ -127,7 +140,7 @@ index a661789c1..785a1a218 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
-index 188d49d82..854ad49b6 100644
+index 188d49d820..854ad49b6c 100644
 --- a/src/main/java/net/minecraft/server/EnumDirection.java
 +++ b/src/main/java/net/minecraft/server/EnumDirection.java
 @@ -255,7 +255,7 @@ public enum EnumDirection implements INamable {
@@ -191,7 +204,7 @@ index 188d49d82..854ad49b6 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 8f06c5848..4361b2cee 100644
+index 8f06c58485..4361b2cee5 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -34,7 +34,7 @@ public class LocaleLanguage {
@@ -204,7 +217,7 @@ index 8f06c5848..4361b2cee 100644
  
              this.e = SystemUtils.b();
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 86585a13f..f52b9c6f0 100644
+index 86585a13ff..f52b9c6f0a 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -8,7 +8,7 @@ import java.util.function.IntPredicate;
@@ -217,7 +230,7 @@ index 86585a13f..f52b9c6f0 100644
              afloat[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
          }
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 3b8f6ec16..bde5714dd 100644
+index 3b8f6ec167..bde5714dd6 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -6,7 +6,7 @@ import java.util.Arrays;
@@ -258,7 +271,7 @@ index 3b8f6ec16..bde5714dd 100644
          this.f = 0;
  
 diff --git a/src/main/java/net/minecraft/server/ShapeDetector.java b/src/main/java/net/minecraft/server/ShapeDetector.java
-index 43596cb2d..3faf74a22 100644
+index 43596cb2d5..3faf74a22f 100644
 --- a/src/main/java/net/minecraft/server/ShapeDetector.java
 +++ b/src/main/java/net/minecraft/server/ShapeDetector.java
 @@ -171,7 +171,7 @@ public class ShapeDetector {
@@ -271,7 +284,7 @@ index 43596cb2d..3faf74a22 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index 4b5463cca..53c9f2188 100644
+index 4b5463cca2..53c9f21887 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -67,7 +67,7 @@ public abstract class VoxelShape {
@@ -284,5 +297,5 @@ index 4b5463cca..53c9f2188 100644
          return arraylist;
      }
 -- 
-2.17.1
+2.18.0