Ignore new ServerData packet that was throwing errors

TCPShield · Sep 19, 2022 · bb7511d · bb7511d
1 parent 78666de
commit bb7511d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,7 @@ plugins {
 // --
 // Variables
 // --
-version = '2.6.0'
+version = '2.6.1'
 group = 'net.tcpshield.tcpshield'
 archivesBaseName = 'TCPShield'
 

diff --git a/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java b/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityHandshakeHandler.java
@@ -16,6 +16,17 @@ 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;
 	}
@@ -42,6 +53,12 @@ public void onHandshake(ConnectionHandshakeEvent e) {
 	@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");
 	}
 

diff --git a/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPlayer.java b/src/main/java/net/tcpshield/tcpshield/velocity/handler/VelocityPlayer.java
@@ -4,7 +4,6 @@
 import net.tcpshield.tcpshield.provider.PlayerProvider;
 import net.tcpshield.tcpshield.util.ReflectionUtil;
 import net.tcpshield.tcpshield.util.exception.manipulate.PlayerManipulationException;
-import net.tcpshield.tcpshield.util.exception.phase.HandshakeException;
 import net.tcpshield.tcpshield.util.exception.phase.InitializationException;
 import net.tcpshield.tcpshield.util.exception.phase.ReflectionException;
 
@@ -27,6 +26,7 @@ public class VelocityPlayer implements PlayerProvider {
 	private static final Method CLOSE_CHANNEL_METHOD;
 
 	// new velocity support
+
 	private static Class<?> LOGIN_INBOUND_CONNECTION_CLASS;
 	private static Field LOGIN_INBOUND_CONNECTION_DELEGATE_FIELD;
 
@@ -149,7 +149,7 @@ public ConnectionType getConnectionType() {
 	}
 
 	enum ConnectionType {
-		LOGIN_INBOUND, INITIAL_INBOUND, LEGACY;
+		LOGIN_INBOUND, INITIAL_INBOUND, LEGACY
 	}
 
 }
diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.6.0
+version: 2.6.1
 main: net.tcpshield.tcpshield.bungee.TCPShieldBungee
 author: https://tcpshield.com
 softdepends:

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: TCPShield
-version: 2.6.0
+version: 2.6.1
 main: net.tcpshield.tcpshield.bukkit.TCPShieldBukkit
 softdepend:
 - ProtocolLib

diff --git a/src/main/resources/velocity-plugin.json b/src/main/resources/velocity-plugin.json
@@ -1,16 +1 @@
-{
-  "id": "tcpshield",
-  "name": "TCPShield",
-  "version": "2.6.0",
-  "description": "TCPShield IP parsing capabilities for Velocity",
-  "authors": [
-    "TCPShield"
-  ],
-  "dependencies": [
-    {
-      "id": "floodgate",
-      "optional": true
-    }
-  ],
-  "main": "net.tcpshield.tcpshield.velocity.TCPShieldVelocity"
-}
+{"id":"tcpshield","name":"TCPShield","version":"2.6.1","description":"TCPShield IP parsing capabilities for Velocity","authors":["TCPShield"],"dependencies":[{"id":"floodgate","optional":true}],"main":"net.tcpshield.tcpshield.velocity.TCPShieldVelocity"}