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

Merge pull request #3048 from kevlahnota/newmaster2

Browse Source 
try to fix older gauntlet/tournament saves.
This commit is contained in:
Anthony Calosa
2023-05-02 07:25:35 +08:00
committed by GitHub
parent 6305671142 771a739702
commit 621b1bca6d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletIO.java
View File

@@ -213,7 +213,11 @@ public class GauntletIO {
final boolean foil = "1".equals(reader.getAttribute("foil")); final boolean foil = "1".equals(reader.getAttribute("foil"));
PaperCard card = FModel.getMagicDb().getOrLoadCommonCard(name, set, index, foil); PaperCard card = FModel.getMagicDb().getOrLoadCommonCard(name, set, index, foil);
if (null == card) { if (null == card) {
throw new RuntimeException("Unsupported card found in gauntlet save: " + name + " from edition " + set); //get same replacement card from any edition due to Edition updates/changes if it exists (ie Ugin, the Ineffable from edition PSLD, Mana Crypt from edition FS, Timeless Lotus from edition ???).
card = FModel.getMagicDb().getCommonCards().getCard(name);
if (card == null) //if the card is not found, notify via log instead of crashing
System.err.println("Warning: Unsupported card found in gauntlet save: " + name + " from edition " + set +". It will be removed from the gauntlet save.");
//throw new RuntimeException("Unsupported card found in gauntlet save: " + name + " from edition " + set);
} }
return card; return card;
} }

6
forge-gui/src/main/java/forge/gamemodes/tournament/TournamentIO.java
View File

@@ -188,7 +188,11 @@ public class TournamentIO {
final boolean foil = "1".equals(reader.getAttribute("foil")); final boolean foil = "1".equals(reader.getAttribute("foil"));
PaperCard card = FModel.getMagicDb().getOrLoadCommonCard(name, set, index, foil); PaperCard card = FModel.getMagicDb().getOrLoadCommonCard(name, set, index, foil);
if (null == card) { if (null == card) {
throw new RuntimeException("Unsupported card found in quest save: " + name + " from edition " + set); //get same replacement card from any edition due to Edition updates/changes if it exists (ie Ugin, the Ineffable from edition PSLD, Mana Crypt from edition FS, Timeless Lotus from edition ???).
card = FModel.getMagicDb().getCommonCards().getCard(name);
if (card == null) //if the card is not found, notify via log instead of crashing
System.err.println("Warning: Unsupported card found in quest save: " + name + " from edition " + set +". It will be removed from the quest save.");
//throw new RuntimeException("Unsupported card found in quest save: " + name + " from edition " + set);
} }
return card; return card;
} }