diff --git a/patches/removed/1.18/0445-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/removed/1.18/0445-Optimize-WorldBorder-collision-checks-and-air.patch index e138e957a..65d3ef949 100644 --- a/patches/removed/1.18/0445-Optimize-WorldBorder-collision-checks-and-air.patch +++ b/patches/removed/1.18/0445-Optimize-WorldBorder-collision-checks-and-air.patch @@ -4,6 +4,9 @@ Date: Sun, 10 May 2020 22:49:05 -0400 Subject: [PATCH] Optimize WorldBorder collision checks and air +# 1.18: All 3 hunks don't seem to apply anymore. +(CollisionSpliterator renamed, kinda, to BlockCollisions) + diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index 890502222191ce1ab5a598bf040fc462fc915e31..19a6b2c686e6421624282d0536dfdd3320da4ec6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/patches/removed/1.18/0836-Cache-palette-array.patch b/patches/removed/1.18/0836-Cache-palette-array.patch index d9d2dd18c..6ae3d7da6 100644 --- a/patches/removed/1.18/0836-Cache-palette-array.patch +++ b/patches/removed/1.18/0836-Cache-palette-array.patch @@ -7,7 +7,8 @@ Instead of allocating the 4KB for every chunk section, cache it locally and reuse it for other chunk sections to save on allocations. These allocations add up very quickly when saving chunks frequently. -1.18: PalettedContainer changed +1.18: PalettedContainer changed, mojang introduced a Codec into the mix to make things +more complicated. Needs a complete rework, but probably still viable as a perf improvement. diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java index c9e942669458668a184aaec3bc0a5509dd6ab5f0..ac84d49d7819666a89cacbe9ef1199cf22ac2ac3 100644 diff --git a/patches/removed/1.18/0463-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/removed/1.18/No longer needed/0463-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from patches/removed/1.18/0463-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to patches/removed/1.18/No longer needed/0463-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/patches/removed/1.18/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/removed/1.18/No longer needed/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 98% rename from patches/removed/1.18/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/removed/1.18/No longer needed/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch index 096c6fb00..441425843 100644 --- a/patches/removed/1.18/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch +++ b/patches/removed/1.18/No longer needed/0705-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch @@ -34,6 +34,8 @@ This should fix some problems converting old data, as the changes here are going to prevent the chunk from being regenerated incorrectly. +# 1.18: No longer needed, DataConverter handles this + diff --git a/src/main/java/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java b/src/main/java/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java index 081bcae48ae34d8354635ea57952f09f14f7fa7a..a4305f58f793e1577de5e13132381ce81304cae4 100644 --- a/src/main/java/net/minecraft/util/datafix/fixes/ChunkToProtochunkFix.java diff --git a/patches/removed/1.18/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 63% rename from patches/removed/1.18/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 882a5a408..2b1b4708c 100644 --- a/patches/removed/1.18/0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/patches/server/0133-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -3,23 +3,21 @@ From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue -#NOTE: Vanilla now does incremental chunk saves - diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index fb3b0693abb6f2f044d39508b727fb3a2ad16823..4a2739edb01c97c99524dc96decbdcb12e0b7d4f 100644 +index 13038723347cdbada65611d9de542d35d94084a0..e954365c9fe7a5f442c4ab31ab8c8db9684409e8 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -215,7 +215,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -221,7 +221,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.playerMap = new PlayerMap(); this.entityMap = new Int2ObjectOpenHashMap(); this.chunkTypeCache = new Long2ByteOpenHashMap(); - this.unloadQueue = Queues.newConcurrentLinkedQueue(); + this.unloadQueue = new com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue<>(); // Paper - need constant-time size() this.structureManager = structureManager; - File file = session.getDimensionPath(world.dimension()); + Path path = session.getDimensionPath(world.dimension()); -@@ -518,7 +518,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -567,7 +567,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Spigot start org.spigotmc.SlackActivityAccountant activityAccountant = this.level.getServer().slackActivityAccountant; activityAccountant.startActivity(0.5); @@ -28,13 +26,12 @@ index fb3b0693abb6f2f044d39508b727fb3a2ad16823..4a2739edb01c97c99524dc96decbdcb1 // Spigot end while (longiterator.hasNext()) { // Spigot long j = longiterator.nextLong(); -@@ -540,7 +540,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -587,7 +587,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + } + activityAccountant.endActivity(); // Spigot + +- int k = Math.max(0, this.unloadQueue.size() - 2000); ++ int k = Math.max(0, Math.min(100, this.unloadQueue.size() - (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR))); // Paper - Target this queue as well Runnable runnable; -- while ((shouldKeepTicking.getAsBoolean() || this.unloadQueue.size() > 2000) && (runnable = (Runnable) this.unloadQueue.poll()) != null) { -+ int queueTarget = Math.min(this.unloadQueue.size() - 100, (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Target this queue as well -+ while ((shouldKeepTicking.getAsBoolean() || this.unloadQueue.size() > queueTarget) && (runnable = (Runnable)this.unloadQueue.poll()) != null) { // Paper - Target this queue as well - runnable.run(); - } - diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch similarity index 98% rename from patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch index c5fd40c0f..7fa4775b1 100644 --- a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/server/0134-Properly-handle-async-calls-to-restart-the-server.patch @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 625a133eacf38fb8b11f4451e063dc21150f0e79..450e7165bd4806a4ed39a1b25486b408cc760460 100644 +index 0adfdaf3edcd10a3a7566947d58d83c623107d94..6d57327ca2450352a0ff153da00cc1d3b3ac1aca 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -229,6 +229,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop extends Craft diff --git a/patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0336-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0337-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0337-Configurable-projectile-relative-velocity.patch b/patches/server/0338-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0337-Configurable-projectile-relative-velocity.patch rename to patches/server/0338-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0338-offset-item-frame-ticking.patch b/patches/server/0339-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0338-offset-item-frame-ticking.patch rename to patches/server/0339-offset-item-frame-ticking.patch diff --git a/patches/server/0339-Fix-MC-158900.patch b/patches/server/0340-Fix-MC-158900.patch similarity index 94% rename from patches/server/0339-Fix-MC-158900.patch rename to patches/server/0340-Fix-MC-158900.patch index ac902b15e..b30fdccd9 100644 --- a/patches/server/0339-Fix-MC-158900.patch +++ b/patches/server/0340-Fix-MC-158900.patch @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2278153bd4113933a106f60f76a1d342684c272e..494b18a3dfa05b5e6ecbb9b99abf06bfe6e1d166 100644 +index 00a221d7523c5b57ca53cc1cecbd3e683cccc8cb..5d4ef973781eac558c1e8d749f751c04a67c4693 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -606,8 +606,10 @@ public abstract class PlayerList { diff --git a/patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0340-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0341-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0341-Dont-send-unnecessary-sign-update.patch b/patches/server/0342-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0341-Dont-send-unnecessary-sign-update.patch rename to patches/server/0342-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0342-Add-option-to-disable-pillager-patrols.patch b/patches/server/0343-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0342-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0343-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from patches/server/0343-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0344-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0344-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0345-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0345-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0346-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0346-Duplicate-UUID-Resolve-Option.patch b/patches/server/0347-Duplicate-UUID-Resolve-Option.patch similarity index 99% rename from patches/server/0346-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0347-Duplicate-UUID-Resolve-Option.patch index 491e45373..e70621fba 100644 --- a/patches/server/0346-Duplicate-UUID-Resolve-Option.patch +++ b/patches/server/0347-Duplicate-UUID-Resolve-Option.patch @@ -83,7 +83,7 @@ index 5628ddebd2a24dc8461c1bd4b0571aa5efd3b418..a0b04a04f90ef79edae77e6ab4cddd2a private void countAllMobsForSpawning() { countAllMobsForSpawning = getBoolean("count-all-mobs-for-spawning", false); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a89af36c461432045fb4d00c0517db5c197245ce..f7b65c62002a8907c1b38b6c4ea67455eb3d807c 100644 +index 9f2c9a1e32e1bfbeeda8e8f733f04d7f5347bbe9..f0c4e98a6d5c448850a72ba90fb68c512fff8310 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0347-Optimize-Hoppers.patch b/patches/server/0348-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0347-Optimize-Hoppers.patch rename to patches/server/0348-Optimize-Hoppers.patch diff --git a/patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0348-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0349-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0349-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0350-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0350-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0351-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 97% rename from patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch index e36f8ff33..369500bf2 100644 --- a/patches/server/0351-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/patches/server/0352-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index b44d621fc8a5194622775b7903de083cca999022..9a6f4c0bcfe8ce331ba7f6c92e527addcf65c911 100644 +index 3e631d55d30831a4063e23f9dbc7a315d11a7b68..cf86755050632b158576849b786079787db11763 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -75,6 +75,18 @@ public class ChunkSerializer { diff --git a/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 94% rename from patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch index b218ba377..310c2e373 100644 --- a/patches/server/0352-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/patches/server/0353-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 53067edd56a4b7571f693c593c0f103567d589ec..3b43e64766e7b9e0444ebee12deee7f12fe5ddb8 100644 +index 68c0f332c176030cd9adfb18a56108ce0931c332..e6408251ed836715f324b1c1e49ff2473f0963ae 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -382,6 +382,14 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0353-Fix-items-not-falling-correctly.patch b/patches/server/0354-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0353-Fix-items-not-falling-correctly.patch rename to patches/server/0354-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0354-Lag-compensate-eating.patch b/patches/server/0355-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0354-Lag-compensate-eating.patch rename to patches/server/0355-Lag-compensate-eating.patch diff --git a/patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0355-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0356-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0356-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0357-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0357-Add-effect-to-block-break-naturally.patch b/patches/server/0358-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0357-Add-effect-to-block-break-naturally.patch rename to patches/server/0358-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0358-Entity-Activation-Range-2.0.patch b/patches/server/0359-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0358-Entity-Activation-Range-2.0.patch rename to patches/server/0359-Entity-Activation-Range-2.0.patch index 5105e9b13..3ef1236c1 100644 --- a/patches/server/0358-Entity-Activation-Range-2.0.patch +++ b/patches/server/0359-Entity-Activation-Range-2.0.patch @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 02ebc7b880f2528ae9cec7e8b4960b70dabf728e..37e9ef7b6378c0dca958426e223fb181b6ca12ff 100644 +index e6408251ed836715f324b1c1e49ff2473f0963ae..db123ef36fc4cb0206349ac696572714b806454c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; @@ -690,7 +690,7 @@ index 84ce3d38d5decb4a2f9fae78e0ef5d715860dc7d..e0302f82356e8cba848aa8cec1e821e0 isActive = false; } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ee8c84770b9b7fb9f3763e378f399da58f042b06..6d36aa5006d3adc3ff30d196bdfd287ad38a564a 100644 +index 1414c7cd14ef3d8ce22e6c146c942d12901d4811..6dd8adabc23931c8e4b8f448bd867207ed25c385 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -193,13 +193,59 @@ public class SpigotWorldConfig diff --git a/patches/server/0359-Increase-Light-Queue-Size.patch b/patches/server/0360-Increase-Light-Queue-Size.patch similarity index 95% rename from patches/server/0359-Increase-Light-Queue-Size.patch rename to patches/server/0360-Increase-Light-Queue-Size.patch index eef59f909..2697c5a05 100644 --- a/patches/server/0359-Increase-Light-Queue-Size.patch +++ b/patches/server/0360-Increase-Light-Queue-Size.patch @@ -29,7 +29,7 @@ index 7dbb7f0e476c82fcbec7b51b62be18adab2fac72..c81364946460a6366bf70457c2025d42 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4661d571cd4047c6b7d76de7ba0cb34ada348d63..758a972589b607447dc507c6c4f4b2a62f6a2832 100644 +index e31eab1baaa77dfb6a3e804481d91b91b6878f65..b80a7d98d4b088e3cc98c3d6f9b053974a71c568 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -812,7 +812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> completablefuture = (CompletableFuture) this.futures.get(i); diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 1e183b8a776de996bdb63d2ab892e63b9a4fb0f0..78d1fd9155f32fc8f98d9dc87116630a17b60f10 100644 +index b1ae9e1aa68aaa0435ecdd50d78f82d4e36441bf..9a247feffce5ba08064afaa96053feb22dd52716 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -101,6 +101,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana diff --git a/patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0458-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0459-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0459-Support-old-UUID-format-for-NBT.patch b/patches/server/0460-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0459-Support-old-UUID-format-for-NBT.patch rename to patches/server/0460-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0460-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0461-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0461-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0462-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0462-Remove-some-streams-from-structures.patch b/patches/server/0463-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0462-Remove-some-streams-from-structures.patch rename to patches/server/0463-Remove-some-streams-from-structures.patch diff --git a/patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0463-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0464-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0464-Support-components-in-ItemMeta.patch b/patches/server/0465-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0464-Support-components-in-ItemMeta.patch rename to patches/server/0465-Support-components-in-ItemMeta.patch diff --git a/patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0465-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0466-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0466-Add-entity-liquid-API.patch b/patches/server/0467-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0466-Add-entity-liquid-API.patch rename to patches/server/0467-Add-entity-liquid-API.patch diff --git a/patches/server/0467-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0468-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0467-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0468-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0468-Spawn-player-in-correct-world-on-login.patch b/patches/server/0469-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0468-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0469-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0469-Add-PrepareResultEvent.patch b/patches/server/0470-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0469-Add-PrepareResultEvent.patch rename to patches/server/0470-Add-PrepareResultEvent.patch diff --git a/patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0470-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index b97a26c23..3fcd3c8b1 100644 --- a/patches/server/0471-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/patches/server/0472-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -360,7 +360,7 @@ index 9e96b0465717bfa761289c255fd8d2f1df1be3d8..87271552aa85626f22f7f8569c8fb48f return this.isEntityTickingReady; } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 78d1fd9155f32fc8f98d9dc87116630a17b60f10..a81c53e3c03cf8e44e7c823a91a049b5ca66eb7b 100644 +index 9a247feffce5ba08064afaa96053feb22dd52716..807914712faf6dc98ff138ffa31b08376afcff8e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -128,6 +128,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0472-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0473-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0473-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0474-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0474-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0475-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0475-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0476-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0476-Move-range-check-for-block-placing-up.patch b/patches/server/0477-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0476-Move-range-check-for-block-placing-up.patch rename to patches/server/0477-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0477-Fix-SPIGOT-5989.patch b/patches/server/0478-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0477-Fix-SPIGOT-5989.patch rename to patches/server/0478-Fix-SPIGOT-5989.patch diff --git a/patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0478-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0479-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0479-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0480-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0480-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0481-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0481-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0482-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0482-Fix-some-rails-connecting-improperly.patch b/patches/server/0483-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0482-Fix-some-rails-connecting-improperly.patch rename to patches/server/0483-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0483-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0484-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0484-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0485-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0485-Brand-support.patch b/patches/server/0486-Brand-support.patch similarity index 100% rename from patches/server/0485-Brand-support.patch rename to patches/server/0486-Brand-support.patch diff --git a/patches/server/0486-Add-setMaxPlayers-API.patch b/patches/server/0487-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0486-Add-setMaxPlayers-API.patch rename to patches/server/0487-Add-setMaxPlayers-API.patch diff --git a/patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0487-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0488-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0488-Don-t-require-FACING-data.patch b/patches/server/0489-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0488-Don-t-require-FACING-data.patch rename to patches/server/0489-Don-t-require-FACING-data.patch diff --git a/patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0489-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0490-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0490-Add-moon-phase-API.patch b/patches/server/0491-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0490-Add-moon-phase-API.patch rename to patches/server/0491-Add-moon-phase-API.patch diff --git a/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch similarity index 97% rename from patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch index 2430d60a9..f95cb1a58 100644 --- a/patches/server/0491-Improve-Chunk-Status-Transition-Speed.patch +++ b/patches/server/0492-Improve-Chunk-Status-Transition-Speed.patch @@ -54,7 +54,7 @@ index 87271552aa85626f22f7f8569c8fb48fe4b30bf3..80aae4303e011dad13ce818136f0383e 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 a81c53e3c03cf8e44e7c823a91a049b5ca66eb7b..ee2eeea6e0fb3103620f6a6b5704e259f44d27e3 100644 +index 807914712faf6dc98ff138ffa31b08376afcff8e..a1b667084f710230d3f94ee0e5f5750de1d71e29 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -674,7 +674,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0492-Prevent-headless-pistons-from-being-created.patch b/patches/server/0493-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0492-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0493-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0493-Add-BellRingEvent.patch b/patches/server/0494-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0493-Add-BellRingEvent.patch rename to patches/server/0494-Add-BellRingEvent.patch diff --git a/patches/server/0494-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0495-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0494-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0495-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0495-Buffer-joins-to-world.patch b/patches/server/0496-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0495-Buffer-joins-to-world.patch rename to patches/server/0496-Buffer-joins-to-world.patch diff --git a/patches/server/0496-Optimize-redstone-algorithm.patch b/patches/server/0497-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0496-Optimize-redstone-algorithm.patch rename to patches/server/0497-Optimize-redstone-algorithm.patch diff --git a/patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0497-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0498-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0498-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0499-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0499-Fix-CraftTeam-null-check.patch b/patches/server/0500-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0499-Fix-CraftTeam-null-check.patch rename to patches/server/0500-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0500-Add-more-Evoker-API.patch b/patches/server/0501-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0500-Add-more-Evoker-API.patch rename to patches/server/0501-Add-more-Evoker-API.patch diff --git a/patches/server/0501-Add-methods-to-get-translation-keys.patch b/patches/server/0502-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0501-Add-methods-to-get-translation-keys.patch rename to patches/server/0502-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0502-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0503-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0503-Cache-block-data-strings.patch b/patches/server/0504-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0503-Cache-block-data-strings.patch rename to patches/server/0504-Cache-block-data-strings.patch diff --git a/patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0504-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0505-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0505-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0506-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0506-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0507-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0507-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0508-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0508-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0509-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0509-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0510-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0510-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0511-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0511-Entity-isTicking.patch b/patches/server/0512-Entity-isTicking.patch similarity index 100% rename from patches/server/0511-Entity-isTicking.patch rename to patches/server/0512-Entity-isTicking.patch diff --git a/patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0512-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0513-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0513-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/server/0514-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0514-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0515-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0515-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0516-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0516-Optimise-getType-calls.patch b/patches/server/0517-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0516-Optimise-getType-calls.patch rename to patches/server/0517-Optimise-getType-calls.patch diff --git a/patches/server/0517-Villager-resetOffers.patch b/patches/server/0518-Villager-resetOffers.patch similarity index 100% rename from patches/server/0517-Villager-resetOffers.patch rename to patches/server/0518-Villager-resetOffers.patch diff --git a/patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0518-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0519-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0519-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0520-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0520-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0521-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0521-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0522-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0521-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0522-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0522-Player-elytra-boost-API.patch b/patches/server/0523-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0522-Player-elytra-boost-API.patch rename to patches/server/0523-Player-elytra-boost-API.patch diff --git a/patches/server/0523-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0524-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0523-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0524-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0524-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0525-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0525-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0526-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0525-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0526-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0526-Add-ignore-discounts-API.patch b/patches/server/0527-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0526-Add-ignore-discounts-API.patch rename to patches/server/0527-Add-ignore-discounts-API.patch diff --git a/patches/server/0527-Toggle-for-removing-existing-dragon.patch b/patches/server/0528-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0527-Toggle-for-removing-existing-dragon.patch rename to patches/server/0528-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0528-Fix-client-lag-on-advancement-loading.patch b/patches/server/0529-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0528-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0529-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0529-Item-no-age-no-player-pickup.patch b/patches/server/0530-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0529-Item-no-age-no-player-pickup.patch rename to patches/server/0530-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0530-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0531-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0531-Beacon-API-custom-effect-ranges.patch b/patches/server/0532-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0531-Beacon-API-custom-effect-ranges.patch rename to patches/server/0532-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0532-Add-API-for-quit-reason.patch b/patches/server/0533-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0532-Add-API-for-quit-reason.patch rename to patches/server/0533-Add-API-for-quit-reason.patch diff --git a/patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0533-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0534-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0534-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0535-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0535-Expose-world-spawn-angle.patch b/patches/server/0536-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0535-Expose-world-spawn-angle.patch rename to patches/server/0536-Expose-world-spawn-angle.patch diff --git a/patches/server/0536-Add-Destroy-Speed-API.patch b/patches/server/0537-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0536-Add-Destroy-Speed-API.patch rename to patches/server/0537-Add-Destroy-Speed-API.patch diff --git a/patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0537-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0538-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0538-Add-LivingEntity-clearActiveItem.patch b/patches/server/0539-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0538-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0539-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0539-Add-PlayerItemCooldownEvent.patch b/patches/server/0540-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0539-Add-PlayerItemCooldownEvent.patch rename to patches/server/0540-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0540-More-lightning-API.patch b/patches/server/0541-More-lightning-API.patch similarity index 100% rename from patches/server/0540-More-lightning-API.patch rename to patches/server/0541-More-lightning-API.patch diff --git a/patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0541-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0542-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0542-Added-missing-default-perms-for-commands.patch b/patches/server/0543-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0542-Added-missing-default-perms-for-commands.patch rename to patches/server/0543-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0543-Add-PlayerShearBlockEvent.patch b/patches/server/0544-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0543-Add-PlayerShearBlockEvent.patch rename to patches/server/0544-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0544-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0545-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0545-Limit-recipe-packets.patch b/patches/server/0546-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0545-Limit-recipe-packets.patch rename to patches/server/0546-Limit-recipe-packets.patch diff --git a/patches/server/0546-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0547-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0546-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0547-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0547-MC-4-Fix-item-position-desync.patch b/patches/server/0548-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0547-MC-4-Fix-item-position-desync.patch rename to patches/server/0548-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0548-Player-Chunk-Load-Unload-Events.patch b/patches/server/0549-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0548-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0549-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0549-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0550-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0550-Expose-LivingEntity-hurt-direction.patch b/patches/server/0551-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0550-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0551-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0551-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0552-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0552-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0553-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0553-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0554-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0554-Implement-TargetHitEvent.patch b/patches/server/0555-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0554-Implement-TargetHitEvent.patch rename to patches/server/0555-Implement-TargetHitEvent.patch diff --git a/patches/server/0555-Additional-Block-Material-API-s.patch b/patches/server/0556-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0555-Additional-Block-Material-API-s.patch rename to patches/server/0556-Additional-Block-Material-API-s.patch diff --git a/patches/server/0556-Fix-harming-potion-dupe.patch b/patches/server/0557-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0556-Fix-harming-potion-dupe.patch rename to patches/server/0557-Fix-harming-potion-dupe.patch diff --git a/patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0557-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0558-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0558-Cache-burn-durations.patch b/patches/server/0559-Cache-burn-durations.patch similarity index 100% rename from patches/server/0558-Cache-burn-durations.patch rename to patches/server/0559-Cache-burn-durations.patch diff --git a/patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0559-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0560-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0560-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0561-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0561-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0562-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0562-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0563-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0563-Zombie-API-breaking-doors.patch b/patches/server/0564-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0563-Zombie-API-breaking-doors.patch rename to patches/server/0564-Zombie-API-breaking-doors.patch diff --git a/patches/server/0564-Fix-nerfed-slime-when-splitting.patch b/patches/server/0565-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0564-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0565-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0565-Add-EntityLoadCrossbowEvent.patch b/patches/server/0566-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0565-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0566-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0566-Guardian-beam-workaround.patch b/patches/server/0567-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0566-Guardian-beam-workaround.patch rename to patches/server/0567-Guardian-beam-workaround.patch diff --git a/patches/server/0567-Added-WorldGameRuleChangeEvent.patch b/patches/server/0568-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0567-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0568-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0568-Added-ServerResourcesReloadedEvent.patch b/patches/server/0569-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0568-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0569-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0569-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0570-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0570-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0571-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0570-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0571-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0571-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0572-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0571-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0572-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0572-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0573-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0573-Configurable-door-breaking-difficulty.patch b/patches/server/0574-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0573-Configurable-door-breaking-difficulty.patch rename to patches/server/0574-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0574-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0575-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0574-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0575-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0575-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0576-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0576-Remove-stale-POIs.patch b/patches/server/0577-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0576-Remove-stale-POIs.patch rename to patches/server/0577-Remove-stale-POIs.patch diff --git a/patches/server/0577-Fix-villager-boat-exploit.patch b/patches/server/0578-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0577-Fix-villager-boat-exploit.patch rename to patches/server/0578-Fix-villager-boat-exploit.patch diff --git a/patches/server/0578-Add-sendOpLevel-API.patch b/patches/server/0579-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0578-Add-sendOpLevel-API.patch rename to patches/server/0579-Add-sendOpLevel-API.patch diff --git a/patches/server/0579-Add-StructureLocateEvent.patch b/patches/server/0580-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0579-Add-StructureLocateEvent.patch rename to patches/server/0580-Add-StructureLocateEvent.patch diff --git a/patches/server/0580-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0581-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0580-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0581-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0581-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0582-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0582-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0583-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0583-Make-schedule-command-per-world.patch b/patches/server/0584-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0583-Make-schedule-command-per-world.patch rename to patches/server/0584-Make-schedule-command-per-world.patch diff --git a/patches/server/0584-Configurable-max-leash-distance.patch b/patches/server/0585-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0584-Configurable-max-leash-distance.patch rename to patches/server/0585-Configurable-max-leash-distance.patch diff --git a/patches/server/0585-Implement-BlockPreDispenseEvent.patch b/patches/server/0586-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0585-Implement-BlockPreDispenseEvent.patch rename to patches/server/0586-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0586-added-Wither-API.patch b/patches/server/0587-added-Wither-API.patch similarity index 100% rename from patches/server/0586-added-Wither-API.patch rename to patches/server/0587-added-Wither-API.patch diff --git a/patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0587-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0588-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0588-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0589-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0589-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0590-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0590-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0591-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0591-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0591-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0592-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0592-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0593-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0592-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0593-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0593-add-DragonEggFormEvent.patch b/patches/server/0594-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0593-add-DragonEggFormEvent.patch rename to patches/server/0594-add-DragonEggFormEvent.patch diff --git a/patches/server/0594-EntityMoveEvent.patch b/patches/server/0595-EntityMoveEvent.patch similarity index 100% rename from patches/server/0594-EntityMoveEvent.patch rename to patches/server/0595-EntityMoveEvent.patch diff --git a/patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0595-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0596-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0596-Inline-shift-direction-fields.patch b/patches/server/0597-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0596-Inline-shift-direction-fields.patch rename to patches/server/0597-Inline-shift-direction-fields.patch diff --git a/patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0597-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0598-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0598-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0599-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0599-living-entity-allow-attribute-registration.patch b/patches/server/0600-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0599-living-entity-allow-attribute-registration.patch rename to patches/server/0600-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0600-fix-dead-slime-setSize-invincibility.patch b/patches/server/0601-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0600-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0601-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0601-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0602-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0602-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0603-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0602-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0603-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0603-Expose-Tracked-Players.patch b/patches/server/0604-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0603-Expose-Tracked-Players.patch rename to patches/server/0604-Expose-Tracked-Players.patch diff --git a/patches/server/0604-Remove-streams-from-SensorNearest.patch b/patches/server/0605-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0604-Remove-streams-from-SensorNearest.patch rename to patches/server/0605-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0605-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0606-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0606-Improve-ServerGUI.patch b/patches/server/0607-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0606-Improve-ServerGUI.patch rename to patches/server/0607-Improve-ServerGUI.patch diff --git a/patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0607-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0608-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0608-fix-converting-txt-to-json-file.patch b/patches/server/0609-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0608-fix-converting-txt-to-json-file.patch rename to patches/server/0609-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0609-Add-worldborder-events.patch b/patches/server/0610-Add-worldborder-events.patch similarity index 100% rename from patches/server/0609-Add-worldborder-events.patch rename to patches/server/0610-Add-worldborder-events.patch diff --git a/patches/server/0610-added-PlayerNameEntityEvent.patch b/patches/server/0611-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0610-added-PlayerNameEntityEvent.patch rename to patches/server/0611-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0611-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0612-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0611-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0612-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0612-Add-recipe-to-cook-events.patch b/patches/server/0613-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0612-Add-recipe-to-cook-events.patch rename to patches/server/0613-Add-recipe-to-cook-events.patch diff --git a/patches/server/0613-Add-Block-isValidTool.patch b/patches/server/0614-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0613-Add-Block-isValidTool.patch rename to patches/server/0614-Add-Block-isValidTool.patch diff --git a/patches/server/0614-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0615-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0614-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0615-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0615-Implement-Keyed-on-World.patch b/patches/server/0616-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0615-Implement-Keyed-on-World.patch rename to patches/server/0616-Implement-Keyed-on-World.patch diff --git a/patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0616-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0617-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0617-Item-Rarity-API.patch b/patches/server/0618-Item-Rarity-API.patch similarity index 100% rename from patches/server/0617-Item-Rarity-API.patch rename to patches/server/0618-Item-Rarity-API.patch diff --git a/patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0618-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0619-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0619-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0620-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0619-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0620-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0620-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0621-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0621-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0622-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0621-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0622-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0622-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0623-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0623-Entity-load-save-limit-per-chunk.patch b/patches/server/0624-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0623-Entity-load-save-limit-per-chunk.patch rename to patches/server/0624-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0624-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0624-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0625-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0625-Expose-protocol-version.patch b/patches/server/0626-Expose-protocol-version.patch similarity index 100% rename from patches/server/0625-Expose-protocol-version.patch rename to patches/server/0626-Expose-protocol-version.patch diff --git a/patches/server/0626-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0626-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0627-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0627-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0627-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0628-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0628-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0628-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0629-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0629-Add-bypass-host-check.patch b/patches/server/0630-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0629-Add-bypass-host-check.patch rename to patches/server/0630-Add-bypass-host-check.patch diff --git a/patches/server/0630-Set-area-affect-cloud-rotation.patch b/patches/server/0631-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0630-Set-area-affect-cloud-rotation.patch rename to patches/server/0631-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0631-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0631-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0632-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0632-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0632-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0633-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0633-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0633-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0634-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0634-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0634-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0635-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0635-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0635-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0636-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0636-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0636-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0637-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0637-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0637-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0638-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0638-Added-PlayerDeepSleepEvent.patch b/patches/server/0639-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0638-Added-PlayerDeepSleepEvent.patch rename to patches/server/0639-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0639-More-World-API.patch b/patches/server/0640-More-World-API.patch similarity index 100% rename from patches/server/0639-More-World-API.patch rename to patches/server/0640-More-World-API.patch diff --git a/patches/server/0640-Added-PlayerBedFailEnterEvent.patch b/patches/server/0641-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0640-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0641-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0641-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0641-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0642-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0642-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0642-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0643-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0643-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0644-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0643-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0644-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0644-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0644-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0645-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0645-Add-Channel-initialization-listeners.patch b/patches/server/0646-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0645-Add-Channel-initialization-listeners.patch rename to patches/server/0646-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0646-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0646-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0647-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0647-Add-more-WanderingTrader-API.patch b/patches/server/0648-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0647-Add-more-WanderingTrader-API.patch rename to patches/server/0648-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0648-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0649-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0648-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0649-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0649-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0649-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0650-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0650-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0650-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0651-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0651-Inventory-close.patch b/patches/server/0652-Inventory-close.patch similarity index 100% rename from patches/server/0651-Inventory-close.patch rename to patches/server/0652-Inventory-close.patch diff --git a/patches/server/0652-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0652-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0653-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0653-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0653-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0654-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0654-Fix-CraftPotionBrewer-cache.patch b/patches/server/0655-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0654-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0655-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0655-Add-basic-Datapack-API.patch b/patches/server/0656-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0655-Add-basic-Datapack-API.patch rename to patches/server/0656-Add-basic-Datapack-API.patch diff --git a/patches/server/0656-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0657-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0656-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0657-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0657-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0657-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0658-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0658-ItemStack-repair-check-API.patch b/patches/server/0659-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0658-ItemStack-repair-check-API.patch rename to patches/server/0659-ItemStack-repair-check-API.patch diff --git a/patches/server/0659-More-Enchantment-API.patch b/patches/server/0660-More-Enchantment-API.patch similarity index 100% rename from patches/server/0659-More-Enchantment-API.patch rename to patches/server/0660-More-Enchantment-API.patch diff --git a/patches/server/0660-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0661-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0660-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0661-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0661-Add-Mob-lookAt-API.patch b/patches/server/0662-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0661-Add-Mob-lookAt-API.patch rename to patches/server/0662-Add-Mob-lookAt-API.patch diff --git a/patches/server/0662-Add-Unix-domain-socket-support.patch b/patches/server/0663-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0662-Add-Unix-domain-socket-support.patch rename to patches/server/0663-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0663-Add-EntityInsideBlockEvent.patch b/patches/server/0664-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0663-Add-EntityInsideBlockEvent.patch rename to patches/server/0664-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0664-Attributes-API-for-item-defaults.patch b/patches/server/0665-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0664-Attributes-API-for-item-defaults.patch rename to patches/server/0665-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0665-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0665-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0666-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0666-More-Lidded-Block-API.patch b/patches/server/0667-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0666-More-Lidded-Block-API.patch rename to patches/server/0667-More-Lidded-Block-API.patch diff --git a/patches/server/0667-Limit-item-frame-cursors-on-maps.patch b/patches/server/0668-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0667-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0668-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0668-Add-PlayerKickEvent-causes.patch b/patches/server/0669-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0668-Add-PlayerKickEvent-causes.patch rename to patches/server/0669-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0669-Add-PufferFishStateChangeEvent.patch b/patches/server/0670-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0669-Add-PufferFishStateChangeEvent.patch rename to patches/server/0670-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0670-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0670-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0671-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0671-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0671-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0672-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0672-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0672-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0673-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0673-Add-BellRevealRaiderEvent.patch b/patches/server/0674-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0673-Add-BellRevealRaiderEvent.patch rename to patches/server/0674-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0674-Fix-invulnerable-end-crystals.patch b/patches/server/0675-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0674-Fix-invulnerable-end-crystals.patch rename to patches/server/0675-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0675-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0676-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0675-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0676-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0676-Fix-dangerous-end-portal-logic.patch b/patches/server/0677-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0676-Fix-dangerous-end-portal-logic.patch rename to patches/server/0677-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0677-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0677-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0678-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0678-Make-item-validations-configurable.patch b/patches/server/0679-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0678-Make-item-validations-configurable.patch rename to patches/server/0679-Make-item-validations-configurable.patch diff --git a/patches/server/0679-Line-Of-Sight-Changes.patch b/patches/server/0680-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0679-Line-Of-Sight-Changes.patch rename to patches/server/0680-Line-Of-Sight-Changes.patch diff --git a/patches/server/0680-add-per-world-spawn-limits.patch b/patches/server/0681-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0680-add-per-world-spawn-limits.patch rename to patches/server/0681-add-per-world-spawn-limits.patch diff --git a/patches/server/0681-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0681-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0682-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0682-Add-more-LimitedRegion-API.patch b/patches/server/0683-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0682-Add-more-LimitedRegion-API.patch rename to patches/server/0683-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0683-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0683-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0684-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0684-Missing-Entity-Behavior-API.patch b/patches/server/0685-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0684-Missing-Entity-Behavior-API.patch rename to patches/server/0685-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0685-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0685-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0686-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0686-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0686-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0687-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0687-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0687-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0688-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0688-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0688-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0689-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0689-Adds-PlayerArmSwingEvent.patch b/patches/server/0690-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0689-Adds-PlayerArmSwingEvent.patch rename to patches/server/0690-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0690-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0690-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0691-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0691-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0691-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0692-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0692-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0693-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0692-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0693-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0693-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0694-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0693-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0694-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0694-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0695-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0694-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0695-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0695-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0696-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0696-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0697-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0697-Stinger-API.patch b/patches/server/0698-Stinger-API.patch similarity index 100% rename from patches/server/0697-Stinger-API.patch rename to patches/server/0698-Stinger-API.patch diff --git a/patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0698-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0699-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0699-Add-System.out-err-catcher.patch b/patches/server/0700-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0699-Add-System.out-err-catcher.patch rename to patches/server/0700-Add-System.out-err-catcher.patch diff --git a/patches/server/0700-Fix-test-not-bootstrapping.patch b/patches/server/0701-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0700-Fix-test-not-bootstrapping.patch rename to patches/server/0701-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0701-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0702-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0702-Improve-boat-collision-performance.patch b/patches/server/0703-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0702-Improve-boat-collision-performance.patch rename to patches/server/0703-Improve-boat-collision-performance.patch diff --git a/patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0703-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0704-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0704-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0705-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0705-Add-PlayerSetSpawnEvent.patch b/patches/server/0706-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0705-Add-PlayerSetSpawnEvent.patch rename to patches/server/0706-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0706-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0707-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0707-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0708-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0707-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0708-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0708-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0709-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0708-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0709-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0709-Added-EntityDamageItemEvent.patch b/patches/server/0710-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0709-Added-EntityDamageItemEvent.patch rename to patches/server/0710-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0710-Optimize-indirect-passenger-iteration.patch b/patches/server/0711-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0710-Optimize-indirect-passenger-iteration.patch rename to patches/server/0711-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0711-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0712-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0712-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0713-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0713-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0714-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0713-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0714-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0714-Clear-bucket-NBT-after-dispense.patch b/patches/server/0715-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0714-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0715-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0715-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch b/patches/server/0716-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch similarity index 100% rename from patches/server/0715-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch rename to patches/server/0716-Set-AsyncAppender-dispatch-thread-to-be-a-daemon-thr.patch diff --git a/patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0717-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0716-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0717-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch b/patches/server/0718-Move-BlockPistonRetractEvent-to-fix-duplication.patch similarity index 100% rename from patches/server/0717-Move-BlockPistonRetractEvent-to-fix-duplication.patch rename to patches/server/0718-Move-BlockPistonRetractEvent-to-fix-duplication.patch diff --git a/patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0719-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0718-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0719-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0719-Add-BlockBreakBlockEvent.patch b/patches/server/0720-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0719-Add-BlockBreakBlockEvent.patch rename to patches/server/0720-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0721-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0720-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0721-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0721-More-CommandBlock-API.patch b/patches/server/0722-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0721-More-CommandBlock-API.patch rename to patches/server/0722-More-CommandBlock-API.patch diff --git a/patches/server/0722-Add-missing-team-sidebar-display-slots.patch b/patches/server/0723-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0722-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0723-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0723-Add-back-EntityPortalExitEvent.patch b/patches/server/0724-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0723-Add-back-EntityPortalExitEvent.patch rename to patches/server/0724-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0725-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0724-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0725-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0725-Get-entity-default-attributes.patch b/patches/server/0726-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0725-Get-entity-default-attributes.patch rename to patches/server/0726-Get-entity-default-attributes.patch diff --git a/patches/server/0726-Left-handed-API.patch b/patches/server/0727-Left-handed-API.patch similarity index 100% rename from patches/server/0726-Left-handed-API.patch rename to patches/server/0727-Left-handed-API.patch diff --git a/patches/server/0727-Add-advancement-display-API.patch b/patches/server/0728-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0727-Add-advancement-display-API.patch rename to patches/server/0728-Add-advancement-display-API.patch diff --git a/patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0729-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0728-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0729-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0729-Add-critical-damage-API.patch b/patches/server/0730-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0729-Add-critical-damage-API.patch rename to patches/server/0730-Add-critical-damage-API.patch diff --git a/patches/server/0730-Fix-issues-with-mob-conversion.patch b/patches/server/0731-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0730-Fix-issues-with-mob-conversion.patch rename to patches/server/0731-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0731-Add-isCollidable-methods-to-various-places.patch b/patches/server/0732-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0731-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0732-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0732-Goat-ram-API.patch b/patches/server/0733-Goat-ram-API.patch similarity index 100% rename from patches/server/0732-Goat-ram-API.patch rename to patches/server/0733-Goat-ram-API.patch diff --git a/patches/server/0733-Add-API-for-resetting-a-single-score.patch b/patches/server/0734-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0733-Add-API-for-resetting-a-single-score.patch rename to patches/server/0734-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0735-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0734-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0735-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0735-Vanilla-command-permission-fixes.patch b/patches/server/0736-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0735-Vanilla-command-permission-fixes.patch rename to patches/server/0736-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0736-Make-CallbackExecutor-strict-again.patch b/patches/server/0737-Make-CallbackExecutor-strict-again.patch similarity index 95% rename from patches/server/0736-Make-CallbackExecutor-strict-again.patch rename to patches/server/0737-Make-CallbackExecutor-strict-again.patch index 862f9007c..68b18d653 100644 --- a/patches/server/0736-Make-CallbackExecutor-strict-again.patch +++ b/patches/server/0737-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 ee2eeea6e0fb3103620f6a6b5704e259f44d27e3..0bee0f348a6123a27b8bcf02d2a93df9b007b689 100644 +index a1b667084f710230d3f94ee0e5f5750de1d71e29..b8066eec2a1481059ee0c25756e14449e3007b6b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -160,17 +160,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0738-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0737-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0738-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0739-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0738-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0739-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0740-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0739-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0740-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch b/patches/server/0741-Separate-lookup-locking-from-state-access-in-UserCac.patch similarity index 100% rename from patches/server/0740-Separate-lookup-locking-from-state-access-in-UserCac.patch rename to patches/server/0741-Separate-lookup-locking-from-state-access-in-UserCac.patch diff --git a/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0742-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 92% rename from patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0742-Fix-chunks-refusing-to-unload-at-low-TPS.patch index b2ad0c10f..5d95d12b7 100644 --- a/patches/server/0741-Fix-chunks-refusing-to-unload-at-low-TPS.patch +++ b/patches/server/0742-Fix-chunks-refusing-to-unload-at-low-TPS.patch @@ -10,7 +10,7 @@ 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 0bee0f348a6123a27b8bcf02d2a93df9b007b689..52d0896356529d07ce43c0006423ab169cc3b068 100644 +index b8066eec2a1481059ee0c25756e14449e3007b6b..c9563c0a5f230753dda469530cabde67fdb13f83 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1297,9 +1297,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0743-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 97% rename from patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0743-Do-not-allow-ticket-level-changes-while-unloading-pl.patch index 59ad52883..d1cd2e9a7 100644 --- a/patches/server/0742-Do-not-allow-ticket-level-changes-while-unloading-pl.patch +++ b/patches/server/0743-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 52d0896356529d07ce43c0006423ab169cc3b068..bda3d88b9d99b18ba703a781a0a9c447fd147585 100644 +index c9563c0a5f230753dda469530cabde67fdb13f83..5157eac0190c6e1458dedfb1cb2eddee5639407e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -296,6 +296,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0744-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0743-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0744-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0745-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0744-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0745-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0745-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0746-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0745-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0746-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0746-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0747-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0746-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0747-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0747-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0748-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0748-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0749-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0748-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0749-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0749-Optimise-general-POI-access.patch b/patches/server/0750-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0749-Optimise-general-POI-access.patch rename to patches/server/0750-Optimise-general-POI-access.patch diff --git a/patches/server/0750-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0751-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0750-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0751-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0751-Add-more-async-catchers.patch b/patches/server/0752-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0751-Add-more-async-catchers.patch rename to patches/server/0752-Add-more-async-catchers.patch diff --git a/patches/server/0752-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0753-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0752-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0753-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0753-Execute-chunk-tasks-mid-tick.patch b/patches/server/0754-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0753-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0754-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0754-Do-not-copy-visible-chunks.patch b/patches/server/0755-Do-not-copy-visible-chunks.patch similarity index 99% rename from patches/server/0754-Do-not-copy-visible-chunks.patch rename to patches/server/0755-Do-not-copy-visible-chunks.patch index 0f7e67079..e649466db 100644 --- a/patches/server/0754-Do-not-copy-visible-chunks.patch +++ b/patches/server/0755-Do-not-copy-visible-chunks.patch @@ -35,7 +35,7 @@ index 35949e9c15eb998aa89842d34d0999cd973590e0..15f0c85ba9f4f9666e94e67dde43eb2e List 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 bda3d88b9d99b18ba703a781a0a9c447fd147585..b50c2c6fec4dc4a6672e2220b7fdf488d7b68c0f 100644 +index 5157eac0190c6e1458dedfb1cb2eddee5639407e..800191e9ed63773333b5650d8ffcb14ffc8ec338 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -120,9 +120,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0755-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0755-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0756-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0756-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0756-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0757-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0757-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0758-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0757-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0758-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0758-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0759-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0758-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0759-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0759-Distance-manager-tick-timings.patch b/patches/server/0760-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0759-Distance-manager-tick-timings.patch rename to patches/server/0760-Distance-manager-tick-timings.patch diff --git a/patches/server/0760-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0760-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0761-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0761-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0761-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0762-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0762-Add-packet-limiter-config.patch b/patches/server/0763-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0762-Add-packet-limiter-config.patch rename to patches/server/0763-Add-packet-limiter-config.patch diff --git a/patches/server/0763-Lag-compensate-block-breaking.patch b/patches/server/0764-Lag-compensate-block-breaking.patch similarity index 100% rename from patches/server/0763-Lag-compensate-block-breaking.patch rename to patches/server/0764-Lag-compensate-block-breaking.patch diff --git a/patches/server/0764-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0764-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0765-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0765-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0765-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0766-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0766-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0766-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0767-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0767-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0767-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0768-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0768-Time-scoreboard-search.patch b/patches/server/0769-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0768-Time-scoreboard-search.patch rename to patches/server/0769-Time-scoreboard-search.patch diff --git a/patches/server/0769-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0769-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0770-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0770-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0770-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0771-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0771-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch similarity index 93% rename from patches/server/0771-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0772-Oprimise-map-impl-for-tracked-players.patch index 66d08b92d..9a9b55816 100644 --- a/patches/server/0771-Oprimise-map-impl-for-tracked-players.patch +++ b/patches/server/0772-Oprimise-map-impl-for-tracked-players.patch @@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have better lookups than HashMap. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b50c2c6fec4dc4a6672e2220b7fdf488d7b68c0f..06a66be037e5a32e2216b661048f40fec30a81a5 100644 +index 800191e9ed63773333b5650d8ffcb14ffc8ec338..9ab37d95b0dbd13dfe31b34b2a91c2a7bc7f6e64 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -108,6 +108,7 @@ import org.apache.logging.log4j.LogManager; diff --git a/patches/server/0772-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0772-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0773-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0773-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0773-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0774-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0774-Optimise-random-block-ticking.patch b/patches/server/0775-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0774-Optimise-random-block-ticking.patch rename to patches/server/0775-Optimise-random-block-ticking.patch diff --git a/patches/server/0775-Optimise-non-flush-packet-sending.patch b/patches/server/0776-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0775-Optimise-non-flush-packet-sending.patch rename to patches/server/0776-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0776-Optimise-nearby-player-lookups.patch b/patches/server/0777-Optimise-nearby-player-lookups.patch similarity index 99% rename from patches/server/0776-Optimise-nearby-player-lookups.patch rename to patches/server/0777-Optimise-nearby-player-lookups.patch index ca59b4611..155aa7711 100644 --- a/patches/server/0776-Optimise-nearby-player-lookups.patch +++ b/patches/server/0777-Optimise-nearby-player-lookups.patch @@ -26,7 +26,7 @@ index bb411853cb9e0120bcaa82e878724ee17167057b..7f663523b8c43b356763d6d5249e1aec // Paper end - optimise anyPlayerCloseEnoughForSpawning long lastAutoSaveTime; // Paper - incremental autosave diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 06a66be037e5a32e2216b661048f40fec30a81a5..462f94b439749e86d860d02014dca96e154b3756 100644 +index 9ab37d95b0dbd13dfe31b34b2a91c2a7bc7f6e64..27e9bd7dabb5f827b8baf126565d1efb9eb2c2ef 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -159,6 +159,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0777-Optimise-WorldServer-notify.patch b/patches/server/0778-Optimise-WorldServer-notify.patch similarity index 99% rename from patches/server/0777-Optimise-WorldServer-notify.patch rename to patches/server/0778-Optimise-WorldServer-notify.patch index 76533e831..c553f2a0c 100644 --- a/patches/server/0777-Optimise-WorldServer-notify.patch +++ b/patches/server/0778-Optimise-WorldServer-notify.patch @@ -8,7 +8,7 @@ Instead, only iterate over navigators in the current region that are eligible for repathing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 462f94b439749e86d860d02014dca96e154b3756..d19961f0b62173c661de3204f03fdcc603486e7b 100644 +index 27e9bd7dabb5f827b8baf126565d1efb9eb2c2ef..a14effa7f8f56a27bccd4479baad82fcb67e55c5 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -283,15 +283,81 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0778-Remove-streams-for-villager-AI.patch b/patches/server/0779-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0778-Remove-streams-for-villager-AI.patch rename to patches/server/0779-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0779-Rewrite-dataconverter-system.patch b/patches/server/0780-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0779-Rewrite-dataconverter-system.patch rename to patches/server/0780-Rewrite-dataconverter-system.patch diff --git a/patches/server/0780-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0780-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0781-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0781-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0781-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0782-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0782-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0782-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0783-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0783-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0783-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0784-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0784-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0784-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0785-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0785-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0785-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0786-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0786-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0786-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0787-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0787-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0787-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0788-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0788-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0788-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0789-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0789-Ensure-valid-vehicle-status.patch b/patches/server/0790-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0789-Ensure-valid-vehicle-status.patch rename to patches/server/0790-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0790-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0790-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0791-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0791-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0791-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0792-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0792-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0793-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0792-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0793-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0793-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch similarity index 100% rename from patches/server/0793-Mark-fish-and-axolotls-from-buckets-as-persistent.patch rename to patches/server/0794-Mark-fish-and-axolotls-from-buckets-as-persistent.patch diff --git a/patches/server/0794-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0795-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0794-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0795-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0795-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch similarity index 95% rename from patches/server/0795-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch rename to patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch index 77f453411..e68034a31 100644 --- a/patches/server/0795-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch +++ b/patches/server/0796-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch @@ -12,7 +12,7 @@ time to save, as flush saving performs a full flush at the end anyways. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d19961f0b62173c661de3204f03fdcc603486e7b..9a19263d6cfbcc7f0f94a6bc04a43f8200431e62 100644 +index a14effa7f8f56a27bccd4479baad82fcb67e55c5..30f3d7571c021ed9c0d7d96b53752dd453704b20 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -910,6 +910,16 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0796-Preserve-overstacked-loot.patch b/patches/server/0797-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0796-Preserve-overstacked-loot.patch rename to patches/server/0797-Preserve-overstacked-loot.patch diff --git a/patches/server/0797-Update-head-rotation-in-missing-places.patch b/patches/server/0798-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0797-Update-head-rotation-in-missing-places.patch rename to patches/server/0798-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0798-prevent-unintended-light-block-manipulation.patch b/patches/server/0799-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0798-prevent-unintended-light-block-manipulation.patch rename to patches/server/0799-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0799-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch similarity index 100% rename from patches/server/0799-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch rename to patches/server/0800-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch diff --git a/patches/server/0800-Fix-CraftCriteria-defaults-map.patch b/patches/server/0801-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0800-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0801-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0801-Fix-upstreams-block-state-factories.patch b/patches/server/0802-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0801-Fix-upstreams-block-state-factories.patch rename to patches/server/0802-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0802-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0802-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0803-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0803-Configurable-feature-seeds.patch b/patches/server/0804-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0803-Configurable-feature-seeds.patch rename to patches/server/0804-Configurable-feature-seeds.patch diff --git a/patches/server/0804-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0804-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0805-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0805-Add-root-admin-user-detection.patch b/patches/server/0806-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0805-Add-root-admin-user-detection.patch rename to patches/server/0806-Add-root-admin-user-detection.patch diff --git a/patches/server/0806-Always-allow-item-changing-in-Fireball.patch b/patches/server/0807-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0806-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0807-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0807-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0807-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0808-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0808-Call-onRemove-logic-for-breakNaturally.patch b/patches/server/0809-Call-onRemove-logic-for-breakNaturally.patch similarity index 100% rename from patches/server/0808-Call-onRemove-logic-for-breakNaturally.patch rename to patches/server/0809-Call-onRemove-logic-for-breakNaturally.patch diff --git a/patches/server/0809-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0810-Fix-anvil-prepare-event-not-working-with-zero-xp.patch similarity index 100% rename from patches/server/0809-Fix-anvil-prepare-event-not-working-with-zero-xp.patch rename to patches/server/0810-Fix-anvil-prepare-event-not-working-with-zero-xp.patch diff --git a/patches/server/0810-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0811-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0810-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0811-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0811-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0812-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0811-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0812-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0812-Rewrite-the-light-engine.patch b/patches/server/0813-Rewrite-the-light-engine.patch similarity index 99% rename from patches/server/0812-Rewrite-the-light-engine.patch rename to patches/server/0813-Rewrite-the-light-engine.patch index 8f1e7ceef..531dd88a8 100644 --- a/patches/server/0812-Rewrite-the-light-engine.patch +++ b/patches/server/0813-Rewrite-the-light-engine.patch @@ -4418,7 +4418,7 @@ index 7f663523b8c43b356763d6d5249e1aec416de37c..873a9767687ee78a852e2392d12bafa2 private final DebugBuffer chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9a19263d6cfbcc7f0f94a6bc04a43f8200431e62..42b4292152d4b17c49c9cc1f488abf892a4883a5 100644 +index 30f3d7571c021ed9c0d7d96b53752dd453704b20..7cb613103bca57c82418f4f968922f510819ee70 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -130,7 +130,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0813-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0814-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0813-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0814-Always-parse-protochunk-light-sources-unless-it-is-m.patch