external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- playSpellAbilityForFree is not optional - removed the "may".

Browse Source
This commit is contained in:
Sloth
2013-03-04 21:29:19 +00:00
parent 7e40feff92
commit 52f5879435
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/cardfactory/CardFactory.java
View File

@@ -224,7 +224,7 @@ public class CardFactory {
} }
} }
controller.getController().mayPlaySpellAbilityForFree(copySA); controller.getController().playSpellAbilityForFree(copySA);
//c.addController(originalController); //c.addController(originalController);
} }

2
src/main/java/forge/game/player/PlayerController.java
View File

@@ -76,7 +76,7 @@ public abstract class PlayerController {
*/ */
public abstract void playFromSuspend(Card c); public abstract void playFromSuspend(Card c);
public abstract boolean playCascade(Card cascadedCard, Card sourceCard); public abstract boolean playCascade(Card cascadedCard, Card sourceCard);
public abstract void mayPlaySpellAbilityForFree(SpellAbility copySA); public abstract void playSpellAbilityForFree(SpellAbility copySA);
/** /**
* @return the player * @return the player
*/ */

7
src/main/java/forge/game/player/PlayerControllerAi.java
View File

@@ -138,13 +138,14 @@ public class PlayerControllerAi extends PlayerController {
* @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility) * @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility)
*/ */
@Override @Override
public void mayPlaySpellAbilityForFree(SpellAbility copySA) { public void playSpellAbilityForFree(SpellAbility copySA) {
if (copySA instanceof Spell) { if (copySA instanceof Spell) {
Spell spell = (Spell) copySA; Spell spell = (Spell) copySA;
if (spell.canPlayFromEffectAI(false, true)) { if (spell.canPlayFromEffectAI(true, true)) {
ComputerUtil.playStackFree(getPlayer(), copySA); ComputerUtil.playStackFree(getPlayer(), copySA);
} }
} else if (copySA.canPlayAI()) { } else {
copySA.canPlayAI();
ComputerUtil.playStackFree(getPlayer(), copySA); ComputerUtil.playStackFree(getPlayer(), copySA);
} }
} }

2
src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -113,7 +113,7 @@ public class PlayerControllerHuman extends PlayerController {
* @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility) * @see forge.game.player.PlayerController#mayPlaySpellAbilityForFree(forge.card.spellability.SpellAbility)
*/ */
@Override @Override
public void mayPlaySpellAbilityForFree(SpellAbility copySA) { public void playSpellAbilityForFree(SpellAbility copySA) {
game.getActionPlay().playSpellAbilityForFree(copySA); game.getActionPlay().playSpellAbilityForFree(copySA);
} }