diff options
Diffstat (limited to 'server/src/state.rs')
| -rw-r--r-- | server/src/state.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/server/src/state.rs b/server/src/state.rs index 5eb4059a..19c38fd2 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -21,7 +21,7 @@ use hurrycurry_protocol::{Message, PacketC, PacketS, PlayerID}; use log::{debug, info, trace}; impl Server { - pub async fn tick_outer(&mut self, dt: f32) -> anyhow::Result<()> { + pub fn tick_outer(&mut self, dt: f32) -> anyhow::Result<()> { if self.start_pause_timer > 0. { self.start_pause_timer -= dt } @@ -46,8 +46,8 @@ impl Server { if !self.paused { let r = self.tick(dt); if let Some((name, timer)) = r { - self.scoreboard.save().await?; - self.load(self.index.generate(&name).await?, timer); + self.scoreboard.save()?; + self.load(self.index.generate_with_book(&name)?, timer); } } while let Some(p) = self.packet_out.pop_front() { @@ -78,7 +78,7 @@ impl Server { player, .. } if let Some(command) = text.strip_prefix("/") => { - match self.handle_command_parse(*player, command).await { + match self.handle_command_parse(*player, command) { Ok(packets) => return Ok(packets), Err(e) => { return Ok(vec![PacketC::ServerMessage { @@ -116,8 +116,7 @@ impl Server { .ok(); self.load( self.index - .generate("lobby") - .await + .generate_with_book("lobby") .map_err(|m| tre!("s.error.map_load", s = format!("{m}")))?, None, ); |