Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit a4cf88d

Browse files
ExplvExplv
authored andcommitted
Fix Grand Exchange item selling, when item is stackable
1 parent c31132a commit a4cf88d

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

AIO/src/org/aio/activities/grand_exchange/GESellActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ public class GESellActivity extends GEActivity {
1515
public GESellActivity(final GEItem geItem) {
1616
this.geItem = geItem;
1717
depositAllBanking = new DepositAllBanking();
18-
itemReqBanking = new ItemReqBanking(new ItemReq(geItem.getName(), 1, geItem.getQuantity()).setNoted());
18+
itemReqBanking = new ItemReqBanking(
19+
new ItemReq(geItem.getName(), 1, geItem.getQuantity()).setStackable().setNoted()
20+
);
1921
}
2022

2123
@Override

AIO/src/org/aio/script/AIO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
@ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
3030
public class AIO extends Script {
3131

32-
static final String VERSION = "v2.1.0";
32+
static final String VERSION = "v2.1.1";
3333

3434
private Gui gui;
3535
private Paint paint;

AIO/src/org/aio/util/item_requirement/ItemReq.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ public final ItemReq setEquipable() {
9898
}
9999

100100
public final boolean isRequirementItem(final Item item) {
101-
return item.getName().equals(getName()) && item.isNote() == isNoted();
101+
return item.getName().equals(getName()) &&
102+
(item.isNote() == isNoted()) || (isStackable() && item.getDefinition().getNotedId() == -1);
102103
}
103104

104105
public final boolean hasRequirement(final ItemContainer... itemContainers) {
@@ -114,7 +115,11 @@ public final long getAmount(final ItemContainer... itemContainers) {
114115
.mapToLong(itemContainer ->
115116
itemContainer.getAmount(item ->
116117
item.getName().equals(getName()) &&
117-
(itemContainer instanceof Bank || item.isNote() == isNoted())
118+
(
119+
itemContainer instanceof Bank ||
120+
item.isNote() == isNoted() ||
121+
(isStackable() && item.getDefinition().getNotedId() == -1) // If an item is stackable, it's noted ID will be -1
122+
)
118123
)
119124
).sum();
120125
}

0 commit comments

Comments
 (0)