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

Merge pull request #11687 from abextm/overcannonicalize-item

Browse Source
This commit is contained in:
Jordan
2020-05-25 18:31:18 -07:00
committed by GitHub
parent 13b5104d5a 98395b94b1
commit a36d38229f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,20 +290,25 @@ public class ItemManager
*/ */
public int getItemPrice(int itemID, boolean ignoreUntradeableMap) public int getItemPrice(int itemID, boolean ignoreUntradeableMap)
{ {
final int realId = canonicalize(itemID); if (itemID == ItemID.COINS_995)
if (realId == ItemID.COINS_995)
{ {
return 1; return 1;
} }
if (realId == ItemID.PLATINUM_TOKEN) if (itemID == ItemID.PLATINUM_TOKEN)
{ {
return 1000; return 1000;
} }
ItemComposition itemComposition = getItemComposition(itemID);
if (itemComposition.getNote() != -1)
{
itemID = itemComposition.getLinkedNoteId();
}
itemID = WORN_ITEMS.getOrDefault(itemID, itemID);
if (!ignoreUntradeableMap) if (!ignoreUntradeableMap)
{ {
UntradeableItemMapping p = UntradeableItemMapping.map(ItemVariationMapping.map(realId)); UntradeableItemMapping p = UntradeableItemMapping.map(ItemVariationMapping.map(itemID));
if (p != null) if (p != null)
{ {
return getItemPrice(p.getPriceID()) * p.getQuantity(); return getItemPrice(p.getPriceID()) * p.getQuantity();
@@ -311,7 +316,7 @@ public class ItemManager
} }
int price = 0; int price = 0;
for (int mappedID : ItemMapping.map(realId)) for (int mappedID : ItemMapping.map(itemID))
{ {
ItemPrice ip = itemPrices.get(mappedID); ItemPrice ip = itemPrices.get(mappedID);
if (ip != null) if (ip != null)