MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Pass the correct virtual host port during the handshake (#1205)

Browse Source
This commit is contained in:
Adrian
2024-01-20 07:27:41 -05:00
committed by GitHub
parent d4a661870e
commit 46d018c0f2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
proxy/src/main/java/com/velocitypowered/proxy/connection/backend/VelocityServerConnection.java
View File

@@ -176,9 +176,9 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
// Initiate the handshake. // Initiate the handshake.
ProtocolVersion protocolVersion = proxyPlayer.getConnection().getProtocolVersion(); ProtocolVersion protocolVersion = proxyPlayer.getConnection().getProtocolVersion();
String playerVhost = String playerVhost = proxyPlayer.getVirtualHost()
proxyPlayer.getVirtualHost().orElseGet(() -> registeredServer.getServerInfo().getAddress()) .orElseGet(() -> registeredServer.getServerInfo().getAddress())
.getHostString(); .getHostString();
HandshakePacket handshake = new HandshakePacket(); HandshakePacket handshake = new HandshakePacket();
handshake.setNextStatus(StateRegistry.LOGIN_ID); handshake.setNextStatus(StateRegistry.LOGIN_ID);
@@ -197,7 +197,9 @@ public class VelocityServerConnection implements MinecraftConnectionAssociation,
handshake.setServerAddress(playerVhost); handshake.setServerAddress(playerVhost);
} }
handshake.setPort(registeredServer.getServerInfo().getAddress().getPort()); handshake.setPort(proxyPlayer.getVirtualHost()
.orElseGet(() -> registeredServer.getServerInfo().getAddress())
.getPort());
mc.delayedWrite(handshake); mc.delayedWrite(handshake);
mc.setProtocolVersion(protocolVersion); mc.setProtocolVersion(protocolVersion);