diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index 168b94fcb..fc10e0771 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e49561c8b 100644
+index d35eee8011e0c1a8b2885054597cfd88b1192795..bbb02e62fe7ea9a96929563fc4ab6e82f4f35974 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2022,8 +2022,58 @@ public class ServerPlayer extends Player {
+@@ -2022,8 +2022,63 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
@@ -26,7 +26,7 @@ index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e
 +
 +        String msg = afk ? org.purpurmc.purpur.PurpurConfig.afkBroadcastAway : org.purpurmc.purpur.PurpurConfig.afkBroadcastBack;
 +
-+        org.purpurmc.purpur.event.PlayerAFKEvent event = new org.purpurmc.purpur.event.PlayerAFKEvent(this.getBukkitEntity(), afk, level.purpurConfig.idleTimeoutKick, msg, !Bukkit.isPrimaryThread());
++        org.purpurmc.purpur.event.PlayerAFKEvent event = new org.purpurmc.purpur.event.PlayerAFKEvent(this.getBukkitEntity(), afk, this.level.purpurConfig.idleTimeoutKick, msg, !Bukkit.isPrimaryThread());
 +        if (!event.callEvent() || event.shouldKick()) {
 +            return;
 +        }
@@ -42,15 +42,20 @@ index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e
 +            server.getPlayerList().broadcastMiniMessage(String.format(msg, this.getGameProfile().getName()), false);
 +        }
 +
-+        if (level.purpurConfig.idleTimeoutUpdateTabList) {
++        if (this.level.purpurConfig.idleTimeoutUpdateTabList) {
++            String scoreboardName = getScoreboardName();
++            String playerListName = getBukkitEntity().getPlayerListName();
++            String[] split = playerListName.split(scoreboardName);
++            String prefix = (split.length > 0 ? split[0] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix, "");
++            String suffix = (split.length > 1 ? split[1] : "").replace(org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, "");
 +            if (afk) {
-+                getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + getScoreboardName() + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true);
++                getBukkitEntity().setPlayerListName(org.purpurmc.purpur.PurpurConfig.afkTabListPrefix + suffix + scoreboardName + prefix + org.purpurmc.purpur.PurpurConfig.afkTabListSuffix, true);
 +            } else {
-+                getBukkitEntity().setPlayerListName(getScoreboardName());
++                getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix);
 +            }
 +        }
 +
-+        ((ServerLevel) level).updateSleepingPlayerList();
++        ((ServerLevel) this.level).updateSleepingPlayerList();
 +    }
 +
 +    @Override
diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch
index 963e5d49c..f18331d79 100644
--- a/patches/server/0019-Player-invulnerabilities.patch
+++ b/patches/server/0019-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e00aa16f51ec065cdce13dff0926d87e49561c8b..1e50d6abb4ff9337ea3266b131d63a37ffea36c2 100644
+index bbb02e62fe7ea9a96929563fc4ab6e82f4f35974..b7ed9c751b260289e40358a23f5731310db0c52c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -62,7 +62,7 @@ index e00aa16f51ec065cdce13dff0926d87e49561c8b..1e50d6abb4ff9337ea3266b131d63a37
          this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
      }
  
-@@ -2533,9 +2543,17 @@ public class ServerPlayer extends Player {
+@@ -2538,9 +2548,17 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
diff --git a/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index ceb6e9e86..0ad334e2e 100644
--- a/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0078-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index fae43130665255e1b264adc58efeb2a6508efdaa..cb10a4f78f462a60ce356732878b9f98cf841ef4 100644
+index a78a1568cfc75fcaf4bbb29e9e3fd60829c6c71d..a4b33e2ee40270f86a0eb5d5ba9387a64efa117a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2602,4 +2602,26 @@ public class ServerPlayer extends Player {
+@@ -2607,4 +2607,26 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
diff --git a/patches/server/0124-Implement-TPSBar.patch b/patches/server/0124-Implement-TPSBar.patch
index 065b1ff32..38af73399 100644
--- a/patches/server/0124-Implement-TPSBar.patch
+++ b/patches/server/0124-Implement-TPSBar.patch
@@ -17,7 +17,7 @@ index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9b3717176ecb40f4c76a5191956f7d378f3f1478..e03ce4bf00505f886e2b07c5b1e77214f7ba789d 100644
+index a1f830b27137f660fd2f0d95eb4b6692ecb56943..d4785d3001ad652f8c01bd0e2f71fe7b4de1661f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1022,6 +1022,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 24b7ae3253b0710954d4a522114fc0617c0ef3b3..d24216e1d9dcf8e9b68aabd622881a00
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 691ee44d766fee9d47daea138d4589b11d0778cc..02b4c685562c125185387d3842fd0f837a04b020 100644
+index 8a41c02d645e7d527cc8f25377a756293c5b8436..0f14419dea999f0872224f33208fa89337d066b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 691ee44d766fee9d47daea138d4589b11d0778cc..02b4c685562c125185387d3842fd0f83
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2632,5 +2635,13 @@ public class ServerPlayer extends Player {
+@@ -2637,5 +2640,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
          }
      }
diff --git a/patches/server/0209-Add-compass-command.patch b/patches/server/0209-Add-compass-command.patch
index 442b9f7a2..8df25c55a 100644
--- a/patches/server/0209-Add-compass-command.patch
+++ b/patches/server/0209-Add-compass-command.patch
@@ -17,7 +17,7 @@ index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 81f7653c098b6964daff37b7e0482964c3d301a0..30b10c9e034a4f683d0aaabfbe8a4aa07c5f2b77 100644
+index 867373e090865e7de5ece1580e4a99c93dc97c96..0cb1f2e14672eaec16f0334b6a0cd98d3d892d53 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 81f7653c098b6964daff37b7e0482964c3d301a0..30b10c9e034a4f683d0aaabfbe8a4aa0
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2645,5 +2648,13 @@ public class ServerPlayer extends Player {
+@@ -2650,5 +2653,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
@@ -89,7 +89,7 @@ index 695e6376fcf3306be49e593126576c1773b5792e..bf3bbe2d26f5ce6e6b00b36d9ea269df
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0fe874bb1eb3bd3eb644602416153b39a5dd5c0c..700c40fd0ba469ba034153f422ad179ece61e330 100644
+index 6aac1632f81aa06912efcb51822881905a13554f..1564055a9b829928cb9f32bd6fc04df41c6c25be 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -223,6 +223,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0298-Implement-ram-and-rambar-commands.patch b/patches/server/0298-Implement-ram-and-rambar-commands.patch
index 5771355f5..230c8a78d 100644
--- a/patches/server/0298-Implement-ram-and-rambar-commands.patch
+++ b/patches/server/0298-Implement-ram-and-rambar-commands.patch
@@ -18,7 +18,7 @@ index eb4dac2239592d680ef31edf47f1ab660299762d..1b956c3f50750a00eaf7851112004115
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index d4bebb739d8ff19a610be6775ee25ede4bce2a8c..2fb0398fa693a0ce0d298c15426d4b592e69195e 100644
+index 72d75313d41aea81ae4c60e2539abf39e650d372..09801f15b0110503cd7487b5fd3c4b3dffb37cb8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index d4bebb739d8ff19a610be6775ee25ede4bce2a8c..2fb0398fa693a0ce0d298c15426d4b59
          nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
          nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
      }
-@@ -2642,6 +2645,14 @@ public class ServerPlayer extends Player {
+@@ -2647,6 +2650,14 @@ public class ServerPlayer extends Player {
          }
      }