From da0ab84f1cbd279294eab50ea832e5122f06e147 Mon Sep 17 00:00:00 2001
From: chiyteng <chiyteng@amazon.com>
Date: Fri, 28 May 2021 11:42:36 -0700
Subject: [PATCH] Add helper function to update entity aliases in link patch

---
 .../Prefab/PrefabPublicHandler.cpp            | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 1c645100d1..fdc4302c1b 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -1077,25 +1077,7 @@ namespace AzToolsFramework
                         RemoveLink(nestedInstancePtr, instanceTemplateId, undoBatch.GetUndoBatch());
 
                         UpdateLinkPatchForNewParent(linkPatchesCopy, oldEntityAliases, parentInstance);
-                        //update aliases
-                        rapidjson::StringBuffer buffer;
-                        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-                        linkPatchesCopy.Accept(writer);
-                        QString previousPatchString(buffer.GetString());
-
-                        for (AZ::EntityId entityId : entityIds)
-                        {
-                            AZStd::string oldEntityAlias = oldEntityAliases[entityId];
-                            EntityAliasOptionalReference newEntityAlias = parentInstance.GetEntityAlias(entityId);
-                            AZ_Assert(
-                                newEntityAlias.has_value(),
-                                "Could not fetch entity alias for entity with id '%llu' during prefab creation.",
-                                static_cast<AZ::u64>(entityId));
-                            ReplaceOldAliases(previousPatchString, oldEntityAlias, newEntityAlias->get());
-                        }
-
-                        linkPatchesCopy.Parse(previousPatchString.toUtf8().constData());
-
+                        
                         CreateLink(*nestedInstancePtr, parentTemplateId, undoBatch.GetUndoBatch(),
                             AZStd::move(linkPatchesCopy), true);
                     });