From f91e6a83f9dd9b1063da16f0dc4abb8c846db943 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Sun, 24 Sep 2023 12:02:31 +0900
Subject: [PATCH] Fix sign nbt on 1.20 client (#3436)

---
 .../protocol1_20to1_19_4/packets/InventoryPackets.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
index 2becdc7dd..c12f15040 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20to1_19_4/packets/InventoryPackets.java
@@ -172,17 +172,19 @@ public final class InventoryPackets extends ItemRewriter<ClientboundPackets1_19_
 
         final ListTag messages = new ListTag(StringTag.class);
         for (int i = 1; i < 5; i++) {
-            final Tag text = tag.get("Text" + i);
+            final Tag text = tag.remove("Text" + i);
             messages.add(text != null ? text : new StringTag(ChatRewriter.emptyComponentString()));
         }
         frontText.put("messages", messages);
 
         final ListTag filteredMessages = new ListTag(StringTag.class);
         for (int i = 1; i < 5; i++) {
-            final Tag text = tag.get("FilteredText" + i);
-            filteredMessages.add(text != null ? text : new StringTag(ChatRewriter.emptyComponentString()));
+            final Tag text = tag.remove("FilteredText" + i);
+            filteredMessages.add(text != null ? text : messages.get(i - 1));
+        }
+        if (!filteredMessages.equals(messages)) {
+            frontText.put("filtered_messages", filteredMessages);
         }
-        frontText.put("filtered_messages", filteredMessages);
 
         final Tag color = tag.remove("Color");
         if (color != null) {