Fixed crashing if some types fail to load in an assembly

ManlyMarco · ManlyMarco · commit 79d167162975 · 2020-11-19T14:17:45.000+01:00
diff --git a/BepInEx.IPALoader/IllusionInjector/PluginManager.cs b/BepInEx.IPALoader/IllusionInjector/PluginManager.cs
@@ -59,7 +59,7 @@ private static IEnumerable<IPlugin> LoadPluginsFromFile(string file, string exeN
             {
                 var assembly = Assembly.LoadFrom(file);
 
-                foreach (var t in assembly.GetTypes())
+                foreach (var t in GetTypesSafe(assembly))
                     if (typeof(IPlugin).IsAssignableFrom(t))
                         try
                         {
@@ -93,6 +93,21 @@ private static IEnumerable<IPlugin> LoadPluginsFromFile(string file, string exeN
             return plugins;
         }
 
+        private static IEnumerable<Type> GetTypesSafe(Assembly assembly)
+        {
+            try
+            {
+                return assembly.GetTypes();
+            }
+            catch (ReflectionTypeLoadException e)
+            {
+                IPALoader.Logger.LogWarning("Could not load some types from assembly " + assembly.FullName + " - check debug log for details");
+                foreach (var eLoaderException in e.LoaderExceptions)
+                    IPALoader.Logger.LogDebug(eLoaderException);
+                return e.Types.Where(x => x != null);
+            }
+        }
+
         public class AppInfo
         {
             private static readonly HandleRef NullHandleRef = new HandleRef(null, IntPtr.Zero);
