diff --git a/server/src/sys/terrain.rs b/server/src/sys/terrain.rs index 91a7741d42..cc42738159 100644 --- a/server/src/sys/terrain.rs +++ b/server/src/sys/terrain.rs @@ -1,7 +1,7 @@ +#[cfg(not(feature = "worldgen"))] +use crate::test_world::{IndexOwned, World}; #[cfg(feature = "persistent_world")] use crate::TerrainPersistence; -#[cfg(not(feature = "worldgen"))] -use test_world::{IndexOwned, World}; #[cfg(feature = "worldgen")] use world::{IndexOwned, World}; diff --git a/server/src/test_world.rs b/server/src/test_world.rs index 3f0da5f23a..41f6681d38 100644 --- a/server/src/test_world.rs +++ b/server/src/test_world.rs @@ -26,10 +26,7 @@ pub struct IndexOwned; pub struct IndexRef<'a>(&'a IndexOwned); impl IndexOwned { - pub fn reload_colors_if_changed( - &mut self, - _reload: impl FnOnce(&mut Self) -> R, - ) -> Option { + pub fn reload_if_changed(&mut self, _reload: impl FnOnce(&mut Self) -> R) -> Option { None }