Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 02:25:28 +01:00
Code Issues Projects Releases Wiki Activity

Increase default watchdog time

Browse Source
This commit is contained in:
md_5 2013-02-27 12:04:04 +11:00
parent e9950b70d3
commit 44927fdaa6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CraftBukkit-Patches/0028-Watchdog-Thread.patch
View File

@ -1,15 +1,15 @@
From 5a0d969c584b848bd8fcb62f4b3178c071801edb Mon Sep 17 00:00:00 2001
From b0378ebbdbfe2bb1462cf2c3c44562b9ac731408 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
---
.../java/net/minecraft/server/MinecraftServer.java | 2 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 76 +++++++++++++++++-
src/main/java/org/bukkit/craftbukkit/Spigot.java | 78 +++++++++++++++++-
src/main/java/org/spigotmc/RestartCommand.java | 23 ++++++
src/main/java/org/spigotmc/WatchdogThread.java | 93 ++++++++++++++++++++++
src/main/resources/configurations/bukkit.yml | 3 +
5 files changed, 195 insertions(+), 2 deletions(-)
5 files changed, 197 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/org/spigotmc/RestartCommand.java
create mode 100644 src/main/java/org/spigotmc/WatchdogThread.java
@ -34,7 +34,7 @@ index aa6a14a..6005fac 100644
this.isStopped = true;
} catch (Throwable throwable1) {
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index 3171411..6f54f7e 100644
index 3171411..c0335fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -1,5 +1,6 @@
@ -65,7 +65,7 @@ index 3171411..6f54f7e 100644
server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage);
server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
@@ -31,12 +35,21 @@ public class Spigot {
@@ -31,12 +35,23 @@ public class Spigot {
server.commandComplete = configuration.getBoolean("settings.command-complete", true);
server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
@ -73,10 +73,12 @@ index 3171411..6f54f7e 100644
+ switch (configVersion) {
+ case 0:
+ configuration.set("settings.timeout-time", 30);
+ case 1:
+ configuration.set("settings.timeout-time", 60);
+ }
+ configuration.set("config-version", 1);
+ configuration.set("config-version", 2);
+
+ WatchdogThread.doStart(configuration.getInt("settings.timeout-time", 30), configuration.getBoolean("settings.restart-on-crash", false));
+ WatchdogThread.doStart(configuration.getInt("settings.timeout-time", 60), configuration.getBoolean("settings.restart-on-crash", false));
+
server.orebfuscatorEnabled = configuration.getBoolean("orebfuscator.enable", false);
server.orebfuscatorEngineMode = configuration.getInt("orebfuscator.engine-mode", 1);
@ -88,7 +90,7 @@ index 3171411..6f54f7e 100644
}
if (server.chunkGCPeriod == 0) {
@@ -265,4 +278,63 @@ public class Spigot {
@@ -265,4 +280,63 @@ public class Spigot {
SpigotTimings.checkIfActiveTimer.stopTiming();
return isActive;
}
@ -295,5 +297,5 @@ index e568bf6..7c18391 100644
default:
growth-chunks-per-tick: 650
--
1.8.1.1
1.8.1-rc2