diff options
author | metamuffin <metamuffin@disroot.org> | 2024-09-02 01:56:48 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-09-02 14:18:02 +0200 |
commit | 84e2b868e87043f4e3844738f4e1c2a7bcbb96c0 (patch) | |
tree | e3c86d15d5b68c816a56b30c7c8fc99e8a01059c /server/src/entity | |
parent | c273af0311b0676dd6bb1bcfc600474508afd125 (diff) | |
download | hurrycurry-84e2b868e87043f4e3844738f4e1c2a7bcbb96c0.tar hurrycurry-84e2b868e87043f4e3844738f4e1c2a7bcbb96c0.tar.bz2 hurrycurry-84e2b868e87043f4e3844738f4e1c2a7bcbb96c0.tar.zst |
rephrase some messages in server
Diffstat (limited to 'server/src/entity')
-rw-r--r-- | server/src/entity/mod.rs | 8 | ||||
-rw-r--r-- | server/src/entity/player_portal.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index 7180d1a7..8055b50d 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -113,13 +113,13 @@ pub fn construct_entity( ) -> Result<DynEntity> { Ok(match decl.to_owned() { EntityDecl::ItemPortal { from, to } => Box::new(ItemPortal { - from: from.or(pos).ok_or(anyhow!("no item portal start"))?, + from: from.or(pos).ok_or(anyhow!("Item portal start without start"))?, to, }), EntityDecl::PlayerPortal { from, to } => Box::new(PlayerPortal { from: from .or(pos.map(|v| v.as_vec2())) - .ok_or(anyhow!("no player portal start"))?, + .ok_or(anyhow!("Player portal without start"))?, to, }), EntityDecl::Conveyor { @@ -130,10 +130,10 @@ pub fn construct_entity( filter, filter_dir, } => { - let from = from.or(pos).ok_or(anyhow!("conveyor has no start"))?; + let from = from.or(pos).ok_or(anyhow!("Conveyor has no start"))?; let to = to .or(dir.map(|s| s + from)) - .ok_or(anyhow!("conveyor has no destination"))?; + .ok_or(anyhow!("Conveyor has no destination"))?; Box::new(Conveyor { from, to, diff --git a/server/src/entity/player_portal.rs b/server/src/entity/player_portal.rs index 53ba9c39..c0faf767 100644 --- a/server/src/entity/player_portal.rs +++ b/server/src/entity/player_portal.rs @@ -37,7 +37,7 @@ impl Entity for PlayerPortal { .game .players .get_mut(&pid) - .ok_or(anyhow!("player missing"))?; + .ok_or(anyhow!("Player is missing"))?; p.movement.position = self.to; c.packet_out .push_back(PacketC::MovementSync { player: pid }); |