diff --git a/server/src/lib.rs b/server/src/lib.rs index 0e7d529931..cdc808259b 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -362,7 +362,10 @@ impl Server { let connection_handler = ConnectionHandler::new(network); // Initiate real-time world simulation + #[cfg(feature = "worldgen")] rtsim::init(&mut state, &world); + #[cfg(not(feature = "worldgen"))] + rtsim::init(&mut state); let this = Self { state, @@ -503,6 +506,7 @@ impl Server { dt, |dispatcher_builder| { sys::add_server_systems(dispatcher_builder); + #[cfg(feature = "worldgen")] rtsim::add_server_systems(dispatcher_builder); }, false, diff --git a/server/src/rtsim/mod.rs b/server/src/rtsim/mod.rs index 0e9665f99e..0aab0f6704 100644 --- a/server/src/rtsim/mod.rs +++ b/server/src/rtsim/mod.rs @@ -82,8 +82,11 @@ pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) { dispatch_builder.add(tick::Sys, TICK_SYS, &[LOAD_CHUNK_SYS, UNLOAD_CHUNK_SYS]); } -pub fn init(state: &mut State, world: &world::World) { +pub fn init(state: &mut State, #[cfg(feature = "worldgen")] world: &world::World) { + #[cfg(feature = "worldgen")] let mut rtsim = RtSim::new(world.sim().get_size()); + #[cfg(not(feature = "worldgen"))] + let mut rtsim = RtSim::new(Vec2::new(40, 40)); for _ in 0..2500 { let pos = rtsim