github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-10 09:11:04 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed CMC compare order.

Browse source
This commit is contained in:
LevelX2 2014-08-18 01:09:15 +02:00
parent 201817b331
commit d651fb65fa
2 changed files with 4 additions and 4 deletions
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell
CounterbalanceTest.java
Mage/src/mage/util
CardUtil.java

2
Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterbalanceTest.java
View file

@ -58,7 +58,7 @@ public class CounterbalanceTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Counterbalance");
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
addCard(Zone.LIBRARY, playerB, "Desert Twister"); // cmc = 6 ({G}{G}{4} because DeatGrasp = 2 + 4 (of X) = 6
addCard(Zone.LIBRARY, playerB, "Desert Twister"); // cmc = 6 ({G}{G}{4} because DeathGrasp = 2 + 4 (of X) = 6
skipInitShuffling(); // so the set to top card stays at top
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Death Grasp", "targetPlayer=PlayerB");

6
Mage/src/mage/util/CardUtil.java
View file

@ -533,7 +533,9 @@ public class CardUtil {
public static Set<Integer> getCMC(MageObject object) {
Set<Integer> cmcObject = new HashSet<>();
if (object instanceof Card) {
if (object instanceof Spell) {
cmcObject.add(((Spell)object).getConvertedManaCost());
} else if (object instanceof Card) {
Card card = (Card) object;
if (card instanceof SplitCard) {
SplitCard splitCard = (SplitCard) card;
@ -542,8 +544,6 @@ public class CardUtil {
} else {
cmcObject.add(card.getManaCost().convertedManaCost());
}
} else if (object instanceof Spell) {
cmcObject.add(((Spell)object).getConvertedManaCost());
}
return cmcObject;
}