ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1133 from Owain94/slayer-v2

Browse Source 
slayer: fix slayer tracker -- justin
This commit is contained in:
Tyler Bochard
2019-07-25 19:01:29 -04:00
committed by GitHub
parent dbb00b482c 3c5c5f1996
commit 71de1ac8ea
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -301,12 +301,12 @@ public class SlayerPlugin extends Plugin
updateConfig(); updateConfig();
addSubscriptions(); addSubscriptions();
weaknessOverlayAttached = false;
overlayManager.add(overlay); overlayManager.add(overlay);
overlayManager.add(targetClickboxOverlay); overlayManager.add(targetClickboxOverlay);
overlayManager.add(targetMinimapOverlay); overlayManager.add(targetMinimapOverlay);
weaknessOverlayAttached = false;
if (slayerXpDropLookup == null) if (slayerXpDropLookup == null)
{ {
// create this in startup since it needs to pull files during creation // 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) 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 static final int FORCED_WAIT = 2;
private int forcedWait = -1; private int forcedWait = -1;
void onGameTick(GameTick tick) public void onGameTick(GameTick tick)
{ {
loginTick = false; 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) 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) 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); setTask(name, amt, initAmt, isNewAssignment, null, lastCertainAmt);
} }
@@ -1034,16 +1034,16 @@ public class SlayerPlugin extends Plugin
rebuildCheckAsTokens(task); rebuildCheckAsTokens(task);
rebuildTargetList(); rebuildTargetList();
if (weaknessOverlayAttached && task.getWeaknessItem() == -1 && task.getWeaknessThreshold() == -1) if (!weaknessOverlayAttached && task.getWeaknessItem() != -1 && task.getWeaknessThreshold() != -1)
{
overlayManager.remove(targetWeaknessOverlay);
weaknessOverlayAttached = false;
}
else if (!weaknessOverlayAttached && task.getWeaknessItem() > -1 && task.getWeaknessThreshold() > -1)
{ {
overlayManager.add(targetWeaknessOverlay); overlayManager.add(targetWeaknessOverlay);
weaknessOverlayAttached = true; weaknessOverlayAttached = true;
} }
else if (weaknessOverlayAttached && task.getWeaknessItem() == -1 && task.getWeaknessThreshold() == -1)
{
overlayManager.remove(targetWeaknessOverlay);
weaknessOverlayAttached = false;
}
} }
AsyncBufferedImage getImageForTask(Task task) AsyncBufferedImage getImageForTask(Task task)
@@ -1307,4 +1307,4 @@ public class SlayerPlugin extends Plugin
this.lastCertainAmount = config.lastCertainAmount(); this.lastCertainAmount = config.lastCertainAmount();
this.taskLocation = config.taskLocation(); this.taskLocation = config.taskLocation();
} }
} }