Make EqualSorter null-check style more consistent

Hirtol · Aug 1, 2020 · d16bf05 · d16bf05
1 parent d02ee6c
commit d16bf05
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/PartyScreenEnhancements/Comparers/AlphabetComparer.cs b/PartyScreenEnhancements/Comparers/AlphabetComparer.cs
@@ -38,12 +38,7 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
                 result = StringComparer.CurrentCulture.Compare(x.Name.ToString(), y.Name.ToString());
 
             if (result == 0)
-            {
-                if (EqualSorter != null)
-                {
-                    return EqualSorter.Compare(x, y);
-                }
-            }
+                return EqualSorter?.Compare(x, y) ?? 0;
 
             return result;
         }

diff --git a/PartyScreenEnhancements/Comparers/LevelComparer.cs b/PartyScreenEnhancements/Comparers/LevelComparer.cs
@@ -31,7 +31,8 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
         {
             if (Descending ? x.Character.Level > y.Character.Level : y.Character.Level > x.Character.Level) return -1;
 
-            if (x.Character.Level == y.Character.Level) return EqualSorter?.Compare(x, y) ?? 0;
+            if (x.Character.Level == y.Character.Level) 
+                return EqualSorter?.Compare(x, y) ?? 0;
 
             return 1;
         }

diff --git a/PartyScreenEnhancements/Comparers/NumberComparer.cs b/PartyScreenEnhancements/Comparers/NumberComparer.cs
@@ -31,7 +31,8 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
         {
             if (Descending ? x.Number > y.Number : y.Number > x.Number) return -1;
 
-            if (x.Number == y.Number) return EqualSorter?.Compare(x, y) ?? 0;
+            if (x.Number == y.Number) 
+                return EqualSorter?.Compare(x, y) ?? 0;
 
             return 1;
         }

diff --git a/PartyScreenEnhancements/Comparers/TrueTierComparer.cs b/PartyScreenEnhancements/Comparers/TrueTierComparer.cs
@@ -35,17 +35,13 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
             {
                 return 1;
             }
+
             if (x.Character.Tier == y.Character.Tier)
             {
-                if (EqualSorter != null)
-                {
-                    return EqualSorter.Compare(x, y);
-                }
-                return 0;
-            }else
-            {
-                return -1;
+                return EqualSorter?.Compare(x, y) ?? 0;
             }
+
+            return -1;
         }
     }
 }
diff --git a/PartyScreenEnhancements/Comparers/TypeComparer.cs b/PartyScreenEnhancements/Comparers/TypeComparer.cs
@@ -38,9 +38,7 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
 
             if (y.Character.GetFormationClass(PartyBase.MainParty) == x.Character.GetFormationClass(PartyBase.MainParty))
             {
-                if (EqualSorter != null)
-                    return EqualSorter.Compare(x, y);
-                return 0;
+                return EqualSorter?.Compare(x, y) ?? 0;
             }
 
             return -1;

diff --git a/PartyScreenEnhancements/Comparers/UpgradeableComparer.cs b/PartyScreenEnhancements/Comparers/UpgradeableComparer.cs
@@ -37,7 +37,8 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
                 : y.Troop.NumberReadyToUpgrade > x.Troop.NumberReadyToUpgrade) return -1;
 
 
-            if (y.Troop.NumberReadyToUpgrade == x.Troop.NumberReadyToUpgrade) return EqualSorter?.Compare(x, y) ?? 0;
+            if (y.Troop.NumberReadyToUpgrade == x.Troop.NumberReadyToUpgrade) 
+                return EqualSorter?.Compare(x, y) ?? 0;
 
             return 1;
         }

diff --git a/PartyScreenEnhancements/Comparers/WoundedComparer.cs b/PartyScreenEnhancements/Comparers/WoundedComparer.cs
@@ -37,7 +37,8 @@ protected override int localCompare(ref PartyCharacterVM x, ref PartyCharacterVM
 
             if (Descending ? x.Troop.WoundedNumber > y.Troop.WoundedNumber : y.Troop.WoundedNumber > x.Troop.WoundedNumber) return -1;
 
-            if (x.Troop.WoundedNumber == y.Troop.WoundedNumber) return EqualSorter?.Compare(x, y) ?? 0;
+            if (x.Troop.WoundedNumber == y.Troop.WoundedNumber) 
+                return EqualSorter?.Compare(x, y) ?? 0;
 
             return 1;
         }