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

Check for NPE - ItemCharges (#324)

Browse Source
This commit is contained in:
sdburns1998
2019-05-20 18:30:25 +02:00
committed by Kyleeld
parent bb55defb50
commit 331594668e
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java
View File

@@ -39,6 +39,7 @@ import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import static net.runelite.api.ItemID.RING_OF_RECOIL;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
@@ -57,8 +58,6 @@ import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.util.Text; import net.runelite.client.util.Text;
import static net.runelite.api.ItemID.RING_OF_RECOIL;
@PluginDescriptor( @PluginDescriptor(
name = "Item Charges", name = "Item Charges",
description = "Show number of item charges remaining", description = "Show number of item charges remaining",
@@ -411,26 +410,34 @@ public class ItemChargePlugin extends Plugin
} }
} }
ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT); ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT);
ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY);
ringOfRecoilAvailable = false; ringOfRecoilAvailable = false;
ringOfRecoilEquipped = false; ringOfRecoilEquipped = false;
Item ring = equipment.getItems()[net.runelite.api.EquipmentInventorySlot.RING.getSlotIdx()]; Item ring = null;
if (ring.getId() == RING_OF_RECOIL) if (equipment != null)
{
ring = equipment.getItems()[EquipmentInventorySlot.RING.getSlotIdx()];
}
if (ring != null && ring.getId() == RING_OF_RECOIL)
{
ringOfRecoilEquipped = true;
ringOfRecoilAvailable = true;
}
Item[] items = new Item[0];
if (inventory != null)
{
items = inventory.getItems();
}
for (Item item : items)
{
if (item.getId() == RING_OF_RECOIL)
{ {
ringOfRecoilEquipped = true;
ringOfRecoilAvailable = true; ringOfRecoilAvailable = true;
break;
} }
Item[] items = inventory.getItems(); }
for (Item item : items)
{
if (item.getId() == RING_OF_RECOIL)
{
ringOfRecoilAvailable = true;
break;
}
}
Widget dialog1 = client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT); Widget dialog1 = client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT);
Widget dialog2 = client.getWidget(WidgetInfo.DIALOG2_SPRITE_TEXT); Widget dialog2 = client.getWidget(WidgetInfo.DIALOG2_SPRITE_TEXT);