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 a7943367d8..8c6bc12432 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 @@ -259,14 +259,13 @@ public class ClanChatPlugin extends Plugin if (member.getWorld() == client.getWorld()) { final String memberName = Text.toJagexName(member.getUsername()); - final Iterator each = clanMembers.iterator(); - while (each.hasNext()) + List toRemove = new ArrayList<>(); + for (Player each : clanMembers) { - if (memberName.equals(Text.toJagexName(each.next().getName()))) + if (memberName.equals(Text.toJagexName(each.getName()))) { - each.remove(); - + toRemove.add(each); if (clanMembers.isEmpty()) { removeClanCounter(); @@ -275,6 +274,7 @@ public class ClanChatPlugin extends Plugin break; } } + clanMembers.removeAll(toRemove); } if (!this.showJoinLeave ||