diff --git a/leaf-server/build.gradle.kts.patch b/leaf-server/build.gradle.kts.patch index b28899f0..3a15a772 100644 --- a/leaf-server/build.gradle.kts.patch +++ b/leaf-server/build.gradle.kts.patch @@ -108,7 +108,7 @@ - implementation("io.netty:netty-codec-haproxy:4.1.118.Final") // Add support for proxy protocol - implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1") + // Leaf start - Bump Dependencies -+ implementation("io.netty:netty-codec-haproxy:4.2.6.Final") // Add support for proxy protocol // Leaf - Bump netty to 4.2.x ++ implementation("io.netty:netty-codec-haproxy:4.2.7.Final") // Add support for proxy protocol // Leaf - Bump netty to 4.2.x + implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3") + // Leaf end - Bump Dependencies implementation("org.ow2.asm:asm-commons:9.8") @@ -165,7 +165,7 @@ + implementation("me.lucko:spark-api:0.1-dev-462d7f8-SNAPSHOT") + implementation("me.lucko:spark-paper:1.10-dev-462d7f8-SNAPSHOT") + -+ implementation("io.netty:netty-all:4.2.6.Final") // Leaf - Bump netty to 4.2.x ++ implementation("io.netty:netty-all:4.2.7.Final") // Leaf - Bump netty to 4.2.x + // Leaf end - Bump Dependencies +} + diff --git a/leaf-server/paper-patches/features/0060-Bump-netty-to-4.2.x.patch b/leaf-server/paper-patches/features/0060-Bump-netty-to-4.2.x.patch deleted file mode 100644 index 76d99453..00000000 --- a/leaf-server/paper-patches/features/0060-Bump-netty-to-4.2.x.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> -Date: Thu, 7 Aug 2025 00:22:50 +0800 -Subject: [PATCH] Bump netty to 4.2.x - - -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 748bd9650da4a209743b7a5dde584b2e19c5a578..3e972dc2160f953daaa727c2305ec71eed7981a5 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -21,6 +21,14 @@ public class Main { - // Paper start - Reset loggers after shutdown - static { - System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager"); -+ -+ // Leaf start - Bump netty to 4.2.x -+ // Fallback to original pooled allocator if no explicitly define adaptive allocator -+ // To follow https://github.com/netty/netty/wiki/Netty-4.2-Migration-Guide -+ if (System.getProperty("io.netty.allocator.type") == null) { -+ System.setProperty("io.netty.allocator.type", "pooled"); -+ } -+ // Leaf end - Bump netty to 4.2.x - } - // Paper end - Reset loggers after shutdown - diff --git a/leaf-server/paper-patches/features/0061-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch b/leaf-server/paper-patches/features/0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch similarity index 100% rename from leaf-server/paper-patches/features/0061-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch rename to leaf-server/paper-patches/features/0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch