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

ExaminePlugin: Make sure widget children array index is valid

Browse Source
This commit is contained in:
Alexander
2018-01-03 03:29:38 +01:00
committed by Adam
parent d4623674c7
commit 73134b73d3
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
View File

@@ -252,20 +252,30 @@ public class ExaminePlugin extends Plugin
if (WidgetInfo.EQUIPMENT.getGroupId() == widgetGroup) if (WidgetInfo.EQUIPMENT.getGroupId() == widgetGroup)
{ {
Widget widgetItem = widget.getChild(1); Widget widgetItem = widget.getChild(1);
quantity = widgetItem != null ? widgetItem.getItemQuantity() : 1; if (widgetItem != null)
itemId = widgetItem.getItemId(); {
quantity = widgetItem.getItemQuantity();
itemId = widgetItem.getItemId();
}
} }
else if (WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup) else if (WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup)
{ {
Widget widgetItem = widget.getChild(pendingExamine.getActionParam()); Widget widgetItem = widget.getChild(pendingExamine.getActionParam());
quantity = widgetItem != null ? widgetItem.getItemQuantity() : 1; if (widgetItem != null)
itemId = widgetItem.getItemId(); {
quantity = widgetItem.getItemQuantity();
itemId = widgetItem.getItemId();
}
} }
else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup) else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup)
{ {
Widget widgetItem = widget.getDynamicChildren()[pendingExamine.getActionParam()]; Widget[] children = widget.getDynamicChildren();
quantity = widgetItem != null ? widgetItem.getItemQuantity() : 1; if (pendingExamine.getActionParam() < children.length)
itemId = widgetItem.getItemId(); {
Widget widgetItem = children[pendingExamine.getActionParam()];
quantity = widgetItem.getItemQuantity();
itemId = widgetItem.getItemId();
}
} }
} }