From 31e5a312b4b6499d4047ba941ebfff9a4a146a22 Mon Sep 17 00:00:00 2001 From: sconel Date: Wed, 19 May 2021 08:58:12 -0700 Subject: [PATCH] Updated loadAll check to set to false if previous entities already spawned on ticket --- .../Spawnable/SpawnableEntitiesManager.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp index 0418bce3a2..8045766686 100644 --- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp +++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp @@ -260,7 +260,16 @@ namespace AzFramework spawnedEntityIndices.push_back(i); } - ticket.m_loadAll = true; + // loadAll is true if every entity has been spawned only once + if (spawnedEntities.size() == entitiesToSpawnSize) + { + ticket.m_loadAll = true; + } + else + { + // Case where there were already spawns from a previous request + ticket.m_loadAll = false; + } // Let other systems know about newly spawned entities for any pre-processing before adding to the scene/game context. if (request.m_preInsertionCallback)