Merge branch 'master' into newclient

snowblossomcoin · Jul 8, 2018 · eff0746 · eff0746
2 parents 2571b85 + ae51ccc
commit eff0746
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/miner/src/Arktika.java b/miner/src/Arktika.java
@@ -428,6 +428,10 @@ else if (type.equals("mem"))
       {
         //We'll get to you layer
       }
+      else
+      {
+        throw new RuntimeException("Unknown type: " + type);
+      }
     }
 
     for(int i=0; i<layer_count; i++)

diff --git a/miner/src/FieldSource.java b/miner/src/FieldSource.java
@@ -36,7 +36,7 @@ public boolean hasChunk(int n)
 
   public boolean skipQueueOnRehit()
   {
-    return true;
+    return false;
   }
 
   public boolean hasDeckFiles()