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

Bugfix flinching with multiple interacting NPC's

Browse Source 
Didn't check for NpcIndex before.
This commit is contained in:
GeChallengeM
2019-07-10 11:19:04 +02:00
parent 4bc7c79a6f
commit e56a2c6db9
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java
View File

@@ -159,6 +159,10 @@ public class NpcStatusPlugin extends Plugin
{ {
for (MemorizedNPC mn : memorizedNPCs) for (MemorizedNPC mn : memorizedNPCs)
{ {
if (mn.getNpcIndex() != ((NPC) event.getActor()).getIndex())
{
continue;
}
if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null) if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 1) || mn.getLastinteracted() == null)
{ {
mn.setStatus(MemorizedNPC.Status.FLINCHING); mn.setStatus(MemorizedNPC.Status.FLINCHING);
@@ -184,7 +188,11 @@ public class NpcStatusPlugin extends Plugin
{ {
for (MemorizedNPC mn : memorizedNPCs) for (MemorizedNPC mn : memorizedNPCs)
{ {
if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 2) || mn.getLastinteracted() == null) if (mn.getNpcIndex() != ((NPC) event.getActor()).getIndex())
{
continue;
}
if (mn.getStatus() == MemorizedNPC.Status.OUT_OF_COMBAT || (mn.getStatus() == MemorizedNPC.Status.IN_COMBAT && mn.getCombatTimerEnd() - client.getTickCount() < 2) || event.getActor().getInteracting() == null)
{ {
mn.setStatus(MemorizedNPC.Status.FLINCHING); mn.setStatus(MemorizedNPC.Status.FLINCHING);
mn.setCombatTimerEnd(-1); mn.setCombatTimerEnd(-1);