Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream SpigotMC

Browse Source 
72d33338f08
2a70ece9ab2 [M]
abcf7aa4a40
9a88a38258c [M]
8dc4297e34f
This commit is contained in:
Zach Brown
2014-12-05 21:33:40 -06:00
parent 1d8cdd7bf5
commit c9daa16dac
28 changed files with 203 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0049-Watchdog-Thread.patch
View File

@@ -1,4 +1,4 @@
From 80cf3ea8dec4901f6ca9ec52b1cc93827b6e284f Mon Sep 17 00:00:00 2001
From 9dc042d1bac57e22faacb6be61edbbc72f2aa168 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@@ -18,10 +18,10 @@ index 390c6eb..240c909 100644
thread.setName("Server Watchdog");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2c39a80..adbd92e 100644
index 0619584..2fa1626 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -539,6 +539,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -535,6 +535,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.a(crashreport);
} finally {
try {
@@ -29,7 +29,7 @@ index 2c39a80..adbd92e 100644
this.stop();
this.isStopped = true;
} catch (Throwable throwable1) {
@@ -639,6 +640,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -635,6 +636,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
this.methodProfiler.b();
this.methodProfiler.b();