From 4fbd5fb01e18d1674b3cbf1e6366610fe36eb2f7 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Mon, 24 Mar 2025 04:41:22 +0800 Subject: [PATCH] Fix remove lambda form ticking guard --- .../features/0021-Remove-lambda-from-ticking-guard.patch | 5 +++-- .../features/0053-No-block-update-command.patch | 4 ++-- .../minecraft-patches/features/0074-Replay-Mod-API.patch | 8 ++++---- .../minecraft-patches/features/0090-Servux-Protocol.patch | 4 ++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch b/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch index f3e8c728..757d1a68 100644 --- a/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch +++ b/leaves-server/minecraft-patches/features/0021-Remove-lambda-from-ticking-guard.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Remove lambda from ticking guard This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index c91d6d24d44b3d718680771b2299f04724c15992..8c8b6c4c6fee9bb9279d02d6b7a47cb2e3f39d93 100644 +index 9fba04e8a8e95546f7d7cc1210b4b324c86d2b87..30a543de1d8b454ffec0c6cd668aad3504cdf95d 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -816,7 +816,23 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -816,7 +816,24 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } profilerFiller.push("tick"); @@ -27,6 +27,7 @@ index c91d6d24d44b3d718680771b2299f04724c15992..8c8b6c4c6fee9bb9279d02d6b7a47cb2 + entity.discard(org.bukkit.event.entity.EntityRemoveEvent.Cause.DISCARD); + // Paper end - Prevent block entity and entity crashes + } ++ this.moonrise$midTickTasks(); // Paper - rewrite chunk system + } else { + this.guardEntityTick(this::tickNonPassenger, entity); + } diff --git a/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch b/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch index 7c611c2b..5147dc65 100644 --- a/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch +++ b/leaves-server/minecraft-patches/features/0053-No-block-update-command.patch @@ -5,10 +5,10 @@ Subject: [PATCH] No block update command diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index c7231836a61e7c8f1541c3b9ac90d82ae8217699..4bd76c64d2955e025442eb24e33f373baaf11911 100644 +index 30a543de1d8b454ffec0c6cd668aad3504cdf95d..0ea8b6c844f85226081408847781f5ccea461bc3 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -2385,6 +2385,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2386,6 +2386,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @Override public void blockUpdated(BlockPos pos, Block block) { diff --git a/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch b/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch index 8ec57516..a41f44f1 100644 --- a/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch +++ b/leaves-server/minecraft-patches/features/0074-Replay-Mod-API.patch @@ -94,7 +94,7 @@ index 7822cecf362cd8d430d90c0daac6e97c8a8d124b..438bbf36d4f80b38482b89e3ef59e9e4 if (this.hidesOnlinePlayers()) { return new ServerStatus.Players(maxPlayers, players.size(), List.of()); diff --git a/net/minecraft/server/PlayerAdvancements.java b/net/minecraft/server/PlayerAdvancements.java -index 4e9ce0c8b459ef41a6945182401c47c61b16b1f7..e9961c4fb7d1c808150171dca89b51eddf0c7518 100644 +index 0d2fb0f6686422f41d50e4898b26915c21c6ce1c..7012faaf1fa2515d9fdfd39da091b3dcb198ceb7 100644 --- a/net/minecraft/server/PlayerAdvancements.java +++ b/net/minecraft/server/PlayerAdvancements.java @@ -174,7 +174,7 @@ public class PlayerAdvancements { @@ -120,10 +120,10 @@ index 5c0a04db38821dbb0cba2bb6f0787f113d167efd..cd153db93f709c3142942fac88ae3ca2 .filter(player -> !playerList.isOp(player.getGameProfile())) .map(player -> player.getGameProfile().getName()), diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index a9b9928f371581e6b324622aa9c75aac6d285d7c..4497901e1ca1eacc4984e5899245d48c66406315 100644 +index 9a4bb86ebb893def457ad3fd896eb2a5e699f140..439bc4a93deb6fe134a9b1de4ca73a8c785d46db 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -2648,7 +2648,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2649,7 +2649,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe if (entity instanceof ServerPlayer serverPlayer) { ServerLevel.this.players.add(serverPlayer); // Leaves start - skip @@ -132,7 +132,7 @@ index a9b9928f371581e6b324622aa9c75aac6d285d7c..4497901e1ca1eacc4984e5899245d48c ServerLevel.this.realPlayers.add(serverPlayer); } // Leaves end - skip -@@ -2719,7 +2719,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2720,7 +2720,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe if (entity instanceof ServerPlayer serverPlayer) { ServerLevel.this.players.remove(serverPlayer); // Leaves start - skip diff --git a/leaves-server/minecraft-patches/features/0090-Servux-Protocol.patch b/leaves-server/minecraft-patches/features/0090-Servux-Protocol.patch index 1bd23186..b418ac7e 100644 --- a/leaves-server/minecraft-patches/features/0090-Servux-Protocol.patch +++ b/leaves-server/minecraft-patches/features/0090-Servux-Protocol.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Servux Protocol diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java -index c0ade1dbf40f308febfec005cab9556fe01f3402..162c0d442ade80563472edf81b15ff17f8ca1ba5 100644 +index 439bc4a93deb6fe134a9b1de4ca73a8c785d46db..dd7df1616d215020a65ce5d048f1b6f01469c86f 100644 --- a/net/minecraft/server/level/ServerLevel.java +++ b/net/minecraft/server/level/ServerLevel.java -@@ -2191,6 +2191,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2192,6 +2192,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } this.lastSpawnChunkRadius = i;