From b3356ea5a20848769ba6c4da0eeba21a6fa08fa9 Mon Sep 17 00:00:00 2001 From: SomeoneWithAnInternetConnection <34518321+SomeoneWithAnInternetConnection@users.noreply.github.com> Date: Fri, 2 Feb 2018 05:21:23 -0500 Subject: [PATCH] Fix NPEs from BoostsPlugin at startup shownSkills wasn't being initialized until it received ConfigChanged event, causing a NullPointerException when the overlay tried to iterate over shownSkills --- .../client/plugins/boosts/BoostsPlugin.java | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index bc32c3e037..6280180c2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -84,6 +84,15 @@ public class BoostsPlugin extends Plugin return boostsOverlay; } + @Override + protected void startUp() + { + if (config.enabled()) + { + updateShownSkills(config.enableSkill()); + } + } + @Subscribe public void onConfigChanged(ConfigChanged event) { @@ -92,14 +101,7 @@ public class BoostsPlugin extends Plugin return; } - if (config.enableSkill()) - { - shownSkills = ObjectArrays.concat(COMBAT, SKILLING, Skill.class); - } - else - { - shownSkills = COMBAT; - } + updateShownSkills(config.enableSkill()); if (event.getKey().equals("displayIndicators")) { @@ -121,4 +123,16 @@ public class BoostsPlugin extends Plugin } } } + + private void updateShownSkills(boolean showSkillingSkills) + { + if (showSkillingSkills) + { + shownSkills = ObjectArrays.concat(COMBAT, SKILLING, Skill.class); + } + else + { + shownSkills = COMBAT; + } + } }