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

Ability refactor: new code to search abilities in cards and permanents;

Browse source
This commit is contained in:
Oleg Agafonov 2020-05-28 22:34:27 +04:00
parent 978118148b
commit 8af43dc13a
31 changed files with 85 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -285,7 +285,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
/**
* Gets all current abilities - includes additional abilities added by other
* cards or effects
* cards or effects. Warning, you can't modify that list.
*
* @param game
* @return A list of {@link Ability} - this collection is not modifiable
@ -295,15 +295,23 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
if (game == null) {
return abilities; // deck editor with empty game
}
CardState cardState = game.getState().getCardState(this.getId());
if (!cardState.hasLostAllAbilities() && (cardState.getAbilities() == null || cardState.getAbilities().isEmpty())) {
if (cardState == null) {
return abilities;
}
// collects all abilities
Abilities<Ability> all = new AbilitiesImpl<>();
// basic
if (!cardState.hasLostAllAbilities()) {
all.addAll(abilities);
}
// dynamic
all.addAll(cardState.getAbilities());
return all;
}
@ -314,6 +322,12 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
cardState.getAbilities().clear();
}
@Override
public boolean hasAbility(Ability ability, Game game) {
// getAbilities(game) searches all abilities from base and dynamic lists (other)
return this.getAbilities(game).contains(ability);
}
/**
* Public in order to support adding abilities to SplitCardHalf's
*