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-API-Patches/Access-items-by-EquipmentSlot.patch
+++ b/Spigot-API-Patches/Access-items-by-EquipmentSlot.patch
@@ -5,11 +5,11 @@ 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
-index ef55b146..eb71f01e 100644
+index 88ce9dc6..96916ec9 100644
 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
 +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -0,0 +0,0 @@ public interface PlayerInventory extends Inventory {
- 
+     @Override
     @Nullable
     public HumanEntity getHolder();
 +