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

Merge pull request #9635 from dekvall/npe-branch

Browse Source 
Fix NPE in groundmarkerplugin and annotate some methods as nullable
This commit is contained in:
Adam
2019-08-20 17:39:53 -04:00
committed by GitHub
parent 6bd7e4fb02 9fe8e8347e
commit 8374ff169d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/Actor.java
View File

@@ -50,6 +50,7 @@ public interface Actor extends Renderable
* *
* @return the name * @return the name
*/ */
@Nullable
String getName(); String getName();
/** /**

4
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -345,6 +345,7 @@ public interface Client extends GameEngine
* *
* @return the logged in player * @return the logged in player
*/ */
@Nullable
Player getLocalPlayer(); Player getLocalPlayer();
/** /**
@@ -425,6 +426,7 @@ public interface Client extends GameEngine
* *
* @return the selected tile * @return the selected tile
*/ */
@Nullable
Tile getSelectedSceneTile(); Tile getSelectedSceneTile();
/** /**
@@ -439,6 +441,7 @@ public interface Client extends GameEngine
* *
* @return the dragged widget, null if not dragging any widget * @return the dragged widget, null if not dragging any widget
*/ */
@Nullable
Widget getDraggedWidget(); Widget getDraggedWidget();
/** /**
@@ -449,6 +452,7 @@ public interface Client extends GameEngine
* *
* @return the dragged on widget, null if not dragging any widget * @return the dragged on widget, null if not dragging any widget
*/ */
@Nullable
Widget getDraggedOnWidget(); Widget getDraggedOnWidget();
/** /**

10
runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java
View File

@@ -209,12 +209,18 @@ public class GroundMarkerPlugin extends Plugin
{ {
if (hotKeyPressed && event.getOption().equals(WALK_HERE)) if (hotKeyPressed && event.getOption().equals(WALK_HERE))
{ {
final Tile selectedSceneTile = client.getSelectedSceneTile();
if (selectedSceneTile == null)
{
return;
}
MenuEntry[] menuEntries = client.getMenuEntries(); MenuEntry[] menuEntries = client.getMenuEntries();
menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1); menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
final WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, client.getSelectedSceneTile().getLocalLocation()); final WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, selectedSceneTile.getLocalLocation());
final int regionId = worldPoint.getRegionID(); final int regionId = worldPoint.getRegionID();
final GroundMarkerPoint point = new GroundMarkerPoint(regionId, worldPoint.getRegionX(), worldPoint.getRegionY(), client.getPlane(), config.markerColor()); final GroundMarkerPoint point = new GroundMarkerPoint(regionId, worldPoint.getRegionX(), worldPoint.getRegionY(), client.getPlane(), config.markerColor());