From 62239488c9ca364d3c087ed4510f95a67dc1ac4f Mon Sep 17 00:00:00 2001 From: swordshine Date: Sat, 22 Jun 2013 10:32:12 +0000 Subject: [PATCH] - revert changes in changezoneall effect, complicated situations here --- .../java/forge/card/ability/effects/ChangeZoneAllEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java index ba6e4153af3..46617b333ac 100644 --- a/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java +++ b/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java @@ -49,7 +49,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect { List tgtPlayers = getTargetPlayers(sa); final Game game = sa.getActivatingPlayer().getGame(); - if (!sa.usesTargeting() || sa.hasParam("UseAllOriginZones")) { + if ((tgtPlayers == null) || tgtPlayers.isEmpty() || sa.hasParam("UseAllOriginZones")) { cards = game.getCardsIn(origin); } else if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) { // Search library using changezoneall effect need a param "Search"