diff --git a/Paper b/Paper
index ede98b682..2b4ce0b37 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit ede98b68207868ada5ec7ef08fbdb8ef25b9981a
+Subproject commit 2b4ce0b370f2697616c4c73dbb42cd3d749b73c9
diff --git a/current-paper b/current-paper
index 672412443..f992ad2f9 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.1--d06dc961d894d612f5fb17ec1ef2410c4f7dcbbd
+1.16.1--7f4159415220d126a0e0a51239c5107356b8ba46
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index c27eb5099..fb6d121b2 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -3393,7 +3393,7 @@ index 87810f007a..8238306d9b 100644
  
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3130c68e73..d6b1cb8c48 100644
+index 0defaec8a8..0d29d88c2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -987,7 +987,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3523,7 +3523,7 @@ index 3130c68e73..d6b1cb8c48 100644
              return !this.canOversleep();
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
-@@ -1261,6 +1317,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1267,6 +1323,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
          // Paper end
  
@@ -3532,7 +3532,7 @@ index 3130c68e73..d6b1cb8c48 100644
          // Paper start
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
-@@ -1287,16 +1345,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1293,16 +1351,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      protected void b(BooleanSupplier booleansupplier) {
@@ -3552,7 +3552,7 @@ index 3130c68e73..d6b1cb8c48 100644
          this.methodProfiler.exitEnter("levels");
          Iterator iterator = this.getWorlds().iterator();
  
-@@ -1307,7 +1365,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1313,7 +1371,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              processQueue.remove().run();
          }
          MinecraftTimings.processQueueTimer.stopTiming(); // Spigot
@@ -3561,7 +3561,7 @@ index 3130c68e73..d6b1cb8c48 100644
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - optimize time updates
-@@ -1349,11 +1407,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1355,11 +1413,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.methodProfiler.enter("tick");
  
              try {
@@ -3576,7 +3576,7 @@ index 3130c68e73..d6b1cb8c48 100644
              } catch (Throwable throwable) {
                  // Spigot Start
                  CrashReport crashreport;
-@@ -1447,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1453,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index e0079b6b8..1c4ae39fd 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -99,10 +99,10 @@ index 74ed02fa92..c1280478ee 100644
                  .completer(new ConsoleCommandCompleter(this.server))
          );
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bb54a4aa71..0a7dd67516 100644
+index 0d29d88c2b..6aaf6dbced 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch
index af597193b..dc5bfa7df 100644
--- a/patches/server/0009-AFK-API.patch
+++ b/patches/server/0009-AFK-API.patch
@@ -37,10 +37,10 @@ index e411f6280d..7ac4ce116e 100644
          super(EntityTypes.PLAYER, world);
          this.bS = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e5a81f8318..ecd0cd7752 100644
+index c72cfd2bdf..d971f02354 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1753,8 +1753,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      public void resetIdleTimer() {
          this.ch = SystemUtils.getMonotonicMillis();
diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch
index 5fc037bed..1ab64a25d 100644
--- a/patches/server/0011-Configurable-server-mod-name.patch
+++ b/patches/server/0011-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0a7dd67516..99b6666a85 100644
+index 6aaf6dbced..ae45376a1a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1512,7 +1512,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0025-Player-invulnerabilities.patch b/patches/server/0025-Player-invulnerabilities.patch
index 69379debb..239e1efe1 100644
--- a/patches/server/0025-Player-invulnerabilities.patch
+++ b/patches/server/0025-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ecd0cd7752..2ff7e6e576 100644
+index d971f02354..aee6e73708 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -141,6 +141,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -142,6 +142,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.canPickUpLoot = true;
          this.maxHealthCache = this.getMaxHealth();
          this.cachedSingleMobDistanceMap = new com.destroystokyo.paper.util.PooledHashSets.PooledObjectLinkedOpenHashSet<>(this); // Paper
@@ -17,7 +17,7 @@ index ecd0cd7752..2ff7e6e576 100644
      }
      // Paper start
      public BlockPosition getPointInFront(double inFront) {
-@@ -801,6 +803,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -802,6 +804,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      }
  
@@ -30,7 +30,7 @@ index ecd0cd7752..2ff7e6e576 100644
      @Override
      public boolean damageEntity(DamageSource damagesource, float f) {
          if (this.isInvulnerable(damagesource)) {
-@@ -808,7 +816,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -809,7 +817,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          } else {
              boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
  
@@ -39,7 +39,7 @@ index ecd0cd7752..2ff7e6e576 100644
                  return false;
              } else {
                  if (damagesource instanceof EntityDamageSource) {
-@@ -1054,6 +1062,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1055,6 +1063,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
              this.world.getServer().getPluginManager().callEvent(changeEvent);
              // CraftBukkit end
@@ -47,7 +47,7 @@ index ecd0cd7752..2ff7e6e576 100644
              return this;
          }
      }
-@@ -2149,9 +2158,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -2150,9 +2159,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isFrozen() { // Paper - protected > public
@@ -79,10 +79,10 @@ index b28bdaabbe..9cbf3e63ea 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 9382e8f79e..7309d8be28 100644
+index 38d83bb318..69118d7d7c 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -890,6 +890,8 @@ public abstract class PlayerList {
+@@ -891,6 +891,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0056-Signs-allow-color-codes.patch b/patches/server/0056-Signs-allow-color-codes.patch
index 5f6babdd9..0e94e983f 100644
--- a/patches/server/0056-Signs-allow-color-codes.patch
+++ b/patches/server/0056-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2ff7e6e576..34e7415a8c 100644
+index aee6e73708..abb929e1bf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1270,6 +1270,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public void openSign(TileEntitySign tileentitysign) {
          tileentitysign.a((EntityHuman) this);
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
diff --git a/patches/server/0060-Players-should-not-cram-to-death.patch b/patches/server/0060-Players-should-not-cram-to-death.patch
index c4c44410a..f31f11d76 100644
--- a/patches/server/0060-Players-should-not-cram-to-death.patch
+++ b/patches/server/0060-Players-should-not-cram-to-death.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 3ccfc969f..4f8042a48 100644
+index abb929e1bf..6a8022f01a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1243,7 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1244,7 +1244,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public boolean isInvulnerable(DamageSource damagesource) {
diff --git a/patches/server/0067-Add-permission-for-F3-N-debug.patch b/patches/server/0067-Add-permission-for-F3-N-debug.patch
index e523a2a48..f2aaf225e 100644
--- a/patches/server/0067-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0067-Add-permission-for-F3-N-debug.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 42e7511e0..05d3edd09 100644
+index 69118d7d7c..0a7fa23c19 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1044,6 +1044,7 @@ public abstract class PlayerList {
+@@ -1045,6 +1045,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch
index 0184de8fd..33fa3046a 100644
--- a/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 145e0a716..9b69073f9 100644
+index 92b6c0dcd6..071d8f3b59 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1703,6 +1703,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -22,7 +22,7 @@ index 145e0a716..9b69073f9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7543f2cee..c3cde1568 100644
+index bc6ae2fb5d..c483dce432 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -35,7 +35,7 @@ index 7543f2cee..c3cde1568 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java
-index 3dd3b8913..99bae2dcb 100644
+index 3dd3b8913e..99bae2dcb7 100644
 --- a/src/main/java/net/minecraft/server/EntityBat.java
 +++ b/src/main/java/net/minecraft/server/EntityBat.java
 @@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient {
@@ -48,7 +48,7 @@ index 3dd3b8913..99bae2dcb 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index a20d6feb8..92c1d1794 100644
+index a20d6feb8c..92c1d1794a 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -104,7 +104,7 @@ public class EntityBoat extends Entity {
@@ -61,7 +61,7 @@ index a20d6feb8..92c1d1794 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index ee7a2fedd..c9ab80ccd 100644
+index ee7a2fedde..c9ab80ccd1 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -74,7 +74,7 @@ index ee7a2fedd..c9ab80ccd 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cb8aaceb1..e360844cc 100644
+index df214cc60a..e00c2c5c66 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2851,7 +2851,7 @@ public abstract class EntityLiving extends Entity {
@@ -98,7 +98,7 @@ index cb8aaceb1..e360844cc 100644
  
      // CraftBukkit start - collidable API
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index cdbe1a32e..c33b5c950 100644
+index cdbe1a32e0..c33b5c950d 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -108,7 +108,7 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -111,7 +111,7 @@ index cdbe1a32e..c33b5c950 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
-index 2172fcefb..7afdb3060 100644
+index 2172fcefbc..7afdb30603 100644
 --- a/src/main/java/net/minecraft/server/EntityParrot.java
 +++ b/src/main/java/net/minecraft/server/EntityParrot.java
 @@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird {
@@ -126,10 +126,10 @@ index 2172fcefb..7afdb3060 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f483076e1..ef6ac7929 100644
+index 6a8022f01a..ba8ce820fc 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1805,8 +1805,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1806,8 +1806,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      }
  
      @Override
@@ -141,7 +141,7 @@ index f483076e1..ef6ac7929 100644
      // Purpur end
  
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 9b4795f3b..192d9798c 100644
+index 9b4795f3bd..192d9798c4 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -45,11 +45,17 @@ public final class IEntitySelector {
@@ -164,7 +164,7 @@ index 9b4795f3b..192d9798c 100644
              } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) {
                  return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a9b1a130b..860e25dfd 100644
+index a9b1a130be..860e25dfd8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -114,6 +114,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0114-Fix-death-message-colors.patch b/patches/server/0114-Fix-death-message-colors.patch
index 4b08f808c..53ca108d3 100644
--- a/patches/server/0114-Fix-death-message-colors.patch
+++ b/patches/server/0114-Fix-death-message-colors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix death message colors
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5c74bbdc4e..e9a3dc4e27 100644
+index ba8ce820fc..0e192e2e5a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -662,7 +662,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -663,7 +663,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();