From 4920f1acc9a58c5d6a0d3ecb736c09ac0542239c Mon Sep 17 00:00:00 2001 From: Sloth Date: Wed, 28 Sep 2011 12:42:22 +0000 Subject: [PATCH] - Fixed a possible NPE in changeHiddenOriginResolveAI. --- .../AbilityFactory_ChangeZone.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index 5e54e1ccc86..78f497ae450 100644 --- a/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -767,19 +767,19 @@ public final class AbilityFactory_ChangeZone { } List origin = Zone.listValueOf(params.get("Origin")); - - CardList fetchList = player.getCardsIn(origin); - fetchList = AbilityFactory.filterListByType(fetchList, params.get("ChangeType"), sa); - - Zone destination = Zone.smartValueOf(params.get("Destination")); - - PlayerZone destZone = player.getZone(destination); - + String type = params.get("ChangeType"); if (type == null) { type = "Card"; } + CardList fetchList = player.getCardsIn(origin); + fetchList = AbilityFactory.filterListByType(fetchList, type, sa); + + Zone destination = Zone.smartValueOf(params.get("Destination")); + + PlayerZone destZone = player.getZone(destination); + CardList fetched = new CardList(); int changeNum = params.containsKey("ChangeNum") ? AbilityFactory.calculateAmount(card, params.get("ChangeNum"), sa) : 1;