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

more resilent quest loader - handles situations like 'I took quest save from my friend who has all duel decks added to setdata.txt, and this quest fails to load on my machine dues to missing cards'

Browse Source
This commit is contained in:
Maxmtg
2013-05-15 04:03:09 +00:00
parent f549dbe189
commit 77e9ebc456
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/item/CardDb.java
View File

@@ -150,14 +150,18 @@ public final class CardDb {
} }
public CardPrinted tryGetCard(final String cardName, String setName) { public CardPrinted tryGetCard(final String cardName, String setName) {
return tryGetCard(cardName, setName, 0);
}
public CardPrinted tryGetCard(final String cardName, String setName, int index) {
// Set exists? // Set exists?
final Map<String, CardPrinted[]> cardsFromset = this.allCardsBySet.get(setName.toUpperCase()); final Map<String, CardPrinted[]> cardsFromset = this.allCardsBySet.get(setName);
if (cardsFromset == null) { if (cardsFromset == null) {
return null; return null;
} }
// Card exists? // Card exists?
final CardPrinted[] cardCopies = cardsFromset.get(cardName.toLowerCase()); final CardPrinted[] cardCopies = cardsFromset.get(cardName);
return cardCopies != null ? cardCopies[0] : null; return cardCopies != null && index < cardCopies.length ? cardCopies[index] : null;
} }
// Single fetch // Single fetch

5
src/main/java/forge/quest/io/QuestDataIO.java
View File

@@ -669,8 +669,9 @@ public class QuestDataIO {
final String sIndex = reader.getAttribute("i"); final String sIndex = reader.getAttribute("i");
final short index = StringUtils.isNumeric(sIndex) ? Short.parseShort(sIndex) : 0; final short index = StringUtils.isNumeric(sIndex) ? Short.parseShort(sIndex) : 0;
final boolean foil = "1".equals(reader.getAttribute("foil")); final boolean foil = "1".equals(reader.getAttribute("foil"));
final CardPrinted card = CardDb.instance().getCard(name, set, index); CardPrinted c = CardDb.instance().tryGetCard(name, set, index);
return foil ? CardPrinted.makeFoiled(card) : card; if ( null == c ) c = CardDb.instance().getCard(name);
return foil ? CardPrinted.makeFoiled(c) : c;
} }
} }
} }