✨(wayzer/map/betterTeam) 优化玩家进入状态分配均匀性

Author: way-zer

scripts/wayzer/map/betterTeam.api.kt

@@ -21,9 +21,16 @@ data class AssignTeamEvent(val player: Player, val group: Iterable<Player>, val
 }
 
 interface TeamService {
+    /** 当前可供玩家使用的全部队伍 */
     val allTeam: Set<Team>
+    /** 当前被规则封禁的队伍 */
     var bannedTeam: Set<Team>
+    /** 存储队伍，用于下一次[randomTeam] */
+    val savedTeams: MutableMap<String, Team>
+    /** 根据Tag更新[bannedTeam]，将自动为被ban玩家换队 */
     fun updateBannedTeam(force: Boolean = false)
+    /** 为玩家随机分配队伍 */
     fun randomTeam(player: Player, group: Iterable<Player> = Groups.player): Team
+    /** 切换玩家到指定[team],或[randomTeam] */
     fun changeTeam(p: Player, team: Team = randomTeam(p))
 }

scripts/wayzer/map/betterTeam.kts

@@ -21,11 +21,23 @@ val allTeam: Set<Team>
     }
 
 var bannedTeam = emptySet<Team>()
+val connectingPlayers = mutableListOf<Player>()
+fun getConnectingPlayers(): List<Player> {
+    connectingPlayers.removeAll { it.con == null || it.con.isConnected || it.con.hasConnected }
+    return connectingPlayers
+}
 
 onEnable {
     val backup = netServer.assigner
     netServer.assigner = NetServer.TeamAssigner { p, g ->
-        randomTeam(p, g)
+        //特殊处理 connectingPlayers，避免一群人连入时分配不均
+        val g2 = if (g == Groups.player) {
+            if (!p.con.isConnected) {
+                connectingPlayers.add(p)
+            }
+            getConnectingPlayers() + g
+        } else g
+        randomTeam(p, g2)
     }
     onDisable { netServer.assigner = backup }
     updateBannedTeam(true)
@@ -36,6 +48,7 @@ val savedTeams = mutableMapOf<String, Team>()
 listen<EventType.ResetEvent> {
     bannedTeam = emptySet()
     savedTeams.clear()
+    connectingPlayers.clear()
 }
 listen<EventType.PlayerLeave> { savedTeams[it.player.uuid()] = it.player.team() }