diff --git a/gradle.properties b/gradle.properties
index f1d9d38aa..c7a39b662 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = ce059b4f993faf1327f5acb6745e469215009808
+paperCommit = 6f5e6c60d397058d89892862bd194773d1695315
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0004-Purpur-client-support.patch b/patches/server/0004-Purpur-client-support.patch
index 1a3559f2a..e0a481ba7 100644
--- a/patches/server/0004-Purpur-client-support.patch
+++ b/patches/server/0004-Purpur-client-support.patch
@@ -17,7 +17,7 @@ index 22452aa7eefa350c3b0d0d19a23c76c8ec811de3..ddf4345c48b9033f96ba237fc5c33857
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 93eb94fc3b1dd35efecc4615bd4f1b0b8361be2d..a133fd75ee9dc007d1c380771a0f7d5a1f714dcf 100644
+index cc6ba95f01b82c42b4e5a0a70721ef00dd335e57..590099657a83bb0bbeeb3273040672486eaec8a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3178,6 +3178,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,10 +43,10 @@ index 93eb94fc3b1dd35efecc4615bd4f1b0b8361be2d..a133fd75ee9dc007d1c380771a0f7d5a
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1a1fa6595c5adf074ac6caed831bf885a5345937..c0eb31d6d8d78d97655c23925b2e1c573c9ca216 100644
+index 7e7b3692b5b7168f6122ae10fbb1772369f922fd..c0c2ac8bbeb4fc33fc62955de838cf67d9827022 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2789,4 +2789,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2791,4 +2791,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch
index 520722d55..00c423ea7 100644
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -68,7 +68,7 @@ index 38995873e2b4cf9e7ac83d074c817a0452948250..38c2e2b4e6577dd6db84b86147a6f0c5
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 142437f0224e186dd74500ac88d5c1d147db3e71..4cfa7f9480339d1d3e3e024c6afe258dfcec31ea 100644
+index a2c349175ddcbec725073d746f55fc7f3d83216f..1d61e34b1cc032089dbd715814553e59ebc8ce5c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -292,6 +292,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -213,7 +213,7 @@ index 1f4b72a0aca200b2e0860449c718e6e607d2fc47..e1dd8932594780b07db13f68efa117eb
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c0eb31d6d8d78d97655c23925b2e1c573c9ca216..75a38684e790a1d551d0b694a0b2aa8545a10f74 100644
+index c0c2ac8bbeb4fc33fc62955de838cf67d9827022..e9c3768ef277fc88db4d5660e241ec7ef8e770c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -445,10 +445,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index c0eb31d6d8d78d97655c23925b2e1c573c9ca216..75a38684e790a1d551d0b694a0b2aa85
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2795,5 +2800,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2797,5 +2802,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -305,7 +305,7 @@ index c38d9583d8ce50670d78b60d92c90d1d5eb4bbfc..01a2d17790b3adbc63fe742b9e5c11dd
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 59a6cb575e40465275184cb816c862c79995c729..2e8a395fb6792c1f7595177e8503d27211f4ae96 100644
+index 9bccf9ae5f7a38eb5792697700f6d17cd5969cbe..06467a5af27a9afeba383c4f9704f5106827af97 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -203,6 +203,7 @@ public class ActivationRange
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch
index afb28032d..760d0b976 100644
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -82,7 +82,7 @@ index 38c2e2b4e6577dd6db84b86147a6f0c5bd0b8879..c03f9ed7dfb53041d37de950b2ec734b
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4cfa7f9480339d1d3e3e024c6afe258dfcec31ea..3518e5748e6f380eb53abc29a9483f58278c44ec 100644
+index 1d61e34b1cc032089dbd715814553e59ebc8ce5c..763874b78363d75f8c386cff3cf48c93920957d1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1983,12 +1983,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -121,10 +121,10 @@ index e4e0db7d94ab7c86f3bdd8be17f85d6ea403b313..b9438bfd5f0949995d64e7c2ca0acd43
          return entityplayer1;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 75a38684e790a1d551d0b694a0b2aa8545a10f74..d5c3f212b78fcd453ec268a2f85bc7e8e2de1a56 100644
+index e9c3768ef277fc88db4d5660e241ec7ef8e770c4..4f007dce3f4f7cf19d8e38b46435c762813c6c43 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2817,5 +2817,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 056d8b837..7c870b177 100644
--- a/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,10 +46,10 @@ index 24934362a424365c0c17ad15cb70288cc0f07fe4..441599f0078f99498aa409d500518366
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d5c3f212b78fcd453ec268a2f85bc7e8e2de1a56..744e2805ce0bc0126af8fcaabaa78e0c9cb1e186 100644
+index 4f007dce3f4f7cf19d8e38b46435c762813c6c43..0b73c96483ec6e901c913641835c38a9546dc3b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1729,7 +1729,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1731,7 +1731,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
index 2d40883d6..e1279b2a3 100644
--- a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
@@ -93,10 +93,10 @@ index 318456621faf484dbad479b2873ae647e0c0f037..83c8889137e566322ec4337b0e6d8b94
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 744e2805ce0bc0126af8fcaabaa78e0c9cb1e186..e7ca83bdc9114e9084b2155e52b5c737ea07d553 100644
+index 0b73c96483ec6e901c913641835c38a9546dc3b0..4eef838dd00d69bb27d5ffff8ad5e04a0dfff4f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1146,6 +1146,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1148,6 +1148,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {
diff --git a/patches/server/0192-Flying-Fall-Damage-API.patch b/patches/server/0192-Flying-Fall-Damage-API.patch
index 40822c4f3..4a0f3bb1e 100644
--- a/patches/server/0192-Flying-Fall-Damage-API.patch
+++ b/patches/server/0192-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index b83695996d966310a2fe687baeaed66019754998..eda18bda0b8332c5b1d9c260e748cca8
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e7ca83bdc9114e9084b2155e52b5c737ea07d553..da8c68927a190bc9ad4aac01737d78bcdaad38da 100644
+index 4eef838dd00d69bb27d5ffff8ad5e04a0dfff4f5..ec26e4266377160b89182967c276152d7610e10c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2840,5 +2840,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2842,5 +2842,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }
diff --git a/patches/server/0227-Extended-OfflinePlayer-API.patch b/patches/server/0227-Extended-OfflinePlayer-API.patch
index c019478c9..cc2b3ea87 100644
--- a/patches/server/0227-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0227-Extended-OfflinePlayer-API.patch
@@ -223,10 +223,10 @@ index 1f2bc88d4570c6ef00e67a772b745e0b0c98e051..f505e871a9836503377f168c31c1f09f
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index da8c68927a190bc9ad4aac01737d78bcdaad38da..db1d1ab8382cd4c2e4c1969b1e7d8faf422b7925 100644
+index ec26e4266377160b89182967c276152d7610e10c..eb5b230aef06e4df57bf92d5a1f771725f6d3a08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2103,6 +2103,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2105,6 +2105,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }