Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
464394434 fix book page limit length (#4932)

patches/server/0001-Tuinity-Server-Changes.patch

@@ -11204,7 +11204,7 @@ index 6c399bcea03e839bf2f21e92b5d76d46b7088667..d3bf356ea768a32a5684eb851a2a0add
      }
      // Paper end - optimised tracker
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4d3a427b16e1e0d6889faf4b913b212f8a6e938d..acaaf78c13f379f9b076d615c8a77ebc4bc8d2be 100644
+index 73241af66256ef386790027fd6c7e0ca984524b4..37e9b8983fc310a04c98e27048b119439179cb5f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -419,7 +419,9 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0009-AFK-API.patch

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
      // Paper start
      public static final Predicate<Entity> affectsSpawning = (entity) -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index acaaf78c13f379f9b076d615c8a77ebc4bc8d2be..c709ff1b228008a45c789903a535a0c95f26948f 100644
+index 37e9b8983fc310a04c98e27048b119439179cb5f..d42dbc3b44f8b54b05f356155727f5a8f6a3e98e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0018-Player-invulnerabilities.patch

@@ -67,7 +67,7 @@ index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc572
      public Scoreboard getScoreboard() {
          return getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c709ff1b228008a45c789903a535a0c95f26948f..69feeaf08a37f30707aee19c955cd8ab0b3c3112 100644
+index d42dbc3b44f8b54b05f356155727f5a8f6a3e98e..cd562571ac6738fad39f585c1c046ee8e8c90f78 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1666,6 +1666,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0021-Alternative-Keepalive-Handling.patch

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 69feeaf08a37f30707aee19c955cd8ab0b3c3112..db0c2886be026d8a833736bec3396bc0019c16fd 100644
+index cd562571ac6738fad39f585c1c046ee8e8c90f78..a8908a46260e90c6366eb100688f15d831be1b4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0048-Signs-allow-color-codes.patch

@@ -17,7 +17,7 @@ index 5c4d9b1f4e926909439b9c290d7cc5726cb8822e..32d1ca467fd80de220c5bdefd23c1f84
          this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index db0c2886be026d8a833736bec3396bc0019c16fd..edac7a57c6c0612e87e836becbe59fc242e21b45 100644
+index a8908a46260e90c6366eb100688f15d831be1b4f..9679c53c9252502dab3e69eaf5c2be0c22943959 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2837,6 +2837,14 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0088-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index edac7a57c6c0612e87e836becbe59fc242e21b45..b74ca27ed9fe341b65443bdf954b6c1419c77dd4 100644
+index 9679c53c9252502dab3e69eaf5c2be0c22943959..781998b444a0687eab7593c2438ea060539e9f2b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1018,7 +1018,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0089-Entity-lifespan.patch

@@ -92,7 +92,7 @@ index 64ed97cdbddfb2b823e87392639f1d063016541a..9c7d2d312549548003f2b6c534cc7a68
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b74ca27ed9fe341b65443bdf954b6c1419c77dd4..c3fb79195021452c0e2ab41b56e67dc5b37f53be 100644
+index 781998b444a0687eab7593c2438ea060539e9f2b..0ff4e1b7ba891a2c740136a962098c9c68410ab9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2229,6 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0099-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c3fb79195021452c0e2ab41b56e67dc5b37f53be..ef8cf33431994dfee767514a20ecaceeda9854f9 100644
+index 0ff4e1b7ba891a2c740136a962098c9c68410ab9..8bcf0b7dd90087c86f0b4a81b31f4942c5653dbc 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1988,7 +1988,15 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0110-Ridables.patch

@@ -4973,7 +4973,7 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef8cf33431994dfee767514a20ecaceeda9854f9..f16109a08804e0942f2f41d9637bd9b88c1c8893 100644
+index 8bcf0b7dd90087c86f0b4a81b31f4942c5653dbc..3b32303b9e8c9c96938758c02ed72e3fea73a638 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2246,6 +2246,8 @@ public class PlayerConnection implements PacketListenerPlayIn {

patches/server/0164-PlayerBookTooLargeEvent.patch

@@ -5,15 +5,12 @@ Subject: [PATCH] PlayerBookTooLargeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f16109a08804e0942f2f41d9637bd9b88c1c8893..33327da588fec7c7458081d62ec6680d178c7dec 100644
+index 3b32303b9e8c9c96938758c02ed72e3fea73a638..d413f3f15de603a9755e5ed9b949edec09b7006d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -928,8 +928,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
+@@ -930,6 +930,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
-         ItemStack testStack = packetplayinbedit.getBook();
-         if (!server.isPrimaryThread() && !testStack.isEmpty() && testStack.getTag() != null) {
              NBTTagList pageList = testStack.getTag().getList("pages", 8);
--            if (pageList.size() > 50) {
+             if (pageList.size() > 100) {
-+            if (pageList.size() > 100) { // Purpur - java edition has 100 pages
                  PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
 +                net.pl3x.purpur.event.player.PlayerBookTooLargeEvent event = new net.pl3x.purpur.event.player.PlayerBookTooLargeEvent(player.getBukkitEntity(), testStack.asBukkitCopy()); if (event.shouldKickPlayer()) // Purpur
                  minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));