Rebasefix-book-page-serialization

3 files changed, 17 insertions, 21 deletions

diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch
index ca455ce7c4..2c625b3d58 100644
--- a/patches/server/0008-CB-fixes.patch
+++ b/patches/server/0008-CB-fixes.patch
@@ -98,25 +98,6 @@ index 1e3ca7ca98abfd5be233a7eeb6dad201776d2d6a..9ec50bbb262b25fea157ae48e8395f5c
                  this.acceptsAll(Main.asList("nogui"), "Disables the graphical console");
  
                  this.acceptsAll(Main.asList("nojline"), "Disables jline and emulates the vanilla console");
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
-index 9c57b883783145ad4483481a2c2e7f0f188cd174..4ffcdff978bb68e74bf19f43433204e9ca3cd2d6 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
-@@ -358,7 +358,13 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
-         }
- 
-         if (this.pages != null) {
--            builder.put(CraftMetaBookSigned.BOOK_PAGES.BUKKIT, ImmutableList.copyOf(this.pages));
-+            // Paper start - deserialization expects json
-+            List<String> jsonPages = new ArrayList<>();
-+            for (final Component page : this.pages) {
-+                jsonPages.add(CraftChatMessage.toJSON(page));
-+            }
-+            builder.put(CraftMetaBookSigned.BOOK_PAGES.BUKKIT, ImmutableList.copyOf(jsonPages));
-+            // Paper end - deserialization expects json
-         }
- 
-         if (this.resolved) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
 index 6b34a8d33faa49ffa9082995e67af10d3cb38c03..f0c817e27a602740bc979b2ebaec3917e1906d74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 4ab78bf77c..f83b3b6f40 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -5013,7 +5013,7 @@ index 2e6f0a0f4bbe4ae3c7c85e679f6187e89d1298ff..c7360e2b2d6e50abc371c21b09cdadd6
          super.serialize(builder);
  
          if (this.hasTitle()) {
-@@ -465,4 +465,113 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
+@@ -459,4 +459,113 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/1042-General-ItemMeta-fixes.patch b/patches/server/1042-General-ItemMeta-fixes.patch
index 08ad9d86b0..a91feb64de 100644
--- a/patches/server/1042-General-ItemMeta-fixes.patch
+++ b/patches/server/1042-General-ItemMeta-fixes.patch
@@ -156,7 +156,7 @@ index 12911233c01d0ac1af9adbd157d56d28361fc76f..99ee41e79891d6017f065492efab5af9
  
      private static Material shieldToBannerHack() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
-index 3f78a0935d738854182254b345064e3c225dcd5f..1d63632372eb8b078bbbba6f9e583eb93c902746 100644
+index 3f78a0935d738854182254b345064e3c225dcd5f..218df87c596d47b431dbbf2aa42822ef174f948f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
 @@ -116,8 +116,8 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
@@ -179,6 +179,21 @@ index 3f78a0935d738854182254b345064e3c225dcd5f..1d63632372eb8b078bbbba6f9e583eb9
          }
      }
  
+@@ -358,7 +358,13 @@ public class CraftMetaBookSigned extends CraftMetaItem implements BookMeta {
+         }
+ 
+         if (this.pages != null) {
+-            builder.put(CraftMetaBookSigned.BOOK_PAGES.BUKKIT, ImmutableList.copyOf(this.pages));
++            // Paper start - deserialization expects json
++            final List<String> jsonPages = new ArrayList<>(this.pages.size());
++            for (final Component page : this.pages) {
++                jsonPages.add(CraftChatMessage.toJSON(page));
++            }
++            builder.put(CraftMetaBookSigned.BOOK_PAGES.BUKKIT, ImmutableList.copyOf(jsonPages));
++            // Paper end - deserialization expects json
+         }
+ 
+         if (this.resolved) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
 index 8e0dd4b7a7a25a8beb27b507047bc48d8227627c..cf5d27ccc2225bac3aa57912f444f95d2f37e32e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java