godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #50991 from Faless/mp/4.x_rpc_config_fix 

[Net] Fix RPC ID encoding/decoding for Node methods.
This commit is contained in:
Rémi Verschelde 2021-07-29 01:28:15 +02:00 committed by GitHub
parent 60eb508fbb fd5a140039
commit 2ae069a97e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/io/multiplayer_api.cpp
View File

@ -63,7 +63,7 @@ const MultiplayerAPI::RPCConfig _get_rpc_config(const Node *p_node, const String
const Vector<MultiplayerAPI::RPCConfig> node_config = p_node->get_node_rpc_methods();
for (int i = 0; i < node_config.size(); i++) {
if (node_config[i].name == p_method) {
r_id = ((uint16_t)i) & (1 << 15);
r_id = ((uint16_t)i) | (1 << 15);
return node_config[i];
}
}
@ -89,7 +89,7 @@ const MultiplayerAPI::RPCConfig _get_rpc_config_by_id(Node *p_node, uint16_t p_i
config = p_node->get_script_instance()->get_rpc_methods();
}
if (id < config.size()) {
return config[p_id];
return config[id];
}
return MultiplayerAPI::RPCConfig();
}