chatchannel: fix clan join/leave timeouts with fc join/leave off

This commit is contained in:
Adam
2021-05-29 22:06:05 -04:00
parent fb7cea1678
commit 68e8712ffc
2 changed files with 3 additions and 8 deletions

View File

@@ -117,7 +117,7 @@ public interface ChatChannelConfig extends Config
position = 4, position = 4,
section = friendsChatSection section = friendsChatSection
) )
default boolean showJoinLeave() default boolean showFriendsChatJoinLeave()
{ {
return false; return false;
} }

View File

@@ -201,7 +201,7 @@ public class ChatChannelPlugin extends Plugin
return; return;
} }
if (!config.showJoinLeave() || if (!config.showFriendsChatJoinLeave() ||
member.getRank().getValue() < config.joinLeaveRank().getValue()) member.getRank().getValue() < config.joinLeaveRank().getValue())
{ {
return; return;
@@ -216,7 +216,7 @@ public class ChatChannelPlugin extends Plugin
{ {
final FriendsChatMember member = event.getMember(); final FriendsChatMember member = event.getMember();
if (!config.showJoinLeave() || if (!config.showFriendsChatJoinLeave() ||
member.getRank().getValue() < config.joinLeaveRank().getValue()) member.getRank().getValue() < config.joinLeaveRank().getValue())
{ {
return; return;
@@ -315,11 +315,6 @@ public class ChatChannelPlugin extends Plugin
} }
} }
if (!config.showJoinLeave())
{
return;
}
timeoutMessages(); timeoutMessages();
addActivityMessages(); addActivityMessages();