external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-02-18 21:23:41 +00:00
parent b4de819f5f
commit 663825c2d3
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/AllZone.java
View File

@@ -89,12 +89,11 @@ public final class AllZone {
/** Constant <code>CARD_RATINGS</code>. */ /** Constant <code>CARD_RATINGS</code>. */
private static CardRatings cardRatings = new CardRatings(); private static CardRatings cardRatings = new CardRatings();
private static CardCollections collections; private static CardCollections collections;
public static final CardCollections getDecks() { public static final CardCollections getDecks() {
if ( null == collections ) if (null == collections) {
{
collections = new CardCollections(ForgeProps.getFile(NewConstants.NEW_DECKS)); collections = new CardCollections(ForgeProps.getFile(NewConstants.NEW_DECKS));
} }
return collections; return collections;

4
src/main/java/forge/card/spellability/SpellAbilityRestriction.java
View File

@@ -207,7 +207,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
return true; return true;
} }
/** /**
* <p> * <p>
* checkZoneRestrictions. * checkZoneRestrictions.
@@ -283,7 +283,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
if (this.isSorcerySpeed() && !PhaseHandler.canCastSorcery(activator)) { if (this.isSorcerySpeed() && !PhaseHandler.canCastSorcery(activator)) {
return false; return false;
} }
if (!checkTimingRestrictions(c, sa)) { if (!checkTimingRestrictions(c, sa)) {
return false; return false;
} }

2
src/main/java/forge/control/home/ControlConstructed.java
View File

@@ -568,7 +568,7 @@ public class ControlConstructed {
deckNames = new ArrayList<String>(); deckNames = new ArrayList<String>();
deckNames.add(0, "Random"); deckNames.add(0, "Random");
deckNames.addAll(AllZone.getDecks().getConstructed().getNames()); deckNames.addAll(AllZone.getDecks().getConstructed().getNames());
// No pre-constructed decks? // No pre-constructed decks?