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

playerscouter: fix value mapping. (#1419)

Browse Source
This commit is contained in:
Ganom
2019-08-22 09:21:16 -04:00
committed by Kyle
parent 491c8b12fb
commit 6e5bebe734
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
View File

@@ -375,7 +375,7 @@ public class ItemManager
{ {
ItemDefinition itemDefinition = getItemDefinition(itemId); ItemDefinition itemDefinition = getItemDefinition(itemId);
if (itemDefinition == null || itemDefinition.getName() == null || (!allowNote && itemDefinition.getNote() != -1)) if (itemDefinition.getName() == null || !allowNote && itemDefinition.getNote() != -1)
{ {
return null; return null;
} }

5
runelite-client/src/main/java/net/runelite/client/game/ItemMapping.java
View File

@@ -283,4 +283,9 @@ public enum ItemMapping
return mapping.iterator().next(); return mapping.iterator().next();
} }
public static boolean isMapped(int itemId)
{
return MAPPINGS.containsValue(itemId);
}
} }

10
runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
View File

@@ -62,6 +62,7 @@ import net.runelite.api.kit.KitType;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemManager;
import net.runelite.client.game.ItemMapping;
import net.runelite.client.game.PvPValueBrokenItem; import net.runelite.client.game.PvPValueBrokenItem;
import net.runelite.client.game.WorldLocation; import net.runelite.client.game.WorldLocation;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
@@ -373,9 +374,10 @@ public class PlayerScouter extends Plugin
{ {
prices.put(id, itemManager.getBrokenValue(id)); prices.put(id, itemManager.getBrokenValue(id));
log.debug("Item has a broken value: Id {}, Value {}", 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()); prices.put(id, itemDefinition.getPrice());
} }
@@ -392,12 +394,14 @@ public class PlayerScouter extends Plugin
player.setGear(prices.entrySet() player.setGear(prices.entrySet()
.stream() .stream()
.sorted(Collections.reverseOrder(Map.Entry.comparingByValue())) .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() player.setRiskedGear(prices.entrySet()
.stream() .stream()
.sorted(Collections.reverseOrder(Map.Entry.comparingByValue())) .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) if (player.getPlayer().getSkullIcon() == null)
{ {