diff --git a/patches/server/0065-Fix-MC-31819.patch b/patches/server/0065-Fix-MC-31819.patch new file mode 100644 index 0000000..7f03221 --- /dev/null +++ b/patches/server/0065-Fix-MC-31819.patch @@ -0,0 +1,52 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Fri, 23 Dec 2022 15:40:22 +0100 +Subject: [PATCH] Fix MC-31819 + +License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) +Gale - https://galemc.org + +This patch is based on the following patch: +"Fix hunger saturation depleting on peaceful" +By: etil2jz <81570777+etil2jz@users.noreply.github.com> +As part of: Mirai (https://github.com/etil2jz/Mirai) +Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) + +* Mirai description * + +The food saturation value is depleted on peaceful, even though +the displayed hunger bar never goes down. Hunger (or any related value, including saturation) +should not go down on peaceful. See https://bugs.mojang.com/browse/MC-31819. + +diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java +index 2e6557a19523d18aecff709de30cb4466b46a9fa..bb838cad051ab8da85e2f5bcf689b6d280e91fcb 100644 +--- a/src/main/java/net/minecraft/world/entity/player/Player.java ++++ b/src/main/java/net/minecraft/world/entity/player/Player.java +@@ -1900,6 +1900,11 @@ public abstract class Player extends LivingEntity { + } + + public void causeFoodExhaustion(float f, EntityExhaustionEvent.ExhaustionReason reason) { ++ // Gale start - Mirai - fix MC-31819 ++ if (this.level.galeConfig().gameplayMechanics.fixes.mc31819 && this.level.getDifficulty() == Difficulty.PEACEFUL) { ++ return; ++ } ++ // Gale end - Mirai - fix MC-31819 + // CraftBukkit end + 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 c1349f89da677297ca1c24e375addaed1f91953c..a7228108ffb447b27f254737a81709d0de2222f6 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -270,6 +270,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public boolean mc110386 = true; + // Gale end - Mirai - fix MC-110386 + ++ // Gale start - Mirai - fix MC-31819 ++ @Setting("mc-31819") ++ public boolean mc31819 = true; ++ // Gale end - Mirai - fix MC-31819 ++ + } + + } diff --git a/patches/server/0065-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0066-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 97% rename from patches/server/0065-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0066-End-gateway-should-check-if-entity-can-use-portal.patch index 7e3cda8..890b49b 100644 --- a/patches/server/0065-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0066-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,7 +49,7 @@ index f80545f80948db27d1fbde77d0505c916eb504ed..2a596cc374206a85bb692f5e09ee2dd8 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 c1349f89da677297ca1c24e375addaed1f91953c..1d3a49182fbd661e05e93d101a3fc723bf5e274e 100644 +index a7228108ffb447b27f254737a81709d0de2222f6..824815ac8e1f90e2667b32b35c447a009a149cbb 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -249,6 +249,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0066-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0067-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 97% rename from patches/server/0066-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0067-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch index 1703d5a..84917c3 100644 --- a/patches/server/0066-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch +++ b/patches/server/0067-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch @@ -59,7 +59,7 @@ index 80aa539f7c6a6ee44338de084cdcdf5fb4ef996a..cb8fc8a88c14d2374a0bbe35aa1c2056 return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 1d3a49182fbd661e05e93d101a3fc723bf5e274e..3a3c9d900374c6dc069bee8e782dd231f5f2bfc3 100644 +index 824815ac8e1f90e2667b32b35c447a009a149cbb..10cd0e029d40ae02d12be358be03141e7cf89017 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -244,6 +244,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0067-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0068-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 97% rename from patches/server/0067-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0068-Make-arrow-movement-resetting-despawn-counter-config.patch index 386006c..473ae73 100644 --- a/patches/server/0067-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0068-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,7 +55,7 @@ index e7ef36dac559d03d127cf45373a7e0dc935b80a8..80b3f0a4ab3e57674a709ee9765df971 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 3a3c9d900374c6dc069bee8e782dd231f5f2bfc3..b26f8204494271b8eae627533a7e6bd883db614c 100644 +index 10cd0e029d40ae02d12be358be03141e7cf89017..24a6e2ef5472936f478b759e79197442490e3ada 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -245,6 +245,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0068-Reduce-array-allocations.patch b/patches/server/0069-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0068-Reduce-array-allocations.patch rename to patches/server/0069-Reduce-array-allocations.patch diff --git a/patches/server/0069-Optimize-sun-burn-tick.patch b/patches/server/0070-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0069-Optimize-sun-burn-tick.patch rename to patches/server/0070-Optimize-sun-burn-tick.patch diff --git a/patches/server/0070-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0071-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0070-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0071-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0071-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0072-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0071-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0072-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0072-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0073-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0072-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0073-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0073-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0074-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0073-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0074-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0074-Replace-class-map-with-optimized-collection.patch b/patches/server/0075-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0074-Replace-class-map-with-optimized-collection.patch rename to patches/server/0075-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0075-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0076-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0075-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0076-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0077-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0077-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0077-Cache-BlockStatePairKey-hash.patch b/patches/server/0078-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0077-Cache-BlockStatePairKey-hash.patch rename to patches/server/0078-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0078-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0079-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0078-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0079-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0080-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0081-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0081-Check-frozen-ticks-before-landing-block.patch b/patches/server/0082-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0081-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0082-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0082-Faster-chunk-serialization.patch b/patches/server/0083-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0082-Faster-chunk-serialization.patch rename to patches/server/0083-Faster-chunk-serialization.patch diff --git a/patches/server/0083-Update-boss-bar-within-tick.patch b/patches/server/0084-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0083-Update-boss-bar-within-tick.patch rename to patches/server/0084-Update-boss-bar-within-tick.patch diff --git a/patches/server/0084-Cache-ominous-banner-item.patch b/patches/server/0085-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0084-Cache-ominous-banner-item.patch rename to patches/server/0085-Cache-ominous-banner-item.patch diff --git a/patches/server/0085-Precompute-piston-shapes.patch b/patches/server/0086-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0085-Precompute-piston-shapes.patch rename to patches/server/0086-Precompute-piston-shapes.patch diff --git a/patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0087-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0087-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0087-Cache-world-generator-sea-level.patch b/patches/server/0088-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0087-Cache-world-generator-sea-level.patch rename to patches/server/0088-Cache-world-generator-sea-level.patch diff --git a/patches/server/0088-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0089-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0088-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0089-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0089-Store-mob-counts-in-an-array.patch b/patches/server/0090-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0089-Store-mob-counts-in-an-array.patch rename to patches/server/0090-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0090-Use-linked-map-for-entity-trackers.patch b/patches/server/0091-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0090-Use-linked-map-for-entity-trackers.patch rename to patches/server/0091-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0091-Optimize-noise-generation.patch b/patches/server/0092-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0091-Optimize-noise-generation.patch rename to patches/server/0092-Optimize-noise-generation.patch diff --git a/patches/server/0092-Ignore-durability-change-equipment-updates.patch b/patches/server/0093-Ignore-durability-change-equipment-updates.patch similarity index 97% rename from patches/server/0092-Ignore-durability-change-equipment-updates.patch rename to patches/server/0093-Ignore-durability-change-equipment-updates.patch index 761d2db..37599f3 100644 --- a/patches/server/0092-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0093-Ignore-durability-change-equipment-updates.patch @@ -53,7 +53,7 @@ index 8fd080110ed4efaf6cb3a2561b32ed66ff8c78f0..b1a01ef0090718923aff4365d8e93c77 return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b26f8204494271b8eae627533a7e6bd883db614c..7b99d605267dfd24f875fbf929b2a97728d16976 100644 +index 24a6e2ef5472936f478b759e79197442490e3ada..6f6aa43685584517d3ea05fac1297c696eeea07d 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch similarity index 96% rename from patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch index a754635..2219701 100644 --- a/patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0094-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,7 +31,7 @@ index 92c9ccf9a05fe54b5c7e5a72da5498115a6d5bd9..d05e5b9b4dec0779489856dab5e50b53 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 7b99d605267dfd24f875fbf929b2a97728d16976..045d6874b30a6ab2082f379415b9c3b3f80af000 100644 +index 6f6aa43685584517d3ea05fac1297c696eeea07d..cf6f75c6c0c88cc0153e25980ba9bf8a915af3b5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -248,6 +248,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0094-Skip-cloning-advancement-criteria.patch b/patches/server/0095-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0094-Skip-cloning-advancement-criteria.patch rename to patches/server/0095-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0095-Player-canSee-by-entity-UUID.patch b/patches/server/0096-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0095-Player-canSee-by-entity-UUID.patch rename to patches/server/0096-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0096-Spread-out-sending-all-player-info.patch b/patches/server/0097-Spread-out-sending-all-player-info.patch similarity index 99% rename from patches/server/0096-Spread-out-sending-all-player-info.patch rename to patches/server/0097-Spread-out-sending-all-player-info.patch index 74f32a7..ca2b4f2 100644 --- a/patches/server/0096-Spread-out-sending-all-player-info.patch +++ b/patches/server/0097-Spread-out-sending-all-player-info.patch @@ -157,7 +157,7 @@ index ede2eb274ca715dccfbfd98e0e2c410990508ced..d2fc479811087a7536fbe1226ae2efa0 } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2e6557a19523d18aecff709de30cb4466b46a9fa..6f071601266dff833270bbde9863cc0c4dcfa97d 100644 +index bb838cad051ab8da85e2f5bcf689b6d280e91fcb..68247b9daf710c71f84e1fae9d91efed151d39aa 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -40,6 +40,7 @@ import net.minecraft.network.syncher.SynchedEntityData; diff --git a/patches/server/0097-Optimize-player-list-for-sending-player-info.patch b/patches/server/0098-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0097-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0098-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0098-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0098-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0099-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0099-Send-multiple-keep-alive-packets.patch b/patches/server/0100-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0099-Send-multiple-keep-alive-packets.patch rename to patches/server/0100-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0100-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 96% rename from patches/server/0100-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch index 461f509..476020c 100644 --- a/patches/server/0100-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,7 +36,7 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..29c7f53a4fa88a77c4076a6294e689e4 } 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 045d6874b30a6ab2082f379415b9c3b3f80af000..f254520946720d740fd2f846890d6d6425ca064e 100644 +index cf6f75c6c0c88cc0153e25980ba9bf8a915af3b5..e2d6f0e479268e1fadfee4a73281360cf9406760 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0101-Specific-interval-TPS-API.patch b/patches/server/0102-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0101-Specific-interval-TPS-API.patch rename to patches/server/0102-Specific-interval-TPS-API.patch diff --git a/patches/server/0102-5-second-TPS-average.patch b/patches/server/0103-5-second-TPS-average.patch similarity index 100% rename from patches/server/0102-5-second-TPS-average.patch rename to patches/server/0103-5-second-TPS-average.patch diff --git a/patches/server/0103-Measure-last-tick-time.patch b/patches/server/0104-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0103-Measure-last-tick-time.patch rename to patches/server/0104-Measure-last-tick-time.patch diff --git a/patches/server/0104-Last-tick-time-API.patch b/patches/server/0105-Last-tick-time-API.patch similarity index 100% rename from patches/server/0104-Last-tick-time-API.patch rename to patches/server/0105-Last-tick-time-API.patch diff --git a/patches/server/0105-Show-last-tick-time-in-tps-command.patch b/patches/server/0106-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0105-Show-last-tick-time-in-tps-command.patch rename to patches/server/0106-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0106-Increase-time-statistics-in-intervals.patch b/patches/server/0107-Increase-time-statistics-in-intervals.patch similarity index 98% rename from patches/server/0106-Increase-time-statistics-in-intervals.patch rename to patches/server/0107-Increase-time-statistics-in-intervals.patch index 8b69819..19ec6ef 100644 --- a/patches/server/0106-Increase-time-statistics-in-intervals.patch +++ b/patches/server/0107-Increase-time-statistics-in-intervals.patch @@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 6f071601266dff833270bbde9863cc0c4dcfa97d..529df114eb0ca3020bf8c699889b9a543905a1f2 100644 +index 68247b9daf710c71f84e1fae9d91efed151d39aa..92b30f5293e80e078d8a1a740d22367ea36a71f1 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -114,6 +114,7 @@ import net.minecraft.world.phys.AABB; diff --git a/patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0108-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0108-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0109-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0108-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0109-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0109-Reduce-RandomSource-instances.patch b/patches/server/0110-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0109-Reduce-RandomSource-instances.patch rename to patches/server/0110-Reduce-RandomSource-instances.patch diff --git a/patches/server/0110-Server-thread-priority-environment-variable.patch b/patches/server/0111-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0110-Server-thread-priority-environment-variable.patch rename to patches/server/0111-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0111-Thread-safety-annotations.patch b/patches/server/0112-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0111-Thread-safety-annotations.patch rename to patches/server/0112-Thread-safety-annotations.patch diff --git a/patches/server/0112-CPU-cores-estimation.patch b/patches/server/0113-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0112-CPU-cores-estimation.patch rename to patches/server/0113-CPU-cores-estimation.patch diff --git a/patches/server/0113-Mutex-utility.patch b/patches/server/0114-Mutex-utility.patch similarity index 100% rename from patches/server/0113-Mutex-utility.patch rename to patches/server/0114-Mutex-utility.patch diff --git a/patches/server/0114-Paired-lock-and-condition-utility.patch b/patches/server/0115-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0114-Paired-lock-and-condition-utility.patch rename to patches/server/0115-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0115-Unterminable-executor-utility.patch b/patches/server/0116-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0115-Unterminable-executor-utility.patch rename to patches/server/0116-Unterminable-executor-utility.patch diff --git a/patches/server/0116-FIFO-concurrent-queue-utility.patch b/patches/server/0117-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0116-FIFO-concurrent-queue-utility.patch rename to patches/server/0117-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0117-Base-thread-pools.patch b/patches/server/0118-Base-thread-pools.patch similarity index 100% rename from patches/server/0117-Base-thread-pools.patch rename to patches/server/0118-Base-thread-pools.patch diff --git a/patches/server/0118-Non-blocking-PooledObjects.patch b/patches/server/0119-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0118-Non-blocking-PooledObjects.patch rename to patches/server/0119-Non-blocking-PooledObjects.patch