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

Merge pull request #91011 from Faless/mp/fix_disconnect_on_change 

[MP] Fix `disconnect_peer` not doing the proper cleanup
This commit is contained in:
Rémi Verschelde 2024-07-31 22:32:55 +02:00
parent 6cd2876c98 c6be5f130c
commit 9559330187
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/multiplayer/scene_multiplayer.cpp
View File

@ -425,11 +425,11 @@ void SceneMultiplayer::_del_peer(int p_id) {
void SceneMultiplayer::disconnect_peer(int p_id) { void SceneMultiplayer::disconnect_peer(int p_id) {
ERR_FAIL_COND(multiplayer_peer.is_null() || multiplayer_peer->get_connection_status() != MultiplayerPeer::CONNECTION_CONNECTED); ERR_FAIL_COND(multiplayer_peer.is_null() || multiplayer_peer->get_connection_status() != MultiplayerPeer::CONNECTION_CONNECTED);
if (pending_peers.has(p_id)) { // Block signals to avoid emitting peer_disconnected.
pending_peers.erase(p_id); bool blocking = is_blocking_signals();
} else if (connected_peers.has(p_id)) { set_block_signals(true);
connected_peers.erase(p_id); _del_peer(p_id);
} set_block_signals(blocking);
multiplayer_peer->disconnect_peer(p_id); multiplayer_peer->disconnect_peer(p_id);
} }