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

Fix issue with creating multiple new gauntlets in the same session

Browse Source
This commit is contained in:
drdev
2014-08-09 02:49:38 +00:00
parent 55dc9949a7
commit a169f50861
3 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui/src/main/java/forge/gauntlet/GauntletUtil.java
View File

@@ -15,11 +15,15 @@ public class GauntletUtil {
public static GauntletData createQuickGauntlet(final Deck userDeck, final int numOpponents, final List<DeckType> allowedDeckTypes) {
final File[] arrFiles = GauntletIO.getGauntletFilesQuick();
final Set<String> setNames = new HashSet<String>();
for (File f : arrFiles) { setNames.add(f.getName()); }
for (File f : arrFiles) {
setNames.add(f.getName());
}
int num = 1;
while (setNames.contains(GauntletIO.PREFIX_QUICK + num + GauntletIO.SUFFIX_DATA)) { num++; }
FModel.getGauntletData().setName(GauntletIO.PREFIX_QUICK + num);
GauntletData gauntlet = new GauntletData();
gauntlet.setName(GauntletIO.PREFIX_QUICK + num);
FModel.setGauntletData(gauntlet);
// Generate gauntlet decks
final List<String> lstEventNames = new ArrayList<String>();
@@ -55,13 +59,12 @@ public class GauntletUtil {
lstGauntletDecks.add(tempDeck);
}
final GauntletData gd = FModel.getGauntletData();
gd.setDecks(lstGauntletDecks);
gd.setEventNames(lstEventNames);
gd.setUserDeck(userDeck);
gauntlet.setDecks(lstGauntletDecks);
gauntlet.setEventNames(lstEventNames);
gauntlet.setUserDeck(userDeck);
// Reset all variable fields to 0, stamps and saves automatically.
gd.reset();
return gd;
gauntlet.reset();
return gauntlet;
}
}

1
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -134,7 +134,6 @@ public class FModel {
formats = new GameFormat.Collection(new GameFormat.Reader(new File(ForgeConstants.BLOCK_DATA_DIR + "formats.txt")));
blocks = new StorageBase<CardBlock>("Block definitions", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "blocks.txt", magicDb.getEditions()));
questPreferences = new QuestPreferences();
gauntletData = new GauntletData();
fantasyBlocks = new StorageBase<CardBlock>("Custom blocks", new CardBlock.Reader(ForgeConstants.BLOCK_DATA_DIR + "fantasyblocks.txt", magicDb.getEditions()));
worlds = new StorageBase<QuestWorld>("Quest worlds", new QuestWorld.Reader(ForgeConstants.QUEST_WORLD_DIR + "worlds.txt"));