From 3c59e4bcf0cb2e98720a5ce058c24fbf8309f636 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 28 May 2021 14:54:29 -0400 Subject: [PATCH] Strip tags when doing friends chat lookups The previous friend chat manager would do this when loading a name into the cache, but now that the cache is gone, we need to do it prior to the lookup --- .../runelite/client/plugins/chatchannel/ChatChannelPlugin.java | 2 +- .../plugins/playerindicators/PlayerIndicatorsService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java index ed9613da66..8eefd23fba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelPlugin.java @@ -786,7 +786,7 @@ public class ChatChannelPlugin extends Plugin private void insertRankIcon(final ChatMessage message) { - final FriendsChatRank rank = getRank(message.getName()); + final FriendsChatRank rank = getRank(Text.removeTags(message.getName())); if (rank != null && rank != FriendsChatRank.UNRANKED) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index e39e4bd79d..381c808623 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -38,6 +38,7 @@ import net.runelite.api.clan.ClanChannelMember; import net.runelite.api.clan.ClanRank; import net.runelite.api.clan.ClanSettings; import net.runelite.api.clan.ClanTitle; +import net.runelite.client.util.Text; @Singleton public class PlayerIndicatorsService @@ -130,7 +131,7 @@ public class PlayerIndicatorsService return FriendsChatRank.UNRANKED; } - FriendsChatMember friendsChatMember = friendsChatManager.findByName(player.getName()); + FriendsChatMember friendsChatMember = friendsChatManager.findByName(Text.removeTags(player.getName())); return friendsChatMember != null ? friendsChatMember.getRank() : FriendsChatRank.UNRANKED; } }