Fix firstEmpty

OvercastNetwork · May 4, 2017 · 2c6bfd5 · 2c6bfd5
1 parent 6111a01
commit 2c6bfd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CraftBukkit/Reduce-ItemStack-copying.patch b/CraftBukkit/Reduce-ItemStack-copying.patch
@@ -263,7 +263,7 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 -            }
 -        }
 -        return -1;
-+        return ListUtils.indexOf(storage(), Objects::isNull);
++        return ListUtils.indexOf(storage(), item -> item == null || Material.AIR.equals(item.getType()));
      }
 
      public int firstPartial(int materialId) {

diff --git a/snapshot/CraftBukkit/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/snapshot/CraftBukkit/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -226,7 +226,7 @@ private int first(ItemStack item, boolean withAmount) {
     }
 
     public int firstEmpty() {
-        return ListUtils.indexOf(storage(), Objects::isNull);
+        return ListUtils.indexOf(storage(), item -> item == null || Material.AIR.equals(item.getType()));
     }
 
     public int firstPartial(int materialId) {