Fix handling of disconnect in versionChecking on 1.20.3+. #1291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… newer translate string used in 1.20.2+
extremeheat
reviewed
Mar 7, 2024
src/client/versionChecking.js
Outdated
| module.exports = function (client, options) { | ||
| client.on('disconnect', message => { | ||
| if (!message.reason) { return } | ||
| if (client.state === states.PLAY | client.state === states.CONFIGURATION) { return } |
There was a problem hiding this comment.
Can you add a comment here explaining why?
There was a problem hiding this comment.
Just documented it.
There was a problem hiding this comment.
why use bitwise or here https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Bitwise_OR
There was a problem hiding this comment.
Fixed, didn't realize that was bitwise or.
src/client/versionChecking.js
Outdated
| @@ -11,7 +14,7 @@ module.exports = function (client, options) { | |||
| let text = parsed.text ? parsed.text : parsed | |||
| let versionRequired | |||
|
|
|||
| if (text.translate && text.translate.startsWith('multiplayer.disconnect.outdated_')) { versionRequired = text.with[0] } else { | |||
| if (text.translate && (text.translate.startsWith('multiplayer.disconnect.outdated_') | text.translate.startsWith('multiplayer.disconnect.incompatible'))) { versionRequired = text.with[0] } else { | |||
There was a problem hiding this comment.
Can you un-inline this if statement?
There was a problem hiding this comment.
Just un-inlined the if. Not sure why it was inlined to begin with.
rom1504
reviewed
Mar 17, 2024
| module.exports = function (client, options) { | ||
| client.on('disconnect', message => { | ||
| if (!message.reason) { return } | ||
| // Prevent the disconnect packet handler in the versionChecking code from triggering on PLAY or CONFIGURATION state disconnects | ||
| // Since version checking only happens during that HANDSHAKE / LOGIN state. |
There was a problem hiding this comment.
why don't we want to handle this also in PLAY or CONFIGURATION states ?
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the versionChecking code catching disconnects from states other then Handshake and Login, which cause errors on 1.20.3+ where NBT chat is used for the Play and Configuration state.
Since version checking only occurs in Handshake / Login state its best not to do anything when those other states occur.
This also includes a fix for the translate string having changed for when you have a version miss match.