Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Assign ServerConnection to Player before processing post-login packets #1309

Merged
merged 8 commits into from
Jul 4, 2024
Merged

Assign ServerConnection to Player before processing post-login packets #1309

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ad01ceb
Assign server connection before processing post-login packets
wallenjos01 Apr 27, 2024
36056c0
Document reasoning for waiting to auto-read
wallenjos01 Apr 28, 2024
d6a2069
Add version information for 1.20.6 (#1310)
Pantera07 Apr 30, 2024
e821bef
Properly pass connection exceptions to the logger
electronicboy May 1, 2024
1b87337
Do not send empty upsert player info packets
electronicboy May 1, 2024
ed7163f
Hotfix cancelling unsigned 1.20.6 commands
electronicboy May 3, 2024
e701bd3
Cleanup comment
wallenjos01 May 8, 2024
2bb339d
Merge branch 'PaperMC:dev/3.0.0' into dev/3.0.0
wallenjos01 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .../src/main/java/com/velocitypowered/proxy/connection/backend/TransitionSessionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ public boolean handle(JoinGamePacket packet) {
smc.setActiveSessionHandler(StateRegistry.PLAY,
new BackendPlaySessionHandler(server, serverConn));

// Clean up disabling auto-read while the connected event was being processed.
smc.setAutoReading(true);

// Now set the connected server.
serverConn.getPlayer().setConnectedServer(serverConn);

// Clean up disabling auto-read while the connected event was being processed.
// Do this after setting the connection, so no incoming packets are processed before
// the API knows which server the player is connected to.
smc.setAutoReading(true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you mind expanding the comment above this line to include your description (or similar)?


// Send client settings. In 1.20.2+ this is done in the config state.
if (smc.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)
&& player.getClientSettingsPacket() != null) {
Expand Down