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

Fixed folder format loading to ensure core sets load first (otherwise android may not load standard correctly)

Browse Source
This commit is contained in:
austinio7116
2018-03-30 09:53:35 +01:00
committed by maustin
parent 021c133db3
commit 057f5face3
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,12 +166,10 @@ public final class FModel {
ForgePreferences.DEV_MODE = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED); ForgePreferences.DEV_MODE = preferences.getPrefBoolean(FPref.DEV_MODE_ENABLED);
ForgePreferences.UPLOAD_DRAFT = ForgePreferences.NET_CONN; ForgePreferences.UPLOAD_DRAFT = ForgePreferences.NET_CONN;
formats = new GameFormat.Collection(new GameFormat.Reader( new File(ForgeConstants.FORMATS_DATA_DIR + "coreformats.txt")));
final File[] files = new File(ForgeConstants.FORMATS_DATA_DIR).listFiles(); final File[] files = new File(ForgeConstants.FORMATS_DATA_DIR).listFiles();
for (final File file : files) { for (final File file : files) {
if(formats == null){ if (!file.getName().equals("coreformats.txt")){
formats = new GameFormat.Collection(new GameFormat.Reader(file));
}else{
GameFormat.Collection additionalformats = new GameFormat.Collection(new GameFormat.Reader(file)); GameFormat.Collection additionalformats = new GameFormat.Collection(new GameFormat.Reader(file));
for (GameFormat format:additionalformats) { for (GameFormat format:additionalformats) {
formats.add(format); formats.add(format);