Fix console display issue on Pterodactyl panel

No need to add `-Dterminal.jline=false -Dterminal.ansi=true` by self
Winds-Studio · Jun 26, 2024 · fac22f8 · fac22f8
1 parent bd2cf6d
commit fac22f8
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 0 deletions.
diff --git a/patches/server/0070-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0070-Fix-console-output-display-on-Pterodactyl-panel.patch
@@ -0,0 +1,26 @@
+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/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 97c7afc78350e25c5853d5c2fe703131af78d531..0e3d538579acfab6f190c9b76f4b522989092f00 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -328,6 +328,14 @@ public class Main {
+                 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
++
+                 net.minecraft.server.Main.main(options);
+             } catch (Throwable t) {
+                 t.printStackTrace();
diff --git a/...server/0070-Faster-Random-Generator.patch → ...server/0071-Faster-Random-Generator.patch b/...server/0070-Faster-Random-Generator.patch → ...server/0071-Faster-Random-Generator.patch
diff --git a/...r/0071-Don-t-save-primed-tnt-entity.patch → ...r/0072-Don-t-save-primed-tnt-entity.patch b/...r/0071-Don-t-save-primed-tnt-entity.patch → ...r/0072-Don-t-save-primed-tnt-entity.patch
diff --git a/...072-Don-t-save-falling-block-entity.patch → ...073-Don-t-save-falling-block-entity.patch b/...072-Don-t-save-falling-block-entity.patch → ...073-Don-t-save-falling-block-entity.patch
diff --git a/...073-Configurable-connection-message.patch → ...074-Configurable-connection-message.patch b/...073-Configurable-connection-message.patch → ...074-Configurable-connection-message.patch
diff --git a/...-in-BlockBehaviour-cache-blockstate.patch → ...-in-BlockBehaviour-cache-blockstate.patch b/...-in-BlockBehaviour-cache-blockstate.patch → ...-in-BlockBehaviour-cache-blockstate.patch
diff --git a/...er/0075-Reduce-worldgen-allocations.patch → ...er/0076-Reduce-worldgen-allocations.patch b/...er/0075-Reduce-worldgen-allocations.patch → ...er/0076-Reduce-worldgen-allocations.patch
diff --git a/patches/server/0076-Fix-MC-183518.patch → patches/server/0077-Fix-MC-183518.patch b/patches/server/0076-Fix-MC-183518.patch → patches/server/0077-Fix-MC-183518.patch
diff --git a/...e-kickPermission-instead-of-using-g.patch → ...e-kickPermission-instead-of-using-g.patch b/...e-kickPermission-instead-of-using-g.patch → ...e-kickPermission-instead-of-using-g.patch
diff --git a/...-place-player-if-the-server-is-full.patch → ...-place-player-if-the-server-is-full.patch b/...-place-player-if-the-server-is-full.patch → ...-place-player-if-the-server-is-full.patch