godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86260 from Faless/mp/fix_2way_auth

Browse Source 
[MP] Fix auth not waiting for confirmation in some cases
This commit is contained in:
Rémi Verschelde 2024-02-21 15:22:46 +01:00
commit 48a1a78390
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/multiplayer/scene_multiplayer.cpp
View File

@ -96,11 +96,6 @@ Error SceneMultiplayer::poll() {
#endif
if (pending_peers.has(sender)) {
if (pending_peers[sender].local) {
// If the auth is over, admit the peer at the first packet.
pending_peers.erase(sender);
_admit_peer(sender);
} else {
ERR_CONTINUE(len < 2 || (packet[0] & CMD_MASK) != NETWORK_COMMAND_SYS || packet[1] != SYS_COMMAND_AUTH);
// Auth message.
PackedByteArray pba;
@ -125,7 +120,6 @@ Error SceneMultiplayer::poll() {
}
continue; // Auth in progress.
}
}
ERR_CONTINUE(!connected_peers.has(sender));