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

deckManager has lazy initialization now

Browse Source 
(in my private yet builds where Deck uses PrintedCards the decks loading before cardFactory caused NPEs)
This commit is contained in:
Maxmtg
2011-08-30 22:58:21 +00:00
parent 16d513aa4c
commit 8382c62a69
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/forge/AllZone.java
View File

@@ -6,6 +6,7 @@ import java.util.Map;
import net.slightlymagic.braids.util.UtilFunctions; import net.slightlymagic.braids.util.UtilFunctions;
import forge.card.cardFactory.CardFactoryInterface; import forge.card.cardFactory.CardFactoryInterface;
import forge.card.cardFactory.LazyCardFactory;
import forge.card.cardFactory.PreloadingCardFactory; import forge.card.cardFactory.PreloadingCardFactory;
import forge.card.mana.ManaPool; import forge.card.mana.ManaPool;
import forge.card.trigger.TriggerHandler; import forge.card.trigger.TriggerHandler;
@@ -78,7 +79,7 @@ public final class AllZone implements NewConstants {
private static Display display; private static Display display;
/** Constant <code>DECK_MGR</code>. */ /** Constant <code>DECK_MGR</code>. */
private static final DeckManager DECK_MGR = new DeckManager(ForgeProps.getFile(NEW_DECKS)); private static DeckManager deckManager;
/** /**
* <p>getHumanPlayer.</p> * <p>getHumanPlayer.</p>
@@ -221,9 +222,10 @@ public final class AllZone implements NewConstants {
* @since 1.0.15 * @since 1.0.15
*/ */
public static CardFactoryInterface getCardFactory() { public static CardFactoryInterface getCardFactory() {
if (cardFactory == null) { if (cardFactory == null) {
setCardFactory(new PreloadingCardFactory(ForgeProps.getFile(CARDSFOLDER))); //setCardFactory(new LazyCardFactory(ForgeProps.getFile(CARDSFOLDER)));
} setCardFactory(new PreloadingCardFactory(ForgeProps.getFile(CARDSFOLDER)));
}
return cardFactory; return cardFactory;
} }
@@ -638,7 +640,8 @@ public final class AllZone implements NewConstants {
* @return dMgr * @return dMgr
*/ */
public static DeckManager getDeckManager() { public static DeckManager getDeckManager() {
return DECK_MGR; if (deckManager == null) { deckManager = new DeckManager(ForgeProps.getFile(NEW_DECKS));}
return deckManager;
} }
/** /**