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/0149-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,69 +0,0 @@
-From 28da2c2e4131200abea38d1655801de42bff18ed Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 13 Sep 2018 21:39:26 -0400
-Subject: [PATCH] Add ItemStackRecipeChoice Draft API
-
-This is based on Spigots Draft API. This is subject to change
-
-Allows creating recipes that must match isSimilar to full item stack.
-
-diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
-new file mode 100644
-index 000000000..43e6576b1
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java
-@@ -0,0 +1,51 @@
-+package com.destroystokyo.paper.inventory;
-+
-+import org.bukkit.inventory.ItemStack;
-+import org.bukkit.inventory.RecipeChoice;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+/**
-+ * Allows crafting Items that require full matching itemstacks to complete the recipe for custom items
-+ * @deprecated Draft API
-+ */
-+@Deprecated
-+public class ItemStackRecipeChoice implements RecipeChoice {
-+
-+    protected final List<ItemStack> choices = new ArrayList<>();
-+
-+    public ItemStackRecipeChoice(ItemStack choices) {
-+        this.choices.add(choices);
-+    }
-+
-+    public ItemStackRecipeChoice(List<ItemStack> choices) {
-+        this.choices.addAll(choices);
-+    }
-+
-+    @Override
-+    public ItemStack getItemStack() {
-+        return choices.isEmpty() ? null : choices.get(0);
-+    }
-+
-+    @Override
-+    public RecipeChoice clone() {
-+        try {
-+            ItemStackRecipeChoice clone = (ItemStackRecipeChoice) super.clone();
-+            clone.choices.addAll(this.choices);
-+            return clone;
-+        } catch (CloneNotSupportedException ex) {
-+            throw new AssertionError(ex);
-+        }
-+    }
-+
-+    @Override
-+    public boolean test(ItemStack itemStack) {
-+        for (ItemStack stack : choices) {
-+            if (stack.isSimilar(itemStack)) {
-+                return true;
-+            }
-+        }
-+        return false;
-+    }
-+}
--- 
-2.21.0
-