External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

nullpointer fix, resolves issue #5602

Browse source
This commit is contained in:
Ingmar Goudt 2019-02-24 08:06:27 +01:00
parent 7ac41300bf
commit 59f8c94af7
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/game/permanent/Battlefield.java
View file

@ -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<UUID> range = game.getPlayer(sourcePlayerId).getInRange();
Player player = game.getPlayer(sourcePlayerId);
if(player == null){
return Collections.emptyList();
}
Set<UUID> range = player.getInRange();
return field.values()
.stream()
.filter(perm -> perm.isPhasedIn() && range.contains(perm.getControllerId())