Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
29a01de126
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:8cd538e6SPIGOT-4498: Crash on startupb4ee04baSPIGOT-4496: Undeprecate MapView.getId and make intec937d0eSPIGOT-4472: Add Consumer scheduler methods Spigot Changes: a1f2566f Use monotonic time for watchdog bc4adcbf SPIGOT-4498: Crash on startup bb387e6c Rebuild patches
23 Zeilen
986 B
Diff
23 Zeilen
986 B
Diff
From 69b58525c617618b2d24eb146c728d67a0ab680d 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 5d03191c80..ed5f46bf6f 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.19.1
|
|
|