diff --git a/gradle.properties b/gradle.properties
index dac8bfc83..64e510d06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.18.2-R0.1-SNAPSHOT
 mcVersion = 1.18.2
 packageVersion = 1_18_R1
 
-paperCommit = 178802ab94714d68c0833f53fbc9de0764ab0f8b
+paperCommit = c6ea84c7fae8d2974820333505a39c7b01c39b90
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0005-Component-related-conveniences.patch b/patches/server/0005-Component-related-conveniences.patch
index a57315145..fb41bf96f 100644
--- a/patches/server/0005-Component-related-conveniences.patch
+++ b/patches/server/0005-Component-related-conveniences.patch
@@ -36,10 +36,10 @@ index b3459253bddd74ecda2b534d4bd6877b079a467f..4da6ef8affbec3fe3311a5c6282daf7f
      public void displayClientMessage(Component message, boolean actionBar) {
          this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f5852341161b0d632e22af9b3e625ca1e786bd63..b66821b421372a503ae2a4963e67a53d9a0cc537 100644
+index 02dc93c394d37c9a84aa4a58d80615c403c54fb9..409598b0bf90b7faf84b3fcac52e15b0c32b789c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1377,6 +1377,62 @@ public abstract class PlayerList {
+@@ -1384,6 +1384,62 @@ public abstract class PlayerList {
      }
      // CraftBukkit end
  
diff --git a/patches/server/0009-Barrels-and-enderchests-6-rows.patch b/patches/server/0009-Barrels-and-enderchests-6-rows.patch
index 263281432..1fdf09a82 100644
--- a/patches/server/0009-Barrels-and-enderchests-6-rows.patch
+++ b/patches/server/0009-Barrels-and-enderchests-6-rows.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b66821b421372a503ae2a4963e67a53d9a0cc537..ecee40ef769ab9ef54cb41d8421855200dea7194 100644
+index 409598b0bf90b7faf84b3fcac52e15b0c32b789c..a2af387c671f344d1b302e5aceab0be42c80756f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1168,6 +1168,27 @@ public abstract class PlayerList {
+@@ -1175,6 +1175,27 @@ public abstract class PlayerList {
          player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
          this.server.getCommands().sendCommands(player);
          } // Paper
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch
index a6db8aa23..136e8030c 100644
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -108,10 +108,10 @@ index 1646852179a41da2380b0b67cbb183d287a07ebf..e755e0b0bb8191af917f4ec383d2aaf7
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ecee40ef769ab9ef54cb41d8421855200dea7194..bd89d47db5fc4a7f40ee6e79366fb6d83a797f56 100644
+index a2af387c671f344d1b302e5aceab0be42c80756f..6ad2ccf91a384bf431e3716d374f0eb45c6c0fe8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -997,6 +997,8 @@ public abstract class PlayerList {
+@@ -1004,6 +1004,8 @@ public abstract class PlayerList {
          }
          // Paper end
  
diff --git a/patches/server/0051-Add-permission-for-F3-N-debug.patch b/patches/server/0051-Add-permission-for-F3-N-debug.patch
index f15271e0a..5f0255dfc 100644
--- a/patches/server/0051-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0051-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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index aafc0d7275a8dc1df2c73974b9b77166d568cc85..9311a5fbaa17c9cd95940b4ddfea6fdb06f9d397 100644
+index 6ad2ccf91a384bf431e3716d374f0eb45c6c0fe8..fe5191550b0472a33122f3378142cdef83c89ce5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1162,6 +1162,7 @@ public abstract class PlayerList {
+@@ -1169,6 +1169,7 @@ public abstract class PlayerList {
              } else {
                  b0 = (byte) (24 + permissionLevel);
              }
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 ba36da2a5..e8a9b7cb2 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
@@ -6,10 +6,10 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index b69c05a7cddacfb791a4f46920677eae805ec42a..1d3692d8d533bb4c3ac18f8837aa44f8704c10be 100644
+index fe5191550b0472a33122f3378142cdef83c89ce5..4701f86c3ef5ccf0bc5e9a748f80d3aa703ccc3e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1011,22 +1011,22 @@ public abstract class PlayerList {
+@@ -1018,22 +1018,22 @@ public abstract class PlayerList {
      }
  
      public void tick() {
@@ -46,7 +46,7 @@ index b69c05a7cddacfb791a4f46920677eae805ec42a..1d3692d8d533bb4c3ac18f8837aa44f8
  
      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 b0459c6b416ad4aec90b4fa44c894f7c592690ca..e9ace0dd9aef27e28766baf6847d82eeafb04bbe 100644
+index ee935e3a3379f059031ded780ea59f2f8915c843..43a764402662169b0b099b795e30169e8d7950d4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1654,7 +1654,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0127-Implement-TPSBar.patch b/patches/server/0127-Implement-TPSBar.patch
index be07a86e8..1712eca00 100644
--- a/patches/server/0127-Implement-TPSBar.patch
+++ b/patches/server/0127-Implement-TPSBar.patch
@@ -17,7 +17,7 @@ index 362fd34016b83ba346a43abb6acf38d887918437..c137f5299e4a9e2f33aeef77818c62c3
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d3add7aab3127845c68b44a6443b5165cf074367..257226e9ac530482149058986bb81bd699b6a6ed 100644
+index d9b0c98fef7aa7cba549bc76b6340b1100dc545a..f61d0b666a6d8a4dd184303068755ea666307d17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1082,6 +1082,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -83,10 +83,10 @@ index 79066cbf1b5a35b75f0352f2df0fb0cd5c77a343..c5505098c6b75008736617f8d264a3e1
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 6e7aeddd827ce3ca0f6b2e4e04de41837b500374..c6a264b004d94d31d29827bd2b56c5a4952ba78a 100644
+index 4701f86c3ef5ccf0bc5e9a748f80d3aa703ccc3e..19abf99c384f50840a141de1b3f4d823ebd33f74 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -486,6 +486,7 @@ public abstract class PlayerList {
+@@ -493,6 +493,7 @@ public abstract class PlayerList {
              scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
          }
          // Paper end
@@ -94,7 +94,7 @@ index 6e7aeddd827ce3ca0f6b2e4e04de41837b500374..c6a264b004d94d31d29827bd2b56c5a4
          // CraftBukkit - Moved from above, added world
          PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
      }
-@@ -596,6 +597,8 @@ public abstract class PlayerList {
+@@ -603,6 +604,8 @@ public abstract class PlayerList {
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
          // Paper end
diff --git a/patches/server/0195-Allow-player-join-full-server-by-permission.patch b/patches/server/0195-Allow-player-join-full-server-by-permission.patch
index 8ff68abdd..d7e09f61b 100644
--- a/patches/server/0195-Allow-player-join-full-server-by-permission.patch
+++ b/patches/server/0195-Allow-player-join-full-server-by-permission.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a088205b5c56595e37ad2e725dcfe31849fe1d96..ebddd006afe4960ac90642d4683c5cc8ef0ac33e 100644
+index 19abf99c384f50840a141de1b3f4d823ebd33f74..111553443a7247db92b15819e9bbd717e4ace61b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -766,7 +766,7 @@ public abstract class PlayerList {
+@@ -773,7 +773,7 @@ public abstract class PlayerList {
              event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(chatmessage)); // Paper - Adventure
          } else {
              // return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? new ChatMessage("multiplayer.disconnect.server_full") : null;
diff --git a/patches/server/0272-Fix-paper-s-anti-xray.patch b/patches/server/0272-Fix-paper-s-anti-xray.patch
deleted file mode 100644
index f00ea0b9e..000000000
--- a/patches/server/0272-Fix-paper-s-anti-xray.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: BillyGalbreath <Blake.Galbreath@Gmail.com>
-Date: Tue, 1 Mar 2022 19:35:53 -0600
-Subject: [PATCH] Fix paper's anti-xray
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e149cca91f87645d1479156d0ff40b8b6527fefc..d363c3f6d4813effcc984fe13e563b6198458d65 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -499,6 +499,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-         this.dragonParts = new Int2ObjectOpenHashMap();
-         this.tickTime = flag1;
-         this.server = minecraftserver;
-+        this.chunkPacketBlockController = this.paperConfig.antiXray ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray // Purpur moved from Level.<init>  (until paper fixes this)
-         // Purpur start - enable/disable MobSpawners per world
-         this.customSpawners = Lists.newArrayList();
-         if (purpurConfig.phantomSpawning) {
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index bdd9282783382a2e6ad525ca27f1be88be4ca3c1..06b9b05b432809e64e41ca71516182e36248a7c7 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -162,7 +162,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-     public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
- 
-     public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
--    public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
-+    public com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray // Purpur - make non-final (until paper fixes this)
- 
-     public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
- 
-@@ -403,7 +403,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         this.keepSpawnInMemory = this.paperConfig.keepSpawnInMemory; // Paper
-         this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
-         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
--        this.chunkPacketBlockController = this.paperConfig.antiXray ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
-+        //this.chunkPacketBlockController = this.paperConfig.antiXray ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray // Purpur - moved to ServerLevel.<init>  (until paper fixes this)
-         this.entitySliceManager = new io.papermc.paper.world.EntitySliceManager((ServerLevel)this); // Paper
-     }
-