diff --git a/patches/removed/1.18/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 94% rename from patches/removed/1.18/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 8529a202ec..800575190a 100644 --- a/patches/removed/1.18/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/patches/server/0435-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -17,10 +17,10 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a5361e1dba7c025667c7627b8851655bba2c9c6a..ef50517fa00fd219e05c4a725350a78635604b2f 100644 +index 7b3d3b3c6c73fb146c3be29aaaac77fee5824f91..845f105457d659a4bd88d4a8ce91b20d6abb7865 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -545,6 +545,15 @@ public class PaperWorldConfig { +@@ -550,6 +550,15 @@ public class PaperWorldConfig { lightQueueSize = getInt("light-queue-size", lightQueueSize); } @@ -37,10 +37,10 @@ index a5361e1dba7c025667c7627b8851655bba2c9c6a..ef50517fa00fd219e05c4a725350a786 public java.util.Map altItemDespawnRateMap; private void altItemDespawnRate() { diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java -index 1a6c75a33c6dfec63eabef0b8a0a5d8812aeeb4c..fb570511f2e12cb3794d32fa72b6fb886e6f1199 100644 +index 95f195980e28bb59f43e5ca1d5e79ebe8c3ddaea..84dc1e94b4f7b8315d8422634dd49b1f85044d18 100644 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java -@@ -195,6 +195,27 @@ public abstract class DistanceManager { +@@ -197,6 +197,27 @@ public abstract class DistanceManager { boolean removed = false; // CraftBukkit if (arraysetsorted.remove(ticket)) { removed = true; // CraftBukkit diff --git a/patches/server/0435-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0436-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0435-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0436-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0436-Maps-shouldn-t-load-chunks.patch b/patches/server/0437-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0436-Maps-shouldn-t-load-chunks.patch rename to patches/server/0437-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0437-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0437-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0438-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0438-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0438-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0439-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0439-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0439-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0440-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0440-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0440-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0441-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0441-Fix-sand-duping.patch b/patches/server/0442-Fix-sand-duping.patch similarity index 100% rename from patches/server/0441-Fix-sand-duping.patch rename to patches/server/0442-Fix-sand-duping.patch diff --git a/patches/server/0442-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0442-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0443-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0443-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0443-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0444-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0444-Expose-Arrow-getItemStack.patch b/patches/server/0445-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0444-Expose-Arrow-getItemStack.patch rename to patches/server/0445-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0445-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0445-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0446-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0446-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0446-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0447-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0447-Add-permission-for-command-blocks.patch b/patches/server/0448-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0447-Add-permission-for-command-blocks.patch rename to patches/server/0448-Add-permission-for-command-blocks.patch diff --git a/patches/server/0448-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0448-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0449-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0449-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0449-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0450-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0450-Paper-dumpitem-command.patch b/patches/server/0451-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0450-Paper-dumpitem-command.patch rename to patches/server/0451-Paper-dumpitem-command.patch diff --git a/patches/server/0451-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0451-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0452-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0452-Improve-Legacy-Component-serialization-size.patch b/patches/server/0453-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0452-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0453-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0453-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0454-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0454-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0455-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0456-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0455-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0456-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0456-Support-old-UUID-format-for-NBT.patch b/patches/server/0457-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0456-Support-old-UUID-format-for-NBT.patch rename to patches/server/0457-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0457-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0458-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0457-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0458-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0458-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0459-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0458-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0459-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0459-Remove-some-streams-from-structures.patch b/patches/server/0460-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0459-Remove-some-streams-from-structures.patch rename to patches/server/0460-Remove-some-streams-from-structures.patch diff --git a/patches/server/0460-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0461-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0460-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0461-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0461-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0462-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from patches/server/0461-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to patches/server/0462-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/patches/server/0462-Support-components-in-ItemMeta.patch b/patches/server/0463-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0462-Support-components-in-ItemMeta.patch rename to patches/server/0463-Support-components-in-ItemMeta.patch diff --git a/patches/server/0463-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0463-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0464-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0464-Add-entity-liquid-API.patch b/patches/server/0465-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0464-Add-entity-liquid-API.patch rename to patches/server/0465-Add-entity-liquid-API.patch diff --git a/patches/server/0465-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0466-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0465-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0466-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0466-Spawn-player-in-correct-world-on-login.patch b/patches/server/0467-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0466-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0467-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0467-Add-PrepareResultEvent.patch b/patches/server/0468-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0467-Add-PrepareResultEvent.patch rename to patches/server/0468-Add-PrepareResultEvent.patch diff --git a/patches/server/0468-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0468-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0469-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index 1184b39dc9..04d6e42446 100644 --- a/patches/server/0469-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/patches/server/0470-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -529,7 +529,7 @@ index 0bd55c5a43bfed7d5c80f6859b2827b7da3d0804..373ac9909666302fd6b9c6891866a9ba } diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java -index 95f195980e28bb59f43e5ca1d5e79ebe8c3ddaea..bf18dbe5dc137dc40f67aa9ae4cb35e7c8358f0d 100644 +index 84dc1e94b4f7b8315d8422634dd49b1f85044d18..451d5e9b5906e662a0c2e04b407068ea49d1089e 100644 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java @@ -113,6 +113,7 @@ public abstract class DistanceManager { @@ -583,7 +583,7 @@ index 95f195980e28bb59f43e5ca1d5e79ebe8c3ddaea..bf18dbe5dc137dc40f67aa9ae4cb35e7 boolean removed = false; // CraftBukkit if (arraysetsorted.remove(ticket)) { -@@ -203,7 +211,12 @@ public abstract class DistanceManager { +@@ -224,7 +232,12 @@ public abstract class DistanceManager { this.tickets.remove(i); } @@ -597,7 +597,7 @@ index 95f195980e28bb59f43e5ca1d5e79ebe8c3ddaea..bf18dbe5dc137dc40f67aa9ae4cb35e7 return removed; // CraftBukkit } -@@ -251,6 +264,112 @@ public abstract class DistanceManager { +@@ -272,6 +285,112 @@ public abstract class DistanceManager { }); } @@ -711,7 +711,7 @@ index 95f195980e28bb59f43e5ca1d5e79ebe8c3ddaea..bf18dbe5dc137dc40f67aa9ae4cb35e7 Ticket ticket = new Ticket<>(TicketType.FORCED, 31, pos); long i = pos.toLong(); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 00305a06885b2457615b6bd35bb1a84721ca1d77..93b8c5c21a6a6c2475f4589014852a5178dfc13f 100644 +index c3875acfad91c50a7fec4b1f8e06e8a32e2ea037..ca3ccf2631587a896f6b909d63889708e6f72f27 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -601,6 +601,26 @@ public class ServerChunkCache extends ChunkSource { @@ -1103,19 +1103,19 @@ index c0ef95f83f2d13025bedd4bcc7e177cee66b5470..fec2a2a9f958492eefbbffcaf8179a2f public void setTaskPerBatch(int taskBatchSize) { diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java -index ffc43e5d3d0563c9e9c171064511b2c65ddf67e1..85f41e94b555eba1c8f887ca130a7cdba7bdb056 100644 +index f1128f0d4a9a0241ac6c9bc18dd13b431c616bb1..2b2b7851d5f68bcdb41d58bcc64740ba58bf1ef4 100644 --- a/src/main/java/net/minecraft/server/level/Ticket.java +++ b/src/main/java/net/minecraft/server/level/Ticket.java -@@ -7,6 +7,7 @@ public final class Ticket implements Comparable> { - private final int ticketLevel; +@@ -8,6 +8,7 @@ public final class Ticket implements Comparable> { public final T key; public long createdTick; + public long delayUnloadBy; // Paper + public int priority; // Paper - Chunk priority protected Ticket(TicketType type, int level, T argument) { this.type = type; diff --git a/src/main/java/net/minecraft/server/level/TicketType.java b/src/main/java/net/minecraft/server/level/TicketType.java -index 78fbb4c3e52e900956ae0811aaf934c81ee5ea48..23d13600d6925f6746dfde08e17ba578e274010e 100644 +index 8770fe0db46b01e8b608637df4f1a669a3f4cdde..3c1698ba0d3bc412ab957777d9b5211dbc555208 100644 --- a/src/main/java/net/minecraft/server/level/TicketType.java +++ b/src/main/java/net/minecraft/server/level/TicketType.java @@ -9,6 +9,8 @@ import net.minecraft.world.level.ChunkPos; diff --git a/patches/server/0470-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0470-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0471-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0471-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0471-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0472-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0472-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0472-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0473-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0473-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0473-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0474-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0474-Move-range-check-for-block-placing-up.patch b/patches/server/0475-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0474-Move-range-check-for-block-placing-up.patch rename to patches/server/0475-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0475-Fix-SPIGOT-5989.patch b/patches/server/0476-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0475-Fix-SPIGOT-5989.patch rename to patches/server/0476-Fix-SPIGOT-5989.patch diff --git a/patches/server/0476-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0476-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0477-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0477-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0477-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0478-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0478-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0478-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0479-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0479-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0479-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0480-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0480-Fix-some-rails-connecting-improperly.patch b/patches/server/0481-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0480-Fix-some-rails-connecting-improperly.patch rename to patches/server/0481-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0481-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0481-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0482-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0482-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0482-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0483-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0483-Brand-support.patch b/patches/server/0484-Brand-support.patch similarity index 100% rename from patches/server/0483-Brand-support.patch rename to patches/server/0484-Brand-support.patch diff --git a/patches/server/0484-Add-setMaxPlayers-API.patch b/patches/server/0485-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0484-Add-setMaxPlayers-API.patch rename to patches/server/0485-Add-setMaxPlayers-API.patch diff --git a/patches/server/0485-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0485-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0486-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0486-Don-t-require-FACING-data.patch b/patches/server/0487-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0486-Don-t-require-FACING-data.patch rename to patches/server/0487-Don-t-require-FACING-data.patch diff --git a/patches/server/0487-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0487-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0488-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0488-Add-moon-phase-API.patch b/patches/server/0489-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0488-Add-moon-phase-API.patch rename to patches/server/0489-Add-moon-phase-API.patch diff --git a/patches/removed/1.18/0488-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch similarity index 89% rename from patches/removed/1.18/0488-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch index bf1e35568a..0dd52b7752 100644 --- a/patches/removed/1.18/0488-Improve-Chunk-Status-Transition-Speed.patch +++ b/patches/server/0490-Improve-Chunk-Status-Transition-Speed.patch @@ -36,13 +36,13 @@ scenario / path: Previously would have hopped to SERVER around 12+ times there extra. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index e317c73b430105052cbf28502916adc3bd60846b..96759f349e10c8ef634a11a6b48f9affae77d65a 100644 +index 64fa9affc32057f09268a6f92dbc88c9decd6ed8..6782e2b100b1619016c637a9e71f9e880ff974e1 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java -@@ -244,6 +244,13 @@ public class ChunkHolder { +@@ -85,6 +85,13 @@ public class ChunkHolder { + this.playersInChunkTickRange = this.chunkMap.playerChunkTickRangeMap.getObjectsInRange(key); + } // Paper end - optimise isOutsideOfRange - long lastAutoSaveTime; // Paper - incremental autosave - long inactiveTimeStart; // Paper - incremental autosave + // Paper start - optimize chunk status progression without jumping through thread pool + public boolean canAdvanceStatus() { + ChunkStatus status = getChunkHolderStatus(); @@ -54,10 +54,10 @@ index e317c73b430105052cbf28502916adc3bd60846b..96759f349e10c8ef634a11a6b48f9aff public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) { this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size()); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f43e8bb6b1c6c204b35ea64b47f6d6f558d0f7a5..047f1772c8f9346ba4541d46af8e144141865cfb 100644 +index 373ac9909666302fd6b9c6891866a9baf3977316..c637a9b0a978700a0cd941be22208ae3c01f6eb2 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -786,7 +786,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -662,7 +662,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return either.mapLeft((list) -> { return (LevelChunk) list.get(list.size() / 2); }); @@ -66,7 +66,7 @@ index f43e8bb6b1c6c204b35ea64b47f6d6f558d0f7a5..047f1772c8f9346ba4541d46af8e1441 } @Nullable -@@ -1237,6 +1237,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1013,6 +1013,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return "chunkGenerate " + requiredStatus.getName(); }); Executor executor = (runnable) -> { diff --git a/patches/server/0489-Prevent-headless-pistons-from-being-created.patch b/patches/server/0491-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0489-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0491-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0490-Add-BellRingEvent.patch b/patches/server/0492-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0490-Add-BellRingEvent.patch rename to patches/server/0492-Add-BellRingEvent.patch diff --git a/patches/server/0491-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0493-Add-zombie-targets-turtle-egg-config.patch similarity index 95% rename from patches/server/0491-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0493-Add-zombie-targets-turtle-egg-config.patch index edecf435e3..9abdec115c 100644 --- a/patches/server/0491-Add-zombie-targets-turtle-egg-config.patch +++ b/patches/server/0493-Add-zombie-targets-turtle-egg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7b3d3b3c6c73fb146c3be29aaaac77fee5824f91..563cad1d7a4943648fe1f7e9b57fa7fe485e4a72 100644 +index 845f105457d659a4bd88d4a8ce91b20d6abb7865..0521d5f9eba13ade77b578dd4eb5addd267dd4b9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -56,6 +56,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0492-Buffer-joins-to-world.patch b/patches/server/0494-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0492-Buffer-joins-to-world.patch rename to patches/server/0494-Buffer-joins-to-world.patch diff --git a/patches/server/0493-Optimize-redstone-algorithm.patch b/patches/server/0495-Optimize-redstone-algorithm.patch similarity index 99% rename from patches/server/0493-Optimize-redstone-algorithm.patch rename to patches/server/0495-Optimize-redstone-algorithm.patch index 965492aa59..aed88ac1e3 100644 --- a/patches/server/0493-Optimize-redstone-algorithm.patch +++ b/patches/server/0495-Optimize-redstone-algorithm.patch @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 563cad1d7a4943648fe1f7e9b57fa7fe485e4a72..0535b24f5c9ff192ec2a6f5a1734f144251d9876 100644 +index 0521d5f9eba13ade77b578dd4eb5addd267dd4b9..bc93318246eab1da5462aa3fa0cde4c100622f4e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -61,6 +61,16 @@ public class PaperWorldConfig { diff --git a/patches/server/0494-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0494-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0496-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0495-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0495-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0497-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0496-Fix-CraftTeam-null-check.patch b/patches/server/0498-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0496-Fix-CraftTeam-null-check.patch rename to patches/server/0498-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0497-Add-more-Evoker-API.patch b/patches/server/0499-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0497-Add-more-Evoker-API.patch rename to patches/server/0499-Add-more-Evoker-API.patch diff --git a/patches/removed/1.18/0499-Incremental-player-saving.patch b/patches/server/0500-Incremental-player-saving.patch similarity index 59% rename from patches/removed/1.18/0499-Incremental-player-saving.patch rename to patches/server/0500-Incremental-player-saving.patch index 5c84c67c69..bc316a7345 100644 --- a/patches/removed/1.18/0499-Incremental-player-saving.patch +++ b/patches/server/0500-Incremental-player-saving.patch @@ -5,13 +5,14 @@ Subject: [PATCH] Incremental player saving diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 4b02a035cec0aa260e67f77c7025d2fb0e85f2eb..0b23250cbbfd947568afcb8c4510b7dea4468380 100644 +index 9a66cddbf9863aa6ff566a337153883c07c08e41..b6c7aec1516a4db4fde8c9ec2772cd982ed5e304 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -465,4 +465,14 @@ public class PaperConfig { - set("settings.unsupported-settings.allow-tnt-duplication", null); +@@ -468,4 +468,15 @@ public class PaperConfig { + config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons."); + allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false); } - ++ + public static int playerAutoSaveRate = -1; + public static int maxPlayerAutoSavePerTick = 10; + private static void playerAutoSaveRate() { @@ -24,40 +25,63 @@ index 4b02a035cec0aa260e67f77c7025d2fb0e85f2eb..0b23250cbbfd947568afcb8c4510b7de + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 335d42592d99d91ae1d99fe1b99122a3bac97a49..968476493bcea8b4d961e838b142912d3eac91cd 100644 +index 4351dd9c293d1db48c87c5df28bcb2b9a59583f7..7f733bd666e42f8ba80bfda233f662564bfc0e24 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -982,7 +982,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit // Paper - move down - // MinecraftServer.LOGGER.debug("Autosave started"); // Paper - serverAutoSave = (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0); // Paper +@@ -1408,13 +1412,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit + MinecraftServer.LOGGER.debug("Autosave started"); this.profiler.push("save"); -- if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // Paper - moved from above -- this.playerList.saveAll(); -+ if (playerSaveInterval > 0) { // Paper -+ this.playerList.savePlayers(playerSaveInterval); // Paper - // this.saveAllChunks(true, false, false); // Paper - saved incrementally below - } // Paper start - for (ServerLevel level : this.getAllLevels()) { +- this.saveEverything(true, false, false); ++ this.saveEverything(true, false, false, playerSaveInterval); // Paper + this.profiler.pop(); + MinecraftServer.LOGGER.debug("Autosave finished"); +- } ++ } else this.getPlayerList().saveAll(playerSaveInterval); // Paper + io.papermc.paper.util.CachedLists.reset(); // Paper + // Paper start - move executeAll() into full server tick timing + try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 74b68679d311017246d49c37f3cd17f938f3b57f..d8df3bcf6ddd87e9fa932f01a41a48a641328f9d 100644 +index 84f78e2b3bf51eae1d486852464df032861c5a0b..968b8180f92066a43f06bff8dd1d49b03bd08f5b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -175,6 +175,7 @@ public class ServerPlayer extends Player { +@@ -171,6 +171,7 @@ public class ServerPlayer extends Player { public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder private static final Logger LOGGER = LogManager.getLogger(); @@ -66,10 +90,10 @@ index 74b68679d311017246d49c37f3cd17f938f3b57f..d8df3bcf6ddd87e9fa932f01a41a48a6 private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10; public ServerGamePacketListenerImpl connection; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 34f56db51e2c6a1c451f95d0fa3cb5c368b1ecf7..2c7dcf5eabc8fe99f78e71493ac96b7f065110a2 100644 +index 310bed27c04ef812aa8607c9dca789db13341d25..b1f93551ce3e4d12e5cbe424c1ceaf3da20d0ffd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -570,6 +570,7 @@ public abstract class PlayerList { +@@ -569,6 +569,7 @@ public abstract class PlayerList { protected void save(ServerPlayer player) { if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit if (!player.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug) @@ -77,25 +101,24 @@ index 34f56db51e2c6a1c451f95d0fa3cb5c368b1ecf7..2c7dcf5eabc8fe99f78e71493ac96b7f this.playerIo.save(player); ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit -@@ -1209,10 +1210,21 @@ public abstract class PlayerList { +@@ -1181,10 +1182,21 @@ public abstract class PlayerList { } public void saveAll() { -- net.minecraft.server.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main + // Paper start - incremental player saving -+ savePlayers(null); ++ saveAll(-1); + } -+ public void savePlayers(Integer interval) { -+ MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main ++ public void saveAll(int interval) { + net.minecraft.server.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main MinecraftTimings.savePlayers.startTiming(); // Paper + int numSaved = 0; + long now = MinecraftServer.currentTick; for (int i = 0; i < this.players.size(); ++i) { - this.save(this.players.get(i)); + ServerPlayer entityplayer = this.players.get(i); -+ if (interval == null || now - entityplayer.lastSave >= interval) { ++ if (interval != -1 || now - entityplayer.lastSave >= interval) { + this.save(entityplayer); -+ if (interval != null && ++numSaved <= com.destroystokyo.paper.PaperConfig.maxPlayerAutoSavePerTick) { break; } ++ if (interval != -1 && ++numSaved <= com.destroystokyo.paper.PaperConfig.maxPlayerAutoSavePerTick) { break; } + } + // Paper end } diff --git a/patches/server/0498-Add-methods-to-get-translation-keys.patch b/patches/server/0501-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0498-Add-methods-to-get-translation-keys.patch rename to patches/server/0501-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0499-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0499-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0500-Cache-block-data-strings.patch b/patches/server/0503-Cache-block-data-strings.patch similarity index 95% rename from patches/server/0500-Cache-block-data-strings.patch rename to patches/server/0503-Cache-block-data-strings.patch index de85a14464..cde2b222d4 100644 --- a/patches/server/0500-Cache-block-data-strings.patch +++ b/patches/server/0503-Cache-block-data-strings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4351dd9c293d1db48c87c5df28bcb2b9a59583f7..fe8b825adfa3f7ed5c85e238ef93e46908ca88ae 100644 +index 7f733bd666e42f8ba80bfda233f662564bfc0e24..4d90ebf13e8ad2dd77175fcdc15a0e84a58ff081 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1963,6 +1963,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop cachedSingleHashSet; // Paper @@ -49,10 +49,10 @@ index 2dd47eab63cf9322a5844e748709e220272a8cfe..c0a685cfe62aeda3583763ecc1e4fa12 this.connection.disconnect(ichatbasecomponent); }); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 310bed27c04ef812aa8607c9dca789db13341d25..6aaa5174bb0eff3216667b4c8d3912d02e1c66e2 100644 +index b1f93551ce3e4d12e5cbe424c1ceaf3da20d0ffd..5bbf5c83a5052df07392cd17236469b2d3ddecdc 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -595,7 +595,7 @@ public abstract class PlayerList { +@@ -596,7 +596,7 @@ public abstract class PlayerList { entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper } diff --git a/patches/server/0530-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 98% rename from patches/server/0530-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch index 698a86ad21..ab3e9e7ec0 100644 --- a/patches/server/0530-Add-Wandering-Trader-spawn-rate-config-options.patch +++ b/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch @@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h values used in other places. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d99ddd769b381b2f9a59352971c6faeee7b6387e..5c22b8993385c1e6c72fe1fbd5f14c76253eec74 100644 +index 62e60057a362ad7c3e96b3167f78ba154cfefdc3..ab6ade77a7be2b0d67effcacbf74ed64a1beccff 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -79,6 +79,19 @@ public class PaperWorldConfig { diff --git a/patches/server/0531-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0531-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0532-Expose-world-spawn-angle.patch b/patches/server/0535-Expose-world-spawn-angle.patch similarity index 93% rename from patches/server/0532-Expose-world-spawn-angle.patch rename to patches/server/0535-Expose-world-spawn-angle.patch index 60424105f6..8a4fd893fa 100644 --- a/patches/server/0532-Expose-world-spawn-angle.patch +++ b/patches/server/0535-Expose-world-spawn-angle.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose world spawn angle diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6aaa5174bb0eff3216667b4c8d3912d02e1c66e2..388e02966660b42d812a89ad290a4b94b450b5fe 100644 +index 5bbf5c83a5052df07392cd17236469b2d3ddecdc..d0c824290c08f825956ec1396381ec1657a6476d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -873,7 +873,7 @@ public abstract class PlayerList { +@@ -874,7 +874,7 @@ public abstract class PlayerList { if (location == null) { worldserver1 = this.server.getLevel(Level.OVERWORLD); blockposition = entityplayer1.getSpawnPoint(worldserver1); diff --git a/patches/server/0533-Add-Destroy-Speed-API.patch b/patches/server/0536-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0533-Add-Destroy-Speed-API.patch rename to patches/server/0536-Add-Destroy-Speed-API.patch diff --git a/patches/server/0534-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0534-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0535-Add-LivingEntity-clearActiveItem.patch b/patches/server/0538-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0535-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0538-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0536-Add-PlayerItemCooldownEvent.patch b/patches/server/0539-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0536-Add-PlayerItemCooldownEvent.patch rename to patches/server/0539-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0537-More-lightning-API.patch b/patches/server/0540-More-lightning-API.patch similarity index 100% rename from patches/server/0537-More-lightning-API.patch rename to patches/server/0540-More-lightning-API.patch diff --git a/patches/server/0538-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0538-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch index dfd3db4bc6..25859f642d 100644 --- a/patches/server/0538-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5c22b8993385c1e6c72fe1fbd5f14c76253eec74..0759b9dbd37ca640b7fe410e0ecb6519542f991b 100644 +index ab6ade77a7be2b0d67effcacbf74ed64a1beccff..cf9d0877d842b7821ea7f8981aaddcf5fa604e80 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -92,6 +92,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0539-Added-missing-default-perms-for-commands.patch b/patches/server/0542-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0539-Added-missing-default-perms-for-commands.patch rename to patches/server/0542-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0540-Add-PlayerShearBlockEvent.patch b/patches/server/0543-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0540-Add-PlayerShearBlockEvent.patch rename to patches/server/0543-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0541-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0541-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch index 07775a18da..1d9ca254e3 100644 --- a/patches/server/0541-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch @@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of the reputation when it is cured. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0759b9dbd37ca640b7fe410e0ecb6519542f991b..ba55c0691e227e4e74a53389d942f78edcdd79b4 100644 +index cf9d0877d842b7821ea7f8981aaddcf5fa604e80..1c9958d8c989add9ef062c54d5348373ddeea4cd 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -97,6 +97,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0542-Limit-recipe-packets.patch b/patches/server/0545-Limit-recipe-packets.patch similarity index 97% rename from patches/server/0542-Limit-recipe-packets.patch rename to patches/server/0545-Limit-recipe-packets.patch index 78a16a98eb..f11df1c178 100644 --- a/patches/server/0542-Limit-recipe-packets.patch +++ b/patches/server/0545-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c0c807522aaa82ca74c47849b47e6b6b48b9a6f8..1de3d8848419fce792e28c8100eca1b2488ac968 100644 +index dbfd840f2f64fa7eec5523aa2ba9e1018f4bb19d..1100f44ec9dcd7183b220028c87c79a07d3f2ff7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -365,6 +365,13 @@ public class PaperConfig { diff --git a/patches/server/0543-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0546-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0543-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0546-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0544-MC-4-Fix-item-position-desync.patch b/patches/server/0547-MC-4-Fix-item-position-desync.patch similarity index 97% rename from patches/server/0544-MC-4-Fix-item-position-desync.patch rename to patches/server/0547-MC-4-Fix-item-position-desync.patch index 14f7a8807c..b81fcf460f 100644 --- a/patches/server/0544-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0547-MC-4-Fix-item-position-desync.patch @@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client keeping them in sync. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 1de3d8848419fce792e28c8100eca1b2488ac968..408e359e6f1a07c5616822e2ecf7549bf481c77d 100644 +index 1100f44ec9dcd7183b220028c87c79a07d3f2ff7..c8a49e7131d0722e4c57cc889933a43569059ba6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -101,6 +101,11 @@ public class PaperConfig { diff --git a/patches/server/0545-Player-Chunk-Load-Unload-Events.patch b/patches/server/0548-Player-Chunk-Load-Unload-Events.patch similarity index 90% rename from patches/server/0545-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0548-Player-Chunk-Load-Unload-Events.patch index 03f3c00bd3..efd272c070 100644 --- a/patches/server/0545-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0548-Player-Chunk-Load-Unload-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a32551253f12bd6f4a9008dd5d99fece6464effe..3b34329e2a3808e7241fe013084ea1d7ce1a7ea9 100644 +index 257942084d988cac5f87ff998ea637fa263a3fe9..e03c315f53a0962f1135b59d66c9074c9bbdb9ed 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2108,11 +2108,21 @@ public class ServerPlayer extends Player { +@@ -2109,11 +2109,21 @@ public class ServerPlayer extends Player { public void trackChunk(ChunkPos chunkPos, Packet chunkDataPacket) { this.connection.send(chunkDataPacket); diff --git a/patches/server/0546-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0546-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0547-Expose-LivingEntity-hurt-direction.patch b/patches/server/0550-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0547-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0550-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0548-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0548-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0549-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0549-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0550-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0550-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0551-Implement-TargetHitEvent.patch b/patches/server/0554-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0551-Implement-TargetHitEvent.patch rename to patches/server/0554-Implement-TargetHitEvent.patch diff --git a/patches/server/0552-Additional-Block-Material-API-s.patch b/patches/server/0555-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0552-Additional-Block-Material-API-s.patch rename to patches/server/0555-Additional-Block-Material-API-s.patch diff --git a/patches/server/0553-Fix-harming-potion-dupe.patch b/patches/server/0556-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0553-Fix-harming-potion-dupe.patch rename to patches/server/0556-Fix-harming-potion-dupe.patch diff --git a/patches/server/0554-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0554-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0555-Cache-burn-durations.patch b/patches/server/0558-Cache-burn-durations.patch similarity index 100% rename from patches/server/0555-Cache-burn-durations.patch rename to patches/server/0558-Cache-burn-durations.patch diff --git a/patches/server/0556-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 95% rename from patches/server/0556-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index 3363f4300f..204a15a905 100644 --- a/patches/server/0556-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ba55c0691e227e4e74a53389d942f78edcdd79b4..4dcaa3d1a3e93985ea1e8a5b6340829a74bdbd7a 100644 +index 1c9958d8c989add9ef062c54d5348373ddeea4cd..98e7bd4c85ed9f6bb063dfc3b0e4b80150a86835 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -102,6 +102,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0557-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0557-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0558-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0558-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0559-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0559-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0560-Zombie-API-breaking-doors.patch b/patches/server/0563-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0560-Zombie-API-breaking-doors.patch rename to patches/server/0563-Zombie-API-breaking-doors.patch diff --git a/patches/server/0561-Fix-nerfed-slime-when-splitting.patch b/patches/server/0564-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0561-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0564-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0562-Add-EntityLoadCrossbowEvent.patch b/patches/server/0565-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0562-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0565-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0563-Guardian-beam-workaround.patch b/patches/server/0566-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0563-Guardian-beam-workaround.patch rename to patches/server/0566-Guardian-beam-workaround.patch diff --git a/patches/server/0564-Added-WorldGameRuleChangeEvent.patch b/patches/server/0567-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0564-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0567-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0565-Added-ServerResourcesReloadedEvent.patch b/patches/server/0568-Added-ServerResourcesReloadedEvent.patch similarity index 93% rename from patches/server/0565-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0568-Added-ServerResourcesReloadedEvent.patch index 226c8cc460..119113d900 100644 --- a/patches/server/0565-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0568-Added-ServerResourcesReloadedEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d12c154f6110854c8ca9268edadab14b97c46d51..36e59108d8939ea0c4dfbe5a24ff72b42a7f7216 100644 +index d8c1bb347608eaea3741525602613bebd5f54c6b..0a09dbbd062df44062c19b8e6898a858f94377ac 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1942,7 +1942,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop completablefuture = CompletableFuture.supplyAsync(() -> { Stream stream = datapacks.stream(); // CraftBukkit - decompile error PackRepository resourcepackrepository = this.packRepository; -@@ -1958,6 +1964,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0575-Add-sendOpLevel-API.patch b/patches/server/0578-Add-sendOpLevel-API.patch similarity index 90% rename from patches/server/0575-Add-sendOpLevel-API.patch rename to patches/server/0578-Add-sendOpLevel-API.patch index 1c76718146..86049b2673 100644 --- a/patches/server/0575-Add-sendOpLevel-API.patch +++ b/patches/server/0578-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index eb622110d0d4f5a87dda91835d4fba339cc5f770..1bafdc0e64c06632ce78eea83abd167f9fd0cc1f 100644 +index ef1b4c290a9dee365a353a9ab26159ef399f0425..a841435338d6c242be35441d902ef2749ea6d406 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1118,6 +1118,11 @@ public abstract class PlayerList { +@@ -1119,6 +1119,11 @@ public abstract class PlayerList { } private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) { @@ -20,7 +20,7 @@ index eb622110d0d4f5a87dda91835d4fba339cc5f770..1bafdc0e64c06632ce78eea83abd167f if (player.connection != null) { byte b0; -@@ -1132,8 +1137,10 @@ public abstract class PlayerList { +@@ -1133,8 +1138,10 @@ public abstract class PlayerList { player.connection.send(new ClientboundEntityEventPacket(player, b0)); } diff --git a/patches/server/0576-Add-StructureLocateEvent.patch b/patches/server/0579-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0576-Add-StructureLocateEvent.patch rename to patches/server/0579-Add-StructureLocateEvent.patch diff --git a/patches/server/0577-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0580-Collision-option-for-requiring-a-player-participant.patch similarity index 97% rename from patches/server/0577-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0580-Collision-option-for-requiring-a-player-participant.patch index 528fcafb07..fce3f00ef1 100644 --- a/patches/server/0577-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0580-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4d723f5327a64cd8257bab502ae59a35b4a35cc1..e8f5ad4925b4d02bf79f9f56d0dac3f0cc410e71 100644 +index ad355eaf5e597be9c35fbf0a635944b16603bdc2..44319f7ebd5e97435b4a4068d638946b74159cf1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -82,6 +82,18 @@ public class PaperWorldConfig { diff --git a/patches/server/0578-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0578-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0579-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0579-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0580-Make-schedule-command-per-world.patch b/patches/server/0583-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0580-Make-schedule-command-per-world.patch rename to patches/server/0583-Make-schedule-command-per-world.patch diff --git a/patches/server/0581-Configurable-max-leash-distance.patch b/patches/server/0584-Configurable-max-leash-distance.patch similarity index 96% rename from patches/server/0581-Configurable-max-leash-distance.patch rename to patches/server/0584-Configurable-max-leash-distance.patch index 324570f5a0..8441617582 100644 --- a/patches/server/0581-Configurable-max-leash-distance.patch +++ b/patches/server/0584-Configurable-max-leash-distance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max leash distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e8f5ad4925b4d02bf79f9f56d0dac3f0cc410e71..6322748d2eabdf29a46c50166fad265b6c8053d5 100644 +index 44319f7ebd5e97435b4a4068d638946b74159cf1..64109ad34919f851d112df5f39aba31bfc386957 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -287,6 +287,12 @@ public class PaperWorldConfig { diff --git a/patches/server/0582-Implement-BlockPreDispenseEvent.patch b/patches/server/0585-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0582-Implement-BlockPreDispenseEvent.patch rename to patches/server/0585-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0583-added-Wither-API.patch b/patches/server/0586-added-Wither-API.patch similarity index 100% rename from patches/server/0583-added-Wither-API.patch rename to patches/server/0586-added-Wither-API.patch diff --git a/patches/server/0584-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0584-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0585-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 93% rename from patches/server/0585-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch index 02835fadba..d698cc3ffc 100644 --- a/patches/server/0585-Add-toggle-for-always-placing-the-dragon-egg.patch +++ b/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6322748d2eabdf29a46c50166fad265b6c8053d5..1eaea3659dbd99767a045e0f66143bebb604c047 100644 +index 64109ad34919f851d112df5f39aba31bfc386957..686a649b23e81c36ae392c79c736eafe22be0c54 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -697,6 +697,11 @@ public class PaperWorldConfig { +@@ -706,6 +706,11 @@ public class PaperWorldConfig { perPlayerMobSpawns = getBoolean("per-player-mob-spawns", true); } diff --git a/patches/server/0586-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0586-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0587-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0587-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0588-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0591-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0588-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0591-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0589-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch similarity index 83% rename from patches/server/0589-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0592-Reset-shield-blocking-on-dimension-change.patch index eed3dd0e29..2c33b73be8 100644 --- a/patches/server/0589-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3b34329e2a3808e7241fe013084ea1d7ce1a7ea9..b1b90f30d19d4db44419e367aa7ffe2fe37f7c73 100644 +index e03c315f53a0962f1135b59d66c9074c9bbdb9ed..174104dcb9c4300201d48cdb3701f5a09fdd2167 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1168,6 +1168,11 @@ public class ServerPlayer extends Player { +@@ -1169,6 +1169,11 @@ public class ServerPlayer extends Player { this.level.getCraftServer().getPluginManager().callEvent(changeEvent); // CraftBukkit end } diff --git a/patches/server/0590-add-DragonEggFormEvent.patch b/patches/server/0593-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0590-add-DragonEggFormEvent.patch rename to patches/server/0593-add-DragonEggFormEvent.patch diff --git a/patches/server/0591-EntityMoveEvent.patch b/patches/server/0594-EntityMoveEvent.patch similarity index 95% rename from patches/server/0591-EntityMoveEvent.patch rename to patches/server/0594-EntityMoveEvent.patch index 111946f7c1..1ff3b72221 100644 --- a/patches/server/0591-EntityMoveEvent.patch +++ b/patches/server/0594-EntityMoveEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 36e59108d8939ea0c4dfbe5a24ff72b42a7f7216..07b04d6fec9bd7615129ba6bd4fd465cb4bc1e84 100644 +index 0a09dbbd062df44062c19b8e6898a858f94377ac..6fcd166096ad94954ec0868e5d26dc0b76cfd3d2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1489,6 +1489,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper diff --git a/patches/server/0592-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 93% rename from patches/server/0592-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch index 3efa573289..16852f19da 100644 --- a/patches/server/0592-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1eaea3659dbd99767a045e0f66143bebb604c047..3c5dd72a4c98703602c41f2a04f1c793a6faf2ea 100644 +index 686a649b23e81c36ae392c79c736eafe22be0c54..168dd88fd1fabff8e63e6429e989dabe2c40cbfa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -702,6 +702,11 @@ public class PaperWorldConfig { +@@ -711,6 +711,11 @@ public class PaperWorldConfig { enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg); } diff --git a/patches/server/0593-Inline-shift-direction-fields.patch b/patches/server/0596-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0593-Inline-shift-direction-fields.patch rename to patches/server/0596-Inline-shift-direction-fields.patch diff --git a/patches/server/0594-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0594-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0595-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0595-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0596-living-entity-allow-attribute-registration.patch b/patches/server/0599-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0596-living-entity-allow-attribute-registration.patch rename to patches/server/0599-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0597-fix-dead-slime-setSize-invincibility.patch b/patches/server/0600-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0597-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0600-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0598-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0598-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0599-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0602-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0599-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0602-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0600-Expose-Tracked-Players.patch b/patches/server/0603-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0600-Expose-Tracked-Players.patch rename to patches/server/0603-Expose-Tracked-Players.patch diff --git a/patches/server/0601-Remove-streams-from-SensorNearest.patch b/patches/server/0604-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0601-Remove-streams-from-SensorNearest.patch rename to patches/server/0604-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0602-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0602-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0603-Improve-ServerGUI.patch b/patches/server/0606-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0603-Improve-ServerGUI.patch rename to patches/server/0606-Improve-ServerGUI.patch diff --git a/patches/server/0604-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0604-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0605-fix-converting-txt-to-json-file.patch b/patches/server/0608-fix-converting-txt-to-json-file.patch similarity index 97% rename from patches/server/0605-fix-converting-txt-to-json-file.patch rename to patches/server/0608-fix-converting-txt-to-json-file.patch index 4402faf5e9..3bc971a05d 100644 --- a/patches/server/0605-fix-converting-txt-to-json-file.patch +++ b/patches/server/0608-fix-converting-txt-to-json-file.patch @@ -48,7 +48,7 @@ index e968b880e435b8753314d85b919a0abc4f35be25..02d7b16f81ebf9f902a36d4f31802b20 if (!OldUsersConverter.serverReadyAfterUserconversion(this)) { return false; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1bafdc0e64c06632ce78eea83abd167f9fd0cc1f..effcca445789a55fffca8f9019c910f1cb1ac207 100644 +index a841435338d6c242be35441d902ef2749ea6d406..c6f98a9fbfc058ca22b54eee9ac73ade697a5e9f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -174,6 +174,7 @@ public abstract class PlayerList { diff --git a/patches/server/0606-Add-worldborder-events.patch b/patches/server/0609-Add-worldborder-events.patch similarity index 100% rename from patches/server/0606-Add-worldborder-events.patch rename to patches/server/0609-Add-worldborder-events.patch diff --git a/patches/server/0607-added-PlayerNameEntityEvent.patch b/patches/server/0610-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0607-added-PlayerNameEntityEvent.patch rename to patches/server/0610-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0608-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0611-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0608-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0611-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0609-Add-recipe-to-cook-events.patch b/patches/server/0612-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0609-Add-recipe-to-cook-events.patch rename to patches/server/0612-Add-recipe-to-cook-events.patch diff --git a/patches/server/0610-Add-Block-isValidTool.patch b/patches/server/0613-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0610-Add-Block-isValidTool.patch rename to patches/server/0613-Add-Block-isValidTool.patch diff --git a/patches/server/0611-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0611-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0614-Allow-using-signs-inside-spawn-protection.patch index da941878f9..f7223693e9 100644 --- a/patches/server/0611-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3c5dd72a4c98703602c41f2a04f1c793a6faf2ea..dd90952fe0c2a46d8dddc1e2a37ed68d07f7900a 100644 +index 168dd88fd1fabff8e63e6429e989dabe2c40cbfa..85203627790204cf899f955781b4e876e23e0809 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -727,4 +727,9 @@ public class PaperWorldConfig { +@@ -736,4 +736,9 @@ public class PaperWorldConfig { expMergeMaxValue = getInt("experience-merge-max-value", -1); log("Experience Merge Max Value: " + expMergeMaxValue); } diff --git a/patches/server/0612-Implement-Keyed-on-World.patch b/patches/server/0615-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0612-Implement-Keyed-on-World.patch rename to patches/server/0615-Implement-Keyed-on-World.patch diff --git a/patches/server/0613-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0613-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0614-Item-Rarity-API.patch b/patches/server/0617-Item-Rarity-API.patch similarity index 100% rename from patches/server/0614-Item-Rarity-API.patch rename to patches/server/0617-Item-Rarity-API.patch diff --git a/patches/server/0615-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0615-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0616-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0619-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0616-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0619-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0617-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch similarity index 88% rename from patches/server/0617-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch index 8015cee5ed..c4fdb55289 100644 --- a/patches/server/0617-Drop-carried-item-when-player-has-disconnected.patch +++ b/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch @@ -7,10 +7,10 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro Closes #5036 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index effcca445789a55fffca8f9019c910f1cb1ac207..ada17f16131be10670223615a36dca3fee6bfb73 100644 +index c6f98a9fbfc058ca22b54eee9ac73ade697a5e9f..b0b3775a706a52fd02eff745ff8f0a9b97de4cf8 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -613,6 +613,14 @@ public abstract class PlayerList { +@@ -614,6 +614,14 @@ public abstract class PlayerList { } // Paper end diff --git a/patches/server/0618-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch similarity index 90% rename from patches/server/0618-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0621-forced-whitelist-use-configurable-kick-message.patch index 6727d3ef15..0b700af29f 100644 --- a/patches/server/0618-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 07b04d6fec9bd7615129ba6bd4fd465cb4bc1e84..877863aace3df7f50c6ad054023445bf09b1cef3 100644 +index 6fcd166096ad94954ec0868e5d26dc0b76cfd3d2..f1713ceace84ecbe2e4a0dcde050c43a636e3595 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -73,7 +73,6 @@ import net.minecraft.nbt.NbtOps; @@ -16,7 +16,7 @@ index 07b04d6fec9bd7615129ba6bd4fd465cb4bc1e84..877863aace3df7f50c6ad054023445bf import net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket; import net.minecraft.network.protocol.game.ClientboundSetTimePacket; import net.minecraft.network.protocol.status.ServerStatus; -@@ -2045,7 +2044,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a0b75c776e5830c00bb861f76b2cde4692b13933..84505eccbd58746e9410846562698d7b3bfbcc34 100644 +index 0ccbe77e8ca58dbe8cbbe04d99a3e6181fee1e9d..53fa2fbaeacc333ab28392df4613819719a55d2e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -805,6 +805,12 @@ public abstract class PlayerList { +@@ -806,6 +806,12 @@ public abstract class PlayerList { } public ServerPlayer respawn(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) { @@ -34,7 +34,7 @@ index a0b75c776e5830c00bb861f76b2cde4692b13933..84505eccbd58746e9410846562698d7b entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot -@@ -896,7 +902,7 @@ public abstract class PlayerList { +@@ -897,7 +903,7 @@ public abstract class PlayerList { } Player respawnPlayer = entityplayer1.getBukkitEntity(); diff --git a/patches/server/0642-Add-Channel-initialization-listeners.patch b/patches/server/0645-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0642-Add-Channel-initialization-listeners.patch rename to patches/server/0645-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0643-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0646-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0643-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0646-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0644-Add-more-WanderingTrader-API.patch b/patches/server/0647-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0644-Add-more-WanderingTrader-API.patch rename to patches/server/0647-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0645-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0648-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0645-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0648-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0646-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0649-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0646-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0649-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0647-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0650-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0647-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0650-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0648-Inventory-close.patch b/patches/server/0651-Inventory-close.patch similarity index 100% rename from patches/server/0648-Inventory-close.patch rename to patches/server/0651-Inventory-close.patch diff --git a/patches/server/0649-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0652-call-PortalCreateEvent-players-and-end-platform.patch similarity index 91% rename from patches/server/0649-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0652-call-PortalCreateEvent-players-and-end-platform.patch index fc1223686e..1dd96ed2ec 100644 --- a/patches/server/0649-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0652-call-PortalCreateEvent-players-and-end-platform.patch @@ -5,10 +5,10 @@ Subject: [PATCH] call PortalCreateEvent players and end platform diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b1b90f30d19d4db44419e367aa7ffe2fe37f7c73..d0bb0c098f5a7fd9d0468cddc75d2fbca2880a8a 100644 +index 174104dcb9c4300201d48cdb3701f5a09fdd2167..670048f5114ec1dcb0d6e0bb6173ba9d657e6eb1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1195,15 +1195,21 @@ public class ServerPlayer extends Player { +@@ -1196,15 +1196,21 @@ public class ServerPlayer extends Player { private void createEndPlatform(ServerLevel world, BlockPos centerPos) { BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable(); diff --git a/patches/server/0650-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0653-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0650-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0653-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0651-Fix-CraftPotionBrewer-cache.patch b/patches/server/0654-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0651-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0654-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0652-Add-basic-Datapack-API.patch b/patches/server/0655-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0652-Add-basic-Datapack-API.patch rename to patches/server/0655-Add-basic-Datapack-API.patch diff --git a/patches/server/0653-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0656-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0653-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0656-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0654-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0657-additions-to-PlayerGameModeChangeEvent.patch similarity index 96% rename from patches/server/0654-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0657-additions-to-PlayerGameModeChangeEvent.patch index 144f2f1b32..723ea2b77a 100644 --- a/patches/server/0654-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0657-additions-to-PlayerGameModeChangeEvent.patch @@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d0bb0c098f5a7fd9d0468cddc75d2fbca2880a8a..447575a3753f92d6d4414672a1ac3dc512112a4a 100644 +index 670048f5114ec1dcb0d6e0bb6173ba9d657e6eb1..b6230ce81d50da84b2db9446232c83bde3632a91 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1804,8 +1804,15 @@ public class ServerPlayer extends Player { +@@ -1805,8 +1805,15 @@ public class ServerPlayer extends Player { } public boolean setGameMode(GameType gameMode) { @@ -66,7 +66,7 @@ index d0bb0c098f5a7fd9d0468cddc75d2fbca2880a8a..447575a3753f92d6d4414672a1ac3dc5 } else { this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId())); if (gameMode == GameType.SPECTATOR) { -@@ -1817,7 +1824,7 @@ public class ServerPlayer extends Player { +@@ -1818,7 +1825,7 @@ public class ServerPlayer extends Player { this.onUpdateAbilities(); this.updateEffectVisibility(); @@ -75,7 +75,7 @@ index d0bb0c098f5a7fd9d0468cddc75d2fbca2880a8a..447575a3753f92d6d4414672a1ac3dc5 } } -@@ -2199,6 +2206,16 @@ public class ServerPlayer extends Player { +@@ -2200,6 +2207,16 @@ public class ServerPlayer extends Player { } public void loadGameTypes(@Nullable CompoundTag nbt) { diff --git a/patches/server/0655-ItemStack-repair-check-API.patch b/patches/server/0658-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0655-ItemStack-repair-check-API.patch rename to patches/server/0658-ItemStack-repair-check-API.patch diff --git a/patches/server/0656-More-Enchantment-API.patch b/patches/server/0659-More-Enchantment-API.patch similarity index 100% rename from patches/server/0656-More-Enchantment-API.patch rename to patches/server/0659-More-Enchantment-API.patch diff --git a/patches/server/0657-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0660-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0657-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0660-Fix-and-optimise-world-force-upgrading.patch index 4bd6506b3a..6fa8f71735 100644 --- a/patches/server/0657-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0660-Fix-and-optimise-world-force-upgrading.patch @@ -274,7 +274,7 @@ index f685ab3cc6e4fd76e8dec3d2d3627a13715cda44..36a1d58dd238c835ce3cc9c2376a86a0 Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 877863aace3df7f50c6ad054023445bf09b1cef3..0562f00a4d3fc2c6d317f1a112e54e23046fda54 100644 +index f1713ceace84ecbe2e4a0dcde050c43a636e3595..fcdae82ecaaa86854a5cddcb652ed3bc388e33c3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -556,11 +556,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 100) ? 10 : 20; + } } + + public static int itemValidationDisplayNameLength = 8192; diff --git a/patches/server/0676-Line-Of-Sight-Changes.patch b/patches/server/0679-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0676-Line-Of-Sight-Changes.patch rename to patches/server/0679-Line-Of-Sight-Changes.patch diff --git a/patches/server/0677-add-per-world-spawn-limits.patch b/patches/server/0680-add-per-world-spawn-limits.patch similarity index 97% rename from patches/server/0677-add-per-world-spawn-limits.patch rename to patches/server/0680-add-per-world-spawn-limits.patch index 6ae56cba2f..f9914764c6 100644 --- a/patches/server/0677-add-per-world-spawn-limits.patch +++ b/patches/server/0680-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a121c3bd970b65783bf7482e022ca3c170309d66..bdecc8ea27253150d0b5c57fe7a018155739647f 100644 +index 12f8e5abab4a1f3ab1e1f71746b5bf0b3bf1506c..5d1d042cb2214951025512fa6751ee5899bdd7d7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -12,6 +12,7 @@ import net.minecraft.world.Difficulty; diff --git a/patches/server/0678-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0681-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0678-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0681-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0679-Add-more-LimitedRegion-API.patch b/patches/server/0682-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0679-Add-more-LimitedRegion-API.patch rename to patches/server/0682-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0680-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0683-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 91% rename from patches/server/0680-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0683-Fix-PlayerDropItemEvent-using-wrong-item.patch index 3219fb457d..bbca49d9c6 100644 --- a/patches/server/0680-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0683-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 447575a3753f92d6d4414672a1ac3dc512112a4a..7255e4baae551177d7536555986aaa0f8333f626 100644 +index b6230ce81d50da84b2db9446232c83bde3632a91..df0b08628d736b7f75120f1b9840784f6c472853 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2175,7 +2175,7 @@ public class ServerPlayer extends Player { +@@ -2176,7 +2176,7 @@ public class ServerPlayer extends Player { if (retainOwnership) { if (!itemstack1.isEmpty()) { diff --git a/patches/server/0681-Missing-Entity-Behavior-API.patch b/patches/server/0684-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0681-Missing-Entity-Behavior-API.patch rename to patches/server/0684-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0682-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0685-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0682-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0685-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0683-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0686-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0683-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0686-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0684-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0687-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0684-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0687-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0685-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0688-Fix-commands-from-signs-not-firing-command-events.patch similarity index 98% rename from patches/server/0685-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0688-Fix-commands-from-signs-not-firing-command-events.patch index 73fd764ba4..ccb7da2f55 100644 --- a/patches/server/0685-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0688-Fix-commands-from-signs-not-firing-command-events.patch @@ -10,10 +10,10 @@ This patch changes sign command logic so that `run_command` click events: - sends failure messages to the player who clicked the sign diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bdecc8ea27253150d0b5c57fe7a018155739647f..3af1cfc75af23edd3cbfbf202427856761b42ce7 100644 +index 5d1d042cb2214951025512fa6751ee5899bdd7d7..496d1669718c405b441d9280df755ab44aec69f4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -803,4 +803,9 @@ public class PaperWorldConfig { +@@ -812,4 +812,9 @@ public class PaperWorldConfig { private void fixInvulnerableEndCrystalExploit() { fixInvulnerableEndCrystalExploit = getBoolean("unsupported-settings.fix-invulnerable-end-crystal-exploit", fixInvulnerableEndCrystalExploit); } diff --git a/patches/server/0686-Adds-PlayerArmSwingEvent.patch b/patches/server/0689-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0686-Adds-PlayerArmSwingEvent.patch rename to patches/server/0689-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0687-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0690-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 95% rename from patches/server/0687-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0690-Fixes-kick-event-leave-message-not-being-sent.patch index 3f18d2d569..194ffd3b24 100644 --- a/patches/server/0687-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0690-Fixes-kick-event-leave-message-not-being-sent.patch @@ -39,10 +39,10 @@ index d66c9c09ae3874dd53ef298f94a0e5c6177f2b35..43cd0b67f31d0340893672c9bf5a0046 this.server.getPlayerList().broadcastMessage(PaperAdventure.asVanilla(quitMessage), ChatType.SYSTEM, Util.NIL_UUID); // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e84dfb907142a0cafbb211383ee04701496105aa..b1913ab35a21a63be72bfd8b7e2586846a62ffb6 100644 +index 8679eb594c6f001de19788e3b08c3c979dfeffe3..f135c9011801c07d1c3aaa326f49bc6018ad8727 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -586,6 +586,11 @@ public abstract class PlayerList { +@@ -587,6 +587,11 @@ public abstract class PlayerList { } public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer) { // Paper - return Component @@ -54,7 +54,7 @@ index e84dfb907142a0cafbb211383ee04701496105aa..b1913ab35a21a63be72bfd8b7e258684 ServerLevel worldserver = entityplayer.getLevel(); entityplayer.awardStat(Stats.LEAVE_GAME); -@@ -596,7 +601,7 @@ public abstract class PlayerList { +@@ -597,7 +602,7 @@ public abstract class PlayerList { entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper } diff --git a/patches/server/0688-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0691-Add-config-for-mobs-immune-to-default-effects.patch similarity index 98% rename from patches/server/0688-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0691-Add-config-for-mobs-immune-to-default-effects.patch index 605e51d56d..d68af96ab1 100644 --- a/patches/server/0688-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0691-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3af1cfc75af23edd3cbfbf202427856761b42ce7..c58b18cd75eca14ce61d59c6beffa34337917ddd 100644 +index 496d1669718c405b441d9280df755ab44aec69f4..ad51b56279c723538ba71c47f22b96f45f82204e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -667,6 +667,21 @@ public class PaperWorldConfig { diff --git a/patches/server/0689-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0692-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0689-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0692-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0690-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0693-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0690-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0693-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch similarity index 86% rename from patches/server/0691-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0694-Don-t-apply-cramming-damage-to-players.patch index 7c048e54a2..fb04119b33 100644 --- a/patches/server/0691-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch @@ -11,10 +11,10 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c58b18cd75eca14ce61d59c6beffa34337917ddd..f21bd06d7f0531e8ae0412377757a147e9db4e85 100644 +index ad51b56279c723538ba71c47f22b96f45f82204e..c6d9b4368446c4e97ab746e0b4d067dfd646edf4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -823,4 +823,9 @@ public class PaperWorldConfig { +@@ -832,4 +832,9 @@ public class PaperWorldConfig { private void showSignClickCommandFailureMessagesToPlayer() { showSignClickCommandFailureMessagesToPlayer = getBoolean("show-sign-click-command-failure-msgs-to-player", showSignClickCommandFailureMessagesToPlayer); } @@ -25,10 +25,10 @@ index c58b18cd75eca14ce61d59c6beffa34337917ddd..f21bd06d7f0531e8ae0412377757a147 + } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7255e4baae551177d7536555986aaa0f8333f626..6d920390ae8ac5d4388c1825c099b2461684eb9e 100644 +index df0b08628d736b7f75120f1b9840784f6c472853..2607dc36e0bd7a915afb0cc9e0f453a2b301c0bd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1434,7 +1434,7 @@ public class ServerPlayer extends Player { +@@ -1435,7 +1435,7 @@ public class ServerPlayer extends Player { @Override public boolean isInvulnerableTo(DamageSource damageSource) { diff --git a/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 98% rename from patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch index cf06ef74aa..a2c0f146e2 100644 --- a/patches/server/0692-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03 * Get a named timer for the specified tile entity type to track type specific timings. * @param entity diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f21bd06d7f0531e8ae0412377757a147e9db4e85..1f8f7735fbbb86583bd3ac1313e7e6adcfcb16d3 100644 +index c6d9b4368446c4e97ab746e0b4d067dfd646edf4..b27b25b22d062e32b56b3fd1b28c2d3597e9023a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -7,13 +7,18 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap; @@ -50,7 +50,7 @@ index f21bd06d7f0531e8ae0412377757a147e9db4e85..1f8f7735fbbb86583bd3ac1313e7e6ad import org.bukkit.configuration.file.YamlConfiguration; import org.spigotmc.SpigotWorldConfig; -@@ -828,4 +833,57 @@ public class PaperWorldConfig { +@@ -837,4 +842,57 @@ public class PaperWorldConfig { private void playerCrammingDamage() { allowPlayerCrammingDamage = getBoolean("allow-player-cramming-damage", allowPlayerCrammingDamage); } diff --git a/patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0693-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0694-Stinger-API.patch b/patches/server/0697-Stinger-API.patch similarity index 100% rename from patches/server/0694-Stinger-API.patch rename to patches/server/0697-Stinger-API.patch diff --git a/patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0695-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0696-Add-System.out-err-catcher.patch b/patches/server/0699-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0696-Add-System.out-err-catcher.patch rename to patches/server/0699-Add-System.out-err-catcher.patch diff --git a/patches/server/0697-Fix-test-not-bootstrapping.patch b/patches/server/0700-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0697-Fix-test-not-bootstrapping.patch rename to patches/server/0700-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0698-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0699-Improve-boat-collision-performance.patch b/patches/server/0702-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0699-Improve-boat-collision-performance.patch rename to patches/server/0702-Improve-boat-collision-performance.patch diff --git a/patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0700-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0701-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0702-Add-PlayerSetSpawnEvent.patch b/patches/server/0705-Add-PlayerSetSpawnEvent.patch similarity index 95% rename from patches/server/0702-Add-PlayerSetSpawnEvent.patch rename to patches/server/0705-Add-PlayerSetSpawnEvent.patch index 48e4f24d19..a2c0b45f63 100644 --- a/patches/server/0702-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0705-Add-PlayerSetSpawnEvent.patch @@ -18,10 +18,10 @@ index e95f2222814e104bf9194a96385737dffe2cb2b5..249ab7357aa19d87179fa4c3ae89d9d3 String string = resourceKey.location().toString(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6d920390ae8ac5d4388c1825c099b2461684eb9e..e5025e37fe13495c5ecd84af20294857f49bd2e3 100644 +index 2607dc36e0bd7a915afb0cc9e0f453a2b301c0bd..ea724b1781ea256c991fe47aa044183e20ae4d82 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1275,7 +1275,7 @@ public class ServerPlayer extends Player { +@@ -1276,7 +1276,7 @@ public class ServerPlayer extends Player { } else if (this.bedBlocked(blockposition, enumdirection)) { return Either.left(Player.BedSleepingProblem.OBSTRUCTED); } else { @@ -30,7 +30,7 @@ index 6d920390ae8ac5d4388c1825c099b2461684eb9e..e5025e37fe13495c5ecd84af20294857 if (this.level.isDay()) { return Either.left(Player.BedSleepingProblem.NOT_POSSIBLE_NOW); } else { -@@ -2103,12 +2103,33 @@ public class ServerPlayer extends Player { +@@ -2104,12 +2104,33 @@ public class ServerPlayer extends Player { return this.respawnForced; } @@ -67,10 +67,10 @@ index 6d920390ae8ac5d4388c1825c099b2461684eb9e..e5025e37fe13495c5ecd84af20294857 this.respawnPosition = pos; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b1913ab35a21a63be72bfd8b7e2586846a62ffb6..898a81a23755f9ab1d1df34a422ef61010fe009f 100644 +index f135c9011801c07d1c3aaa326f49bc6018ad8727..bacfdafadaff4ab11fdc91b6a2614ca1dfb65596 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -890,7 +890,7 @@ public abstract class PlayerList { +@@ -891,7 +891,7 @@ public abstract class PlayerList { f1 = (float) Mth.wrapDegrees(Mth.atan2(vec3d1.z, vec3d1.x) * 57.2957763671875D - 90.0D); } diff --git a/patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0703-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0704-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0707-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0704-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0707-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch similarity index 95% rename from patches/server/0705-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0708-Config-option-for-Piglins-guarding-chests.patch index 0fa2669f2e..695978e24a 100644 --- a/patches/server/0705-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1f8f7735fbbb86583bd3ac1313e7e6adcfcb16d3..569b108b22cfa21d9368b7f7e1bf785ae7dd15fa 100644 +index b27b25b22d062e32b56b3fd1b28c2d3597e9023a..0c430c1ef426bf2127e94063c966ba0935b3a39f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -78,6 +78,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0706-Added-EntityDamageItemEvent.patch b/patches/server/0709-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0706-Added-EntityDamageItemEvent.patch rename to patches/server/0709-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0707-Optimize-indirect-passenger-iteration.patch b/patches/server/0710-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0707-Optimize-indirect-passenger-iteration.patch rename to patches/server/0710-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0708-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch similarity index 93% rename from patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch index 580d1201fa..7cb33fcb32 100644 --- a/patches/server/0709-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 569b108b22cfa21d9368b7f7e1bf785ae7dd15fa..7eacd9265a8d4cee6e3c3608ab08603a3b6e5a15 100644 +index 0c430c1ef426bf2127e94063c966ba0935b3a39f..8cb3767551d36cc2c7c07548182d817f9843bf50 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -819,6 +819,11 @@ public class PaperWorldConfig { +@@ -828,6 +828,11 @@ public class PaperWorldConfig { mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit); } diff --git a/patches/server/0710-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0710-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0713-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0711-Clear-bucket-NBT-after-dispense.patch b/patches/server/0714-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0711-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0714-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0712-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0715-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch similarity index 100% rename from patches/server/0712-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch rename to patches/server/0715-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch diff --git a/patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0713-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0714-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch similarity index 100% rename from patches/server/0714-Move-BlockPistonRetractEvent-to-fix-duplication.patch rename to patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch diff --git a/patches/server/0715-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0715-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0716-Add-BlockBreakBlockEvent.patch b/patches/server/0719-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0716-Add-BlockBreakBlockEvent.patch rename to patches/server/0719-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0717-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0717-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0718-More-CommandBlock-API.patch b/patches/server/0721-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0718-More-CommandBlock-API.patch rename to patches/server/0721-More-CommandBlock-API.patch diff --git a/patches/server/0719-Add-missing-team-sidebar-display-slots.patch b/patches/server/0722-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0719-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0722-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0720-Add-back-EntityPortalExitEvent.patch b/patches/server/0723-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0720-Add-back-EntityPortalExitEvent.patch rename to patches/server/0723-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0721-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0721-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0722-Get-entity-default-attributes.patch b/patches/server/0725-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0722-Get-entity-default-attributes.patch rename to patches/server/0725-Get-entity-default-attributes.patch diff --git a/patches/server/0723-Left-handed-API.patch b/patches/server/0726-Left-handed-API.patch similarity index 100% rename from patches/server/0723-Left-handed-API.patch rename to patches/server/0726-Left-handed-API.patch diff --git a/patches/server/0724-Add-advancement-display-API.patch b/patches/server/0727-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0724-Add-advancement-display-API.patch rename to patches/server/0727-Add-advancement-display-API.patch diff --git a/patches/server/0725-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0725-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0726-Add-critical-damage-API.patch b/patches/server/0729-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0726-Add-critical-damage-API.patch rename to patches/server/0729-Add-critical-damage-API.patch diff --git a/patches/server/0727-Fix-issues-with-mob-conversion.patch b/patches/server/0730-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0727-Fix-issues-with-mob-conversion.patch rename to patches/server/0730-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0728-Add-isCollidable-methods-to-various-places.patch b/patches/server/0731-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0728-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0731-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0729-Goat-ram-API.patch b/patches/server/0732-Goat-ram-API.patch similarity index 100% rename from patches/server/0729-Goat-ram-API.patch rename to patches/server/0732-Goat-ram-API.patch diff --git a/patches/server/0730-Add-API-for-resetting-a-single-score.patch b/patches/server/0733-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0730-Add-API-for-resetting-a-single-score.patch rename to patches/server/0733-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0731-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0731-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0732-Vanilla-command-permission-fixes.patch b/patches/server/0735-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0732-Vanilla-command-permission-fixes.patch rename to patches/server/0735-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0733-Make-CallbackExecutor-strict-again.patch b/patches/server/0736-Make-CallbackExecutor-strict-again.patch similarity index 95% rename from patches/server/0733-Make-CallbackExecutor-strict-again.patch rename to patches/server/0736-Make-CallbackExecutor-strict-again.patch index 867395d7e0..bd553fabdc 100644 --- a/patches/server/0733-Make-CallbackExecutor-strict-again.patch +++ b/patches/server/0736-Make-CallbackExecutor-strict-again.patch @@ -10,7 +10,7 @@ schedules. Effectively, use the callback executor as a tool of finding issues rather than hiding these issues. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 373ac9909666302fd6b9c6891866a9baf3977316..5eeabc64d5067361c27b68e4268de3596c29787e 100644 +index c637a9b0a978700a0cd941be22208ae3c01f6eb2..e4005ead8dafb4ae02ad5bbfb8e7721dbc734758 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -158,17 +158,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0734-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 92% rename from patches/server/0734-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch index ceb37b600d..f8647890e9 100644 --- a/patches/server/0734-Do-not-allow-the-server-to-unload-chunks-at-request-.patch +++ b/patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch @@ -10,7 +10,7 @@ to be unloaded will simply be unloaded next tick, rather than immediately. diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 6f4c2d4eb5f42cd661ec6dd6c354060811e59dad..ccf5caeca8d3a0b045296d550fbd0e447fd34309 100644 +index 930291a0844acbd0491e641008727223b0010a60..1a27a694fde340082c9ab60a63abce39bab22739 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -875,6 +875,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0735-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 96% rename from patches/server/0735-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 8fa3501931..fa9789c8eb 100644 --- a/patches/server/0735-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,10 +28,10 @@ index 5fd96595d44a47b43c5787c9dd1f4f5cfe6943fa..5d57431a369207a2f207f89682f08610 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e5025e37fe13495c5ecd84af20294857f49bd2e3..9897435b97459fa3a9376fbdc93cba68d7f6f46d 100644 +index ea724b1781ea256c991fe47aa044183e20ae4d82..5270a8b1ee2cc426b8e0b5d34db4d81843fb4230 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1576,6 +1576,18 @@ public class ServerPlayer extends Player { +@@ -1577,6 +1577,18 @@ public class ServerPlayer extends Player { this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId)); this.doCloseContainer(); } diff --git a/patches/server/0736-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 90% rename from patches/server/0736-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch index f10caff2f3..be9a9e31a7 100644 --- a/patches/server/0736-Correctly-handle-recursion-for-chunkholder-updates.patch +++ b/patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch @@ -8,10 +8,10 @@ cause a recursive call which would handle the increase but then the caller would think the chunk would be unloaded. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 04fe3432216c9a1e4d3dbfa159faf2332de422fb..870c601c5ab839d7ee3cbdf8885bb665c89a441d 100644 +index 41333234cdda8127a239f591d8d2cd304e341852..0b4c10b71d29d01408cafb38cdc7e48e6f90d8a8 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java -@@ -419,8 +419,10 @@ public class ChunkHolder { +@@ -426,8 +426,10 @@ public class ChunkHolder { playerchunkmap.onFullChunkStatusChange(this.pos, playerchunk_state); } @@ -22,7 +22,7 @@ index 04fe3432216c9a1e4d3dbfa159faf2332de422fb..870c601c5ab839d7ee3cbdf8885bb665 ChunkStatus chunkstatus = ChunkHolder.getStatus(this.oldTicketLevel); ChunkStatus chunkstatus1 = ChunkHolder.getStatus(this.ticketLevel); boolean flag = this.oldTicketLevel <= ChunkMap.MAX_CHUNK_DISTANCE; -@@ -462,6 +464,12 @@ public class ChunkHolder { +@@ -469,6 +471,12 @@ public class ChunkHolder { // Run callback right away if the future was already done chunkStorage.callbackExecutor.run(); diff --git a/patches/server/0737-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch similarity index 100% rename from patches/server/0737-Separate-lookup-locking-from-state-access-in-UserCac.patch rename to patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch diff --git a/patches/server/0738-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 88% rename from patches/server/0738-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch index babcd3b261..6b98e4afbb 100644 --- a/patches/server/0738-Fix-chunks-refusing-to-unload-at-low-TPS.patch +++ b/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch @@ -10,10 +10,10 @@ chunk future to complete. We can simply schedule to the immediate executor to get this effect, rather than the main mailbox. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 5eeabc64d5067361c27b68e4268de3596c29787e..66dd1759bb38ebcba49e5858121bfa2bad1ae2f3 100644 +index e4005ead8dafb4ae02ad5bbfb8e7721dbc734758..cda41112ce58f4572c36c5d33e16cf13bc10b1ec 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1220,9 +1220,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1226,9 +1226,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider return chunk; }); diff --git a/patches/server/0739-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 95% rename from patches/server/0739-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch index 4399fcb3e7..59345055f6 100644 --- a/patches/server/0739-Do-not-allow-ticket-level-changes-while-unloading-pl.patch +++ b/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch @@ -8,7 +8,7 @@ Sync loading the chunk at this stage would cause it to load older data, as well as screwing our region state. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 66dd1759bb38ebcba49e5858121bfa2bad1ae2f3..f7ea3b293dd042127a2a674feee6777dfb6619c3 100644 +index cda41112ce58f4572c36c5d33e16cf13bc10b1ec..f67a7ba5e95a3ba4d3589c6df1012bdc98559747 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -294,6 +294,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -49,7 +49,7 @@ index 66dd1759bb38ebcba49e5858121bfa2bad1ae2f3..f7ea3b293dd042127a2a674feee6777d } }; diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index ccf5caeca8d3a0b045296d550fbd0e447fd34309..64ea7ec9fdb5a90a7806574280a343d0a608f3b3 100644 +index 1a27a694fde340082c9ab60a63abce39bab22739..a2f7f3a153b512bf1cd96ec4bbe3173aa467825a 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -820,6 +820,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0740-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 91% rename from patches/server/0740-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch index 7658c9344b..e3a6543fe8 100644 --- a/patches/server/0740-Do-not-allow-ticket-level-changes-when-updating-chun.patch +++ b/patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch @@ -8,10 +8,10 @@ This WILL cause state corruption if it happens. So, don't allow it. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 870c601c5ab839d7ee3cbdf8885bb665c89a441d..4e3d4195db3660edd2b9ee850b774be91455fb84 100644 +index 0b4c10b71d29d01408cafb38cdc7e48e6f90d8a8..dcd95e4cb169fa5eefc34b6fff8f21893052576b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java -@@ -399,7 +399,13 @@ public class ChunkHolder { +@@ -406,7 +406,13 @@ public class ChunkHolder { CompletableFuture completablefuture1 = new CompletableFuture(); completablefuture1.thenRunAsync(() -> { @@ -25,7 +25,7 @@ index 870c601c5ab839d7ee3cbdf8885bb665c89a441d..4e3d4195db3660edd2b9ee850b774be9 }, executor); this.pendingFullStateConfirmation = completablefuture1; completablefuture.thenAccept((either) -> { -@@ -416,7 +422,12 @@ public class ChunkHolder { +@@ -423,7 +429,12 @@ public class ChunkHolder { private void demoteFullChunk(ChunkMap playerchunkmap, ChunkHolder.FullChunkStatus playerchunk_state) { this.pendingFullStateConfirmation.cancel(false); diff --git a/patches/server/0741-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0741-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0742-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0745-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0742-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0745-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0743-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0746-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0743-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0746-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0744-Optimise-general-POI-access.patch b/patches/server/0747-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0744-Optimise-general-POI-access.patch rename to patches/server/0747-Optimise-general-POI-access.patch diff --git a/patches/server/0745-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0748-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0745-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0748-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0746-Add-more-async-catchers.patch b/patches/server/0749-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0746-Add-more-async-catchers.patch rename to patches/server/0749-Add-more-async-catchers.patch diff --git a/patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0747-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0750-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0748-Execute-chunk-tasks-mid-tick.patch b/patches/server/0751-Execute-chunk-tasks-mid-tick.patch similarity index 97% rename from patches/server/0748-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0751-Execute-chunk-tasks-mid-tick.patch index 9d7c6b59de..7d825bd555 100644 --- a/patches/server/0748-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0751-Execute-chunk-tasks-mid-tick.patch @@ -19,7 +19,7 @@ index b27021a42cbed3f0648a8d0903d00d03922ae221..eada966d7f108a6081be7a848f5c1dfc private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 983bc6b8600489696899b5aaa09e7f7b674d2e42..86b57776a42261053237d62f3b666793457c5e2f 100644 +index f4b7488963a6f16016d6ede80072bd3722c0caa3..7e15aa7c156096decdaa8596f242a4b2e5ea97b4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -331,6 +331,76 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop allChunks = new ArrayList<>(visibleChunks.values()); List players = world.players; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f7ea3b293dd042127a2a674feee6777dfb6619c3..050ea3d2b52e6b2ee8158f71fe500e1684a1c9a6 100644 +index f67a7ba5e95a3ba4d3589c6df1012bdc98559747..0c629a4f835c735f9ff9e5f687c8376dbadd447d 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -118,9 +118,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -140,7 +140,7 @@ index f7ea3b293dd042127a2a674feee6777dfb6619c3..050ea3d2b52e6b2ee8158f71fe500e16 this.modified = false; return true; } -@@ -1376,7 +1388,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1382,7 +1394,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.viewDistance = j; this.distanceManager.updatePlayerTickets(this.viewDistance); @@ -149,7 +149,7 @@ index f7ea3b293dd042127a2a674feee6777dfb6619c3..050ea3d2b52e6b2ee8158f71fe500e16 while (objectiterator.hasNext()) { ChunkHolder playerchunk = (ChunkHolder) objectiterator.next(); -@@ -1418,7 +1430,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1424,7 +1436,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public int size() { @@ -158,7 +158,7 @@ index f7ea3b293dd042127a2a674feee6777dfb6619c3..050ea3d2b52e6b2ee8158f71fe500e16 } public DistanceManager getDistanceManager() { -@@ -1426,13 +1438,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1432,13 +1444,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected Iterable getChunks() { diff --git a/patches/server/0750-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0753-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0750-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0753-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0751-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0754-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0751-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0754-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0752-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0755-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0752-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0755-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0753-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0756-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0753-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0756-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0754-Distance-manager-tick-timings.patch b/patches/server/0757-Distance-manager-tick-timings.patch similarity index 96% rename from patches/server/0754-Distance-manager-tick-timings.patch rename to patches/server/0757-Distance-manager-tick-timings.patch index 65d0a79bc2..73aa285fc4 100644 --- a/patches/server/0754-Distance-manager-tick-timings.patch +++ b/patches/server/0757-Distance-manager-tick-timings.patch @@ -19,7 +19,7 @@ index eada966d7f108a6081be7a848f5c1dfcb1eed676..a977f7483f37df473096b2234dc1308b public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks"); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 64ea7ec9fdb5a90a7806574280a343d0a608f3b3..7e9a5499bec4eb33c25f610465c6bbfb4ccd18df 100644 +index a2f7f3a153b512bf1cd96ec4bbe3173aa467825a..204fc634fdbcff8ff9f4b570c50a76401dcc8bd6 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -821,6 +821,7 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0755-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0758-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0755-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0758-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0756-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0759-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0756-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0759-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0757-Add-packet-limiter-config.patch b/patches/server/0760-Add-packet-limiter-config.patch similarity index 98% rename from patches/server/0757-Add-packet-limiter-config.patch rename to patches/server/0760-Add-packet-limiter-config.patch index 109cd8e165..fcb23b30b4 100644 --- a/patches/server/0757-Add-packet-limiter-config.patch +++ b/patches/server/0760-Add-packet-limiter-config.patch @@ -24,10 +24,10 @@ and an action can be defined: DROP or KICK If interval or rate are less-than 0, the limit is ignored diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ce2cc249439d525d2089302f3febde758aa96929..e311e1dd8b0e07b8787ec42a58c4e6559ac661ed 100644 +index 90e29dd8452c052dfd32fb065094721be0a750f3..5dc5b90e314f9df291a3020c0ca1837b8157ad1f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -507,4 +507,102 @@ public class PaperConfig { +@@ -518,4 +518,102 @@ public class PaperConfig { itemValidationBookAuthorLength = getInt("settings.item-validation.book.author", itemValidationBookAuthorLength); itemValidationBookPageLength = getInt("settings.item-validation.book.page", itemValidationBookPageLength); } diff --git a/patches/server/0758-Lag-compensate-block-breaking.patch b/patches/server/0761-Lag-compensate-block-breaking.patch similarity index 98% rename from patches/server/0758-Lag-compensate-block-breaking.patch rename to patches/server/0761-Lag-compensate-block-breaking.patch index a11901e0ec..36563b0d1f 100644 --- a/patches/server/0758-Lag-compensate-block-breaking.patch +++ b/patches/server/0761-Lag-compensate-block-breaking.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Lag compensate block breaking Use time instead of ticks if ticks fall behind diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e311e1dd8b0e07b8787ec42a58c4e6559ac661ed..dbf8f1b605b8abbfd668e05a3e6fc004784f934a 100644 +index 5dc5b90e314f9df291a3020c0ca1837b8157ad1f..a1c90c8199d1d8e4d5ebdeda0da04ed9370aac04 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -605,4 +605,10 @@ public class PaperConfig { +@@ -616,4 +616,10 @@ public class PaperConfig { } } } diff --git a/patches/server/0759-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0762-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 93% rename from patches/server/0759-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0762-Use-correct-LevelStem-registry-when-loading-default-.patch index be669ea456..6617298ab2 100644 --- a/patches/server/0759-Use-correct-LevelStem-registry-when-loading-default-.patch +++ b/patches/server/0762-Use-correct-LevelStem-registry-when-loading-default-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use correct LevelStem registry when loading default diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 86b57776a42261053237d62f3b666793457c5e2f..58fa998b07d08c8ca3fd1e3f6fb7ee94de359cd6 100644 +index 7e15aa7c156096decdaa8596f242a4b2e5ea97b4..309e960ba7678e09d7eb7af11f57e5c3ff4f3d9e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -634,7 +634,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop