Sonar cleanups 03032019

This commit is contained in:
Ingmar Goudt 2019-03-04 10:43:20 +01:00
parent f46f321635
commit 45f665eb1d
13 changed files with 37 additions and 41 deletions

View file

@ -2,8 +2,11 @@
package mage.cards.b;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
@ -65,13 +68,10 @@ class BaneOfBalaGedEffect extends OneShotEffect {
if (defendingPlayer != null) {
Target target = new TargetControlledPermanent(2);
defendingPlayer.chooseTarget(outcome, target, source, game);
Set<Card> toExile = new HashSet<>();
target.getTargets().stream().map((targetId)
-> game.getPermanent(targetId)).filter((permanent)
-> (permanent != null)).forEach((permanent)
-> {
toExile.add(permanent);
});
Set<Card> toExile = target.getTargets().stream()
.map(game::getPermanent)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
defendingPlayer.moveCards(toExile, Zone.EXILED, source, game);
return true;
}

View file

@ -1,5 +1,6 @@
package mage.cards.c;
import java.util.Objects;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
@ -61,12 +62,11 @@ class CentaurMediatorEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
game.getState().getPlayersInRange(
source.getControllerId(), game
).stream().map((playerId) -> game.getPlayer(playerId)).filter(
(player) -> (player != null)
).forEachOrdered((player) -> {
player.gainLife(4, game, source);
});
source.getControllerId(), game)
.stream()
.map(game::getPlayer)
.filter(Objects::nonNull)
.forEachOrdered(player -> player.gainLife(4, game, source));
return true;
}

View file

@ -72,7 +72,7 @@ class KavuPredatorTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
this.getEffects().get(0).setValue("gainedLife", new Integer(event.getAmount()));
this.getEffects().get(0).setValue("gainedLife", event.getAmount());
return true;
}
return false;