Update Upstream

2019-05-05 19:58:04 -07:00
parent 52cd8744e0
commit f9f71eb14e
321 changed files with 809 additions and 856 deletions
--- a/Spigot-Server-Patches/Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/Inventory-removeItemAnySlot.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Inventory#removeItemAnySlot


 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index 3a2b57ae7..fe52f87d3 100644
+index 9fbedcede8..b7e08b55f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -0,0 +0,0 @@ public class CraftInventory implements Inventory {
@@ -27,8 +27,8 @@ index 3a2b57ae7..fe52f87d3 100644
             if (inventory[i] == null) continue;
 
@@ -0,0 +0,0 @@ public class CraftInventory implements Inventory {
-     }
 
+     @Override
     public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
 +        // Paper start
 +        return removeItem(false, items);