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

Fix shade fix accidentally being unmerged

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-04 19:57:08 +11:00
parent 74b11192c3
commit d908152b5e
8 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 4b2f953fb85e7a393219a1615b3b9c2bcb6fa870 Mon Sep 17 00:00:00 2001
From cba82a2fe027a66e917bc7c25e1eea965bc65295 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 2ab8366..831707c 100644
index 6b5e092..170cdef 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -436,6 +436,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -442,6 +442,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.t();
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
@@ -16,7 +16,7 @@ index 2ab8366..831707c 100644
}
// Spigot end
} else {
@@ -462,6 +463,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -468,6 +469,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {