diff --git a/luminol-server/minecraft-patches/features/0054-Correct-player-respawn-place.patch b/luminol-server/minecraft-patches/features/0024-Correct-player-respawn-place.patch similarity index 96% rename from luminol-server/minecraft-patches/features/0054-Correct-player-respawn-place.patch rename to luminol-server/minecraft-patches/features/0024-Correct-player-respawn-place.patch index 3683824..eb3264a 100644 --- a/luminol-server/minecraft-patches/features/0054-Correct-player-respawn-place.patch +++ b/luminol-server/minecraft-patches/features/0024-Correct-player-respawn-place.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Correct player respawn place diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 884d338e00017ff351b91c70fb51186cbdfb1fe6..d0853f44f1b4c88ba62a74db9e49a32709685425 100644 +index 3bc0fc1d411d3c5e206695510ec9288ffbf8c277..b6df8df78105e08ca7be82524685d8b9422abf21 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java @@ -472,8 +472,10 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc diff --git a/luminol-server/minecraft-patches/features/0024-Kaiiju-Don-t-pathfind-outside-region.patch b/luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0024-Kaiiju-Don-t-pathfind-outside-region.patch rename to luminol-server/minecraft-patches/features/0025-Kaiiju-Don-t-pathfind-outside-region.patch diff --git a/luminol-server/minecraft-patches/features/0025-Kaiiju-Vanilla-end-portal-teleportation.patch b/luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0025-Kaiiju-Vanilla-end-portal-teleportation.patch rename to luminol-server/minecraft-patches/features/0026-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/luminol-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch b/luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0026-Kaiiju-Entity-tick-and-removal-limiter.patch rename to luminol-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch 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-Purpur-Barrels-and-enderchests-6-rows.patch b/luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0029-Purpur-Barrels-and-enderchests-6-rows.patch rename to luminol-server/minecraft-patches/features/0030-Purpur-Barrels-and-enderchests-6-rows.patch diff --git a/luminol-server/minecraft-patches/features/0030-Petal-Reduce-sensor-work.patch b/luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0030-Petal-Reduce-sensor-work.patch rename to luminol-server/minecraft-patches/features/0031-Petal-Reduce-sensor-work.patch diff --git a/luminol-server/minecraft-patches/features/0031-Pufferfish-Cache-climbing-check-for-activation.patch b/luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0031-Pufferfish-Cache-climbing-check-for-activation.patch rename to luminol-server/minecraft-patches/features/0032-Pufferfish-Cache-climbing-check-for-activation.patch diff --git a/luminol-server/minecraft-patches/features/0032-Pufferfish-Reduce-chunk-loading-lookups.patch b/luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0032-Pufferfish-Reduce-chunk-loading-lookups.patch rename to luminol-server/minecraft-patches/features/0033-Pufferfish-Reduce-chunk-loading-lookups.patch diff --git a/luminol-server/minecraft-patches/features/0033-Gale-Use-platform-math-functions.patch b/luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0033-Gale-Use-platform-math-functions.patch rename to luminol-server/minecraft-patches/features/0034-Gale-Use-platform-math-functions.patch diff --git a/luminol-server/minecraft-patches/features/0034-Gale-Variable-entity-wake-up-duration.patch b/luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0034-Gale-Variable-entity-wake-up-duration.patch rename to luminol-server/minecraft-patches/features/0035-Gale-Variable-entity-wake-up-duration.patch diff --git a/luminol-server/minecraft-patches/features/0035-Gale-Skip-entity-move-if-movement-is-zero.patch b/luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0035-Gale-Skip-entity-move-if-movement-is-zero.patch rename to luminol-server/minecraft-patches/features/0036-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/luminol-server/minecraft-patches/features/0036-Gale-Replace-AI-attributes-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0036-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0037-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0037-Gale-Optimize-noise-generation.patch b/luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0037-Gale-Optimize-noise-generation.patch rename to luminol-server/minecraft-patches/features/0038-Gale-Optimize-noise-generation.patch diff --git a/luminol-server/minecraft-patches/features/0038-SparklyPaper-Optimize-canSee-checks.patch b/luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0038-SparklyPaper-Optimize-canSee-checks.patch rename to luminol-server/minecraft-patches/features/0039-SparklyPaper-Optimize-canSee-checks.patch diff --git a/luminol-server/minecraft-patches/features/0039-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0039-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to luminol-server/minecraft-patches/features/0040-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/luminol-server/minecraft-patches/features/0040-Leaf-Secure-seed-and-matter-seed-command.patch b/luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0040-Leaf-Secure-seed-and-matter-seed-command.patch rename to luminol-server/minecraft-patches/features/0041-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/luminol-server/minecraft-patches/features/0041-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0041-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to luminol-server/minecraft-patches/features/0042-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/luminol-server/minecraft-patches/features/0042-Leaf-Replace-brain-maps-with-optimized-collection.patch b/luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0042-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to luminol-server/minecraft-patches/features/0043-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/luminol-server/minecraft-patches/features/0043-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch b/luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0043-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch rename to luminol-server/minecraft-patches/features/0044-Leaf-Paper-PR-Prevent-zombie-reinforcements-loading-.patch diff --git a/luminol-server/minecraft-patches/features/0044-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0045-Tick-regions-api.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0044-Tick-regions-api.patch rename to luminol-server/minecraft-patches/features/0045-Tick-regions-api.patch diff --git a/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch b/luminol-server/minecraft-patches/features/0046-Add-missing-teleportation-apis-for-folia.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch rename to luminol-server/minecraft-patches/features/0046-Add-missing-teleportation-apis-for-folia.patch index a1035a1..5f2cb7a 100644 --- a/luminol-server/minecraft-patches/features/0045-Add-missing-teleportation-apis-for-folia.patch +++ b/luminol-server/minecraft-patches/features/0046-Add-missing-teleportation-apis-for-folia.patch @@ -5,10 +5,10 @@ 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 3bc0fc1d411d3c5e206695510ec9288ffbf8c277..c2562b8f7ca3bc815a5abe5ae00a6fe1654b002d 100644 +index b6df8df78105e08ca7be82524685d8b9422abf21..98ce0736c18cbb09704ef7ca6b67866d5736f7c7 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1661,6 +1661,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1673,6 +1673,9 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc if (respawnComplete != null) { respawnComplete.accept(ServerPlayer.this); } diff --git a/luminol-server/minecraft-patches/features/0046-Leaves-Disable-moved-wrongly-threshold.patch b/luminol-server/minecraft-patches/features/0047-Leaves-Disable-moved-wrongly-threshold.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0046-Leaves-Disable-moved-wrongly-threshold.patch rename to luminol-server/minecraft-patches/features/0047-Leaves-Disable-moved-wrongly-threshold.patch diff --git a/luminol-server/minecraft-patches/features/0047-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch b/luminol-server/minecraft-patches/features/0048-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0047-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch rename to luminol-server/minecraft-patches/features/0048-Leaves-Fix-Incorrect-Collision-Behavior-for-Block-Sh.patch diff --git a/luminol-server/minecraft-patches/features/0053-Leaves-Fix-SculkCatalyst-exp-skip.patch b/luminol-server/minecraft-patches/features/0049-Leaves-Fix-SculkCatalyst-exp-skip.patch similarity index 93% rename from luminol-server/minecraft-patches/features/0053-Leaves-Fix-SculkCatalyst-exp-skip.patch rename to luminol-server/minecraft-patches/features/0049-Leaves-Fix-SculkCatalyst-exp-skip.patch index 6027e38..544930e 100644 --- a/luminol-server/minecraft-patches/features/0053-Leaves-Fix-SculkCatalyst-exp-skip.patch +++ b/luminol-server/minecraft-patches/features/0049-Leaves-Fix-SculkCatalyst-exp-skip.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Fix SculkCatalyst exp skip diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index c2562b8f7ca3bc815a5abe5ae00a6fe1654b002d..884d338e00017ff351b91c70fb51186cbdfb1fe6 100644 +index 98ce0736c18cbb09704ef7ca6b67866d5736f7c7..d0853f44f1b4c88ba62a74db9e49a32709685425 100644 --- a/net/minecraft/server/level/ServerPlayer.java +++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1346,7 +1346,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1358,7 +1358,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc } // SPIGOT-5478 must be called manually now @@ -17,7 +17,7 @@ index c2562b8f7ca3bc815a5abe5ae00a6fe1654b002d..884d338e00017ff351b91c70fb51186c // we clean the player's inventory after the EntityDeathEvent is called so plugins can get the exact state of the inventory. if (!event.getKeepInventory()) { // Paper start - PlayerDeathEvent#getItemsToKeep -@@ -1380,6 +1380,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc +@@ -1392,6 +1392,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc this.setClientLoaded(false); } @@ -34,7 +34,7 @@ index c2562b8f7ca3bc815a5abe5ae00a6fe1654b002d..884d338e00017ff351b91c70fb51186c AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0); this.level() diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 015a6c45241148eb5a26f9494ca731354273f3cd..1df158d30622ea71fcc937140c682d0e994d54c1 100644 +index 2293c3db45e9ecce4e0d4b2f87b8e90228e44d94..658aa09aecf8d64145feedb82dc9be2a55201450 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java @@ -293,6 +293,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/luminol-server/minecraft-patches/features/0048-Raytracing-tracker-experiment.patch b/luminol-server/minecraft-patches/features/0050-Raytracing-tracker-experiment.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0048-Raytracing-tracker-experiment.patch rename to luminol-server/minecraft-patches/features/0050-Raytracing-tracker-experiment.patch diff --git a/luminol-server/minecraft-patches/features/0049-Disable-Heightmap-Warning.patch b/luminol-server/minecraft-patches/features/0051-Disable-Heightmap-Warning.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0049-Disable-Heightmap-Warning.patch rename to luminol-server/minecraft-patches/features/0051-Disable-Heightmap-Warning.patch diff --git a/luminol-server/minecraft-patches/features/0050-Leaves-Revert-raid-changes.patch b/luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch similarity index 100% rename from luminol-server/minecraft-patches/features/0050-Leaves-Revert-raid-changes.patch rename to luminol-server/minecraft-patches/features/0052-Leaves-Revert-raid-changes.patch diff --git a/luminol-server/minecraft-patches/features/0051-Lithium-fast-util.patch b/luminol-server/minecraft-patches/features/0053-Lithium-Fast-util.patch similarity index 98% rename from luminol-server/minecraft-patches/features/0051-Lithium-fast-util.patch rename to luminol-server/minecraft-patches/features/0053-Lithium-Fast-util.patch index e39c984..0b34a57 100644 --- a/luminol-server/minecraft-patches/features/0051-Lithium-fast-util.patch +++ b/luminol-server/minecraft-patches/features/0053-Lithium-Fast-util.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Bacteriawa Date: Thu, 7 Nov 2024 21:50:47 +0100 -Subject: [PATCH] Lithium: fast util +Subject: [PATCH] Lithium: Fast util This patch is based on the following mixins: * "net/caffeinemc/mods/lithium/mixin/math/fast_util/DirectionMixin.java" diff --git a/luminol-server/minecraft-patches/features/0052-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch b/luminol-server/minecraft-patches/features/0054-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch similarity index 87% rename from luminol-server/minecraft-patches/features/0052-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch rename to luminol-server/minecraft-patches/features/0054-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch index ce8d504..8653562 100644 --- a/luminol-server/minecraft-patches/features/0052-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch +++ b/luminol-server/minecraft-patches/features/0054-Lithium-Skip-unnecessary-calculations-if-player-is-n.patch @@ -12,10 +12,10 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric) Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html) diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 2293c3db45e9ecce4e0d4b2f87b8e90228e44d94..015a6c45241148eb5a26f9494ca731354273f3cd 100644 +index 658aa09aecf8d64145feedb82dc9be2a55201450..1df158d30622ea71fcc937140c682d0e994d54c1 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -2642,6 +2642,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -2644,6 +2644,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } protected void updateSwingTime() { @@ -23,7 +23,7 @@ index 2293c3db45e9ecce4e0d4b2f87b8e90228e44d94..015a6c45241148eb5a26f9494ca73135 int currentSwingDuration = this.getCurrentSwingDuration(); if (this.swinging) { this.swingTime++; -@@ -3567,6 +3568,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3569,6 +3570,7 @@ public abstract class LivingEntity extends Entity implements Attackable { protected void updateFallFlying() { this.checkSlowFallDistance(); if (!this.level().isClientSide) { diff --git a/luminol-server/minecraft-patches/features/0055-Fix-off-tickregion-sync-teleport.patch b/luminol-server/minecraft-patches/features/0055-Fix-off-tickregion-sync-teleport.patch new file mode 100644 index 0000000..9b8f64b --- /dev/null +++ b/luminol-server/minecraft-patches/features/0055-Fix-off-tickregion-sync-teleport.patch @@ -0,0 +1,42 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MrHua269 +Date: Thu, 24 Apr 2025 23:11:13 +0800 +Subject: [PATCH] Fix off tickregion sync teleport + + +diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java +index ceca76a5791e319dd7cc4048c9860b1df065b95a..4a0d07a3263704a7c6e6859ddcbe767c202ed794 100644 +--- a/net/minecraft/world/entity/Entity.java ++++ b/net/minecraft/world/entity/Entity.java +@@ -4067,6 +4067,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + this.resetStoredPositions(); + } + ++ // Luminol start - Fix sync teleport issue ++ private boolean getNearByEdge(int destX, int destZ) { ++ int sizeBx = Math.min(6, (int) (this.bb.maxX - this.bb.minX) + this.level.getCraftServer().getSimulationDistance()); ++ int sizeBz = Math.min(6, (int) (this.bb.maxZ - this.bb.minZ) + this.level.getCraftServer().getSimulationDistance()); ++ ++ return ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.level, ++ (destX >> 4) - sizeBx, ++ (destZ >> 4) - sizeBz, ++ (destX >> 4) + sizeBx, ++ (destZ >> 4) + sizeBz); ++ } ++ // Luminol end ++ + protected final void transform(TeleportTransition telpeort) { + PositionMoveRotation move = PositionMoveRotation.calculateAbsolute( + PositionMoveRotation.of(this), PositionMoveRotation.of(telpeort), telpeort.relatives() +@@ -4186,10 +4199,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + wrapped.callEvent(); + // Luminol end + +- // check for same region + if (destination == this.level()) { + Vec3 currPos = this.position(); +- if ( ++ if (this.getNearByEdge((int) pos.x, (int) pos.z) && // Luminol - Fix sync teleport issue + destination.regioniser.getRegionAtUnsynchronised( + ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkX(currPos), ca.spottedleaf.moonrise.common.util.CoordinateUtils.getChunkZ(currPos) + ) == destination.regioniser.getRegionAtUnsynchronised( diff --git a/luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch b/luminol-server/minecraft-patches/features/0056-Add-afterPortalLogic-to-process-some-logics.patch similarity index 90% rename from luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch rename to luminol-server/minecraft-patches/features/0056-Add-afterPortalLogic-to-process-some-logics.patch index d932874..fd5772a 100644 --- a/luminol-server/minecraft-patches/features/0055-Add-afterPortalLogic-to-process-some-logics.patch +++ b/luminol-server/minecraft-patches/features/0056-Add-afterPortalLogic-to-process-some-logics.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add afterPortalLogic to process some logics diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index ceca76a5791e319dd7cc4048c9860b1df065b95a..065e74d29eee35e07a0d5db8850dc6f93a9729c0 100644 +index 4a0d07a3263704a7c6e6859ddcbe767c202ed794..dc0a9f39751173824d8cef569f94b459ee6e94dc 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java -@@ -4545,6 +4545,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4557,6 +4557,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } @@ -21,7 +21,7 @@ index ceca76a5791e319dd7cc4048c9860b1df065b95a..065e74d29eee35e07a0d5db8850dc6f9 protected boolean portalToAsync(ServerLevel destination, BlockPos portalPos, boolean takePassengers, PortalType type, java.util.function.Consumer teleportComplete) { ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); -@@ -4628,6 +4634,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -4640,6 +4646,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess info.postTeleportTransition().onTransition(teleported); } diff --git a/luminol-server/minecraft-patches/features/0056-Entity-portal-teleport-speed-fix.patch b/luminol-server/minecraft-patches/features/0057-Entity-portal-teleport-speed-fix.patch similarity index 96% rename from luminol-server/minecraft-patches/features/0056-Entity-portal-teleport-speed-fix.patch rename to luminol-server/minecraft-patches/features/0057-Entity-portal-teleport-speed-fix.patch index 8605108..1dfaa30 100644 --- a/luminol-server/minecraft-patches/features/0056-Entity-portal-teleport-speed-fix.patch +++ b/luminol-server/minecraft-patches/features/0057-Entity-portal-teleport-speed-fix.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity portal-teleport speed fix diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 065e74d29eee35e07a0d5db8850dc6f93a9729c0..920b7a3e6def4ac0078a1e543d7c17f5d4955fc5 100644 +index dc0a9f39751173824d8cef569f94b459ee6e94dc..a4e5c5675dc09f598a6ae05d7aea21b48e451b21 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -3304,7 +3304,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess