From 703575c8984fe5e75b0ce2c8467081c890b05da7 Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Tue, 19 Dec 2023 11:52:30 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=BE=20=D1=86=D0=B2=D0=B5=D1=82=D1=83=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82=D1=8B=D1=85=20=D0=BE?= =?UTF-8?q?=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectStormtrooper/PlaneCompareByColor.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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; } } }