From add3ee8f823e2d66347c956fd4e2b3f38b1f78dd Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Wed, 22 Mar 2023 00:27:03 +0100 Subject: [PATCH] Variable entity wake-up duration --- ...056-Variable-entity-wake-up-duration.patch | 93 +++++++++++++++++++ ...at-commands-before-player-has-joine.patch} | 0 ... 0058-Do-not-log-invalid-statistics.patch} | 0 ...9-Do-not-log-empty-message-warnings.patch} | 0 ...060-Do-not-log-ignored-advancements.patch} | 0 ...1-Do-not-log-setBlock-in-far-chunks.patch} | 0 ...062-Do-not-log-unrecognized-recipes.patch} | 0 ...-log-legacy-Material-initialization.patch} | 0 ...Do-not-log-expired-message-warnings.patch} | 0 ...t-log-out-of-order-message-warnings.patch} | 0 ...> 0066-Do-not-log-Not-Secure-marker.patch} | 0 ...0067-Do-not-log-run-as-root-warning.patch} | 0 ...068-Do-not-log-offline-mode-warning.patch} | 0 ...tly-log-invalid-pool-element-errors.patch} | 0 ...> 0070-Fix-legacy-colors-in-console.patch} | 0 ...er-showing-in-ping-before-server-fu.patch} | 0 ...2-Make-sand-duping-fix-configurable.patch} | 21 ++--- ...-238526.patch => 0073-Fix-MC-238526.patch} | 4 +- ...-123848.patch => 0074-Fix-MC-123848.patch} | 4 +- ...ow-rotation-when-shearing-mooshroom.patch} | 4 +- ...-121706.patch => 0076-Fix-MC-121706.patch} | 6 +- ...-110386.patch => 0077-Fix-MC-110386.patch} | 4 +- ...MC-31819.patch => 0078-Fix-MC-31819.patch} | 4 +- ...MC-26304.patch => 0079-Fix-MC-26304.patch} | 0 ...ould-check-if-entity-can-use-portal.patch} | 4 +- ...eating-blocks-in-non-ticking-chunks.patch} | 12 ++- ...nt-resetting-despawn-counter-config.patch} | 6 +- ...ogging-login-locations-configurable.patch} | 0 ...ch => 0084-Reduce-array-allocations.patch} | 0 ...atch => 0085-Optimize-sun-burn-tick.patch} | 0 ...-Optional-allocation-in-EntityBased.patch} | 0 ...-goal-set-with-optimized-collection.patch} | 0 ...rules-map-with-optimized-collection.patch} | 0 ...tributes-with-optimized-collections.patch} | 0 ...class-map-with-optimized-collection.patch} | 0 ...tracker-map-with-optimized-collecti.patch} | 0 ...ape-full-block-cache-with-hashtable.patch} | 0 ...ignableFrom-call-in-ClassInstanceMu.patch} | 0 ...> 0094-Cache-BlockStatePairKey-hash.patch} | 0 ...95-Cache-CubeVoxelShape-shape-array.patch} | 0 ...by-multiplication-in-CubePointRange.patch} | 0 ...ace-parts-by-size-in-CubePointRange.patch} | 0 ...k-frozen-ticks-before-landing-block.patch} | 0 ... => 0099-Faster-chunk-serialization.patch} | 0 ...=> 0100-Update-boss-bar-within-tick.patch} | 0 ...h => 0101-Cache-ominous-banner-item.patch} | 0 ...d-generation-chunk-and-block-access.patch} | 0 ...103-Cache-world-generator-sea-level.patch} | 0 ...Skip-secondary-POI-sensor-if-absent.patch} | 0 ...0105-Optimize-villager-data-storage.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...> 0107-Store-mob-counts-in-an-array.patch} | 0 ...-Use-linked-map-for-entity-trackers.patch} | 0 ...h => 0109-Optimize-noise-generation.patch} | 0 ...0110-Optimize-sheep-offspring-color.patch} | 2 +- ...durability-change-equipment-updates.patch} | 2 +- ...es-on-entities-with-fire-resistance.patch} | 4 +- ...3-Skip-cloning-advancement-criteria.patch} | 0 ...lock-destruction-packet-allocations.patch} | 0 ...ation-packets-only-for-living-entit.patch} | 2 +- ...-Spread-out-sending-all-player-info.patch} | 0 ...player-list-for-sending-player-info.patch} | 0 ...dSendEvent-if-there-are-no-listener.patch} | 0 ...19-Send-multiple-keep-alive-packets.patch} | 0 ...ake-slow-login-timeout-configurable.patch} | 0 ...x-interaction-distance-configurable.patch} | 10 +- ...nation-chunk-before-entity-teleport.patch} | 4 +- ...Don-t-load-chunks-to-spawn-phantoms.patch} | 2 +- ...hunks-to-activate-climbing-entities.patch} | 4 +- ...imations-as-the-entity-being-critte.patch} | 4 +- ...6-Ignore-null-legacy-structure-data.patch} | 0 ...Don-t-double-save-stored-user-lists.patch} | 0 ...necessary-mob-spawning-computations.patch} | 0 ...random-strolling-into-non-ticking-c.patch} | 6 +- ...er-in-world-if-kicked-before-being-.patch} | 0 ... 0131-CraftBukkit-UUID-to-world-map.patch} | 0 ...file.patch => 0132-Global-EULA-file.patch} | 0 ...h => 0133-Specific-interval-TPS-API.patch} | 0 ....patch => 0134-5-second-TPS-average.patch} | 0 ...atch => 0135-Measure-last-tick-time.patch} | 0 ...PI.patch => 0136-Last-tick-time-API.patch} | 0 ...-Show-last-tick-time-in-tps-command.patch} | 0 ...crease-time-statistics-in-intervals.patch} | 0 ...eck-has-physics-before-same-vehicle.patch} | 2 +- ...ible-planar-movement-multiplication.patch} | 2 +- ...0141-Optimize-identical-item-checks.patch} | 0 ... 0142-Reduce-RandomSource-instances.patch} | 0 ...hread-priority-environment-variable.patch} | 0 ...h => 0144-Thread-safety-annotations.patch} | 0 ....patch => 0145-CPU-cores-estimation.patch} | 0 ...tch => 0146-Virtual-threads-utility.patch} | 0 ...patch => 0147-CheckableLock-utility.patch} | 0 ...utility.patch => 0148-Mutex-utility.patch} | 0 ...h => 0149-Thread-aware-lock-utility.patch} | 0 ... 0150-Unterminable-executor-utility.patch} | 0 ... 0151-FIFO-concurrent-queue-utility.patch} | 0 ...pool.patch => 0152-Base-thread-pool.patch} | 0 ...153-Watch-for-blocking-base-threads.patch} | 0 ... => 0154-Non-blocking-PooledObjects.patch} | 0 ... => 0155-Yielding-memoized-Supplier.patch} | 0 ...=> 0156-Yielding-ChunkHolderManager.patch} | 0 ...-executor-tasks-on-base-thread-pool.patch} | 0 ...-executor-tasks-on-base-thread-pool.patch} | 0 ...d-upgrade-tasks-on-base-thread-pool.patch} | 0 ...ompletion-tasks-on-base-thread-pool.patch} | 0 ...xt-filter-tasks-on-base-thread-pool.patch} | 0 ...n-cleaner-tasks-on-base-thread-pool.patch} | 0 ...unk-cache-tasks-on-base-thread-pool.patch} | 0 ...ead-chunk-tasks-on-base-thread-pool.patch} | 0 ...tisedQueueExecutorThread-agent-util.patch} | 0 ...nk-worker-tasks-on-base-thread-pool.patch} | 0 ...teps.patch => 0167-Split-tick-steps.patch} | 0 ...patch => 0168-Multithreaded-ticking.patch} | 0 ...=> 0169-Yielding-ChunkTaskScheduler.patch} | 0 114 files changed, 150 insertions(+), 56 deletions(-) create mode 100644 patches/server/0056-Variable-entity-wake-up-duration.patch rename patches/server/{0056-Do-not-process-chat-commands-before-player-has-joine.patch => 0057-Do-not-process-chat-commands-before-player-has-joine.patch} (100%) rename patches/server/{0057-Do-not-log-invalid-statistics.patch => 0058-Do-not-log-invalid-statistics.patch} (100%) rename patches/server/{0058-Do-not-log-empty-message-warnings.patch => 0059-Do-not-log-empty-message-warnings.patch} (100%) rename patches/server/{0059-Do-not-log-ignored-advancements.patch => 0060-Do-not-log-ignored-advancements.patch} (100%) rename patches/server/{0060-Do-not-log-setBlock-in-far-chunks.patch => 0061-Do-not-log-setBlock-in-far-chunks.patch} (100%) rename patches/server/{0061-Do-not-log-unrecognized-recipes.patch => 0062-Do-not-log-unrecognized-recipes.patch} (100%) rename patches/server/{0062-Do-not-log-legacy-Material-initialization.patch => 0063-Do-not-log-legacy-Material-initialization.patch} (100%) rename patches/server/{0063-Do-not-log-expired-message-warnings.patch => 0064-Do-not-log-expired-message-warnings.patch} (100%) rename patches/server/{0064-Do-not-log-out-of-order-message-warnings.patch => 0065-Do-not-log-out-of-order-message-warnings.patch} (100%) rename patches/server/{0065-Do-not-log-Not-Secure-marker.patch => 0066-Do-not-log-Not-Secure-marker.patch} (100%) rename patches/server/{0066-Do-not-log-run-as-root-warning.patch => 0067-Do-not-log-run-as-root-warning.patch} (100%) rename patches/server/{0067-Do-not-log-offline-mode-warning.patch => 0068-Do-not-log-offline-mode-warning.patch} (100%) rename patches/server/{0068-Softly-log-invalid-pool-element-errors.patch => 0069-Softly-log-invalid-pool-element-errors.patch} (100%) rename patches/server/{0069-Fix-legacy-colors-in-console.patch => 0070-Fix-legacy-colors-in-console.patch} (100%) rename patches/server/{0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%) rename patches/server/{0071-Make-sand-duping-fix-configurable.patch => 0072-Make-sand-duping-fix-configurable.patch} (91%) rename patches/server/{0072-Fix-MC-238526.patch => 0073-Fix-MC-238526.patch} (95%) rename patches/server/{0073-Fix-MC-123848.patch => 0074-Fix-MC-123848.patch} (95%) rename patches/server/{0074-Fix-cow-rotation-when-shearing-mooshroom.patch => 0075-Fix-cow-rotation-when-shearing-mooshroom.patch} (96%) rename patches/server/{0075-Fix-MC-121706.patch => 0076-Fix-MC-121706.patch} (95%) rename patches/server/{0076-Fix-MC-110386.patch => 0077-Fix-MC-110386.patch} (93%) rename patches/server/{0077-Fix-MC-31819.patch => 0078-Fix-MC-31819.patch} (93%) rename patches/server/{0078-Fix-MC-26304.patch => 0079-Fix-MC-26304.patch} (100%) rename patches/server/{0079-End-gateway-should-check-if-entity-can-use-portal.patch => 0080-End-gateway-should-check-if-entity-can-use-portal.patch} (95%) rename patches/server/{0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch => 0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch} (92%) rename patches/server/{0081-Make-arrow-movement-resetting-despawn-counter-config.patch => 0082-Make-arrow-movement-resetting-despawn-counter-config.patch} (93%) rename patches/server/{0082-Make-logging-login-locations-configurable.patch => 0083-Make-logging-login-locations-configurable.patch} (100%) rename patches/server/{0083-Reduce-array-allocations.patch => 0084-Reduce-array-allocations.patch} (100%) rename patches/server/{0084-Optimize-sun-burn-tick.patch => 0085-Optimize-sun-burn-tick.patch} (100%) rename patches/server/{0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%) rename patches/server/{0086-Replace-AI-goal-set-with-optimized-collection.patch => 0087-Replace-AI-goal-set-with-optimized-collection.patch} (100%) rename patches/server/{0087-Replace-game-rules-map-with-optimized-collection.patch => 0088-Replace-game-rules-map-with-optimized-collection.patch} (100%) rename patches/server/{0088-Replace-AI-attributes-with-optimized-collections.patch => 0089-Replace-AI-attributes-with-optimized-collections.patch} (100%) rename patches/server/{0089-Replace-class-map-with-optimized-collection.patch => 0090-Replace-class-map-with-optimized-collection.patch} (100%) rename patches/server/{0090-Replace-throttle-tracker-map-with-optimized-collecti.patch => 0091-Replace-throttle-tracker-map-with-optimized-collecti.patch} (100%) rename patches/server/{0091-Replace-shape-full-block-cache-with-hashtable.patch => 0092-Replace-shape-full-block-cache-with-hashtable.patch} (100%) rename patches/server/{0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%) rename patches/server/{0093-Cache-BlockStatePairKey-hash.patch => 0094-Cache-BlockStatePairKey-hash.patch} (100%) rename patches/server/{0094-Cache-CubeVoxelShape-shape-array.patch => 0095-Cache-CubeVoxelShape-shape-array.patch} (100%) rename patches/server/{0095-Replace-division-by-multiplication-in-CubePointRange.patch => 0096-Replace-division-by-multiplication-in-CubePointRange.patch} (100%) rename patches/server/{0096-Replace-parts-by-size-in-CubePointRange.patch => 0097-Replace-parts-by-size-in-CubePointRange.patch} (100%) rename patches/server/{0097-Check-frozen-ticks-before-landing-block.patch => 0098-Check-frozen-ticks-before-landing-block.patch} (100%) rename patches/server/{0098-Faster-chunk-serialization.patch => 0099-Faster-chunk-serialization.patch} (100%) rename patches/server/{0099-Update-boss-bar-within-tick.patch => 0100-Update-boss-bar-within-tick.patch} (100%) rename patches/server/{0100-Cache-ominous-banner-item.patch => 0101-Cache-ominous-banner-item.patch} (100%) rename patches/server/{0101-Optimize-world-generation-chunk-and-block-access.patch => 0102-Optimize-world-generation-chunk-and-block-access.patch} (100%) rename patches/server/{0102-Cache-world-generator-sea-level.patch => 0103-Cache-world-generator-sea-level.patch} (100%) rename patches/server/{0103-Skip-secondary-POI-sensor-if-absent.patch => 0104-Skip-secondary-POI-sensor-if-absent.patch} (100%) rename patches/server/{0104-Optimize-villager-data-storage.patch => 0105-Optimize-villager-data-storage.patch} (100%) rename patches/server/{0105-Skip-entity-move-if-movement-is-zero.patch => 0106-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0106-Store-mob-counts-in-an-array.patch => 0107-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0107-Use-linked-map-for-entity-trackers.patch => 0108-Use-linked-map-for-entity-trackers.patch} (100%) rename patches/server/{0108-Optimize-noise-generation.patch => 0109-Optimize-noise-generation.patch} (100%) rename patches/server/{0109-Optimize-sheep-offspring-color.patch => 0110-Optimize-sheep-offspring-color.patch} (98%) rename patches/server/{0110-Ignore-durability-change-equipment-updates.patch => 0111-Ignore-durability-change-equipment-updates.patch} (97%) rename patches/server/{0111-Hide-flames-on-entities-with-fire-resistance.patch => 0112-Hide-flames-on-entities-with-fire-resistance.patch} (94%) rename patches/server/{0112-Skip-cloning-advancement-criteria.patch => 0113-Skip-cloning-advancement-criteria.patch} (100%) rename patches/server/{0113-Reduce-block-destruction-packet-allocations.patch => 0114-Reduce-block-destruction-packet-allocations.patch} (100%) rename patches/server/{0114-Send-set-head-rotation-packets-only-for-living-entit.patch => 0115-Send-set-head-rotation-packets-only-for-living-entit.patch} (96%) rename patches/server/{0115-Spread-out-sending-all-player-info.patch => 0116-Spread-out-sending-all-player-info.patch} (100%) rename patches/server/{0116-Optimize-player-list-for-sending-player-info.patch => 0117-Optimize-player-list-for-sending-player-info.patch} (100%) rename patches/server/{0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch => 0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch} (100%) rename patches/server/{0118-Send-multiple-keep-alive-packets.patch => 0119-Send-multiple-keep-alive-packets.patch} (100%) rename patches/server/{0119-Make-slow-login-timeout-configurable.patch => 0120-Make-slow-login-timeout-configurable.patch} (100%) rename patches/server/{0120-Make-max-interaction-distance-configurable.patch => 0121-Make-max-interaction-distance-configurable.patch} (94%) rename patches/server/{0121-Load-portal-destination-chunk-before-entity-teleport.patch => 0122-Load-portal-destination-chunk-before-entity-teleport.patch} (95%) rename patches/server/{0122-Don-t-load-chunks-to-spawn-phantoms.patch => 0123-Don-t-load-chunks-to-spawn-phantoms.patch} (97%) rename patches/server/{0123-Don-t-load-chunks-to-activate-climbing-entities.patch => 0124-Don-t-load-chunks-to-activate-climbing-entities.patch} (96%) rename patches/server/{0124-Broadcast-crit-animations-as-the-entity-being-critte.patch => 0125-Broadcast-crit-animations-as-the-entity-being-critte.patch} (96%) rename patches/server/{0125-Ignore-null-legacy-structure-data.patch => 0126-Ignore-null-legacy-structure-data.patch} (100%) rename patches/server/{0126-Don-t-double-save-stored-user-lists.patch => 0127-Don-t-double-save-stored-user-lists.patch} (100%) rename patches/server/{0127-Skip-unnecessary-mob-spawning-computations.patch => 0128-Skip-unnecessary-mob-spawning-computations.patch} (100%) rename patches/server/{0128-Prevent-entities-random-strolling-into-non-ticking-c.patch => 0129-Prevent-entities-random-strolling-into-non-ticking-c.patch} (92%) rename patches/server/{0129-Do-not-place-player-in-world-if-kicked-before-being-.patch => 0130-Do-not-place-player-in-world-if-kicked-before-being-.patch} (100%) rename patches/server/{0130-CraftBukkit-UUID-to-world-map.patch => 0131-CraftBukkit-UUID-to-world-map.patch} (100%) rename patches/server/{0131-Global-EULA-file.patch => 0132-Global-EULA-file.patch} (100%) rename patches/server/{0132-Specific-interval-TPS-API.patch => 0133-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0133-5-second-TPS-average.patch => 0134-5-second-TPS-average.patch} (100%) rename patches/server/{0134-Measure-last-tick-time.patch => 0135-Measure-last-tick-time.patch} (100%) rename patches/server/{0135-Last-tick-time-API.patch => 0136-Last-tick-time-API.patch} (100%) rename patches/server/{0136-Show-last-tick-time-in-tps-command.patch => 0137-Show-last-tick-time-in-tps-command.patch} (100%) rename patches/server/{0137-Increase-time-statistics-in-intervals.patch => 0138-Increase-time-statistics-in-intervals.patch} (100%) rename patches/server/{0138-For-collision-check-has-physics-before-same-vehicle.patch => 0139-For-collision-check-has-physics-before-same-vehicle.patch} (94%) rename patches/server/{0139-Skip-negligible-planar-movement-multiplication.patch => 0140-Skip-negligible-planar-movement-multiplication.patch} (94%) rename patches/server/{0140-Optimize-identical-item-checks.patch => 0141-Optimize-identical-item-checks.patch} (100%) rename patches/server/{0141-Reduce-RandomSource-instances.patch => 0142-Reduce-RandomSource-instances.patch} (100%) rename patches/server/{0142-Server-thread-priority-environment-variable.patch => 0143-Server-thread-priority-environment-variable.patch} (100%) rename patches/server/{0143-Thread-safety-annotations.patch => 0144-Thread-safety-annotations.patch} (100%) rename patches/server/{0144-CPU-cores-estimation.patch => 0145-CPU-cores-estimation.patch} (100%) rename patches/server/{0145-Virtual-threads-utility.patch => 0146-Virtual-threads-utility.patch} (100%) rename patches/server/{0146-CheckableLock-utility.patch => 0147-CheckableLock-utility.patch} (100%) rename patches/server/{0147-Mutex-utility.patch => 0148-Mutex-utility.patch} (100%) rename patches/server/{0148-Thread-aware-lock-utility.patch => 0149-Thread-aware-lock-utility.patch} (100%) rename patches/server/{0149-Unterminable-executor-utility.patch => 0150-Unterminable-executor-utility.patch} (100%) rename patches/server/{0150-FIFO-concurrent-queue-utility.patch => 0151-FIFO-concurrent-queue-utility.patch} (100%) rename patches/server/{0151-Base-thread-pool.patch => 0152-Base-thread-pool.patch} (100%) rename patches/server/{0152-Watch-for-blocking-base-threads.patch => 0153-Watch-for-blocking-base-threads.patch} (100%) rename patches/server/{0153-Non-blocking-PooledObjects.patch => 0154-Non-blocking-PooledObjects.patch} (100%) rename patches/server/{0154-Yielding-memoized-Supplier.patch => 0155-Yielding-memoized-Supplier.patch} (100%) rename patches/server/{0155-Yielding-ChunkHolderManager.patch => 0156-Yielding-ChunkHolderManager.patch} (100%) rename patches/server/{0156-Run-async-executor-tasks-on-base-thread-pool.patch => 0157-Run-async-executor-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0157-Run-background-executor-tasks-on-base-thread-pool.patch => 0158-Run-background-executor-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0158-Run-world-upgrade-tasks-on-base-thread-pool.patch => 0159-Run-world-upgrade-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0159-Run-tab-completion-tasks-on-base-thread-pool.patch => 0160-Run-tab-completion-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0160-Run-text-filter-tasks-on-base-thread-pool.patch => 0161-Run-text-filter-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0161-Run-cleaner-tasks-on-base-thread-pool.patch => 0162-Run-cleaner-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0162-Run-chunk-cache-tasks-on-base-thread-pool.patch => 0163-Run-chunk-cache-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch => 0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch => 0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch} (100%) rename patches/server/{0165-Run-chunk-worker-tasks-on-base-thread-pool.patch => 0166-Run-chunk-worker-tasks-on-base-thread-pool.patch} (100%) rename patches/server/{0166-Split-tick-steps.patch => 0167-Split-tick-steps.patch} (100%) rename patches/server/{0167-Multithreaded-ticking.patch => 0168-Multithreaded-ticking.patch} (100%) rename patches/server/{0168-Yielding-ChunkTaskScheduler.patch => 0169-Yielding-ChunkTaskScheduler.patch} (100%) diff --git a/patches/server/0056-Variable-entity-wake-up-duration.patch b/patches/server/0056-Variable-entity-wake-up-duration.patch new file mode 100644 index 0000000..ad90294 --- /dev/null +++ b/patches/server/0056-Variable-entity-wake-up-duration.patch @@ -0,0 +1,93 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martijn Muijsers +Date: Wed, 22 Mar 2023 00:18:15 +0100 +Subject: [PATCH] Variable entity wake-up duration + +License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) +Gale - https://galemc.org + +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index be563b466b9b9312254596ea3b8e116b28cf250c..378d6f8eb10404e687080e0c306aae26e204967a 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -255,4 +255,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { + + } + ++ public GameplayMechanics gameplayMechanics; ++ public class GameplayMechanics extends ConfigurationPart { ++ ++ // Gale start - variable entity wake-up duration ++ /** ++ * This value is sigma, ++ * where the normal wake-up time will be multiplied by normal(mu = 1, sigma) ++ * Any value < 0 behaves like 0. ++ * ++ */ ++ public double entityWakeUpDurationRatioStandardDeviation = 0.2; ++ // Gale end - variable entity wake-up duration ++ ++ } ++ + } +diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java +index 2bff2b6cff78f1ad4cbc6abbc1a37464f543ccb7..8a6bc6d4dc5825e0d125ce3853bd3d7714ac113f 100644 +--- a/src/main/java/org/spigotmc/ActivationRange.java ++++ b/src/main/java/org/spigotmc/ActivationRange.java +@@ -38,6 +38,7 @@ import co.aikar.timings.MinecraftTimings; + import net.minecraft.world.entity.schedule.Activity; + import net.minecraft.world.level.Level; + import net.minecraft.world.phys.AABB; ++import org.galemc.gale.configuration.GaleWorldConfiguration; + + public class ActivationRange + { +@@ -70,28 +71,41 @@ public class ActivationRange + if (entity.activationType == ActivationType.VILLAGER) { + if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) { + world.wakeupInactiveRemainingVillagers--; +- return config.wakeUpInactiveVillagersFor; ++ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveVillagersFor); // Gale - variable entity wake-up duration + } + } else if (entity.activationType == ActivationType.ANIMAL) { + if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) { + world.wakeupInactiveRemainingAnimals--; +- return config.wakeUpInactiveAnimalsFor; ++ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveAnimalsFor); // Gale - variable entity wake-up duration + } + } else if (entity.activationType == ActivationType.FLYING_MONSTER) { + if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) { + world.wakeupInactiveRemainingFlying--; +- return config.wakeUpInactiveFlyingFor; ++ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveFlyingFor); // Gale - variable entity wake-up duration + } + } else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) { + if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) { + world.wakeupInactiveRemainingMonsters--; +- return config.wakeUpInactiveMonstersFor; ++ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveMonstersFor); // Gale - variable entity wake-up duration + } + } + return -1; + } + // Paper end + ++ // Gale start - variable entity wake-up duration ++ private static final java.util.Random wakeUpDurationRandom = new java.util.Random(); ++ ++ private static int getWakeUpDurationWithVariance(Entity entity, int wakeUpDuration) { ++ GaleWorldConfiguration config = entity.level.galeConfig(); ++ double deviation = config.gameplayMechanics.entityWakeUpDurationRatioStandardDeviation; ++ if (deviation <= 0) { ++ return wakeUpDuration; ++ } ++ return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(wakeUpDuration * wakeUpDurationRandom.nextGaussian(1, deviation)))); ++ } ++ // Gale end - variable entity wake-up duration ++ + static AABB maxBB = new AABB( 0, 0, 0, 0, 0, 0 ); + + /** diff --git a/patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch similarity index 100% rename from patches/server/0056-Do-not-process-chat-commands-before-player-has-joine.patch rename to patches/server/0057-Do-not-process-chat-commands-before-player-has-joine.patch diff --git a/patches/server/0057-Do-not-log-invalid-statistics.patch b/patches/server/0058-Do-not-log-invalid-statistics.patch similarity index 100% rename from patches/server/0057-Do-not-log-invalid-statistics.patch rename to patches/server/0058-Do-not-log-invalid-statistics.patch diff --git a/patches/server/0058-Do-not-log-empty-message-warnings.patch b/patches/server/0059-Do-not-log-empty-message-warnings.patch similarity index 100% rename from patches/server/0058-Do-not-log-empty-message-warnings.patch rename to patches/server/0059-Do-not-log-empty-message-warnings.patch diff --git a/patches/server/0059-Do-not-log-ignored-advancements.patch b/patches/server/0060-Do-not-log-ignored-advancements.patch similarity index 100% rename from patches/server/0059-Do-not-log-ignored-advancements.patch rename to patches/server/0060-Do-not-log-ignored-advancements.patch diff --git a/patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch similarity index 100% rename from patches/server/0060-Do-not-log-setBlock-in-far-chunks.patch rename to patches/server/0061-Do-not-log-setBlock-in-far-chunks.patch diff --git a/patches/server/0061-Do-not-log-unrecognized-recipes.patch b/patches/server/0062-Do-not-log-unrecognized-recipes.patch similarity index 100% rename from patches/server/0061-Do-not-log-unrecognized-recipes.patch rename to patches/server/0062-Do-not-log-unrecognized-recipes.patch diff --git a/patches/server/0062-Do-not-log-legacy-Material-initialization.patch b/patches/server/0063-Do-not-log-legacy-Material-initialization.patch similarity index 100% rename from patches/server/0062-Do-not-log-legacy-Material-initialization.patch rename to patches/server/0063-Do-not-log-legacy-Material-initialization.patch diff --git a/patches/server/0063-Do-not-log-expired-message-warnings.patch b/patches/server/0064-Do-not-log-expired-message-warnings.patch similarity index 100% rename from patches/server/0063-Do-not-log-expired-message-warnings.patch rename to patches/server/0064-Do-not-log-expired-message-warnings.patch diff --git a/patches/server/0064-Do-not-log-out-of-order-message-warnings.patch b/patches/server/0065-Do-not-log-out-of-order-message-warnings.patch similarity index 100% rename from patches/server/0064-Do-not-log-out-of-order-message-warnings.patch rename to patches/server/0065-Do-not-log-out-of-order-message-warnings.patch diff --git a/patches/server/0065-Do-not-log-Not-Secure-marker.patch b/patches/server/0066-Do-not-log-Not-Secure-marker.patch similarity index 100% rename from patches/server/0065-Do-not-log-Not-Secure-marker.patch rename to patches/server/0066-Do-not-log-Not-Secure-marker.patch diff --git a/patches/server/0066-Do-not-log-run-as-root-warning.patch b/patches/server/0067-Do-not-log-run-as-root-warning.patch similarity index 100% rename from patches/server/0066-Do-not-log-run-as-root-warning.patch rename to patches/server/0067-Do-not-log-run-as-root-warning.patch diff --git a/patches/server/0067-Do-not-log-offline-mode-warning.patch b/patches/server/0068-Do-not-log-offline-mode-warning.patch similarity index 100% rename from patches/server/0067-Do-not-log-offline-mode-warning.patch rename to patches/server/0068-Do-not-log-offline-mode-warning.patch diff --git a/patches/server/0068-Softly-log-invalid-pool-element-errors.patch b/patches/server/0069-Softly-log-invalid-pool-element-errors.patch similarity index 100% rename from patches/server/0068-Softly-log-invalid-pool-element-errors.patch rename to patches/server/0069-Softly-log-invalid-pool-element-errors.patch diff --git a/patches/server/0069-Fix-legacy-colors-in-console.patch b/patches/server/0070-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0069-Fix-legacy-colors-in-console.patch rename to patches/server/0070-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0070-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0071-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0071-Make-sand-duping-fix-configurable.patch b/patches/server/0072-Make-sand-duping-fix-configurable.patch similarity index 91% rename from patches/server/0071-Make-sand-duping-fix-configurable.patch rename to patches/server/0072-Make-sand-duping-fix-configurable.patch index a0d5a41..ce19e63 100644 --- a/patches/server/0071-Make-sand-duping-fix-configurable.patch +++ b/patches/server/0072-Make-sand-duping-fix-configurable.patch @@ -59,23 +59,20 @@ index ce2c3c146ef64400e00084bd2245d2b87a67fbc2..2496b14c3a284d5a2f80a42e6cc23830 } // Paper end - fix sand duping diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index be563b466b9b9312254596ea3b8e116b28cf250c..ffc6da34591bc071b425b5538dd2da95ff078dc8 100644 +index 378d6f8eb10404e687080e0c306aae26e204967a..98eb5d1d32a93a7800d0d97401018e3ae7f8366f 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -255,4 +255,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { - - } - -+ public GameplayMechanics gameplayMechanics; -+ public class GameplayMechanics extends ConfigurationPart { -+ +@@ -270,6 +270,13 @@ public class GaleWorldConfiguration extends ConfigurationPart { + */ + public double entityWakeUpDurationRatioStandardDeviation = 0.2; + // Gale end - variable entity wake-up duration ++ + public Fixes fixes; + public class Fixes extends ConfigurationPart { + + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable + + } -+ -+ } -+ - } + + } + diff --git a/patches/server/0072-Fix-MC-238526.patch b/patches/server/0073-Fix-MC-238526.patch similarity index 95% rename from patches/server/0072-Fix-MC-238526.patch rename to patches/server/0073-Fix-MC-238526.patch index e3f7c6f..1cd17e5 100644 --- a/patches/server/0072-Fix-MC-238526.patch +++ b/patches/server/0073-Fix-MC-238526.patch @@ -49,10 +49,10 @@ index 35cfa366baf6747105faa93f1220bb9cc31a5bd5..2fcdb8173db167a440a5a94d1ec8f6c2 } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index ffc6da34591bc071b425b5538dd2da95ff078dc8..2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29 100644 +index 98eb5d1d32a93a7800d0d97401018e3ae7f8366f..eab771bf7cdefb3cec1c138bb35c21055313bcc3 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -262,7 +262,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -275,7 +275,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class Fixes extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable diff --git a/patches/server/0073-Fix-MC-123848.patch b/patches/server/0074-Fix-MC-123848.patch similarity index 95% rename from patches/server/0073-Fix-MC-123848.patch rename to patches/server/0074-Fix-MC-123848.patch index 7855a38..f5af157 100644 --- a/patches/server/0073-Fix-MC-123848.patch +++ b/patches/server/0074-Fix-MC-123848.patch @@ -58,10 +58,10 @@ index 30aec9dff249ae629b22318e52902361a9fa4099..c58fab79c9425a56cd9ffdfa81e4ea97 // Paper start - fix MC-252817 (green map markers do not disappear) this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29..ab5b2db71038decf68f3b0072367e986d5b25f82 100644 +index eab771bf7cdefb3cec1c138bb35c21055313bcc3..7940eac6d2df583d2b61cb872671ac20a952cce7 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -268,6 +268,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -281,6 +281,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc238526 = false; // Gale end - Purpur - fix MC-238526 diff --git a/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 96% rename from patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch index 934f78a..cb8de01 100644 --- a/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,10 +64,10 @@ index 68a5ee85e64802e4509ba0d184fc0ceb3cbe2d11..8ee1a0626e5a6c0ad19a25b8f476a2e1 entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index ab5b2db71038decf68f3b0072367e986d5b25f82..6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6 100644 +index 7940eac6d2df583d2b61cb872671ac20a952cce7..41f0e3a2da3ec4a2d516dbe6b5332b701cd0f3a1 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -262,7 +262,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -275,7 +275,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class Fixes extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable diff --git a/patches/server/0075-Fix-MC-121706.patch b/patches/server/0076-Fix-MC-121706.patch similarity index 95% rename from patches/server/0075-Fix-MC-121706.patch rename to patches/server/0076-Fix-MC-121706.patch index f4c386c..1ba5a99 100644 --- a/patches/server/0075-Fix-MC-121706.patch +++ b/patches/server/0076-Fix-MC-121706.patch @@ -65,10 +65,10 @@ index 6558b0d4bea99948fdc2b51751f3cfdc239d4b67..bedb5b8ee24817a494455f17e1f32b42 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6..7fb76d13d15c5133099dde75410631c31ee53ce2 100644 +index 41f0e3a2da3ec4a2d516dbe6b5332b701cd0f3a1..249cbffd6933f696b595189d73fb00735ca7abe5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -263,7 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -276,7 +276,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom @@ -77,7 +77,7 @@ index 6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6..7fb76d13d15c5133099dde75410631c3 // Gale start - Purpur - fix MC-238526 @Setting("mc-238526") public boolean mc238526 = false; -@@ -274,6 +274,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -287,6 +287,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc123848 = false; // Gale end - Purpur - fix MC-123848 diff --git a/patches/server/0076-Fix-MC-110386.patch b/patches/server/0077-Fix-MC-110386.patch similarity index 93% rename from patches/server/0076-Fix-MC-110386.patch rename to patches/server/0077-Fix-MC-110386.patch index 5b1589a..3819b41 100644 --- a/patches/server/0076-Fix-MC-110386.patch +++ b/patches/server/0077-Fix-MC-110386.patch @@ -35,10 +35,10 @@ index 39ea15c7577af186d93d4ad9a48034d746a86fc8..865eb39f4a1d2207c857acccc0695be9 } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 7fb76d13d15c5133099dde75410631c31ee53ce2..9254430412c59860d56cae6e46f8f64a3d1e2c87 100644 +index 249cbffd6933f696b595189d73fb00735ca7abe5..ab223d1b3174d18ffc1bbba7f9f13d66b6c29429 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -279,6 +279,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -292,6 +292,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc121706 = false; // Gale end - Purpur - fix MC-121706 diff --git a/patches/server/0077-Fix-MC-31819.patch b/patches/server/0078-Fix-MC-31819.patch similarity index 93% rename from patches/server/0077-Fix-MC-31819.patch rename to patches/server/0078-Fix-MC-31819.patch index 0b79c7e..290dde2 100644 --- a/patches/server/0077-Fix-MC-31819.patch +++ b/patches/server/0078-Fix-MC-31819.patch @@ -35,10 +35,10 @@ index 2b02800666b358159c8ecb63208a14855f90657b..9e7b5b876ec7aa90bf46afa6992fc59e if (!this.abilities.invulnerable) { if (!this.level.isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9254430412c59860d56cae6e46f8f64a3d1e2c87..d190b3ab4ed9f0c183932d235f9f7752a6177f31 100644 +index ab223d1b3174d18ffc1bbba7f9f13d66b6c29429..07fea98c1d8c4cc23bfac368a2e236c775d3691a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -284,6 +284,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -297,6 +297,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc110386 = true; // Gale end - Mirai - fix MC-110386 diff --git a/patches/server/0078-Fix-MC-26304.patch b/patches/server/0079-Fix-MC-26304.patch similarity index 100% rename from patches/server/0078-Fix-MC-26304.patch rename to patches/server/0079-Fix-MC-26304.patch diff --git a/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 95% rename from patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch index 0e31469..21db57a 100644 --- a/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,10 +49,10 @@ index c73024cc62490c336ffe26313580e88d25ca7078..c86dea3e38d72929a4970334e3cc4e93 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index d190b3ab4ed9f0c183932d235f9f7752a6177f31..f623518450d1d750b81b84da936282c2df949b7d 100644 +index 07fea98c1d8c4cc23bfac368a2e236c775d3691a..9e6f389748706a41f3115db19041b55f70614d0c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -263,6 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -276,6 +276,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom diff --git a/patches/server/0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch similarity index 92% rename from patches/server/0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch rename to patches/server/0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch index 6f18a4c..68e14de 100644 --- a/patches/server/0080-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch +++ b/patches/server/0081-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch @@ -59,13 +59,15 @@ index 80aa539f7c6a6ee44338de084cdcdf5fb4ef996a..cb8fc8a88c14d2374a0bbe35aa1c2056 return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f623518450d1d750b81b84da936282c2df949b7d..6bc83bfe35c52d314fde725c672de6971d8a86c5 100644 +index 9e6f389748706a41f3115db19041b55f70614d0c..f50b467b991d7a00030ec589e96026d0a7413e21 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -258,6 +258,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public GameplayMechanics gameplayMechanics; - public class GameplayMechanics extends ConfigurationPart { - +@@ -270,7 +270,9 @@ public class GaleWorldConfiguration extends ConfigurationPart { + */ + public double entityWakeUpDurationRatioStandardDeviation = 0.2; + // Gale end - variable entity wake-up duration +- ++ + public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public Fixes fixes; diff --git a/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 93% rename from patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch index dfc9798..7d71fb0 100644 --- a/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0082-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,11 +55,11 @@ index 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..e190f414ab5af7326d92af3fddf3f7a2 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 6bc83bfe35c52d314fde725c672de6971d8a86c5..711154b099acfe51705503ea5784727d4cac6ab1 100644 +index f50b467b991d7a00030ec589e96026d0a7413e21..ffa0c986b59f33292ea769a30784d429ce59ae6c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -259,6 +259,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class GameplayMechanics extends ConfigurationPart { +@@ -272,6 +272,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + // Gale end - variable entity wake-up duration public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0082-Make-logging-login-locations-configurable.patch b/patches/server/0083-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0082-Make-logging-login-locations-configurable.patch rename to patches/server/0083-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0083-Reduce-array-allocations.patch b/patches/server/0084-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0083-Reduce-array-allocations.patch rename to patches/server/0084-Reduce-array-allocations.patch diff --git a/patches/server/0084-Optimize-sun-burn-tick.patch b/patches/server/0085-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0084-Optimize-sun-burn-tick.patch rename to patches/server/0085-Optimize-sun-burn-tick.patch diff --git a/patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0086-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0087-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0088-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0089-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0089-Replace-class-map-with-optimized-collection.patch b/patches/server/0090-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0089-Replace-class-map-with-optimized-collection.patch rename to patches/server/0090-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0091-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0092-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0093-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0093-Cache-BlockStatePairKey-hash.patch b/patches/server/0094-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0093-Cache-BlockStatePairKey-hash.patch rename to patches/server/0094-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0094-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0095-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0094-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0095-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0096-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0097-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0097-Check-frozen-ticks-before-landing-block.patch b/patches/server/0098-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0097-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0098-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0098-Faster-chunk-serialization.patch b/patches/server/0099-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0098-Faster-chunk-serialization.patch rename to patches/server/0099-Faster-chunk-serialization.patch diff --git a/patches/server/0099-Update-boss-bar-within-tick.patch b/patches/server/0100-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0099-Update-boss-bar-within-tick.patch rename to patches/server/0100-Update-boss-bar-within-tick.patch diff --git a/patches/server/0100-Cache-ominous-banner-item.patch b/patches/server/0101-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0100-Cache-ominous-banner-item.patch rename to patches/server/0101-Cache-ominous-banner-item.patch diff --git a/patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0102-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0102-Cache-world-generator-sea-level.patch b/patches/server/0103-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0102-Cache-world-generator-sea-level.patch rename to patches/server/0103-Cache-world-generator-sea-level.patch diff --git a/patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0104-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0104-Optimize-villager-data-storage.patch b/patches/server/0105-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0104-Optimize-villager-data-storage.patch rename to patches/server/0105-Optimize-villager-data-storage.patch diff --git a/patches/server/0105-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0106-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0105-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0106-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0106-Store-mob-counts-in-an-array.patch b/patches/server/0107-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0106-Store-mob-counts-in-an-array.patch rename to patches/server/0107-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0107-Use-linked-map-for-entity-trackers.patch b/patches/server/0108-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0107-Use-linked-map-for-entity-trackers.patch rename to patches/server/0108-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0108-Optimize-noise-generation.patch b/patches/server/0109-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0108-Optimize-noise-generation.patch rename to patches/server/0109-Optimize-noise-generation.patch diff --git a/patches/server/0109-Optimize-sheep-offspring-color.patch b/patches/server/0110-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0109-Optimize-sheep-offspring-color.patch rename to patches/server/0110-Optimize-sheep-offspring-color.patch index a99df20..ff786e0 100644 --- a/patches/server/0109-Optimize-sheep-offspring-color.patch +++ b/patches/server/0110-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index fb3777e158065a6ce306a2a6e66bec053da2aeb4..8b17dd156aa321686570da1e62010727 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 711154b099acfe51705503ea5784727d4cac6ab1..122361057f2b25072ca763df68d614c176c57b5d 100644 +index ffa0c986b59f33292ea769a30784d429ce59ae6c..bb6cd08bae9bfea0baced2c4ab839ef693465157 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0110-Ignore-durability-change-equipment-updates.patch b/patches/server/0111-Ignore-durability-change-equipment-updates.patch similarity index 97% rename from patches/server/0110-Ignore-durability-change-equipment-updates.patch rename to patches/server/0111-Ignore-durability-change-equipment-updates.patch index bc51b38..c40ec5b 100644 --- a/patches/server/0110-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0111-Ignore-durability-change-equipment-updates.patch @@ -53,7 +53,7 @@ index 8155a806ccb200b8883ce6734c5b7e34338060ee..08638e5982083835cd90243e6edf4508 return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 122361057f2b25072ca763df68d614c176c57b5d..72ab895b4b64d224b847ec330512f1aed0b39f6b 100644 +index bb6cd08bae9bfea0baced2c4ab839ef693465157..418c57f1e8f14c0c92c7d46cb26e1064ee6a296c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -62,6 +62,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch similarity index 94% rename from patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch index 6142369..4cbfe61 100644 --- a/patches/server/0111-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,10 +31,10 @@ index 46fc1afdba3dc550bacbec4f5da5081d8eb0051f..70b9efbbee8ad78538379459d4e3b10c this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 72ab895b4b64d224b847ec330512f1aed0b39f6b..61d1cf5008da9969a08fcd3257f19c4d5c46ff16 100644 +index 418c57f1e8f14c0c92c7d46cb26e1064ee6a296c..5246237d49be75f3113791126e6ae9c94cc06972 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -277,6 +277,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -290,6 +290,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable diff --git a/patches/server/0112-Skip-cloning-advancement-criteria.patch b/patches/server/0113-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0112-Skip-cloning-advancement-criteria.patch rename to patches/server/0113-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0113-Reduce-block-destruction-packet-allocations.patch b/patches/server/0114-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0113-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0114-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch b/patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch similarity index 96% rename from patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch rename to patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch index 04410ff..6676efd 100644 --- a/patches/server/0114-Send-set-head-rotation-packets-only-for-living-entit.patch +++ b/patches/server/0115-Send-set-head-rotation-packets-only-for-living-entit.patch @@ -27,7 +27,7 @@ index 834b497053f4fa20cf94c00e1ee2db4838bdf233..b79e302cf4e0eae858e2322b5b260282 if (this.entity instanceof LivingEntity) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 61d1cf5008da9969a08fcd3257f19c4d5c46ff16..b18bc70c5ada1124e63cdbe8d75adf058a34bd4f 100644 +index 5246237d49be75f3113791126e6ae9c94cc06972..6ec49abd285e1e2c06842b4c25ca3bb262996452 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -64,6 +64,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0115-Spread-out-sending-all-player-info.patch b/patches/server/0116-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0115-Spread-out-sending-all-player-info.patch rename to patches/server/0116-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0116-Optimize-player-list-for-sending-player-info.patch b/patches/server/0117-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0116-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0117-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0117-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0118-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0118-Send-multiple-keep-alive-packets.patch b/patches/server/0119-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0118-Send-multiple-keep-alive-packets.patch rename to patches/server/0119-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0119-Make-slow-login-timeout-configurable.patch b/patches/server/0120-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0119-Make-slow-login-timeout-configurable.patch rename to patches/server/0120-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0120-Make-max-interaction-distance-configurable.patch b/patches/server/0121-Make-max-interaction-distance-configurable.patch similarity index 94% rename from patches/server/0120-Make-max-interaction-distance-configurable.patch rename to patches/server/0121-Make-max-interaction-distance-configurable.patch index badf25e..6706d99 100644 --- a/patches/server/0120-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0121-Make-max-interaction-distance-configurable.patch @@ -65,17 +65,19 @@ index 15611b8970b6cfb733a9f733d64d75c9934b65f7..25a8d3a1302c36f46eb3e0f9a5a532a3 private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b18bc70c5ada1124e63cdbe8d75adf058a34bd4f..a3fb445c105a0335bd3360122d39aea93ea2de59 100644 +index 6ec49abd285e1e2c06842b4c25ca3bb262996452..b63b05f2af042c60977b97184a3e0f7ae17683f5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -275,12 +275,26 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -275,7 +275,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { } public GameplayMechanics gameplayMechanics; - public class GameplayMechanics extends ConfigurationPart { + public class GameplayMechanics extends ConfigurationPart.Post { - public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + // Gale start - variable entity wake-up duration + /** +@@ -294,6 +294,20 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance @@ -96,7 +98,7 @@ index b18bc70c5ada1124e63cdbe8d75adf058a34bd4f..a3fb445c105a0335bd3360122d39aea9 public Fixes fixes; public class Fixes extends ConfigurationPart { -@@ -315,6 +329,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -328,6 +342,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0122-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 95% rename from patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0122-Load-portal-destination-chunk-before-entity-teleport.patch index ea96ae6..4158d2a 100644 --- a/patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0122-Load-portal-destination-chunk-before-entity-teleport.patch @@ -31,10 +31,10 @@ index 70b9efbbee8ad78538379459d4e3b10c688acad6..7945c979d229d0cae099ffee8568f4a9 entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index a3fb445c105a0335bd3360122d39aea93ea2de59..f2e8569007b9d52885696de76b1bd1e1035f8121 100644 +index b63b05f2af042c60977b97184a3e0f7ae17683f5..52eec168fa5788150da9ddd23d0cb0546e08d6df 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -329,6 +329,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -342,6 +342,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { } diff --git a/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch index 2642601..124445f 100644 --- a/patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0123-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..ffef23b9455613e8d9e4cc4e21e52b76 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f2e8569007b9d52885696de76b1bd1e1035f8121..75e0128d1f4f5b112f9908373b2e32941c68888e 100644 +index 52eec168fa5788150da9ddd23d0cb0546e08d6df..0c045b6846d5f0f99d4a71d6dff0334304dd3496 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 96% rename from patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch index 2a696e2..de77c5e 100644 --- a/patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0124-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 08f0497a51da53646c347a010e412760245290da..3d68dabe6348b01a322c271f06b8db820d3e062e 100644 +index 7945c979d229d0cae099ffee8568f4a9906ea819..24a6a1fb433ed8a5220cd68488d0244e8215bc5a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4378,6 +4378,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -79,7 +79,7 @@ index 17dbade3fa91ccc3db8792b5c2c9374ad3d61337..a076e8b852a87b67602a21f07048da15 if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 75e0128d1f4f5b112f9908373b2e32941c68888e..f611c38cb628569fbf3257e006f410d6f0a25d39 100644 +index 0c045b6846d5f0f99d4a71d6dff0334304dd3496..913803c3c4934b1ebcbe5f9f81f30b4a21e1acdf 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -287,6 +287,18 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0125-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 96% rename from patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0125-Broadcast-crit-animations-as-the-entity-being-critte.patch index 8e209e9..f2042b5 100644 --- a/patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0125-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,10 +38,10 @@ index 2dcab455bdc6b0742cd2322062678aa7cd173c79..37b6064586452c46c1417510c4130fba @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f611c38cb628569fbf3257e006f410d6f0a25d39..adf0489fac2798325123d42fd35a8b9b6865aa0b 100644 +index 913803c3c4934b1ebcbe5f9f81f30b4a21e1acdf..67cb63fc4f8cb59d5c3951955e65207528260311 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -331,6 +331,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0125-Ignore-null-legacy-structure-data.patch b/patches/server/0126-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0125-Ignore-null-legacy-structure-data.patch rename to patches/server/0126-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0126-Don-t-double-save-stored-user-lists.patch b/patches/server/0127-Don-t-double-save-stored-user-lists.patch similarity index 100% rename from patches/server/0126-Don-t-double-save-stored-user-lists.patch rename to patches/server/0127-Don-t-double-save-stored-user-lists.patch diff --git a/patches/server/0127-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0128-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0127-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0128-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0128-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0129-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 92% rename from patches/server/0128-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0129-Prevent-entities-random-strolling-into-non-ticking-c.patch index 85596fe..3a7a2f8 100644 --- a/patches/server/0128-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0129-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,11 +36,11 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..f9e0cf073abf3e0ffcedd4418a66c310 } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index adf0489fac2798325123d42fd35a8b9b6865aa0b..cc25c05262929b946cf696a1df0f24a50508db5e 100644 +index 67cb63fc4f8cb59d5c3951955e65207528260311..ec2038b4bd980d12109f5dbe9423613dc7e48cd1 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -307,6 +307,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class GameplayMechanics extends ConfigurationPart.Post { +@@ -320,6 +320,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + // Gale end - variable entity wake-up duration public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks diff --git a/patches/server/0129-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0130-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0129-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0130-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0130-CraftBukkit-UUID-to-world-map.patch b/patches/server/0131-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0130-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0131-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0131-Global-EULA-file.patch b/patches/server/0132-Global-EULA-file.patch similarity index 100% rename from patches/server/0131-Global-EULA-file.patch rename to patches/server/0132-Global-EULA-file.patch diff --git a/patches/server/0132-Specific-interval-TPS-API.patch b/patches/server/0133-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0132-Specific-interval-TPS-API.patch rename to patches/server/0133-Specific-interval-TPS-API.patch diff --git a/patches/server/0133-5-second-TPS-average.patch b/patches/server/0134-5-second-TPS-average.patch similarity index 100% rename from patches/server/0133-5-second-TPS-average.patch rename to patches/server/0134-5-second-TPS-average.patch diff --git a/patches/server/0134-Measure-last-tick-time.patch b/patches/server/0135-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0134-Measure-last-tick-time.patch rename to patches/server/0135-Measure-last-tick-time.patch diff --git a/patches/server/0135-Last-tick-time-API.patch b/patches/server/0136-Last-tick-time-API.patch similarity index 100% rename from patches/server/0135-Last-tick-time-API.patch rename to patches/server/0136-Last-tick-time-API.patch diff --git a/patches/server/0136-Show-last-tick-time-in-tps-command.patch b/patches/server/0137-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0136-Show-last-tick-time-in-tps-command.patch rename to patches/server/0137-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0137-Increase-time-statistics-in-intervals.patch b/patches/server/0138-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0137-Increase-time-statistics-in-intervals.patch rename to patches/server/0138-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0138-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0139-For-collision-check-has-physics-before-same-vehicle.patch similarity index 94% rename from patches/server/0138-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0139-For-collision-check-has-physics-before-same-vehicle.patch index 389077f..be63196 100644 --- a/patches/server/0138-For-collision-check-has-physics-before-same-vehicle.patch +++ b/patches/server/0139-For-collision-check-has-physics-before-same-vehicle.patch @@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3d68dabe6348b01a322c271f06b8db820d3e062e..45b5aa21f1429c462355b244f413e592011b2acd 100644 +index 24a6a1fb433ed8a5220cd68488d0244e8215bc5a..7ae7d4121344b9edae6105be8709e471dd857286 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1989,8 +1989,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0139-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0140-Skip-negligible-planar-movement-multiplication.patch similarity index 94% rename from patches/server/0139-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0140-Skip-negligible-planar-movement-multiplication.patch index 17d5d0f..3c52d13 100644 --- a/patches/server/0139-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0140-Skip-negligible-planar-movement-multiplication.patch @@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 45b5aa21f1429c462355b244f413e592011b2acd..b6404bfac381352b6ceb23a1b95ed5f3ccabe606 100644 +index 7ae7d4121344b9edae6105be8709e471dd857286..697fad59a6ab4fb41aac65979b42d8ed4b4c8c21 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1189,9 +1189,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0140-Optimize-identical-item-checks.patch b/patches/server/0141-Optimize-identical-item-checks.patch similarity index 100% rename from patches/server/0140-Optimize-identical-item-checks.patch rename to patches/server/0141-Optimize-identical-item-checks.patch diff --git a/patches/server/0141-Reduce-RandomSource-instances.patch b/patches/server/0142-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0141-Reduce-RandomSource-instances.patch rename to patches/server/0142-Reduce-RandomSource-instances.patch diff --git a/patches/server/0142-Server-thread-priority-environment-variable.patch b/patches/server/0143-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0142-Server-thread-priority-environment-variable.patch rename to patches/server/0143-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0143-Thread-safety-annotations.patch b/patches/server/0144-Thread-safety-annotations.patch similarity index 100% rename from patches/server/0143-Thread-safety-annotations.patch rename to patches/server/0144-Thread-safety-annotations.patch diff --git a/patches/server/0144-CPU-cores-estimation.patch b/patches/server/0145-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0144-CPU-cores-estimation.patch rename to patches/server/0145-CPU-cores-estimation.patch diff --git a/patches/server/0145-Virtual-threads-utility.patch b/patches/server/0146-Virtual-threads-utility.patch similarity index 100% rename from patches/server/0145-Virtual-threads-utility.patch rename to patches/server/0146-Virtual-threads-utility.patch diff --git a/patches/server/0146-CheckableLock-utility.patch b/patches/server/0147-CheckableLock-utility.patch similarity index 100% rename from patches/server/0146-CheckableLock-utility.patch rename to patches/server/0147-CheckableLock-utility.patch diff --git a/patches/server/0147-Mutex-utility.patch b/patches/server/0148-Mutex-utility.patch similarity index 100% rename from patches/server/0147-Mutex-utility.patch rename to patches/server/0148-Mutex-utility.patch diff --git a/patches/server/0148-Thread-aware-lock-utility.patch b/patches/server/0149-Thread-aware-lock-utility.patch similarity index 100% rename from patches/server/0148-Thread-aware-lock-utility.patch rename to patches/server/0149-Thread-aware-lock-utility.patch diff --git a/patches/server/0149-Unterminable-executor-utility.patch b/patches/server/0150-Unterminable-executor-utility.patch similarity index 100% rename from patches/server/0149-Unterminable-executor-utility.patch rename to patches/server/0150-Unterminable-executor-utility.patch diff --git a/patches/server/0150-FIFO-concurrent-queue-utility.patch b/patches/server/0151-FIFO-concurrent-queue-utility.patch similarity index 100% rename from patches/server/0150-FIFO-concurrent-queue-utility.patch rename to patches/server/0151-FIFO-concurrent-queue-utility.patch diff --git a/patches/server/0151-Base-thread-pool.patch b/patches/server/0152-Base-thread-pool.patch similarity index 100% rename from patches/server/0151-Base-thread-pool.patch rename to patches/server/0152-Base-thread-pool.patch diff --git a/patches/server/0152-Watch-for-blocking-base-threads.patch b/patches/server/0153-Watch-for-blocking-base-threads.patch similarity index 100% rename from patches/server/0152-Watch-for-blocking-base-threads.patch rename to patches/server/0153-Watch-for-blocking-base-threads.patch diff --git a/patches/server/0153-Non-blocking-PooledObjects.patch b/patches/server/0154-Non-blocking-PooledObjects.patch similarity index 100% rename from patches/server/0153-Non-blocking-PooledObjects.patch rename to patches/server/0154-Non-blocking-PooledObjects.patch diff --git a/patches/server/0154-Yielding-memoized-Supplier.patch b/patches/server/0155-Yielding-memoized-Supplier.patch similarity index 100% rename from patches/server/0154-Yielding-memoized-Supplier.patch rename to patches/server/0155-Yielding-memoized-Supplier.patch diff --git a/patches/server/0155-Yielding-ChunkHolderManager.patch b/patches/server/0156-Yielding-ChunkHolderManager.patch similarity index 100% rename from patches/server/0155-Yielding-ChunkHolderManager.patch rename to patches/server/0156-Yielding-ChunkHolderManager.patch diff --git a/patches/server/0156-Run-async-executor-tasks-on-base-thread-pool.patch b/patches/server/0157-Run-async-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0156-Run-async-executor-tasks-on-base-thread-pool.patch rename to patches/server/0157-Run-async-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0157-Run-background-executor-tasks-on-base-thread-pool.patch b/patches/server/0158-Run-background-executor-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0157-Run-background-executor-tasks-on-base-thread-pool.patch rename to patches/server/0158-Run-background-executor-tasks-on-base-thread-pool.patch diff --git a/patches/server/0158-Run-world-upgrade-tasks-on-base-thread-pool.patch b/patches/server/0159-Run-world-upgrade-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0158-Run-world-upgrade-tasks-on-base-thread-pool.patch rename to patches/server/0159-Run-world-upgrade-tasks-on-base-thread-pool.patch diff --git a/patches/server/0159-Run-tab-completion-tasks-on-base-thread-pool.patch b/patches/server/0160-Run-tab-completion-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0159-Run-tab-completion-tasks-on-base-thread-pool.patch rename to patches/server/0160-Run-tab-completion-tasks-on-base-thread-pool.patch diff --git a/patches/server/0160-Run-text-filter-tasks-on-base-thread-pool.patch b/patches/server/0161-Run-text-filter-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0160-Run-text-filter-tasks-on-base-thread-pool.patch rename to patches/server/0161-Run-text-filter-tasks-on-base-thread-pool.patch diff --git a/patches/server/0161-Run-cleaner-tasks-on-base-thread-pool.patch b/patches/server/0162-Run-cleaner-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0161-Run-cleaner-tasks-on-base-thread-pool.patch rename to patches/server/0162-Run-cleaner-tasks-on-base-thread-pool.patch diff --git a/patches/server/0162-Run-chunk-cache-tasks-on-base-thread-pool.patch b/patches/server/0163-Run-chunk-cache-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0162-Run-chunk-cache-tasks-on-base-thread-pool.patch rename to patches/server/0163-Run-chunk-cache-tasks-on-base-thread-pool.patch diff --git a/patches/server/0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch b/patches/server/0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0163-Run-TickThread-chunk-tasks-on-base-thread-pool.patch rename to patches/server/0164-Run-TickThread-chunk-tasks-on-base-thread-pool.patch diff --git a/patches/server/0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch b/patches/server/0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch similarity index 100% rename from patches/server/0164-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch rename to patches/server/0165-BaseThread-PrioritisedQueueExecutorThread-agent-util.patch diff --git a/patches/server/0165-Run-chunk-worker-tasks-on-base-thread-pool.patch b/patches/server/0166-Run-chunk-worker-tasks-on-base-thread-pool.patch similarity index 100% rename from patches/server/0165-Run-chunk-worker-tasks-on-base-thread-pool.patch rename to patches/server/0166-Run-chunk-worker-tasks-on-base-thread-pool.patch diff --git a/patches/server/0166-Split-tick-steps.patch b/patches/server/0167-Split-tick-steps.patch similarity index 100% rename from patches/server/0166-Split-tick-steps.patch rename to patches/server/0167-Split-tick-steps.patch diff --git a/patches/server/0167-Multithreaded-ticking.patch b/patches/server/0168-Multithreaded-ticking.patch similarity index 100% rename from patches/server/0167-Multithreaded-ticking.patch rename to patches/server/0168-Multithreaded-ticking.patch diff --git a/patches/server/0168-Yielding-ChunkTaskScheduler.patch b/patches/server/0169-Yielding-ChunkTaskScheduler.patch similarity index 100% rename from patches/server/0168-Yielding-ChunkTaskScheduler.patch rename to patches/server/0169-Yielding-ChunkTaskScheduler.patch