Minor changes to book-related patches (#200)

The maximum title length was changed from 32 to 16 (16 is the vanilla limit, it was previously incorrect), an unnecessary patch was dropped, and some minor changes
hpfxd · Jun 23, 2024 · e155e2e · e155e2e
1 parent 323dd56
commit e155e2e
Show file tree

Hide file tree

Showing 41 changed files with 33 additions and 49 deletions.
diff --git a/...0061-Add-Player-sendEquipmentChange.patch → ...0060-Add-Player-sendEquipmentChange.patch b/...0061-Add-Player-sendEquipmentChange.patch → ...0060-Add-Player-sendEquipmentChange.patch
diff --git a/patches/server/0060-Allow-disabling-component-selector-resolving-in-book.patch b/patches/server/0060-Allow-disabling-component-selector-resolving-in-book.patch
diff --git a/...rver/0062-Cache-chunk-coordinations.patch → ...rver/0061-Cache-chunk-coordinations.patch b/...rver/0062-Cache-chunk-coordinations.patch → ...rver/0061-Cache-chunk-coordinations.patch
diff --git a/...-Client-Side-Unloading-of-Chunk-0-0.patch → ...-Client-Side-Unloading-of-Chunk-0-0.patch b/...-Client-Side-Unloading-of-Chunk-0-0.patch → ...-Client-Side-Unloading-of-Chunk-0-0.patch
diff --git a/...428-Better-handling-of-some-ItemMet.patch → ...428-Better-handling-of-some-ItemMet.patch b/...428-Better-handling-of-some-ItemMet.patch → ...428-Better-handling-of-some-ItemMet.patch
diff --git a/...-Experience-should-save-as-Integers.patch → ...-Experience-should-save-as-Integers.patch b/...-Experience-should-save-as-Integers.patch → ...-Experience-should-save-as-Integers.patch
diff --git a/...0066-Fix-issue-with-ProtocolSupport.patch → ...0065-Fix-issue-with-ProtocolSupport.patch b/...0066-Fix-issue-with-ProtocolSupport.patch → ...0065-Fix-issue-with-ProtocolSupport.patch
diff --git a/...ion-for-logging-player-ip-addresses.patch → ...ion-for-logging-player-ip-addresses.patch b/...ion-for-logging-player-ip-addresses.patch → ...ion-for-logging-player-ip-addresses.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Add config option for logging player ip addresses
 
 
 diff --git a/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java b/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java
-index 8d071fdd1ae8aaa97003f0b56d7e206e6dd4b44f..ae3cdaca275b1a50c5c37c3dd0021c4bd579d373 100644
+index fcf7738c75f21ad23693d903b476c65b4a207a84..1d8e4d1050ebafef8784920481621965fd5c212f 100644
 --- a/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java
 +++ b/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java
-@@ -121,4 +121,8 @@ public class PandaSpigotConfig {
+@@ -119,4 +119,8 @@ public class PandaSpigotConfig {
+         "https://docs.papermc.io/paper/reference/paper-global-configuration#packet-limiter\n" +
+         "(note that \"max-packet-rate\" is renamed to \"maxPacketRate\")")
      public PacketLimiterConfig packetLimiter = PacketLimiterConfig.createDefault();
-
-     public boolean resolveSelectorsInBooks = true;
 +
 +    @Comment("Whether player IP addresses should be logged by the server. This does not impact\n" +
 +        "the ability of plugins to log the IP addresses of players.")

diff --git a/...leteEvent-and-AsyncTabCompleteEvent.patch → ...leteEvent-and-AsyncTabCompleteEvent.patch b/...leteEvent-and-AsyncTabCompleteEvent.patch → ...leteEvent-and-AsyncTabCompleteEvent.patch
diff --git a/...es/server/0069-Fix-setFlying-Toggle.patch → ...es/server/0068-Fix-setFlying-Toggle.patch b/...es/server/0069-Fix-setFlying-Toggle.patch → ...es/server/0068-Fix-setFlying-Toggle.patch
diff --git a/...70-Fix-AIOOBE-in-inventory-handling.patch → ...69-Fix-AIOOBE-in-inventory-handling.patch b/...70-Fix-AIOOBE-in-inventory-handling.patch → ...69-Fix-AIOOBE-in-inventory-handling.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 15f7c315df23eac08e12ce752b1b1bb23fd25aba..557bb0d99b227ed0a70b1855f9ddab88f94dc134 100644
+index 977675f6155a1ccb1d9cdfdcb48a9f922805df9a..1f80521c97fd7b0ef263b9e17cb79bcc51db0433 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1600,7 +1600,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList

diff --git a/...-Cache-block-break-animation-packet.patch → ...-Cache-block-break-animation-packet.patch b/...-Cache-block-break-animation-packet.patch → ...-Cache-block-break-animation-packet.patch
diff --git a/...g-entity-tracker-if-server-is-empty.patch → ...g-entity-tracker-if-server-is-empty.patch b/...g-entity-tracker-if-server-is-empty.patch → ...g-entity-tracker-if-server-is-empty.patch
diff --git a/.../server/0073-Add-World-Util-Methods.patch → .../server/0072-Add-World-Util-Methods.patch b/.../server/0073-Add-World-Util-Methods.patch → .../server/0072-Add-World-Util-Methods.patch
@@ -20,7 +20,7 @@ index 03fe76355813497a5db33ad185db0e4b40c6f85a..df28cca6175ff3ddf4992c44a0760ef1
          int j = blockposition.getX() & 15;
          int k = blockposition.getY();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b75d78da71f24a0b02bf709d026389add0556489..56d9a764bbf521f512e959efaa864c445a198917 100644
+index 084f107bf019b0f2e00d17a470632780db490abc..a429dc5e950a31557d444d0a50ed71d13f13d555 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -93,7 +93,7 @@ public abstract class World implements IBlockAccess {

diff --git a/...74-Optimize-light-level-comparisons.patch → ...73-Optimize-light-level-comparisons.patch b/...74-Optimize-light-level-comparisons.patch → ...73-Optimize-light-level-comparisons.patch
diff --git a/...d-loading-chunks-in-multiple-places.patch → ...d-loading-chunks-in-multiple-places.patch b/...d-loading-chunks-in-multiple-places.patch → ...d-loading-chunks-in-multiple-places.patch
diff --git a/...6-Use-less-resources-for-collisions.patch → ...5-Use-less-resources-for-collisions.patch b/...6-Use-less-resources-for-collisions.patch → ...5-Use-less-resources-for-collisions.patch
@@ -42,7 +42,7 @@ index 58e485c2e5845dda15c33ee1beb170860535f88b..854cf888d64e50bfd85420bb5dcc9386
                          try {
                              iblockdata.getBlock().a(this.world, blockposition2, iblockdata, this);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 870e4f920fc336e38f331699eb0d8d91c43112d8..ad5db898164f575b37fdc9c8800660eded6dc45c 100644
+index 46ebdb5e22592658cbd8172390b52edac5344e0f..ba185d2ef2b7970f566aa9c5980dad1e6c80e6f0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -296,8 +296,13 @@ public abstract class World implements IBlockAccess {

diff --git a/...Use-LinkedHashMap-for-GameRules-map.patch → ...Use-LinkedHashMap-for-GameRules-map.patch b/...Use-LinkedHashMap-for-GameRules-map.patch → ...Use-LinkedHashMap-for-GameRules-map.patch
diff --git a/...8-Fix-MC-117075-TE-Unload-Lag-Spike.patch → ...7-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/...8-Fix-MC-117075-TE-Unload-Lag-Spike.patch → ...7-Fix-MC-117075-TE-Unload-Lag-Spike.patch
diff --git a/...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch → ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch → ...ix-Bugs-with-Spigot-Mob-Spawn-Logic.patch
diff --git a/...t-entity-and-falling-block-movement.patch → ...t-entity-and-falling-block-movement.patch b/...t-entity-and-falling-block-movement.patch → ...t-entity-and-falling-block-movement.patch
diff --git a/...Optimize-Captured-TileEntity-Lookup.patch → ...Optimize-Captured-TileEntity-Lookup.patch b/...Optimize-Captured-TileEntity-Lookup.patch → ...Optimize-Captured-TileEntity-Lookup.patch
diff --git a/...option-to-load-extra-plugin-jars-no.patch → ...option-to-load-extra-plugin-jars-no.patch b/...option-to-load-extra-plugin-jars-no.patch → ...option-to-load-extra-plugin-jars-no.patch
diff --git a/...es/server/0083-Reduce-Chunk-Hashing.patch → ...es/server/0082-Reduce-Chunk-Hashing.patch b/...es/server/0083-Reduce-Chunk-Hashing.patch → ...es/server/0082-Reduce-Chunk-Hashing.patch
diff --git a/...ver/0084-Book-security-improvements.patch → ...ver/0083-Book-security-improvements.patch b/...ver/0084-Book-security-improvements.patch → ...ver/0083-Book-security-improvements.patch
@@ -3,8 +3,9 @@ From: uRyanxD <familiarodrigues123ro@gmail.com>
 Date: Fri, 9 Dec 2022 13:17:43 -0300
 Subject: [PATCH] Book security improvements
 
-Co-authored-by: RoccoDev
 Co-authored-by: bob7l
+Co-authored-by: RoccoDev <hey@rocco.dev>
+Co-authored-by: xism4 <soportexism4@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 index ad33280bb8baab581a4ac17b5fe78022134c676b..a6480484f2c2f55e6cb4ef682c99f56d46980a0e 100644
@@ -20,7 +21,7 @@ index ad33280bb8baab581a4ac17b5fe78022134c676b..a6480484f2c2f55e6cb4ef682c99f56d
      }
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 14afdc7cbb88150f4711811a06fa149c36cec8b9..3904c77141ec3b778dc6cc2fd256961b7598ab31 100644
+index 1f80521c97fd7b0ef263b9e17cb79bcc51db0433..f5ef763b8783a6a275b5d4311d368bed25e3b878 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -111,6 +111,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -60,10 +61,10 @@ index 14afdc7cbb88150f4711811a06fa149c36cec8b9..3904c77141ec3b778dc6cc2fd256961b
 
              try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa475f03a97c 100644
+index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..44b3c3ac151fecebd41b43b7bb6708cb8508dc50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -33,8 +33,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -33,8 +33,12 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
      static final ItemMetaKey BOOK_PAGES = new ItemMetaKey("pages");
      static final ItemMetaKey RESOLVED = new ItemMetaKey("resolved");
      static final ItemMetaKey GENERATION = new ItemMetaKey("generation");
@@ -72,12 +73,13 @@ index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa47
 +    // PandaSpigot start - Add security limits to books
 +    static final int MAX_PAGES = 50;
 +    static final int MAX_PAGE_LENGTH = 256;
-+    static final int MAX_TITLE_LENGTH = 32;
++    static final int MAX_TITLE_LENGTH = 16;
++    static final int MAX_AUTHOR_LENGHT = 16;
 +    // PandaSpigot end
 
      protected String title;
      protected String author;
-@@ -61,11 +64,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -61,11 +65,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          super(tag);
 
          if (tag.hasKey(BOOK_TITLE.NBT)) {
@@ -87,11 +89,11 @@ index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa47
 
          if (tag.hasKey(BOOK_AUTHOR.NBT)) {
 -            this.author = limit( tag.getString(BOOK_AUTHOR.NBT), 1024 ); // Spigot
-+            this.author = limit( tag.getString(BOOK_AUTHOR.NBT), 16 ); // Spigot // PandaSpigot
++            this.author = limit( tag.getString(BOOK_AUTHOR.NBT), MAX_AUTHOR_LENGHT ); // Spigot // PandaSpigot
          }
 
          boolean resolved = false;
-@@ -80,7 +83,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -80,7 +84,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          if (tag.hasKey(BOOK_PAGES.NBT) && handlePages) {
              NBTTagList pages = tag.getList(BOOK_PAGES.NBT, 8);
 
@@ -100,7 +102,7 @@ index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa47
                  String page = pages.getString(i);
                  if (resolved) {
                      try {
-@@ -90,7 +93,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -90,7 +94,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
                          // Ignore and treat as an old book
                      }
                  }
@@ -109,7 +111,7 @@ index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa47
              }
          }
      }
-@@ -104,7 +107,9 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -104,7 +108,9 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
 
          Iterable<?> pages = SerializableMeta.getObject(Iterable.class, map, BOOK_PAGES.BUKKIT, true);
          if(pages != null) {
@@ -119,3 +121,15 @@ index 0b5ada0118f521eaca65b0fd67ebf232fa183b1a..8f46643ddcd0365c842384268a92aa47
                  if (page instanceof String) {
                      addPage((String) page);
                  }
+@@ -188,7 +194,10 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+             this.title = null;
+             return true;
+         } else if (title.length() > MAX_TITLE_LENGTH) {
+-            return false;
++            // PandaSpigot start
++            this.title = title.substring(0, MAX_TITLE_LENGTH);
++            return true;
++            // PandaSpigot end
+         }
+
+         this.title = title;
diff --git a/...0085-Implement-SpawnerPreSpawnEvent.patch → ...0084-Implement-SpawnerPreSpawnEvent.patch b/...0085-Implement-SpawnerPreSpawnEvent.patch → ...0084-Implement-SpawnerPreSpawnEvent.patch
diff --git a/...ver/0086-Remove-DataWatcher-Locking.patch → ...ver/0085-Remove-DataWatcher-Locking.patch b/...ver/0086-Remove-DataWatcher-Locking.patch → ...ver/0085-Remove-DataWatcher-Locking.patch
diff --git a/.../0087-Optimize-Light-Recalculations.patch → .../0086-Optimize-Light-Recalculations.patch b/.../0087-Optimize-Light-Recalculations.patch → .../0086-Optimize-Light-Recalculations.patch
diff --git a/...s/server/0088-Optimize-armor-stands.patch → ...s/server/0087-Optimize-armor-stands.patch b/...s/server/0088-Optimize-armor-stands.patch → ...s/server/0087-Optimize-armor-stands.patch
diff --git a/...-Looking-up-same-chunk-twice-in-EAR.patch → ...-Looking-up-same-chunk-twice-in-EAR.patch b/...-Looking-up-same-chunk-twice-in-EAR.patch → ...-Looking-up-same-chunk-twice-in-EAR.patch
diff --git a/...s/server/0090-Backport-ArrowDMG-fix.patch → ...s/server/0089-Backport-ArrowDMG-fix.patch b/...s/server/0090-Backport-ArrowDMG-fix.patch → ...s/server/0089-Backport-ArrowDMG-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Backport ArrowDMG fix
 Upstream commit: PaperMC/Paper@bb397ba74c034ffe5ae164d774a043cb7bca0472
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index cd95aa17291d31e3cebe9f6488a43923a18facba..94d8f2ffe938bd2d57d0297f9efc43ee55da3ba9 100644
+index e8a20bc5b66b4777c1d5de1f0a036db85407766b..62e38bf1c0d0fc878768ac00fa3c56ac7fe5101d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1300,13 +1300,26 @@ public abstract class EntityLiving extends Entity {

diff --git a/...ver/0091-Random-arrow-damage-toggle.patch → ...ver/0090-Random-arrow-damage-toggle.patch b/...ver/0091-Random-arrow-damage-toggle.patch → ...ver/0090-Random-arrow-damage-toggle.patch
diff --git a/...erver/0092-Disable-Vanilla-Chunk-GC.patch → ...erver/0091-Disable-Vanilla-Chunk-GC.patch b/...erver/0092-Disable-Vanilla-Chunk-GC.patch → ...erver/0091-Disable-Vanilla-Chunk-GC.patch
diff --git a/...e-player-info-update-packet-on-join.patch → ...e-player-info-update-packet-on-join.patch b/...e-player-info-update-packet-on-join.patch → ...e-player-info-update-packet-on-join.patch
diff --git a/...Optimize-heavy-Nether-Portal-search.patch → ...Optimize-heavy-Nether-Portal-search.patch b/...Optimize-heavy-Nether-Portal-search.patch → ...Optimize-heavy-Nether-Portal-search.patch
diff --git a/.../server/0095-Fix-Paper-hopper-patch.patch → .../server/0094-Fix-Paper-hopper-patch.patch b/.../server/0095-Fix-Paper-hopper-patch.patch → .../server/0094-Fix-Paper-hopper-patch.patch
diff --git a/...er/0096-Fix-Paper-height-nerf-patch.patch → ...er/0095-Fix-Paper-height-nerf-patch.patch b/...er/0096-Fix-Paper-height-nerf-patch.patch → ...er/0095-Fix-Paper-height-nerf-patch.patch
diff --git a/...erver/0097-Add-SLF4J-implementation.patch → ...erver/0096-Add-SLF4J-implementation.patch b/...erver/0097-Add-SLF4J-implementation.patch → ...erver/0096-Add-SLF4J-implementation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add SLF4J implementation
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 70bfa464fad7080ab5bb60ad2a16aabfc9e039bd..8b91873dbe8355a32351e9939404b390eb05dd64 100644
+index bce6429d64fe4dcf10e8fa507f4792b3037acce3..012ab25b96fde290063444b6dfc246d0bda45ea5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -24,6 +24,7 @@ dependencies {

diff --git a/...0098-Add-PrePlayerAttackEntityEvent.patch → ...0097-Add-PrePlayerAttackEntityEvent.patch b/...0098-Add-PrePlayerAttackEntityEvent.patch → ...0097-Add-PrePlayerAttackEntityEvent.patch
diff --git a/...099-Implement-EntityPickupItemEvent.patch → ...098-Implement-EntityPickupItemEvent.patch b/...099-Implement-EntityPickupItemEvent.patch → ...098-Implement-EntityPickupItemEvent.patch
diff --git a/...100-Add-Stricter-Client-Sign-limits.patch → ...099-Add-Stricter-Client-Sign-limits.patch b/...100-Add-Stricter-Client-Sign-limits.patch → ...099-Add-Stricter-Client-Sign-limits.patch