diff --git a/Paper b/Paper
index de5b093c0..979b53a7f 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit de5b093c05fb18d510ac8cb6635b7c3eec0b9f50
+Subproject commit 979b53a7f1aa8297ac6f5c3cddef15face705bed
diff --git a/current-paper b/current-paper
index 2663e4bf6..d92afb200 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.15.2--ed6d62ffb80483160c0dbb3463fa2048b5811ea5
+1.15.2--b82a7eef21ad09d8f4cfd2af15f456f80b761f64
diff --git a/patches/server/0007-Ridables.patch b/patches/server/0007-Ridables.patch
index 46b7f706c..2e17b66da 100644
--- a/patches/server/0007-Ridables.patch
+++ b/patches/server/0007-Ridables.patch
@@ -1,4 +1,4 @@
-From 7265c2942eaf49e272a1fcbd31cf6cce02ecff18 Mon Sep 17 00:00:00 2001
+From d7b3299a3aaf3ba71cbae864bab62d1edc2c450e 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
@@ -195,10 +195,10 @@ 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 8da54c68c..6e05cd094 100644
+index eb706f863..9c6a1f218 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -78,7 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -79,7 +79,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
      private CraftEntity bukkitEntity;
  
@@ -207,7 +207,7 @@ index 8da54c68c..6e05cd094 100644
      Throwable addedToWorldStack; // Paper - entity debug
      public CraftEntity getBukkitEntity() {
          if (bukkitEntity == null) {
-@@ -102,7 +102,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -103,7 +103,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;
@@ -216,7 +216,7 @@ index 8da54c68c..6e05cd094 100644
      @Nullable
      private Entity vehicle;
      public boolean attachedToPlayer;
-@@ -135,7 +135,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      public double E;
      public double F;
      public double G;
@@ -225,7 +225,7 @@ index 8da54c68c..6e05cd094 100644
      public boolean noclip;
      public float J;
      protected final Random random;
-@@ -179,7 +179,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -180,7 +180,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      private boolean aF;
      private final double[] aG;
      private long aH;
@@ -234,7 +234,7 @@ index 8da54c68c..6e05cd094 100644
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -815,6 +815,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -816,6 +816,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return vec3d1;
      }
  
@@ -242,7 +242,7 @@ index 8da54c68c..6e05cd094 100644
      public static double b(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1141,6 +1142,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1142,6 +1143,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return flag;
      }
  
@@ -250,7 +250,7 @@ index 8da54c68c..6e05cd094 100644
      private boolean l() {
          return this.world.getType(new BlockPosition(this)).getBlock() == Blocks.BUBBLE_COLUMN;
      }
-@@ -1154,8 +1156,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1155,8 +1157,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.isInWater() || this.isInRain() || this.l();
      }
  
@@ -261,7 +261,7 @@ index 8da54c68c..6e05cd094 100644
      }
  
      public boolean aA() {
-@@ -1286,6 +1289,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1287,6 +1290,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.inLava;
      }
  
@@ -269,7 +269,7 @@ index 8da54c68c..6e05cd094 100644
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2113,7 +2117,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2114,7 +2118,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              } else {
                  this.passengers.add(entity);
              }
@@ -284,7 +284,7 @@ index 8da54c68c..6e05cd094 100644
          }
          return true; // CraftBukkit
      }
-@@ -2148,6 +2158,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2149,6 +2159,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  return false;
              }
              // Spigot end
@@ -297,7 +297,7 @@ index 8da54c68c..6e05cd094 100644
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2316,6 +2332,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2317,6 +2333,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -305,7 +305,7 @@ index 8da54c68c..6e05cd094 100644
      public boolean bt() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2534,6 +2551,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2535,6 +2552,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -313,7 +313,7 @@ index 8da54c68c..6e05cd094 100644
      public void l(float f) {}
  
      public boolean bA() {
-@@ -3379,4 +3397,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3380,4 +3398,43 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
          void accept(Entity entity, double d0, double d1, double d2);
      }
@@ -462,7 +462,7 @@ index 34239160b..592408bac 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java
-index c7d79efdf..7e4aad771 100644
+index dd1d246ae..f0f83baac 100644
 --- a/src/main/java/net/minecraft/server/EntityBee.java
 +++ b/src/main/java/net/minecraft/server/EntityBee.java
 @@ -36,9 +36,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
@@ -550,7 +550,7 @@ index c7d79efdf..7e4aad771 100644
          this.targetSelector.a(1, (new EntityBee.h(this)).a(new Class[0]));
          this.targetSelector.a(2, new EntityBee.c(this));
      }
-@@ -588,6 +630,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -590,6 +632,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          private d() {
              super(); // CraftBukkit - decompile error
@@ -558,7 +558,7 @@ index c7d79efdf..7e4aad771 100644
          }
  
          @Override
-@@ -648,6 +691,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -652,6 +695,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          private g() {
              super(); // CraftBukkit - decompile error
@@ -566,7 +566,7 @@ index c7d79efdf..7e4aad771 100644
          }
  
          @Override
-@@ -712,6 +756,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -716,6 +760,7 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          private i() {
              super(); // CraftBukkit - decompile error
@@ -574,7 +574,7 @@ index c7d79efdf..7e4aad771 100644
          }
  
          @Override
-@@ -1230,4 +1275,67 @@ public class EntityBee extends EntityAnimal implements EntityBird {
+@@ -1234,4 +1279,67 @@ public class EntityBee extends EntityAnimal implements EntityBird {
  
          }
      }
@@ -3336,10 +3336,10 @@ 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 e7bfbc330..c64cc69f3 100644
+index e353d9336..f4fcefc68 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1286,6 +1286,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1291,6 +1291,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3347,7 +3347,7 @@ index e7bfbc330..c64cc69f3 100644
          if (this.isPassenger()) {
              if (f >= -1.0F && f <= 1.0F) {
                  this.aZ = f;
-@@ -1298,7 +1299,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1303,7 +1304,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.jumping = flag;
              this.setSneaking(flag1);
          }
diff --git a/patches/server/0014-Zombie-horse-naturally-spawn.patch b/patches/server/0014-Zombie-horse-naturally-spawn.patch
index ad829cf5a..55b632f11 100644
--- a/patches/server/0014-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0014-Zombie-horse-naturally-spawn.patch
@@ -1,4 +1,4 @@
-From 965318f23a523f848d1216d63c2680bb6580c655 Mon Sep 17 00:00:00 2001
+From e0c64e1eaaf7718ed96b38e3b83ecd196123069e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 7 Jul 2019 19:52:16 -0500
 Subject: [PATCH] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2de48e7537..0a8f6ae30f 100644
+index 941eee838..56d598186 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -560,12 +560,18 @@ public class WorldServer extends World {
+@@ -561,12 +561,18 @@ public class WorldServer extends World {
                  boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
@@ -38,7 +38,7 @@ index 2de48e7537..0a8f6ae30f 100644
  
                  this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 749fa33e55..1a8b8de8dd 100644
+index 749fa33e5..1a8b8de8d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -649,9 +649,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0019-Cows-eat-mushrooms.patch b/patches/server/0019-Cows-eat-mushrooms.patch
index 27561b6f1..c4bc2cc26 100644
--- a/patches/server/0019-Cows-eat-mushrooms.patch
+++ b/patches/server/0019-Cows-eat-mushrooms.patch
@@ -1,4 +1,4 @@
-From 87993a8d2eb4fc82971127f1252c7abebeff1ee4 Mon Sep 17 00:00:00 2001
+From 211d31fb2539ea85036df5882b037e5eb848db1f 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 6e05cd094..765da25e6 100644
+index 9c6a1f218..517a3abe8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1039,6 +1039,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1040,6 +1040,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -22,7 +22,7 @@ index 6e05cd094..765da25e6 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);
-@@ -2578,6 +2579,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2579,6 +2580,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
diff --git a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 3d73aab9e..3da85a890 100644
--- a/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0024-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -1,4 +1,4 @@
-From 4d4b7aeaac21cb69d8a5af476ca1f24f4d64be4e Mon Sep 17 00:00:00 2001
+From 43f02f8755a7d3a4203d31857f8ce9b2fea83c8b 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 765da25e6..ebb3d2055 100644
+index 517a3abe8..1c96e1b02 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1385,6 +1385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1386,6 +1386,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -36,7 +36,7 @@ index 765da25e6..ebb3d2055 100644
      public double h(Entity entity) {
          return this.c(entity.getPositionVector());
      }
-@@ -1908,14 +1909,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1909,14 +1910,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
diff --git a/patches/server/0033-Controllable-Minecarts.patch b/patches/server/0033-Controllable-Minecarts.patch
index 1f962bb2d..0e8eedc72 100644
--- a/patches/server/0033-Controllable-Minecarts.patch
+++ b/patches/server/0033-Controllable-Minecarts.patch
@@ -1,4 +1,4 @@
-From c2bf57f2035543b31164d4fd40b622a8cd1b1663 Mon Sep 17 00:00:00 2001
+From a98890923c56ac158742afa544cc5957a4194fad 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 ebb3d2055..44a7f2f60 100644
+index 1c96e1b02..2d793eb59 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1286,6 +1286,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1287,6 +1287,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.inLava = true;
      }
  
diff --git a/patches/server/0034-Signs-allow-color-codes.patch b/patches/server/0034-Signs-allow-color-codes.patch
index 645faf6dd..5b60bb561 100644
--- a/patches/server/0034-Signs-allow-color-codes.patch
+++ b/patches/server/0034-Signs-allow-color-codes.patch
@@ -1,4 +1,4 @@
-From 59a5bfd027b1573519cfc1be1242139806343d21 Mon Sep 17 00:00:00 2001
+From 3fe44c34e9c2f2a60eaba70bbda3dadd77495341 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,10 +11,10 @@ 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 c64cc69f3d..f9a574d115 100644
+index f4fcefc68..cc66f5e1a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1126,6 +1126,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1131,6 +1131,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
@@ -23,7 +23,7 @@ index c64cc69f3d..f9a574d115 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7929fcc800..895e34ed34 100644
+index 7929fcc80..895e34ed3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2580,6 +2580,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -42,7 +42,7 @@ index 7929fcc800..895e34ed34 100644
              }
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 099d98e04c..19d76c8cce 100644
+index 099d98e04..19d76c8cc 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -89,6 +89,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -67,7 +67,7 @@ index 099d98e04c..19d76c8cce 100644
      @Override
      public PacketPlayOutTileEntityData getUpdatePacket() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 086bd505cb..bf9093158b 100644
+index 086bd505c..bf9093158 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -76,8 +76,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0042-Implement-AFK-API.patch b/patches/server/0042-Implement-AFK-API.patch
index a188211bf..64ef973b8 100644
--- a/patches/server/0042-Implement-AFK-API.patch
+++ b/patches/server/0042-Implement-AFK-API.patch
@@ -1,4 +1,4 @@
-From 2b8669bfb0b78ce0cd452493fa5a1692735352e2 Mon Sep 17 00:00:00 2001
+From 727c23eccf5481c8061692feb5d3b804340c060b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -18,10 +18,10 @@ Subject: [PATCH] Implement AFK API
  11 files changed, 112 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 44a7f2f60..819054106 100644
+index 2d793eb59..c0e4c42f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1378,6 +1378,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1379,6 +1379,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return MathHelper.c(f * f + f1 * f1 + f2 * f2);
      }
  
@@ -50,10 +50,10 @@ index de22cad76..9d26bd1e4 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 f9a574d11..e4f948b8a 100644
+index cc66f5e1a..1f20b8969 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1617,8 +1617,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1622,8 +1622,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.cj = SystemUtils.getMonotonicMillis();
@@ -206,7 +206,7 @@ index 895e34ed3..f92516069 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 0a8f6ae30..18f6aedc9 100644
+index 56d598186..173bc91a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -383,7 +383,7 @@ public class WorldServer extends World {
@@ -218,7 +218,7 @@ index 0a8f6ae30..18f6aedc9 100644
          })) {
              // CraftBukkit start
              long l = this.worldData.getDayTime() + 24000L;
-@@ -688,7 +688,7 @@ public class WorldServer extends World {
+@@ -689,7 +689,7 @@ public class WorldServer extends World {
              while (iterator.hasNext()) {
                  EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
diff --git a/patches/server/0048-Players-should-not-cram-to-death.patch b/patches/server/0048-Players-should-not-cram-to-death.patch
index f1b45076c..3288c4042 100644
--- a/patches/server/0048-Players-should-not-cram-to-death.patch
+++ b/patches/server/0048-Players-should-not-cram-to-death.patch
@@ -1,4 +1,4 @@
-From f0535483f6f38c43d0935c869d511670516217f6 Mon Sep 17 00:00:00 2001
+From 0e94855b9937f4826ea40fbe796beacaa674771a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:01:46 -0500
 Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e4f948b8ae..d443df96e3 100644
+index 1f20b8969..c357d2231 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1100,7 +1100,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1105,7 +1105,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
diff --git a/patches/server/0049-Add-EntityPortalReadyEvent.patch b/patches/server/0049-Add-EntityPortalReadyEvent.patch
index 8a45f5409..b998ef823 100644
--- a/patches/server/0049-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0049-Add-EntityPortalReadyEvent.patch
@@ -1,4 +1,4 @@
-From fccd15c95e2e0e836a9b3520c728d9017c1e7df0 Mon Sep 17 00:00:00 2001
+From 37ed97b94d7947d693c771b1a3efe2b903e514df 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 819054106..39d84296f 100644
+index c0e4c42f1..da7cdacaa 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -168,9 +168,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -169,9 +169,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 819054106..39d84296f 100644
      private boolean invulnerable;
      protected UUID uniqueID;
      protected String am;
-@@ -2219,6 +2219,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2220,6 +2220,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 18f6aedc9..368b4ea3a 100644
+index 173bc91a9..a47ed872a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -65,7 +65,7 @@ public class WorldServer extends World {
diff --git a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
index de6beacc0..85e2107a8 100644
--- a/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0057-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -1,4 +1,4 @@
-From 171bfb411b7bef7d0f541501f8f68edab276c0bb Mon Sep 17 00:00:00 2001
+From ca05e5ba4f1143a8f4c6f622ec77948f3a7e3174 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 39d84296f..b1bae6a1a 100644
+index da7cdacaa..d0ff043ea 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1513,6 +1513,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1514,6 +1514,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean isCollidable() {
diff --git a/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
index 86b8c7f89..29f01200b 100644
--- a/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
+++ b/patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch
@@ -1,4 +1,4 @@
-From 7193c81c229027af648a966bacd0417dc092a88c Mon Sep 17 00:00:00 2001
+From ad09f029fe71871eeed9c1464aac4ec5b8e6ae1c 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
@@ -34,10 +34,10 @@ index 4349d22cc..eeff76ff4 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b1bae6a1a..e49881583 100644
+index d0ff043ea..4f9a780b8 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1530,6 +1530,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1531,6 +1531,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/patches/server/0100-Add-item-entity-options.patch b/patches/server/0100-Add-item-entity-options.patch
index c9cf20ca8..8b25ef29f 100644
--- a/patches/server/0100-Add-item-entity-options.patch
+++ b/patches/server/0100-Add-item-entity-options.patch
@@ -1,4 +1,4 @@
-From de0240ce96479fdf0f668694f99c536a68177985 Mon Sep 17 00:00:00 2001
+From d966a55aac457ad295e8535ac46cd8c3dd54d925 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 e49881583..2f1652005 100644
+index 4f9a780b8..fe9c72dd9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1261,6 +1261,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1262,6 +1262,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      }
  
diff --git a/patches/server/0102-Configurable-void-damage-height.patch b/patches/server/0102-Configurable-void-damage-height.patch
index 1e9f589bf..06025bd39 100644
--- a/patches/server/0102-Configurable-void-damage-height.patch
+++ b/patches/server/0102-Configurable-void-damage-height.patch
@@ -1,4 +1,4 @@
-From d1f04238a8f31d59b7ca1617200af06b47e23271 Mon Sep 17 00:00:00 2001
+From 3cbf50ee0737097f0090d1adcd5fcc6fd94e1922 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 2f1652005..0d47ca549 100644
+index fe9c72dd9..f5209ec92 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -452,7 +452,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -453,7 +453,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      // Paper start
      protected void performVoidDamage() {
diff --git a/patches/server/0103-Fix-the-dead-lagging-the-server.patch b/patches/server/0103-Fix-the-dead-lagging-the-server.patch
index 13f25751f..4d6023e8c 100644
--- a/patches/server/0103-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0103-Fix-the-dead-lagging-the-server.patch
@@ -1,4 +1,4 @@
-From f8dadd1fd11472e6be5ed6d5f6dc1115a7adafd7 Mon Sep 17 00:00:00 2001
+From eb48b2cb416c8d84156a17ac3851fc09273d42d4 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 0d47ca549..a26865601 100644
+index f5209ec92..ff0fd8c62 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1347,7 +1347,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1348,7 +1348,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;