From f6f5aa04730db0e7284ce5af63463951b1c87d5f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 19 Jun 2020 10:54:11 +0200 Subject: [PATCH] * Fixed broken rarity sorting in card grid (fixes #6508). --- .../java/mage/client/util/CardViewRarityComparator.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/CardViewRarityComparator.java b/Mage.Client/src/main/java/mage/client/util/CardViewRarityComparator.java index 82f0edeb501..77bd9ff23f9 100644 --- a/Mage.Client/src/main/java/mage/client/util/CardViewRarityComparator.java +++ b/Mage.Client/src/main/java/mage/client/util/CardViewRarityComparator.java @@ -15,16 +15,10 @@ public class CardViewRarityComparator implements Comparator { Rarity r1 = o1.getRarity(); Rarity r2 = o2.getRarity(); - int val = Integer.compare( + return Integer.compare( r1 == null ? 0 : r1.getSorting(), r2 == null ? 0 : r2.getSorting() ); - - if (val == 0) { - return o1.getName().compareTo(o2.getName()); - } else { - return val; - } } } \ No newline at end of file