Minor fixes

2 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
index 5c4c10f86d..d9717b33b3 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java
@@ -95,7 +95,10 @@ public final class iaeaNuclide {
 
         String[] parts = Util.splitButDifferent(rows[0][16], "|");
         double Mass=doubleOrNaN(parts[0],"mass");
-        if(Mass!=Double.NaN) mass = (float)(Mass*MICRO_AMU_TO_EV_DIV_C_C);
+        if(!Double.isNaN(Mass)) {
+            //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z)));
+            mass = (float)(Mass*MICRO_AMU_TO_EV_DIV_C_C);
+        }
         else mass=Float.NaN;
 
         discovery=(short)doubleOrNaN(rows[0][18],"discovery");
@@ -128,7 +131,8 @@ public final class iaeaNuclide {
         if(s.length()>0) {
             try {
                 double value=Double.parseDouble(s);
-                return value != 0 ?value:Float.NaN;
+                if(Double.isNaN(value)) return Double.NaN;
+                return value != 0 ?value:Double.NaN;
             } catch (Exception e) {
                 System.out.println("Invalid Value " + name + " " + N + " " + Z + " " + s);
                 e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index e34d690732..efe9f54cd6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -256,8 +256,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
                         }
                         int maxDepth = 0;
                         for (int i = 0; i < 20; i++) {
-                            if (scanComplexityTemp[i] == SCAN_DO_NOTHING) continue;
-                            else {
+                            if (scanComplexityTemp[i] != SCAN_DO_NOTHING) {
                                 maxDepth = i;
                                 if(!DEBUG_MODE) scanComplexityTemp[i]&=~SCAN_GET_CLASS_TYPE;
                                 addComputationRequirements(i+1,scanComplexityTemp[i]);
@@ -268,7 +267,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
                         System.arraycopy(scanComplexityTemp,0,scanComplexity,0,maxDepth);
                     }
 
-                    totalComputationRemaining = totalComputationRequired;
+                    totalComputationRemaining = totalComputationRequired*=20;
                     mMaxProgresstime = 20;//const
                     mEfficiencyIncrease = 10000;
                     quantumStuff(true);