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

npchighlight: Merge nested if statements

Browse Source
This commit is contained in:
sdburns1998
2019-07-07 15:56:05 +02:00
parent 8c8a716663
commit 8cd89cbbb2
1 changed files with 8 additions and 13 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

@@ -562,13 +562,10 @@ public class NpcIndicatorsPlugin extends Plugin
{ {
for (NPC npc : despawnedNpcsThisTick) for (NPC npc : despawnedNpcsThisTick)
{ {
if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() && teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()))
{ {
if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation())) // NPC teleported away, so we don't want to add the respawn timer
{ continue;
// NPC teleported away, so we don't want to add the respawn timer
continue;
}
} }
if (isInViewRange(client.getLocalPlayer().getWorldLocation(), npc.getWorldLocation())) if (isInViewRange(client.getLocalPlayer().getWorldLocation(), npc.getWorldLocation()))
@@ -590,14 +587,12 @@ public class NpcIndicatorsPlugin extends Plugin
for (NPC npc : spawnedNpcsThisTick) for (NPC npc : spawnedNpcsThisTick)
{ {
if (!teleportGraphicsObjectSpawnedThisTick.isEmpty()) if (!teleportGraphicsObjectSpawnedThisTick.isEmpty() &&
(teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) ||
teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc))))
{ {
if (teleportGraphicsObjectSpawnedThisTick.contains(npc.getWorldLocation()) || // NPC teleported here, so we don't want to update the respawn timer
teleportGraphicsObjectSpawnedThisTick.contains(getWorldLocationBehind(npc))) continue;
{
// NPC teleported here, so we don't want to update the respawn timer
continue;
}
} }
if (lastPlayerLocation != null && isInViewRange(lastPlayerLocation, npc.getWorldLocation())) if (lastPlayerLocation != null && isInViewRange(lastPlayerLocation, npc.getWorldLocation()))