Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

remove explicit null checks, match(..) checks on null itself by instanceof calls

Browse source
This commit is contained in:
Ingmar Goudt 2021-04-28 20:53:42 +02:00
parent b4d806211c
commit 96d026e4af
77 changed files with 97 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/target/common/TargetPermanentOrPlayer.java
View file

@ -64,7 +64,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
return filter.match(permanent, game);
}
Player player = game.getPlayer(id);
return player != null && filter.match(player, game);
return filter.match(player, game);
}
@Override
@ -102,7 +102,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
if (permanent != null) {
return filter.match(permanent, game);
}
return player != null && filter.match(player, game);
return filter.match(player, game);
}
/**
@ -196,7 +196,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
Set<UUID> possibleTargets = new HashSet<>();
for (UUID playerId : game.getState().getPlayersInRange(sourceControllerId, game)) {
Player player = game.getPlayer(playerId);
if (player != null && filter.match(player, game)) {
if (filter.match(player, game)) {
possibleTargets.add(playerId);
}
}