Update to 1.7.5

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions

View File

@@ -1,14 +1,14 @@
From 087a9d5ec0df8f70d0c0d9d5cf2f34d3cd59d37a Mon Sep 17 00:00:00 2001
From 8316892609dcb021aeb85d249d76a8a350cb42dd 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 b082ad2..1e83999 100644
index f9cbe47..2407ab2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -485,6 +485,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -488,6 +488,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
this.a(crashreport);
} finally {
try {
@@ -16,7 +16,7 @@ index b082ad2..1e83999 100644
this.stop();
this.isStopped = true;
} catch (Throwable throwable1) {
@@ -675,6 +676,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
@@ -678,6 +679,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
SpigotTimings.tickablesTimer.stopTiming(); // Spigot
this.methodProfiler.b();
@@ -290,5 +290,5 @@ index 0000000..de08ad6
+ }
+}
--
1.8.3.2
1.8.5.2.msysgit.0