Allow proto chunks to be saved again

Appear to be used more extensively in 1.14. Subject to further review.
2019-05-30 18:22:34 -05:00
parent 5405793b86
commit de002d43b3
137 changed files with 292 additions and 316 deletions
--- a/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
+++ b/Spigot-Server-Patches/0299-Inventory-removeItemAnySlot.patch
@@ -0,0 +1,61 @@
+From fe90e35388bd795eec603c54e5b9f03504ab4d65 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.com>
+Date: Tue, 28 Aug 2018 23:04:15 -0400
+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 deb9de366..f05f4c1da 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+@@ -224,10 +224,16 @@ public class CraftInventory implements Inventory {
+     }
+ 
+     private int first(ItemStack item, boolean withAmount) {
+        // Paper start
+        return first(item, withAmount, getStorageContents());
+    }
+
+    private int first(ItemStack item, boolean withAmount, ItemStack[] inventory) {
+        // Paper end
+         if (item == null) {
+             return -1;
+         }
+-        ItemStack[] inventory = getStorageContents();
+        //ItemStack[] inventory = getStorageContents(); // Paper - let param deal
+         for (int i = 0; i < inventory.length; i++) {
+             if (inventory[i] == null) continue;
+ 
+@@ -345,6 +351,17 @@ public class CraftInventory implements Inventory {
+ 
+     @Override
+     public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
+        // Paper start
+        return removeItem(false, items);
+    }
+
+    @Override
+    public HashMap<Integer, ItemStack> removeItemAnySlot(ItemStack... items) {
+        return removeItem(true, items);
+    }
+
+    private HashMap<Integer, ItemStack> removeItem(boolean searchEntire, ItemStack... items) {
+        // Paper end
+         Validate.notNull(items, "Items cannot be null");
+         HashMap<Integer, ItemStack> leftover = new HashMap<Integer, ItemStack>();
+ 
+@@ -355,7 +372,10 @@ public class CraftInventory implements Inventory {
+             int toDelete = item.getAmount();
+ 
+             while (true) {
+-                int first = first(item, false);
+                // Paper start - Allow searching entire contents
+                ItemStack[] toSearch = searchEntire ? getContents() : getStorageContents();
+                int first = first(item, false, toSearch);
+                // Paper end
+ 
+                 // Drat! we don't have this type in the inventory
+                 if (first == -1) {
+-- 
+2.21.0
+