Skip to content

Commit ec1768f

Browse files
Fix server protocol detection on backend connection as well
Supersedes ViaVersion/ViaVersion#4484
1 parent a0ff588 commit ec1768f

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

common/src/main/java/com/viaversion/viaaprilfools/api/VAFServerVersionProvider.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,16 @@ public ProtocolVersion getClientProtocol(UserConnection connection) {
4646

4747
@Override
4848
public ProtocolVersion getClosestServerProtocol(UserConnection connection) throws Exception {
49-
if (!connection.isClientSide()) {
50-
final ProtocolVersion version = connection.getProtocolInfo().protocolVersion();
51-
if (version instanceof RedirectProtocolVersion redirectProtocolVersion) {
52-
return redirectProtocolVersion.getOrigin();
53-
}
49+
final ProtocolVersion version = delegate.getClosestServerProtocol(connection);
50+
if (connection.isClientSide() && !version.isKnown()) {
51+
return ProtocolVersion.getProtocol(VersionType.SPECIAL, version.getOriginalVersion());
52+
}
53+
54+
if (version instanceof final RedirectProtocolVersion redirectProtocolVersion) {
55+
return redirectProtocolVersion.getOrigin();
56+
} else {
57+
return version;
5458
}
55-
return delegate.getClosestServerProtocol(connection);
5659
}
5760

5861
}

0 commit comments

Comments
 (0)