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

Make the Counters API for card and permanent consistent.

Browse source
This commit is contained in:
Samuel Sandeen 2016-09-03 10:33:54 -04:00
parent 277dc19fec
commit 148f633672
176 changed files with 272 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/keyword/ModularAbility.java
View file

@ -75,7 +75,7 @@ public class ModularAbility extends DiesTriggeredAbility {
public boolean checkTrigger(GameEvent event, Game game) {
if (super.checkTrigger(event, game)) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getTarget().getCounters().getCount(CounterType.P1P1) > 0) {
if (zEvent.getTarget().getCounters(game).getCount(CounterType.P1P1) > 0) {
return true;
}
}
@ -157,7 +157,7 @@ class ModularDistributeCounterEffect extends OneShotEffect {
Permanent targetArtifact = game.getPermanent(targetPointer.getFirst(game, source));
Player player = game.getPlayer(source.getControllerId());
if (sourcePermanent != null && targetArtifact != null && player != null) {
int numberOfCounters = sourcePermanent.getCounters().getCount(CounterType.P1P1);
int numberOfCounters = sourcePermanent.getCounters(game).getCount(CounterType.P1P1);
if (numberOfCounters > 0) {
targetArtifact.addCounters(CounterType.P1P1.createInstance(numberOfCounters), game);
}