Update default book configs to match 1.13.2

1 files changed, 12 insertions, 6 deletions

diff --git a/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch b/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch
index ae33a8278d..9245ba9782 100644
--- a/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch
+++ b/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch
@@ -1,28 +1,34 @@
-From 797d58776f9e4c4bc6e59a4d78d540d7fb069402 Mon Sep 17 00:00:00 2001
+From cb5abe5576e8400081e6a1a552178d3f14bf7604 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 17 Nov 2018 00:08:54 -0500
 Subject: [PATCH] Limit Book Sizes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 332e90f86..0ac61f4de 100644
+index 332e90f8..27203eea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -320,4 +320,12 @@ public class PaperConfig {
+@@ -320,4 +320,18 @@ public class PaperConfig {
          tabSpamIncrement = getInt("settings.spam-limiter.tab-spam-increment", tabSpamIncrement);
          tabSpamLimit = getInt("settings.spam-limiter.tab-spam-limit", tabSpamLimit);
      }
 +
 +
-+    public static int maxBookPageSize = 1024;
-+    public static double maxBookTotalSizeMultiplier = 0.90D;
++    public static int maxBookPageSize = 2560;
++    public static double maxBookTotalSizeMultiplier = 0.98D;
 +    private static void maxBookSize() {
 +        maxBookPageSize = getInt("settings.book-size.page-max", maxBookPageSize);
 +        maxBookTotalSizeMultiplier = getDouble("settings.book-size.total-multiplier", maxBookTotalSizeMultiplier);
++        if (maxBookPageSize == 1024 && maxBookTotalSizeMultiplier == 0.90D) {
++            config.set("settings.book-size.page-max", 2560);
++            config.set("settings.book-size.total-multiplier", 0.98D);
++            maxBookPageSize = 2560;
++            maxBookTotalSizeMultiplier = 0.98D;
++        }
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d6d2010d5..de62c3b76 100644
+index d6d2010d..de62c3b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2329,6 +2329,45 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {