[2.4.5] 优化跨服玩家列表处理

ItsFlicker · ItsFlicker · commit e8b4bed88fd8 · 2026-06-14T14:10:20.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.4.4
+version=2.4.5
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/impl/BukkitProxyManager.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/impl/BukkitProxyManager.kt
@@ -17,6 +17,7 @@ import taboolib.common.platform.PlatformFactory
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.function.console
 import taboolib.common.platform.function.getProxyPlayer
+import taboolib.common.platform.function.submitAsync
 import taboolib.common.util.unsafeLazy
 import taboolib.common5.cint
 import taboolib.module.chat.ComponentText
@@ -99,6 +100,9 @@ object BukkitProxyManager : ClientMessageManager {
             }
             ProxyMode.REDIS -> {
                 RedisManager()
+                submitAsync(period = 200L) {
+                    updateNames()
+                }
                 BukkitProxyProcessor.RedisSide()
             }
             else -> null
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Text.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/obj/Text.kt
@@ -10,6 +10,8 @@ import me.arasple.mc.trchat.util.papiRegex
 import me.arasple.mc.trchat.util.setPlaceholders
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
+import taboolib.common.platform.Platform
+import taboolib.common.platform.PlatformSide
 import taboolib.common.util.replaceWithOrder
 import taboolib.module.chat.ComponentText
 import taboolib.module.chat.Components
@@ -19,6 +21,7 @@ import taboolib.module.configuration.ConfigNode
  * @author ItsFlicker
  * @since 2022/1/21 23:21
  */
+@PlatformSide(Platform.BUKKIT)
 open class Text(val content: String, val condition: Condition?) {
 
     val dynamic = papiRegex.containsMatchIn(content)
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerJoin.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerJoin.kt
@@ -1,5 +1,6 @@
 package me.arasple.mc.trchat.module.internal.listener
 
+import me.arasple.mc.trchat.api.impl.BukkitProxyManager
 import me.arasple.mc.trchat.module.display.channel.Channel
 import me.arasple.mc.trchat.module.internal.service.Updater
 import me.arasple.mc.trchat.util.data
@@ -39,6 +40,7 @@ object ListenerJoin {
                 }
             }
             Updater.notifyPlayer(adaptPlayer(player))
+            BukkitProxyManager.updateNames()
         }
     }
 }
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerQuit.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerQuit.kt
@@ -1,5 +1,6 @@
 package me.arasple.mc.trchat.module.internal.listener
 
+import me.arasple.mc.trchat.api.impl.BukkitProxyManager
 import me.arasple.mc.trchat.module.conf.file.Functions
 import me.arasple.mc.trchat.module.display.ChatSession
 import me.arasple.mc.trchat.module.display.channel.Channel
@@ -11,6 +12,7 @@ import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
+import taboolib.common.platform.function.submit
 
 /**
  * @author ItsFlicker
@@ -31,6 +33,9 @@ object ListenerQuit {
         Channel.channels.values.forEach { it.listeners -= name }
         ChatSession.removeSession(player)
         PlayerData.removeData(player)
+        submit(delay = 10) {
+            BukkitProxyManager.updateNames()
+        }
     }
 
 }
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/proxy/BukkitProxyProcessor.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/proxy/BukkitProxyProcessor.kt
@@ -21,7 +21,6 @@ import org.bukkit.plugin.messaging.PluginMessageListener
 import org.bukkit.plugin.messaging.PluginMessageRecipient
 import taboolib.common.platform.function.console
 import taboolib.common.platform.function.getProxyPlayer
-import taboolib.common.platform.function.submitAsync
 import taboolib.common.util.subList
 import taboolib.common5.util.decodeBase64
 import taboolib.module.chat.Components
@@ -34,6 +33,7 @@ import taboolib.platform.util.deserializeToInventory
 import taboolib.platform.util.onlinePlayers
 import java.io.IOException
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Future
 
@@ -106,7 +106,6 @@ sealed interface BukkitProxyProcessor : PluginMessageListener {
                 }
             }
             "UpdateAllNames" -> {
-                BukkitProxyManager.updateNames()
                 val names = data[1].takeIf { it != "" }?.split(",") ?: return
                 val displayNames = data[2].split(",")
                 val uuids = data[3].split(",")
@@ -251,13 +250,7 @@ sealed interface BukkitProxyProcessor : PluginMessageListener {
 
     object RedisSide : BukkitProxyProcessor {
 
-        val allNames = mutableMapOf<String, List<Triple<String, String?, UUID>>>()
-
-        init {
-            submitAsync(period = 200L) {
-                BukkitProxyManager.updateNames()
-            }
-        }
+        val allNames = ConcurrentHashMap<String, List<Triple<String, String?, UUID>>>()
 
         override fun execute(data: Array<String>) {
             when (data[0]) {
@@ -309,4 +302,4 @@ sealed interface BukkitProxyProcessor : PluginMessageListener {
         }
 
     }
-}
+}
diff --git a/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/util/color/CustomColor.kt b/project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/util/color/CustomColor.kt
@@ -3,12 +3,15 @@ package me.arasple.mc.trchat.util.color
 import me.arasple.mc.trchat.util.papiRegex
 import me.arasple.mc.trchat.util.setPlaceholders
 import org.bukkit.command.CommandSender
+import taboolib.common.platform.Platform
+import taboolib.common.platform.PlatformSide
 import taboolib.module.configuration.ConfigNode
 
 /**
  * @author ItsFlicker
  * @since 2021/12/12 12:30
  */
+@PlatformSide(Platform.BUKKIT)
 class CustomColor(val type: ColorType, val color: String) {
 
     enum class ColorType {
diff --git a/project/runtime-bungee/src/main/kotlin/me/arasple/mc/trchat/api/impl/BungeeProxyManager.kt b/project/runtime-bungee/src/main/kotlin/me/arasple/mc/trchat/api/impl/BungeeProxyManager.kt
@@ -14,10 +14,7 @@ import taboolib.common.platform.Schedule
 import taboolib.common.platform.function.server
 import taboolib.common.util.unsafeLazy
 import java.io.IOException
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.concurrent.Future
+import java.util.concurrent.*
 
 /**
  * @author ItsFlicker
@@ -36,7 +33,7 @@ object BungeeProxyManager : ProxyMessageManager {
         Executors.newFixedThreadPool(8, factory)
     }
 
-    override val allNames = mutableMapOf<Int, List<Triple<String, String, String>>>()
+    override val allNames = ConcurrentHashMap<Int, List<Triple<String, String, String>>>()
 
     override fun sendMessage(recipient: Any, vararg args: String): Future<*> {
         if (recipient !is ServerInfo) {
@@ -68,9 +65,11 @@ object BungeeProxyManager : ProxyMessageManager {
         }
     }
 
-    @Schedule(async = true, period = 100L)
+    @Schedule(period = 1200L)
+    @Synchronized
     override fun updateAllNames() {
-        val flat = allNames.values.flatten()
+        refreshNamesFromProxy()
+        val flat = allNames.values.toList().flatten()
         sendMessageToAll(
             "UpdateAllNames",
             flat.joinToString(",") { it.first },
@@ -79,4 +78,25 @@ object BungeeProxyManager : ProxyMessageManager {
         )
     }
 
-}
+    @Synchronized
+    fun updateNames(port: Int, names: List<Triple<String, String, String>>): Boolean {
+        if (allNames[port]?.toSet() == names.toSet()) {
+            return false
+        }
+        allNames[port] = names
+        return true
+    }
+
+    private fun refreshNamesFromProxy() {
+        val displayNames = allNames.values.toList().flatten().associate { it.third to it.second }
+        allNames.clear()
+        server<ProxyServer>().players
+            .mapNotNull { player ->
+                val info = player.server?.info ?: return@mapNotNull null
+                info.address.port to Triple(player.name, displayNames[player.uniqueId.toString()] ?: "#", player.uniqueId.toString())
+            }
+            .groupBy({ it.first }, { it.second })
+            .forEach { (port, names) -> allNames[port] = names }
+    }
+
+}
diff --git a/project/runtime-bungee/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerBungeeTransfer.kt b/project/runtime-bungee/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerBungeeTransfer.kt
@@ -7,12 +7,16 @@ import me.arasple.mc.trchat.util.print
 import me.arasple.mc.trchat.util.proxy.common.MessageReader
 import net.md_5.bungee.api.ProxyServer
 import net.md_5.bungee.api.connection.Connection
+import net.md_5.bungee.api.event.PlayerDisconnectEvent
 import net.md_5.bungee.api.event.PluginMessageEvent
+import net.md_5.bungee.api.event.PostLoginEvent
+import net.md_5.bungee.api.event.ServerSwitchEvent
 import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.common.platform.function.console
 import taboolib.common.platform.function.server
+import taboolib.common.platform.function.submit
 import taboolib.module.chat.Components
 import java.io.IOException
 
@@ -44,6 +48,27 @@ object ListenerBungeeTransfer {
         }
     }
 
+    @SubscribeEvent
+    fun onProxyJoin(e: PostLoginEvent) {
+        updateAllNamesLater()
+    }
+
+    @SubscribeEvent
+    fun onProxyQuit(e: PlayerDisconnectEvent) {
+        updateAllNamesLater()
+    }
+
+    @SubscribeEvent
+    fun onProxySwitch(e: ServerSwitchEvent) {
+        updateAllNamesLater()
+    }
+
+    private fun updateAllNamesLater() {
+        submit(delay = 30) {
+            BungeeProxyManager.updateAllNames()
+        }
+    }
+
     @Suppress("Deprecation")
     private fun execute(data: Array<String>, connection: Connection) {
         when (data[0]) {
@@ -79,10 +104,13 @@ object ListenerBungeeTransfer {
                 val names = data[2].split(",")
                 val displayNames = data[3].split(",")
                 val uuids = data[4].split(",")
-                BungeeProxyManager.allNames[port] = names.mapIndexed { index, name ->
+                val updated = names.mapIndexed { index, name ->
                     Triple(name, displayNames[index], uuids[index])
                 }
+                if (BungeeProxyManager.updateNames(port, updated)) {
+                    BungeeProxyManager.updateAllNames()
+                }
             }
         }
     }
-}
+}
diff --git a/project/runtime-velocity/src/main/kotlin/me/arasple/mc/trchat/api/impl/VelocityProxyManager.kt b/project/runtime-velocity/src/main/kotlin/me/arasple/mc/trchat/api/impl/VelocityProxyManager.kt
@@ -16,10 +16,7 @@ import taboolib.common.platform.Schedule
 import taboolib.common.platform.function.warning
 import taboolib.common.util.unsafeLazy
 import java.io.IOException
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.concurrent.Future
+import java.util.concurrent.*
 
 /**
  * @author ItsFlicker
@@ -42,7 +39,7 @@ object VelocityProxyManager : ProxyMessageManager {
         Executors.newFixedThreadPool(8, factory)
     }
 
-    override val allNames = mutableMapOf<Int, List<Triple<String, String, String>>>()
+    override val allNames = ConcurrentHashMap<Int, List<Triple<String, String, String>>>()
 
     override fun sendMessage(recipient: Any, vararg args: String): Future<*> {
         if (recipient !is ChannelMessageSink) {
@@ -87,9 +84,11 @@ object VelocityProxyManager : ProxyMessageManager {
         }
     }
 
-    @Schedule(async = true, period = 100L)
+    @Schedule(period = 1200L)
+    @Synchronized
     override fun updateAllNames() {
-        val flat = allNames.values.flatten()
+        refreshNamesFromProxy()
+        val flat = allNames.values.toList().flatten()
         sendMessageToAll(
             "UpdateAllNames",
             flat.joinToString(",") { it.first },
@@ -98,4 +97,25 @@ object VelocityProxyManager : ProxyMessageManager {
         )
     }
 
-}
+    @Synchronized
+    fun updateNames(port: Int, names: List<Triple<String, String, String>>): Boolean {
+        if (allNames[port]?.toSet() == names.toSet()) {
+            return false
+        }
+        allNames[port] = names
+        return true
+    }
+
+    private fun refreshNamesFromProxy() {
+        val displayNames = allNames.values.toList().flatten().associate { it.third to it.second }
+        allNames.clear()
+        plugin.server.allPlayers
+            .mapNotNull { player ->
+                val info = player.currentServer.map { it.serverInfo }.orElse(null) ?: return@mapNotNull null
+                info.address.port to Triple(player.username, displayNames[player.uniqueId.toString()] ?: "#", player.uniqueId.toString())
+            }
+            .groupBy({ it.first }, { it.second })
+            .forEach { (port, names) -> allNames[port] = names }
+    }
+
+}
diff --git a/project/runtime-velocity/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerVelocityTransfer.kt b/project/runtime-velocity/src/main/kotlin/me/arasple/mc/trchat/module/internal/listener/ListenerVelocityTransfer.kt
@@ -1,6 +1,9 @@
 package me.arasple.mc.trchat.module.internal.listener
 
+import com.velocitypowered.api.event.connection.DisconnectEvent
 import com.velocitypowered.api.event.connection.PluginMessageEvent
+import com.velocitypowered.api.event.connection.PostLoginEvent
+import com.velocitypowered.api.event.player.ServerPostConnectEvent
 import com.velocitypowered.api.proxy.ServerConnection
 import me.arasple.mc.trchat.api.impl.VelocityProxyManager
 import me.arasple.mc.trchat.module.internal.TrChatVelocity.plugin
@@ -14,6 +17,7 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
 import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.event.SubscribeEvent
+import taboolib.common.platform.function.submit
 import taboolib.common.platform.function.warning
 import java.io.IOException
 
@@ -46,6 +50,27 @@ object ListenerVelocityTransfer {
         }
     }
 
+    @SubscribeEvent
+    fun onProxyJoin(e: PostLoginEvent) {
+        updateAllNamesLater()
+    }
+
+    @SubscribeEvent
+    fun onProxyQuit(e: DisconnectEvent) {
+        updateAllNamesLater()
+    }
+
+    @SubscribeEvent
+    fun onProxySwitch(e: ServerPostConnectEvent) {
+        updateAllNamesLater()
+    }
+
+    private fun updateAllNamesLater() {
+        submit(delay = 30) {
+            VelocityProxyManager.updateAllNames()
+        }
+    }
+
     private fun execute(data: Array<String>, connection: ServerConnection) {
         when (data[0]) {
             "ForwardMessage" -> {
@@ -81,10 +106,13 @@ object ListenerVelocityTransfer {
                 val names = data[2].split(",")
                 val displayNames = data[3].split(",")
                 val uuids = data[4].split(",")
-                VelocityProxyManager.allNames[port] = names.mapIndexed { index, name ->
+                val updated = names.mapIndexed { index, name ->
                     Triple(name, displayNames[index], uuids[index])
                 }
+                if (VelocityProxyManager.updateNames(port, updated)) {
+                    VelocityProxyManager.updateAllNames()
+                }
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package me.arasple.mc.trchat.module.internal.listener`
`2`	`2`
	`3`	`+import me.arasple.mc.trchat.api.impl.BukkitProxyManager`
`3`	`4`	`import me.arasple.mc.trchat.module.display.channel.Channel`
`4`	`5`	`import me.arasple.mc.trchat.module.internal.service.Updater`
`5`	`6`	`import me.arasple.mc.trchat.util.data`
`@@ -39,6 +40,7 @@ object ListenerJoin {`
`39`	`40`	`}`
`40`	`41`	`}`
`41`	`42`	`Updater.notifyPlayer(adaptPlayer(player))`
	`43`	`+ BukkitProxyManager.updateNames()`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`	`}`