From 7bca9201d57702c2a2f4ccfcf40a0e5e9ccc5af2 Mon Sep 17 00:00:00 2001 From: MC_XiaoHei Date: Thu, 3 Jul 2025 17:41:49 +0800 Subject: [PATCH] fix 0052 --- .../features/0052-Elytra-aeronautics-no-chunk-load.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/leaves-server/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch b/leaves-server/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch index 93c7ea01..6217d466 100644 --- a/leaves-server/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch +++ b/leaves-server/minecraft-patches/features/0052-Elytra-aeronautics-no-chunk-load.patch @@ -41,7 +41,7 @@ index ed05aaa76e1e34ca82fcc7cfb73f371a11600eee..4a34e43d5471bb12ef2535a1a9246376 this.tickBlockEntities(); } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2c8f0194c0a4d8a235371f5ffaead8bbf35738ea..aae9a058c7049fdec4934ad3280e62bdbe2a8453 100644 +index 2c8f0194c0a4d8a235371f5ffaead8bbf35738ea..767944fdfe19f0bcfeff92029958c455cd338c14 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -570,7 +570,7 @@ public class ServerGamePacketListenerImpl @@ -57,12 +57,12 @@ index 2c8f0194c0a4d8a235371f5ffaead8bbf35738ea..aae9a058c7049fdec4934ad3280e62bd allowMovement = !this.hasNewCollision(serverLevel, this.player, boundingBox, newBox); } // else: no collision at all detected, why do we care? } -+ teleportBack = teleportBack && !player.elytraAeronauticsNoChunk; // Leaves - Elytra aeronautics ++ allowMovement = allowMovement || player.elytraAeronauticsNoChunk; // Leaves - Elytra aeronautics // Paper end - optimise out extra getCubes if (!allowMovement) { io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.CLIPPED_INTO_BLOCK, diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index 2a87494c2dcfc9e3d4641bc2dd9ee97ed15bdd20..0484649d8835e16b71f9ba3e0da16198fa94cb73 100644 +index 6ee9d69b31bd677df1b54995d0b952168fa1ccd7..5e134b1b755904023d32f89e97525b613f3dc503 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -1118,7 +1118,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess