fixed it for real

ChaoticLeah · Dec 26, 2023 · 07d98fb · 07d98fb
1 parent 6f86807
commit 07d98fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/scripts/Objects/Object.js b/scripts/Objects/Object.js
@@ -46,8 +46,12 @@ export class GameObject {
     }
   }
 
-  addChild(child) {
-    this.getProperties().childrenObjectIds.push(child);
+  addChild(childId) {
+    this.getProperties().childrenObjectIds.push(childId);
+  }
+
+  hasChild(childId) {
+    return this.getProperties().childrenObjectIds.includes(childId)
   }
 
   addChildAtIndex(child, index) {

diff --git a/scripts/Objects/ObjectManager.js b/scripts/Objects/ObjectManager.js
@@ -57,8 +57,11 @@ export function addObject(object, parentObjectId) {
       parentObjectId = "root";
     }
     object.getProperties().parentObjectId = parentObjectId.toString();
-    if (parentObjectId != "none")
+    const parentIsDefined = getObject(parentObjectId) != undefined
+    const alreadyHasChild = parentIsDefined && getObject(parentObjectId).hasChild(object.getProperties().id)
+    if (parentObjectId != "none" && parentIsDefined && !alreadyHasChild)
       getObject(parentObjectId).addChild(object.getProperties().id);
+
     objects.set(object.getProperties().id, object);
     return true;
   } catch (err) {

diff --git a/scripts/Objects/ObjectsTab.js b/scripts/Objects/ObjectsTab.js
@@ -127,13 +127,10 @@ function walkEveryBranch(id, depth, callback) {
  */
 function getOrderedObjectArray() {
   let nodes = []
-
   // Walk every branch and print the childrenObjectIds
   walkEveryBranch("root", 0, (node) => {
     node.depth --
-    if(node.id != "root" && ![...nodes, {id: -1}].some(function(lnode) {
-      return lnode.id == node.id
-    }))
+    if(node.id != "root")
       nodes.push(node)
   });
   return nodes