Update to CraftBukkit 1.6.4

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-09-20 11:46:45 +10:00
parent 759d56f0fb
commit d0f0d605bf
26 changed files with 129 additions and 177 deletions

View File

@@ -1,14 +1,14 @@
From de7e8217654cf0fd14076c0ce8cbf569cc84e39d Mon Sep 17 00:00:00 2001
From 3cd709b7763070249f9d6c8c7c805a227de91696 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 f52d619..33eaecc 100644
index fba219f..e5b8391 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -413,6 +413,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -415,6 +415,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.s();
SpigotTimings.serverTickTimer.stopTiming();
org.spigotmc.CustomTimingsHandler.tick();
@@ -16,7 +16,7 @@ index f52d619..33eaecc 100644
}
// Spigot end
} else {
@@ -440,6 +441,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -442,6 +443,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {