External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated target adjusters D through G

Browse source
This commit is contained in:
Evan Kranzler 2018-09-26 22:13:35 -04:00
parent 8d9cf6a8d2
commit f6ed3a4d19
21 changed files with 348 additions and 364 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/MageObjectReference.java
View file

@ -1,7 +1,5 @@
package mage;
import java.io.Serializable;
import java.util.UUID;
import mage.cards.Card;
import mage.constants.Zone;
import mage.game.Game;
@ -10,6 +8,9 @@ import mage.game.stack.Spell;
import mage.game.stack.StackObject;
import org.apache.log4j.Logger;
import java.io.Serializable;
import java.util.UUID;
/**
* A object reference that takes zone changes into account.
*
@ -145,4 +146,8 @@ public class MageObjectReference implements Comparable<MageObjectReference>, Ser
}
return null;
}
public boolean zoneCounterIsCurrent(Game game) {
return game.getState().getZoneChangeCounter(sourceId) == zoneChangeCounter;
}
}

4
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -360,9 +360,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
public List<Mana> getMana() {
List<Mana> mana = new ArrayList<>();
for (ActivatedManaAbilityImpl ability : this.abilities.getActivatedManaAbilities(Zone.BATTLEFIELD)) {
for (Mana netMana : ability.getNetMana(null)) {
mana.add(netMana);
}
mana.addAll(ability.getNetMana(null));
}
return mana;
}