From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Tue, 26 Dec 2023 02:04:01 -0500
Subject: [PATCH] Fix TerminalConsoleAppender NPE error on server closed and
 other issues

TODO - Dreeam: Fix error on shutdown

This patch use own fork of terminalconsoleappender to fix some issues,
since the original version doesn't compatible with latest version of jline or log4j
You can find the fork on https://github.com/Dreeam-qwq/TerminalConsoleAppender

Fixed NPE error when server losed.
Fixed errors in console has no color,also fixed`Advanced terminal features are not available in this environment`
or `Unable to create terminal` like issues

diff --git a/build.gradle.kts b/build.gradle.kts
index 2e02cf5a4706721f0d00da7f7fa189e671acc769..5cd5ed2053bf8538c7733b8cfb784827f879c4c8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 
     // Paper start
     implementation("org.jline:jline-terminal-jansi:3.25.1") // Leaf - Bump Dependencies
-    implementation("net.minecrell:terminalconsoleappender:1.3.0")
+    implementation("com.github.Dreeam-qwq:TerminalConsoleAppender:360a0759") // Leaf - Use own TerminalConsoleAppender fork to fix some issues under latest version of jline/log4j
     implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
     implementation("net.kyori:ansi:1.0.3") // Manually bump beyond above transitive dep
     /*
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index eb8e2c9401c79b106f206bd4ae76aca5ae9ae4bb..2544c8022ed0fdebc407fc85350041d77247d168 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1280,10 +1280,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
                 //org.spigotmc.WatchdogThread.doStop(); // Spigot // Paper - move into stop
                 // CraftBukkit start - Restore terminal to original settings
-                try {
+                // Leaf - Remove empty try catch
+                //try {
                     //net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Move into stop
-                } catch (Exception ignored) {
-                }
+                //} catch (Exception ignored) {
+                //}
+                // Leaf end
                 // CraftBukkit end
                 //io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
                 //this.onServerExit(); // Paper - moved into stop
diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
index e8e93538dfd71de86515d9405f728db1631e949a..ff2f6535754598857a442ecc0ce5b70521810ad6 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
@@ -31,10 +31,12 @@ public class ServerShutdownThread extends Thread {
             // Paper end
         } finally {
             org.apache.logging.log4j.LogManager.shutdown(); // Paper
-            try {
+            // Leaf - Remove empty try catch
+            //try {
                 //net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Move into stop
-            } catch (Exception e) {
-            }
+            //} catch (Exception e) {
+            //}
+            // Leaf end
         }
     }
 }