Configuration networking fixes #3832
Conversation
modmuss50
added
bug
|
Please refer to ae314ad , we have to wait for initial acceptable channels from server, so |
.../client/java/net/fabricmc/fabric/impl/networking/client/ClientConfigurationNetworkAddon.java
Show resolved
Hide resolved
...c/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java
Outdated
Show resolved
Hide resolved
| public void onServerReady() { | ||
| ClientConfigurationConnectionEvents.START.invoker().onConfigurationStart(this.handler, this.client); | ||
| } | ||
|
|
||
| @Override | ||
| protected void receiveRegistration(boolean register, RegistrationPayload payload) { | ||
| super.receiveRegistration(register, payload); |
There was a problem hiding this comment.
The configuration negotiation flow should be like this, imo:
S2C: LoginSuccessS2CPacket
C2S: EnterConfigurationC2SPacket
S2C: sendInitialChannelRegistrationPacket
S2C: Ping
S: fire ServerConfigurationConnectionEvents.BEFORE_CONFIGURE
C2S: receive initial channels, send back client side channels, fire START event here because we must wait for server initial channels
C2S: Pong
S: receive initial channels, fire ServerConfigurationConnectionEvents.CONFIGURE
so onServerReady() should be called here (in the if block) as we received the initial channels.
There was a problem hiding this comment.
Yes, I agree ill make these changes. It should also be fired even when connecting to a vanilla server (thus when no channels are recieved)
There was a problem hiding this comment.
I have updated this to now also trigger the event it if the brand packet is recieved.
.../fabricmc/fabric/test/networking/client/configuration/NetworkingConfigurationClientTest.java
Outdated
Show resolved
Hide resolved
…abric/test/networking/client/configuration/NetworkingConfigurationClientTest.java Co-authored-by: Octol1ttle <[email protected]>
* Configuration networking fixes * Review fixes. * Update fabric-networking-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/networking/client/configuration/NetworkingConfigurationClientTest.java Co-authored-by: Octol1ttle <[email protected]> --------- Co-authored-by: Octol1ttle <[email protected]> (cherry picked from commit 686dcdc)
ClientConfigurationConnectionEvents.READYas it was incorrectly named, replaced withCOMPLETEClientConfigurationConnectionEvents.START, this is fired when the server is ready to recieve configuration packets. During login and reconfigureThis should be backported to 1.20.6
Closes #3830
Closes #3821