Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'juliancoffee/fix_testserver' into 'master'

Browse Source 
Make test-server compile again

See merge request veloren/veloren!2974
This commit is contained in:
Marcel 2021-10-30 09:27:27 +00:00
commit bcba2aae7e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/sys/terrain.rs
View File

@ -1,7 +1,7 @@
#[cfg(not(feature = "worldgen"))]
use crate::test_world::{IndexOwned, World};
#[cfg(feature = "persistent_world")] #[cfg(feature = "persistent_world")]
use crate::TerrainPersistence; use crate::TerrainPersistence;
#[cfg(not(feature = "worldgen"))]
use test_world::{IndexOwned, World};
#[cfg(feature = "worldgen")] #[cfg(feature = "worldgen")]
use world::{IndexOwned, World}; use world::{IndexOwned, World};

5
server/src/test_world.rs
View File

@ -26,10 +26,7 @@ pub struct IndexOwned;
pub struct IndexRef<'a>(&'a IndexOwned); pub struct IndexRef<'a>(&'a IndexOwned);
impl IndexOwned { impl IndexOwned {
pub fn reload_colors_if_changed<R>( pub fn reload_if_changed<R>(&mut self, _reload: impl FnOnce(&mut Self) -> R) -> Option<R> {
&mut self,
_reload: impl FnOnce(&mut Self) -> R,
) -> Option<R> {
None None
} }