Merge branch 'targetAdjustment' into master

This commit is contained in:
Evan Kranzler 2019-01-12 14:42:58 -05:00 committed by GitHub
commit 3483b3a181
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
154 changed files with 3062 additions and 2964 deletions

View file

@ -327,9 +327,11 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
return spellAbility;
}
// @Override
// public void adjustCosts(Ability ability, Game game) {
// }
@Override
public void adjustCosts(Ability ability, Game game) {
ability.adjustCosts(game);
}
@Override
public void adjustTargets(Ability ability, Game game) {
ability.adjustTargets(game);
@ -360,9 +362,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;
}