[ci skip] Reorder patches

2025-12-19 15:09:25 +00:00 · 2024-11-10 17:34:53 -05:00
parent 5365c49680
commit e9f5738e97
93 changed files with 6 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -114,7 +114,6 @@ If these excellent projects hadn't appeared, Leaf wouldn't have become great.
      • <a href="https://github.com/LuminolMC/Luminol">Luminol</a><br>
      • <a href="https://github.com/Gensokyo-Reimagined/Nitori">Nitori</a><br>
      • <a href="https://github.com/Tuinity/Moonrise">Moonrise</a><br>
-      • <a href="https://github.com/DivineMC/DivineMC">DivineMC</a><br>
    </p>
 </details>

--- a/patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch
+++ b/patches/server/0058-SparklyPaper-Throttle-hopper-when-full.patch
--- a/patches/server/0059-Polpot-Make-egg-and-snowball-can-knockback-player.patch
+++ b/patches/server/0059-Polpot-Make-egg-and-snowball-can-knockback-player.patch
--- a/patches/server/0060-Moonrise-Bitstorage-optimisations.patch
+++ b/patches/server/0060-Moonrise-Bitstorage-optimisations.patch
--- a/patches/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch
+++ b/patches/server/0061-Moonrise-Optimize-nearby-players-for-spawning-iterat.patch
--- a/patches/server/0062-Moonrise-block-counting-optimisations.patch
+++ b/patches/server/0062-Moonrise-block-counting-optimisations.patch
--- a/patches/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch
+++ b/patches/server/0063-Moonrise-Optimise-BiomeManager-getFiddle.patch
--- a/patches/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch
+++ b/patches/server/0064-Moonrise-Do-not-send-chunk-radius-packet-from-Player.patch
--- a/patches/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch
+++ b/patches/server/0065-Moonrise-Add-direct-lookup-by-chunk-for-NearbyPlayer.patch
--- a/patches/server/0066-Moonrise-Optimise-checkInsideBlocks.patch
+++ b/patches/server/0066-Moonrise-Optimise-checkInsideBlocks.patch
--- a/patches/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
+++ b/patches/server/0067-Moonrise-Avoid-streams-for-block-retrieval-in-Entity.patch
--- a/patches/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch
+++ b/patches/server/0068-Moonrise-Optimise-countEntries-for-low-size-SimpleBi.patch
--- a/patches/server/0069-Moonrise-fluid-method-optimisations.patch
+++ b/patches/server/0069-Moonrise-fluid-method-optimisations.patch
--- a/patches/server/0070-Moonrise-optimise-palette-reads.patch
+++ b/patches/server/0070-Moonrise-optimise-palette-reads.patch
--- a/patches/server/0071-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
+++ b/patches/server/0071-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
--- a/patches/server/0072-Fix-MC-65198.patch
+++ b/patches/server/0072-Fix-MC-65198.patch
--- a/patches/server/0073-Including-5s-in-getTPS.patch
+++ b/patches/server/0073-Including-5s-in-getTPS.patch
--- a/patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch
+++ b/patches/server/0074-Remove-useless-creating-stats-json-bases-on-player-n.patch
--- a/patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch
+++ b/patches/server/0075-Don-t-throw-exception-on-missing-ResourceKey-value.patch
--- a/patches/server/0076-Improve-Purpur-AFK-system.patch
+++ b/patches/server/0076-Improve-Purpur-AFK-system.patch
--- a/patches/server/0077-Virtual-Thread-for-async-scheduler.patch
+++ b/patches/server/0077-Virtual-Thread-for-async-scheduler.patch
--- a/patches/server/0078-Mirai-Configurable-chat-message-signatures.patch
+++ b/patches/server/0078-Mirai-Configurable-chat-message-signatures.patch
--- a/patches/server/0079-Cache-player-profileResult.patch
+++ b/patches/server/0079-Cache-player-profileResult.patch
--- a/patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch
+++ b/patches/server/0080-Prevent-change-non-editable-sign-warning-spam-in-con.patch
--- a/patches/server/0081-Matter-Secure-Seed.patch
+++ b/patches/server/0081-Matter-Secure-Seed.patch
--- a/patches/server/0082-Matter-Seed-Command.patch
+++ b/patches/server/0082-Matter-Seed-Command.patch
--- a/patches/server/0083-Ignore-terminal-provider-warning.patch
+++ b/patches/server/0083-Ignore-terminal-provider-warning.patch
--- a/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch
+++ b/patches/server/0084-Fix-console-freeze-above-JAVA-22.patch
--- a/patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch
+++ b/patches/server/0085-Fix-console-output-display-on-Pterodactyl-panel.patch
--- a/patches/server/0086-Faster-Random-Generator.patch
+++ b/patches/server/0086-Faster-Random-Generator.patch
--- a/patches/server/0087-Don-t-save-primed-tnt-entity.patch
+++ b/patches/server/0087-Don-t-save-primed-tnt-entity.patch
--- a/patches/server/0088-Don-t-save-falling-block-entity.patch
+++ b/patches/server/0088-Don-t-save-falling-block-entity.patch
--- a/patches/server/0089-Configurable-connection-message.patch
+++ b/patches/server/0089-Configurable-connection-message.patch
--- a/patches/server/0090-Configurable-unknown-command-message.patch
+++ b/patches/server/0090-Configurable-unknown-command-message.patch
--- a/patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch
+++ b/patches/server/0091-Airplane-Remove-stream-in-PoiCompetitorScan.patch
--- a/patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
+++ b/patches/server/0092-Remove-stream-in-BlockBehaviour-cache-blockstate.patch
--- a/patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch
+++ b/patches/server/0093-Remove-stream-in-RecipeManager-getRecipeFor.patch
--- a/patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch
+++ b/patches/server/0094-Remove-stream-in-entity-visible-effects-filter.patch
--- a/patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
+++ b/patches/server/0095-Remove-stream-and-double-iteration-in-enough-deep-sl.patch
--- a/patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch
+++ b/patches/server/0096-Remove-stream-in-trial-spawner-ticking.patch
--- a/patches/server/0097-Remove-stream-in-Brain.patch
+++ b/patches/server/0097-Remove-stream-in-Brain.patch
--- a/patches/server/0098-Remove-stream-in-BehaviorUtils.patch
+++ b/patches/server/0098-Remove-stream-in-BehaviorUtils.patch
--- a/patches/server/0099-Remove-stream-in-YieldJobSite.patch
+++ b/patches/server/0099-Remove-stream-in-YieldJobSite.patch
--- a/patches/server/0100-Remove-stream-in-PlayerSensor.patch
+++ b/patches/server/0100-Remove-stream-in-PlayerSensor.patch
--- a/patches/server/0101-Remove-stream-in-GolemSensor.patch
+++ b/patches/server/0101-Remove-stream-in-GolemSensor.patch
--- a/patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch
+++ b/patches/server/0102-Replace-Entity-active-effects-map-with-optimized-col.patch
--- a/patches/server/0103-Replace-criterion-map-with-optimized-collection.patch
+++ b/patches/server/0103-Replace-criterion-map-with-optimized-collection.patch
--- a/patches/server/0104-Replace-world-map-with-optimized-collection.patch
+++ b/patches/server/0104-Replace-world-map-with-optimized-collection.patch
--- a/patches/server/0105-Reduce-worldgen-allocations.patch
+++ b/patches/server/0105-Reduce-worldgen-allocations.patch
--- a/patches/server/0106-Replace-brain-maps-with-optimized-collection.patch
+++ b/patches/server/0106-Replace-brain-maps-with-optimized-collection.patch
--- a/patches/server/0107-Fix-MC-183518.patch
+++ b/patches/server/0107-Fix-MC-183518.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix-MC-183518
 Related MC issue: https://bugs.mojang.com/browse/MC-183518

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 705becd8d234ff6b73c1a1e88d2d0b0633a3479b..37c377761b45eefab39164a7e714e585a02a4447 100644
+index 21ef94bed550a5b6662a68be44efc4d805281999..36442bdcce41cd7116ca52ed71304cb0161233ba 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
+++ b/patches/server/0108-Use-caffeine-cache-kickPermission-instead-of-using-g.patch
--- a/patches/server/0109-Do-not-place-player-if-the-server-is-full.patch
+++ b/patches/server/0109-Do-not-place-player-if-the-server-is-full.patch
--- a/patches/server/0110-Fix-MC-200418.patch
+++ b/patches/server/0110-Fix-MC-200418.patch
--- a/patches/server/0111-Fix-MC-119417.patch
+++ b/patches/server/0111-Fix-MC-119417.patch
--- a/patches/server/0112-Fix-MC-223153.patch
+++ b/patches/server/0112-Fix-MC-223153.patch
--- a/patches/server/0113-Optimize-LeavesProtocolManager-init-protocol.patch
+++ b/patches/server/0113-Optimize-LeavesProtocolManager-init-protocol.patch
--- a/patches/server/0114-Cache-CraftEntityType-minecraftToBukkit-convert.patch
+++ b/patches/server/0114-Cache-CraftEntityType-minecraftToBukkit-convert.patch
--- a/patches/server/0115-Configurable-player-knockback-zombie.patch
+++ b/patches/server/0115-Configurable-player-knockback-zombie.patch
--- a/patches/server/0116-Hide-specified-item-components-to-clients.patch
+++ b/patches/server/0116-Hide-specified-item-components-to-clients.patch
--- a/patches/server/0117-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
+++ b/patches/server/0117-Paper-PR-Skip-AI-during-inactive-ticks-for-non-aware.patch
--- a/patches/server/0118-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
+++ b/patches/server/0118-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch
--- a/patches/server/0119-Paper-PR-Throttle-failed-spawn-attempts.patch
+++ b/patches/server/0119-Paper-PR-Throttle-failed-spawn-attempts.patch
--- a/patches/server/0120-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
+++ b/patches/server/0120-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
--- a/patches/server/0121-Dont-send-useless-entity-packets.patch
+++ b/patches/server/0121-Dont-send-useless-entity-packets.patch
--- a/patches/server/0122-Don-t-spawn-if-lastSpawnState-is-null.patch
+++ b/patches/server/0122-Don-t-spawn-if-lastSpawnState-is-null.patch
--- a/patches/server/0123-Multithreaded-Tracker.patch
+++ b/patches/server/0123-Multithreaded-Tracker.patch
--- a/patches/server/0124-Nitori-Async-playerdata-Save.patch
+++ b/patches/server/0124-Nitori-Async-playerdata-Save.patch
--- a/patches/server/0125-Change-max-stack-count.patch
+++ b/patches/server/0125-Change-max-stack-count.patch
--- a/patches/server/0126-Reduce-object-complexity-to-make-block-isValid-calls.patch
+++ b/patches/server/0126-Reduce-object-complexity-to-make-block-isValid-calls.patch
--- a/patches/server/0127-Optimize-nearby-alive-players-for-spawning.patch
+++ b/patches/server/0127-Optimize-nearby-alive-players-for-spawning.patch
--- a/patches/server/0128-Cache-blockstate-cache.patch
+++ b/patches/server/0128-Cache-blockstate-cache.patch
--- a/patches/server/0129-Fix-MC-177381.patch
+++ b/patches/server/0129-Fix-MC-177381.patch
--- a/patches/server/0130-Asynchronous-locator.patch
+++ b/patches/server/0130-Asynchronous-locator.patch
@@ -3,7 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
 Date: Wed, 23 Oct 2024 23:54:00 +0800
 Subject: [PATCH] Asynchronous locator

-This patch was ported from project: https://github.com/thebrightspark/AsyncLocator
+Original license: MIT
+Original project: https://github.com/thebrightspark/AsyncLocator

 diff --git a/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java b/src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java
 index 11b7f15755dde766140c29bedca456c80d53293f..749d00449ac3f3c79bfc73a5517ea3a07675e447 100644
--- a/patches/server/0131-Virtual-thread-for-chat-executor.patch
+++ b/patches/server/0131-Virtual-thread-for-chat-executor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Virtual thread for chat executor


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 37c377761b45eefab39164a7e714e585a02a4447..09e55f62b4cea5b058e04356252f4f56957646b8 100644
+index 36442bdcce41cd7116ca52ed71304cb0161233ba..b9d87acd4e59047caa542a4581f35938641f1be3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2894,7 +2894,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch
+++ b/patches/server/0132-Smart-sort-entities-in-NearestLivingEntitySensor.patch
--- a/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0133-Further-reduce-memory-footprint-of-CompoundTag.patch
--- a/patches/server/0134-Optimize-Entity-distanceToSqr.patch
+++ b/patches/server/0134-Optimize-Entity-distanceToSqr.patch
--- a/patches/server/0135-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
+++ b/patches/server/0135-EMC-Don-t-use-snapshots-for-TileEntity-getOwner.patch
--- a/patches/server/0136-EMC-Default-don-t-use-blockstate-snapshots.patch
+++ b/patches/server/0136-EMC-Default-don-t-use-blockstate-snapshots.patch
--- a/patches/server/0137-Cache-tile-entity-position.patch
+++ b/patches/server/0137-Cache-tile-entity-position.patch
--- a/patches/server/0138-TT20-Lag-compensation.patch
+++ b/patches/server/0138-TT20-Lag-compensation.patch
@@ -3,8 +3,8 @@ From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
 Date: Mon, 1 Nov 2077 00:00:00 +0800
 Subject: [PATCH] TT20 Lag compensation

-This patch was ported from project: https://github.com/snackbag/TT20
-Project license: AGPL-3.0
+Original license: AGPL-3.0
+Original project: https://github.com/snackbag/TT20

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
 index 09e55f62b4cea5b058e04356252f4f56957646b8..279289e0c3dc65fed0ee4b2f5b0ef077ab433d5e 100644
--- a/patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch
+++ b/patches/server/0139-Fix-wrong-entity-behavior-in-fluid-caused-by-inconsi.patch
--- a/patches/server/0140-C2ME-Reduce-Allocations.patch
+++ b/patches/server/0140-C2ME-Reduce-Allocations.patch
--- a/patches/server/0141-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch
+++ b/patches/server/0141-DivineMC-Lithium-entity.fast_elytra_check-entity.fas.patch
--- a/patches/server/0142-Lithium-fast-util.patch
+++ b/patches/server/0142-Lithium-fast-util.patch
--- a/patches/server/0143-Lithium-CompactSineLUT.patch
+++ b/patches/server/0143-Lithium-CompactSineLUT.patch
--- a/patches/server/0144-Lithium-IterateOutwardsCache.patch
+++ b/patches/server/0144-Lithium-IterateOutwardsCache.patch
--- a/patches/server/0145-Lithium-HashedList.patch
+++ b/patches/server/0145-Lithium-HashedList.patch
--- a/patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch
+++ b/patches/server/0146-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch
--- a/patches/server/0147-Fix-tick-function-tag-running-before-load.patch
+++ b/patches/server/0147-Fix-tick-function-tag-running-before-load.patch
--- a/patches/server/0148-Better-inline-world-height.patch
+++ b/patches/server/0148-Better-inline-world-height.patch
--- a/patches/server/0149-Branchless-clamp-logic.patch
+++ b/patches/server/0149-Branchless-clamp-logic.patch