Upstream
/
VIAaaS
mirror of https://github.com/ViaVersion/VIAaaS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed initial porting mistakes

This commit is contained in:
FlorianMichael 2024-02-25 19:26:56 +01:00
parent 4090a6eb12
commit 73fa4d249f
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/viaversion/aas/util/AddressParser.java
View File

@ -117,7 +117,10 @@ public class AddressParser {
if (protocolId == null) {
protocol = ProtocolVersion.getClosest(arg.replace("_", "."));
} else {
protocol = ProtocolVersion.getProtocol(protocolId);
final ProtocolVersion ver = ProtocolVersion.getProtocol(protocolId);
if (ver.isKnown()) {
protocol = ver;
}
}
}
}

8
src/main/kotlin/com/viaversion/aas/codec/packet/PacketRegistry.kt
View File

@ -56,21 +56,19 @@ object PacketRegistry {
register(State.LOGIN, Direction.SERVERBOUND, ::LoginStart, Range.all(), 0)
register(State.LOGIN, Direction.SERVERBOUND, ::CryptoResponse, Range.all(), 1)
register(State.LOGIN, Direction.SERVERBOUND, ::PluginResponse, Range.atLeast(ProtocolVersion.v1_13), 2)
register(State.LOGIN, Direction.SERVERBOUND, ::PluginResponse, sharewareVersion.singleton, 2)
// register(State.LOGIN, Direction.SERVERBOUND, ::PluginResponse, sharewareVersion.singleton, 2)
register(State.LOGIN, Direction.CLIENTBOUND, ::LoginDisconnect, Range.all(), 0)
register(State.LOGIN, Direction.CLIENTBOUND, ::CryptoRequest, Range.all(), 1)
register(State.LOGIN, Direction.CLIENTBOUND, ::LoginSuccess, Range.all(), 2)
register(
State.LOGIN, Direction.CLIENTBOUND, ::SetCompression, mapOf(
Range.atLeast(ProtocolVersion.v1_8) to 3,
sharewareVersion.singleton to 3
Range.atLeast(ProtocolVersion.v1_8) to 3
)
)
register(
State.LOGIN, Direction.CLIENTBOUND, ::PluginRequest, mapOf(
Range.atLeast(ProtocolVersion.v1_13) to 4,
sharewareVersion.singleton to 4
Range.atLeast(ProtocolVersion.v1_13) to 4
)
)

4
src/main/kotlin/com/viaversion/aas/handler/state/HandshakeState.kt
View File

@ -48,7 +48,9 @@ class HandshakeState : ConnectionState {
}
private fun handleNextState(handler: MinecraftHandler, packet: Handshake) {
handler.data.frontVer = ProtocolVersion.getProtocol(packet.protocolId)
ProtocolVersion.getProtocol(packet.protocolId).apply {
if (this.isKnown) handler.data.frontVer = this
}
when (packet.nextState.ordinal) {
1 -> handler.data.state = StatusState()
2 -> handler.data.state = LoginState()