testserver/Spigot-Server-Patches/0104-System-property-for-di...

From 23eacc2aa2794bb3a1c00d8ad9f0546dd1772a08 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Thu, 12 May 2016 23:02:58 -0500
Subject: [PATCH] System property for disabling watchdoge


diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
index 56f5f54bd1..9532aada82 100644
--- a/src/main/java/org/spigotmc/WatchdogThread.java
+++ b/src/main/java/org/spigotmc/WatchdogThread.java
@@ -57,7 +57,7 @@ public class WatchdogThread extends Thread
         while ( !stopping )
         {
             //
-            if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime )
+            if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable
             {
                 Logger log = Bukkit.getServer().getLogger();
                 log.log( Level.SEVERE, "------------------------------" );
-- 
2.21.0
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 15:36:57 +00:00			`From 23eacc2aa2794bb3a1c00d8ad9f0546dd1772a08 Mon Sep 17 00:00:00 2001`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00			`From: Zach Brown <zach.brown@destroystokyo.com>`
			`Date: Thu, 12 May 2016 23:02:58 -0500`
			`Subject: [PATCH] System property for disabling watchdoge`


			`diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java`
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 15:36:57 +00:00			`index 56f5f54bd1..9532aada82 100644`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00			`--- a/src/main/java/org/spigotmc/WatchdogThread.java`
			`+++ b/src/main/java/org/spigotmc/WatchdogThread.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: 9a793cce Remove no longer applicable caveats to setPlayerListName 7137829e SPIGOT-4496: Undeprecate MapView.getId and make int de33ade0 Remove some draft API designations a35fa838 SPIGOT-4472: Add Consumer scheduler methods CraftBukkit Changes: 8cd538e6 SPIGOT-4498: Crash on startup b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int ec937d0e SPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches 2018-11-24 05:28:04 +00:00			`@@ -57,7 +57,7 @@ public class WatchdogThread extends Thread`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00			`while ( !stopping )`
			`{`
			`//`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: 9a793cce Remove no longer applicable caveats to setPlayerListName 7137829e SPIGOT-4496: Undeprecate MapView.getId and make int de33ade0 Remove some draft API designations a35fa838 SPIGOT-4472: Add Consumer scheduler methods CraftBukkit Changes: 8cd538e6 SPIGOT-4498: Crash on startup b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int ec937d0e SPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches 2018-11-24 05:28:04 +00:00			`- if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime )`
			`+ if ( lastTick != 0 && monotonicMillis() > lastTick + timeoutTime && !Boolean.getBoolean("disable.watchdog")) // Paper - Add property to disable`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00			`{`
			`Logger log = Bukkit.getServer().getLogger();`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears 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: 9a793cce Remove no longer applicable caveats to setPlayerListName 7137829e SPIGOT-4496: Undeprecate MapView.getId and make int de33ade0 Remove some draft API designations a35fa838 SPIGOT-4472: Add Consumer scheduler methods CraftBukkit Changes: 8cd538e6 SPIGOT-4498: Crash on startup b4ee04ba SPIGOT-4496: Undeprecate MapView.getId and make int ec937d0e SPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches 2018-11-24 05:28:04 +00:00			`log.log( Level.SEVERE, "------------------------------" );`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00			`--`
Initial work on 1.14 pre-5 2019-04-23 04:47:07 +00:00			`2.21.0`
Make watchdoge disabler its own patch file Change implementation, smaller diff, less NPE 2016-05-13 04:04:49 +00:00