Fix CC3 1.0.0.2 bug.

Fix: Correct Invalid Cast exception when trying to remove a node from a custom fabricator.
SubnauticaModding · Dec 10, 2023 · 4ac7dde · 4ac7dde
1 parent ef0a459
commit 4ac7dde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/Nautilus/Crafting/ModCraftTreeLinkingNode.cs b/Nautilus/Crafting/ModCraftTreeLinkingNode.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Nautilus.Handlers;
+using Nautilus.Utility;
 using UnityEngine;
 using UnityEngine.Assertions;
 
@@ -83,16 +84,15 @@ public ModCraftTreeTab AddTabNode(string nameID)
     /// <returns></returns>
     public ModCraftTreeTab GetTabNode(string nameID)
     {
-        foreach (ModCraftTreeTab node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {
                 continue;
             }
 
-            if (node.Name == nameID && node.Action == TreeAction.Expand)
+            if (node.Name == nameID && node.Action == TreeAction.Expand && node is ModCraftTreeTab tab)
             {
-                ModCraftTreeTab tab = node;
                 return tab;
             }
         }
@@ -107,16 +107,15 @@ public ModCraftTreeTab GetTabNode(string nameID)
     /// <returns></returns>
     public ModCraftTreeCraft GetCraftingNode(TechType techType)
     {
-        foreach (ModCraftTreeNode node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {
                 continue;
             }
 
-            if (node.TechType == techType && node.Action == TreeAction.Craft)
+            if (node.TechType == techType && node.Action == TreeAction.Craft && node is ModCraftTreeCraft craftNode)
             {
-                ModCraftTreeCraft craftNode = (ModCraftTreeCraft)node;
                 return craftNode;
             }
         }
@@ -131,7 +130,7 @@ public ModCraftTreeCraft GetCraftingNode(TechType techType)
     /// <returns></returns>
     public ModCraftTreeNode GetNode(string nameID)
     {
-        foreach (ModCraftTreeNode node in ChildNodes)
+        foreach (var node in ChildNodes)
         {
             if (node == null)
             {

diff --git a/Nautilus/Handlers/CraftTreeHandler.cs b/Nautilus/Handlers/CraftTreeHandler.cs
@@ -190,13 +190,7 @@ public static void RemoveNode(CraftTree.Type craftTree, params string[] stepsToN
     {
         if(CraftTreePatcher.CustomTrees.TryGetValue(craftTree, out var root))
         {
-            var tab = root.GetTabNode(stepsToNode);
-            if(tab == null)
-            {
-                root.GetNode(stepsToNode)?.RemoveNode();
-                return;
-            }
-            tab.RemoveNode();
+            root.GetNode(stepsToNode)?.RemoveNode();
             return;
         }
         CraftTreePatcher.NodesToRemove.Add(new Node(stepsToNode, craftTree));