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

HumanPlay.playSpellAbility now returns boolean if the spell was cast successful. (and returns false on rollback)

Browse Source
This commit is contained in:
Hanmac
2016-07-19 06:28:19 +00:00
parent 7661e44e2b
commit 49c8b987e5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,12 +81,12 @@ public class HumanPlay {
* @param sa * @param sa
* a {@link forge.game.spellability.SpellAbility} object. * a {@link forge.game.spellability.SpellAbility} object.
*/ */
public final static void playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa) { public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa) {
FThreads.assertExecutedByEdt(false); FThreads.assertExecutedByEdt(false);
if (sa == controller.getGame().PLAY_LAND_SURROGATE) { if (sa == controller.getGame().PLAY_LAND_SURROGATE) {
p.playLand(sa.getHostCard(), false); p.playLand(sa.getHostCard(), false);
return; return false;
} }
boolean castFaceDown = sa instanceof Spell && ((Spell)sa).isCastFaceDown(); boolean castFaceDown = sa instanceof Spell && ((Spell)sa).isCastFaceDown();
@@ -98,7 +98,7 @@ public class HumanPlay {
source.setSplitStateToPlayAbility(sa); source.setSplitStateToPlayAbility(sa);
sa = chooseOptionalAdditionalCosts(p, sa); sa = chooseOptionalAdditionalCosts(p, sa);
if (sa == null) { if (sa == null) {
return; return false;
} }
if (flippedToCast && !castFaceDown) { if (flippedToCast && !castFaceDown) {
@@ -133,6 +133,7 @@ public class HumanPlay {
if (flippedToCast && !castFaceDown) { if (flippedToCast && !castFaceDown) {
source.turnFaceDown(true); source.turnFaceDown(true);
} }
return false;
} }
} else if (payManaCostIfNeeded(controller, p, sa)) { } else if (payManaCostIfNeeded(controller, p, sa)) {
if (sa.isSpell() && !source.isCopiedSpell()) { if (sa.isSpell() && !source.isCopiedSpell()) {
@@ -145,7 +146,9 @@ public class HumanPlay {
if (flippedToCast && !castFaceDown) { if (flippedToCast && !castFaceDown) {
source.turnFaceDown(true); source.turnFaceDown(true);
} }
return false;
} }
return true;
} }
/** /**

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

@@ -1268,8 +1268,7 @@ public class PlayerControllerHuman
@Override @Override
public boolean playSaFromPlayEffect(final SpellAbility tgtSA) { public boolean playSaFromPlayEffect(final SpellAbility tgtSA) {
HumanPlay.playSpellAbility(this, player, tgtSA); return HumanPlay.playSpellAbility(this, player, tgtSA);
return true;
} }
@Override @Override