From 91129b798ed2c29998eeb9bd0237330f2b5cec97 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 25 Feb 2019 03:16:35 -0500 Subject: [PATCH] [Auto] Updated Upstream (Bukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 217dc08d SPIGOT-4634: Make Inventory iteration behaviour explicit --- Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch | 6 +++--- work/Bukkit | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch index ce19d47fb1..201b55a3ba 100644 --- a/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch @@ -1,14 +1,14 @@ -From ffab9eae4ca06c397e8b4ac825718180dfd3fa3b Mon Sep 17 00:00:00 2001 +From ebaecfd4aee0b13db35408adbfb670c0f1c3856d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 3585f109..6992b702 100644 +index bab561dc..9d0306c3 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java -@@ -121,6 +121,33 @@ public interface Inventory extends Iterable { +@@ -131,6 +131,33 @@ public interface Inventory extends Iterable { */ public HashMap removeItem(ItemStack... items) throws IllegalArgumentException; diff --git a/work/Bukkit b/work/Bukkit index e167e549af..217dc08dff 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit e167e549afd442461df623cdb3c6ba1f2be797d9 +Subproject commit 217dc08dff6ff9d0482f7952b9555ff66d31800a