diff options
Diffstat (limited to 'server/src/state.rs')
| -rw-r--r-- | server/src/state.rs | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/server/src/state.rs b/server/src/state.rs index 20a57b9d..4be0fb5a 100644 --- a/server/src/state.rs +++ b/server/src/state.rs @@ -99,11 +99,7 @@ impl State { game: &mut game, state: &mut server, } - .load( - index.generate("lobby-none".to_string()).await?, - None, - &mut packet_out, - ); + .load(index.generate("lobby").await?, None, &mut packet_out); } Ok(Self { @@ -123,7 +119,7 @@ impl State { }; if server.tick(dt, &mut self.packet_out) { server.load( - self.index.generate("lobby-none".to_string()).await?, + self.index.generate("lobby").await?, None, &mut self.packet_out, ); @@ -192,7 +188,7 @@ impl State { }) .ok(); server.load( - self.index.generate("lobby-none".to_string()).await?, + self.index.generate("lobby").await?, None, &mut self.packet_out, ); @@ -231,7 +227,7 @@ impl State { }; match command { Command::Start { spec, timer } => { - let data = self.index.generate(spec).await?; + let data = self.index.generate(&spec).await?; server.load(data, Some(Duration::from_secs(timer)), &mut self.packet_out); } Command::End => { @@ -249,7 +245,7 @@ impl State { }) .ok(); server.load( - self.index.generate("lobby-none".to_string()).await?, + self.index.generate("lobby").await?, None, &mut self.packet_out, ); @@ -259,9 +255,7 @@ impl State { bail!("must be at most one player to reload"); } server.load( - self.index - .generate(server.state.data.spec.to_string()) - .await?, + self.index.generate(&server.game.data.current_map).await?, None, &mut self.packet_out, ); |