Update watchdog patches

This commit is contained in:
Nassim Jahnke
2024-12-17 13:32:46 +01:00
parent 7daedfcbc3
commit 2d83f05a6c
12 changed files with 253 additions and 426 deletions

View File

@@ -41,7 +41,7 @@
@Nullable
private KeyPair keyPair;
@Nullable
@@ -271,10 +_,33 @@
@@ -271,10 +_,35 @@
private final SuppressedExceptionCollector suppressedExceptions = new SuppressedExceptionCollector();
private final DiscontinuousFrame tickFrame;
@@ -54,7 +54,7 @@
+ public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
+ public int autosavePeriod;
+ // Paper - don't store the vanilla dispatcher
+ private boolean forceTicks;
+ public boolean forceTicks;
+ // CraftBukkit end
+ // Spigot start
+ public static final int TPS = 20;
@@ -63,6 +63,8 @@
+ @Deprecated(forRemoval = true) // Paper
+ public final double[] recentTps = new double[ 3 ];
+ // Spigot end
+ public volatile boolean hasFullyShutdown; // Paper - Improved watchdog support
+ public volatile boolean abnormalExit; // Paper - Improved watchdog support
+ public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
+ public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
+ private final Set<String> pluginsBlockingSleep = new java.util.HashSet<>(); // Paper - API to allow/disallow tick sleeping

View File

@@ -301,7 +301,7 @@
}
@Override
@@ -271,12 +_,14 @@
@@ -271,12 +_,15 @@
}
if (this.rconThread != null) {
@@ -314,6 +314,7 @@
+ // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
}
+
+ this.hasFullyShutdown = true; // Paper - Improved watchdog support
+ System.exit(0); // CraftBukkit
}