From 254ed6a94e26250bb8afe06c6c0d3cc076c7b923 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 28 Mar 2022 18:58:04 -0400 Subject: [PATCH] [MIC] fixed Prowling Geistcatcher error when no cards are exiled (fixes #8797) --- Mage.Sets/src/mage/cards/p/ProwlingGeistcatcher.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/p/ProwlingGeistcatcher.java b/Mage.Sets/src/mage/cards/p/ProwlingGeistcatcher.java index 43359ed16d8..ca32e5d05a5 100644 --- a/Mage.Sets/src/mage/cards/p/ProwlingGeistcatcher.java +++ b/Mage.Sets/src/mage/cards/p/ProwlingGeistcatcher.java @@ -14,6 +14,7 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.counters.CounterType; import mage.filter.StaticFilters; +import mage.game.ExileZone; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; @@ -110,11 +111,8 @@ class ProwlingGeistcatcherReturnEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(source.getControllerId()); - if (player == null) { - return false; - } - return player.moveCards(game.getExile().getExileZone( - CardUtil.getExileZoneId(game, source) - ), Zone.BATTLEFIELD, source, game); + ExileZone exileZone = game.getExile().getExileZone(CardUtil.getExileZoneId(game, source)); + return player != null && exileZone != null && !exileZone.isEmpty() + && player.moveCards(exileZone, Zone.BATTLEFIELD, source, game); } }