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/0011-Add-ExecuteCommandEvent.patch

@@ -1,183 +0,0 @@
-From 026def607865ff42c7740b5c0ef9439c09497888 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Fri, 31 May 2019 00:08:28 -0500
-Subject: [PATCH] Add ExecuteCommandEvent
-
----
- .../purpur/event/ExecuteCommandEvent.java     | 130 ++++++++++++++++++
- .../org/bukkit/command/SimpleCommandMap.java  |  15 +-
- 2 files changed, 144 insertions(+), 1 deletion(-)
- create mode 100644 src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
-
-diff --git a/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
-new file mode 100644
-index 000000000..3250bd4dc
---- /dev/null
-+++ b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
-@@ -0,0 +1,130 @@
-+package net.pl3x.purpur.event;
-+
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.event.Cancellable;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+/**
-+ * This event is called whenever someone runs a command
-+ */
-+public class ExecuteCommandEvent extends Event implements Cancellable {
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancel = false;
-+    private CommandSender sender;
-+    private Command command;
-+    private String label;
-+    private String[] args;
-+
-+    public ExecuteCommandEvent(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @Nullable String[] args) {
-+        this.sender = sender;
-+        this.command = command;
-+        this.label = label;
-+        this.args = args;
-+    }
-+
-+    /**
-+     * Gets the command that the player is attempting to execute.
-+     *
-+     * @return Command the player is attempting to execute
-+     */
-+    @NotNull
-+    public Command getCommand() {
-+        return command;
-+    }
-+
-+    /**
-+     * Sets the command that the player will execute.
-+     *
-+     * @param command New command that the player will execute
-+     * @throws IllegalArgumentException if command is null or empty
-+     */
-+    public void setCommand(@NotNull Command command) throws IllegalArgumentException {
-+        Validate.notNull(command, "Command cannot be null");
-+        this.command = command;
-+    }
-+
-+    /**
-+     * Gets the sender that this command will be executed as.
-+     *
-+     * @return Sender this command will be executed as
-+     */
-+    @NotNull
-+    public CommandSender getSender() {
-+        return sender;
-+    }
-+
-+    /**
-+     * Sets the sender that this command will be executed as.
-+     *
-+     * @param sender New sender which this event will execute as
-+     * @throws IllegalArgumentException if the sender provided is null
-+     */
-+    public void setSender(@NotNull final CommandSender sender) throws IllegalArgumentException {
-+        Validate.notNull(sender, "Sender cannot be null");
-+        this.sender = sender;
-+    }
-+
-+    /**
-+     * Get the label used to execute this command
-+     *
-+     * @return Label used to execute this command
-+     */
-+    @NotNull
-+    public String getLabel() {
-+        return label;
-+    }
-+
-+    /**
-+     * Set the label used to execute this command
-+     *
-+     * @param label Label used
-+     */
-+    public void setLabel(@NotNull String label) {
-+        this.label = label;
-+    }
-+
-+    /**
-+     * Get the args passed to the command
-+     *
-+     * @return Args passed to the command
-+     */
-+    @NotNull
-+    public String[] getArgs() {
-+        return args;
-+    }
-+
-+    /**
-+     * Set the args passed to the command
-+     *
-+     * @param args Args passed to the command
-+     */
-+    public void setArgs(@NotNull String[] args) {
-+        this.args = args;
-+    }
-+
-+    @Override
-+    public boolean isCancelled() {
-+        return cancel;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancel = cancel;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 460fda05a..1e0eb0999 100644
---- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
-+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -147,6 +147,19 @@ public class SimpleCommandMap implements CommandMap {
-             return false;
-         }
- 
-+        // Purpur start
-+        String[] parsedArgs = Arrays.copyOfRange(args, 1, args.length);
-+        net.pl3x.purpur.event.ExecuteCommandEvent event = new net.pl3x.purpur.event.ExecuteCommandEvent(sender, target, sentCommandLabel, parsedArgs);
-+        if (!event.callEvent()) {
-+            return true; // cancelled
-+        }
-+
-+        sender = event.getSender();
-+        target = event.getCommand();
-+        sentCommandLabel = event.getLabel();
-+        parsedArgs = event.getArgs();
-+        // Purpur end
-+
-         // Paper start - Plugins do weird things to workaround normal registration
-         if (target.timings == null) {
-             target.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, target);
-@@ -156,7 +169,7 @@ public class SimpleCommandMap implements CommandMap {
-         try {
-             try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources
-             // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
--            target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
-+            target.execute(sender, sentCommandLabel, parsedArgs); // Purpur
-             } // target.timings.stopTiming(); // Spigot // Paper
-         } catch (CommandException ex) {
-             server.getPluginManager().callEvent(new ServerExceptionEvent(new ServerCommandException(ex, target, sender, args))); // Paper
--- 
-2.24.0
-