From f580d94d8932b4622b7b3673eeaefeeda7dbddb1 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Mon, 26 May 2025 15:53:16 +0800 Subject: [PATCH] Update upstream(folia) --- gradle.properties | 2 +- .../0058-Fix-forgotten-chunk-pos-shift.patch | 25 ------------------- ...ynced-data-after-player-teleportati.patch} | 0 ...59-Fix-off-tickregion-sync-teleport.patch} | 0 ...ix-uncorrected-death-check-of-folia.patch} | 0 ...h => 0061-Portal-Behavior-Modifiers.patch} | 2 +- ...-entity-was-moving-to-another-regio.patch} | 0 ...olia-off-region-POI-accessing-issue.patch} | 0 8 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 luminol-server/minecraft-patches/features/0058-Fix-forgotten-chunk-pos-shift.patch rename luminol-server/minecraft-patches/features/{0059-Fix-incorrectly-synced-data-after-player-teleportati.patch => 0058-Fix-incorrectly-synced-data-after-player-teleportati.patch} (100%) rename luminol-server/minecraft-patches/features/{0060-Fix-off-tickregion-sync-teleport.patch => 0059-Fix-off-tickregion-sync-teleport.patch} (100%) rename luminol-server/minecraft-patches/features/{0061-Fix-uncorrected-death-check-of-folia.patch => 0060-Fix-uncorrected-death-check-of-folia.patch} (100%) rename luminol-server/minecraft-patches/features/{0062-Portal-Behavior-Modifiers.patch => 0061-Portal-Behavior-Modifiers.patch} (98%) rename luminol-server/minecraft-patches/features/{0063-Teleport-async-if-entity-was-moving-to-another-regio.patch => 0062-Teleport-async-if-entity-was-moving-to-another-regio.patch} (100%) rename luminol-server/minecraft-patches/features/{0064-Try-fixing-folia-off-region-POI-accessing-issue.patch => 0063-Try-fixing-folia-off-region-POI-accessing-issue.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 764bfa5..f0ebeb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -foliaRef=c299a7e8e7f12ff02f3cba19fd4797be0792caa8 +foliaRef=06ace91ba91c18451404516eced1a9c05f4e3f69 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0058-Fix-forgotten-chunk-pos-shift.patch b/luminol-server/minecraft-patches/features/0058-Fix-forgotten-chunk-pos-shift.patch deleted file mode 100644 index 62542c6..0000000 --- a/luminol-server/minecraft-patches/features/0058-Fix-forgotten-chunk-pos-shift.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sun, 25 May 2025 23:01:35 +0800 -Subject: [PATCH] Fix forgotten chunk pos shift - -Fixes: https://github.com/PaperMC/Folia/issues/364 - -diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index 7782dae9f9155eaef35bca2dd2b0782ed6f5c9a3..d3b922a5293efda76db8f42c281b782af764cb04 100644 ---- a/net/minecraft/server/level/ServerLevel.java -+++ b/net/minecraft/server/level/ServerLevel.java -@@ -2350,11 +2350,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - Optional> optional1 = PoiTypes.forState(newState); - if (!Objects.equals(optional, optional1)) { - BlockPos blockPos = pos.immutable(); -- optional.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX(), blockPos.getZ(), () -> { // Folia - region threading -+ optional.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX() >> 4, blockPos.getZ() >> 4, () -> { // Folia - region threading // Luminol - Fix forgotten chunk pos shift - this.getPoiManager().remove(blockPos); - DebugPackets.sendPoiRemovedPacket(this, blockPos); - })); -- optional1.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX(), blockPos.getZ(), () -> { // Folia - region threading -+ optional1.ifPresent(holder -> io.papermc.paper.threadedregions.RegionizedServer.getInstance().taskQueue.queueChunkTask(this, blockPos.getX() >> 4, blockPos.getZ() >> 4, () -> { // Folia - region threading // Luminol - Fix forgotten chunk pos shift - // Paper start - Remove stale POIs - if (optional.isEmpty() && this.getPoiManager().exists(blockPos, ignored -> true)) { - this.getPoiManager().remove(blockPos); diff --git a/luminol-server/minecraft-patches/features/0059-Fix-incorrectly-synced-data-after-player-teleportati.patch b/luminol-server/minecraft-patches/features/0058-Fix-incorrectly-synced-data-after-player-teleportati.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0059-Fix-incorrectly-synced-data-after-player-teleportati.patch rename to luminol-server/minecraft-patches/features/0058-Fix-incorrectly-synced-data-after-player-teleportati.patch diff --git a/luminol-server/minecraft-patches/features/0060-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0059-Fix-off-tickregion-sync-teleport.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0060-Fix-off-tickregion-sync-teleport.patch rename to luminol-server/minecraft-patches/features/0059-Fix-off-tickregion-sync-teleport.patch diff --git a/luminol-server/minecraft-patches/features/0061-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0060-Fix-uncorrected-death-check-of-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0061-Fix-uncorrected-death-check-of-folia.patch rename to luminol-server/minecraft-patches/features/0060-Fix-uncorrected-death-check-of-folia.patch diff --git a/luminol-server/minecraft-patches/features/0062-Portal-Behavior-Modifiers.patch b/luminol-server/minecraft-patches/features/0061-Portal-Behavior-Modifiers.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0062-Portal-Behavior-Modifiers.patch rename to luminol-server/minecraft-patches/features/0061-Portal-Behavior-Modifiers.patch index 5577e87..06cd245 100644 --- a/luminol-server/minecraft-patches/features/0062-Portal-Behavior-Modifiers.patch +++ b/luminol-server/minecraft-patches/features/0061-Portal-Behavior-Modifiers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Portal Behavior Modifiers diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index d3b922a5293efda76db8f42c281b782af764cb04..ff4e994bf515f48adc95fe29c4be652a2c438594 100644 +index 8329bc0cf531a1317ff8e213e948019d28df1eea..84a6bf575902676fc06211562b57806415528e64 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java @@ -1356,7 +1356,27 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/luminol-server/minecraft-patches/features/0063-Teleport-async-if-entity-was-moving-to-another-regio.patch b/luminol-server/minecraft-patches/features/0062-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0063-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to luminol-server/minecraft-patches/features/0062-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/luminol-server/minecraft-patches/features/0064-Try-fixing-folia-off-region-POI-accessing-issue.patch b/luminol-server/minecraft-patches/features/0063-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0064-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to luminol-server/minecraft-patches/features/0063-Try-fixing-folia-off-region-POI-accessing-issue.patch