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

refactor: clean up some superfluous null filters in optionals

Browse source
This commit is contained in:
xenohedron 2024-11-29 02:34:43 -05:00
parent b1f914bbf4
commit faeca638de
15 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/cards/a/AirtightAlibi.java
View file

@ -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);

2
Mage.Sets/src/mage/cards/a/AssaultIntercessor.java
View file

@ -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);
}

1
Mage.Sets/src/mage/cards/b/BrassKnuckles.java
View file

@ -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))

1
Mage.Sets/src/mage/cards/c/ConquerorsFlail.java
View file

@ -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);
}

1
Mage.Sets/src/mage/cards/e/ElspethsTalent.java
View file

@ -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);

1
Mage.Sets/src/mage/cards/e/EmergentWoodwurm.java
View file

@ -69,7 +69,6 @@ enum EmergentWoodwurmPredicate implements ObjectSourcePlayerPredicate<Card> {
.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)

1
Mage.Sets/src/mage/cards/g/GuardianScalelord.java
View file

@ -77,7 +77,6 @@ enum GuardianScalelordPredicate implements ObjectSourcePlayerPredicate<Card> {
public boolean apply(ObjectSourcePlayer<Card> 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)

3
Mage.Sets/src/mage/cards/n/NarsetEnlightenedExile.java
View file

@ -78,10 +78,9 @@ enum NarsetEnlightenedExilePredicate implements ObjectSourcePlayerPredicate<Card
public boolean apply(ObjectSourcePlayer<Card> 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);
}
}
}

2
Mage.Sets/src/mage/cards/p/PainDistributor.java
View file

@ -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);
}

1
Mage.Sets/src/mage/cards/q/QuintoriusLoremaster.java
View file

@ -110,7 +110,6 @@ enum QuintoriusLoremasterPredicate implements ObjectSourcePlayerPredicate<Card>
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);
}

1
Mage.Sets/src/mage/cards/r/RangersOfIthilien.java
View file

@ -70,7 +70,6 @@ enum RangersOfIthilienPredicate implements ObjectSourcePlayerPredicate<Permanent
public boolean apply(ObjectSourcePlayer<Permanent> 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())

2
Mage.Sets/src/mage/cards/r/Ringwraiths.java
View file

@ -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);
}

2
Mage.Sets/src/mage/cards/s/SurgeEngine.java
View file

@ -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);

1
Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java
View file

@ -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);
}

1
Mage.Sets/src/mage/cards/w/WarTrainedSlasher.java
View file

@ -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);
}