diff --git a/src/main/java/forge/card/cardfactory/CardFactory.java b/src/main/java/forge/card/cardfactory/CardFactory.java index 6468bcf71d2..07749d13efb 100644 --- a/src/main/java/forge/card/cardfactory/CardFactory.java +++ b/src/main/java/forge/card/cardfactory/CardFactory.java @@ -224,7 +224,7 @@ public class CardFactory { } } - controller.getController().mayPlaySpellAbilityForFree(copySA); + controller.getController().playSpellAbilityForFree(copySA); //c.addController(originalController); } diff --git a/src/main/java/forge/game/player/PlayerController.java b/src/main/java/forge/game/player/PlayerController.java index ec4e3a61669..60fc5ab4808 100644 --- a/src/main/java/forge/game/player/PlayerController.java +++ b/src/main/java/forge/game/player/PlayerController.java @@ -76,7 +76,7 @@ public abstract class PlayerController { */ public abstract void playFromSuspend(Card c); public abstract boolean playCascade(Card cascadedCard, Card sourceCard); - public abstract void mayPlaySpellAbilityForFree(SpellAbility copySA); + public abstract void playSpellAbilityForFree(SpellAbility copySA); /** * @return the player */ diff --git a/src/main/java/forge/game/player/PlayerControllerAi.java b/src/main/java/forge/game/player/PlayerControllerAi.java index ef9bd250e0b..89b9daaf663 100644 --- a/src/main/java/forge/game/player/PlayerControllerAi.java +++ b/src/main/java/forge/game/player/PlayerControllerAi.java @@ -138,13 +138,14 @@ public class PlayerControllerAi extends PlayerController { * @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility) */ @Override - public void mayPlaySpellAbilityForFree(SpellAbility copySA) { + public void playSpellAbilityForFree(SpellAbility copySA) { if (copySA instanceof Spell) { Spell spell = (Spell) copySA; - if (spell.canPlayFromEffectAI(false, true)) { + if (spell.canPlayFromEffectAI(true, true)) { ComputerUtil.playStackFree(getPlayer(), copySA); } - } else if (copySA.canPlayAI()) { + } else { + copySA.canPlayAI(); ComputerUtil.playStackFree(getPlayer(), copySA); } } diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java index cd2787e786e..e749b87b238 100644 --- a/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -113,7 +113,7 @@ public class PlayerControllerHuman extends PlayerController { * @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility) */ @Override - public void mayPlaySpellAbilityForFree(SpellAbility copySA) { + public void playSpellAbilityForFree(SpellAbility copySA) { game.getActionPlay().playSpellAbilityForFree(copySA); }