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 Failure // Comply returning to hand together with the targeted spell on stack.

Browse Source
This commit is contained in:
Agetian
2017-04-21 13:41:00 +00:00
parent 9b2adf7686
commit e46c9b6aff
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
View File

@@ -365,7 +365,8 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
* a {@link forge.game.spellability.SpellAbility} object. * a {@link forge.game.spellability.SpellAbility} object.
*/ */
private void changeKnownOriginResolve(final SpellAbility sa) { private void changeKnownOriginResolve(final SpellAbility sa) {
Iterable<Card> tgtCards = getTargetCards(sa); final boolean onlySpells = sa.hasParam("OnlySpells");
Iterable<Card> tgtCards = !onlySpells ? getTargetCards(sa) : new CardCollection();
final TargetRestrictions tgt = sa.getTargetRestrictions(); final TargetRestrictions tgt = sa.getTargetRestrictions();
final Player player = sa.getActivatingPlayer(); final Player player = sa.getActivatingPlayer();
final Card hostCard = sa.getHostCard(); final Card hostCard = sa.getHostCard();

2
forge-gui/res/cardsfolder/upcoming/failure_comply.txt
View File

@@ -2,7 +2,7 @@ Name:Failure
ManaCost:1 U ManaCost:1 U
AlternateMode: Split AlternateMode: Split
Types:Instant Types:Instant
A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Card | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Destination$ Hand | SpellDescription$ Return target spell to its owner's hand. A:SP$ ChangeZone | Cost$ 1 U | ValidTgts$ Card | OnlySpells$ True | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Destination$ Hand | SpellDescription$ Return target spell to its owner's hand.
SVar:Picture:http://www.wizards.com/global/images/magic/general/failure_comply.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/failure_comply.jpg
Oracle:Return target spell to its owner's hand. Oracle:Return target spell to its owner's hand.