From a0dc0e97dad3388034d69ceb7d00ca98f0071de7 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 24 Oct 2018 12:03:00 +0200 Subject: [PATCH] Prevent NPE in recent clan chats when var is null RECENT_CLAN_CHAT can be null when reset, so move the jagex name sanitization to updateRecentChat method (after null check). Signed-off-by: Tomas Slusny --- .../net/runelite/client/plugins/clanchat/ClanChatPlugin.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index cebd3ebf80..72f32b3860 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -133,7 +133,7 @@ public class ClanChatPlugin extends Plugin { if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && config.recentChats()) { - updateRecentChat(Text.toJagexName(client.getVar(VarClientStr.RECENT_CLAN_CHAT))); + updateRecentChat(client.getVar(VarClientStr.RECENT_CLAN_CHAT)); } } @@ -215,6 +215,8 @@ public class ClanChatPlugin extends Plugin return; } + s = Text.toJagexName(s); + chats.removeIf(s::equalsIgnoreCase); chats.add(s);