diff --git a/Mage/src/main/java/mage/game/permanent/Battlefield.java b/Mage/src/main/java/mage/game/permanent/Battlefield.java index c9df6b058c6..a4445c6c642 100644 --- a/Mage/src/main/java/mage/game/permanent/Battlefield.java +++ b/Mage/src/main/java/mage/game/permanent/Battlefield.java @@ -6,6 +6,7 @@ import mage.constants.CardType; import mage.constants.RangeOfInfluence; import mage.filter.FilterPermanent; import mage.game.Game; +import mage.players.Player; import java.io.Serializable; import java.util.*; @@ -297,7 +298,11 @@ public class Battlefield implements Serializable { .filter(perm -> perm.isPhasedIn() && filter.match(perm, sourceId, sourcePlayerId, game)) .collect(Collectors.toList()); } else { - Set range = game.getPlayer(sourcePlayerId).getInRange(); + Player player = game.getPlayer(sourcePlayerId); + if(player == null){ + return Collections.emptyList(); + } + Set range = player.getInRange(); return field.values() .stream() .filter(perm -> perm.isPhasedIn() && range.contains(perm.getControllerId())