core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Aikar 2019-02-25 03:16:35 -05:00
parent e6fc2d18c3
commit 91129b798e
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/0145-Inventory-removeItemAnySlot.patch
View File

@ -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 <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 28 Aug 2018 23:04:06 -0400 Date: Tue, 28 Aug 2018 23:04:06 -0400
Subject: [PATCH] Inventory#removeItemAnySlot Subject: [PATCH] Inventory#removeItemAnySlot
diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java 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 --- a/src/main/java/org/bukkit/inventory/Inventory.java
+++ b/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<ItemStack> { @@ -131,6 +131,33 @@ public interface Inventory extends Iterable<ItemStack> {
*/ */
public HashMap<Integer, ItemStack> removeItem(ItemStack... items) throws IllegalArgumentException; public HashMap<Integer, ItemStack> removeItem(ItemStack... items) throws IllegalArgumentException;

2
work/Bukkit

@ -1 +1 @@
Subproject commit e167e549afd442461df623cdb3c6ba1f2be797d9 Subproject commit 217dc08dff6ff9d0482f7952b9555ff66d31800a