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/0153-Material-API-additions.patch

@@ -1,44 +0,0 @@
-From 515426e99ead7041a586709f651b989c9a2c0c61 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 6 Oct 2018 21:14:29 -0400
-Subject: [PATCH] Material API additions
-
-
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 6120955b1..c628a9349 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -74,6 +74,7 @@ import org.jetbrains.annotations.Nullable;
- /**
-  * An enum of all material IDs accepted by the official server and client
-  */
-+@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
- public enum Material implements Keyed {
-     //<editor-fold desc="Materials" defaultstate="collapsed">
-     ACACIA_BOAT(27326, 1),
-@@ -2986,6 +2987,22 @@ public enum Material implements Keyed {
-         }
-     }
- 
-+    // Paper start
-+
-+    /**
-+     * @return If the type is either AIR, CAVE_AIR or VOID_AIR
-+     */
-+    public boolean isEmpty() {
-+        switch (this) {
-+            case AIR:
-+            case CAVE_AIR:
-+            case VOID_AIR:
-+                return true;
-+        }
-+        return false;
-+    }
-+    // Paper end
-+
-     /**
-      * Do not use for any reason.
-      *
--- 
-2.21.0
-