Fixed skip-queue-server-if-possible sending players even if target se…

…rver is offline when queue server is in send-instantly
ajgeiss0702 · Nov 5, 2023 · 64148c2 · 64148c2
1 parent a4ebd15
commit 64148c2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java
@@ -232,8 +232,14 @@ public void onServerKick(AdaptedPlayer player, @NotNull AdaptedServer from, Comp
 
         if(!main.getQueueManager().canSendInstantly(player, to)) return null;
 
+        AdaptedServer ideal = to.getIdealServer(player);
+
+        if(ideal == null) return null;
+        if(!ideal.isJoinable(player)) return null;
+
         Debug.info("Skipping queue-server " + initialChoice.getName() + " for " + player.getName() + " because they would be sent instantly! (skip-queue-server-if-possible)");
 
-        return to.getIdealServer(player);
+        ideal.addPlayer();
+        return ideal;
     }
 }