diff --git a/gradle.properties b/gradle.properties
index 11a56b81c..0e506efe4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=dev.folia
 version=1.21.1-R0.1-SNAPSHOT
 mcVersion=1.21.1
 
-paperRef=14a48cda408dc49db65b345b2e02cd71d9a7aae9
+paperRef=84281ceeefb9d294758a9a292ba6c01da40e8409
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/server/0003-Threaded-Regions.patch b/patches/server/0003-Threaded-Regions.patch
index a50a04107..9a151599c 100644
--- a/patches/server/0003-Threaded-Regions.patch
+++ b/patches/server/0003-Threaded-Regions.patch
@@ -13199,7 +13199,7 @@ index 653856d0b8dcf2baf4cc77a276f17c8cc1fa717e..3f5639f26f249ca10e03826231d087ab
              date1 = fallback;
          }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5e2c4969e77c669acbb4a13c07033cb267c3d586..444f363e577344e962ffc515f6a052e349a0466d 100644
+index b0e8fe11e7f5d1fd803fa34187c9fa77245ad79b..45830e2f6b2f745430cb38e86678d066101656e4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -134,10 +134,10 @@ public abstract class PlayerList {
@@ -17165,7 +17165,7 @@ index 1a4dc4b2561dbaf01246b4fb46266b1ac84008b8..345090afeab4f6396244c50bdbe83208
      default boolean hasChunksAt(int minX, int minZ, int maxX, int maxZ) {
          int i = SectionPos.blockToSectionCoord(minX);
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index e524b27d185da3e88668f8ef107517272860bd66..dd02f20e965e6e4aaaf5992ea3c4bb0b7f3cc270 100644
+index 743a33ae2814c513b84b1a60e50a3c24527568f8..1023b0d4f52a79bc4db27130d47b6c93b464794a 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -141,7 +141,7 @@ public final class NaturalSpawner {
@@ -20287,7 +20287,7 @@ index bf18f9ad7dec2b09ebfcb5ec6566f2556e842f22..2dddb661b29c1c3350bfbf71a0a1b961
          return this.handle;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index bf2d18f74b0f0da7c3c30310c74224a1c0853564..91c63c3dceddf09018d3651f4c11bf521eb53ecf 100644
+index c7efdd1483b309ed8121e2203216ab288daa3117..d12f9586602769bd0c692f1cf5820b008cb4bc51 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -52,7 +52,7 @@ public class ActivationRange
diff --git a/patches/server/0004-Max-pending-logins.patch b/patches/server/0004-Max-pending-logins.patch
index 6f0751f33..a142d0dfe 100644
--- a/patches/server/0004-Max-pending-logins.patch
+++ b/patches/server/0004-Max-pending-logins.patch
@@ -19,7 +19,7 @@ index 9451cccebf7acee3bd9f28f4f9d60412d1554ff4..8098b1a447a7c054e15edc09d2fa50e4
  
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 444f363e577344e962ffc515f6a052e349a0466d..7503afc82ec13a7f5732d32d70ce47900a747352 100644
+index 45830e2f6b2f745430cb38e86678d066101656e4..98064cb4c99929ed109dac928c302c87631ad539 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -175,6 +175,17 @@ public abstract class PlayerList {
diff --git a/patches/server/0016-Sync-vehicle-position-to-player-position-on-player-d.patch b/patches/server/0016-Sync-vehicle-position-to-player-position-on-player-d.patch
index 62bd7d8f1..485d2ece2 100644
--- a/patches/server/0016-Sync-vehicle-position-to-player-position-on-player-d.patch
+++ b/patches/server/0016-Sync-vehicle-position-to-player-position-on-player-d.patch
@@ -7,7 +7,7 @@ This allows the player to be re-positioned before logging into
 the world without causing thread checks to trip on Folia.
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 7503afc82ec13a7f5732d32d70ce47900a747352..77164bd5d562a72d5936dc84a41071472421eeb5 100644
+index 98064cb4c99929ed109dac928c302c87631ad539..20eeae6e968ecb5d67f16d0d2f56632e038a89b4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -516,7 +516,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0017-Region-profiler.patch b/patches/server/0017-Region-profiler.patch
index 629997712..ca4f4eb84 100644
--- a/patches/server/0017-Region-profiler.patch
+++ b/patches/server/0017-Region-profiler.patch
@@ -1785,7 +1785,7 @@ index f03f968d1526fbcff1ae87376370ba5976c2b807..90d78ddf8518c0df307cdaa8b7cfb554
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 77164bd5d562a72d5936dc84a41071472421eeb5..93ceea16e436e9227bc983417b258c307156198e 100644
+index 20eeae6e968ecb5d67f16d0d2f56632e038a89b4..9acb477df682a27b4340e4068d6b81df1925fc0b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1299,6 +1299,7 @@ public abstract class PlayerList {