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

Merge pull request #776 from deathbeam/fix-idle-thresholds

Browse Source 
Remove the timeout for HP/pray thresholds
This commit is contained in:
Adam
2018-03-03 23:02:46 -05:00
committed by GitHub
parent a911c9564d 829bc61023
commit ab442de1f3
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java
View File

@@ -129,8 +129,6 @@ public class IdleNotifierPlugin extends Plugin
private Actor lastOpponent; private Actor lastOpponent;
private Instant lastAnimating; private Instant lastAnimating;
private Instant lastInteracting; private Instant lastInteracting;
private Instant lastHitpoints;
private Instant lastPrayer;
private boolean notifyIdle = false; private boolean notifyIdle = false;
private boolean notifyHitpoints = true; private boolean notifyHitpoints = true;
private boolean notifyPrayer = true; private boolean notifyPrayer = true;
@@ -299,24 +297,24 @@ public class IdleNotifierPlugin extends Plugin
notifier.notify("[" + local.getName() + "] is now out of combat!"); notifier.notify("[" + local.getName() + "] is now out of combat!");
} }
if (checkLowHitpoints(waitDuration)) if (checkLowHitpoints())
{ {
notifier.notify("[" + local.getName() + "] has low hitpoints!"); notifier.notify("[" + local.getName() + "] has low hitpoints!");
} }
if (checkLowPrayer(waitDuration)) if (checkLowPrayer())
{ {
notifier.notify("[" + local.getName() + "] has low prayer!"); notifier.notify("[" + local.getName() + "] has low prayer!");
} }
} }
private boolean checkLowHitpoints(Duration waitDuration) private boolean checkLowHitpoints()
{ {
if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold()) if (client.getRealSkillLevel(Skill.HITPOINTS) > config.getHitpointsThreshold())
{ {
if (client.getBoostedSkillLevel(Skill.HITPOINTS) <= config.getHitpointsThreshold()) if (client.getBoostedSkillLevel(Skill.HITPOINTS) <= config.getHitpointsThreshold())
{ {
if (!notifyHitpoints && Instant.now().compareTo(lastHitpoints.plus(waitDuration)) >= 0) if (!notifyHitpoints)
{ {
notifyHitpoints = true; notifyHitpoints = true;
return true; return true;
@@ -324,7 +322,6 @@ public class IdleNotifierPlugin extends Plugin
} }
else else
{ {
lastHitpoints = Instant.now();
notifyHitpoints = false; notifyHitpoints = false;
} }
} }
@@ -332,13 +329,13 @@ public class IdleNotifierPlugin extends Plugin
return false; return false;
} }
private boolean checkLowPrayer(Duration waitDuration) private boolean checkLowPrayer()
{ {
if (client.getRealSkillLevel(Skill.PRAYER) > config.getPrayerThreshold()) if (client.getRealSkillLevel(Skill.PRAYER) > config.getPrayerThreshold())
{ {
if (client.getBoostedSkillLevel(Skill.PRAYER) <= config.getPrayerThreshold()) if (client.getBoostedSkillLevel(Skill.PRAYER) <= config.getPrayerThreshold())
{ {
if (!notifyPrayer && Instant.now().compareTo(lastPrayer.plus(waitDuration)) >= 0) if (!notifyPrayer)
{ {
notifyPrayer = true; notifyPrayer = true;
return true; return true;
@@ -346,7 +343,6 @@ public class IdleNotifierPlugin extends Plugin
} }
else else
{ {
lastPrayer = Instant.now();
notifyPrayer = false; notifyPrayer = false;
} }
} }