From 705973157c4f02c786de0ecbb30a9ee6ba5dc488 Mon Sep 17 00:00:00 2001 From: Creeam <102713261+HaHaWTH@users.noreply.github.com> Date: Mon, 26 May 2025 09:10:49 +1400 Subject: [PATCH] Fix Winds-Studio/Leaf#338 (#339) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Delayed init, registry太神秘了 --- .../features/0181-Cache-block-path-type.patch | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/leaf-server/minecraft-patches/features/0181-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0181-Cache-block-path-type.patch index 87f5212b..9b11a321 100644 --- a/leaf-server/minecraft-patches/features/0181-Cache-block-path-type.patch +++ b/leaf-server/minecraft-patches/features/0181-Cache-block-path-type.patch @@ -4,18 +4,19 @@ Date: Fri, 23 May 2025 12:01:42 +0900 Subject: [PATCH] Cache block path type -diff --git a/net/minecraft/server/Bootstrap.java b/net/minecraft/server/Bootstrap.java -index 35b91f4daba4ac9751fa388d9da7d127db1356b0..60cc058db9227a61cc3186003efefc4888e06ddc 100644 ---- a/net/minecraft/server/Bootstrap.java -+++ b/net/minecraft/server/Bootstrap.java -@@ -60,6 +60,7 @@ public class Bootstrap { - io.papermc.paper.world.worldgen.OptionallyFlatBedrockConditionSource.bootstrap(); // Paper - Flat bedrock generator settings - }); - // Paper end -+ net.minecraft.world.level.block.Blocks.initPathType(); // Leaf - Cache path type - CreativeModeTabs.validate(); - wrapStreams(); - bootstrapDuration.set(Duration.between(instant, Instant.now()).toMillis()); +diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java +index a54f9030c81a2eb36f4dae951b09a9a6057be936..0b5858ae29269fb9f8516aaa95941ebb4d4915e4 100644 +--- a/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/net/minecraft/server/dedicated/DedicatedServer.java +@@ -418,7 +418,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + } + + if (org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) mobSpawnExecutor.start(); // Pufferfish +- ++ net.minecraft.world.level.block.Blocks.initPathType(); // Leaf - Cache path type + org.purpurmc.purpur.task.BossBarTask.startAll(); // Purpur - Implement TPSBar + if (org.purpurmc.purpur.PurpurConfig.beeCountPayload) org.purpurmc.purpur.task.BeehiveTask.instance().register(); // Purpur - Give bee counts in beehives to Purpur clients + return true; diff --git a/net/minecraft/world/level/block/Blocks.java b/net/minecraft/world/level/block/Blocks.java index 07a8fbfa7eb6e684ea699f009ce2d19311994e39..c5840aad8b6a719873b06a6c5e30cba35555656f 100644 --- a/net/minecraft/world/level/block/Blocks.java