diff --git a/patches/server/0004-Gale-branding-changes.patch b/patches/server/0004-Gale-branding-changes.patch index e908706..c10e608 100644 --- a/patches/server/0004-Gale-branding-changes.patch +++ b/patches/server/0004-Gale-branding-changes.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers -Date: Wed, 23 Nov 2022 15:34:33 +0100 +Date: Mon, 26 Dec 2022 13:47:08 +0100 Subject: [PATCH] Gale branding changes License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) @@ -19,39 +19,6 @@ index 977edc4adb5414e83d289cca295baa6bfbadaa52..ebe3f85542004002713dd327e8a423f2 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 4b002e8b75d117b726b0de274a76d3596fce015b..d1a95265e65ace453bcb866f16262842d11108d6 100644 ---- a/src/main/java/com/destroystokyo/paper/Metrics.java -+++ b/src/main/java/com/destroystokyo/paper/Metrics.java -@@ -593,7 +593,7 @@ public class Metrics { - boolean logFailedRequests = config.getBoolean("logFailedRequests", false); - // Only start Metrics, if it's enabled in the config - if (config.getBoolean("enabled", true)) { -- Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger()); -+ Metrics metrics = new Metrics("Gale", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - - metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { - String minecraftVersion = Bukkit.getVersion(); -@@ -603,15 +603,15 @@ public class Metrics { - - metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); - metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); -- final String paperVersion; -+ final String galeVersion; // Gale - branding changes - final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); - if (implVersion != null) { - final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); -- paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); -+ galeVersion = "git-Gale-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - } else { -- paperVersion = "unknown"; -+ galeVersion = "unknown"; // Gale - branding changes - } -- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion)); -+ metrics.addCustomChart(new Metrics.SimplePie("gale_version", () -> galeVersion)); // Gale - branding changes - - metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { - Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java index bf42969859545a8a520923ef1836ffa4a5cc24a0..f6183c39b3e6895953047ee1e2d967b3ab43eb4a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java diff --git a/patches/server/0005-Gale-metrics.patch b/patches/server/0005-Gale-metrics.patch new file mode 100644 index 0000000..b24f7d2 --- /dev/null +++ b/patches/server/0005-Gale-metrics.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Mon, 26 Dec 2022 13:47:57 +0100 +Subject: [PATCH] Gale metrics + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Gale - https://galemc.org + +diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java +index 4b002e8b75d117b726b0de274a76d3596fce015b..a83a1dc5a3ecc3780e12721bb3022867d80b34d4 100644 +--- a/src/main/java/com/destroystokyo/paper/Metrics.java ++++ b/src/main/java/com/destroystokyo/paper/Metrics.java +@@ -593,7 +593,7 @@ public class Metrics { + boolean logFailedRequests = config.getBoolean("logFailedRequests", false); + // Only start Metrics, if it's enabled in the config + if (config.getBoolean("enabled", true)) { +- Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger()); ++ Metrics metrics = new Metrics("Gale", serverUUID, logFailedRequests, Bukkit.getLogger()); // Gale - branding changes - metrics + + metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { + String minecraftVersion = Bukkit.getVersion(); +@@ -603,15 +603,15 @@ public class Metrics { + + metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); + metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); +- final String paperVersion; ++ final String galeVersion; // Gale - branding changes + final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion(); + if (implVersion != null) { + final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1); +- paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); ++ galeVersion = "git-Gale-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics + } else { +- paperVersion = "unknown"; ++ galeVersion = "unknown"; // Gale - branding changes + } +- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion)); ++ metrics.addCustomChart(new Metrics.SimplePie("gale_version", () -> galeVersion)); // Gale - branding changes - metrics + + metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { + Map> map = new HashMap<>(); diff --git a/patches/server/0005-Gale-configuration.patch b/patches/server/0006-Gale-configuration.patch similarity index 100% rename from patches/server/0005-Gale-configuration.patch rename to patches/server/0006-Gale-configuration.patch diff --git a/patches/server/0006-Set-Gale-permissions-root.patch b/patches/server/0007-Set-Gale-permissions-root.patch similarity index 100% rename from patches/server/0006-Set-Gale-permissions-root.patch rename to patches/server/0007-Set-Gale-permissions-root.patch diff --git a/patches/server/0007-Gale-commands.patch b/patches/server/0008-Gale-commands.patch similarity index 100% rename from patches/server/0007-Gale-commands.patch rename to patches/server/0008-Gale-commands.patch diff --git a/patches/server/0008-Include-server.properties-in-timings.patch b/patches/server/0009-Include-server.properties-in-timings.patch similarity index 100% rename from patches/server/0008-Include-server.properties-in-timings.patch rename to patches/server/0009-Include-server.properties-in-timings.patch diff --git a/patches/server/0009-Include-hardware-specs-in-timings.patch b/patches/server/0010-Include-hardware-specs-in-timings.patch similarity index 100% rename from patches/server/0009-Include-hardware-specs-in-timings.patch rename to patches/server/0010-Include-hardware-specs-in-timings.patch diff --git a/patches/server/0010-Use-timin.gs-by-default.patch b/patches/server/0011-Use-timin.gs-by-default.patch similarity index 100% rename from patches/server/0010-Use-timin.gs-by-default.patch rename to patches/server/0011-Use-timin.gs-by-default.patch diff --git a/patches/server/0011-Recommend-disabling-timings-on-startup.patch b/patches/server/0012-Recommend-disabling-timings-on-startup.patch similarity index 100% rename from patches/server/0011-Recommend-disabling-timings-on-startup.patch rename to patches/server/0012-Recommend-disabling-timings-on-startup.patch diff --git a/patches/server/0012-Make-timings-calls-final.patch b/patches/server/0013-Make-timings-calls-final.patch similarity index 100% rename from patches/server/0012-Make-timings-calls-final.patch rename to patches/server/0013-Make-timings-calls-final.patch diff --git a/patches/server/0013-Remove-vanilla-profiler.patch b/patches/server/0014-Remove-vanilla-profiler.patch similarity index 100% rename from patches/server/0013-Remove-vanilla-profiler.patch rename to patches/server/0014-Remove-vanilla-profiler.patch diff --git a/patches/server/0014-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 98% rename from patches/server/0014-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch index ce9efe1..a80f985 100644 --- a/patches/server/0014-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ b/patches/server/0015-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch @@ -40,7 +40,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5f3796c9b0f910e578fe70c46ca97c36b70378f8..4ede155dc9a5f8935043f58640616c72e7898309 100644 +index 3a116b37a89306ea8f2b7eec867d0e3c3523f74c..6d7f51274537f5041c9f98923bb72b9fc9ddd295 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3629,7 +3629,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0015-Simpler-ShapelessRecipe-comparison-for-vanilla.patch b/patches/server/0016-Simpler-ShapelessRecipe-comparison-for-vanilla.patch similarity index 100% rename from patches/server/0015-Simpler-ShapelessRecipe-comparison-for-vanilla.patch rename to patches/server/0016-Simpler-ShapelessRecipe-comparison-for-vanilla.patch diff --git a/patches/server/0016-Reduce-projectile-chunk-loading.patch b/patches/server/0017-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0016-Reduce-projectile-chunk-loading.patch rename to patches/server/0017-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0017-Predict-Halloween.patch b/patches/server/0018-Predict-Halloween.patch similarity index 100% rename from patches/server/0017-Predict-Halloween.patch rename to patches/server/0018-Predict-Halloween.patch diff --git a/patches/server/0018-Move-random-tick-random.patch b/patches/server/0019-Move-random-tick-random.patch similarity index 100% rename from patches/server/0018-Move-random-tick-random.patch rename to patches/server/0019-Move-random-tick-random.patch diff --git a/patches/server/0019-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0020-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from patches/server/0019-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0020-Optimize-random-calls-in-chunk-ticking.patch diff --git a/patches/server/0020-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0021-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from patches/server/0020-Reduce-enderman-teleport-chunk-lookups.patch rename to patches/server/0021-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/patches/server/0021-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0022-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0021-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0022-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0022-Remove-iterators-from-Inventory-contains.patch b/patches/server/0023-Remove-iterators-from-Inventory-contains.patch similarity index 100% rename from patches/server/0022-Remove-iterators-from-Inventory-contains.patch rename to patches/server/0023-Remove-iterators-from-Inventory-contains.patch diff --git a/patches/server/0023-Check-targeting-range-before-getting-visibility.patch b/patches/server/0024-Check-targeting-range-before-getting-visibility.patch similarity index 100% rename from patches/server/0023-Check-targeting-range-before-getting-visibility.patch rename to patches/server/0024-Check-targeting-range-before-getting-visibility.patch diff --git a/patches/server/0024-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0025-Print-stack-trace-for-plugins-not-shutting-down-task.patch similarity index 100% rename from patches/server/0024-Print-stack-trace-for-plugins-not-shutting-down-task.patch rename to patches/server/0025-Print-stack-trace-for-plugins-not-shutting-down-task.patch diff --git a/patches/server/0025-Improve-fluid-direction-caching.patch b/patches/server/0026-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0025-Improve-fluid-direction-caching.patch rename to patches/server/0026-Improve-fluid-direction-caching.patch diff --git a/patches/server/0026-Cache-on-climbable-check.patch b/patches/server/0027-Cache-on-climbable-check.patch similarity index 97% rename from patches/server/0026-Cache-on-climbable-check.patch rename to patches/server/0027-Cache-on-climbable-check.patch index 1939b5e..d9fef4a 100644 --- a/patches/server/0026-Cache-on-climbable-check.patch +++ b/patches/server/0027-Cache-on-climbable-check.patch @@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4ede155dc9a5f8935043f58640616c72e7898309..3b3b4adc1c1a298e15c88aa115f4137742a7ab51 100644 +index 6d7f51274537f5041c9f98923bb72b9fc9ddd295..7f4f4f291cbe0281bd4da94bc1f7a16215622e7f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -143,7 +143,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; diff --git a/patches/server/0027-Use-array-for-gamerule-storage.patch b/patches/server/0028-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0027-Use-array-for-gamerule-storage.patch rename to patches/server/0028-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0029-Make-EntityCollisionContext-a-live-representation.patch similarity index 100% rename from patches/server/0028-Make-EntityCollisionContext-a-live-representation.patch rename to patches/server/0029-Make-EntityCollisionContext-a-live-representation.patch diff --git a/patches/server/0029-Improve-container-checking-with-a-bitset.patch b/patches/server/0030-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0029-Improve-container-checking-with-a-bitset.patch rename to patches/server/0030-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0030-Better-checking-for-useless-move-packets.patch b/patches/server/0031-Better-checking-for-useless-move-packets.patch similarity index 100% rename from patches/server/0030-Better-checking-for-useless-move-packets.patch rename to patches/server/0031-Better-checking-for-useless-move-packets.patch diff --git a/patches/server/0031-Use-fast-item-merge-raytracing.patch b/patches/server/0032-Use-fast-item-merge-raytracing.patch similarity index 100% rename from patches/server/0031-Use-fast-item-merge-raytracing.patch rename to patches/server/0032-Use-fast-item-merge-raytracing.patch diff --git a/patches/server/0032-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0033-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0032-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0033-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0033-Inline-level-height.patch b/patches/server/0034-Inline-level-height.patch similarity index 100% rename from patches/server/0033-Inline-level-height.patch rename to patches/server/0034-Inline-level-height.patch diff --git a/patches/server/0034-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch similarity index 100% rename from patches/server/0034-Use-ThreadUnsafeRandom-for-mob-spawning.patch rename to patches/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch diff --git a/patches/server/0035-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0036-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0035-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0036-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0036-Remove-streams-from-getting-nearby-players.patch b/patches/server/0037-Remove-streams-from-getting-nearby-players.patch similarity index 100% rename from patches/server/0036-Remove-streams-from-getting-nearby-players.patch rename to patches/server/0037-Remove-streams-from-getting-nearby-players.patch diff --git a/patches/server/0037-Skip-cloning-loot-parameters.patch b/patches/server/0038-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0037-Skip-cloning-loot-parameters.patch rename to patches/server/0038-Skip-cloning-loot-parameters.patch diff --git a/patches/server/0038-Block-goal-does-not-load-chunks.patch b/patches/server/0039-Block-goal-does-not-load-chunks.patch similarity index 100% rename from patches/server/0038-Block-goal-does-not-load-chunks.patch rename to patches/server/0039-Block-goal-does-not-load-chunks.patch diff --git a/patches/server/0039-Reduce-entity-allocations.patch b/patches/server/0040-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0039-Reduce-entity-allocations.patch rename to patches/server/0040-Reduce-entity-allocations.patch diff --git a/patches/server/0040-Remove-lambda-from-ticking-guard.patch b/patches/server/0041-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0040-Remove-lambda-from-ticking-guard.patch rename to patches/server/0041-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0041-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0042-SIMD-support.patch b/patches/server/0043-SIMD-support.patch similarity index 100% rename from patches/server/0042-SIMD-support.patch rename to patches/server/0043-SIMD-support.patch diff --git a/patches/server/0043-Make-book-writing-configurable.patch b/patches/server/0044-Make-book-writing-configurable.patch similarity index 98% rename from patches/server/0043-Make-book-writing-configurable.patch rename to patches/server/0044-Make-book-writing-configurable.patch index 0ac6de2..9e4cef2 100644 --- a/patches/server/0043-Make-book-writing-configurable.patch +++ b/patches/server/0044-Make-book-writing-configurable.patch @@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 81b27d48c1421c02f86b95db1d7a1eeaf130cd09..2503af47e491d456e3044e097f35c928e45e5a21 100644 +index 1192b751c8d00754d40781e714bc3f6330767f75..d31f52ace6dd6a80adb639e1e50f4b547b23103d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -182,6 +182,8 @@ import net.minecraft.world.phys.Vec3; diff --git a/patches/server/0044-Optimize-entity-coordinate-key.patch b/patches/server/0045-Optimize-entity-coordinate-key.patch similarity index 96% rename from patches/server/0044-Optimize-entity-coordinate-key.patch rename to patches/server/0045-Optimize-entity-coordinate-key.patch index e5ed4dd..fb42d90 100644 --- a/patches/server/0044-Optimize-entity-coordinate-key.patch +++ b/patches/server/0045-Optimize-entity-coordinate-key.patch @@ -35,7 +35,7 @@ index d1a59c2af0557a816c094983ec60097fb4de060c..3fad7e58a1461d897526d63efd27075f public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a3f717c6aacdae306a4c61b34d6aaaffa41f7c68..792d0724893a0ecc656408e6398b996e1d300f41 100644 +index 9f6dfe81d1c1d1308505eb0d495d63e8b5be246a..ca5b6a05ea3a3005d4a46f8581f498f6aadaee74 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0045-Reduce-in-wall-checks.patch b/patches/server/0046-Reduce-in-wall-checks.patch similarity index 97% rename from patches/server/0045-Reduce-in-wall-checks.patch rename to patches/server/0046-Reduce-in-wall-checks.patch index 0703540..caf0d7f 100644 --- a/patches/server/0045-Reduce-in-wall-checks.patch +++ b/patches/server/0046-Reduce-in-wall-checks.patch @@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth keeping it. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3b3b4adc1c1a298e15c88aa115f4137742a7ab51..c7b8c58a67a4e6f4a98730c7ef9f62072b788bc3 100644 +index 7f4f4f291cbe0281bd4da94bc1f7a16215622e7f..20f70e0bc085a941a7e5de3ceff968870f23fb5f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -400,7 +400,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0046-Make-chat-order-verification-configurable.patch b/patches/server/0047-Make-chat-order-verification-configurable.patch similarity index 100% rename from patches/server/0046-Make-chat-order-verification-configurable.patch rename to patches/server/0047-Make-chat-order-verification-configurable.patch diff --git a/patches/server/0047-Make-saving-fireworks-configurable.patch b/patches/server/0048-Make-saving-fireworks-configurable.patch similarity index 100% rename from patches/server/0047-Make-saving-fireworks-configurable.patch rename to patches/server/0048-Make-saving-fireworks-configurable.patch diff --git a/patches/server/0048-Don-t-trigger-lootable-refresh-for-non-player-intera.patch b/patches/server/0049-Don-t-trigger-lootable-refresh-for-non-player-intera.patch similarity index 100% rename from patches/server/0048-Don-t-trigger-lootable-refresh-for-non-player-intera.patch rename to patches/server/0049-Don-t-trigger-lootable-refresh-for-non-player-intera.patch diff --git a/patches/server/0049-Reduce-hopper-item-checks.patch b/patches/server/0050-Reduce-hopper-item-checks.patch similarity index 100% rename from patches/server/0049-Reduce-hopper-item-checks.patch rename to patches/server/0050-Reduce-hopper-item-checks.patch diff --git a/patches/server/0050-Reduce-villager-item-re-pickup.patch b/patches/server/0051-Reduce-villager-item-re-pickup.patch similarity index 100% rename from patches/server/0050-Reduce-villager-item-re-pickup.patch rename to patches/server/0051-Reduce-villager-item-re-pickup.patch diff --git a/patches/server/0051-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0052-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0051-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0052-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0052-Do-not-log-invalid-statistics.patch b/patches/server/0053-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0052-Do-not-log-invalid-statistics.patch rename to patches/server/0053-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0053-Do-not-log-empty-message-warnings.patch b/patches/server/0054-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0053-Do-not-log-empty-message-warnings.patch rename to patches/server/0054-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0054-Do-not-log-ignored-advancements.patch b/patches/server/0055-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0054-Do-not-log-ignored-advancements.patch rename to patches/server/0055-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0055-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0056-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0055-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0056-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0056-Do-not-log-unrecognized-recipes.patch b/patches/server/0057-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0056-Do-not-log-unrecognized-recipes.patch rename to patches/server/0057-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0057-Do-not-log-legacy-Material-initialization.patch b/patches/server/0058-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0057-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0058-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0058-Do-not-log-expired-message-warnings.patch b/patches/server/0059-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0058-Do-not-log-expired-message-warnings.patch rename to patches/server/0059-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0059-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0060-Do-not-log-out-of-order-message-warnings.patch similarity index 100% rename from patches/server/0059-Do-not-log-out-of-order-message-warnings.patch rename to patches/server/0060-Do-not-log-out-of-order-message-warnings.patch diff --git a/patches/server/0060-Do-not-log-Not-Secure-marker.patch b/patches/server/0061-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0060-Do-not-log-Not-Secure-marker.patch rename to patches/server/0061-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0061-Do-not-log-run-as-root-warning.patch b/patches/server/0062-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0061-Do-not-log-run-as-root-warning.patch rename to patches/server/0062-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0062-Do-not-log-offline-mode-warning.patch b/patches/server/0063-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0062-Do-not-log-offline-mode-warning.patch rename to patches/server/0063-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0063-Softly-log-invalid-pool-element-errors.patch b/patches/server/0064-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0063-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0064-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0064-Fix-legacy-colors-in-console.patch b/patches/server/0065-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0064-Fix-legacy-colors-in-console.patch rename to patches/server/0065-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0065-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0066-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0065-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0066-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0066-Make-sand-duping-fix-configurable.patch b/patches/server/0067-Make-sand-duping-fix-configurable.patch similarity index 100% rename from patches/server/0066-Make-sand-duping-fix-configurable.patch rename to patches/server/0067-Make-sand-duping-fix-configurable.patch diff --git a/patches/server/0067-Fix-MC-238526.patch b/patches/server/0068-Fix-MC-238526.patch similarity index 100% rename from patches/server/0067-Fix-MC-238526.patch rename to patches/server/0068-Fix-MC-238526.patch diff --git a/patches/server/0068-Fix-MC-123848.patch b/patches/server/0069-Fix-MC-123848.patch similarity index 100% rename from patches/server/0068-Fix-MC-123848.patch rename to patches/server/0069-Fix-MC-123848.patch diff --git a/patches/server/0069-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0069-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0070-Fix-MC-121706.patch b/patches/server/0071-Fix-MC-121706.patch similarity index 100% rename from patches/server/0070-Fix-MC-121706.patch rename to patches/server/0071-Fix-MC-121706.patch diff --git a/patches/server/0071-Fix-MC-110386.patch b/patches/server/0072-Fix-MC-110386.patch similarity index 100% rename from patches/server/0071-Fix-MC-110386.patch rename to patches/server/0072-Fix-MC-110386.patch diff --git a/patches/server/0072-Fix-MC-31819.patch b/patches/server/0073-Fix-MC-31819.patch similarity index 100% rename from patches/server/0072-Fix-MC-31819.patch rename to patches/server/0073-Fix-MC-31819.patch diff --git a/patches/server/0073-Fix-MC-26304.patch b/patches/server/0074-Fix-MC-26304.patch similarity index 100% rename from patches/server/0073-Fix-MC-26304.patch rename to patches/server/0074-Fix-MC-26304.patch diff --git a/patches/server/0074-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0074-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0075-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0076-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0075-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0076-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 100% rename from patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch diff --git a/patches/server/0077-Make-logging-login-locations-configurable.patch b/patches/server/0078-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0077-Make-logging-login-locations-configurable.patch rename to patches/server/0078-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0078-Reduce-array-allocations.patch b/patches/server/0079-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0078-Reduce-array-allocations.patch rename to patches/server/0079-Reduce-array-allocations.patch diff --git a/patches/server/0079-Optimize-sun-burn-tick.patch b/patches/server/0080-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0079-Optimize-sun-burn-tick.patch rename to patches/server/0080-Optimize-sun-burn-tick.patch diff --git a/patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0080-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0081-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0081-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0082-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0082-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0083-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0083-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0084-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0084-Replace-class-map-with-optimized-collection.patch b/patches/server/0085-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0084-Replace-class-map-with-optimized-collection.patch rename to patches/server/0085-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0085-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0086-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0086-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0087-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0086-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0087-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0088-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0088-Cache-BlockStatePairKey-hash.patch b/patches/server/0089-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0088-Cache-BlockStatePairKey-hash.patch rename to patches/server/0089-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0090-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0089-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0090-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0091-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0092-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0092-Check-frozen-ticks-before-landing-block.patch b/patches/server/0093-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0092-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0093-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0093-Faster-chunk-serialization.patch b/patches/server/0094-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0093-Faster-chunk-serialization.patch rename to patches/server/0094-Faster-chunk-serialization.patch diff --git a/patches/server/0094-Update-boss-bar-within-tick.patch b/patches/server/0095-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0094-Update-boss-bar-within-tick.patch rename to patches/server/0095-Update-boss-bar-within-tick.patch diff --git a/patches/server/0095-Cache-ominous-banner-item.patch b/patches/server/0096-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0095-Cache-ominous-banner-item.patch rename to patches/server/0096-Cache-ominous-banner-item.patch diff --git a/patches/server/0096-Precompute-piston-shapes.patch b/patches/server/0097-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0096-Precompute-piston-shapes.patch rename to patches/server/0097-Precompute-piston-shapes.patch diff --git a/patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0097-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0098-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0098-Cache-world-generator-sea-level.patch b/patches/server/0099-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0098-Cache-world-generator-sea-level.patch rename to patches/server/0099-Cache-world-generator-sea-level.patch diff --git a/patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0099-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0100-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0100-Optimize-villager-data-storage.patch b/patches/server/0101-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0100-Optimize-villager-data-storage.patch rename to patches/server/0101-Optimize-villager-data-storage.patch diff --git a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0102-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0101-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0102-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0102-Store-mob-counts-in-an-array.patch b/patches/server/0103-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0102-Store-mob-counts-in-an-array.patch rename to patches/server/0103-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0103-Use-linked-map-for-entity-trackers.patch b/patches/server/0104-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0103-Use-linked-map-for-entity-trackers.patch rename to patches/server/0104-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0104-Optimize-noise-generation.patch b/patches/server/0105-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0104-Optimize-noise-generation.patch rename to patches/server/0105-Optimize-noise-generation.patch diff --git a/patches/server/0105-Optimize-sheep-offspring-color.patch b/patches/server/0106-Optimize-sheep-offspring-color.patch similarity index 100% rename from patches/server/0105-Optimize-sheep-offspring-color.patch rename to patches/server/0106-Optimize-sheep-offspring-color.patch diff --git a/patches/server/0106-Ignore-durability-change-equipment-updates.patch b/patches/server/0107-Ignore-durability-change-equipment-updates.patch similarity index 100% rename from patches/server/0106-Ignore-durability-change-equipment-updates.patch rename to patches/server/0107-Ignore-durability-change-equipment-updates.patch diff --git a/patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch similarity index 100% rename from patches/server/0107-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0108-Hide-flames-on-entities-with-fire-resistance.patch diff --git a/patches/server/0108-Skip-cloning-advancement-criteria.patch b/patches/server/0109-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0108-Skip-cloning-advancement-criteria.patch rename to patches/server/0109-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0109-Reduce-block-destruction-packet-allocations.patch b/patches/server/0110-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0109-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0110-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0110-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 100% rename from patches/server/0110-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0111-Send-set-head-rotation-packets-only-for-living-entit.patch diff --git a/patches/server/0111-Player-canSee-by-entity-UUID.patch b/patches/server/0112-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0111-Player-canSee-by-entity-UUID.patch rename to patches/server/0112-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0112-Spread-out-sending-all-player-info.patch b/patches/server/0113-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0112-Spread-out-sending-all-player-info.patch rename to patches/server/0113-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch b/patches/server/0114-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0113-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0114-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0115-Send-multiple-keep-alive-packets.patch b/patches/server/0116-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0115-Send-multiple-keep-alive-packets.patch rename to patches/server/0116-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0116-Make-slow-login-timeout-configurable.patch b/patches/server/0117-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0116-Make-slow-login-timeout-configurable.patch rename to patches/server/0117-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0117-Make-max-interaction-distance-configurable.patch b/patches/server/0118-Make-max-interaction-distance-configurable.patch similarity index 100% rename from patches/server/0117-Make-max-interaction-distance-configurable.patch rename to patches/server/0118-Make-max-interaction-distance-configurable.patch diff --git a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 100% rename from patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch diff --git a/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 100% rename from patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch diff --git a/patches/server/0122-Ignore-null-legacy-structure-data.patch b/patches/server/0123-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0122-Ignore-null-legacy-structure-data.patch rename to patches/server/0123-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0123-Don-t-double-save-stored-user-lists.patch b/patches/server/0124-Don-t-double-save-stored-user-lists.patch similarity index 100% rename from patches/server/0123-Don-t-double-save-stored-user-lists.patch rename to patches/server/0124-Don-t-double-save-stored-user-lists.patch diff --git a/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0125-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 100% rename from patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0126-Prevent-entities-random-strolling-into-non-ticking-c.patch diff --git a/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0127-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0127-CraftBukkit-UUID-to-world-map.patch b/patches/server/0128-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0127-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0128-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0128-Global-EULA-file.patch b/patches/server/0129-Global-EULA-file.patch similarity index 100% rename from patches/server/0128-Global-EULA-file.patch rename to patches/server/0129-Global-EULA-file.patch diff --git a/patches/server/0129-Specific-interval-TPS-API.patch b/patches/server/0130-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0129-Specific-interval-TPS-API.patch rename to patches/server/0130-Specific-interval-TPS-API.patch diff --git a/patches/server/0130-5-second-TPS-average.patch b/patches/server/0131-5-second-TPS-average.patch similarity index 100% rename from patches/server/0130-5-second-TPS-average.patch rename to patches/server/0131-5-second-TPS-average.patch diff --git a/patches/server/0131-Measure-last-tick-time.patch b/patches/server/0132-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0131-Measure-last-tick-time.patch rename to patches/server/0132-Measure-last-tick-time.patch diff --git a/patches/server/0132-Last-tick-time-API.patch b/patches/server/0133-Last-tick-time-API.patch similarity index 100% rename from patches/server/0132-Last-tick-time-API.patch rename to patches/server/0133-Last-tick-time-API.patch diff --git a/patches/server/0133-Show-last-tick-time-in-tps-command.patch b/patches/server/0134-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0133-Show-last-tick-time-in-tps-command.patch rename to patches/server/0134-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0134-Increase-time-statistics-in-intervals.patch b/patches/server/0135-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0134-Increase-time-statistics-in-intervals.patch rename to patches/server/0135-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0136-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0137-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0136-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0137-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0137-Optimize-identical-item-checks.patch b/patches/server/0138-Optimize-identical-item-checks.patch similarity index 100% rename from patches/server/0137-Optimize-identical-item-checks.patch rename to patches/server/0138-Optimize-identical-item-checks.patch diff --git a/patches/server/0138-Reduce-RandomSource-instances.patch b/patches/server/0139-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0138-Reduce-RandomSource-instances.patch rename to patches/server/0139-Reduce-RandomSource-instances.patch diff --git a/patches/server/0139-Server-thread-priority-environment-variable.patch b/patches/server/0140-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0139-Server-thread-priority-environment-variable.patch rename to patches/server/0140-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0140-Thread-safety-annotations.patch b/patches/server/0141-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0140-Thread-safety-annotations.patch rename to patches/server/0141-Thread-safety-annotations.patch diff --git a/patches/server/0141-CPU-cores-estimation.patch b/patches/server/0142-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0141-CPU-cores-estimation.patch rename to patches/server/0142-CPU-cores-estimation.patch diff --git a/patches/server/0142-Mutex-utility.patch b/patches/server/0143-Mutex-utility.patch similarity index 100% rename from patches/server/0142-Mutex-utility.patch rename to patches/server/0143-Mutex-utility.patch diff --git a/patches/server/0143-Paired-lock-and-condition-utility.patch b/patches/server/0144-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0143-Paired-lock-and-condition-utility.patch rename to patches/server/0144-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0144-Unterminable-executor-utility.patch b/patches/server/0145-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0144-Unterminable-executor-utility.patch rename to patches/server/0145-Unterminable-executor-utility.patch diff --git a/patches/server/0145-FIFO-concurrent-queue-utility.patch b/patches/server/0146-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0145-FIFO-concurrent-queue-utility.patch rename to patches/server/0146-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0146-Base-thread-pools.patch b/patches/server/0147-Base-thread-pools.patch similarity index 100% rename from patches/server/0146-Base-thread-pools.patch rename to patches/server/0147-Base-thread-pools.patch diff --git a/patches/server/0147-Non-blocking-PooledObjects.patch b/patches/server/0148-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0147-Non-blocking-PooledObjects.patch rename to patches/server/0148-Non-blocking-PooledObjects.patch