Updated Upstream (Bukkit/CraftBukkit)

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:
da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots
3abebc9f #492: Let Tameable extend Animals rather than Entity
941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent
4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME

CraftBukkit Changes:
933e9094 #664: Add methods to get/set ItemStacks in EquipmentSlots
18722312 #662: Expose ItemStack and hand used in PlayerShearEntityEvent

Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jedediah Smith <jedediah@silencegreys.com>
-Date: Sun, 20 Mar 2016 06:44:49 -0400
-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 88ce9dc6b94fec5ffe50866e4b5e0c18021d6158..96916ec95e124b984b51fc60c601274c87dc9447 100644
---- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
-+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
-@@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory {
-     @Override
-     @Nullable
-     public HumanEntity getHolder();
-+
-+    // Paper start
-+    /**
-+     * Gets the {@link ItemStack} found in the slot.
-+     *
-+     * @param slot The slot
-+     * @return The item stack in the slot
-+     */
-+    @Nullable
-+    ItemStack getItem(@NotNull EquipmentSlot slot);
-+
-+    /**
-+     * Sets the {@link ItemStack} at the given {@link EquipmentSlot}.
-+     *
-+     * @param slot The slot for the stack
-+     * @param stack The item stack to set
-+     */
-+    void setItem(@NotNull EquipmentSlot slot, @Nullable ItemStack stack);
-+    // Paper end
- }

Spigot-API-Patches/0084-Tameable-getOwnerUniqueId-API.patch

@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdfc9c3e3d56519870e51dfe487d0580414..957a60167215d00e9e0edaf418736f7f24c0a04b 100644
+index 26c996cd41acc88490ac0135a9239cffc03e8efb..65e68da98ab66ed781bce2f0dbe0913be48d2990 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -1,5 +1,6 @@
@@ -16,8 +16,8 @@ index 0c066bdfc9c3e3d56519870e51dfe487d0580414..957a60167215d00e9e0edaf418736f7f
 +import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
- public interface Tameable extends Entity {
+ public interface Tameable extends Animals {
-@@ -25,9 +26,22 @@ public interface Tameable extends Entity {
+@@ -25,9 +26,22 @@ public interface Tameable extends Animals {
       */
      public void setTamed(boolean tame);