claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce more odd null cases

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-13 13:31:14 -05:00
parent c6dde56c1e
commit a45db9f18d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SabreTools.DatFiles/DatFile.Splitting.cs
View File

@@ -170,14 +170,14 @@ namespace SabreTools.DatFiles
// Get the romof parent items // Get the romof parent items
string? romOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf!); Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf);
if (parentItems.Count == 0) if (parentItems.Count == 0)
continue; continue;
// If the parent exists and has items, we copy the items from the parent to the current game // If the parent exists and has items, we copy the items from the parent to the current game
foreach (var item in parentItems) foreach (var item in parentItems)
{ {
DatItem datItem = (item.Value.Clone() as DatItem)!; DatItem datItem = (DatItem)item.Value.Clone();
if (items.Any(i => i.Value.GetName() == datItem.GetName()) if (items.Any(i => i.Value.GetName() == datItem.GetName())
&& items.Any(i => i.Value == datItem)) && items.Any(i => i.Value == datItem))
{ {
@@ -682,7 +682,7 @@ namespace SabreTools.DatFiles
foundnew = true; foundnew = true;
// Clone the item and then add it // Clone the item and then add it
DatItem datItem = (item.Clone() as DatItem)!; DatItem datItem = (DatItem)item.Clone();
ItemsDB.AddItem(datItem, machine.Key, source.Key); ItemsDB.AddItem(datItem, machine.Key, source.Key);
} }
} }
@@ -738,7 +738,7 @@ namespace SabreTools.DatFiles
foundnew = true; foundnew = true;
// Clone the item and then add it // Clone the item and then add it
DatItem datItem = (item.Clone() as DatItem)!; DatItem datItem = (DatItem)item.Clone();
ItemsDB.AddItem(datItem, machine.Key, source.Key); ItemsDB.AddItem(datItem, machine.Key, source.Key);
} }
} }
@@ -790,7 +790,7 @@ namespace SabreTools.DatFiles
// Get the cloneof parent items // Get the cloneof parent items
string? cloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey); string? cloneOf = machine.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey);
List<DatItem> parentItems = GetItemsForBucket(cloneOf!); List<DatItem> parentItems = GetItemsForBucket(cloneOf);
if (parentItems.Count == 0) if (parentItems.Count == 0)
continue; continue;
@@ -848,7 +848,7 @@ namespace SabreTools.DatFiles
continue; continue;
// If the parent doesn't have any items, we want to continue // If the parent doesn't have any items, we want to continue
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(cloneOf!); Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(cloneOf);
if (parentItems.Count == 0) if (parentItems.Count == 0)
continue; continue;
@@ -1023,7 +1023,7 @@ namespace SabreTools.DatFiles
// Get the cloneof parent items // Get the cloneof parent items
string? cloneOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey); string? cloneOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.CloneOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(cloneOf!); Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(cloneOf);
if (parentItems == null || parentItems.Count == 0) if (parentItems == null || parentItems.Count == 0)
continue; continue;
@@ -1087,7 +1087,7 @@ namespace SabreTools.DatFiles
// Get the romof parent items // Get the romof parent items
string? romOf = machine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romOf = machine.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
List<DatItem> parentItems = GetItemsForBucket(romOf!); List<DatItem> parentItems = GetItemsForBucket(romOf);
if (parentItems.Count == 0) if (parentItems.Count == 0)
continue; continue;
@@ -1133,7 +1133,7 @@ namespace SabreTools.DatFiles
// Get the romof parent items // Get the romof parent items
string? romOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romOf = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf!); Dictionary<long, DatItem> parentItems = GetItemsForBucketDB(romOf);
if (parentItems.Count == 0) if (parentItems.Count == 0)
continue; continue;