diff --git a/patches/server/0064-Fix-MC-110386.patch b/patches/server/0064-Fix-MC-110386.patch new file mode 100644 index 0000000..d74160f --- /dev/null +++ b/patches/server/0064-Fix-MC-110386.patch @@ -0,0 +1,52 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Fri, 23 Dec 2022 15:30:58 +0100 +Subject: [PATCH] Fix MC-110386 + +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 mobs attacking themselves" +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 * + +If an entity is provoked by a second one using commands, +the second will join in the fight against itself, +causing it to attack itself repeatedly. See https://bugs.mojang.com/browse/MC-110386. + +diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java +index 39ea15c7577af186d93d4ad9a48034d746a86fc8..865eb39f4a1d2207c857acccc0695be92af2d6bb 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java ++++ b/src/main/java/net/minecraft/world/entity/ai/goal/target/HurtByTargetGoal.java +@@ -114,6 +114,11 @@ public class HurtByTargetGoal extends TargetGoal { + } + + protected void alertOther(Mob mob, LivingEntity target) { ++ // Gale start - Mirai - fix MC-110386 ++ if (mob == target && mob.level.galeConfig().gameplayMechanics.fixes.mc110386) { ++ return; ++ } ++ // Gale end - Mirai - fix MC-110386 + mob.setTarget(target, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_NEARBY_ENTITY, true); // CraftBukkit - reason + } + } +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index 0ae303da1858ed75cb0eb4b224a0e21fa352fc70..c1349f89da677297ca1c24e375addaed1f91953c 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -265,6 +265,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public boolean mc121706 = false; + // Gale end - Purpur - fix MC-121706 + ++ // Gale start - Mirai - fix MC-110386 ++ @Setting("mc-110386") ++ public boolean mc110386 = true; ++ // Gale end - Mirai - fix MC-110386 ++ + } + + } diff --git a/patches/server/0064-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0065-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 97% rename from patches/server/0064-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0065-End-gateway-should-check-if-entity-can-use-portal.patch index 58b6294..7e3cda8 100644 --- a/patches/server/0064-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0065-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 0ae303da1858ed75cb0eb4b224a0e21fa352fc70..3b023cbd132c6aa263dbbe54ed7d30e1049d3875 100644 +index c1349f89da677297ca1c24e375addaed1f91953c..1d3a49182fbd661e05e93d101a3fc723bf5e274e 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/0065-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0066-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 97% rename from patches/server/0065-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0066-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch index bbe4b56..1703d5a 100644 --- a/patches/server/0065-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch +++ b/patches/server/0066-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 3b023cbd132c6aa263dbbe54ed7d30e1049d3875..9470f4fcca253e722c4120fbab12da3959de60ab 100644 +index 1d3a49182fbd661e05e93d101a3fc723bf5e274e..3a3c9d900374c6dc069bee8e782dd231f5f2bfc3 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/0066-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0067-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 97% rename from patches/server/0066-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0067-Make-arrow-movement-resetting-despawn-counter-config.patch index b824bb6..386006c 100644 --- a/patches/server/0066-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0067-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 9470f4fcca253e722c4120fbab12da3959de60ab..201f30774536966bda6f79b4db2fba6352829e10 100644 +index 3a3c9d900374c6dc069bee8e782dd231f5f2bfc3..b26f8204494271b8eae627533a7e6bd883db614c 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/0067-Reduce-array-allocations.patch b/patches/server/0068-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0067-Reduce-array-allocations.patch rename to patches/server/0068-Reduce-array-allocations.patch diff --git a/patches/server/0068-Optimize-sun-burn-tick.patch b/patches/server/0069-Optimize-sun-burn-tick.patch similarity index 97% rename from patches/server/0068-Optimize-sun-burn-tick.patch rename to patches/server/0069-Optimize-sun-burn-tick.patch index e7e420d..d51f6d5 100644 --- a/patches/server/0068-Optimize-sun-burn-tick.patch +++ b/patches/server/0069-Optimize-sun-burn-tick.patch @@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4b64c6009d93b034b16b67d743050d2a634db6ff..660e8d27bb8733f01d7e60b841877ee14579ede4 100644 +index 792d0724893a0ecc656408e6398b996e1d300f41..fa6bcab86726a874a2f3f565afc8364b51d876fc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -290,7 +290,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0070-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0070-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0070-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0071-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0070-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0071-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0071-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0072-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0071-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0072-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0072-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0073-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0072-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0073-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0073-Replace-class-map-with-optimized-collection.patch b/patches/server/0074-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0073-Replace-class-map-with-optimized-collection.patch rename to patches/server/0074-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0074-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0075-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0074-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0075-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0075-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0076-Cache-BlockStatePairKey-hash.patch b/patches/server/0077-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0076-Cache-BlockStatePairKey-hash.patch rename to patches/server/0077-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0077-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0078-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0077-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0078-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0078-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0078-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0079-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0079-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0079-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0080-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0080-Check-frozen-ticks-before-landing-block.patch b/patches/server/0081-Check-frozen-ticks-before-landing-block.patch similarity index 94% rename from patches/server/0080-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0081-Check-frozen-ticks-before-landing-block.patch index 6ec76ba..81c13be 100644 --- a/patches/server/0080-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0081-Check-frozen-ticks-before-landing-block.patch @@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6ad1e6c4a20bec34b56276736ee616b5dcff0354..75ae119719cf566f66371606e70f19b6b36dc7cb 100644 +index c60cabeff2058663ba05d6c41ff80756b43355a4..7a228425a973122de3d0b0e78d18586d6669e9ed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -572,11 +572,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0081-Faster-chunk-serialization.patch b/patches/server/0082-Faster-chunk-serialization.patch similarity index 99% rename from patches/server/0081-Faster-chunk-serialization.patch rename to patches/server/0082-Faster-chunk-serialization.patch index 0a06d4d..08e4668 100644 --- a/patches/server/0081-Faster-chunk-serialization.patch +++ b/patches/server/0082-Faster-chunk-serialization.patch @@ -320,7 +320,7 @@ index acae3eb30e0689048937f479dc3070f0688abdad..4b79f0474a9013dd4fdb68c6363ca194 int onResize(int newBits, T object); } diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 7908360dd47937b2cb702e381802b7b278a5198e..1da043e5883dcde484fbbaab11dda3ec4a6e2481 100644 +index 3c7ef1e8e338a84eee34f39ce73e64876632ea87..5eee4afb7bac7937155c979759bbc991f92c61fd 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -22,8 +22,25 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0082-Update-boss-bar-within-tick.patch b/patches/server/0083-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0082-Update-boss-bar-within-tick.patch rename to patches/server/0083-Update-boss-bar-within-tick.patch diff --git a/patches/server/0083-Cache-ominous-banner-item.patch b/patches/server/0084-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0083-Cache-ominous-banner-item.patch rename to patches/server/0084-Cache-ominous-banner-item.patch diff --git a/patches/server/0084-Precompute-piston-shapes.patch b/patches/server/0085-Precompute-piston-shapes.patch similarity index 100% rename from patches/server/0084-Precompute-piston-shapes.patch rename to patches/server/0085-Precompute-piston-shapes.patch diff --git a/patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0085-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0086-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0086-Cache-world-generator-sea-level.patch b/patches/server/0087-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0086-Cache-world-generator-sea-level.patch rename to patches/server/0087-Cache-world-generator-sea-level.patch diff --git a/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0088-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0087-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0088-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0088-Store-mob-counts-in-an-array.patch b/patches/server/0089-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0088-Store-mob-counts-in-an-array.patch rename to patches/server/0089-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0089-Use-linked-map-for-entity-trackers.patch b/patches/server/0090-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0089-Use-linked-map-for-entity-trackers.patch rename to patches/server/0090-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0090-Optimize-noise-generation.patch b/patches/server/0091-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0090-Optimize-noise-generation.patch rename to patches/server/0091-Optimize-noise-generation.patch diff --git a/patches/server/0091-Ignore-durability-change-equipment-updates.patch b/patches/server/0092-Ignore-durability-change-equipment-updates.patch similarity index 95% rename from patches/server/0091-Ignore-durability-change-equipment-updates.patch rename to patches/server/0092-Ignore-durability-change-equipment-updates.patch index 08e98ac..761d2db 100644 --- a/patches/server/0091-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0092-Ignore-durability-change-equipment-updates.patch @@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 75ae119719cf566f66371606e70f19b6b36dc7cb..88bfda2090a1f8c9368f5d6f98374d045c045150 100644 +index 7a228425a973122de3d0b0e78d18586d6669e9ed..c6488bf509178c54ac95665f96a11cfced87cd34 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3148,7 +3148,7 @@ public abstract class LivingEntity extends Entity { @@ -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 201f30774536966bda6f79b4db2fba6352829e10..dcbda08a6246b21b370a9005ed095d4413be6a81 100644 +index b26f8204494271b8eae627533a7e6bd883db614c..7b99d605267dfd24f875fbf929b2a97728d16976 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/0092-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch similarity index 93% rename from patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch index f71177a..a754635 100644 --- a/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0093-Hide-flames-on-entities-with-fire-resistance.patch @@ -13,7 +13,7 @@ As part of: Slice (https://github.com/Cryptite/Slice) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7841fd24b2f4e4310a6d34660e7c7cd265af835e..a5e2b9862358362f0c67683b0266ab846cab1fcf 100644 +index 92c9ccf9a05fe54b5c7e5a72da5498115a6d5bd9..d05e5b9b4dec0779489856dab5e50b53ff698c38 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -868,7 +868,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -31,7 +31,7 @@ index 7841fd24b2f4e4310a6d34660e7c7cd265af835e..a5e2b9862358362f0c67683b0266ab84 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 dcbda08a6246b21b370a9005ed095d4413be6a81..3c8f498ed1f730cc53fd395839f58ac4bd916265 100644 +index 7b99d605267dfd24f875fbf929b2a97728d16976..045d6874b30a6ab2082f379415b9c3b3f80af000 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/0093-Skip-cloning-advancement-criteria.patch b/patches/server/0094-Skip-cloning-advancement-criteria.patch similarity index 93% rename from patches/server/0093-Skip-cloning-advancement-criteria.patch rename to patches/server/0094-Skip-cloning-advancement-criteria.patch index eb8240e..e5c8d1a 100644 --- a/patches/server/0093-Skip-cloning-advancement-criteria.patch +++ b/patches/server/0094-Skip-cloning-advancement-criteria.patch @@ -13,7 +13,7 @@ As part of: Mirai (https://github.com/etil2jz/Mirai) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/advancements/Advancement.java b/src/main/java/net/minecraft/advancements/Advancement.java -index 2c01231dcfbb992c9d2f034fcfd4af52fe8ac265..b84c69e722ae120c38c3b7c4cc7c5584496f13ab 100644 +index dd4409790524293be07483f00df05d8a8743e3d9..8fbed180d3f6207cdda70ca6c82dcc9c20741836 100644 --- a/src/main/java/net/minecraft/advancements/Advancement.java +++ b/src/main/java/net/minecraft/advancements/Advancement.java @@ -45,7 +45,7 @@ public class Advancement { diff --git a/patches/server/0094-Player-canSee-by-entity-UUID.patch b/patches/server/0095-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0094-Player-canSee-by-entity-UUID.patch rename to patches/server/0095-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0095-Spread-out-sending-all-player-info.patch b/patches/server/0096-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0095-Spread-out-sending-all-player-info.patch rename to patches/server/0096-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0096-Optimize-player-list-for-sending-player-info.patch b/patches/server/0097-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0096-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0097-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0098-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0097-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0098-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0098-Send-multiple-keep-alive-packets.patch b/patches/server/0099-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0098-Send-multiple-keep-alive-packets.patch rename to patches/server/0099-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0100-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 96% rename from patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0100-Prevent-entities-random-strolling-into-non-ticking-c.patch index 379ce40..461f509 100644 --- a/patches/server/0099-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0100-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 3c8f498ed1f730cc53fd395839f58ac4bd916265..92c6883c86fcfae34a57feb15e3a401f2bddc36a 100644 +index 045d6874b30a6ab2082f379415b9c3b3f80af000..f254520946720d740fd2f846890d6d6425ca064e 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/0100-Specific-interval-TPS-API.patch b/patches/server/0101-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0100-Specific-interval-TPS-API.patch rename to patches/server/0101-Specific-interval-TPS-API.patch diff --git a/patches/server/0101-5-second-TPS-average.patch b/patches/server/0102-5-second-TPS-average.patch similarity index 100% rename from patches/server/0101-5-second-TPS-average.patch rename to patches/server/0102-5-second-TPS-average.patch diff --git a/patches/server/0102-Measure-last-tick-time.patch b/patches/server/0103-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0102-Measure-last-tick-time.patch rename to patches/server/0103-Measure-last-tick-time.patch diff --git a/patches/server/0103-Last-tick-time-API.patch b/patches/server/0104-Last-tick-time-API.patch similarity index 100% rename from patches/server/0103-Last-tick-time-API.patch rename to patches/server/0104-Last-tick-time-API.patch diff --git a/patches/server/0104-Show-last-tick-time-in-tps-command.patch b/patches/server/0105-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0104-Show-last-tick-time-in-tps-command.patch rename to patches/server/0105-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0105-Increase-time-statistics-in-intervals.patch b/patches/server/0106-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0105-Increase-time-statistics-in-intervals.patch rename to patches/server/0106-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0106-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch similarity index 94% rename from patches/server/0106-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch index 6ce4122..2b91672 100644 --- a/patches/server/0106-For-collision-check-has-physics-before-same-vehicle.patch +++ b/patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a5e2b9862358362f0c67683b0266ab846cab1fcf..83f48e8e9c48b67ac7aa0c790cdf1c43391cabe7 100644 +index d05e5b9b4dec0779489856dab5e50b53ff698c38..7a2c57900d6d651bc9e05073fffe1476f6032e80 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1983,8 +1983,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0107-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from patches/server/0107-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0108-Skip-negligible-planar-movement-multiplication.patch index d0ad6cc..34ca97e 100644 --- a/patches/server/0107-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 83f48e8e9c48b67ac7aa0c790cdf1c43391cabe7..5adb379fdb4bae14b143b5fd9adfe983b3e75419 100644 +index 7a2c57900d6d651bc9e05073fffe1476f6032e80..5f1cea3088cb48804c46d7aadf347a8481470933 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1187,9 +1187,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0108-Reduce-RandomSource-instances.patch b/patches/server/0109-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0108-Reduce-RandomSource-instances.patch rename to patches/server/0109-Reduce-RandomSource-instances.patch diff --git a/patches/server/0109-Server-thread-priority-environment-variable.patch b/patches/server/0110-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0109-Server-thread-priority-environment-variable.patch rename to patches/server/0110-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0110-Thread-safety-annotations.patch b/patches/server/0111-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0110-Thread-safety-annotations.patch rename to patches/server/0111-Thread-safety-annotations.patch diff --git a/patches/server/0111-CPU-cores-estimation.patch b/patches/server/0112-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0111-CPU-cores-estimation.patch rename to patches/server/0112-CPU-cores-estimation.patch diff --git a/patches/server/0112-Mutex-utility.patch b/patches/server/0113-Mutex-utility.patch similarity index 100% rename from patches/server/0112-Mutex-utility.patch rename to patches/server/0113-Mutex-utility.patch diff --git a/patches/server/0113-Paired-lock-and-condition-utility.patch b/patches/server/0114-Paired-lock-and-condition-utility.patch similarity index 100% rename from patches/server/0113-Paired-lock-and-condition-utility.patch rename to patches/server/0114-Paired-lock-and-condition-utility.patch diff --git a/patches/server/0114-Unterminable-executor-utility.patch b/patches/server/0115-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0114-Unterminable-executor-utility.patch rename to patches/server/0115-Unterminable-executor-utility.patch diff --git a/patches/server/0115-FIFO-concurrent-queue-utility.patch b/patches/server/0116-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0115-FIFO-concurrent-queue-utility.patch rename to patches/server/0116-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0116-Base-thread-pools.patch b/patches/server/0117-Base-thread-pools.patch similarity index 100% rename from patches/server/0116-Base-thread-pools.patch rename to patches/server/0117-Base-thread-pools.patch diff --git a/patches/server/0117-Non-blocking-PooledObjects.patch b/patches/server/0118-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0117-Non-blocking-PooledObjects.patch rename to patches/server/0118-Non-blocking-PooledObjects.patch