From 3d9d6d45fe46034ed0d09a156cec7112a092f0c5 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Sun, 28 Mar 2021 09:05:31 +0200
Subject: [PATCH] Fix NPE when targeting different players hidden zone

---
 .../main/java/forge/game/ability/effects/ChangeZoneEffect.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
index 1831a0927c7..31140d7ed5b 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java
@@ -1179,7 +1179,7 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
             }
         }
 
-        for (Player player : fetchers) {
+        for (Player player : HiddenOriginChoicesMap.keySet()) {
             boolean searchedLibrary = HiddenOriginChoicesMap.get(player).searchedLibrary;
             boolean shuffleMandatory = HiddenOriginChoicesMap.get(player).shuffleMandatory;
             CardCollection chosenCards = HiddenOriginChoicesMap.get(player).chosenCards;