Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

forge-ai/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>1.6.28-SNAPSHOT</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
 
     <artifactId>forge-ai</artifactId>

forge-ai/src/main/java/forge/ai/AIOption.java

@@ -1,5 +1,5 @@
 package forge.ai;
 
 public enum AIOption {
-    USE_SIMULATION;
+    USE_SIMULATION
 }

forge-ai/src/main/java/forge/ai/AiAttackController.java

@@ -1021,7 +1021,7 @@ public class AiAttackController {
         } // stay at home to block
 
         if ( LOG_AI_ATTACKS )
-            System.out.println(String.valueOf(this.aiAggression) + " = ai aggression");
+            System.out.println(this.aiAggression + " = ai aggression");
 
         // ****************
         // Evaluation the end
@@ -1457,7 +1457,7 @@ public class AiAttackController {
         if (artifact != null) {
             return artifact;
         }
-        return null;    //should never get here
+        return null;//should never get here
     }
 
     private void doLightmineFieldAttackLogic(List<Card> attackersLeft, int numForcedAttackers, boolean playAggro) {

forge-ai/src/main/java/forge/ai/AiBlockController.java

@@ -859,7 +859,7 @@ public class AiBlockController {
                                 damageToPW += ComputerUtilCombat.predictDamageTo((Card) def, pwatkr.getNetCombatDamage(), pwatkr, true);
                             }
                         }
-                        if ((!onlyIfLethal && damageToPW > 0) || damageToPW >= ((Card) def).getCounters(CounterType.LOYALTY)) {
+                        if ((!onlyIfLethal && damageToPW > 0) || damageToPW >= def.getCounters(CounterType.LOYALTY)) {
                             threatenedPWs.add((Card) def);
                         }
                     }
@@ -879,7 +879,7 @@ public class AiBlockController {
             if (!chumpPWDefenders.isEmpty()) {
                 for (final Card attacker : attackers) {
                     GameEntity def = combat.getDefenderByAttacker(attacker);
-                    if (def instanceof Card && threatenedPWs.contains((Card) def)) {
+                    if (def instanceof Card && threatenedPWs.contains(def)) {
                         if (attacker.hasKeyword(Keyword.TRAMPLE)) {
                             // don't bother trying to chump a trampling creature
                             continue;
@@ -914,7 +914,7 @@ public class AiBlockController {
                                 pwDefenders.addAll(combat.getBlockers(pwAtk));
                             } else {
                                 isFullyBlocked = false;
-                                damageToPW += ComputerUtilCombat.predictDamageTo((Card) pw, pwAtk.getNetCombatDamage(), pwAtk, true);
+                                damageToPW += ComputerUtilCombat.predictDamageTo(pw, pwAtk.getNetCombatDamage(), pwAtk, true);
                             }
                         }
                         if (!isFullyBlocked && damageToPW >= pw.getCounters(CounterType.LOYALTY)) {
@@ -1329,13 +1329,9 @@ public class AiBlockController {
                 && ((Card) combat.getDefenderByAttacker(attacker)).isPlaneswalker();
         boolean wantToTradeDownToSavePW = chanceToTradeDownToSaveWalker > 0;
 
-        if (((evalBlk <= evalAtk + 1) || (wantToSavePlaneswalker && wantToTradeDownToSavePW)) // "1" accounts for tapped.
+        return ((evalBlk <= evalAtk + 1) || (wantToSavePlaneswalker && wantToTradeDownToSavePW)) // "1" accounts for tapped.
                 && powerParityOrHigher
                 && (creatureParityOrAllowedDiff || wantToTradeWithCreatInHand)
-                && (MyRandom.percentTrue(chance) || wantToSavePlaneswalker)) {
-            return true;
-        }
-
-        return false;
+                && (MyRandom.percentTrue(chance) || wantToSavePlaneswalker);
     }
 }

forge-ai/src/main/java/forge/ai/AiCardMemory.java

@@ -137,7 +137,7 @@ public class AiCardMemory {
 
         Set<Card> memorySet = getMemorySet(set);
 
-        return memorySet == null ? false : memorySet.contains(c);
+        return memorySet != null && memorySet.contains(c);
     }
 
     /**
@@ -291,7 +291,7 @@ public class AiCardMemory {
      * @return true, if the given memory set contains no remembered cards.
      */
     public boolean isMemorySetEmpty(MemorySet set) {
-        return set == null ? true : getMemorySet(set).isEmpty();
+        return set == null || getMemorySet(set).isEmpty();
     }
     
     /**

forge-ai/src/main/java/forge/ai/AiController.java

@@ -1645,7 +1645,6 @@ public class AiController {
             // For non-converted triggers (such as Cumulative Upkeep) that don't have costs or targets to worry about
             return true;
         }
-        
         return false;
     }
     
@@ -1690,16 +1689,11 @@ public class AiController {
                 left = AbilityUtils.calculateAmount(hostCard, svarToCheck, sa);
             }
             System.out.println("aiShouldRun?" + left + comparator + compareTo);
-            if (Expressions.compare(left, comparator, compareTo)) {
-                return true;
-            }
+            return Expressions.compare(left, comparator, compareTo);
         } else if (effect.getMapParams().containsKey("AICheckDredge")) {
             return player.getCardsIn(ZoneType.Library).size() > 8 || player.isCardInPlay("Laboratory Maniac");
-        } else if (sa != null && doTrigger(sa, false)) {
-            return true;
-        }
+        } else return sa != null && doTrigger(sa, false);
 
-        return false;
     }
 
     public List<SpellAbility> chooseSaToActivateFromOpeningHand(List<SpellAbility> usableFromOpeningHand) {
@@ -2078,9 +2072,7 @@ public class AiController {
         // AI-specific restrictions specified as activation parameters in spell abilities
         
         if (sa.hasParam("AILifeThreshold")) {
-            if (player.getLife() <= Integer.parseInt(sa.getParam("AILifeThreshold"))) {
-                return false;
-            }
+            return player.getLife() > Integer.parseInt(sa.getParam("AILifeThreshold"));
         }
         
         return true;

forge-ai/src/main/java/forge/ai/AiCostDecision.java

@@ -56,7 +56,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
     @Override
     public PaymentDecision visit(CostChooseCreatureType cost) {
         String choice = player.getController().chooseSomeType("Creature", ability, CardType.getAllCreatureTypes(),
-                Lists.<String>newArrayList());
+                Lists.newArrayList());
         return PaymentDecision.type(choice);
     }
 
@@ -475,7 +475,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 if (ability.getPayCosts().hasTapCost() && typeList.contains(ability.getHostCard())) {
                     c--;
                 }
-                source.setSVar("ChosenX", "Number$" + Integer.toString(c));
+                source.setSVar("ChosenX", "Number$" + c);
             } else {
                 if (!isVehicle) {
                     c = AbilityUtils.calculateAmount(source, amount, ability);
@@ -809,7 +809,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
             final String sVar = ability.getSVar(amount);
             if (sVar.equals("XChoice")) {
                 c = AbilityUtils.calculateAmount(source, "ChosenX", ability);
-                source.setSVar("ChosenX", "Number$" + String.valueOf(c));
+                source.setSVar("ChosenX", "Number$" + c);
             } else if (amount.equals("All")) {
                 c = source.getCounters(cost.counter);
             } else if (sVar.equals("Targeted$CardManaCost")) {
@@ -865,7 +865,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
                 }
                 typeList = CardLists.filter(typeList, Presets.TAPPED);
                 c = typeList.size();
-                source.setSVar("ChosenX", "Number$" + Integer.toString(c));
+                source.setSVar("ChosenX", "Number$" + c);
             } else {
                 c = AbilityUtils.calculateAmount(source, amount, ability);
             }

forge-ai/src/main/java/forge/ai/AiPlayDecision.java

@@ -17,5 +17,5 @@ public enum AiPlayDecision {
     WouldBecomeZeroToughnessCreature,
     WouldDestroyWorldEnchantment,
     BadEtbEffects,
-    CurseEffects;
+    CurseEffects
 }

forge-ai/src/main/java/forge/ai/ComputerUtil.java

@@ -423,7 +423,7 @@ public class ComputerUtil {
                 int mana = ComputerUtilMana.getAvailableManaEstimate(ai, false);
 
                 boolean cantAffordSoon = activate.getCMC() > mana + 1;
-                boolean wrongColor = !activate.determineColor().hasNoColorsExcept(ColorSet.fromNames(ComputerUtilCost.getAvailableManaColors(ai, ImmutableList.<Card>of())).getColor());
+                boolean wrongColor = !activate.determineColor().hasNoColorsExcept(ColorSet.fromNames(ComputerUtilCost.getAvailableManaColors(ai, ImmutableList.of())).getColor());
 
                 // Only do this for spells, not activated abilities
                 // We can't pay for this spell even if we play another land, or have wrong colors
@@ -524,7 +524,7 @@ public class ComputerUtil {
 
         typeList = CardLists.filter(typeList, CardPredicates.canBeSacrificedBy(ability));
 
-        if ((target != null) && target.getController() == ai && typeList.contains(target)) {
+        if ((target != null) && target.getController() == ai) {
             typeList.remove(target); // don't sacrifice the card we're pumping
         }
 
@@ -554,7 +554,7 @@ public class ComputerUtil {
             final Card target, final int amount) {
         CardCollection typeList = CardLists.getValidCards(ai.getCardsIn(zone), type.split(";"), activate.getController(), activate, null);
         
-        if ((target != null) && target.getController() == ai && typeList.contains(target)) {
+        if ((target != null) && target.getController() == ai) {
             typeList.remove(target); // don't exile the card we're pumping
         }
 
@@ -575,7 +575,7 @@ public class ComputerUtil {
             final Card target, final int amount) {
         CardCollection typeList = CardLists.getValidCards(ai.getCardsIn(zone), type.split(";"), activate.getController(), activate, null);
         
-        if ((target != null) && target.getController() == ai && typeList.contains(target)) {
+        if ((target != null) && target.getController() == ai) {
             typeList.remove(target); // don't move the card we're pumping
         }
 
@@ -704,7 +704,7 @@ public class ComputerUtil {
     public static CardCollection chooseReturnType(final Player ai, final String type, final Card activate, final Card target, final int amount) {
         final CardCollection typeList =
                 CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), type.split(";"), activate.getController(), activate, null);
-        if ((target != null) && target.getController() == ai && typeList.contains(target)) {
+        if ((target != null) && target.getController() == ai) {
             // don't bounce the card we're pumping
             typeList.remove(target);
         }
@@ -1926,8 +1926,8 @@ public class ComputerUtil {
                 return true;
             }
             if (game.getPhaseHandler().inCombat() &&
-            		ComputerUtilCombat.combatantWouldBeDestroyed(ai, source, game.getCombat())) {
-            	return true;
+                    ComputerUtilCombat.combatantWouldBeDestroyed(ai, source, game.getCombat())) {
+                return true;
             }
         } else if (zone.getZoneType() == ZoneType.Exile && sa.getMayPlay() != null) {
             // play cards in exile that can only be played that turn
@@ -1967,11 +1967,8 @@ public class ComputerUtil {
         final CardCollectionView lands = CardLists.filter(handList, new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                if (c.getManaCost().getCMC() > 0 || c.hasSVar("NeedsToPlay")
-                        || (!c.getType().isLand() && !c.getType().isArtifact())) {
-                    return false;
-                }
-                return true;
+                return c.getManaCost().getCMC() <= 0 && !c.hasSVar("NeedsToPlay")
+                        && (c.getType().isLand() || c.getType().isArtifact());
             }
         });
 
@@ -1986,10 +1983,7 @@ public class ComputerUtil {
         final CardCollectionView castables = CardLists.filter(handList, new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                if (c.getManaCost().getCMC() > 0 && c.getManaCost().getCMC() <= landSize) {
-                    return false;
-                }
-                return true;
+                return c.getManaCost().getCMC() <= 0 || c.getManaCost().getCMC() > landSize;
             }
         });
 
@@ -2186,10 +2180,7 @@ public class ComputerUtil {
         CardCollection goodChoices = CardLists.filter(validCards, new Predicate<Card>() {
             @Override
             public boolean apply(final Card c) {
-                if (c.hasSVar("DiscardMeByOpp") || c.hasSVar("DiscardMe")) {
-                    return false;
-                }
-                return true;
+                return !c.hasSVar("DiscardMeByOpp") && !c.hasSVar("DiscardMe");
             }
         });
         if (goodChoices.isEmpty()) {
@@ -2225,7 +2216,7 @@ public class ComputerUtil {
 
     public static String chooseSomeType(Player ai, String kindOfType, String logic, List<String> invalidTypes) {
         if (invalidTypes == null) {
-            invalidTypes = ImmutableList.<String>of();
+            invalidTypes = ImmutableList.of();
         }
 
         final Game game = ai.getGame();
@@ -2546,8 +2537,7 @@ public class ComputerUtil {
             @Override
             public boolean apply(final Card c) {
                 if (c.getController() == ai) {
-                    if (c.getSVar("Targeting").equals("Dies") || c.getSVar("Targeting").equals("Counter"))
-                    return false;
+                    return !c.getSVar("Targeting").equals("Dies") && !c.getSVar("Targeting").equals("Counter");
                 }
                 return true;
             }
@@ -2875,7 +2865,6 @@ public class ComputerUtil {
         } else if (Iterables.any(list, CardTraitPredicates.hasParam("AiLogic", "LichDraw"))) {
             return false;
         }
-
         return true;
     }
 

forge-ai/src/main/java/forge/ai/ComputerUtilCard.java

@@ -368,7 +368,7 @@ public class ComputerUtilCard {
         }
     
         if (hasEnchantmants || hasArtifacts) {
-            final List<Card> ae = CardLists.filter(list, Predicates.and(Predicates.<Card>or(CardPredicates.Presets.ARTIFACTS, CardPredicates.Presets.ENCHANTMENTS), new Predicate<Card>() {
+            final List<Card> ae = CardLists.filter(list, Predicates.and(Predicates.or(CardPredicates.Presets.ARTIFACTS, CardPredicates.Presets.ENCHANTMENTS), new Predicate<Card>() {
                 @Override
                 public boolean apply(Card card) {
                     return !card.hasSVar("DoNotDiscardIfAble");
@@ -1301,7 +1301,7 @@ public class ComputerUtilCard {
                     combatTrick = true;
 
                     final List<String> kws = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & "))
-                            : Lists.<String>newArrayList();
+                            : Lists.newArrayList();
                     for (String kw : kws) {
                         if (!kw.equals("Trample") && !kw.equals("First Strike") && !kw.equals("Double Strike")) {
                             combatTrick = false;

forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java

@@ -84,7 +84,7 @@ public class ComputerUtilCombat {
         return Iterables.any(defenders, new Predicate<GameEntity>() {
             @Override public boolean apply(final GameEntity input) {
                 return ComputerUtilCombat.canAttackNextTurn(attacker, input);
-            };
+            }
         });
     } // canAttackNextTurn(Card)
 
@@ -119,11 +119,7 @@ public class ComputerUtilCombat {
         }
 
         // The creature won't untap next turn
-        if (atacker.isTapped() && !Untap.canUntap(atacker)) {
-            return false;
-        }
-
-        return true;
+        return !atacker.isTapped() || Untap.canUntap(atacker);
     } // canAttackNextTurn(Card, GameEntity)
 
     /**
@@ -883,20 +879,19 @@ public class ComputerUtilCombat {
         } else if (mode == TriggerType.DamageDone) {
             willTrigger = true;
             if (trigParams.containsKey("ValidSource")) {
-                if (CardTraitBase.matchesValid(defender, trigParams.get("ValidSource").split(","), source)
+                if (!(CardTraitBase.matchesValid(defender, trigParams.get("ValidSource").split(","), source)
                         && defender.getNetCombatDamage() > 0
                         && (!trigParams.containsKey("ValidTarget")
-                                || CardTraitBase.matchesValid(attacker, trigParams.get("ValidTarget").split(","), source))) {
-                    return true;
+                                || CardTraitBase.matchesValid(attacker, trigParams.get("ValidTarget").split(","), source)))) {
+                    return false;
                 }
-                if (CardTraitBase.matchesValid(attacker, trigParams.get("ValidSource").split(","), source)
+                if (!(CardTraitBase.matchesValid(attacker, trigParams.get("ValidSource").split(","), source)
                         && attacker.getNetCombatDamage() > 0
                         && (!trigParams.containsKey("ValidTarget")
-                                || CardTraitBase.matchesValid(defender, trigParams.get("ValidTarget").split(","), source))) {
-                    return true;
+                        || CardTraitBase.matchesValid(defender, trigParams.get("ValidTarget").split(","), source)))) {
+                    return false;
                 }
             }
-            return false;
         }
 
         return willTrigger;
@@ -1414,7 +1409,7 @@ public class ComputerUtilCombat {
             if (att.matches("[0-9][0-9]?") || att.matches("-" + "[0-9][0-9]?")) {
                 power += Integer.parseInt(att);
             } else {
-                String bonus = new String(source.getSVar(att));
+                String bonus = source.getSVar(att);
                 if (bonus.contains("TriggerCount$NumBlockers")) {
                     bonus = TextUtil.fastReplace(bonus, "TriggerCount$NumBlockers", "Number$1");
                 } else if (bonus.contains("TriggeredPlayersDefenders$Amount")) { // for Melee
@@ -1655,7 +1650,7 @@ public class ComputerUtilCombat {
             if (def.matches("[0-9][0-9]?") || def.matches("-" + "[0-9][0-9]?")) {
                 toughness += Integer.parseInt(def);
             } else {
-                String bonus = new String(source.getSVar(def));
+                String bonus = source.getSVar(def);
                 if (bonus.contains("TriggerCount$NumBlockers")) {
                     bonus = TextUtil.fastReplace(bonus, "TriggerCount$NumBlockers", "Number$1");
                 } else if (bonus.contains("TriggeredPlayersDefenders$Amount")) { // for Melee
@@ -1948,7 +1943,7 @@ public class ComputerUtilCombat {
             return defenderDamage >= attackerLife;
 
         } // defender no double strike
-        return false; // should never arrive here
+        return false;// should never arrive here
     } // canDestroyAttacker
 
     // For AI safety measures like Regeneration
@@ -2195,7 +2190,7 @@ public class ComputerUtilCombat {
             return attackerDamage >= defenderLife;
 
         } // attacker no double strike
-        return false; // should never arrive here
+        return false;// should never arrive here
     } // canDestroyBlocker
 
 

forge-ai/src/main/java/forge/ai/ComputerUtilCost.java

@@ -424,7 +424,7 @@ public class ComputerUtilCost {
                     continue;
                 }
                 final int remainingLife = ai.getLife();
-                final int lifeCost = ((CostPayLife) part).convertAmount();
+                final int lifeCost = part.convertAmount();
                 if ((remainingLife - lifeCost) < 10) {
                     return false; //Don't pay life if it would put AI under 10 life
                 } else if ((remainingLife / lifeCost) < 4) {
@@ -552,7 +552,7 @@ public class ComputerUtilCost {
         final Card source = sa.getHostCard();
         final String aiLogic = sa.getParam("UnlessAI");
         boolean payForOwnOnly = "OnlyOwn".equals(aiLogic);
-        boolean payOwner = sa.hasParam("UnlessAI") ? aiLogic.startsWith("Defined") : false;
+        boolean payOwner = sa.hasParam("UnlessAI") && aiLogic.startsWith("Defined");
         boolean payNever = "Never".equals(aiLogic);
         boolean shockland = "Shockland".equals(aiLogic);
         boolean isMine = sa.getActivatingPlayer().equals(payer);

forge-ai/src/main/java/forge/ai/ComputerUtilMana.java

@@ -880,10 +880,12 @@ public class ComputerUtilMana {
 
         // For combat tricks, always obey mana reservation
         if (curPhase == PhaseType.COMBAT_DECLARE_BLOCKERS || curPhase == PhaseType.CLEANUP) {
-            AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_DECLBLK);
-        } else if (!(ai.getGame().getPhaseHandler().isPlayerTurn(ai)) && (curPhase == PhaseType.COMBAT_DECLARE_BLOCKERS || curPhase == PhaseType.CLEANUP)) {
-            AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_ENEMY_DECLBLK);
-            AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT);
+            if (!(ai.getGame().getPhaseHandler().isPlayerTurn(ai))) {
+                AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_ENEMY_DECLBLK);
+                AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.CHOSEN_FOG_EFFECT);
+            }
+            else
+                AiCardMemory.clearMemorySet(ai, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_DECLBLK);
         } else {
             if ((AiCardMemory.isRememberedCard(ai, sourceCard, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_DECLBLK)) ||
                     (AiCardMemory.isRememberedCard(ai, sourceCard, AiCardMemory.MemorySet.HELD_MANA_SOURCES_FOR_ENEMY_DECLBLK))) {

forge-ai/src/main/java/forge/ai/GameState.java

@@ -1061,7 +1061,7 @@ public abstract class GameState {
     }
 
     private void applyCountersToGameEntity(GameEntity entity, String counterString) {
-        entity.setCounters(Maps.<CounterType, Integer>newEnumMap(CounterType.class));
+        entity.setCounters(Maps.newEnumMap(CounterType.class));
         String[] allCounterStrings = counterString.split(",");
         for (final String counterPair : allCounterStrings) {
             String[] pair = counterPair.split("=", 2);
@@ -1107,7 +1107,7 @@ public abstract class GameState {
                     Map<CounterType, Integer> counters = c.getCounters();
                     // Note: Not clearCounters() since we want to keep the counters
                     // var as-is.
-                    c.setCounters(Maps.<CounterType, Integer>newEnumMap(CounterType.class));
+                    c.setCounters(Maps.newEnumMap(CounterType.class));
                     if (c.isAura()) {
                         // dummy "enchanting" to indicate that the card will be force-attached elsewhere
                         // (will be overridden later, so the actual value shouldn't matter)

forge-ai/src/main/java/forge/ai/PlayerControllerAi.java

@@ -492,7 +492,7 @@ public class PlayerControllerAi extends PlayerController {
             Card toDiscard = Aggregates.itemWithMin(cardsOfType, CardPredicates.Accessors.fnGetCmc);
             return new CardCollection(toDiscard);
         }
-        return getAi().getCardsToDiscard(num, (String[])null, sa);
+        return getAi().getCardsToDiscard(num, null, sa);
     }
 
 
@@ -612,7 +612,7 @@ public class PlayerControllerAi extends PlayerController {
 
     @Override
     public CardCollection chooseCardsToDiscardToMaximumHandSize(int numDiscard) {
-        return brains.getCardsToDiscard(numDiscard, (String[])null, null);
+        return brains.getCardsToDiscard(numDiscard, null, null);
     }
 
     @Override
@@ -669,7 +669,7 @@ public class PlayerControllerAi extends PlayerController {
             throw new InvalidParameterException("SA is not api-based, this is not supported yet");
         }
         return SpellApiToAi.Converter.get(api).chooseNumber(player, sa, min, max, params);
-    };
+    }
 
     @Override
     public int chooseNumber(SpellAbility sa, String title, List<Integer> options, Player relatedPlayer) {

forge-ai/src/main/java/forge/ai/SpecialCardAi.java

@@ -94,12 +94,8 @@ public class SpecialCardAi {
             int minCMC = isLowCMCDeck ? 3 : 4; // probably not worth wasting a lotus on a low-CMC spell (<4 CMC), except in low-CMC decks, where 3 CMC may be fine
             int paidCMC = cost.getConvertedManaCost();
             if (paidCMC < minCMC) {
-                if (paidCMC == 3 && numManaSrcs < 3) {
-                    // if it's a CMC 3 spell and we're more than one mana source short for it, might be worth it anyway
-                    return true;
-                } 
-
-                return false;
+                // if it's a CMC 3 spell and we're more than one mana source short for it, might be worth it anyway
+                return paidCMC == 3 && numManaSrcs < 3;
             }
 
             return true;
@@ -218,11 +214,7 @@ public class SpecialCardAi {
                 }
             }
 
-            if (ai.getLife() <= sa.getHostCard().getNetPower() && !hasUsefulBlocker) {
-                return true;
-            } else {
-                return false;
-            }
+            return ai.getLife() <= sa.getHostCard().getNetPower() && !hasUsefulBlocker;
         }
         
         public static int getSacThreshold() {
@@ -335,7 +327,7 @@ public class SpecialCardAi {
             boolean canTrample = source.hasKeyword(Keyword.TRAMPLE);
 
             if (!isBlocking && combat.getDefenderByAttacker(source) instanceof Card) {
-                int loyalty = ((Card)combat.getDefenderByAttacker(source)).getCounters(CounterType.LOYALTY);
+                int loyalty = combat.getDefenderByAttacker(source).getCounters(CounterType.LOYALTY);
                 int totalDamageToPW = 0;
                 for (Card atk : (combat.getAttackersOf(combat.getDefenderByAttacker(source)))) {
                     if (combat.isUnblocked(atk)) {
@@ -411,11 +403,7 @@ public class SpecialCardAi {
             Pair<Integer, Integer> predictedPT = getPumpedPT(ai, source.getNetCombatDamage(), source.getNetToughness());
             int oppT = Aggregates.sum(potentialBlockers, CardPredicates.Accessors.fnGetNetToughness);
 
-            if (potentialBlockers.isEmpty() || (source.hasKeyword(Keyword.TRAMPLE) && predictedPT.getLeft() - oppT >= oppLife)) {
-                return true;
-            }
-
-            return false;
+            return potentialBlockers.isEmpty() || (source.hasKeyword(Keyword.TRAMPLE) && predictedPT.getLeft() - oppT >= oppLife);
         }
 
         public static Pair<Integer, Integer> getPumpedPT(Player ai, int power, int toughness) {
@@ -522,7 +510,7 @@ public class SpecialCardAi {
                         best.add(sp); // these SAs are prioritized since the AI sees a reason to play them now
                     }
                     final List<String> keywords = sp.hasParam("KW") ? Arrays.asList(sp.getParam("KW").split(" & "))
-                            : Lists.<String>newArrayList();
+                            : Lists.newArrayList();
                     for (String kw : keywords) {
                         if (!tgtCard.hasKeyword(kw)) {
                             if ("Indestructible".equals(kw) && ai.getOpponents().getCreaturesInPlay().isEmpty()) {
@@ -568,10 +556,7 @@ public class SpecialCardAi {
                     @Override
                     public boolean apply(final Card c) {
                         // Don't enchant creatures that can survive
-                        if (!c.canBeDestroyed() || c.getNetCombatDamage() < c.getNetToughness() || c.isEnchantedBy("Guilty Conscience")) {
-                            return false;
-                        }
-                        return true;
+                        return c.canBeDestroyed() && c.getNetCombatDamage() >= c.getNetToughness() && !c.isEnchantedBy("Guilty Conscience");
                     }
                 });
                 chosen = ComputerUtilCard.getBestCreatureAI(creatures);
@@ -919,7 +904,6 @@ public class SpecialCardAi {
                 // Only activate in AI's own turn (sans the exception above)
                 return false;
             }
-
             return true;
         }
     }
@@ -941,11 +925,7 @@ public class SpecialCardAi {
 
             }
             // Maybe use it for some important high-impact spells even if there are more cards in hand?
-            if (ai.getCardsIn(ZoneType.Hand).size() > 1 && !hasEnsnaringBridgeEffect) {
-                return false;
-            }
-
-            return true;
+            return ai.getCardsIn(ZoneType.Hand).size() <= 1 || hasEnsnaringBridgeEffect;
         }
     }
 
@@ -1310,12 +1290,8 @@ public class SpecialCardAi {
                 }
             }
 
-            if (aiHandSize < HAND_SIZE_THRESHOLD || maxOppHandSize - aiHandSize > HAND_SIZE_THRESHOLD) {
-                // use in case we're getting low on cards or if we're significantly behind our opponent in cards in hand
-                return true;
-            }
-
-            return false;
+            // use in case we're getting low on cards or if we're significantly behind our opponent in cards in hand
+            return aiHandSize < HAND_SIZE_THRESHOLD || maxOppHandSize - aiHandSize > HAND_SIZE_THRESHOLD;
         }
     }
 
@@ -1342,9 +1318,7 @@ public class SpecialCardAi {
                 if (topGY == null
                         || !topGY.isCreature()
                         || ComputerUtilCard.evaluateCreature(creatHand) > ComputerUtilCard.evaluateCreature(topGY) + 80) {
-                    if (numCreatsInHand > 1 || !ComputerUtilMana.canPayManaCost(creatHand.getSpellPermanent(), ai, 0)) {
-                        return true;
-                    }
+                    return numCreatsInHand > 1 || !ComputerUtilMana.canPayManaCost(creatHand.getSpellPermanent(), ai, 0);
                 }
             }
 
@@ -1466,7 +1440,6 @@ public class SpecialCardAi {
                 // Only activate in AI's own turn (sans the exception above)
                 return false;
             }
-
             return true;
         }
     }

forge-ai/src/main/java/forge/ai/ability/ActivateAbilityAi.java

@@ -56,12 +56,9 @@ public class ActivateAbilityAi extends SpellAbilityAi {
             } else {
                 final List<Player> defined = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa);
 
-                if (!defined.contains(opp)) {
-                    return false;
-                }
+                return defined.contains(opp);
             }
 
-            return true;
         } else {
             sa.resetTargets();
             sa.getTargets().add(opp);

forge-ai/src/main/java/forge/ai/ability/AddTurnAi.java

@@ -67,10 +67,8 @@ public class AddTurnAi extends SpellAbilityAi {
                     return false;
                 }
             }
-            if (!StringUtils.isNumeric(sa.getParam("NumTurns"))) {
-                // TODO: improve ai for Sage of Hours
-                return false;
-            }
+            // TODO: improve ai for Sage of Hours
+            return StringUtils.isNumeric(sa.getParam("NumTurns"));
             // not sure if the AI should be playing with cards that give the
             // Human more turns.
         }

forge-ai/src/main/java/forge/ai/ability/AmassAi.java

@@ -23,9 +23,7 @@ public class AmassAi extends SpellAbilityAi {
         final Game game = ai.getGame();
 
         if (!aiArmies.isEmpty()) {
-            if (CardLists.count(aiArmies, CardPredicates.canReceiveCounters(CounterType.P1P1)) <= 0) {
-                return false;
-            }
+            return CardLists.count(aiArmies, CardPredicates.canReceiveCounters(CounterType.P1P1)) > 0;
         } else {
             final String tokenScript = "b_0_0_zombie_army";
             final int amount = AbilityUtils.calculateAmount(host, sa.getParamOrDefault("Num", "1"), sa);
@@ -57,12 +55,9 @@ public class AmassAi extends SpellAbilityAi {
             //reset static abilities
             game.getAction().checkStaticAbilities(false);
 
-            if (!result) {
-                return false;
-            }
+            return result;
         }
 
-        return true;
     }
 
     @Override

forge-ai/src/main/java/forge/ai/ability/AnimateAi.java

@@ -207,21 +207,16 @@ public class AnimateAi extends SpellAbilityAi {
             return bFlag; // All of the defined stuff is animated, not very useful
         } else {
             sa.resetTargets();
-            if (!animateTgtAI(sa)) {
-                return false;
-            }
+            return animateTgtAI(sa);
         }
 
-        return true;
     }
 
     @Override
     public boolean chkAIDrawback(SpellAbility sa, Player aiPlayer) {
         if (sa.usesTargeting()) {
             sa.resetTargets();
-            if (!animateTgtAI(sa)) {
-                return false;
-            }
+            return animateTgtAI(sa);
         }
 
         return true;

forge-ai/src/main/java/forge/ai/ability/AnimateAllAi.java

@@ -8,11 +8,7 @@ public class AnimateAllAi extends SpellAbilityAi {
 
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {
-        if ("Always".equals(sa.getParam("AILogic"))) {
-            return true;
-        }
-
-        return false;
+        return "Always".equals(sa.getParam("AILogic"));
     } // end animateAllCanPlayAI()
 
     @Override

forge-ai/src/main/java/forge/ai/ability/AttachAi.java

@@ -123,9 +123,7 @@ public class AttachAi extends SpellAbilityAi {
                     return !(c.hasProtectionFrom(source) || c.hasKeyword(Keyword.SHROUD) || c.hasKeyword(Keyword.HEXPROOF));
                 }
             });
-            if (targets.isEmpty()) {
-                return false;
-            }
+            return !targets.isEmpty();
         }
 
         return true;
@@ -239,9 +237,7 @@ public class AttachAi extends SpellAbilityAi {
                 return false;
             }
 
-            if (!(combat.isAttacking(attachTarget) || combat.isBlocking(attachTarget))) {
-                return false;
-            }
+            return combat.isAttacking(attachTarget) || combat.isBlocking(attachTarget);
         }
 
         return true;
@@ -987,9 +983,7 @@ public class AttachAi extends SpellAbilityAi {
                     return false;
                 }
                 // don't equip creatures that don't gain anything
-                if (card.hasSVar("NonStackingAttachEffect") && newTarget.isEquippedBy(card.getName())) {
-                    return false;
-                }
+                return !card.hasSVar("NonStackingAttachEffect") || !newTarget.isEquippedBy(card.getName());
             }
         }
 
@@ -1353,7 +1347,7 @@ public class AttachAi extends SpellAbilityAi {
         CardCollection prefList = list;
 
         // Filter AI-specific targets if provided
-        prefList = ComputerUtil.filterAITgts(sa, aiPlayer, (CardCollection)list, true);
+        prefList = ComputerUtil.filterAITgts(sa, aiPlayer, list, true);
 
         Card c = attachGeneralAI(aiPlayer, sa, prefList, mandatory, attachSource, sa.getParam("AILogic"));
 
@@ -1557,86 +1551,55 @@ public class AttachAi extends SpellAbilityAi {
         }
 
         if (evasive) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || !ComputerUtilCombat.canAttackNextTurn(card)
-                    || !canBeBlocked) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && ComputerUtilCombat.canAttackNextTurn(card)
+                    && canBeBlocked;
         } else if (keyword.equals("Haste")) {
-            if (!card.hasSickness() || !ph.isPlayerTurn(sa.getActivatingPlayer()) || card.isTapped()
-                    || card.getNetCombatDamage() + powerBonus <= 0
-                    || card.hasKeyword("CARDNAME can attack as though it had haste.")
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || !ComputerUtilCombat.canAttackNextTurn(card)) {
-                return false;
-            }
+            return card.hasSickness() && ph.isPlayerTurn(sa.getActivatingPlayer()) && !card.isTapped()
+                    && card.getNetCombatDamage() + powerBonus > 0
+                    && !card.hasKeyword("CARDNAME can attack as though it had haste.")
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && ComputerUtilCombat.canAttackNextTurn(card);
         } else if (keyword.endsWith("Indestructible")) {
             return true;
         } else if (keyword.endsWith("Deathtouch") || keyword.endsWith("Wither")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || ((!canBeBlocked || !ComputerUtilCombat.canAttackNextTurn(card))
-                            && !CombatUtil.canBlock(card, true))) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && ((canBeBlocked && ComputerUtilCombat.canAttackNextTurn(card))
+                    || CombatUtil.canBlock(card, true));
         } else if (keyword.equals("Double Strike") || keyword.equals("Lifelink")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || (!ComputerUtilCombat.canAttackNextTurn(card) && !CombatUtil.canBlock(card, true))) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && (ComputerUtilCombat.canAttackNextTurn(card) || CombatUtil.canBlock(card, true));
         } else if (keyword.equals("First Strike")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0 || card.hasKeyword(Keyword.DOUBLE_STRIKE)
-            		|| (!ComputerUtilCombat.canAttackNextTurn(card) && !CombatUtil.canBlock(card, true))) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0 && !card.hasKeyword(Keyword.DOUBLE_STRIKE)
+                    && (ComputerUtilCombat.canAttackNextTurn(card) || CombatUtil.canBlock(card, true));
         } else if (keyword.startsWith("Flanking")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || !ComputerUtilCombat.canAttackNextTurn(card)
-                    || !canBeBlocked) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && ComputerUtilCombat.canAttackNextTurn(card)
+                    && canBeBlocked;
         } else if (keyword.startsWith("Bushido")) {
-            if ((!canBeBlocked || !ComputerUtilCombat.canAttackNextTurn(card))
-                    && !CombatUtil.canBlock(card, true)) {
-                return false;
-            }
+            return (canBeBlocked && ComputerUtilCombat.canAttackNextTurn(card))
+                    || CombatUtil.canBlock(card, true);
         } else if (keyword.equals("Trample")) {
-            if (card.getNetCombatDamage() + powerBonus <= 1
-                    || !canBeBlocked
-                    || !ComputerUtilCombat.canAttackNextTurn(card)) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 1
+                    && canBeBlocked
+                    && ComputerUtilCombat.canAttackNextTurn(card);
         } else if (keyword.equals("Infect")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || !ComputerUtilCombat.canAttackNextTurn(card)) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && ComputerUtilCombat.canAttackNextTurn(card);
         } else if (keyword.equals("Vigilance")) {
-            if (card.getNetCombatDamage() + powerBonus <= 0
-                    || !ComputerUtilCombat.canAttackNextTurn(card)
-                    || !CombatUtil.canBlock(card, true)) {
-                return false;
-            }
+            return card.getNetCombatDamage() + powerBonus > 0
+                    && ComputerUtilCombat.canAttackNextTurn(card)
+                    && CombatUtil.canBlock(card, true);
         } else if (keyword.equals("Reach")) {
-            if (card.hasKeyword(Keyword.FLYING) || !CombatUtil.canBlock(card, true)) {
-                return false;
-            }
+            return !card.hasKeyword(Keyword.FLYING) && CombatUtil.canBlock(card, true);
         } else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
-            if (!CombatUtil.canBlock(card, true) || card.hasKeyword("CARDNAME can block any number of creatures.")
-                    || card.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.")) {
-                return false;
-            }
+            return CombatUtil.canBlock(card, true) && !card.hasKeyword("CARDNAME can block any number of creatures.")
+                    && !card.hasKeyword("CARDNAME can block an additional ninety-nine creatures each combat.");
         } else if (keyword.equals("CARDNAME can attack as though it didn't have defender.")) {
-            if (!card.hasKeyword(Keyword.DEFENDER) || card.getNetCombatDamage() + powerBonus <= 0) {
-                return false;
-            }
+            return card.hasKeyword(Keyword.DEFENDER) && card.getNetCombatDamage() + powerBonus > 0;
         } else if (keyword.equals("Shroud") || keyword.equals("Hexproof")) {
-            if (card.hasKeyword(Keyword.SHROUD) || card.hasKeyword(Keyword.HEXPROOF)) {
-                return false;
-            }
-        } else if (keyword.equals("Defender")) {
-        	return false;
-        }
-        return true;
+            return !card.hasKeyword(Keyword.SHROUD) && !card.hasKeyword(Keyword.HEXPROOF);
+        } else return !keyword.equals("Defender");
     }
 
     /**
@@ -1657,17 +1620,11 @@ public class AttachAi extends SpellAbilityAi {
 
         if (keyword.endsWith("CARDNAME can't attack.") || keyword.equals("Defender")
                 || keyword.endsWith("CARDNAME can't attack or block.")) {
-            if (!ComputerUtilCombat.canAttackNextTurn(card) || card.getNetCombatDamage() < 1) {
-                return false;
-            }
+            return ComputerUtilCombat.canAttackNextTurn(card) && card.getNetCombatDamage() >= 1;
         } else if (keyword.endsWith("CARDNAME attacks each turn if able.") || keyword.endsWith("CARDNAME attacks each combat if able.")) {
-            if (!ComputerUtilCombat.canAttackNextTurn(card) || !CombatUtil.canBlock(card, true) || ai.getCreaturesInPlay().isEmpty()) {
-                return false;
-            }
+            return ComputerUtilCombat.canAttackNextTurn(card) && CombatUtil.canBlock(card, true) && !ai.getCreaturesInPlay().isEmpty();
         } else if (keyword.endsWith("CARDNAME can't block.") || keyword.contains("CantBlock")) {
-            if (!CombatUtil.canBlock(card, true)) {
-                return false;
-            }
+            return CombatUtil.canBlock(card, true);
         } else if (keyword.endsWith("CARDNAME's activated abilities can't be activated.")) {
             for (SpellAbility ability : card.getSpellAbilities()) {
                 if (ability.isAbility()) {
@@ -1676,18 +1633,12 @@ public class AttachAi extends SpellAbilityAi {
             }
             return false;
         } else if (keyword.endsWith("Prevent all combat damage that would be dealt by CARDNAME.")) {
-            if (!ComputerUtilCombat.canAttackNextTurn(card) || card.getNetCombatDamage() < 1) {
-                return false;
-            }
+            return ComputerUtilCombat.canAttackNextTurn(card) && card.getNetCombatDamage() >= 1;
         } else if (keyword.endsWith("Prevent all combat damage that would be dealt to and dealt by CARDNAME.")
                 || keyword.endsWith("Prevent all damage that would be dealt to and dealt by CARDNAME.")) {
-            if (!ComputerUtilCombat.canAttackNextTurn(card) || card.getNetCombatDamage() < 2) {
-                return false;
-            }
+            return ComputerUtilCombat.canAttackNextTurn(card) && card.getNetCombatDamage() >= 2;
         } else if (keyword.endsWith("CARDNAME doesn't untap during your untap step.")) {
-            if (card.isUntapped()) {
-                return false;
-            }
+            return !card.isUntapped();
         }
         return true;
     }
@@ -1711,12 +1662,8 @@ public class AttachAi extends SpellAbilityAi {
             return true;
         }
 
-        if (sa.getHostCard().isEquipment() && ComputerUtilCard.isUselessCreature(ai, c)) {
-            // useless to equip a creature that can't attack or block.
-            return false;
-        }
-
-        return true;
+        // useless to equip a creature that can't attack or block.
+        return !sa.getHostCard().isEquipment() || !ComputerUtilCard.isUselessCreature(ai, c);
     }
 
     public static Card doPumpOrCurseAILogic(final Player ai, final SpellAbility sa, final List<Card> list, final String type) {

forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java

@@ -355,9 +355,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     @Override
                     public boolean apply(final Card c) {
                         if (c.getType().isLegendary()) {
-                            if (ai.isCardInPlay(c.getName())) {
-                                return false;
-                            }
+                            return !ai.isCardInPlay(c.getName());
                         }
                         return true;
                     }
@@ -738,11 +736,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
         }
 
         final AbilitySub subAb = sa.getSubAbility();
-        if (subAb != null && !SpellApiToAi.Converter.get(subAb.getApi()).chkDrawbackWithSubs(ai, subAb)) {
-            return false;
-        }
-
-        return true;
+        return subAb == null || SpellApiToAi.Converter.get(subAb.getApi()).chkDrawbackWithSubs(ai, subAb);
     }
 
     /*
@@ -864,7 +858,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
         list = CardLists.getTargetableCards(list, sa);
 
         // Filter AI-specific targets if provided
-        list = ComputerUtil.filterAITgts(sa, ai, (CardCollection)list, true);
+        list = ComputerUtil.filterAITgts(sa, ai, list, true);
         if (sa.hasParam("AITgtsOnlyBetterThanSelf")) {
             list = CardLists.filter(list, new Predicate<Card>() {
                 @Override
@@ -995,11 +989,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
 	                    @Override
 	                    public boolean apply(final Card c) {
 	                        for (Card aura : c.getEnchantedBy()) {
-	                            if (aura.getController().isOpponentOf(ai)) {
-	                                return true;
-	                            } else {
-	                                return false;
-	                            }
+                                return aura.getController().isOpponentOf(ai);
 	                        }
 	                        if (blink) {
 	                            return c.isToken();
@@ -1471,16 +1461,12 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 if (!list.isEmpty()) {
                     final Card attachedTo = list.get(0);
                     // This code is for the Dragon auras
-                    if (attachedTo.getController().isOpponentOf(ai)) {
-                        return false;
-                    }
+                    return !attachedTo.getController().isOpponentOf(ai);
                 }
             }
         } else if (isPreferredTarget(ai, sa, mandatory, true)) {
             // do nothing
-        } else if (!isUnpreferredTarget(ai, sa, mandatory)) {
-            return false;
-        }
+        } else return isUnpreferredTarget(ai, sa, mandatory);
 
         return true;
     }
@@ -1532,9 +1518,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 @Override
                 public boolean apply(final Card c) {
                     if (c.getType().isLegendary()) {
-                        if (decider.isCardInPlay(c.getName())) {
-                            return false;
-                        }
+                        return !decider.isCardInPlay(c.getName());
                     }
                     return true;
                 }
@@ -1543,10 +1527,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 fetchList = CardLists.filter(fetchList, new Predicate<Card>() {
                     @Override
                     public boolean apply(final Card c) {
-                        if (ComputerUtilCard.isCardRemAIDeck(c) || ComputerUtilCard.isCardRemRandomDeck(c)) {
-                            return false;
-                        }
-                        return true;
+                        return !ComputerUtilCard.isCardRemAIDeck(c) && !ComputerUtilCard.isCardRemRandomDeck(c);
                     }
                 });
             }
@@ -1718,9 +1699,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
                 @Override
                 public boolean apply(final Card c) {
                     if (c.getType().isLegendary()) {
-                        if (ai.isCardInPlay(c.getName())) {
-                            return false;
-                        }
+                        return !ai.isCardInPlay(c.getName());
                     }
                     return true;
                 }
@@ -1826,20 +1805,16 @@ public class ChangeZoneAi extends SpellAbilityAi {
                     && "Battlefield".equals(causeSub.getParam("Destination"))) {
                 // A blink effect implemented using ChangeZone API
                 return false;
-            } else if (subApi == ApiType.DelayedTrigger) {
+            } else // This is an intrinsic effect that blinks the card (e.g. Obzedat, Ghost Council), no need to
+                // return the commander to the Command zone.
+                if (subApi == ApiType.DelayedTrigger) {
                 SpellAbility exec = causeSub.getAdditionalAbility("Execute");
                 if (exec != null && exec.getApi() == ApiType.ChangeZone) {
-                    if ("Exile".equals(exec.getParam("Origin")) && "Battlefield".equals(exec.getParam("Destination"))) {
-                        // A blink effect implemented using a delayed trigger
-                        return false;
-                    }
+                    // A blink effect implemented using a delayed trigger
+                    return !"Exile".equals(exec.getParam("Origin")) || !"Battlefield".equals(exec.getParam("Destination"));
                 }
-            } else if (causeSa.getHostCard() != null && causeSa.getHostCard().equals((Card)sa.getReplacingObject("Card"))
-                    && causeSa.getActivatingPlayer().equals(aiPlayer)) {
-                // This is an intrinsic effect that blinks the card (e.g. Obzedat, Ghost Council), no need to
-                // return the commander to the Command zone.
-                return false;
-            }
+            } else return causeSa.getHostCard() == null || !causeSa.getHostCard().equals(sa.getReplacingObject("Card"))
+                        || !causeSa.getActivatingPlayer().equals(aiPlayer);
         }
         
         // Normally we want the commander back in Command zone to recast him later

forge-ai/src/main/java/forge/ai/ability/ChangeZoneAllAi.java

@@ -335,11 +335,8 @@ public class ChangeZoneAllAi extends SpellAbilityAi {
         		return true;
 
         	// if AI creature is better than Human Creature
-        	if (ComputerUtilCard.evaluateCreatureList(aiCards) >= ComputerUtilCard
-                    .evaluateCreatureList(humanCards)) {
-                return true;
-            }
-        	return false;
+            return ComputerUtilCard.evaluateCreatureList(aiCards) >= ComputerUtilCard
+                    .evaluateCreatureList(humanCards);
         }
         return true;
     }
@@ -441,29 +438,21 @@ public class ChangeZoneAllAi extends SpellAbilityAi {
             if (sa.getParam("GainControl") != null) {
                 // Check if the cards are valuable enough
                 if ((CardLists.getNotType(humanType, "Creature").size() == 0) && (CardLists.getNotType(computerType, "Creature").size() == 0)) {
-                    if ((ComputerUtilCard.evaluateCreatureList(computerType) + ComputerUtilCard
-                            .evaluateCreatureList(humanType)) < 1) {
-                        return false;
-                    }
+                    return (ComputerUtilCard.evaluateCreatureList(computerType) + ComputerUtilCard
+                            .evaluateCreatureList(humanType)) >= 1;
                 } // otherwise evaluate both lists by CMC and pass only if human
                   // permanents are less valuable
-                else if ((ComputerUtilCard.evaluatePermanentList(computerType) + ComputerUtilCard
-                        .evaluatePermanentList(humanType)) < 1) {
-                    return false;
-                }
+                else return (ComputerUtilCard.evaluatePermanentList(computerType) + ComputerUtilCard
+                        .evaluatePermanentList(humanType)) >= 1;
             } else {
                 // don't activate if human gets more back than AI does
                 if ((CardLists.getNotType(humanType, "Creature").isEmpty()) && (CardLists.getNotType(computerType, "Creature").isEmpty())) {
-                    if (ComputerUtilCard.evaluateCreatureList(computerType) <= ComputerUtilCard
-                            .evaluateCreatureList(humanType)) {
-                        return false;
-                    }
+                    return ComputerUtilCard.evaluateCreatureList(computerType) > ComputerUtilCard
+                            .evaluateCreatureList(humanType);
                 } // otherwise evaluate both lists by CMC and pass only if human
                   // permanents are less valuable
-                else if (ComputerUtilCard.evaluatePermanentList(computerType) <= ComputerUtilCard
-                        .evaluatePermanentList(humanType)) {
-                    return false;
-                }
+                else return ComputerUtilCard.evaluatePermanentList(computerType) > ComputerUtilCard
+                        .evaluatePermanentList(humanType);
             }
         }
 

forge-ai/src/main/java/forge/ai/ability/ChooseCardAi.java

@@ -71,21 +71,15 @@ public class ChooseCardAi extends SpellAbilityAi {
             choices = CardLists.filterControlledBy(choices, ai.getOpponents());
         }
         if (aiLogic.equals("AtLeast1") || aiLogic.equals("OppPreferred")) {
-            if (choices.isEmpty()) {
-                return false;
-            }
+            return !choices.isEmpty();
         } else if (aiLogic.equals("AtLeast2") || aiLogic.equals("BestBlocker")) {
-            if (choices.size() < 2) {
-                return false;
-            }
+            return choices.size() >= 2;
         } else if (aiLogic.equals("Clone") || aiLogic.equals("Vesuva")) {
             final String filter = aiLogic.equals("Clone") ? "Permanent.YouDontCtrl,Permanent.nonLegendary"
                     : "Permanent.YouDontCtrl+notnamedVesuva,Permanent.nonLegendary+notnamedVesuva";
 
             choices = CardLists.getValidCards(choices, filter, host.getController(), host);
-            if (choices.isEmpty()) {
-                return false;
-            }
+            return !choices.isEmpty();
         } else if (aiLogic.equals("Never")) {
             return false;
         } else if (aiLogic.equals("NeedsPrevention")) {
@@ -103,9 +97,7 @@ public class ChooseCardAi extends SpellAbilityAi {
                     return ComputerUtilCombat.damageIfUnblocked(c, ai, combat, true) > ref;
                 }
             });
-            if (choices.isEmpty()) {
-                return false;
-            }
+            return !choices.isEmpty();
         } else if (aiLogic.equals("Ashiok")) {
             final int loyalty = host.getCounters(CounterType.LOYALTY) - 1;
             for (int i = loyalty; i >= 0; i--) {
@@ -117,13 +109,9 @@ public class ChooseCardAi extends SpellAbilityAi {
                 }
             }
 
-            if (choices.isEmpty()) {
-                return false;
-            }
+            return !choices.isEmpty();
         } else if (aiLogic.equals("RandomNonLand")) {
-            if (CardLists.getValidCards(choices, "Card.nonLand", host.getController(), host).isEmpty()) {
-                return false;
-            }
+            return !CardLists.getValidCards(choices, "Card.nonLand", host.getController(), host).isEmpty();
         } else if (aiLogic.equals("Duneblast")) {
             CardCollection aiCreatures = ai.getCreaturesInPlay();
             CardCollection oppCreatures = ai.getWeakestOpponent().getCreaturesInPlay();
@@ -139,10 +127,8 @@ public class ChooseCardAi extends SpellAbilityAi {
             aiCreatures.remove(chosen);
             int minGain = 200;
 
-            if ((ComputerUtilCard.evaluateCreatureList(aiCreatures) + minGain) >= ComputerUtilCard
-                    .evaluateCreatureList(oppCreatures)) {
-                return false;
-            }
+            return (ComputerUtilCard.evaluateCreatureList(aiCreatures) + minGain) < ComputerUtilCard
+                    .evaluateCreatureList(oppCreatures);
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/ChooseColorAi.java

@@ -52,10 +52,7 @@ public class ChooseColorAi extends SpellAbilityAi {
         }
 
         if ("Addle".equals(sourceName)) {
-            if (ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS) || ai.getWeakestOpponent().getCardsIn(ZoneType.Hand).isEmpty()) {
-                return false;
-            }
-            return true;
+            return !ph.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS) && !ai.getWeakestOpponent().getCardsIn(ZoneType.Hand).isEmpty();
         }
 
         if (logic.equals("MostExcessOpponentControls")) {

forge-ai/src/main/java/forge/ai/ability/ChooseDirectionAi.java

@@ -33,9 +33,7 @@ public class ChooseDirectionAi extends SpellAbilityAi {
                 CardCollection right = CardLists.filterControlledBy(all, game.getNextPlayerAfter(ai, Direction.Right));
                 int leftValue = Aggregates.sum(left, CardPredicates.Accessors.fnGetCmc);
                 int rightValue = Aggregates.sum(right, CardPredicates.Accessors.fnGetCmc);
-                if (aiValue > leftValue || aiValue > rightValue) {
-                    return false;
-                }
+                return aiValue <= leftValue && aiValue <= rightValue;
             }
         }
         return true;

forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java

@@ -385,9 +385,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
         final Player opp = player.getWeakestOpponent();
         if (opp != null) {
             // TODO add predict Combat Damage?
-            if (opp.getLife() < copy.getNetPower()) {
-                return true;
-            }
+            return opp.getLife() < copy.getNetPower();
         }
 
         // haste might not be good enough?

forge-ai/src/main/java/forge/ai/ability/ChooseSourceAi.java

@@ -97,10 +97,7 @@ public class ChooseSourceAi extends SpellAbilityAi {
                         return false;
                     }
                     int dmg = AbilityUtils.calculateAmount(threatSource, topStack.getParam("NumDmg"), topStack);
-                    if (ComputerUtilCombat.predictDamageTo(ai, dmg, threatSource, false) <= 0) {
-                        return false;
-                    }
-                    return true;
+                    return ComputerUtilCombat.predictDamageTo(ai, dmg, threatSource, false) > 0;
                 }
                 if (game.getPhaseHandler().getPhase() != PhaseType.COMBAT_DECLARE_BLOCKERS) {
                     return false;
@@ -119,9 +116,7 @@ public class ChooseSourceAi extends SpellAbilityAi {
                         return ComputerUtilCombat.damageIfUnblocked(c, ai, combat, true) > 0;
                     }
                 });
-                if (choices.isEmpty()) {
-                    return false;
-                }
+                return !choices.isEmpty();
             }
         }
 

forge-ai/src/main/java/forge/ai/ability/CloneAi.java

@@ -244,9 +244,6 @@ public class CloneAi extends SpellAbilityAi {
         }
 
         // don't activate during main2 unless this effect is permanent
-        if (ph.is(PhaseType.MAIN2) && !sa.hasParam("Permanent")) {
-            return false;
-        }
-        return true;
+        return !ph.is(PhaseType.MAIN2) || sa.hasParam("Permanent");
     }
 }

forge-ai/src/main/java/forge/ai/ability/ControlGainAi.java

@@ -84,9 +84,7 @@ public class ControlGainAi extends SpellAbilityAi {
             if (sa.hasParam("AllValid")) {
                 CardCollectionView tgtCards = CardLists.filterControlledBy(game.getCardsIn(ZoneType.Battlefield), opponents);
                 tgtCards = AbilityUtils.filterListByType(tgtCards, sa.getParam("AllValid"), sa);
-                if (tgtCards.isEmpty()) {
-                    return false;
-                }
+                return !tgtCards.isEmpty();
             }
             return true;
         } else {
@@ -247,7 +245,7 @@ public class ControlGainAi extends SpellAbilityAi {
                         break;
                     }
                 }
-            };
+            }
 
             if (t != null) {
                 sa.getTargets().add(t);
@@ -296,15 +294,12 @@ public class ControlGainAi extends SpellAbilityAi {
                 lose.addAll(Lists.newArrayList(sa.getParam("LoseControl").split(",")));
             }
 
-            if (lose.contains("EOT")
-                    && game.getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
-                return false;
-            }
+            return !lose.contains("EOT")
+                    || !game.getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS);
         } else {
             return this.canPlayAI(ai, sa);
         }
 
-        return true;
     } // pumpDrawbackAI()
 
     @Override

forge-ai/src/main/java/forge/ai/ability/CountersMoveAi.java

@@ -90,9 +90,7 @@ public class CountersMoveAi extends SpellAbilityAi {
             }
 
             // for Simic Fluxmage and other
-            if (!ph.getNextTurn().equals(ai) || ph.getPhase().isBefore(PhaseType.END_OF_TURN)) {
-                return false;
-            }
+            return ph.getNextTurn().equals(ai) && !ph.getPhase().isBefore(PhaseType.END_OF_TURN);
 
         } else if (CounterType.P1P1.equals(cType) && sa.hasParam("Defined")) {
             // something like Cyptoplast Root-kin
@@ -107,9 +105,7 @@ public class CountersMoveAi extends SpellAbilityAi {
             }
             // Make sure that removing the last counter doesn't kill the creature
             if ("Self".equals(sa.getParam("Source"))) {
-                if (host != null && host.getNetToughness() - 1 <= 0) {
-                    return false;
-                }
+                return host == null || host.getNetToughness() - 1 > 0;
             }
         }
         return true;
@@ -193,9 +189,7 @@ public class CountersMoveAi extends SpellAbilityAi {
 
                 // check for some specific AI preferences
                 if ("DontMoveCounterIfLethal".equals(sa.getParam("AILogic"))) {
-                    if (cType == CounterType.P1P1 && src.getNetToughness() - src.getTempToughnessBoost() - 1 <= 0) {
-                        return false;
-                    }
+                    return cType != CounterType.P1P1 || src.getNetToughness() - src.getTempToughnessBoost() - 1 > 0;
                 }
             }
             // no target
@@ -207,9 +201,7 @@ public class CountersMoveAi extends SpellAbilityAi {
     public boolean chkAIDrawback(SpellAbility sa, Player ai) {
         if (sa.usesTargeting()) {
             sa.resetTargets();
-            if (!moveTgtAI(ai, sa)) {
-                return false;
-            }
+            return moveTgtAI(ai, sa);
         }
 
         return true;
@@ -287,10 +279,7 @@ public class CountersMoveAi extends SpellAbilityAi {
                         // do not steal a P1P1 from Undying if it would die
                         // this way
                         if (CounterType.P1P1.equals(cType) && srcCardCpy.getNetToughness() <= 0) {
-                            if (srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING) || card.isToken()) {
-                                return true;
-                            }
-                            return false;
+                            return srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING) || card.isToken();
                         }
                         return true;
                     }

forge-ai/src/main/java/forge/ai/ability/CountersMultiplyAi.java

@@ -48,6 +48,7 @@ public class CountersMultiplyAi extends SpellAbilityAi {
                         if (!c.canReceiveCounters(counterType)) {
                             return false;
                         }
+
                     } else {
                         for (Map.Entry<CounterType, Integer> e : c.getCounters().entrySet()) {
                             // has negative counter it would double
@@ -96,10 +97,7 @@ public class CountersMultiplyAi extends SpellAbilityAi {
 
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
-        if (sa.usesTargeting() && !setTargets(ai, sa) && !mandatory) {
-            return false;
-        }
-        return true;
+        return !sa.usesTargeting() || setTargets(ai, sa) || mandatory;
     }
 
     private CounterType getCounterType(SpellAbility sa) {

forge-ai/src/main/java/forge/ai/ability/CountersProliferateAi.java

@@ -85,10 +85,7 @@ public class CountersProliferateAi extends SpellAbilityAi {
         }
 
 
-        if (cperms.isEmpty() && hperms.isEmpty() && !opponentPoison && !allyExpOrEnergy) {
-            return false;
-        }
-        return true;
+        return !cperms.isEmpty() || !hperms.isEmpty() || opponentPoison || allyExpOrEnergy;
     }
 
     @Override

forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java

@@ -469,7 +469,7 @@ public class CountersPutAi extends SpellAbilityAi {
                     int left = amount;
                     for (Card c : list) {
                         if (ComputerUtilCard.shouldPumpCard(ai, sa, c, i, i,
-                                Lists.<String>newArrayList())) {
+                                Lists.newArrayList())) {
                             sa.getTargets().add(c);
                             abTgt.addDividedAllocation(c, i);
                             left -= i;
@@ -506,7 +506,7 @@ public class CountersPutAi extends SpellAbilityAi {
                     if (type.equals("P1P1") && !SpellAbilityAi.isSorcerySpeed(sa)) {
                         for (Card c : list) {
                             if (ComputerUtilCard.shouldPumpCard(ai, sa, c, amount, amount,
-                                    Lists.<String>newArrayList())) {
+                                    Lists.newArrayList())) {
                                 choice = c;
                                 break;
                             }

forge-ai/src/main/java/forge/ai/ability/CountersRemoveAi.java

@@ -101,7 +101,7 @@ public class CountersRemoveAi extends SpellAbilityAi {
         }
 
         // Filter AI-specific targets if provided
-        list = ComputerUtil.filterAITgts(sa, ai, (CardCollection)list, false);
+        list = ComputerUtil.filterAITgts(sa, ai, list, false);
 
         boolean noLegendary = game.getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noLegendRule);
 

forge-ai/src/main/java/forge/ai/ability/DamageAiBase.java

@@ -37,9 +37,7 @@ public abstract class DamageAiBase extends SpellAbilityAi {
         }
         if ("SelfDamage".equals(sa.getParam("AILogic"))) {
             if (comp.getLife() * 0.75 < enemy.getLife()) {
-                if (!lifelink) {
-                    return true;
-                }
+                return !lifelink;
             }
         }
         return false;

forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java

@@ -80,10 +80,7 @@ public class DamageDealAi extends DamageAiBase {
                 dmg--; // the card will be spent casting the spell, so actual damage is 1 less
             }
         }
-        if (!this.damageTargetAI(ai, sa, dmg, true)) {
-            return false;
-        }
-        return true;
+        return this.damageTargetAI(ai, sa, dmg, true);
     }
 
     @Override
@@ -490,9 +487,7 @@ public class DamageDealAi extends DamageAiBase {
         for (final Object o : objects) {
             if (o instanceof Card) {
                 final Card c = (Card) o;
-                if (hPlay.contains(c)) {
-                    hPlay.remove(c);
-                }
+                hPlay.remove(c);
             }
         }
         hPlay = CardLists.getTargetableCards(hPlay, sa);
@@ -952,9 +947,7 @@ public class DamageDealAi extends DamageAiBase {
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         if (tgt == null) {
             // If it's not mandatory check a few things
-            if (!mandatory && !this.damageChooseNontargeted(ai, sa, dmg)) {
-                return false;
-            }
+            return mandatory || this.damageChooseNontargeted(ai, sa, dmg);
         } else {
             if (!this.damageChoosingTargets(ai, sa, tgt, dmg, mandatory, true) && !mandatory) {
                 return false;

forge-ai/src/main/java/forge/ai/ability/DebuffAi.java

@@ -124,7 +124,7 @@ public class DebuffAi extends SpellAbilityAi {
 
         final TargetRestrictions tgt = sa.getTargetRestrictions();
         sa.resetTargets();
-        CardCollection list = getCurseCreatures(ai, sa, kws == null ? Lists.<String>newArrayList() : kws);
+        CardCollection list = getCurseCreatures(ai, sa, kws == null ? Lists.newArrayList() : kws);
         list = CardLists.getValidCards(list, tgt.getValidTgts(), sa.getActivatingPlayer(), sa.getHostCard(), sa);
 
         // several uses here:

forge-ai/src/main/java/forge/ai/ability/DelayedTriggerAi.java

@@ -27,7 +27,7 @@ public class DelayedTriggerAi extends SpellAbilityAi {
         trigsa.setActivatingPlayer(ai);
 
         if (trigsa instanceof AbilitySub) {
-            return SpellApiToAi.Converter.get(((AbilitySub) trigsa).getApi()).chkDrawbackWithSubs(ai, (AbilitySub)trigsa);
+            return SpellApiToAi.Converter.get(trigsa.getApi()).chkDrawbackWithSubs(ai, (AbilitySub)trigsa);
         } else {
             return AiPlayDecision.WillPlay == ((PlayerControllerAi)ai.getController()).getAi().canPlaySa(trigsa);
         }

forge-ai/src/main/java/forge/ai/ability/DestroyAi.java

@@ -48,7 +48,7 @@ public class DestroyAi extends SpellAbilityAi {
                 return false;
             }
 
-            hasXCost = abCost.getCostMana() != null ? abCost.getCostMana().getAmountOfX() > 0 : false;
+            hasXCost = abCost.getCostMana() != null && abCost.getCostMana().getAmountOfX() > 0;
         }
 
         if ("AtOpponentsCombatOrAfter".equals(sa.getParam("AILogic"))) {
@@ -132,7 +132,7 @@ public class DestroyAi extends SpellAbilityAi {
             }
 
             // Filter AI-specific targets if provided
-            list = ComputerUtil.filterAITgts(sa, ai, (CardCollection)list, true);
+            list = ComputerUtil.filterAITgts(sa, ai, list, true);
 
             list = CardLists.getNotKeyword(list, Keyword.INDESTRUCTIBLE);
             if (CardLists.getNotType(list, "Creature").isEmpty()) {
@@ -296,8 +296,8 @@ public class DestroyAi extends SpellAbilityAi {
             }
 
             if (list.isEmpty()
-                || !CardLists.filterControlledBy(list, ai).isEmpty()
-                || CardLists.getNotKeyword(list, Keyword.INDESTRUCTIBLE).isEmpty()) {
+                    || !CardLists.filterControlledBy(list, ai).isEmpty()
+                    || CardLists.getNotKeyword(list, Keyword.INDESTRUCTIBLE).isEmpty()) {
                 return false;
             }
         }
@@ -342,7 +342,7 @@ public class DestroyAi extends SpellAbilityAi {
             }
 
             // Filter AI-specific targets if provided
-            preferred = ComputerUtil.filterAITgts(sa, ai, (CardCollection)preferred, true);
+            preferred = ComputerUtil.filterAITgts(sa, ai, preferred, true);
 
             for (final Card c : preferred) {
                 list.remove(c);
@@ -400,16 +400,11 @@ public class DestroyAi extends SpellAbilityAi {
                 }
             }
 
-            if (sa.getTargets().getNumTargeted() < tgt.getMinTargets(sa.getHostCard(), sa)) {
-                return false;
-            }
+            return sa.getTargets().getNumTargeted() >= tgt.getMinTargets(sa.getHostCard(), sa);
         } else {
-            if (!mandatory) {
-                return false;
-            }
+            return mandatory;
         }
 
-        return true;
     }
 
     public boolean doLandForLandRemovalLogic(SpellAbility sa, Player ai, Card tgtLand, String logic) {

forge-ai/src/main/java/forge/ai/ability/DestroyAllAi.java

@@ -147,7 +147,7 @@ public class DestroyAllAi extends SpellAbilityAi {
             block.assignBlockersForCombat(combat);
 
             if (ComputerUtilCombat.lifeInSeriousDanger(ai, combat)) {
-            	return true;
+                return true;
             }
             return false;
         } // only lands involved
@@ -171,7 +171,6 @@ public class DestroyAllAi extends SpellAbilityAi {
         else if ((ComputerUtilCard.evaluatePermanentList(ailist) + 3) >= ComputerUtilCard.evaluatePermanentList(opplist)) {
             return false;
         }
-
         return true;
     }
 }

forge-ai/src/main/java/forge/ai/ability/DrainManaAi.java

@@ -51,12 +51,9 @@ public class DrainManaAi extends SpellAbilityAi {
             } else {
                 final List<Player> defined = AbilityUtils.getDefinedPlayers(source, sa.getParam("Defined"), sa);
 
-                if (!defined.contains(opp)) {
-                    return false;
-                }
+                return defined.contains(opp);
             }
 
-            return true;
         } else {
             sa.resetTargets();
             sa.getTargets().add(opp);

forge-ai/src/main/java/forge/ai/ability/DrawAi.java

@@ -69,7 +69,7 @@ public class DrawAi extends SpellAbilityAi {
         }
 
         if (!canLoot(ai, sa)) {
-                return false;
+            return false;
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/EffectAi.java

@@ -283,11 +283,7 @@ public class EffectAi extends SpellAbilityAi {
                     return false;
                 }
                 final SpellAbility topStack = game.getStack().peekAbility();
-                if (topStack.getActivatingPlayer().isOpponentOf(ai) && topStack.getApi() == ApiType.GainLife) {
-                	return true;
-                } else {
-                	return false;
-                }
+                return topStack.getActivatingPlayer().isOpponentOf(ai) && topStack.getApi() == ApiType.GainLife;
             } else if (logic.equals("Fight")) {
                 return FightAi.canFightAi(ai, sa, 0, 0);
             } else if (logic.equals("Burn")) {
@@ -301,11 +297,9 @@ public class EffectAi extends SpellAbilityAi {
                     return false;
                 }
                 if (logic.contains(":")) {
-                    String k[] = logic.split(":");
+                    String[] k = logic.split(":");
                     Integer i = Integer.valueOf(k[1]);
-                    if (ai.getCreaturesInPlay().size() < i) {
-                        return false;
-                    }
+                    return ai.getCreaturesInPlay().size() >= i;
                 }
                 return true;
             } else if (logic.equals("CastFromGraveThisTurn")) {

forge-ai/src/main/java/forge/ai/ability/FightAi.java

@@ -273,10 +273,10 @@ public class FightAi extends SpellAbilityAi {
     		if (!canKill(opponent, fighter, -pumpDefense)) {	// can survive
     			return true;
     		} else {
-    			if (MyRandom.getRandom().nextInt(20)<(opponent.getCMC() - fighter.getCMC())) {	// trade
-    				return true;
-    			}
-    		}
+                if (MyRandom.getRandom().nextInt(20)<(opponent.getCMC() - fighter.getCMC())) {	// trade
+                    return true;
+                }
+            }
     	}
     	return false;
     }

forge-ai/src/main/java/forge/ai/ability/FlipACoinAi.java

@@ -20,9 +20,9 @@ public class FlipACoinAi extends SpellAbilityAi {
             if (AILogic.equals("Never")) {
                 return false;
             } else if (AILogic.equals("PhaseOut")) {
-            	if (!ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(sa.getHostCard())) {
+                if (!ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(sa.getHostCard())) {
                     return false;
-            	}
+                }
             } else if (AILogic.equals("KillOrcs")) {
             	if (ai.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.END_OF_TURN) ) {
                     return false;

forge-ai/src/main/java/forge/ai/ability/GameWinAi.java

@@ -11,9 +11,7 @@ public class GameWinAi extends SpellAbilityAi {
      */
     @Override
     protected boolean canPlayAI(Player ai, SpellAbility sa) {
-        if (ai.cantWin()) {
-            return false;
-        }
+        return !ai.cantWin();
 
         // TODO Check conditions are met on card (e.g. Coalition Victory)
 
@@ -21,7 +19,6 @@ public class GameWinAi extends SpellAbilityAi {
 
         // In general, don't return true.
         // But this card wins the game, I can make an exception for that
-        return true;
     }
 
     @Override

forge-ai/src/main/java/forge/ai/ability/LifeGainAi.java

@@ -106,13 +106,9 @@ public class LifeGainAi extends SpellAbilityAi {
             return false;
         }
 
-        if (!lifeCritical && !activateForCost
-                && (!ph.getNextTurn().equals(ai) || ph.getPhase().isBefore(PhaseType.END_OF_TURN))
-                && !sa.hasParam("PlayerTurn") && !SpellAbilityAi.isSorcerySpeed(sa)) {
-            return false;
-        }
-
-        return true;
+        return lifeCritical || activateForCost
+                || (ph.getNextTurn().equals(ai) && !ph.getPhase().isBefore(PhaseType.END_OF_TURN))
+                || sa.hasParam("PlayerTurn") || SpellAbilityAi.isSorcerySpeed(sa);
     }
 
     /*
@@ -304,9 +300,7 @@ public class LifeGainAi extends SpellAbilityAi {
                     hasTgt = true;
                 }
             }
-            if (!hasTgt) {
-                return false;
-            }
+            return hasTgt;
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/LifeLoseAi.java

@@ -53,9 +53,7 @@ public class LifeLoseAi extends SpellAbilityAi {
         }
 
         if (sa.usesTargeting()) {
-            if (!doTgt(ai, sa, false)) {
-                return false;
-            }
+            return doTgt(ai, sa, false);
         }
 
         return true;
@@ -187,12 +185,8 @@ public class LifeLoseAi extends SpellAbilityAi {
                 ? new FCollection<Player>(sa.getTargets().getTargetPlayers()) 
                 : AbilityUtils.getDefinedPlayers(sa.getHostCard(), sa.getParam("Defined"), sa);
 
-        if (!mandatory && tgtPlayers.contains(ai) && amount > 0 && amount + 3 > ai.getLife()) {
-            // For cards like Foul Imp, ETB you lose life
-            return false;
-        }
-
-        return true;
+        // For cards like Foul Imp, ETB you lose life
+        return mandatory || !tgtPlayers.contains(ai) || amount <= 0 || amount + 3 <= ai.getLife();
     }
 
     protected boolean doTgt(Player ai, SpellAbility sa, boolean mandatory) {

forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java

@@ -81,11 +81,8 @@ public class ManaEffectAi extends SpellAbilityAi {
             return true; // handled elsewhere, does not meet the standard requirements
         }
 
-        if (!(sa.getPayCosts() != null && sa.getPayCosts().hasNoManaCost() && sa.getPayCosts().isReusuableResource()
-                && sa.getSubAbility() == null && ComputerUtil.playImmediately(ai, sa))) {
-            return false;
-        }
-        return true;
+        return sa.getPayCosts() != null && sa.getPayCosts().hasNoManaCost() && sa.getPayCosts().isReusuableResource()
+                && sa.getSubAbility() == null && ComputerUtil.playImmediately(ai, sa);
         // return super.checkApiLogic(ai, sa);
     }
 

forge-ai/src/main/java/forge/ai/ability/ManifestAi.java

@@ -185,10 +185,7 @@ public class ManifestAi extends SpellAbilityAi {
         CardCollection filtered = CardLists.filter(options, new Predicate<Card>() {
             @Override
             public boolean apply(Card input) {
-                if (shouldManyfest(input, ai, sa)) {
-                    return false;
-                }
-                return true;
+                return !shouldManyfest(input, ai, sa);
             }
         });
         if (!filtered.isEmpty()) {

forge-ai/src/main/java/forge/ai/ability/MillAi.java

@@ -31,19 +31,13 @@ public class MillAi extends SpellAbilityAi {
         PhaseHandler ph = ai.getGame().getPhaseHandler();
 
         if (aiLogic.equals("Main1")) {
-            if (ph.getPhase().isBefore(PhaseType.MAIN2) && !sa.hasParam("ActivationPhases")
-                    && !ComputerUtil.castSpellInMain1(ai, sa)) {
-                return false;
-            }
+            return !ph.getPhase().isBefore(PhaseType.MAIN2) || sa.hasParam("ActivationPhases")
+                    || ComputerUtil.castSpellInMain1(ai, sa);
         } else if (aiLogic.equals("EndOfOppTurn")) {
-            if (!(ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai))) {
-                return false;
-            }
+            return ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai);
         } else if (aiLogic.equals("LilianaMill")) {
             // Only mill if a "Raise Dead" target is available, in case of control decks with few creatures
-            if (CardLists.filter(ai.getCardsIn(ZoneType.Graveyard), CardPredicates.Presets.CREATURES).size() < 1) {
-                return false;
-            }
+            return CardLists.filter(ai.getCardsIn(ZoneType.Graveyard), CardPredicates.Presets.CREATURES).size() >= 1;
         }
         return true;
     }
@@ -62,11 +56,9 @@ public class MillAi extends SpellAbilityAi {
             }
         }
         if (sa.getHostCard().isCreature() && sa.getPayCosts().hasTapCost()) {
-            if (!(ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai))) {
-                // creatures with a tap cost to mill (e.g. Doorkeeper) should be activated at the opponent's end step
-                // because they are also potentially useful for combat
-                return false;
-            }
+            // creatures with a tap cost to mill (e.g. Doorkeeper) should be activated at the opponent's end step
+            // because they are also potentially useful for combat
+            return ph.is(PhaseType.END_OF_TURN) && ph.getNextTurn().equals(ai);
         }
         return true;
     }
@@ -100,9 +92,7 @@ public class MillAi extends SpellAbilityAi {
             // Set PayX here to maximum value.
             final int cardsToDiscard = getNumToDiscard(ai, sa);
             source.setSVar("PayX", Integer.toString(cardsToDiscard));
-            if (cardsToDiscard <= 0) {
-                return false;
-            }
+            return cardsToDiscard > 0;
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/PeekAndRevealAi.java

@@ -24,10 +24,10 @@ public class PeekAndRevealAi extends SpellAbilityAi {
             return false;
         }
         if ("Main2".equals(sa.getParam("AILogic"))) {
-        	if (aiPlayer.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)) {
-        		return false;
-    		}
-    	}
+            if (aiPlayer.getGame().getPhaseHandler().getPhase().isBefore(PhaseType.MAIN2)) {
+                return false;
+            }
+        }
         // So far this only appears on Triggers, but will expand
         // once things get converted from Dig + NoMove
         return true;

forge-ai/src/main/java/forge/ai/ability/PermanentAi.java

@@ -38,10 +38,7 @@ public class PermanentAi extends SpellAbilityAi {
         }
 
         // Wait for Main2 if possible
-        if (ph.is(PhaseType.MAIN1) && ph.isPlayerTurn(ai) && !ComputerUtil.castPermanentInMain1(ai, sa) && !sa.hasParam("WithoutManaCost")) {
-            return false;
-        }
-        return true;
+        return !ph.is(PhaseType.MAIN1) || !ph.isPlayerTurn(ai) || ComputerUtil.castPermanentInMain1(ai, sa) || sa.hasParam("WithoutManaCost");
     }
 
     /**
@@ -259,9 +256,7 @@ public class PermanentAi extends SpellAbilityAi {
                 }
             }
 
-            if (dontCast) {
-                return false;
-            } 
+            return !dontCast;
         }
         
         return true;

forge-ai/src/main/java/forge/ai/ability/PermanentCreatureAi.java

@@ -40,9 +40,7 @@ public class PermanentCreatureAi extends PermanentAi {
 
             ComputerUtilCard.applyStaticContPT(game, copy, null);
 
-            if (copy.getNetToughness() <= 0) {
-                return false;
-            }
+            return copy.getNetToughness() > 0;
         }
         return true;
     }
@@ -225,13 +223,9 @@ public class PermanentCreatureAi extends PermanentAi {
          */
         final Card copy = CardUtil.getLKICopy(sa.getHostCard());
         ComputerUtilCard.applyStaticContPT(game, copy, null);
-        if (copy.getNetToughness() <= 0 && !copy.hasStartOfKeyword("etbCounter") && mana.countX() == 0
-                && !copy.hasETBTrigger(false) && !copy.hasETBReplacement() && !copy.hasSVar("NoZeroToughnessAI")) {
-            // AiPlayDecision.WouldBecomeZeroToughnessCreature
-            return false;
-        }
-
-        return true;
+        // AiPlayDecision.WouldBecomeZeroToughnessCreature
+        return copy.getNetToughness() > 0 || copy.hasStartOfKeyword("etbCounter") || mana.countX() != 0
+                || copy.hasETBTrigger(false) || copy.hasETBReplacement() || copy.hasSVar("NoZeroToughnessAI");
     }
 
 }

forge-ai/src/main/java/forge/ai/ability/PermanentNoncreatureAi.java

@@ -19,10 +19,7 @@ public class PermanentNoncreatureAi extends PermanentAi {
 
     @Override
     protected boolean checkAiLogic(final Player ai, final SpellAbility sa, final String aiLogic) {
-        if ("Never".equals(aiLogic) || "DontCast".equals(aiLogic)) {
-            return false;
-        }
-        return true;
+        return !"Never".equals(aiLogic) && !"DontCast".equals(aiLogic);
     }
 
     /**
@@ -54,10 +51,8 @@ public class PermanentNoncreatureAi extends PermanentAi {
                 // TODO: consider replacing the condition with host.hasSVar("OblivionRing")
                 targets = CardLists.filterControlledBy(targets, ai.getOpponents());
             }
-            if (targets.isEmpty()) {
-                // AiPlayDecision.AnotherTime
-                return false;
-            }
+            // AiPlayDecision.AnotherTime
+            return !targets.isEmpty();
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/PhasesAi.java

@@ -33,9 +33,7 @@ public class PhasesAi extends SpellAbilityAi {
             if (tgtCards.contains(source)) {
                 // Protect it from something
                 final boolean isThreatened = ComputerUtil.predictThreatenedObjects(aiPlayer, null, true).contains(source);
-                if (isThreatened) {
-                    return true;
-                }
+                return isThreatened;
             } else {
                 // Card def = tgtCards.get(0);
                 // Phase this out if it might attack me, or before it can be

forge-ai/src/main/java/forge/ai/ability/PlayAi.java

@@ -178,11 +178,7 @@ public class PlayAi extends SpellAbilityAi {
                         // Before accepting, see if the spell has a valid number of targets (it should at this point).
                         // Proceeding past this point if the spell is not correctly targeted will result
                         // in "Failed to add to stack" error and the card disappearing from the game completely.
-                        if (!spell.isTargetNumberValid()) {
-                            return false;
-                        }
-
-                        return true;
+                        return spell.isTargetNumberValid();
                     }
                 }
                 return false;

forge-ai/src/main/java/forge/ai/ability/PoisonAi.java

@@ -24,11 +24,8 @@ public class PoisonAi extends SpellAbilityAi {
      */
     @Override
     protected boolean checkPhaseRestrictions(final Player ai, final SpellAbility sa, final PhaseHandler ph) {
-        if (ph.getPhase().isBefore(PhaseType.MAIN2)
-                && !sa.hasParam("ActivationPhases")) {
-            return false;
-        }
-        return true;
+        return !ph.getPhase().isBefore(PhaseType.MAIN2)
+                || sa.hasParam("ActivationPhases");
     }
 
     /*
@@ -83,7 +80,6 @@ public class PoisonAi extends SpellAbilityAi {
                 return false;
             }
         }
-
         return true;
     }
 
@@ -99,7 +95,6 @@ public class PoisonAi extends SpellAbilityAi {
                     } else if (!input.canReceiveCounters(CounterType.POISON)) {
                         return false;
                     }
-
                     return true;
                 }
 
@@ -132,10 +127,7 @@ public class PoisonAi extends SpellAbilityAi {
                             if (input.cantLose()) {
                                 return true;
                             }
-                            if (!input.canReceiveCounters(CounterType.POISON)) {
-                                return true;
-                            }
-                            return false;
+                            return !input.canReceiveCounters(CounterType.POISON);
                         }
 
                     });

forge-ai/src/main/java/forge/ai/ability/ProtectAi.java

@@ -162,11 +162,8 @@ public class ProtectAi extends SpellAbilityAi {
     @Override
     protected boolean checkPhaseRestrictions(final Player ai, final SpellAbility sa, final PhaseHandler ph) {
         final boolean notAiMain1 = !(ph.getPlayerTurn() == ai && ph.getPhase() == PhaseType.MAIN1);
-        if (SpellAbilityAi.isSorcerySpeed(sa) && notAiMain1) {
-            // sorceries can only give protection in order to create an unblockable attacker
-            return false;
-        }
-        return true;
+        // sorceries can only give protection in order to create an unblockable attacker
+        return !SpellAbilityAi.isSorcerySpeed(sa) || !notAiMain1;
     }
     
     @Override
@@ -177,9 +174,7 @@ public class ProtectAi extends SpellAbilityAi {
                 return false;
             } else if (cards.size() == 1) {
                 // Affecting single card
-                if ((getProtectCreatures(ai, sa)).contains(cards.get(0))) {
-                    return true;
-                }
+                return (getProtectCreatures(ai, sa)).contains(cards.get(0));
             }
             /*
              * when this happens we need to expand AI to consider if its ok

forge-ai/src/main/java/forge/ai/ability/PumpAi.java

@@ -92,10 +92,7 @@ public class PumpAi extends PumpAiBase {
                 return true;
             }
 
-            if (!ph.getNextTurn().equals(ai) || ph.getPhase().isBefore(PhaseType.END_OF_TURN)) {
-                return false;
-            }
-            return true;
+            return ph.getNextTurn().equals(ai) && !ph.getPhase().isBefore(PhaseType.END_OF_TURN);
         } else if (logic.equals("Aristocrat")) {
             final boolean isThreatened = ComputerUtil.predictThreatenedObjects(ai, null, true).contains(sa.getHostCard());
             if (!ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS) && !isThreatened) {
@@ -121,9 +118,7 @@ public class PumpAi extends PumpAiBase {
                 || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS))) {
             // Instant-speed pumps should not be cast outside of combat when the
             // stack is empty
-            if (!sa.isCurse() && !SpellAbilityAi.isSorcerySpeed(sa) && !main1Preferred) {
-                return false;
-            }
+            return sa.isCurse() || SpellAbilityAi.isSorcerySpeed(sa) || main1Preferred;
         }
         return true;
     }
@@ -134,7 +129,7 @@ public class PumpAi extends PumpAiBase {
         final Card source = sa.getHostCard();
         final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa);
         final List<String> keywords = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & "))
-                : Lists.<String>newArrayList();
+                : Lists.newArrayList();
         final String numDefense = sa.hasParam("NumDef") ? sa.getParam("NumDef") : "";
         final String numAttack = sa.hasParam("NumAtt") ? sa.getParam("NumAtt") : "";
 
@@ -191,11 +186,8 @@ public class PumpAi extends PumpAiBase {
                             srcCardCpy.setCounters(cType, srcCardCpy.getCounters(cType) - amount);
 
                             if (CounterType.P1P1.equals(cType) && srcCardCpy.getNetToughness() <= 0) {
-                                if (srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING)
-                                        || card.isToken()) {
-                                    return true;
-                                }
-                                return false;
+                                return srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING)
+                                        || card.isToken();
                             }
                             return false;
                         }
@@ -244,11 +236,8 @@ public class PumpAi extends PumpAiBase {
                                 srcCardCpy.setCounters(cType, srcCardCpy.getCounters(cType) - amount);
 
                                 if (CounterType.P1P1.equals(cType) && srcCardCpy.getNetToughness() <= 0) {
-                                    if (srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING)
-                                            || card.isToken()) {
-                                        return true;
-                                    }
-                                    return false;
+                                    return srcCardCpy.getCounters(cType) > 0 || !card.hasKeyword(Keyword.UNDYING)
+                                            || card.isToken();
                                 }
                                 return true;
                             }
@@ -395,9 +384,7 @@ public class PumpAi extends PumpAiBase {
                         Card pumped = ComputerUtilCard.getPumpedCreature(ai, sa, card, 0, 0, keywords);
                         if (game.getPhaseHandler().is(PhaseType.COMBAT_DECLARE_ATTACKERS, ai)
                                 || game.getPhaseHandler().is(PhaseType.COMBAT_BEGIN, ai)) {
-                            if (!ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, pumped)) {
-                                return false;
-                            }
+                            return ComputerUtilCard.doesSpecifiedCreatureAttackAI(ai, pumped);
                         }
 
                         return true;
@@ -432,7 +419,7 @@ public class PumpAi extends PumpAiBase {
     private boolean pumpTgtAI(final Player ai, final SpellAbility sa, final int defense, final int attack, final boolean mandatory,
     		boolean immediately) {
         final List<String> keywords = sa.hasParam("KW") ? Arrays.asList(sa.getParam("KW").split(" & "))
-                : Lists.<String>newArrayList();
+                : Lists.newArrayList();
         final Game game = ai.getGame();
         final Card source = sa.getHostCard();
         final boolean isFight = "Fight".equals(sa.getParam("AILogic")) || "PowerDmg".equals(sa.getParam("AILogic"));
@@ -555,7 +542,7 @@ public class PumpAi extends PumpAiBase {
         }
 
         // Filter AI-specific targets if provided
-        list = ComputerUtil.filterAITgts(sa, ai, (CardCollection)list, true);
+        list = ComputerUtil.filterAITgts(sa, ai, list, true);
 
         if (list.isEmpty()) {
             if (ComputerUtil.activateForCost(sa, ai)) {
@@ -788,15 +775,11 @@ public class PumpAi extends PumpAiBase {
                 if (!source.hasKeyword(Keyword.INDESTRUCTIBLE) && source.getNetToughness() + defense <= source.getDamage()) {
                     return false;
                 }
-                if (source.getNetToughness() + defense <= 0) {
-                    return false;
-                }
+                return source.getNetToughness() + defense > 0;
             }
         } else {
             //Targeted
-            if (!pumpTgtAI(ai, sa, defense, attack, false, true)) {
-                return false;
-            }
+            return pumpTgtAI(ai, sa, defense, attack, false, true);
         }
 
         return true;
@@ -849,9 +832,7 @@ public class PumpAi extends PumpAiBase {
                                 }
                             }
                     );
-                    if (sacFodder.size() >= numCreatsToSac) {
-                        return true;
-                    }
+                    return sacFodder.size() >= numCreatsToSac;
                 }
             }
 

forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java

@@ -56,24 +56,17 @@ public abstract class PumpAiBase extends SpellAbilityAi {
         if (!CardUtil.isStackingKeyword(keyword) && card.hasKeyword(keyword)) {
             return false;
         } else if (keyword.equals("Defender") || keyword.endsWith("CARDNAME can't attack.")) {
-            if (!ph.isPlayerTurn(card.getController()) || !CombatUtil.canAttack(card, ai)
-                    || (card.getNetCombatDamage() <= 0)
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
-                return false;
-            }
+            return ph.isPlayerTurn(card.getController()) && CombatUtil.canAttack(card, ai)
+                    && (card.getNetCombatDamage() > 0)
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS);
         } else if (keyword.endsWith("CARDNAME can't attack or block.")) {
             if (sa.hasParam("UntilYourNextTurn")) {
-                if (CombatUtil.canAttack(card, ai) || CombatUtil.canBlock(card, true)) {
-                    return true;
-                }
-                return false;
+                return CombatUtil.canAttack(card, ai) || CombatUtil.canBlock(card, true);
             }
             if (!ph.isPlayerTurn(ai)) {
-                if (!CombatUtil.canAttack(card, ai)
-                        || (card.getNetCombatDamage() <= 0)
-                        || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
-                    return false;
-                }
+                return CombatUtil.canAttack(card, ai)
+                        && (card.getNetCombatDamage() > 0)
+                        && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS);
             } else {
                 if (ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
                         || ph.getPhase().isBefore(PhaseType.MAIN1)) {
@@ -90,9 +83,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                         return CombatUtil.canAttack(c, card.getController()) || (combat != null && combat.isAttacking(c));
                     }
                 });
-                if (!CombatUtil.canBlockAtLeastOne(card, attackers)) {
-                    return false;
-                }
+                return CombatUtil.canBlockAtLeastOne(card, attackers);
             }
         } else if (keyword.endsWith("CARDNAME can't block.")) {
             if (!ph.isPlayerTurn(ai) || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
@@ -112,24 +103,18 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                             && card.getController().equals(combat.getDefenderPlayerByAttacker(c)));
                 }
             });
-            if (!CombatUtil.canBlockAtLeastOne(card, attackers)) {
-                return false;
-            }
+            return CombatUtil.canBlockAtLeastOne(card, attackers);
         } else if (keyword.endsWith("CantBlockCardUIDSource")) {    // can't block CARDNAME this turn
             if (!ph.isPlayerTurn(ai) || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
                     || ph.getPhase().isBefore(PhaseType.MAIN1) || !CombatUtil.canBlock(sa.getHostCard(), card)) {
                 return false;
             }
             // target needs to be a creature, controlled by the player which is attacked
-            if (sa.getHostCard().isTapped() && (combat == null || !combat.isAttacking(sa.getHostCard())
-                    || !card.getController().equals(combat.getDefenderPlayerByAttacker(sa.getHostCard())))) {
-                return false;
-            }
+            return !sa.getHostCard().isTapped() || (combat != null && combat.isAttacking(sa.getHostCard())
+                    && card.getController().equals(combat.getDefenderPlayerByAttacker(sa.getHostCard())));
         } else if (keyword.endsWith("This card doesn't untap during your next untap step.")) {
-            if (ph.getPhase().isBefore(PhaseType.MAIN2) || card.isUntapped() || !ph.isPlayerTurn(ai)
-                    || !Untap.canUntap(card)) {
-                return false;
-            }
+            return !ph.getPhase().isBefore(PhaseType.MAIN2) && !card.isUntapped() && ph.isPlayerTurn(ai)
+                    && Untap.canUntap(card);
         } else if (keyword.endsWith("Prevent all combat damage that would be dealt by CARDNAME.")
                 || keyword.endsWith("Prevent all damage that would be dealt by CARDNAME.")) {
             if (ph.isPlayerTurn(ai) && (!(CombatUtil.canBlock(card) || combat != null && combat.isBlocking(card))
@@ -139,28 +124,18 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     || CardLists.getNotKeyword(ai.getCreaturesInPlay(), Keyword.DEFENDER).isEmpty())) {
                 return false;
             }
-            if (!ph.isPlayerTurn(ai) && (combat == null || !combat.isAttacking(card) || card.getNetCombatDamage() <= 0)) {
-                return false;
-            }
+            return ph.isPlayerTurn(ai) || (combat != null && combat.isAttacking(card) && card.getNetCombatDamage() > 0);
         } else if (keyword.endsWith("CARDNAME attacks each turn if able.")
                 || keyword.endsWith("CARDNAME attacks each combat if able.")) {
-            if (ph.isPlayerTurn(ai) || !CombatUtil.canAttack(card, ai) || !CombatUtil.canBeBlocked(card, ai)
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
-                return false;
-            }
+            return !ph.isPlayerTurn(ai) && CombatUtil.canAttack(card, ai) && CombatUtil.canBeBlocked(card, ai)
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS);
         } else if (keyword.endsWith("CARDNAME can't be regenerated.")) {
             if (card.getShieldCount() > 0) {
                 return true;
             }
-            if (card.hasKeyword("If CARDNAME would be destroyed, regenerate it.") && combat != null
-                    && (combat.isBlocked(card) || combat.isBlocking(card))) {
-                return true;
-            }
-            return false;
-        } else if (keyword.endsWith("CARDNAME's activated abilities can't be activated.")) {
-            return false; //too complex
-        }
-        return true;
+            return card.hasKeyword("If CARDNAME would be destroyed, regenerate it.") && combat != null
+                    && (combat.isBlocked(card) || combat.isBlocking(card));
+        } else return !keyword.endsWith("CARDNAME's activated abilities can't be activated."); //too complex
     }
 
     /**
@@ -187,12 +162,10 @@ public abstract class PumpAiBase extends SpellAbilityAi {
         final boolean evasive = (keyword.endsWith("Unblockable") || keyword.endsWith("Shadow") || keyword.startsWith("CantBeBlockedBy"));
         // give evasive keywords to creatures that can or do attack
         if (evasive) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.endsWith("Flying")) {
             CardCollectionView attackingFlyer = CardCollection.EMPTY;
             if (combat != null) {
@@ -221,13 +194,11 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     }
                 }
             }
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || !Iterables.any(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
-                            Predicates.not(flyingOrReach))) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && Iterables.any(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
+                    Predicates.not(flyingOrReach));
         } else if (keyword.endsWith("Horsemanship")) {
             if (ph.isPlayerTurn(opp)
                     && ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)
@@ -236,46 +207,35 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     && ComputerUtilCombat.lifeInDanger(ai, game.getCombat())) {
                 return true;
             }
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getNotKeyword(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
-                            Keyword.HORSEMANSHIP).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getNotKeyword(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
+                    Keyword.HORSEMANSHIP).isEmpty();
         } else if (keyword.endsWith("Intimidate")) {
-        	if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getNotType(CardLists.filter(
-                    		opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)), "Artifact").isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getNotType(CardLists.filter(
+                    opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)), "Artifact").isEmpty();
         } else if (keyword.endsWith("Fear")) {
-        	if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getNotColor(CardLists.getNotType(CardLists.filter(
-                    		opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)), "Artifact"), MagicColor.BLACK).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getNotColor(CardLists.getNotType(CardLists.filter(
+                    opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)), "Artifact"), MagicColor.BLACK).isEmpty();
         } else if (keyword.endsWith("Haste")) {
-            if (!card.hasSickness() || ph.isPlayerTurn(opp) || card.isTapped()
-                    || newPower <= 0
-                    || card.hasKeyword("CARDNAME can attack as though it had haste.")
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || !ComputerUtilCombat.canAttackNextTurn(card)) {
-                return false;
-            }
+            return card.hasSickness() && !ph.isPlayerTurn(opp) && !card.isTapped()
+                    && newPower > 0
+                    && !card.hasKeyword("CARDNAME can attack as though it had haste.")
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && ComputerUtilCombat.canAttackNextTurn(card);
         } else if (keyword.endsWith("Indestructible")) {
             // Predicting threatened objects in relevant non-combat situations happens elsewhere,
             // so we are only worrying about combat relevance of Indestructible at this point.
-            if (combat == null
-                    || !((combat.isBlocked(card) || combat.isBlocking(card))
-                    && ComputerUtilCombat.combatantWouldBeDestroyed(ai, card, combat))) {
-                return false;
-            }
-            return true;
+            return combat != null
+                    && ((combat.isBlocked(card) || combat.isBlocking(card))
+                    && ComputerUtilCombat.combatantWouldBeDestroyed(ai, card, combat));
         } else if (keyword.endsWith("Deathtouch")) {
             if (ph.isPlayerTurn(opp) && ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
                 List<Card> attackers = combat.getAttackers();
@@ -297,12 +257,10 @@ public abstract class PumpAiBase extends SpellAbilityAi {
             }
             return false;
         } else if (keyword.equals("Bushido")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
-                    || opp.getCreaturesInPlay().isEmpty()
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)
+                    && !opp.getCreaturesInPlay().isEmpty()
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.equals("First Strike")) {
             if (card.hasKeyword(Keyword.DOUBLE_STRIKE)) {
                 return false;
@@ -321,40 +279,31 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                 if (!ComputerUtilCombat.canDestroyAttacker(ai, attacker, card, combat, true) 
                         && ComputerUtilCombat.canDestroyAttacker(ai, attacker, card, combat, false))
                 	return true;
-                if (ComputerUtilCombat.canDestroyBlocker(ai, card, attacker, combat, true) 
-                        && !ComputerUtilCombat.canDestroyBlocker(ai, card, attacker, combat, false))
-                	return true;
+                return ComputerUtilCombat.canDestroyBlocker(ai, card, attacker, combat, true)
+                        && !ComputerUtilCombat.canDestroyBlocker(ai, card, attacker, combat, false);
             }
             return false;
         } else if (keyword.equals("Double Strike")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || newPower <= 0
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && newPower > 0
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS);
         } else if (keyword.startsWith("Rampage")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-            		|| newPower <= 0
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).size() < 2) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && newPower > 0
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).size() >= 2;
         } else if (keyword.startsWith("Flanking")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-            		|| newPower <= 0
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || CardLists.getNotKeyword(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
-                            Keyword.FLANKING).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && newPower > 0
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && !CardLists.getNotKeyword(CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)),
+                    Keyword.FLANKING).isEmpty();
         } else if (keyword.startsWith("Trample")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || !CombatUtil.canBeBlocked(card, opp)
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 1
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && CombatUtil.canBeBlocked(card, opp)
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 1
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.equals("Infect")) {
             if (newPower <= 0) {
                 return false;
@@ -362,11 +311,9 @@ public abstract class PumpAiBase extends SpellAbilityAi {
             if (combat != null && combat.isBlocking(card) && !card.hasKeyword(Keyword.WITHER)) {
                 return true;
             }
-            if ((ph.isPlayerTurn(opp))
-                    || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
-                return false;
-            }
+            return (!ph.isPlayerTurn(opp))
+                    && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS);
         } else if (keyword.endsWith("Wither")) {
             if (newPower <= 0 || card.hasKeyword(Keyword.INFECT)) {
                 return false;
@@ -378,20 +325,16 @@ public abstract class PumpAiBase extends SpellAbilityAi {
             }
             return combat != null && ( combat.isAttacking(card) || combat.isBlocking(card) );
         } else if (keyword.equals("Vigilance")) {
-            if (ph.isPlayerTurn(opp) || !CombatUtil.canAttack(card, opp)
-            		|| newPower <= 0
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || CardLists.getNotKeyword(opp.getCreaturesInPlay(), Keyword.DEFENDER).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && CombatUtil.canAttack(card, opp)
+                    && newPower > 0
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && !CardLists.getNotKeyword(opp.getCreaturesInPlay(), Keyword.DEFENDER).isEmpty();
         } else if (keyword.equals("Reach")) {
-            if (ph.isPlayerTurn(ai)
-                    || !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || CardLists.getKeyword(game.getCombat().getAttackers(), Keyword.FLYING).isEmpty()
-                    || card.hasKeyword(Keyword.FLYING)
-                    || !CombatUtil.canBlock(card)) {
-                return false;
-            }
+            return !ph.isPlayerTurn(ai)
+                    && ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && !CardLists.getKeyword(game.getCombat().getAttackers(), Keyword.FLYING).isEmpty()
+                    && !card.hasKeyword(Keyword.FLYING)
+                    && CombatUtil.canBlock(card);
         } else if (keyword.endsWith("CARDNAME can block an additional creature each combat.")) {
             if (ph.isPlayerTurn(ai)
                     || !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
@@ -407,63 +350,43 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                     }
                 }
             }
-            if (possibleBlockNum <= canBlockNum) {
-                return false;
-            }
+            return possibleBlockNum > canBlockNum;
         } else if (keyword.equals("Shroud") || keyword.equals("Hexproof")) {
-            if (!ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(card)) {
-                return false;
-            }
+            return ComputerUtil.predictThreatenedObjects(sa.getActivatingPlayer(), sa).contains(card);
         } else if (keyword.equals("Persist")) {
-            if (card.getBaseToughness() <= 1 || card.hasKeyword(Keyword.UNDYING)) {
-                return false;
-            }
+            return card.getBaseToughness() > 1 && !card.hasKeyword(Keyword.UNDYING);
         } else if (keyword.equals("Islandwalk")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getType(opp.getLandsInPlay(), "Island").isEmpty()
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getType(opp.getLandsInPlay(), "Island").isEmpty()
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.equals("Swampwalk")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getType(opp.getLandsInPlay(), "Swamp").isEmpty()
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getType(opp.getLandsInPlay(), "Swamp").isEmpty()
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.equals("Mountainwalk")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getType(opp.getLandsInPlay(), "Mountain").isEmpty()
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getType(opp.getLandsInPlay(), "Mountain").isEmpty()
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.equals("Forestwalk")) {
-            if (ph.isPlayerTurn(opp) || !(CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
-                    || newPower <= 0
-                    || CardLists.getType(opp.getLandsInPlay(), "Forest").isEmpty()
-                    || CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty()) {
-                return false;
-            }
+            return !ph.isPlayerTurn(opp) && (CombatUtil.canAttack(card, opp) || (combat != null && combat.isAttacking(card)))
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS)
+                    && newPower > 0
+                    && !CardLists.getType(opp.getLandsInPlay(), "Forest").isEmpty()
+                    && !CardLists.filter(opp.getCreaturesInPlay(), CardPredicates.possibleBlockers(card)).isEmpty();
         } else if (keyword.endsWith("CARDNAME can attack as though it didn't have defender.")) {
-            if (!ph.isPlayerTurn(ai) || !card.hasKeyword(Keyword.DEFENDER)
-                    || ph.getPhase().isAfter(PhaseType.COMBAT_BEGIN)
-                    || card.isTapped() || newPower <= 0) {
-                return false;
-            }
+            return ph.isPlayerTurn(ai) && card.hasKeyword(Keyword.DEFENDER)
+                    && !ph.getPhase().isAfter(PhaseType.COMBAT_BEGIN)
+                    && !card.isTapped() && newPower > 0;
         } else if (keyword.equals("Prevent all combat damage that would be dealt to CARDNAME.")) {
-            if (combat == null || !(combat.isBlocking(card) || combat.isBlocked(card))) {
-                return false;
-            }
+            return combat != null && (combat.isBlocking(card) || combat.isBlocked(card));
         } else if (keyword.equals("Menace")) {
-            if (combat == null || !combat.isAttacking(card)) {
-                return false;
-            }
+            return combat != null && combat.isAttacking(card);
         }
         return true;
     }
@@ -547,10 +470,7 @@ public abstract class PumpAiBase extends SpellAbilityAi {
                                 return true;
                             }
                             //Don't waste a -7/-0 spell on a 1/1 creature
-                            if (c.getNetPower() + attack > -2 || c.getNetPower() > 3) {
-                                return true;
-                            }
-                            return false;
+                            return c.getNetPower() + attack > -2 || c.getNetPower() > 3;
                         }
                     });
                 } else {

forge-ai/src/main/java/forge/ai/ability/PumpAllAi.java

@@ -141,10 +141,7 @@ public class PumpAllAi extends PumpAiBase {
 
             // evaluate both lists and pass only if human creatures are more
             // valuable
-            if ((ComputerUtilCard.evaluateCreatureList(comp) + 200) >= ComputerUtilCard.evaluateCreatureList(human)) {
-                return false;
-            }
-            return true;
+            return (ComputerUtilCard.evaluateCreatureList(comp) + 200) < ComputerUtilCard.evaluateCreatureList(human);
         } // end Curse
 
         return !CardLists.getValidCards(getPumpCreatures(ai, sa, defense, power, keywords, false), valid, source.getController(), source).isEmpty();

forge-ai/src/main/java/forge/ai/ability/RemoveFromCombatAi.java

@@ -18,9 +18,7 @@ public class RemoveFromCombatAi extends SpellAbilityAi {
         // AI should only activate this during Human's turn
 
         if ("RemoveBestAttacker".equals(sa.getParam("AILogic"))) {
-            if (aiPlayer.getGame().getCombat() != null && aiPlayer.getGame().getCombat().getDefenders().contains(aiPlayer)) {
-                return true;
-            }
+            return aiPlayer.getGame().getCombat() != null && aiPlayer.getGame().getCombat().getDefenders().contains(aiPlayer);
         }
 
         // TODO - implement AI

forge-ai/src/main/java/forge/ai/ability/RepeatAi.java

@@ -32,9 +32,7 @@ public class RepeatAi extends SpellAbilityAi {
             // Set PayX here to maximum value.
             final int max = ComputerUtilMana.determineLeftoverMana(sa, ai);
             source.setSVar("PayX", Integer.toString(max));
-            if (max <= 0) {
-                return false;
-            }
+            return max > 0;
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java

@@ -35,9 +35,7 @@ public class RepeatEachAi extends SpellAbilityAi {
             List<Card> humTokenCreats = CardLists.filter(aiPlayer.getOpponents().getCreaturesInPlay(), Presets.TOKEN);
             List<Card> compTokenCreats = CardLists.filter(aiPlayer.getCreaturesInPlay(), Presets.TOKEN);
 
-            if (compTokenCreats.size() <= humTokenCreats.size()) {
-                return false;
-            }
+            return compTokenCreats.size() > humTokenCreats.size();
         } else if ("BalanceLands".equals(logic)) {
             if (CardLists.filter(aiPlayer.getCardsIn(ZoneType.Battlefield), Presets.LANDS).size() >= 5) {
                 return false;
@@ -111,9 +109,7 @@ public class RepeatEachAi extends SpellAbilityAi {
                 }
             }
             // would not hit oppoent, don't do that
-            if (!hitOpp) {
-                return false;
-            }
+            return hitOpp;
         }
 
         // TODO Add some normal AI variability here

forge-ai/src/main/java/forge/ai/ability/RevealHandAi.java

@@ -30,11 +30,7 @@ public class RevealHandAi extends RevealAiBase {
     @Override
     protected boolean doTriggerAINoCost(Player ai, SpellAbility sa, boolean mandatory) {
 
-        if (!revealHandTargetAI(ai, sa/*, false, mandatory*/)) {
-            return false;
-        }
-
-        return true;
+        return revealHandTargetAI(ai, sa/*, false, mandatory*/);
     }
 
 }

forge-ai/src/main/java/forge/ai/ability/RollPlanarDiceAi.java

@@ -144,7 +144,7 @@ public class RollPlanarDiceAi extends SpellAbilityAi {
             }
         }
 
-        return decideToRoll ? true : false;
+        return decideToRoll;
     }
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/SacrificeAi.java

@@ -136,9 +136,7 @@ public class SacrificeAi extends SpellAbilityAi {
 
             // Since all of the cards have AI:RemoveDeck:All, I enabled 1 for 1
             // (or X for X) trades for special decks
-            if (humanList.size() < amount) {
-                return false;
-            }
+            return humanList.size() >= amount;
         } else if (defined.equals("You")) {
             List<Card> computerList =
                     CardLists.getValidCards(ai.getCardsIn(ZoneType.Battlefield), valid.split(","), sa.getActivatingPlayer(), sa.getHostCard(), sa);

forge-ai/src/main/java/forge/ai/ability/ScryAi.java

@@ -145,10 +145,10 @@ public class ScryAi extends SpellAbilityAi {
                 if (maxToRemove <= 0) {
                 	return false;
                 }
-                sa.setSVar("ChosenX", "Number$" + Integer.toString(maxToRemove));
+                sa.setSVar("ChosenX", "Number$" + maxToRemove);
             } else {
                 // no Instant or Sorceries anymore, just scry
-                sa.setSVar("ChosenX", "Number$" + Integer.toString(Math.min(counterNum, libsize)));
+                sa.setSVar("ChosenX", "Number$" + Math.min(counterNum, libsize));
             }
         }
         return true;

forge-ai/src/main/java/forge/ai/ability/SetStateAi.java

@@ -92,9 +92,7 @@ public class SetStateAi extends SpellAbilityAi {
                     }
                 }
 
-                if (sa.getTargets().getNumTargeted() < tgt.getMinTargets(source, sa)) {
-                    return false;
-                }
+                return sa.getTargets().getNumTargeted() >= tgt.getMinTargets(source, sa);
             }
         } else if ("TurnFace".equals(mode)) {
             if (!sa.usesTargeting()) {
@@ -123,9 +121,7 @@ public class SetStateAi extends SpellAbilityAi {
                     }
                 }
 
-                if (sa.getTargets().getNumTargeted() < tgt.getMinTargets(source, sa)) {
-                    return false;
-                }
+                return sa.getTargets().getNumTargeted() >= tgt.getMinTargets(source, sa);
             }
         }
         return true;
@@ -254,9 +250,7 @@ public class SetStateAi extends SpellAbilityAi {
                 // for legendary KI counter creatures
                 if (othercard.getCounters(CounterType.KI) >= source.getCounters(CounterType.KI)) {
                     // if the other legendary is useless try to replace it
-                    if (!ComputerUtilCard.isUselessCreature(aiPlayer, othercard)) {
-                        return false;
-                    }
+                    return ComputerUtilCard.isUselessCreature(aiPlayer, othercard);
                 }
             }
         }
@@ -266,10 +260,6 @@ public class SetStateAi extends SpellAbilityAi {
 
     public boolean confirmAction(Player player, SpellAbility sa, PlayerActionConfirmMode mode, String message) {
         // TODO: improve the AI for when it may want to transform something that's optional to transform
-        if (!isSafeToTransformIntoLegendary(player, sa.getHostCard())) {
-            return false;
-        }
-
-        return true;
+        return isSafeToTransformIntoLegendary(player, sa.getHostCard());
     }
 }

forge-ai/src/main/java/forge/ai/ability/SkipTurnAi.java

@@ -11,10 +11,7 @@ public class SkipTurnAi extends SpellAbilityAi {
      */
     @Override
     protected boolean canPlayAI(Player aiPlayer, SpellAbility sa) {
-        if ("Always".equals(sa.getParam("AILogic"))) {
-            return true;
-        }
-        return false;
+        return "Always".equals(sa.getParam("AILogic"));
     }
 
     /* (non-Javadoc)

forge-ai/src/main/java/forge/ai/ability/SurveilAi.java

@@ -76,9 +76,7 @@ public class SurveilAi extends SpellAbilityAi {
         if ("Never".equals(aiLogic)) {
             return false;
         } else if ("Once".equals(aiLogic)) {
-            if (AiCardMemory.isRememberedCard(ai, source, AiCardMemory.MemorySet.ACTIVATED_THIS_TURN)) {
-                return false;
-            }
+            return !AiCardMemory.isRememberedCard(ai, source, AiCardMemory.MemorySet.ACTIVATED_THIS_TURN);
         }
 
         // TODO: add card-specific Surveil AI logic here when/if necessary

forge-ai/src/main/java/forge/ai/ability/TapAi.java

@@ -64,9 +64,7 @@ public class TapAi extends TapAiBase {
                 bFlag |= c.isUntapped();
             }
 
-            if (!bFlag) {
-                return false;
-            }
+            return bFlag;
         } else {
             if ("TapForXCounters".equals(sa.getParam("AILogic"))) {
                 // e.g. Waxmane Baku
@@ -83,12 +81,9 @@ public class TapAi extends TapAiBase {
             }
 
             sa.resetTargets();
-            if (!tapPrefTargeting(ai, source, tgt, sa, false)) {
-                return false;
-            }
+            return tapPrefTargeting(ai, source, tgt, sa, false);
         }
 
-        return true;
     }
 
 }

forge-ai/src/main/java/forge/ai/ability/TapAiBase.java

@@ -248,12 +248,8 @@ public abstract class TapAiBase extends SpellAbilityAi  {
             sa.getTargets().add(choice);
         }
 
-        if (sa.getTargets().getNumTargeted() == 0) {
-            // Nothing was ever targeted, so we need to bail.
-            return false;
-        }
-
-        return true;
+        // Nothing was ever targeted, so we need to bail.
+        return sa.getTargets().getNumTargeted() != 0;
     }
 
     /**
@@ -307,11 +303,7 @@ public abstract class TapAiBase extends SpellAbilityAi  {
         // just tap whatever we can
         tapList = list;
 
-        if (tapTargetList(ai, sa, tapList, mandatory)) {
-            return true;
-        }
-
-        return false;
+        return tapTargetList(ai, sa, tapList, mandatory);
     }
 
     @Override

forge-ai/src/main/java/forge/ai/ability/TapAllAi.java

@@ -93,9 +93,7 @@ public class TapAllAi extends SpellAbilityAi {
                     return CombatUtil.canAttack(c) && ComputerUtilCombat.canAttackNextTurn(c);
                 }
             });
-            if(!any) {
-                return false;
-            }
+            return any;
         }
         return true;
     }

forge-ai/src/main/java/forge/ai/ability/TokenAi.java

@@ -103,12 +103,9 @@ public class TokenAi extends SpellAbilityAi {
 
         if (actualToken == null) {
             final AbilitySub sub = sa.getSubAbility();
-            if (pwPlus || (sub != null && SpellApiToAi.Converter.get(sub.getApi()).chkAIDrawback(sub, ai))) {
-                return true; // planeswalker plus ability or sub-ability is
-                             // useful
-            } else {
-                return false; // no token created
-            }
+            // useful
+            // no token created
+            return pwPlus || (sub != null && SpellApiToAi.Converter.get(sub.getApi()).chkAIDrawback(sub, ai)); // planeswalker plus ability or sub-ability is
         }
 
         // X-cost spells
@@ -154,10 +151,7 @@ public class TokenAi extends SpellAbilityAi {
                 && !haste && !pwMinus) {
             return false;
         }
-        if ((ph.getPhase().isAfter(PhaseType.COMBAT_BEGIN) || !ph.isPlayerTurn(ai)) && oneShot) {
-            return false;
-        }
-        return true;
+        return (!ph.getPhase().isAfter(PhaseType.COMBAT_BEGIN) && ph.isPlayerTurn(ai)) || !oneShot;
     }
     
     @Override
@@ -269,10 +263,8 @@ public class TokenAi extends SpellAbilityAi {
             list.add(token);
             list = CardLists.getValidCards(list, valid.split(","), ai.getWeakestOpponent(), topStack.getHostCard(), sa);
             list = CardLists.filter(list, CardPredicates.canBeSacrificedBy(topStack));
-            if (ComputerUtilCard.evaluateCreature(token) < ComputerUtilCard.evaluateCreature(list.get(0))
-                    && list.contains(token)) {
-                return true;
-            }
+            return ComputerUtilCard.evaluateCreature(token) < ComputerUtilCard.evaluateCreature(list.get(0))
+                    && list.contains(token);
         }
         return false;
     }

forge-ai/src/main/java/forge/ai/ability/UnattachAllAi.java

@@ -82,9 +82,7 @@ public class UnattachAllAi extends SpellAbilityAi {
             //don't equip a worse creature
             if (card.isEquipping()) {
                 Card oldTarget = card.getEquipping();
-                if (ComputerUtilCard.evaluateCreature(oldTarget) > ComputerUtilCard.evaluateCreature(newTarget)) {
-                    return false;
-                }
+                return ComputerUtilCard.evaluateCreature(oldTarget) <= ComputerUtilCard.evaluateCreature(newTarget);
             }
         }
 

forge-ai/src/main/java/forge/ai/ability/UntapAi.java

@@ -45,11 +45,7 @@ public class UntapAi extends SpellAbilityAi {
             return false;
         }
 
-        if (!ComputerUtilCost.checkDiscardCost(ai, cost, sa.getHostCard())) {
-            return false;
-        }
-
-        return true;
+        return ComputerUtilCost.checkDiscardCost(ai, cost, sa.getHostCard());
     }
 
     @Override
@@ -63,16 +59,11 @@ public class UntapAi extends SpellAbilityAi {
 
         if (tgt == null) {
             final List<Card> pDefined = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa);
-            if (pDefined != null && pDefined.get(0).isUntapped() && pDefined.get(0).getController() == ai) {
-                return false;
-            }
+            return pDefined == null || !pDefined.get(0).isUntapped() || pDefined.get(0).getController() != ai;
         } else {
-            if (!untapPrefTargeting(ai, tgt, sa, false)) {
-                return false;
-            }
+            return untapPrefTargeting(ai, tgt, sa, false);
         }
 
-        return true;
     }
 
     @Override
@@ -86,11 +77,7 @@ public class UntapAi extends SpellAbilityAi {
 
             // TODO: use Defined to determine, if this is an unfavorable result
             final List<Card> pDefined = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);
-            if (pDefined != null && pDefined.get(0).isUntapped() && pDefined.get(0).getController() == ai) {
-                return false;
-            }
-
-            return true;
+            return pDefined == null || !pDefined.get(0).isUntapped() || pDefined.get(0).getController() != ai;
         } else {
             if (untapPrefTargeting(ai, tgt, sa, mandatory)) {
                 return true;
@@ -271,11 +258,7 @@ public class UntapAi extends SpellAbilityAi {
         // just tap whatever we can
         tapList = list;
 
-        if (untapTargetList(source, tgt, sa, mandatory, tapList)) {
-            return true;
-        }
-
-        return false;
+        return untapTargetList(source, tgt, sa, mandatory, tapList);
     }
 
     private boolean untapTargetList(final Card source, final TargetRestrictions tgt, final SpellAbility sa, final boolean mandatory, 
@@ -438,13 +421,10 @@ public class UntapAi extends SpellAbilityAi {
 
         // no harm in doing this past declare blockers during the opponent's turn and right before our turn,
         // maybe we'll serendipitously untap into something like a removal spell or burn spell that'll help
-        if (ph.getNextTurn() == ai
-                && (ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS) || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS))) {
-            return true;
-        }
+        return ph.getNextTurn() == ai
+                && (ph.is(PhaseType.COMBAT_DECLARE_BLOCKERS) || ph.getPhase().isAfter(PhaseType.COMBAT_DECLARE_BLOCKERS));
 
         // haven't found any immediate playable options
-        return false;
     }
 
 }

forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java

@@ -80,7 +80,7 @@ public class PossibleTargetSelector {
     }
 
     private static class SimilarTargetSkipper {
-        private ArrayListMultimap<String, Card> validTargetsMap = ArrayListMultimap.<String, Card>create();
+        private ArrayListMultimap<String, Card> validTargetsMap = ArrayListMultimap.create();
         private HashMap<Card, String> cardTypeStrings = new HashMap<Card, String>();
         private HashMap<Card, Integer> creatureScores;
 

forge-ai/src/main/java/forge/ai/simulation/SpellAbilityChoicesIterator.java

@@ -49,7 +49,7 @@ public class SpellAbilityChoicesIterator {
             // TODO: Do we need to do something special to support cards that have extra costs
             // when choosing more modes, like Blessed Alliance?
             if (!allowRepeat) {
-                modeIterator = CombinatoricsUtils.combinationsIterator(choices.size(), num);;
+                modeIterator = CombinatoricsUtils.combinationsIterator(choices.size(), num);
             } else {
                 // Note: When allowRepeat is true, it does result in many possibilities being tried.
                 // We should ideally prune some of those at a higher level.

forge-ai/src/main/java/forge/ai/simulation/SpellAbilityPicker.java

@@ -308,9 +308,7 @@ public class SpellAbilityPicker {
                 return true;
             }
             List<PhaseType> phases = conditions.getPhases();
-            if (phases.isEmpty() || phases.contains(PhaseType.MAIN1)) {
-                return true;
-            }
+            return phases.isEmpty() || phases.contains(PhaseType.MAIN1);
         }
 
         return false;

forge-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>forge</artifactId>
         <groupId>forge</groupId>
-        <version>1.6.28-SNAPSHOT</version>
+        <version>1.6.29-SNAPSHOT</version>
     </parent>
 
     <artifactId>forge-core</artifactId>

forge-core/src/main/java/forge/CardStorageReader.java

@@ -64,7 +64,7 @@ public class CardStorageReader {
         void report(int current, int total);
 
         // does nothing, used when they pass null instead of an instance
-        public final static ProgressObserver emptyObserver = new ProgressObserver() {
+        ProgressObserver emptyObserver = new ProgressObserver() {
             @Override public void setOperationName(final String name, final boolean usePercents) {}
             @Override public void report(final int current, final int total) {}
         };

forge-core/src/main/java/forge/ImageKeys.java

@@ -123,7 +123,7 @@ public final class ImageKeys {
             int index = filename.lastIndexOf('_');
             if (index != -1) {
                 String setlessFilename = filename.substring(0, index);
-                String setCode = filename.substring(index + 1, filename.length());
+                String setCode = filename.substring(index + 1);
                 // try with upper case set
                 file = findFile(dir, setlessFilename + "_" + setCode.toUpperCase());
                 if (file != null) { return file; }

forge-core/src/main/java/forge/card/CardDb.java

@@ -41,7 +41,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
     public final static char NameSetSeparator = '|';
 
     // need this to obtain cardReference by name+set+artindex
-    private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<String,Collection<PaperCard>>(String.CASE_INSENSITIVE_ORDER),  CollectionSuppliers.<PaperCard>arrayLists());
+    private final ListMultimap<String, PaperCard> allCardsByName = Multimaps.newListMultimap(new TreeMap<String,Collection<PaperCard>>(String.CASE_INSENSITIVE_ORDER),  CollectionSuppliers.arrayLists());
     private final Map<String, PaperCard> uniqueCardsByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
     private final Map<String, CardRules> rulesByName;
     private final Map<String, ICardFace> facesByName = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
@@ -62,7 +62,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
         Random(false);
 
         final boolean filterSets;
-        private SetPreference(boolean filterIrregularSets) {
+        SetPreference(boolean filterIrregularSets) {
             filterSets = filterIrregularSets;
         }
 

forge-core/src/main/java/forge/card/CardEdition.java

@@ -189,7 +189,7 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
     public String getBoosterMustContain() { return boosterMustContain; }
     public CardInSet[] getCards() { return cards; }
 
-    public Map<String, Integer> getTokens() { return tokenNormalized; };
+    public Map<String, Integer> getTokens() { return tokenNormalized; }
 
     public static final Function<CardEdition, String> FN_GET_CODE = new Function<CardEdition, String>() {
         @Override

forge-core/src/main/java/forge/card/CardFace.java

@@ -20,7 +20,7 @@ final class CardFace implements ICardFace {
     public enum FaceSelectionMethod { // 
         USE_ACTIVE_FACE,
         USE_PRIMARY_FACE,
-        COMBINE;
+        COMBINE
     }
 
     
@@ -87,7 +87,7 @@ final class CardFace implements ICardFace {
     void setInitialLoyalty(String value)        { this.initialLoyalty = value; }
 
     void setPtText(String value) {
-        final String k[] = value.split("/");
+        final String[] k = value.split("/");
 
         if (k.length != 2) {
             throw new RuntimeException("Creature '" + this.getName() + "' has bad p/t stats");

forge-core/src/main/java/forge/card/CardFacePredicates.java

@@ -85,7 +85,7 @@ public final class CardFacePredicates {
 
         @Override
         public boolean apply(ICardFace input) {
-            String k[] = valid.split("\\.", 2);
+            String[] k = valid.split("\\.", 2);
 
             if ("Card".equals(k[0])) {
                 // okay
@@ -110,10 +110,7 @@ public final class CardFacePredicates {
         static protected boolean hasProperty(ICardFace input, final String v) {
             if (v.startsWith("non")) {
                 return !hasProperty(input, v.substring(3));
-            } else if (!input.getType().hasStringType(v)) {
-                return false;
-            }
-            return true;
+            } else return input.getType().hasStringType(v);
         }
     }
 

forge-core/src/main/java/forge/card/CardRarity.java

@@ -35,7 +35,7 @@ public enum CardRarity {
 
     private final String shortName, longName;
 
-    private CardRarity(final String shortName0, final String longName0) {
+    CardRarity(final String shortName0, final String longName0) {
         shortName = shortName0;
         longName = longName0;
     }

forge-core/src/main/java/forge/card/CardRulesPredicates.java

@@ -435,10 +435,10 @@ public final class CardRulesPredicates {
                 return this.op(card.getManaCost().getGenericCost(), this.operand);
             case POWER:
                 value = card.getIntPower();
-                return value != Integer.MAX_VALUE ? this.op(value, this.operand) : false;
+                return value != Integer.MAX_VALUE && this.op(value, this.operand);
             case TOUGHNESS:
                 value = card.getIntToughness();
-                return value != Integer.MAX_VALUE ? this.op(value, this.operand) : false;
+                return value != Integer.MAX_VALUE && this.op(value, this.operand);
             default:
                 return false;
             }

forge-core/src/main/java/forge/card/CardSplitType.java

@@ -10,7 +10,7 @@ public enum CardSplitType
     Split(FaceSelectionMethod.COMBINE, CardStateName.RightSplit),
     Flip(FaceSelectionMethod.USE_PRIMARY_FACE, CardStateName.Flipped);
 
-    private CardSplitType(FaceSelectionMethod calcMode, CardStateName stateName) {
+    CardSplitType(FaceSelectionMethod calcMode, CardStateName stateName) {
         method = calcMode;
         this.changedStateName = stateName;
     }

forge-core/src/main/java/forge/card/CardType.java

@@ -73,7 +73,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
         public final boolean isPermanent;
         private static final ImmutableList<String> allCoreTypeNames = EnumUtil.getNames(CoreType.class);
 
-        private CoreType(final boolean permanent) {
+        CoreType(final boolean permanent) {
             isPermanent = permanent;
         }
     }

forge-core/src/main/java/forge/card/ICardFace.java

@@ -5,5 +5,5 @@ package forge.card;
  *
  */
 public interface ICardFace extends ICardCharacteristics, ICardRawAbilites, Comparable<ICardFace> {
-    public String getAltName();
+    String getAltName();
 }

forge-core/src/main/java/forge/card/MagicColor.java

@@ -168,7 +168,7 @@ public final class MagicColor {
         private final String name, symbol;
         private final byte colormask;
 
-        private Color(String name0, byte colormask0, String symbol0) {
+        Color(String name0, byte colormask0, String symbol0) {
             name = name0;
             colormask = colormask0;
             symbol = symbol0;

forge-core/src/main/java/forge/card/mana/ManaAtom.java

@@ -44,7 +44,7 @@ public abstract class ManaAtom {
         if (s.length() == 2) { //if name is two characters, check for combination of two colors
             return (byte)(fromName(s.charAt(0)) | fromName(s.charAt(1)));
         } else if (s.length() == 1) {
-            return (byte) fromName(s.charAt(0));
+            return fromName(s.charAt(0));
         }
         s = s.toLowerCase();
 

forge-core/src/main/java/forge/card/mana/ManaCost.java

@@ -69,7 +69,7 @@ public final class ManaCost implements Comparable<ManaCost>, Iterable<ManaCostSh
     private ManaCost(int cmc) {
         this.hasNoCost = cmc < 0;
         this.genericCost = cmc < 0 ? 0 : cmc;
-        sealClass(Lists.<ManaCostShard>newArrayList());
+        sealClass(Lists.newArrayList());
     }
     
     private ManaCost(int cmc, List<ManaCostShard> shards0) {

forge-core/src/main/java/forge/card/mana/ManaCostShard.java

@@ -86,7 +86,7 @@ public enum ManaCostShard {
      * @param sValue
      *            the s value
      */
-    private ManaCostShard(final int value, final String sValue) {
+    ManaCostShard(final int value, final String sValue) {
         this(value, sValue, sValue);
     }
 
@@ -100,7 +100,7 @@ public enum ManaCostShard {
      * @param imgKey
      *            the img key
      */
-    private ManaCostShard(final int value, final String sValue, final String imgKey) {
+    ManaCostShard(final int value, final String sValue, final String imgKey) {
         this.shard = value;
         this.cmc = this.getCMC();
         this.cmpc = this.getCmpCost();

forge-core/src/main/java/forge/deck/DeckFormat.java

@@ -85,10 +85,7 @@ public enum DeckFormat {
             if (otherPart != null && otherPart.getManaCost().getCMC() > 3) {
                 return false; //only cards with CMC less than 3 are allowed
             }
-            if (bannedCards.contains(rules.getName())) {
-                return false;
-            }
-            return true;
+            return !bannedCards.contains(rules.getName());
         }
     }) {
         private final Set<String> bannedCommanders = ImmutableSet.of("Derevi, Empyrial Tactician", "Erayo, Soratami Ascendant", "Rofellos, Llanowar Emissary");
@@ -120,7 +117,7 @@ public enum DeckFormat {
     private final static String ADVPROCLAMATION = "Advantageous Proclamation";
     private final static String SOVREALM = "Sovereign's Realm";
 
-    private DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<CardRules> cardPoolFilter0, Predicate<PaperCard> paperCardPoolFilter0) {
+    DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<CardRules> cardPoolFilter0, Predicate<PaperCard> paperCardPoolFilter0) {
         mainRange = mainRange0;
         sideRange = sideRange0;
         maxCardCopies = maxCardCopies0;
@@ -128,7 +125,7 @@ public enum DeckFormat {
         paperCardPoolFilter = paperCardPoolFilter0;
     }
 
-    private DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<CardRules> cardPoolFilter0) {
+    DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0, Predicate<CardRules> cardPoolFilter0) {
         mainRange = mainRange0;
         sideRange = sideRange0;
         maxCardCopies = maxCardCopies0;
@@ -136,7 +133,7 @@ public enum DeckFormat {
         cardPoolFilter = cardPoolFilter0;
     }
 
-    private DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0) {
+    DeckFormat(Range<Integer> mainRange0, Range<Integer> sideRange0, int maxCardCopies0) {
         mainRange = mainRange0;
         sideRange = sideRange0;
         maxCardCopies = maxCardCopies0;