diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index 5d3a0fe5f04..5cf544a3597 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -1468,7 +1468,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 attackersLeft, int numForcedAttackers, boolean playAggro) { diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index a8b02bce767..bbf1635052e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -770,7 +770,7 @@ public class ComputerUtil { final int considerSacThreshold = getAIPreferenceParameter(host, "CreatureEvalThreshold", source); if ("OpponentOnly".equals(source.getParam("AILogic"))) { - if(!source.getActivatingPlayer().isOpponentOf(ai)) { + if (!source.getActivatingPlayer().isOpponentOf(ai)) { return sacrificed; // sacrifice none } } else if ("DesecrationDemon".equals(source.getParam("AILogic"))) { diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java b/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java index fa8c7d633d9..c9aec6c625f 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java @@ -72,7 +72,7 @@ public class ComputerUtilAbility { if (!player.getCardsIn(ZoneType.Library).isEmpty()) { all.add(player.getCardsIn(ZoneType.Library).get(0)); } - for(Player p : game.getPlayers()) { + for (Player p : game.getPlayers()) { all.addAll(p.getCardsIn(ZoneType.Exile)); all.addAll(p.getCardsIn(ZoneType.Battlefield)); } diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index c07e8c86e3d..c7496c1ee7e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java @@ -436,7 +436,7 @@ public class ComputerUtilCard { // For ability of Oracle en-Vec, return the first card that are going to attack next turn public static Card getBestCreatureToAttackNextTurnAI(final Player aiPlayer, final Iterable list) { AiController aic = ((PlayerControllerAi)aiPlayer.getController()).getAi(); - for(final Card card : list) { + for (final Card card : list) { if (aic.getPredictedCombatNextTurn().isAttacking(card)) { return card; } @@ -832,7 +832,7 @@ public class ComputerUtilCard { } } // same for Trigger that does make Tokens - for(Trigger t:c.getTriggers()){ + for (Trigger t :c .getTriggers()) { SpellAbility sa = t.ensureAbility(); if (sa != null) { if (sa.getApi() != ApiType.Token || !sa.hasParam("TokenTypes")) { @@ -851,7 +851,7 @@ public class ComputerUtilCard { } } // special rule for Fabricate and Servo - if(c.hasStartOfKeyword(Keyword.FABRICATE.toString())){ + if (c.hasStartOfKeyword(Keyword.FABRICATE.toString())) { Integer count = typesInDeck.get("Servo"); if (count == null) { count = 0; @@ -1694,7 +1694,7 @@ public class ComputerUtilCard { pumped.addHiddenExtrinsicKeywords(timestamp, 0, hiddenKws); } Set types = c.getCounters().keySet(); - for(CounterType ct : types) { + for (CounterType ct : types) { pumped.addCounterFireNoEvents(ct, c.getCounters(ct), ai, sa, true, null); } //Copies tap-state and extra keywords (auras, equipment, etc.) diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java index ce7fcd65dd9..801dec9319e 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java @@ -671,7 +671,6 @@ public class ComputerUtilCombat { int flankingMagnitude = 0; if (attacker.hasKeyword(Keyword.FLANKING) && !blocker.hasKeyword(Keyword.FLANKING)) { - flankingMagnitude = attacker.getAmountOfKeyword(Keyword.FLANKING); if (flankingMagnitude >= blocker.getNetToughness()) { diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 3dbea35fb5a..b4e802a46a3 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -220,16 +220,16 @@ public class PlayerControllerAi extends PlayerController { if (delayedReveal != null) { reveal(delayedReveal.getCards(), delayedReveal.getZone(), delayedReveal.getOwner(), delayedReveal.getMessagePrefix()); } - FCollection remaining = new FCollection<>(optionList); - List selecteds = new ArrayList<>(); - T selected; - do { - selected = chooseSingleEntityForEffect(remaining, null, sa, title, selecteds.size()>=min, targetedPlayer, params); - if ( selected != null ) { - remaining.remove(selected); - selecteds.add(selected); - } - } while ( (selected != null ) && (selecteds.size() < max) ); + FCollection remaining = new FCollection<>(optionList); + List selecteds = new ArrayList<>(); + T selected; + do { + selected = chooseSingleEntityForEffect(remaining, null, sa, title, selecteds.size()>=min, targetedPlayer, params); + if ( selected != null ) { + remaining.remove(selected); + selecteds.add(selected); + } + } while ( (selected != null ) && (selecteds.size() < max) ); return selecteds; } @@ -361,8 +361,7 @@ public class PlayerControllerAi extends PlayerController { for (Card c: topN) { if (ComputerUtil.scryWillMoveCardToBottomOfLibrary(player, c)) { toBottom.add(c); - } - else { + } else { toTop.add(c); } } @@ -525,8 +524,7 @@ public class PlayerControllerAi extends PlayerController { if (copySA instanceof Spell) { Spell spell = (Spell) copySA; ((PlayerControllerAi) player.getController()).getAi().canPlayFromEffectAI(spell, true, true); - } - else { + } else { getAi().canPlaySa(copySA); } } @@ -884,9 +882,8 @@ public class PlayerControllerAi extends PlayerController { byte chosenColorMask = MagicColor.fromName(c); if ((colors.getColor() & chosenColorMask) != 0) { return chosenColorMask; - } else { - return Iterables.getFirst(colors, (byte)0); } + return Iterables.getFirst(colors, (byte)0); } @Override @@ -905,9 +902,7 @@ public class PlayerControllerAi extends PlayerController { if ((colors.getColor() & chosenColorMask) != 0) { return chosenColorMask; } - else { - return Iterables.getFirst(colors, MagicColor.WHITE); - } + return Iterables.getFirst(colors, MagicColor.WHITE); } @Override @@ -1370,8 +1365,7 @@ public class PlayerControllerAi extends PlayerController { } @Override - public int chooseNumberForKeywordCost(SpellAbility sa, Cost cost, KeywordInterface keyword, String prompt, - int max) { + public int chooseNumberForKeywordCost(SpellAbility sa, Cost cost, KeywordInterface keyword, String prompt, int max) { // TODO: improve the logic depending on the keyword and the playability of the cost-modified SA (enough targets present etc.) int chosenAmount = 0; diff --git a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java index 2c229c7b7c0..12cee8fdb25 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CharmAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/CharmAi.java @@ -178,7 +178,7 @@ public class CharmAi extends SpellAbilityAi { } else if (ai.canGainLife() && aiLife <= 5) { // critical Life try to gain more chosenList.add(gain); - } else if(!ai.canGainLife() && aiLife == 14 ) { + } else if (!ai.canGainLife() && aiLife == 14 ) { // ai cant gain life, but try to avoid falling to 13 // but if a opponent does control Tainted Remedy its irrelevant chosenList.add(oppTainted ? lose : gain); diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java index 0fe89ead3a7..00a55dce474 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java @@ -419,15 +419,15 @@ public class CountersPutAi extends SpellAbilityAi { oa.setActivatingPlayer(ai); CardCollection targets = CardLists.getTargetableCards(ai.getOpponents().getCreaturesInPlay(), oa); - if (!targets.isEmpty()){ + if (!targets.isEmpty()) { boolean canSurvive = false; for (Card humanCreature : targets) { - if (!FightAi.canKill(humanCreature, source, 0)){ + if (!FightAi.canKill(humanCreature, source, 0)) { canSurvive = true; break; } } - if (!canSurvive){ + if (!canSurvive) { return false; } } diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index df7ea6ee8ed..06d6144eaaa 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -165,7 +165,7 @@ public class DamageDealAi extends DamageAiBase { dmg = 2; } else if ("OpponentHasCreatures".equals(logic)) { for (Player opp : ai.getOpponents()) { - if (!opp.getCreaturesInPlay().isEmpty()){ + if (!opp.getCreaturesInPlay().isEmpty()) { return true; } } @@ -287,7 +287,7 @@ public class DamageDealAi extends DamageAiBase { } if ((damage.equals("X") && sa.getSVar(damage).equals("Count$xPaid")) || - sourceName.equals("Crater's Claws")){ + sourceName.equals("Crater's Claws")) { // If I can kill my target by paying less mana, do it if (sa.usesTargeting() && !sa.getTargets().isTargetingAnyPlayer() && !sa.isDividedAsYouChoose()) { int actualPay = dmg; @@ -330,7 +330,6 @@ public class DamageDealAi extends DamageAiBase { */ private Card dealDamageChooseTgtC(final Player ai, final SpellAbility sa, final int d, final boolean noPrevention, final Player pl, final boolean mandatory) { - // wait until stack is empty (prevents duplicate kills) if (!sa.isTrigger() && !ai.getGame().getStack().isEmpty()) { //TODO:all removal APIs require a check to prevent duplicate kill/bounce/exile/etc. @@ -345,7 +344,7 @@ public class DamageDealAi extends DamageAiBase { final Player activator = sa.getActivatingPlayer(); final Card source = sa.getHostCard(); final Game game = source.getGame(); - List hPlay = getTargetableCards(ai, sa, pl, tgt, activator, source, game); + List hPlay = getTargetableCards(mandatory ? pl : ai, sa, pl, tgt, activator, source, game); // Filter MustTarget requirements StaticAbilityMustTarget.filterMustTargetCards(ai, hPlay, sa); @@ -531,7 +530,7 @@ public class DamageDealAi extends DamageAiBase { if ("PowerDmg".equals(logic)) { // check if it is better to target the player instead, the original target is already set in PumpAi.pumpTgtAI() - if (tgt.canTgtCreatureAndPlayer() && shouldTgtP(ai, sa, dmg, noPrevention)){ + if (tgt.canTgtCreatureAndPlayer() && shouldTgtP(ai, sa, dmg, noPrevention)) { sa.resetTargets(); sa.getTargets().add(enemy); } diff --git a/forge-ai/src/main/java/forge/ai/ability/DelayedTriggerAi.java b/forge-ai/src/main/java/forge/ai/ability/DelayedTriggerAi.java index 3cc8b5a951d..8513849621d 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DelayedTriggerAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DelayedTriggerAi.java @@ -94,7 +94,7 @@ public class DelayedTriggerAi extends SpellAbilityAi { } }); - if(count == 0) { + if (count == 0) { return false; } return true; diff --git a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java index cefac09aaa5..ba7e3614f22 100644 --- a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java @@ -114,7 +114,7 @@ public class RearrangeTopOfLibraryAi extends SpellAbilityAi { if (!top.isLand() && cmc - maxCastable >= uncastableCMCThreshold) { // Can't cast in the foreseeable future. Shuffle if doing it to ourselves or an ally, otherwise keep it return !p.isOpponentOf(player); - } else if (top.isLand() && landsOTB <= minLandsToScryLandsAway){ + } else if (top.isLand() && landsOTB <= minLandsToScryLandsAway) { // We don't want to give the opponent a free land if his land count is low return p.isOpponentOf(player); } diff --git a/forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java b/forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java index 1cb7766e11f..d11f04bc03c 100644 --- a/forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/RepeatEachAi.java @@ -52,14 +52,14 @@ public class RepeatEachAi extends SpellAbilityAi { } } else if ("OpponentHasCreatures".equals(logic)) { //TODO convert this to NeedsToPlayVar for (Player opp : aiPlayer.getOpponents()) { - if (!opp.getCreaturesInPlay().isEmpty()){ + if (!opp.getCreaturesInPlay().isEmpty()) { return true; } } return false; } else if ("OpponentHasMultipleCreatures".equals(logic)) { for (Player opp : aiPlayer.getOpponents()) { - if (opp.getCreaturesInPlay().size() > 1){ + if (opp.getCreaturesInPlay().size() > 1) { return true; } } diff --git a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java index 2e73a232e34..261658d6292 100644 --- a/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/SetStateAi.java @@ -69,7 +69,7 @@ public class SetStateAi extends SpellAbilityAi { final String logic = sa.getParamOrDefault("AILogic", ""); final Game game = source.getGame(); - if("Transform".equals(mode)) { + if ("Transform".equals(mode)) { if (!sa.usesTargeting()) { // no Transform with Defined which is not Self if (!source.canTransform()) { diff --git a/forge-ai/src/main/java/forge/ai/ability/TapAi.java b/forge-ai/src/main/java/forge/ai/ability/TapAi.java index 52abe9535f0..295cc2f5a9b 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TapAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/TapAi.java @@ -35,7 +35,7 @@ public class TapAi extends TapAiBase { // Don't tap down after blockers return false; } - } else if (!SpellAbilityAi.playReusable(ai, sa)){ + } else if (!SpellAbilityAi.playReusable(ai, sa)) { // Generally don't want to tap things with an Instant during Players turn outside of combat return false; } diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java index 12cd7450824..a05458ec288 100644 --- a/forge-game/src/main/java/forge/game/GameLogFormatter.java +++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java @@ -45,7 +45,7 @@ public class GameLogFormatter extends IGameEventVisitor.Base { @Override public GameLogEntry visit(GameEventGameOutcome ev) { - for(String outcome : ev.result.getOutcomeStrings()) { + for (String outcome : ev.result.getOutcomeStrings()) { log.add(GameLogEntryType.GAME_OUTCOME, outcome); } return generateSummary(ev.history); diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index cad9a2ac1e3..bb3c46eaf00 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -2550,7 +2550,7 @@ public class AbilityUtils { int colorOcurrencices = 0; byte colorCode = ManaAtom.fromName(sq[1]); for (Card c0 : cards) { - for (ManaCostShard sh : c0.getManaCost()){ + for (ManaCostShard sh : c0.getManaCost()) { if (sh.isColor(colorCode)) colorOcurrencices++; } diff --git a/forge-game/src/main/java/forge/game/ability/ApiType.java b/forge-game/src/main/java/forge/game/ability/ApiType.java index afbb4b7ab0f..f7a687e37d1 100644 --- a/forge-game/src/main/java/forge/game/ability/ApiType.java +++ b/forge-game/src/main/java/forge/game/ability/ApiType.java @@ -192,7 +192,7 @@ public enum ApiType { private static final Map allValues = new HashMap<>(); static { - for(ApiType t : ApiType.values()) { + for (ApiType t : ApiType.values()) { allValues.put(t.name().toLowerCase(), t); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java index 0bfe529c0a5..a402327b376 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AmassEffect.java @@ -78,7 +78,7 @@ public class AmassEffect extends TokenEffectBase { tgtCards = pc.chooseCardsForEffect(tgtCards, sa, Localizer.getInstance().getMessage("lblChooseAnArmy"), 1, 1, false, params); GameEntityCounterTable table = new GameEntityCounterTable(); - for(final Card tgtCard : tgtCards) { + for (final Card tgtCard : tgtCards) { tgtCard.addCounter(CounterEnumType.P1P1, amount, activator, sa, true, table); game.updateLastStateForCard(tgtCard); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java index c3a24f2b8ce..bf481bc5493 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java @@ -96,7 +96,7 @@ public class ChangeTargetsEffect extends SpellAbilityEffect { SpellAbility changingTgtSA = changingTgtSI.getSpellAbility(true); if (changingTgtSA.usesTargeting()) { // random target and DefinedMagnet works on single targets - if (sa.hasParam("RandomTarget")){ + if (sa.hasParam("RandomTarget")) { int div = changingTgtSA.getTotalDividedValue(); changingTgtSA.resetTargets(); List candidates = changingTgtSA.getTargetRestrictions().getAllCandidates(changingTgtSA, true); @@ -116,7 +116,7 @@ public class ChangeTargetsEffect extends SpellAbilityEffect { changingTgtSI.updateTarget(changingTgtSA.getTargets(), sa.getHostCard()); } - else if (sa.hasParam("DefinedMagnet")){ + else if (sa.hasParam("DefinedMagnet")) { GameObject newTarget = Iterables.getFirst(getDefinedCardsOrTargeted(sa, "DefinedMagnet"), null); if (newTarget != null && changingTgtSA.canTarget(newTarget)) { int div = changingTgtSA.getTotalDividedValue(); diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index 830cbbd2457..ec348aebae2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -222,7 +222,7 @@ public class CharmEffect extends SpellAbilityEffect { }); for (AbilitySub sub : chosen) { - // Clone the chosen, just in case the some subAb gets chosen multiple times + // Clone the chosen, just in case the same subAb gets chosen multiple times AbilitySub clone = (AbilitySub)sub.copy(); // update ActivatingPlayer @@ -250,7 +250,6 @@ public class CharmEffect extends SpellAbilityEffect { // add Clone to Tail of sa sa.appendSubAbility(clone); } - } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java index 743c746ae9f..114d16ace3f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java @@ -141,7 +141,7 @@ public class ChooseCardNameEffect extends SpellAbilityEffect { } host.setNamedCard(chosen); - if(!randomChoice) { + if (!randomChoice) { p.getGame().getAction().notifyOfValue(sa, host, Localizer.getInstance().getMessage("lblPlayerPickedChosen", p.getName(), chosen), p); p.setNamedCard(chosen); } diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java index 34aba792dc4..f18b046b1f3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java @@ -28,7 +28,7 @@ public class ControlSpellEffect extends SpellAbilityEffect { sb.append(newController).append(" gains control of "); - for(SpellAbility spell : getTargetSpells(sa)) { + for (SpellAbility spell : getTargetSpells(sa)) { Card c = spell.getHostCard(); sb.append(" "); if (c.isFaceDown()) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java index 5af20e90dfc..414e344ef6f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java @@ -160,7 +160,7 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect { if (sa.hasParam("MayChooseTarget")) { copy.setMayChooseNewTargets(true); } - if (sa.hasParam("RandomTarget")){ + if (sa.hasParam("RandomTarget")) { List candidates = copy.getTargetRestrictions().getAllCandidates(chosenSA, true); if (sa.hasParam("RandomTargetRestriction")) { candidates.removeIf(new Predicate() { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersNoteEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersNoteEffect.java index b1cbf040fe7..5c9f92ebede 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersNoteEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersNoteEffect.java @@ -37,7 +37,7 @@ public class CountersNoteEffect extends SpellAbilityEffect { } private void noteCounters(Card notee, Card source) { - for(Entry counter : notee.getCounters().entrySet()) { + for (Entry counter : notee.getCounters().entrySet()) { StringBuilder sb = new StringBuilder(); sb.append(NOTE_COUNTERS).append(counter.getKey().getName()); source.setSVar(sb.toString(), counter.getValue().toString()); @@ -45,7 +45,7 @@ public class CountersNoteEffect extends SpellAbilityEffect { } private void loadCounters(Card notee, Card source, final Player p, final SpellAbility sa, GameEntityCounterTable table) { - for(Entry svar : source.getSVars().entrySet()) { + for (Entry svar : source.getSVars().entrySet()) { String key = svar.getKey(); if (key.startsWith(NOTE_COUNTERS)) { notee.addCounter( diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java index 0725d4e7806..b1ff536f4a9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java @@ -35,7 +35,7 @@ public class DamageAllEffect extends DamageBaseEffect { if (!definedSources.isEmpty() && definedSources.get(0) != sa.getHostCard()) { sb.append(definedSources.get(0).toString()).append(" deals"); - } else if ("ParentTarget".equals(definedStr)){ + } else if ("ParentTarget".equals(definedStr)) { sb.append("Target creature deals"); } else { sb.append("Deals"); diff --git a/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java index e0a855ef9e5..74c05ce871a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java @@ -96,7 +96,7 @@ public class DebuffEffect extends SpellAbilityEffect { for (final String kw : kws) { // Check if some of the Keywords are Protection from if (!ProtectionFromColor && kw.startsWith("Protection from ")) { - for(byte col : MagicColor.WUBRG) { + for (byte col : MagicColor.WUBRG) { final String colString = MagicColor.toLongString(col); if (kw.endsWith(colString.toLowerCase())) { ProtectionFromColor = true; @@ -110,7 +110,7 @@ public class DebuffEffect extends SpellAbilityEffect { if (ProtectionFromColor && tgtC.hasKeyword(allColors)) { final List allColorsProtect = Lists.newArrayList(); - for(byte col : MagicColor.WUBRG) { + for (byte col : MagicColor.WUBRG) { allColorsProtect.add("Protection from " + MagicColor.toLongString(col).toLowerCase()); } allColorsProtect.removeAll(kws); @@ -123,7 +123,7 @@ public class DebuffEffect extends SpellAbilityEffect { if (ProtectionFromColor && tgtC.hasKeyword(allColors)) { final List allColorsProtect = Lists.newArrayList(); - for(byte col : MagicColor.WUBRG) { + for (byte col : MagicColor.WUBRG) { final String colString = MagicColor.toLongString(col); if (!kws.contains("Protection from " + colString)) { allColorsProtect.add( diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 809c3d775e6..fe82dc1738c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -330,7 +330,7 @@ public class EffectEffect extends SpellAbilityEffect { } private void noteCounters(Card notee, Card source) { - for(Map.Entry counter : notee.getCounters().entrySet()) { + for (Map.Entry counter : notee.getCounters().entrySet()) { StringBuilder sb = new StringBuilder(); sb.append("NoteCounters").append(counter.getKey().getName()); source.setSVar(sb.toString(), counter.getValue().toString()); diff --git a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java index f2614f45cf0..8e249fc3a66 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java @@ -50,7 +50,7 @@ public class PeekAndRevealEffect extends SpellAbilityEffect { numPeek = Math.min(numPeek, library.size()); CardCollection peekCards = new CardCollection(); - for(int i = 0; i < numPeek; i++) { + for (int i = 0; i < numPeek; i++) { peekCards.add(library.get(i)); } @@ -74,7 +74,7 @@ public class PeekAndRevealEffect extends SpellAbilityEffect { } if (imprintRevealed) { Map cachedMap = Maps.newHashMap(); - for(Card c : revealableCards) { + for (Card c : revealableCards) { source.addImprintedCard(CardUtil.getLKICopy(c, cachedMap)); } } diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java index 76834972a01..dc3bc6970ed 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java @@ -13,7 +13,7 @@ public class PlaneswalkEffect extends SpellAbilityEffect { public void resolve(SpellAbility sa) { Game game = sa.getActivatingPlayer().getGame(); - for(Player p : game.getPlayers()) { + for (Player p : game.getPlayers()) { p.leaveCurrentPlane(); } if (sa.hasParam("Defined")) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java index cd3f70d45a5..29f4ec66886 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java @@ -103,7 +103,7 @@ public class PlayEffect extends SpellAbilityEffect { } else if (sa.hasParam("AnySupportedCard")) { final String valid = sa.getParam("AnySupportedCard"); List cards = null; - if (valid.startsWith("Names:")){ + if (valid.startsWith("Names:")) { cards = new ArrayList<>(); for (String name : valid.substring(6).split(",")) { name = name.replace(";", ","); diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java index ead24353032..75e48fe6c60 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java @@ -66,7 +66,7 @@ public class ProtectAllEffect extends SpellAbilityEffect { } else if (sa.getParam("Gains").equals("TargetedCardColor")) { for (final Card c : sa.getSATargetingCard().getTargets().getTargetCards()) { ColorSet cs = CardUtil.getColors(c); - for(byte col : MagicColor.WUBRG) { + for (byte col : MagicColor.WUBRG) { if (cs.hasAnyColor(col)) gains.add(MagicColor.toLongString(col).toLowerCase()); } diff --git a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java index c684ce10121..d13f4e576f3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java @@ -87,7 +87,7 @@ public class TwoPilesEffect extends SpellAbilityEffect { } String title; - if("One".equals(sa.getParamOrDefault("FaceDown", "False"))) { + if ("One".equals(sa.getParamOrDefault("FaceDown", "False"))) { title = Localizer.getInstance().getMessage("lblSelectCardForFaceDownPile"); } else if (isLeftRightPile) { title = Localizer.getInstance().getMessage("lblSelectCardForLeftPile"); diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 49154a187be..df699d12539 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -2084,7 +2084,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { || keyword.equals("Foretell") // for the ones without cost || keyword.equals("Hideaway") || keyword.equals("Ascend") || keyword.equals("Totem armor") || keyword.equals("Battle cry") - || keyword.equals("Devoid") || keyword.equals("Riot")){ + || keyword.equals("Devoid") || keyword.equals("Riot")) { sbLong.append(keyword).append(" (").append(inst.getReminderText()).append(")"); } else if (keyword.startsWith("Partner:")) { final String[] k = keyword.split(":"); @@ -3580,10 +3580,6 @@ public class Card extends GameEntity implements Comparable, IHasSVars { return changed; } - public boolean clearChangedCardKeywords() { - return clearChangedCardKeywords(false); - } - public boolean clearChangedCardColors() { boolean changed = false; @@ -3981,7 +3977,7 @@ public class Card extends GameEntity implements Comparable, IHasSVars { this.tempBoost = 0; this.bonusFromCounters = 0; } - public StatBreakdown(int currentValue, int tempBoost, int bonusFromCounters){ + public StatBreakdown(int currentValue, int tempBoost, int bonusFromCounters) { this.currentValue = currentValue; this.tempBoost = tempBoost; this.bonusFromCounters = bonusFromCounters; @@ -4268,6 +4264,9 @@ public class Card extends GameEntity implements Comparable, IHasSVars { return change; } + public boolean clearChangedCardKeywords() { + return clearChangedCardKeywords(false); + } public final boolean clearChangedCardKeywords(final boolean updateView) { if (changedCardKeywords.isEmpty()) { return false; diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index a0e8846bec2..a677a19c483 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -270,7 +270,7 @@ public class CardFactory { original.addNonManaAbilities(card.getCurrentState().getNonManaAbilities()); original.addIntrinsicKeywords(card.getCurrentState().getIntrinsicKeywords()); // Copy 'Fuse' to original side original.getSVars().putAll(card.getCurrentState().getSVars()); // Unfortunately need to copy these to (Effect looks for sVars on execute) - } else if (state != CardStateName.Original){ + } else if (state != CardStateName.Original) { CardFactoryUtil.setupKeywordedAbilities(card); } if (state == CardStateName.Adventure) { diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 097aebcf786..1a7716df80a 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -538,7 +538,7 @@ public class CardFactoryUtil { landkw.add(k); } else if (k.startsWith("Protection")) { protectionkw.add(k); - for(byte col : MagicColor.WUBRG) { + for (byte col : MagicColor.WUBRG) { final String colString = "Protection from " + MagicColor.toLongString(col).toLowerCase(); if (k.contains(colString)) { protectionColorkw.add(colString); @@ -896,7 +896,7 @@ public class CardFactoryUtil { cascadeTrigger.setOverridingAbility(dig); inst.addTrigger(cascadeTrigger); - } else if (keyword.startsWith("Champion")){ + } else if (keyword.startsWith("Champion")) { final String[] k = keyword.split(":"); final String[] valid = k[1].split(","); String desc = Lang.joinHomogenous(Lists.newArrayList(valid), null, "or"); @@ -1688,7 +1688,7 @@ public class CardFactoryUtil { int idx = 0; int skipId = 0; - for(String ab : abs) { + for (String ab : abs) { idx += 1; if (idx <= skipId) { continue; @@ -1898,7 +1898,7 @@ public class CardFactoryUtil { final List abs = Arrays.asList(keyword.substring("Dungeon:".length()).split(",")); final Map saMap = new LinkedHashMap<>(); - for(String ab : abs) { + for (String ab : abs) { saMap.put(ab, AbilityFactory.getAbility(card, ab)); } for (SpellAbility sa : saMap.values()) { @@ -2956,7 +2956,7 @@ public class CardFactoryUtil { inst.addSpellAbility(abilityMorphDown(card)); inst.addSpellAbility(abilityMorphUp(card, k[1], false)); - } else if (keyword.startsWith("Megamorph")){ + } else if (keyword.startsWith("Megamorph")) { final String[] k = keyword.split(":"); inst.addSpellAbility(abilityMorphDown(card)); diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 397e7c98394..9447ce99f0b 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -354,7 +354,7 @@ public final class CardUtil { if ((combinedColor & color) == 0) { continue; } - for(final Card c : game.getColoredCardsInPlay(MagicColor.toLongString(color))) { + for (final Card c : game.getColoredCardsInPlay(MagicColor.toLongString(color))) { if (!res.contains(c) && !tgts.contains(c) && c.isValid(valid, source.getController(), source, targetSA)) { res.add(c); } diff --git a/forge-game/src/main/java/forge/game/combat/AttackingBand.java b/forge-game/src/main/java/forge/game/combat/AttackingBand.java index 96ca2ad84e2..c2ffa3cb808 100644 --- a/forge-game/src/main/java/forge/game/combat/AttackingBand.java +++ b/forge-game/src/main/java/forge/game/combat/AttackingBand.java @@ -49,7 +49,7 @@ public class AttackingBand { String[] validString = { "Legendary.Creature", "Creature.namedWolves of the Hunt", "Dinosaur" }; Card source = band.get(0); - for(int i = 0; i < bandsWithString.length; i++) { + for (int i = 0; i < bandsWithString.length; i++) { String keyword = bandsWithString[i]; String valid = validString[i]; diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index daf5888ea7a..9ab7719d0ef 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -807,7 +807,7 @@ public class Combat { if (defender instanceof Player && defender.hasKeyword("You assign combat damage of each creature attacking you.")) { assigningPlayer = (Player)defender; } - else if (AttackingBand.isValidBand(orderedBlockers, true)){ + else if (AttackingBand.isValidBand(orderedBlockers, true)) { assigningPlayer = orderedBlockers.get(0).getController(); } diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java index f6f58c8894e..464032de59c 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java @@ -175,7 +175,7 @@ public class CostPutCounter extends CostPartWithList { * @see forge.card.cost.CostPartWithList#executePayment(forge.card.spellability.SpellAbility, forge.Card) */ @Override - protected Card doPayment(SpellAbility ability, Card targetCard){ + protected Card doPayment(SpellAbility ability, Card targetCard) { final Integer i = this.convertAmount(); targetCard.addCounter(this.getCounter(), i, ability.getActivatingPlayer(), null, ability.getRootAbility().isTrigger(), counterTable); return targetCard; diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index d5ad6cc0e12..d69d7f8ba2b 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -394,7 +394,7 @@ public class PhaseHandler implements java.io.Serializable { final CardZoneTable table = new CardZoneTable(); final CardCollection discarded = new CardCollection(); boolean firstDiscarded = playerTurn.getNumDiscardedThisTurn() == 0; - for (Card c : playerTurn.getController().chooseCardsToDiscardToMaximumHandSize(numDiscard)){ + for (Card c : playerTurn.getController().chooseCardsToDiscardToMaximumHandSize(numDiscard)) { if (playerTurn.discard(c, null, table) != null) { discarded.add(c); } @@ -590,7 +590,7 @@ public class PhaseHandler implements java.io.Serializable { "You may exert CARDNAME as it attacks."); if (!possibleExerters.isEmpty()) { - for(Card exerter : whoDeclares.getController().exertAttackers(possibleExerters)) { + for (Card exerter : whoDeclares.getController().exertAttackers(possibleExerters)) { exerter.exert(); } } @@ -1087,7 +1087,7 @@ public class PhaseHandler implements java.io.Serializable { sw.reset(); } } - else if (DEBUG_PHASES){ + else if (DEBUG_PHASES) { System.out.print(" >> (no priority given to " + getPriorityPlayer() + ")\n"); } diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index 7531d7c02e2..f812e577c04 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/forge-game/src/main/java/forge/game/player/PlayerView.java @@ -483,7 +483,7 @@ public class PlayerView extends GameEntityView { if (cards == null) return 0; - for(CardView c : cards) { + for (CardView c : cards) { types.addAll((Collection) c.getCurrentState().getType().getCoreTypes()); } diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 168b9520b54..a142b5d59fe 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -2190,7 +2190,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit @Override public int compareTo(SpellAbility ab) { - if (this.isManaAbility() && ab.isManaAbility()){ + if (this.isManaAbility() && ab.isManaAbility()) { return this.calculateScoreForManaAbility() - ab.calculateScoreForManaAbility(); } return 0; diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java index cf978a2dfb4..3dcaa5c1ed4 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java @@ -318,7 +318,7 @@ public class SpellAbilityStackInstance implements IIdentifiable, IHasCardView { SpellAbility compare = sa; SpellAbilityStackInstance sub = this; - if (!compare.equals(sub.ability)){ + if (!compare.equals(sub.ability)) { return false; }