Prevent Chainloader.Plugins from containing nulls and mark it obsolete

BepInEx · Oct 22, 2019 · db8c499 · db8c499
1 parent f2e88d4
commit db8c499
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/BepInEx/Bootstrap/Chainloader.cs b/BepInEx/Bootstrap/Chainloader.cs
@@ -24,7 +24,19 @@ public static class Chainloader
 		/// </summary>
 		public static Dictionary<string, PluginInfo> PluginInfos { get; } = new Dictionary<string, PluginInfo>();
 
-		public static List<BaseUnityPlugin> Plugins { get; } = new List<BaseUnityPlugin>();
+		private static readonly List<BaseUnityPlugin> _plugins = new List<BaseUnityPlugin>();
+		[Obsolete("Use PluginInfos instead")]
+		public static List<BaseUnityPlugin> Plugins
+		{
+			get
+			{
+				lock (_plugins)
+				{
+					_plugins.RemoveAll(x => x == null);
+					return _plugins;
+				}
+			}
+		}
 
 		public static List<string> DependencyErrors { get; } = new List<string>();
 
@@ -314,7 +326,7 @@ public static void Start()
 						PluginInfos[pluginGUID] = pluginInfo;
 						pluginInfo.Instance = (BaseUnityPlugin)ManagerObject.AddComponent(ass.GetType(pluginInfo.TypeName));
 
-						Plugins.Add(pluginInfo.Instance);
+						_plugins.Add(pluginInfo.Instance);
 					}
 					catch (Exception ex)
 					{