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 7644e1bf12..01d8404622 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 @@ -229,7 +229,7 @@ public class TimersPlugin extends Plugin return; } - if (event.getMessage().equals("You drink some of your stamina potion.") && config.showStamina()) + if (config.showStamina() && event.getMessage().equals("You drink some of your stamina potion.")) { createGameTimer(STAMINA); } @@ -239,17 +239,17 @@ public class TimersPlugin extends Plugin removeGameTimer(STAMINA); } - if (event.getMessage().equals("You drink some of your antifire potion.") && config.showAntiFire()) + if (config.showAntiFire() && event.getMessage().equals("You drink some of your antifire potion.")) { createGameTimer(ANTIFIRE); } - if (event.getMessage().equals("You drink some of your extended antifire potion.") && config.showExAntiFire()) + if (config.showExAntiFire() && event.getMessage().equals("You drink some of your extended antifire potion.")) { createGameTimer(EXANTIFIRE); } - if (event.getMessage().equals("You drink some of your extended super antifire potion.") && config.showExSuperAntifire()) + if (config.showExSuperAntifire() && event.getMessage().equals("You drink some of your extended super antifire potion.")) { createGameTimer(EXSUPERANTIFIRE); } @@ -261,12 +261,12 @@ public class TimersPlugin extends Plugin removeGameTimer(EXANTIFIRE); } - if (event.getMessage().contains("You drink some of your overload potion") && config.showOverload()) + if (config.showOverload() && event.getMessage().startsWith("You drink some of your") && event.getMessage().contains("overload")) { createGameTimer(OVERLOAD); } - if ((event.getMessage().equals("You add the furnace.") || event.getMessage().contains("You repair your cannon, restoring it to working order.")) && config.showCannon()) + if (config.showCannon() && (event.getMessage().equals("You add the furnace.") || event.getMessage().contains("You repair your cannon, restoring it to working order."))) { createGameTimer(CANNON); } @@ -276,12 +276,12 @@ public class TimersPlugin extends Plugin removeGameTimer(CANNON); } - if (event.getMessage().contains("You drink some of your super antivenom potion") && config.showAntiVenomPlus()) + if (config.showAntiVenomPlus() && event.getMessage().contains("You drink some of your super antivenom potion")) { createGameTimer(ANTIVENOMPLUS); } - if (event.getMessage().equals("You are charged to combine runes!") && config.showMagicImbue()) + if (config.showMagicImbue() && event.getMessage().equals("You are charged to combine runes!")) { createGameTimer(MAGICIMBUE); } @@ -291,22 +291,22 @@ public class TimersPlugin extends Plugin removeGameTimer(MAGICIMBUE); } - if (event.getMessage().equals("