From 17413db71501fd156a3f02f578b0fc9efdc310e1 Mon Sep 17 00:00:00 2001 From: Lotto Date: Mon, 16 Apr 2018 23:01:57 +0200 Subject: [PATCH] Revert "hiscore panel: fix total level breakage" --- .../http/api/hiscore/HiscoreSkill.java | 58 ++++++++----------- .../client/plugins/hiscore/HiscorePanel.java | 2 +- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java index 1327aa29bc..57cc7423d5 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java @@ -27,29 +27,29 @@ package net.runelite.http.api.hiscore; public enum HiscoreSkill { OVERALL("Overall"), - ATTACK("Attack", true), - DEFENCE("Defence", true), - STRENGTH("Strength", true), - HITPOINTS("Hitpoints", true), - RANGED("Ranged", true), - PRAYER("Prayer", true), - MAGIC("Magic", true), - COOKING("Cooking", true), - WOODCUTTING("Woodcutting", true), - FLETCHING("Fletching", true), - FISHING("Fishing", true), - FIREMAKING("Firemaking", true), - CRAFTING("Crafting", true), - SMITHING("Smithing", true), - MINING("Mining", true), - HERBLORE("Herblore", true), - AGILITY("Agility", true), - THIEVING("Thieving", true), - SLAYER("Slayer", true), - FARMING("Farming", true), - RUNECRAFT("Runecraft", true), - HUNTER("Hunter", true), - CONSTRUCTION("Construction", true), + ATTACK("Attack"), + DEFENCE("Defence"), + STRENGTH("Strength"), + HITPOINTS("Hitpoints"), + RANGED("Ranged"), + PRAYER("Prayer"), + MAGIC("Magic"), + COOKING("Cooking"), + WOODCUTTING("Woodcutting"), + FLETCHING("Fletching"), + FISHING("Fishing"), + FIREMAKING("Firemaking"), + CRAFTING("Crafting"), + SMITHING("Smithing"), + MINING("Mining"), + HERBLORE("Herblore"), + AGILITY("Agility"), + THIEVING("Thieving"), + SLAYER("Slayer"), + FARMING("Farming"), + RUNECRAFT("Runecraft"), + HUNTER("Hunter"), + CONSTRUCTION("Construction"), CLUE_SCROLL_EASY("Clue Scrolls (easy)"), CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"), CLUE_SCROLL_ALL("Clue Scrolls (all)"), @@ -61,26 +61,14 @@ public enum HiscoreSkill CLUE_SCROLL_MASTER("Clue Scrolls (master)"); private final String name; - private final boolean virtualLevels; HiscoreSkill(String name) - { - this(name, false); - } - - HiscoreSkill(String name, boolean virtualLevels) { this.name = name; - this.virtualLevels = virtualLevels; } public String getName() { return name; } - - public boolean hasVirtualLevels() - { - return virtualLevels; - } } 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 0f7e409dd3..41843e72a7 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 @@ -550,7 +550,7 @@ public class HiscorePanel extends PluginPanel Skill s = result.getSkill(skill); int level; - if (config.virtualLevels() && skill.hasVirtualLevels()) + if (config.virtualLevels() && s.getExperience() >= 0) { level = Experience.getLevelForXp((int) s.getExperience()); }