mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-23 17:09:29 +00:00
Updated Upstream (Paper/Gale)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@755a775 [ci skip] rebuild patches PaperMC/Paper@3b9db2b Updated Upstream (Bukkit/CraftBukkit) (#11501) PaperMC/Paper@c13f9fd Fix potential annotation testing interruption (#11460) PaperMC/Paper@260c3bb Always send Banner patterns to the client (#11506) PaperMC/Paper@14a48cd Some small touchups to the GUI (#11505) PaperMC/Paper@d348cb8 Restrict BlockProjectileSource#launchProjectile Gale Changes: Dreeam-qwq/Gale@e893e3d Updated Upstream (Paper)
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
|
||||
Date: Thu, 27 Jun 2024 01:13:07 +0800
|
||||
Subject: [PATCH] Fix console output display on Pterodactyl panel
|
||||
|
||||
Fixed console display issue when the terminal used xterm, should work on Pterodactyl, MCSManager and kind of panel software
|
||||
|
||||
diff --git a/src/main/java/org/dreeam/leaf/LeafBootstrap.java b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
|
||||
index 780affb51ebddcd05729c8e3272e28630bed8077..2f5122a61af183d6a4c20a175122c228b6e9fc48 100644
|
||||
--- a/src/main/java/org/dreeam/leaf/LeafBootstrap.java
|
||||
+++ b/src/main/java/org/dreeam/leaf/LeafBootstrap.java
|
||||
@@ -14,5 +14,12 @@ public class LeafBootstrap {
|
||||
private static void runPreBootTasks() {
|
||||
System.setProperty("org.jline.terminal.disableDeprecatedProviderWarning", "true"); // Leaf - Ignore terminal provider warning
|
||||
if (org.galemc.gale.virtualthread.VirtualThreadService.getJavaMajorVersion() >= 22) System.setProperty("jdk.console", "java.base"); // Leaf - Fix console freeze above JAVA 22
|
||||
+ // Leaf start - Fix console output display on Pterodactyl panel
|
||||
+ if (System.getProperty("terminal.jline", "false") != null && System.getProperty("terminal.ansi", "true") != null
|
||||
+ && "xterm".equalsIgnoreCase(System.getenv("TERM"))) {
|
||||
+ System.setProperty("terminal.jline", "false");
|
||||
+ System.setProperty("terminal.ansi", "true");
|
||||
+ }
|
||||
+ // Leaf end - Fix console output display on Pterodactyl panel
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user