From 0cb3404baeffd3cdba71717b3ec3f388fb00ca03 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 21 May 2018 15:27:50 -0400
Subject: [PATCH] Revert "Fix early stop of player lookup in HiScores (#3035)"

This reverts commit 323da7fd1b9e9bbec4be214c71bc4b543e496bc4.
---
 .../client/plugins/hiscore/HiscorePanel.java  | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
index 05cd52af27..f36b1c69a5 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
@@ -438,7 +438,7 @@ public class HiscorePanel extends PluginPanel
 		int index = 0;
 		for (JLabel label : skillLabels)
 		{
-			HiscoreSkill skill = find(index++);
+			HiscoreSkill skill = find(index);
 
 			if (skill == null)
 			{
@@ -456,26 +456,24 @@ public class HiscorePanel extends PluginPanel
 					label.setText(Integer.toString(combatLevel));
 				}
 			}
-			else if (result.getSkill(skill) == null || result.getSkill(skill).getRank() == -1)
+			else if (result.getSkill(skill) != null && result.getSkill(skill).getRank() != -1)
 			{
-				label.setToolTipText(null);
-				continue;
-			}
+				Skill s = result.getSkill(skill);
+				int level;
+				if (config.virtualLevels() && SKILLS.contains(skill))
+				{
+					level = Experience.getLevelForXp((int) s.getExperience());
+				}
+				else
+				{
+					level = s.getLevel();
+				}
 
-			Skill s = result.getSkill(skill);
-			int level;
-			if (config.virtualLevels() && SKILLS.contains(skill))
-			{
-				level = Experience.getLevelForXp((int) s.getExperience());
+				label.setText(Integer.toString(level));
 			}
-			else
-			{
-				level = s.getLevel();
-			}
-
-			label.setText(Integer.toString(level));
 
 			label.setToolTipText(detailsHtml(skill));
+			index++;
 		}
 	}