Made boulders avoid rivers

Cargo.toml

@@ -7,6 +7,7 @@ members = [
 	"chat-cli",
 	"server",
 	"server-cli",
+	"server-gui",
 	"voxygen",
 	"world",
 	"network",

server/src/lib.rs

@@ -358,6 +358,9 @@ impl Server {
     /// Get a reference to the server's world.
     pub fn world(&self) -> &World { &self.world }
 
+    /// Get a reference to the server's world map.
+    pub fn map(&self) -> &WorldMapMsg { &self.map }
+
     /// Execute a single server tick, handle input and update the game state by
     /// the given duration.
     pub fn tick(&mut self, _input: Input, dt: Duration) -> Result<Vec<Event>, Error> {

world/src/sim/mod.rs

@@ -2182,7 +2182,7 @@ impl SimChunk {
             downhill,
             temp,
             humidity,
-            rockiness: if true {
+            rockiness: if true && !river.is_river() {
                 (gen_ctx.rock_nz.get((wposf.div(1024.0)).into_array()) as f32)
                     .sub(0.1)
                     .mul(1.3)