Merge branch 'RPKit-387' into release/v1.8

RP-Kit · May 25, 2020 · 18f2902 · 18f2902
2 parents afbb436 + f9b5208
commit 18f2902
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...src/main/kotlin/com/rpkit/chat/bukkit/command/listchatchannels/ListChatChannelsCommand.kt b/...src/main/kotlin/com/rpkit/chat/bukkit/command/listchatchannels/ListChatChannelsCommand.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ross Binden
+ * Copyright 2020 Ren Binden
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,8 @@ class ListChatChannelsCommand(private val plugin: RPKChatBukkit): CommandExecuto
                                 }
                                 messageComponents.add(chatChannelComponent)
                             } else if (matcher.group() == "\$mute") {
-                                if (chatChannel.listenerMinecraftProfiles.contains(minecraftProfile)) {
+                                if (chatChannel.listenerMinecraftProfiles.any { listenerMinecraftProfile ->
+                                            listenerMinecraftProfile.id == minecraftProfile.id }) {
                                     val muteComponent = TextComponent("Mute")
                                     muteComponent.clickEvent = ClickEvent(ClickEvent.Action.RUN_COMMAND, "/mute ${chatChannel.name}")
                                     muteComponent.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, arrayOf(TextComponent("Click to mute ${chatChannel.name}")))

diff --git a/...rpk-chat-bukkit/src/main/kotlin/com/rpkit/chat/bukkit/listener/AsyncPlayerChatListener.kt b/...rpk-chat-bukkit/src/main/kotlin/com/rpkit/chat/bukkit/listener/AsyncPlayerChatListener.kt
@@ -54,7 +54,8 @@ class AsyncPlayerChatListener(private val plugin: RPKChatBukkit): Listener {
                                         message = matcher.group(1)
                                     }
                                 }
-                                if (!chatChannel.listenerMinecraftProfiles.contains(minecraftProfile)) {
+                                if (!chatChannel.listenerMinecraftProfiles.any { listenerMinecraftProfile ->
+                                            listenerMinecraftProfile.id == minecraftProfile.id }) {
                                     chatChannel.addListener(minecraftProfile, event.isAsynchronous)
                                     chatChannelProvider.updateChatChannel(chatChannel, event.isAsynchronous)
                                 }