diff --git a/patches/server/0011-AFK-API.patch b/patches/server/0011-AFK-API.patch
index 10a5ba1cc..f6ac55c23 100644
--- a/patches/server/0011-AFK-API.patch
+++ b/patches/server/0011-AFK-API.patch
@@ -5,7 +5,7 @@ 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 4935937ec8da9979b64e1445f74c38cc5f49eec1..bfdb9e8f1a7e82f0022e050598fee4e51e1222c2 100644
+index 4935937ec8da9979b64e1445f74c38cc5f49eec1..7e94441f543c1961c298d1f8699fac16f11440eb 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1927,8 +1927,58 @@ public class ServerPlayer extends Player {
@@ -39,14 +39,14 @@ index 4935937ec8da9979b64e1445f74c38cc5f49eec1..bfdb9e8f1a7e82f0022e050598fee4e5
 +
 +        msg = event.getBroadcastMsg();
 +        if (msg != null && !msg.isEmpty()) {
-+            server.getPlayerList().sendMessage(org.bukkit.craftbukkit.util.CraftChatMessage.fromString(String.format(msg, this.getGameProfile().getName())));
++            server.getPlayerList().sendMessage(String.format(msg, this.getGameProfile().getName()));
 +        }
 +
 +        if (level.purpurConfig.idleTimeoutUpdateTabList) {
 +            if (afk) {
-+                getBukkitEntity().setPlayerListName(net.pl3x.purpur.PurpurConfig.afkTabListPrefix + getName().getString() + net.pl3x.purpur.PurpurConfig.afkTabListSuffix);
++                getBukkitEntity().setPlayerListName(net.pl3x.purpur.PurpurConfig.afkTabListPrefix + getScoreboardName() + net.pl3x.purpur.PurpurConfig.afkTabListSuffix, true);
 +            } else {
-+                getBukkitEntity().setPlayerListName(getName().getString());
++                getBukkitEntity().setPlayerListName(getScoreboardName());
 +            }
 +        }
 +
@@ -220,10 +220,27 @@ index 36cbaefea53a60c4a7176bf699c03e7cac338976..1b3ab9fd6a6d094d559e18a1d119e651
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1da5b6f73e78a697031f7662e68c546543fb9d1a..6b4f4c10254e2e9e39e237086a3c8cf929c02156 100644
+index 1da5b6f73e78a697031f7662e68c546543fb9d1a..3eeb138d060f86e0f928fc59234563528d83bf65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2529,4 +2529,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -423,10 +423,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+     @Override
+     public void setPlayerListName(String name) {
++        // Purpur start
++        setPlayerListName(name, false);
++    }
++    public void setPlayerListName(String name, boolean useMM) {
++        // Purpur end
+         if (name == null) {
+             name = getName();
+         }
+-        this.getHandle().listName = name.equals(getName()) ? null : CraftChatMessage.fromStringOrNull(name);
++        this.getHandle().listName = name.equals(getName()) ? null : useMM ? io.papermc.paper.adventure.PaperAdventure.asVanilla(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(name)) : CraftChatMessage.fromStringOrNull(name); // Purpur
+         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()));
+@@ -2529,4 +2534,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch
index df261db1f..5f46b3267 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 bfdb9e8f1a7e82f0022e050598fee4e51e1222c2..9149f496c163834bf0e9c40086ba3ee9d38177c2 100644
+index 7e94441f543c1961c298d1f8699fac16f11440eb..2b70903b618d00e711f2078fb7cdd92d0d749125 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -333,6 +333,7 @@ public class ServerPlayer extends Player {
@@ -110,10 +110,10 @@ index 1b3ab9fd6a6d094d559e18a1d119e651c411a11e..2d42f36e9f1ce6bf064588d84ed7ae52
  
      public boolean babiesAreRidable = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b4f4c10254e2e9e39e237086a3c8cf929c02156..a2b041d713e937b4b5e1e6c7c73be8ab32115120 100644
+index 3eeb138d060f86e0f928fc59234563528d83bf65..2e42abb396b84b9f6d42809086f5a513dbc9ef40 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2545,5 +2545,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2550,5 +2550,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 1a9853494..6af61631f 100644
--- a/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,10 +46,10 @@ index c92b57e7e5d1b31db8b7e75a9013df41eb2806c4..7d7e5b7508470c0570e7f0becd607a2c
  
      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 a2b041d713e937b4b5e1e6c7c73be8ab32115120..53d1eabf3e4490fb3f6eb1195c8ec584ceb50794 100644
+index 2e42abb396b84b9f6d42809086f5a513dbc9ef40..1ff393d62ae98de65b1cd963705c4e3897a34b5a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1558,7 +1558,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1563,7 +1563,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(Player player) {
diff --git a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch
index 6e6b35fa2..f75774c5a 100644
--- a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch
@@ -113,10 +113,10 @@ index edc08af4ec2ce6e90c30da286c0ba5ac16efd3fc..3a92c0112befe51e795f81b1fce52e1f
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 53d1eabf3e4490fb3f6eb1195c8ec584ceb50794..5e729ad8677b84be00895fb29a4e209248e3f55f 100644
+index 1ff393d62ae98de65b1cd963705c4e3897a34b5a..d7150eb5b7c51c3346ce9b5d143c744156a72117 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -997,6 +997,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1002,6 +1002,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {
diff --git a/patches/server/0213-Flying-Fall-Damage-API.patch b/patches/server/0213-Flying-Fall-Damage-API.patch
index bfe25d307..7b7dea663 100644
--- a/patches/server/0213-Flying-Fall-Damage-API.patch
+++ b/patches/server/0213-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index b9ce1021f12f14ba45c49890d8d529b733bae532..48e208c332a06c56fef604920a1cb95c
          } 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 5e729ad8677b84be00895fb29a4e209248e3f55f..432ac0aa33e3d69a9fb640ec5ecc9edae42ea8ab 100644
+index d7150eb5b7c51c3346ce9b5d143c744156a72117..667feff00111d7bc6b271c3692b8708c68aba811 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2570,5 +2570,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2575,5 +2575,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }