Removed MC-31819 & MC-26304 fix patches, since mojang already fixed

2026-01-06 15:41:56 +00:00 · 2024-12-12 02:40:27 -05:00
parent 85fd7f938b
commit 39616a908a
63 changed files with 34 additions and 31 deletions
--- a/patches/removed/server/0059-Fix-MC-31819.patch
+++ b/patches/removed/server/0059-Fix-MC-31819.patch
@@ -3,6 +3,8 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Fri, 23 Dec 2022 15:40:22 +0100
 Subject: [PATCH] Fix MC-31819

+Removed since Gale 1.21.3, Mojang fixed it in 1.21 24w21a
+
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

--- a/patches/removed/server/0060-Fix-MC-26304.patch
+++ b/patches/removed/server/0060-Fix-MC-26304.patch
@@ -3,6 +3,8 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Fri, 23 Dec 2022 16:42:04 +0100
 Subject: [PATCH] Fix MC-26304

+Removed since Gale 1.21.3, Mojang fixed it in 1.21 24w19a
+
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

--- a/patches/server/0059-Make-arrow-movement-resetting-despawn-counter-config.patch
+++ b/patches/server/0059-Make-arrow-movement-resetting-despawn-counter-config.patch
@@ -42,7 +42,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/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index accc246f441c8bf5e1a755cfc0db8f97c0c01c6b..5fbd0612f1d1b0961e03931c26036c74d8265bb3 100644
+index 8ce573042ea87631eb6539f2a0d5036655c2b809..6e313a45356ed2b043ef626c7ca191b294acaf70 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -371,7 +371,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -55,10 +55,10 @@ index accc246f441c8bf5e1a755cfc0db8f97c0c01c6b..5fbd0612f1d1b0961e03931c26036c74
 
     public boolean isInGround() {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index e3e4459da020a85a66360e761adbf6e55920c6c5..f459d398cf9e274b8551540c8a1f707bd609ecb9 100644
+index 266079aed0610e0fa9e35da81680b7f388a8844a..cc843de2d62bdaadb4efb7032162f8f04b10c286 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -123,6 +123,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -118,6 +118,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
 
         }
 
--- a/patches/server/0060-Make-logging-login-locations-configurable.patch
+++ b/patches/server/0060-Make-logging-login-locations-configurable.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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c78ba7dca18d0890816a6374883f31784de15733..bbf501b68afbcedfc49d0742fe71e956a05c5285 100644
+index 91d0b4ed03cbe6f8c472e8fb2a1481ed6be67b3b..2b6621b858961b8ec4ad73fb2db797306adf7251 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -421,7 +421,13 @@ public abstract class PlayerList {
--- a/patches/server/0061-Reduce-array-allocations.patch
+++ b/patches/server/0061-Reduce-array-allocations.patch
@@ -324,7 +324,7 @@ index 90ca25c4aaf92a5639839a7cdaee2ffcdb75efa7..d3219e3d36ef96bb43c2cb7d86f14ef7
         OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
         OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index cd73c5bc1cd56a4e7bbac5171015cd6904acf68d..05a150bd6f29006d0aeaa91356f40deca02cb164 100644
+index d32524da655a615a13a03c8536c1f229547d0c6b..c36e21be642ad24231cdcd0ff20d22e1e449e18e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1250,7 +1250,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -337,7 +337,7 @@ index cd73c5bc1cd56a4e7bbac5171015cd6904acf68d..05a150bd6f29006d0aeaa91356f40dec
         return ret;
     }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 25e91c5e5f5cf1a9dbb2931b964c754408926788..534d72803949c75314e9c0d225bb889aa6a3d4c6 100644
+index 13482ce226de563cc2e802cdfeaca22eff8f9096..3455b7f21fee42d21182b8b5f8af7a9a238f646c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2842,7 +2842,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
--- a/patches/server/0062-Optimize-sun-burn-tick.patch
+++ b/patches/server/0062-Optimize-sun-burn-tick.patch
--- a/patches/server/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
+++ b/patches/server/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
--- a/patches/server/0064-Replace-game-rules-map-with-optimized-collection.patch
+++ b/patches/server/0064-Replace-game-rules-map-with-optimized-collection.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/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index 467696a78791d65a66eb380e97d33123a5a12e61..3fd99c677f35639261f6eba202813735e32f82d5 100644
+index 7c363d59c6567cae8e6caf213be51804efa5a96d..43d31e45f47f390a87be66a6fc8c95eb0d17a87f 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -168,7 +168,7 @@ public class GameRules {
--- a/patches/server/0065-Replace-AI-attributes-with-optimized-collections.patch
+++ b/patches/server/0065-Replace-AI-attributes-with-optimized-collections.patch
--- a/patches/server/0066-Replace-class-map-with-optimized-collection.patch
+++ b/patches/server/0066-Replace-class-map-with-optimized-collection.patch
--- a/patches/server/0067-Replace-instance-list-with-optimized-collection.patch
+++ b/patches/server/0067-Replace-instance-list-with-optimized-collection.patch
--- a/patches/server/0068-Replace-throttle-tracker-map-with-optimized-collecti.patch
+++ b/patches/server/0068-Replace-throttle-tracker-map-with-optimized-collecti.patch
--- a/patches/server/0069-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
+++ b/patches/server/0069-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
--- a/patches/server/0070-Replace-division-by-multiplication-in-CubePointRange.patch
+++ b/patches/server/0070-Replace-division-by-multiplication-in-CubePointRange.patch
--- a/patches/server/0071-Replace-parts-by-size-in-CubePointRange.patch
+++ b/patches/server/0071-Replace-parts-by-size-in-CubePointRange.patch
--- a/patches/server/0072-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0072-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 244857d69b52e1689d932cab914ed8c1331e96d3..91c97580123701b4bafb7502d2947fda91dc9cc0 100644
+index 948e8a66ebe77093983bb0a552f10fa2b4d70882..887adb618a6eb158b53a96e57d785583a3ac322f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -579,11 +579,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0073-Faster-chunk-serialization.patch
+++ b/patches/server/0073-Faster-chunk-serialization.patch
--- a/patches/server/0074-Update-boss-bar-within-tick.patch
+++ b/patches/server/0074-Update-boss-bar-within-tick.patch
--- a/patches/server/0075-Cache-world-generator-sea-level.patch
+++ b/patches/server/0075-Cache-world-generator-sea-level.patch
--- a/patches/server/0076-Skip-secondary-POI-sensor-if-absent.patch
+++ b/patches/server/0076-Skip-secondary-POI-sensor-if-absent.patch
--- a/patches/server/0077-Optimize-villager-data-storage.patch
+++ b/patches/server/0077-Optimize-villager-data-storage.patch
--- a/patches/server/0078-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0078-Skip-entity-move-if-movement-is-zero.patch
--- a/patches/server/0079-Store-mob-counts-in-an-array.patch
+++ b/patches/server/0079-Store-mob-counts-in-an-array.patch
--- a/patches/server/0080-Use-linked-map-for-entity-trackers.patch
+++ b/patches/server/0080-Use-linked-map-for-entity-trackers.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d72c49b7861f049ebc32f7bb15345243c4be5838..4d83eda76eccfbda1ff47dc32e3544b7607c19f5 100644
+index 8b5a51558214c3a900b2e7c942e3c663280fdfb8..c86c839de2a718e0e84089b190e6b3bfaf2d18c8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -184,7 +184,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
--- a/patches/server/0081-Optimize-noise-generation.patch
+++ b/patches/server/0081-Optimize-noise-generation.patch
--- a/patches/server/0082-Optimize-sheep-offspring-color.patch
+++ b/patches/server/0082-Optimize-sheep-offspring-color.patch
@@ -46,7 +46,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/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 432ad1c785e133ef18390108fd342be50ec4dddc..21be4cc1f12d7f8ecadc3be242e1dae1e8c5fa11 100644
+index 0b7f8b8d8cd119d83e67a2cee389bd6117ac4cf7..a021252871fd93d4fb3f23598d6008f25a350150 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
@@ -337,7 +337,99 @@ public class Sheep extends Animal implements Shearable {
@@ -150,7 +150,7 @@ index 432ad1c785e133ef18390108fd342be50ec4dddc..21be4cc1f12d7f8ecadc3be242e1dae1
         DyeColor enumcolor1 = secondParent.getColor();
         CraftingInput craftinginput = Sheep.makeCraftInput(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 f459d398cf9e274b8551540c8a1f707bd609ecb9..2692f835321bb16ecd4185970af01bfa97ca9f1f 100644
+index cc843de2d62bdaadb4efb7032162f8f04b10c286..1ba7cc5844236cfa75e7efcbf5a377f8e71fbaca 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 {
--- a/patches/server/0083-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0083-Hide-flames-on-entities-with-fire-resistance.patch
@@ -31,10 +31,10 @@ index 6604efeaf2eddfc109d05b45b4e36378862054c0..ce11e73e7a91c9d45f62552ab1cd7bec
 
         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 2692f835321bb16ecd4185970af01bfa97ca9f1f..93f4be842259ede94c94588f266c2270546e8311 100644
+index 1ba7cc5844236cfa75e7efcbf5a377f8e71fbaca..ecd4cf29a03d6f4ee71450b1c0d952209e40be4a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -126,6 +126,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -121,6 +121,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
--- a/patches/server/0084-Skip-cloning-advancement-criteria.patch
+++ b/patches/server/0084-Skip-cloning-advancement-criteria.patch
--- a/patches/server/0085-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0085-Reduce-block-destruction-packet-allocations.patch
@@ -13,7 +13,7 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 05a150bd6f29006d0aeaa91356f40deca02cb164..86b2898d967d811d4727b5d0eb5f579fbc752590 100644
+index c36e21be642ad24231cdcd0ff20d22e1e449e18e..c25da6e647401767def8cdbe505964865e8d7820 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1618,7 +1618,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
--- a/patches/server/0086-Spread-out-sending-all-player-info.patch
+++ b/patches/server/0086-Spread-out-sending-all-player-info.patch
@@ -37,7 +37,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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bbf501b68afbcedfc49d0742fe71e956a05c5285..ef3906925b29dead10c9040ff96edd3d89bb0d81 100644
+index 2b6621b858961b8ec4ad73fb2db797306adf7251..843f09312888ab91ddd50fa2870ba4dc2236d54a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -133,10 +133,11 @@ public abstract class PlayerList {
@@ -148,7 +148,7 @@ index bbf501b68afbcedfc49d0742fe71e956a05c5285..ef3906925b29dead10c9040ff96edd3d
         }
 
 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 7dc22be7e2afeafe0292648a9a20422c39833966..0e46efa30dc980a348caed64c4a8734e5a6a095a 100644
+index 61d412c4f1ebd55661cc3f0260468e3ac0efe0bb..d6068324f7926741a490ead6277015b0e69517f8 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -208,12 +208,15 @@ public abstract class Player extends LivingEntity {
--- a/patches/server/0087-Optimize-player-list-for-sending-player-info.patch
+++ b/patches/server/0087-Optimize-player-list-for-sending-player-info.patch
@@ -37,7 +37,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/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef3906925b29dead10c9040ff96edd3d89bb0d81..eaddeaade352dbc70a4774d584a36d38842764f0 100644
+index 843f09312888ab91ddd50fa2870ba4dc2236d54a..75a293b2b27231894fe996a42ff10a1462d640f3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -991,14 +991,18 @@ public abstract class PlayerList {
--- a/patches/server/0088-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
+++ b/patches/server/0088-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
--- a/patches/server/0089-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0089-Send-multiple-keep-alive-packets.patch
--- a/patches/server/0090-Make-slow-login-timeout-configurable.patch
+++ b/patches/server/0090-Make-slow-login-timeout-configurable.patch
--- a/patches/server/0091-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0091-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -31,10 +31,10 @@ index ce11e73e7a91c9d45f62552ab1cd7bec47b2a879..4865759b5ad05997b7777a8cd0369670
             if (this instanceof Leashable leashable) {
                 leashable.dropLeash(true, true); // Paper drop lead
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 93f4be842259ede94c94588f266c2270546e8311..fd5d02f8b1b1e2e84e6bda4885f091a000cbcbc9 100644
+index ecd4cf29a03d6f4ee71450b1c0d952209e40be4a..63ff60f9d5d9a8a5ea36754dd394696b54082d93 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -124,6 +124,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -119,6 +119,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
 
         }
 
--- a/patches/server/0092-Don-t-load-chunks-to-spawn-phantoms.patch
+++ b/patches/server/0092-Don-t-load-chunks-to-spawn-phantoms.patch
@@ -34,7 +34,7 @@ index 021221da5d0315f6e371380a705ac6b3f6ac18d3..997f80d332b95bb011cbbc27c065b281
 
                                         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 fd5d02f8b1b1e2e84e6bda4885f091a000cbcbc9..e648d995fe9d2b44e66cb50e3f894b3524f77fef 100644
+index 63ff60f9d5d9a8a5ea36754dd394696b54082d93..0c1a45ae1e4633a873a37ad4382b3a365331b0fa 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -92,6 +92,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0093-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0093-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -79,7 +79,7 @@ index 887adb618a6eb158b53a96e57d785583a3ac322f..9551c2b75687bd036aaabd9593df7d96
             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 e648d995fe9d2b44e66cb50e3f894b3524f77fef..17b1a7a2e0b557354f0c4ea2f92d9105bcd5cf2c 100644
+index 0c1a45ae1e4633a873a37ad4382b3a365331b0fa..a61817385d2874454ba6326898e47ffda2cdaca8 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0094-Broadcast-crit-animations-as-the-entity-being-critte.patch
+++ b/patches/server/0094-Broadcast-crit-animations-as-the-entity-being-critte.patch
@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ada9814d24b32140f365eb01a231bc123d99c72e..36df6a23f1943c55ecc6bed55b48a77ba3b449e4 100644
+index 61ef647d61a8e2df209f79b7518c802feb85ac66..75c6d238fdbe434ea95db2c84da4461a0078327b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2399,12 +2399,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -38,7 +38,7 @@ index ada9814d24b32140f365eb01a231bc123d99c72e..36df6a23f1943c55ecc6bed55b48a77b
 
     @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 17b1a7a2e0b557354f0c4ea2f92d9105bcd5cf2c..1efeb37086f5c897f2f1ae1ecdc713f1e3a55ede 100644
+index a61817385d2874454ba6326898e47ffda2cdaca8..5d26566c0d58fbd61d8f2d01b09343a89b280df5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -106,6 +106,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
--- a/patches/server/0095-Ignore-null-legacy-structure-data.patch
+++ b/patches/server/0095-Ignore-null-legacy-structure-data.patch
--- a/patches/server/0096-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0096-Skip-unnecessary-mob-spawning-computations.patch
--- a/patches/server/0097-Prevent-entities-random-strolling-into-non-ticking-c.patch
+++ b/patches/server/0097-Prevent-entities-random-strolling-into-non-ticking-c.patch
@@ -26,10 +26,10 @@ index 676e1580849e8942eb41c7a3a80f464138b22764..129591f1bb9cc687a2873855e7bc58f8
             } 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 1efeb37086f5c897f2f1ae1ecdc713f1e3a55ede..15b351e23ca2daac2a903d58774f2a9bf3b4b070 100644
+index 5d26566c0d58fbd61d8f2d01b09343a89b280df5..ce6b525ad25b718941e8216c06c6da7caf890099 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-@@ -137,6 +137,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
+@@ -132,6 +132,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
         }
 
         public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
--- a/patches/server/0098-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/patches/server/0098-Do-not-place-player-in-world-if-kicked-before-being-.patch
@@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index eaddeaade352dbc70a4774d584a36d38842764f0..79aaa3aa6ee8d11fb8542822b04e8ed7c2abcc77 100644
+index 75a293b2b27231894fe996a42ff10a1462d640f3..99521abc925e0c7754d9e5aaad52e4fa70383946 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -272,6 +272,13 @@ public abstract class PlayerList {
--- a/patches/server/0099-CraftBukkit-UUID-to-world-map.patch
+++ b/patches/server/0099-CraftBukkit-UUID-to-world-map.patch
--- a/patches/server/0100-Global-EULA-file.patch
+++ b/patches/server/0100-Global-EULA-file.patch
--- a/patches/server/0101-Specific-interval-TPS-API.patch
+++ b/patches/server/0101-Specific-interval-TPS-API.patch
--- a/patches/server/0102-5-second-TPS-average.patch
+++ b/patches/server/0102-5-second-TPS-average.patch
--- a/patches/server/0103-Measure-last-tick-time.patch
+++ b/patches/server/0103-Measure-last-tick-time.patch
--- a/patches/server/0104-Last-tick-time-API.patch
+++ b/patches/server/0104-Last-tick-time-API.patch
--- a/patches/server/0105-Show-last-tick-time-in-tps-command.patch
+++ b/patches/server/0105-Show-last-tick-time-in-tps-command.patch
--- a/patches/server/0106-Increase-time-statistics-in-intervals.patch
+++ b/patches/server/0106-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 0e46efa30dc980a348caed64c4a8734e5a6a095a..f59ea87c3b7b9b4c46fed1bafff106ed97c9ff70 100644
+index d6068324f7926741a490ead6277015b0e69517f8..7187652d038a5ea7b3555f5ad6f3671263947375 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -156,6 +156,7 @@ public abstract class Player extends LivingEntity {
--- a/patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/patches/server/0107-For-collision-check-has-physics-before-same-vehicle.patch
--- a/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch
--- a/patches/server/0109-Optimize-matching-item-checks.patch
+++ b/patches/server/0109-Optimize-matching-item-checks.patch
--- a/patches/server/0110-Pre-compute-VarLong-sizes.patch
+++ b/patches/server/0110-Pre-compute-VarLong-sizes.patch
--- a/patches/server/0111-Optimize-VarInt-write-and-VarLong-write.patch
+++ b/patches/server/0111-Optimize-VarInt-write-and-VarLong-write.patch
--- a/patches/server/0112-Reduce-RandomSource-instances.patch
+++ b/patches/server/0112-Reduce-RandomSource-instances.patch
@@ -26,7 +26,7 @@ index 6f69e74d8662025c4148b36de7a35e789abcd1d2..8c18763ff74a6fbc87eafa1170c4ad9d
             double d1 = (double) (center.y - maxRange);
             double d2 = (double) (center.x + maxRange);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 36df6a23f1943c55ecc6bed55b48a77ba3b449e4..22e0d57048aedd3ac1ae5aecb43498fbef26f6ee 100644
+index 75c6d238fdbe434ea95db2c84da4461a0078327b..7e06a80e6deb80df865f7798588a92b88084411b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -524,7 +524,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
--- a/patches/server/0113-Add-xor-shift-random.patch
+++ b/patches/server/0113-Add-xor-shift-random.patch
--- a/patches/server/0114-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
+++ b/patches/server/0114-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
@@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison

 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 9f4ffbeb8ab4581dab95674f1e4bb78e86deeb7e..7cbb1b5639f52e8671e3faa38eac9f1c76df0fa1 100644
+index 9551c2b75687bd036aaabd9593df7d96c062ab90..167d164d07285bfff6eb8076d7abe17ca9543df9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1050,10 +1050,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
--- a/patches/server/0115-Initialize-line-of-sight-cache-with-low-capacity.patch
+++ b/patches/server/0115-Initialize-line-of-sight-cache-with-low-capacity.patch
--- a/patches/server/0116-Reduce-line-of-sight-updates-and-cache-lookups.patch
+++ b/patches/server/0116-Reduce-line-of-sight-updates-and-cache-lookups.patch
--- a/patches/server/0117-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0117-Server-thread-priority-environment-variable.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/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7759fe7b458b681589b47932197961722676ada7..ffc69e4eab4a28dd0066b322de852577b4c392b9 100644
+index 1f299e98a9efd0f51bace264b0cbb7cbc4845907..24b9711dca7223dd12b24c36cd76f50fbd96fc68 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -195,6 +195,8 @@ import org.bukkit.event.server.ServerLoadEvent;
--- a/patches/server/0118-Virtual-thread-support.patch
+++ b/patches/server/0118-Virtual-thread-support.patch
--- a/todos.txt
+++ b/todos.txt
@@ -3,5 +3,4 @@ Do a benchmark for `Remove streams and iterators from range check`, getEffective
 Do benchmark for reduce entity fluid lookup on 1.21.3
 Block shape pair key hashcode cache
 Check gale force load chunk option whether need or whether need to change.
-Check MC-31819 & MC-26304
 Apply patches in work