Fixed crash on startup.

This commit is contained in:
Krazy
2014-06-01 05:19:50 +00:00
parent b459ca2ec0
commit f7d82c00d5

View File

@@ -80,8 +80,12 @@ public enum CSubmenuQuestDraft implements ICDoc {
new UiCommand() { @Override new UiCommand() { @Override
public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } }); public void run() { CSubmenuQuestDraft.this.endTournamentAndAwardPrizes(); } });
if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) { if (FModel.getQuest().getAchievements() == null) {
view.setMode(Mode.EMPTY); view.setMode(Mode.EMPTY);
} else if (FModel.getQuest().getAchievements().getDraftEvents() == null || FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
QuestAchievements achievements = FModel.getQuest().getAchievements();
achievements.generateNewTournaments();
view.setMode(Mode.SELECT_TOURNAMENT);
} else if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) { } else if (FModel.getQuest().getDraftDecks() == null || !FModel.getQuest().getDraftDecks().contains(QuestEventDraft.DECK_NAME)) {
view.setMode(Mode.SELECT_TOURNAMENT); view.setMode(Mode.SELECT_TOURNAMENT);
} else if (!FModel.getQuest().getAchievements().getCurrentDraft().isStarted()) { } else if (!FModel.getQuest().getAchievements().getCurrentDraft().isStarted()) {
@@ -274,7 +278,15 @@ public enum CSubmenuQuestDraft implements ICDoc {
VSubmenuQuestDraft view = VSubmenuQuestDraft.SINGLETON_INSTANCE; VSubmenuQuestDraft view = VSubmenuQuestDraft.SINGLETON_INSTANCE;
if (FModel.getQuest().getAchievements() == null || FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) { if (FModel.getQuest().getAchievements() == null) {
view.setMode(Mode.EMPTY);
return;
}
QuestAchievements achievements = FModel.getQuest().getAchievements();
achievements.generateNewTournaments();
if (FModel.getQuest().getAchievements().getDraftEvents().isEmpty()) {
view.setMode(Mode.EMPTY); view.setMode(Mode.EMPTY);
return; return;
} }
@@ -291,9 +303,6 @@ public enum CSubmenuQuestDraft implements ICDoc {
QuestDraftUtils.update(); QuestDraftUtils.update();
QuestAchievements achievements = FModel.getQuest().getAchievements();
achievements.generateNewTournaments();
switch (view.getMode()) { switch (view.getMode()) {
case SELECT_TOURNAMENT: case SELECT_TOURNAMENT: