diff --git a/Paper b/Paper
index 0ed6da7ab..a4f066cce 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 0ed6da7ab2a309973e4b3bbe9e7abe56ea93fe2a
+Subproject commit a4f066ccea069da8ff950ecf52e42e20234f41df
diff --git a/current-paper b/current-paper
index 5368ea739..ac624dfd7 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--02a000c7ee17e8217c3b0a580b2f054f6f7d2ec7
+1.15.2--fa4549a5b3af14f60ddc6ff880cb804c6166f4f9
diff --git a/patches/api/0002-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch
index 0ac0e3b7c..ccffae889 100644
--- a/patches/api/0002-Purpur-config-files.patch
+++ b/patches/api/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From b7f8049479b52ec5a7c0edb6fd48ae1fa12fb7ad Mon Sep 17 00:00:00 2001
+From 748ec8f720ad952d784ed4e3931d4c9a9de1c17c 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
@@ -50,10 +50,10 @@ index 93d5a3f97..5e7e10c8f 100644
  
          JSONObject object = new JSONObject();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80f9abdca..eaaf9a4e9 100644
+index 9ceaac0e8..20fe14213 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1371,6 +1371,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -1386,6 +1386,18 @@ public interface Server extends PluginMessageRecipient {
          }
          // Paper end
  
diff --git a/patches/api/0009-Add-tick-times-API.patch b/patches/api/0009-Add-tick-times-API.patch
index 23c5e4232..80bf854aa 100644
--- a/patches/api/0009-Add-tick-times-API.patch
+++ b/patches/api/0009-Add-tick-times-API.patch
@@ -1,4 +1,4 @@
-From 9d3f33b35ebc4ff79bff98b87904592581b3ebce Mon Sep 17 00:00:00 2001
+From 190a3d3ef1cd3a3444da5965a8230f44883ebcd3 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
  2 files changed, 38 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3a60094a1..6935cf272 100644
+index 9cac2d299..14e85ac6c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1664,4 +1664,25 @@ public final class Bukkit {
+@@ -1692,4 +1692,25 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -39,12 +39,12 @@ index 3a60094a1..6935cf272 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e8b2fe0c2..9d306c084 100644
+index 8f16fb0cb..90b439071 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1465,4 +1465,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1487,4 +1487,21 @@ public interface Server extends PluginMessageRecipient {
       */
-     int getCurrentTick();
+     boolean isStopping();
      // Paper end
 +
 +    // Purpur start
diff --git a/patches/api/0010-Bring-back-server-name.patch b/patches/api/0010-Bring-back-server-name.patch
index 20ba546a5..41e286911 100644
--- a/patches/api/0010-Bring-back-server-name.patch
+++ b/patches/api/0010-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From 59d3509aaea5bc9b3b15b30602af394a6ef741ec Mon Sep 17 00:00:00 2001
+From d4f6fbd999d628857801e5d9a405ee5b010e9ab5 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,10 +9,10 @@ Subject: [PATCH] Bring back server name
  2 files changed, 16 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6935cf272..abf7caf0b 100644
+index 14e85ac6c..ce82eadb5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1666,6 +1666,15 @@ public final class Bukkit {
+@@ -1694,6 +1694,15 @@ public final class Bukkit {
      }
  
      // Purpur start
@@ -29,10 +29,10 @@ index 6935cf272..abf7caf0b 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 9d306c084..89e9395e8 100644
+index 90b439071..d2a3114eb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1467,6 +1467,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1489,6 +1489,13 @@ public interface Server extends PluginMessageRecipient {
      // Paper end
  
      // Purpur start
diff --git a/patches/api/0014-Implement-lagging-threshold.patch b/patches/api/0014-Implement-lagging-threshold.patch
index e5277a35b..12d12d515 100644
--- a/patches/api/0014-Implement-lagging-threshold.patch
+++ b/patches/api/0014-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From 0fa0f29ff2114ab2c3d770bfb54ef050bb727e87 Mon Sep 17 00:00:00 2001
+From 8cb6d31ea7c41a44a0f02f130c259613b7a384b5 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,10 +9,10 @@ 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 abf7caf0b..c9fc59a2e 100644
+index ce82eadb5..013e3b2d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1675,6 +1675,15 @@ public final class Bukkit {
+@@ -1703,6 +1703,15 @@ public final class Bukkit {
          return server.getServerName();
      }
  
@@ -29,10 +29,10 @@ index abf7caf0b..c9fc59a2e 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 89e9395e8..6f2e580ce 100644
+index d2a3114eb..a185f2473 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1474,6 +1474,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1496,6 +1496,13 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      String getServerName();
  
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 5978d96ab..9c44c7ed0 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From 6bc4c7906669c44712c2707619b491897537e761 Mon Sep 17 00:00:00 2001
+From 498a36be474c013abb9677f08f5d83e0ea160aa9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:02:11 -0500
 Subject: [PATCH] Rebrand
@@ -107,10 +107,10 @@ index cd6e259239..bb227bc0fb 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 936434110c..aec5ef2e33 100644
+index 2686874f26..9f6d2eebbc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1499,7 +1499,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1510,7 +1510,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -241,7 +241,7 @@ index 0000000000..d8b408f061
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b9a398bc57..f70468adab 100644
+index 8cc0f66ce5..76fbbb620c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -203,7 +203,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 408a63546..c07fe43ec 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From d37c97a3d37806c3efae56031dbe5253adbb152f Mon Sep 17 00:00:00 2001
+From 6d54e386f9aee77d38d503e587507142d959e77e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:09:43 -0500
 Subject: [PATCH] Purpur config files
@@ -20,10 +20,10 @@ Subject: [PATCH] Purpur config files
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 6916ed30c4..cd00a48927 100644
+index 1c4cd36351..cb8bac539d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -96,10 +96,12 @@ public class PaperConfig {
+@@ -97,10 +97,12 @@ public class PaperConfig {
              MinecraftServer.getServer().server.getCommandMap().register(entry.getKey(), "Paper", entry.getValue());
          }
  
@@ -57,7 +57,7 @@ index 1ef7890da5..e614570d33 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5117dafbcf..1131d43269 100644
+index d554d4cf0f..618f115ca9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -78,10 +78,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -971,7 +971,7 @@ index 0000000000..eda37fa43f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f70468adab..ea43602eb4 100644
+index 76fbbb620c..aa084a56b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -806,6 +806,7 @@ public final class CraftServer implements Server {
@@ -998,7 +998,7 @@ index f70468adab..ea43602eb4 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2082,6 +2085,18 @@ public final class CraftServer implements Server {
+@@ -2092,6 +2095,18 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 5b726603a..45f69feb5 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -1,4 +1,4 @@
-From b1a2d7c1ba4db2363fb795da44c55dcd68e8b682 Mon Sep 17 00:00:00 2001
+From e51672ab45d21a513bb38ecb7e4aa3446f074d43 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 6 Feb 2020 19:53:59 -0600
 Subject: [PATCH] Ridables
@@ -197,7 +197,7 @@ index 816d301f1c..f7344d3aec 100644
          this.C = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 862a64b6fd..69ae184bc6 100644
+index 9cb4e5a1e6..48be21826c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -236,7 +236,7 @@ index 862a64b6fd..69ae184bc6 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -822,6 +822,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -823,6 +823,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
  
@@ -244,7 +244,7 @@ index 862a64b6fd..69ae184bc6 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1148,6 +1149,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1149,6 +1150,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -252,7 +252,7 @@ index 862a64b6fd..69ae184bc6 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1161,8 +1163,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1162,8 +1164,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -263,7 +263,7 @@ index 862a64b6fd..69ae184bc6 100644
      }
  
      public boolean aA() {
-@@ -1293,6 +1296,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1294,6 +1297,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -271,7 +271,7 @@ index 862a64b6fd..69ae184bc6 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2124,7 +2128,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2125,7 +2129,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -286,7 +286,7 @@ index 862a64b6fd..69ae184bc6 100644
          }
          return true; // CraftBukkit
      }
-@@ -2159,6 +2169,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2160,6 +2170,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -299,7 +299,7 @@ index 862a64b6fd..69ae184bc6 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2327,6 +2343,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2328,6 +2344,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -307,7 +307,7 @@ index 862a64b6fd..69ae184bc6 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2545,6 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2546,6 +2563,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -315,7 +315,7 @@ index 862a64b6fd..69ae184bc6 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3391,4 +3409,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3392,4 +3410,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -5184,17 +5184,17 @@ index c4aa38ddf1..3d52a396e6 100644
          return f1 + f * (f2 - f1);
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index bdb90a3466..e059930ba7 100644
+index 134f7d0013..d659796737 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
-@@ -27,6 +27,7 @@ public abstract class PathfinderGoal {
+@@ -28,6 +28,7 @@ public abstract class PathfinderGoal {
  
      public void e() {}
  
 +    public void setTypes(EnumSet<PathfinderGoal.Type> types) { this.a(types); } // Purpur - OBFHELPER
      public void a(EnumSet<PathfinderGoal.Type> enumset) {
-         this.a.clear();
-         this.a.addAll(enumset);
+         // Paper start - remove streams from pathfindergoalselector
+         this.goalTypes.clear();
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java b/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
 index e07c7674a5..3c077b6870 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSwell.java
diff --git a/patches/server/0014-Zombie-horse-naturally-spawn.patch b/patches/server/0014-Zombie-horse-naturally-spawn.patch
index e5671839a..c71930720 100644
--- a/patches/server/0014-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0014-Zombie-horse-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From 91984aa97fb03de5d715aeba4f1c79b9af4cf5a8 Mon Sep 17 00:00:00 2001
+From b91f254c61044afeb51cddd2c150b1f8b4015684 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 43573287f2..42798f6e00 100644
+index 84a3367b87..7d9e61a82d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -568,12 +568,18 @@ public class WorldServer extends World {
+@@ -586,12 +586,18 @@ public class WorldServer extends World {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
diff --git a/patches/server/0019-Cows-eat-mushrooms.patch b/patches/server/0019-Cows-eat-mushrooms.patch
index e410f6aff..5029a28ca 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0019-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 45cdad7a9d811747ff0bfafaaaf8265d9f6f2e2f Mon Sep 17 00:00:00 2001
+From e7435b03177cd83fc098e5dd9f0d23dae640fb5f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 01:10:30 -0500
 Subject: [PATCH] Cows eat mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] Cows eat mushrooms
  4 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ffdad5f332..2035ea763d 100644
+index 48be21826c..db6766dce3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1046,6 +1046,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1047,6 +1047,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index ffdad5f332..2035ea763d 100644
      public void a(SoundEffect soundeffect, float f, float f1) {
          if (!this.isSilent()) {
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), soundeffect, this.getSoundCategory(), f, f1);
-@@ -2589,6 +2590,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2590,6 +2591,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -140,7 +140,7 @@ index 4049ab0273..47b19b7754 100644
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3e5a60ecfd..7908bb1607 100644
+index 12fbdf65c5..091f30727f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -145,10 +145,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index da379b140..453d6fbcd 100644
--- a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From b6e691c64ac83821ab032b70d20d0721fc3070c1 Mon Sep 17 00:00:00 2001
+From c6456c0ea379bec1ad012133ad7f17dc0779d90a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 18:26:06 -0500
 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -25,10 +25,10 @@ index f7344d3aec..f6c0165f94 100644
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 601d133946..6b95b89e89 100644
+index db6766dce3..06fd474253 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1392,6 +1392,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1393,6 +1393,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index 601d133946..6b95b89e89 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -1919,14 +1920,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1920,14 +1921,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
diff --git a/patches/server/0032-Controllable-Minecarts.patch b/patches/server/0032-Controllable-Minecarts.patch
index 982c5c937..1deb83bf2 100644
--- a/patches/server/0032-Controllable-Minecarts.patch
+++ b/patches/server/0032-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From 6d4b0ac5099bcd3c0ac27191ae75c1f61c6e51fc Mon Sep 17 00:00:00 2001
+From 28482d5bf765b5f76d724fc3f43d1b7bf3afe75a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 29 Jun 2019 02:32:40 -0500
 Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
  4 files changed, 76 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6b95b89e89..313b74fb0f 100644
+index 06fd474253..4a24f38885 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1293,6 +1293,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1294,6 +1294,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  
diff --git a/patches/server/0039-Implement-AFK-API.patch b/patches/server/0039-Implement-AFK-API.patch
index d692e8c98..948e7e679 100644
--- a/patches/server/0039-Implement-AFK-API.patch
+++ b/patches/server/0039-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 5f4953b02d1597baf03c2a5df53b63bd69e595a6 Mon Sep 17 00:00:00 2001
+From 06bc2751ebfd115af5d64546bf8c007a25f4abee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -18,10 +18,10 @@ Subject: [PATCH] Implement AFK API
  11 files changed, 112 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 313b74fb0f..cdb32e40ed 100644
+index 4a24f38885..1454c2fa4d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1385,6 +1385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1386,6 +1386,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  
@@ -206,10 +206,10 @@ index 895e34ed34..f92516069a 100644
                                  if (from.getX() != Double.MAX_VALUE) {
                                      Location oldTo = to.clone();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 42798f6e00..efe9796c4a 100644
+index 7d9e61a82d..b9309f1d2c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -383,7 +383,7 @@ public class WorldServer extends World {
+@@ -393,7 +393,7 @@ public class WorldServer extends World {
          }
  
          if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -218,7 +218,7 @@ index 42798f6e00..efe9796c4a 100644
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -696,7 +696,7 @@ public class WorldServer extends World {
+@@ -714,7 +714,7 @@ public class WorldServer extends World {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
diff --git a/patches/server/0044-Make-the-GUI-better.patch b/patches/server/0044-Make-the-GUI-better.patch
index d0e9873ad..566a2ffda 100644
--- a/patches/server/0044-Make-the-GUI-better.patch
+++ b/patches/server/0044-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From 9b8a27001d68292d0390367c6284393100d756e2 Mon Sep 17 00:00:00 2001
+From e1b312cc6867d590f6f5603a3316c416e0046655 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 16 Jan 2020 14:59:16 -0600
 Subject: [PATCH] Make the GUI better
@@ -88,10 +88,10 @@ index e614570d33..bd9c123d56 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index aec5ef2e33..63cc289e44 100644
+index 9f6d2eebbc..11ba4a8c06 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1306,6 +1306,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1317,6 +1317,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return true;
      }
  
diff --git a/patches/server/0046-Add-EntityPortalReadyEvent.patch b/patches/server/0046-Add-EntityPortalReadyEvent.patch
index 918dae2bf..b290bb0ef 100644
--- a/patches/server/0046-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0046-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 06beb46a65ac9ad982302a218fa13873f257e06f Mon Sep 17 00:00:00 2001
+From 866304d7e8ea0c56e8d4c59567255bbc9abd93b6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 11 Jan 2020 23:12:52 -0600
 Subject: [PATCH] Add EntityPortalReadyEvent
@@ -86,7 +86,7 @@ index 09c7c13183..6880cdd7f9 100644
                      break;
                      // CraftBukkit start - add the block to our list
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cdb32e40ed..3a7024b08c 100644
+index 1454c2fa4d..41f4d086e2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -169,9 +169,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index cdb32e40ed..3a7024b08c 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2230,6 +2230,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2231,6 +2231,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();
@@ -141,10 +141,10 @@ index f84dd6d9be..f50e9670bc 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0eca6f42d9..6c95497ee1 100644
+index b9309f1d2c..d0d3d6c29c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -65,7 +65,7 @@ public class WorldServer extends World {
+@@ -75,7 +75,7 @@ public class WorldServer extends World {
      public boolean savingDisabled;
      private boolean everyoneSleeping;
      private int emptyTime;
diff --git a/patches/server/0049-Add-blacklist-option-for-grindstone.patch b/patches/server/0048-Add-blacklist-option-for-grindstone.patch
similarity index 98%
rename from patches/server/0049-Add-blacklist-option-for-grindstone.patch
rename to patches/server/0048-Add-blacklist-option-for-grindstone.patch
index 332cd687a..52ee81f78 100644
--- a/patches/server/0049-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0048-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From 1309766e3d46d414d3dc5ca823c3a35fa671e1eb Mon Sep 17 00:00:00 2001
+From 7f2bd93c89a9c0a1465a0b794b35309e48bd95d1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 1 Aug 2019 19:15:12 -0500
 Subject: [PATCH] Add blacklist option for grindstone
@@ -68,7 +68,7 @@ index 7b7a0a7cb1..6b45bc17cf 100644
          return this.getItem().f(this);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0f0975e730..60f5f21645 100644
+index 15f6113762..03c10d778e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey;
diff --git a/patches/server/0048-Add-tick-times-API.patch b/patches/server/0048-Add-tick-times-API.patch
deleted file mode 100644
index 6d8105d60..000000000
--- a/patches/server/0048-Add-tick-times-API.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 6f706722898460ae8b2a24a3782e2353cb6509e7 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Thu, 30 Jan 2020 00:41:24 -0600
-Subject: [PATCH] Add tick times API
-
----
- .../net/minecraft/server/MinecraftServer.java | 37 +++++++++++++++++++
- .../org/bukkit/craftbukkit/CraftServer.java   | 12 ++++++
- 2 files changed, 49 insertions(+)
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 63cc289e44..e4b1eabd77 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-     private int G;
-     private int H;
-     public final long[] f = new long[100]; public long[] getTickTimes() { return f; } // Paper - OBFHELPER
-+    // Purpur start
-+    public final TickTimes tickTimes5s = new TickTimes(100);
-+    public final TickTimes tickTimes10s = new TickTimes(200);
-+    public final TickTimes tickTimes60s = new TickTimes(1200);
-+    // Purpur end
-     @Nullable
-     private KeyPair I;
-     @Nullable
-@@ -1175,6 +1180,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         this.methodProfiler.enter("tallying");
-         long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
- 
-+        // Purpur start
-+        tickTimes5s.add(this.ticks % 100, l);
-+        tickTimes10s.add(this.ticks % 200, l);
-+        tickTimes60s.add(this.ticks % 1200, l);
-+        // Purpur end
-+
-         this.av = this.av * 0.8F + (float) l / 1000000.0F * 0.19999999F;
-         long i1 = SystemUtils.getMonotonicNanos();
- 
-@@ -2270,4 +2281,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         return SERVER; // Paper
-     }
-     // CraftBukkit end
-+
-+    // Purpur start
-+    public static class TickTimes {
-+        private final long[] times;
-+
-+        public TickTimes(int length) {
-+            times = new long[length];
-+        }
-+
-+        void add(int index, long time) {
-+            times[index] = time;
-+        }
-+
-+        public long[] getTimes() {
-+            return times.clone();
-+        }
-+
-+        public double getAverage() {
-+            long total = 0L;
-+            for (long value : times) {
-+                total += value;
-+            }
-+            return ((double) total / (double) times.length) * 1.0E-6D;
-+        }
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ea43602eb4..cea28154e2 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2223,4 +2223,16 @@ public final class CraftServer implements Server {
-         return net.minecraft.server.MinecraftServer.currentTick;
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public long[] getTickTimes() {
-+        return getServer().tickTimes5s.getTimes();
-+    }
-+
-+    @Override
-+    public double getAverageTickTime() {
-+        return getServer().tickTimes5s.getAverage();
-+    }
-+    // Purpur end
- }
--- 
-2.24.0
-
diff --git a/patches/server/0050-Implement-lagging-threshold.patch b/patches/server/0049-Implement-lagging-threshold.patch
similarity index 86%
rename from patches/server/0050-Implement-lagging-threshold.patch
rename to patches/server/0049-Implement-lagging-threshold.patch
index 67fbc3b61..5c7c8f67f 100644
--- a/patches/server/0050-Implement-lagging-threshold.patch
+++ b/patches/server/0049-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From b8502fc595d496a47f136d6aa11e995572d43ce3 Mon Sep 17 00:00:00 2001
+From bc78a0fa91cf5f14809754da9f5f28cd6413bce7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 10:07:16 -0500
 Subject: [PATCH] Implement lagging threshold
@@ -6,11 +6,11 @@ Subject: [PATCH] Implement lagging threshold
 ---
  src/main/java/net/minecraft/server/MinecraftServer.java | 2 ++
  src/main/java/net/pl3x/purpur/PurpurConfig.java         | 5 +++++
- src/main/java/org/bukkit/craftbukkit/CraftServer.java   | 5 +++++
- 3 files changed, 12 insertions(+)
+ src/main/java/org/bukkit/craftbukkit/CraftServer.java   | 7 +++++++
+ 3 files changed, 14 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4b1eabd77..510da109b0 100644
+index 11ba4a8c06..6887c2ffd2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,6 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -46,19 +46,20 @@ index e219312168..b608b1deb3 100644
      private static void dontSendUselessEntityPackets() {
          dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cea28154e2..13da5fedbb 100644
+index aa084a56b2..5ecdea2ee0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2234,5 +2234,10 @@ public final class CraftServer implements Server {
-     public double getAverageTickTime() {
-         return getServer().tickTimes5s.getAverage();
+@@ -2238,4 +2238,11 @@ public final class CraftServer implements Server {
+         return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
+     // Paper end
 +
++    // Purpur start
 +    @Override
 +    public boolean isLagging() {
 +        return getServer().lagging;
 +    }
-     // Purpur end
++    // Purpur end
  }
 -- 
 2.24.0
diff --git a/patches/server/0051-Implement-configurable-villager-brain-ticks.patch b/patches/server/0050-Implement-configurable-villager-brain-ticks.patch
similarity index 98%
rename from patches/server/0051-Implement-configurable-villager-brain-ticks.patch
rename to patches/server/0050-Implement-configurable-villager-brain-ticks.patch
index 73b636723..059e7ea60 100644
--- a/patches/server/0051-Implement-configurable-villager-brain-ticks.patch
+++ b/patches/server/0050-Implement-configurable-villager-brain-ticks.patch
@@ -1,4 +1,4 @@
-From 9895d9f862bc3acd00fb2f13d29fe58d1c1d5642 Mon Sep 17 00:00:00 2001
+From 0a9ca74c6ac418b7a763f1f1782353b5468a513b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
diff --git a/patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
similarity index 97%
rename from patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
rename to patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
index 74d5d4c2f..93db440cd 100644
--- a/patches/server/0052-Add-option-for-zombies-targetting-turtle-eggs.patch
+++ b/patches/server/0051-Add-option-for-zombies-targetting-turtle-eggs.patch
@@ -1,4 +1,4 @@
-From d088458b4d4f9f5269dbf9e0c3283f6bf3376ee3 Mon Sep 17 00:00:00 2001
+From a7cde93d882393149203f5a959a2ebc10f1b84c6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
diff --git a/patches/server/0053-Implement-bamboo-growth-settings.patch b/patches/server/0052-Implement-bamboo-growth-settings.patch
similarity index 98%
rename from patches/server/0053-Implement-bamboo-growth-settings.patch
rename to patches/server/0052-Implement-bamboo-growth-settings.patch
index 7599aea48..a8227aa58 100644
--- a/patches/server/0053-Implement-bamboo-growth-settings.patch
+++ b/patches/server/0052-Implement-bamboo-growth-settings.patch
@@ -1,4 +1,4 @@
-From 86128fc56605abb5750fbb85c81d652a6c06263a Mon Sep 17 00:00:00 2001
+From e763204c910ac50b29391bcdd9f0310d903621a0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 20:57:29 -0500
 Subject: [PATCH] Implement bamboo growth settings
@@ -76,7 +76,7 @@ index 02c548dd9c..016ceebb9d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f3d9944e93..9e6f4bb843 100644
+index da12d94601..829ab945fa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -72,6 +72,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
similarity index 97%
rename from patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch
rename to patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
index 8c8598183..f243b5a0a 100644
--- a/patches/server/0054-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0053-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 2f98750b79199b775d18ce235717cfe8f1eaec20 Mon Sep 17 00:00:00 2001
+From c840da389140d49c8d6423e6ed55ca491c677046 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Climbing should not bypass cramming gamerule
@@ -17,10 +17,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3a7024b08c..09224e2b11 100644
+index 41f4d086e2..1ee3dafc45 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1520,6 +1520,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1521,6 +1521,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {
@@ -161,7 +161,7 @@ index 4665671ef6..fbf2a50f08 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ec())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9e6f4bb843..c593180397 100644
+index 829ab945fa..0d8276a69c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -136,6 +136,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0055-Option-for-slimes-not-pushable.patch b/patches/server/0054-Option-for-slimes-not-pushable.patch
similarity index 97%
rename from patches/server/0055-Option-for-slimes-not-pushable.patch
rename to patches/server/0054-Option-for-slimes-not-pushable.patch
index f5150cbbb..70bfb8b42 100644
--- a/patches/server/0055-Option-for-slimes-not-pushable.patch
+++ b/patches/server/0054-Option-for-slimes-not-pushable.patch
@@ -1,4 +1,4 @@
-From 7806409448b0a5cfe121230af5ab00a771ad81a4 Mon Sep 17 00:00:00 2001
+From 64b784befcca6b4662238e5a7ef93fcf35ae04f9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 23 Aug 2019 21:56:31 -0500
 Subject: [PATCH] Option for slimes not pushable
diff --git a/patches/server/0056-Bring-back-server-name.patch b/patches/server/0055-Bring-back-server-name.patch
similarity index 87%
rename from patches/server/0056-Bring-back-server-name.patch
rename to patches/server/0055-Bring-back-server-name.patch
index c1ac07fd0..87bf8484b 100644
--- a/patches/server/0056-Bring-back-server-name.patch
+++ b/patches/server/0055-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From f20db3ae3d9121a59e5abb19b6c2b704082e05ad Mon Sep 17 00:00:00 2001
+From 1297e8eb5780abad9be724575bd5bfbbf8c84bef Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 26 May 2019 15:19:14 -0500
 Subject: [PATCH] Bring back server name
@@ -21,10 +21,10 @@ index 0c3ec83570..309f5562b8 100644
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 13da5fedbb..e2392032b2 100644
+index 5ecdea2ee0..6cebb2b7c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2225,6 +2225,11 @@ public final class CraftServer implements Server {
+@@ -2240,6 +2240,11 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Purpur start
@@ -34,8 +34,8 @@ index 13da5fedbb..e2392032b2 100644
 +    }
 +
      @Override
-     public long[] getTickTimes() {
-         return getServer().tickTimes5s.getTimes();
+     public boolean isLagging() {
+         return getServer().lagging;
 -- 
 2.24.0
 
diff --git a/patches/server/0057-Dispenser-curse-of-binding-protection.patch b/patches/server/0056-Dispenser-curse-of-binding-protection.patch
similarity index 97%
rename from patches/server/0057-Dispenser-curse-of-binding-protection.patch
rename to patches/server/0056-Dispenser-curse-of-binding-protection.patch
index 02a056049..64e9655cf 100644
--- a/patches/server/0057-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0056-Dispenser-curse-of-binding-protection.patch
@@ -1,4 +1,4 @@
-From a61b377c3381264e8798e346d30e7309118202c2 Mon Sep 17 00:00:00 2001
+From 2f0031c31dbe4c083713f492881df9d1af366e65 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 25 Aug 2019 00:09:52 -0500
 Subject: [PATCH] Dispenser curse of binding protection
@@ -49,7 +49,7 @@ index df8c42bfbd..a4b3d0c298 100644
          return this.b;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c593180397..38d2e99cb1 100644
+index 0d8276a69c..f6e4b0d8b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch b/patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
similarity index 98%
rename from patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
rename to patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
index 926fe4c07..f121f588a 100644
--- a/patches/server/0058-Implement-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0057-Implement-LivingEntity-safeFallDistance.patch
@@ -1,4 +1,4 @@
-From ef2e0e662b4fdbb11c24630cce15ad4618daf32b Mon Sep 17 00:00:00 2001
+From ce75eeb888fd6a3636de0efc067796ea7f78acfc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 5 May 2019 12:58:45 -0500
 Subject: [PATCH] Implement LivingEntity safeFallDistance
diff --git a/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 95%
rename from patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch
index 196c811e7..bbcf1bdb4 100644
--- a/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0058-Add-option-for-boats-to-eject-players-on-land.patch
@@ -1,4 +1,4 @@
-From 9e5f3087a5309e2f2e0179e36b59fc7511863cfe Mon Sep 17 00:00:00 2001
+From ced3a2e752fe3e6abc9d437c97908743ae1d135c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 7 Sep 2019 22:47:59 -0500
 Subject: [PATCH] Add option for boats to eject players on land
@@ -21,7 +21,7 @@ index 563fc8ced0..479ed7c7bc 100644
              } else {
                  return EntityBoat.EnumStatus.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 38d2e99cb1..24b7154707 100644
+index f6e4b0d8b8..ba9fc88048 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -134,6 +134,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0060-Advancement-API-Additions.patch b/patches/server/0059-Advancement-API-Additions.patch
similarity index 99%
rename from patches/server/0060-Advancement-API-Additions.patch
rename to patches/server/0059-Advancement-API-Additions.patch
index ef678b792..f49a5c7e3 100644
--- a/patches/server/0060-Advancement-API-Additions.patch
+++ b/patches/server/0059-Advancement-API-Additions.patch
@@ -1,4 +1,4 @@
-From 252aeaebaf6963252adc8e93e8ca6fe8d1e4e9e0 Mon Sep 17 00:00:00 2001
+From 1c6389a654c0ddb4ee3d959e31d148e5f08f6702 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 31 May 2019 21:24:33 -0500
 Subject: [PATCH] Advancement API Additions
diff --git a/patches/server/0061-Add-option-to-set-armorstand-step-height.patch b/patches/server/0060-Add-option-to-set-armorstand-step-height.patch
similarity index 96%
rename from patches/server/0061-Add-option-to-set-armorstand-step-height.patch
rename to patches/server/0060-Add-option-to-set-armorstand-step-height.patch
index 7748a4730..2056470e2 100644
--- a/patches/server/0061-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0060-Add-option-to-set-armorstand-step-height.patch
@@ -1,4 +1,4 @@
-From 25447a2e438e473944698988df2c83de7c936273 Mon Sep 17 00:00:00 2001
+From ec8b550c4ebb69c5ac0fc03f5680ca0ccdfb4296 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 6 Oct 2019 12:46:35 -0500
 Subject: [PATCH] Add option to set armorstand step height
@@ -29,7 +29,7 @@ index dfe8c57cef..0f6870a45c 100644
          if (!this.canTick) {
              if (this.noTickPoseDirty) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24b7154707..910377c499 100644
+index ba9fc88048..8d99003a8a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -135,6 +135,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch b/patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
similarity index 97%
rename from patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch
rename to patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
index 2d5866540..bdd9cc253 100644
--- a/patches/server/0062-Implement-ItemFactory-getMonsterEgg.patch
+++ b/patches/server/0061-Implement-ItemFactory-getMonsterEgg.patch
@@ -1,4 +1,4 @@
-From c3d6fc5e2b0a71d385734bbf707b1366b0c9da1b Mon Sep 17 00:00:00 2001
+From 0a08cbb8c7b36082fe6efccd46987055239b1bba Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 16:36:55 -0500
 Subject: [PATCH] Implement ItemFactory#getMonsterEgg
diff --git a/patches/server/0063-Alternative-Keepalive-Handling.patch b/patches/server/0062-Alternative-Keepalive-Handling.patch
similarity index 98%
rename from patches/server/0063-Alternative-Keepalive-Handling.patch
rename to patches/server/0062-Alternative-Keepalive-Handling.patch
index 41427d387..e1ebac041 100644
--- a/patches/server/0063-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0062-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 8424f04fe9c27bbfd69727504f4330d5ad3d344c Mon Sep 17 00:00:00 2001
+From 453cb1e7cf0a3c89572dc257de590ed4b74f3053 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 11 Oct 2019 00:17:39 -0500
 Subject: [PATCH] Alternative Keepalive Handling
diff --git a/patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 97%
rename from patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
index 104bc1c45..7228b0882 100644
--- a/patches/server/0064-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0063-Implement-PlayerSetSpawnerTypeWithEggEvent.patch
@@ -1,4 +1,4 @@
-From 6d7ea8a087be03ce9ec616bc05232321ceed10d0 Mon Sep 17 00:00:00 2001
+From 6f8799eed41032695252fb7ed9bce9a9690f471a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 5 Jul 2019 18:21:00 -0500
 Subject: [PATCH] Implement PlayerSetSpawnerTypeWithEggEvent
diff --git a/patches/server/0065-Add-moon-phase-API.patch b/patches/server/0064-Add-moon-phase-API.patch
similarity index 90%
rename from patches/server/0065-Add-moon-phase-API.patch
rename to patches/server/0064-Add-moon-phase-API.patch
index 3528d0484..24c7ed12b 100644
--- a/patches/server/0065-Add-moon-phase-API.patch
+++ b/patches/server/0064-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From fb0fe965e1fe07f94203bc077b7a7e1efa071dca Mon Sep 17 00:00:00 2001
+From 15142ed5ebde0a586fd83ebae67ac21b655c5c83 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:16 -0600
 Subject: [PATCH] Add moon phase API
@@ -8,7 +8,7 @@ Subject: [PATCH] Add moon phase API
  1 file changed, 8 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1fbb1344fc..0054fe2a6d 100644
+index f56131e3a5..de8c2cd2bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2457,6 +2457,14 @@ public class CraftWorld implements World {
diff --git a/patches/server/0066-Add-getPlacementBlockData-to-World.patch b/patches/server/0065-Add-getPlacementBlockData-to-World.patch
similarity index 97%
rename from patches/server/0066-Add-getPlacementBlockData-to-World.patch
rename to patches/server/0065-Add-getPlacementBlockData-to-World.patch
index 13813a20c..a11ff9dfc 100644
--- a/patches/server/0066-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0065-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From beafcfd03b677a595ce23efd4a78d4f3c3679351 Mon Sep 17 00:00:00 2001
+From 3fa528c754db8cd7bb8cf844a1c4eda8cce349f7 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:30:17 -0600
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,7 +66,7 @@ index 9c9b93f280..74a722cce5 100644
      public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
      public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0054fe2a6d..cc35f322a8 100644
+index de8c2cd2bc..0f5bd0a17a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2463,6 +2463,11 @@ public class CraftWorld implements World {
diff --git a/patches/server/0067-Barrels-have-6-rows.patch b/patches/server/0066-Barrels-have-6-rows.patch
similarity index 98%
rename from patches/server/0067-Barrels-have-6-rows.patch
rename to patches/server/0066-Barrels-have-6-rows.patch
index e1cc2442f..bb55c256e 100644
--- a/patches/server/0067-Barrels-have-6-rows.patch
+++ b/patches/server/0066-Barrels-have-6-rows.patch
@@ -1,4 +1,4 @@
-From 3b81011884895ab7dba9c3f29a536a2ec0268dad Mon Sep 17 00:00:00 2001
+From d5c2ca13c73fb5250a39e89858e7dc0c9d0dc8c6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 23 May 2019 21:50:37 -0500
 Subject: [PATCH] Barrels have 6 rows
diff --git a/patches/server/0068-Enderchest-6-rows-plus-permissions.patch b/patches/server/0067-Enderchest-6-rows-plus-permissions.patch
similarity index 99%
rename from patches/server/0068-Enderchest-6-rows-plus-permissions.patch
rename to patches/server/0067-Enderchest-6-rows-plus-permissions.patch
index c36ed8b39..336d6b9cf 100644
--- a/patches/server/0068-Enderchest-6-rows-plus-permissions.patch
+++ b/patches/server/0067-Enderchest-6-rows-plus-permissions.patch
@@ -1,4 +1,4 @@
-From 730a0b2c96d54f9bba6c241e2aabdb9e7e5aa2f6 Mon Sep 17 00:00:00 2001
+From 375a8337c5992e617ebcddeba44ced534b932ad5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 23 Jun 2019 17:01:26 -0500
 Subject: [PATCH] Enderchest 6 rows (plus permissions)
diff --git a/patches/server/0069-Add-5-second-tps-average-in-tps.patch b/patches/server/0068-Add-5-second-tps-average-in-tps.patch
similarity index 97%
rename from patches/server/0069-Add-5-second-tps-average-in-tps.patch
rename to patches/server/0068-Add-5-second-tps-average-in-tps.patch
index a4ff21538..96e83e746 100644
--- a/patches/server/0069-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0068-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From a69d358165c1eea6ef0a6b220a1812375c1607d9 Mon Sep 17 00:00:00 2001
+From 7c31b36a57d591d8db8b5d77ad23baf51ad3decc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 28 Jul 2019 01:27:37 -0500
 Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
  3 files changed, 11 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 14d6f67c2b..95050de2a5 100644
+index 6887c2ffd2..1577308be6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -182,7 +182,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -52,7 +52,7 @@ index 14d6f67c2b..95050de2a5 100644
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e2392032b2..108f4ccf6b 100644
+index 6cebb2b7c1..f4081ecd3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2050,6 +2050,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 94%
rename from patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
index da66a27cd..19dc6d765 100644
--- a/patches/server/0070-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0069-Add-playPickupItemAnimation-to-LivingEntity.patch
@@ -1,4 +1,4 @@
-From 7732842c10213ebf95086f947dc6debf10aff8b5 Mon Sep 17 00:00:00 2001
+From 8741452b0b07fd1a96886e9aca6298a3ed699cf6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:25:16 -0500
 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
diff --git a/patches/server/0071-Add-more-evoker-API.patch b/patches/server/0070-Add-more-evoker-API.patch
similarity index 97%
rename from patches/server/0071-Add-more-evoker-API.patch
rename to patches/server/0070-Add-more-evoker-API.patch
index 490bfacb6..e57ad8494 100644
--- a/patches/server/0071-Add-more-evoker-API.patch
+++ b/patches/server/0070-Add-more-evoker-API.patch
@@ -1,4 +1,4 @@
-From c306c186ae294dc54ee21d1010509abd02bc12cb Mon Sep 17 00:00:00 2001
+From 4ffdac06240625be0d492cdca14d3decda4fd3d5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:29:02 -0500
 Subject: [PATCH] Add more evoker API
diff --git a/patches/server/0072-Add-API-for-Villager-resetOffers.patch b/patches/server/0071-Add-API-for-Villager-resetOffers.patch
similarity index 97%
rename from patches/server/0072-Add-API-for-Villager-resetOffers.patch
rename to patches/server/0071-Add-API-for-Villager-resetOffers.patch
index 0dd4af076..41aed143b 100644
--- a/patches/server/0072-Add-API-for-Villager-resetOffers.patch
+++ b/patches/server/0071-Add-API-for-Villager-resetOffers.patch
@@ -1,4 +1,4 @@
-From 6dc90c206d24a274c6ff030ca55302f5b4f0b584 Mon Sep 17 00:00:00 2001
+From d223e8233143f9da1f6fd2957ebf01d0da2bc274 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 7 Oct 2019 00:15:37 -0500
 Subject: [PATCH] Add API for Villager#resetOffers()
diff --git a/patches/server/0073-Add-more-llama-API.patch b/patches/server/0072-Add-more-llama-API.patch
similarity index 99%
rename from patches/server/0073-Add-more-llama-API.patch
rename to patches/server/0072-Add-more-llama-API.patch
index 6d109e527..bfad51db9 100644
--- a/patches/server/0073-Add-more-llama-API.patch
+++ b/patches/server/0072-Add-more-llama-API.patch
@@ -1,4 +1,4 @@
-From bed75b5779a908fc1f9c64bbdf48f2966887801a Mon Sep 17 00:00:00 2001
+From f132a8efa42e3d7d67c5b857b31e7d22c980eb6b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
diff --git a/patches/server/0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch b/patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
similarity index 95%
rename from patches/server/0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
rename to patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
index b55ed14bd..b6549ae14 100644
--- a/patches/server/0074-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
+++ b/patches/server/0073-Fix-furnace-cook-speed-multiplier-using-values-betwe.patch
@@ -1,4 +1,4 @@
-From cff47976090e87dc16d5a276a9cc885e825ecc6b Mon Sep 17 00:00:00 2001
+From 40669ce1b8be64c6d5ccdfa665b0d3116041ba30 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 03:36:52 -0500
 Subject: [PATCH] Fix furnace cook speed multiplier using values between 0 and
diff --git a/patches/server/0075-Implement-infinite-lava.patch b/patches/server/0074-Implement-infinite-lava.patch
similarity index 97%
rename from patches/server/0075-Implement-infinite-lava.patch
rename to patches/server/0074-Implement-infinite-lava.patch
index 11cce1d6b..0f043f766 100644
--- a/patches/server/0075-Implement-infinite-lava.patch
+++ b/patches/server/0074-Implement-infinite-lava.patch
@@ -1,4 +1,4 @@
-From babd4a9eafc898c15985e48c1318ffebf9ab3975 Mon Sep 17 00:00:00 2001
+From df729107182ad0052f70bf0cfd02d6e232d55177 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 23 Nov 2019 17:55:42 -0600
 Subject: [PATCH] Implement infinite lava
@@ -70,7 +70,7 @@ index 9eba9a12c0..39252e6873 100644
      protected boolean c;
      protected boolean d;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 910377c499..fbde4cc77e 100644
+index 8d99003a8a..fc7c9dd37e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0076-Expose-getItemStack-for-Trident.patch b/patches/server/0075-Expose-getItemStack-for-Trident.patch
similarity index 96%
rename from patches/server/0076-Expose-getItemStack-for-Trident.patch
rename to patches/server/0075-Expose-getItemStack-for-Trident.patch
index b9076ae69..58dca413b 100644
--- a/patches/server/0076-Expose-getItemStack-for-Trident.patch
+++ b/patches/server/0075-Expose-getItemStack-for-Trident.patch
@@ -1,4 +1,4 @@
-From 94c6c639c030945c3bdaf67647695d96d191ba30 Mon Sep 17 00:00:00 2001
+From cfd4aa008264358a6f6fc5d7d20ea38201a8c680 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:19:40 -0500
 Subject: [PATCH] Expose getItemStack for Trident
diff --git a/patches/server/0077-Despawn-egg-hatches-chicken.patch b/patches/server/0076-Despawn-egg-hatches-chicken.patch
similarity index 96%
rename from patches/server/0077-Despawn-egg-hatches-chicken.patch
rename to patches/server/0076-Despawn-egg-hatches-chicken.patch
index 33b39f090..7420da69b 100644
--- a/patches/server/0077-Despawn-egg-hatches-chicken.patch
+++ b/patches/server/0076-Despawn-egg-hatches-chicken.patch
@@ -1,4 +1,4 @@
-From 31d2db14d22911a259defeacef8263d52f5a4223 Mon Sep 17 00:00:00 2001
+From 4e2292cc6672a7442bbac64c454aeab43c11aa95 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 23:47:42 -0600
 Subject: [PATCH] Despawn egg hatches chicken
@@ -41,7 +41,7 @@ index 2926fbb957..bbb9ca1efc 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fbde4cc77e..878770c110 100644
+index fc7c9dd37e..71872a3fe7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -262,11 +262,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
similarity index 96%
rename from patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
rename to patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 58ae8f202..b7a3df353 100644
--- a/patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From 0c3f0203c4cf6d999a7fa8e09f0bf70c351398f0 Mon Sep 17 00:00:00 2001
+From 2f457ddb8fff476a7b0fe42d81e33c811ad3360c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 01:42:50 -0500
 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -25,7 +25,7 @@ index ae36518374..b2dd0c2073 100644
  
      public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cc35f322a8..87ede14251 100644
+index 0f5bd0a17a..b9b23c9803 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -383,12 +383,16 @@ public class CraftWorld implements World {
diff --git a/patches/server/0079-Add-sleep-options.patch b/patches/server/0078-Add-sleep-options.patch
similarity index 97%
rename from patches/server/0079-Add-sleep-options.patch
rename to patches/server/0078-Add-sleep-options.patch
index 115be8cee..5c7d0ffe7 100644
--- a/patches/server/0079-Add-sleep-options.patch
+++ b/patches/server/0078-Add-sleep-options.patch
@@ -1,4 +1,4 @@
-From 763dbfdf7cd95903e234a50f77221be70ae4b2cf Mon Sep 17 00:00:00 2001
+From dbd534d892b2d6b41560de30811efe76665dafea Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 03:30:17 -0600
 Subject: [PATCH] Add sleep options
@@ -53,7 +53,7 @@ index d69854b5c1..0e16e03bb1 100644
                  return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW);
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 878770c110..faebefabeb 100644
+index 71872a3fe7..44786e1fc9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -150,6 +150,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0080-Option-for-hay-block-fall-damage.patch b/patches/server/0079-Option-for-hay-block-fall-damage.patch
similarity index 94%
rename from patches/server/0080-Option-for-hay-block-fall-damage.patch
rename to patches/server/0079-Option-for-hay-block-fall-damage.patch
index ed598cd78..26f50f9ab 100644
--- a/patches/server/0080-Option-for-hay-block-fall-damage.patch
+++ b/patches/server/0079-Option-for-hay-block-fall-damage.patch
@@ -1,4 +1,4 @@
-From 13fef016e0c962a9bf1442282b54059a3e3d412c Mon Sep 17 00:00:00 2001
+From 24f1c083e54f296ccd53e0c171b45624c3bbc191 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 30 Nov 2019 01:31:09 -0600
 Subject: [PATCH] Option for hay block fall damage
@@ -21,7 +21,7 @@ index ca81c49f0a..1f8f60542f 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index faebefabeb..4ab38cf04f 100644
+index 44786e1fc9..c3c76a6fca 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -127,6 +127,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
similarity index 96%
rename from patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
rename to patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
index e57c7ad10..0e5efa3dd 100644
--- a/patches/server/0081-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
+++ b/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch
@@ -1,4 +1,4 @@
-From 867304e89a75db2fcaf76848458e030dd841d5db Mon Sep 17 00:00:00 2001
+From 10e1c72edc119d3f1f752985935291ac0fba854b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:35:35 -0500
 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent
diff --git a/patches/server/0082-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
similarity index 97%
rename from patches/server/0082-Add-LootableInventoryFirstFillEvent.patch
rename to patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
index d79dffac6..682a32427 100644
--- a/patches/server/0082-Add-LootableInventoryFirstFillEvent.patch
+++ b/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch
@@ -1,4 +1,4 @@
-From f19b4f8b9ed84b4a630edaaecde5e5ce95f260d0 Mon Sep 17 00:00:00 2001
+From 2c820399a19585925137de9ec871152990cb9c2a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:43:17 -0500
 Subject: [PATCH] Add LootableInventoryFirstFillEvent
diff --git a/patches/server/0083-Villagers-follow-emerald-blocks.patch b/patches/server/0082-Villagers-follow-emerald-blocks.patch
similarity index 98%
rename from patches/server/0083-Villagers-follow-emerald-blocks.patch
rename to patches/server/0082-Villagers-follow-emerald-blocks.patch
index ff75ed0bf..63beb7619 100644
--- a/patches/server/0083-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0082-Villagers-follow-emerald-blocks.patch
@@ -1,4 +1,4 @@
-From 919a34ac3d490006ebfe1136e5e5cba494c41ec1 Mon Sep 17 00:00:00 2001
+From a90f4a9dba663021b3a5f81fd49bc87d8b8e8cbc Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
diff --git a/patches/server/0084-Add-player-death-exp-control-options.patch b/patches/server/0083-Add-player-death-exp-control-options.patch
similarity index 97%
rename from patches/server/0084-Add-player-death-exp-control-options.patch
rename to patches/server/0083-Add-player-death-exp-control-options.patch
index 2630daa25..b2b10158d 100644
--- a/patches/server/0084-Add-player-death-exp-control-options.patch
+++ b/patches/server/0083-Add-player-death-exp-control-options.patch
@@ -1,4 +1,4 @@
-From 05d805b5cbdc10331f4913f53b29cfe54d299ff9 Mon Sep 17 00:00:00 2001
+From 420773360e59f43603f79cdb386308c08a56bd94 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Dec 2019 22:08:37 -0600
 Subject: [PATCH] Add player death exp control options
@@ -35,7 +35,7 @@ index 0e16e03bb1..477d5c00b4 100644
              return 0;
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d1f71ee14b..af14defca3 100644
+index 3cb3bcfe13..1fcdb4e28d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -155,6 +155,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0085-Add-permission-for-F3-N-debug.patch b/patches/server/0084-Add-permission-for-F3-N-debug.patch
similarity index 93%
rename from patches/server/0085-Add-permission-for-F3-N-debug.patch
rename to patches/server/0084-Add-permission-for-F3-N-debug.patch
index 2d3c9293f..31e40b19d 100644
--- a/patches/server/0085-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0084-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From 8c54b8a7c43cf63bc5580b53794ed11c63e3ad0e Mon Sep 17 00:00:00 2001
+From 640dfe8880c47d2bbea0d179b791b63651199e5b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 28 Dec 2019 04:21:54 -0600
 Subject: [PATCH] Add permission for F3+N debug
diff --git a/patches/server/0086-Allow-leashing-villagers.patch b/patches/server/0085-Allow-leashing-villagers.patch
similarity index 98%
rename from patches/server/0086-Allow-leashing-villagers.patch
rename to patches/server/0085-Allow-leashing-villagers.patch
index d7f90d1e2..092f6a7d4 100644
--- a/patches/server/0086-Allow-leashing-villagers.patch
+++ b/patches/server/0085-Allow-leashing-villagers.patch
@@ -1,4 +1,4 @@
-From 71b6aefc0fe0b37e2ad7b076e55ff8843ce64859 Mon Sep 17 00:00:00 2001
+From a00211ce54c21d1d437c8f32cae87c491e97ed16 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
diff --git a/patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 97%
rename from patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
index d3149ae6c..5ab2b4c53 100644
--- a/patches/server/0087-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch
@@ -1,4 +1,4 @@
-From a5d5751bea94147721183e0488e7ac0f5584b13f Mon Sep 17 00:00:00 2001
+From c70d6a36530234215d99fdd091ef464ed2d0bcb4 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
diff --git a/patches/server/0088-Make-lava-flow-speed-configurable.patch b/patches/server/0087-Make-lava-flow-speed-configurable.patch
similarity index 96%
rename from patches/server/0088-Make-lava-flow-speed-configurable.patch
rename to patches/server/0087-Make-lava-flow-speed-configurable.patch
index 6d60a202c..27cdfee96 100644
--- a/patches/server/0088-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0087-Make-lava-flow-speed-configurable.patch
@@ -1,4 +1,4 @@
-From 73a4646468060dc7890229018290c9912c36c9f5 Mon Sep 17 00:00:00 2001
+From e17415b9f704b89e86e3a491076179f866020c48 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Jan 2020 11:31:36 -0600
 Subject: [PATCH] Make lava flow speed configurable
@@ -35,7 +35,7 @@ index 39252e6873..75f8441ab6 100644
          return this.d;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 89a3ab67d3..9fd551d6b8 100644
+index 89a2faab38..b15abc81e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -133,8 +133,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
similarity index 97%
rename from patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch
rename to patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
index daab5b88e..ef3a406ab 100644
--- a/patches/server/0089-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,4 +1,4 @@
-From 228d147d000224bf1c23c852dcef04593baebde5 Mon Sep 17 00:00:00 2001
+From 02181da0d4ce520022f86ec7f394f129f26862ff Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
diff --git a/patches/server/0090-UPnP-Port-Forwarding-Service.patch b/patches/server/0089-UPnP-Port-Forwarding-Service.patch
similarity index 98%
rename from patches/server/0090-UPnP-Port-Forwarding-Service.patch
rename to patches/server/0089-UPnP-Port-Forwarding-Service.patch
index 9f7aed9ab..4106c51a4 100644
--- a/patches/server/0090-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0089-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From 700c2918dd403589a9201e6fc625895253a3f007 Mon Sep 17 00:00:00 2001
+From ac1ceac801068a5e93a7f75cc102ddeb62d04f9c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 22 Jan 2020 20:13:40 -0600
 Subject: [PATCH] UPnP Port Forwarding Service
@@ -78,7 +78,7 @@ index bd9c123d56..7e8286b573 100644
          // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
          server.loadPlugins();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 95050de2a5..8390ce7b54 100644
+index 1577308be6..2a3b4f309c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -186,6 +186,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0091-Implement-EntityMoveEvent.patch b/patches/server/0090-Implement-EntityMoveEvent.patch
similarity index 96%
rename from patches/server/0091-Implement-EntityMoveEvent.patch
rename to patches/server/0090-Implement-EntityMoveEvent.patch
index 0878fe56b..595ea3260 100644
--- a/patches/server/0091-Implement-EntityMoveEvent.patch
+++ b/patches/server/0090-Implement-EntityMoveEvent.patch
@@ -1,4 +1,4 @@
-From 3f7e67b779b50e7de1de83610a0babddb396d88a Mon Sep 17 00:00:00 2001
+From cc3249e79954be7f076c23c880ed55e896c7c938 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 11 Feb 2020 21:56:48 -0600
 Subject: [PATCH] Implement EntityMoveEvent
diff --git a/patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
similarity index 97%
rename from patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch
rename to patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
index a2a73d9c0..3a824afc2 100644
--- a/patches/server/0092-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 39dca041f48cdedb69df537052d8c065990b316c Mon Sep 17 00:00:00 2001
+From 843d3a1513d8d8fa010be09ff53c1dca36015d0a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
@@ -27,10 +27,10 @@ index 4349d22cc8..647d303ad1 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 09224e2b11..169904504f 100644
+index 1ee3dafc45..e207a40777 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1537,6 +1537,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1538,6 +1538,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -134,7 +134,7 @@ index f5c8074dcf..674f2ccc7f 100644
          float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F);
          float f6 = -MathHelper.sin((f + f2) * 0.017453292F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e12b096db3..91746d99ec 100644
+index 4db025e2c7..de6246e230 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -164,6 +164,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0093-Implement-bed-explosion-options.patch b/patches/server/0092-Implement-bed-explosion-options.patch
similarity index 97%
rename from patches/server/0093-Implement-bed-explosion-options.patch
rename to patches/server/0092-Implement-bed-explosion-options.patch
index a59d1661d..4449036b6 100644
--- a/patches/server/0093-Implement-bed-explosion-options.patch
+++ b/patches/server/0092-Implement-bed-explosion-options.patch
@@ -1,4 +1,4 @@
-From 55b86ebe06ce1927cfb17114392c692eda158858 Mon Sep 17 00:00:00 2001
+From 915d861a9f0574fcb68fad3466f79dd5d849ea16 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:04:29 -0600
 Subject: [PATCH] Implement bed explosion options
@@ -22,7 +22,7 @@ index 06a35629ab..df41a7dfcd 100644
                  // CraftBukkit end
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 91746d99ec..b0bded22db 100644
+index de6246e230..eaaffc2b30 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -3,6 +3,7 @@ package net.pl3x.purpur;
diff --git a/patches/server/0094-Add-item-entity-options.patch b/patches/server/0093-Add-item-entity-options.patch
similarity index 96%
rename from patches/server/0094-Add-item-entity-options.patch
rename to patches/server/0093-Add-item-entity-options.patch
index 461a33811..dd1c074ec 100644
--- a/patches/server/0094-Add-item-entity-options.patch
+++ b/patches/server/0093-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From d3f765706b531d416e301c23c0a4c3b944d738c9 Mon Sep 17 00:00:00 2001
+From 332f58b260caf189214afc480b28c85cf558c790 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Feb 2020 15:54:08 -0600
 Subject: [PATCH] Add item entity options
@@ -10,10 +10,10 @@ Subject: [PATCH] Add item entity options
  3 files changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 169904504f..bcb1db00de 100644
+index e207a40777..604c95b5ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1268,6 +1268,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1269,6 +1269,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
@@ -56,7 +56,7 @@ index bbb9ca1efc..262a7935e7 100644
              if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b0bded22db..2607d93b63 100644
+index eaaffc2b30..9348193e58 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -5,6 +5,8 @@ import net.minecraft.server.Block;
diff --git a/patches/server/0095-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
similarity index 99%
rename from patches/server/0095-Make-natural-spawns-per-biome-configurable.patch
rename to patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
index 525a11d7a..1adc80fee 100644
--- a/patches/server/0095-Make-natural-spawns-per-biome-configurable.patch
+++ b/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch
@@ -1,4 +1,4 @@
-From f849bf8f54f61aaf813a73fc1b08ae5ef14c9f42 Mon Sep 17 00:00:00 2001
+From d2fe438d86a197169414ea4c66c131976aff3df3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 13:39:06 -0600
 Subject: [PATCH] Make natural spawns per biome configurable
diff --git a/patches/server/0096-Configurable-void-damage-height.patch b/patches/server/0095-Configurable-void-damage-height.patch
similarity index 94%
rename from patches/server/0096-Configurable-void-damage-height.patch
rename to patches/server/0095-Configurable-void-damage-height.patch
index 77b9b17e4..40797b4bc 100644
--- a/patches/server/0096-Configurable-void-damage-height.patch
+++ b/patches/server/0095-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 1fb84dcc6440f3509eb71beddb5bd23d3e9b95b1 Mon Sep 17 00:00:00 2001
+From c15bcd4bf9e8bb736c8d3fd046bf4e1df8109b9d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 27 Feb 2020 21:42:19 -0600
 Subject: [PATCH] Configurable void damage height
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable void damage height
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bcb1db00de..300a4057f3 100644
+index 604c95b5ae..6c3d5cdab3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -453,7 +453,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index bcb1db00de..300a4057f3 100644
              && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2607d93b63..a4e16f7f3b 100644
+index 9348193e58..7e920b0d04 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -189,6 +189,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0097-Fix-the-dead-lagging-the-server.patch b/patches/server/0096-Fix-the-dead-lagging-the-server.patch
similarity index 91%
rename from patches/server/0097-Fix-the-dead-lagging-the-server.patch
rename to patches/server/0096-Fix-the-dead-lagging-the-server.patch
index d286d356e..43190e596 100644
--- a/patches/server/0097-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0096-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From fde2ea1d343b6f96b640c49458853842cd853196 Mon Sep 17 00:00:00 2001
+From 078dd0a43d122985c30e849bb195a1d1cf0d1054 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 6 Mar 2020 13:37:26 -0600
 Subject: [PATCH] Fix the dead lagging the server
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix the dead lagging the server
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 300a4057f3..7f9a3d220d 100644
+index 6c3d5cdab3..61b931e6bf 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1354,7 +1354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1355,7 +1355,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;
diff --git a/patches/server/0098-Add-flying-mobs-to-entity-activation-range-settings.patch b/patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch
similarity index 98%
rename from patches/server/0098-Add-flying-mobs-to-entity-activation-range-settings.patch
rename to patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch
index adfdee460..252c4029f 100644
--- a/patches/server/0098-Add-flying-mobs-to-entity-activation-range-settings.patch
+++ b/patches/server/0097-Add-flying-mobs-to-entity-activation-range-settings.patch
@@ -1,4 +1,4 @@
-From 6b04a9ccf7410558f53fdf191625401b3b776ba8 Mon Sep 17 00:00:00 2001
+From 90ddff0b3abcffa394245a6cb7b937ad7a582ec9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 8 Mar 2020 20:54:44 -0500
 Subject: [PATCH] Add flying mobs to entity activation range settings
@@ -83,7 +83,7 @@ index 17c4d7ec9b..88ae15bc4f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 3ceeed3f99..9a3f566a93 100644
+index 1b42ba94c0..c9864d3f5c 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -181,6 +181,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0099-Add-mspt-command.patch b/patches/server/0098-Add-mspt-command.patch
similarity index 98%
rename from patches/server/0099-Add-mspt-command.patch
rename to patches/server/0098-Add-mspt-command.patch
index 71002ffa4..1540cbf49 100644
--- a/patches/server/0099-Add-mspt-command.patch
+++ b/patches/server/0098-Add-mspt-command.patch
@@ -1,4 +1,4 @@
-From 359749edefd02b8cbe166c7ae6f9f8a6efb0c925 Mon Sep 17 00:00:00 2001
+From 28c67bdc1d03076db4d750dec7eef75241d74f62 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:23:44 -0500
 Subject: [PATCH] Add /mspt command
diff --git a/patches/server/0100-Add-ping-command.patch b/patches/server/0099-Add-ping-command.patch
similarity index 99%
rename from patches/server/0100-Add-ping-command.patch
rename to patches/server/0099-Add-ping-command.patch
index 39f7a82bb..705508385 100644
--- a/patches/server/0100-Add-ping-command.patch
+++ b/patches/server/0099-Add-ping-command.patch
@@ -1,4 +1,4 @@
-From d52f0071a48d19f1810d6d3fab0f4369245de5c7 Mon Sep 17 00:00:00 2001
+From 20c146c300aba9ff89590434311da7938c305d19 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command
diff --git a/patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0100-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 96%
rename from patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/server/0100-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index ec8527d89..5ad677551 100644
--- a/patches/server/0101-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0100-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -1,4 +1,4 @@
-From 6e55978a4fba2ddf62f232a299764cf80cb33958 Mon Sep 17 00:00:00 2001
+From c8408324eef2f8527f35472e6a59899aaa6bf588 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Mar 2020 19:39:34 -0500
 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
@@ -22,7 +22,7 @@ index ed8e26aa45..ca6c0ec299 100644
  
              if (b0 > 0 && !this.z()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a4e16f7f3b..95193625b7 100644
+index 7e920b0d04..a0405b6bff 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -189,6 +189,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0102-Configurable-server-mod-name.patch b/patches/server/0101-Configurable-server-mod-name.patch
similarity index 94%
rename from patches/server/0102-Configurable-server-mod-name.patch
rename to patches/server/0101-Configurable-server-mod-name.patch
index dcbcf3c65..06d2df18d 100644
--- a/patches/server/0102-Configurable-server-mod-name.patch
+++ b/patches/server/0101-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From 4e4ac39d11481c3b4692b36aa177607178363464 Mon Sep 17 00:00:00 2001
+From c49d530abdca0726bd1fe168a4e55d0154c60b21 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 11:47:39 -0500
 Subject: [PATCH] Configurable server mod name
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable server mod name
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 02f4963fe3..fc84a7e096 100644
+index 2a3b4f309c..b7e0e0a977 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1529,7 +1529,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0102-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 94%
rename from patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/server/0102-End-gateway-should-check-if-entity-can-use-portal.patch
index 4cf1d021d..c05a89432 100644
--- a/patches/server/0103-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0102-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,4 +1,4 @@
-From 55c6fed36bf58fdde1dcf46b1eaf2d39e3a3786b Mon Sep 17 00:00:00 2001
+From cfeb1df877afa9cbe04a4e068de6d79da3e33f7c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Mar 2020 18:33:05 -0500
 Subject: [PATCH] End gateway should check if entity can use portal
diff --git a/patches/server/0104-Configurable-TPS-Catchup.patch b/patches/server/0103-Configurable-TPS-Catchup.patch
similarity index 95%
rename from patches/server/0104-Configurable-TPS-Catchup.patch
rename to patches/server/0103-Configurable-TPS-Catchup.patch
index 79a5ed28f..85f832c8a 100644
--- a/patches/server/0104-Configurable-TPS-Catchup.patch
+++ b/patches/server/0103-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From 95e0759fda9fa3e5bddfbde67a5d26496c624db6 Mon Sep 17 00:00:00 2001
+From 1b727afb3e9f167e8104755a6e6c3b451be24dbb Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:06:22 -0500
 Subject: [PATCH] Configurable TPS Catchup
@@ -9,7 +9,7 @@ Subject: [PATCH] Configurable TPS Catchup
  2 files changed, 12 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fc84a7e096..6059933c5f 100644
+index b7e0e0a977..b6da0884cd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -959,6 +959,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0105-Breedable-Polar-Bears.patch b/patches/server/0104-Breedable-Polar-Bears.patch
similarity index 98%
rename from patches/server/0105-Breedable-Polar-Bears.patch
rename to patches/server/0104-Breedable-Polar-Bears.patch
index 3259cf847..ca351586f 100644
--- a/patches/server/0105-Breedable-Polar-Bears.patch
+++ b/patches/server/0104-Breedable-Polar-Bears.patch
@@ -1,4 +1,4 @@
-From a8583bbc4f305b08ecfbea51ee81c5ea5eabb758 Mon Sep 17 00:00:00 2001
+From 2dcf0ebbe37697db1b17209d2dd1364fc1a4a696 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 19:46:44 -0500
 Subject: [PATCH] Breedable Polar Bears
diff --git a/patches/server/0106-Configurable-jockey-options.patch b/patches/server/0105-Configurable-jockey-options.patch
similarity index 99%
rename from patches/server/0106-Configurable-jockey-options.patch
rename to patches/server/0105-Configurable-jockey-options.patch
index 5587023ea..a121d1c35 100644
--- a/patches/server/0106-Configurable-jockey-options.patch
+++ b/patches/server/0105-Configurable-jockey-options.patch
@@ -1,4 +1,4 @@
-From 86fbdf21c8c9e7c97a69a7b875ffa094e6bb3b5c Mon Sep 17 00:00:00 2001
+From 9ffef8dbe642e3b08972f88ae1fc16d66c0ed38a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 21:39:32 -0500
 Subject: [PATCH] Configurable jockey options
diff --git a/patches/server/0107-Configurable-enchantment-max-level.patch b/patches/server/0106-Configurable-enchantment-max-level.patch
similarity index 99%
rename from patches/server/0107-Configurable-enchantment-max-level.patch
rename to patches/server/0106-Configurable-enchantment-max-level.patch
index ad57bef3d..2f54b7db5 100644
--- a/patches/server/0107-Configurable-enchantment-max-level.patch
+++ b/patches/server/0106-Configurable-enchantment-max-level.patch
@@ -1,4 +1,4 @@
-From e20c8e31d3c94a90fcbf4b7710ac912afc572831 Mon Sep 17 00:00:00 2001
+From ef60eb5ac03b90034046500d8e74ee5802897b77 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Apr 2020 17:21:42 -0500
 Subject: [PATCH] Configurable enchantment max level
diff --git a/patches/server/0109-Optimize-Chunk-Ticks.patch b/patches/server/0107-Optimize-Chunk-Ticks.patch
similarity index 96%
rename from patches/server/0109-Optimize-Chunk-Ticks.patch
rename to patches/server/0107-Optimize-Chunk-Ticks.patch
index c2939bad9..b7ee23f93 100644
--- a/patches/server/0109-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0107-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From 8d74454f45f74963f24703a984868e23ce73b6ce Mon Sep 17 00:00:00 2001
+From 58c64b9443b0e64821e51a524993a30cee2e95a9 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 00:28:06 -0500
 Subject: [PATCH] Optimize Chunk Ticks
@@ -10,10 +10,10 @@ Subject: [PATCH] Optimize Chunk Ticks
  3 files changed, 51 insertions(+), 63 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index bacfc4cba6..e5a59e8e21 100644
+index f741a034e8..d5b4861c45 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -632,11 +632,12 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -646,11 +646,12 @@ public class ChunkProviderServer extends IChunkProvider {
              int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
              BlockPosition blockposition = this.world.getSpawn();
              // CraftBukkit start - Other mob type spawn tick rate
@@ -31,7 +31,7 @@ index bacfc4cba6..e5a59e8e21 100644
              // CraftBukkit end
  
              this.world.getMethodProfiler().enter("naturalSpawnCount");
-@@ -662,15 +663,17 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -676,15 +677,17 @@ public class ChunkProviderServer extends IChunkProvider {
  
              this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
              this.world.getMethodProfiler().exit();
@@ -58,7 +58,7 @@ index bacfc4cba6..e5a59e8e21 100644
              final int[] chunksTicked = {0}; this.playerChunkMap.forEachVisibleChunk((playerchunk) -> { // Paper - safe iterator incase chunk loads, also no wrapping
                  Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
  
-@@ -690,40 +693,11 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -704,40 +707,11 @@ public class ChunkProviderServer extends IChunkProvider {
                          if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
                              this.world.getMethodProfiler().enter("spawner");
                              this.world.timings.mobSpawn.startTiming(); // Spigot
@@ -135,10 +135,10 @@ index 3ed7fa324f..7f236585db 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 92c9ab43d7..f42bc2180c 100644
+index c38d31fafe..b7b358c59f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1359,28 +1359,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1371,28 +1371,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
      }
  
      boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {
diff --git a/patches/server/0110-Add-configurable-beehive-generation-chance.patch b/patches/server/0108-Add-configurable-beehive-generation-chance.patch
similarity index 98%
rename from patches/server/0110-Add-configurable-beehive-generation-chance.patch
rename to patches/server/0108-Add-configurable-beehive-generation-chance.patch
index 9158ca096..e1c4ccb45 100644
--- a/patches/server/0110-Add-configurable-beehive-generation-chance.patch
+++ b/patches/server/0108-Add-configurable-beehive-generation-chance.patch
@@ -1,4 +1,4 @@
-From 966a5671bec24f1f77553c50093a06e964847310 Mon Sep 17 00:00:00 2001
+From d1e0d3d6862820cc51e8a17f7fa01d6e6de17678 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Apr 2020 03:39:34 -0500
 Subject: [PATCH] Add configurable beehive generation chance
@@ -69,7 +69,7 @@ index b9dee0e255..9e9d9e6437 100644
          BlockPosition blockposition1;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2da403bc47..ecf326d697 100644
+index 092542c811..833b58f858 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -99,6 +99,29 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0108-Optimize-entity-pathfinder-selector.patch b/patches/server/0108-Optimize-entity-pathfinder-selector.patch
deleted file mode 100644
index 914ebe101..000000000
--- a/patches/server/0108-Optimize-entity-pathfinder-selector.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-From 974d84555d47b46d87aca6f8365d6608f17a6d27 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 6 Mar 2020 16:33:58 -0600
-Subject: [PATCH] Optimize entity pathfinder selector
-
----
- .../co/aikar/timings/MinecraftTimings.java    |   6 +
- .../tuinity/util/OptimizedSmallEnumSet.java   |  65 +++++++++
- .../net/minecraft/server/PathfinderGoal.java  |   6 +-
- .../server/PathfinderGoalSelector.java        | 132 +++++++++++-------
- .../server/PathfinderGoalWrapped.java         |   6 +-
- 5 files changed, 161 insertions(+), 54 deletions(-)
- create mode 100644 src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
-
-diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 434833d50e..7fc9a625a3 100644
---- a/src/main/java/co/aikar/timings/MinecraftTimings.java
-+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
-@@ -43,6 +43,12 @@ public final class MinecraftTimings {
-     public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
-     public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
- 
-+    // Purpur start
-+    public static final Timing goalCleanup = Timings.ofSafe("PathfinderGoal - Cleanup");
-+    public static final Timing goalUpdate = Timings.ofSafe("PathfinderGoal - Update");
-+    public static final Timing goalTick = Timings.ofSafe("PathfinderGoal - Tick");
-+    // Purpur end
-+
-     private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
- 
-     private MinecraftTimings() {}
-diff --git a/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
-new file mode 100644
-index 0000000000..68db858885
---- /dev/null
-+++ b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
-@@ -0,0 +1,65 @@
-+package com.tuinity.tuinity.util;
-+
-+import java.util.Collection;
-+
-+// containing utils to work on small numbers of enums
-+public final class OptimizedSmallEnumSet<E extends Enum> {
-+
-+    private final Class<E> enumClass;
-+    private long backingSet;
-+
-+    public OptimizedSmallEnumSet(final Class<E> clazz) {
-+        if (clazz == null) {
-+            throw new IllegalArgumentException("Null class");
-+        }
-+        if (!clazz.isEnum()) {
-+            throw new IllegalArgumentException("Class must be enum, not " + clazz.getCanonicalName());
-+        }
-+        this.enumClass = clazz;
-+    }
-+
-+    public boolean addUnchecked(final E element) {
-+        final int ordinal = element.ordinal();
-+        final long key = 1L << ordinal;
-+
-+        final long prev = this.backingSet;
-+        this.backingSet = prev | key;
-+
-+        return (prev & key) == 0;
-+    }
-+
-+    public boolean removeUnchecked(final E element) {
-+        final int ordinal = element.ordinal();
-+        final long key = 1L << ordinal;
-+
-+        final long prev = this.backingSet;
-+        this.backingSet = prev & ~key;
-+
-+        return (prev & key) != 0;
-+    }
-+
-+    public void clear() {
-+        this.backingSet = 0L;
-+    }
-+
-+    public int size() {
-+        return Long.bitCount(this.backingSet);
-+    }
-+
-+    public void addAllUnchecked(final Collection<E> enums) {
-+        for (final E element : enums) {
-+            if (element == null) {
-+                throw new NullPointerException("Null element");
-+            }
-+            this.backingSet |= (1L << element.ordinal());
-+        }
-+    }
-+
-+    public long getBackingSet() {
-+        return this.backingSet;
-+    }
-+
-+    public boolean hasCommonElements(final OptimizedSmallEnumSet<E> other) {
-+        return (other.backingSet & this.backingSet) != 0;
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index e059930ba7..6c307a9095 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoal.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
-@@ -4,7 +4,7 @@ import java.util.EnumSet;
- 
- public abstract class PathfinderGoal {
- 
--    private final EnumSet<PathfinderGoal.Type> a = EnumSet.noneOf(PathfinderGoal.Type.class);
-+    private final com.tuinity.tuinity.util.OptimizedSmallEnumSet<Type> a = new com.tuinity.tuinity.util.OptimizedSmallEnumSet<>(PathfinderGoal.Type.class); // Purpur
- 
-     public PathfinderGoal() {}
- 
-@@ -30,14 +30,14 @@ public abstract class PathfinderGoal {
-     public void setTypes(EnumSet<PathfinderGoal.Type> types) { this.a(types); } // Purpur - OBFHELPER
-     public void a(EnumSet<PathfinderGoal.Type> enumset) {
-         this.a.clear();
--        this.a.addAll(enumset);
-+        this.a.addAllUnchecked(enumset); // Purpur
-     }
- 
-     public String toString() {
-         return this.getClass().getSimpleName();
-     }
- 
--    public EnumSet<PathfinderGoal.Type> i() {
-+    public com.tuinity.tuinity.util.OptimizedSmallEnumSet<PathfinderGoal.Type> i() { // Purpur
-         return this.a;
-     }
- 
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 935136771e..b2bea3e241 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-@@ -12,6 +12,7 @@ import org.apache.logging.log4j.Logger;
- public class PathfinderGoalSelector {
- 
-     private static final Logger LOGGER = LogManager.getLogger();
-+    private static PathfinderGoalWrapped EMPTY_GOAL() { return b; }; // Purpur - OBFHELPER
-     private static final PathfinderGoalWrapped b = new PathfinderGoalWrapped(Integer.MAX_VALUE, new PathfinderGoal() {
-         @Override
-         public boolean a() {
-@@ -26,7 +27,7 @@ public class PathfinderGoalSelector {
-     private final Map<PathfinderGoal.Type, PathfinderGoalWrapped> c = new EnumMap(PathfinderGoal.Type.class);
-     private final Set<PathfinderGoalWrapped> d = Sets.newLinkedHashSet();private Set<PathfinderGoalWrapped> getTasks() { return d; }// Paper - OBFHELPER
-     private final GameProfilerFiller e;
--    private final EnumSet<PathfinderGoal.Type> f = EnumSet.noneOf(PathfinderGoal.Type.class);
-+    private final com.tuinity.tuinity.util.OptimizedSmallEnumSet<PathfinderGoal.Type> disabledTypes = new com.tuinity.tuinity.util.OptimizedSmallEnumSet<>(PathfinderGoal.Type.class); // Purpur
-     private int g = 3;private int getTickRate() { return g; } // Paper - OBFHELPER
-     private int curRate;private int getCurRate() { return curRate; } private void incRate() { this.curRate++; } // Paper TODO
- 
-@@ -58,65 +59,98 @@ public class PathfinderGoalSelector {
-     // Paper end
- 
-     public void a(PathfinderGoal pathfindergoal) {
--        this.d.stream().filter((pathfindergoalwrapped) -> {
--            return pathfindergoalwrapped.j() == pathfindergoal;
--        }).filter(PathfinderGoalWrapped::g).forEach(PathfinderGoalWrapped::d);
--        this.d.removeIf((pathfindergoalwrapped) -> {
--            return pathfindergoalwrapped.j() == pathfindergoal;
--        });
-+        // Purpur start
-+        for (java.util.Iterator<PathfinderGoalWrapped> iterator = getTasks().iterator(); iterator.hasNext();) {
-+            PathfinderGoalWrapped wrappedGoal = iterator.next();
-+            if (wrappedGoal.getGoal() != pathfindergoal) {
-+                continue;
-+            }
-+            if (wrappedGoal.isRunning()) {
-+                wrappedGoal.d(); // reset goal
-+            }
-+            iterator.remove();
-+        }
-+        // Purpur end
-     }
- 
-+    private static final PathfinderGoal.Type[] PATHFINDER_GOAL_TYPES = PathfinderGoal.Type.values(); // Purpur
-+
-     public void doTick() {
-         this.e.enter("goalCleanup");
--        this.c().filter((pathfindergoalwrapped) -> {
--            boolean flag;
-+        // Purpur start
-+        co.aikar.timings.MinecraftTimings.goalCleanup.startTiming();
-+        for (java.util.Iterator<PathfinderGoalWrapped> iter = getTasks().iterator(); iter.hasNext();) {
-+            PathfinderGoalWrapped wrappedGoal = iter.next();
-+            if (!wrappedGoal.isRunning()) {
-+                continue; // goal is not running
-+            }
-+            if (!this.disabledTypes.hasCommonElements(wrappedGoal.getTypes()) && wrappedGoal.b()) {
-+                continue; // goal type is not disabled and should continue running
-+            }
-+            wrappedGoal.d(); // reset goal
-+        }
-+        this.c.forEach((type, goal) -> {
-+            if (!goal.isRunning()) {
-+                this.c.remove(type); // remove locked goal types if goal no longer running
-+            }
-+        });
-+        co.aikar.timings.MinecraftTimings.goalCleanup.stopTiming();
-+        // Purpur end
-+        this.e.exit();
-+        this.e.enter("goalUpdate");
-+        // Purpur start
-+        co.aikar.timings.MinecraftTimings.goalUpdate.startTiming();
-+        goal_update_loop:
-+        for (java.util.Iterator<PathfinderGoalWrapped> iterator = getTasks().iterator(); iterator.hasNext();) {
-+            PathfinderGoalWrapped wrappedGoal = iterator.next();
-+            if (wrappedGoal.isRunning()) {
-+                continue; // goal is already running
-+            }
-+
-+            com.tuinity.tuinity.util.OptimizedSmallEnumSet<PathfinderGoal.Type> wrappedGoalSet = wrappedGoal.getTypes();
- 
--            if (pathfindergoalwrapped.g()) {
--                Stream stream = pathfindergoalwrapped.i().stream();
--                EnumSet enumset = this.f;
-+            if (disabledTypes.hasCommonElements(wrappedGoalSet)) {
-+                continue; // goal type is disabled
-+            }
- 
--                this.f.getClass();
--                if (!stream.anyMatch(enumset::contains) && pathfindergoalwrapped.b()) {
--                    flag = false;
--                    return flag;
-+            long k = wrappedGoalSet.getBackingSet();
-+            int wrappedGoalSize = wrappedGoalSet.size();
-+            for (int i = 0; i < wrappedGoalSize; ++i) {
-+                PathfinderGoal.Type type = PATHFINDER_GOAL_TYPES[Long.numberOfTrailingZeros(k)];
-+                k ^= -k & k; // Tuinity's ca.spottedleaf.concurrentutil.util.IntegerUtil.getTrailingBit
-+                if (!c.getOrDefault(type, EMPTY_GOAL()).canBeReplacedBy(wrappedGoal)) {
-+                    continue goal_update_loop; // goal type(s) is locked by another running goal with same type(s)
-                 }
-             }
- 
--            flag = true;
--            return flag;
--        }).forEach(PathfinderGoal::d);
--        this.c.forEach((pathfindergoal_type, pathfindergoalwrapped) -> {
--            if (!pathfindergoalwrapped.g()) {
--                this.c.remove(pathfindergoal_type);
-+            if (!wrappedGoal.a()) {
-+                continue; // goal failed to run
-             }
- 
--        });
--        this.e.exit();
--        this.e.enter("goalUpdate");
--        this.d.stream().filter((pathfindergoalwrapped) -> {
--            return !pathfindergoalwrapped.g();
--        }).filter((pathfindergoalwrapped) -> {
--            Stream stream = pathfindergoalwrapped.i().stream();
--            EnumSet enumset = this.f;
--
--            this.f.getClass();
--            return stream.noneMatch(enumset::contains);
--        }).filter((pathfindergoalwrapped) -> {
--            return pathfindergoalwrapped.i().stream().allMatch((pathfindergoal_type) -> {
--                return ((PathfinderGoalWrapped) this.c.getOrDefault(pathfindergoal_type, PathfinderGoalSelector.b)).a(pathfindergoalwrapped);
--            });
--        }).filter(PathfinderGoalWrapped::a).forEach((pathfindergoalwrapped) -> {
--            pathfindergoalwrapped.i().forEach((pathfindergoal_type) -> {
--                PathfinderGoalWrapped pathfindergoalwrapped1 = (PathfinderGoalWrapped) this.c.getOrDefault(pathfindergoal_type, PathfinderGoalSelector.b);
--
--                pathfindergoalwrapped1.d();
--                this.c.put(pathfindergoal_type, pathfindergoalwrapped);
--            });
--            pathfindergoalwrapped.c();
--        });
-+            k = wrappedGoalSet.getBackingSet();
-+            wrappedGoalSize = wrappedGoalSet.size();
-+            for (int i = 0; i < wrappedGoalSize; ++i) {
-+                PathfinderGoal.Type type = PATHFINDER_GOAL_TYPES[Long.numberOfTrailingZeros(k)];
-+                k ^= -k & k; // Tuinity's ca.spottedleaf.concurrentutil.util.IntegerUtil.getTrailingBit
-+                c.getOrDefault(type, EMPTY_GOAL()).d(); // reset goal
-+                c.put(type, wrappedGoal);
-+            }
-+
-+            wrappedGoal.c(); // start goal
-+        }
-+        co.aikar.timings.MinecraftTimings.goalUpdate.stopTiming();
-+        // Purpur end
-         this.e.exit();
-         this.e.enter("goalTick");
--        this.c().forEach(PathfinderGoalWrapped::e);
-+        // Purpur start
-+        co.aikar.timings.MinecraftTimings.goalTick.startTiming();
-+        for (PathfinderGoalWrapped wrappedGoal : getTasks()) {
-+            if (wrappedGoal.isRunning()) {
-+                wrappedGoal.e(); // goal tick
-+            }
-+        }
-+        co.aikar.timings.MinecraftTimings.goalTick.stopTiming();
-+        // Purpur end
-         this.e.exit();
-     }
- 
-@@ -125,11 +159,11 @@ public class PathfinderGoalSelector {
-     }
- 
-     public void a(PathfinderGoal.Type pathfindergoal_type) {
--        this.f.add(pathfindergoal_type);
-+        this.disabledTypes.addUnchecked(pathfindergoal_type); // Purpur
-     }
- 
-     public void b(PathfinderGoal.Type pathfindergoal_type) {
--        this.f.remove(pathfindergoal_type);
-+        this.disabledTypes.removeUnchecked(pathfindergoal_type); // Purpur
-     }
- 
-     public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) {
-diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 29657fed75..172e74b965 100644
---- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-+++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-@@ -14,6 +14,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
-         this.a = pathfindergoal;
-     }
- 
-+    public boolean canBeReplacedBy(PathfinderGoalWrapped pathfindergoalwrapped) { return a(pathfindergoalwrapped); } // Purpur - OBFHELPER
-     public boolean a(PathfinderGoalWrapped pathfindergoalwrapped) {
-         return this.E_() && pathfindergoalwrapped.h() < this.h();
-     }
-@@ -59,8 +60,8 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
-         this.a.a(enumset);
-     }
- 
--    @Override
--    public EnumSet<PathfinderGoal.Type> i() {
-+    public com.tuinity.tuinity.util.OptimizedSmallEnumSet<PathfinderGoal.Type> getTypes() { return i(); } // Purpur - OBFHELPER
-+    @Override public com.tuinity.tuinity.util.OptimizedSmallEnumSet<PathfinderGoal.Type> i() { // Purpur
-         return this.a.i();
-     }
- 
-@@ -73,6 +74,7 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
-         return this.b;
-     }
- 
-+    public PathfinderGoal getGoal() { return j(); } // Purpur - OBFHELPER
-     public PathfinderGoal j() {
-         return this.a;
-     }
--- 
-2.24.0
-
diff --git a/patches/server/0111-Add-more-timings-timers.patch b/patches/server/0109-Add-more-timings-timers.patch
similarity index 72%
rename from patches/server/0111-Add-more-timings-timers.patch
rename to patches/server/0109-Add-more-timings-timers.patch
index f86cd3573..145c436c1 100644
--- a/patches/server/0111-Add-more-timings-timers.patch
+++ b/patches/server/0109-Add-more-timings-timers.patch
@@ -1,23 +1,28 @@
-From e883bbd022a3366c55638d766bac3360073daef9 Mon Sep 17 00:00:00 2001
+From 20d028a9e7a52cbada3f0dc88badc9bd33c87042 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 02:36:45 -0500
 Subject: [PATCH] Add more timings timers
 
 ---
- .../java/co/aikar/timings/MinecraftTimings.java  | 16 ++++++++++++++++
- .../net/minecraft/server/EntityInsentient.java   | 14 ++++++++++++++
- .../java/net/minecraft/server/EntityLiving.java  | 12 ++++++++++++
- .../java/net/minecraft/server/WorldServer.java   |  2 ++
- 4 files changed, 44 insertions(+)
+ .../co/aikar/timings/MinecraftTimings.java    | 22 +++++++++++++++++++
+ .../minecraft/server/EntityInsentient.java    | 14 ++++++++++++
+ .../net/minecraft/server/EntityLiving.java    | 12 ++++++++++
+ .../server/PathfinderGoalSelector.java        |  6 +++++
+ .../net/minecraft/server/WorldServer.java     |  2 ++
+ 5 files changed, 56 insertions(+)
 
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index 7fc9a625a3..cb27ed36e6 100644
+index 434833d50e..cb27ed36e6 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
-@@ -47,6 +47,22 @@ public final class MinecraftTimings {
-     public static final Timing goalCleanup = Timings.ofSafe("PathfinderGoal - Cleanup");
-     public static final Timing goalUpdate = Timings.ofSafe("PathfinderGoal - Update");
-     public static final Timing goalTick = Timings.ofSafe("PathfinderGoal - Tick");
+@@ -43,6 +43,28 @@ public final class MinecraftTimings {
+     public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
+     public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
+ 
++    // Purpur start
++    public static final Timing goalCleanup = Timings.ofSafe("PathfinderGoal - Cleanup");
++    public static final Timing goalUpdate = Timings.ofSafe("PathfinderGoal - Update");
++    public static final Timing goalTick = Timings.ofSafe("PathfinderGoal - Tick");
 +
 +    public static final Timing entityMovementTick = Timings.ofSafe("Entity Movement");
 +    public static final Timing entityMovementTickAI = Timings.ofSafe("Entity Movement - AI");
@@ -34,9 +39,11 @@ index 7fc9a625a3..cb27ed36e6 100644
 +    public static final Timing entityInsentientControls = Timings.ofSafe("Entity Insentient - Controls");
 +
 +    public static final Timing passengerTick = Timings.ofSafe("Passenger Tick");
-     // Purpur end
- 
++    // Purpur end
++
      private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
+ 
+     private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
 index bac6cea1ff..f9ca4280d4 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -156,11 +163,53 @@ index 2769077bb4..fdb8a0f8c7 100644
          this.world.getMethodProfiler().exit();
          // Purpur start
          if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
+diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+index 90319909e5..323253b22c 100644
+--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
++++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
+@@ -77,6 +77,7 @@ public class PathfinderGoalSelector {
+     private static final PathfinderGoal.Type[] PATHFINDER_GOAL_TYPES = PathfinderGoal.Type.values(); // Paper - remove streams from pathfindergoalselector
+ 
+     public void doTick() {
++        co.aikar.timings.MinecraftTimings.goalCleanup.startTiming();
+         this.e.enter("goalCleanup");
+         // Paper start - remove streams from pathfindergoalselector
+         for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
+@@ -96,8 +97,10 @@ public class PathfinderGoalSelector {
+             }
+ 
+         });
++        co.aikar.timings.MinecraftTimings.goalCleanup.stopTiming();
+         this.e.exit();
+         this.e.enter("goalUpdate");
++        co.aikar.timings.MinecraftTimings.goalUpdate.startTiming();
+         // Paper start - remove streams from pathfindergoalselector
+         goal_update_loop: for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
+             PathfinderGoalWrapped wrappedGoal = iterator.next();
+@@ -140,8 +143,10 @@ public class PathfinderGoalSelector {
+             wrappedGoal.c();
+         }
+         // Paper end - remove streams from pathfindergoalselector
++        co.aikar.timings.MinecraftTimings.goalUpdate.stopTiming();
+         this.e.exit();
+         this.e.enter("goalTick");
++        co.aikar.timings.MinecraftTimings.goalTick.startTiming();
+         // Paper start - remove streams from pathfindergoalselector
+         for (Iterator<PathfinderGoalWrapped> iterator = this.d.iterator(); iterator.hasNext();) {
+             PathfinderGoalWrapped wrappedGoal = iterator.next();
+@@ -150,6 +155,7 @@ public class PathfinderGoalSelector {
+             }
+         }
+         // Paper end - remove streams from pathfindergoalselector
++        co.aikar.timings.MinecraftTimings.goalTick.startTiming();
+         this.e.exit();
+     }
+ 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 5b01cf947d..27c3ad7311 100644
+index d0d3d6c29c..51b7b23181 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -815,7 +815,9 @@ public class WorldServer extends World {
+@@ -833,7 +833,9 @@ public class WorldServer extends World {
                          return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
                      });
                      gameprofilerfiller.c("tickPassenger");
diff --git a/patches/server/0112-Skip-events-if-there-s-no-listeners.patch b/patches/server/0110-Skip-events-if-there-s-no-listeners.patch
similarity index 95%
rename from patches/server/0112-Skip-events-if-there-s-no-listeners.patch
rename to patches/server/0110-Skip-events-if-there-s-no-listeners.patch
index cd80cd88a..b89f502f5 100644
--- a/patches/server/0112-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0110-Skip-events-if-there-s-no-listeners.patch
@@ -1,4 +1,4 @@
-From 07b7231e8bd0fb12885b134af76f6f381b08a338 Mon Sep 17 00:00:00 2001
+From e41fce09a4489f7c24baae33b18fd19da6a01c96 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 03:07:59 -0500
 Subject: [PATCH] Skip events if there's no listeners
diff --git a/patches/server/0113-Debug-stick-should-not-update-neighbors.patch b/patches/server/0111-Debug-stick-should-not-update-neighbors.patch
similarity index 94%
rename from patches/server/0113-Debug-stick-should-not-update-neighbors.patch
rename to patches/server/0111-Debug-stick-should-not-update-neighbors.patch
index cb6f9a1eb..7971604f8 100644
--- a/patches/server/0113-Debug-stick-should-not-update-neighbors.patch
+++ b/patches/server/0111-Debug-stick-should-not-update-neighbors.patch
@@ -1,4 +1,4 @@
-From 92944ad199d2bb2497ee9c280853b09040399be2 Mon Sep 17 00:00:00 2001
+From 75a1b14282dee435f54f1b3798482afadd05e3aa Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Apr 2020 17:16:30 -0500
 Subject: [PATCH] Debug stick should not update neighbors
diff --git a/patches/server/0114-Async-recalc-perms-and-command-map.patch b/patches/server/0112-Async-recalc-perms-and-command-map.patch
similarity index 97%
rename from patches/server/0114-Async-recalc-perms-and-command-map.patch
rename to patches/server/0112-Async-recalc-perms-and-command-map.patch
index e52d2dfe1..7e6fd973e 100644
--- a/patches/server/0114-Async-recalc-perms-and-command-map.patch
+++ b/patches/server/0112-Async-recalc-perms-and-command-map.patch
@@ -1,4 +1,4 @@
-From d9a0a309f8cd883f78c5598a66f05dea6420daa5 Mon Sep 17 00:00:00 2001
+From f9dedbe5901d9cdfcee2616910fbe9b985bca3cf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 8 Apr 2020 23:01:20 -0500
 Subject: [PATCH] Async recalc perms and command map
diff --git a/patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
similarity index 96%
rename from patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
rename to patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
index 7fcb1def8..a864c1930 100644
--- a/patches/server/0115-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
+++ b/patches/server/0113-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch
@@ -1,4 +1,4 @@
-From eaf229d5d413bbfc09c1068cac5d9636a5e36858 Mon Sep 17 00:00:00 2001
+From 24311a8d3beaedca9e542332e563c5b029bffa46 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 21 Feb 2020 17:04:51 -0600
 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter
diff --git a/patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch
similarity index 97%
rename from patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch
rename to patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch
index 087248fec..24e760fdc 100644
--- a/patches/server/0116-MC-168772-Fix-Add-turtle-egg-block-options.patch
+++ b/patches/server/0114-MC-168772-Fix-Add-turtle-egg-block-options.patch
@@ -1,4 +1,4 @@
-From 4a700e25f0c15801d2da6808f3849ba8a9609966 Mon Sep 17 00:00:00 2001
+From b513091baaf0d8d2542f42472bc0792d87bdbc49 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 22:15:46 -0500
 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options
diff --git a/patches/server/0117-MC-4-Fix-Item-position-desync.patch b/patches/server/0115-MC-4-Fix-Item-position-desync.patch
similarity index 98%
rename from patches/server/0117-MC-4-Fix-Item-position-desync.patch
rename to patches/server/0115-MC-4-Fix-Item-position-desync.patch
index da51a500b..1210483ba 100644
--- a/patches/server/0117-MC-4-Fix-Item-position-desync.patch
+++ b/patches/server/0115-MC-4-Fix-Item-position-desync.patch
@@ -1,4 +1,4 @@
-From bf9f69ee5bce7695393d8e5a7be25c4bfb19817d Mon Sep 17 00:00:00 2001
+From 5c0028d941de9edc3c375adc57c3edb2200a2ec0 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 21:12:58 -0500
 Subject: [PATCH] MC-4 Fix - Item position desync
diff --git a/patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch
similarity index 98%
rename from patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch
rename to patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch
index 945ac502c..5f6d80ffa 100644
--- a/patches/server/0118-MC-56653-Fix-pig-zombies-aggro.patch
+++ b/patches/server/0116-MC-56653-Fix-pig-zombies-aggro.patch
@@ -1,4 +1,4 @@
-From 053436f0f4c6944382bad7812ed408eec1cb1f5e Mon Sep 17 00:00:00 2001
+From 8f6c4e1d4491b00d203c1a6fe50cf64ba6b45306 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] MC-56653 Fix - pig zombies aggro
diff --git a/patches/server/0119-EMC-MonsterEggSpawn-Event.patch b/patches/server/0117-EMC-MonsterEggSpawn-Event.patch
similarity index 97%
rename from patches/server/0119-EMC-MonsterEggSpawn-Event.patch
rename to patches/server/0117-EMC-MonsterEggSpawn-Event.patch
index 183238e62..94d96960b 100644
--- a/patches/server/0119-EMC-MonsterEggSpawn-Event.patch
+++ b/patches/server/0117-EMC-MonsterEggSpawn-Event.patch
@@ -1,4 +1,4 @@
-From e42dc0bc24e7637b4ab0f765eb54bc0b2aa4cd26 Mon Sep 17 00:00:00 2001
+From ef7d15f9029f6d90d34ca9367ede9997d5cfaef9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 20 Jul 2013 22:40:56 -0400
 Subject: [PATCH] EMC - MonsterEggSpawn Event
@@ -8,7 +8,7 @@ Subject: [PATCH] EMC - MonsterEggSpawn Event
  1 file changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 0dd9897b99..149e253360 100644
+index 8e8d392a15..ff11baa7c5 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -163,19 +163,45 @@ public class EntityTypes<T extends Entity> {
diff --git a/patches/server/0120-EMC-Optimize-Pathfinding.patch b/patches/server/0118-EMC-Optimize-Pathfinding.patch
similarity index 97%
rename from patches/server/0120-EMC-Optimize-Pathfinding.patch
rename to patches/server/0118-EMC-Optimize-Pathfinding.patch
index 764b3812b..9ffc65ffd 100644
--- a/patches/server/0120-EMC-Optimize-Pathfinding.patch
+++ b/patches/server/0118-EMC-Optimize-Pathfinding.patch
@@ -1,4 +1,4 @@
-From c1f79bb11410fae47c95eeecbea77c94bf2fed1a Mon Sep 17 00:00:00 2001
+From 7f0089f85f89a5da06847080dd27f165abc5ba36 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] EMC - Optimize Pathfinding
diff --git a/patches/server/0121-PaperPR-Add-BellRingEvent.patch b/patches/server/0119-PaperPR-Add-BellRingEvent.patch
similarity index 97%
rename from patches/server/0121-PaperPR-Add-BellRingEvent.patch
rename to patches/server/0119-PaperPR-Add-BellRingEvent.patch
index 35b7d788d..f1e74eb75 100644
--- a/patches/server/0121-PaperPR-Add-BellRingEvent.patch
+++ b/patches/server/0119-PaperPR-Add-BellRingEvent.patch
@@ -1,4 +1,4 @@
-From e515eecb410d5ba2849ee9d4fa6fda902bd4cbae Mon Sep 17 00:00:00 2001
+From ffa5c033e7015a17872192e78acd535ad6b38c40 Mon Sep 17 00:00:00 2001
 From: Eearslya Sleiarion <eearslya@gmail.com>
 Date: Mon, 24 Jun 2019 21:27:32 -0700
 Subject: [PATCH] PaperPR - Add BellRingEvent
diff --git a/patches/server/0122-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
similarity index 95%
rename from patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
rename to patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
index 146331eb1..f082c50c5 100644
--- a/patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
+++ b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
@@ -1,4 +1,4 @@
-From de6cb27c67dbd6d7184489d2c9e5642e925d8b43 Mon Sep 17 00:00:00 2001
+From a88295b5511f3e93068d8218334c69ce92b36ed7 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -31,7 +31,7 @@ index b844b93d77..f1cca7219e 100644
      public boolean batRidableInWater = false;
      public boolean batRequireShiftToMount = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 87ede14251..7596fe4e3f 100644
+index b9b23c9803..46de7d232f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -332,6 +332,13 @@ public class CraftWorld implements World {
diff --git a/patches/server/0123-Tuinity-Delay-chunk-unloads.patch b/patches/server/0121-Tuinity-Delay-chunk-unloads.patch
similarity index 99%
rename from patches/server/0123-Tuinity-Delay-chunk-unloads.patch
rename to patches/server/0121-Tuinity-Delay-chunk-unloads.patch
index 3df4ee984..9859aac25 100644
--- a/patches/server/0123-Tuinity-Delay-chunk-unloads.patch
+++ b/patches/server/0121-Tuinity-Delay-chunk-unloads.patch
@@ -1,4 +1,4 @@
-From 1be20ba4b362f4e35ab907fc9ba3216254449c52 Mon Sep 17 00:00:00 2001
+From 7b8c9918096daf54b1c2ac4fdfab600551b58851 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 25 Oct 2019 02:11:30 -0700
 Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -210,7 +210,7 @@ index 6a3723202c..eda4be515c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7596fe4e3f..68e1c0c126 100644
+index 46de7d232f..efc9e52305 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -485,6 +485,7 @@ public class CraftWorld implements World {
diff --git a/patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch b/patches/server/0122-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
similarity index 96%
rename from patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
rename to patches/server/0122-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
index da365116a..e201ce140 100644
--- a/patches/server/0124-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
+++ b/patches/server/0122-Tuinity-Don-t-run-entity-collision-code-if-not-neede.patch
@@ -1,4 +1,4 @@
-From 8d3e6d4ba1cb4ca09811708e434f758235d10adb Mon Sep 17 00:00:00 2001
+From e6aa72962f5d52ca162a51c8172c355e70c818ca Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Thu, 26 Mar 2020 18:34:18 -0700
 Subject: [PATCH] Tuinity - Don't run entity collision code if not needed
diff --git a/patches/server/0125-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch b/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
similarity index 91%
rename from patches/server/0125-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
rename to patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
index 41136c059..21637730c 100644
--- a/patches/server/0125-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
+++ b/patches/server/0123-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
@@ -1,4 +1,4 @@
-From f7d91586882e500e530d648546a9d0f35bf2c304 Mon Sep 17 00:00:00 2001
+From b946786fb894bc8fd19d8182179c85d8ed66024f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <spottedleaf@spottedleaf.dev>
 Date: Fri, 3 Apr 2020 02:21:13 -0700
 Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
@@ -12,7 +12,7 @@ chunks.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6059933c5f..cefda1cf27 100644
+index b6da0884cd..1ef77fbd31 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1068,7 +1068,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0126-YAPFA-Disable-mojang-profiler.patch b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
similarity index 98%
rename from patches/server/0126-YAPFA-Disable-mojang-profiler.patch
rename to patches/server/0124-YAPFA-Disable-mojang-profiler.patch
index e1df29b77..297a2c167 100644
--- a/patches/server/0126-YAPFA-Disable-mojang-profiler.patch
+++ b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
@@ -1,4 +1,4 @@
-From 47a2326d5a72daeca806725fb545afe49e90c24c Mon Sep 17 00:00:00 2001
+From 8d8701c00b50db97c0505a03a41ae80c99be488d Mon Sep 17 00:00:00 2001
 From: tr7zw <tr7zw@live.de>
 Date: Thu, 5 Mar 2020 23:08:01 +0100
 Subject: [PATCH] YAPFA - Disable mojang profiler
@@ -43,7 +43,7 @@ index f0d72ea39d..e38a684060 100644
              throw CommandDebug.b.create();
          } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cefda1cf27..effbf92365 100644
+index 1ef77fbd31..31c71e46a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas