Checking patches early now actually works.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jul 17, 2013 · 4486fbb · 4486fbb
1 parent d7a77dc
commit 4486fbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/common/nallar/patched/server/PatchMinecraftServer.java b/src/common/nallar/patched/server/PatchMinecraftServer.java
@@ -84,7 +84,10 @@ public void construct() {
 	}
 
 	public static void staticConstruct() {
-		PatchUtil.checkPatches();
+		try {
+			PatchUtil.checkPatches();
+		} catch (NoClassDefFoundError ignored) {
+		}
 		setTargetTPS(20);
 		setNetworkTPS(40);
 	}

diff --git a/src/common/nallar/tickthreading/util/PatchUtil.java b/src/common/nallar/tickthreading/util/PatchUtil.java
@@ -21,7 +21,6 @@
 import nallar.tickthreading.patcher.PatchManager;
 import nallar.tickthreading.patcher.Patches;
 import nallar.tickthreading.util.contextaccess.ContextAccess;
-import net.minecraft.server.MinecraftServer;
 
 public enum PatchUtil {
 	;
@@ -126,7 +125,6 @@ public static void checkPatches() {
 					"\nTo patch your server, simply run the PATCHME.bat/sh file in your server directory" +
 					"\n\nAlso, make a full backup of your server if you haven't already!" +
 					"\n\nFiles checked for patches: " + CollectionsUtil.join(filesToCheck));
-			MinecraftServer.getServer().initiateShutdown();
 			if (!System.getProperty("os.name").startsWith("Windows")) {
 				PatchUtil.startPatch();
 			}