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/0007-Implement-AFK-API.patch

@@ -1,120 +0,0 @@
-From 37efa9e3cdecabc0f10d35dc501ef4cafa164080 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 10 Aug 2019 22:19:56 -0500
-Subject: [PATCH] Implement AFK API
-
----
- .../net/pl3x/purpur/event/PlayerAFKEvent.java | 70 +++++++++++++++++++
- src/main/java/org/bukkit/entity/Player.java   | 21 ++++++
- 2 files changed, 91 insertions(+)
- create mode 100644 src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
-
-diff --git a/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
-new file mode 100644
-index 00000000..0c8b3e5e
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
-@@ -0,0 +1,70 @@
-+package net.pl3x.purpur.event;
-+
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.HandlerList;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class PlayerAFKEvent extends PlayerEvent implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private final boolean setAfk;
-+    private boolean shouldKick;
-+    private String broadcast;
-+    private boolean cancel;
-+
-+    public PlayerAFKEvent(@NotNull Player player, boolean setAfk, boolean shouldKick, @Nullable String broadcast, boolean async) {
-+        super(player, async);
-+        this.setAfk = setAfk;
-+        this.shouldKick = shouldKick;
-+        this.broadcast = broadcast;
-+    }
-+
-+    /**
-+     * Whether player is going afk or coming back
-+     *
-+     * @return True if going afk. False is coming back
-+     */
-+    public boolean isGoingAfk() {
-+        return setAfk;
-+    }
-+
-+    public boolean shouldKick() {
-+        return shouldKick;
-+    }
-+
-+    public void setShouldKick(boolean shouldKick) {
-+        this.shouldKick = shouldKick;
-+    }
-+
-+    @Nullable
-+    public String getBroadcastMsg() {
-+        return broadcast;
-+    }
-+
-+    public void setBroadcastMsg(@Nullable String broadcast) {
-+        this.broadcast = broadcast;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancel;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancel = cancel;
-+    }
-+
-+    @Override
-+    @NotNull
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 787bb144..edc48117 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1830,4 +1830,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-     @Override
-     Spigot spigot();
-     // Spigot end
-+
-+    // Purpur start
-+    /**
-+     * Check if player is AFK
-+     *
-+     * @return True if AFK
-+     */
-+    boolean isAfk();
-+
-+    /**
-+     * Set player as AFK
-+     *
-+     * @param setAfk Whether to set AFK or not
-+     */
-+    void setAfk(boolean setAfk);
-+
-+    /**
-+     * Reset the idle timer back to 0
-+     */
-+    void resetIdleTimer();
-+    // Purpur end
- }
--- 
-2.24.0
-