From b22fc1fd60a0f5200ea7800084479f653eac35d8 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Mon, 10 Jun 2024 13:10:03 +0000 Subject: [PATCH] Try fixing folia off region POI accessing issue --- ...folia-off-region-POI-accessing-issue.patch | 45 +++++++++++++++++++ ...sync-calling-during-moving-event-be.patch} | 4 +- ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 2 +- ...ch => 0020-Petal-Reduce-sensor-work.patch} | 2 +- ...fish-Optimize-entity-coordinate-key.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 2 +- ...ish-Improve-fluid-direction-caching.patch} | 0 ...024-Pufferfish-Optimize-suffocation.patch} | 0 ...return-optimization-for-target-find.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...per-6045-block-goal-shouldn-t-load-.patch} | 0 ...e-entity-fluid-lookups-if-no-fluids.patch} | 2 +- ...heck-for-spooky-season-once-an-hour.patch} | 0 ...patch => 0030-Pufferfish-Entity-TTL.patch} | 2 +- ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...ferfish-Dynamic-Activation-of-Brain.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 2 +- ...ufferfish-Reduce-entity-allocations.patch} | 0 ...ve-container-checking-with-a-bitset.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...hunks-to-activate-climbing-entities.patch} | 2 +- ...=> 0038-Gale-Optimize-sun-burn-tick.patch} | 0 ...k-frozen-ticks-before-landing-block.patch} | 0 ...r-lootable-refresh-for-non-player-i.patch} | 2 +- ...41-Gale-Use-platform-math-functions.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 2 +- ...ld-generation-chunk-and-block-acces.patch} | 0 ...0044-Gale-Optimize-noise-generation.patch} | 0 ...045-Gale-Faster-chunk-serialization.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ...-goal-set-with-optimized-collection.patch} | 0 ...ttributes-with-optimized-collection.patch} | 2 +- ...ttle-tracker-map-with-optimized-col.patch} | 0 ...parkly-Paper-Optimize-canSee-checks.patch} | 0 ...1-Purpur-use-alternative-keep-alive.patch} | 0 ...-start-tick-and-finished-tick-event.patch} | 0 ...patch => 0053-Leaves-Replay-Mod-API.patch} | 0 ...-172047.patch => 0054-Fix-MC-172047.patch} | 0 ...x-MC-2025.patch => 0055-Fix-MC-2025.patch} | 2 +- ...k-API.patch => 0056-KioCG-Chunk-API.patch} | 0 ...ch => 0057-Added-chunkhot-to-tpsbar.patch} | 0 42 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch rename patches/server/{0016-Prevent-teleportAsync-calling-during-moving-event-be.patch => 0017-Prevent-teleportAsync-calling-during-moving-event-be.patch} (97%) rename patches/server/{0017-Kaiiju-Don-t-pathfind-outside-region.patch => 0018-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0018-Kaiiju-Vanilla-end-portal-teleportation.patch => 0019-Kaiiju-Vanilla-end-portal-teleportation.patch} (97%) rename patches/server/{0019-Petal-Reduce-sensor-work.patch => 0020-Petal-Reduce-sensor-work.patch} (96%) rename patches/server/{0020-Pufferfish-Optimize-entity-coordinate-key.patch => 0021-Pufferfish-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0021-Pufferfish-Cache-climbing-check-for-activation.patch => 0022-Pufferfish-Cache-climbing-check-for-activation.patch} (96%) rename patches/server/{0022-Pufferfish-Improve-fluid-direction-caching.patch => 0023-Pufferfish-Improve-fluid-direction-caching.patch} (100%) rename patches/server/{0023-Pufferfish-Optimize-suffocation.patch => 0024-Pufferfish-Optimize-suffocation.patch} (100%) rename patches/server/{0024-Pufferfish-Early-return-optimization-for-target-find.patch => 0025-Pufferfish-Early-return-optimization-for-target-find.patch} (100%) rename patches/server/{0025-Pufferfish-Reduce-chunk-loading-lookups.patch => 0026-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0026-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%) rename patches/server/{0027-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch => 0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch} (98%) rename patches/server/{0028-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch => 0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%) rename patches/server/{0029-Pufferfish-Entity-TTL.patch => 0030-Pufferfish-Entity-TTL.patch} (97%) rename patches/server/{0030-Pufferfish-Reduce-projectile-chunk-loading.patch => 0031-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename patches/server/{0031-Pufferfish-Dynamic-Activation-of-Brain.patch => 0032-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%) rename patches/server/{0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (96%) rename patches/server/{0033-Pufferfish-Reduce-entity-allocations.patch => 0034-Pufferfish-Reduce-entity-allocations.patch} (100%) rename patches/server/{0034-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0035-Pufferfish-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0035-Gale-Variable-entity-wake-up-duration.patch => 0036-Gale-Variable-entity-wake-up-duration.patch} (100%) rename patches/server/{0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (97%) rename patches/server/{0037-Gale-Optimize-sun-burn-tick.patch => 0038-Gale-Optimize-sun-burn-tick.patch} (100%) rename patches/server/{0038-Gale-Check-frozen-ticks-before-landing-block.patch => 0039-Gale-Check-frozen-ticks-before-landing-block.patch} (100%) rename patches/server/{0039-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch => 0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch} (92%) rename patches/server/{0040-Gale-Use-platform-math-functions.patch => 0041-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0041-Gale-Skip-entity-move-if-movement-is-zero.patch => 0042-Gale-Skip-entity-move-if-movement-is-zero.patch} (95%) rename patches/server/{0042-Gale-Optimize-world-generation-chunk-and-block-acces.patch => 0043-Gale-Optimize-world-generation-chunk-and-block-acces.patch} (100%) rename patches/server/{0043-Gale-Optimize-noise-generation.patch => 0044-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0044-Gale-Faster-chunk-serialization.patch => 0045-Gale-Faster-chunk-serialization.patch} (100%) rename patches/server/{0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0046-Gale-Replace-AI-goal-set-with-optimized-collection.patch => 0047-Gale-Replace-AI-goal-set-with-optimized-collection.patch} (100%) rename patches/server/{0047-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0048-Gale-Replace-AI-attributes-with-optimized-collection.patch} (95%) rename patches/server/{0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0049-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0049-Sparkly-Paper-Optimize-canSee-checks.patch => 0050-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0050-Purpur-use-alternative-keep-alive.patch => 0051-Purpur-use-alternative-keep-alive.patch} (100%) rename patches/server/{0051-Threaded-region-start-tick-and-finished-tick-event.patch => 0052-Threaded-region-start-tick-and-finished-tick-event.patch} (100%) rename patches/server/{0052-Leaves-Replay-Mod-API.patch => 0053-Leaves-Replay-Mod-API.patch} (100%) rename patches/server/{0053-Fix-MC-172047.patch => 0054-Fix-MC-172047.patch} (100%) rename patches/server/{0054-Fix-MC-2025.patch => 0055-Fix-MC-2025.patch} (95%) rename patches/server/{0055-KioCG-Chunk-API.patch => 0056-KioCG-Chunk-API.patch} (100%) rename patches/server/{0056-Added-chunkhot-to-tpsbar.patch => 0057-Added-chunkhot-to-tpsbar.patch} (100%) diff --git a/patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch b/patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch new file mode 100644 index 0000000..e36ed1c --- /dev/null +++ b/patches/server/0016-Try-fixing-folia-off-region-POI-accessing-issue.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Mon, 10 Jun 2024 13:07:46 +0000 +Subject: [PATCH] Try fixing folia off region POI accessing issue + + +diff --git a/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..343c85ded7e7abc22fac0aaeb7be786e9bd7b39a +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPOIAccessOffRegionFixConfig.java +@@ -0,0 +1,20 @@ ++package me.earthme.luminol.config.modules.fixes; ++ ++import me.earthme.luminol.config.ConfigInfo; ++import me.earthme.luminol.config.EnumConfigCategory; ++import me.earthme.luminol.config.IConfigModule; ++ ++public class FoliaPOIAccessOffRegionFixConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.FIXES; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "folia.fix_poi_access_off_region"; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java +index 79e9e5ece5859938ca0c86ead4c25cf5bde9da27..63256feea83be1b180b1183cec94bab29b030c62 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java ++++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java +@@ -82,7 +82,7 @@ public class PoiManager extends SectionStorage { + + public Stream getInSquare(Predicate> typePredicate, BlockPos pos, int radius, PoiManager.Occupancy occupationStatus) { + int i = Math.floorDiv(radius, 16) + 1; +- return ChunkPos.rangeClosed(new ChunkPos(pos), i).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, occupationStatus)).filter(poi -> { ++ return ChunkPos.rangeClosed(new ChunkPos(pos), i).filter(cpos -> me.earthme.luminol.config.modules.fixes.FoliaPOIAccessOffRegionFixConfig.enabled ? io.papermc.paper.util.TickThread.isTickThreadFor(this.world,cpos) : true).flatMap(chunkPos -> this.getInChunk(typePredicate, chunkPos, occupationStatus)).filter(poi -> { //Luminol - Fix off region POI access + BlockPos blockPos2 = poi.getPos(); + return Math.abs(blockPos2.getX() - pos.getX()) <= radius && Math.abs(blockPos2.getZ() - pos.getZ()) <= radius; + }); diff --git a/patches/server/0016-Prevent-teleportAsync-calling-during-moving-event-be.patch b/patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch similarity index 97% rename from patches/server/0016-Prevent-teleportAsync-calling-during-moving-event-be.patch rename to patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch index 7a7e193..ae9d34f 100644 --- a/patches/server/0016-Prevent-teleportAsync-calling-during-moving-event-be.patch +++ b/patches/server/0017-Prevent-teleportAsync-calling-during-moving-event-be.patch @@ -48,7 +48,7 @@ index 46df26bef2f1d4b0bd5a1313e8ee4f86c2fdf355..0086a1a4611b983eefd0cb7bf8e9cff6 super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); this.chatVisibility = ChatVisiblity.FULL; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 954809d8997750959541e6462668f17efd0b0f70..4fc9a47745b817d9ee2da4776cab26ff9f3b0025 100644 +index e7b510dee355a9865bd67f5aea52c62957226eb3..e0f12426f18b343b27089440cd01127d79600ef0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -675,7 +675,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -72,7 +72,7 @@ index 954809d8997750959541e6462668f17efd0b0f70..4fc9a47745b817d9ee2da4776cab26ff // If the event is cancelled we move the player back to their old location. if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 36f0175228f4ab80ebc67082e7c9bbbc2c14e147..ad15df5dfe34e20a6b5dafaf01e8a7306b158109 100644 +index cbf5bda50b87b8520ee6fa6d0b41c94b5c9f3583..ac4533f69e9bb22c7375ad8bc83ddc23399a56d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3986,6 +3986,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0017-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0017-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0018-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0018-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 97% rename from patches/server/0018-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch index 3df4eb3..aaacf84 100644 --- a/patches/server/0018-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/patches/server/0019-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8749e1d7109b751ec69e771b43014c085c0802cd..b676200cb54afa7aebe23eee4e7aef7c9a6e0712 100644 +index ac4533f69e9bb22c7375ad8bc83ddc23399a56d7..2ff3216c3789fc4779bb18502cb288f57e370ea0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4193,12 +4193,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0019-Petal-Reduce-sensor-work.patch b/patches/server/0020-Petal-Reduce-sensor-work.patch similarity index 96% rename from patches/server/0019-Petal-Reduce-sensor-work.patch rename to patches/server/0020-Petal-Reduce-sensor-work.patch index 863d5e1..4a33a21 100644 --- a/patches/server/0019-Petal-Reduce-sensor-work.patch +++ b/patches/server/0020-Petal-Reduce-sensor-work.patch @@ -33,7 +33,7 @@ index 0000000000000000000000000000000000000000..dd45cf1fde5ee4cf8347064f106c64b8 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 54297b9dde40fe853d873d60373cd8c0a3c9466b..7369d608c26e46e9d3a881ac14efe1d0f075b1cb 100644 +index 3228d15fc21fec08e8683f96c829935a1de6cf45..7433a29577ecb36e847bd610059c0c83702d01f6 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -926,10 +926,11 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/server/0020-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0021-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0020-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0021-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 96% rename from patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch index a2f9c0e..11a31f5 100644 --- a/patches/server/0021-Pufferfish-Cache-climbing-check-for-activation.patch +++ b/patches/server/0022-Pufferfish-Cache-climbing-check-for-activation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Cache climbing check for activation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b676200cb54afa7aebe23eee4e7aef7c9a6e0712..2fb2df4922a1b5b3acf732e68d8db7bb15ecc789 100644 +index 2ff3216c3789fc4779bb18502cb288f57e370ea0..a19773b8721fb4011a48738977a162358b4dbcb5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -309,7 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0022-Pufferfish-Improve-fluid-direction-caching.patch b/patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0022-Pufferfish-Improve-fluid-direction-caching.patch rename to patches/server/0023-Pufferfish-Improve-fluid-direction-caching.patch diff --git a/patches/server/0023-Pufferfish-Optimize-suffocation.patch b/patches/server/0024-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0023-Pufferfish-Optimize-suffocation.patch rename to patches/server/0024-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0024-Pufferfish-Early-return-optimization-for-target-find.patch b/patches/server/0025-Pufferfish-Early-return-optimization-for-target-find.patch similarity index 100% rename from patches/server/0024-Pufferfish-Early-return-optimization-for-target-find.patch rename to patches/server/0025-Pufferfish-Early-return-optimization-for-target-find.patch diff --git a/patches/server/0025-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0025-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0026-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0026-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0026-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0027-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0027-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 98% rename from patches/server/0027-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/server/0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch index 903ef93..f06f723 100644 --- a/patches/server/0027-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch +++ b/patches/server/0028-Pufferfish-Reduce-entity-fluid-lookups-if-no-fluids.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Pufferfish Reduce entity fluid lookups if no fluids diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2fb2df4922a1b5b3acf732e68d8db7bb15ecc789..9b4a9025f9b30834a07a83cc02e7ee7f665dcbd9 100644 +index a19773b8721fb4011a48738977a162358b4dbcb5..ada744f8e594dbec516e2a66beaf6140e98d7510 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -5260,16 +5260,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0028-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0028-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0029-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0029-Pufferfish-Entity-TTL.patch b/patches/server/0030-Pufferfish-Entity-TTL.patch similarity index 97% rename from patches/server/0029-Pufferfish-Entity-TTL.patch rename to patches/server/0030-Pufferfish-Entity-TTL.patch index cbadd13..1fff063 100644 --- a/patches/server/0029-Pufferfish-Entity-TTL.patch +++ b/patches/server/0030-Pufferfish-Entity-TTL.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..15697d69659b6e1e776acf5094684b5f + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9b4a9025f9b30834a07a83cc02e7ee7f665dcbd9..835a6e73a340375e30e4822df45a1c99d36ac009 100644 +index ada744f8e594dbec516e2a66beaf6140e98d7510..5c36b3c6bf38acfa3f38dcca4b666aca9665e7d4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -812,6 +812,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0031-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0031-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0031-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0032-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 96% rename from patches/server/0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch index a1c58ce..1446367 100644 --- a/patches/server/0032-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch +++ b/patches/server/0033-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..acc032f727e605e79b688efb4873ff47 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 7f6b810f175e21dbbc85d17fefbba2a7c638144d..a892ff1b3bc11df5f46269c5ae8838c4a7f91ea9 100644 +index 397c8ef1c83f0bf3c03d31ee19dbf1533dba9e48..abbbd6b56af8a177cd8ebfc5aa34c3f7282bdc59 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -230,11 +230,13 @@ public abstract class Mob extends LivingEntity implements Targeting { diff --git a/patches/server/0033-Pufferfish-Reduce-entity-allocations.patch b/patches/server/0034-Pufferfish-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0033-Pufferfish-Reduce-entity-allocations.patch rename to patches/server/0034-Pufferfish-Reduce-entity-allocations.patch diff --git a/patches/server/0034-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0035-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0034-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0035-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0035-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0036-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0035-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0036-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 97% rename from patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch index a352a95..c81ba40 100644 --- a/patches/server/0036-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0037-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..ed62d25d6cd6dfcf8c5db20ced36eb3d + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c7c0f6e399e472792ecad75fc402a64785fae818..31f80438e82da6de1cd1ec35a2f77c45f0127722 100644 +index 5b76c645214852f172c2a498751438090cc970ec..62f997aae20fe392bc271b23b632441ce989c69c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -5458,6 +5458,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0037-Gale-Optimize-sun-burn-tick.patch b/patches/server/0038-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0037-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0038-Gale-Optimize-sun-burn-tick.patch diff --git a/patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch b/patches/server/0039-Gale-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0038-Gale-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0039-Gale-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0039-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch b/patches/server/0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch similarity index 92% rename from patches/server/0039-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch rename to patches/server/0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch index 1471768..7b8bd1c 100644 --- a/patches/server/0039-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch +++ b/patches/server/0040-Gale-Don-t-trigger-lootable-refresh-for-non-player-i.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Gale Don't trigger lootable refresh for non-player diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -index a5cd70b6ada2b44f64db0985483ee5eadc67003f..e49be65c2d379027c2821c0db7f151bc3cd20a4b 100644 +index fa64bf5ad13c278438039b663ea3134e72108411..cb3318c124337868f763b0e060f90e7eb3ba466d 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java @@ -68,6 +68,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc diff --git a/patches/server/0040-Gale-Use-platform-math-functions.patch b/patches/server/0041-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0040-Gale-Use-platform-math-functions.patch rename to patches/server/0041-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch index 76b84f6..8c08ab4 100644 --- a/patches/server/0041-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0042-Gale-Skip-entity-move-if-movement-is-zero.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Skip entity move if movement is zero diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6948342ef9fa4af0e13707e85cd788c815e34544..29cbafa048f61f7eb7d35dd103faff8c2b4a77f5 100644 +index 485ca9a13a04ee47b27f1d23c6323583139865a1..2072664329f68552f43db55dee283ba96951ac09 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0042-Gale-Optimize-world-generation-chunk-and-block-acces.patch b/patches/server/0043-Gale-Optimize-world-generation-chunk-and-block-acces.patch similarity index 100% rename from patches/server/0042-Gale-Optimize-world-generation-chunk-and-block-acces.patch rename to patches/server/0043-Gale-Optimize-world-generation-chunk-and-block-acces.patch diff --git a/patches/server/0043-Gale-Optimize-noise-generation.patch b/patches/server/0044-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0043-Gale-Optimize-noise-generation.patch rename to patches/server/0044-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0044-Gale-Faster-chunk-serialization.patch b/patches/server/0045-Gale-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0044-Gale-Faster-chunk-serialization.patch rename to patches/server/0045-Gale-Faster-chunk-serialization.patch diff --git a/patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0045-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0046-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0046-Gale-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0047-Gale-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0046-Gale-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0047-Gale-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0047-Gale-Replace-AI-attributes-with-optimized-collection.patch b/patches/server/0048-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 95% rename from patches/server/0047-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to patches/server/0048-Gale-Replace-AI-attributes-with-optimized-collection.patch index 2119d13..b0a408c 100644 --- a/patches/server/0047-Gale-Replace-AI-attributes-with-optimized-collection.patch +++ b/patches/server/0048-Gale-Replace-AI-attributes-with-optimized-collection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Gale Replace AI attributes with optimized collections diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index 683c9693754d1a87b7e8fccc757a0d0963351f60..d904cc2d882f62f74ff34f7e8266947798563ed4 100644 +index 8d6954d05d2bf6d6c1c4953db3127b011a858cec..0ddb031bfe8df351f1cf97d258f81558e4719dbf 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java @@ -1,8 +1,6 @@ diff --git a/patches/server/0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0049-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0048-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0049-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0049-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0049-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0050-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0050-Purpur-use-alternative-keep-alive.patch b/patches/server/0051-Purpur-use-alternative-keep-alive.patch similarity index 100% rename from patches/server/0050-Purpur-use-alternative-keep-alive.patch rename to patches/server/0051-Purpur-use-alternative-keep-alive.patch diff --git a/patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch similarity index 100% rename from patches/server/0051-Threaded-region-start-tick-and-finished-tick-event.patch rename to patches/server/0052-Threaded-region-start-tick-and-finished-tick-event.patch diff --git a/patches/server/0052-Leaves-Replay-Mod-API.patch b/patches/server/0053-Leaves-Replay-Mod-API.patch similarity index 100% rename from patches/server/0052-Leaves-Replay-Mod-API.patch rename to patches/server/0053-Leaves-Replay-Mod-API.patch diff --git a/patches/server/0053-Fix-MC-172047.patch b/patches/server/0054-Fix-MC-172047.patch similarity index 100% rename from patches/server/0053-Fix-MC-172047.patch rename to patches/server/0054-Fix-MC-172047.patch diff --git a/patches/server/0054-Fix-MC-2025.patch b/patches/server/0055-Fix-MC-2025.patch similarity index 95% rename from patches/server/0054-Fix-MC-2025.patch rename to patches/server/0055-Fix-MC-2025.patch index e9fe033..4eb0d4d 100644 --- a/patches/server/0054-Fix-MC-2025.patch +++ b/patches/server/0055-Fix-MC-2025.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix-MC-2025 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 29cbafa048f61f7eb7d35dd103faff8c2b4a77f5..0893b62e72fe03a14e7617f28676f53f77e7624c 100644 +index 2072664329f68552f43db55dee283ba96951ac09..82ffe6571b06a482296fb28e37aa148daf6a0ce6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2549,6 +2549,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0055-KioCG-Chunk-API.patch b/patches/server/0056-KioCG-Chunk-API.patch similarity index 100% rename from patches/server/0055-KioCG-Chunk-API.patch rename to patches/server/0056-KioCG-Chunk-API.patch diff --git a/patches/server/0056-Added-chunkhot-to-tpsbar.patch b/patches/server/0057-Added-chunkhot-to-tpsbar.patch similarity index 100% rename from patches/server/0056-Added-chunkhot-to-tpsbar.patch rename to patches/server/0057-Added-chunkhot-to-tpsbar.patch