From b6c90b33a6a879091e53626d11ada834cc734fa9 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sun, 19 Nov 2017 12:57:11 -0500
Subject: [PATCH] runelite-client: fix not initializing default config

Config manager scans plugins from the plugin manager for configurations
---
 .../src/main/java/net/runelite/client/RuneLite.java   |  6 ++----
 .../net/runelite/client/plugins/PluginManager.java    | 11 +++++------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index d06da358d5..9ed9a07ea9 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -43,7 +43,6 @@ import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import javax.imageio.ImageIO;
 import javax.inject.Singleton;
@@ -61,7 +60,6 @@ import net.runelite.client.config.ConfigManager;
 import net.runelite.client.events.SessionClose;
 import net.runelite.client.events.SessionOpen;
 import net.runelite.client.menus.MenuManager;
-import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginManager;
 import net.runelite.client.ui.ClientUI;
 import net.runelite.http.api.account.AccountClient;
@@ -168,14 +166,14 @@ public class RuneLite
 
 		// Load the plugins, but does not start them yet.
 		// This will initialize configuration
-		List<Plugin> plugins = pluginManager.loadCorePlugins();
+		pluginManager.loadCorePlugins();
 
 		// Plugins have provided their config, so set default config
 		// to main settings
 		configManager.loadDefault();
 
 		// Start plugins
-		pluginManager.startCorePlugins(plugins);
+		pluginManager.startCorePlugins();
 
 		// Load the session, including saved configuration
 		loadSession();
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
index 56900a8bde..11cca2f167 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java
@@ -70,13 +70,14 @@ public class PluginManager
 
 	private final List<Plugin> plugins = new CopyOnWriteArrayList<>();
 
-	public List<Plugin> loadCorePlugins() throws IOException
+	public void loadCorePlugins() throws IOException
 	{
-		return scanAndInstantiate(getClass().getClassLoader(), PLUGIN_PACKAGE);
+		plugins.addAll(scanAndInstantiate(getClass().getClassLoader(), PLUGIN_PACKAGE));
 	}
 
-	public void startCorePlugins(List<Plugin> scannedPlugins)
+	public void startCorePlugins()
 	{
+		List<Plugin> scannedPlugins = new ArrayList<>(plugins);
 		for (Plugin plugin : scannedPlugins)
 		{
 			try
@@ -86,10 +87,8 @@ public class PluginManager
 			catch (PluginInstantiationException ex)
 			{
 				logger.warn("Unable to start plugin {}", plugin.getClass().getSimpleName(), ex);
-				continue;
+				plugins.remove(plugin);
 			}
-
-			plugins.add(plugin);
 		}
 	}