From 376e02f880482ca5f404cfb03ab8ab1f6cb445a9 Mon Sep 17 00:00:00 2001 From: NanaChiyo0721 Date: Mon, 17 Aug 2026 12:24:18 +0800 Subject: [PATCH] Do not fire teleport or respawn events anymore --- ...e-teleport-or-respawn-events-anymore.patch | 19 +++++++++++++++++++ ...10-Entity-portal-teleport-speed-fix.patch} | 0 ...hreading-with-entity-ai-data-access.patch} | 0 ...tch => 0012-Fix-off-region-leashing.patch} | 0 ...k-returning-of-ServerConfigurationP.patch} | 0 ...> 0014-Fix-riding-statistics-desync.patch} | 0 ...player-auto-saving-ignores-interval.patch} | 0 ...atch => 0016-Fix-dragon-part-desync.patch} | 0 ...der-pearls-when-player-switched-dim.patch} | 0 ...h => 0018-Fix-creative-item-picking.patch} | 0 ...0019-Fix-high-velocity-moving-issue.patch} | 0 ...sing-original-rotation-and-velocity.patch} | 0 ...able-passing-in-RegionizedWorldData.patch} | 0 ...iable-passing-in-ThreadedRegionizer.patch} | 0 ...update-determination-in-RegionizedT.patch} | 0 ...olia-nether-portal-ticket-placement.patch} | 0 ...ncorrect-ticket-lock-size-computing.patch} | 0 ...nsafe-collections-use-in-PlayerList.patch} | 0 ...27-Force-clamp-grid-exponent-to-1-6.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ...nimals-check-can-teleport-in-an-unl.patch} | 0 ...zedTaskQueue-queue-TTL-optimization.patch} | 0 ...erations-in-nether-portal-searching.patch} | 0 ...cket-processing-queue-with-mt-queue.patch} | 0 ...0033-Reduce-allocation-in-PoiAccess.patch} | 0 ...4-Reduce-allocation-in-SignalGetter.patch} | 0 ...location-in-unlistened-spawn-events.patch} | 0 ...ync-protocol-switching-optimization.patch} | 2 +- ...0037-Improved-server-health-command.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...-to-support-for-long-command-inputs.patch} | 0 ...0041-Add-config-for-server-mod-name.patch} | 0 ...=> 0042-Add-config-for-cpu-affinity.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ...044-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...46-Add-config-for-heightmap-warning.patch} | 0 ...atch => 0047-Add-config-gui-support.patch} | 0 ...e-data-command-to-be-enabled-config.patch} | 0 ...config-for-command-block-command-ex.patch} | 0 ...-config-to-modify-tripwire-behavior.patch} | 0 ... 0051-Add-config-for-item-multitask.patch} | 2 +- ...2-Add-config-to-enable-tick-command.patch} | 0 ...-for-whether-to-save-portal-tickets.patch} | 0 ...tch => 0054-Add-portal-rate-limiter.patch} | 0 ...us-bar.patch => 0055-Add-status-bar.patch} | 0 ...patch => 0056-Leaves-Vanilla-Hopper.patch} | 0 ...eaves-Lithium-Sleeping-Block-Entity.patch} | 0 ...ch => 0058-Petal-Reduce-sensor-work.patch} | 0 ...9-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ... => 0063-Secure-seed-V2-with-Blake3.patch} | 0 ...rain-maps-with-optimized-collection.patch} | 0 ...ss-creating-stats-json-bases-on-pla.patch} | 0 ...mize-PatchedDataComponentMap-equals.patch} | 0 ...r-checking-for-useless-move-packets.patch} | 0 ...ch => 0068-Leaf-fast-bit-radix-sort.patch} | 0 ...Configurable-vanilla-username-check.patch} | 0 ...70-Leaf-Lithium-faster-hash-palette.patch} | 0 ...cket-limit-Shiroha-Option-to-full-d.patch} | 2 +- ...ves-Configurable-collision-behavior.patch} | 0 ...073-Leaves-Optimized-dragon-respawn.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...ttributes-with-optimized-collection.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...7-Gale-Store-mob-counts-in-an-array.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...> 0080-Gale-Cache-ShapePairKey-hash.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ...-Gale-Optimize-matching-item-checks.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ... 0085-Gale-Reduce-array-allocations.patch} | 2 +- ...086-Some-optimizations-from-krypton.patch} | 0 ...imized-collections-for-WeightedList.patch} | 0 ...m-optimized-non-poi-block-searching.patch} | 0 ...p-unnecessary-secondary-poi-sensing.patch} | 0 ...h => 0090-Per-region-async-profiler.patch} | 0 82 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 shiroha-server/minecraft-patches/features/0009-Do-not-fire-teleport-or-respawn-events-anymore.patch rename shiroha-server/minecraft-patches/features/{0009-Entity-portal-teleport-speed-fix.patch => 0010-Entity-portal-teleport-speed-fix.patch} (100%) rename shiroha-server/minecraft-patches/features/{0010-Fix-region-threading-with-entity-ai-data-access.patch => 0011-Fix-region-threading-with-entity-ai-data-access.patch} (100%) rename shiroha-server/minecraft-patches/features/{0011-Fix-off-region-leashing.patch => 0012-Fix-off-region-leashing.patch} (100%) rename shiroha-server/minecraft-patches/features/{0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch => 0013-Fix-unpatched-task-returning-of-ServerConfigurationP.patch} (100%) rename shiroha-server/minecraft-patches/features/{0013-Fix-riding-statistics-desync.patch => 0014-Fix-riding-statistics-desync.patch} (100%) rename shiroha-server/minecraft-patches/features/{0014-Fix-player-auto-saving-ignores-interval.patch => 0015-Fix-player-auto-saving-ignores-interval.patch} (100%) rename shiroha-server/minecraft-patches/features/{0015-Fix-dragon-part-desync.patch => 0016-Fix-dragon-part-desync.patch} (100%) rename shiroha-server/minecraft-patches/features/{0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch => 0017-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch} (100%) rename shiroha-server/minecraft-patches/features/{0017-Fix-creative-item-picking.patch => 0018-Fix-creative-item-picking.patch} (100%) rename shiroha-server/minecraft-patches/features/{0018-Fix-high-velocity-moving-issue.patch => 0019-Fix-high-velocity-moving-issue.patch} (100%) rename shiroha-server/minecraft-patches/features/{0019-Fix-teleport-missing-original-rotation-and-velocity.patch => 0020-Fix-teleport-missing-original-rotation-and-velocity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0020-Fix-wrong-variable-passing-in-RegionizedWorldData.patch => 0021-Fix-wrong-variable-passing-in-RegionizedWorldData.patch} (100%) rename shiroha-server/minecraft-patches/features/{0021-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch => 0022-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch} (100%) rename shiroha-server/minecraft-patches/features/{0022-Fix-wrong-ticket-update-determination-in-RegionizedT.patch => 0023-Fix-wrong-ticket-update-determination-in-RegionizedT.patch} (100%) rename shiroha-server/minecraft-patches/features/{0023-Fix-folia-nether-portal-ticket-placement.patch => 0024-Fix-folia-nether-portal-ticket-placement.patch} (100%) rename shiroha-server/minecraft-patches/features/{0024-Fix-incorrect-ticket-lock-size-computing.patch => 0025-Fix-incorrect-ticket-lock-size-computing.patch} (100%) rename shiroha-server/minecraft-patches/features/{0025-Fix-thread-unsafe-collections-use-in-PlayerList.patch => 0026-Fix-thread-unsafe-collections-use-in-PlayerList.patch} (100%) rename shiroha-server/minecraft-patches/features/{0026-Force-clamp-grid-exponent-to-1-6.patch => 0027-Force-clamp-grid-exponent-to-1-6.patch} (100%) rename shiroha-server/minecraft-patches/features/{0027-Force-disable-builtin-spark-plugin.patch => 0028-Force-disable-builtin-spark-plugin.patch} (100%) rename shiroha-server/minecraft-patches/features/{0028-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch => 0029-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch} (100%) rename shiroha-server/minecraft-patches/features/{0029-RegionizedTaskQueue-queue-TTL-optimization.patch => 0030-RegionizedTaskQueue-queue-TTL-optimization.patch} (100%) rename shiroha-server/minecraft-patches/features/{0030-Reduce-ticket-operations-in-nether-portal-searching.patch => 0031-Reduce-ticket-operations-in-nether-portal-searching.patch} (100%) rename shiroha-server/minecraft-patches/features/{0031-Replace-packet-processing-queue-with-mt-queue.patch => 0032-Replace-packet-processing-queue-with-mt-queue.patch} (100%) rename shiroha-server/minecraft-patches/features/{0032-Reduce-allocation-in-PoiAccess.patch => 0033-Reduce-allocation-in-PoiAccess.patch} (100%) rename shiroha-server/minecraft-patches/features/{0033-Reduce-allocation-in-SignalGetter.patch => 0034-Reduce-allocation-in-SignalGetter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0034-Reduce-allocation-in-unlistened-spawn-events.patch => 0035-Reduce-allocation-in-unlistened-spawn-events.patch} (100%) rename shiroha-server/minecraft-patches/features/{0035-Async-protocol-switching-optimization.patch => 0036-Async-protocol-switching-optimization.patch} (99%) rename shiroha-server/minecraft-patches/features/{0036-Improved-server-health-command.patch => 0037-Improved-server-health-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0037-Kaiiju-Entity-tick-and-removal-limiter.patch => 0038-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0038-Kaiiju-Vanilla-end-portal-teleportation.patch => 0039-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0039-Add-config-to-support-for-long-command-inputs.patch => 0040-Add-config-to-support-for-long-command-inputs.patch} (100%) rename shiroha-server/minecraft-patches/features/{0040-Add-config-for-server-mod-name.patch => 0041-Add-config-for-server-mod-name.patch} (100%) rename shiroha-server/minecraft-patches/features/{0041-Add-config-for-cpu-affinity.patch => 0042-Add-config-for-cpu-affinity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0042-Add-config-for-unsafe-teleportation.patch => 0043-Add-config-for-unsafe-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0043-Add-config-for-watchdog-timeout.patch => 0044-Add-config-for-watchdog-timeout.patch} (100%) rename shiroha-server/minecraft-patches/features/{0044-Add-config-to-disable-entity-tick-catchers.patch => 0045-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0045-Add-config-for-heightmap-warning.patch => 0046-Add-config-for-heightmap-warning.patch} (100%) rename shiroha-server/minecraft-patches/features/{0046-Add-config-gui-support.patch => 0047-Add-config-gui-support.patch} (100%) rename shiroha-server/minecraft-patches/features/{0047-Add-force-the-data-command-to-be-enabled-config.patch => 0048-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename shiroha-server/minecraft-patches/features/{0048-Add-experimental-config-for-command-block-command-ex.patch => 0049-Add-experimental-config-for-command-block-command-ex.patch} (100%) rename shiroha-server/minecraft-patches/features/{0049-Add-config-to-modify-tripwire-behavior.patch => 0050-Add-config-to-modify-tripwire-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0050-Add-config-for-item-multitask.patch => 0051-Add-config-for-item-multitask.patch} (96%) rename shiroha-server/minecraft-patches/features/{0051-Add-config-to-enable-tick-command.patch => 0052-Add-config-to-enable-tick-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0052-Add-config-for-whether-to-save-portal-tickets.patch => 0053-Add-config-for-whether-to-save-portal-tickets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0053-Add-portal-rate-limiter.patch => 0054-Add-portal-rate-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0054-Add-status-bar.patch => 0055-Add-status-bar.patch} (100%) rename shiroha-server/minecraft-patches/features/{0055-Leaves-Vanilla-Hopper.patch => 0056-Leaves-Vanilla-Hopper.patch} (100%) rename shiroha-server/minecraft-patches/features/{0056-Leaves-Lithium-Sleeping-Block-Entity.patch => 0057-Leaves-Lithium-Sleeping-Block-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0057-Petal-Reduce-sensor-work.patch => 0058-Petal-Reduce-sensor-work.patch} (100%) rename shiroha-server/minecraft-patches/features/{0058-Purpur-Lobotomize-stuck-villagers.patch => 0059-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0059-Pufferfish-Reduce-projectile-chunk-loading.patch => 0060-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename shiroha-server/minecraft-patches/features/{0060-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0061-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename shiroha-server/minecraft-patches/features/{0061-Leaf-Secure-seed-and-matter-seed-command.patch => 0062-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0062-Secure-seed-V2-with-Blake3.patch => 0063-Secure-seed-V2-with-Blake3.patch} (100%) rename shiroha-server/minecraft-patches/features/{0063-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0064-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0064-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0065-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename shiroha-server/minecraft-patches/features/{0065-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0066-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%) rename shiroha-server/minecraft-patches/features/{0066-Leaf-Better-checking-for-useless-move-packets.patch => 0067-Leaf-Better-checking-for-useless-move-packets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0067-Leaf-fast-bit-radix-sort.patch => 0068-Leaf-fast-bit-radix-sort.patch} (100%) rename shiroha-server/minecraft-patches/features/{0068-Leaf-Configurable-vanilla-username-check.patch => 0069-Leaf-Configurable-vanilla-username-check.patch} (100%) rename shiroha-server/minecraft-patches/features/{0069-Leaf-Lithium-faster-hash-palette.patch => 0070-Leaf-Lithium-faster-hash-palette.patch} (100%) rename shiroha-server/minecraft-patches/features/{0070-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch => 0071-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch} (97%) rename shiroha-server/minecraft-patches/features/{0071-Leaves-Configurable-collision-behavior.patch => 0072-Leaves-Configurable-collision-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0072-Leaves-Optimized-dragon-respawn.patch => 0073-Leaves-Optimized-dragon-respawn.patch} (100%) rename shiroha-server/minecraft-patches/features/{0073-Gale-Variable-entity-wake-up-duration.patch => 0074-Gale-Variable-entity-wake-up-duration.patch} (100%) rename shiroha-server/minecraft-patches/features/{0074-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0075-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0075-Gale-Skip-entity-move-if-movement-is-zero.patch => 0076-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename shiroha-server/minecraft-patches/features/{0076-Gale-Store-mob-counts-in-an-array.patch => 0077-Gale-Store-mob-counts-in-an-array.patch} (100%) rename shiroha-server/minecraft-patches/features/{0077-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0078-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename shiroha-server/minecraft-patches/features/{0078-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0079-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename shiroha-server/minecraft-patches/features/{0079-Gale-Cache-ShapePairKey-hash.patch => 0080-Gale-Cache-ShapePairKey-hash.patch} (100%) rename shiroha-server/minecraft-patches/features/{0080-Gale-For-collision-check-has-physics-before-same-veh.patch => 0081-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename shiroha-server/minecraft-patches/features/{0081-Gale-Skip-negligible-planar-movement-multiplication.patch => 0082-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename shiroha-server/minecraft-patches/features/{0082-Gale-Optimize-matching-item-checks.patch => 0083-Gale-Optimize-matching-item-checks.patch} (100%) rename shiroha-server/minecraft-patches/features/{0083-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0084-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0084-Gale-Reduce-array-allocations.patch => 0085-Gale-Reduce-array-allocations.patch} (99%) rename shiroha-server/minecraft-patches/features/{0085-Some-optimizations-from-krypton.patch => 0086-Some-optimizations-from-krypton.patch} (100%) rename shiroha-server/minecraft-patches/features/{0086-Lithium-optimized-collections-for-WeightedList.patch => 0087-Lithium-optimized-collections-for-WeightedList.patch} (100%) rename shiroha-server/minecraft-patches/features/{0087-Lithium-optimized-non-poi-block-searching.patch => 0088-Lithium-optimized-non-poi-block-searching.patch} (100%) rename shiroha-server/minecraft-patches/features/{0088-Lithium-skip-unnecessary-secondary-poi-sensing.patch => 0089-Lithium-skip-unnecessary-secondary-poi-sensing.patch} (100%) rename shiroha-server/minecraft-patches/features/{0089-Per-region-async-profiler.patch => 0090-Per-region-async-profiler.patch} (100%) diff --git a/shiroha-server/minecraft-patches/features/0009-Do-not-fire-teleport-or-respawn-events-anymore.patch b/shiroha-server/minecraft-patches/features/0009-Do-not-fire-teleport-or-respawn-events-anymore.patch new file mode 100644 index 0000000..70874bf --- /dev/null +++ b/shiroha-server/minecraft-patches/features/0009-Do-not-fire-teleport-or-respawn-events-anymore.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NanaChiyo0721 +Date: Mon, 17 Aug 2026 12:14:42 +0800 +Subject: [PATCH] Do not fire teleport or respawn events anymore + + +diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java +index c86b1fd5e200c478d178be32791b6e8c960d47e2..626761226aaacc7b6e429026b248be980a21d749 100644 +--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java ++++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java +@@ -1931,7 +1931,7 @@ public class ServerGamePacketListenerImpl + } + PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags)); + // Paper end - Teleport API +- this.cserver.getPluginManager().callEvent(event); ++ // this.cserver.getPluginManager().callEvent(event); // Shiroha - Do not fire teleport or respawn events anymore + + if (event.isCancelled() || !to.equals(event.getTo())) { + relatives = Set.of(); // target pos is absolute diff --git a/shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch b/shiroha-server/minecraft-patches/features/0010-Entity-portal-teleport-speed-fix.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0009-Entity-portal-teleport-speed-fix.patch rename to shiroha-server/minecraft-patches/features/0010-Entity-portal-teleport-speed-fix.patch diff --git a/shiroha-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch b/shiroha-server/minecraft-patches/features/0011-Fix-region-threading-with-entity-ai-data-access.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0010-Fix-region-threading-with-entity-ai-data-access.patch rename to shiroha-server/minecraft-patches/features/0011-Fix-region-threading-with-entity-ai-data-access.patch diff --git a/shiroha-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch b/shiroha-server/minecraft-patches/features/0012-Fix-off-region-leashing.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch rename to shiroha-server/minecraft-patches/features/0012-Fix-off-region-leashing.patch diff --git a/shiroha-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch b/shiroha-server/minecraft-patches/features/0013-Fix-unpatched-task-returning-of-ServerConfigurationP.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch rename to shiroha-server/minecraft-patches/features/0013-Fix-unpatched-task-returning-of-ServerConfigurationP.patch diff --git a/shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch b/shiroha-server/minecraft-patches/features/0014-Fix-riding-statistics-desync.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch rename to shiroha-server/minecraft-patches/features/0014-Fix-riding-statistics-desync.patch diff --git a/shiroha-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch b/shiroha-server/minecraft-patches/features/0015-Fix-player-auto-saving-ignores-interval.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0014-Fix-player-auto-saving-ignores-interval.patch rename to shiroha-server/minecraft-patches/features/0015-Fix-player-auto-saving-ignores-interval.patch diff --git a/shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch b/shiroha-server/minecraft-patches/features/0016-Fix-dragon-part-desync.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0015-Fix-dragon-part-desync.patch rename to shiroha-server/minecraft-patches/features/0016-Fix-dragon-part-desync.patch diff --git a/shiroha-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch b/shiroha-server/minecraft-patches/features/0017-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0016-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch rename to shiroha-server/minecraft-patches/features/0017-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch diff --git a/shiroha-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch b/shiroha-server/minecraft-patches/features/0018-Fix-creative-item-picking.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0017-Fix-creative-item-picking.patch rename to shiroha-server/minecraft-patches/features/0018-Fix-creative-item-picking.patch diff --git a/shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch b/shiroha-server/minecraft-patches/features/0019-Fix-high-velocity-moving-issue.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0018-Fix-high-velocity-moving-issue.patch rename to shiroha-server/minecraft-patches/features/0019-Fix-high-velocity-moving-issue.patch diff --git a/shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch b/shiroha-server/minecraft-patches/features/0020-Fix-teleport-missing-original-rotation-and-velocity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0019-Fix-teleport-missing-original-rotation-and-velocity.patch rename to shiroha-server/minecraft-patches/features/0020-Fix-teleport-missing-original-rotation-and-velocity.patch diff --git a/shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-RegionizedWorldData.patch b/shiroha-server/minecraft-patches/features/0021-Fix-wrong-variable-passing-in-RegionizedWorldData.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-RegionizedWorldData.patch rename to shiroha-server/minecraft-patches/features/0021-Fix-wrong-variable-passing-in-RegionizedWorldData.patch diff --git a/shiroha-server/minecraft-patches/features/0021-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch b/shiroha-server/minecraft-patches/features/0022-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0021-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch rename to shiroha-server/minecraft-patches/features/0022-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch diff --git a/shiroha-server/minecraft-patches/features/0022-Fix-wrong-ticket-update-determination-in-RegionizedT.patch b/shiroha-server/minecraft-patches/features/0023-Fix-wrong-ticket-update-determination-in-RegionizedT.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0022-Fix-wrong-ticket-update-determination-in-RegionizedT.patch rename to shiroha-server/minecraft-patches/features/0023-Fix-wrong-ticket-update-determination-in-RegionizedT.patch diff --git a/shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch b/shiroha-server/minecraft-patches/features/0024-Fix-folia-nether-portal-ticket-placement.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch rename to shiroha-server/minecraft-patches/features/0024-Fix-folia-nether-portal-ticket-placement.patch diff --git a/shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch b/shiroha-server/minecraft-patches/features/0025-Fix-incorrect-ticket-lock-size-computing.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch rename to shiroha-server/minecraft-patches/features/0025-Fix-incorrect-ticket-lock-size-computing.patch diff --git a/shiroha-server/minecraft-patches/features/0025-Fix-thread-unsafe-collections-use-in-PlayerList.patch b/shiroha-server/minecraft-patches/features/0026-Fix-thread-unsafe-collections-use-in-PlayerList.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0025-Fix-thread-unsafe-collections-use-in-PlayerList.patch rename to shiroha-server/minecraft-patches/features/0026-Fix-thread-unsafe-collections-use-in-PlayerList.patch diff --git a/shiroha-server/minecraft-patches/features/0026-Force-clamp-grid-exponent-to-1-6.patch b/shiroha-server/minecraft-patches/features/0027-Force-clamp-grid-exponent-to-1-6.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0026-Force-clamp-grid-exponent-to-1-6.patch rename to shiroha-server/minecraft-patches/features/0027-Force-clamp-grid-exponent-to-1-6.patch diff --git a/shiroha-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch b/shiroha-server/minecraft-patches/features/0028-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0027-Force-disable-builtin-spark-plugin.patch rename to shiroha-server/minecraft-patches/features/0028-Force-disable-builtin-spark-plugin.patch diff --git a/shiroha-server/minecraft-patches/features/0028-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/shiroha-server/minecraft-patches/features/0029-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0028-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch rename to shiroha-server/minecraft-patches/features/0029-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch diff --git a/shiroha-server/minecraft-patches/features/0029-RegionizedTaskQueue-queue-TTL-optimization.patch b/shiroha-server/minecraft-patches/features/0030-RegionizedTaskQueue-queue-TTL-optimization.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0029-RegionizedTaskQueue-queue-TTL-optimization.patch rename to shiroha-server/minecraft-patches/features/0030-RegionizedTaskQueue-queue-TTL-optimization.patch diff --git a/shiroha-server/minecraft-patches/features/0030-Reduce-ticket-operations-in-nether-portal-searching.patch b/shiroha-server/minecraft-patches/features/0031-Reduce-ticket-operations-in-nether-portal-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0030-Reduce-ticket-operations-in-nether-portal-searching.patch rename to shiroha-server/minecraft-patches/features/0031-Reduce-ticket-operations-in-nether-portal-searching.patch diff --git a/shiroha-server/minecraft-patches/features/0031-Replace-packet-processing-queue-with-mt-queue.patch b/shiroha-server/minecraft-patches/features/0032-Replace-packet-processing-queue-with-mt-queue.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0031-Replace-packet-processing-queue-with-mt-queue.patch rename to shiroha-server/minecraft-patches/features/0032-Replace-packet-processing-queue-with-mt-queue.patch diff --git a/shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-PoiAccess.patch b/shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-PoiAccess.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-PoiAccess.patch rename to shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-PoiAccess.patch diff --git a/shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-SignalGetter.patch b/shiroha-server/minecraft-patches/features/0034-Reduce-allocation-in-SignalGetter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-SignalGetter.patch rename to shiroha-server/minecraft-patches/features/0034-Reduce-allocation-in-SignalGetter.patch diff --git a/shiroha-server/minecraft-patches/features/0034-Reduce-allocation-in-unlistened-spawn-events.patch b/shiroha-server/minecraft-patches/features/0035-Reduce-allocation-in-unlistened-spawn-events.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0034-Reduce-allocation-in-unlistened-spawn-events.patch rename to shiroha-server/minecraft-patches/features/0035-Reduce-allocation-in-unlistened-spawn-events.patch diff --git a/shiroha-server/minecraft-patches/features/0035-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0036-Async-protocol-switching-optimization.patch similarity index 99% rename from shiroha-server/minecraft-patches/features/0035-Async-protocol-switching-optimization.patch rename to shiroha-server/minecraft-patches/features/0036-Async-protocol-switching-optimization.patch index d016b1f..49985af 100644 --- a/shiroha-server/minecraft-patches/features/0035-Async-protocol-switching-optimization.patch +++ b/shiroha-server/minecraft-patches/features/0036-Async-protocol-switching-optimization.patch @@ -171,7 +171,7 @@ index 0485ce2a56adedc200cc0cd441df7cce88da66a8..344d2aa66f1fb720ca7abcc426ef438e @Override diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c86b1fd5e200c478d178be32791b6e8c960d47e2..862a764889ed9ca985afdf672aebeb342c18b0c2 100644 +index 626761226aaacc7b6e429026b248be980a21d749..0bcc7c157b32cdef930c195def8f6be77fddec0a 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2898,7 +2898,13 @@ public class ServerGamePacketListenerImpl diff --git a/shiroha-server/minecraft-patches/features/0036-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0037-Improved-server-health-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0036-Improved-server-health-command.patch rename to shiroha-server/minecraft-patches/features/0037-Improved-server-health-command.patch diff --git a/shiroha-server/minecraft-patches/features/0037-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0038-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0037-Kaiiju-Entity-tick-and-removal-limiter.patch rename to shiroha-server/minecraft-patches/features/0038-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0038-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0039-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0038-Kaiiju-Vanilla-end-portal-teleportation.patch rename to shiroha-server/minecraft-patches/features/0039-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0039-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-to-support-for-long-command-inputs.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0039-Add-config-to-support-for-long-command-inputs.patch rename to shiroha-server/minecraft-patches/features/0040-Add-config-to-support-for-long-command-inputs.patch diff --git a/shiroha-server/minecraft-patches/features/0040-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-for-server-mod-name.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0040-Add-config-for-server-mod-name.patch rename to shiroha-server/minecraft-patches/features/0041-Add-config-for-server-mod-name.patch diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-for-cpu-affinity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0041-Add-config-for-cpu-affinity.patch rename to shiroha-server/minecraft-patches/features/0042-Add-config-for-cpu-affinity.patch diff --git a/shiroha-server/minecraft-patches/features/0042-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0043-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0042-Add-config-for-unsafe-teleportation.patch rename to shiroha-server/minecraft-patches/features/0043-Add-config-for-unsafe-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0043-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0044-Add-config-for-watchdog-timeout.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0043-Add-config-for-watchdog-timeout.patch rename to shiroha-server/minecraft-patches/features/0044-Add-config-for-watchdog-timeout.patch diff --git a/shiroha-server/minecraft-patches/features/0044-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0045-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0044-Add-config-to-disable-entity-tick-catchers.patch rename to shiroha-server/minecraft-patches/features/0045-Add-config-to-disable-entity-tick-catchers.patch diff --git a/shiroha-server/minecraft-patches/features/0045-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0046-Add-config-for-heightmap-warning.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0045-Add-config-for-heightmap-warning.patch rename to shiroha-server/minecraft-patches/features/0046-Add-config-for-heightmap-warning.patch diff --git a/shiroha-server/minecraft-patches/features/0046-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0047-Add-config-gui-support.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0046-Add-config-gui-support.patch rename to shiroha-server/minecraft-patches/features/0047-Add-config-gui-support.patch diff --git a/shiroha-server/minecraft-patches/features/0047-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0048-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0047-Add-force-the-data-command-to-be-enabled-config.patch rename to shiroha-server/minecraft-patches/features/0048-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/shiroha-server/minecraft-patches/features/0048-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0049-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0048-Add-experimental-config-for-command-block-command-ex.patch rename to shiroha-server/minecraft-patches/features/0049-Add-experimental-config-for-command-block-command-ex.patch diff --git a/shiroha-server/minecraft-patches/features/0049-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0050-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0049-Add-config-to-modify-tripwire-behavior.patch rename to shiroha-server/minecraft-patches/features/0050-Add-config-to-modify-tripwire-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0050-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0051-Add-config-for-item-multitask.patch similarity index 96% rename from shiroha-server/minecraft-patches/features/0050-Add-config-for-item-multitask.patch rename to shiroha-server/minecraft-patches/features/0051-Add-config-for-item-multitask.patch index d946d33..073d6d3 100644 --- a/shiroha-server/minecraft-patches/features/0050-Add-config-for-item-multitask.patch +++ b/shiroha-server/minecraft-patches/features/0051-Add-config-for-item-multitask.patch @@ -8,7 +8,7 @@ is for Anarchy servers or Crystal PVP servers this allows them to pvp without stopping the item mid animation. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 862a764889ed9ca985afdf672aebeb342c18b0c2..acb148f14593bf8a468a4623b68ba1c7935b5ba6 100644 +index 0bcc7c157b32cdef930c195def8f6be77fddec0a..4f2ea3d0a3e15dd78bd4cece163d37bf773958bd 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2183,7 +2183,9 @@ public class ServerGamePacketListenerImpl diff --git a/shiroha-server/minecraft-patches/features/0051-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0052-Add-config-to-enable-tick-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0051-Add-config-to-enable-tick-command.patch rename to shiroha-server/minecraft-patches/features/0052-Add-config-to-enable-tick-command.patch diff --git a/shiroha-server/minecraft-patches/features/0052-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0053-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0052-Add-config-for-whether-to-save-portal-tickets.patch rename to shiroha-server/minecraft-patches/features/0053-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/shiroha-server/minecraft-patches/features/0053-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0054-Add-portal-rate-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0053-Add-portal-rate-limiter.patch rename to shiroha-server/minecraft-patches/features/0054-Add-portal-rate-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0054-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0055-Add-status-bar.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0054-Add-status-bar.patch rename to shiroha-server/minecraft-patches/features/0055-Add-status-bar.patch diff --git a/shiroha-server/minecraft-patches/features/0055-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0056-Leaves-Vanilla-Hopper.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0055-Leaves-Vanilla-Hopper.patch rename to shiroha-server/minecraft-patches/features/0056-Leaves-Vanilla-Hopper.patch diff --git a/shiroha-server/minecraft-patches/features/0056-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0057-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0056-Leaves-Lithium-Sleeping-Block-Entity.patch rename to shiroha-server/minecraft-patches/features/0057-Leaves-Lithium-Sleeping-Block-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0057-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0058-Petal-Reduce-sensor-work.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0057-Petal-Reduce-sensor-work.patch rename to shiroha-server/minecraft-patches/features/0058-Petal-Reduce-sensor-work.patch diff --git a/shiroha-server/minecraft-patches/features/0058-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0059-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0058-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/minecraft-patches/features/0059-Purpur-Lobotomize-stuck-villagers.patch diff --git a/shiroha-server/minecraft-patches/features/0059-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0060-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0059-Pufferfish-Reduce-projectile-chunk-loading.patch rename to shiroha-server/minecraft-patches/features/0060-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/shiroha-server/minecraft-patches/features/0060-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0061-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0060-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to shiroha-server/minecraft-patches/features/0061-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/shiroha-server/minecraft-patches/features/0061-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0062-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0061-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/minecraft-patches/features/0062-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/shiroha-server/minecraft-patches/features/0062-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0063-Secure-seed-V2-with-Blake3.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0062-Secure-seed-V2-with-Blake3.patch rename to shiroha-server/minecraft-patches/features/0063-Secure-seed-V2-with-Blake3.patch diff --git a/shiroha-server/minecraft-patches/features/0063-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0064-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0063-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0064-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0064-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0065-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0064-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to shiroha-server/minecraft-patches/features/0065-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/shiroha-server/minecraft-patches/features/0065-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0066-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0065-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to shiroha-server/minecraft-patches/features/0066-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/shiroha-server/minecraft-patches/features/0066-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0067-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0066-Leaf-Better-checking-for-useless-move-packets.patch rename to shiroha-server/minecraft-patches/features/0067-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/shiroha-server/minecraft-patches/features/0067-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0068-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0067-Leaf-fast-bit-radix-sort.patch rename to shiroha-server/minecraft-patches/features/0068-Leaf-fast-bit-radix-sort.patch diff --git a/shiroha-server/minecraft-patches/features/0068-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0069-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0068-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/minecraft-patches/features/0069-Leaf-Configurable-vanilla-username-check.patch diff --git a/shiroha-server/minecraft-patches/features/0069-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0070-Leaf-Lithium-faster-hash-palette.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0069-Leaf-Lithium-faster-hash-palette.patch rename to shiroha-server/minecraft-patches/features/0070-Leaf-Lithium-faster-hash-palette.patch diff --git a/shiroha-server/minecraft-patches/features/0070-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0071-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch similarity index 97% rename from shiroha-server/minecraft-patches/features/0070-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch rename to shiroha-server/minecraft-patches/features/0071-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch index 0799afa..9777db7 100644 --- a/shiroha-server/minecraft-patches/features/0070-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch +++ b/shiroha-server/minecraft-patches/features/0071-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch @@ -21,7 +21,7 @@ index cc9459273762cde3e6b87a7eaf225607f527315c..ddcb9370b316441a78e95c19bc34812e synchronized (PACKET_LIMIT_LOCK) { if (this.allPacketCounts != null) { diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index acb148f14593bf8a468a4623b68ba1c7935b5ba6..be8d2a76ec1b93f6110f2a65c701bcbdc3dfe79d 100644 +index 4f2ea3d0a3e15dd78bd4cece163d37bf773958bd..85c74dd76c34a816ddb1f84fa572d4396bfda9fe 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -890,7 +890,7 @@ public class ServerGamePacketListenerImpl diff --git a/shiroha-server/minecraft-patches/features/0071-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0072-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0071-Leaves-Configurable-collision-behavior.patch rename to shiroha-server/minecraft-patches/features/0072-Leaves-Configurable-collision-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0072-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0073-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0072-Leaves-Optimized-dragon-respawn.patch rename to shiroha-server/minecraft-patches/features/0073-Leaves-Optimized-dragon-respawn.patch diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0073-Gale-Variable-entity-wake-up-duration.patch rename to shiroha-server/minecraft-patches/features/0074-Gale-Variable-entity-wake-up-duration.patch diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0074-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0075-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0075-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0076-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0075-Gale-Skip-entity-move-if-movement-is-zero.patch rename to shiroha-server/minecraft-patches/features/0076-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/shiroha-server/minecraft-patches/features/0076-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0077-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0076-Gale-Store-mob-counts-in-an-array.patch rename to shiroha-server/minecraft-patches/features/0077-Gale-Store-mob-counts-in-an-array.patch diff --git a/shiroha-server/minecraft-patches/features/0077-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0078-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0077-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to shiroha-server/minecraft-patches/features/0078-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/shiroha-server/minecraft-patches/features/0078-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0079-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0078-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to shiroha-server/minecraft-patches/features/0079-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/shiroha-server/minecraft-patches/features/0079-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0080-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0079-Gale-Cache-ShapePairKey-hash.patch rename to shiroha-server/minecraft-patches/features/0080-Gale-Cache-ShapePairKey-hash.patch diff --git a/shiroha-server/minecraft-patches/features/0080-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0081-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0080-Gale-For-collision-check-has-physics-before-same-veh.patch rename to shiroha-server/minecraft-patches/features/0081-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/shiroha-server/minecraft-patches/features/0081-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0082-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0081-Gale-Skip-negligible-planar-movement-multiplication.patch rename to shiroha-server/minecraft-patches/features/0082-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/shiroha-server/minecraft-patches/features/0082-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0083-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0082-Gale-Optimize-matching-item-checks.patch rename to shiroha-server/minecraft-patches/features/0083-Gale-Optimize-matching-item-checks.patch diff --git a/shiroha-server/minecraft-patches/features/0083-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0084-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0083-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to shiroha-server/minecraft-patches/features/0084-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0084-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0085-Gale-Reduce-array-allocations.patch similarity index 99% rename from shiroha-server/minecraft-patches/features/0084-Gale-Reduce-array-allocations.patch rename to shiroha-server/minecraft-patches/features/0085-Gale-Reduce-array-allocations.patch index 9e61f1b..6ae7992 100644 --- a/shiroha-server/minecraft-patches/features/0084-Gale-Reduce-array-allocations.patch +++ b/shiroha-server/minecraft-patches/features/0085-Gale-Reduce-array-allocations.patch @@ -150,7 +150,7 @@ index 306bac1feb35b2957a6acd2b394bdd3d500e6191..f169316ddef764a43ea38d8cdc017004 this.getInventory().equipment.set(value, net.minecraft.world.item.ItemStack.EMPTY); } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index be8d2a76ec1b93f6110f2a65c701bcbdc3dfe79d..b7f80b325ff796970f43dbc3ce47a811b140440d 100644 +index 85c74dd76c34a816ddb1f84fa572d4396bfda9fe..5cb1d887ed7f436d2eaf9ed4249df6d5bc83304b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3023,7 +3023,7 @@ public class ServerGamePacketListenerImpl diff --git a/shiroha-server/minecraft-patches/features/0085-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0086-Some-optimizations-from-krypton.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0085-Some-optimizations-from-krypton.patch rename to shiroha-server/minecraft-patches/features/0086-Some-optimizations-from-krypton.patch diff --git a/shiroha-server/minecraft-patches/features/0086-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0087-Lithium-optimized-collections-for-WeightedList.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0086-Lithium-optimized-collections-for-WeightedList.patch rename to shiroha-server/minecraft-patches/features/0087-Lithium-optimized-collections-for-WeightedList.patch diff --git a/shiroha-server/minecraft-patches/features/0087-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0088-Lithium-optimized-non-poi-block-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0087-Lithium-optimized-non-poi-block-searching.patch rename to shiroha-server/minecraft-patches/features/0088-Lithium-optimized-non-poi-block-searching.patch diff --git a/shiroha-server/minecraft-patches/features/0088-Lithium-skip-unnecessary-secondary-poi-sensing.patch b/shiroha-server/minecraft-patches/features/0089-Lithium-skip-unnecessary-secondary-poi-sensing.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0088-Lithium-skip-unnecessary-secondary-poi-sensing.patch rename to shiroha-server/minecraft-patches/features/0089-Lithium-skip-unnecessary-secondary-poi-sensing.patch diff --git a/shiroha-server/minecraft-patches/features/0089-Per-region-async-profiler.patch b/shiroha-server/minecraft-patches/features/0090-Per-region-async-profiler.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0089-Per-region-async-profiler.patch rename to shiroha-server/minecraft-patches/features/0090-Per-region-async-profiler.patch