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

slayer plugin: fix npe from getTransformedComposition returning null

Browse Source 
Prefer checking if slayer targets is not empty before doing task lookup.

Introduced in c8105908c0
This commit is contained in:
Adam
2018-12-19 18:38:27 -05:00
parent 9e1a380c37
commit 8e4d4b07b5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
View File

@@ -562,10 +562,14 @@ public class SlayerPlugin extends Plugin
if (name.contains(target)) if (name.contains(target))
{ {
NPCComposition composition = npc.getTransformedComposition(); NPCComposition composition = npc.getTransformedComposition();
List actions = Arrays.asList(composition.getActions());
if (composition != null && (actions.contains("Attack") || actions.contains("Pick"))) //Pick action is for zygomite-fungi if (composition != null)
{ {
return true; List<String> actions = Arrays.asList(composition.getActions());
if (actions.contains("Attack") || actions.contains("Pick")) //Pick action is for zygomite-fungi
{
return true;
}
} }
} }
} }

5
runelite-client/src/main/java/net/runelite/client/plugins/slayer/TargetWeaknessOverlay.java
View File

@@ -65,7 +65,9 @@ class TargetWeaknessOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics) public Dimension render(Graphics2D graphics)
{ {
if (!config.weaknessPrompt()) final List<NPC> targets = plugin.getHighlightedTargets();
if (targets.isEmpty() || !config.weaknessPrompt())
{ {
return null; return null;
} }
@@ -84,7 +86,6 @@ class TargetWeaknessOverlay extends Overlay
return null; return null;
} }
final List<NPC> targets = plugin.getHighlightedTargets();
for (NPC target : targets) for (NPC target : targets)
{ {
final int currentHealth = calculateHealth(target); final int currentHealth = calculateHealth(target);