diff --git a/src/main/java/forge/AllZone.java b/src/main/java/forge/AllZone.java index ee8085be6b5..e4fa1eabc3f 100644 --- a/src/main/java/forge/AllZone.java +++ b/src/main/java/forge/AllZone.java @@ -89,12 +89,11 @@ public final class AllZone { /** Constant CARD_RATINGS. */ private static CardRatings cardRatings = new CardRatings(); - + private static CardCollections collections; - + public static final CardCollections getDecks() { - if ( null == collections ) - { + if (null == collections) { collections = new CardCollections(ForgeProps.getFile(NewConstants.NEW_DECKS)); } return collections; diff --git a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java index 6bbad7c1fec..2f7b4e21418 100644 --- a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java +++ b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java @@ -207,7 +207,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { return true; } - + /** *

* checkZoneRestrictions. @@ -283,7 +283,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { if (this.isSorcerySpeed() && !PhaseHandler.canCastSorcery(activator)) { return false; } - + if (!checkTimingRestrictions(c, sa)) { return false; } diff --git a/src/main/java/forge/control/home/ControlConstructed.java b/src/main/java/forge/control/home/ControlConstructed.java index dd62593033f..cf096737bb2 100644 --- a/src/main/java/forge/control/home/ControlConstructed.java +++ b/src/main/java/forge/control/home/ControlConstructed.java @@ -568,7 +568,7 @@ public class ControlConstructed { deckNames = new ArrayList(); deckNames.add(0, "Random"); - + deckNames.addAll(AllZone.getDecks().getConstructed().getNames()); // No pre-constructed decks?