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/0002-Purpur-config-files.patch

@@ -1,56 +1,14 @@
-From 23500f1f8f5d8e17be4b8e14b2ec52638b2db889 Mon Sep 17 00:00:00 2001
+From 48b6e33ffaa5a320da32cf4750a932c5018e7be4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
 
 ---
- .../java/co/aikar/timings/TimingsExport.java  | 23 ++++++++++++++++---
- src/main/java/org/bukkit/Server.java          | 12 ++++++++++
- 2 files changed, 32 insertions(+), 3 deletions(-)
+ src/main/java/org/bukkit/Server.java | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f9..5e7e10c8 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
-         // Information on the users Config
- 
-         parent.put("config", createObject(
--            pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
--            pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
--            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+                // Purpur start
-+                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
-+                pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-+                pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
-+                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+                pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
-+                // Purpur end
-         ));
- 
-         new TimingsExport(listeners, parent, history).start();
-@@ -247,6 +251,19 @@ class TimingsExport extends Thread {
-         return timingsCost;
-     }
- 
-+    // Purpur start
-+    private static JSONObject mapAsJSON(java.util.Properties properties) {
-+        JSONObject object = new JSONObject();
-+        for (String key : properties.stringPropertyNames()) {
-+            if (TimingsManager.hiddenConfigs.contains(key)) {
-+                continue;
-+            }
-+            object.put(key, valAsJSON(properties.get(key), key));
-+        }
-+        return object;
-+    }
-+    // Purpur end
-+
-     private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
- 
-         JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c3fb1c27..79543106 100644
+index cc06492f4..47548dfd1 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1396,6 +1396,18 @@ public interface Server extends PluginMessageRecipient {

patches/api/0003-Host-our-own-timings.patch

@@ -1,25 +0,0 @@
-From efced177921197f8480a7c4e9fba2484fdd41604 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Tue, 18 Feb 2020 20:38:26 -0600
-Subject: [PATCH] Host our own timings
-
----
- src/main/java/co/aikar/timings/TimingsExport.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 47be89aea..1b5767b29 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -300,7 +300,7 @@ class TimingsExport extends Thread {
-         String response = null;
-         String timingsURL = null;
-         try {
--            HttpURLConnection con = (HttpURLConnection) new URL("http://timings.aikar.co/post").openConnection();
-+            HttpURLConnection con = (HttpURLConnection) new URL(Bukkit.spigot().getPurpurConfig().getString("settings.timings.url", "https://timings.pl3x.net") + "/post").openConnection(); // Purpur
-             con.setDoOutput(true);
-             String hostName = "BrokenHost";
-             try {
--- 
-2.24.0
-

patches/api/0003-Ridables.patch

@@ -1,4 +1,4 @@
-From 282ffe28105fdbbbaa9ca8efc1184d83f5f47dee Mon Sep 17 00:00:00 2001
+From 928b868b220c11a48ed5dc688f92c3cf793078b7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables

patches/api/0004-Remove-pointless-annotations-and-deprecations.patch

@@ -1,4 +1,4 @@
-From b635caa251ca2fe802bfe3ff6c967971a2b88b93 Mon Sep 17 00:00:00 2001
+From d943d6fd099a66d7f6934394f6a839be75104828 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 31 Dec 2019 23:00:07 -0600
 Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,7 +14,7 @@ Subject: [PATCH] Remove pointless annotations and deprecations
  7 files changed, 9 insertions(+), 18 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 95ad0122..5d42cf62 100644
+index a9c10228e..780d603e4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -863,13 +863,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 95ad0122..5d42cf62 100644
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 79543106..aabf82b5 100644
+index 47548dfd1..bbb2946f6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -722,13 +722,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 79543106..aabf82b5 100644
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
 diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
-index 45cb8da1..383b43e1 100644
+index 45cb8da12..383b43e1b 100644
 --- a/src/main/java/org/bukkit/command/CommandExecutor.java
 +++ b/src/main/java/org/bukkit/command/CommandExecutor.java
 @@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da1..383b43e1 100644
 +    public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
-index e9cf71f5..34d3462c 100644
+index e9cf71f5c..34d3462c7 100644
 --- a/src/main/java/org/bukkit/command/TabCompleter.java
 +++ b/src/main/java/org/bukkit/command/TabCompleter.java
 @@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -72,7 +72,7 @@ index e9cf71f5..34d3462c 100644
 +    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index d7d6a3e8..cf8d7749 100644
+index ccd81fca2..a8ade268c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -100,7 +100,7 @@ index d7d6a3e8..cf8d7749 100644
          ItemMeta meta = getItemMeta();
          return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 04fa3991..24d65491 100644
+index 04fa3991f..24d65491c 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991..24d65491 100644
      }
  
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index a48be38b..951b81e7 100644
+index a48be38b1..951b81e79 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -41,6 +41,11 @@ public class AnnotationTest {

patches/api/0005-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From fd0bef0590aaaa10deefcda30d4e6b7a6bde21fc Mon Sep 17 00:00:00 2001
+From 78aecf28f5492c23d4c60df906093ffa9120e008 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 06:50:55 -0500
 Subject: [PATCH] Allow inventory resizing

patches/api/0006-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 37efa9e3cdecabc0f10d35dc501ef4cafa164080 Mon Sep 17 00:00:00 2001
+From b9e40e25bdb2a99a85e88c413e6cc8949c5cd619 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Implement AFK API
 
 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
+index 000000000..0c8b3e5e4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..0c8b3e5e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 787bb144..edc48117 100644
+index 787bb144b..edc481170 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

patches/api/0007-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 07869e37e8dc3b12e9e0fa2ce5ee0a4e23e250a6 Mon Sep 17 00:00:00 2001
+From e63bb83fe25662c23e93b21da43c4f75ec616990 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:00 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent

patches/api/0008-Bring-back-server-name.patch

@@ -1,4 +1,4 @@
-From cc89d98244645c403a461188a6fb49bc86288213 Mon Sep 17 00:00:00 2001
+From 2c770cf3a11862fdec3aa1a7a9f04871a41d1e27 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:18:40 -0500
 Subject: [PATCH] Bring back server name
@@ -9,7 +9,7 @@ Subject: [PATCH] Bring back server name
  2 files changed, 20 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 780d603e..33ccf297 100644
+index 780d603e4..33ccf2979 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1714,4 +1714,15 @@ public final class Bukkit {
@@ -29,7 +29,7 @@ index 780d603e..33ccf297 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bbb2946f..8d3501a6 100644
+index bbb2946f6..8d3501a67 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1505,4 +1505,13 @@ public interface Server extends PluginMessageRecipient {

patches/api/0009-Implement-LivingEntity-safeFallDistance.patch

@@ -1,4 +1,4 @@
-From 24a737b9d80b9bc724dbcff7b9487de04f8fd706 Mon Sep 17 00:00:00 2001
+From 5ae5f9e9d98de60e44d57aee71eeab472d3639a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:19 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance

patches/api/0010-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From 026def607865ff42c7740b5c0ef9439c09497888 Mon Sep 17 00:00:00 2001
+From db25bc04648a0ce70ac58987a994c730f3c6e1ae 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

patches/api/0011-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From 0cf23610dddc0f16cb40bf33ccdd6495abd55fb2 Mon Sep 17 00:00:00 2001
+From e4b28b6ed7d3e1f7f32f0397abb1068483715cc0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 12 Jul 2019 02:09:58 -0500
 Subject: [PATCH] Implement ChunkTooLargeEvent

patches/api/0012-Implement-lagging-threshold.patch

@@ -1,4 +1,4 @@
-From d2beebd0b8bca2ad0eef2138675d81cd0f0f9568 Mon Sep 17 00:00:00 2001
+From 25c7441fd2fe5c753d82cb728ff762125fff9983 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:24 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement lagging threshold
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 33ccf297..ee8fe48a 100644
+index 33ccf2979..ee8fe48aa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1724,5 +1724,14 @@ public final class Bukkit {
@@ -28,7 +28,7 @@ index 33ccf297..ee8fe48a 100644
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8d3501a6..c35405e0 100644
+index 8d3501a67..c35405e09 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1513,5 +1513,12 @@ public interface Server extends PluginMessageRecipient {

patches/api/0013-Advancement-API-Additions.patch

@@ -1,4 +1,4 @@
-From 60b43c69c3c60af8494c8a3e456528c541734e29 Mon Sep 17 00:00:00 2001
+From a2b02de4ec98e2d8fee3fc9a36f3da00a839c38d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:21 -0500
 Subject: [PATCH] Advancement API Additions

patches/api/0014-Implement-ItemFactory-getMonsterEgg.patch

@@ -1,4 +1,4 @@
-From 629ed9eab41a762189f7671220ad3b459c010243 Mon Sep 17 00:00:00 2001
+From 8c6a8c2f9bc5badb5b85a0901b329eb01366c4cc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:37:04 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg

patches/api/0015-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 02402b5e5b5cf877fdc9c4772b3823b74c466d39 Mon Sep 17 00:00:00 2001
+From 226d3bc769d579cb0463f1aa0551e02a22b68753 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:15 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent

patches/api/0016-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From a9072d23135ed363762d4521228cda31784f35b4 Mon Sep 17 00:00:00 2001
+From c90d5a3d7fc8dc2449b778807b42e18de51f3641 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:20:49 -0500
 Subject: [PATCH] Add MonsterEggSpawnEvent

patches/api/0017-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From 3e05bb777ebac12f0ac443593e417efdc4decccb Mon Sep 17 00:00:00 2001
+From c7e580d108dcc2aa8c6375bc489c2a3925a5e48a 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

patches/api/0018-Add-moon-phase-API.patch

@@ -1,4 +1,4 @@
-From 707e74f8dc730b9e1f1ce8183430d5c39af67b64 Mon Sep 17 00:00:00 2001
+From fd204c5ff1b25d9c570cfab851c791d546bd966d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:07 -0600
 Subject: [PATCH] Add moon phase API

patches/api/0019-Add-API-for-Villager-resetOffers.patch

@@ -1,4 +1,4 @@
-From 013e7bc6e20e097f054a3b76f9d6a3aa49d2f256 Mon Sep 17 00:00:00 2001
+From 1a3ff839467609e8b95ae15984ca7fa1b76ee965 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:28 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
@@ -8,7 +8,7 @@ Subject: [PATCH] Add API for Villager#resetOffers()
  1 file changed, 7 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index e0a3285b..32b8c4f2 100644
+index e0a3285b8..32b8c4f20 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {

patches/api/0020-Expose-getItemStack-for-Trident.patch

@@ -1,4 +1,4 @@
-From 0f7cf240c9626b6026a3d677c27d2f6e6ce25f77 Mon Sep 17 00:00:00 2001
+From b036bfcd8aa79e0b040aa83b0cc1983e3afe679f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:31 -0500
 Subject: [PATCH] Expose getItemStack for Trident

patches/api/0021-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From e063ff17a0d1999d1e2c5df0b9854c9b6d19b32f Mon Sep 17 00:00:00 2001
+From 5dbf64e9ba5558297cbc7584e973926d6fbe073f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:05 -0500
 Subject: [PATCH] Add more llama API

patches/api/0022-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From d3f0f04f84e7ede322ace349254a61cc3e7cb349 Mon Sep 17 00:00:00 2001
+From 5a78f176845e8317a91657d10012218362479e06 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:28:53 -0500
 Subject: [PATCH] Add more evoker API

patches/api/0023-Add-getPlacementBlockData-to-World.patch

@@ -1,4 +1,4 @@
-From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
+From 01653647955c1bcb951cf78ffd53e96691032aad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World

patches/api/0024-Add-playPickupItemAnimation-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From 42cfdbc72c16463dd1425698390a833e3897a16c Mon Sep 17 00:00:00 2001
+From 1e19760c6229130f4ac3251e96812a7b48f45c2f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:05 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity

patches/api/0025-Add-getPlayer-to-SkeletonHorseTrapEvent.patch

@@ -1,4 +1,4 @@
-From 5d02f8f0e45d9b702f4b9af577ba96597e671eda Mon Sep 17 00:00:00 2001
+From 2d430ee7eddeccfec313ff6b233cd21610d43268 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:24 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent

patches/api/0026-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From 5ab2d114a2e7670385dbc009fa4003fd33128328 Mon Sep 17 00:00:00 2001
+From d791d6fabb76c20a61628b1385c9fd4082e4182a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:10 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent

patches/api/0027-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch

@@ -1,4 +1,4 @@
-From 7585dec7e71ded381ac4e47354e34bf1d0899b86 Mon Sep 17 00:00:00 2001
+From b1d25612377cabaa13d2283f99ecf369edb75d5e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:53:46 -0500
 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon

patches/api/0028-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From 019520dabc7b0c2aa506fd02575b5ecaa7f90071 Mon Sep 17 00:00:00 2001
+From bff9840823ea00fc90f1a46db26fb66edbc053df Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:38 -0600
 Subject: [PATCH] Implement EntityMoveEvent

patches/api/0029-Add-ItemStack-convenience-methods.patch

@@ -1,4 +1,4 @@
-From da8df9256caea27c4fc9e9298878e1d1428fe6a1 Mon Sep 17 00:00:00 2001
+From 5604fc9655a277f14d6796ea3dd49bc34af8ab7b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods

patches/api/0030-Add-BellRingEvent.patch

@@ -1,4 +1,4 @@
-From 179348f81a08cc70fc0ba7f2e72ced6222a0ac38 Mon Sep 17 00:00:00 2001
+From 1af4daf9a5234c33b5e3d53c401ffacf74179d8f Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:39 -0700
 Subject: [PATCH] Add BellRingEvent

patches/api/0031-Configurable-enchantment-max-level.patch

@@ -1,4 +1,4 @@
-From 05f331fbdeffe82858cc827f452ca3458108921e Mon Sep 17 00:00:00 2001
+From 8746ada205f89722c0e8c2aefb2a7f812a1493e1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 19:18:29 -0500
 Subject: [PATCH] Configurable enchantment max level

patches/api/0032-More-anvil-controls.patch

@@ -1,4 +1,4 @@
-From 1f9945fb4f4524e6faf06b2b374a3c4a66aaf80b Mon Sep 17 00:00:00 2001
+From 2d9b148d0e16c2ac73a972d8d6cb418d51c77dba Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 19 Apr 2020 00:25:09 -0500
 Subject: [PATCH] More anvil controls
@@ -13,7 +13,7 @@ Subject: [PATCH] More anvil controls
 
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 new file mode 100644
-index 00000000..85663c0a
+index 000000000..85663c0a4
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
 @@ -0,0 +1,52 @@
@@ -71,7 +71,7 @@ index 00000000..85663c0a
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 new file mode 100644
-index 00000000..2717ad82
+index 000000000..2717ad82c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
 @@ -0,0 +1,35 @@
@@ -111,7 +111,7 @@ index 00000000..2717ad82
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
-index b95e563b..435026e5 100644
+index b95e563b5..435026e53 100644
 --- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
 +++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
 @@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {

patches/api/0033-PlayerItemCooldownEvent.patch

@@ -1,4 +1,4 @@
-From f4a853766da3be371ba55bba97c3e8b2f0aaefd9 Mon Sep 17 00:00:00 2001
+From 37126b7796f37bc747b9f00439100a87e31c7efb Mon Sep 17 00:00:00 2001
 From: KennyTV <kennytv@t-online.de>
 Date: Mon, 20 Apr 2020 13:57:13 +0200
 Subject: [PATCH] PlayerItemCooldownEvent
@@ -10,7 +10,7 @@ Subject: [PATCH] PlayerItemCooldownEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 new file mode 100644
-index 00000000..ffc2512e
+index 000000000..2002909f3
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/player/PlayerItemCooldownEvent.java
 @@ -0,0 +1,77 @@
@@ -92,5 +92,5 @@ index 00000000..ffc2512e
 +    }
 +}
 -- 
-2.26.1.windows.1
+2.24.0
 

patches/api/0034-Player-invulnerabilities.patch

@@ -1,4 +1,4 @@
-From 017455c2e28e6237b63a1b5d7ffb95a2a9efd334 Mon Sep 17 00:00:00 2001
+From 8eadbbe8b0c05341045d3cdb76946da3112b6957 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:31 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -8,7 +8,7 @@ Subject: [PATCH] Player invulnerabilities
  1 file changed, 21 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index edc48117..5d77b71d 100644
+index edc481170..5d77b71d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1850,5 +1850,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM