Skip to content

Commit ef6228a

Browse files
committed
Fix console freeze above JAVA 22
1 parent a46d325 commit ef6228a

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
group = org.dreeam.leaf
22
version = 1.20.6-R0.1-SNAPSHOT
33

4-
galeCommit = 454a795cab19c2690483401c2b461a7bb2bd0cbc
4+
galeCommit = 6582b9b215859997f52debf81c75dfb7aec3e2ac
55

66
org.gradle.caching = true
77
org.gradle.parallel = true
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Dreeam <[email protected]>
3+
Date: Sat, 4 May 2024 02:46:17 -0400
4+
Subject: [PATCH] Fix console freeze above JAVA 22
5+
6+
Revert to old console provider, Fix https://github.com/PaperMC/Paper/issues/10405
7+
Solution refers to https://inside.java/2023/07/31/quality-heads-up
8+
9+
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
10+
index b6c68c250826698c058b95642850ec42645de2f7..b4599dae7bc59e67eee22a7b70d148d4f63669b5 100644
11+
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
12+
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
13+
@@ -355,6 +355,7 @@ public class Main {
14+
printlnStartupInfoToSystemOut("Loading libraries, please wait..."); // Gale - include time in startup logs
15+
16+
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
17+
+ if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() >= 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix console freeze above JAVA 22
18+
19+
net.minecraft.server.Main.main(options);
20+
} catch (Throwable t) {

0 commit comments

Comments
 (0)