diff options
Diffstat (limited to 'server/src/server.rs')
| -rw-r--r-- | server/src/server.rs | 18 | 
1 files changed, 10 insertions, 8 deletions
| diff --git a/server/src/server.rs b/server/src/server.rs index 6693d0fb..90a30891 100644 --- a/server/src/server.rs +++ b/server/src/server.rs @@ -235,7 +235,9 @@ impl Server {      pub async fn new(tx: Sender<PacketC>) -> Result<Self> {          Ok(Self {              game: Game::default(), -            index: DataIndex::load().await.context("loading data index")?, +            index: DataIndex::load() +                .await +                .context("Failed to load data index")?,              tx,              packet_out: VecDeque::new(),              connections: HashMap::new(), @@ -247,7 +249,7 @@ impl Server {              last_movement_update: HashMap::default(),              scoreboard: ScoreboardStore::load()                  .await -                .context("loading scoreboards")?, +                .context("Failed to load scoreboards")?,          })      }  } @@ -387,7 +389,7 @@ impl Server {                          .game                          .players                          .get_many_mut([&pid, &base_pid]) -                        .ok_or(anyhow!("interacting with yourself. this is impossible"))?; +                        .ok_or(anyhow!("Interacting with yourself. This is impossible."))?;                      if this.character < 0 || other.character < 0 {                          bail!("You shall not interact with customers.") @@ -411,7 +413,7 @@ impl Server {                          .game                          .players                          .get_mut(&pid) -                        .ok_or(anyhow!("player does not exist"))?; +                        .ok_or(anyhow!("The player does not exist"))?;                      interact_effect(                          &self.game.data, @@ -461,7 +463,7 @@ impl Server {                      .game                      .players                      .get_mut(&player) -                    .ok_or(anyhow!("player does not exist"))?; +                    .ok_or(anyhow!("The player does not exist"))?;                  pdata.item = item.map(|i| Item {                      kind: i,                      active: None, @@ -477,7 +479,7 @@ impl Server {                  self.game.score.points += score.points;                  self.score_changed = true;              } -            PacketS::ReplayTick { .. } => bail!("packet not supported in this session"), +            PacketS::ReplayTick { .. } => bail!("Packet not supported in this session"),          }          Ok(())      } @@ -620,7 +622,7 @@ impl Server {                  packet_in: &mut self.packet_loopback,                  dt,              }) { -                warn!("entity tick failed: {e}") +                warn!("Entity tick failed: {e}")              }          }          if let Some(map) = load_map { @@ -629,7 +631,7 @@ impl Server {          while let Some(p) = self.packet_loopback.pop_front() {              if let Err(e) = self.packet_in(p, &mut vec![]) { -                warn!("internal packet errored: {e}"); +                warn!("Internal packet errored: {e}");              }          } | 
