From ea07c6661aafa061ebce3d41aa548628c8001bd1 Mon Sep 17 00:00:00 2001
From: sagan <camjanssen120@gmail.com>
Date: Wed, 15 Sep 2021 05:42:14 -0600
Subject: [PATCH] Don't crash when attempt servers order is empty, return empty
 optional instead (#576)

---
 .../proxy/connection/client/ConnectedPlayer.java           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
index 6006bfc36..46debee5e 100644
--- 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++) {