From 8bce97d0bb3fec0022c34675e94f204b2c6364e1 Mon Sep 17 00:00:00 2001 From: MrHua269 Date: Tue, 11 Feb 2025 13:36:54 +0800 Subject: [PATCH] Fix uncorrected death check of folia --- ...Fix-uncorrected-death-check-of-folia.patch | 19 +++++++++++++++++++ ...aiiju-Don-t-pathfind-outside-region.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...4-Purpur-Use-alternative-keep-alive.patch} | 0 ...5-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ch => 0026-Petal-Reduce-sensor-work.patch} | 0 ...Cache-climbing-check-for-activation.patch} | 0 ...erfish-Reduce-chunk-loading-lookups.patch} | 0 ...29-Gale-Use-platform-math-functions.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...ttributes-with-optimized-collection.patch} | 0 ...0033-Gale-Optimize-noise-generation.patch} | 0 ...SparklyPaper-Optimize-canSee-checks.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ...-api.patch => 0037-Tick-regions-api.patch} | 0 ...issing-teleportation-apis-for-folia.patch} | 0 ...ves-Disable-moved-wrongly-threshold.patch} | 0 ...ect-Collision-Behavior-for-Block-Sh.patch} | 0 ... 0041-Raytracing-tracker-experiment.patch} | 0 22 files changed, 19 insertions(+) create mode 100644 luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch rename luminol-server/minecraft-patches/features/{0020-Kaiiju-Don-t-pathfind-outside-region.patch => 0021-Kaiiju-Don-t-pathfind-outside-region.patch} (100%) rename luminol-server/minecraft-patches/features/{0021-Kaiiju-Vanilla-end-portal-teleportation.patch => 0022-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename luminol-server/minecraft-patches/features/{0022-Kaiiju-Entity-tick-and-removal-limiter.patch => 0023-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename luminol-server/minecraft-patches/features/{0023-Purpur-Use-alternative-keep-alive.patch => 0024-Purpur-Use-alternative-keep-alive.patch} (100%) rename luminol-server/minecraft-patches/features/{0024-Purpur-Lobotomize-stuck-villagers.patch => 0025-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename luminol-server/minecraft-patches/features/{0025-Petal-Reduce-sensor-work.patch => 0026-Petal-Reduce-sensor-work.patch} (100%) rename luminol-server/minecraft-patches/features/{0026-Pufferfish-Cache-climbing-check-for-activation.patch => 0027-Pufferfish-Cache-climbing-check-for-activation.patch} (100%) rename luminol-server/minecraft-patches/features/{0027-Pufferfish-Reduce-chunk-loading-lookups.patch => 0028-Pufferfish-Reduce-chunk-loading-lookups.patch} (100%) rename luminol-server/minecraft-patches/features/{0028-Gale-Use-platform-math-functions.patch => 0029-Gale-Use-platform-math-functions.patch} (100%) rename luminol-server/minecraft-patches/features/{0029-Gale-Variable-entity-wake-up-duration.patch => 0030-Gale-Variable-entity-wake-up-duration.patch} (100%) rename luminol-server/minecraft-patches/features/{0030-Gale-Skip-entity-move-if-movement-is-zero.patch => 0031-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename luminol-server/minecraft-patches/features/{0031-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0032-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename luminol-server/minecraft-patches/features/{0032-Gale-Optimize-noise-generation.patch => 0033-Gale-Optimize-noise-generation.patch} (100%) rename luminol-server/minecraft-patches/features/{0033-SparklyPaper-Optimize-canSee-checks.patch => 0034-SparklyPaper-Optimize-canSee-checks.patch} (100%) rename luminol-server/minecraft-patches/features/{0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0035-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename luminol-server/minecraft-patches/features/{0035-Leaf-Secure-seed-and-matter-seed-command.patch => 0036-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename luminol-server/minecraft-patches/features/{0036-Tick-regions-api.patch => 0037-Tick-regions-api.patch} (100%) rename luminol-server/minecraft-patches/features/{0037-Add-missing-teleportation-apis-for-folia.patch => 0038-Add-missing-teleportation-apis-for-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0038-Leaves-Disable-moved-wrongly-threshold.patch => 0039-Leaves-Disable-moved-wrongly-threshold.patch} (100%) rename luminol-server/minecraft-patches/features/{0039-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch => 0040-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch} (100%) rename luminol-server/minecraft-patches/features/{0040-Raytracing-tracker-experiment.patch => 0041-Raytracing-tracker-experiment.patch} (100%) diff --git a/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch new file mode 100644 index 0000000..292d061 --- /dev/null +++ b/luminol-server/minecraft-patches/features/0020-Fix-uncorrected-death-check-of-folia.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Tue, 11 Feb 2025 13:34:47 +0800 +Subject: [PATCH] Fix uncorrected death check of folia + + +diff --git a/net/minecraft/world/inventory/AbstractContainerMenu.java b/net/minecraft/world/inventory/AbstractContainerMenu.java +index 50af953a4698a3c6e16b840fab764dd733b3fbc9..a9c058238819f3631d94ac306185e909821caf35 100644 +--- a/net/minecraft/world/inventory/AbstractContainerMenu.java ++++ b/net/minecraft/world/inventory/AbstractContainerMenu.java +@@ -679,7 +679,7 @@ public abstract class AbstractContainerMenu { + } + + private static void dropOrPlaceInInventory(Player player, ItemStack stack) { +- boolean flag = player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; ++ boolean flag = !player.isAlive(); //player.isRemoved() && player.getRemovalReason() != Entity.RemovalReason.CHANGED_DIMENSION; // Luminol - Fix uncorrected death check of folia + boolean flag1 = player instanceof ServerPlayer serverPlayer && serverPlayer.hasDisconnected(); + if (flag || flag1) { + player.drop(stack, false); diff --git a/luminol-server/minecraft-patches/features/0020-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0021-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0020-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0021-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0021-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0022-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0021-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0022-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0023-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0022-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0023-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/luminol-server/minecraft-patches/features/0023-Purpur-Use-alternative-keep-alive.patch b/luminol-server/minecraft-patches/features/0024-Purpur-Use-alternative-keep-alive.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0023-Purpur-Use-alternative-keep-alive.patch rename to luminol-server/minecraft-patches/features/0024-Purpur-Use-alternative-keep-alive.patch diff --git a/luminol-server/minecraft-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch b/luminol-server/minecraft-patches/features/0025-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0024-Purpur-Lobotomize-stuck-villagers.patch rename to luminol-server/minecraft-patches/features/0025-Purpur-Lobotomize-stuck-villagers.patch diff --git a/luminol-server/minecraft-patches/features/0025-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0026-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0026-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0026-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0027-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0027-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0027-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0028-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0027-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0028-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0029-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0028-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0029-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0029-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0030-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0030-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0030-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0031-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0031-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0031-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0032-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0032-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0032-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0033-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0033-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0033-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0034-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0034-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0035-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0035-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0036-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0036-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0036-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0037-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0037-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0037-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0038-Add-missing-teleportation-apis-for-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0038-Add-missing-teleportation-apis-for-folia.patch diff --git a/luminol-server/minecraft-patches/features/0038-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0039-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0039-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0039-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0040-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0040-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0041-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0041-Raytracing-tracker-experiment.patch