From 860c86191a64ff157d7e781309c526cb099b9066 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Mon, 18 May 2020 15:22:23 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
c8028d1c Fix data version check for ItemStack serialization (#3394)
9254a80a Fix race condition reintroduced in Prioritize class loader patch
6f196fe7 Add Raw Byte ItemStack Serialization
df43f828 Allow server startup for those poor people running <1G Xmx
3c9b65ef Fix cases where no-tick < tick view distance
72f89a07 Workaround for Client Lag Spikes (MC-162253)
3f941c0c Add option for console having all permissions
d2ae4658 Add permission for command blocks
9f8ae5cb Prioritise own classes where possible
74466412 Check portal restrictions when entering end gateways
fc9cf84d Fix NPE when temp ip bans expire (#3373)
16bd420d Add missing mob goals for API (#3367)
b5c4e2f6 Ensure no-tick view is not smaller than ticking VD
52564b1f Expand Pathfinding API with more options
dde65481 Fix usage of vanilla goals
7797aebe Drop Leads from nether portals - Fixes #3226
511b6bc2 Reduce MutableInt and Vec3d allocations, use ArrayDeque
84673141 Optimize NibbleArray to use pooled buffers
897dd2c8 Foundational work for Future Memory usage improvements
bb4002d8 Handle CraftPlayer#setSpectatorTarget better
4ae08959 Fix collision checks on spawning hanging entities and null on async chunk loads
c2f8d1ef Protect Bedrock and End Portal/Frames from being destroyed
827cc632 Updated Upstream (Bukkit/CraftBukkit/Spigot)
92f680ed Fix Pathfinding and obscure glitchy buggy 0 tick farms
7a7c4292 Optimize Pathfinder - Remove Streams / Optimized collections
fc917d16 Optimize Hoppers - Major performance improvement
14ad77c6 Fix PotionEffect API Ignoring Icon bug
eb3ce8a2 Fix EntityRaider picking up items when they shouldn't be able
1ea9ada0 Add a TELEPORT ticket when changing dimensions
8e9459ea Fix missing flag pass for isUrgent
7befec44 Potential bed api (#3339)
27945a6b Optimize WorldBorder collision checks and air
55e17a85 Wait for Async Tasks during shutdown
b5905256 Ensure Entity AABB's are never invalid
a054aa6f Properly remove Entities from current chunk
c894ddfd Fix teleporting onto a chunk line
57d6cc01 Send LOGIN protocol packets immediately - Fix disconnect during async prelogin
cd93e54d Don't use our modified chunk checks for collision in world gen
b4003ef1 Allow loading entities current chunk if needed to fix collision checks
e5f64896 Add Urgent API for Async Chunks API and use it for Async Teleport
ad8e59dc Ensure chunks loaded on respawn for suffocation check
---
 Paper                                         |  2 +-
 current-paper                                 |  2 +-
 patches/api/0004-Ridables.patch               | 14 +++----
 patches/api/0019-Add-moon-phase-API.patch     |  6 +--
 ...4-Add-getPlacementBlockData-to-World.patch |  6 +--
 ...30-Add-ItemStack-convenience-methods.patch |  6 +--
 patches/server/0001-Rebrand.patch             | 16 ++++----
 patches/server/0002-Purpur-config-files.patch |  8 ++--
 patches/server/0007-Ridables.patch            | 38 +++++++++----------
 .../0010-Add-obfhelpers-for-plugin-use.patch  | 10 ++---
 patches/server/0011-Silk-touch-spawners.patch | 10 ++---
 patches/server/0019-Cows-eat-mushrooms.patch  |  8 ++--
 ...ed-to-crystals-and-crystals-shoot-ph.patch |  8 ++--
 .../server/0030-Controllable-Minecarts.patch  |  6 +--
 .../server/0031-Signs-allow-color-codes.patch |  8 ++--
 .../0034-Campfires-burn-out-in-rain.patch     |  6 +--
 ...036-Dont-send-useless-entity-packets.patch |  8 ++--
 patches/server/0037-Implement-AFK-API.patch   | 14 +++----
 ...g-mends-most-damages-equipment-first.patch |  6 +--
 patches/server/0042-Make-the-GUI-better.patch |  6 +--
 .../0044-Add-EntityPortalReadyEvent.patch     | 10 ++---
 .../0045-Implement-elytra-settings.patch      |  8 ++--
 ...-Add-blacklist-option-for-grindstone.patch |  6 +--
 .../0047-Implement-lagging-threshold.patch    | 10 ++---
 ...-should-not-bypass-cramming-gamerule.patch |  6 +--
 .../server/0053-Bring-back-server-name.patch  |  6 +--
 .../0060-Alternative-Keepalive-Handling.patch |  6 +--
 patches/server/0062-Add-moon-phase-API.patch  |  8 ++--
 ...3-Add-getPlacementBlockData-to-World.patch |  6 +--
 ...5-Enderchest-6-rows-plus-permissions.patch |  8 ++--
 ...0066-Add-5-second-tps-average-in-tps.patch | 12 +++---
 ...geEvent-not-firing-for-all-use-cases.patch | 10 ++---
 .../0082-Add-permission-for-F3-N-debug.patch  |  6 +--
 .../0087-UPnP-Port-Forwarding-Service.patch   |  8 ++--
 ...o-disable-saving-projectiles-to-disk.patch | 10 ++---
 .../server/0091-Add-item-entity-options.patch |  6 +--
 ...0093-Configurable-void-damage-height.patch |  6 +--
 ...0094-Fix-the-dead-lagging-the-server.patch |  6 +--
 .../0097-Configurable-server-mod-name.patch   |  6 +--
 ...hould-check-if-entity-can-use-portal.patch |  6 +--
 .../0099-Configurable-TPS-Catchup.patch       |  6 +--
 .../server/0103-Optimize-Chunk-Ticks.patch    |  8 ++--
 ...ug-stick-should-not-update-neighbors.patch |  6 +--
 .../0113-Player-invulnerabilities.patch       | 14 +++----
 .../0116-MC-4-Fix-Item-position-desync.patch  | 12 +++---
 .../0120-PaperPR-Per-World-Spawn-limits.patch |  6 +--
 .../0122-Tuinity-Delay-chunk-unloads.patch    | 10 ++---
 ...ble-to-execute-tasks-on-the-main-ser.patch |  6 +--
 .../0124-YAPFA-Disable-mojang-profiler.patch  |  8 ++--
 49 files changed, 207 insertions(+), 207 deletions(-)

diff --git a/Paper b/Paper
index b1691e7b6..c8028d1c7 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit b1691e7b696ad26dd2f6e81657029ae955f981f8
+Subproject commit c8028d1c76fa18eb52a0bdd8f295fe0232d9385f
diff --git a/current-paper b/current-paper
index 374e0bb7a..c60d224ff 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--4855e238ccb7ca42732659de5fa77da1264a62d9
+1.15.2--0c6830d7565eff99b423b84111c1159be356df13
diff --git a/patches/api/0004-Ridables.patch b/patches/api/0004-Ridables.patch
index 33ab053e8..a2597a341 100644
--- a/patches/api/0004-Ridables.patch
+++ b/patches/api/0004-Ridables.patch
@@ -1,4 +1,4 @@
-From 4bca53682d571ec4fcd1b4dc823ba12f23fef801 Mon Sep 17 00:00:00 2001
+From 282ffe28105fdbbbaa9ca8efc1184d83f5f47dee Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 4 May 2019 00:57:16 -0500
 Subject: [PATCH] Ridables
@@ -11,10 +11,10 @@ Subject: [PATCH] Ridables
  create mode 100644 src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-index dc60d945..751b9a5e 100644
+index d23ad96ee..36d37e9a3 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
-@@ -138,6 +138,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
+@@ -154,6 +154,10 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
      GoalKey<Mob> FOLLOW_ENTITY = GoalKey.of(Mob.class, NamespacedKey.minecraft("follow_entity"));
      GoalKey<Tameable> FOLLOW_OWNER = GoalKey.of(Tameable.class, NamespacedKey.minecraft("follow_owner"));
      GoalKey<Animals> FOLLOW_PARENT = GoalKey.of(Animals.class, NamespacedKey.minecraft("follow_parent"));
@@ -27,7 +27,7 @@ index dc60d945..751b9a5e 100644
      GoalKey<Mob> INTERACT = GoalKey.of(Mob.class, NamespacedKey.minecraft("interact"));
 diff --git a/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 new file mode 100644
-index 00000000..c0ec5a13
+index 000000000..c0ec5a130
 --- /dev/null
 +++ b/src/main/java/net/pl3x/purpur/event/entity/RidableSpacebarEvent.java
 @@ -0,0 +1,37 @@
@@ -69,10 +69,10 @@ index 00000000..c0ec5a13
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 5518ecd2..809021b2 100644
+index 3f0f38031..25372c58b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -656,4 +656,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -659,4 +659,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      @NotNull
      org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
      // Paper end
@@ -116,5 +116,5 @@ index 5518ecd2..809021b2 100644
 +    // Purpur end
  }
 -- 
-2.26.0.windows.1
+2.24.0
 
diff --git a/patches/api/0019-Add-moon-phase-API.patch b/patches/api/0019-Add-moon-phase-API.patch
index f8ca7f59d..a34243f73 100644
--- a/patches/api/0019-Add-moon-phase-API.patch
+++ b/patches/api/0019-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From 8876f5bd26cacef6a6849fb2c95a5118742c40d3 Mon Sep 17 00:00:00 2001
+From 707e74f8dc730b9e1f1ce8183430d5c39af67b64 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 1 Feb 2020 22:22:07 -0600
 Subject: [PATCH] Add moon phase API
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 906ee6827..e5232946e 100644
+index 9518da825..cf0d18283 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3273,6 +3273,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3382,6 +3382,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public List<Raid> getRaids();
  
diff --git a/patches/api/0024-Add-getPlacementBlockData-to-World.patch b/patches/api/0024-Add-getPlacementBlockData-to-World.patch
index c69c31d94..d5cd08839 100644
--- a/patches/api/0024-Add-getPlacementBlockData-to-World.patch
+++ b/patches/api/0024-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 386834e8745191fe5fc0436a6c50a5abeaf588b6 Mon Sep 17 00:00:00 2001
+From da805501e85eb43e4d89693f7116ecc95fb3aa2c Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:34:36 -0500
 Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index e5232946e..822e06647 100644
+index cf0d18283..3a7226cc9 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3281,6 +3281,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -3390,6 +3390,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
       */
      @NotNull
      net.pl3x.purpur.MoonPhase getMoonPhase();
diff --git a/patches/api/0030-Add-ItemStack-convenience-methods.patch b/patches/api/0030-Add-ItemStack-convenience-methods.patch
index 0e52ad434..3dc77c412 100644
--- a/patches/api/0030-Add-ItemStack-convenience-methods.patch
+++ b/patches/api/0030-Add-ItemStack-convenience-methods.patch
@@ -1,4 +1,4 @@
-From 78465fa5b6604ac86838560ff7f3ee8e3c0f57ee Mon Sep 17 00:00:00 2001
+From c7218d4100f7de38fbfc643e4705908adf1c41bd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 15 Mar 2020 20:52:12 -0500
 Subject: [PATCH] Add ItemStack convenience methods
@@ -50,7 +50,7 @@ index 1f2dbd68c..f2be0d0ce 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index cf8d77491..6895ee55f 100644
+index a8ade268c..cdc62301e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -17,6 +17,18 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -72,7 +72,7 @@ index cf8d77491..6895ee55f 100644
  
  /**
   * Represents a stack of items.
-@@ -760,4 +772,611 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
+@@ -783,4 +795,611 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
          return itemMeta.hasItemFlag(flag);
      }
      // Paper end
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index e59cc6b13..b915707d9 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -1,4 +1,4 @@
-From 2390a607636570bc73eb6a21ddf64e56e7b9bf37 Mon Sep 17 00:00:00 2001
+From 11137688efbe226b4c00fd1e9e2a2a0796b0c025 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
@@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand
  create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java
 
 diff --git a/pom.xml b/pom.xml
-index 0c0051f7f..6ca410444 100644
+index 1ae57e8ab..7f251e739 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -75,7 +75,7 @@ index 0c0051f7f..6ca410444 100644
          <dependency>
              <groupId>net.minecrell</groupId>
              <artifactId>terminalconsoleappender</artifactId>
-@@ -153,7 +167,7 @@
+@@ -159,7 +173,7 @@
  
      <!-- This builds a completely 'ready to start' jar with all dependencies inside -->
      <build>
@@ -84,7 +84,7 @@ index 0c0051f7f..6ca410444 100644
          <defaultGoal>clean install</defaultGoal> <!-- Paper -->
          <plugins>
              <plugin>
-@@ -161,7 +175,7 @@
+@@ -167,7 +181,7 @@
                  <artifactId>gitdescribe-maven-plugin</artifactId>
                  <version>1.3</version>
                  <configuration>
@@ -107,10 +107,10 @@ index cd6e25923..bb227bc0f 100644
          );
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a4bc9043..9c96994f2 100644
+index 3ec164785..92677b38b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1555,7 +1555,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1559,7 +1559,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -241,7 +241,7 @@ index 000000000..d8b408f06
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c2b7cb360..07c96d8a9 100644
+index 894917c88..648dde01a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -205,7 +205,7 @@ import javax.annotation.Nullable; // Paper
@@ -254,7 +254,7 @@ index c2b7cb360..07c96d8a9 100644
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 770375ed4..0e5da2a30 100644
+index 549ba4d80..3c7cb4e3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -306,7 +306,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch
index 8322c4dc3..e057a1b4a 100644
--- a/patches/server/0002-Purpur-config-files.patch
+++ b/patches/server/0002-Purpur-config-files.patch
@@ -1,4 +1,4 @@
-From 9d60a1b0e3525b1703db089be68dd6b3a31d48f3 Mon Sep 17 00:00:00 2001
+From 376d9b7f6349b16f1f9b7cbf2d7e90c292064826 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
@@ -62,7 +62,7 @@ index b07c49f1b..cf5abd393 100644
          // Paper end
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0e6368d0f..352cbe6c0 100644
+index 508a3ed1e..d64d7b731 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -85,6 +85,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -364,7 +364,7 @@ index 000000000..7d983d9a5
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 07c96d8a9..7f707e689 100644
+index 648dde01a..64f1190b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -815,6 +815,7 @@ public final class CraftServer implements Server {
@@ -391,7 +391,7 @@ index 07c96d8a9..7f707e689 100644
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2105,6 +2108,18 @@ public final class CraftServer implements Server {
+@@ -2134,6 +2137,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 6ccec739f..8136a830e 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -1,4 +1,4 @@
-From e9e36c5f91db8a630a6e784ddc8f33d8df885405 Mon Sep 17 00:00:00 2001
+From a4bd5ae6b15eae7ff3ef922097ac77434a3b26b9 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
@@ -199,7 +199,7 @@ index 816d301f1..f7344d3ae 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 cd2c18382..418126197 100644
+index e0ab058bf..1ef13ee78 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
@@ -208,10 +208,10 @@ index cd2c18382..418126197 100644
  
 -    PlayerChunkMap.EntityTracker tracker; // Paper
 +    PlayerChunkMap.EntityTracker tracker; public PlayerChunkMap.EntityTracker getTracker() { return tracker; } // Paper // Purpur
+     boolean collisionLoadChunks = false; // Paper
      Throwable addedToWorldStack; // Paper - entity debug
      public CraftEntity getBukkitEntity() {
-         if (bukkitEntity == null) {
-@@ -103,7 +103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -104,7 +104,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private int id;
      public boolean i; public final boolean blocksEntitySpawning() { return this.i; } // Paper - OBFHELPER
      public final List<Entity> passengers;
@@ -220,7 +220,7 @@ index cd2c18382..418126197 100644
      @Nullable
      private Entity vehicle;
      public boolean attachedToPlayer;
-@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -137,7 +137,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public double E;
      public double F;
      public double G;
@@ -229,7 +229,7 @@ index cd2c18382..418126197 100644
      public boolean noclip;
      public float J;
      protected final Random random;
-@@ -180,7 +180,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -181,7 +181,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private boolean aF;
      private final double[] aG;
      private long aH;
@@ -238,7 +238,7 @@ index cd2c18382..418126197 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -872,6 +872,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -874,6 +874,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
  
@@ -246,7 +246,7 @@ index cd2c18382..418126197 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1199,6 +1200,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1201,6 +1202,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -254,7 +254,7 @@ index cd2c18382..418126197 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1212,8 +1214,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1214,8 +1216,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -265,7 +265,7 @@ index cd2c18382..418126197 100644
      }
  
      public boolean aA() {
-@@ -1344,6 +1347,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1346,6 +1349,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -273,7 +273,7 @@ index cd2c18382..418126197 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2179,7 +2183,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2181,7 +2185,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -288,7 +288,7 @@ index cd2c18382..418126197 100644
          }
          return true; // CraftBukkit
      }
-@@ -2214,6 +2224,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2216,6 +2226,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -301,7 +301,7 @@ index cd2c18382..418126197 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2382,6 +2398,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2384,6 +2400,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -309,7 +309,7 @@ index cd2c18382..418126197 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2600,6 +2617,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2602,6 +2619,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -317,7 +317,7 @@ index cd2c18382..418126197 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3454,4 +3472,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3465,4 +3483,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -3366,7 +3366,7 @@ index 0357c9da9..98a657cec 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b37301598..6a7a9dc3d 100644
+index 62f1e4c5f..a657522cc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -5227,10 +5227,10 @@ index 0c7f094e5..62a081006 100644
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 352cbe6c0..4442f5cc0 100644
+index d64d7b731..4c04e2120 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -990,6 +990,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -994,6 +994,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          }
      }
  
@@ -5238,7 +5238,7 @@ index 352cbe6c0..4442f5cc0 100644
      public boolean a(AxisAlignedBB axisalignedbb, Material material) {
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
-@@ -1625,4 +1626,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1629,4 +1630,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      @Override public BiomeManager d() {
          return this.biomeManager;
      }
diff --git a/patches/server/0010-Add-obfhelpers-for-plugin-use.patch b/patches/server/0010-Add-obfhelpers-for-plugin-use.patch
index f97f82b1f..af3c9aadc 100644
--- a/patches/server/0010-Add-obfhelpers-for-plugin-use.patch
+++ b/patches/server/0010-Add-obfhelpers-for-plugin-use.patch
@@ -1,4 +1,4 @@
-From 4a75af86103dd3fce42fcb75887c681e5474dc33 Mon Sep 17 00:00:00 2001
+From d00b977d56be597aaafd83184f0693c10b656fd3 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 1 Jan 2020 20:12:39 -0600
 Subject: [PATCH] Add obfhelpers for plugin use
@@ -10,7 +10,7 @@ Subject: [PATCH] Add obfhelpers for plugin use
  3 files changed, 4 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
-index fb97c51bb1..50ed4001d1 100644
+index fb97c51bb..50ed4001d 100644
 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
 +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
 @@ -145,6 +145,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
@@ -30,10 +30,10 @@ index fb97c51bb1..50ed4001d1 100644
              return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
          }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index d6e43313bf..4730c2beb7 100644
+index ea60880c6..413b888a0 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -595,6 +595,7 @@ public final class ItemStack {
+@@ -596,6 +596,7 @@ public final class ItemStack {
          return this.tag;
      }
  
@@ -42,7 +42,7 @@ index d6e43313bf..4730c2beb7 100644
          if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
              return this.tag.getCompound(s);
 diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
-index bea4a0b808..c6481c7ff1 100644
+index bea4a0b80..c6481c7ff 100644
 --- a/src/main/java/net/minecraft/server/NBTTagString.java
 +++ b/src/main/java/net/minecraft/server/NBTTagString.java
 @@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
diff --git a/patches/server/0011-Silk-touch-spawners.patch b/patches/server/0011-Silk-touch-spawners.patch
index 1a49f54bc..dd5ab1545 100644
--- a/patches/server/0011-Silk-touch-spawners.patch
+++ b/patches/server/0011-Silk-touch-spawners.patch
@@ -1,4 +1,4 @@
-From fcf69dc9727e13cd05e36b1ccbb3bc9dea530efa Mon Sep 17 00:00:00 2001
+From 454f9a81df12ad44d358eeda82b46fedc91f3786 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 9 May 2019 14:27:37 -0500
 Subject: [PATCH] Silk touch spawners
@@ -10,10 +10,10 @@ Subject: [PATCH] Silk touch spawners
  3 files changed, 47 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e40375b67a..b29ed1cfa7 100644
+index d051a54aa..8c8dc9d6b 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
-@@ -494,6 +494,7 @@ public class Block implements IMaterial {
+@@ -501,6 +501,7 @@ public class Block implements IMaterial {
          iblockdata.dropNaturally(world, blockposition, itemstack);
      }
  
@@ -22,7 +22,7 @@ index e40375b67a..b29ed1cfa7 100644
          if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              float f = 0.5F;
 diff --git a/src/main/java/net/minecraft/server/BlockMobSpawner.java b/src/main/java/net/minecraft/server/BlockMobSpawner.java
-index 5296fdf168..69d04f6cbf 100644
+index 5296fdf16..69d04f6cb 100644
 --- a/src/main/java/net/minecraft/server/BlockMobSpawner.java
 +++ b/src/main/java/net/minecraft/server/BlockMobSpawner.java
 @@ -11,6 +11,40 @@ public class BlockMobSpawner extends BlockTileEntity {
@@ -67,7 +67,7 @@ index 5296fdf168..69d04f6cbf 100644
      public void dropNaturally(IBlockData iblockdata, World world, BlockPosition blockposition, ItemStack itemstack) {
          super.dropNaturally(iblockdata, world, blockposition, itemstack);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index a0d932c403..0dd9897b99 100644
+index 5a7494947..8e8d392a1 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -136,10 +136,17 @@ public class EntityTypes<T extends Entity> {
diff --git a/patches/server/0019-Cows-eat-mushrooms.patch b/patches/server/0019-Cows-eat-mushrooms.patch
index 4e0d439c1..c2f2d0b1a 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0019-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 23ad60ec8f75e9da9a58ed56affc15165cf59435 Mon Sep 17 00:00:00 2001
+From 424361653f547e2ef080fcccba4bca7e6752a6ba 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 418126197..008b6a1d7 100644
+index 1ef13ee78..0652f6312 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1096,6 +1096,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1098,6 +1098,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index 418126197..008b6a1d7 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);
-@@ -2644,6 +2645,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2646,6 +2647,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
diff --git a/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index a616fbeab..c0a936d3b 100644
--- a/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0022-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From 7fd828cf0d1c476ee0c44ab9b6d351522940ba5f Mon Sep 17 00:00:00 2001
+From a50f400dcbc7332935e3d8292445bc40191fef76 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 f7344d3ae..f6c0165f9 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 008b6a1d7..128409516 100644
+index 0652f6312..197953e19 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1443,6 +1443,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1445,6 +1445,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index 008b6a1d7..128409516 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -1972,14 +1973,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1974,14 +1975,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
diff --git a/patches/server/0030-Controllable-Minecarts.patch b/patches/server/0030-Controllable-Minecarts.patch
index 1efb83c8b..f08760876 100644
--- a/patches/server/0030-Controllable-Minecarts.patch
+++ b/patches/server/0030-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From edb03f00873ebbc1019e08b8ac1c1cdf03ce4659 Mon Sep 17 00:00:00 2001
+From 0d016d81edb562a793a0c1cf2a1f393e03f9509b 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 128409516..e54d8f595 100644
+index 197953e19..5d39d86f0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1344,6 +1344,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1346,6 +1346,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  
diff --git a/patches/server/0031-Signs-allow-color-codes.patch b/patches/server/0031-Signs-allow-color-codes.patch
index ca8e18038..9424ca1ac 100644
--- a/patches/server/0031-Signs-allow-color-codes.patch
+++ b/patches/server/0031-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From cb78e7772e58a87b4ddd5dc5488ff2b12a686aee Mon Sep 17 00:00:00 2001
+From 6736a689133e386f0ec23a3f9c1c95b55fc6d8b8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 17:40:30 -0500
 Subject: [PATCH] Signs allow color codes
@@ -11,7 +11,7 @@ Subject: [PATCH] Signs allow color codes
  4 files changed, 25 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index db54bcc7e..192ec4378 100644
+index a657522cc..c3dc8ada8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1131,6 +1131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,10 +23,10 @@ index db54bcc7e..192ec4378 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 02bda8bee..2e6411100 100644
+index b25b3b481..ee961bc05 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2614,6 +2614,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2622,6 +2622,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
                      }
                  }
                  // Paper end
diff --git a/patches/server/0034-Campfires-burn-out-in-rain.patch b/patches/server/0034-Campfires-burn-out-in-rain.patch
index b6beeb6d7..cfc69f0ee 100644
--- a/patches/server/0034-Campfires-burn-out-in-rain.patch
+++ b/patches/server/0034-Campfires-burn-out-in-rain.patch
@@ -1,4 +1,4 @@
-From 250c9ee434a431d4ca5623c9e68a19313647a657 Mon Sep 17 00:00:00 2001
+From fff946598371ecb10e4108eed1ed7273099bae31 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 6 Jun 2019 21:30:49 -0500
 Subject: [PATCH] Campfires burn out in rain
@@ -10,10 +10,10 @@ Subject: [PATCH] Campfires burn out in rain
  3 files changed, 19 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index b29ed1cfa..d7911c342 100644
+index 8c8dc9d6b..13981967b 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
-@@ -387,7 +387,7 @@ public class Block implements IMaterial {
+@@ -394,7 +394,7 @@ public class Block implements IMaterial {
          PacketDebug.a(world, blockposition);
      }
  
diff --git a/patches/server/0036-Dont-send-useless-entity-packets.patch b/patches/server/0036-Dont-send-useless-entity-packets.patch
index 4e8ae2769..7e4c00244 100644
--- a/patches/server/0036-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0036-Dont-send-useless-entity-packets.patch
@@ -1,4 +1,4 @@
-From 8d6b566ea1808ad7ec747ea5224fc9f6c10cfabd Mon Sep 17 00:00:00 2001
+From 46c6b61048ea662203af345382ace73735a9e179 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 6 Jul 2019 17:00:04 -0500
 Subject: [PATCH] Dont send useless entity packets
@@ -10,10 +10,10 @@ Subject: [PATCH] Dont send useless entity packets
  3 files changed, 27 insertions(+), 5 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 6d3b34ead..8d4bcd34c 100644
+index 5cc89c0cf..390cb8e76 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -163,6 +163,7 @@ public class EntityTrackerEntry {
+@@ -169,6 +169,7 @@ public class EntityTrackerEntry {
                          this.o = 0;
                          packet1 = new PacketPlayOutEntityTeleport(this.tracker);
                      }
@@ -21,7 +21,7 @@ index 6d3b34ead..8d4bcd34c 100644
                  }
  
                  if ((this.e || this.tracker.impulse || this.tracker instanceof EntityLiving && ((EntityLiving) this.tracker).isGliding()) && this.tickCounter > 0) {
-@@ -249,6 +250,22 @@ public class EntityTrackerEntry {
+@@ -255,6 +256,22 @@ public class EntityTrackerEntry {
  
      }
  
diff --git a/patches/server/0037-Implement-AFK-API.patch b/patches/server/0037-Implement-AFK-API.patch
index 192aa054b..8102416c9 100644
--- a/patches/server/0037-Implement-AFK-API.patch
+++ b/patches/server/0037-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From d1cf022928b0c3dee8838a58215fc5cfef8fb2c2 Mon Sep 17 00:00:00 2001
+From dfcd5e0469a2c910964d8f9b2071b925625be773 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, 111 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e54d8f595..3533dbcd5 100644
+index 5d39d86f0..46bc91524 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1436,6 +1436,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1438,6 +1438,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  
@@ -50,7 +50,7 @@ index 27cfc6654..d62174e9c 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f3278d356..219a274f9 100644
+index c3dc8ada8..0d57cff87 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1624,8 +1624,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -171,7 +171,7 @@ index 1398c47a2..0bf1a14b7 100644
      public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
          double d4 = d3 * d3;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c61edea48..f641aa30c 100644
+index ee961bc05..17b23ed2f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -196,7 +196,7 @@ index c61edea48..f641aa30c 100644
                      // Skip the first time we do this
                      if (true) { // Spigot - don't skip any move events
                          Location oldTo = to.clone();
-@@ -1134,6 +1142,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1141,6 +1149,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
                                  this.lastYaw = to.getYaw();
                                  this.lastPitch = to.getPitch();
  
@@ -206,7 +206,7 @@ index c61edea48..f641aa30c 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 a4a441fea..c4a09eda3 100644
+index 441249284..afb6ad44a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -405,7 +405,7 @@ public class WorldServer extends World {
diff --git a/patches/server/0039-Mending-mends-most-damages-equipment-first.patch b/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
index 08102977a..d1230f2df 100644
--- a/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0039-Mending-mends-most-damages-equipment-first.patch
@@ -1,4 +1,4 @@
-From 7e6b03c7abf04a8166bff6569bcdf9e1cc760472 Mon Sep 17 00:00:00 2001
+From 650646daddf4a1af505b0dd966ccc2414b583ffd Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 14 Jul 2019 19:52:47 -0500
 Subject: [PATCH] Mending mends most damages equipment first
@@ -62,10 +62,10 @@ index 53c6c3389..0fae3693c 100644
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 4730c2beb..4fe503808 100644
+index 413b888a0..ce6a46685 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -369,10 +369,19 @@ public final class ItemStack {
+@@ -370,10 +370,19 @@ public final class ItemStack {
          }
      }
  
diff --git a/patches/server/0042-Make-the-GUI-better.patch b/patches/server/0042-Make-the-GUI-better.patch
index 433bd2549..78a052c7c 100644
--- a/patches/server/0042-Make-the-GUI-better.patch
+++ b/patches/server/0042-Make-the-GUI-better.patch
@@ -1,4 +1,4 @@
-From 566ac634b6c6db3e101070eaef5a7e851ef4b303 Mon Sep 17 00:00:00 2001
+From 045bfdd1709b11fa5befd268f29f18b5187e81eb 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 cf5abd393..73d2b32c5 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9c96994f2..6b6439493 100644
+index 92677b38b..f1266767e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1362,6 +1362,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1366,6 +1366,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return true;
      }
  
diff --git a/patches/server/0044-Add-EntityPortalReadyEvent.patch b/patches/server/0044-Add-EntityPortalReadyEvent.patch
index 8575368fc..b3515a5bb 100644
--- a/patches/server/0044-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0044-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From 25bbc9ac23524b9aa48af17f295ef5d60d90c834 Mon Sep 17 00:00:00 2001
+From 6b15e6d5c97e3bee4ce7d47a08679a5b73437a7e 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,10 +86,10 @@ index 09c7c1318..6880cdd7f 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 3533dbcd5..b609808df 100644
+index 46bc91524..39bd34ab3 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
+@@ -170,9 +170,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      protected boolean af; public final boolean inPortal() { return this.af; } // Paper - OBFHELPER
      protected int ag;
      public DimensionManager dimension;
@@ -102,7 +102,7 @@ index 3533dbcd5..b609808df 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2285,6 +2285,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2287,6 +2287,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                      this.world.getMethodProfiler().enter("portal");
                      this.ag = i;
                      this.portalCooldown = this.ba();
@@ -141,7 +141,7 @@ index f84dd6d9b..f50e9670b 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c4a09eda3..71719ce63 100644
+index afb6ad44a..75424bfbc 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -75,7 +75,7 @@ public class WorldServer extends World {
diff --git a/patches/server/0045-Implement-elytra-settings.patch b/patches/server/0045-Implement-elytra-settings.patch
index 9a677dab4..508493fe8 100644
--- a/patches/server/0045-Implement-elytra-settings.patch
+++ b/patches/server/0045-Implement-elytra-settings.patch
@@ -1,4 +1,4 @@
-From f645248ee974a8387fa60bc2256f0d751f78b287 Mon Sep 17 00:00:00 2001
+From b27d4ef147b5bdf0411208613ae3b4a13dc914e2 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 25 Jul 2019 18:07:37 -0500
 Subject: [PATCH] Implement elytra settings
@@ -56,10 +56,10 @@ index bd524a35b..c0e8cd0cd 100644
                          itemstack.subtract(1);
                      } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 4fe503808..7b7a0a7cb 100644
+index ce6a46685..8c3bbef66 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -401,7 +401,7 @@ public final class ItemStack {
+@@ -402,7 +402,7 @@ public final class ItemStack {
              int j;
  
              if (i > 0) {
@@ -68,7 +68,7 @@ index 4fe503808..7b7a0a7cb 100644
                  int k = 0;
  
                  for (int l = 0; j > 0 && l < i; ++l) {
-@@ -447,6 +447,12 @@ public final class ItemStack {
+@@ -448,6 +448,12 @@ public final class ItemStack {
                  if (this.isDamaged(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) {
                      consumer.accept(t0);
                      Item item = this.getItem();
diff --git a/patches/server/0046-Add-blacklist-option-for-grindstone.patch b/patches/server/0046-Add-blacklist-option-for-grindstone.patch
index 95387a6b7..9f5867653 100644
--- a/patches/server/0046-Add-blacklist-option-for-grindstone.patch
+++ b/patches/server/0046-Add-blacklist-option-for-grindstone.patch
@@ -1,4 +1,4 @@
-From d0c16f5f7ea30d85027a2613635851dd2a260e5e Mon Sep 17 00:00:00 2001
+From caa81e11598a014df82fe474f0dac6eaad0c4b39 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
@@ -51,10 +51,10 @@ index ed88e208d..fcfb4abdc 100644
                  Map<Enchantment, Integer> map = EnchantmentManager.a(itemstack);
                  Iterator iterator = map.entrySet().iterator();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 7b7a0a7cb..6b45bc17c 100644
+index 8c3bbef66..d5e0578b2 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -541,6 +541,12 @@ public final class ItemStack {
+@@ -542,6 +542,12 @@ public final class ItemStack {
          return !this.e() ? this.doMaterialsMatch(itemstack) : !itemstack.isEmpty() && this.getItem() == itemstack.getItem();
      }
  
diff --git a/patches/server/0047-Implement-lagging-threshold.patch b/patches/server/0047-Implement-lagging-threshold.patch
index d9b9c3822..7439bef06 100644
--- a/patches/server/0047-Implement-lagging-threshold.patch
+++ b/patches/server/0047-Implement-lagging-threshold.patch
@@ -1,4 +1,4 @@
-From d119d9a7174b439e160e45cbca936cb48960ce8a Mon Sep 17 00:00:00 2001
+From dec4e338ded47a5c9bbcfbc93899016dea718f4e 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
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
  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 6b6439493..d8822c29f 100644
+index f1266767e..2b60ecde7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -21,7 +21,7 @@ index 6b6439493..d8822c29f 100644
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
  
-@@ -940,6 +941,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -944,6 +945,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          recentTps[1] = tps5.getAverage();
                          recentTps[2] = tps15.getAverage();
                          // Paper end
@@ -46,10 +46,10 @@ index d3e1c8c40..ab20fa2fa 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 7f707e689..c075e9d35 100644
+index 64f1190b0..e890a1f81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2257,4 +2257,11 @@ public final class CraftServer implements Server {
+@@ -2286,4 +2286,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end
diff --git a/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
index 5ea81ee29..f05d46b18 100644
--- a/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0051-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 67a83ab0381a8c7bcc1c66908354ca49433b88b9 Mon Sep 17 00:00:00 2001
+From 7692271288d67f40ec95da714f6d6b33fa4da4b2 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 b609808df..2e9496136 100644
+index 39bd34ab3..ce0821a65 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1571,6 +1571,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1573,6 +1573,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {
diff --git a/patches/server/0053-Bring-back-server-name.patch b/patches/server/0053-Bring-back-server-name.patch
index c02a1f4ce..1f4d836d0 100644
--- a/patches/server/0053-Bring-back-server-name.patch
+++ b/patches/server/0053-Bring-back-server-name.patch
@@ -1,4 +1,4 @@
-From e40b33149f2d4836c29f4ea74fb64d31ee21a0ba Mon Sep 17 00:00:00 2001
+From c26c5993da3fb17e8d5cdb2335d45e8cabcb0363 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 0c3ec8357..309f5562b 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 c075e9d35..b62cfb9a9 100644
+index e890a1f81..b488d1848 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2259,6 +2259,11 @@ public final class CraftServer implements Server {
+@@ -2288,6 +2288,11 @@ public final class CraftServer implements Server {
      // Paper end
  
      // Purpur start
diff --git a/patches/server/0060-Alternative-Keepalive-Handling.patch b/patches/server/0060-Alternative-Keepalive-Handling.patch
index 473cb369f..038a53305 100644
--- a/patches/server/0060-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0060-Alternative-Keepalive-Handling.patch
@@ -1,4 +1,4 @@
-From 4f27c69dd03c244d9f695afa6313b48ba67fce4d Mon Sep 17 00:00:00 2001
+From f9d2d62f4fe967fa09e9a03798c4cf3d53a9cb53 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
@@ -22,7 +22,7 @@ index 8e93f1540..470f92c4f 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f641aa30c..f83a35c9f 100644
+index 17b23ed2f..d3b4f0bea 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -75,6 +75,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -55,7 +55,7 @@ index f641aa30c..f83a35c9f 100644
          if (this.isPendingPing()) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
-@@ -2651,6 +2667,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -2659,6 +2675,17 @@ public class PlayerConnection implements PacketListenerPlayIn {
  
      @Override
      public void a(PacketPlayInKeepAlive packetplayinkeepalive) {
diff --git a/patches/server/0062-Add-moon-phase-API.patch b/patches/server/0062-Add-moon-phase-API.patch
index 5bd868070..b68468a73 100644
--- a/patches/server/0062-Add-moon-phase-API.patch
+++ b/patches/server/0062-Add-moon-phase-API.patch
@@ -1,4 +1,4 @@
-From e00e22ff6a8e6136bcfd11c1676a18390433cca8 Mon Sep 17 00:00:00 2001
+From 0007148e4418e7676942bae638381c265f9df97c 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,10 +8,10 @@ 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 ac257d50d..bb529b33d 100644
+index 874240d9d..08175e300 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2461,6 +2461,14 @@ public class CraftWorld implements World {
+@@ -2463,6 +2463,14 @@ public class CraftWorld implements World {
  
          return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
      }
@@ -25,7 +25,7 @@ index ac257d50d..bb529b33d 100644
 +
      // Paper start
      @Override
-     public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
+     public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen, boolean urgent) {
 -- 
 2.24.0
 
diff --git a/patches/server/0063-Add-getPlacementBlockData-to-World.patch b/patches/server/0063-Add-getPlacementBlockData-to-World.patch
index e26ea3fae..958491c5a 100644
--- a/patches/server/0063-Add-getPlacementBlockData-to-World.patch
+++ b/patches/server/0063-Add-getPlacementBlockData-to-World.patch
@@ -1,4 +1,4 @@
-From 39d262aad7cbbe16598bdee9f7107a7708e988b2 Mon Sep 17 00:00:00 2001
+From 906e4e33c188c9ab482b9de4adea2b605b21a775 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,10 +66,10 @@ index 9c9b93f28..74a722cce 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 bb529b33d..b28684c5e 100644
+index 08175e300..177eec1c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2467,6 +2467,11 @@ public class CraftWorld implements World {
+@@ -2469,6 +2469,11 @@ public class CraftWorld implements World {
      public net.pl3x.purpur.MoonPhase getMoonPhase() {
          return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
      }
diff --git a/patches/server/0065-Enderchest-6-rows-plus-permissions.patch b/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
index 0a3b9d2da..80ec992c4 100644
--- a/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
+++ b/patches/server/0065-Enderchest-6-rows-plus-permissions.patch
@@ -1,4 +1,4 @@
-From 5b0acaf7937c8feacc2d97a2945ea257aa1ca327 Mon Sep 17 00:00:00 2001
+From 483872160dc3cbc799420a8c1db32ef5e4bbe143 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)
@@ -111,12 +111,12 @@ index 47827fbf1..0f5819a40 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-index 525ebf961..ee90b92af 100644
+index a4a809f30..e7d19d67c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java
-@@ -17,6 +17,14 @@ public final class CraftDefaultPermissions {
-         DefaultPermissions.registerPermission(ROOT + ".debugstick", "Gives the user the ability to use the debug stick in creative", org.bukkit.permissions.PermissionDefault.OP, parent);
+@@ -18,6 +18,14 @@ public final class CraftDefaultPermissions {
          DefaultPermissions.registerPermission(ROOT + ".debugstick.always", "Gives the user the ability to use the debug stick in all game modes", org.bukkit.permissions.PermissionDefault.FALSE, parent);
+         DefaultPermissions.registerPermission(ROOT + ".commandblock", "Gives the user the ability to use command blocks.", org.bukkit.permissions.PermissionDefault.OP, parent); // Paper
          // Spigot end
 +        // Purpur start
 +        DefaultPermissions.registerPermission("purpur.enderchest.rows.six", "Gives the user six rows of enderchest space", org.bukkit.permissions.PermissionDefault.FALSE);
diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
index 02f5c1718..9d5ba0c16 100644
--- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch
@@ -1,4 +1,4 @@
-From 2900aaeff3997f68cf9c35a4ad845b87aea0f586 Mon Sep 17 00:00:00 2001
+From 6ef5ae3357460132d80230bb96c2457ac9f65e0e 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 d8822c29f..e06c0bb39 100644
+index 2b60ecde7..378fd60db 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,7 +22,7 @@ index d8822c29f..e06c0bb39 100644
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -844,6 +844,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -848,6 +848,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -30,7 +30,7 @@ index d8822c29f..e06c0bb39 100644
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -933,13 +934,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -937,13 +938,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -52,10 +52,10 @@ index d8822c29f..e06c0bb39 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 b62cfb9a9..e7605ee9f 100644
+index b488d1848..b2db22413 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2063,6 +2063,7 @@ public final class CraftServer implements Server {
+@@ -2092,6 +2092,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 208da3762..854cbcc26 100644
--- a/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0075-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
@@ -1,4 +1,4 @@
-From 1d30eeeb7722d1dc6a30725d763f2724f7d8906a Mon Sep 17 00:00:00 2001
+From 1a9eb647458d4f89ab12c198f611534dbff7904c 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
  2 files changed, 11 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4442f5cc0..71a47ca2a 100644
+index 4c04e2120..7356d794d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1432,8 +1432,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1436,8 +1436,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return blockposition;
      }
  
@@ -25,10 +25,10 @@ index 4442f5cc0..71a47ca2a 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 acf854322..ba8b0e756 100644
+index 177eec1c6..b32031815 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 {
+@@ -385,12 +385,16 @@ public class CraftWorld implements World {
      @Override
      public boolean setSpawnLocation(int x, int y, int z) {
          try {
diff --git a/patches/server/0082-Add-permission-for-F3-N-debug.patch b/patches/server/0082-Add-permission-for-F3-N-debug.patch
index 0f6c71a9a..8619e373f 100644
--- a/patches/server/0082-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0082-Add-permission-for-F3-N-debug.patch
@@ -1,4 +1,4 @@
-From f92c808c4d70752623932d33a603c811a8a05097 Mon Sep 17 00:00:00 2001
+From 45fcb3a76ce633365bb5974a8486d1e3f2bd6007 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9786f110c..5155537e7 100644
+index 9b726de6d..60f3df16e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -975,6 +975,7 @@ public abstract class PlayerList {
+@@ -976,6 +976,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server/0087-UPnP-Port-Forwarding-Service.patch b/patches/server/0087-UPnP-Port-Forwarding-Service.patch
index 55ed95baf..60bc9a0ea 100644
--- a/patches/server/0087-UPnP-Port-Forwarding-Service.patch
+++ b/patches/server/0087-UPnP-Port-Forwarding-Service.patch
@@ -1,4 +1,4 @@
-From eff9e802ad2abe60b19c5ba3418bb47e0e310cd5 Mon Sep 17 00:00:00 2001
+From 176ac13ebc4fd1146e653cd6146f63a7f268a7bf 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
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
  create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
 
 diff --git a/pom.xml b/pom.xml
-index 6ca410444..46101cdbe 100644
+index 7f251e739..c1d87f951 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -56,6 +56,12 @@
@@ -30,7 +30,7 @@ index 6ca410444..46101cdbe 100644
          <!-- Purpur end -->
          <dependency>
              <groupId>net.minecrell</groupId>
-@@ -156,6 +162,10 @@
+@@ -162,6 +168,10 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>
@@ -78,7 +78,7 @@ index 73d2b32c5..a522ed5c3 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 e06c0bb39..28fefa0ca 100644
+index 378fd60db..d00852a12 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
diff --git a/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
index df04e524a..f1c2f6ef6 100644
--- a/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0089-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 28e69a3ee02a3c62d369a19a53df26930bd1ae6d Mon Sep 17 00:00:00 2001
+From 1940aae5b2ec54b55798f99c4aa15b14f7d02d1a 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
@@ -15,10 +15,10 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
  8 files changed, 58 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index e625842e5..f126d8d63 100644
+index 82264bf65..10764dd10 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -437,6 +437,7 @@ public class ChunkRegionLoader {
+@@ -441,6 +441,7 @@ public class ChunkRegionLoader {
  
                  while (iterator1.hasNext()) {
                      Entity entity = (Entity) iterator1.next();
@@ -27,10 +27,10 @@ index e625842e5..f126d8d63 100644
                      // Paper start
                      if (asyncsavedata == null && !entity.dead && (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 2e9496136..2a4603214 100644
+index ce0821a65..b92e956e6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1588,6 +1588,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1590,6 +1590,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/patches/server/0091-Add-item-entity-options.patch b/patches/server/0091-Add-item-entity-options.patch
index 4001f63ba..ad84b5571 100644
--- a/patches/server/0091-Add-item-entity-options.patch
+++ b/patches/server/0091-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From 9a407c03071a9286e414bd4fe4feadc61e9132b7 Mon Sep 17 00:00:00 2001
+From 9768c60b60fe0bc632bd397c4037e14692e30394 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 2a4603214..fac9fe23a 100644
+index b92e956e6..69983550b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1319,6 +1319,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1321,6 +1321,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/patches/server/0093-Configurable-void-damage-height.patch b/patches/server/0093-Configurable-void-damage-height.patch
index 07cd5b7e8..588315986 100644
--- a/patches/server/0093-Configurable-void-damage-height.patch
+++ b/patches/server/0093-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From 62230b26b7bf0f5f96ad902dc0d3fa5474d12ec5 Mon Sep 17 00:00:00 2001
+From 3e6308383144e7642e6ad7d78ebe0cce25bb38fe 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,10 +9,10 @@ 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 e5a2414c1..f04319b1f 100644
+index 69983550b..86e244e06 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -502,7 +502,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -504,7 +504,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      // Paper start
      protected void performVoidDamage() {
diff --git a/patches/server/0094-Fix-the-dead-lagging-the-server.patch b/patches/server/0094-Fix-the-dead-lagging-the-server.patch
index 16e36106a..6293b8df9 100644
--- a/patches/server/0094-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0094-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From 349b3023f48e71d5352cd02b3538f1d0aece1d42 Mon Sep 17 00:00:00 2001
+From 362b4517b13cfae71cedc57042ef661503295566 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 ca524a7db..b57f26373 100644
+index 86e244e06..c72b4fbd0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1405,7 +1405,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1407,7 +1407,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/0097-Configurable-server-mod-name.patch b/patches/server/0097-Configurable-server-mod-name.patch
index 0880ac7ad..57a3f7996 100644
--- a/patches/server/0097-Configurable-server-mod-name.patch
+++ b/patches/server/0097-Configurable-server-mod-name.patch
@@ -1,4 +1,4 @@
-From e7ac3f7ec7a140fa09a32050abe8506dc77ee3cd Mon Sep 17 00:00:00 2001
+From f3df53b9df37f26ab2e230b8141b7cff832a549d 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,10 +9,10 @@ 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 28fefa0ca..142633ddb 100644
+index d00852a12..9b3df983f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1573,7 +1573,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1577,7 +1577,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0098-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0098-End-gateway-should-check-if-entity-can-use-portal.patch
index 7a4ddf311..2c762cb06 100644
--- a/patches/server/0098-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0098-End-gateway-should-check-if-entity-can-use-portal.patch
@@ -1,4 +1,4 @@
-From 52ae95b4469b0133754c9b1b349a094471ae8373 Mon Sep 17 00:00:00 2001
+From 47bffde99a17985487370477c181654f72419fde 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
@@ -8,10 +8,10 @@ Subject: [PATCH] End gateway should check if entity can use portal
  1 file changed, 1 insertion(+)
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index c71f76004..d73045f70 100644
+index 87aef515c..55294b5df 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-@@ -118,6 +118,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
+@@ -122,6 +122,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
  
      public void a(Entity entity) {
          if (this.world instanceof WorldServer && !this.f()) {
diff --git a/patches/server/0099-Configurable-TPS-Catchup.patch b/patches/server/0099-Configurable-TPS-Catchup.patch
index 0459178ed..ddce4ae3f 100644
--- a/patches/server/0099-Configurable-TPS-Catchup.patch
+++ b/patches/server/0099-Configurable-TPS-Catchup.patch
@@ -1,4 +1,4 @@
-From 70f0d85f03cee8323f15fec7597f1ef44c1e0e17 Mon Sep 17 00:00:00 2001
+From 7fe871ca0c6d15341afae88e1a9fbc9a6cfaa868 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,10 +9,10 @@ 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 142633ddb..8aed5ff43 100644
+index 9b3df983f..3b9d27b6c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -976,6 +976,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -980,6 +980,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.methodProfiler.exitEnter("nextTickWait");
                      this.ac = true;
                      this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);
diff --git a/patches/server/0103-Optimize-Chunk-Ticks.patch b/patches/server/0103-Optimize-Chunk-Ticks.patch
index 657e9054d..80145f9d7 100644
--- a/patches/server/0103-Optimize-Chunk-Ticks.patch
+++ b/patches/server/0103-Optimize-Chunk-Ticks.patch
@@ -1,4 +1,4 @@
-From 612c06073940d88a5cc84b9783112453b9ed55f1 Mon Sep 17 00:00:00 2001
+From 8c0c22b4f9bcaa2c8671de1f4cefe082c18b9692 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
@@ -9,10 +9,10 @@ Subject: [PATCH] Optimize Chunk Ticks
  2 files changed, 25 insertions(+), 39 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index e2abda1bc..8ffb2e6b7 100644
+index 8ca6adbac..389b42afa 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -767,11 +767,12 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -771,11 +771,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
@@ -30,7 +30,7 @@ index e2abda1bc..8ffb2e6b7 100644
              // CraftBukkit end
  
              this.world.getMethodProfiler().enter("naturalSpawnCount");
-@@ -817,40 +818,11 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -821,40 +822,11 @@ public class ChunkProviderServer extends IChunkProvider {
                          if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(playerchunk, chunkcoordintpair, true)) { // Spigot // Paper - optimise isOutsideOfRange
                              this.world.getMethodProfiler().enter("spawner");
                              this.world.timings.mobSpawn.startTiming(); // Spigot
diff --git a/patches/server/0107-Debug-stick-should-not-update-neighbors.patch b/patches/server/0107-Debug-stick-should-not-update-neighbors.patch
index faf5a06ad..51136d3af 100644
--- a/patches/server/0107-Debug-stick-should-not-update-neighbors.patch
+++ b/patches/server/0107-Debug-stick-should-not-update-neighbors.patch
@@ -1,4 +1,4 @@
-From b70ef6b222343737404e4ae6190743e1a2993c6b Mon Sep 17 00:00:00 2001
+From c9aeecf1d55f5b9f6a9589128d59a63eafc07642 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
@@ -8,10 +8,10 @@ Subject: [PATCH] Debug stick should not update neighbors
  1 file changed, 5 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6b45bc17c..92d9ddf6a 100644
+index d5e0578b2..bc465a47d 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -185,6 +185,11 @@ public final class ItemStack {
+@@ -186,6 +186,11 @@ public final class ItemStack {
                  if (this.getItem() == Items.BONE_MEAL) {
                      world.captureTreeGeneration = true;
                  }
diff --git a/patches/server/0113-Player-invulnerabilities.patch b/patches/server/0113-Player-invulnerabilities.patch
index 39d24e37d..e15ccb886 100644
--- a/patches/server/0113-Player-invulnerabilities.patch
+++ b/patches/server/0113-Player-invulnerabilities.patch
@@ -1,4 +1,4 @@
-From f65a4661cd8809abc4cf81ad6256849d15c4c51f Mon Sep 17 00:00:00 2001
+From 62f89ef6290a97c5149e838728a711a2766356ad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 2 May 2020 20:55:44 -0500
 Subject: [PATCH] Player invulnerabilities
@@ -12,7 +12,7 @@ Subject: [PATCH] Player invulnerabilities
  5 files changed, 42 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 19cfdf6c8..621171584 100644
+index c4a6f94a3..d6415a506 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -131,6 +131,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -55,7 +55,7 @@ index 19cfdf6c8..621171584 100644
              return this;
          }
      }
-@@ -1963,9 +1973,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1988,9 +1998,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -75,10 +75,10 @@ index 19cfdf6c8..621171584 100644
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f83a35c9f..4d6e7c249 100644
+index d3b4f0bea..2f047d8ec 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1522,6 +1522,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -1530,6 +1530,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
          // Paper start
          PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];
@@ -87,10 +87,10 @@ index f83a35c9f..4d6e7c249 100644
          this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 5155537e7..652a954b5 100644
+index 60f3df16e..274270c7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -823,6 +823,8 @@ public abstract class PlayerList {
+@@ -824,6 +824,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0116-MC-4-Fix-Item-position-desync.patch b/patches/server/0116-MC-4-Fix-Item-position-desync.patch
index b3b01ae97..1ad036164 100644
--- a/patches/server/0116-MC-4-Fix-Item-position-desync.patch
+++ b/patches/server/0116-MC-4-Fix-Item-position-desync.patch
@@ -1,4 +1,4 @@
-From 38d451e1f9556d05be4854849084f53771e2b061 Mon Sep 17 00:00:00 2001
+From 1e342f9021a2174b50add0d9518f062d2721d6ad 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
@@ -10,13 +10,13 @@ Subject: [PATCH] MC-4 Fix - Item position desync
  3 files changed, 10 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 8d4bcd34c..ec0abe429 100644
+index 390cb8e76..4e63fd83e 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-@@ -127,6 +127,12 @@ public class EntityTrackerEntry {
-                 j = MathHelper.d(this.tracker.pitch * 256.0F / 360.0F);
-                 Vec3D vec3d = this.tracker.getPositionVector().d(PacketPlayOutEntity.a(this.xLoc, this.yLoc, this.zLoc));
-                 boolean flag1 = vec3d.g() >= 7.62939453125E-6D;
+@@ -131,6 +131,12 @@ public class EntityTrackerEntry {
+                 double vec3d_dz = this.tracker.locZ() - 2.44140625E-4D*(this.zLoc);
+                 boolean flag1 = (vec3d_dx * vec3d_dx + vec3d_dy * vec3d_dy + vec3d_dz * vec3d_dz) >= 7.62939453125E-6D;
+                 // Paper end - reduce allocation of Vec3D here
 +                // Purpur start - fixes MC-4
 +                if (net.pl3x.purpur.PurpurConfig.fixItemPositionDesync && this.tracker instanceof EntityItem) {
 +                    Vec3D loc = PacketPlayOutEntity.decrypt(PacketPlayOutEntity.encrypt(tracker.locX()), PacketPlayOutEntity.encrypt(tracker.locY()), PacketPlayOutEntity.encrypt(tracker.locZ()));
diff --git a/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
index 069c37d99..23c0fc984 100644
--- a/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
+++ b/patches/server/0120-PaperPR-Per-World-Spawn-limits.patch
@@ -1,4 +1,4 @@
-From 50d9b3f7dccf2126aaf29dcfc4182ca41b939ada Mon Sep 17 00:00:00 2001
+From e20f17afdb64be8a7b94f2a8b4ff7de1bf76befc 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,10 +31,10 @@ index 7e7f10351..f2281d325 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 2e230d118..97c2994a9 100644
+index b32031815..bfd500587 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 {
+@@ -334,6 +334,13 @@ public class CraftWorld implements World {
          this.generator = gen;
  
          environment = env;
diff --git a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch
index 91329684b..2f1e2adca 100644
--- a/patches/server/0122-Tuinity-Delay-chunk-unloads.patch
+++ b/patches/server/0122-Tuinity-Delay-chunk-unloads.patch
@@ -1,4 +1,4 @@
-From 3755fa9ef7cb0798f63098b7cc08db5a4bac6b73 Mon Sep 17 00:00:00 2001
+From fb5246adbd39b33de4c97f8ab9ece717ac69b1cb 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
@@ -35,7 +35,7 @@ index 55f9f4e6e..ac21fdb4c 100644
          this.a(ChunkCoordIntPair.a, i, j, flag);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 942efe62f..6f710ffa2 100644
+index 716d4eab3..8eddb1fa1 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -30,7 +30,7 @@ public abstract class ChunkMapDistance {
@@ -46,7 +46,7 @@ index 942efe62f..6f710ffa2 100644
 +    private final ChunkMapDistance.a e = new ChunkMapDistance.a(); final ChunkMapDistance.a getTicketTracker() { return this.e; } // Purpur - OBFHELPER
      public static final int MOB_SPAWN_RANGE = 8; //private final ChunkMapDistance.b f = new ChunkMapDistance.b(8); // Paper - no longer used
      private final ChunkMapDistance.c g = new ChunkMapDistance.c(33);
-     private final java.util.Queue<PlayerChunk> pendingChunkUpdates = new java.util.LinkedList<>(); // PAIL pendingChunkUpdates // Paper - use a queue
+     private final java.util.Queue<PlayerChunk> pendingChunkUpdates = new java.util.ArrayDeque<>(); // PAIL pendingChunkUpdates // Paper - use a queue
 @@ -42,6 +42,46 @@ public abstract class ChunkMapDistance {
      private long currentTick;
  
@@ -209,10 +209,10 @@ index ab88636ca..becb13e0e 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6a50d7de3..513e84f76 100644
+index bfd500587..643080f6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -487,6 +487,7 @@ public class CraftWorld implements World {
+@@ -489,6 +489,7 @@ public class CraftWorld implements World {
          net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z); // Paper
          if (chunk != null) {
              world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
diff --git a/patches/server/0123-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
index 612558aeb..bd38cf02f 100644
--- a/patches/server/0123-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 bdbadad11796ee8102d30ca98c237914c56dd2a8 Mon Sep 17 00:00:00 2001
+From 787d40c6eecd49aeeb2cb303ad38faccd1f2e4b3 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,10 +12,10 @@ 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 8aed5ff43..606e8dd97 100644
+index 3b9d27b6c..555374f13 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1102,7 +1102,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1106,7 +1106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      protected boolean canExecute(TickTask ticktask) {
diff --git a/patches/server/0124-YAPFA-Disable-mojang-profiler.patch b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
index aac95abe9..ca11471db 100644
--- a/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
+++ b/patches/server/0124-YAPFA-Disable-mojang-profiler.patch
@@ -1,4 +1,4 @@
-From 0ddd9826204572dc1bec0941dda0dcaaa41af7be Mon Sep 17 00:00:00 2001
+From 7f6f02a2a89bc1a6c3cd16cbdcb65871b5bda7f5 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 f0d72ea39..e38a68406 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 606e8dd97..616dcbf7f 100644
+index 555374f13..69b2eb0e0 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
@@ -55,7 +55,7 @@ index 606e8dd97..616dcbf7f 100644
      private ServerConnection serverConnection;
      public final WorldLoadListenerFactory worldLoadListenerFactory;
      private final ServerPing serverPing = new ServerPing();
-@@ -1456,6 +1456,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1460,6 +1460,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              String s1 = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              final DedicatedServer dedicatedserver = new DedicatedServer(optionset, dedicatedserversettings, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new, s1);
  
@@ -64,7 +64,7 @@ index 606e8dd97..616dcbf7f 100644
              /*
              dedicatedserver.i((String) optionset.valueOf(optionspec7));
              dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
-@@ -1881,6 +1883,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1885,6 +1887,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);