diff --git a/Mage.Sets/src/mage/cards/a/AirtightAlibi.java b/Mage.Sets/src/mage/cards/a/AirtightAlibi.java index b534379c2fc..a6621508eb8 100644 --- a/Mage.Sets/src/mage/cards/a/AirtightAlibi.java +++ b/Mage.Sets/src/mage/cards/a/AirtightAlibi.java @@ -125,7 +125,6 @@ class AirtightAlibiReplacementEffect extends ReplacementEffectImpl { public boolean applies(GameEvent event, Ability source, Game game) { return Optional .ofNullable(source.getSourcePermanentIfItStillExists(game)) - .filter(Objects::nonNull) .map(Permanent::getAttachedTo) .map(event.getTargetId()::equals) .orElse(false); diff --git a/Mage.Sets/src/mage/cards/a/AssaultIntercessor.java b/Mage.Sets/src/mage/cards/a/AssaultIntercessor.java index 8a12da72ce2..245cec70910 100644 --- a/Mage.Sets/src/mage/cards/a/AssaultIntercessor.java +++ b/Mage.Sets/src/mage/cards/a/AssaultIntercessor.java @@ -76,11 +76,9 @@ class AssaultIntercessorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { return Optional .ofNullable(getValue("creatureDied")) - .filter(Objects::nonNull) .map(Permanent.class::cast) .map(Controllable::getControllerId) .map(game::getPlayer) - .filter(Objects::nonNull) .map(player -> player.loseLife(2, game, source, false) > 0) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/b/BrassKnuckles.java b/Mage.Sets/src/mage/cards/b/BrassKnuckles.java index cc5a5b226b0..830e18e7cf1 100644 --- a/Mage.Sets/src/mage/cards/b/BrassKnuckles.java +++ b/Mage.Sets/src/mage/cards/b/BrassKnuckles.java @@ -67,7 +67,6 @@ enum BrassKnucklesCondition implements Condition { .ofNullable(source.getSourcePermanentIfItStillExists(game)) .map(Permanent::getAttachedTo) .map(game::getPermanent) - .filter(Objects::nonNull) .map(Permanent::getAttachments) .map(Collection::stream) .map(stream -> stream.map(game::getPermanent)) diff --git a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java index 280501b12d1..32539d56033 100644 --- a/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java +++ b/Mage.Sets/src/mage/cards/c/ConquerorsFlail.java @@ -114,7 +114,6 @@ class ConquerorsFlailEffect extends ContinuousRuleModifyingEffectImpl { .ofNullable(source.getSourcePermanentIfItStillExists(game)) .map(Permanent::getAttachedTo) .map(game::getPermanent) - .filter(Objects::nonNull) .map(permanent -> permanent.isCreature(game)) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/e/ElspethsTalent.java b/Mage.Sets/src/mage/cards/e/ElspethsTalent.java index 0bf855505d6..04f1c3a2123 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethsTalent.java +++ b/Mage.Sets/src/mage/cards/e/ElspethsTalent.java @@ -90,7 +90,6 @@ class ElspethsTalentTriggeredAbility extends TriggeredAbilityImpl { && event.getSourceId().equals(permanent.getAttachedTo()) && isControlledBy(event.getPlayerId()) && Optional.ofNullable(game.getStack().getStackObject(event.getSourceId())) - .filter(Objects::nonNull) .map(StackObject::getStackAbility) .map(LoyaltyAbility.class::isInstance) .orElse(false); diff --git a/Mage.Sets/src/mage/cards/e/EmergentWoodwurm.java b/Mage.Sets/src/mage/cards/e/EmergentWoodwurm.java index fb1b81d6d81..d9472c83b64 100644 --- a/Mage.Sets/src/mage/cards/e/EmergentWoodwurm.java +++ b/Mage.Sets/src/mage/cards/e/EmergentWoodwurm.java @@ -69,7 +69,6 @@ enum EmergentWoodwurmPredicate implements ObjectSourcePlayerPredicate { .of(input) .map(ObjectSourcePlayer::getSource) .map(ability -> ability.getSourcePermanentOrLKI(game)) - .filter(Objects::nonNull) .map(MageObject::getPower) .map(MageInt::getValue) .map(i -> input.getObject().getManaValue() <= i) diff --git a/Mage.Sets/src/mage/cards/g/GuardianScalelord.java b/Mage.Sets/src/mage/cards/g/GuardianScalelord.java index af29bf49010..17454291a1b 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianScalelord.java +++ b/Mage.Sets/src/mage/cards/g/GuardianScalelord.java @@ -77,7 +77,6 @@ enum GuardianScalelordPredicate implements ObjectSourcePlayerPredicate { public boolean apply(ObjectSourcePlayer input, Game game) { return Optional .ofNullable(input.getSource().getSourcePermanentOrLKI(game)) - .filter(Objects::nonNull) .map(MageObject::getPower) .map(MageInt::getValue) .map(p -> input.getObject().getManaValue() <= p) diff --git a/Mage.Sets/src/mage/cards/n/NarsetEnlightenedExile.java b/Mage.Sets/src/mage/cards/n/NarsetEnlightenedExile.java index c9f1c13b644..bee904dc0dc 100644 --- a/Mage.Sets/src/mage/cards/n/NarsetEnlightenedExile.java +++ b/Mage.Sets/src/mage/cards/n/NarsetEnlightenedExile.java @@ -78,10 +78,9 @@ enum NarsetEnlightenedExilePredicate implements ObjectSourcePlayerPredicate input, Game game) { return Optional .ofNullable(input.getSource().getSourcePermanentOrLKI(game)) - .filter(Objects::nonNull) .map(MageObject::getPower) .map(MageInt::getValue) .map(p -> input.getObject().getManaValue() < p) .orElse(false); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/p/PainDistributor.java b/Mage.Sets/src/mage/cards/p/PainDistributor.java index cb50f2654e1..85595a0f134 100644 --- a/Mage.Sets/src/mage/cards/p/PainDistributor.java +++ b/Mage.Sets/src/mage/cards/p/PainDistributor.java @@ -103,11 +103,9 @@ class PainDistributorEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { return Optional .ofNullable(getValue("permanentDied")) - .filter(Objects::nonNull) .map(Permanent.class::cast) .map(Controllable::getControllerId) .map(game::getPlayer) - .filter(Objects::nonNull) .map(player -> player.damage(1, source, game) > 0) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java b/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java index ca664488b90..d4c3db7f3f2 100644 --- a/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java +++ b/Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java @@ -110,7 +110,6 @@ enum QuintoriusLoremasterPredicate implements ObjectSourcePlayerPredicate UUID exileZoneId = CardUtil.getExileZoneId(game, quintorius.getId(), quintorius.getZoneChangeCounter(game)); return exile.getExileZone(exileZoneId); }) - .filter(Objects::nonNull) .map(exile -> exile.contains(input.getObject().getId())) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/r/RangersOfIthilien.java b/Mage.Sets/src/mage/cards/r/RangersOfIthilien.java index bbce9a324ff..e0ef3234804 100644 --- a/Mage.Sets/src/mage/cards/r/RangersOfIthilien.java +++ b/Mage.Sets/src/mage/cards/r/RangersOfIthilien.java @@ -70,7 +70,6 @@ enum RangersOfIthilienPredicate implements ObjectSourcePlayerPredicate input, Game game) { return Optional .ofNullable(input.getSource().getSourcePermanentIfItStillExists(game)) - .filter(Objects::nonNull) .map(MageObject::getPower) .map(MageInt::getValue) .map(i -> i > input.getObject().getPower().getValue()) diff --git a/Mage.Sets/src/mage/cards/r/Ringwraiths.java b/Mage.Sets/src/mage/cards/r/Ringwraiths.java index 0919b94bb08..10dbec9e613 100644 --- a/Mage.Sets/src/mage/cards/r/Ringwraiths.java +++ b/Mage.Sets/src/mage/cards/r/Ringwraiths.java @@ -77,11 +77,9 @@ class RingwraithsEffect extends OneShotEffect { return Optional .ofNullable(getTargetPointer().getFirst(game, source)) .map(game::getPermanent) - .filter(Objects::nonNull) .filter(permanent -> permanent.isLegendary(game)) .map(Controllable::getControllerId) .map(game::getPlayer) - .filter(Objects::nonNull) .map(player -> player.loseLife(3, game, source, false) > 0) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/s/SurgeEngine.java b/Mage.Sets/src/mage/cards/s/SurgeEngine.java index a230a0b0b65..0e525fa1cf4 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeEngine.java +++ b/Mage.Sets/src/mage/cards/s/SurgeEngine.java @@ -79,7 +79,6 @@ enum SurgeEngineCondition implements Condition { public boolean apply(Game game, Ability source) { return Optional .ofNullable(source.getSourcePermanentIfItStillExists(game)) - .filter(Objects::nonNull) .map(permanent -> !permanent.hasAbility(DefenderAbility.getInstance(), game)) .orElse(false); } @@ -94,7 +93,6 @@ class SurgeEngineAbility extends ActivatedAbilityImpl { private static final Condition staticCondition = (game, source) -> Optional .ofNullable(source.getSourcePermanentIfItStillExists(game)) - .filter(Objects::nonNull) .map(permanent -> permanent.getColor(game)) .map(ObjectColor::isBlue) .orElse(false); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java b/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java index bdfb2ce261b..ef963b2b662 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java @@ -74,7 +74,6 @@ class ThrashingFrontlinerTriggeredAbility extends TriggeredAbilityImpl { .ofNullable(this.getSourceId()) .map(game.getCombat()::getDefenderId) .map(game::getPermanent) - .filter(Objects::nonNull) .map(permanent -> permanent.isBattle(game)) .orElse(false); } diff --git a/Mage.Sets/src/mage/cards/w/WarTrainedSlasher.java b/Mage.Sets/src/mage/cards/w/WarTrainedSlasher.java index 6f2e4e1aee4..b77283e273e 100644 --- a/Mage.Sets/src/mage/cards/w/WarTrainedSlasher.java +++ b/Mage.Sets/src/mage/cards/w/WarTrainedSlasher.java @@ -73,7 +73,6 @@ class WarTrainedSlasherTriggeredAbility extends TriggeredAbilityImpl { .ofNullable(this.getSourceId()) .map(game.getCombat()::getDefenderId) .map(game::getPermanent) - .filter(Objects::nonNull) .map(permanent -> permanent.isBattle(game)) .orElse(false); }