From 68e8712ffcc49a467427ec4990b80425f82e18fc Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 29 May 2021 22:06:05 -0400 Subject: [PATCH] chatchannel: fix clan join/leave timeouts with fc join/leave off --- .../client/plugins/chatchannel/ChatChannelConfig.java | 2 +- .../client/plugins/chatchannel/ChatChannelPlugin.java | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java index 2897b73955..eeffc30f4d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatchannel/ChatChannelConfig.java @@ -117,7 +117,7 @@ public interface ChatChannelConfig extends Config position = 4, section = friendsChatSection ) - default boolean showJoinLeave() + default boolean showFriendsChatJoinLeave() { return false; } 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 951b3368cc..b77c6745cd 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 @@ -201,7 +201,7 @@ public class ChatChannelPlugin extends Plugin return; } - if (!config.showJoinLeave() || + if (!config.showFriendsChatJoinLeave() || member.getRank().getValue() < config.joinLeaveRank().getValue()) { return; @@ -216,7 +216,7 @@ public class ChatChannelPlugin extends Plugin { final FriendsChatMember member = event.getMember(); - if (!config.showJoinLeave() || + if (!config.showFriendsChatJoinLeave() || member.getRank().getValue() < config.joinLeaveRank().getValue()) { return; @@ -315,11 +315,6 @@ public class ChatChannelPlugin extends Plugin } } - if (!config.showJoinLeave()) - { - return; - } - timeoutMessages(); addActivityMessages();