Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches

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

@@ -1,58 +0,0 @@
-From 3365caed03fea3f98a35b79d1a6bf10b23f652dc 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 4b27f6890..1828b2ced 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 Monster, RangedEntity { // Paper
-+// Paper start
-+public interface Witch extends Monster, RangedEntity {
-+    /**
-+     * 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
- }
--- 
-2.21.0
-