Revert "Add debug property to disable the watchdog"
This reverts commit d1c470756f962801e7d3bc19bee9440f33a4706e.
Dieser Commit ist enthalten in:
Ursprung
4f73ddb766
Commit
32ecc21162
@ -1,4 +1,4 @@
|
|||||||
From 0f02669f1a5e07544ec56d1e0faf4657f68a19a4 Mon Sep 17 00:00:00 2001
|
From c4769bc62dc29d598093e20269fd1f8213cb0f20 Mon Sep 17 00:00:00 2001
|
||||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||||
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
Date: Tue, 1 Mar 2016 14:32:43 -0600
|
||||||
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
|
||||||
@ -46,7 +46,7 @@ index 3f27fe6..52155e8 100644
|
|||||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||||
private final Logger logger = Logger.getLogger("Minecraft");
|
private final Logger logger = Logger.getLogger("Minecraft");
|
||||||
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
index 94a3d42..1b802da 100644
|
index 94a3d42..3ed983c 100644
|
||||||
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
--- a/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
|
||||||
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread
|
||||||
@ -58,12 +58,7 @@ index 94a3d42..1b802da 100644
|
|||||||
this.timeoutTime = timeoutTime;
|
this.timeoutTime = timeoutTime;
|
||||||
this.restart = restart;
|
this.restart = restart;
|
||||||
}
|
}
|
||||||
@@ -52,13 +52,13 @@ public class WatchdogThread extends Thread
|
@@ -56,9 +56,9 @@ public class WatchdogThread extends Thread
|
||||||
while ( !stopping )
|
|
||||||
{
|
|
||||||
//
|
|
||||||
- if ( lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime )
|
|
||||||
+ if ( !Boolean.getBoolean("disable.watchdog") && lastTick != 0 && System.currentTimeMillis() > lastTick + timeoutTime ) // Paper - Add property to disable
|
|
||||||
{
|
{
|
||||||
Logger log = Bukkit.getServer().getLogger();
|
Logger log = Bukkit.getServer().getLogger();
|
||||||
log.log( Level.SEVERE, "The server has stopped responding!" );
|
log.log( Level.SEVERE, "The server has stopped responding!" );
|
||||||
@ -85,5 +80,5 @@ index 94a3d42..1b802da 100644
|
|||||||
log.log( Level.SEVERE, "------------------------------" );
|
log.log( Level.SEVERE, "------------------------------" );
|
||||||
//
|
//
|
||||||
--
|
--
|
||||||
2.8.2.windows.1
|
2.8.1
|
||||||
|
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren