From 7de65bbcf42c9a7a3365a342c3f8acdd37db97f4 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 28 May 2020 14:45:22 -0400 Subject: [PATCH] plugin manager: don't search child injector bindings for configs This fixes plugins which have dependencies and no configuration from erronously having their deps config picked up, and also fixes defaults being applied multiple times to the same config on startup due to the configs being in the bindings of multiple injectors --- .../main/java/net/runelite/client/plugins/PluginManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 8b31d4a201..1a2dc1f365 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 @@ -164,7 +164,7 @@ public class PluginManager { final Injector injector = plugin.getInjector(); - for (Key key : injector.getAllBindings().keySet()) + for (Key key : injector.getBindings().keySet()) { Class type = key.getTypeLiteral().getRawType(); if (Config.class.isAssignableFrom(type)) @@ -197,7 +197,7 @@ public class PluginManager List list = new ArrayList<>(); for (Injector injector : injectors) { - for (Key key : injector.getAllBindings().keySet()) + for (Key key : injector.getBindings().keySet()) { Class type = key.getTypeLiteral().getRawType(); if (Config.class.isAssignableFrom(type))