Update watchdog patches
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- /dev/null
|
||||
+++ b/io/papermc/paper/FeatureHooks.java
|
||||
@@ -1,0 +_,77 @@
|
||||
@@ -1,0 +_,84 @@
|
||||
+package io.papermc.paper;
|
||||
+
|
||||
+import io.papermc.paper.command.PaperSubcommand;
|
||||
@@ -16,6 +16,7 @@
|
||||
+import net.minecraft.core.Registry;
|
||||
+import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
|
||||
+import net.minecraft.server.level.ServerPlayer;
|
||||
+import net.minecraft.world.entity.Entity;
|
||||
+import net.minecraft.world.entity.monster.Spider;
|
||||
+import net.minecraft.world.level.ChunkPos;
|
||||
+import net.minecraft.world.level.Level;
|
||||
@@ -77,4 +78,10 @@
|
||||
+ public static boolean isSpiderCollidingWithWorldBorder(final Spider spider) {
|
||||
+ return true; // ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.isCollidingWithBorder(spider.level().getWorldBorder(), spider.getBoundingBox().inflate(ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.COLLISION_EPSILON))
|
||||
+ }
|
||||
+
|
||||
+ public static void dumpTickingInfo() {
|
||||
+ }
|
||||
+
|
||||
+ private static void dumpEntity(final Entity entity) {
|
||||
+ }
|
||||
+}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user