diff --git a/src/command.rs b/src/command.rs index 75b2a9b..b5ae53e 100644 --- a/src/command.rs +++ b/src/command.rs @@ -671,7 +671,7 @@ impl<'m> Command<'m> { Command::LevelRule { rule, value } => { if rule == "all" { // get all rules - if let Some(rules) = data.level.level_rules.get_all_rules_info() { + if let Some(rules) = data.level.rules.get_all_rules_info() { for (name, rule) in rules { messages.push(format!("&f{name}: {rule}")); } @@ -680,7 +680,7 @@ impl<'m> Command<'m> { } } else if let Some(value) = value { // set a rule - match data.level.level_rules.set_rule(rule, value) { + match data.level.rules.set_rule(rule, value) { Ok(()) => { messages.push(format!("&fUpdated rule {rule}")); } @@ -690,7 +690,7 @@ impl<'m> Command<'m> { } } else { // get a rule - if let Some(info) = data.level.level_rules.get_rule(rule) { + if let Some(info) = data.level.rules.get_rule(rule) { messages.push(format!("&f{info}")); } else { messages.push(format!("Unknown rule: {rule}")); diff --git a/src/level.rs b/src/level.rs index d32127e..b89a1ba 100644 --- a/src/level.rs +++ b/src/level.rs @@ -38,7 +38,7 @@ pub struct Level { pub weather: WeatherType, /// the level's level rules #[serde(default)] - pub level_rules: LevelRules, + pub rules: LevelRules, /// index of blocks which need to be updated in the next tick #[serde(default)] @@ -65,7 +65,7 @@ impl Level { z_size, blocks: vec![0; x_size * y_size * z_size], weather: WeatherType::Sunny, - level_rules: Default::default(), + rules: Default::default(), awaiting_update: Default::default(), possible_random_updates: Default::default(), updates: Default::default(), diff --git a/src/server.rs b/src/server.rs index d442dbe..0fb6b97 100644 --- a/src/server.rs +++ b/src/server.rs @@ -215,7 +215,7 @@ fn tick(data: &mut ServerData, tick: usize) { // apply random tick updates let mut rng = rand::thread_rng(); level.possible_random_updates.shuffle(&mut rng); - for _ in 0..level.level_rules.random_tick_updates { + for _ in 0..level.rules.random_tick_updates { if let Some(index) = level.possible_random_updates.pop() { level.awaiting_update.insert(index); } else { @@ -240,7 +240,7 @@ fn tick(data: &mut ServerData, tick: usize) { .is_none_or(|id| id == 0x00) { dirt_count += 1; - if rng.gen_range(0..level.level_rules.grass_spread_chance) == 0 { + if rng.gen_range(0..level.rules.grass_spread_chance) == 0 { dirt_count -= 1; level.updates.push(BlockUpdate { index: level.index(nx, ny, nz), @@ -255,7 +255,7 @@ fn tick(data: &mut ServerData, tick: usize) { .is_some_and(|id| id != 0x00) { dirt_count += 1; - if rng.gen_range(0..level.level_rules.grass_spread_chance) == 0 { + if rng.gen_range(0..level.rules.grass_spread_chance) == 0 { dirt_count -= 1; level.updates.push(BlockUpdate { index: level.index(x, y, z), @@ -278,7 +278,7 @@ fn tick(data: &mut ServerData, tick: usize) { stationary, ticks_to_spread, } => { - if !level.level_rules.fluid_spread { + if !level.rules.fluid_spread { continue; } if tick % ticks_to_spread == 0 { @@ -328,7 +328,7 @@ fn tick(data: &mut ServerData, tick: usize) { } } BlockType::FluidStationary { moving } => { - if !level.level_rules.fluid_spread { + if !level.rules.fluid_spread { continue; } let mut needs_update = false;