Merge pull request #293 from UniquePassive/playermixin-npe

RSPlayerMixin: Don't NPE when Player name is null
2017-12-27 17:44:22 -05:00
parent 94ffd34ba9 8f9c74aa91
commit 9b3231671a
1 changed files with 8 additions and 1 deletions
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java
@@ -48,7 +48,14 @@ public abstract class RSPlayerMixin implements RSPlayer
 	@Override
 	public String getName()
 	{
-		return getRSName().replace('\u00A0', ' ');
+		String name = getRSName();
+
+		if (name == null)
+		{
+			return null;
+		}
+
+		return name.replace('\u00A0', ' ');
 	}

 	@Inject