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

npc indicators: don't memorize npcs in instances

Browse Source 
I can't find any instances of npc indexes being reused in instances,
which just causes the respawn timers to incorrectly identify a random
npc later which happens to use the same id.

See 01f134795d
This commit is contained in:
Adam
2020-05-16 12:58:21 -04:00
parent 8ab929d001
commit ba73d70433
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,6 @@ import static net.runelite.api.MenuAction.MENU_ACTION_DEPRIORITIZE_OFFSET;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.client.events.ConfigChanged;
import net.runelite.api.events.FocusChanged; import net.runelite.api.events.FocusChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
@@ -63,6 +62,7 @@ import net.runelite.api.events.NpcSpawned;
import net.runelite.client.callback.ClientThread; import net.runelite.client.callback.ClientThread;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ConfigChanged;
import net.runelite.client.input.KeyManager; import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
@@ -310,8 +310,11 @@ public class NpcIndicatorsPlugin extends Plugin
} }
else else
{ {
memorizeNpc(npc); if (!client.isInInstancedRegion())
npcTags.add(id); {
memorizeNpc(npc);
npcTags.add(id);
}
highlightedNpcs.add(npc); highlightedNpcs.add(npc);
} }
@@ -341,9 +344,12 @@ public class NpcIndicatorsPlugin extends Plugin
{ {
if (WildcardMatcher.matches(highlight, npcName)) if (WildcardMatcher.matches(highlight, npcName))
{ {
memorizeNpc(npc);
highlightedNpcs.add(npc); highlightedNpcs.add(npc);
spawnedNpcsThisTick.add(npc); if (!client.isInInstancedRegion())
{
memorizeNpc(npc);
spawnedNpcsThisTick.add(npc);
}
break; break;
} }
} }
@@ -485,7 +491,10 @@ public class NpcIndicatorsPlugin extends Plugin
{ {
if (WildcardMatcher.matches(highlight, npcName)) if (WildcardMatcher.matches(highlight, npcName))
{ {
memorizeNpc(npc); if (!client.isInInstancedRegion())
{
memorizeNpc(npc);
}
highlightedNpcs.add(npc); highlightedNpcs.add(npc);
continue outer; continue outer;
} }