From fd8fb5ae37eee73b1a7797196e572b8d9b728d5f Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Sun, 9 Oct 2022 15:29:47 +0200
Subject: [PATCH] Small fix

---
 .../ambassador/forge/ForgeFML2ClientConnectionPhase.java       | 2 +-
 .../org/adde0109/ambassador/velocity/VelocityEventHandler.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
index 127f7ff..a98176c 100644
--- a/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/forge/ForgeFML2ClientConnectionPhase.java
@@ -109,7 +109,7 @@ public class ForgeFML2ClientConnectionPhase implements VelocityForgeClientConnec
   }
 
   public void handleKick(KickedFromServerEvent event) {
-    if (backupServer != null) {
+    if (backupServer != null && !(event.getResult() instanceof KickedFromServerEvent.RedirectPlayer)) {
       net.kyori.adventure.text.Component reason = event.getServerKickReason().orElse(null);
       event.setResult(KickedFromServerEvent.RedirectPlayer.create(backupServer,reason));
     }
diff --git a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
index f247505..57e56db 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/VelocityEventHandler.java
@@ -1,6 +1,7 @@
 package org.adde0109.ambassador.velocity;
 
 import com.velocitypowered.api.event.Continuation;
+import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.permission.PermissionsSetupEvent;
 import com.velocitypowered.api.event.player.KickedFromServerEvent;
@@ -31,7 +32,7 @@ public class VelocityEventHandler {
     player.getConnection().eventLoop().submit(() -> phase.handleLogin(player,null,continuation));
   }
 
-  @Subscribe
+  @Subscribe(order = PostOrder.LAST)
   public void onKickedFromServerEvent(KickedFromServerEvent event, Continuation continuation) {
     if (((ConnectedPlayer) event.getPlayer()).getPhase() instanceof ForgeFML2ClientConnectionPhase phase) {
       phase.handleKick(event);