🐛 修复事件处理

Author: wling-art

bukkit/src/main/kotlin/org/crashvibe/FGateBukkit/listeners/OnJoin.kt

@@ -2,12 +2,12 @@ package org.crashvibe.FGateBukkit.listeners
 
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
-import org.bukkit.event.player.PlayerLoginEvent
+import org.bukkit.event.player.PlayerJoinEvent
 import org.crashvibe.FGateClient.listeners.OnJoinService
 
 class OnJoin : Listener {
   @EventHandler
-  fun onQuit(event: PlayerLoginEvent) {
+  fun onJoin(event: PlayerJoinEvent) {
     OnJoinService.handleJoin(event.player.name)
   }
 }

bukkit/src/main/kotlin/org/crashvibe/FGateBukkit/listeners/OnLogin.kt

@@ -15,7 +15,7 @@ class OnLogin : Listener {
   @EventHandler(priority = EventPriority.HIGHEST)
   fun onAsyncPlayerPreLogin(event: AsyncPlayerPreLoginEvent) {
     val config = ConfigManager.configData.eventResolve.join
-    val result = OnLoginService.handleJoin(event.name, event.uniqueId.toString(), event.address.hostAddress)
+    val result = OnLoginService.handleLogin(event.name, event.uniqueId.toString(), event.address.hostAddress)
 
     when (result.action) {
       OnLoginService.Action.kick -> {

common/src/main/kotlin/org/crashvibe/FGateClient/listeners/OnLoginService.kt

@@ -12,40 +12,40 @@ object OnLoginService {
   enum class Action { kick, allow }
 
   @Serializable
-  data class JoinInfo(val player: String, val uuid: String, val ip: String, val timestamp: Long)
+  data class LoginInfo(val player: String, val uuid: String, val ip: String, val timestamp: Long)
 
   @Serializable
-  data class JoinResult(val action: Action, val reason: String? = null)
+  data class LoginResult(val action: Action, val reason: String? = null)
 
-  fun handleJoin(player: String, uuid: String, ip: String): JoinResult {
+  fun handleLogin(player: String, uuid: String, ip: String): LoginResult {
     val config = ConfigManager.configData.eventResolve.join
 
     if (!WebSocketManager.instance.isOpen) {
       return if (config.allowJoin) {
-        JoinResult(Action.allow)
+        LoginResult(Action.allow)
       } else {
-        JoinResult(Action.kick, config.kickMessage)
+        LoginResult(Action.kick, config.kickMessage)
       }
     }
 
-    val request = JoinInfo(player, uuid, ip, System.currentTimeMillis())
+    val request = LoginInfo(player, uuid, ip, System.currentTimeMillis())
 
     return try {
-      val response: JsonRpcResponse<JoinResult, JsonElement> = runBlocking {
+      val response: JsonRpcResponse<LoginResult, JsonElement> = runBlocking {
         WebSocketManager.instance.sendRequest("player.login", request)
       }
 
       if (response.error != null) {
         logger.severe("加入事件错误: ${response.error.message}")
-        return if (config.errorJoin) JoinResult(Action.allow)
-        else JoinResult(Action.kick, config.errorMessage)
+        return if (config.errorJoin) LoginResult(Action.allow)
+        else LoginResult(Action.kick, config.errorMessage)
       }
 
-      response.result ?: JoinResult(Action.kick, config.errorMessage)
+      response.result ?: LoginResult(Action.kick, config.errorMessage)
     } catch (e: Exception) {
       logger.severe("加入事件异常: ${e.message}")
-      if (config.errorJoin) JoinResult(Action.allow)
-      else JoinResult(Action.kick, config.errorMessage)
+      if (config.errorJoin) LoginResult(Action.allow)
+      else LoginResult(Action.kick, config.errorMessage)
     }
   }
 }