From 65619e998b2e1483bc5ea06a923dc94c1c086a30 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 14 Mar 2018 18:02:33 +0100 Subject: [PATCH] Fix NPE from RSPlayer#getName Add null check for getRsName, because when logging to game, sometimes it is null, and throws NPE. Signed-off-by: Tomas Slusny --- .../main/java/net/runelite/mixins/RSPlayerMixin.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java index 80fb65c2da..4981d760f5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java @@ -36,6 +36,7 @@ import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Shadow; import net.runelite.rs.api.RSClient; +import net.runelite.rs.api.RSName; import net.runelite.rs.api.RSPlayer; @Mixin(RSPlayer.class) @@ -48,7 +49,14 @@ public abstract class RSPlayerMixin implements RSPlayer @Override public String getName() { - String name = getRsName().getName(); + final RSName rsName = getRsName(); + + if (rsName == null) + { + return null; + } + + String name = rsName.getName(); if (name == null) {