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

2
Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java
View file

@ -60,7 +60,7 @@ class VenserTheSojournerSpellCastTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getPlayerId().equals(this.getControllerId())) {
Spell spell = game.getStack().getSpell(event.getTargetId());
return spell != null && StaticFilters.FILTER_SPELL_A.match(spell, game);
return StaticFilters.FILTER_SPELL_A.match(spell, game);
}
return false;
}

2
Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java
View file

@ -99,7 +99,7 @@ class EdgeOfMalacolEffect extends ContinuousRuleModifyingEffectImpl {
return false;
}
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && filter.match(permanent, game) && Objects.equals(permanent.getControllerId(), game.getActivePlayerId())) {
if (filter.match(permanent, game) && Objects.equals(permanent.getControllerId(), game.getActivePlayerId())) {
UUID oldController = source.getControllerId();
source.setControllerId(game.getActivePlayerId());
Effect effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance(2));

2
Mage/src/main/java/mage/game/command/planes/FeedingGroundsPlane.java
View file

@ -138,7 +138,7 @@ class FeedingGroundsEffect extends CostModificationEffectImpl {
} else {
// used at least for flashback ability because Flashback ability doesn't use stack
Card sourceCard = game.getCard(abilityToModify.getSourceId());
return sourceCard != null && filter.match(sourceCard, game) && selectedByRuntimeData(sourceCard, source, game);
return filter.match(sourceCard, game) && selectedByRuntimeData(sourceCard, source, game);
}
}
return false;