From d343f2181f03719aa16ce7c331207dc47c91f178 Mon Sep 17 00:00:00 2001
From: hayanesuru <hayanesuru@outlook.jp>
Date: Fri, 22 Aug 2025 16:26:21 +0900
Subject: [PATCH] fix block state tags init

---
 .../0245-Cache-block-state-tags.patch         | 22 +++++++++----------
 .../features/0277-Bump-netty-to-4.2.x.patch   |  6 ++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/leaf-server/minecraft-patches/features/0245-Cache-block-state-tags.patch b/leaf-server/minecraft-patches/features/0245-Cache-block-state-tags.patch
index dfa5bae8..e30adf66 100644
--- a/leaf-server/minecraft-patches/features/0245-Cache-block-state-tags.patch
+++ b/leaf-server/minecraft-patches/features/0245-Cache-block-state-tags.patch
@@ -4,18 +4,18 @@ Date: Fri, 23 May 2025 12:01:42 +0900
 Subject: [PATCH] Cache block state tags
 
 
-diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index bfa2e28b5dd88f62375e79a8ccf344ffc21f5c1b..16e5321ba7a7d6fda059ea338d71904f583459ba 100644
---- a/net/minecraft/server/dedicated/DedicatedServer.java
-+++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -361,6 +361,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
-             }
- 
-             if (org.dreeam.leaf.config.modules.async.AsyncMobSpawning.enabled) mobSpawnExecutor.start(); // Pufferfish
+diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
+index 4134679c838307de7ae410cfc727fada0eeebf6b..caea98bbca9c0f161303701c9ad5cc5aa58f3a9f 100644
+--- a/net/minecraft/server/Main.java
++++ b/net/minecraft/server/Main.java
+@@ -335,6 +335,7 @@ public class Main {
+             levelStorageAccess.saveDataTag(frozen, worldData);
+             */
+             Class.forName(net.minecraft.world.entity.npc.VillagerTrades.class.getName()); // Paper - load this sync so it won't fail later async
 +            net.minecraft.world.level.block.Blocks.initPathType(); // Leaf - Cache block state tags
-             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
- 
+             final DedicatedServer dedicatedServer = MinecraftServer.spin(
+                 thread1 -> {
+                     DedicatedServer dedicatedServer1 = new DedicatedServer(
 diff --git a/net/minecraft/world/level/block/Blocks.java b/net/minecraft/world/level/block/Blocks.java
 index 57aad048034005543a72556e990b53db8deebfee..b7aa32927e701184d53a03e009f88e9cf6313aab 100644
 --- a/net/minecraft/world/level/block/Blocks.java
diff --git a/leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch b/leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch
index 25db63fc..4b673cdc 100644
--- a/leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch
+++ b/leaf-server/minecraft-patches/features/0277-Bump-netty-to-4.2.x.patch
@@ -28,7 +28,7 @@ index 340d5487fa778277b9560250271c5143d80d9987..99543330da85ddecd91c954c8aa386c8
      public boolean isCommandBlockEnabled() {
          return true;
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 926d0cf31be80fe1298c14411e65cd39a0962b32..f31a643b9fcfdafb2c1c6069b44b736527960787 100644
+index 39898c9429612b0cc690361be971c1fb3e71b278..5d9dd6feb9a33351de6b9b3d7bceb3e904585e4d 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -2063,6 +2063,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -45,10 +45,10 @@ index 926d0cf31be80fe1298c14411e65cd39a0962b32..f31a643b9fcfdafb2c1c6069b44b7365
          return this.pvp;
      }
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index 16e5321ba7a7d6fda059ea338d71904f583459ba..c13b8c2a4a1b6a6b744a0b1b330e63f3c77fa6e5 100644
+index bfa2e28b5dd88f62375e79a8ccf344ffc21f5c1b..209b4a8b479b54fac60fe0ad8c366d0fbe7b8a25 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -505,9 +505,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -504,9 +504,21 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
      @Override
      public boolean isEpollEnabled() {