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

- Temporary fix so QuestController is instantiated when it's first requested, instead of when FModel is, since that's too early

Browse Source
This commit is contained in:
Sol
2012-10-08 23:27:45 +00:00
parent 7edd2c4948
commit 9c174b3e3e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,7 @@ public enum FModel {
private final FMatchState matchState; private final FMatchState matchState;
private GauntletData gauntletData; private GauntletData gauntletData;
private final QuestController quest; private QuestController quest = null;
private final EditionCollection editions; private final EditionCollection editions;
private final FormatCollection formats; private final FormatCollection formats;
@@ -147,7 +147,6 @@ public enum FModel {
this.blocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions)); this.blocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/blocks.txt", editions));
this.fantasyBlocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/fantasyblocks.txt", editions)); this.fantasyBlocks = new StorageView<CardBlock>(new CardBlock.Reader("res/blockdata/fantasyblocks.txt", editions));
this.quest = new QuestController();
// TODO - there's got to be a better place for this...oblivion? // TODO - there's got to be a better place for this...oblivion?
Preferences.DEV_MODE = this.preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED); Preferences.DEV_MODE = this.preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
@@ -164,6 +163,9 @@ public enum FModel {
} }
public final QuestController getQuest() { public final QuestController getQuest() {
if (quest == null) {
this.quest = new QuestController();
}
return quest; return quest;
} }