Revert "Fix early stop of player lookup in HiScores (#3035)"

This reverts commit 323da7fd1b.
This commit is contained in:
Adam
2018-05-21 15:27:50 -04:00
parent 629d8be605
commit 0cb3404bae

View File

@@ -438,7 +438,7 @@ public class HiscorePanel extends PluginPanel
int index = 0; int index = 0;
for (JLabel label : skillLabels) for (JLabel label : skillLabels)
{ {
HiscoreSkill skill = find(index++); HiscoreSkill skill = find(index);
if (skill == null) if (skill == null)
{ {
@@ -456,26 +456,24 @@ public class HiscorePanel extends PluginPanel
label.setText(Integer.toString(combatLevel)); 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); Skill s = result.getSkill(skill);
continue; int level;
} if (config.virtualLevels() && SKILLS.contains(skill))
{
level = Experience.getLevelForXp((int) s.getExperience());
}
else
{
level = s.getLevel();
}
Skill s = result.getSkill(skill); label.setText(Integer.toString(level));
int level;
if (config.virtualLevels() && SKILLS.contains(skill))
{
level = Experience.getLevelForXp((int) s.getExperience());
} }
else
{
level = s.getLevel();
}
label.setText(Integer.toString(level));
label.setToolTipText(detailsHtml(skill)); label.setToolTipText(detailsHtml(skill));
index++;
} }
} }