From ef776287cb839714260f13d427214e313c56558e Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Thu, 8 Jun 2023 07:56:25 +1000
Subject: [PATCH] SPIGOT-7371: Fix editing signs with API

By: md_5 <git@md-5.net>
---
 .../java/org/bukkit/craftbukkit/block/CraftSign.java |  4 ++--
 .../bukkit/craftbukkit/block/sign/CraftSignSide.java | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
index d22ef80c8..581ecce8f 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
@@ -87,8 +87,8 @@ public class CraftSign<T extends TileEntitySign> extends CraftBlockEntityState<T
 
     @Override
     public void applyTo(T sign) {
-        front.applyLegacyStringToSignSide();
-        back.applyLegacyStringToSignSide();
+        getSnapshot().setText(front.applyLegacyStringToSignSide(), true);
+        getSnapshot().setText(back.applyLegacyStringToSignSide(), false);
 
         super.applyTo(sign);
     }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java
index 0bae2463e..4a6d7a14d 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/sign/CraftSignSide.java
@@ -15,7 +15,7 @@ public class CraftSignSide implements SignSide {
     // Lazily initialized only if requested:
     private String[] originalLines = null;
     private String[] lines = null;
-    private final SignText signText;
+    private SignText signText;
 
     public CraftSignSide(SignText signText) {
         this.signText = signText;
@@ -53,7 +53,7 @@ public class CraftSignSide implements SignSide {
 
     @Override
     public void setGlowingText(boolean glowing) {
-        signText.setHasGlowingText(glowing);
+        signText = signText.setHasGlowingText(glowing);
     }
 
     @Nullable
@@ -64,18 +64,20 @@ public class CraftSignSide implements SignSide {
 
     @Override
     public void setColor(@NotNull DyeColor color) {
-        signText.setColor(EnumColor.byId(color.getWoolData()));
+        signText = signText.setColor(EnumColor.byId(color.getWoolData()));
     }
 
-    public void applyLegacyStringToSignSide() {
+    public SignText applyLegacyStringToSignSide() {
         if (lines != null) {
             for (int i = 0; i < lines.length; i++) {
                 String line = (lines[i] == null) ? "" : lines[i];
                 if (line.equals(originalLines[i])) {
                     continue; // The line contents are still the same, skip.
                 }
-                signText.setMessage(i, CraftChatMessage.fromString(line)[0]);
+                signText = signText.setMessage(i, CraftChatMessage.fromString(line)[0]);
             }
         }
+
+        return signText;
     }
 }