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

npc indicators: verify compoistion id of tagged npcs

Browse Source 
This fixes npc tags for dynamic npcs sometimes erronously tagging the
wrong npc if the npc index gets reused. This happens regularly when
tagging bloat manually a few times, since the Verzik webs are all npcs
and there are many of them, thus a high chance of index collision.
This commit is contained in:
Adam
2020-05-12 11:45:38 -04:00
parent 4243dce1b1
commit 01f134795d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
View File

@@ -145,9 +145,9 @@ public class NpcIndicatorsPlugin extends Plugin
private List<String> highlights = new ArrayList<>();
/**
* NPC ids marked with the Tag option
* NPC ids marked with the Tag option, index -> composition id
*/
private final Set<Integer> npcTags = new HashSet<>();
private final Map<Integer, Integer> npcTags = new HashMap<>();
/**
* Tagged NPCs that spawned this tick, which need to be verified that
@@ -294,7 +294,7 @@ public class NpcIndicatorsPlugin extends Plugin
}
final int id = click.getId();
final boolean removed = npcTags.remove(id);
final Integer removedId = npcTags.remove(id);
final NPC[] cachedNPCs = client.getCachedNPCs();
final NPC npc = cachedNPCs[id];
@@ -303,7 +303,7 @@ public class NpcIndicatorsPlugin extends Plugin
return;
}
if (removed)
if (removedId != null)
{
highlightedNpcs.remove(npc);
memorizedNpcs.remove(npc.getIndex());
@@ -311,7 +311,7 @@ public class NpcIndicatorsPlugin extends Plugin
else
{
memorizeNpc(npc);
npcTags.add(id);
npcTags.put(id, npc.getId());
highlightedNpcs.add(npc);
}
@@ -329,7 +329,8 @@ public class NpcIndicatorsPlugin extends Plugin
return;
}
if (npcTags.contains(npc.getIndex()))
Integer taggedId = npcTags.get(npc.getIndex());
if (taggedId != null && taggedId == npc.getId())
{
memorizeNpc(npc);
highlightedNpcs.add(npc);
@@ -475,7 +476,8 @@ public class NpcIndicatorsPlugin extends Plugin
continue;
}
if (npcTags.contains(npc.getIndex()))
Integer taggedId = npcTags.get(npc.getIndex());
if (taggedId != null && taggedId == npc.getId())
{
highlightedNpcs.add(npc);
continue;