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/0122-PlayerElytraBoostEvent.patch

@@ -1,100 +0,0 @@
-From 512606bd2ea928ab0c900d85440f8107a17fa26f Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 21 Jul 2018 01:59:53 -0500
-Subject: [PATCH] PlayerElytraBoostEvent
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
-new file mode 100644
-index 000000000..e9a76a25f
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java
-@@ -0,0 +1,85 @@
-+package com.destroystokyo.paper.event.player;
-+
-+import org.bukkit.entity.Firework;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.bukkit.inventory.ItemStack;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Fired when a player boosts elytra flight with a firework
-+ */
-+public class PlayerElytraBoostEvent extends PlayerEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled = false;
-+    @NotNull private final ItemStack itemStack;
-+    @NotNull private Firework firework;
-+    private boolean consume = true;
-+
-+    public PlayerElytraBoostEvent(@NotNull Player player, @NotNull ItemStack itemStack, @NotNull Firework firework) {
-+        super(player);
-+        this.itemStack = itemStack;
-+        this.firework = firework;
-+    }
-+
-+    /**
-+     * Get the firework itemstack used
-+     *
-+     * @return ItemStack of firework
-+     */
-+    @NotNull
-+    public ItemStack getItemStack() {
-+        return itemStack;
-+    }
-+
-+    /**
-+     * Get the firework entity that was spawned
-+     *
-+     * @return Firework entity
-+     */
-+    @NotNull
-+    public Firework getFirework() {
-+        return firework;
-+    }
-+
-+    /**
-+     * Get whether to consume the firework or not
-+     *
-+     * @return True to consume
-+     */
-+    public boolean shouldConsume() {
-+        return consume;
-+    }
-+
-+    /**
-+     * Set whether to consume the firework or not
-+     *
-+     * @param consume True to consume
-+     */
-+    public void setShouldConsume(boolean consume) {
-+        this.consume = consume;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        cancelled = cancel;
-+    }
-+}
--- 
-2.21.0
-