From 2ae3be3f5ce0eeb4a962c066d2b2876448bee560 Mon Sep 17 00:00:00 2001 From: granny Date: Sun, 14 May 2023 03:17:11 -0700 Subject: [PATCH] use component directly for player list name fixes #1316 --- patches/server/0004-Purpur-config-files.patch | 4 ++-- patches/server/0012-AFK-API.patch | 10 +++++----- patches/server/0014-Configurable-server-mod-name.patch | 6 +++--- patches/server/0064-Add-ping-command.patch | 6 +++--- patches/server/0065-Add-demo-command.patch | 6 +++--- patches/server/0066-Add-credits-command.patch | 6 +++--- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index c5837c0e7..9a783a592 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -179,17 +179,17 @@ index c103f10dbb6c06e14bb7b5df73a797f456803301..c5f208dbeb55627bc2917314cc8a0da2 .withRequiredArg() diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..43884d28fe27962a5ca895315849318975cb3011 +index 0000000000000000000000000000000000000000..9fe1cdafdafc3f718ef4eb4fd4150971e2832738 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -0,0 +1,175 @@ +package org.purpurmc.purpur; + -+import co.aikar.timings.TimingsManager; +import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableMap; +import com.mojang.datafixers.util.Pair; +import net.kyori.adventure.bossbar.BossBar; ++import net.kyori.adventure.text.minimessage.MiniMessage; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch index 21c3de0dc..e24bf2797 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-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 055915f609d1181bbcfa2ce72e1282ace71cb45c..e16e2c7c802c387cc278542d6f013fc7441063e1 100644 +index 055915f609d1181bbcfa2ce72e1282ace71cb45c..4e68585de7601f87297977c426a8f4621c8c0860 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2071,8 +2071,63 @@ public class ServerPlayer extends Player { @@ -44,7 +44,7 @@ index 055915f609d1181bbcfa2ce72e1282ace71cb45c..e16e2c7c802c387cc278542d6f013fc7 + + if (this.level.purpurConfig.idleTimeoutUpdateTabList) { + String scoreboardName = getScoreboardName(); -+ String playerListName = getBukkitEntity().getPlayerListName(); ++ String playerListName = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().serialize(getBukkitEntity().playerListName()); + 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, ""); @@ -260,7 +260,7 @@ index 9986b89ceabc065d96c889bf9a50a4aa093e7300..2506882191e83a3cc03666a56e63c18f // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 6b0e6f3c93092dcabe53048a9260941c095ef996..66892e16e6c5cd505422e685045f243606aecdb0 100644 +index e6a720f25266d793bec5f644dadacbf45aef23f5..594d041c63f86dbafca756f6f7012b9ab5e385ef 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -174,8 +174,16 @@ public class PurpurConfig { @@ -275,8 +275,8 @@ index 6b0e6f3c93092dcabe53048a9260941c095ef996..66892e16e6c5cd505422e685045f2436 cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob); + afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway); + afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack); -+ afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix); -+ afkTabListSuffix = getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix); ++ afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix))); ++ afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix))); } public static int barrelRows = 3; diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch index 007f2f13e..14a9d3744 100644 --- a/patches/server/0014-Configurable-server-mod-name.patch +++ b/patches/server/0014-Configurable-server-mod-name.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a6e6dff37efd7b54a3f17c22ba4b45436bc8884d..d728e115c57ecf26c960e5130135c8875007dd48 100644 +index 7f37231b33d6cfbd3d10c6c5d0b3e0b96ba0ceb3..57f6de7872bfa80cf7668524975946cbd7fcda56 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1685,7 +1685,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop