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

- Moved most of the stuff happening in startGame outside of the swingWorker (to fix the ConcurrentModificationException error).

Browse Source
This commit is contained in:
Sloth
2012-11-23 16:10:40 +00:00
parent 9f157274ee
commit 32b81da2e0
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java
View File

@@ -294,39 +294,6 @@ public class SSubmenuQuestUtil {
qData.setCurrentEvent(event); qData.setCurrentEvent(event);
qData.save(); qData.save();
PlayerStartConditions humanStart = new PlayerStartConditions(SSubmenuQuestUtil.getCurrentDeck());
PlayerStartConditions aiStart = new PlayerStartConditions(event.getEventDeck());
if (qData.getMode() == QuestMode.Fantasy) {
int lifeAI = 20;
int extraLifeHuman = 0;
if (event instanceof QuestEventChallenge) {
lifeAI = ((QuestEventChallenge) event).getAILife();
if (qData.getAssets().hasItem(QuestItemType.ZEPPELIN)) {
extraLifeHuman = 3;
}
}
humanStart.setStartingLife(qData.getAssets().getLife(qData.getMode()) + extraLifeHuman);
aiStart.setStartingLife(lifeAI);
humanStart.setCardsOnTable(new Supplier<Iterable<Card>>() {
@Override public Iterable<Card> get() { return QuestUtil.getHumanStartingCards(qData, event); } });
aiStart.setCardsOnTable(new Supplier<Iterable<Card>>() {
@Override public Iterable<Card> get() { return QuestUtil.getComputerStartingCards(event); } });
} // End isFantasy
MatchStartHelper msh = new MatchStartHelper();
msh.addPlayer( Singletons.getControl().getLobby().getQuestPlayer(), humanStart );
LobbyPlayer aiPlayer = Singletons.getControl().getLobby().findLocalPlayer(PlayerType.COMPUTER, event.getName());
aiPlayer.setPicture(event.getIconFilename());
msh.addPlayer( aiPlayer, aiStart );
Singletons.getModel().getMatch().initMatch(GameType.Quest, msh.getPlayerMap());
Singletons.getModel().getMatch().startRound();
return null; return null;
} }
@@ -336,6 +303,39 @@ public class SSubmenuQuestUtil {
} }
}; };
worker.execute(); worker.execute();
PlayerStartConditions humanStart = new PlayerStartConditions(SSubmenuQuestUtil.getCurrentDeck());
PlayerStartConditions aiStart = new PlayerStartConditions(event.getEventDeck());
if (qData.getMode() == QuestMode.Fantasy) {
int lifeAI = 20;
int extraLifeHuman = 0;
if (event instanceof QuestEventChallenge) {
lifeAI = ((QuestEventChallenge) event).getAILife();
if (qData.getAssets().hasItem(QuestItemType.ZEPPELIN)) {
extraLifeHuman = 3;
}
}
humanStart.setStartingLife(qData.getAssets().getLife(qData.getMode()) + extraLifeHuman);
aiStart.setStartingLife(lifeAI);
humanStart.setCardsOnTable(new Supplier<Iterable<Card>>() {
@Override public Iterable<Card> get() { return QuestUtil.getHumanStartingCards(qData, event); } });
aiStart.setCardsOnTable(new Supplier<Iterable<Card>>() {
@Override public Iterable<Card> get() { return QuestUtil.getComputerStartingCards(event); } });
} // End isFantasy
MatchStartHelper msh = new MatchStartHelper();
msh.addPlayer( Singletons.getControl().getLobby().getQuestPlayer(), humanStart );
LobbyPlayer aiPlayer = Singletons.getControl().getLobby().findLocalPlayer(PlayerType.COMPUTER, event.getName());
aiPlayer.setPicture(event.getIconFilename());
msh.addPlayer( aiPlayer, aiStart );
Singletons.getModel().getMatch().initMatch(GameType.Quest, msh.getPlayerMap());
Singletons.getModel().getMatch().startRound();
} }
/** Duplicate in DeckEditorQuestMenu and /** Duplicate in DeckEditorQuestMenu and