diff --git a/luminol-server/minecraft-patches/features/0052-Do-not-search-the-block-out-of-current-region.patch b/luminol-server/minecraft-patches/features/0052-Do-not-search-the-block-out-of-current-region.patch deleted file mode 100644 index ad1b961..0000000 --- a/luminol-server/minecraft-patches/features/0052-Do-not-search-the-block-out-of-current-region.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Sun, 9 Mar 2025 11:39:01 +0800 -Subject: [PATCH] Do not search the block out of current region - -Skip getting the blocks don't belong to current tickregion. - -notice: this bug is actually caused by another bug of the teleportAsync implementation. - -diff --git a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -index fc529ece01d8a85e600eb8910662010ab6851d82..7364515b7e489c5e97c7ca693458ff2ae9335c6e 100644 ---- a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -+++ b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -@@ -432,6 +432,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { - if (i != 0 || i1 != 0 || allowBedrock) { - for (int y = level.getMaxY(); y > (blockPos == null ? level.getMinY() : blockPos.getY()); y--) { - BlockPos blockPos1 = new BlockPos(pos.getX() + i, y, pos.getZ() + i1); -+ if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor((Level) level, blockPos1)) continue; // Luminol - Do not search the block out of current region as we might be at the edge of the tickregion - BlockState blockState = level.getBlockState(blockPos1); - if (blockState.isCollisionShapeFullBlock(level, blockPos1) && (allowBedrock || !blockState.is(Blocks.BEDROCK))) { - blockPos = blockPos1; diff --git a/luminol-server/minecraft-patches/features/0053-Force-disable-builtin-spark-plugin.patch b/luminol-server/minecraft-patches/features/0052-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0053-Force-disable-builtin-spark-plugin.patch rename to luminol-server/minecraft-patches/features/0052-Force-disable-builtin-spark-plugin.patch diff --git a/luminol-server/minecraft-patches/features/0054-Fix-a-series-issue-around-entity-memory-typed-Global.patch b/luminol-server/minecraft-patches/features/0053-Fix-a-series-issue-around-entity-memory-typed-Global.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0054-Fix-a-series-issue-around-entity-memory-typed-Global.patch rename to luminol-server/minecraft-patches/features/0053-Fix-a-series-issue-around-entity-memory-typed-Global.patch diff --git a/luminol-server/minecraft-patches/features/0055-Fix-chunk-iteration-self-modification.patch b/luminol-server/minecraft-patches/features/0054-Fix-chunk-iteration-self-modification.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0055-Fix-chunk-iteration-self-modification.patch rename to luminol-server/minecraft-patches/features/0054-Fix-chunk-iteration-self-modification.patch diff --git a/luminol-server/minecraft-patches/features/0056-Fix-creative-player-item-pick.patch b/luminol-server/minecraft-patches/features/0055-Fix-creative-player-item-pick.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0056-Fix-creative-player-item-pick.patch rename to luminol-server/minecraft-patches/features/0055-Fix-creative-player-item-pick.patch diff --git a/luminol-server/minecraft-patches/features/0057-Fix-entity-portal-teleport-speed.patch b/luminol-server/minecraft-patches/features/0056-Fix-entity-portal-teleport-speed.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0057-Fix-entity-portal-teleport-speed.patch rename to luminol-server/minecraft-patches/features/0056-Fix-entity-portal-teleport-speed.patch diff --git a/luminol-server/minecraft-patches/features/0058-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0057-Fix-off-tickregion-sync-teleport.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0058-Fix-off-tickregion-sync-teleport.patch rename to luminol-server/minecraft-patches/features/0057-Fix-off-tickregion-sync-teleport.patch diff --git a/luminol-server/minecraft-patches/features/0059-Fix-uncorrected-death-check-of-folia.patch b/luminol-server/minecraft-patches/features/0058-Fix-uncorrected-death-check-of-folia.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0059-Fix-uncorrected-death-check-of-folia.patch rename to luminol-server/minecraft-patches/features/0058-Fix-uncorrected-death-check-of-folia.patch diff --git a/luminol-server/minecraft-patches/features/0060-Teleport-async-if-entity-was-moving-to-another-regio.patch b/luminol-server/minecraft-patches/features/0059-Teleport-async-if-entity-was-moving-to-another-regio.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0060-Teleport-async-if-entity-was-moving-to-another-regio.patch rename to luminol-server/minecraft-patches/features/0059-Teleport-async-if-entity-was-moving-to-another-regio.patch diff --git a/luminol-server/minecraft-patches/features/0061-Try-fixing-folia-off-region-POI-accessing-issue.patch b/luminol-server/minecraft-patches/features/0060-Try-fixing-folia-off-region-POI-accessing-issue.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0061-Try-fixing-folia-off-region-POI-accessing-issue.patch rename to luminol-server/minecraft-patches/features/0060-Try-fixing-folia-off-region-POI-accessing-issue.patch diff --git a/luminol-server/minecraft-patches/features/0062-Fix-mispatched-entity-custom-spawning-logic.patch b/luminol-server/minecraft-patches/features/0061-Fix-mispatched-entity-custom-spawning-logic.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0062-Fix-mispatched-entity-custom-spawning-logic.patch rename to luminol-server/minecraft-patches/features/0061-Fix-mispatched-entity-custom-spawning-logic.patch