diff --git a/Paper b/Paper
index 3148b25b1..6ada26a6d 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 3148b25b1c9e33b9818f0fb82a4967a67b428ac0
+Subproject commit 6ada26a6d01280f97724ebde3c1ce7025d9688e4
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index bd07ffd37..61999c57f 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -16738,10 +16738,10 @@ index 9f7d2ef932ab41cef5d3d0736d20a7c7e4a2c888..51e9c54cddf4b28ba3d3d892322c4877
          }
      }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 513c1041c34ebb3ac1775674a3f4526693759c08..4d310908489953d6d061b2358f614142edacb62e 100644
+index ae8903ee1decd22e2ad6138f29fbc757b807e0a7..58d01c6f8abcd9e1792495abd08b186f9d03f834 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -61,6 +61,84 @@ public class WatchdogThread extends Thread
+@@ -65,6 +65,84 @@ public class WatchdogThread extends Thread
          }
      }
  
@@ -16826,7 +16826,7 @@ index 513c1041c34ebb3ac1775674a3f4526693759c08..4d310908489953d6d061b2358f614142
      @Override
      public void run()
      {
-@@ -117,6 +195,7 @@ public class WatchdogThread extends Thread
+@@ -121,6 +199,7 @@ public class WatchdogThread extends Thread
                  log.log( Level.SEVERE, "------------------------------" );
                  log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
                  ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch
index d1191efa3..480fba387 100644
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -79,10 +79,10 @@ index d1d4f4baf33e6b2224116f22a63b6d218e26635b..07fcf1646a46b867ffb0e88746b4a781
          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 70f702680f8221cb262023814a7bae21b0074da6..0b453e9d1299cb48df6d3d70048907f628896753 100644
+index 4bc9b3b08b42becfd66f39cb0d639bdcae18d45c..d51650b3f7b14d0659cccb4acef969aa7a211200 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -905,6 +905,8 @@ public abstract class PlayerList {
+@@ -914,6 +914,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0057-Add-permission-for-F3-N-debug.patch b/patches/server/0057-Add-permission-for-F3-N-debug.patch
index 84e613f31..3144d5913 100644
--- a/patches/server/0057-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0057-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 0b453e9d1299cb48df6d3d70048907f628896753..7b385eb43e4cf565d500d0250f3c5e4dbebae986 100644
+index d51650b3f7b14d0659cccb4acef969aa7a211200..156c55666f6a9ba7108499f513d251aacbcd9fe8 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -1059,6 +1059,7 @@ public abstract class PlayerList {
+@@ -1068,6 +1068,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + i);
              }
diff --git a/patches/server/0154-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0154-Spread-out-and-optimise-player-list-ticks.patch
index ef2ed6b61..4e5352643 100644
--- a/patches/server/0154-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server/0154-Spread-out-and-optimise-player-list-ticks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spread out and optimise player list ticks
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7b385eb43e4cf565d500d0250f3c5e4dbebae986..f055fd0aff86d04677d0bd256c9e7c12f94bfbcc 100644
+index 156c55666f6a9ba7108499f513d251aacbcd9fe8..2f1a2fa1f80ed23c67db1d01023a04b5074d1654 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -71,7 +71,7 @@ public abstract class PlayerList {
@@ -17,7 +17,7 @@ index 7b385eb43e4cf565d500d0250f3c5e4dbebae986..f055fd0aff86d04677d0bd256c9e7c12
  
      // CraftBukkit start
      private CraftServer cserver;
-@@ -919,22 +919,23 @@ public abstract class PlayerList {
+@@ -928,22 +928,23 @@ public abstract class PlayerList {
      }
  
      public void tick() {
diff --git a/patches/server/0160-Implement-TPSBar.patch b/patches/server/0160-Implement-TPSBar.patch
index a59d34d6a..ae720f40d 100644
--- a/patches/server/0160-Implement-TPSBar.patch
+++ b/patches/server/0160-Implement-TPSBar.patch
@@ -37,7 +37,7 @@ index 22e84d2e08ad436c553dc7d99046adf9ee63e9f1..9399b3c1571dfbbc58476e3d92599f58
          this.isRestarting = isRestarting;
          if (flag) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f055fd0aff86d04677d0bd256c9e7c12f94bfbcc..d2a7fa1595ed4bc9fea0238af42f70889e07b262 100644
+index 2f1a2fa1f80ed23c67db1d01023a04b5074d1654..ebbbd6f86cd08d84c37c8550eda1b805fe966bc3 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -513,6 +513,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0172-Fix-villager-boat-exploit.patch b/patches/server/0172-Fix-villager-boat-exploit.patch
deleted file mode 100644
index bf8afe233..000000000
--- a/patches/server/0172-Fix-villager-boat-exploit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: jmp <jasonpenilla2@me.com>
-Date: Mon, 11 Jan 2021 12:43:51 -0800
-Subject: [PATCH] Fix villager boat exploit
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index d2a7fa1595ed4bc9fea0238af42f70889e07b262..46e1723f4042d3fef5bc73552d496968a532342c 100644
---- a/src/main/java/net/minecraft/server/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -542,6 +542,15 @@ public abstract class PlayerList {
- 
-                 for (Iterator iterator = entity.getAllPassengers().iterator(); iterator.hasNext(); entity1.dead = true) {
-                     entity1 = (Entity) iterator.next();
-+                    // Purpur start
-+                    if (entity1 instanceof EntityVillagerAbstract) {
-+                        final EntityVillagerAbstract villager = (EntityVillagerAbstract) entity1;
-+                        final EntityHuman human = villager.getTrader();
-+                        if (human != null) {
-+                            villager.setTradingPlayer(null);
-+                        }
-+                    }
-+                    // Purpur end
-                     worldserver.removeEntity(entity1);
-                 }
-