diff --git a/luminol-server/minecraft-patches/features/0023-Fix-nether-portal-zero-delta-movement-issue.patch b/luminol-server/minecraft-patches/features/0023-Fix-nether-portal-zero-delta-movement-issue.patch new file mode 100644 index 0000000..45db0ab --- /dev/null +++ b/luminol-server/minecraft-patches/features/0023-Fix-nether-portal-zero-delta-movement-issue.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Sat, 8 Feb 2025 15:02:31 +0800 +Subject: [PATCH] Fix nether portal zero delta movement issue + + +diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java +index d6d429817dac95badcb1d67e370cd37cef43fd48..243129274e532ec732fae9c61bb1a2cc18c146c7 100644 +--- a/net/minecraft/world/entity/Entity.java ++++ b/net/minecraft/world/entity/Entity.java +@@ -4305,7 +4305,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + // done + portalInfoCompletable.complete( + new net.minecraft.world.level.portal.TeleportTransition( +- destination, Vec3.atBottomCenterOf(adjustedSpawn), Vec3.ZERO, 90.0f, 0.0f, ++ destination, Vec3.atBottomCenterOf(adjustedSpawn), this.getDeltaMovement(), 90.0f, 0.0f, // Luminol - Fix portal zero delta movement issue + TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET), + org.bukkit.event.player.PlayerTeleportEvent.TeleportCause.END_PORTAL + ) diff --git a/luminol-server/minecraft-patches/features/0023-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0024-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0023-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0024-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0025-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 97% rename from luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0025-Kaiiju-Vanilla-end-portal-teleportation.patch index 2a57879..0e7a1d4 100644 --- a/luminol-server/minecraft-patches/features/0024-Kaiiju-Vanilla-end-portal-teleportation.patch +++ b/luminol-server/minecraft-patches/features/0025-Kaiiju-Vanilla-end-portal-teleportation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Kaiiju Vanilla end portal teleportation diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index d6af2839f6ad51f2a29a4e4a141778a2e93145d5..f259701b82caef0a64659c69737f12b2f8d4c30a 100644 +index 243129274e532ec732fae9c61bb1a2cc18c146c7..2ff8f50a20f179f68ccd2392404c3d5957a6bf78 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -110,6 +110,7 @@ import net.minecraft.world.level.block.Rotation; diff --git a/luminol-server/minecraft-patches/features/0025-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/luminol-server/minecraft-patches/features/0027-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch rename to luminol-server/minecraft-patches/features/0027-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 08d67bb..c58177a 100644 --- a/luminol-server/minecraft-patches/features/0026-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/luminol-server/minecraft-patches/features/0027-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -159,7 +159,7 @@ index 23b342cc31c7e72ade0e1ccad86a9ccf34380f13..249cb7326c8e4012dcffdb6bbb7bfc1f + // KioCG end } diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index f259701b82caef0a64659c69737f12b2f8d4c30a..0cf1fb6b7be70f1aeb6f664d86d2c695a2b16d8b 100644 +index 2ff8f50a20f179f68ccd2392404c3d5957a6bf78..73ad8aa2912fc004ca85c2720238c295e7e7810c 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -5967,4 +5967,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/luminol-server/minecraft-patches/features/0027-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0028-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0028-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0029-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0029-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0030-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0030-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0030-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0031-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0031-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0031-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0032-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0032-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0032-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0033-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0033-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0033-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0034-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0034-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0034-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0035-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 94% rename from luminol-server/minecraft-patches/features/0034-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0035-Gale-Skip-entity-move-if-movement-is-zero.patch index 812bcb2..9398799 100644 --- a/luminol-server/minecraft-patches/features/0034-Gale-Skip-entity-move-if-movement-is-zero.patch +++ b/luminol-server/minecraft-patches/features/0035-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/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 0cf1fb6b7be70f1aeb6f664d86d2c695a2b16d8b..2b1db01621cdf0db1e524c99c9ba2af5d845cdec 100644 +index 73ad8aa2912fc004ca85c2720238c295e7e7810c..4a4e941c6a05653b5faf9a395e59b89eb8fb7564 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1104,7 +1104,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/luminol-server/minecraft-patches/features/0035-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0036-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0036-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0036-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0037-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0037-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0037-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0038-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0038-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0038-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0039-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0039-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0039-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0040-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0040-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0040-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0041-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0041-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0041-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0041-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch index 23ce94b..b7bfd0b 100644 --- a/luminol-server/minecraft-patches/features/0041-Add-missing-teleportation-apis-for-folia.patch +++ b/luminol-server/minecraft-patches/features/0042-Add-missing-teleportation-apis-for-folia.patch @@ -19,7 +19,7 @@ index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f6 ); }); diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2b1db01621cdf0db1e524c99c9ba2af5d845cdec..c14f766f1bea5c3c94d124da09d7bf9dfbfb1966 100644 +index 4a4e941c6a05653b5faf9a395e59b89eb8fb7564..1b13dd5f32731ddb9b7428d70419a3d662e10afe 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -4166,6 +4166,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/luminol-server/minecraft-patches/features/0042-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0043-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0043-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0043-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0044-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0044-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0044-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0045-Raytracing-tracker-experiment.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0044-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0045-Raytracing-tracker-experiment.patch index 4050f44..b64cbfb 100644 --- a/luminol-server/minecraft-patches/features/0044-Raytracing-tracker-experiment.patch +++ b/luminol-server/minecraft-patches/features/0045-Raytracing-tracker-experiment.patch @@ -19,7 +19,7 @@ index 7eff847790394aecd058e7a61905da86163b4c6e..9099457f55a2829297ac1db8a69a98ff double rangeY = level.paperConfig().entities.trackingRangeY.get(this.entity, -1); if (rangeY != -1) { diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 3aee378b03db39dd49a7afe5e762e0639ba17b26..a8a1f1d11bd6a1ed70291dc7fe60f3428c331601 100644 +index 1b13dd5f32731ddb9b7428d70419a3d662e10afe..5f123d6ea977e32ef920211e1183df66966c5fdb 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -136,7 +136,7 @@ import net.minecraft.world.scores.ScoreHolder;