Don't crash when attempt servers order is empty, return empty optional instead (#576)

2021-09-15 05:42:14 -06:00
parent d1135bd190
commit ea07c6661a
1 changed files with 6 additions and 1 deletions
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -690,7 +690,12 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
    }

    if (serversToTry.isEmpty()) {
-      serversToTry = server.getConfiguration().getAttemptConnectionOrder();
+      List<String> connOrder = server.getConfiguration().getAttemptConnectionOrder();
+      if (connOrder.isEmpty()) {
+        return Optional.empty();
+      } else {
+        serversToTry = connOrder;
+      }
    }

    for (int i = tryIndex; i < serversToTry.size(); i++) {