diff --git a/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java b/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java index 7f20b227d4a..1e5e563f6df 100644 --- a/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/mulligan/MulliganCardSorterTest.java @@ -84,27 +84,27 @@ public class MulliganCardSorterTest extends CardTestPlayerBase { // creatures by mana assertHandSort(Arrays.asList( - "Grizzly Bears", // 2 - "Yellow Scarves Troops", // 2 + "Aspiring Champion", // 4 "Marchesa's Infiltrator", // 3 - "Aspiring Champion" // 4 + "Grizzly Bears", // 2 + "Yellow Scarves Troops" // 2 )); // other by mana assertHandSort(Arrays.asList( - "Lightning Bolt", // 1 - "Samite Blessing", // 1 + "From Beyond", // 4 "Druid's Call", // 2 - "From Beyond" // 4 + "Lightning Bolt", // 1 + "Samite Blessing" // 1 )); // lands > others > creatures assertHandSort(Arrays.asList( "Forest", // land "Island", // land + "Druid's Call", // other, 2 "Lightning Bolt", // other, 1 "Samite Blessing", // other, 1 - "Druid's Call", // other, 2 "Grizzly Bears", // creature, 2 "Yellow Scarves Troops" // creature, 2 )); diff --git a/Mage/src/main/java/mage/game/mulligan/MulliganDefaultHandSorter.java b/Mage/src/main/java/mage/game/mulligan/MulliganDefaultHandSorter.java index 7a4e37d09c8..6e933f2548f 100644 --- a/Mage/src/main/java/mage/game/mulligan/MulliganDefaultHandSorter.java +++ b/Mage/src/main/java/mage/game/mulligan/MulliganDefaultHandSorter.java @@ -16,17 +16,17 @@ public class MulliganDefaultHandSorter implements Comparator { // groups: lands > other > creatures // inside group: by mana value, by name - // lands + // lands (lands first) if (c1.isLand() != c2.isLand()) { return Boolean.compare(c2.isLand(), c1.isLand()); } - // creatures + // creatures (others first, then creatures) if (c1.isCreature() != c2.isCreature()) { return Boolean.compare(c1.isCreature(), c2.isCreature()); } - // by mana + // by mana (from big to low) if (c1.getManaValue() != c2.getManaValue()) { - return Integer.compare(c1.getManaValue(), c2.getManaValue()); + return Integer.compare(c2.getManaValue(), c1.getManaValue()); } // by name return c1.getName().compareTo(c2.getName());