Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

moved Watchers to Ability and moved Counters to CardState

Browse source
This commit is contained in:
betasteward 2015-03-01 21:17:23 -05:00
parent 620a3b9a52
commit 632573fc3e
204 changed files with 1516 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/condition/common/SourceHasCounterCondition.java
View file

@ -74,7 +74,7 @@ public class SourceHasCounterCondition implements Condition {
if (from != -1) { //range compare
int count;
if (card != null) {
count = card.getCounters().getCount(counterType);
count = card.getCounters(game).getCount(counterType);
} else {
count = permanent.getCounters().getCount(counterType);
}
@ -84,7 +84,7 @@ public class SourceHasCounterCondition implements Condition {
return count >= from && count <= to;
} else { // single compare (lte)
if (card != null) {
return card.getCounters().getCount(counterType) >= amount;
return card.getCounters(game).getCount(counterType) >= amount;
} else {
return permanent.getCounters().getCount(counterType) >= amount;
}