Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-22 16:39:22 +00:00
Code Issues Releases Activity

Add back sun burn tick optimization of Gale

Browse Source
This commit is contained in:
Dreeam
2024-02-03 11:03:22 -05:00
parent 25091d3938
commit 0fd3883c57
26 changed files with 76 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
patches/server/0047-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch Normal file
View File

@@ -0,0 +1,67 @@
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
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 e7ac805b5b455083b6b07eec05ca2e3bc655edd0..f9b4cd6f7032908ff32cfa68e736c01eaec24ce1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
// Gale end - project setup
// 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.15.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 9af04084afe0689e5486be775cee3ba20e30617e..5b7f99a534dc7a02fcc6d6b01a80d5c62d8af527 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1270,10 +1270,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
}
}
}