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

- reverted some changes because r22822 fixes most of the cases

Browse Source
This commit is contained in:
swordshine
2013-08-07 12:13:32 +00:00
parent b568fdd47b
commit 654f64b604
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,7 +407,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
boolean optional = sa.hasParam("Optional");
for (Card tgtC : tgtCards) {
for (final Card tgtC : tgtCards) {
if (tgt != null && tgtC.isInPlay() && !tgtC.canBeTargetedBy(sa)) {
continue;
}
@@ -419,7 +419,6 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
if (optional && false == player.getController().confirmAction(sa, null, prompt) )
continue;
tgtC = game.getCardState(tgtC);
final Zone originZone = game.getZoneOf(tgtC);
// if Target isn't in the expected Zone, continue

2
src/main/java/forge/card/ability/effects/SacrificeEffect.java
View File

@@ -22,7 +22,7 @@ public class SacrificeEffect extends SpellAbilityEffect {
public void resolve(SpellAbility sa) {
final Player activator = sa.getActivatingPlayer();
final Game game = activator.getGame();
final Card card = game.getCardState(sa.getSourceCard());
final Card card = sa.getSourceCard();
// Expand Sacrifice keyword here depending on what we need out of it.
final String num = sa.hasParam("Amount") ? sa.getParam("Amount") : "1";