fix method

LoneWandererProductions · Jun 5, 2024 · 208006b · 208006b
1 parent 5387e94
commit 208006b
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/PluginLoader/PluginLoad.cs b/PluginLoader/PluginLoad.cs
@@ -68,13 +68,27 @@ public static bool LoadAll(string path, string extension = PluginLoaderResources
 
             foreach (var pluginPath in pluginPaths)
             {
+                var pluginAssembly = LoadPlugin(pluginPath);
+
                 try
                 {
-                    var pluginAssembly = LoadPlugin(pluginPath);
+
                     var syncPlugins = CreateCommands<IPlugin>(pluginAssembly).ToList();
-                    var asyncPlugins = CreateCommands<IAsyncPlugin>(pluginAssembly).ToList();
 
                     PluginContainer.AddRange(syncPlugins);
+                }
+                catch (Exception ex) when (ex is ArgumentException or FileLoadException or ApplicationException
+                                               or ReflectionTypeLoadException or BadImageFormatException
+                                               or FileNotFoundException)
+                {
+                    Trace.WriteLine(ex);
+                    loadErrorEvent?.Invoke(nameof(LoadAll), new LoaderErrorEventArgs(ex.ToString()));
+                }
+
+                try
+                {
+                    var asyncPlugins = CreateCommands<IAsyncPlugin>(pluginAssembly).ToList();
+
                     AsyncPluginContainer.AddRange(asyncPlugins);
                 }
                 catch (Exception ex) when (ex is ArgumentException or FileLoadException or ApplicationException