Add some exception handling

twanvl · Sep 10, 2018 · 8bdf9b6 · 8bdf9b6
1 parent eec96bc
commit 8bdf9b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/sts_exporter/CardExportData.java b/src/main/java/sts_exporter/CardExportData.java
@@ -456,8 +456,9 @@ private static final ArrayList<String> words(String str) {
 
     @Override
     public int compareTo(CardExportData that) {
-        if (card.color != that.card.color) return card.color.compareTo(that.card.color);
-        if (card.rarity != that.card.rarity) return card.rarity.compareTo(that.card.rarity);
-        return name.compareTo(that.name);
+        int result = card.color.compareTo(that.card.color);
+        if (result == 0) result = card.rarity.compareTo(that.card.rarity);
+        if (result == 0) result = name.compareTo(that.name);
+        return result;
     }
 }
diff --git a/src/main/java/sts_exporter/CreatureExportData.java b/src/main/java/sts_exporter/CreatureExportData.java
@@ -107,9 +107,13 @@ public static ArrayList<AbstractPlayer> getAllPlayers() {
             Method createCharacter = CardCrawlGame.class.getDeclaredMethod("createCharacter", AbstractPlayer.PlayerClass.class);
             createCharacter.setAccessible(true);
             for (AbstractPlayer.PlayerClass playerClass : AbstractPlayer.PlayerClass.values()) {
-                AbstractPlayer p = (AbstractPlayer)createCharacter.invoke(null, playerClass);
-                p.name = p.title;
-                players.add(p);
+                try {
+                    AbstractPlayer p = (AbstractPlayer)createCharacter.invoke(null, playerClass);
+                    p.name = p.title;
+                    players.add(p);
+                } catch (Exception e) {
+                    Exporter.logger.error("Exception occured when creating character", e);
+                }
             }
         } catch (Exception e) {
             Exporter.logger.error("Exception occured when getting createCharacter method", e);