2022-08-21 04:57:17 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: =?UTF-8?q?Jos=C3=A9=20Miguel=20Moreno?= <josemmo@pm.me>
|
|
|
|
Date: Sat, 5 Jun 2021 13:45:15 +0200
|
|
|
|
Subject: [PATCH] Fix plugin loggers on server shutdown
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/log/CustomLogManager.java b/src/main/java/io/papermc/paper/log/CustomLogManager.java
|
|
|
|
new file mode 100644
|
|
|
|
index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dcd79602dc
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/log/CustomLogManager.java
|
|
|
|
@@ -0,0 +1,26 @@
|
|
|
|
+package io.papermc.paper.log;
|
|
|
|
+
|
|
|
|
+import java.util.logging.LogManager;
|
|
|
|
+
|
|
|
|
+public class CustomLogManager extends LogManager {
|
|
|
|
+ private static CustomLogManager instance;
|
|
|
|
+
|
|
|
|
+ public CustomLogManager() {
|
|
|
|
+ instance = this;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void reset() {
|
|
|
|
+ // Ignore calls to this method
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void superReset() {
|
|
|
|
+ super.reset();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static void forceReset() {
|
|
|
|
+ if (instance != null) {
|
|
|
|
+ instance.superReset();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
index ab1f4e62b2ffed99b47ae23cae172f20ed586b27..97dbe5a44d2791c6dee830654c3935f4ac54aad4 100644
|
2022-08-21 04:57:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2024-01-25 10:54:46 +01:00
|
|
|
@@ -1223,6 +1223,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2024-01-23 12:06:27 +01:00
|
|
|
} catch (Exception ignored) {
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
+ io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
|
|
|
|
this.onServerExit();
|
|
|
|
}
|
|
|
|
|
2022-08-21 04:57:17 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2024-01-24 11:45:17 +01:00
|
|
|
index db6398c1822f6ad499feddd6a915984ef9917777..d931a4c6e633bf9c1b3e5e18e880e2ddbfe4aa2a 100644
|
2022-08-21 04:57:17 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
2023-03-14 22:10:53 +01:00
|
|
|
@@ -18,6 +18,12 @@ public class Main {
|
2022-08-21 04:57:17 +02:00
|
|
|
public static boolean useJline = true;
|
|
|
|
public static boolean useConsole = true;
|
|
|
|
|
2024-01-18 15:56:25 +01:00
|
|
|
+ // Paper start - Reset loggers after shutdown
|
2022-08-21 04:57:17 +02:00
|
|
|
+ static {
|
|
|
|
+ System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager");
|
|
|
|
+ }
|
2024-01-18 15:56:25 +01:00
|
|
|
+ // Paper end - Reset loggers after shutdown
|
2022-08-21 04:57:17 +02:00
|
|
|
+
|
|
|
|
public static void main(String[] args) {
|
|
|
|
// Paper start
|
|
|
|
final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");
|