From 226468f7b0021f0d042b8121d5022ba7e2cba721 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 23 Jul 2022 02:56:50 +0100
Subject: [PATCH] Cache Component MOTDs

---
 .../Add-tick-times-API-and-mspt-command.patch |  2 +-
 patches/server/Adventure.patch                | 33 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/patches/server/Add-tick-times-API-and-mspt-command.patch b/patches/server/Add-tick-times-API-and-mspt-command.patch
index 32ff23e3fd..b7a5954c3d 100644
--- a/patches/server/Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/Add-tick-times-API-and-mspt-command.patch
@@ -129,7 +129,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     private String motd;
+     @Nullable private net.kyori.adventure.text.Component cachedMotd; // Paper
      private int playerIdleTimeout;
      public final long[] tickTimes;
 +    // Paper start
diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index 99b4450290..c5fed05b0d 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -1367,6 +1367,37 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          buf.writeComponent(this.header);
          buf.writeComponent(this.footer);
      }
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     private boolean allowFlight;
+     @Nullable
+     private String motd;
++    @Nullable private net.kyori.adventure.text.Component cachedMotd; // Paper
+     private int playerIdleTimeout;
+     public final long[] tickTimes;
+     @Nullable
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         return this.motd;
+     }
+ 
++    public net.kyori.adventure.text.Component getComponentMotd() {
++        net.kyori.adventure.text.Component component = cachedMotd;
++        if (this.motd != null && this.cachedMotd == null) {
++            component = cachedMotd = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.motd);
++        }
++
++        return component != null ? component : net.kyori.adventure.text.Component.empty();
++    }
++
+     public void setMotd(String motd) {
+         this.motd = motd;
++        this.cachedMotd = null; // Paper
+     }
+ 
+     public boolean previewsChat() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1958,7 +1989,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper start
 +    @Override
 +    public net.kyori.adventure.text.Component motd() {
-+        return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(console.getMotd());
++        return console.getComponentMotd();
 +    }
 +    // Paper end
      @Override