Handle invalid pings

voruti · Jul 15, 2023 · 5373be7 · 5373be7
1 parent 1935561
commit 5373be7
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/voruti/velocityplayerlistquery/VelocityPlayerListQuery.java b/src/main/java/voruti/velocityplayerlistquery/VelocityPlayerListQuery.java
@@ -58,10 +58,17 @@ public EventTask onServerPing(final ProxyPingEvent event) {
         this.logger.trace("Server ping event received, adding players to server list entry...");
 
         return EventTask.async(() -> {
-            Collection<Player> players = this.server.getAllPlayers();
+            final ServerPing serverPing = event.getPing();
 
+            // check if server ping is valid:
+            if (serverPing.getVersion() == null || serverPing.getDescriptionComponent() == null) {
+                this.logger.info("Server ping is invalid, skipping");
+                return;
+            }
+
+            final Collection<Player> players = this.server.getAllPlayers();
             if (!players.isEmpty()) {
-                event.setPing(event.getPing().asBuilder()
+                event.setPing(serverPing.asBuilder()
                         .samplePlayers(
                                 players.stream()
                                         .map(player -> new ServerPing.SamplePlayer(