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

Account for quantity when deciding to hide item from left-click (#2031)

Browse Source
This commit is contained in:
cboar
2019-11-13 04:57:21 -08:00
committed by Lucwousin
parent 80be03858d
commit 33570fbe88
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -735,13 +735,13 @@ public class GroundItemsPlugin extends Plugin
{ {
final MenuEntry aEntry = a.getEntry(); final MenuEntry aEntry = a.getEntry();
final int aId = aEntry.getIdentifier(); final int aId = aEntry.getIdentifier();
final boolean aHidden = isItemIdHidden(aId);
final int aQuantity = getCollapsedItemQuantity(aId, aEntry.getTarget()); final int aQuantity = getCollapsedItemQuantity(aId, aEntry.getTarget());
final boolean aHidden = isItemIdHidden(aId, aQuantity);
final MenuEntry bEntry = b.getEntry(); final MenuEntry bEntry = b.getEntry();
final int bId = bEntry.getIdentifier(); final int bId = bEntry.getIdentifier();
final boolean bHidden = isItemIdHidden(bId);
final int bQuantity = getCollapsedItemQuantity(bId, bEntry.getTarget()); final int bQuantity = getCollapsedItemQuantity(bId, bEntry.getTarget());
final boolean bHidden = isItemIdHidden(bId, bQuantity);
// only put items below walk if the config is set for it // only put items below walk if the config is set for it
if (this.rightClickHidden) if (this.rightClickHidden)
@@ -964,6 +964,7 @@ public class GroundItemsPlugin extends Plugin
current = current.getNext(); current = current.getNext();
} }
final ItemDefinition itemComposition = itemManager.getItemDefinition(itemId); final ItemDefinition itemComposition = itemManager.getItemDefinition(itemId);
final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemComposition.getId(); final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemComposition.getId();
final int itemPrice = itemManager.getItemPrice(realItemId); final int itemPrice = itemManager.getItemPrice(realItemId);
@@ -1126,12 +1127,12 @@ public class GroundItemsPlugin extends Plugin
return itemManager.getItemPrice(realItemId); return itemManager.getItemPrice(realItemId);
} }
private boolean isItemIdHidden(int itemId) private boolean isItemIdHidden(int itemId, int quantity)
{ {
final ItemDefinition itemComposition = itemManager.getItemDefinition(itemId); final ItemDefinition itemComposition = itemManager.getItemDefinition(itemId);
final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemId; final int realItemId = itemComposition.getNote() != -1 ? itemComposition.getLinkedNoteId() : itemId;
final int alchPrice = itemManager.getAlchValue(realItemId); final int alchPrice = itemManager.getAlchValue(realItemId) * quantity;
final int gePrice = itemManager.getItemPrice(realItemId); final int gePrice = itemManager.getItemPrice(realItemId) * quantity;
return getHidden(itemComposition.getName(), gePrice, alchPrice, itemComposition.isTradeable()) != null; return getHidden(itemComposition.getName(), gePrice, alchPrice, itemComposition.isTradeable()) != null;
} }