Fixed missing forced-hosts not allowing Velocity to start

PaperMC · Jul 28, 2024 · 7507789 · 7507789
1 parent 5146853
commit 7507789
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
@@ -186,18 +186,20 @@ public boolean validate() {
         valid = false;
       }
     }
-
-    for (Map.Entry<String, List<String>> entry : forcedHosts.getForcedHosts().entrySet()) {
-      if (entry.getValue().isEmpty()) {
-        logger.error("Forced host '{}' does not contain any servers", entry.getKey());
-        valid = false;
-        continue;
-      }
-
-      for (String server : entry.getValue()) {
-        if (!servers.getServers().containsKey(server)) {
-          logger.error("Server '{}' for forced host '{}' does not exist", server, entry.getKey());
+    final Map<String, List<String>> configuredForcedHosts = forcedHosts.getForcedHosts();
+    if (!configuredForcedHosts.isEmpty()) {
+      for (Map.Entry<String, List<String>> entry : configuredForcedHosts.entrySet()) {
+        if (entry.getValue().isEmpty()) {
+          logger.error("Forced host '{}' does not contain any servers", entry.getKey());
           valid = false;
+          continue;
+        }
+
+        for (String server : entry.getValue()) {
+          if (!servers.getServers().containsKey(server)) {
+            logger.error("Server '{}' for forced host '{}' does not exist", server, entry.getKey());
+            valid = false;
+          }
         }
       }
     }
@@ -638,11 +640,7 @@ public String toString() {
 
   private static class ForcedHosts {
 
-    private Map<String, List<String>> forcedHosts = ImmutableMap.of(
-        "lobby.example.com", ImmutableList.of("lobby"),
-        "factions.example.com", ImmutableList.of("factions"),
-        "minigames.example.com", ImmutableList.of("minigames")
-    );
+    private Map<String, List<String>> forcedHosts = ImmutableMap.of();
 
     private ForcedHosts() {
     }