summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorMai Lavelle <mai.lavelle@gmail.com>2023-03-07 09:38:29 -0500
committerYuri Sizov <yuris@humnom.net>2023-03-30 19:20:01 +0200
commit9f20659c62796184ede59a1ea930e9bf492f0195 (patch)
tree28b20b2173318f1fced07dcbd6113975d52be112 /modules
parent105699620067a280cccd13a9c0e3ab84a5cbc3c6 (diff)
Fixups to list handling in SceneReplicationConfig
Wrong paths were being inserted leading to duplicates / missed properties. (cherry picked from commit 74edbdd4bce8f7a8a6c01ecb6ba5ae74ad6bac10)
Diffstat (limited to 'modules')
-rw-r--r--modules/multiplayer/scene_replication_config.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/modules/multiplayer/scene_replication_config.cpp b/modules/multiplayer/scene_replication_config.cpp
index f8006228de..b91c755c62 100644
--- a/modules/multiplayer/scene_replication_config.cpp
+++ b/modules/multiplayer/scene_replication_config.cpp
@@ -51,6 +51,9 @@ bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_val
ERR_FAIL_INDEX_V(idx, properties.size(), false);
ReplicationProperty &prop = properties[idx];
if (what == "sync") {
+ if ((bool)p_value == prop.sync) {
+ return true;
+ }
prop.sync = p_value;
if (prop.sync) {
sync_props.push_back(prop.name);
@@ -59,6 +62,9 @@ bool SceneReplicationConfig::_set(const StringName &p_name, const Variant &p_val
}
return true;
} else if (what == "spawn") {
+ if ((bool)p_value == prop.spawn) {
+ return true;
+ }
prop.spawn = p_value;
if (prop.spawn) {
spawn_props.push_back(prop.name);
@@ -132,16 +138,18 @@ void SceneReplicationConfig::add_property(const NodePath &p_path, int p_index) {
spawn_props.clear();
for (const ReplicationProperty &prop : properties) {
if (prop.sync) {
- sync_props.push_back(p_path);
+ sync_props.push_back(prop.name);
}
if (prop.spawn) {
- spawn_props.push_back(p_path);
+ spawn_props.push_back(prop.name);
}
}
}
void SceneReplicationConfig::remove_property(const NodePath &p_path) {
properties.erase(p_path);
+ sync_props.erase(p_path);
+ spawn_props.erase(p_path);
}
bool SceneReplicationConfig::has_property(const NodePath &p_path) const {
@@ -178,7 +186,7 @@ void SceneReplicationConfig::property_set_spawn(const NodePath &p_path, bool p_e
spawn_props.clear();
for (const ReplicationProperty &prop : properties) {
if (prop.spawn) {
- spawn_props.push_back(p_path);
+ spawn_props.push_back(prop.name);
}
}
}
@@ -199,7 +207,7 @@ void SceneReplicationConfig::property_set_sync(const NodePath &p_path, bool p_en
sync_props.clear();
for (const ReplicationProperty &prop : properties) {
if (prop.sync) {
- sync_props.push_back(p_path);
+ sync_props.push_back(prop.name);
}
}
}