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/0156-Add-LivingEntity-getTargetEntity.patch

@@ -1,108 +0,0 @@
-From 6fa603fb50284943a6142bb69261ad2c830ec573 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 22 Sep 2018 00:32:53 -0500
-Subject: [PATCH] Add LivingEntity#getTargetEntity
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
-new file mode 100644
-index 000000000..f52644fab
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
-@@ -0,0 +1,38 @@
-+package com.destroystokyo.paper.entity;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.util.Vector;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Represents information about a targeted entity
-+ */
-+public class TargetEntityInfo {
-+    private final Entity entity;
-+    private final Vector hitVec;
-+
-+    public TargetEntityInfo(@NotNull Entity entity, @NotNull Vector hitVec) {
-+        this.entity = entity;
-+        this.hitVec = hitVec;
-+    }
-+
-+    /**
-+     * Get the entity that is targeted
-+     *
-+     * @return Targeted entity
-+     */
-+    @NotNull
-+    public Entity getEntity() {
-+        return entity;
-+    }
-+
-+    /**
-+     * Get the position the entity is targeted at
-+     *
-+     * @return Targeted position
-+     */
-+    @NotNull
-+    public Vector getHitVector() {
-+        return hitVec;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4dec50caf..956d68867 100644
---- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      */
-     @Nullable
-     public com.destroystokyo.paper.block.TargetBlockInfo getTargetBlockInfo(int maxDistance, @NotNull com.destroystokyo.paper.block.TargetBlockInfo.FluidMode fluidMode);
-+
-+    /**
-+     * Gets information about the entity being targeted
-+     *
-+     * @param maxDistance this is the maximum distance to scan
-+     * @return entity being targeted, or null if no entity is targeted
-+     */
-+    @Nullable
-+    public default Entity getTargetEntity(int maxDistance) {
-+        return getTargetEntity(maxDistance, false);
-+    }
-+
-+    /**
-+     * Gets information about the entity being targeted
-+     *
-+     * @param maxDistance this is the maximum distance to scan
-+     * @param ignoreBlocks true to scan through blocks
-+     * @return entity being targeted, or null if no entity is targeted
-+     */
-+    @Nullable
-+    public Entity getTargetEntity(int maxDistance, boolean ignoreBlocks);
-+
-+    /**
-+     * Gets information about the entity being targeted
-+     *
-+     * @param maxDistance this is the maximum distance to scan
-+     * @return TargetEntityInfo about the entity being targeted,
-+     *     or null if no entity is targeted
-+     */
-+    @Nullable
-+    public default com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance) {
-+        return getTargetEntityInfo(maxDistance, false);
-+    }
-+
-+    /**
-+     * Gets information about the entity being targeted
-+     *
-+     * @param maxDistance this is the maximum distance to scan
-+     * @param ignoreBlocks true to scan through blocks
-+     * @return TargetEntityInfo about the entity being targeted,
-+     *     or null if no entity is targeted
-+     */
-+    @Nullable
-+    public com.destroystokyo.paper.entity.TargetEntityInfo getTargetEntityInfo(int maxDistance, boolean ignoreBlocks);
-     // Paper end
- 
-     /**
--- 
-2.21.0
-