godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Fix MultiplayerAPI crash when peer impl misbehave.

Browse Source 
Also fix WebSocketMultiplayer::get_available_packet_count() return value
when peer is not configured to use the multiplayer API.
This commit is contained in:
Fabio Alessandrelli
2020-01-21 20:46:32 +01:00
parent 4d052e51a2
commit 50f1b035b8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/io/multiplayer_api.cpp
View File

@@ -111,6 +111,7 @@ void MultiplayerAPI::poll() {
Error err = network_peer->get_packet(&packet, len); Error err = network_peer->get_packet(&packet, len);
if (err != OK) { if (err != OK) {
ERR_PRINT("Error getting packet!"); ERR_PRINT("Error getting packet!");
break; // Something is wrong!
} }
rpc_sender_id = sender; rpc_sender_id = sender;

2
modules/websocket/websocket_multiplayer_peer.cpp
View File

@@ -98,7 +98,7 @@ void WebSocketMultiplayerPeer::_bind_methods() {
// //
int WebSocketMultiplayerPeer::get_available_packet_count() const { int WebSocketMultiplayerPeer::get_available_packet_count() const {
ERR_FAIL_COND_V_MSG(!_is_multiplayer, ERR_UNCONFIGURED, "Please use get_peer(ID).get_available_packet_count to get available packet count from peers when not using the MultiplayerAPI."); ERR_FAIL_COND_V_MSG(!_is_multiplayer, 0, "Please use get_peer(ID).get_available_packet_count to get available packet count from peers when not using the MultiplayerAPI.");
return _incoming_packets.size(); return _incoming_packets.size();
} }