From acf3233d4af7f5635dc3b034d5217a1efa6a7763 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Apr 2018 12:37:54 -0400 Subject: [PATCH] pluginmanager: don't store plugin enabled/disabled state in config --- .../client/plugins/PluginManager.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) 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 cca8fb1c30..6ae56398b0 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 @@ -178,19 +178,6 @@ public class PluginManager { configManager.setDefaultConfiguration(config, false); } - - for (Plugin plugin : getPlugins()) - { - final String keyName = plugin.getClass().getSimpleName().toLowerCase(); - final String value = configManager.getConfiguration(runeliteGroupName, keyName); - - if (value == null) - { - final PluginDescriptor pluginDescriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); - final boolean enabled = pluginDescriptor == null || pluginDescriptor.enabledByDefault(); - configManager.setConfiguration(runeliteGroupName, keyName, String.valueOf(enabled)); - } - } } public void loadCorePlugins() throws IOException @@ -389,7 +376,14 @@ public class PluginManager { final String keyName = plugin.getClass().getSimpleName().toLowerCase(); final String value = configManager.getConfiguration(runeliteGroupName, keyName); - return Boolean.valueOf(value); + + if (value != null) + { + return Boolean.valueOf(value); + } + + final PluginDescriptor pluginDescriptor = plugin.getClass().getAnnotation(PluginDescriptor.class); + return pluginDescriptor == null || pluginDescriptor.enabledByDefault(); } private Plugin instantiate(List scannedPlugins, Class clazz) throws PluginInstantiationException