✨(wayzer/user/ban) 自动封禁ip

Author: way-zer

scripts/wayzer/lib/PlayerData.kt

@@ -21,7 +21,7 @@ class PlayerData(val name: String, val uuid: String, val ids: Set<String> = muta
     val shortId: String get() = IGetUidByShortId.getOrNull()?.getShortId(this) ?: id
 
     override fun toString(): String {
-        return "PlayerData(id='$id', name='$name', authed=$authed)"
+        return "PlayerData(id='$id', name='$name', authed=$authed, \nids=$ids)"
     }
 
 
@@ -45,8 +45,10 @@ class PlayerData(val name: String, val uuid: String, val ids: Set<String> = muta
 
         operator fun get(player: Player): PlayerData = online.getOrPut(player) {
             if (player.con == null) error("player is not online")
-            (preOnline.remove(player.usid()) ?: PlayerData(player.plainName(), player.uuid()))
-                .also { it.player = player }
+            (preOnline.remove(player.usid()) ?: PlayerData(player.plainName(), player.uuid())).also {
+                it.addId("ip:${player.con.address}", asPrimary = false)
+                it.player = player
+            }
         }
 
         fun onLeave(player: Player) {

scripts/wayzer/user/ban.kts

@@ -52,13 +52,20 @@ fun Player.kick(ban: PlayerBan) {
 
 listen<EventType.PlayerConnect> {
     launch(Dispatchers.IO) {
-        val ban = store.findNotEnd(PlayerData[it.player].id) ?: return@launch
+        val ban = findBan(PlayerData[it.player]) ?: return@launch
         withContext(Dispatchers.game) {
             it.player.kick(ban)
         }
     }
 }
 
+suspend fun findBan(player: PlayerData): PlayerBan? = withContext(Dispatchers.IO) {
+    player.ids.firstNotNullOfOrNull { id ->
+        if (id == player.uuid && player.authed) return@firstNotNullOfOrNull null //skip uuid if authed
+        store.findNotEnd(id)
+    }
+}
+
 suspend fun ban(player: PlayerData, time: Int, reason: String, operate: Player?) {
     val ban = withContext(Dispatchers.IO) {
         store.create(
@@ -67,7 +74,13 @@ suspend fun ban(player: PlayerData, time: Int, reason: String, operate: Player?)
             operate?.let { PlayerData[it].id }
         )
     }
-    Groups.player.filter { PlayerData[it].id in player.ids }.forEach {
+    Groups.player.filter {
+        val info = PlayerData[it]
+        info.ids.any { id ->
+            if (id == info.uuid && info.authed) return@any false //skip uuid if authed
+            id in player.ids
+        }
+    }.forEach {
         it.kick(ban)
         broadcast("[red] 管理员禁封了{target.name},原因: [yellow]{reason}".with("target" to it, "reason" to reason))
     }