From 30ea2188bfa4501b23bfe987ab914e1a9ba3c82e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sun, 24 Aug 2014 06:56:47 +0200 Subject: [PATCH] * Restric activated abilities - Fixed a bug that restriction effects that prevented permanents from using activated abilities were not applied to activated mana abilities used tp pay mana costs (e.g. Linvala, Keeper of Silence). --- Mage/src/mage/players/PlayerImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index 3bed23eb417..ddf7432c752 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -1049,9 +1049,11 @@ public abstract class PlayerImpl implements Player, Serializable { protected LinkedHashMap getUseableManaAbilities(MageObject object, Zone zone, Game game) { LinkedHashMap useable = new LinkedHashMap<>(); - for (ManaAbility ability: object.getAbilities().getManaAbilities(zone)) { - if (ability.canActivate(playerId, game)) { - useable.put(ability.getId(), ability); + if (!(object instanceof Permanent) || ((Permanent)object).canUseActivatedAbilities(game)) { + for (ManaAbility ability: object.getAbilities().getManaAbilities(zone)) { + if (ability.canActivate(playerId, game)) { + useable.put(ability.getId(), ability); + } } } return useable;