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

* Improved mana source check. Fixed #1513.

Browse source
This commit is contained in:
LevelX2 2016-02-14 18:31:02 +01:00
parent 6726f48669
commit 74799d286b
19 changed files with 294 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -2336,8 +2336,8 @@ public abstract class PlayerImpl implements Player, Serializable {
}
// returns only mana producers that don't require mana payment
protected List<Permanent> getAvailableManaProducers(Game game) {
List<Permanent> result = new ArrayList<>();
protected List<MageObject> getAvailableManaProducers(Game game) {
List<MageObject> result = new ArrayList<>();
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
boolean canAdd = false;
for (ManaAbility ability : permanent.getAbilities().getManaAbilities(Zone.BATTLEFIELD)) {
@ -2353,6 +2353,21 @@ public abstract class PlayerImpl implements Player, Serializable {
result.add(permanent);
}
}
for (Card card : getHand().getCards(game)) {
boolean canAdd = false;
for (ManaAbility ability : card.getAbilities(game).getManaAbilities(Zone.HAND)) {
if (!ability.getManaCosts().isEmpty()) {
canAdd = false;
break;
}
if (ability.canActivate(playerId, game)) {
canAdd = true;
}
}
if (canAdd) {
result.add(card);
}
}
return result;
}