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

won't crash if card wasn't given oracle text

Browse Source
This commit is contained in:
Maxmtg
2013-02-21 07:07:50 +00:00
parent a23ea5f340
commit 5b837ce77d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/forge/card/CardFace.java
View File

@@ -27,7 +27,7 @@ final class CardFace implements ICardCharacteristics {
private ManaCost manaCost = ManaCost.NO_COST;
private ColorSet color = null;
private String oracleText = null;
private String oracleText = "";
private int iPower = -1;
private int iToughness = -1;
private String power = null;
@@ -76,7 +76,7 @@ final class CardFace implements ICardCharacteristics {
}
public void calculateColor() { // Most scripts do not specify color explicitly
if ( oracleText == null ) System.err.println(name + " has no Oracle text");
if ( StringUtils.isBlank( oracleText ) ) System.err.println(name + " has no Oracle text");
if ( manaCost == null && color == null ) System.err.println(name + " has neither ManaCost nor Color");
if ( color == null ) color = ColorSet.fromManaCost(manaCost);
}
@@ -87,10 +87,7 @@ final class CardFace implements ICardCharacteristics {
@Override public Set<Entry<String, CardInSet>> getSetsPrinted() { return this.setsPrinted.entrySet(); }
@Override public CardInSet getEditionInfo(final String setCode) {
final CardInSet result = this.setsPrinted.get(setCode);
if (result != null) {
return result;
}
throw new RuntimeException(String.format("Card '%s' was never printed in set '%s'", this.getName(), setCode));
return result; // if returns null, String.format("Card '%s' was never printed in set '%s'", this.getName(), setCode);
}
}