クールタイムが解消されない問題を修正

sya-ri · Feb 21, 2021 · 0994fb1 · 0994fb1
1 parent d3ed2f7
commit 0994fb1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     id("net.minecrell.plugin-yml.bukkit") version "0.3.0"
 }
 
-version = "1.0.0"
+version = "1.0.1"
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/com/github/syari/plugin/talk/with/near/player/discord/DiscordClient.kt b/src/main/kotlin/com/github/syari/plugin/talk/with/near/player/discord/DiscordClient.kt
@@ -59,7 +59,7 @@ object DiscordClient {
         val uuidPlayer = UUIDPlayer.from(player)
         if (muteCoolTime.contains(uuidPlayer)) return null
         muteCoolTime.add(uuidPlayer)
-        plugin.runTaskLater(10, true) {
+        plugin.runTaskLater(10) {
             muteCoolTime.remove(uuidPlayer)
         }
         val guild = guild ?: return "ギルドが見つかりませんでした"
@@ -86,7 +86,7 @@ object DiscordClient {
         val uuidPlayer = UUIDPlayer.from(player)
         if (moveCoolTime.contains(uuidPlayer)) return null
         moveCoolTime.add(uuidPlayer)
-        plugin.runTaskLater(15, true) {
+        plugin.runTaskLater(15) {
             moveCoolTime.remove(uuidPlayer)
         }
         val guild = guild ?: return "ギルドが見つかりませんでした"

diff --git a/src/main/kotlin/com/github/syari/plugin/talk/with/near/player/mode/AutoGroupOnMove.kt b/src/main/kotlin/com/github/syari/plugin/talk/with/near/player/mode/AutoGroupOnMove.kt
@@ -54,15 +54,13 @@ object AutoGroupOnMove : EventRegister {
                 if (coolTime.contains(uuidPlayer)) return@event
                 updateConnectChannel()
                 coolTime.add(uuidPlayer)
-                plugin.runTaskLater(5, true) {
+                plugin.runTaskLater(5) {
                     coolTime.remove(uuidPlayer)
                 }
             }
         }
     }
 
-    private var lastConnectChannel = mapOf<UUIDPlayer, Long>()
-
     private fun updateConnectChannel() {
         val voiceMemberList = DiscordMember.playerList.toMutableSet()
 
@@ -106,19 +104,16 @@ object AutoGroupOnMove : EventRegister {
             }
         }
 
-        if (lastConnectChannel != connectChannel) {
-            connectChannel.forEach { (uuidPlayer, channel) ->
-                val player = uuidPlayer.player ?: return@forEach
+        connectChannel.forEach { (uuidPlayer, channel) ->
+            val player = uuidPlayer.player ?: return@forEach
+            DiscordClient.move(player, channel)
+        }
+        voiceMemberList.forEach {
+            val player = it.player ?: return@forEach
+            val channel = ownerToChannel[null]
+            if (channel != null) {
                 DiscordClient.move(player, channel)
             }
-            voiceMemberList.forEach {
-                val player = it.player ?: return@forEach
-                val channel = ownerToChannel[null]
-                if (channel != null) {
-                    DiscordClient.move(player, channel)
-                }
-            }
-            lastConnectChannel = connectChannel
         }
     }
 }