Updated Upstream (Leaf)

Winds-Studio · Jul 4, 2024 · f0e36a8 · f0e36a8
1 parent 46d9135
commit f0e36a8
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 0 deletions.
diff --git a/patches/server/0077-Fix-console-output-display-on-Pterodactyl-panel.patch b/patches/server/0077-Fix-console-output-display-on-Pterodactyl-panel.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dreeam <[email protected]>
+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 f310722b6f6b5e487e876e42070fdaaa01b62efb..6e2f045f26949c03750d6ee3518c6664b132c948 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -358,6 +358,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/0077-Faster-Random-Generator.patch → ...server/0078-Faster-Random-Generator.patch b/...server/0077-Faster-Random-Generator.patch → ...server/0078-Faster-Random-Generator.patch
diff --git a/...r/0078-Don-t-save-primed-tnt-entity.patch → ...r/0079-Don-t-save-primed-tnt-entity.patch b/...r/0078-Don-t-save-primed-tnt-entity.patch → ...r/0079-Don-t-save-primed-tnt-entity.patch
diff --git a/...079-Don-t-save-falling-block-entity.patch → ...080-Don-t-save-falling-block-entity.patch b/...079-Don-t-save-falling-block-entity.patch → ...080-Don-t-save-falling-block-entity.patch
diff --git a/...080-Configurable-connection-message.patch → ...081-Configurable-connection-message.patch b/...080-Configurable-connection-message.patch → ...081-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/...Optimize-Use-thread-safe-Collection.patch → ...Optimize-Use-thread-safe-Collection.patch b/...Optimize-Use-thread-safe-Collection.patch → ...Optimize-Use-thread-safe-Collection.patch
diff --git a/...Optimize-Reduce-expensive-iteration.patch → ...Optimize-Reduce-expensive-iteration.patch b/...Optimize-Reduce-expensive-iteration.patch → ...Optimize-Reduce-expensive-iteration.patch
diff --git a/...er/0084-Reduce-worldgen-allocations.patch → ...er/0085-Reduce-worldgen-allocations.patch b/...er/0084-Reduce-worldgen-allocations.patch → ...er/0085-Reduce-worldgen-allocations.patch
diff --git a/patches/server/0085-Fix-MC-183518.patch → patches/server/0086-Fix-MC-183518.patch b/patches/server/0085-Fix-MC-183518.patch → patches/server/0086-Fix-MC-183518.patch