Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads
3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495
e470f1ef Add more information to Timing Reports
f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers
a4fe910f Fix sounds when using worldedit regen command
70ad51a8 Updated Upstream (Bukkit/CraftBukkit)
d7cfa4fa Improve legacy format serialization more

patches/api/0018-Add-ThrownEggHatchEvent.patch

@@ -1,132 +0,0 @@
-From 3e05bb777ebac12f0ac443593e417efdc4decccb Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 19 Oct 2019 03:27:55 -0500
-Subject: [PATCH] Add ThrownEggHatchEvent
-
----
- .../event/entity/ThrownEggHatchEvent.java     | 113 ++++++++++++++++++
- 1 file changed, 113 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
-
-diff --git a/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java b/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
-new file mode 100644
-index 000000000..815e871d0
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
-@@ -0,0 +1,113 @@
-+package net.pl3x.purpur.event.entity;
-+
-+import org.bukkit.entity.Egg;
-+import org.bukkit.entity.EntityType;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+
-+/**
-+ * Called when a thrown egg might hatch
-+ */
-+public class ThrownEggHatchEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+
-+    private final Egg egg;
-+    private boolean hatching;
-+    private EntityType hatchType;
-+    private byte numHatches;
-+
-+    public ThrownEggHatchEvent(@NotNull final Egg egg, final boolean hatching, final byte numHatches, @NotNull final EntityType hatchingType) {
-+        this.egg = egg;
-+        this.hatching = hatching;
-+        this.numHatches = numHatches;
-+        this.hatchType = hatchingType;
-+    }
-+
-+    /**
-+     * Gets the egg involved in this event.
-+     *
-+     * @return the egg involved in this event
-+     */
-+    @NotNull
-+    public Egg getEgg() {
-+        return egg;
-+    }
-+
-+    /**
-+     * Gets whether the egg is hatching or not. Will be what the server
-+     * would've done without interaction.
-+     *
-+     * @return boolean Whether the egg is going to hatch or not
-+     */
-+    public boolean isHatching() {
-+        return hatching;
-+    }
-+
-+    /**
-+     * Sets whether the egg will hatch or not.
-+     *
-+     * @param hatching true if you want the egg to hatch, false if you want it not to
-+     */
-+    public void setHatching(boolean hatching) {
-+        this.hatching = hatching;
-+    }
-+
-+    /**
-+     * Get the type of the mob being hatched (EntityType.CHICKEN by default)
-+     *
-+     * @return The type of the mob being hatched by the egg
-+     */
-+    @NotNull
-+    public EntityType getHatchingType() {
-+        return hatchType;
-+    }
-+
-+    /**
-+     * Change the type of mob being hatched by the egg
-+     *
-+     * @param hatchType The type of the mob being hatched by the egg
-+     */
-+    public void setHatchingType(@NotNull EntityType hatchType) {
-+        if (!hatchType.isSpawnable()) throw new IllegalArgumentException("Can't spawn that entity type from an egg!");
-+        this.hatchType = hatchType;
-+    }
-+
-+    /**
-+     * Get the number of mob hatches from the egg. By default the number will
-+     * be the number the server would've done
-+     * <ul>
-+     * <li>7/8 chance of being 0
-+     * <li>31/256 ~= 1/8 chance to be 1
-+     * <li>1/256 chance to be 4
-+     * </ul>
-+     *
-+     * @return The number of mobs going to be hatched by the egg
-+     */
-+    public byte getNumHatches() {
-+        return numHatches;
-+    }
-+
-+    /**
-+     * Change the number of mobs coming out of the hatched egg
-+     * <p>
-+     * The boolean hatching will override this number. Ie. If hatching =
-+     * false, this number will not matter
-+     *
-+     * @param numHatches The number of mobs coming out of the egg
-+     */
-+    public void setNumHatches(byte numHatches) {
-+        this.numHatches = numHatches;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
--- 
-2.24.0
-