From fa7d5add4976a7c36390f13c503fa40aa06951b3 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Sun, 21 May 2023 07:48:56 +0200 Subject: [PATCH] FModel: load types before loading cards --- forge-gui/src/main/java/forge/model/FModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index adc72e64e2e..7029daf8f7c 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -164,6 +164,8 @@ public final class FModel { if (new AutoUpdater(true).attemptToUpdate()) { // } + // load types before loading cards + loadDynamicGamedata(); //load card database final CardStorageReader reader = new CardStorageReader(ForgeConstants.CARD_DATA_DIR, progressBarBridge, @@ -243,8 +245,6 @@ public final class FModel { Spell.setPerformanceMode(preferences.getPrefBoolean(FPref.PERFORMANCE_MODE)); - loadDynamicGamedata(); - if (progressBar != null) { FThreads.invokeInEdtLater(new Runnable() { @Override