diff --git a/ProjectStormtrooper/ProjectStormtrooper/PlaneCompareByColor.cs b/ProjectStormtrooper/ProjectStormtrooper/PlaneCompareByColor.cs index f90183d..3392ece 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/PlaneCompareByColor.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/PlaneCompareByColor.cs @@ -22,12 +22,14 @@ namespace ProjectStormtrooper { return x.EntityPlane.BodyColor.Name.CompareTo(y.EntityPlane.BodyColor.Name); } - var speedCompare = x.EntityPlane.Speed.CompareTo(y.EntityPlane.Speed); - if (speedCompare != 0) + if (x.EntityPlane is EntityStormtrooper xStormtrooper && y.EntityPlane is EntityStormtrooper yStormtrooper) { - return speedCompare; + if (xStormtrooper.AdditionalColor != yStormtrooper.AdditionalColor) + { + return xStormtrooper.AdditionalColor.Name.CompareTo(yStormtrooper.AdditionalColor.Name); + } } - return x.EntityPlane.Weight.CompareTo(y.EntityPlane.Weight); + return 0; } } }