mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 15:33:43 +01:00
2f782a6652
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:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
23 lines
986 B
Diff
23 lines
986 B
Diff
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
|
|
|