diff --git a/patches/server/0061-Add-Player-sendEquipmentChange.patch b/patches/server/0060-Add-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0061-Add-Player-sendEquipmentChange.patch rename to patches/server/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 deleted file mode 100644 index 60759537..00000000 --- a/patches/server/0060-Allow-disabling-component-selector-resolving-in-book.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: uRyanxD -Date: Fri, 3 Jun 2022 20:36:24 -0300 -Subject: [PATCH] Allow disabling component selector resolving in books - - -diff --git a/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java b/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java -index fcf7738c75f21ad23693d903b476c65b4a207a84..8d071fdd1ae8aaa97003f0b56d7e206e6dd4b44f 100644 ---- a/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java -+++ b/src/main/java/com/hpfxd/pandaspigot/config/PandaSpigotConfig.java -@@ -119,4 +119,6 @@ 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; - } -diff --git a/src/main/java/net/minecraft/server/ItemWrittenBook.java b/src/main/java/net/minecraft/server/ItemWrittenBook.java -index d179049724abe8d5e7a914835d17df59e606f78b..2b84704ac6d0ec0a0bd491b35030f23b2d02f2c2 100644 ---- a/src/main/java/net/minecraft/server/ItemWrittenBook.java -+++ b/src/main/java/net/minecraft/server/ItemWrittenBook.java -@@ -49,7 +49,7 @@ public class ItemWrittenBook extends Item { - if (itemstack != null && itemstack.getTag() != null) { - NBTTagCompound nbttagcompound = itemstack.getTag(); - -- if (!nbttagcompound.getBoolean("resolved")) { -+ if (com.hpfxd.pandaspigot.config.PandaSpigotConfig.get().resolveSelectorsInBooks && !nbttagcompound.getBoolean("resolved")) { // PandaSpigot - nbttagcompound.setBoolean("resolved", true); - if (b(nbttagcompound)) { - NBTTagList nbttaglist = nbttagcompound.getList("pages", 8); diff --git a/patches/server/0062-Cache-chunk-coordinations.patch b/patches/server/0061-Cache-chunk-coordinations.patch similarity index 100% rename from patches/server/0062-Cache-chunk-coordinations.patch rename to patches/server/0061-Cache-chunk-coordinations.patch diff --git a/patches/server/0063-Fix-Occasional-Client-Side-Unloading-of-Chunk-0-0.patch b/patches/server/0062-Fix-Occasional-Client-Side-Unloading-of-Chunk-0-0.patch similarity index 100% rename from patches/server/0063-Fix-Occasional-Client-Side-Unloading-of-Chunk-0-0.patch rename to patches/server/0062-Fix-Occasional-Client-Side-Unloading-of-Chunk-0-0.patch diff --git a/patches/server/0064-Backport-SPIGOT-5428-Better-handling-of-some-ItemMet.patch b/patches/server/0063-Backport-SPIGOT-5428-Better-handling-of-some-ItemMet.patch similarity index 100% rename from patches/server/0064-Backport-SPIGOT-5428-Better-handling-of-some-ItemMet.patch rename to patches/server/0063-Backport-SPIGOT-5428-Better-handling-of-some-ItemMet.patch diff --git a/patches/server/0065-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0064-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0065-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0064-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0066-Fix-issue-with-ProtocolSupport.patch b/patches/server/0065-Fix-issue-with-ProtocolSupport.patch similarity index 100% rename from patches/server/0066-Fix-issue-with-ProtocolSupport.patch rename to patches/server/0065-Fix-issue-with-ProtocolSupport.patch diff --git a/patches/server/0067-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0066-Add-config-option-for-logging-player-ip-addresses.patch similarity index 92% rename from patches/server/0067-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0066-Add-config-option-for-logging-player-ip-addresses.patch index 31d15749..41f2b39a 100644 --- a/patches/server/0067-Add-config-option-for-logging-player-ip-addresses.patch +++ b/patches/server/0066-Add-config-option-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/patches/server/0068-Backport-TabCompleteEvent-and-AsyncTabCompleteEvent.patch b/patches/server/0067-Backport-TabCompleteEvent-and-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0068-Backport-TabCompleteEvent-and-AsyncTabCompleteEvent.patch rename to patches/server/0067-Backport-TabCompleteEvent-and-AsyncTabCompleteEvent.patch diff --git a/patches/server/0069-Fix-setFlying-Toggle.patch b/patches/server/0068-Fix-setFlying-Toggle.patch similarity index 100% rename from patches/server/0069-Fix-setFlying-Toggle.patch rename to patches/server/0068-Fix-setFlying-Toggle.patch diff --git a/patches/server/0070-Fix-AIOOBE-in-inventory-handling.patch b/patches/server/0069-Fix-AIOOBE-in-inventory-handling.patch similarity index 92% rename from patches/server/0070-Fix-AIOOBE-in-inventory-handling.patch rename to patches/server/0069-Fix-AIOOBE-in-inventory-handling.patch index 380cdc48..49dbba0c 100644 --- a/patches/server/0070-Fix-AIOOBE-in-inventory-handling.patch +++ b/patches/server/0069-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/patches/server/0071-Cache-block-break-animation-packet.patch b/patches/server/0070-Cache-block-break-animation-packet.patch similarity index 100% rename from patches/server/0071-Cache-block-break-animation-packet.patch rename to patches/server/0070-Cache-block-break-animation-packet.patch diff --git a/patches/server/0072-Skip-updating-entity-tracker-if-server-is-empty.patch b/patches/server/0071-Skip-updating-entity-tracker-if-server-is-empty.patch similarity index 100% rename from patches/server/0072-Skip-updating-entity-tracker-if-server-is-empty.patch rename to patches/server/0071-Skip-updating-entity-tracker-if-server-is-empty.patch diff --git a/patches/server/0073-Add-World-Util-Methods.patch b/patches/server/0072-Add-World-Util-Methods.patch similarity index 98% rename from patches/server/0073-Add-World-Util-Methods.patch rename to patches/server/0072-Add-World-Util-Methods.patch index b90973db..6a386bd5 100644 --- a/patches/server/0073-Add-World-Util-Methods.patch +++ b/patches/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/patches/server/0074-Optimize-light-level-comparisons.patch b/patches/server/0073-Optimize-light-level-comparisons.patch similarity index 100% rename from patches/server/0074-Optimize-light-level-comparisons.patch rename to patches/server/0073-Optimize-light-level-comparisons.patch diff --git a/patches/server/0075-Avoid-loading-chunks-in-multiple-places.patch b/patches/server/0074-Avoid-loading-chunks-in-multiple-places.patch similarity index 100% rename from patches/server/0075-Avoid-loading-chunks-in-multiple-places.patch rename to patches/server/0074-Avoid-loading-chunks-in-multiple-places.patch diff --git a/patches/server/0076-Use-less-resources-for-collisions.patch b/patches/server/0075-Use-less-resources-for-collisions.patch similarity index 98% rename from patches/server/0076-Use-less-resources-for-collisions.patch rename to patches/server/0075-Use-less-resources-for-collisions.patch index bed71701..47dca8f2 100644 --- a/patches/server/0076-Use-less-resources-for-collisions.patch +++ b/patches/server/0075-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/patches/server/0077-Use-LinkedHashMap-for-GameRules-map.patch b/patches/server/0076-Use-LinkedHashMap-for-GameRules-map.patch similarity index 100% rename from patches/server/0077-Use-LinkedHashMap-for-GameRules-map.patch rename to patches/server/0076-Use-LinkedHashMap-for-GameRules-map.patch diff --git a/patches/server/0078-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0077-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0078-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0077-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0079-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch b/patches/server/0078-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch similarity index 100% rename from patches/server/0079-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch rename to patches/server/0078-Fix-Bugs-with-Spigot-Mob-Spawn-Logic.patch diff --git a/patches/server/0080-Optimize-tnt-entity-and-falling-block-movement.patch b/patches/server/0079-Optimize-tnt-entity-and-falling-block-movement.patch similarity index 100% rename from patches/server/0080-Optimize-tnt-entity-and-falling-block-movement.patch rename to patches/server/0079-Optimize-tnt-entity-and-falling-block-movement.patch diff --git a/patches/server/0081-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0080-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0081-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0080-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0082-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0081-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0082-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0081-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0083-Reduce-Chunk-Hashing.patch b/patches/server/0082-Reduce-Chunk-Hashing.patch similarity index 100% rename from patches/server/0083-Reduce-Chunk-Hashing.patch rename to patches/server/0082-Reduce-Chunk-Hashing.patch diff --git a/patches/server/0084-Book-security-improvements.patch b/patches/server/0083-Book-security-improvements.patch similarity index 82% rename from patches/server/0084-Book-security-improvements.patch rename to patches/server/0083-Book-security-improvements.patch index e40b1c23..4be47ab0 100644 --- a/patches/server/0084-Book-security-improvements.patch +++ b/patches/server/0083-Book-security-improvements.patch @@ -3,8 +3,9 @@ From: uRyanxD 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 +Co-authored-by: xism4 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/patches/server/0085-Implement-SpawnerPreSpawnEvent.patch b/patches/server/0084-Implement-SpawnerPreSpawnEvent.patch similarity index 100% rename from patches/server/0085-Implement-SpawnerPreSpawnEvent.patch rename to patches/server/0084-Implement-SpawnerPreSpawnEvent.patch diff --git a/patches/server/0086-Remove-DataWatcher-Locking.patch b/patches/server/0085-Remove-DataWatcher-Locking.patch similarity index 100% rename from patches/server/0086-Remove-DataWatcher-Locking.patch rename to patches/server/0085-Remove-DataWatcher-Locking.patch diff --git a/patches/server/0087-Optimize-Light-Recalculations.patch b/patches/server/0086-Optimize-Light-Recalculations.patch similarity index 100% rename from patches/server/0087-Optimize-Light-Recalculations.patch rename to patches/server/0086-Optimize-Light-Recalculations.patch diff --git a/patches/server/0088-Optimize-armor-stands.patch b/patches/server/0087-Optimize-armor-stands.patch similarity index 100% rename from patches/server/0088-Optimize-armor-stands.patch rename to patches/server/0087-Optimize-armor-stands.patch diff --git a/patches/server/0089-Avoid-Looking-up-same-chunk-twice-in-EAR.patch b/patches/server/0088-Avoid-Looking-up-same-chunk-twice-in-EAR.patch similarity index 100% rename from patches/server/0089-Avoid-Looking-up-same-chunk-twice-in-EAR.patch rename to patches/server/0088-Avoid-Looking-up-same-chunk-twice-in-EAR.patch diff --git a/patches/server/0090-Backport-ArrowDMG-fix.patch b/patches/server/0089-Backport-ArrowDMG-fix.patch similarity index 94% rename from patches/server/0090-Backport-ArrowDMG-fix.patch rename to patches/server/0089-Backport-ArrowDMG-fix.patch index 56758d94..95a8aa8f 100644 --- a/patches/server/0090-Backport-ArrowDMG-fix.patch +++ b/patches/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/patches/server/0091-Random-arrow-damage-toggle.patch b/patches/server/0090-Random-arrow-damage-toggle.patch similarity index 100% rename from patches/server/0091-Random-arrow-damage-toggle.patch rename to patches/server/0090-Random-arrow-damage-toggle.patch diff --git a/patches/server/0092-Disable-Vanilla-Chunk-GC.patch b/patches/server/0091-Disable-Vanilla-Chunk-GC.patch similarity index 100% rename from patches/server/0092-Disable-Vanilla-Chunk-GC.patch rename to patches/server/0091-Disable-Vanilla-Chunk-GC.patch diff --git a/patches/server/0093-Use-single-player-info-update-packet-on-join.patch b/patches/server/0092-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0093-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0092-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0094-Optimize-heavy-Nether-Portal-search.patch b/patches/server/0093-Optimize-heavy-Nether-Portal-search.patch similarity index 100% rename from patches/server/0094-Optimize-heavy-Nether-Portal-search.patch rename to patches/server/0093-Optimize-heavy-Nether-Portal-search.patch diff --git a/patches/server/0095-Fix-Paper-hopper-patch.patch b/patches/server/0094-Fix-Paper-hopper-patch.patch similarity index 100% rename from patches/server/0095-Fix-Paper-hopper-patch.patch rename to patches/server/0094-Fix-Paper-hopper-patch.patch diff --git a/patches/server/0096-Fix-Paper-height-nerf-patch.patch b/patches/server/0095-Fix-Paper-height-nerf-patch.patch similarity index 100% rename from patches/server/0096-Fix-Paper-height-nerf-patch.patch rename to patches/server/0095-Fix-Paper-height-nerf-patch.patch diff --git a/patches/server/0097-Add-SLF4J-implementation.patch b/patches/server/0096-Add-SLF4J-implementation.patch similarity index 88% rename from patches/server/0097-Add-SLF4J-implementation.patch rename to patches/server/0096-Add-SLF4J-implementation.patch index 45193f94..e37b2171 100644 --- a/patches/server/0097-Add-SLF4J-implementation.patch +++ b/patches/server/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/patches/server/0098-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0097-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0098-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0097-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0099-Implement-EntityPickupItemEvent.patch b/patches/server/0098-Implement-EntityPickupItemEvent.patch similarity index 100% rename from patches/server/0099-Implement-EntityPickupItemEvent.patch rename to patches/server/0098-Implement-EntityPickupItemEvent.patch diff --git a/patches/server/0100-Add-Stricter-Client-Sign-limits.patch b/patches/server/0099-Add-Stricter-Client-Sign-limits.patch similarity index 100% rename from patches/server/0100-Add-Stricter-Client-Sign-limits.patch rename to patches/server/0099-Add-Stricter-Client-Sign-limits.patch