Fix Grand Exchange item selling, when item is stackable

Explv · Jan 27, 2019 · a4cf88d · a4cf88d
1 parent c31132a
commit a4cf88d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/AIO/src/org/aio/activities/grand_exchange/GESellActivity.java b/AIO/src/org/aio/activities/grand_exchange/GESellActivity.java
@@ -15,7 +15,9 @@ public class GESellActivity extends GEActivity {
     public GESellActivity(final GEItem geItem) {
         this.geItem = geItem;
         depositAllBanking = new DepositAllBanking();
-        itemReqBanking = new ItemReqBanking(new ItemReq(geItem.getName(), 1, geItem.getQuantity()).setNoted());
+        itemReqBanking = new ItemReqBanking(
+                new ItemReq(geItem.getName(), 1, geItem.getQuantity()).setStackable().setNoted()
+        );
     }
 
     @Override

diff --git a/AIO/src/org/aio/script/AIO.java b/AIO/src/org/aio/script/AIO.java
@@ -29,7 +29,7 @@
 @ScriptManifest(author = "Explv", name = "Explv's AIO " + AIO.VERSION, info = "AIO", version = 0, logo = "http://i.imgur.com/58Zz0fb.png")
 public class AIO extends Script {
 
-    static final String VERSION = "v2.1.0";
+    static final String VERSION = "v2.1.1";
 
     private Gui gui;
     private Paint paint;

diff --git a/AIO/src/org/aio/util/item_requirement/ItemReq.java b/AIO/src/org/aio/util/item_requirement/ItemReq.java
@@ -98,7 +98,8 @@ public final ItemReq setEquipable() {
     }
 
     public final boolean isRequirementItem(final Item item) {
-        return item.getName().equals(getName()) && item.isNote() == isNoted();
+        return item.getName().equals(getName()) &&
+                (item.isNote() == isNoted()) || (isStackable() && item.getDefinition().getNotedId() == -1);
     }
 
     public final boolean hasRequirement(final ItemContainer... itemContainers) {
@@ -114,7 +115,11 @@ public final long getAmount(final ItemContainer... itemContainers) {
                 .mapToLong(itemContainer ->
                         itemContainer.getAmount(item ->
                                 item.getName().equals(getName()) &&
-                                        (itemContainer instanceof Bank || item.isNote() == isNoted())
+                                (
+                                    itemContainer instanceof Bank ||
+                                    item.isNote() == isNoted() ||
+                                    (isStackable() && item.getDefinition().getNotedId() == -1) // If an item is stackable, it's noted ID will be -1
+                                )
                         )
                 ).sum();
     }