Skip to content

NetworkManager: fix entity creation in network secondary #3160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2025
Merged

NetworkManager: fix entity creation in network secondary #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67d1f7d
NetworkManager: fix entity creation in network secondary
srmainwaring Oct 27, 2025
e4561a6
Merge branch 'gz-sim10' into prs/10/fix-distributed-sim
arjo129 Nov 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/SimulationRunner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,17 @@ void SimulationRunner::Step(const UpdateInfo &_info)
GZ_PROFILE("SimulationRunner::Step");
this->currentInfo = _info;

// The Run method does not check for entity creation each iteration
// on network secondaries, so check here to ensure that performers
// have parents assigned.
if (this->networkMgr && this->networkMgr->IsSecondary())
{
if (this->createEntities)
{
this->CreateEntities();
}
}

// Process new ECM state information, typically sent from the GUI after
// a change was made to the GUI's ECM.
this->ProcessNewWorldControlState();
Expand Down
5 changes: 4 additions & 1 deletion src/network/NetworkManagerSecondary.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ void NetworkManagerSecondary::OnStep(
{
auto parent =
this->dataPtr->ecm->Component<components::ParentEntity>(entityId);
this->dataPtr->ecm->RequestRemoveEntity(parent->Data());
if (parent != nullptr)
{
this->dataPtr->ecm->RequestRemoveEntity(parent->Data());
}

if (this->performers.find(entityId) != this->performers.end())
{
Expand Down
Loading