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

attack styles: fix NPE in overlay

Browse Source
This commit is contained in:
dekvall
2019-08-04 23:54:24 +02:00
committed by Adam
parent 44a000bdc3
commit 688ab50647
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesOverlay.java
View File

@@ -60,7 +60,14 @@ class AttackStylesOverlay extends Overlay
if (warnedSkillSelected || config.alwaysShowStyle()) if (warnedSkillSelected || config.alwaysShowStyle())
{ {
final String attackStyleString = plugin.getAttackStyle().getName(); final AttackStyle attackStyle = plugin.getAttackStyle();
if (attackStyle == null)
{
return null;
}
final String attackStyleString = attackStyle.getName();
panelComponent.getChildren().add(TitleComponent.builder() panelComponent.getChildren().add(TitleComponent.builder()
.text(attackStyleString) .text(attackStyleString)

2
runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java
View File

@@ -31,6 +31,7 @@ import com.google.inject.Provides;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import javax.annotation.Nullable;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.Skill; import net.runelite.api.Skill;
@@ -129,6 +130,7 @@ public class AttackStylesPlugin extends Plugin
hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), false); hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), false);
} }
@Nullable
public AttackStyle getAttackStyle() public AttackStyle getAttackStyle()
{ {
return attackStyle; return attackStyle;