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:
e461dcfe #555: Item - add getters/setters for owner/thrower

CraftBukkit Changes:
055870c4 #758: Item - add getters/setters for owner/thrower

Spigot-API-Patches/0161-Add-more-Witch-API.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 12 Oct 2018 03:47:26 -0500
-Subject: [PATCH] Add more Witch API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index aa88aede6c4e66a608a63d07bc66d60357b0bee9..cd8d0a20e52ad35f659175e0d24a1dc0e92023b9 100644
---- a/src/main/java/org/bukkit/entity/Witch.java
-+++ b/src/main/java/org/bukkit/entity/Witch.java
-@@ -2,8 +2,43 @@ package org.bukkit.entity;
- 
- import com.destroystokyo.paper.entity.RangedEntity;
- 
-+// Paper start
-+import org.bukkit.inventory.ItemStack;
-+import org.jetbrains.annotations.Nullable;
-+// Paper end
-+
- /**
-  * Represents a Witch
-  */
- public interface Witch extends Raider, RangedEntity { // Paper
-+    // Paper start
-+    /**
-+     * Check if Witch is drinking a potion
-+     *
-+     * @return True if drinking a potion
-+     */
-+    boolean isDrinkingPotion();
-+
-+    /**
-+     * Get time remaining (in ticks) the Witch is drinking a potion
-+     *
-+     * @return Time remaining (in ticks)
-+     */
-+    int getPotionUseTimeLeft();
-+
-+    /**
-+     * Get the potion the Witch is drinking
-+     *
-+     * @return The potion the witch is drinking
-+     */
-+    @Nullable
-+    ItemStack getDrinkingPotion();
-+
-+    /**
-+     * Set the potion the Witch should drink
-+     *
-+     * @param potion Potion to drink
-+     */
-+    void setDrinkingPotion(@Nullable ItemStack potion);
-+    // Paper end
- }