[minor] SunburstCount prevent exception.

This commit is contained in:
LevelX2 2013-06-21 21:30:24 +02:00
parent 250f860298
commit 514d21375c
2 changed files with 24 additions and 23 deletions

View file

@ -69,11 +69,11 @@ public class SuspendedCondition implements Condition {
break;
}
}
}
if (found) {
if (game.getState().getZone(card.getId()) == Zone.EXILED &&
card.getCounters().getCount(CounterType.TIME) > 0) {
return true;
if (found) {
if (game.getState().getZone(card.getId()) == Zone.EXILED &&
card.getCounters().getCount(CounterType.TIME) > 0) {
return true;
}
}
}
return false;

View file

@ -49,24 +49,25 @@ public class SunburstCount implements DynamicValue{
@Override
public int calculate(Game game, Ability source) {
int count = 0;
StackObject spell = game.getStack().getFirst();
if (spell != null && spell instanceof Spell && ((Spell)spell).getSourceId().equals(source.getSourceId())) {
Mana mana = ((Spell)spell).getSpellAbility().getManaCostsToPay().getPayment();
if(mana.getBlack() > 0) {
count++;
}
if(mana.getBlue() > 0) {
count++;
}
if(mana.getGreen() > 0) {
count++;
}
if(mana.getRed() > 0) {
count++;
}
if(mana.getWhite() > 0) {
count++;
if (!game.getStack().isEmpty()) {
StackObject spell = game.getStack().getFirst();
if (spell != null && spell instanceof Spell && ((Spell)spell).getSourceId().equals(source.getSourceId())) {
Mana mana = ((Spell)spell).getSpellAbility().getManaCostsToPay().getPayment();
if(mana.getBlack() > 0) {
count++;
}
if(mana.getBlue() > 0) {
count++;
}
if(mana.getGreen() > 0) {
count++;
}
if(mana.getRed() > 0) {
count++;
}
if(mana.getWhite() > 0) {
count++;
}
}
}
return count;