Fix handshake error with Geyser ping passthrough on Velocity

build.gradle

@@ -75,6 +75,9 @@ repositories {
     maven {
         url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
     }
+    maven {
+        url = 'https://repo.codemc.io/repository/maven-public/'
+    }
     maven {
         url = 'https://repo.dmulloy2.net/nexus/repository/public/'
     }

src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java

@@ -14,70 +14,74 @@
  */
 public class VelocityHandshakeHandler {
 
-	private final TCPShieldPlugin plugin;
-
-
-	private static Class<?> CONNECTED_PLAYER_CONNECTION_CLASS;
-
-	static {
-		try {
-			CONNECTED_PLAYER_CONNECTION_CLASS = Class.forName("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
-		} catch (Exception e) {
-			// ignore for old velocity versions
-		}
-	}
-
-	public VelocityHandshakeHandler(TCPShieldPlugin plugin) {
-		this.plugin = plugin;
-	}
-
-	// Turns out this event sometimes passes erroneous hostnames
-	// which have the null bytes terminated as FML data which causes
-	// issues with the verification process.
-	@Subscribe(order = PostOrder.FIRST)
-	public void onPreLogin(PreLoginEvent e) {
-		if (!this.plugin.getConfigProvider().handlePreLoginEvent()) {
-			return;
-		}
-
-		InboundConnection connection = e.getConnection();
-		handleEvent(connection, "onPreLogin");
-	}
-
-	@Subscribe(order = PostOrder.FIRST)
-	public void onHandshake(ConnectionHandshakeEvent e) {
-		InboundConnection connection = e.getConnection();
-		handleEvent(connection, "onHandshake");
-	}
-
-	@Subscribe(order = PostOrder.FIRST)
-	public void onProxyPing(ProxyPingEvent e) {
-		InboundConnection connection = e.getConnection();
-
-		if (connection.getClass() == CONNECTED_PLAYER_CONNECTION_CLASS) {
-			// new ServerData (0x42) packet on connect, we don't care about it
-			return;
-		}
-
-		handleEvent(connection, "onProxyPing");
-	}
-
-	private void handleEvent(InboundConnection connection, String debugSource) {
-		VelocityPlayer player = new VelocityPlayer(connection);
-		if (player.getConnectionType() == VelocityPlayer.ConnectionType.LEGACY) {
-			player.disconnect();
-			return;
-		}
-
-		VelocityPacket packet = new VelocityPacket(connection);
-
-		this.plugin.getDebugger().warn("Velocity: " + debugSource + " Raw player hostname: " + packet.getPayloadString());
-
-		try {
-			plugin.getPacketHandler().handleHandshake(packet, player);
-		} catch (HandshakeException exception) {
-			plugin.getDebugger().exception(exception);
-		}
-	}
+    private final TCPShieldPlugin plugin;
+
+
+    private static Class<?> CONNECTED_PLAYER_CONNECTION_CLASS;
+
+    static {
+        try {
+            CONNECTED_PLAYER_CONNECTION_CLASS = Class.forName("com.velocitypowered.proxy.connection.client.ConnectedPlayer");
+        } catch (Exception e) {
+            // ignore for old velocity versions
+        }
+    }
+
+    public VelocityHandshakeHandler(TCPShieldPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Subscribe(order = PostOrder.FIRST)
+    public void onPreLogin(PreLoginEvent e) {
+        if (!this.plugin.getConfigProvider().handlePreLoginEvent()) {
+            return;
+        }
+
+        InboundConnection connection = e.getConnection();
+        handleEvent(connection, "onPreLogin");
+    }
+
+    @Subscribe(order = PostOrder.FIRST)
+    public void onHandshake(ConnectionHandshakeEvent e) {
+        InboundConnection connection = e.getConnection();
+        handleEvent(connection, "onHandshake");
+    }
+
+    @Subscribe(order = PostOrder.FIRST)
+    public void onProxyPing(ProxyPingEvent e) {
+        InboundConnection connection = e.getConnection();
+
+        if (connection.getClass() == CONNECTED_PLAYER_CONNECTION_CLASS) {
+            // new ServerData (0x42) packet on connect, we don't care about it
+            return;
+        }
+
+        handleEvent(connection, "onProxyPing");
+    }
+
+    private void handleEvent(InboundConnection connection, String debugSource) {
+        VelocityPlayer player = new VelocityPlayer(connection);
+
+        // Unrecognized connection types (e.g. Geyser's ping passthrough connection)
+        // aren't real player connections we can manipulate, so ignore them silently.
+        if (player.getConnectionType() == VelocityPlayer.ConnectionType.UNKNOWN) {
+            return;
+        }
+
+        if (player.getConnectionType() == VelocityPlayer.ConnectionType.LEGACY) {
+            player.disconnect();
+            return;
+        }
+
+        VelocityPacket packet = new VelocityPacket(connection);
+
+        this.plugin.getDebugger().warn("Velocity: " + debugSource + " Raw player hostname: " + packet.getPayloadString());
+
+        try {
+            plugin.getPacketHandler().handleHandshake(packet, player);
+        } catch (HandshakeException exception) {
+            plugin.getDebugger().exception(exception);
+        }
+    }
 
 }