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

Make it compile without feature(worldgen)

Browse Source 
+ move settings check to toggling mode segment
This commit is contained in:
juliancoffee
2021-08-28 13:36:33 +03:00
parent 68a4b269d2
commit 1838d151f5
1 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/cmd.rs
View File

@ -3108,10 +3108,13 @@ fn handle_battlemode(
) -> CmdResult<()> {
let ecs = server.state.ecs();
let settings = ecs.read_resource::<Settings>();
if let Some(mode) = parse_args!(args, String) {
if !settings.battle_mode.allow_choosing() {
return Err("Toggling battlemode is disabled.".to_owned());
}
if let Some(mode) = parse_args!(args, String) {
#[cfg(feature = "worldgen")]
let in_town = {
let world = &server.world;
let index = &server.index;
let sim = world.sim();
@ -3129,6 +3132,11 @@ fn handle_battlemode(
break;
}
}
in_town
};
// just skip this check, if worldgen is disabled
#[cfg(not(feature = "worldgen"))]
let in_town = true;
if !in_town {
return Err("You can change battle_mode only in town".to_owned());