Skip to content

Commit 5d50eab

Browse files
committed
Fix minimessage MOTD support
1 parent 8093ffb commit 5d50eab

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

deepslateMC-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,19 @@
2828
if (this.hidesOnlinePlayers()) {
2929
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
3030
} else {
31-
@@ -2152,7 +_,18 @@
31+
@@ -2147,12 +_,29 @@
32+
33+
@Override
34+
public String getMotd() {
35+
- return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.motd); // Paper - Adventure
36+
+ // Deepslate start - MiniMessage MOTD
37+
+ if(de.pascalpex.deepslatemc.files.Config.getMinimessageMotd()) {
38+
+ return net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().serialize(this.motd);
39+
+ } else {
40+
+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.motd); // Paper - Adventure
41+
+ }
42+
+ // Deepslate end - MiniMessage MOTD
43+
}
3244

3345
public void setMotd(String motd) {
3446
// Paper start - Adventure
@@ -38,7 +50,7 @@
3850
+ try {
3951
+ this.motd = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserializeOr(motd, net.kyori.adventure.text.Component.empty());
4052
+ } catch (net.kyori.adventure.text.minimessage.internal.parser.ParsingExceptionImpl e) {
41-
+ org.bukkit.Bukkit.getLogger().warning("You have enabled DeepslateMC's miniMessageMotdSupport but your motd contains legacy color codes. Will fallback to legacy colors.");
53+
+ LOGGER.error("You have enabled DeepslateMC's miniMessageMotdSupport but your motd contains legacy color codes. Will fallback to legacy colors.");
4254
+ this.motd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserializeOr(motd, net.kyori.adventure.text.Component.empty());
4355
+ }
4456
+ } else {

0 commit comments

Comments
 (0)