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

* Fixed missing check for restricting effects of activated abilities of permanents (fixes #6657). I guess that got lost by refactoring get playable abilities.

Browse source
This commit is contained in:
LevelX2 2020-06-18 22:59:42 +02:00
parent 3beaec4525
commit c41fc0284d
4 changed files with 67 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3365,11 +3365,14 @@ public abstract class PlayerImpl implements Player, Serializable {
// activated abilities from battlefield objects
if (fromAll || fromZone == Zone.BATTLEFIELD) {
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
boolean canUseActivated = permanent.canUseActivatedAbilities(game);
List<ActivatedAbility> battlePlayable = new ArrayList<>();
getPlayableFromCardAll(game, Zone.BATTLEFIELD, permanent, availableMana, battlePlayable);
for (ActivatedAbility ability : battlePlayable) {
activatedUnique.putIfAbsent(ability.toString(), ability);
activatedAll.add(ability);
if (ability instanceof SpecialAction || canUseActivated) {
activatedUnique.putIfAbsent(ability.toString(), ability);
activatedAll.add(ability);
}
}
}
}
@ -4272,7 +4275,7 @@ public abstract class PlayerImpl implements Player, Serializable {
cards.addAll(getLibrary().getTopCards(game, value));
if (!cards.isEmpty()) {
TargetCard target = new TargetCard(0, cards.size(), Zone.LIBRARY,
new FilterCard("card" + (cards.size() == 1 ? "":"s")
new FilterCard("card" + (cards.size() == 1 ? "" : "s")
+ " to PUT on the BOTTOM of your library (Scry)"));
chooseTarget(Outcome.Benefit, cards, target, source, game);
putCardsOnBottomOfLibrary(new CardsImpl(target.getTargets()), game, source, true);