Use Class.forName first, then normal call to loadHook

MinimallyCorrect · Feb 8, 2016 · 578af54 · 578af54
1 parent a6ebf4a
commit 578af54
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/me/nallar/modpatcher/ModPatcher.java b/src/main/java/me/nallar/modpatcher/ModPatcher.java
@@ -221,7 +221,7 @@ private static void addToCurrentClassLoader() {
 				invalidClasses.removeIf(ModPatcher::removeModPatcherEntries);
 				negativeResources.removeIf(ModPatcher::removeModPatcherEntries);
 
-				log.trace("Loaded class: " + lcl.findClass("me.nallar.modpatcher.ModPatcherLoadHook"));
+				log.trace("Loaded class: " + Class.forName(MODPATCHER_PACKAGE + ".ModPatcherLoadHook"));
 			} else {
 				Method method = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
 				method.setAccessible(true);
@@ -273,10 +273,11 @@ private static void checkClassLoading() {
 
 	private static void checkClassLoading(boolean load) {
 		try {
+			Class.forName(MODPATCHER_PACKAGE + ".ModPatcherLoadHook");
 			ModPatcherLoadHook.loadHook(requiredVersion, getModPatcherRelease(), API_VERSION);
-		} catch (NoClassDefFoundError e) {
+		} catch (ClassNotFoundException | NoClassDefFoundError e) {
 			if (!load)
-				throw e;
+				throw new Error(e);
 
 			loadModPatcher();
 		}