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

Remove unnecessary null skips

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-13 10:52:27 -05:00
parent edf38041ae
commit 94f117c06f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,7 @@ namespace SabreTools.DatFiles
} }
items = GetItemsForBucket(bucket); items = GetItemsForBucket(bucket);
foreach (DatItem item in items!) foreach (DatItem item in items)
{ {
// Special disk handling // Special disk handling
if (item is Disk disk) if (item is Disk disk)
@@ -827,7 +827,7 @@ namespace SabreTools.DatFiles
// Now we want to get the parent romof tag and put it in each of the items // Now we want to get the parent romof tag and put it in each of the items
items = GetItemsForBucket(bucket); items = GetItemsForBucket(bucket);
string? romof = GetItemsForBucket(cloneOf!)![0].GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romof = GetItemsForBucket(cloneOf!)![0].GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
foreach (DatItem item in items!) foreach (DatItem item in items)
{ {
item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, romof); item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, romof);
} }
@@ -1103,7 +1103,7 @@ namespace SabreTools.DatFiles
continue; continue;
// If the parent exists and has items, we remove the parent items from the current game // If the parent exists and has items, we remove the parent items from the current game
foreach (DatItem item in parentItems!) foreach (DatItem item in parentItems)
{ {
DatItem datItem = (DatItem)item.Clone(); DatItem datItem = (DatItem)item.Clone();
while (items.Contains(datItem)) while (items.Contains(datItem))
@@ -1114,8 +1114,8 @@ namespace SabreTools.DatFiles
// Now we want to get the parent romof tag and put it in each of the remaining items // Now we want to get the parent romof tag and put it in each of the remaining items
items = GetItemsForBucket(bucket); items = GetItemsForBucket(bucket);
string? romof = GetItemsForBucket(cloneOf!)![0].GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romof = GetItemsForBucket(cloneOf)[0].GetFieldValue<Machine>(DatItem.MachineKey)!.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
foreach (DatItem item in items!) foreach (DatItem item in items)
{ {
item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, romof); item.GetFieldValue<Machine>(DatItem.MachineKey)!.SetFieldValue<string?>(Models.Metadata.Machine.RomOfKey, romof);
} }
@@ -1171,7 +1171,7 @@ namespace SabreTools.DatFiles
continue; continue;
string? romof = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey); string? romof = machine.Value.GetStringFieldValue(Models.Metadata.Machine.RomOfKey);
foreach (var item in items!) foreach (var item in items)
{ {
machine = ItemsDB.GetMachineForItem(item.Key); machine = ItemsDB.GetMachineForItem(item.Key);
if (machine.Value == null) if (machine.Value == null)