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

Merge pull request #6244 from deathbeam/idle-notifier-fixes

Browse Source 
Properly update last action times in Idle Notifier
This commit is contained in:
Tomas Slusny
2018-11-03 12:44:30 +01:00
committed by GitHub
parent d1af4d1ecb 1842612b28
commit 3f904d3804
2 changed files with 12 additions and 5 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

@@ -214,19 +214,23 @@ public class IdleNotifierPlugin extends Plugin
case SAND_COLLECTION:
resetTimers();
lastAnimation = animation;
lastAnimating = Instant.now();
break;
case MAGIC_LUNAR_SHARED:
if (graphic == GraphicID.BAKE_PIE)
{
resetTimers();
lastAnimation = animation;
lastAnimating = Instant.now();
break;
}
case IDLE:
lastAnimating = Instant.now();
break;
default:
// On unknown animation simply assume the animation is invalid and dont throw notification
lastAnimation = IDLE;
lastAnimating = null;
}
}
@@ -246,6 +250,10 @@ public class IdleNotifierPlugin extends Plugin
{
lastInteract = null;
}
else
{
lastInteracting = Instant.now();
}
final boolean isNpc = target instanceof NPC;
@@ -264,6 +272,7 @@ public class IdleNotifierPlugin extends Plugin
// Player is most likely in combat with attack-able NPC
resetTimers();
lastInteract = target;
lastInteracting = Instant.now();
}
}
@@ -447,7 +456,9 @@ public class IdleNotifierPlugin extends Plugin
if (interact == null)
{
if (lastInteracting != null && Instant.now().compareTo(lastInteracting.plus(waitDuration)) >= 0)
if (lastInteracting != null
&& Instant.now().compareTo(lastInteracting.plus(waitDuration)) >= 0
&& lastCombatCountdown == 0)
{
lastInteract = null;
lastInteracting = null;
@@ -553,9 +564,6 @@ public class IdleNotifierPlugin extends Plugin
{
final Player local = client.getLocalPlayer();
// Reset combat idle timer
lastCombatCountdown = 0;
// Reset animation idle timer
lastAnimating = null;
if (client.getGameState() == GameState.LOGIN_SCREEN || local == null || local.getAnimation() != lastAnimation)