Check patches earlier in startup process if possible.

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

Hide file tree

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

diff --git a/src/common/nallar/tickthreading/minecraft/TickThreading.java b/src/common/nallar/tickthreading/minecraft/TickThreading.java
@@ -1,7 +1,6 @@
 package nallar.tickthreading.minecraft;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,8 +38,6 @@
 import nallar.tickthreading.minecraft.entitylist.LoadedTileEntityList;
 import nallar.tickthreading.minecraft.profiling.EntityTickProfiler;
 import nallar.tickthreading.minecraft.profiling.Timings;
-import nallar.tickthreading.util.CollectionsUtil;
-import nallar.tickthreading.util.LocationUtil;
 import nallar.tickthreading.util.PatchUtil;
 import nallar.tickthreading.util.ReflectUtil;
 import nallar.tickthreading.util.TableFormatter;
@@ -123,25 +120,7 @@ public class TickThreading {
 
 	public TickThreading() {
 		Log.LOGGER.getLevel(); // Force log class to load
-		try {
-			PatchUtil.writePatchRunners();
-		} catch (IOException e) {
-			Log.severe("Failed to write patch runners", e);
-		}
-		List<File> filesToCheck = LocationUtil.getJarLocations();
-		if (PatchUtil.shouldPatch(filesToCheck)) {
-			Log.severe("TickThreading is disabled, because your server has not been patched" +
-					" or the patches are out of date" +
-					"\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();
-			}
-			Runtime.getRuntime().exit(1);
-		}
-		ContextAccess.$.getContext(0);
+		PatchUtil.checkPatches();
 	}
 
 	@Mod.Init

diff --git a/src/common/nallar/tickthreading/util/PatchUtil.java b/src/common/nallar/tickthreading/util/PatchUtil.java
@@ -8,6 +8,7 @@
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Scanner;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -19,6 +20,8 @@
 import nallar.tickthreading.patcher.PatchMain;
 import nallar.tickthreading.patcher.PatchManager;
 import nallar.tickthreading.patcher.Patches;
+import nallar.tickthreading.util.contextaccess.ContextAccess;
+import net.minecraft.server.MinecraftServer;
 
 public enum PatchUtil {
 	;
@@ -103,4 +106,32 @@ public void run() {
 			}
 		}).start();
 	}
+
+	private static boolean patchesChecked = false;
+
+	public static void checkPatches() {
+		if (patchesChecked) {
+			return;
+		}
+		patchesChecked = true;
+		try {
+			PatchUtil.writePatchRunners();
+		} catch (IOException e) {
+			Log.severe("Failed to write patch runners", e);
+		}
+		List<File> filesToCheck = LocationUtil.getJarLocations();
+		if (PatchUtil.shouldPatch(filesToCheck)) {
+			Log.severe("TickThreading is disabled, because your server has not been patched" +
+					" or the patches are out of date" +
+					"\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();
+			}
+			Runtime.getRuntime().exit(1);
+		}
+		ContextAccess.$.getContext(0);
+	}
 }