Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00
Code Issues Releases Activity

Enable adaptive allocator as default

Browse Source 
See 498a38cf74 for reference
This commit is contained in:
Dreeam
2025-10-25 07:47:36 -04:00
parent 35ac5d48ed
commit ea6f354099
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
leaf-server/build.gradle.kts.patch
View File

@@ -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
+}
+

25
leaf-server/paper-patches/features/0060-Bump-netty-to-4.2.x.patch
View File

@@ -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

0
leaf-server/paper-patches/features/0061-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch → leaf-server/paper-patches/features/0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch
View File