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 new file mode 100644 index 00000000..ba8cf859 --- /dev/null +++ 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/patches/server/0070-Faster-Random-Generator.patch b/patches/server/0071-Faster-Random-Generator.patch similarity index 100% rename from patches/server/0070-Faster-Random-Generator.patch rename to patches/server/0071-Faster-Random-Generator.patch diff --git a/patches/server/0071-Don-t-save-primed-tnt-entity.patch b/patches/server/0072-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0071-Don-t-save-primed-tnt-entity.patch rename to patches/server/0072-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0072-Don-t-save-falling-block-entity.patch b/patches/server/0073-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0072-Don-t-save-falling-block-entity.patch rename to patches/server/0073-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0073-Configurable-connection-message.patch b/patches/server/0074-Configurable-connection-message.patch similarity index 100% rename from patches/server/0073-Configurable-connection-message.patch rename to patches/server/0074-Configurable-connection-message.patch diff --git a/patches/server/0074-Remove-stream-in-BlockBehaviour-cache-blockstate.patch b/patches/server/0075-Remove-stream-in-BlockBehaviour-cache-blockstate.patch similarity index 100% rename from patches/server/0074-Remove-stream-in-BlockBehaviour-cache-blockstate.patch rename to patches/server/0075-Remove-stream-in-BlockBehaviour-cache-blockstate.patch diff --git a/patches/server/0075-Reduce-worldgen-allocations.patch b/patches/server/0076-Reduce-worldgen-allocations.patch similarity index 100% rename from patches/server/0075-Reduce-worldgen-allocations.patch rename to patches/server/0076-Reduce-worldgen-allocations.patch diff --git a/patches/server/0076-Fix-MC-183518.patch b/patches/server/0077-Fix-MC-183518.patch similarity index 100% rename from patches/server/0076-Fix-MC-183518.patch rename to patches/server/0077-Fix-MC-183518.patch diff --git a/patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch b/patches/server/0078-Use-caffeine-cache-kickPermission-instead-of-using-g.patch similarity index 100% rename from patches/server/0077-Use-caffeine-cache-kickPermission-instead-of-using-g.patch rename to patches/server/0078-Use-caffeine-cache-kickPermission-instead-of-using-g.patch diff --git a/patches/server/0078-Do-not-place-player-if-the-server-is-full.patch b/patches/server/0079-Do-not-place-player-if-the-server-is-full.patch similarity index 100% rename from patches/server/0078-Do-not-place-player-if-the-server-is-full.patch rename to patches/server/0079-Do-not-place-player-if-the-server-is-full.patch