Merge branch 'zesterer/small-fixes' into 'master'

Small Fixes

See merge request veloren/veloren!851

assets/voxygen/shaders/include/light.glsl

@@ -25,7 +25,7 @@ vec3 illuminate(vec3 color, vec3 light, vec3 diffuse, vec3 ambience) {
 }
 
 float attenuation_strength(vec3 rpos) {
-	return 1.0 / (rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z);
+	return 1.0 / pow(rpos.x * rpos.x + rpos.y * rpos.y + rpos.z * rpos.z, 0.6);
 }
 
 vec3 light_at(vec3 wpos, vec3 wnorm) {

common/src/path.rs

@@ -218,8 +218,26 @@ where
         ];
 
         DIRS.iter()
-            .map(move |dir| pos + dir)
+            .map(move |dir| (pos, dir))
-            .filter(move |pos| is_walkable(pos))
+            .filter(move |(pos, dir)| {
+                is_walkable(pos)
+                    && ((dir.z < 1
+                        || vol
+                            .get(pos + Vec3::unit_z() * 2)
+                            .map(|b| !b.is_solid())
+                            .unwrap_or(true))
+                        && (dir.z < 2
+                            || vol
+                                .get(pos + Vec3::unit_z() * 3)
+                                .map(|b| !b.is_solid())
+                                .unwrap_or(true))
+                        && (dir.z >= 0
+                            || vol
+                                .get(pos + *dir + Vec3::unit_z() * 2)
+                                .map(|b| !b.is_solid())
+                                .unwrap_or(true)))
+            })
+            .map(move |(pos, dir)| pos + dir)
             .chain(
                 DIAGONALS
                     .iter()