External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 05:09:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fixed that the AI used activated abilities even if they were forbidden by a restriction effect like Arrest.

Browse source
This commit is contained in:
LevelX2 2015-05-23 17:43:27 +02:00
parent e1a8e41702
commit 7003dc7e3f
3 changed files with 72 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage/src/mage/players/PlayerImpl.java
View file

@ -2442,11 +2442,10 @@ public abstract class PlayerImpl implements Player, Serializable {
// eliminate duplicate activated abilities
Map<String, Ability> playableActivated = new HashMap<>();
for (Permanent permanent : game.getBattlefield().getAllActivePermanents(playerId)) {
for (ActivatedAbility ability : permanent.getAbilities().getActivatedAbilities(Zone.BATTLEFIELD)) {
LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getUseableActivatedAbilities(permanent, Zone.BATTLEFIELD, game);
for (ActivatedAbility ability : useableAbilities.values()) {
if (!playableActivated.containsKey(ability.toString())) {
if (canPlay(ability, availableMana, permanent, game)) {
playableActivated.put(ability.toString(), ability);
}
playableActivated.put(ability.toString(), ability);
}
}
}
@ -2853,13 +2852,13 @@ public abstract class PlayerImpl implements Player, Serializable {
case EXILED:
boolean result = false;
for(Card card: cards) {
result |= moveCardToExileWithInfo(card, null, "", source == null ? null : source.getSourceId(), game, true);
result |= moveCardToExileWithInfo(card, null, "", source == null ? null : source.getSourceId(), game, fromZone, true);
}
return result;
case GRAVEYARD:
return moveCardsToGraveyardWithInfo(cards, source, game, fromZone);
case HAND:
boolean result = false;
result = false;
for(Card card: cards) {
result |= moveCardToHandWithInfo(card, source == null ? null : source.getSourceId(), game, fromZone);
}