From 1e581f8631f3de4fc1699cc37a4f07007ab12fa4 Mon Sep 17 00:00:00 2001 From: PKLite Date: Thu, 29 Aug 2019 06:42:27 -0400 Subject: [PATCH] Manual merge Signed-off-by: PKLite --- .../net/runelite/client/plugins/boosts/BoostsPlugin.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 6e4919c62e..7f80f37327 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 @@ -110,7 +110,7 @@ public class BoostsPlugin extends Plugin private long lastTickMillis; private final List boostedSkillsChanged = new ArrayList<>(); - private boolean enableSkill; + private BoostsConfig.DisplayBoosts displayBoosts; @Getter(AccessLevel.PACKAGE) private boolean useRelativeBoost; @Getter(AccessLevel.PACKAGE) @@ -332,8 +332,7 @@ public class BoostsPlugin extends Plugin private void updateShownSkills() { - switch (config.displayBoosts()) - if (this.enableSkill) + switch (this.displayBoosts) { case NONE: shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS); @@ -458,7 +457,7 @@ public class BoostsPlugin extends Plugin private void updateConfig() { - this.enableSkill = config.enableSkill(); + this.displayBoosts = config.displayBoosts(); this.useRelativeBoost = config.useRelativeBoost(); this.displayInfoboxes = config.displayInfoboxes(); this.displayIcons = config.displayIcons();