diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch index 9217523..2cafed6 100644 --- a/patches/server/0017-Remove-vanilla-profiler.patch +++ b/patches/server/0017-Remove-vanilla-profiler.patch @@ -1901,7 +1901,7 @@ index 6ec3fc801453fd54c25b642e6fa71c19b463311d..b02a2ca45152693e9974e802866feaa6 if (throwable instanceof ThreadDeath) throw throwable; // Paper // Paper start - Prevent block entity and entity crashes diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java -index 8aa4ac3a6affbe888d6084a27b668c58dfda6c79..b70deca077e49da069906d33bb29daab21f0943d 100644 +index 8aa4ac3a6affbe888d6084a27b668c58dfda6c79..61d5fe8e5344a6cb94d427859488c34821c8a3f6 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java @@ -12,7 +12,6 @@ import java.util.function.Function; @@ -1932,6 +1932,14 @@ index 8aa4ac3a6affbe888d6084a27b668c58dfda6c79..b70deca077e49da069906d33bb29daab // Set set = positions.keySet(); startNode.g = 0.0F; startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection +@@ -123,7 +120,6 @@ public class PathFinder { + if (best == null || comparator.compare(path, best) < 0) + best = path; + } +- profiler.pop(); + return best; + // Paper end - Perf: remove streams and optimize collection + } diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java b/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java index 3ddf6ab00de2456ebf504985b88994f970e3b5c4..3b2eb7738380c9385c0227e6f04e3c1691093b1f 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/LootDataManager.java diff --git a/patches/server/0069-Make-tripwire-duping-fix-configurable.patch b/patches/server/0069-Make-tripwire-duping-fix-configurable.patch new file mode 100644 index 0000000..b1cc0c4 --- /dev/null +++ b/patches/server/0069-Make-tripwire-duping-fix-configurable.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> +Date: Sun, 6 Nov 2022 04:32:27 -0500 +Subject: [PATCH] Make tripwire duping fix configurable + +License: MIT (https://opensource.org/licenses/MIT) +Leaf - https://github.com/Winds-Studio/Leaf + +diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +index 8bf94fcf5c46ffe6d90f8431338b768ef1a2dd61..d0da50473a53ffe37ac4a0e0f3e3d328ce1b6a4c 100644 +--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +@@ -201,7 +201,7 @@ public class TripWireHookBlock extends Block { + BlockState iblockdata4 = aiblockdata[l]; + + if (iblockdata4 != null) { +- if (world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended ++ if (!world.galeConfig().gameplayMechanics.fixes.tripwireDuping || world.getBlockState(blockposition2).is(Blocks.TRIPWIRE)) { // Paper - Fix tripwire disarming not working as intended // Gale - Leaf - make tripwire duping fix configurable + world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3); + } + } +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index f8a561d91686d6df89a7374ca223972e435978c9..867849daa3a3eacaa90caad079234f8aa38d8dcf 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -96,6 +96,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public GameplayMechanics gameplayMechanics; + public class GameplayMechanics extends ConfigurationPart { + ++ public Fixes fixes; ++ public class Fixes extends ConfigurationPart { ++ public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable ++ ++ } ++ + public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration + public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable + diff --git a/patches/server/0069-Fix-MC-238526.patch b/patches/server/0070-Fix-MC-238526.patch similarity index 86% rename from patches/server/0069-Fix-MC-238526.patch rename to patches/server/0070-Fix-MC-238526.patch index 1446ed5..bf81f95 100644 --- a/patches/server/0069-Fix-MC-238526.patch +++ b/patches/server/0070-Fix-MC-238526.patch @@ -49,23 +49,18 @@ index 9b897cf53f4bb5d366e6ac88dbed93c59d8fe541..53e3a40246da0a4d30ad8a7286d1a43d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644 +index 867849daa3a3eacaa90caad079234f8aa38d8dcf..1f99a324527d5329a21e795d3b6d95b535f415ef 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public GameplayMechanics gameplayMechanics; - public class GameplayMechanics extends ConfigurationPart { +@@ -100,6 +100,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public class Fixes extends ConfigurationPart { + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable -+ public Fixes fixes; -+ public class Fixes extends ConfigurationPart { -+ + // Gale start - Purpur - fix MC-238526 + @Setting("mc-238526") + public boolean mc238526 = false; + // Gale end - Purpur - fix MC-238526 + -+ } -+ - public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration - public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable + } + public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration diff --git a/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 93% rename from patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch index 7e0904c..bf64cb1 100644 --- a/patches/server/0070-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0071-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,12 +64,12 @@ index 161c128d27f50f145f88142191f1a5c93649ea65..6659abb4ab8a13a48c154d2e3f273eb1 entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644 +index 1f99a324527d5329a21e795d3b6d95b535f415ef..410aa2ffd6bd9792e81a3e2933fe923291e1dd99 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public Fixes fixes; +@@ -100,6 +100,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class Fixes extends ConfigurationPart { + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + diff --git a/patches/server/0071-Fix-MC-121706.patch b/patches/server/0072-Fix-MC-121706.patch similarity index 96% rename from patches/server/0071-Fix-MC-121706.patch rename to patches/server/0072-Fix-MC-121706.patch index a33c189..e0b2a51 100644 --- a/patches/server/0071-Fix-MC-121706.patch +++ b/patches/server/0072-Fix-MC-121706.patch @@ -65,10 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644 +index 410aa2ffd6bd9792e81a3e2933fe923291e1dd99..eb84bc4a643cb66258a3263c4798265071978c3f 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -107,6 +107,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc238526 = false; // Gale end - Purpur - fix MC-238526 diff --git a/patches/server/0072-Fix-MC-110386.patch b/patches/server/0073-Fix-MC-110386.patch similarity index 93% rename from patches/server/0072-Fix-MC-110386.patch rename to patches/server/0073-Fix-MC-110386.patch index 1cbfc62..e4ba8ac 100644 --- a/patches/server/0072-Fix-MC-110386.patch +++ b/patches/server/0073-Fix-MC-110386.patch @@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644 +index eb84bc4a643cb66258a3263c4798265071978c3f..0ad4a7d73f0c28834a925128a1235d2f279dd067 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -112,6 +112,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc121706 = false; // Gale end - Purpur - fix MC-121706 diff --git a/patches/server/0073-Fix-MC-31819.patch b/patches/server/0074-Fix-MC-31819.patch similarity index 93% rename from patches/server/0073-Fix-MC-31819.patch rename to patches/server/0074-Fix-MC-31819.patch index 71b6d73..47f2b29 100644 --- a/patches/server/0073-Fix-MC-31819.patch +++ b/patches/server/0074-Fix-MC-31819.patch @@ -35,10 +35,10 @@ index 567704f61034363e48ef2a5b5566ebdc91682297..e1b2b6a55d0a837d2a447dcc636a9f29 if (!this.abilities.invulnerable) { if (!this.level().isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644 +index 0ad4a7d73f0c28834a925128a1235d2f279dd067..b38180cff9f1d24d9d2093add658d14b3196066a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -117,6 +117,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc110386 = true; // Gale end - Mirai - fix MC-110386 diff --git a/patches/server/0074-Fix-MC-26304.patch b/patches/server/0075-Fix-MC-26304.patch similarity index 100% rename from patches/server/0074-Fix-MC-26304.patch rename to patches/server/0075-Fix-MC-26304.patch diff --git a/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 93% rename from patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch index e867c35..a7bc513 100644 --- a/patches/server/0075-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0076-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,11 +49,11 @@ index 098fde8200a11f91f934ddab6b1486dac4014dfe..083130de6f6d5b6daa1564d5d51115f7 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..56bf02a1f9741fc1c05ede0c0c79fea97d46271b 100644 +index b38180cff9f1d24d9d2093add658d14b3196066a..cd4ddb2d4d66d4ffd7310ef29444d995ec58e427 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class Fixes extends ConfigurationPart { +@@ -101,6 +101,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal 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 95% 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 index b498275..3edfe6b 100644 --- a/patches/server/0076-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0077-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,10 +55,10 @@ index e8faca6e443239968f0111519f9e5cd018ed3297..488a98e20b4f405d1ce4a224d2d2b515 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 56bf02a1f9741fc1c05ede0c0c79fea97d46271b..0f205f02ce0553fb1f8db8aa903861102a570708 100644 +index cd4ddb2d4d66d4ffd7310ef29444d995ec58e427..e55535f7de93c2b0ac7d84d2dbf16101cb0e61de 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -124,6 +124,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -125,6 +125,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } 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-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0086-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0087-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0087-Cache-BlockStatePairKey-hash.patch b/patches/server/0088-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0087-Cache-BlockStatePairKey-hash.patch rename to patches/server/0088-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0088-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0089-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0088-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0089-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0089-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0090-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0090-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0091-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0091-Check-frozen-ticks-before-landing-block.patch b/patches/server/0092-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0091-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0092-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0092-Faster-chunk-serialization.patch b/patches/server/0093-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0092-Faster-chunk-serialization.patch rename to patches/server/0093-Faster-chunk-serialization.patch diff --git a/patches/server/0093-Update-boss-bar-within-tick.patch b/patches/server/0094-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0093-Update-boss-bar-within-tick.patch rename to patches/server/0094-Update-boss-bar-within-tick.patch diff --git a/patches/server/0094-Cache-ominous-banner-item.patch b/patches/server/0095-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0094-Cache-ominous-banner-item.patch rename to patches/server/0095-Cache-ominous-banner-item.patch diff --git a/patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0095-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0096-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0096-Cache-world-generator-sea-level.patch b/patches/server/0097-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0096-Cache-world-generator-sea-level.patch rename to patches/server/0097-Cache-world-generator-sea-level.patch diff --git a/patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0097-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0098-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0098-Optimize-villager-data-storage.patch b/patches/server/0099-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0098-Optimize-villager-data-storage.patch rename to patches/server/0099-Optimize-villager-data-storage.patch diff --git a/patches/server/0099-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0100-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0099-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0100-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0100-Store-mob-counts-in-an-array.patch b/patches/server/0101-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0100-Store-mob-counts-in-an-array.patch rename to patches/server/0101-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0101-Use-linked-map-for-entity-trackers.patch b/patches/server/0102-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0101-Use-linked-map-for-entity-trackers.patch rename to patches/server/0102-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0102-Optimize-noise-generation.patch b/patches/server/0103-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0102-Optimize-noise-generation.patch rename to patches/server/0103-Optimize-noise-generation.patch diff --git a/patches/server/0103-Optimize-sheep-offspring-color.patch b/patches/server/0104-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0103-Optimize-sheep-offspring-color.patch rename to patches/server/0104-Optimize-sheep-offspring-color.patch index 8347157..f0262a7 100644 --- a/patches/server/0103-Optimize-sheep-offspring-color.patch +++ b/patches/server/0104-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index 1d80678f7e8f658e43616f0baf723f096a99122a..865f244de1605303f22d8944174b0fe0 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 0f205f02ce0553fb1f8db8aa903861102a570708..19115238d0fd845a788446d88d9ec9a52762c367 100644 +index e55535f7de93c2b0ac7d84d2dbf16101cb0e61de..df8843a80bb0008be1a3a3151360cc92e5676579 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch similarity index 94% rename from patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch index 4846443..fb00782 100644 --- a/patches/server/0104-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0105-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,10 +31,10 @@ index 4f34ca69a0f417028bad01f4a29644a1e08bb9ca..b4d78f2609a58e4aba0340ebfce229bb this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 19115238d0fd845a788446d88d9ec9a52762c367..5d499e77800466210473e36b2355873807b9f86a 100644 +index df8843a80bb0008be1a3a3151360cc92e5676579..7d4e0bf1b128a04118079e0e8e420f3dd3978600 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -127,6 +127,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -128,6 +128,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration diff --git a/patches/server/0105-Skip-cloning-advancement-criteria.patch b/patches/server/0106-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0105-Skip-cloning-advancement-criteria.patch rename to patches/server/0106-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0106-Reduce-block-destruction-packet-allocations.patch b/patches/server/0107-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0106-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0107-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0107-Spread-out-sending-all-player-info.patch b/patches/server/0108-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0107-Spread-out-sending-all-player-info.patch rename to patches/server/0108-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0108-Optimize-player-list-for-sending-player-info.patch b/patches/server/0109-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0108-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0109-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0109-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0110-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0110-Send-multiple-keep-alive-packets.patch b/patches/server/0111-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0110-Send-multiple-keep-alive-packets.patch rename to patches/server/0111-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0111-Make-slow-login-timeout-configurable.patch b/patches/server/0112-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0111-Make-slow-login-timeout-configurable.patch rename to patches/server/0112-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0112-Make-max-interaction-distance-configurable.patch b/patches/server/0113-Make-max-interaction-distance-configurable.patch similarity index 98% rename from patches/server/0112-Make-max-interaction-distance-configurable.patch rename to patches/server/0113-Make-max-interaction-distance-configurable.patch index 317b419..2a5591e 100644 --- a/patches/server/0112-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0113-Make-max-interaction-distance-configurable.patch @@ -86,7 +86,7 @@ index f46c16dd6ff9cd09ea579eecf99ce78c7eb39d49..430b8a2bb1639eeb7338e0f7b1030248 private void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 5d499e77800466210473e36b2355873807b9f86a..c5b23bafb7909130a8a294e3b5bf94daa313ee11 100644 +index 7d4e0bf1b128a04118079e0e8e420f3dd3978600..eb651b6f618cfe4b79a5279396eac6bc99014d02 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -9,6 +9,7 @@ import io.papermc.paper.configuration.PaperConfigurations; @@ -97,7 +97,7 @@ index 5d499e77800466210473e36b2355873807b9f86a..c5b23bafb7909130a8a294e3b5bf94da import org.spongepowered.configurate.objectmapping.meta.Setting; @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"}) -@@ -130,6 +131,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -131,6 +132,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable diff --git a/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 94% rename from patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch index d73a2ec..d9f8b91 100644 --- a/patches/server/0113-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0114-Load-portal-destination-chunk-before-entity-teleport.patch @@ -31,10 +31,10 @@ index b4d78f2609a58e4aba0340ebfce229bb78135475..c445d59036c9de418997ad3be9bc3912 entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - EntityPortalExitEvent entity.setDeltaMovement(velocity); // Paper - EntityPortalExitEvent diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index c5b23bafb7909130a8a294e3b5bf94daa313ee11..f6e4fada132faeb37c076013ef7c54147de42ba8 100644 +index eb651b6f618cfe4b79a5279396eac6bc99014d02..2d298c999def8d401f7100b16a49846b2d5ff186 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -126,6 +126,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -127,6 +127,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch index 5498f80..c83b265 100644 --- a/patches/server/0114-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0115-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..3380125f68b865977ac6275796158204 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f6e4fada132faeb37c076013ef7c54147de42ba8..bc8af8c6b5f0d4717317e072b3be7348b2eeee76 100644 +index 2d298c999def8d401f7100b16a49846b2d5ff186..210423422c81c55d82a190584259af562b7e15ad 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -93,6 +93,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 97% rename from patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch index 12a0c94..a35f3c0 100644 --- a/patches/server/0115-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0116-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -79,7 +79,7 @@ index 6560fda6525dceddc91b95c8dd82b10debd6b62f..9b33b8b6aa769aceeb8080814b0682cb if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index bc8af8c6b5f0d4717317e072b3be7348b2eeee76..9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9 100644 +index 210423422c81c55d82a190584259af562b7e15ad..da903a8872d15d597b739fcb1bb044882f84c138 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 91% rename from patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch index 6d10a36..0cee4c6 100644 --- a/patches/server/0116-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0117-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,12 +38,12 @@ index 06b9fdd33fe888d298dfd24a67702a610233f10d..8d7cda352d1be1bd7638561d4727df9c @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9c7342ed33eb0051a8f8b7b18a02cdbccd003eb9..b736cef3509b1f6c7c6135c0f9e5d29f35c82053 100644 +index da903a8872d15d597b739fcb1bb044882f84c138..f4ba8b70038390a026c61b9f2dc9f427103e6edb 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -107,6 +107,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public Fixes fixes; +@@ -108,6 +108,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class Fixes extends ConfigurationPart { + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom diff --git a/patches/server/0117-Ignore-null-legacy-structure-data.patch b/patches/server/0118-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0117-Ignore-null-legacy-structure-data.patch rename to patches/server/0118-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0118-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0119-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 94% rename from patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch index ec45018..cad5011 100644 --- a/patches/server/0119-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0120-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,10 +36,10 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..9e4d0493aa814a392742c9ddc1815211 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b736cef3509b1f6c7c6135c0f9e5d29f35c82053..2b8f53fc53dc69aa9afd516ef4a81ecf7b43e62c 100644 +index f4ba8b70038390a026c61b9f2dc9f427103e6edb..f4e4da45b069bdea577027e23eb0dcb9e1a45987 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -139,6 +139,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -140,6 +140,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0120-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0121-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0121-CraftBukkit-UUID-to-world-map.patch b/patches/server/0122-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0121-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0122-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0122-Global-EULA-file.patch b/patches/server/0123-Global-EULA-file.patch similarity index 100% rename from patches/server/0122-Global-EULA-file.patch rename to patches/server/0123-Global-EULA-file.patch diff --git a/patches/server/0123-Specific-interval-TPS-API.patch b/patches/server/0124-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0123-Specific-interval-TPS-API.patch rename to patches/server/0124-Specific-interval-TPS-API.patch diff --git a/patches/server/0124-5-second-TPS-average.patch b/patches/server/0125-5-second-TPS-average.patch similarity index 100% rename from patches/server/0124-5-second-TPS-average.patch rename to patches/server/0125-5-second-TPS-average.patch diff --git a/patches/server/0125-Measure-last-tick-time.patch b/patches/server/0126-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0125-Measure-last-tick-time.patch rename to patches/server/0126-Measure-last-tick-time.patch diff --git a/patches/server/0126-Last-tick-time-API.patch b/patches/server/0127-Last-tick-time-API.patch similarity index 100% rename from patches/server/0126-Last-tick-time-API.patch rename to patches/server/0127-Last-tick-time-API.patch diff --git a/patches/server/0127-Show-last-tick-time-in-tps-command.patch b/patches/server/0128-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0127-Show-last-tick-time-in-tps-command.patch rename to patches/server/0128-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0128-Increase-time-statistics-in-intervals.patch b/patches/server/0129-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0128-Increase-time-statistics-in-intervals.patch rename to patches/server/0129-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0129-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0130-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0130-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0131-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0130-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0131-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0131-Optimize-matching-item-checks.patch b/patches/server/0132-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0131-Optimize-matching-item-checks.patch rename to patches/server/0132-Optimize-matching-item-checks.patch diff --git a/patches/server/0132-Pre-compute-VarLong-sizes.patch b/patches/server/0133-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0132-Pre-compute-VarLong-sizes.patch rename to patches/server/0133-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0133-Optimize-VarLong-write.patch b/patches/server/0134-Optimize-VarLong-write.patch similarity index 100% rename from patches/server/0133-Optimize-VarLong-write.patch rename to patches/server/0134-Optimize-VarLong-write.patch diff --git a/patches/server/0134-Reduce-RandomSource-instances.patch b/patches/server/0135-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0134-Reduce-RandomSource-instances.patch rename to patches/server/0135-Reduce-RandomSource-instances.patch diff --git a/patches/server/0135-Add-xor-shift-random.patch b/patches/server/0136-Add-xor-shift-random.patch similarity index 100% rename from patches/server/0135-Add-xor-shift-random.patch rename to patches/server/0136-Add-xor-shift-random.patch diff --git a/patches/server/0136-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0137-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0136-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0137-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0137-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0138-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0137-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0138-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0138-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0139-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 100% rename from patches/server/0138-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0139-Reduce-line-of-sight-updates-and-cache-lookups.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-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0141-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0140-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0141-Instantly-continue-on-world-upgrade-finish.patch diff --git a/patches/server/0141-Virtual-thread-support.patch b/patches/server/0142-Virtual-thread-support.patch similarity index 100% rename from patches/server/0141-Virtual-thread-support.patch rename to patches/server/0142-Virtual-thread-support.patch