Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00
Code Issues Releases Activity

Temporarily drop useless patch to fix error on shutdown

Browse Source
This commit is contained in:
Dreeam
2024-04-24 05:49:51 -04:00
parent c1dbd8ca10
commit 3669cb65e9
34 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
patches/server/0052-Faster-sequencing-of-futures-for-chunk-structure-gen.patch → patches/server/0051-Faster-sequencing-of-futures-for-chunk-structure-gen.patch
View File

69
patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch
View File

@@ -1,69 +0,0 @@
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 00c01da244709b68448815e9188414d70440d59b..08194b0dce494013a9766e8c84b5697876c0d35f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
// Paper start
implementation("org.jline:jline-terminal-jansi:3.26.0") // 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 c4ccba8e24c0511d81d0f138977c2621e34b888e..e0ee41855a82008bf09de7222671a106073ec761 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
}
}
}

4
patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch → patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch
View File

@@ -9,7 +9,7 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive`
Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941..6ac7a5093a665553b34bfec5c5057e530277a959 100644
index 00eb84726a6563ef1d7b29977566086df1bab090..056f3c234fc853a46f804d9d21f51eed47321e3f 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -238,7 +238,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -24,7 +24,7 @@ index 56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941..6ac7a5093a665553b34bfec5c5057e53
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 5c047e57628626d4bccf98cfa34676b7b6657cd5..1d66b474a80514e694bbf7b5328986fe6d373348 100644
index 356ec77bf63da9a218036c92bde9bf5fa006c1ac..0ac00c3c6aa6c5418b21a68e91520224d13a7b00 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -76,10 +76,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {

6
patches/server/0054-LinearPurpur-Add-Linear-region-format.patch → patches/server/0053-LinearPurpur-Add-Linear-region-format.patch
View File

@@ -17,7 +17,7 @@ This format saves about 50% of disk space.
Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools
diff --git a/build.gradle.kts b/build.gradle.kts
index 08194b0dce494013a9766e8c84b5697876c0d35f..d00d516b12f13c17e8313b3ebd4c56ef300b8d8a 100644
index 00c01da244709b68448815e9188414d70440d59b..71f72777303cce3b94628f96c5877e75332cf4d8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,6 +32,8 @@ dependencies {
@@ -27,7 +27,7 @@ index 08194b0dce494013a9766e8c84b5697876c0d35f..d00d516b12f13c17e8313b3ebd4c56ef
+ implementation("com.github.luben:zstd-jni:1.5.6-2") // LinearPurpur
+ implementation("org.lz4:lz4-java:1.8.0") // LinearPurpur
implementation("org.jline:jline-terminal-jansi:3.26.0") // Leaf - Bump Dependencies
implementation("com.github.Dreeam-qwq:TerminalConsoleAppender:360a0759") // Leaf - Use own TerminalConsoleAppender fork to fix some issues under latest version of jline/log4j
implementation("net.minecrell:terminalconsoleappender:1.3.0")
implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies
diff --git a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java
index 2934f0cf0ef09c84739312b00186c2ef0019a165..e67543ef424d448096379bef118b8cb24b938964 100644
@@ -118,7 +118,7 @@ index 8dffb330b474b830d2f816ecf8be2e8d2e4556cd..bed46642b59d38e58e6aa663a47cbfc9
long expectedChunks = (long)regionFiles.length * (32L * 32L);
// Gale start - instantly continue on world upgrade finish
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e0ee41855a82008bf09de7222671a106073ec761..eadb2bc57b500805d4d8616df99a49a8ee503d8b 100644
index c4ccba8e24c0511d81d0f138977c2621e34b888e..9ce81b482aacc71f2b610cc4926a5867ec48944e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -866,7 +866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

2
patches/server/0055-LinearPurpur-Just-remove-all-locks-on-region-files.patch → patches/server/0054-LinearPurpur-Just-remove-all-locks-on-region-files.patch
View File

@@ -107,7 +107,7 @@ index 8ee307a453e79e59444f5c5b8b45ffc7755237c7..6d696f6945c4e08d58616505b961e56f
// Paper end - rewrite chunk system
}
diff --git a/src/main/java/org/purpurmc/purpur/region/LinearRegionFile.java b/src/main/java/org/purpurmc/purpur/region/LinearRegionFile.java
index 731a90436cae2e615c228c07f042fa112b95a8d2..3897e28975db9666ec91668a1481df926f300be5 100644
index e381b2e3de96c34c2f5ed4ade7ecedd8a2218c15..35d1a070f12bb7a5e4a219cbdfbf7b6999b688f2 100644
--- a/src/main/java/org/purpurmc/purpur/region/LinearRegionFile.java
+++ b/src/main/java/org/purpurmc/purpur/region/LinearRegionFile.java
@@ -61,6 +61,11 @@ public class LinearRegionFile implements AbstractRegionFile, AutoCloseable {

0
patches/server/0056-Plazma-Add-missing-purpur-configuration-options.patch → patches/server/0055-Plazma-Add-missing-purpur-configuration-options.patch
View File

0
patches/server/0057-Plazma-Add-some-missing-Pufferfish-configurations.patch → patches/server/0056-Plazma-Add-some-missing-Pufferfish-configurations.patch
View File

0
patches/server/0058-Skip-event-if-no-listeners.patch → patches/server/0057-Skip-event-if-no-listeners.patch
View File

0
patches/server/0059-PaperPR-Rewrite-framed-map-tracker-ticking.patch → patches/server/0058-PaperPR-Rewrite-framed-map-tracker-ticking.patch
View File

0
patches/server/0060-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch → patches/server/0059-SparklyPaper-Skip-MapItem-update-if-the-map-does-not.patch
View File

0
patches/server/0061-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch → patches/server/0060-SparklyPaper-Cache-coordinate-key-used-for-nearby-pl.patch
View File

0
patches/server/0062-SparklyPaper-Optimize-canSee-checks.patch → patches/server/0061-SparklyPaper-Optimize-canSee-checks.patch
View File

0
patches/server/0063-Polpot-Make-egg-and-snowball-can-knockback-player.patch → patches/server/0062-Polpot-Make-egg-and-snowball-can-knockback-player.patch
View File

2
patches/server/0064-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch → patches/server/0063-Redirect-to-Gale-s-method-to-fix-plugin-incompatibil.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Redirect to Gale's method to fix plugin incompatibility
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 861c316db5e86b3939bd7259be81575d6351838e..e11de0bca95fe380b58553e1d963fd3687769a91 100644
index ec126a481fbb276ae435ac501077d221d508c0c1..70bf701ae9aea5b6f322db5aa2ae17009d68a807 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -251,6 +251,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

0
patches/server/0065-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch → patches/server/0064-Redirect-vanilla-getProfiler-in-PathNavigationRegion.patch
View File

2
patches/server/0066-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch → patches/server/0065-Fix-MC-249136-lag-when-attempting-to-locate-a-buried.patch
View File

@@ -34,7 +34,7 @@ index 07eb481380e8fd4e492f36342ba633579c1b624e..9f1ab055bbad2d96831c207f8f1b6126
public void addReference(StructureStart structureStart) {
structureStart.addReference();
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index b8b78494449c0cd638f9706a803dc54e184d981f..2dcbe2ffbcb3b33b71de21961cb83bb9e75878ad 100644
index 4c03297fb523ef59cd9d11edbed437398e562a00..0e54af504001fb94e65bff1c81a8e2e2e6b039c3 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -302,7 +302,7 @@ public abstract class ChunkGenerator {

2
patches/server/0067-Fix-MC-2025.patch → patches/server/0066-Fix-MC-2025.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix MC-2025
Mojang issues: https://bugs.mojang.com/browse/MC-2025
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4bf569b6b81701ea2d45d090438686c5dbbd1744..434965c7ff6fdce1076952fa1f96334d7c362ba4 100644
index bf3ef85baf05eb4bfb4521c59e789a7f1de113b9..c873f1a36954f9ebf007153e37dc0b3953cebd1e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2566,6 +2566,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

0
patches/server/0068-Fix-MC-65198.patch → patches/server/0067-Fix-MC-65198.patch
View File

0
patches/server/0069-Fix-MC-172047.patch → patches/server/0068-Fix-MC-172047.patch
View File

0
patches/server/0070-Including-5s-in-getTPS.patch → patches/server/0069-Including-5s-in-getTPS.patch
View File

0
patches/server/0071-Remove-useless-creating-stats-json-bases-on-player-n.patch → patches/server/0070-Remove-useless-creating-stats-json-bases-on-player-n.patch
View File

0
patches/server/0072-Fix-NPE-during-creating-GUI-graph.patch → patches/server/0071-Fix-NPE-during-creating-GUI-graph.patch
View File

0
patches/server/0073-Don-t-throw-exception-on-missing-ResourceKey-value.patch → patches/server/0072-Don-t-throw-exception-on-missing-ResourceKey-value.patch
View File

4
patches/server/0074-Improve-Purpur-AFK-system.patch → patches/server/0073-Improve-Purpur-AFK-system.patch
View File

@@ -21,7 +21,7 @@ index edbdcdac30a9c80849045c5225bb1d6bdd091e2d..f1ddbbf41a7232ad3c432dfef9a84209
org.purpurmc.purpur.command.DemoCommand.register(this.dispatcher); // Purpur
org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9950580f3d0387b142576bfdb6a8f74365c12878..9b87e62426f8805247b86eef0fe2939cf76aa1d8 100644
index 6568b4541a81d52cc81729eb8590cf3723289bac..54e872d7279a56ce1c1ff0310ed302f0012e5d3e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2277,6 +2277,8 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 9950580f3d0387b142576bfdb6a8f74365c12878..9b87e62426f8805247b86eef0fe2939c
} else {
getBukkitEntity().setPlayerListName(prefix + scoreboardName + suffix);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index e11de0bca95fe380b58553e1d963fd3687769a91..bf14f2a0eef3d3964d4ce1f09473e5106f20ebb8 100644
index 70bf701ae9aea5b6f322db5aa2ae17009d68a807..85eba54ecdcb678eedcfdcc0a484ae2155f2bb15 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2264,8 +2264,33 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

2
patches/server/0075-Virtual-Thread-for-async-scheduler.patch → patches/server/0074-Virtual-Thread-for-async-scheduler.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Virtual Thread for async scheduler
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ee166ad76bd2c143e04e4bf6bd9991bc90ab99a5..13f3f8628143ffc22a2d2c2129ea4836b0a679d7 100644
index dcb6ccda0b46dc271be305c93df5c7db574bc07b..a3ef402251b526384b897df82965e769a93ff00b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -385,7 +385,6 @@ public class Main {

2
patches/server/0076-Use-a-shadow-fork-that-supports-Java-21.patch → patches/server/0075-Use-a-shadow-fork-that-supports-Java-21.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Use a shadow fork that supports Java 21
diff --git a/build.gradle.kts b/build.gradle.kts
index 90d705a319323c82a9e19cf70c46c80354a7f3f2..6a96a847c3b0a7af0e187cc2251c3ad275da4c11 100644
index 71f72777303cce3b94628f96c5877e75332cf4d8..78a543150da9e2db42ec8ce07f4fa7528467462d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import io.papermc.paperweight.util.*

0
patches/server/0077-Chat-Image-protocol.patch → patches/server/0076-Chat-Image-protocol.patch
View File

0
patches/server/0078-Asteor-Bar-protocol.patch → patches/server/0077-Asteor-Bar-protocol.patch
View File

0
patches/server/0079-Mirai-Configurable-chat-message-signatures.patch → patches/server/0078-Mirai-Configurable-chat-message-signatures.patch
View File

0
patches/server/0080-Block-log4j-rce-exploit-in-chat.patch → patches/server/0079-Block-log4j-rce-exploit-in-chat.patch
View File

2
patches/server/0081-Cache-player-profileResult.patch → patches/server/0080-Cache-player-profileResult.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Cache player profileResult
diff --git a/build.gradle.kts b/build.gradle.kts
index 821a01ab64dc2e59b78c19af5a62cdc42bf8bc03..98846d73a121cf0b7b41498be1bae24cf4168f56 100644
index 78a543150da9e2db42ec8ce07f4fa7528467462d..50ab66f5bf161e23d15949f0aa2416477ad1a98a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -31,6 +31,10 @@ dependencies {

0
patches/server/0082-Prevent-change-non-editable-sign-warning-spam-in-con.patch → patches/server/0081-Prevent-change-non-editable-sign-warning-spam-in-con.patch
View File

2
patches/server/0083-Matter-Secure-Seed.patch → patches/server/0082-Matter-Secure-Seed.patch
View File

@@ -154,7 +154,7 @@ index d0285843920f78e05ce07b1b0b2d8ce97ec8041e..30bf9668b3abb4389a25e0c065ec35e0
@Nullable
public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index 2dcbe2ffbcb3b33b71de21961cb83bb9e75878ad..0c0045e08c7ff694142640bd0beaf334742a07d6 100644
index 0e54af504001fb94e65bff1c81a8e2e2e6b039c3..d00499d207259af148140a43b245764628e8a5f5 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -77,6 +77,11 @@ import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement

0
patches/server/0084-Matter-Seed-Command.patch → patches/server/0083-Matter-Seed-Command.patch
View File