Changed noise octaves with non-detailed worldgen

core/src/io/anuke/mindustry/core/Control.java

@@ -352,7 +352,7 @@ public class Control extends Module{
             throw new RuntimeException(error);
         }
 
-        if(Inputs.keyTap("console")){
+        if(debug && Inputs.keyTap("console")){
             console = !console;
         }
 

core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java

@@ -248,7 +248,7 @@ public class WorldGenerator{
         double iceridge = rid.getValue(x+99999, y, 1f / 300f) + sim3.octaveNoise2D(2, 1f, 1f/14f, x, y)/11f;
         double elevation = elevationOf(x, y, detailed);
         double temp = vn.noise(x, y, 1f / 300f) * sim3.octaveNoise2D(detailed ? 2 : 1, 1, 1f / 13f, x, y)/13f
-            + sim3.octaveNoise2D(detailed ? 12 : 6, 0.6, 1f / 920f, x, y);
+            + sim3.octaveNoise2D(detailed ? 12 : 9, 0.6, 1f / 920f, x, y);
 
         int lerpDst = 20;
         lerpDst *= lerpDst;
@@ -317,7 +317,7 @@ public class WorldGenerator{
 
     double elevationOf(int x, int y, boolean detailed){
         double ridge = rid.getValue(x, y, 1f / 400f);
-        return sim.octaveNoise2D(detailed ? 7 : 2, 0.62, 1f / 640, x, y) * 6.1 - 1 - ridge;
+        return sim.octaveNoise2D(detailed ? 7 : 4, 0.62, 1f / 640, x, y) * 6.1 - 1 - ridge;
     }
 
     public static class GenResult{

core/src/io/anuke/mindustry/world/consumers/ConsumeLiquid.java

@@ -43,7 +43,7 @@ public class ConsumeLiquid extends Consume{
 
     @Override
     public boolean valid(Block block, TileEntity entity){
-        return entity.liquids.get(liquid) >= use(block);
+        return entity != null && entity.liquids != null && entity.liquids.get(liquid) >= use(block);
     }
 
     @Override