Skip to content

Commit 2979b9d

Browse files
authored
Also send version type; always send player details (#4795)
1 parent a734a4a commit 2979b9d

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,24 +64,20 @@ public static void sendPlayerDetails(final UserConnection connection, final Stri
6464
return;
6565
}
6666

67-
final ProtocolInfo protocolInfo = connection.getProtocolInfo();
68-
final ProtocolVersion nativeVersion = protocolInfo.protocolVersion();
69-
final ProtocolVersion serverVersion = protocolInfo.serverProtocolVersion();
70-
if (serverVersion.equals(nativeVersion)) {
71-
// No need to send details if the native version is the same as the server version
72-
return;
73-
}
67+
final JsonObject payload = new JsonObject();
68+
payload.addProperty("specVersion", VERSION);
7469

7570
final String platformName = Via.getPlatform().getPlatformName();
7671
final String platformVersion = Via.getPlatform().getPlatformVersion();
7772

78-
final JsonObject payload = new JsonObject();
79-
payload.addProperty("specVersion", VERSION);
73+
final ProtocolInfo protocolInfo = connection.getProtocolInfo();
74+
final ProtocolVersion clientVersion = protocolInfo.protocolVersion();
8075

8176
payload.addProperty("platformName", platformName);
8277
payload.addProperty("platformVersion", platformVersion);
83-
payload.addProperty("version", nativeVersion.getOriginalVersion());
84-
payload.addProperty("versionName", nativeVersion.getName());
78+
payload.addProperty("version", clientVersion.getOriginalVersion());
79+
payload.addProperty("versionName", clientVersion.getName());
80+
payload.addProperty("versionType", clientVersion.getVersionType().name());
8581

8682
Via.getPlatform().sendCustomPayload(connection, channel, payload.toString().getBytes(StandardCharsets.UTF_8));
8783
}
@@ -98,13 +94,14 @@ public static void sendServerDetails(final UserConnection connection, final Stri
9894
return;
9995
}
10096

101-
final ProtocolInfo protocolInfo = connection.getProtocolInfo();
102-
final ProtocolVersion serverVersion = protocolInfo.serverProtocolVersion();
10397
final JsonObject payload = new JsonObject();
10498
payload.addProperty("specVersion", VERSION);
10599

100+
final ProtocolInfo protocolInfo = connection.getProtocolInfo();
101+
final ProtocolVersion serverVersion = protocolInfo.serverProtocolVersion();
106102
payload.addProperty("version", serverVersion.getOriginalVersion());
107103
payload.addProperty("versionName", serverVersion.getName());
104+
payload.addProperty("versionType", serverVersion.getVersionType().name());
108105

109106
Via.getPlatform().sendCustomPayloadToClient(connection, channel, payload.toString().getBytes(StandardCharsets.UTF_8));
110107
}

0 commit comments

Comments
 (0)