github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-27 20:06:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed NPE of HasCounterCondition.

Browse source
This commit is contained in:
LevelX2 2013-04-13 23:34:33 +02:00
parent 484b88ee0f
commit aefcd3c697
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Mage/src/mage/abilities/condition/common/HasCounterCondition.java
View file

@ -29,8 +29,10 @@ package mage.abilities.condition.common;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.condition.Condition; import mage.abilities.condition.Condition;
import mage.cards.Card;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent;
/** /**
* *
@ -60,14 +62,31 @@ public class HasCounterCondition implements Condition {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Card card = null;
Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent == null) {
card = game.getCard(source.getSourceId());
if (card == null) {
return false;
}
}
if (from != -1) { //range compare if (from != -1) { //range compare
int count = game.getPermanent(source.getSourceId()).getCounters().getCount(counterType); int count;
if (card != null) {
count = card.getCounters().getCount(counterType);
} else {
count = permanent.getCounters().getCount(counterType);
}
if (to == Integer.MAX_VALUE) { if (to == Integer.MAX_VALUE) {
return count >= from; return count >= from;
} }
return count >= from && count <= to; return count >= from && count <= to;
} else { // single compare (lte) } else { // single compare (lte)
return game.getPermanent(source.getSourceId()).getCounters().getCount(counterType) >= amount; if (card != null) {
return card.getCounters().getCount(counterType) >= amount;
} else {
return permanent.getCounters().getCount(counterType) >= amount;
}
} }
} }
} }