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

- Fixed Venser, Shaper Savant not countering spells.

Browse Source
This commit is contained in:
Sloth
2015-09-20 08:10:46 +00:00
parent a9325bcff8
commit b7aaba3e29
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
sb.append(" "); sb.append(" ");
final ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination")); final ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
final ZoneType origin = ZoneType.smartValueOf(sa.getParam("Origin")); final ZoneType origin = ZoneType.listValueOf(sa.getParam("Origin")).get(0);
final StringBuilder sbTargets = new StringBuilder(); final StringBuilder sbTargets = new StringBuilder();
@@ -531,7 +531,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (sa.hasParam("Fizzle")) { if (sa.hasParam("Fizzle")) {
final FCollectionView<SpellAbility> spells = tgtC.getSpellAbilities(); final FCollectionView<SpellAbility> spells = tgtC.getSpellAbilities();
for (SpellAbility spell : spells) { for (SpellAbility spell : spells) {
if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand)) { if (tgtC.isInZone(ZoneType.Exile) || tgtC.isInZone(ZoneType.Hand) || tgtC.isInZone(ZoneType.Stack)) {
final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spell); final SpellAbilityStackInstance si = game.getStack().getInstanceFromSpellAbility(spell);
if (si != null) { if (si != null) {
game.getStack().remove(si); game.getStack().remove(si);

3
forge-gui/res/cardsfolder/d/deep_slumber_titan.txt
View File

@@ -5,6 +5,7 @@ PT:7/7
K:CARDNAME enters the battlefield tapped. K:CARDNAME enters the battlefield tapped.
K:CARDNAME doesn't untap during your untap step. K:CARDNAME doesn't untap during your untap step.
T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it. T:Mode$ DamageDone | ValidTarget$ Card.Self | Execute$ TrigUntap | TriggerDescription$ Whenever CARDNAME is dealt damage, untap it.
SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self SVar:TrigUntap:AB$ Untap | Cost$ 0 | Defined$ Self
SVar:RemRandomDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/deep_slumber_titan.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/deep_slumber_titan.jpg
Oracle:Deep-Slumber Titan enters the battlefield tapped.\nDeep-Slumber Titan doesn't untap during your untap step.\nWhenever Deep-Slumber Titan is dealt damage, untap it. Oracle:Deep-Slumber Titan enters the battlefield tapped.\nDeep-Slumber Titan doesn't untap during your untap step.\nWhenever Deep-Slumber Titan is dealt damage, untap it.