diff --git a/luminol-server/minecraft-patches/features/0028-Fix-incorrectly-synced-data-after-player-teleportati.patch b/luminol-server/minecraft-patches/features/0028-Fix-incorrectly-synced-data-after-player-teleportati.patch new file mode 100644 index 0000000..cfacf73 --- /dev/null +++ b/luminol-server/minecraft-patches/features/0028-Fix-incorrectly-synced-data-after-player-teleportati.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Fri, 2 May 2025 12:03:14 +0800 +Subject: [PATCH] Fix incorrectly synced data after player teleportation + + +diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java +index b6df8df78105e08ca7be82524685d8b9422abf21..10e3a54f3e7aa02a5c9986d3694c02bef07a66bf 100644 +--- a/net/minecraft/server/level/ServerPlayer.java ++++ b/net/minecraft/server/level/ServerPlayer.java +@@ -1812,14 +1812,20 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc + this.connection.send(new ClientboundChangeDifficultyPacket( + worlddata.getDifficulty(), worlddata.isDifficultyLocked() + )); +- this.connection.send(new ClientboundSetExperiencePacket( ++ /*this.connection.send(new ClientboundSetExperiencePacket( // Luminol start - teleportAsync tweaks, will send in next tick, see the changes below + this.experienceProgress, this.totalExperience, this.experienceLevel +- )); ++ ));*/ // Luminol end + + playerlist.sendActivePlayerEffects(this); + playerlist.sendLevelInfo(this, destination); + playerlist.sendPlayerPermissionLevel(this); + ++ // Luminol start - teleportAsync tweaks ++ this.lastSentExp = -1; ++ this.lastSentHealth = -1.0F; ++ this.lastSentFood = -1; ++ // Luminol end ++ + // regular world add logic + this.unsetRemoved(); + destination.addDuringTeleport(this); diff --git a/luminol-server/minecraft-patches/features/0028-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0029-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0029-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0030-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0031-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0031-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0031-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0032-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0032-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0032-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0033-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0033-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0033-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0034-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0034-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/minecraft-patches/features/0034-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0035-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0035-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0035-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0036-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0036-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0036-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0037-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0037-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0037-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0038-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0038-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0038-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0039-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0039-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0039-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0040-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0040-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0040-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0041-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0041-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0041-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0042-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0042-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0042-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0043-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0043-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0044-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0044-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0044-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0045-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0044-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0045-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0045-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0046-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0045-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0046-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/luminol-server/minecraft-patches/features/0046-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0047-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0047-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0047-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0048-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0048-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch diff --git a/luminol-server/minecraft-patches/features/0048-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0049-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0048-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0049-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0049-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0050-Add-missing-teleportation-apis-for-folia.patch similarity index 99% rename from luminol-server/minecraft-patches/features/0049-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0050-Add-missing-teleportation-apis-for-folia.patch index 5f2cb7a..182eaa0 100644 --- a/luminol-server/minecraft-patches/features/0049-Add-missing-teleportation-apis-for-folia.patch +++ b/luminol-server/minecraft-patches/features/0050-Add-missing-teleportation-apis-for-folia.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing teleportation apis for folia diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index b6df8df78105e08ca7be82524685d8b9422abf21..98ce0736c18cbb09704ef7ca6b67866d5736f7c7 100644 +index 10e3a54f3e7aa02a5c9986d3694c02bef07a66bf..ca67950e35c7f420846337e885d95b8eabca3f37 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1673,6 +1673,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/luminol-server/minecraft-patches/features/0050-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0051-Fix-off-tickregion-sync-teleport.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-Fix-off-tickregion-sync-teleport.patch rename to luminol-server/minecraft-patches/features/0051-Fix-off-tickregion-sync-teleport.patch diff --git a/luminol-server/minecraft-patches/features/0051-Portal-Behavior-Modifiers.patch b/luminol-server/minecraft-patches/features/0052-Portal-Behavior-Modifiers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0051-Portal-Behavior-Modifiers.patch rename to luminol-server/minecraft-patches/features/0052-Portal-Behavior-Modifiers.patch diff --git a/luminol-server/minecraft-patches/features/0052-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0053-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0052-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0053-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0053-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0054-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0053-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0054-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0054-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-server/minecraft-patches/features/0055-Leaves-Fix-SculkCatalyst-exp-skip.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0054-Leaves-Fix-SculkCatalyst-exp-skip.patch rename to luminol-server/minecraft-patches/features/0055-Leaves-Fix-SculkCatalyst-exp-skip.patch index 544930e..ae28dcf 100644 --- a/luminol-server/minecraft-patches/features/0054-Leaves-Fix-SculkCatalyst-exp-skip.patch +++ b/luminol-server/minecraft-patches/features/0055-Leaves-Fix-SculkCatalyst-exp-skip.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Fix SculkCatalyst exp skip diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 98ce0736c18cbb09704ef7ca6b67866d5736f7c7..d0853f44f1b4c88ba62a74db9e49a32709685425 100644 +index ca67950e35c7f420846337e885d95b8eabca3f37..d9ea3db817878ff56a2772ce983ff95431e1326c 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1358,7 +1358,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/luminol-server/minecraft-patches/features/0055-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0056-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0055-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0056-Raytracing-tracker-experiment.patch diff --git a/luminol-server/minecraft-patches/features/0056-Lithium-Fast-util.patch b/luminol-server/minecraft-patches/features/0057-Lithium-Fast-util.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0056-Lithium-Fast-util.patch rename to luminol-server/minecraft-patches/features/0057-Lithium-Fast-util.patch diff --git a/luminol-server/minecraft-patches/features/0057-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/luminol-server/minecraft-patches/features/0058-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0057-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to luminol-server/minecraft-patches/features/0058-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch diff --git a/luminol-server/minecraft-patches/features/0058-Cross-Region-Damage-trace.patch b/luminol-server/minecraft-patches/features/0059-Cross-Region-Damage-trace.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0058-Cross-Region-Damage-trace.patch rename to luminol-server/minecraft-patches/features/0059-Cross-Region-Damage-trace.patch index 010942c..9aa3188 100644 --- a/luminol-server/minecraft-patches/features/0058-Cross-Region-Damage-trace.patch +++ b/luminol-server/minecraft-patches/features/0059-Cross-Region-Damage-trace.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cross Region Damage trace diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index d0853f44f1b4c88ba62a74db9e49a32709685425..dfe0ebfefae40270e3732fb0dfc593fa8b5803d9 100644 +index d9ea3db817878ff56a2772ce983ff95431e1326c..fd4e37719baced819100f7ad2d1cf0350950cb60 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -1378,6 +1378,13 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/luminol-server/minecraft-patches/features/0059-Add-config-to-enable-tick-command.patch b/luminol-server/minecraft-patches/features/0060-Add-config-to-enable-tick-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0059-Add-config-to-enable-tick-command.patch rename to luminol-server/minecraft-patches/features/0060-Add-config-to-enable-tick-command.patch