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

Merge in some stuff

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0062-Watchdog-Thread.patch
View File

@@ -1,14 +1,14 @@
From a34414532e3cea8d346427482b49fea87d2744ac Mon Sep 17 00:00:00 2001
From f8af28a8dd18b38f17b93bc2d40262d0856333f8 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.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6b5e092..170cdef 100644
index 76bbf83..59c76d8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -442,6 +442,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -446,6 +446,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.t();
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
@@ -16,7 +16,7 @@ index 6b5e092..170cdef 100644
}
// Spigot end
} else {
@@ -468,6 +469,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -472,6 +473,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {
@@ -144,7 +144,7 @@ index 0000000..a8840c9
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 7c07142..801b071 100644
index 6d0a08e..6e32691 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -173,4 +173,18 @@ public class SpigotConfig