From 085870de1f9fee84bbfcf59298a020d4cfb78c32 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Tue, 23 Jun 2015 22:10:02 +0200 Subject: [PATCH] Minor code optimization. --- Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java b/Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java index 4ae362d68d6..e1edcb283c4 100644 --- a/Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java +++ b/Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java @@ -85,13 +85,10 @@ class TeferisMoatRestrictionEffect extends RestrictionEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { ObjectColor chosenColor = (ObjectColor) game.getState().getValue(source.getSourceId() + "_color"); - if (chosenColor == null) - return false; - boolean creature = permanent.getCardType().contains(CardType.CREATURE); - boolean flying = permanent.getAbilities().contains(FlyingAbility.getInstance()); - boolean sharesColor = permanent.getColor(game).shares(chosenColor); - - return creature && !flying && sharesColor; + return chosenColor != null && + !permanent.getAbilities().contains(FlyingAbility.getInstance()) && + permanent.getColor(game).shares(chosenColor) && + permanent.getCardType().contains(CardType.CREATURE); } @Override