mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
[minor] SunburstCount prevent exception.
This commit is contained in:
parent
250f860298
commit
514d21375c
2 changed files with 24 additions and 23 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue