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

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

View file

@ -54,7 +54,7 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
return filter.match(permanent, game);
}
Player player = game.getPlayer(objectId);
return player != null && filter.match(player, game);
return filter.match(player, game);
}
@Override
@ -83,7 +83,7 @@ public abstract class TargetPermanentOrPlayerAmount extends TargetAmount {
if (permanent != null) {
return filter.match(permanent, game);
}
return player != null && filter.match(player, game);
return filter.match(player, game);
}
@Override