handle unclaimed creatures in cryopods if the cryopod has no owner ne…

…ither
cadon · Apr 21, 2023 · 3f60040 · 3f60040
1 parent 62b3ea9
commit 3f60040
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/SavegameToolkit/ArkSavegame.cs b/SavegameToolkit/ArkSavegame.cs
@@ -451,16 +451,20 @@ private void extractBinaryObjectCryopods(ReadingOptions options)
                         {
                             // if a creature is cryoed and unclaimed, determine the owner of the container the cryopod is in and set that as the owner
                             var ownerInventoryProperty = cryo.GetPropertyValue<ObjectReference>("OwnerInventory");
-                            if (!soulTrapContainer.TryGetValue(ownerInventoryProperty.ObjectId, out var ownerString))
+                            if (ownerInventoryProperty != null)
                             {
-                                var inventoryObject = Objects.FirstOrDefault(o => o.Id == ownerInventoryProperty.ObjectId);
-                                ownerString = inventoryObject?.Parent?.GetPropertyValue<string>("OwnerName");
-                                soulTrapContainer[ownerInventoryProperty.ObjectId] = ownerString;
-                            }
-
-                            if (!string.IsNullOrEmpty(ownerString))
-                            {
-                                storedGameObjects[0].Properties.Add(new PropertyString("TribeName", ownerString));
+                                if (!soulTrapContainer.TryGetValue(ownerInventoryProperty.ObjectId, out var ownerString))
+                                {
+                                    var inventoryObject =
+                                        Objects.FirstOrDefault(o => o.Id == ownerInventoryProperty.ObjectId);
+                                    ownerString = inventoryObject?.Parent?.GetPropertyValue<string>("OwnerName");
+                                    soulTrapContainer[ownerInventoryProperty.ObjectId] = ownerString;
+                                }
+
+                                if (!string.IsNullOrEmpty(ownerString))
+                                {
+                                    storedGameObjects[0].Properties.Add(new PropertyString("TribeName", ownerString));
+                                }
                             }
                         }
                     }