Update file dates and cleanup/consolidate ping-passthrough code.

Author: TheMiningTeamYT

proxy/src/main/java/com/velocitypowered/proxy/config/LegacyPingPassthroughMode.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Velocity Contributors
+ * Copyright (C) 2018-2026 Velocity Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,4 +25,4 @@ public enum LegacyPingPassthroughMode {
   MODS,
   DESCRIPTION,
   ALL
-}
+}

proxy/src/main/java/com/velocitypowered/proxy/config/PingPassthroughMode.java

@@ -16,6 +16,7 @@
  */
 
 package com.velocitypowered.proxy.config;
+import com.electronwill.nightconfig.core.CommentedConfig;
 
 /**
  * Object to contain all the things that can be toggled for ping passthrough.
@@ -28,13 +29,36 @@
  */
 public record PingPassthroughMode(boolean version, boolean players,
     boolean description, boolean favicon, boolean modinfo) {
+  public static final PingPassthroughMode DEFAULT = new PingPassthroughMode();
+  
+  /**
+   * Creates a default PingPassthroughMode.
+   */
+  PingPassthroughMode() {
+    this(false, false, false, false, false);
+  }
+
+  /**
+   * Returns a PingPassthroughMode from a config section, or the default if the section is null.
+   * Based on the code for PacketLimiterConfig.
+   *
+   * @param config The configuration object to parse.
+   * @return The PingPassthroughMode, or the default if {@code config} is null.
+   */
+  public static PingPassthroughMode fromConfig(CommentedConfig config) {
+    if (config == null) {
+      return DEFAULT;
+    }
+    return new PingPassthroughMode(
+        config.getOrElse("version", DEFAULT.version()),
+        config.getOrElse("players", DEFAULT.players()),
+        config.getOrElse("description", DEFAULT.description()),
+        config.getOrElse("favicon", DEFAULT.favicon()),
+        config.getOrElse("modinfo", DEFAULT.modinfo()));
+  }
 
   public boolean enabled() {
     return this.version || this.players || this.description || this.favicon
       || this.modinfo;
   }
-
-  // Not used, just here to state what the defaults are.
-  public static final PingPassthroughMode DEFAULT = new PingPassthroughMode(
-      false, false, false, false, false);
-}
+}

proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java

@@ -80,7 +80,7 @@ public class VelocityConfiguration implements ProxyConfig {
   @Expose
   private boolean onlineModeKickExistingPlayers = false;
   @Expose
-  private PingPassthroughMode pingPassthrough = new PingPassthroughMode(false, false, false, false, false);
+  private PingPassthroughMode pingPassthrough = PingPassthroughMode.DEFAULT;
   @Expose
   private boolean samplePlayersInPing = false;
   private final Servers servers;
@@ -557,12 +557,7 @@ public static VelocityConfiguration read(Path path) throws IOException {
       final CommentedConfig metricsConfig = config.get("metrics");
       final PlayerInfoForwarding forwardingMode = config.getEnumOrElse(
               "player-info-forwarding-mode", PlayerInfoForwarding.NONE);
-      final PingPassthroughMode pingPassthrough = new PingPassthroughMode(
-              config.getOrElse("ping-passthrough.version", false),
-              config.getOrElse("ping-passthrough.players", false),
-              config.getOrElse("ping-passthrough.description", false),
-              config.getOrElse("ping-passthrough.favicon", false),
-              config.getOrElse("ping-passthrough.modinfo", false));
+      final PingPassthroughMode pingPassthrough = PingPassthroughMode.fromConfig(config.get("ping-passthrough"));
       final boolean samplePlayersInPing = config.getOrElse("sample-players-in-ping", false);
 
       final String bind = config.getOrElse("bind", "0.0.0.0:25565");

proxy/src/main/java/com/velocitypowered/proxy/config/migration/PingPassthroughMigration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Velocity Contributors
+ * Copyright (C) 2024-2026 Velocity Contributors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,42 +65,36 @@ public void migrate(final CommentedFileConfig config, final Logger logger) {
     config.removeComment("ping-passthrough");
     config.remove("ping-passthrough");
 
-    // Create ping passthrough entry for the version
     config.set("ping-passthrough.version", version);
     config.setComment(
         "ping-passthrough.version",
         " Should Velocity pass the version number from the backend server when responding to server list ping requests?"
     );
 
-    // Create ping passthrough entry for the players
     config.set("ping-passthrough.players", players);
     config.setComment(
         "ping-passthrough.players",
         " Should Velocity pass the player count from the backend server when responding to server list ping requests?"
     );
 
-    // Create ping passthrough entry for the description
     config.set("ping-passthrough.description", description);
     config.setComment(
         "ping-passthrough.description",
         " Should Velocity pass the description from the backend server when responding to server list ping requests?"
     );
 
-    // Create ping passthrough entry for the favicon
     config.set("ping-passthrough.favicon", favicon);
     config.setComment(
         "ping-passthrough.favicon",
         " Should Velocity pass the favicon (also known as the server icon) from the backend server when responding to server list ping requests?"
     );
 
-    // Create ping passthrough entry for the mods info
     config.set("ping-passthrough.modinfo", modinfo);
     config.setComment(
         "ping-passthrough.modinfo",
         " Should Velocity pass the mod list from the backend server when responding to server list ping requests?"
     );
 
-    // Update config version
     config.set("config-version", "2.9");
   }
 }

proxy/src/main/java/com/velocitypowered/proxy/connection/util/ServerListPingHandler.java

@@ -128,11 +128,13 @@ private CompletableFuture<ServerPing> attemptPingPassthrough(VelocityInboundConn
           players = fallback.getPlayers().orElse(null);
         }
 
-        // Why the special handling of the description?
-        // Why not just response.getDescriptionComponent.orElse(null)?
         Component description;
-        if (mode.description() && response.getDescriptionComponent() != null) {
-          description = response.getDescriptionComponent();
+        if (mode.description()) {
+          if (response.getDescriptionComponent() != null) {
+            description = response.getDescriptionComponent();
+          } else {
+            description = Component.empty();
+          }
         } else {
           description = fallback.getDescriptionComponent();
         }