check punishment post-connect and fix pre-connect checks

Author: acrylic-style

velocity/src/main/kotlin/net/azisaba/spicyAzisaBan/velocity/listener/EventListeners.kt

@@ -6,13 +6,17 @@ import com.velocitypowered.api.event.Subscribe
 import com.velocitypowered.api.event.command.CommandExecuteEvent
 import com.velocitypowered.api.event.connection.LoginEvent
 import com.velocitypowered.api.event.player.PlayerChatEvent
+import com.velocitypowered.api.event.player.ServerPostConnectEvent
 import com.velocitypowered.api.event.player.ServerPreConnectEvent
 import com.velocitypowered.api.network.ProtocolVersion
 import com.velocitypowered.api.proxy.Player
+import net.azisaba.spicyAzisaBan.SABMessages
+import net.azisaba.spicyAzisaBan.SpicyAzisaBan
 import net.azisaba.spicyAzisaBan.common.ServerInfo
 import net.azisaba.spicyAzisaBan.punishment.PunishmentChecker
 import net.azisaba.spicyAzisaBan.struct.PlayerData
 import net.azisaba.spicyAzisaBan.util.Util.send
+import net.azisaba.spicyAzisaBan.util.Util.translate
 import net.azisaba.spicyAzisaBan.velocity.VelocityPlayerActor
 import net.azisaba.spicyAzisaBan.velocity.util.VelocityUtil.toVelocity
 import net.kyori.adventure.text.Component
@@ -36,14 +40,27 @@ object EventListeners {
 
     @Subscribe
     fun onServerPreConnect(e: ServerPreConnectEvent): EventTask = EventTask.async {
+        if (e.result.server.isEmpty) return@async
         PunishmentChecker.checkLocalBan(
-            ServerInfo(e.originalServer.serverInfo.name, e.originalServer.serverInfo.address),
+            ServerInfo(e.result.server.get().serverInfo.name, e.result.server.get().serverInfo.address),
             VelocityPlayerActor(e.player)
         ) {
             e.result = ServerPreConnectEvent.ServerResult.denied()
         }.complete()
     }
 
+    @Subscribe
+    fun onServerPostConnect(e: ServerPostConnectEvent): EventTask = EventTask.async {
+        if (e.player.currentServer.isEmpty) return@async
+        PunishmentChecker.checkLocalBan(
+            ServerInfo(e.player.currentServer.get().serverInfo.name, e.player.currentServer.get().serverInfo.address),
+            VelocityPlayerActor(e.player)
+        ) {
+            SpicyAzisaBan.LOGGER.warning("Kicking player ${e.player.username} because they are banned from ${e.player.currentServer.get().serverInfo.name}")
+            e.player.disconnect(SABMessages.General.error.translate())
+        }.complete()
+    }
+
     @Suppress("DEPRECATION")
     @Subscribe
     fun onPlayerChat(e: PlayerChatEvent): EventTask = EventTask.async {