From 6e5bebe734acf1735f2bca39ef020b19c383c020 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Thu, 22 Aug 2019 09:21:16 -0400
Subject: [PATCH] playerscouter: fix value mapping. (#1419)

---
 .../java/net/runelite/client/game/ItemManager.java     |  2 +-
 .../java/net/runelite/client/game/ItemMapping.java     |  5 +++++
 .../client/plugins/playerscouter/PlayerScouter.java    | 10 +++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
index a6c0cd0067..3b8df74e93 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
@@ -375,7 +375,7 @@ public class ItemManager
 	{
 		ItemDefinition itemDefinition = getItemDefinition(itemId);
 
-		if (itemDefinition == null || itemDefinition.getName() == null || (!allowNote && itemDefinition.getNote() != -1))
+		if (itemDefinition.getName() == null || !allowNote && itemDefinition.getNote() != -1)
 		{
 			return null;
 		}
diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
index 11af997808..89485df2ef 100644
--- a/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
+++ b/runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
@@ -283,4 +283,9 @@ public enum ItemMapping
 
 		return mapping.iterator().next();
 	}
+
+	public static boolean isMapped(int itemId)
+	{
+		return MAPPINGS.containsValue(itemId);
+	}
 }
\ No newline at end of file
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
index d08b79d7d7..968a331bf4 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
@@ -62,6 +62,7 @@ import net.runelite.api.kit.KitType;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.eventbus.EventBus;
 import net.runelite.client.game.ItemManager;
+import net.runelite.client.game.ItemMapping;
 import net.runelite.client.game.PvPValueBrokenItem;
 import net.runelite.client.game.WorldLocation;
 import net.runelite.client.plugins.Plugin;
@@ -373,9 +374,10 @@ public class PlayerScouter extends Plugin
 			{
 				prices.put(id, itemManager.getBrokenValue(id));
 				log.debug("Item has a broken value: Id {}, Value {}", id, itemManager.getBrokenValue(id));
+				continue;
 			}
 
-			if (!itemDefinition.isTradeable() && !PvPValueBrokenItem.breaksOnDeath(id))
+			if (!itemDefinition.isTradeable() && !ItemMapping.isMapped(id))
 			{
 				prices.put(id, itemDefinition.getPrice());
 			}
@@ -392,12 +394,14 @@ public class PlayerScouter extends Plugin
 		player.setGear(prices.entrySet()
 			.stream()
 			.sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
-			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)));
+			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new))
+		);
 
 		player.setRiskedGear(prices.entrySet()
 			.stream()
 			.sorted(Collections.reverseOrder(Map.Entry.comparingByValue()))
-			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new)));
+			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new))
+		);
 
 		if (player.getPlayer().getSkullIcon() == null)
 		{