From 2f613fa300ed7698c3466b775b43b66148d52863 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 24 Oct 2021 15:04:53 -0400 Subject: [PATCH] api: add clan id to clan channel changed event --- .../java/net/runelite/api/events/ClanChannelChanged.java | 5 +++++ .../java/net/runelite/client/plugins/team/TeamPlugin.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java b/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java index 57abd91dbb..d9e3edbbff 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java @@ -39,6 +39,11 @@ public class ClanChannelChanged */ @Nullable private final ClanChannel clanChannel; + /** + * The clan id, or -1 for guest clan + * @see net.runelite.api.clan.ClanID + */ + private int clanId; /** * Whether or not this was the guest clan channel */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java index 4d78816524..178454ace0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java @@ -45,6 +45,7 @@ import net.runelite.api.Player; import net.runelite.api.SpriteID; import net.runelite.api.clan.ClanChannel; import net.runelite.api.clan.ClanChannelMember; +import net.runelite.api.clan.ClanID; import net.runelite.api.events.ClanChannelChanged; import net.runelite.api.events.ClanMemberJoined; import net.runelite.api.events.ClanMemberLeft; @@ -290,7 +291,7 @@ public class TeamPlugin extends Plugin @Subscribe public void onClanChannelChanged(ClanChannelChanged event) { - if (!event.isGuest()) + if (event.getClanId() == ClanID.CLAN) { removeClanChatCounter(); clanChatCount = 0;