diff options
author | metamuffin <metamuffin@disroot.org> | 2024-09-18 15:42:19 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-09-18 15:42:19 +0200 |
commit | fb6ca2a4b9d78dd80dbdf37b2926d9ede4108e8b (patch) | |
tree | 76b1a77dcd3ae29595caaa6423a18b5ce29e32db /server/src/main.rs | |
parent | e5fdbaadbf01f14290e70c49482e1dce3c9816d8 (diff) | |
download | hurrycurry-fb6ca2a4b9d78dd80dbdf37b2926d9ede4108e8b.tar hurrycurry-fb6ca2a4b9d78dd80dbdf37b2926d9ede4108e8b.tar.bz2 hurrycurry-fb6ca2a4b9d78dd80dbdf37b2926d9ede4108e8b.tar.zst |
translate server messages
Diffstat (limited to 'server/src/main.rs')
-rw-r--r-- | server/src/main.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/server/src/main.rs b/server/src/main.rs index de680200..20d9908d 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -22,7 +22,7 @@ use hurrycurry_protocol::{PacketC, PacketS, BINCODE_CONFIG, VERSION}; use hurrycurry_server::{ data::DATA_DIR, server::{GameServerExt, Server}, - ConnectionID, + trm, ConnectionID, }; use log::{debug, info, trace, warn, LevelFilter}; use std::{ @@ -168,8 +168,8 @@ async fn run(addr: SocketAddr) -> anyhow::Result<()> { rx = rx.resubscribe(); warn!("Client was lagging; resubscribed: {e}"); PacketC::ServerMessage { - text: "Lagging behind. Some clientbound packets were dropped." - .to_string(), + message: trm!("s.state.overflow_resubscribe"), + error: true, } } }), @@ -226,9 +226,10 @@ async fn run(addr: SocketAddr) -> anyhow::Result<()> { let packet_out = match state.write().await.packet_in_outer(id, packet).await { Ok(packets) => packets, Err(e) => { - warn!("Client error: {e}"); - vec![PacketC::Error { - message: format!("{e}"), + warn!("Client error: {e:?}"); + vec![PacketC::ServerMessage { + message: e.into(), + error: true, }] } }; |