summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorGuilherme Sousa <guilherme.sousa1994@gmail.com>2022-09-30 12:48:40 +0200
committerGuilherme Sousa <guilherme.sousa1994@gmail.com>2022-09-30 13:11:56 +0200
commita6c201fa76a2037dd8a7dadb48a824167f0726f9 (patch)
treebdae45d329f8550b1c6449a98a820bb703abf930 /modules
parente3464c8fc86e346c5c3a9d7d554cc2c5866ccb48 (diff)
Add Error for synchronizer authority mismatch
Diffstat (limited to 'modules')
-rw-r--r--modules/multiplayer/scene_replication_interface.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/multiplayer/scene_replication_interface.cpp b/modules/multiplayer/scene_replication_interface.cpp
index 6e3dbfab47..53d8e82dfc 100644
--- a/modules/multiplayer/scene_replication_interface.cpp
+++ b/modules/multiplayer/scene_replication_interface.cpp
@@ -125,9 +125,12 @@ Error SceneReplicationInterface::on_replication_start(Object *p_obj, Variant p_c
MultiplayerSynchronizer *sync = Object::cast_to<MultiplayerSynchronizer>(p_config.get_validated_object());
ERR_FAIL_COND_V(!sync, ERR_INVALID_PARAMETER);
+ const ObjectID oid = node->get_instance_id();
+ MultiplayerSpawner *spawner = rep_state->get_spawner(oid);
+ ERR_FAIL_COND_V_MSG(spawner && spawner->get_multiplayer_authority() != sync->get_multiplayer_authority(), ERR_INVALID_PARAMETER, "The authority of the MultiplayerSynchronizer \"" + String(sync->get_path()) + "\" differs from the authority of its \"root_node\" spawner and will not sync. Change the \"root_node\" of the MultiplayerSynchronizer to be a child of the scene root instead.");
+
// Add to synchronizer list and setup visibility.
rep_state->config_add_sync(node, sync);
- const ObjectID oid = node->get_instance_id();
sync->connect("visibility_changed", callable_mp(this, &SceneReplicationInterface::_visibility_changed).bind(oid));
if (multiplayer->has_multiplayer_peer() && sync->is_multiplayer_authority()) {
_update_sync_visibility(0, oid);