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

- Fixed casting a non-instant spell from a Play Effect not working for the human player.

Browse Source
This commit is contained in:
Agetian
2017-06-21 13:07:58 +00:00
parent c9fef205e4
commit 8f2aa095ce
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -63,6 +63,10 @@ public class HumanPlay {
* a {@link forge.game.spellability.SpellAbility} object. * a {@link forge.game.spellability.SpellAbility} object.
*/ */
public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa) { public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa) {
return playSpellAbility(controller, p, sa, false);
}
public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa, boolean fromPlayEffect) {
FThreads.assertExecutedByEdt(false); FThreads.assertExecutedByEdt(false);
if (sa == controller.getGame().PLAY_LAND_SURROGATE) { if (sa == controller.getGame().PLAY_LAND_SURROGATE) {
@@ -82,8 +86,8 @@ public class HumanPlay {
return false; return false;
} }
// extra play check // extra play check (unless the card is cast from a play effect)
if (!sa.canPlay()) { if (!(fromPlayEffect || sa.canPlay())) {
return false; return false;
} }

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1506,7 +1506,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override @Override
public boolean playSaFromPlayEffect(final SpellAbility tgtSA) { public boolean playSaFromPlayEffect(final SpellAbility tgtSA) {
return HumanPlay.playSpellAbility(this, player, tgtSA); return HumanPlay.playSpellAbility(this, player, tgtSA, true);
} }
@Override @Override