Revert "fix bug in a spawner component (#725)"

This reverts commit bbaece1. Signed-off-by: Jan Hanca <[email protected]> Signed-off-by: Mateusz Zak <[email protected]>
o3de · Oct 31, 2024 · 0ffe3c2 · 0ffe3c2
1 parent 1af2de0
commit 0ffe3c2
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerComponent.cpp b/Gems/ROS2/Code/Source/Spawner/ROS2SpawnerComponent.cpp
@@ -243,14 +243,8 @@ namespace ROS2
             PreSpawn(id, view, transform, spawnableName, spawnableNamespace);
         };
 
-        optionalArgs.m_completionCallback = [service_handle, header, ticketName, parentId = GetEntityId()](auto id, auto view)
+        optionalArgs.m_completionCallback = [service_handle, header, ticketName](auto id, auto view)
         {
-            if (!view.empty())
-            {
-                const AZ::Entity* root = *view.begin();
-                auto* transformInterface = root->FindComponent<AzFramework::TransformComponent>();
-                transformInterface->SetParent(parentId);
-            }
             SpawnEntityResponse response;
             response.success = true;
             response.status_message = ticketName.c_str();
@@ -275,6 +269,7 @@ namespace ROS2
 
         auto* transformInterface = root->FindComponent<AzFramework::TransformComponent>();
         transformInterface->SetWorldTM(transform);
+        transformInterface->SetParent(GetEntityId());
 
         AZStd::string instanceName = AZStd::string::format("%s_%d", spawnableName.c_str(), m_counter++);
         for (AZ::Entity* entity : view)