[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:
fd6a980a Fix PlayerInventory.setItem docs
This commit is contained in:
Aikar 2018-08-19 00:29:35 -04:00
parent 4816b3fa16
commit d6df1e92f0
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
2 changed files with 4 additions and 4 deletions

View File

@ -1,14 +1,14 @@
From a4f2ef92d3cb775e916cbf50f2613f901b0e07e3 Mon Sep 17 00:00:00 2001 From a7dfaaafcec3d730d94bbb597f2070accb79bf76 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 20 Mar 2016 06:44:49 -0400 Date: Sun, 20 Mar 2016 06:44:49 -0400
Subject: [PATCH] Access items by EquipmentSlot Subject: [PATCH] Access items by EquipmentSlot
diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
index 5d75bd49..ddded787 100644 index fc5772e8..d56f6e00 100644
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -198,4 +198,22 @@ public interface PlayerInventory extends Inventory { @@ -202,4 +202,22 @@ public interface PlayerInventory extends Inventory {
public void setHeldItemSlot(int slot); public void setHeldItemSlot(int slot);
public HumanEntity getHolder(); public HumanEntity getHolder();

@ -1 +1 @@
Subproject commit f7662d5c9249b90936349d3da43bb0bab089e59e Subproject commit fd6a980affe4ec8ba565e0866e6106ab051f97fd