Merge pull request #464 from jneb802/dev

MSchmoecker · web-flow · commit 016cbbe276ef · 2025-12-29T09:14:43.000+01:00
Fix: Release() call during SoftReference location registration causes intermittent NullReferenceException
diff --git a/JotunnLib/Managers/ZoneManager.cs b/JotunnLib/Managers/ZoneManager.cs
@@ -638,7 +638,11 @@ private void RegisterLocationInZoneSystem(ZoneSystem zoneSystem, ZoneLocation zo
                 zoneSystem.m_locations.Add(zoneLocation);
             }
 
-            zoneLocation.m_prefab.Release();
+            // Only release if the asset is currently loaded (meaning PrepareLocation called Load)
+            if (zoneLocation.m_prefab.IsLoaded)
+            {
+                zoneLocation.m_prefab.Release();
+            }
         }
 
         private static void InvokeOnVanillaLocationsAvailable() => OnVanillaLocationsAvailable?.SafeInvoke();

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,11 @@ private void RegisterLocationInZoneSystem(ZoneSystem zoneSystem, ZoneLocation zo`
`638`	`638`	`zoneSystem.m_locations.Add(zoneLocation);`
`639`	`639`	`}`
`640`	`640`
`641`		`- zoneLocation.m_prefab.Release();`
	`641`	`+ // Only release if the asset is currently loaded (meaning PrepareLocation called Load)`
	`642`	`+ if (zoneLocation.m_prefab.IsLoaded)`
	`643`	`+ {`
	`644`	`+ zoneLocation.m_prefab.Release();`
	`645`	`+ }`
`642`	`646`	`}`
`643`	`647`
`644`	`648`	`private static void InvokeOnVanillaLocationsAvailable() => OnVanillaLocationsAvailable?.SafeInvoke();`