mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 11:48:02 +00:00
All computer decks are auto-assigned names
Protection from crashing on empty decks files Resolution for issues 241-244
This commit is contained in:
@@ -245,11 +245,19 @@ public class DeckManager {
|
|||||||
for (File file : files) {
|
for (File file : files) {
|
||||||
Deck[] d = new Deck[8];
|
Deck[] d = new Deck[8];
|
||||||
|
|
||||||
|
boolean gotError = false;
|
||||||
for (int i = 0; i < d.length; i++) {
|
for (int i = 0; i < d.length; i++) {
|
||||||
d[i] = readDeck(new File(file, i + ".dck"));
|
d[i] = readDeck(new File(file, i + ".dck"));
|
||||||
|
if(d[i] == null) {
|
||||||
|
gotError = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
draftMap.put(d[0].getName(), d);
|
if (!gotError)
|
||||||
|
{
|
||||||
|
draftMap.put(d[0].getName(), d);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -276,7 +284,8 @@ public class DeckManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ListIterator<String> lineIterator = lines.listIterator();
|
ListIterator<String> lineIterator = lines.listIterator();
|
||||||
|
if (!lineIterator.hasNext()) { return null; }
|
||||||
|
|
||||||
String line = lineIterator.next();
|
String line = lineIterator.next();
|
||||||
|
|
||||||
//Old text-based format
|
//Old text-based format
|
||||||
|
|||||||
@@ -252,6 +252,10 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
|
|||||||
Deck[] all = {
|
Deck[] all = {
|
||||||
human, computer[0], computer[1], computer[2], computer[3], computer[4], computer[5], computer[6]};
|
human, computer[0], computer[1], computer[2], computer[3], computer[4], computer[5], computer[6]};
|
||||||
|
|
||||||
|
for(int i = 1; i < all.length; i++) {
|
||||||
|
all[i].setName(String.format("Draft %s - Computer %d", s, i));
|
||||||
|
}
|
||||||
|
|
||||||
//DeckManager deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS));
|
//DeckManager deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS));
|
||||||
DeckManager deckManager = AllZone.getDeckManager();
|
DeckManager deckManager = AllZone.getDeckManager();
|
||||||
deckManager.addDraftDeck(all);
|
deckManager.addDraftDeck(all);
|
||||||
|
|||||||
Reference in New Issue
Block a user