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

Fix ground items nullpointer exception

Browse Source
This commit is contained in:
Dennis de V
2018-03-12 13:50:42 +01:00
committed by Adam
parent 1121be0628
commit 9aac22477b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
View File

@@ -34,6 +34,7 @@ import net.runelite.api.Client;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.ItemLayer; import net.runelite.api.ItemLayer;
import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.Node; import net.runelite.api.Node;
import net.runelite.api.Region; import net.runelite.api.Region;
@@ -93,7 +94,8 @@ public class GroundItemsPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
if ((config.highlightMenuOption() || config.highlightMenuItemName()) && event.getOption().equals("Take")) if ((config.highlightMenuOption() || config.highlightMenuItemName()) && event.getOption().equals("Take")
&& event.getType() == MenuAction.GROUND_ITEM_THIRD_OPTION.getId())
{ {
String hiddenItemsStr = config.getHiddenItems().toLowerCase(); String hiddenItemsStr = config.getHiddenItems().toLowerCase();
List<String> hiddenItems = Arrays.asList(hiddenItemsStr.split(GroundItemsOverlay.DELIMITER_REGEX)); List<String> hiddenItems = Arrays.asList(hiddenItemsStr.split(GroundItemsOverlay.DELIMITER_REGEX));
@@ -113,6 +115,10 @@ public class GroundItemsPlugin extends Plugin
Region region = client.getRegion(); Region region = client.getRegion();
Tile tile = region.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()]; Tile tile = region.getTiles()[client.getPlane()][event.getActionParam0()][event.getActionParam1()];
ItemLayer itemLayer = tile.getItemLayer(); ItemLayer itemLayer = tile.getItemLayer();
if (itemLayer == null)
{
return;
}
MenuEntry[] menuEntries = client.getMenuEntries(); MenuEntry[] menuEntries = client.getMenuEntries();
MenuEntry lastEntry = menuEntries[menuEntries.length - 1]; MenuEntry lastEntry = menuEntries[menuEntries.length - 1];