Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replaced System.exit with RuntimeException

master
melvin 2011-07-21 11:25:41 +08:00
parent 20b44068a6
commit f432ac70d0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/magic/data/CardDefinitions.java
View File

@ -106,14 +106,13 @@ public class CardDefinitions {
if (card!=null) { if (card!=null) {
//legendaries are at least Rare //legendaries are at least Rare
if (card.hasType(MagicType.Legendary) && card.getRarity() < 3) { if (card.hasType(MagicType.Legendary) && card.getRarity() < 3) {
card.setRarity('R'); System.err.println("ERROR! Wrong rarity for " + card.getName());
System.err.println("Rarity for Legendary : "+card.getName()); throw new RuntimeException(card.getName() + " is legendary but rarity is only " + card.getRarity());
System.exit(1);
} }
//every card should have a timing hint //every card should have a timing hint
if (card.getTiming()==MagicTiming.None) { if (card.getTiming()==MagicTiming.None) {
System.err.println("No timing : "+card.getName()); System.err.println("ERROR! No timing hint for " + card.getName());
System.exit(1); throw new RuntimeException(card.getName() + " does not have a timing hint");
} }
} }
} }
@ -201,10 +200,6 @@ public class CardDefinitions {
} }
public MagicCardDefinition getCard(final int cindex) { public MagicCardDefinition getCard(final int cindex) {
if (cindex < 0 || cindex >= cards.size()) {
System.err.println("ERROR! No card definition found at " + cindex);
System.exit(1);
}
return cards.get(cindex); return cards.get(cindex);
} }
@ -212,7 +207,7 @@ public class CardDefinitions {
final MagicCardDefinition cardDefinition=cardsMap.get(name); final MagicCardDefinition cardDefinition=cardsMap.get(name);
if (cardDefinition == null) { if (cardDefinition == null) {
System.err.println("ERROR! No card definition found for " + name); System.err.println("ERROR! No card definition found for " + name);
System.exit(1); throw new RuntimeException("No card definition found for " + name);
} }
return cardDefinition; return cardDefinition;
} }