SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split TPS patch out correctly.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-02-08 17:09:51 +11:00
parent 9aca2747b3
commit a5f0015001
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0008-Update-timeout-time-to-new-default-value.patch
View File

@@ -1,4 +1,4 @@
From 80a22dc2c4c0d1f7dddb6f97663a40784b0efef0 Mon Sep 17 00:00:00 2001
From 266474a8588a30de49a7c2a883dde257b7e001ee Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Thu, 10 Jan 2013 12:33:37 +1100
Subject: [PATCH] Update timeout time to new default value.
@@ -9,12 +9,12 @@ Subject: [PATCH] Update timeout time to new default value.
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
index e11aee4..2b0362a 100644
index a53c7b0..30bc542 100644
--- a/src/main/java/org/bukkit/craftbukkit/Spigot.java
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
@@ -8,7 +8,14 @@ public class Spigot {
@@ -7,7 +7,14 @@ public class Spigot {
public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.RestartCommand("restart"));
commandMap.register("bukkit", new org.bukkit.craftbukkit.command.TicksPerSecondCommand("tps"));
- org.bukkit.craftbukkit.util.WatchdogThread.startThread(configuration.getInt("settings.timeout-time", 180), configuration.getBoolean("settings.restart-on-crash", false));
+ int timeout = configuration.getInt("settings.timeout-time", 300);
@@ -29,7 +29,7 @@ index e11aee4..2b0362a 100644
server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage);
server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index e192700..78134f9 100644
index 5262ae1..55bfb77 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -26,7 +26,7 @@ settings:
@@ -42,5 +42,5 @@ index e192700..78134f9 100644
filter-unsafe-ips: false
whitelist-message: You are not white-listed on this server!
--
1.8.0.3
1.8.1-rc2