From c1eca74dd05bde45e3fd2452c5bca5227b1cdc34 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Sun, 6 Jul 2025 14:06:07 +0200
Subject: [PATCH] Handle KickedFromServerEvent with redirect and empty
 component

---
 .../velocitycore/listeners/ConnectionListener.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
index a6d879c1..d534b29a 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java
@@ -23,6 +23,7 @@ import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.DisconnectEvent;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
+import com.velocitypowered.api.event.player.KickedFromServerEvent;
 import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.permission.Tristate;
 import com.velocitypowered.api.proxy.Player;
@@ -38,6 +39,7 @@ import de.steamwar.velocitycore.commands.*;
 import de.steamwar.velocitycore.discord.DiscordBot;
 import de.steamwar.velocitycore.discord.util.DiscordRanks;
 import de.steamwar.velocitycore.mods.ModUtils;
+import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 
 import java.util.HashSet;
@@ -110,6 +112,13 @@ public class ConnectionListener extends BasicListener {
         }
     }
 
+    @Subscribe
+    public void kickEvent(KickedFromServerEvent event) {
+        if (event.getResult() instanceof KickedFromServerEvent.RedirectPlayer red) {
+            event.setResult(KickedFromServerEvent.RedirectPlayer.create(red.getServer(), Component.empty()));
+        }
+    }
+
     @Subscribe
     public void onDisconnect(DisconnectEvent e){
         ChallengeCommand.remove(e.getPlayer());