Added workaround for crash if a registered species doesn't have a reg…

…istered template (#75)
bdew-minecraft · Jan 16, 2015 · 9b417ae · 9b417ae
1 parent 1687448
commit 9b417ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,10 +3,8 @@
 /build
 /run
 /deps/run
-/.idea/workspace.xml
-/.idea/dictionaries
+/.idea
 /eclipse
 /.gradle
 /*.iml
-/*.ipr
-/.idea/libraries/Gradle__*
+/*.ipr
diff --git a/src/net/bdew/gendustry/misc/GeneticsCache.scala b/src/net/bdew/gendustry/misc/GeneticsCache.scala
@@ -91,9 +91,13 @@ object GeneticsCache {
     Gendustry.logInfo("%d mutation inputs", speciesUsedMutations.size)
 
     for (species <- Misc.filterType(AlleleManager.alleleRegistry.getRegisteredAlleles.values(), classOf[IAlleleSpecies])) {
-      for ((allele, chromosome) <- species.getRoot.getTemplate(species.getUID).zipWithIndex) {
-        if (allele != null && !AlleleManager.alleleRegistry.isBlacklisted(allele.getUID))
-          speciesChromosomes(GeneSampleInfo(species.getRoot, chromosome, allele)) += species
+      if (species.getRoot.getTemplate(species.getUID) == null) {
+        Gendustry.logWarn("getTemplate returned null for species %s (root: %s)", species.getUID, species.getRoot.getUID)
+      } else {
+        for ((allele, chromosome) <- species.getRoot.getTemplate(species.getUID).zipWithIndex) {
+          if (allele != null && !AlleleManager.alleleRegistry.isBlacklisted(allele.getUID))
+            speciesChromosomes(GeneSampleInfo(species.getRoot, chromosome, allele)) += species
+        }
       }
     }