Skip to content

Commit 49a1bff

Browse files
Only send the connection details if ViaVersion is active (ViaVersion#4434)
1 parent da022a0 commit 49a1bff

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

common/src/main/java/com/viaversion/viaversion/connection/ConnectionDetails.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.google.gson.JsonObject;
2121
import com.viaversion.viaversion.api.Via;
22+
import com.viaversion.viaversion.api.connection.ProtocolInfo;
2223
import com.viaversion.viaversion.api.connection.UserConnection;
2324
import com.viaversion.viaversion.api.platform.ViaPlatform;
2425
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
@@ -37,7 +38,14 @@ public final class ConnectionDetails {
3738
public static final String APP_CHANNEL = "vv:app_details";
3839

3940
public static void sendConnectionDetails(final UserConnection connection, final String channel) {
40-
final ProtocolVersion nativeVersion = connection.getProtocolInfo().protocolVersion();
41+
final ProtocolInfo protocolInfo = connection.getProtocolInfo();
42+
final ProtocolVersion nativeVersion = protocolInfo.protocolVersion();
43+
final ProtocolVersion serverVersion = protocolInfo.serverProtocolVersion();
44+
if (serverVersion.equals(nativeVersion)) {
45+
// No need to send details if the native version is the same as the server version
46+
return;
47+
}
48+
4149
final String platformName = Via.getPlatform().getPlatformName();
4250
final String platformVersion = Via.getPlatform().getPlatformVersion();
4351

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
projectVersion=5.3.2-SNAPSHOT
33

44
# Smile emoji
5-
mcVersions=1.21.5,1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9
5+
mcVersions=1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10, 1.9.4, 1.9.3, 1.9.2, 1.9.1, 1.9, 1.8.9
66
mcVersionRange=1.8-1.21.5
77
velocityVersion=3.4
88

velocity/src/main/java/com/viaversion/viaversion/velocity/listeners/ConnectionDetailsListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ConnectionDetailsListener {
3232

3333
@Subscribe
3434
public void onPostServerJoin(final ServerPostConnectEvent event) {
35-
final UserConnection connection = Via.getAPI().getConnection(event.getPlayer().getUniqueId());
35+
final UserConnection connection = Via.getManager().getConnectionManager().getClientConnection(event.getPlayer().getUniqueId());
3636
ConnectionDetails.sendConnectionDetails(connection, ConnectionDetails.PROXY_CHANNEL);
3737
}
3838

0 commit comments

Comments
 (0)