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

Avoid shifting sands

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-07 20:26:20 -05:00
parent f778735b96
commit 52b3e4196f
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
SabreTools.DatItems/DatItem.cs
View File

@@ -163,12 +163,17 @@ namespace SabreTools.DatItems
try try
{ {
if (GetName() == other.GetName()) // Get the names to avoid changing values
string? selfName = GetName();
string? otherName = other.GetName();
// If the names are equal
if (selfName == otherName)
return Equals(other) ? 0 : (other.ItemType - ItemType); return Equals(other) ? 0 : (other.ItemType - ItemType);
// If `other.GetName()` is null, Compare will return > 0 // If `otherName` is null, Compare will return > 0
// If `this.GetName()` is null, Compare will return < 0 // If `selfName` is null, Compare will return < 0
return string.Compare(GetName(), other.GetName(), StringComparison.Ordinal); return string.Compare(selfName, otherName, StringComparison.Ordinal);
} }
catch catch
{ {
@@ -555,12 +560,17 @@ namespace SabreTools.DatItems
try try
{ {
if (GetName() == other.GetName()) // Get the names to avoid changing values
string? selfName = GetName();
string? otherName = other.GetName();
// If the names are equal
if (selfName == otherName)
return Equals(other) ? 0 : (other.ItemType - ItemType); return Equals(other) ? 0 : (other.ItemType - ItemType);
// If `other?.GetName()` is null, Compare will return > 0 // If `otherName` is null, Compare will return > 0
// If `this.GetName()` is null, Compare will return < 0 // If `selfName` is null, Compare will return < 0
return string.Compare(GetName(), other.GetName(), StringComparison.Ordinal); return string.Compare(selfName, otherName, StringComparison.Ordinal);
} }
catch catch
{ {