fix: prefab cache preferred parent of ObjectDB from prefab instead of…

… main scene

CHANGELOG.md

@@ -2,6 +2,7 @@
 ## Version 2.10.1
 * Added [Server Troubleshooting](https://github.com/Valheim-Modding/Wiki/wiki/Server-Troubleshooting) link as a button to the compatibility window
 * Changed "open log file" button to "open log folder" in the compatibility window
+* Fixed an edge case where PrefabManager.Cache preferred the prefab for ObjectDB parent instead of the scene object
 * Fixed an error when an independent mod adds a prefab twice to ObjectDB. A warning will be logged with the prefab name and hash to help debugging, but vanilla or other mods may still have issues with the double prefab
 * Fixed an error when available pieces in the build hammer where not initialized properly
 * Fixed an error that could occur when a build tab is localized

JotunnLib/Managers/PrefabManager.cs

@@ -448,6 +448,15 @@ private static Object FindBestAsset(IDictionary<string, Object> map, Object unit
                     return unityObject;
                 }
 
+                // if a ObjectDB parent exists in the main scene, prefer it over the prefab
+                if (name == "_NetScene" && cached is GameObject cachedGo && unityObject is GameObject newGo)
+                {
+                    if (!cachedGo.activeInHierarchy && newGo.activeInHierarchy)
+                    {
+                        return newGo;
+                    }
+                }
+
                 bool cachedHasParent = GetParent(cached);
                 bool otherHasParent = GetParent(unityObject);