Move timings changes to its own patch

patches/api/0001-Rebrand.patch

@@ -1,12 +1,11 @@
-From f4eddf543b30c6c3b2457f4be39e7283f114f75a Mon Sep 17 00:00:00 2001
+From 8f788f0d088dedfb7407566e489b3c13ede8b4f4 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] Rebrand
 
 ---
- pom.xml                                           | 13 ++++++-------
- src/main/java/co/aikar/timings/TimingsExport.java |  2 +-
- 2 files changed, 7 insertions(+), 8 deletions(-)
+ pom.xml | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
 index 2cb971408..58a1f7d07 100644
@@ -45,19 +44,6 @@ index 2cb971408..58a1f7d07 100644
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 23eb8c65c..bc152ca2b 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -283,7 +283,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("https://timings.pl3x.net/post").openConnection();
-             con.setDoOutput(true);
-             String hostName = "BrokenHost";
-             try {
 -- 
 2.24.0
 

patches/api/0002-Purpur-config-files.patch

@@ -0,0 +1,30 @@
+From a5bf35da63687caa3e7bca2b719c2c4f279d5723 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
+
+---
+ src/main/java/org/bukkit/Server.java | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
+index 98e7ba900..765f8059a 100644
+--- a/src/main/java/org/bukkit/Server.java
++++ b/src/main/java/org/bukkit/Server.java
+@@ -1331,6 +1331,13 @@ public interface Server extends PluginMessageRecipient {
+         }
+         // Paper end
+ 
++        // Purpur start
++        @NotNull
++        public org.bukkit.configuration.file.YamlConfiguration getPurpurConfig() {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++        // Purpur end
++
+         /**
+          * Sends the component to the player
+          *
+-- 
+2.24.0
+

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

@@ -0,0 +1,35 @@
+From 8a1d326049c054417215c4323b06599aa1c5542b 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 | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
+index 23eb8c65c..13f335997 100644
+--- a/src/main/java/co/aikar/timings/TimingsExport.java
++++ b/src/main/java/co/aikar/timings/TimingsExport.java
+@@ -206,7 +206,8 @@ class TimingsExport extends Thread {
+         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))
++            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
++            pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null)) // Purpur
+         ));
+ 
+         new TimingsExport(listeners, parent, history).start();
+@@ -283,7 +284,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/0004-Ridables.patch

@@ -1,4 +1,4 @@
-From 58f629ff04510107d4e0005e5cfc3c614ecbcf52 Mon Sep 17 00:00:00 2001
+From 2226788f01d043f4c3839259447f0bacb3c166fb 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Ridables
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 new file mode 100644
-index 00000000..c0ec5a13
+index 000000000..c0ec5a130
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 @@ -0,0 +1,37 @@
@@ -53,7 +53,7 @@ index 00000000..c0ec5a13
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5518ecd2..809021b2 100644
+index 5518ecd21..809021b20 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -656,4 +656,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

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

@@ -1,4 +1,4 @@
-From 310e46f83be4cb38be1ba3e3c13683253d3cc45f Mon Sep 17 00:00:00 2001
+From 53631afe68d9acea33e6902859a2e3a39fe370b4 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 355bd2e2..50415189 100644
+index 355bd2e22..50415189c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -807,13 +807,10 @@ public final class Bukkit {
@@ -32,7 +32,7 @@ index 355bd2e2..50415189 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 98e7ba90..248c32b0 100644
+index 765f8059a..e0d207d73 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient {
@@ -50,7 +50,7 @@ index 98e7ba90..248c32b0 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 d7d6a3e83..cf8d77491 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/0006-Allow-inventory-resizing.patch

@@ -1,4 +1,4 @@
-From feca342eda755a4e536ec48a4c1d528c80a35402 Mon Sep 17 00:00:00 2001
+From fc6e3fdc54656b498d5bb9ae14fad4892ba50229 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Allow inventory resizing
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 10c3b6d7..931e5ff7 100644
+index 10c3b6d75..931e5ff7b 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
 @@ -128,7 +128,7 @@ public enum InventoryType {

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

@@ -1,4 +1,4 @@
-From 4d187d87c842770caedf16ca9f051fd1b3732d9d Mon Sep 17 00:00:00 2001
+From 2485a3cead97fe0e750fc0d9e91541d22e433593 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..4db33485
+index 000000000..4db334854
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerAFKEvent.java
 @@ -0,0 +1,70 @@
@@ -86,7 +86,7 @@ index 00000000..4db33485
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 877ea4f3..b9fe2a0f 100644
+index 877ea4f32..b9fe2a0fa 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2067,4 +2067,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/api/0008-Add-EntityPortalReadyEvent.patch

@@ -1,4 +1,4 @@
-From 8f4805c659215292c3cc6ae82997f07764f28654 Mon Sep 17 00:00:00 2001
+From 5674b1e40686d33ce2ca4bf877784dadd9aec77f 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java
 new file mode 100644
-index 00000000..37f11c10
+index 000000000..37f11c104
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityPortalReadyEvent.java
 @@ -0,0 +1,40 @@

patches/api/0009-Add-tick-times-API.patch

@@ -1,4 +1,4 @@
-From 06db9bc6c7dd75c551ed8572bf924e0e6a149067 Mon Sep 17 00:00:00 2001
+From 91cf9066559c224fe335daba79f4cad4a0aac81c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 00:41:08 -0600
 Subject: [PATCH] Add tick times API
@@ -39,10 +39,10 @@ index 50415189c..8fbda2aee 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 248c32b03..7d631ac27 100644
+index e0d207d73..6be24c16c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1413,4 +1413,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1420,4 +1420,21 @@ public interface Server extends PluginMessageRecipient {
       */
      int getCurrentTick();
      // Paper end

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

@@ -1,4 +1,4 @@
-From 2c39363f1617d348182d18c4ef1ba4b60e904140 Mon Sep 17 00:00:00 2001
+From ff8c9b346b116a2558a9c6499b600ce56c5f7904 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
@@ -29,10 +29,10 @@ index 8fbda2aee..a2cf8e29b 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7d631ac27..92df8f8cd 100644
+index 6be24c16c..6690ef00c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1415,6 +1415,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start

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

@@ -1,4 +1,4 @@
-From d98d5e617a7514cd7b899a2d0fb8da7588b5c934 Mon Sep 17 00:00:00 2001
+From 5e09c1746e3db13c3230138414436cd08abd08c2 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement LivingEntity safeFallDistance
  1 file changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 77f4246d..2e1e27b0 100644
+index 77f4246d7..2e1e27b05 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -701,4 +701,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

patches/api/0012-Add-ExecuteCommandEvent.patch

@@ -1,4 +1,4 @@
-From 274c8049b8a80b1677134d12cabff19a0bfbad2e Mon Sep 17 00:00:00 2001
+From f142340af07c20e2e48954e21d0395563028f742 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Add ExecuteCommandEvent
 
 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 00000000..3250bd4d
+index 000000000..3250bd4dc
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ExecuteCommandEvent.java
 @@ -0,0 +1,130 @@
@@ -146,7 +146,7 @@ index 00000000..3250bd4d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 460fda05..1e0eb099 100644
+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 {

patches/api/0013-Implement-ChunkTooLargeEvent.patch

@@ -1,4 +1,4 @@
-From b94ddbb2afac2538d00ac7adf6080f9e8a5e7d2e Mon Sep 17 00:00:00 2001
+From 20b2357b34fb3596a795660ec87e3ec2a4488f62 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement ChunkTooLargeEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 new file mode 100644
-index 00000000..f9d4a42c
+index 000000000..f9d4a42c6
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/ChunkTooLargeEvent.java
 @@ -0,0 +1,109 @@

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

@@ -1,4 +1,4 @@
-From 4e1039edb300dd6fe96d0879f7e08d8a73f1f844 Mon Sep 17 00:00:00 2001
+From 5d638f431165d9cce1456fa35e5f5947c2dc5893 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
@@ -29,10 +29,10 @@ index a2cf8e29b..220cc96c0 100644
       * Get a sample of the servers last tick times (in nanos)
       * 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 92df8f8cd..3714f2f55 100644
+index 6690ef00c..8ce12a1c0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1422,6 +1422,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1429,6 +1429,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  

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

@@ -1,4 +1,4 @@
-From e65b38277758c8b2133f679404b5ec33a70fd072 Mon Sep 17 00:00:00 2001
+From e43f10dce3d188e53ec6cd1a4d9e8819350e95d4 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
@@ -12,7 +12,7 @@ Subject: [PATCH] Advancement API Additions
  create mode 100644 src/main/java/org/bukkit/advancement/FrameType.java
 
 diff --git a/src/main/java/org/bukkit/advancement/Advancement.java b/src/main/java/org/bukkit/advancement/Advancement.java
-index 7c500997..432caadb 100644
+index 7c5009974..432caadba 100644
 --- a/src/main/java/org/bukkit/advancement/Advancement.java
 +++ b/src/main/java/org/bukkit/advancement/Advancement.java
 @@ -3,6 +3,7 @@ package org.bukkit.advancement;
@@ -38,7 +38,7 @@ index 7c500997..432caadb 100644
  }
 diff --git a/src/main/java/org/bukkit/advancement/AdvancementDisplay.java b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
 new file mode 100644
-index 00000000..bca3d112
+index 000000000..bca3d112e
 --- /dev/null
 +++ b/src/main/java/org/bukkit/advancement/AdvancementDisplay.java
 @@ -0,0 +1,53 @@
@@ -97,7 +97,7 @@ index 00000000..bca3d112
 +}
 diff --git a/src/main/java/org/bukkit/advancement/FrameType.java b/src/main/java/org/bukkit/advancement/FrameType.java
 new file mode 100644
-index 00000000..d1757f3d
+index 000000000..d1757f3d4
 --- /dev/null
 +++ b/src/main/java/org/bukkit/advancement/FrameType.java
 @@ -0,0 +1,27 @@

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

@@ -1,4 +1,4 @@
-From ffb5a9e257eb752cc814a8c2ad34281fc0cbcedd Mon Sep 17 00:00:00 2001
+From ba7c31d363c124d1d76e449314cea73c71eaf513 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Implement ItemFactory#getMonsterEgg
  1 file changed, 11 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 03ba2265..630c15d2 100644
+index 03ba22659..630c15d23 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -166,4 +166,15 @@ public interface ItemFactory {

patches/api/0017-Implement-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -1,4 +1,4 @@
-From 2bc86d35277b1f10a66da66679ebad753cc5e2e6 Mon Sep 17 00:00:00 2001
+From 1706141ee6b09fd3eacc90cd54ce8e10f9bc2b7b 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 new file mode 100644
-index 00000000..c050b75e
+index 000000000..c050b75e9
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/PlayerSetSpawnerTypeWithEggEvent.java
 @@ -0,0 +1,85 @@

patches/api/0018-Add-MonsterEggSpawnEvent.patch

@@ -1,4 +1,4 @@
-From f9b7f2c2980f030dac545c5968f53ff0336919ee Mon Sep 17 00:00:00 2001
+From 42efc2192856cf55d70e06391ac7f8fadf19681a 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add MonsterEggSpawnEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 new file mode 100644
-index 00000000..983d6723
+index 000000000..983d67234
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/MonsterEggSpawnEvent.java
 @@ -0,0 +1,67 @@

patches/api/0019-Add-ThrownEggHatchEvent.patch

@@ -1,4 +1,4 @@
-From 2cc5826c577ada95c503685def71ca2229fc42b2 Mon Sep 17 00:00:00 2001
+From 11affff10e4891f58f728891f8fdbcf29de19984 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add ThrownEggHatchEvent
 
 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 00000000..815e871d
+index 000000000..815e871d0
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/ThrownEggHatchEvent.java
 @@ -0,0 +1,113 @@

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

@@ -1,4 +1,4 @@
-From 5290786e816577b65635c4bf4f19a5c0161cbd01 Mon Sep 17 00:00:00 2001
+From 0b2ca9d055cbef330876bd0a759210ce7fd9b907 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
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
 
 diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
 new file mode 100644
-index 00000000..f5ad98c6
+index 000000000..f5ad98c62
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
 @@ -0,0 +1,36 @@
@@ -52,7 +52,7 @@ index 00000000..f5ad98c6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 5047be15..80d63e25 100644
+index 5047be15f..80d63e250 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3117,6 +3117,16 @@ public interface World extends PluginMessageRecipient, Metadatable {

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

@@ -1,4 +1,4 @@
-From 4ab0e022aceb013cac96033a9831f04f773a42ab Mon Sep 17 00:00:00 2001
+From c4edd7018545faf35f370d4e8fe4f08ecb2baced 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 ef48ad9b..2bb9f768 100644
+index ef48ad9b2..2bb9f768b 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
 @@ -96,6 +96,13 @@ public interface Villager extends AbstractVillager {

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

@@ -1,4 +1,4 @@
-From a3f61fb19e894e0cfa62861f71d831da596b7e56 Mon Sep 17 00:00:00 2001
+From 0b7223ebf7e15b584fc72ec60da3ca841f90ed08 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Expose getItemStack for Trident
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java
-index 3379ef9b..27f19074 100644
+index 3379ef9ba..27f19074e 100644
 --- a/src/main/java/org/bukkit/entity/Trident.java
 +++ b/src/main/java/org/bukkit/entity/Trident.java
 @@ -3,4 +3,14 @@ package org.bukkit.entity;

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

@@ -1,4 +1,4 @@
-From 82710ce4f071a88af2810cd1fb22f102e8c19f16 Mon Sep 17 00:00:00 2001
+From b3769f637f3dc7e629337a2d1fc24b68d37069d0 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Add more llama API
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
 new file mode 100644
-index 00000000..6e68c139
+index 000000000..6e68c1399
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaJoinCaravanEvent.java
 @@ -0,0 +1,61 @@
@@ -80,7 +80,7 @@ index 00000000..6e68c139
 +}
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 new file mode 100644
-index 00000000..ec8d978c
+index 000000000..ec8d978c2
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/LlamaLeaveCaravanEvent.java
 @@ -0,0 +1,34 @@
@@ -119,7 +119,7 @@ index 00000000..ec8d978c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index d23226cc..1ef9479c 100644
+index d23226ccb..1ef9479c9 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;

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

@@ -1,4 +1,4 @@
-From 7eb218a710dac5d39311af7ffe4eb8d6f34774e8 Mon Sep 17 00:00:00 2001
+From 8b6dbecee0d1542ac21cc0e0b7cb0972459ad31c 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add more evoker API
  1 file changed, 17 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/Evoker.java b/src/main/java/org/bukkit/entity/Evoker.java
-index f8d173ad..f2a03f7f 100644
+index f8d173adc..f2a03f7f8 100644
 --- a/src/main/java/org/bukkit/entity/Evoker.java
 +++ b/src/main/java/org/bukkit/entity/Evoker.java
 @@ -64,4 +64,21 @@ public interface Evoker extends Spellcaster {

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

@@ -1,4 +1,4 @@
-From 66ce45dc58b31a62835a65084975bd2944afb805 Mon Sep 17 00:00:00 2001
+From 751e2690ac68caf38a98e10dba2fd5638798c468 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 80d63e25..3a0be100 100644
+index 80d63e250..3a0be1004 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -3125,6 +3125,16 @@ public interface World extends PluginMessageRecipient, Metadatable {

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

@@ -1,4 +1,4 @@
-From d77454324f3c45b2ab8c681f4b1a4c048f2baa69 Mon Sep 17 00:00:00 2001
+From 4ebf17348d90eb71f570dae60c164487edcd8d16 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
  1 file changed, 17 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 2e1e27b0..3bf1e100 100644
+index 2e1e27b05..3bf1e1009 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -716,5 +716,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

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

@@ -1,4 +1,4 @@
-From ca47259eaee5541c8e2eb4a4d1f6f9af58c6cfc2 Mon Sep 17 00:00:00 2001
+From 562ac86ea29bd27b5fc5d752b6420f3453417d62 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
@@ -8,7 +8,7 @@ Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
  1 file changed, 24 insertions(+)
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
-index d79dbcd6..1ed3ea8f 100644
+index d79dbcd68..1ed3ea8fa 100644
 --- a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java
 @@ -1,20 +1,30 @@

patches/api/0028-Add-LootableInventoryFirstFillEvent.patch

@@ -1,4 +1,4 @@
-From 5572f8fa1338a49cc0275bbdb32e27a22e902878 Mon Sep 17 00:00:00 2001
+From ddf19ccd8ab11161730a8343d8d3b7d519645581 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Add LootableInventoryFirstFillEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java b/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java
 new file mode 100644
-index 00000000..ef8eafb7
+index 000000000..ef8eafb7c
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/block/LootableInventoryFirstFillEvent.java
 @@ -0,0 +1,42 @@

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

@@ -1,4 +1,4 @@
-From 2e59c0d80bf6d8be098fa62c44512e761e8ccf72 Mon Sep 17 00:00:00 2001
+From cac280553cbb6a3332741a1eb53118a46eecee90 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
@@ -9,7 +9,7 @@ Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon
  2 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/PortalType.java b/src/main/java/org/bukkit/PortalType.java
-index 427cfbb8..e2356532 100644
+index 427cfbb8b..e23565323 100644
 --- a/src/main/java/org/bukkit/PortalType.java
 +++ b/src/main/java/org/bukkit/PortalType.java
 @@ -15,6 +15,13 @@ public enum PortalType {
@@ -27,7 +27,7 @@ index 427cfbb8..e2356532 100644
       * This is a custom Plugin portal.
       */
 diff --git a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
-index 397baaef..7456240b 100644
+index 397baaefd..7456240b4 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/EntityCreatePortalEvent.java
 @@ -11,10 +11,8 @@ import org.jetbrains.annotations.NotNull;

patches/api/0030-Implement-EntityMoveEvent.patch

@@ -1,4 +1,4 @@
-From 5c6a41619b0385514e2540103dbdf89f3012cfb2 Mon Sep 17 00:00:00 2001
+From 534c94b62bf879c90aeecd784759b4e4564b884e 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement EntityMoveEvent
 
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 new file mode 100644
-index 00000000..c48c525b
+index 000000000..c48c525b8
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/EntityMoveEvent.java
 @@ -0,0 +1,95 @@