diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index 91bf115d61..a3ef586d11 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -301,12 +301,12 @@ public class SlayerPlugin extends Plugin updateConfig(); addSubscriptions(); + weaknessOverlayAttached = false; + overlayManager.add(overlay); overlayManager.add(targetClickboxOverlay); overlayManager.add(targetMinimapOverlay); - weaknessOverlayAttached = false; - if (slayerXpDropLookup == null) { // create this in startup since it needs to pull files during creation @@ -442,7 +442,7 @@ public class SlayerPlugin extends Plugin } } - void onVarbitChanged(VarbitChanged event) + public void onVarbitChanged(VarbitChanged event) { if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints) { @@ -556,7 +556,7 @@ public class SlayerPlugin extends Plugin private static final int FORCED_WAIT = 2; private int forcedWait = -1; - void onGameTick(GameTick tick) + public void onGameTick(GameTick tick) { loginTick = false; @@ -637,7 +637,7 @@ public class SlayerPlugin extends Plugin } } - void onChatMessage(ChatMessage event) + public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) { @@ -722,7 +722,7 @@ public class SlayerPlugin extends Plugin } } - void onExperienceChanged(ExperienceChanged event) + public void onExperienceChanged(ExperienceChanged event) { if (event.getSkill() != SLAYER) { @@ -1005,7 +1005,7 @@ public class SlayerPlugin extends Plugin } } - void setTask(String name, int amt, int initAmt, boolean isNewAssignment, int lastCertainAmt) + public void setTask(String name, int amt, int initAmt, boolean isNewAssignment, int lastCertainAmt) { setTask(name, amt, initAmt, isNewAssignment, null, lastCertainAmt); } @@ -1034,16 +1034,16 @@ public class SlayerPlugin extends Plugin rebuildCheckAsTokens(task); rebuildTargetList(); - if (weaknessOverlayAttached && task.getWeaknessItem() == -1 && task.getWeaknessThreshold() == -1) - { - overlayManager.remove(targetWeaknessOverlay); - weaknessOverlayAttached = false; - } - else if (!weaknessOverlayAttached && task.getWeaknessItem() > -1 && task.getWeaknessThreshold() > -1) + if (!weaknessOverlayAttached && task.getWeaknessItem() != -1 && task.getWeaknessThreshold() != -1) { overlayManager.add(targetWeaknessOverlay); weaknessOverlayAttached = true; } + else if (weaknessOverlayAttached && task.getWeaknessItem() == -1 && task.getWeaknessThreshold() == -1) + { + overlayManager.remove(targetWeaknessOverlay); + weaknessOverlayAttached = false; + } } AsyncBufferedImage getImageForTask(Task task) @@ -1307,4 +1307,4 @@ public class SlayerPlugin extends Plugin this.lastCertainAmount = config.lastCertainAmount(); this.taskLocation = config.taskLocation(); } -} \ No newline at end of file +}