From 503d17e59d7534f977ae5f79052136150f2e2d25 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Sat, 2 Jun 2018 23:39:07 +0100 Subject: [PATCH] Reorder updateConfig to match TimerConfig --- .../client/plugins/timers/TimersPlugin.java | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index e72f727df1..31f9603fb1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -122,51 +122,9 @@ public class TimersPlugin extends Plugin @Subscribe public void updateConfig(ConfigChanged event) { - if (!config.showCharge()) + if (!config.showAntidotePlus()) { - removeGameTimer(CHARGE); - } - - if (!config.showStamina()) - { - removeGameTimer(STAMINA); - } - - if (!config.showAntiFire()) - { - removeGameTimer(ANTIFIRE); - } - - if (!config.showExAntiFire()) - { - removeGameTimer(EXANTIFIRE); - } - - if (!config.showOverload()) - { - removeGameTimer(OVERLOAD); - removeGameTimer(OVERLOAD_RAID); - } - - if (!config.showCannon()) - { - removeGameTimer(CANNON); - } - - if (!config.showMagicImbue()) - { - removeGameTimer(MAGICIMBUE); - } - - if (!config.showTeleblock()) - { - removeGameTimer(FULLTB); - removeGameTimer(HALFTB); - } - - if (!config.showSuperAntiFire()) - { - removeGameTimer(SUPERANTIFIRE); + removeGameTimer(ANTIDOTEPLUS); } if (!config.showAntidotePlusPlus()) @@ -174,9 +132,9 @@ public class TimersPlugin extends Plugin removeGameTimer(ANTIDOTEPLUSPLUS); } - if (!config.showAntidotePlus()) + if (!config.showSanfew()) { - removeGameTimer(ANTIDOTEPLUS); + removeGameTimer(SANFEW); } if (!config.showAntiVenom()) @@ -189,9 +147,55 @@ public class TimersPlugin extends Plugin removeGameTimer(ANTIVENOMPLUS); } - if (!config.showSanfew()) + if (!config.showAntiFire()) { - removeGameTimer(SANFEW); + removeGameTimer(ANTIFIRE); + } + + if (!config.showExAntiFire()) + { + removeGameTimer(EXANTIFIRE); + } + + if (!config.showSuperAntiFire()) + { + removeGameTimer(SUPERANTIFIRE); + } + + if (!config.showStamina()) + { + removeGameTimer(STAMINA); + } + + if (!config.showOverload()) + { + removeGameTimer(OVERLOAD); + removeGameTimer(OVERLOAD_RAID); + } + + if (!config.showPrayerEnhance()) + { + removeGameTimer(PRAYER_ENHANCE); + } + + if (!config.showCannon()) + { + removeGameTimer(CANNON); + } + + if (!config.showMagicImbue()) + { + removeGameTimer(MAGICIMBUE); + } + + if (!config.showCharge()) + { + removeGameTimer(CHARGE); + } + + if (!config.showImbuedHeart()) + { + removeGameTimer(IMBUEDHEART); } if (!config.showVengeance()) @@ -204,9 +208,10 @@ public class TimersPlugin extends Plugin removeGameTimer(VENGEANCEOTHER); } - if (!config.showImbuedHeart()) + if (!config.showTeleblock()) { - removeGameTimer(IMBUEDHEART); + removeGameTimer(FULLTB); + removeGameTimer(HALFTB); } if (!config.showFreezes()) @@ -222,11 +227,6 @@ public class TimersPlugin extends Plugin removeGameTimer(ICEBLITZ); removeGameTimer(ICEBARRAGE); } - - if (!config.showPrayerEnhance()) - { - removeGameTimer(PRAYER_ENHANCE); - } } @Subscribe