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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-12-01 21:28:49 +00:00
parent a9a199518d
commit 6ac18eb140
9 changed files with 56 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/model/FModel.java
View File

@@ -169,7 +169,7 @@ public enum FModel {
* Separate thread, no more hangs when network connection is limited
*/
private void testNetworkConnection() {
//
Runnable runNetworkTest = new Runnable() {
@Override
public void run() {

10
src/main/java/forge/quest/QuestController.java
View File

@@ -161,8 +161,9 @@ public class QuestController {
* @return QuestPreconManager
*/
public static IStorageView<PreconDeck> getPrecons() {
if ( null == preconManager )
if (null == preconManager) {
preconManager = new StorageView<PreconDeck>(new PreconReader(ForgeProps.getFile(NewConstants.Quest.PRECONS)));
}
return QuestController.preconManager;
}
@@ -223,12 +224,13 @@ public class QuestController {
this.load(new QuestData(name, difficulty, mode, formatPrizes, allowSetUnlocks)); // pass awards and unlocks here
if ( null != startingCards )
if (null != startingCards) {
this.myCards.addDeck(startingCards);
else {
} else {
Predicate<CardPrinted> filter = Predicates.alwaysTrue();
if ( formatStartingPool != null )
if (formatStartingPool != null) {
filter = formatStartingPool.getFilterPrinted();
}
this.myCards.setupNewGameCardPool(filter, difficulty);
}

4
src/main/java/forge/quest/QuestEventChallenge.java
View File

@@ -223,8 +223,8 @@ public class QuestEventChallenge extends QuestEvent {
* @return the card reward list
*/
public final List<CardPrinted> getCardRewardList() {
if ( cardRewardList == null )
{
if (cardRewardList == null) {
this.cardRewardList = BoosterUtils.generateCardRewardList(cardReward);
}
return this.cardRewardList.open();

12
src/main/java/forge/quest/QuestUtilCards.java
View File

@@ -78,13 +78,16 @@ public final class QuestUtilCards {
if (usedFormat != null) {
List<String> availableEditions = usedFormat.getAllowedSetCodes();
for (String edition : availableEditions) {
if (db.isCardSupported("Plains", edition))
if (db.isCardSupported("Plains", edition)) {
landCodes.add(edition);
}
if (usedFormat.isSetLegal("ICE"))
}
if (usedFormat.isSetLegal("ICE")) {
snowLandCodes.add("ICE");
if (usedFormat.isSetLegal("CSP"))
}
if (usedFormat.isSetLegal("CSP")) {
snowLandCodes.add("CSP");
}
} else {
Iterable<CardEdition> allEditions = Singletons.getModel().getEditions();
for (CardEdition edition : Iterables.filter(allEditions, CardEdition.Predicates.hasBasicLands)) {
@@ -95,8 +98,9 @@ public final class QuestUtilCards {
}
String landCode = Aggregates.random(landCodes);
if ( null == landCode )
if (null == landCode) {
landCode = "M10";
}
pool.add(db.getCard("Forest", landCode), nBasic);
pool.add(db.getCard("Mountain", landCode), nBasic);

3
src/main/java/forge/quest/data/QuestData.java
View File

@@ -77,8 +77,9 @@ public final class QuestData {
public QuestData(String name2, int diff, QuestMode mode2, GameFormat userFormat, boolean allowSetUnlocks) {
this.name = name2;
if ( userFormat != null)
if (userFormat != null) {
this.format = new GameFormatQuest(userFormat, allowSetUnlocks);
}
this.mode = mode2;
this.achievements = new QuestAchievements(diff);
this.assets = new QuestAssets(format);