From 74aeb4fe5df3d9f2de1f2f4b8a51dd8dd532434a Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Wed, 1 Jan 2025 12:19:31 +0800 Subject: [PATCH] Set old pos before moving entity by piston --- ...d-pos-before-moving-entity-by-piston.patch | 44 +++++++++++++++++++ ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...ch => 0029-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...per-6045-block-goal-shouldn-t-load-.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...heck-for-spooky-season-once-an-hour.patch} | 0 ...035-Pufferfish-Optimize-suffocation.patch} | 0 ...ferfish-Dynamic-Activation-of-Brain.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...h => 0038-Pufferfish-SIMD-Utilities.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...=> 0040-Gale-Optimize-sun-burn-tick.patch} | 0 ...41-Gale-Use-platform-math-functions.patch} | 0 ...0042-Gale-Optimize-noise-generation.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ...ttle-tracker-map-with-optimized-col.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...parkly-Paper-Optimize-canSee-checks.patch} | 0 ...-MapItem-update-if-the-map-does-not.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...I-and-display-of-chunkhot-in-tpsbar.patch} | 0 ...050-Leaf-Skip-event-if-no-listeners.patch} | 0 ...1-Purpur-use-alternative-keep-alive.patch} | 0 ...-start-tick-and-finished-tick-event.patch} | 0 ...x-MC-2025.patch => 0053-Fix-MC-2025.patch} | 0 ...=> 0054-FoliaPR-Add-TPS-From-Region.patch} | 0 ...=> 0055-Leaves-Fix-color-in-console.patch} | 0 31 files changed, 44 insertions(+) create mode 100644 patches/server/0025-Set-old-pos-before-moving-entity-by-piston.patch rename patches/server/{0025-Kaiiju-Don-t-pathfind-outside-region.patch => 0026-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0026-Kaiiju-Vanilla-end-portal-teleportation.patch => 0027-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename patches/server/{0027-Kaiiju-Entity-tick-and-removal-limiter.patch => 0028-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename patches/server/{0028-Petal-Reduce-sensor-work.patch => 0029-Petal-Reduce-sensor-work.patch} (100%) rename patches/server/{0029-Pufferfish-Cache-climbing-check-for-activation.patch => 0030-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename patches/server/{0030-Pufferfish-Reduce-chunk-loading-lookups.patch => 0031-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch => 0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch} (100%) rename patches/server/{0032-Pufferfish-Reduce-projectile-chunk-loading.patch => 0033-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename patches/server/{0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch => 0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch} (100%) rename patches/server/{0034-Pufferfish-Optimize-suffocation.patch => 0035-Pufferfish-Optimize-suffocation.patch} (100%) rename patches/server/{0035-Pufferfish-Dynamic-Activation-of-Brain.patch => 0036-Pufferfish-Dynamic-Activation-of-Brain.patch} (100%) rename patches/server/{0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename patches/server/{0037-Pufferfish-SIMD-Utilities.patch => 0038-Pufferfish-SIMD-Utilities.patch} (100%) rename patches/server/{0038-Gale-Variable-entity-wake-up-duration.patch => 0039-Gale-Variable-entity-wake-up-duration.patch} (100%) rename patches/server/{0039-Gale-Optimize-sun-burn-tick.patch => 0040-Gale-Optimize-sun-burn-tick.patch} (100%) rename patches/server/{0040-Gale-Use-platform-math-functions.patch => 0041-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0041-Gale-Optimize-noise-generation.patch => 0042-Gale-Optimize-noise-generation.patch} (100%) rename patches/server/{0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0043-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename patches/server/{0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch => 0044-Gale-Replace-throttle-tracker-map-with-optimized-col.patch} (100%) rename patches/server/{0044-Gale-Skip-entity-move-if-movement-is-zero.patch => 0045-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0045-Sparkly-Paper-Optimize-canSee-checks.patch => 0046-Sparkly-Paper-Optimize-canSee-checks.patch} (100%) rename patches/server/{0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch => 0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch} (100%) rename patches/server/{0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch => 0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch} (100%) rename patches/server/{0049-Leaf-Skip-event-if-no-listeners.patch => 0050-Leaf-Skip-event-if-no-listeners.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-Fix-MC-2025.patch => 0053-Fix-MC-2025.patch} (100%) rename patches/server/{0053-FoliaPR-Add-TPS-From-Region.patch => 0054-FoliaPR-Add-TPS-From-Region.patch} (100%) rename patches/server/{0054-Leaves-Fix-color-in-console.patch => 0055-Leaves-Fix-color-in-console.patch} (100%) diff --git a/patches/server/0025-Set-old-pos-before-moving-entity-by-piston.patch b/patches/server/0025-Set-old-pos-before-moving-entity-by-piston.patch new file mode 100644 index 0000000..182e4e2 --- /dev/null +++ b/patches/server/0025-Set-old-pos-before-moving-entity-by-piston.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Wed, 1 Jan 2025 12:18:18 +0800 +Subject: [PATCH] Set old pos before moving entity by piston + + +diff --git a/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPistonIssueFixConfig.java b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPistonIssueFixConfig.java +new file mode 100644 +index 0000000000000000000000000000000000000000..6edfb1d36a88d319151d28ba14873269736f84b6 +--- /dev/null ++++ b/src/main/java/me/earthme/luminol/config/modules/fixes/FoliaPistonIssueFixConfig.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 FoliaPistonIssueFixConfig implements IConfigModule { ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.FIXES; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "folia.fix_piston_moving_issue"; ++ } ++} +diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +index c3a04ef842630b3df447dea48b84bccde0c89e83..9545f46c22cb7dcdf2412f9a741dc51be40faace 100644 +--- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +@@ -195,6 +195,7 @@ public class PistonMovingBlockEntity extends BlockEntity { + + private static void moveEntityByPiston(Direction direction, Entity entity, double distance, Direction movementDirection) { + NOCLIP.set(direction); ++ if (me.earthme.luminol.config.modules.fixes.FoliaPistonIssueFixConfig.enabled) entity.setOldPosAndRot(); // Luminol- Try fixing folia issue #311 + entity.move( + MoverType.PISTON, + new Vec3( diff --git a/patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch b/patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0025-Kaiiju-Don-t-pathfind-outside-region.patch rename to patches/server/0026-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch b/patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from patches/server/0026-Kaiiju-Vanilla-end-portal-teleportation.patch rename to patches/server/0027-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/patches/server/0027-Kaiiju-Entity-tick-and-removal-limiter.patch b/patches/server/0028-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from patches/server/0027-Kaiiju-Entity-tick-and-removal-limiter.patch rename to patches/server/0028-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/patches/server/0028-Petal-Reduce-sensor-work.patch b/patches/server/0029-Petal-Reduce-sensor-work.patch similarity index 100% rename from patches/server/0028-Petal-Reduce-sensor-work.patch rename to patches/server/0029-Petal-Reduce-sensor-work.patch diff --git a/patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch b/patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from patches/server/0029-Pufferfish-Cache-climbing-check-for-activation.patch rename to patches/server/0030-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch b/patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0030-Pufferfish-Reduce-chunk-loading-lookups.patch rename to patches/server/0031-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch b/patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch similarity index 100% rename from patches/server/0031-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch rename to patches/server/0032-Pufferfish-Fix-Paper-6045-block-goal-shouldn-t-load-.patch diff --git a/patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch b/patches/server/0033-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from patches/server/0032-Pufferfish-Reduce-projectile-chunk-loading.patch rename to patches/server/0033-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0033-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0034-Pufferfish-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0034-Pufferfish-Optimize-suffocation.patch b/patches/server/0035-Pufferfish-Optimize-suffocation.patch similarity index 100% rename from patches/server/0034-Pufferfish-Optimize-suffocation.patch rename to patches/server/0035-Pufferfish-Optimize-suffocation.patch diff --git a/patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch similarity index 100% rename from patches/server/0035-Pufferfish-Dynamic-Activation-of-Brain.patch rename to patches/server/0036-Pufferfish-Dynamic-Activation-of-Brain.patch diff --git a/patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from patches/server/0036-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to patches/server/0037-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/patches/server/0037-Pufferfish-SIMD-Utilities.patch b/patches/server/0038-Pufferfish-SIMD-Utilities.patch similarity index 100% rename from patches/server/0037-Pufferfish-SIMD-Utilities.patch rename to patches/server/0038-Pufferfish-SIMD-Utilities.patch diff --git a/patches/server/0038-Gale-Variable-entity-wake-up-duration.patch b/patches/server/0039-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from patches/server/0038-Gale-Variable-entity-wake-up-duration.patch rename to patches/server/0039-Gale-Variable-entity-wake-up-duration.patch diff --git a/patches/server/0039-Gale-Optimize-sun-burn-tick.patch b/patches/server/0040-Gale-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0039-Gale-Optimize-sun-burn-tick.patch rename to patches/server/0040-Gale-Optimize-sun-burn-tick.patch 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-Optimize-noise-generation.patch b/patches/server/0042-Gale-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0041-Gale-Optimize-noise-generation.patch rename to patches/server/0042-Gale-Optimize-noise-generation.patch diff --git a/patches/server/0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/patches/server/0043-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from patches/server/0042-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to patches/server/0043-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/patches/server/0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch b/patches/server/0044-Gale-Replace-throttle-tracker-map-with-optimized-col.patch similarity index 100% rename from patches/server/0043-Gale-Replace-throttle-tracker-map-with-optimized-col.patch rename to patches/server/0044-Gale-Replace-throttle-tracker-map-with-optimized-col.patch diff --git a/patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0044-Gale-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0045-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch b/patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch similarity index 100% rename from patches/server/0045-Sparkly-Paper-Optimize-canSee-checks.patch rename to patches/server/0046-Sparkly-Paper-Optimize-canSee-checks.patch diff --git a/patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch b/patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch similarity index 100% rename from patches/server/0046-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch rename to patches/server/0047-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch diff --git a/patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0047-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0048-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 100% rename from patches/server/0048-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to patches/server/0049-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch diff --git a/patches/server/0049-Leaf-Skip-event-if-no-listeners.patch b/patches/server/0050-Leaf-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0049-Leaf-Skip-event-if-no-listeners.patch rename to patches/server/0050-Leaf-Skip-event-if-no-listeners.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-Fix-MC-2025.patch b/patches/server/0053-Fix-MC-2025.patch similarity index 100% rename from patches/server/0052-Fix-MC-2025.patch rename to patches/server/0053-Fix-MC-2025.patch diff --git a/patches/server/0053-FoliaPR-Add-TPS-From-Region.patch b/patches/server/0054-FoliaPR-Add-TPS-From-Region.patch similarity index 100% rename from patches/server/0053-FoliaPR-Add-TPS-From-Region.patch rename to patches/server/0054-FoliaPR-Add-TPS-From-Region.patch diff --git a/patches/server/0054-Leaves-Fix-color-in-console.patch b/patches/server/0055-Leaves-Fix-color-in-console.patch similarity index 100% rename from patches/server/0054-Leaves-Fix-color-in-console.patch rename to patches/server/0055-Leaves-Fix-color-in-console.patch