From a4af34423a4b0e85ac4a6fc80408e9e06f120ba2 Mon Sep 17 00:00:00 2001
From: srikappa-amzn <srikappa@amazon.com>
Date: Thu, 16 Sep 2021 00:03:00 -0700
Subject: [PATCH] Use iter_swap instead of erase

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
---
 .../Spawnable/SpawnableEntitiesManager.cpp           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
index 2c317bc33f..92d461819b 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesManager.cpp
@@ -628,18 +628,16 @@ namespace AzFramework
         if (request.m_requestId == ticket->m_currentRequestId)
         {
             AZStd::vector<AZ::Entity*>& spawnedEntities = ticket->m_spawnedEntities;
-            AZStd::vector<AZ::Entity*>::size_type entityIndex = 0;
-            for (entityIndex = 0; entityIndex < spawnedEntities.size(); entityIndex++)
+            for (auto entityIterator = spawnedEntities.begin(); entityIterator != spawnedEntities.end(); ++entityIterator)
             {
-                if (spawnedEntities[entityIndex]->GetId() == request.m_entityId)
+                if ((*entityIterator)->GetId() == request.m_entityId)
                 {
-                    spawnedEntities.erase(spawnedEntities.begin() + entityIndex);
-                    ticket->m_spawnedEntityIndices.erase(ticket->m_spawnedEntityIndices.begin() + entityIndex);
-                    ticket->m_currentRequestId++;
+                    AZStd::iter_swap(entityIterator, spawnedEntities.rbegin());
+                    spawnedEntities.pop_back();
                     return true;
                 }
             }
-            return false; 
+            return true; 
         }
         else
         {