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

bank: Fix NPE in PostScriptFired subscriber (#12342)

Browse Source 
The bank widget can become null before the bank build script finishes by
holding the bank close key as the bank is opened. This commit adds a
null check to avoid this possible NPE.
This commit is contained in:
honeyhoney
2020-08-24 22:05:56 +01:00
committed by GitHub
parent e1ef747ed9
commit 7efd8d18d1
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
View File

@@ -232,23 +232,26 @@ public class BankPlugin extends Plugin
final Widget[] children = bankItemContainer.getChildren(); final Widget[] children = bankItemContainer.getChildren();
long geTotal = 0, haTotal = 0; long geTotal = 0, haTotal = 0;
log.debug("Computing bank price of {} items", bankContainer.size()); if (children != null)
// The first components are the bank items, followed by tabs etc. There are always 816 components regardless
// of bank size, but we only need to check up to the bank size.
for (int i = 0; i < bankContainer.size(); ++i)
{ {
Widget child = children[i]; log.debug("Computing bank price of {} items", bankContainer.size());
if (child != null && !child.isSelfHidden() && child.getItemId() > -1)
{
final int alchPrice = getHaPrice(child.getItemId());
geTotal += (long) itemManager.getItemPrice(child.getItemId()) * child.getItemQuantity();
haTotal += (long) alchPrice * child.getItemQuantity();
}
}
Widget bankTitle = client.getWidget(WidgetInfo.BANK_TITLE_BAR); // The first components are the bank items, followed by tabs etc. There are always 816 components regardless
bankTitle.setText(bankTitle.getText() + createValueText(geTotal, haTotal)); // of bank size, but we only need to check up to the bank size.
for (int i = 0; i < bankContainer.size(); ++i)
{
Widget child = children[i];
if (child != null && !child.isSelfHidden() && child.getItemId() > -1)
{
final int alchPrice = getHaPrice(child.getItemId());
geTotal += (long) itemManager.getItemPrice(child.getItemId()) * child.getItemQuantity();
haTotal += (long) alchPrice * child.getItemQuantity();
}
}
Widget bankTitle = client.getWidget(WidgetInfo.BANK_TITLE_BAR);
bankTitle.setText(bankTitle.getText() + createValueText(geTotal, haTotal));
}
} }
else if (event.getScriptId() == ScriptID.BANKMAIN_SEARCH_REFRESH) else if (event.getScriptId() == ScriptID.BANKMAIN_SEARCH_REFRESH)
{ {