From 92f7997603273a58987c838221834dcb0c967521 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Wed, 8 Dec 2021 23:01:21 -0500
Subject: [PATCH] Fix for Issue #1517

Fix for Issue #1517
Locked entities were simply ignored and it was still processing their children.
Now it's no more possible to duplicate if the selection and their children contains a locked entities.
It was also unable to add the new parent if the duplicated child entity was locked. Which was causing some other issues.
---
 .../entitySelectionTool.js                    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/scripts/system/create/entitySelectionTool/entitySelectionTool.js b/scripts/system/create/entitySelectionTool/entitySelectionTool.js
index f4d6117bd1..257d4fb407 100644
--- a/scripts/system/create/entitySelectionTool/entitySelectionTool.js
+++ b/scripts/system/create/entitySelectionTool/entitySelectionTool.js
@@ -343,6 +343,19 @@ SelectionManager = (function() {
         }
         
         var duplicateInterrupted = false;
+        for (var j = 0; j < entitiesToDuplicate.length; j++) {
+            var lockedEntities = Entities.getEntityProperties(entitiesToDuplicate[j], 'locked');
+            if (lockedEntities.locked) {
+                duplicateInterrupted = true;
+                break;
+            }
+        }
+        if (duplicateInterrupted) {
+            audioFeedback.rejection();
+            Window.notifyEditError("At least one of the selected entities or one of their children are locked.");
+            return [];
+        }
+
         // duplicate entities from above and store their original to new entity mappings and children needing re-parenting
         for (var i = 0; i < entitiesToDuplicate.length; i++) {
             var originalEntityID = entitiesToDuplicate[i];
@@ -389,8 +402,6 @@ SelectionManager = (function() {
                     duplicatedChildrenWithOldParents[newEntityID] = properties.parentID;
                 }
                 originalEntityToNewEntityID[originalEntityID] = newEntityID;
-            } else {
-                duplicateInterrupted = true;
             }
         }
         
@@ -409,11 +420,7 @@ SelectionManager = (function() {
             }
         });
         
-        if (duplicateInterrupted) {
-            audioFeedback.rejection();
-        } else {
-            audioFeedback.confirmation();
-        }
+        audioFeedback.confirmation();
         return duplicatedEntityIDs;
     };