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

[Cosmetic] Update patches to be generated with latest stable git.

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-04-10 12:36:11 +10:00
parent c35e70ad7d
commit b8055fe033
45 changed files with 337 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,23 +1,23 @@
From 537ebc42f0bd36efe1a8c36983c5b645d65703e9 Mon Sep 17 00:00:00 2001
From ed80e4532dcea20ec8dbe4bd8773f768c9532a7e 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 | 124 ++++++++++++++++----
src/main/java/org/spigotmc/RestartCommand.java | 23 ++++
src/main/java/org/spigotmc/WatchdogThread.java | 93 +++++++++++++++
src/main/resources/configurations/bukkit.yml | 3 +
.../java/net/minecraft/server/MinecraftServer.java | 2 +
src/main/java/org/bukkit/craftbukkit/Spigot.java | 124 +++++++++++++++++----
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, 223 insertions(+), 22 deletions(-)
create mode 100644 src/main/java/org/spigotmc/RestartCommand.java
create mode 100644 src/main/java/org/spigotmc/WatchdogThread.java
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 4010cbf..168394f 100644
index 16b15df..4a9d711 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -401,6 +401,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -403,6 +403,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.q();
SpigotTimings.serverTickTimer.stopTiming();
org.bukkit.CustomTimingsHandler.tick();
@@ -25,7 +25,7 @@ index 4010cbf..168394f 100644
}
// Spigot end
} else {
@@ -428,6 +429,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -430,6 +431,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {
@@ -401,5 +401,5 @@ index 5822e41..a62ba24 100644
default:
growth-chunks-per-tick: 650
--
1.7.0.4
1.8.2.1