fix: do not redirect player to waiting server if already connected to it #1

Author: Quozul

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'fr.pickaria'
-version = '1.1-SNAPSHOT'
+version = '1.2-SNAPSHOT'
 
 repositories {
     mavenCentral()

src/main/java/fr/pickaria/pterodactylpoweraction/ConnectionListener.java

@@ -74,7 +74,7 @@ public void onServerPreConnect(ServerPreConnectEvent event) {
         shutdownManager.cancelTask(originalServer);
 
         try {
-            pingCompletableFuture.get();
+            pingCompletableFuture.get(); // FIXME: This is blocking the main thread
             // Server pinged successfully, we can connect the player to this server
             event.setResult(ServerPreConnectEvent.ServerResult.allowed(originalServer));
         } catch (ExecutionException exception) {
@@ -118,14 +118,32 @@ public void onDisconnect(DisconnectEvent event) {
     @Subscribe()
     public void onKicked(KickedFromServerEvent event) {
         stopServer(event.getPlayer());
+        redirectPlayerToWaitingServerOnKick(event);
+    }
+
+    private void redirectPlayerToWaitingServerOnKick(KickedFromServerEvent event) {
+        boolean shouldRedirectToWaitingServerOnKick = configuration.getRedirectToWaitingServerOnKick();
+        boolean isKickedFromWaitingServer = event.getServer() == this.waitingServer;
+        boolean isConnectedToWaitingServer = event.getPlayer().getCurrentServer()
+                .map(serverConnection -> serverConnection.getServer() == this.waitingServer)
+                .orElse(false);
 
-        // Redirect the player to the waiting server
-        if (configuration.getRedirectToWaitingServerOnKick() && event.getServer() != this.waitingServer) {
-            event.setResult(KickedFromServerEvent.RedirectPlayer.create(waitingServer, getKickReasonMessage(event)));
+        if (shouldRedirectToWaitingServerOnKick && !isKickedFromWaitingServer) {
+            if (isConnectedToWaitingServer) {
+                event.setResult(KickedFromServerEvent.Notify.create(getKickDisconnectMessage(event)));
+            } else {
+                event.setResult(KickedFromServerEvent.RedirectPlayer.create(waitingServer, getKickRedirectMessage(event)));
+            }
+        } else {
+            event.setResult(KickedFromServerEvent.DisconnectPlayer.create(getKickDisconnectMessage(event)));
         }
     }
 
-    private Component getKickReasonMessage(KickedFromServerEvent event) {
+    private Component getKickDisconnectMessage(KickedFromServerEvent event) {
+        return event.getServerKickReason().orElse(Component.translatable("kick.generic.disconnect"));
+    }
+
+    private Component getKickRedirectMessage(KickedFromServerEvent event) {
         Optional<Component> serverKickReason = event.getServerKickReason();
         String serverName = event.getServer().getServerInfo().getName();
         String serverCommand = "/server " + serverName;

src/main/resources/PterodactylPowerAction/Bundle_en.properties

@@ -2,5 +2,6 @@ starting.server=The server {0} is starting, you will be automatically redirected
 failed.to.start.server=The server {0} failed to start. Please try again.
 kick.reason.message=You have been kicked from the server {0} for reason: "{1}"\n → {2}
 kick.generic.message=You have been kicked from the server {0}.\n → {1}
+kick.generic.disconnect=You have been kicked from the server {0}.
 go.back.command=Return to the server {0}
 run.command=Click to perform the command {0}

src/main/resources/PterodactylPowerAction/Bundle_fr.properties

@@ -2,5 +2,6 @@ starting.server=Le serveur {0} est en train de démarrer, vous allez être redir
 failed.to.start.server=Le serveur {0} n'a pas réussi à démarrer. Veuillez réessayer.
 kick.reason.message=Vous avez été expulsé du serveur {0} pour la raison: "{1}"\n → {2}
 kick.generic.message=Vous avez été expulsé du serveur {0}.\n → {1}
+kick.generic.disconnect=Vous avez été déconnecté du serveur {0}.
 go.back.command=Retourner sur le serveur {0}
 run.command=Clique pour faire la commande {0}