Merge branch 'dev' of https://github.com/Toby222/SharkGame into dev

Toby222 · Jan 25, 2024 · 3bd242c · 3bd242c
2 parents 68fab0d + 398aa51
commit 3bd242c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/aspecttree.ts b/src/aspecttree.ts
@@ -220,7 +220,7 @@ SharkGame.AspectTree = {
 
         $.each(SharkGame.Aspects, (aspectId, aspectData) => {
             const reqref = tree.requirementReference[aspectId];
-            if (!reqref.revealed) return;
+            if (!reqref || !reqref.revealed) return;
 
             let basicText = "";
             let cantBuyText = "";

diff --git a/src/util.ts b/src/util.ts
@@ -514,6 +514,14 @@ SharkGame.MiscUtil = {
         if (obj instanceof HTMLAllCollection) {
             return obj;
         }
+        if (obj instanceof Node) {
+            console.warn(
+                "deepClone called with Node. " +
+                    "This would cause unintended side-effects (e.g. missing event listeners). " +
+                    "So we'll just return the object unchanged."
+            );
+            return obj;
+        }
         switch (typeof obj) {
             // Immutable types
             case "bigint":

diff --git a/src/world.ts b/src/world.ts
@@ -48,8 +48,8 @@ SharkGame.World = {
 
         // enable resources allowed on the planet
         if (worldInfo.includedResources) {
-            SharkGame.ResourceMap.forEach((resource) => {
-                resource.exists = false;
+            SharkGame.ResourceMap.forEach((_resourceData, resourceName) => {
+                worldResources.get(resourceName).exists = false;
             });
             _.each(worldInfo.includedResources, (group) => {
                 if (sharkmisc.has(SharkGame.InternalCategories, group)) {