From 3a8f64da64cd348f3e9b67ee61c44dfa2ab812ca Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Wed, 12 Aug 2026 03:49:09 +0800 Subject: [PATCH] Update Folia --- gradle.properties | 2 +- lophine-api/build.gradle.kts.patch | 15 +- .../features/0001-Rebrand-to-Lophine.patch | 4 +- lophine-server/build.gradle.kts.patch | 2 +- .../features/0001-Set-Lophine-logo.patch | 19 + ...patch => 0002-Luminol-Config-System.patch} | 0 ...> 0003-Correct-player-respawn-place.patch} | 0 ...reference-get-in-RegionizedTaskQueu.patch} | 0 ...orrect-thread-unsafe-random-sources.patch} | 0 ...l-logic-of-some-projectile-entities.patch} | 0 ...Configurable-region-format-framewor.patch} | 0 ...-not-enable-any-debug-subscriptions.patch} | 0 ...o-far-poi-chunk-in-poi-compete-scan.patch} | 0 ...es-around-entity-brain-and-memories.patch} | 0 ...tch => 0011-Fix-off-region-leashing.patch} | 0 ...k-returning-of-ServerConfigurationP.patch} | 0 ...> 0013-Fix-riding-statistics-desync.patch} | 6 +- ...der-pearls-when-player-switched-dim.patch} | 0 ...h => 0015-Fix-long-commands-support.patch} | 0 ... 0016-Fix-creative-player-item-pick.patch} | 0 ...17-Fix-entity-portal-teleport-speed.patch} | 6 +- ...player-auto-saving-ignores-interval.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ...nimals-check-can-teleport-in-an-unl.patch} | 0 ...-teleprotAsync-calls-in-move-events.patch} | 6 +- ...when-teleportation-or-firstly-creat.patch} | 4 +- ...-entity-was-moving-to-another-regio.patch} | 4 +- ...sing-original-rotation-and-velocity.patch} | 0 ... 0025-Improved-Server-Health-Report.patch} | 0 ...atch => 0026-World-load-unload-APIs.patch} | 16 +- ...iiju-Do-not-pathfind-outside-region.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 10 +- ...ync-protocol-switching-optimization.patch} | 8 +- ...0031-Add-config-for-server-mod-name.patch} | 0 ...Add-config-for-offline-mode-warning.patch} | 0 ...=> 0033-Add-config-for-cpu-affinity.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ... 0035-Add-config-for-vanilla-random.patch} | 2 +- ...036-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...38-Add-config-for-heightmap-warning.patch} | 0 ...atch => 0039-Add-config-gui-support.patch} | 0 ...e-data-command-to-be-enabled-config.patch} | 0 ...config-for-command-block-command-ex.patch} | 0 ...erify-signature-only-in-online-mode.patch} | 0 ...-for-whether-to-save-portal-tickets.patch} | 0 ...y-datapack-command-Fix-datapack-com.patch} | 0 ...-with-chunkhot-membar-and-regionbar.patch} | 4 +- ...-config-to-modify-tripwire-behavior.patch} | 0 ...7-Add-config-to-enable-tick-command.patch} | 0 ... 0048-Add-config-for-item-multitask.patch} | 0 ....patch => 0049-Add-tick-regions-api.patch} | 0 ...-teleportation-event-APIs-for-folia.patch} | 12 +- ...tch => 0051-Add-Portal-rate-limiter.patch} | 0 ...Add-config-for-waypoint-restoration.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ...0054-Add-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 => 0059-Leaf-fast-bit-radix-sort.patch} | 0 ...Configurable-vanilla-username-check.patch} | 4 +- ...1-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...ch => 0064-Petal-Reduce-sensor-work.patch} | 0 ...=> 0065-Leaves-Disable-packet-limit.patch} | 2 +- ...patch => 0066-Leaves-Vanilla-Hopper.patch} | 0 ...eaves-Lithium-Sleeping-Block-Entity.patch} | 6 +- ...ves-Configurable-collision-behavior.patch} | 0 ...ves-Disable-moved-wrongly-threshold.patch} | 0 ...070-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} | 6 +- ...4-Gale-Store-mob-counts-in-an-array.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...> 0077-Gale-Cache-ShapePairKey-hash.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 8 +- ...ible-planar-movement-multiplication.patch} | 4 +- ...-Gale-Optimize-matching-item-checks.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ... 0082-Gale-Reduce-array-allocations.patch} | 0 ...083-Some-optimizations-from-krypton.patch} | 0 ...cket-processing-queue-with-mt-queue.patch} | 0 ...rver-I18n.patch => 0085-Server-I18n.patch} | 0 ...rpur-Barrels-and-enderchests-6-rows.patch} | 0 ...to-disable-some-check-for-operators.patch} | 0 ...to-enable-cross-region-damage-trace.patch} | 0 ...d-config-to-enable-save-all-command.patch} | 0 ...d-config-to-enable-function-command.patch} | 0 ...config-to-enable-scoreboard-command.patch} | 0 ...dd-config-to-enable-trigger-command.patch} | 0 ...config-to-enable-raytracing-tracker.patch} | 4 +- ... 0094-Modify-merge-ItemEntity-logic.patch} | 0 ...ch => 0095-Old-zombie-reinforcement.patch} | 0 ...0096-Old-leader-zombie-health-logic.patch} | 0 ...tch => 0097-Spawn-invulnerable-time.patch} | 0 ... => 0098-Leaves-Item-overstack-util.patch} | 0 ...ch => 0099-Leaves-Old-raid-behavior.patch} | 0 ...-for-Raid-Revert-and-Cross-Region-D.patch} | 0 ...01-Leaves-Leaves-Base-Protocol-Core.patch} | 0 ...-Configurable-trading-with-the-void.patch} | 0 ...atch => 0103-Leaves-Servux-Protocol.patch} | 0 ...avesHooks.patch => 0104-LeavesHooks.patch} | 0 ...ves-Old-Explosion-Damage-Calculator.patch} | 0 ... 0106-Leaves-Redstone-Shears-Wrench.patch} | 0 ... => 0107-Leaves-Syncmatica-Protocol.patch} | 0 ....patch => 0108-Leaves-BBOR-Protocol.patch} | 0 ...h => 0109-Leaves-Xaero-Map-Protocol.patch} | 0 ...=> 0110-Leaves-Support-REI-protocol.patch} | 0 ....patch => 0111-Leaves-Jade-Protocol.patch} | 0 ...lternative-block-placement-Protocol.patch} | 0 ...yer.patch => 0113-Leaves-Fakeplayer.patch} | 8 +- ...patch => 0114-Leaves-Replay-Mod-API.patch} | 0 ...=> 0115-Leaves-Creative-fly-no-clip.patch} | 0 ... => 0116-Leaves-Wool-Hopper-Counter.patch} | 0 ...tch => 0117-Global-Entities-Counter.patch} | 0 ...aves-Catch-update-suppression-crash.patch} | 4 +- ... 0119-Leaves-CCE-update-suppression.patch} | 0 ...aves-Redstone-ignore-upwards-update.patch} | 0 ...patch => 0121-Instant-Block-Updater.patch} | 0 ...rt-TrapDoorBlock-changes-form-Paper.patch} | 0 ...ss-of-item-drops-due-to-update-supp.patch} | 0 ...et-placed-block-on-exception-Do-not.patch} | 0 ...5-Leaves-Old-Block-remove-behaviour.patch} | 0 ...Tweaks-mob-fire-and-explosion-rules.patch} | 0 ...tures.patch => 0127-Carpet-features.patch} | 0 ...col.patch => 0128-PCA-sync-protocol.patch} | 0 ...-Add-Vanilla-like-experience-Config.patch} | 0 ...Restore-vanilla-ender-pearl-loading.patch} | 0 ...Fix-wrong-variable-passing-in-Regio.patch} | 0 ...Fix-wrong-variable-passing-in-Threa.patch} | 0 ...Fix-wrong-ticket-update-determinati.patch} | 0 ...Lithium-optimized-collections-for-W.patch} | 0 ...Lithium-optimized-non-poi-block-sea.patch} | 0 ...Fix-folia-nether-portal-ticket-plac.patch} | 6 +- ...RegionizedTaskQueue-queue-TTL-optim.patch} | 0 ...Reduce-ticket-operations-in-nether-.patch} | 4 +- .../features/0001-Rebrand-to-Lophine.patch | 4216 ----------------- ...ig-to-avoid-of-folia-supported-check.patch | 4 +- .../0022-Leaves-Leaves-Fakeplayer.patch | 4 +- .../features/0023-Leaves-Replay-Mod-API.patch | 4 +- .../src/main/resources/lophine-logo.png | Bin 0 -> 535473 bytes 147 files changed, 108 insertions(+), 4296 deletions(-) create mode 100644 lophine-server/minecraft-patches/features/0001-Set-Lophine-logo.patch rename lophine-server/minecraft-patches/features/{0001-Luminol-Config-System.patch => 0002-Luminol-Config-System.patch} (100%) rename lophine-server/minecraft-patches/features/{0002-Correct-player-respawn-place.patch => 0003-Correct-player-respawn-place.patch} (100%) rename lophine-server/minecraft-patches/features/{0003-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch => 0004-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch} (100%) rename lophine-server/minecraft-patches/features/{0004-Correct-thread-unsafe-random-sources.patch => 0005-Correct-thread-unsafe-random-sources.patch} (100%) rename lophine-server/minecraft-patches/features/{0005-Correct-portal-logic-of-some-projectile-entities.patch => 0006-Correct-portal-logic-of-some-projectile-entities.patch} (100%) rename lophine-server/minecraft-patches/features/{0006-Anonymous-Object-Configurable-region-format-framewor.patch => 0007-Anonymous-Object-Configurable-region-format-framewor.patch} (100%) rename lophine-server/minecraft-patches/features/{0007-Do-not-enable-any-debug-subscriptions.patch => 0008-Do-not-enable-any-debug-subscriptions.patch} (100%) rename lophine-server/minecraft-patches/features/{0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch => 0009-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch} (100%) rename lophine-server/minecraft-patches/features/{0009-Fixes-around-entity-brain-and-memories.patch => 0010-Fixes-around-entity-brain-and-memories.patch} (100%) rename lophine-server/minecraft-patches/features/{0010-Fix-off-region-leashing.patch => 0011-Fix-off-region-leashing.patch} (100%) rename lophine-server/minecraft-patches/features/{0011-Fix-unpatched-task-returning-of-ServerConfigurationP.patch => 0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch} (100%) rename lophine-server/minecraft-patches/features/{0012-Fix-riding-statistics-desync.patch => 0013-Fix-riding-statistics-desync.patch} (93%) rename lophine-server/minecraft-patches/features/{0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch => 0014-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch} (100%) rename lophine-server/minecraft-patches/features/{0014-Fix-long-commands-support.patch => 0015-Fix-long-commands-support.patch} (100%) rename lophine-server/minecraft-patches/features/{0015-Fix-creative-player-item-pick.patch => 0016-Fix-creative-player-item-pick.patch} (100%) rename lophine-server/minecraft-patches/features/{0016-Fix-entity-portal-teleport-speed.patch => 0017-Fix-entity-portal-teleport-speed.patch} (94%) rename lophine-server/minecraft-patches/features/{0017-Fix-player-auto-saving-ignores-interval.patch => 0018-Fix-player-auto-saving-ignores-interval.patch} (100%) rename lophine-server/minecraft-patches/features/{0018-Force-disable-builtin-spark-plugin.patch => 0019-Force-disable-builtin-spark-plugin.patch} (100%) rename lophine-server/minecraft-patches/features/{0019-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch => 0020-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch} (100%) rename lophine-server/minecraft-patches/features/{0020-Prevent-teleprotAsync-calls-in-move-events.patch => 0021-Prevent-teleprotAsync-calls-in-move-events.patch} (95%) rename lophine-server/minecraft-patches/features/{0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch => 0022-Sync-dragon-part-when-teleportation-or-firstly-creat.patch} (95%) rename lophine-server/minecraft-patches/features/{0022-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0023-Teleport-async-if-entity-was-moving-to-another-regio.patch} (96%) rename lophine-server/minecraft-patches/features/{0023-Fix-teleport-missing-original-rotation-and-velocity.patch => 0024-Fix-teleport-missing-original-rotation-and-velocity.patch} (100%) rename lophine-server/minecraft-patches/features/{0024-Improved-Server-Health-Report.patch => 0025-Improved-Server-Health-Report.patch} (100%) rename lophine-server/minecraft-patches/features/{0025-World-load-unload-APIs.patch => 0026-World-load-unload-APIs.patch} (98%) rename lophine-server/minecraft-patches/features/{0026-Kaiiju-Do-not-pathfind-outside-region.patch => 0027-Kaiiju-Do-not-pathfind-outside-region.patch} (100%) rename lophine-server/minecraft-patches/features/{0027-Kaiiju-Entity-tick-and-removal-limiter.patch => 0028-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename lophine-server/minecraft-patches/features/{0028-Kaiiju-Vanilla-end-portal-teleportation.patch => 0029-Kaiiju-Vanilla-end-portal-teleportation.patch} (94%) rename lophine-server/minecraft-patches/features/{0029-Async-protocol-switching-optimization.patch => 0030-Async-protocol-switching-optimization.patch} (98%) rename lophine-server/minecraft-patches/features/{0030-Add-config-for-server-mod-name.patch => 0031-Add-config-for-server-mod-name.patch} (100%) rename lophine-server/minecraft-patches/features/{0031-Add-config-for-offline-mode-warning.patch => 0032-Add-config-for-offline-mode-warning.patch} (100%) rename lophine-server/minecraft-patches/features/{0032-Add-config-for-cpu-affinity.patch => 0033-Add-config-for-cpu-affinity.patch} (100%) rename lophine-server/minecraft-patches/features/{0033-Add-config-for-unsafe-teleportation.patch => 0034-Add-config-for-unsafe-teleportation.patch} (100%) rename lophine-server/minecraft-patches/features/{0034-Add-config-for-vanilla-random.patch => 0035-Add-config-for-vanilla-random.patch} (92%) rename lophine-server/minecraft-patches/features/{0035-Add-config-for-watchdog-timeout.patch => 0036-Add-config-for-watchdog-timeout.patch} (100%) rename lophine-server/minecraft-patches/features/{0036-Add-config-to-disable-entity-tick-catchers.patch => 0037-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename lophine-server/minecraft-patches/features/{0037-Add-config-for-heightmap-warning.patch => 0038-Add-config-for-heightmap-warning.patch} (100%) rename lophine-server/minecraft-patches/features/{0038-Add-config-gui-support.patch => 0039-Add-config-gui-support.patch} (100%) rename lophine-server/minecraft-patches/features/{0039-Add-force-the-data-command-to-be-enabled-config.patch => 0040-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename lophine-server/minecraft-patches/features/{0040-Add-experimental-config-for-command-block-command-ex.patch => 0041-Add-experimental-config-for-command-block-command-ex.patch} (100%) rename lophine-server/minecraft-patches/features/{0041-Add-config-to-verify-signature-only-in-online-mode.patch => 0042-Add-config-to-verify-signature-only-in-online-mode.patch} (100%) rename lophine-server/minecraft-patches/features/{0042-Add-config-for-whether-to-save-portal-tickets.patch => 0043-Add-config-for-whether-to-save-portal-tickets.patch} (100%) rename lophine-server/minecraft-patches/features/{0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch => 0044-Add-back-read-only-datapack-command-Fix-datapack-com.patch} (100%) rename lophine-server/minecraft-patches/features/{0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch => 0045-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch} (99%) rename lophine-server/minecraft-patches/features/{0045-Add-config-to-modify-tripwire-behavior.patch => 0046-Add-config-to-modify-tripwire-behavior.patch} (100%) rename lophine-server/minecraft-patches/features/{0046-Add-config-to-enable-tick-command.patch => 0047-Add-config-to-enable-tick-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0047-Add-config-for-item-multitask.patch => 0048-Add-config-for-item-multitask.patch} (100%) rename lophine-server/minecraft-patches/features/{0048-Add-tick-regions-api.patch => 0049-Add-tick-regions-api.patch} (100%) rename lophine-server/minecraft-patches/features/{0049-Add-missing-teleportation-event-APIs-for-folia.patch => 0050-Add-missing-teleportation-event-APIs-for-folia.patch} (95%) rename lophine-server/minecraft-patches/features/{0050-Add-Portal-rate-limiter.patch => 0051-Add-Portal-rate-limiter.patch} (100%) rename lophine-server/minecraft-patches/features/{0051-Add-config-for-waypoint-restoration.patch => 0052-Add-config-for-waypoint-restoration.patch} (100%) rename lophine-server/minecraft-patches/features/{0052-Leaf-Secure-seed-and-matter-seed-command.patch => 0053-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0053-Add-secure-seed-V2-with-Blake3.patch => 0054-Add-secure-seed-V2-with-Blake3.patch} (100%) rename lophine-server/minecraft-patches/features/{0054-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0055-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename lophine-server/minecraft-patches/features/{0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0056-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename lophine-server/minecraft-patches/features/{0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0057-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%) rename lophine-server/minecraft-patches/features/{0057-Leaf-Better-checking-for-useless-move-packets.patch => 0058-Leaf-Better-checking-for-useless-move-packets.patch} (100%) rename lophine-server/minecraft-patches/features/{0058-Leaf-fast-bit-radix-sort.patch => 0059-Leaf-fast-bit-radix-sort.patch} (100%) rename lophine-server/minecraft-patches/features/{0059-Leaf-Configurable-vanilla-username-check.patch => 0060-Leaf-Configurable-vanilla-username-check.patch} (98%) rename lophine-server/minecraft-patches/features/{0060-Purpur-Lobotomize-stuck-villagers.patch => 0061-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename lophine-server/minecraft-patches/features/{0061-Pufferfish-Reduce-projectile-chunk-loading.patch => 0062-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename lophine-server/minecraft-patches/features/{0062-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0063-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename lophine-server/minecraft-patches/features/{0063-Petal-Reduce-sensor-work.patch => 0064-Petal-Reduce-sensor-work.patch} (100%) rename lophine-server/minecraft-patches/features/{0064-Leaves-Disable-packet-limit.patch => 0065-Leaves-Disable-packet-limit.patch} (97%) rename lophine-server/minecraft-patches/features/{0065-Leaves-Vanilla-Hopper.patch => 0066-Leaves-Vanilla-Hopper.patch} (100%) rename lophine-server/minecraft-patches/features/{0066-Leaves-Lithium-Sleeping-Block-Entity.patch => 0067-Leaves-Lithium-Sleeping-Block-Entity.patch} (99%) rename lophine-server/minecraft-patches/features/{0067-Leaves-Configurable-collision-behavior.patch => 0068-Leaves-Configurable-collision-behavior.patch} (100%) rename lophine-server/minecraft-patches/features/{0068-Leaves-Disable-moved-wrongly-threshold.patch => 0069-Leaves-Disable-moved-wrongly-threshold.patch} (100%) rename lophine-server/minecraft-patches/features/{0069-Leaves-Optimized-dragon-respawn.patch => 0070-Leaves-Optimized-dragon-respawn.patch} (100%) rename lophine-server/minecraft-patches/features/{0070-Gale-Variable-entity-wake-up-duration.patch => 0071-Gale-Variable-entity-wake-up-duration.patch} (100%) rename lophine-server/minecraft-patches/features/{0071-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0072-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename lophine-server/minecraft-patches/features/{0072-Gale-Skip-entity-move-if-movement-is-zero.patch => 0073-Gale-Skip-entity-move-if-movement-is-zero.patch} (90%) rename lophine-server/minecraft-patches/features/{0073-Gale-Store-mob-counts-in-an-array.patch => 0074-Gale-Store-mob-counts-in-an-array.patch} (100%) rename lophine-server/minecraft-patches/features/{0074-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0075-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename lophine-server/minecraft-patches/features/{0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename lophine-server/minecraft-patches/features/{0076-Gale-Cache-ShapePairKey-hash.patch => 0077-Gale-Cache-ShapePairKey-hash.patch} (100%) rename lophine-server/minecraft-patches/features/{0077-Gale-For-collision-check-has-physics-before-same-veh.patch => 0078-Gale-For-collision-check-has-physics-before-same-veh.patch} (80%) rename lophine-server/minecraft-patches/features/{0078-Gale-Skip-negligible-planar-movement-multiplication.patch => 0079-Gale-Skip-negligible-planar-movement-multiplication.patch} (91%) rename lophine-server/minecraft-patches/features/{0079-Gale-Optimize-matching-item-checks.patch => 0080-Gale-Optimize-matching-item-checks.patch} (100%) rename lophine-server/minecraft-patches/features/{0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename lophine-server/minecraft-patches/features/{0081-Gale-Reduce-array-allocations.patch => 0082-Gale-Reduce-array-allocations.patch} (100%) rename lophine-server/minecraft-patches/features/{0082-Some-optimizations-from-krypton.patch => 0083-Some-optimizations-from-krypton.patch} (100%) rename lophine-server/minecraft-patches/features/{0083-Replace-packet-processing-queue-with-mt-queue.patch => 0084-Replace-packet-processing-queue-with-mt-queue.patch} (100%) rename lophine-server/minecraft-patches/features/{0084-Server-I18n.patch => 0085-Server-I18n.patch} (100%) rename lophine-server/minecraft-patches/features/{0085-Purpur-Barrels-and-enderchests-6-rows.patch => 0086-Purpur-Barrels-and-enderchests-6-rows.patch} (100%) rename lophine-server/minecraft-patches/features/{0086-Add-config-to-disable-some-check-for-operators.patch => 0087-Add-config-to-disable-some-check-for-operators.patch} (100%) rename lophine-server/minecraft-patches/features/{0087-Add-config-to-enable-cross-region-damage-trace.patch => 0088-Add-config-to-enable-cross-region-damage-trace.patch} (100%) rename lophine-server/minecraft-patches/features/{0088-Add-config-to-enable-save-all-command.patch => 0089-Add-config-to-enable-save-all-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0089-Add-config-to-enable-function-command.patch => 0090-Add-config-to-enable-function-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0090-Add-config-to-enable-scoreboard-command.patch => 0091-Add-config-to-enable-scoreboard-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0091-Add-config-to-enable-trigger-command.patch => 0092-Add-config-to-enable-trigger-command.patch} (100%) rename lophine-server/minecraft-patches/features/{0092-Add-config-to-enable-raytracing-tracker.patch => 0093-Add-config-to-enable-raytracing-tracker.patch} (98%) rename lophine-server/minecraft-patches/features/{0093-Modify-merge-ItemEntity-logic.patch => 0094-Modify-merge-ItemEntity-logic.patch} (100%) rename lophine-server/minecraft-patches/features/{0094-Old-zombie-reinforcement.patch => 0095-Old-zombie-reinforcement.patch} (100%) rename lophine-server/minecraft-patches/features/{0095-Old-leader-zombie-health-logic.patch => 0096-Old-leader-zombie-health-logic.patch} (100%) rename lophine-server/minecraft-patches/features/{0096-Spawn-invulnerable-time.patch => 0097-Spawn-invulnerable-time.patch} (100%) rename lophine-server/minecraft-patches/features/{0097-Leaves-Item-overstack-util.patch => 0098-Leaves-Item-overstack-util.patch} (100%) rename lophine-server/minecraft-patches/features/{0098-Leaves-Old-raid-behavior.patch => 0099-Leaves-Old-raid-behavior.patch} (100%) rename lophine-server/minecraft-patches/features/{0099-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch => 0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch} (100%) rename lophine-server/minecraft-patches/features/{0100-Leaves-Leaves-Base-Protocol-Core.patch => 0101-Leaves-Leaves-Base-Protocol-Core.patch} (100%) rename lophine-server/minecraft-patches/features/{0101-Leaves-Configurable-trading-with-the-void.patch => 0102-Leaves-Configurable-trading-with-the-void.patch} (100%) rename lophine-server/minecraft-patches/features/{0102-Leaves-Servux-Protocol.patch => 0103-Leaves-Servux-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0103-LeavesHooks.patch => 0104-LeavesHooks.patch} (100%) rename lophine-server/minecraft-patches/features/{0104-Leaves-Old-Explosion-Damage-Calculator.patch => 0105-Leaves-Old-Explosion-Damage-Calculator.patch} (100%) rename lophine-server/minecraft-patches/features/{0105-Leaves-Redstone-Shears-Wrench.patch => 0106-Leaves-Redstone-Shears-Wrench.patch} (100%) rename lophine-server/minecraft-patches/features/{0106-Leaves-Syncmatica-Protocol.patch => 0107-Leaves-Syncmatica-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0107-Leaves-BBOR-Protocol.patch => 0108-Leaves-BBOR-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0108-Leaves-Xaero-Map-Protocol.patch => 0109-Leaves-Xaero-Map-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0109-Leaves-Support-REI-protocol.patch => 0110-Leaves-Support-REI-protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0110-Leaves-Jade-Protocol.patch => 0111-Leaves-Jade-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0111-Leaves-Alternative-block-placement-Protocol.patch => 0112-Leaves-Alternative-block-placement-Protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0112-Leaves-Fakeplayer.patch => 0113-Leaves-Fakeplayer.patch} (99%) rename lophine-server/minecraft-patches/features/{0113-Leaves-Replay-Mod-API.patch => 0114-Leaves-Replay-Mod-API.patch} (100%) rename lophine-server/minecraft-patches/features/{0114-Leaves-Creative-fly-no-clip.patch => 0115-Leaves-Creative-fly-no-clip.patch} (100%) rename lophine-server/minecraft-patches/features/{0115-Leaves-Wool-Hopper-Counter.patch => 0116-Leaves-Wool-Hopper-Counter.patch} (100%) rename lophine-server/minecraft-patches/features/{0116-Global-Entities-Counter.patch => 0117-Global-Entities-Counter.patch} (100%) rename lophine-server/minecraft-patches/features/{0117-Leaves-Catch-update-suppression-crash.patch => 0118-Leaves-Catch-update-suppression-crash.patch} (98%) rename lophine-server/minecraft-patches/features/{0118-Leaves-CCE-update-suppression.patch => 0119-Leaves-CCE-update-suppression.patch} (100%) rename lophine-server/minecraft-patches/features/{0119-Leaves-Redstone-ignore-upwards-update.patch => 0120-Leaves-Redstone-ignore-upwards-update.patch} (100%) rename lophine-server/minecraft-patches/features/{0120-Instant-Block-Updater.patch => 0121-Instant-Block-Updater.patch} (100%) rename lophine-server/minecraft-patches/features/{0121-Revert-TrapDoorBlock-changes-form-Paper.patch => 0122-Revert-TrapDoorBlock-changes-form-Paper.patch} (100%) rename lophine-server/minecraft-patches/features/{0122-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch => 0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch} (100%) rename lophine-server/minecraft-patches/features/{0123-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch => 0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch} (100%) rename lophine-server/minecraft-patches/features/{0124-Leaves-Old-Block-remove-behaviour.patch => 0125-Leaves-Old-Block-remove-behaviour.patch} (100%) rename lophine-server/minecraft-patches/features/{0125-MiniTweaks-mob-fire-and-explosion-rules.patch => 0126-MiniTweaks-mob-fire-and-explosion-rules.patch} (100%) rename lophine-server/minecraft-patches/features/{0126-Carpet-features.patch => 0127-Carpet-features.patch} (100%) rename lophine-server/minecraft-patches/features/{0127-PCA-sync-protocol.patch => 0128-PCA-sync-protocol.patch} (100%) rename lophine-server/minecraft-patches/features/{0128-Add-Vanilla-like-experience-Config.patch => 0129-Add-Vanilla-like-experience-Config.patch} (100%) rename lophine-server/minecraft-patches/features/{0129-Restore-vanilla-ender-pearl-loading.patch => 0130-Restore-vanilla-ender-pearl-loading.patch} (100%) rename lophine-server/minecraft-patches/features/{0130-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch => 0131-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch} (100%) rename lophine-server/minecraft-patches/features/{0131-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch => 0132-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch} (100%) rename lophine-server/minecraft-patches/features/{0132-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch => 0133-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch} (100%) rename lophine-server/minecraft-patches/features/{0133-Anonymous-Object-Lithium-optimized-collections-for-W.patch => 0134-Anonymous-Object-Lithium-optimized-collections-for-W.patch} (100%) rename lophine-server/minecraft-patches/features/{0134-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch => 0135-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch} (100%) rename lophine-server/minecraft-patches/features/{0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch => 0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch} (95%) rename lophine-server/minecraft-patches/features/{0136-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch => 0137-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch} (100%) rename lophine-server/minecraft-patches/features/{0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch => 0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch} (95%) create mode 100644 lophine-server/src/main/resources/lophine-logo.png diff --git a/gradle.properties b/gradle.properties index f8258c5..acb27dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ release=true # true for push to repo, false for skip push repo, auto for detect by release value pushRepo=auto -foliaRef=57f643f10e0a9d01024773232d38ae666067d593 +foliaRef=24c5c95dc45e02caff98a97ed6ffee7565523464 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-api/build.gradle.kts.patch b/lophine-api/build.gradle.kts.patch index 72805e4..1f3a929 100644 --- a/lophine-api/build.gradle.kts.patch +++ b/lophine-api/build.gradle.kts.patch @@ -1,6 +1,6 @@ --- a/folia-api/build.gradle.kts +++ b/folia-api/build.gradle.kts -@@ -53,6 +_,7 @@ +@@ -68,6 +_,7 @@ api("org.apache.logging.log4j:log4j-api:$log4jVersion") api("org.slf4j:slf4j-api:$slf4jVersion") api("com.mojang:brigadier:1.3.10") @@ -8,7 +8,16 @@ // Deprecate bungeecord-chat in favor of adventure api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") { -@@ -105,17 +_,21 @@ +@@ -109,7 +_,7 @@ + testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3") + + // checkstyle +- checkstyle(project(":folia-checkstyle")) ++ //checkstyle(project(":folia-checkstyle")) + } + + val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() +@@ -123,17 +_,21 @@ java { srcDir(generatedDir) srcDir(file("../paper-api/src/main/java")) @@ -30,7 +39,7 @@ } } } -@@ -259,3 +_,19 @@ +@@ -277,3 +_,19 @@ tasks.check { dependsOn(scanJarForBadCalls) } diff --git a/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch index da62731..a8fcfa4 100644 --- a/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-api/paper-patches/features/0001-Rebrand-to-Lophine.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand to Lophine diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java -index 56a5877181e8d37518b178c95155e892c442e96d..ebe0290bf0235af2ba353ac1f74b29080daebba4 100644 +index 4e099b584c3435ba1ebce492011d35ae1ac0cdf8..ed558bea1f939ab902d3c45417573fba83307abc 100644 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java -@@ -19,6 +19,17 @@ public interface ServerBuildInfo { +@@ -17,6 +17,17 @@ public interface ServerBuildInfo { */ Key BRAND_PAPER_ID = Key.key("papermc", "paper"); diff --git a/lophine-server/build.gradle.kts.patch b/lophine-server/build.gradle.kts.patch index 5cf5590..2fba8e8 100644 --- a/lophine-server/build.gradle.kts.patch +++ b/lophine-server/build.gradle.kts.patch @@ -64,7 +64,7 @@ @@ -103,10 +_,14 @@ main { - java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") } + java { srcDir("../paper-server/src/main/java") } resources { srcDir("../paper-server/src/main/resources") } + java { srcDir("../folia-server/src/main/java") } + resources { srcDir("../folia-server/src/main/resources") } diff --git a/lophine-server/minecraft-patches/features/0001-Set-Lophine-logo.patch b/lophine-server/minecraft-patches/features/0001-Set-Lophine-logo.patch new file mode 100644 index 0000000..a367fa9 --- /dev/null +++ b/lophine-server/minecraft-patches/features/0001-Set-Lophine-logo.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Helvetica Volubi +Date: Wed, 12 Aug 2026 03:44:13 +0800 +Subject: [PATCH] Set Lophine logo + + +diff --git a/net/minecraft/server/gui/MinecraftServerGui.java b/net/minecraft/server/gui/MinecraftServerGui.java +index 79518cbca7760f710130509d93d27fb017d67159..05d17e35803adacb6efb594ad90d6254f4a1b09c 100644 +--- a/net/minecraft/server/gui/MinecraftServerGui.java ++++ b/net/minecraft/server/gui/MinecraftServerGui.java +@@ -58,7 +58,7 @@ public class MinecraftServerGui extends JComponent { + // Paper start - Improve ServerGUI + frame.setName("Minecraft server"); + try { +- frame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("folia-logo.png")))); ++ frame.setIconImage(javax.imageio.ImageIO.read(java.util.Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("lophine-logo.png")))); + } catch (java.io.IOException ignore) { + } + // Paper end - Improve ServerGUI diff --git a/lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch b/lophine-server/minecraft-patches/features/0002-Luminol-Config-System.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0001-Luminol-Config-System.patch rename to lophine-server/minecraft-patches/features/0002-Luminol-Config-System.patch diff --git a/lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch b/lophine-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0002-Correct-player-respawn-place.patch rename to lophine-server/minecraft-patches/features/0003-Correct-player-respawn-place.patch diff --git a/lophine-server/minecraft-patches/features/0003-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch b/lophine-server/minecraft-patches/features/0004-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0003-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch rename to lophine-server/minecraft-patches/features/0004-Correct-volatile-reference-get-in-RegionizedTaskQueu.patch diff --git a/lophine-server/minecraft-patches/features/0004-Correct-thread-unsafe-random-sources.patch b/lophine-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0004-Correct-thread-unsafe-random-sources.patch rename to lophine-server/minecraft-patches/features/0005-Correct-thread-unsafe-random-sources.patch diff --git a/lophine-server/minecraft-patches/features/0005-Correct-portal-logic-of-some-projectile-entities.patch b/lophine-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0005-Correct-portal-logic-of-some-projectile-entities.patch rename to lophine-server/minecraft-patches/features/0006-Correct-portal-logic-of-some-projectile-entities.patch diff --git a/lophine-server/minecraft-patches/features/0006-Anonymous-Object-Configurable-region-format-framewor.patch b/lophine-server/minecraft-patches/features/0007-Anonymous-Object-Configurable-region-format-framewor.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0006-Anonymous-Object-Configurable-region-format-framewor.patch rename to lophine-server/minecraft-patches/features/0007-Anonymous-Object-Configurable-region-format-framewor.patch diff --git a/lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch b/lophine-server/minecraft-patches/features/0008-Do-not-enable-any-debug-subscriptions.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0007-Do-not-enable-any-debug-subscriptions.patch rename to lophine-server/minecraft-patches/features/0008-Do-not-enable-any-debug-subscriptions.patch diff --git a/lophine-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch b/lophine-server/minecraft-patches/features/0009-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0008-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch rename to lophine-server/minecraft-patches/features/0009-Do-not-load-too-far-poi-chunk-in-poi-compete-scan.patch diff --git a/lophine-server/minecraft-patches/features/0009-Fixes-around-entity-brain-and-memories.patch b/lophine-server/minecraft-patches/features/0010-Fixes-around-entity-brain-and-memories.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0009-Fixes-around-entity-brain-and-memories.patch rename to lophine-server/minecraft-patches/features/0010-Fixes-around-entity-brain-and-memories.patch diff --git a/lophine-server/minecraft-patches/features/0010-Fix-off-region-leashing.patch b/lophine-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0010-Fix-off-region-leashing.patch rename to lophine-server/minecraft-patches/features/0011-Fix-off-region-leashing.patch diff --git a/lophine-server/minecraft-patches/features/0011-Fix-unpatched-task-returning-of-ServerConfigurationP.patch b/lophine-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0011-Fix-unpatched-task-returning-of-ServerConfigurationP.patch rename to lophine-server/minecraft-patches/features/0012-Fix-unpatched-task-returning-of-ServerConfigurationP.patch diff --git a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch b/lophine-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch similarity index 93% rename from lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch rename to lophine-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch index bf6bb14..3b08476 100644 --- a/lophine-server/minecraft-patches/features/0012-Fix-riding-statistics-desync.patch +++ b/lophine-server/minecraft-patches/features/0013-Fix-riding-statistics-desync.patch @@ -19,10 +19,10 @@ index 216c9263999f05c36fb4c5598b41ff70e5759f5e..6c2196726a0669bddda456a089aeec0d int distance = Math.round((float)Math.sqrt(dx * dx + dy * dy + dz * dz) * 100.0F); Entity vehicle = this.getVehicle(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 18b9e630442fd31a14e131bb9043be46e10881e3..b475a8fe259848749ee05ff6cf10e46f52f955d3 100644 +index 75dabd3e7b6077b5ae8ee30048786442742b93f9..6fa3ac9a37dafa166d8e70aaf4ec369db0792200 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4194,7 +4194,13 @@ public abstract class Entity +@@ -4200,7 +4200,13 @@ public abstract class Entity } } @@ -36,7 +36,7 @@ index 18b9e630442fd31a14e131bb9043be46e10881e3..b475a8fe259848749ee05ff6cf10e46f java.util.ArrayDeque queue = new java.util.ArrayDeque<>(); queue.add(this); -@@ -4207,14 +4213,24 @@ public abstract class Entity +@@ -4213,14 +4219,24 @@ public abstract class Entity for (EntityTreeNode passenger : passengers) { queue.add(passenger); diff --git a/lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch b/lophine-server/minecraft-patches/features/0014-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0013-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch rename to lophine-server/minecraft-patches/features/0014-Fix-misbehaved-ender-pearls-when-player-switched-dim.patch diff --git a/lophine-server/minecraft-patches/features/0014-Fix-long-commands-support.patch b/lophine-server/minecraft-patches/features/0015-Fix-long-commands-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0014-Fix-long-commands-support.patch rename to lophine-server/minecraft-patches/features/0015-Fix-long-commands-support.patch diff --git a/lophine-server/minecraft-patches/features/0015-Fix-creative-player-item-pick.patch b/lophine-server/minecraft-patches/features/0016-Fix-creative-player-item-pick.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0015-Fix-creative-player-item-pick.patch rename to lophine-server/minecraft-patches/features/0016-Fix-creative-player-item-pick.patch diff --git a/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch b/lophine-server/minecraft-patches/features/0017-Fix-entity-portal-teleport-speed.patch similarity index 94% rename from lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch rename to lophine-server/minecraft-patches/features/0017-Fix-entity-portal-teleport-speed.patch index 8d44c7a..b5cdfcf 100644 --- a/lophine-server/minecraft-patches/features/0016-Fix-entity-portal-teleport-speed.patch +++ b/lophine-server/minecraft-patches/features/0017-Fix-entity-portal-teleport-speed.patch @@ -46,10 +46,10 @@ index 35ab432bbd59aba80a6eaca1769e6aa82c8a7e46..6950fa2462353f30ee02e1d0091cfcf2 } else {entity.inactiveTick();} // Paper - EAR 2 profiler.pop(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index b475a8fe259848749ee05ff6cf10e46f52f955d3..5e7cf38d241591715fec9ec008d3ac87bbaef662 100644 +index 6fa3ac9a37dafa166d8e70aaf4ec369db0792200..bb02a5d2e752c7a3f0aba9ff115f3df61b9e141a 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -387,6 +387,7 @@ public abstract class Entity +@@ -388,6 +388,7 @@ public abstract class Entity public long activatedTick = Integer.MIN_VALUE; public boolean isTemporarilyActive; public long activatedImmunityTick = Integer.MIN_VALUE; @@ -57,7 +57,7 @@ index b475a8fe259848749ee05ff6cf10e46f52f955d3..5e7cf38d241591715fec9ec008d3ac87 public void inactiveTick() { } -@@ -3591,6 +3592,7 @@ public abstract class Entity +@@ -3597,6 +3598,7 @@ public abstract class Entity } else { if (this.portalProcess == null || !this.portalProcess.isSamePortal(portal)) { this.portalProcess = new PortalProcessor(portal, pos.immutable()); diff --git a/lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch b/lophine-server/minecraft-patches/features/0018-Fix-player-auto-saving-ignores-interval.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0017-Fix-player-auto-saving-ignores-interval.patch rename to lophine-server/minecraft-patches/features/0018-Fix-player-auto-saving-ignores-interval.patch diff --git a/lophine-server/minecraft-patches/features/0018-Force-disable-builtin-spark-plugin.patch b/lophine-server/minecraft-patches/features/0019-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0018-Force-disable-builtin-spark-plugin.patch rename to lophine-server/minecraft-patches/features/0019-Force-disable-builtin-spark-plugin.patch diff --git a/lophine-server/minecraft-patches/features/0019-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/lophine-server/minecraft-patches/features/0020-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0019-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch rename to lophine-server/minecraft-patches/features/0020-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch diff --git a/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch b/lophine-server/minecraft-patches/features/0021-Prevent-teleprotAsync-calls-in-move-events.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch rename to lophine-server/minecraft-patches/features/0021-Prevent-teleprotAsync-calls-in-move-events.patch index fc6eb61..d5e0c4e 100644 --- a/lophine-server/minecraft-patches/features/0020-Prevent-teleprotAsync-calls-in-move-events.patch +++ b/lophine-server/minecraft-patches/features/0021-Prevent-teleprotAsync-calls-in-move-events.patch @@ -29,10 +29,10 @@ index c86b1fd5e200c478d178be32791b6e8c960d47e2..9be6d486082d344fb91fd74207eee83c // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 5e7cf38d241591715fec9ec008d3ac87bbaef662..51dacbe395c85aba9b81831e511a413b303ca675 100644 +index bb02a5d2e752c7a3f0aba9ff115f3df61b9e141a..33b6f6c0316af44e47370a55e3515df4e3b706b6 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4472,12 +4472,25 @@ public abstract class Entity +@@ -4478,12 +4478,25 @@ public abstract class Entity teleportTarget.cause(), teleportFlags, teleportComplete ); } @@ -73,7 +73,7 @@ index 3fcd534cee1f605a710ffc43eff4b5106c7dd40c..9b887b40236a212de513e3ceece1abfe this.lastLocation = vehicle.getLocation(); // CraftBukkit end diff --git a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java -index 5ad77636d0681d1f0341cff4482ba6ad52f3583b..0ae8b5222c5f2f608af352cbaa866c493dd065aa 100644 +index 30b99d9d0944399e6f3a74c4310cbf8f15cc5adc..9a414d8a1a2e95f2843d8f6e65cf5ad0b742bb26 100644 --- a/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java +++ b/net/minecraft/world/entity/vehicle/minecart/AbstractMinecart.java @@ -318,7 +318,9 @@ public abstract class AbstractMinecart extends VehicleEntity { diff --git a/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch b/lophine-server/minecraft-patches/features/0022-Sync-dragon-part-when-teleportation-or-firstly-creat.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch rename to lophine-server/minecraft-patches/features/0022-Sync-dragon-part-when-teleportation-or-firstly-creat.patch index 7fc9d51..59d5d36 100644 --- a/lophine-server/minecraft-patches/features/0021-Sync-dragon-part-when-teleportation-or-firstly-creat.patch +++ b/lophine-server/minecraft-patches/features/0022-Sync-dragon-part-when-teleportation-or-firstly-creat.patch @@ -17,10 +17,10 @@ index aa53138b3670a8337b639472a6ab5ce46702ff76..ed27b73e787782f328906b2a061feeca } diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 51dacbe395c85aba9b81831e511a413b303ca675..e2e1b101de8afbec7d853593c527e35111c94319 100644 +index 33b6f6c0316af44e47370a55e3515df4e3b706b6..8585068ce8a01b9fb90135f7bf3b35bb1647396a 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4456,6 +4456,7 @@ public abstract class Entity +@@ -4462,6 +4462,7 @@ public abstract class Entity Entity copy = this.getType().create(destination, EntitySpawnReason.DIMENSION_TRAVEL); copy.restoreFrom(this); copy.transform(pos, yaw, pitch, velocity); diff --git a/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch b/lophine-server/minecraft-patches/features/0023-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 96% rename from lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to lophine-server/minecraft-patches/features/0023-Teleport-async-if-entity-was-moving-to-another-regio.patch index 31a0743..881a2af 100644 --- a/lophine-server/minecraft-patches/features/0022-Teleport-async-if-entity-was-moving-to-another-regio.patch +++ b/lophine-server/minecraft-patches/features/0023-Teleport-async-if-entity-was-moving-to-another-regio.patch @@ -8,10 +8,10 @@ On folia, entity usually cannot move out of the tickregion, but sometimes it act Reference from : https://github.com/KaiijuMC/Kaiiju/blob/ver/1.20.1/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index e2e1b101de8afbec7d853593c527e35111c94319..33c9692a59c58c44a77b1077553e2bda88cb8305 100644 +index 8585068ce8a01b9fb90135f7bf3b35bb1647396a..3ea74b0ee3527c109b3491a5fa3b5bdd26214292 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1163,6 +1163,19 @@ public abstract class Entity +@@ -1164,6 +1164,19 @@ public abstract class Entity this.moveStartZ = this.getZ(); this.moveVector = delta; } diff --git a/lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch b/lophine-server/minecraft-patches/features/0024-Fix-teleport-missing-original-rotation-and-velocity.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0023-Fix-teleport-missing-original-rotation-and-velocity.patch rename to lophine-server/minecraft-patches/features/0024-Fix-teleport-missing-original-rotation-and-velocity.patch diff --git a/lophine-server/minecraft-patches/features/0024-Improved-Server-Health-Report.patch b/lophine-server/minecraft-patches/features/0025-Improved-Server-Health-Report.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0024-Improved-Server-Health-Report.patch rename to lophine-server/minecraft-patches/features/0025-Improved-Server-Health-Report.patch diff --git a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch b/lophine-server/minecraft-patches/features/0026-World-load-unload-APIs.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch rename to lophine-server/minecraft-patches/features/0026-World-load-unload-APIs.patch index 6330364..216144e 100644 --- a/lophine-server/minecraft-patches/features/0025-World-load-unload-APIs.patch +++ b/lophine-server/minecraft-patches/features/0026-World-load-unload-APIs.patch @@ -429,10 +429,10 @@ index 9fad06eda81b4c2c1889a9cfa7a6948e7ee01862..854f8954ccfd8c34c9f9c91fd1805260 private final Vec2 spawnAngle; diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1fc4d25989 100644 +index 3ea74b0ee3527c109b3491a5fa3b5bdd26214292..ccbd1760c66c86971cec7a89442a647267f4a2f6 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -392,6 +392,9 @@ public abstract class Entity +@@ -393,6 +393,9 @@ public abstract class Entity public void inactiveTick() { } // Paper end - EAR 2 @@ -442,7 +442,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f // CraftBukkit end // Paper start -@@ -4534,6 +4537,17 @@ public abstract class Entity +@@ -4540,6 +4543,17 @@ public abstract class Entity } } @@ -460,7 +460,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f // TODO any events that can modify go HERE // check for same region -@@ -4552,6 +4566,14 @@ public abstract class Entity +@@ -4558,6 +4572,14 @@ public abstract class Entity } for (EntityTreeNode entity : passengerTree.getFullTree()) { @@ -475,7 +475,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f entity.root.teleportSyncSameRegion(pos, yaw, pitch, velocity); } -@@ -4567,8 +4589,8 @@ public abstract class Entity +@@ -4573,8 +4595,8 @@ public abstract class Entity // performs add/remove from world logic which will also perform add/remove tracker logic } @@ -486,7 +486,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f } return true; } -@@ -4585,7 +4607,7 @@ public abstract class Entity +@@ -4591,7 +4613,7 @@ public abstract class Entity node.root = node.root.transformForAsyncTeleport(destination, pos, yaw, pitch, velocity); } @@ -495,7 +495,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f return true; } -@@ -4864,6 +4886,13 @@ public abstract class Entity +@@ -4870,6 +4892,13 @@ public abstract class Entity ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(initialPosition) ); @@ -509,7 +509,7 @@ index 33c9692a59c58c44a77b1077553e2bda88cb8305..e8047a06a2df17fde9965508c1ebcf1f // first, remove entity/passengers from world EntityTreeNode passengerTree = this.detachPassengers(); -@@ -4921,6 +4950,10 @@ public abstract class Entity +@@ -4927,6 +4956,10 @@ public abstract class Entity if (info.postTeleportTransition() != null) { info.postTeleportTransition().onTransition(teleported); } diff --git a/lophine-server/minecraft-patches/features/0026-Kaiiju-Do-not-pathfind-outside-region.patch b/lophine-server/minecraft-patches/features/0027-Kaiiju-Do-not-pathfind-outside-region.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0026-Kaiiju-Do-not-pathfind-outside-region.patch rename to lophine-server/minecraft-patches/features/0027-Kaiiju-Do-not-pathfind-outside-region.patch diff --git a/lophine-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch b/lophine-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch rename to lophine-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch b/lophine-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 94% rename from lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch rename to lophine-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch index 28c67ff..95a02ad 100644 --- a/lophine-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/lophine-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -8,10 +8,10 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index e8047a06a2df17fde9965508c1ebcf1fc4d25989..3b98ef4310d9f996437af9f12ab3de2cf6f4dd63 100644 +index ccbd1760c66c86971cec7a89442a647267f4a2f6..58c65c3b1d425c6566313ba34588d9d16f66c52d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4672,15 +4672,19 @@ public abstract class Entity +@@ -4678,15 +4678,19 @@ public abstract class Entity targetPos, 16, // load 16 blocks to be safe from block physics ca.spottedleaf.concurrentutil.util.Priority.HIGH, (chunks) -> { @@ -35,7 +35,7 @@ index e8047a06a2df17fde9965508c1ebcf1fc4d25989..3b98ef4310d9f996437af9f12ab3de2c TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL, TeleportTransition.PassengerTeleportationMode.POSITION_RIDER -@@ -4696,11 +4700,15 @@ public abstract class Entity +@@ -4702,11 +4706,15 @@ public abstract class Entity ca.spottedleaf.concurrentutil.util.Priority.HIGH, (chunks) -> { BlockPos adjustedSpawn = destination.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, spawnPos); @@ -53,7 +53,7 @@ index e8047a06a2df17fde9965508c1ebcf1fc4d25989..3b98ef4310d9f996437af9f12ab3de2c false, false, Relative.union(Relative.DELTA, Relative.ROTATION), TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), -@@ -4881,6 +4889,10 @@ public abstract class Entity +@@ -4887,6 +4895,10 @@ public abstract class Entity return false; } @@ -64,7 +64,7 @@ index e8047a06a2df17fde9965508c1ebcf1fc4d25989..3b98ef4310d9f996437af9f12ab3de2c Vec3 initialPosition = this.position(); ChunkPos initialPositionChunk = new ChunkPos( ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(initialPosition), -@@ -4955,9 +4967,14 @@ public abstract class Entity +@@ -4961,9 +4973,14 @@ public abstract class Entity destination.levelUnloadStateLock.releaseRead(); // Luminol end diff --git a/lophine-server/minecraft-patches/features/0029-Async-protocol-switching-optimization.patch b/lophine-server/minecraft-patches/features/0030-Async-protocol-switching-optimization.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0029-Async-protocol-switching-optimization.patch rename to lophine-server/minecraft-patches/features/0030-Async-protocol-switching-optimization.patch index ff9a8b3..fdee284 100644 --- a/lophine-server/minecraft-patches/features/0029-Async-protocol-switching-optimization.patch +++ b/lophine-server/minecraft-patches/features/0030-Async-protocol-switching-optimization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Async protocol switching optimization diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java -index 40f54536422fa38bd84017fc634808016b4de58b..ecaa296f576c5c90fda89e0406d6552628ef5de3 100644 +index c3922310ef1fce26eca60793b75bcb480683778a..8144de362b03ce63334765791701cec724776f42 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java -@@ -1067,4 +1067,127 @@ public class Connection extends SimpleChannelInboundHandler> { +@@ -1108,4 +1108,127 @@ public class Connection extends SimpleChannelInboundHandler> { } } // Paper end - Optimize network @@ -216,10 +216,10 @@ index 9be6d486082d344fb91fd74207eee83ca2f8e869..40b409ad07eaa03473712ba83bc4ccd9 @Override diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index f2329d1a9d9d4bf4c9d771e25e54f2f9ef65a76c..deee051c103f9797f4612e06c12f293ec54724ac 100644 +index 95787d6d29ddb8dca78506bb2a115fa612fdaa29..841acc9fb6f0ca219c908812d20831aba0630126 100644 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -435,12 +435,30 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -439,12 +439,30 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, public void handleLoginAcknowledgement(final ServerboundLoginAcknowledgedPacket packet) { net.minecraft.network.protocol.PacketUtils.ensureRunningOnSameThread(packet, this, this.server.packetProcessor()); // CraftBukkit Validate.validState(this.state == ServerLoginPacketListenerImpl.State.PROTOCOL_SWITCHING, "Unexpected login acknowledgement packet"); diff --git a/lophine-server/minecraft-patches/features/0030-Add-config-for-server-mod-name.patch b/lophine-server/minecraft-patches/features/0031-Add-config-for-server-mod-name.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0030-Add-config-for-server-mod-name.patch rename to lophine-server/minecraft-patches/features/0031-Add-config-for-server-mod-name.patch diff --git a/lophine-server/minecraft-patches/features/0031-Add-config-for-offline-mode-warning.patch b/lophine-server/minecraft-patches/features/0032-Add-config-for-offline-mode-warning.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0031-Add-config-for-offline-mode-warning.patch rename to lophine-server/minecraft-patches/features/0032-Add-config-for-offline-mode-warning.patch diff --git a/lophine-server/minecraft-patches/features/0032-Add-config-for-cpu-affinity.patch b/lophine-server/minecraft-patches/features/0033-Add-config-for-cpu-affinity.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0032-Add-config-for-cpu-affinity.patch rename to lophine-server/minecraft-patches/features/0033-Add-config-for-cpu-affinity.patch diff --git a/lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch b/lophine-server/minecraft-patches/features/0034-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch rename to lophine-server/minecraft-patches/features/0034-Add-config-for-unsafe-teleportation.patch diff --git a/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch b/lophine-server/minecraft-patches/features/0035-Add-config-for-vanilla-random.patch similarity index 92% rename from lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch rename to lophine-server/minecraft-patches/features/0035-Add-config-for-vanilla-random.patch index 2a4aeb2..c46e350 100644 --- a/lophine-server/minecraft-patches/features/0034-Add-config-for-vanilla-random.patch +++ b/lophine-server/minecraft-patches/features/0035-Add-config-for-vanilla-random.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for vanilla random diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 3b98ef4310d9f996437af9f12ab3de2cf6f4dd63..a7f4a9f8bca00fda1b57e2245c57726bb1ce41ed 100644 +index 58c65c3b1d425c6566313ba34588d9d16f66c52d..708bd774bdf535be82358bd6f4c7f8b0538285e3 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -298,7 +298,7 @@ public abstract class Entity diff --git a/lophine-server/minecraft-patches/features/0035-Add-config-for-watchdog-timeout.patch b/lophine-server/minecraft-patches/features/0036-Add-config-for-watchdog-timeout.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0035-Add-config-for-watchdog-timeout.patch rename to lophine-server/minecraft-patches/features/0036-Add-config-for-watchdog-timeout.patch diff --git a/lophine-server/minecraft-patches/features/0036-Add-config-to-disable-entity-tick-catchers.patch b/lophine-server/minecraft-patches/features/0037-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0036-Add-config-to-disable-entity-tick-catchers.patch rename to lophine-server/minecraft-patches/features/0037-Add-config-to-disable-entity-tick-catchers.patch diff --git a/lophine-server/minecraft-patches/features/0037-Add-config-for-heightmap-warning.patch b/lophine-server/minecraft-patches/features/0038-Add-config-for-heightmap-warning.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0037-Add-config-for-heightmap-warning.patch rename to lophine-server/minecraft-patches/features/0038-Add-config-for-heightmap-warning.patch diff --git a/lophine-server/minecraft-patches/features/0038-Add-config-gui-support.patch b/lophine-server/minecraft-patches/features/0039-Add-config-gui-support.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0038-Add-config-gui-support.patch rename to lophine-server/minecraft-patches/features/0039-Add-config-gui-support.patch diff --git a/lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch b/lophine-server/minecraft-patches/features/0040-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch rename to lophine-server/minecraft-patches/features/0040-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/lophine-server/minecraft-patches/features/0040-Add-experimental-config-for-command-block-command-ex.patch b/lophine-server/minecraft-patches/features/0041-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0040-Add-experimental-config-for-command-block-command-ex.patch rename to lophine-server/minecraft-patches/features/0041-Add-experimental-config-for-command-block-command-ex.patch diff --git a/lophine-server/minecraft-patches/features/0041-Add-config-to-verify-signature-only-in-online-mode.patch b/lophine-server/minecraft-patches/features/0042-Add-config-to-verify-signature-only-in-online-mode.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0041-Add-config-to-verify-signature-only-in-online-mode.patch rename to lophine-server/minecraft-patches/features/0042-Add-config-to-verify-signature-only-in-online-mode.patch diff --git a/lophine-server/minecraft-patches/features/0042-Add-config-for-whether-to-save-portal-tickets.patch b/lophine-server/minecraft-patches/features/0043-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0042-Add-config-for-whether-to-save-portal-tickets.patch rename to lophine-server/minecraft-patches/features/0043-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch b/lophine-server/minecraft-patches/features/0044-Add-back-read-only-datapack-command-Fix-datapack-com.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0043-Add-back-read-only-datapack-command-Fix-datapack-com.patch rename to lophine-server/minecraft-patches/features/0044-Add-back-read-only-datapack-command-Fix-datapack-com.patch diff --git a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch b/lophine-server/minecraft-patches/features/0045-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch rename to lophine-server/minecraft-patches/features/0045-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch index 7ca8376..025dc0c 100644 --- a/lophine-server/minecraft-patches/features/0044-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch +++ b/lophine-server/minecraft-patches/features/0045-Add-tpsbar-with-chunkhot-membar-and-regionbar.patch @@ -183,10 +183,10 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974 + // KioCG end } diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index a7f4a9f8bca00fda1b57e2245c57726bb1ce41ed..84fe83f25e72e8ce257421f62e532d4203438d2b 100644 +index 708bd774bdf535be82358bd6f4c7f8b0538285e3..dc2a7aa39f6aa9ec6b5cfbce3bfec71e9c458dcb 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -6475,4 +6475,6 @@ public abstract class Entity +@@ -6486,4 +6486,6 @@ public abstract class Entity return ((ServerLevel) this.level()).isPositionEntityTicking(this.blockPosition()); } // Paper end diff --git a/lophine-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch b/lophine-server/minecraft-patches/features/0046-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch rename to lophine-server/minecraft-patches/features/0046-Add-config-to-modify-tripwire-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch b/lophine-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch rename to lophine-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch diff --git a/lophine-server/minecraft-patches/features/0047-Add-config-for-item-multitask.patch b/lophine-server/minecraft-patches/features/0048-Add-config-for-item-multitask.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0047-Add-config-for-item-multitask.patch rename to lophine-server/minecraft-patches/features/0048-Add-config-for-item-multitask.patch diff --git a/lophine-server/minecraft-patches/features/0048-Add-tick-regions-api.patch b/lophine-server/minecraft-patches/features/0049-Add-tick-regions-api.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0048-Add-tick-regions-api.patch rename to lophine-server/minecraft-patches/features/0049-Add-tick-regions-api.patch diff --git a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch b/lophine-server/minecraft-patches/features/0050-Add-missing-teleportation-event-APIs-for-folia.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch rename to lophine-server/minecraft-patches/features/0050-Add-missing-teleportation-event-APIs-for-folia.patch index c5ff0fe..810c4ef 100644 --- a/lophine-server/minecraft-patches/features/0049-Add-missing-teleportation-event-APIs-for-folia.patch +++ b/lophine-server/minecraft-patches/features/0050-Add-missing-teleportation-event-APIs-for-folia.patch @@ -19,10 +19,10 @@ index 21733beb07c0df3cf6872ce84a07e85dfe5ee3e9..055911982349bab23ba8d6c88f06c014 ); }); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 84fe83f25e72e8ce257421f62e532d4203438d2b..7b5fac05a53a80a7c9cdae4986f35c30285bcf81 100644 +index dc2a7aa39f6aa9ec6b5cfbce3bfec71e9c458dcb..23dc3a2c0c124d842cf23e35b4a5d079d5d523da 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4549,6 +4549,31 @@ public abstract class Entity +@@ -4555,6 +4555,31 @@ public abstract class Entity // Luminol end // TODO any events that can modify go HERE @@ -54,7 +54,7 @@ index 84fe83f25e72e8ce257421f62e532d4203438d2b..7b5fac05a53a80a7c9cdae4986f35c30 // check for same region if (destination == this.level() -@@ -4667,6 +4692,17 @@ public abstract class Entity +@@ -4673,6 +4698,17 @@ public abstract class Entity case END: { if (destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END) { BlockPos targetPos = ServerLevel.END_SPAWN_POINT; @@ -72,7 +72,7 @@ index 84fe83f25e72e8ce257421f62e532d4203438d2b..7b5fac05a53a80a7c9cdae4986f35c30 // need to load chunks so we can create the platform destination.moonrise$loadChunksAsync( targetPos, 16, // load 16 blocks to be safe from block physics -@@ -4694,6 +4730,17 @@ public abstract class Entity +@@ -4700,6 +4736,17 @@ public abstract class Entity ); } else { BlockPos spawnPos = destination.getRespawnData().pos(); @@ -90,7 +90,7 @@ index 84fe83f25e72e8ce257421f62e532d4203438d2b..7b5fac05a53a80a7c9cdae4986f35c30 // need to load chunk for heightmap destination.moonrise$loadChunksAsync( spawnPos, 0, -@@ -4751,7 +4798,17 @@ public abstract class Entity +@@ -4757,7 +4804,17 @@ public abstract class Entity WorldBorder destinationBorder = destination.getWorldBorder(); double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType()); BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); @@ -108,7 +108,7 @@ index 84fe83f25e72e8ce257421f62e532d4203438d2b..7b5fac05a53a80a7c9cdae4986f35c30 ca.spottedleaf.concurrentutil.completable.CallbackCompletable portalFound = new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>(); -@@ -4888,6 +4945,15 @@ public abstract class Entity +@@ -4894,6 +4951,15 @@ public abstract class Entity if (!this.canPortalAsync(destination, takePassengers)) { return false; } diff --git a/lophine-server/minecraft-patches/features/0050-Add-Portal-rate-limiter.patch b/lophine-server/minecraft-patches/features/0051-Add-Portal-rate-limiter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0050-Add-Portal-rate-limiter.patch rename to lophine-server/minecraft-patches/features/0051-Add-Portal-rate-limiter.patch diff --git a/lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch b/lophine-server/minecraft-patches/features/0052-Add-config-for-waypoint-restoration.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0051-Add-config-for-waypoint-restoration.patch rename to lophine-server/minecraft-patches/features/0052-Add-config-for-waypoint-restoration.patch diff --git a/lophine-server/minecraft-patches/features/0052-Leaf-Secure-seed-and-matter-seed-command.patch b/lophine-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0052-Leaf-Secure-seed-and-matter-seed-command.patch rename to lophine-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/lophine-server/minecraft-patches/features/0053-Add-secure-seed-V2-with-Blake3.patch b/lophine-server/minecraft-patches/features/0054-Add-secure-seed-V2-with-Blake3.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0053-Add-secure-seed-V2-with-Blake3.patch rename to lophine-server/minecraft-patches/features/0054-Add-secure-seed-V2-with-Blake3.patch diff --git a/lophine-server/minecraft-patches/features/0054-Leaf-Replace-brain-maps-with-optimized-collection.patch b/lophine-server/minecraft-patches/features/0055-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0054-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to lophine-server/minecraft-patches/features/0055-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/lophine-server/minecraft-patches/features/0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/lophine-server/minecraft-patches/features/0056-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to lophine-server/minecraft-patches/features/0056-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/lophine-server/minecraft-patches/features/0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/lophine-server/minecraft-patches/features/0057-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to lophine-server/minecraft-patches/features/0057-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/lophine-server/minecraft-patches/features/0057-Leaf-Better-checking-for-useless-move-packets.patch b/lophine-server/minecraft-patches/features/0058-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0057-Leaf-Better-checking-for-useless-move-packets.patch rename to lophine-server/minecraft-patches/features/0058-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/lophine-server/minecraft-patches/features/0058-Leaf-fast-bit-radix-sort.patch b/lophine-server/minecraft-patches/features/0059-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0058-Leaf-fast-bit-radix-sort.patch rename to lophine-server/minecraft-patches/features/0059-Leaf-fast-bit-radix-sort.patch diff --git a/lophine-server/minecraft-patches/features/0059-Leaf-Configurable-vanilla-username-check.patch b/lophine-server/minecraft-patches/features/0060-Leaf-Configurable-vanilla-username-check.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0059-Leaf-Configurable-vanilla-username-check.patch rename to lophine-server/minecraft-patches/features/0060-Leaf-Configurable-vanilla-username-check.patch index 775f798..8bb8ca5 100644 --- a/lophine-server/minecraft-patches/features/0059-Leaf-Configurable-vanilla-username-check.patch +++ b/lophine-server/minecraft-patches/features/0060-Leaf-Configurable-vanilla-username-check.patch @@ -21,7 +21,7 @@ index 35aa8df4aecd91387997f01c258f0d549dfba0f8..908cff4caa1457e07d809fb793d00d36 private final List tickables = Lists.newArrayList(); // Paper - per-level GameRules diff --git a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index deee051c103f9797f4612e06c12f293ec54724ac..911fb0912c7bc6ab0e29c03a21c6bddb248bbc0a 100644 +index 841acc9fb6f0ca219c908812d20831aba0630126..74f79cf51c4ff2dcda53054863a26725953d2b09 100644 --- a/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -167,11 +167,20 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, @@ -63,7 +63,7 @@ index deee051c103f9797f4612e06c12f293ec54724ac..911fb0912c7bc6ab0e29c03a21c6bddb gameprofile = ServerLoginPacketListenerImpl.this.callPlayerPreLoginEvents(gameprofile); // Paper - Add more fields to AsyncPlayerPreLoginEvent ServerLoginPacketListenerImpl.LOGGER.info("UUID of player {} is {}", gameprofile.name(), gameprofile.id()); -@@ -341,7 +359,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, +@@ -345,7 +363,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, server.getPluginManager().callEvent(asyncEvent); profile = asyncEvent.getPlayerProfile(); profile.complete(true); // Paper - setPlayerProfileAPI diff --git a/lophine-server/minecraft-patches/features/0060-Purpur-Lobotomize-stuck-villagers.patch b/lophine-server/minecraft-patches/features/0061-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0060-Purpur-Lobotomize-stuck-villagers.patch rename to lophine-server/minecraft-patches/features/0061-Purpur-Lobotomize-stuck-villagers.patch diff --git a/lophine-server/minecraft-patches/features/0061-Pufferfish-Reduce-projectile-chunk-loading.patch b/lophine-server/minecraft-patches/features/0062-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0061-Pufferfish-Reduce-projectile-chunk-loading.patch rename to lophine-server/minecraft-patches/features/0062-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/lophine-server/minecraft-patches/features/0062-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/lophine-server/minecraft-patches/features/0063-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0062-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to lophine-server/minecraft-patches/features/0063-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/lophine-server/minecraft-patches/features/0063-Petal-Reduce-sensor-work.patch b/lophine-server/minecraft-patches/features/0064-Petal-Reduce-sensor-work.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0063-Petal-Reduce-sensor-work.patch rename to lophine-server/minecraft-patches/features/0064-Petal-Reduce-sensor-work.patch diff --git a/lophine-server/minecraft-patches/features/0064-Leaves-Disable-packet-limit.patch b/lophine-server/minecraft-patches/features/0065-Leaves-Disable-packet-limit.patch similarity index 97% rename from lophine-server/minecraft-patches/features/0064-Leaves-Disable-packet-limit.patch rename to lophine-server/minecraft-patches/features/0065-Leaves-Disable-packet-limit.patch index 5f4a0fb..07af80f 100644 --- a/lophine-server/minecraft-patches/features/0064-Leaves-Disable-packet-limit.patch +++ b/lophine-server/minecraft-patches/features/0065-Leaves-Disable-packet-limit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves: Disable packet limit diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java -index ecaa296f576c5c90fda89e0406d6552628ef5de3..d2e9d46bbd9ee4ce45419b11499d7a7bc50f0219 100644 +index 8144de362b03ce63334765791701cec724776f42..63c78d8dbfdcfb908100052e36d75ffce8c9d613 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java @@ -258,8 +258,8 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/lophine-server/minecraft-patches/features/0065-Leaves-Vanilla-Hopper.patch b/lophine-server/minecraft-patches/features/0066-Leaves-Vanilla-Hopper.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0065-Leaves-Vanilla-Hopper.patch rename to lophine-server/minecraft-patches/features/0066-Leaves-Vanilla-Hopper.patch diff --git a/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch b/lophine-server/minecraft-patches/features/0067-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch rename to lophine-server/minecraft-patches/features/0067-Leaves-Lithium-Sleeping-Block-Entity.patch index f9cb804..fba94a5 100644 --- a/lophine-server/minecraft-patches/features/0066-Leaves-Lithium-Sleeping-Block-Entity.patch +++ b/lophine-server/minecraft-patches/features/0067-Leaves-Lithium-Sleeping-Block-Entity.patch @@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c int getContainerSize(); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 7b5fac05a53a80a7c9cdae4986f35c30285bcf81..77ff989f2d2c2705a82d0e99e532c7073eb42825 100644 +index 23dc3a2c0c124d842cf23e35b4a5d079d5d523da..5c2a2bc340f41fab8c1399b89708b41d0e4c670d 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -324,7 +324,7 @@ public abstract class Entity @@ -252,7 +252,7 @@ index 7b5fac05a53a80a7c9cdae4986f35c30285bcf81..77ff989f2d2c2705a82d0e99e532c707 private final VecDeltaCodec packetPositionCodec = new VecDeltaCodec(); public boolean needsSync; public boolean syncPosition; -@@ -4467,11 +4467,13 @@ public abstract class Entity +@@ -4473,11 +4473,13 @@ public abstract class Entity } protected Entity transformForAsyncTeleport(ServerLevel destination, Vec3 pos, Float yaw, Float pitch, Vec3 velocity) { @@ -266,7 +266,7 @@ index 7b5fac05a53a80a7c9cdae4986f35c30285bcf81..77ff989f2d2c2705a82d0e99e532c707 if (copy instanceof net.minecraft.world.entity.boss.enderdragon.EnderDragon dragon) dragon.syncDragonPartsAfterTeleportTransform(); // Luminol - Sync dragon part when teleportation or firstly created // vanilla code used to call remove _after_ copying, and some stuff is required to be after copy - so add hook here // for example, clearing of inventory after switching dimensions -@@ -6147,8 +6149,29 @@ public abstract class Entity +@@ -6153,8 +6155,29 @@ public abstract class Entity this.setBoundingBox(this.makeBoundingBox()); } // Paper end - Block invalid positions and bounding box diff --git a/lophine-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch b/lophine-server/minecraft-patches/features/0068-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch rename to lophine-server/minecraft-patches/features/0068-Leaves-Configurable-collision-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0068-Leaves-Disable-moved-wrongly-threshold.patch b/lophine-server/minecraft-patches/features/0069-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0068-Leaves-Disable-moved-wrongly-threshold.patch rename to lophine-server/minecraft-patches/features/0069-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch b/lophine-server/minecraft-patches/features/0070-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch rename to lophine-server/minecraft-patches/features/0070-Leaves-Optimized-dragon-respawn.patch diff --git a/lophine-server/minecraft-patches/features/0070-Gale-Variable-entity-wake-up-duration.patch b/lophine-server/minecraft-patches/features/0071-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0070-Gale-Variable-entity-wake-up-duration.patch rename to lophine-server/minecraft-patches/features/0071-Gale-Variable-entity-wake-up-duration.patch diff --git a/lophine-server/minecraft-patches/features/0071-Gale-Replace-AI-attributes-with-optimized-collection.patch b/lophine-server/minecraft-patches/features/0072-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0071-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to lophine-server/minecraft-patches/features/0072-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch b/lophine-server/minecraft-patches/features/0073-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 90% rename from lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch rename to lophine-server/minecraft-patches/features/0073-Gale-Skip-entity-move-if-movement-is-zero.patch index 98d4405..c9f0c91 100644 --- a/lophine-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/lophine-server/minecraft-patches/features/0073-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -10,10 +10,10 @@ VMP (https://github.com/RelativityMC/VMP-fabric) Licensed under: MIT (https://opensource.org/licenses/MIT) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 77ff989f2d2c2705a82d0e99e532c7073eb42825..3c3420c51d70eb9afb80db43635246a546d1562c 100644 +index 5c2a2bc340f41fab8c1399b89708b41d0e4c670d..16e4d2f3193080c177d7ceb225fa9637b3ec1842 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1155,8 +1155,14 @@ public abstract class Entity +@@ -1156,8 +1156,14 @@ public abstract class Entity private double moveStartY; private double moveStartZ; // Paper end - detailed watchdog information @@ -28,7 +28,7 @@ index 77ff989f2d2c2705a82d0e99e532c7073eb42825..3c3420c51d70eb9afb80db43635246a5 final Vec3 originalMovement = delta; // Paper - Expose pre-collision velocity // Paper start - detailed watchdog information ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Cannot move an entity off-main"); -@@ -5641,6 +5647,11 @@ public abstract class Entity +@@ -5647,6 +5653,11 @@ public abstract class Entity } public final void setBoundingBox(final AABB bb) { diff --git a/lophine-server/minecraft-patches/features/0073-Gale-Store-mob-counts-in-an-array.patch b/lophine-server/minecraft-patches/features/0074-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0073-Gale-Store-mob-counts-in-an-array.patch rename to lophine-server/minecraft-patches/features/0074-Gale-Store-mob-counts-in-an-array.patch diff --git a/lophine-server/minecraft-patches/features/0074-Gale-Optimize-random-calls-in-chunk-ticking.patch b/lophine-server/minecraft-patches/features/0075-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0074-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to lophine-server/minecraft-patches/features/0075-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/lophine-server/minecraft-patches/features/0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/lophine-server/minecraft-patches/features/0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to lophine-server/minecraft-patches/features/0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/lophine-server/minecraft-patches/features/0076-Gale-Cache-ShapePairKey-hash.patch b/lophine-server/minecraft-patches/features/0077-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0076-Gale-Cache-ShapePairKey-hash.patch rename to lophine-server/minecraft-patches/features/0077-Gale-Cache-ShapePairKey-hash.patch diff --git a/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch b/lophine-server/minecraft-patches/features/0078-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 80% rename from lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch rename to lophine-server/minecraft-patches/features/0078-Gale-For-collision-check-has-physics-before-same-veh.patch index dbb1b49..e3fd03f 100644 --- a/lophine-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch +++ b/lophine-server/minecraft-patches/features/0078-Gale-For-collision-check-has-physics-before-same-veh.patch @@ -20,10 +20,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 3c3420c51d70eb9afb80db43635246a546d1562c..f38ce49165b6c46d039e82d676e24832e93a402e 100644 +index 16e4d2f3193080c177d7ceb225fa9637b3ec1842..e3dd3a2e0e38eef886ecc46750c54e83756f4bde 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -2441,8 +2441,8 @@ public abstract class Entity +@@ -2442,8 +2442,8 @@ public abstract class Entity } public void push(final Entity entity) { @@ -31,5 +31,5 @@ index 3c3420c51d70eb9afb80db43635246a546d1562c..f38ce49165b6c46d039e82d676e24832 if (!this.isPassengerOfSameVehicle(entity)) { - if (!entity.noPhysics && !this.noPhysics) { if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper - Collision option for requiring a player participant - double xa = entity.getX() - this.getX(); - double za = entity.getZ() - this.getZ(); + // Paper start - Add EntityCollideWithEntity Event + if (io.papermc.paper.event.entity.EntityCollideWithEntityEvent.getHandlerList().getRegisteredListeners().length != 0 && diff --git a/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch b/lophine-server/minecraft-patches/features/0079-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 91% rename from lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch rename to lophine-server/minecraft-patches/features/0079-Gale-Skip-negligible-planar-movement-multiplication.patch index ebb5de1..91b5d96 100644 --- a/lophine-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch +++ b/lophine-server/minecraft-patches/features/0079-Gale-Skip-negligible-planar-movement-multiplication.patch @@ -7,10 +7,10 @@ License: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://github.com/GaleMC/Gale diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index f38ce49165b6c46d039e82d676e24832e93a402e..0868c067c5a455d1984d59b22426c2f019b25c9f 100644 +index e3dd3a2e0e38eef886ecc46750c54e83756f4bde..9d2e62c4c5cd0668a9083c7af9abed96b4589f7f 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1302,8 +1302,17 @@ public abstract class Entity +@@ -1303,8 +1303,17 @@ public abstract class Entity } } diff --git a/lophine-server/minecraft-patches/features/0079-Gale-Optimize-matching-item-checks.patch b/lophine-server/minecraft-patches/features/0080-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0079-Gale-Optimize-matching-item-checks.patch rename to lophine-server/minecraft-patches/features/0080-Gale-Optimize-matching-item-checks.patch diff --git a/lophine-server/minecraft-patches/features/0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/lophine-server/minecraft-patches/features/0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to lophine-server/minecraft-patches/features/0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch b/lophine-server/minecraft-patches/features/0082-Gale-Reduce-array-allocations.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch rename to lophine-server/minecraft-patches/features/0082-Gale-Reduce-array-allocations.patch diff --git a/lophine-server/minecraft-patches/features/0082-Some-optimizations-from-krypton.patch b/lophine-server/minecraft-patches/features/0083-Some-optimizations-from-krypton.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0082-Some-optimizations-from-krypton.patch rename to lophine-server/minecraft-patches/features/0083-Some-optimizations-from-krypton.patch diff --git a/lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch b/lophine-server/minecraft-patches/features/0084-Replace-packet-processing-queue-with-mt-queue.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0083-Replace-packet-processing-queue-with-mt-queue.patch rename to lophine-server/minecraft-patches/features/0084-Replace-packet-processing-queue-with-mt-queue.patch diff --git a/lophine-server/minecraft-patches/features/0084-Server-I18n.patch b/lophine-server/minecraft-patches/features/0085-Server-I18n.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0084-Server-I18n.patch rename to lophine-server/minecraft-patches/features/0085-Server-I18n.patch diff --git a/lophine-server/minecraft-patches/features/0085-Purpur-Barrels-and-enderchests-6-rows.patch b/lophine-server/minecraft-patches/features/0086-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0085-Purpur-Barrels-and-enderchests-6-rows.patch rename to lophine-server/minecraft-patches/features/0086-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/lophine-server/minecraft-patches/features/0086-Add-config-to-disable-some-check-for-operators.patch b/lophine-server/minecraft-patches/features/0087-Add-config-to-disable-some-check-for-operators.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0086-Add-config-to-disable-some-check-for-operators.patch rename to lophine-server/minecraft-patches/features/0087-Add-config-to-disable-some-check-for-operators.patch diff --git a/lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch b/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-cross-region-damage-trace.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0087-Add-config-to-enable-cross-region-damage-trace.patch rename to lophine-server/minecraft-patches/features/0088-Add-config-to-enable-cross-region-damage-trace.patch diff --git a/lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch b/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-save-all-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0088-Add-config-to-enable-save-all-command.patch rename to lophine-server/minecraft-patches/features/0089-Add-config-to-enable-save-all-command.patch diff --git a/lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch b/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-function-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0089-Add-config-to-enable-function-command.patch rename to lophine-server/minecraft-patches/features/0090-Add-config-to-enable-function-command.patch diff --git a/lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch b/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-scoreboard-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0090-Add-config-to-enable-scoreboard-command.patch rename to lophine-server/minecraft-patches/features/0091-Add-config-to-enable-scoreboard-command.patch diff --git a/lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch b/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-trigger-command.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0091-Add-config-to-enable-trigger-command.patch rename to lophine-server/minecraft-patches/features/0092-Add-config-to-enable-trigger-command.patch diff --git a/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch b/lophine-server/minecraft-patches/features/0093-Add-config-to-enable-raytracing-tracker.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch rename to lophine-server/minecraft-patches/features/0093-Add-config-to-enable-raytracing-tracker.patch index 2853de3..44945b9 100644 --- a/lophine-server/minecraft-patches/features/0092-Add-config-to-enable-raytracing-tracker.patch +++ b/lophine-server/minecraft-patches/features/0093-Add-config-to-enable-raytracing-tracker.patch @@ -18,7 +18,7 @@ index e9307ef10502856378d7831fb7800dd77230130c..6bca982627cf6a865820df75be2814a7 double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1); if (rangeY != -1) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0868c067c5a455d1984d59b22426c2f019b25c9f..b9f9dd85d259306db9eb9daf0a9ec36f27dfddb7 100644 +index 9d2e62c4c5cd0668a9083c7af9abed96b4589f7f..939ad903434aa3766a6bf647743086693b8c3d19 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -164,7 +164,7 @@ public abstract class Entity @@ -30,7 +30,7 @@ index 0868c067c5a455d1984d59b22426c2f019b25c9f..b9f9dd85d259306db9eb9daf0a9ec36f // CraftBukkit start private static final int CURRENT_LEVEL = 2; static boolean isLevelAtLeast(ValueInput input, int level) { -@@ -6586,4 +6586,48 @@ public abstract class Entity +@@ -6597,4 +6597,48 @@ public abstract class Entity // Paper end public boolean shouldTickHot() { return this.tickCount > 20 * 10 && this.isAlive(); } // KioCG diff --git a/lophine-server/minecraft-patches/features/0093-Modify-merge-ItemEntity-logic.patch b/lophine-server/minecraft-patches/features/0094-Modify-merge-ItemEntity-logic.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0093-Modify-merge-ItemEntity-logic.patch rename to lophine-server/minecraft-patches/features/0094-Modify-merge-ItemEntity-logic.patch diff --git a/lophine-server/minecraft-patches/features/0094-Old-zombie-reinforcement.patch b/lophine-server/minecraft-patches/features/0095-Old-zombie-reinforcement.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0094-Old-zombie-reinforcement.patch rename to lophine-server/minecraft-patches/features/0095-Old-zombie-reinforcement.patch diff --git a/lophine-server/minecraft-patches/features/0095-Old-leader-zombie-health-logic.patch b/lophine-server/minecraft-patches/features/0096-Old-leader-zombie-health-logic.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0095-Old-leader-zombie-health-logic.patch rename to lophine-server/minecraft-patches/features/0096-Old-leader-zombie-health-logic.patch diff --git a/lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch b/lophine-server/minecraft-patches/features/0097-Spawn-invulnerable-time.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0096-Spawn-invulnerable-time.patch rename to lophine-server/minecraft-patches/features/0097-Spawn-invulnerable-time.patch diff --git a/lophine-server/minecraft-patches/features/0097-Leaves-Item-overstack-util.patch b/lophine-server/minecraft-patches/features/0098-Leaves-Item-overstack-util.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0097-Leaves-Item-overstack-util.patch rename to lophine-server/minecraft-patches/features/0098-Leaves-Item-overstack-util.patch diff --git a/lophine-server/minecraft-patches/features/0098-Leaves-Old-raid-behavior.patch b/lophine-server/minecraft-patches/features/0099-Leaves-Old-raid-behavior.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0098-Leaves-Old-raid-behavior.patch rename to lophine-server/minecraft-patches/features/0099-Leaves-Old-raid-behavior.patch diff --git a/lophine-server/minecraft-patches/features/0099-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch b/lophine-server/minecraft-patches/features/0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0099-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch rename to lophine-server/minecraft-patches/features/0100-Compatibility-fix-for-Raid-Revert-and-Cross-Region-D.patch diff --git a/lophine-server/minecraft-patches/features/0100-Leaves-Leaves-Base-Protocol-Core.patch b/lophine-server/minecraft-patches/features/0101-Leaves-Leaves-Base-Protocol-Core.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0100-Leaves-Leaves-Base-Protocol-Core.patch rename to lophine-server/minecraft-patches/features/0101-Leaves-Leaves-Base-Protocol-Core.patch diff --git a/lophine-server/minecraft-patches/features/0101-Leaves-Configurable-trading-with-the-void.patch b/lophine-server/minecraft-patches/features/0102-Leaves-Configurable-trading-with-the-void.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0101-Leaves-Configurable-trading-with-the-void.patch rename to lophine-server/minecraft-patches/features/0102-Leaves-Configurable-trading-with-the-void.patch diff --git a/lophine-server/minecraft-patches/features/0102-Leaves-Servux-Protocol.patch b/lophine-server/minecraft-patches/features/0103-Leaves-Servux-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0102-Leaves-Servux-Protocol.patch rename to lophine-server/minecraft-patches/features/0103-Leaves-Servux-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0103-LeavesHooks.patch b/lophine-server/minecraft-patches/features/0104-LeavesHooks.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0103-LeavesHooks.patch rename to lophine-server/minecraft-patches/features/0104-LeavesHooks.patch diff --git a/lophine-server/minecraft-patches/features/0104-Leaves-Old-Explosion-Damage-Calculator.patch b/lophine-server/minecraft-patches/features/0105-Leaves-Old-Explosion-Damage-Calculator.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0104-Leaves-Old-Explosion-Damage-Calculator.patch rename to lophine-server/minecraft-patches/features/0105-Leaves-Old-Explosion-Damage-Calculator.patch diff --git a/lophine-server/minecraft-patches/features/0105-Leaves-Redstone-Shears-Wrench.patch b/lophine-server/minecraft-patches/features/0106-Leaves-Redstone-Shears-Wrench.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0105-Leaves-Redstone-Shears-Wrench.patch rename to lophine-server/minecraft-patches/features/0106-Leaves-Redstone-Shears-Wrench.patch diff --git a/lophine-server/minecraft-patches/features/0106-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0107-Leaves-Syncmatica-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0106-Leaves-Syncmatica-Protocol.patch rename to lophine-server/minecraft-patches/features/0107-Leaves-Syncmatica-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0107-Leaves-BBOR-Protocol.patch b/lophine-server/minecraft-patches/features/0108-Leaves-BBOR-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0107-Leaves-BBOR-Protocol.patch rename to lophine-server/minecraft-patches/features/0108-Leaves-BBOR-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0108-Leaves-Xaero-Map-Protocol.patch b/lophine-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0108-Leaves-Xaero-Map-Protocol.patch rename to lophine-server/minecraft-patches/features/0109-Leaves-Xaero-Map-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0109-Leaves-Support-REI-protocol.patch b/lophine-server/minecraft-patches/features/0110-Leaves-Support-REI-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0109-Leaves-Support-REI-protocol.patch rename to lophine-server/minecraft-patches/features/0110-Leaves-Support-REI-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0110-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0111-Leaves-Jade-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0110-Leaves-Jade-Protocol.patch rename to lophine-server/minecraft-patches/features/0111-Leaves-Jade-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0111-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0112-Leaves-Alternative-block-placement-Protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0111-Leaves-Alternative-block-placement-Protocol.patch rename to lophine-server/minecraft-patches/features/0112-Leaves-Alternative-block-placement-Protocol.patch diff --git a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch b/lophine-server/minecraft-patches/features/0113-Leaves-Fakeplayer.patch similarity index 99% rename from lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch rename to lophine-server/minecraft-patches/features/0113-Leaves-Fakeplayer.patch index b0b61c8..d5b87a4 100644 --- a/lophine-server/minecraft-patches/features/0112-Leaves-Fakeplayer.patch +++ b/lophine-server/minecraft-patches/features/0113-Leaves-Fakeplayer.patch @@ -33,7 +33,7 @@ index d76a338ab4f326e6105adc451eee3d4601403c98..b827d51d23ceaebef2191a9f349bbd34 Map listenersForType = advancements.getTriggerMapForType(this); if (listenersForType != null && !listenersForType.isEmpty()) { diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java -index d2e9d46bbd9ee4ce45419b11499d7a7bc50f0219..848967dbe41694411603ef369cfdc3a0b00240d3 100644 +index 63c78d8dbfdcfb908100052e36d75ffce8c9d613..6a57cf05044ffab0d6dc280e583613fc9fc403c4 100644 --- a/net/minecraft/network/Connection.java +++ b/net/minecraft/network/Connection.java @@ -74,7 +74,7 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -570,10 +570,10 @@ index 71988e11c512fcb391f845a1905411ea240479fa..a7a687c7a90bce1ad20d32241f0b4316 public @Nullable ServerPlayer getPlayer(final String playerName) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index b9f9dd85d259306db9eb9daf0a9ec36f27dfddb7..c3df068144c3af4b3700b104588970154837018d 100644 +index 939ad903434aa3766a6bf647743086693b8c3d19..6530baa206a2f2f9b8ca378a2c72928d79f23601 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1263,7 +1263,7 @@ public abstract class Entity +@@ -1264,7 +1264,7 @@ public abstract class Entity BlockPos effectPos = this.getOnPosLegacy(); BlockState effectState = this.level().getBlockState(effectPos); @@ -582,7 +582,7 @@ index b9f9dd85d259306db9eb9daf0a9ec36f27dfddb7..c3df068144c3af4b3700b10458897015 this.checkFallDamage(movement.y, this.onGround(), effectState, effectPos); } -@@ -1664,7 +1664,7 @@ public abstract class Entity +@@ -1665,7 +1665,7 @@ public abstract class Entity return colliders.isEmpty() ? maxDistance : -Shapes.collide(Direction.Axis.Y, aabb, colliders, -maxDistance); } diff --git a/lophine-server/minecraft-patches/features/0113-Leaves-Replay-Mod-API.patch b/lophine-server/minecraft-patches/features/0114-Leaves-Replay-Mod-API.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0113-Leaves-Replay-Mod-API.patch rename to lophine-server/minecraft-patches/features/0114-Leaves-Replay-Mod-API.patch diff --git a/lophine-server/minecraft-patches/features/0114-Leaves-Creative-fly-no-clip.patch b/lophine-server/minecraft-patches/features/0115-Leaves-Creative-fly-no-clip.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0114-Leaves-Creative-fly-no-clip.patch rename to lophine-server/minecraft-patches/features/0115-Leaves-Creative-fly-no-clip.patch diff --git a/lophine-server/minecraft-patches/features/0115-Leaves-Wool-Hopper-Counter.patch b/lophine-server/minecraft-patches/features/0116-Leaves-Wool-Hopper-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0115-Leaves-Wool-Hopper-Counter.patch rename to lophine-server/minecraft-patches/features/0116-Leaves-Wool-Hopper-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0116-Global-Entities-Counter.patch b/lophine-server/minecraft-patches/features/0117-Global-Entities-Counter.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0116-Global-Entities-Counter.patch rename to lophine-server/minecraft-patches/features/0117-Global-Entities-Counter.patch diff --git a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch b/lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch similarity index 98% rename from lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch rename to lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch index 6fce4df..6f851e7 100644 --- a/lophine-server/minecraft-patches/features/0117-Leaves-Catch-update-suppression-crash.patch +++ b/lophine-server/minecraft-patches/features/0118-Leaves-Catch-update-suppression-crash.patch @@ -115,10 +115,10 @@ index 624f637e7a4fb8297d42e9944011e3c83245949e..ac6561a1552f7a2f724fefe0aa1507db CrashReport report = CrashReport.forThrowable(t, "Ticking player"); CrashReportCategory category = report.addCategory("Player being ticked"); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index c3df068144c3af4b3700b104588970154837018d..f15f0ca83ff2313d2e025db984c4fa1d492c5a70 100644 +index 6530baa206a2f2f9b8ca378a2c72928d79f23601..455a5e973c2840e1440b6cff529179b173d81023 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -1522,8 +1522,18 @@ public abstract class Entity +@@ -1523,8 +1523,18 @@ public abstract class Entity } if (shouldVibrate) { diff --git a/lophine-server/minecraft-patches/features/0118-Leaves-CCE-update-suppression.patch b/lophine-server/minecraft-patches/features/0119-Leaves-CCE-update-suppression.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0118-Leaves-CCE-update-suppression.patch rename to lophine-server/minecraft-patches/features/0119-Leaves-CCE-update-suppression.patch diff --git a/lophine-server/minecraft-patches/features/0119-Leaves-Redstone-ignore-upwards-update.patch b/lophine-server/minecraft-patches/features/0120-Leaves-Redstone-ignore-upwards-update.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0119-Leaves-Redstone-ignore-upwards-update.patch rename to lophine-server/minecraft-patches/features/0120-Leaves-Redstone-ignore-upwards-update.patch diff --git a/lophine-server/minecraft-patches/features/0120-Instant-Block-Updater.patch b/lophine-server/minecraft-patches/features/0121-Instant-Block-Updater.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0120-Instant-Block-Updater.patch rename to lophine-server/minecraft-patches/features/0121-Instant-Block-Updater.patch diff --git a/lophine-server/minecraft-patches/features/0121-Revert-TrapDoorBlock-changes-form-Paper.patch b/lophine-server/minecraft-patches/features/0122-Revert-TrapDoorBlock-changes-form-Paper.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0121-Revert-TrapDoorBlock-changes-form-Paper.patch rename to lophine-server/minecraft-patches/features/0122-Revert-TrapDoorBlock-changes-form-Paper.patch diff --git a/lophine-server/minecraft-patches/features/0122-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch b/lophine-server/minecraft-patches/features/0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0122-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch rename to lophine-server/minecraft-patches/features/0123-Leaves-Prevent-loss-of-item-drops-due-to-update-supp.patch diff --git a/lophine-server/minecraft-patches/features/0123-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch b/lophine-server/minecraft-patches/features/0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0123-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch rename to lophine-server/minecraft-patches/features/0124-Leaves-Do-not-reset-placed-block-on-exception-Do-not.patch diff --git a/lophine-server/minecraft-patches/features/0124-Leaves-Old-Block-remove-behaviour.patch b/lophine-server/minecraft-patches/features/0125-Leaves-Old-Block-remove-behaviour.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0124-Leaves-Old-Block-remove-behaviour.patch rename to lophine-server/minecraft-patches/features/0125-Leaves-Old-Block-remove-behaviour.patch diff --git a/lophine-server/minecraft-patches/features/0125-MiniTweaks-mob-fire-and-explosion-rules.patch b/lophine-server/minecraft-patches/features/0126-MiniTweaks-mob-fire-and-explosion-rules.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0125-MiniTweaks-mob-fire-and-explosion-rules.patch rename to lophine-server/minecraft-patches/features/0126-MiniTweaks-mob-fire-and-explosion-rules.patch diff --git a/lophine-server/minecraft-patches/features/0126-Carpet-features.patch b/lophine-server/minecraft-patches/features/0127-Carpet-features.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0126-Carpet-features.patch rename to lophine-server/minecraft-patches/features/0127-Carpet-features.patch diff --git a/lophine-server/minecraft-patches/features/0127-PCA-sync-protocol.patch b/lophine-server/minecraft-patches/features/0128-PCA-sync-protocol.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0127-PCA-sync-protocol.patch rename to lophine-server/minecraft-patches/features/0128-PCA-sync-protocol.patch diff --git a/lophine-server/minecraft-patches/features/0128-Add-Vanilla-like-experience-Config.patch b/lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0128-Add-Vanilla-like-experience-Config.patch rename to lophine-server/minecraft-patches/features/0129-Add-Vanilla-like-experience-Config.patch diff --git a/lophine-server/minecraft-patches/features/0129-Restore-vanilla-ender-pearl-loading.patch b/lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0129-Restore-vanilla-ender-pearl-loading.patch rename to lophine-server/minecraft-patches/features/0130-Restore-vanilla-ender-pearl-loading.patch diff --git a/lophine-server/minecraft-patches/features/0130-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch b/lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0130-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch rename to lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Regio.patch diff --git a/lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch b/lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0131-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch rename to lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-variable-passing-in-Threa.patch diff --git a/lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch b/lophine-server/minecraft-patches/features/0133-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0132-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch rename to lophine-server/minecraft-patches/features/0133-Anonymous-Object-Fix-wrong-ticket-update-determinati.patch diff --git a/lophine-server/minecraft-patches/features/0133-Anonymous-Object-Lithium-optimized-collections-for-W.patch b/lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-collections-for-W.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0133-Anonymous-Object-Lithium-optimized-collections-for-W.patch rename to lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-collections-for-W.patch diff --git a/lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch b/lophine-server/minecraft-patches/features/0135-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0134-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch rename to lophine-server/minecraft-patches/features/0135-Anonymous-Object-Lithium-optimized-non-poi-block-sea.patch diff --git a/lophine-server/minecraft-patches/features/0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch b/lophine-server/minecraft-patches/features/0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch rename to lophine-server/minecraft-patches/features/0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch index 409a575..d55a860 100644 --- a/lophine-server/minecraft-patches/features/0135-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch +++ b/lophine-server/minecraft-patches/features/0136-Anonymous-Object-Fix-folia-nether-portal-ticket-plac.patch @@ -33,10 +33,10 @@ index ea93ac07ec6d4e83d1d0904daf721132e2bbecc3..4252672ad2aaf03d50e5ea6a681e9964 public static class IntBounds { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index f15f0ca83ff2313d2e025db984c4fa1d492c5a70..6d6b1024ef7467bc7f72693a655a25eeede1b0f8 100644 +index 455a5e973c2840e1440b6cff529179b173d81023..3b73f1800c92a0f6a2fc515dc63aec20f62b96af 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4847,7 +4847,7 @@ public abstract class Entity +@@ -4853,7 +4853,7 @@ public abstract class Entity portalInfoCompletable.complete( new TeleportTransition(destination, Vec3.atCenterOf(targetPos), Vec3.ZERO, 90.0f, 0.0f, @@ -45,7 +45,7 @@ index f15f0ca83ff2313d2e025db984c4fa1d492c5a70..6d6b1024ef7467bc7f72693a655a25ee ); return; } -@@ -4859,7 +4859,7 @@ public abstract class Entity +@@ -4865,7 +4865,7 @@ public abstract class Entity portalInfoCompletable.complete( net.minecraft.world.level.block.NetherPortalBlock.createDimensionTransition( destination, portal, originalPortalDirection, relativePos, diff --git a/lophine-server/minecraft-patches/features/0136-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch b/lophine-server/minecraft-patches/features/0137-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch similarity index 100% rename from lophine-server/minecraft-patches/features/0136-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch rename to lophine-server/minecraft-patches/features/0137-Anonymous-Object-RegionizedTaskQueue-queue-TTL-optim.patch diff --git a/lophine-server/minecraft-patches/features/0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch b/lophine-server/minecraft-patches/features/0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch similarity index 95% rename from lophine-server/minecraft-patches/features/0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch rename to lophine-server/minecraft-patches/features/0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch index 676a5ba..cc5bc77 100644 --- a/lophine-server/minecraft-patches/features/0137-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch +++ b/lophine-server/minecraft-patches/features/0138-Anonymous-Object-Reduce-ticket-operations-in-nether-.patch @@ -29,10 +29,10 @@ index 8eca4b0a82d738f873f9e01a7424aaf7ee3735a2..e94ea890c83e65d987519379ebe3b513 // Folia start - region threading diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 6d6b1024ef7467bc7f72693a655a25eeede1b0f8..363dcad09e441ea8b4fd79fcb94432536783676c 100644 +index 3b73f1800c92a0f6a2fc515dc63aec20f62b96af..ef8f41f05255de25b5f831275bd1e5e1340f6141 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4866,10 +4866,10 @@ public abstract class Entity +@@ -4872,10 +4872,10 @@ public abstract class Entity ); // kick off search for existing portal or creation diff --git a/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch index 9dbdd9a..2253f58 100644 --- a/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/paper-patches/features/0001-Rebrand-to-Lophine.patch @@ -117,4219 +117,3 @@ index 5607f4cc8ca2f620461eb5e97d01d9db0d6b2303..f5462b42c8231a5cf58a24e5fc5dc77b if (net.minecraft.world.level.Level.lastPhysicsProblem != null) { logger.log(Level.SEVERE, "------------------------------"); -diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png -index c06126b92e36566c93b901637926703bbfcc42ff..76ea89f23e6d2a42806c5d5d29b415d325e1ee82 100644 -GIT binary patch -literal 188156 -zcmeFYXIN8Pv^AWBAOQqImrf9*gGetz2u0;_YDtEfM;j3_F8j|Ip&yS#T)2pQBkl`fIuKB?OW4Ba?e}l-XM^j+wX7i#5Jp1AjoWmwz?|XKWpPO0DFJJeD)wL*KZS_ -zLsr*3nn8N&7E1Ej6{s2JRhQD$>-C*7m)I{Ue(8qyy!(>G!T%1S2T3~By)`e_DN&EO -z6uBG6Vwd@Wn{X+LSBhq)Jg3E_^5FFJ^_cR($R>Vk4ftw4P|h7Q+;8*QmOtL88C*S8 -zKDKf#!C#mB^Qu`8&Do&(pI>@%NkD)9PEP=1Uj2DZkP|_KzCW)Gs3*wQ;m^w#A_w~W -zF-0&t=;g(=*&u4r#if0EATrR!r4Ia<|GVw~O~UVB_`gW_ze%_Nh5x^ikj5WG(#Kh9 -za}u8$SS|bY1}}HXPi5}q@nZ_uz@D(-*vU~a-KtK$UV$}t9<`UrO0b`6j|F-D}~zys$!^#>mdxG7dsLSRxiV?HOnj~vXRTVT~> -zYj}BXZFdl{?Iy@OVwH9NV+Vr%aZrEk?=<=xkIIUmt8=fk%(I}CuP>F7xk_J)vg}z; -z>i!oba2(9~;}>RT4vbd*_43PR289W0(XQkNa|Ie~Y~#{Zmj|q>pSq8$T$OXN!?-4W -zT@AtE8-B9nYeTFoR3)^~=v(oe2IW`zbm!{x;5^Ph7)vO(zG@DeIf-Pw8q|zS;MPvt -z7twW}s-9`9XO1>mmxI)wT1)46sQBe_rb*XJDxev)^XUq)l~EKKW_27Mq^v;(dtOoC449NTg6)rSZ4YJ}kXbq!=1{oDP^I{a69uKcim -zcyJnN&+m6o)^^M`SiZEqmbJZja=zR0Az>-RJ=wHn^8s)EcFx?d?OWM3`<*}av=cP9 -z>cwG`t>fH&gCXpT*^yUWl`2omIVQIzq>rW>$j-A9W|+v}KUCPK47nc$oo_YmSB713 -z&`MGKn{G5yxZsuw+=h>b-dM-Y3v>IvXd<~tT6#A+$JU>QJYp7YARIj;4j?_m_BvT_ -zx;kiO{QdC8yH}C=cGidD*lujhnFvw$-$M)H)g|t_@B3kj)YIULjK^=3x4}S_F{A~y -zx%-WuT$y3A#rBY_YW9-Y$)^ARq(%O4ihLa1D}|S0yUltb?vW}&dx03%=VE6JwR4<& -z&s)y_-=#g%SC(?s9V={yRt95#%A<14SL_w`U%2g)5@QoiC?n=D*PML58b9w#qW+sm -zef#2Gr(Kg~3Ylj86&dAy$GwCkRkSo@j -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 -zP42%XpL)jV7L7v+hxY96Qi<;A{c?VY -zxn>*8MUUjlBh})is>t%4xzgR*r!F;cjxJ>hk0<+-PH>4Z%lvt6H79TBNF&rEgC}sL -z>QD8M7FJo^rHK5LjPQ5U!+9vT7n|i$A4ei@G+>NL-84jsYlN%_XCqH;T$2^4ZLDf%Py@k_05o%QYr!k16n&cY)hRRfDx7lFtj_4}izPXxqG -zmxs+Fqjg-0da?L%->&@t#$d`lm3Nbs;}EA7RGCEExhg+lDs5!D?9*kkD+h{_m0;hzCtI|1pa^cXk9SWYqcDvidQeJSkFtw&D!woY3GLol8&pz -z)_DVXV+_?H-=ZsTU=S=p8@Ei}SZX~tZu7D5s1%=%k!L3cBM4*`D~?N^7;IXGH-tg3 -z9}Y@8dXsSEKs0$>)u7I8_y&Pd`(0u?vTeG-{gSqeHB}x@3@=|0OwMj6zilB_pE{vX -z8{IS8ZS^_GlUCL=4bF -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 -z**yO!Vj0DX<%u**{OJfk1ZVW5leOIoFOm -zTx#?sJ$Dq^xYQuEUdryPdD)RaE^-u1y#$r>zdJ}?)lWVYF6nx|KBJ|e1Yj#K^3|D) -zTOO*^0sUURjVzD~#Yysz3VJ6y!qNI$7O3k)O0dyh9V@I_8X0h@@2}R&KciGRW|E$> -zO|~?8=3`|xUMQir(Zl$WEcTMLep^G!M~MO^bH)@3Kd^p$ubT|BTK&NS~s)cBu@oNZs)i-FYR_`ohOOR}B+O3AWI<3s!$t0AoDX -zh31HA0L~t2u--jb)wOjG)EOGCa(R;SXn)%%}!?a4XQsHFzS7+ao -zKMADfF`7*JXPFHbp4OKkLSFnt%O}zG%se%PE-(GXnxyfepz-dFcQuajJ@?rm)4Hq7 -z!w;wKa@hXN+*SY=4hud7OsA5hVGO?|U4S0autBm+x)T|_G{7Nc)YsQtjU(&$jaj3m -zjV*jM*$y!F&$D0&A+xQjFuxH>2RO!r9A5qug6uL4M;6_k2bE^qy+8 -zws;1T8=gBGGS*zlMG!{K_lHxCEKnXIqc;@6nm0oaqd_%mI$#gYO<6!O0(?6r&d!ze -zpxV1ub)nSw@h#tUHOymjaK(S$oqHSCfMl0%AhY5v2cU=?ErKu^IQ?1oJP&tnvO?Aa -zZh2ZJiwt##dqnxVD5X3G!dGC=<9Q&xK#wPg`P{elVnn*PHTusV8wQUB3Yl3`?>bur -z-ZyTODz%1}M8g5iTdW6;MC%gU1j3;H$L!Qtd43R@5#ZwwfuyVX@i8#S$m%x;!rN$& -zDXJs7w{$rR1gbL`y9~}i*;fKSxh({Nq;$E>H@wVVR4i)$Gqjg -zP5VG6?nk^5068th@$h4phKhJa(1!no`yhGD1H7!rX}U=0_i$#;B-+jlm{L4f#i{c)N`tO8g$=|9;|>m`6;4p>ndFrHSIOZ-MG -z3N+ShwsdET5v5@AuGbMR3I8PW -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 -z2Y=81<)asJ&7Aw3efC;=t##vb*&;9i2QC0t -zFvUbLW60zJn{pOZOzdOJngHuB?j=DFwKS*ch%nZaux4w$i%lSND_35;v@QO>IHYyA -zWQ@)-SMgcB`W3`VmG7WGW4W?(>?%^gVM2!s{n5N6ax~{~n4-Dr?Py)M_Lc-(j2=c_ -zwv{_^nE?T2j5;L5(8>$O_RERoth!f7;JP1kN4TVQ9^h@|l+aTAwbR2pWgvIniaf)w -zC?6*Z?gl7He}5#>$02@;%ugnAHZ0(gcH4|e+Xg5DEc(Vg?s@HLH{?5<;B7kO6Y`Ka -zW7RUF=5abAP)wK~xi)fF7OlP%7nsx2VtToHlQR%+J3)aA%gxRc_45|o#~Z*| -zy>4UnktL&cPS#Kejw};bK&6muoK%y6F2C>ww4%57VH3f;`!trq^@w`&!x}t?<6vai?@>=VNoI~--fBnzdRWXun9EUn -zz{wL88CizT$|2#3;V~*^wq?igXrD@#91m0k(C8TmyC$iP%9@6+4q*e1mmZu$cYb+n8q}Lq}ZNdH3_C|4?0dcQPwOpKCbos}}uPNMoDRV2?Q)CL}Mt;O_ -zfnGk21+(EX-TB!C1+?xah#b(p85mZ+TA)DI13Uo6CIjIRQJl5Ck9)U6Bz0)H1$8(Y -z)Q7ghPECh0;ITKEU>VSs{77^86Jl%`-ianAOEDCv;35*x8c&$6Zk+w<-Z-ybM%t^t -zk6B&9AjR@(dP6hqC7ls_#omE1sY_x@5hEEBr@NBfE<4?m+Tx4AJZDjeveR}y3GB*M!sxI%j`HJMy -zeaFWBN9t-7vwz-_^_M9z^2i2Vs!r)gL2wY{O|jOhpERuY|7#o`B3!WU@DYw=_xz1f -zP>0{k`6~^QLadOmW~Po=u49lYpzF%?W2Y`(>1Q!7dMq3wakUDOcLy|8iEzw?8k&kC -z@BY!1*K@4gbd?snl4IZ^p{g3H=3X_vk8p9v7G=Na+*zQWHz``!oimmjdnsA7C3Wb87u-hF -zm_6j_OF1@_uVg<^RqrSV9D}=hZ -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 -z3o*bWv%iq^v^n_)H@S#DZp3|TTjp8yVddfRPS -zSD${74iN#D3Pq7h@(I4w;s317yqPWTN3Sj$