even better server logging

1 files changed, 17 insertions, 15 deletions

diff --git a/server/src/server.rs b/server/src/server.rs
index 2c01b496..99e7eaf8 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -364,6 +364,7 @@ impl Server {
         (gamedata, serverdata): (Gamedata, Serverdata),
         timer: Option<Duration>,
     ) {
+        info!("Changing map to {:?}", gamedata.current_map);
         for mut e in self.entities.drain(..) {
             e.destructor(EntityContext {
                 game: &mut self.game,
@@ -448,17 +449,17 @@ impl Server {
                     Some(&mut self.packet_out),
                 );
                 if let Some(conn) = conn {
-                    info!("{conn} join {player}");
+                    info!("{player} joined (owned by {conn})");
                 } else {
-                    info!("server join {player}");
+                    info!("Server adds {player}");
                 }
                 replies.push(PacketC::Joined { id: player })
             }
             PacketS::Leave { player } => {
                 if let Some(conn) = conn {
-                    info!("{conn} leave {player}");
+                    info!("{player} left (owned by {conn})");
                 } else {
-                    info!("server leave {player}");
+                    info!("Server removes {player}");
                 }
                 let p = self
                     .game
@@ -650,27 +651,28 @@ impl Server {
                 player,
                 pin,
             } => {
+                let Some(player_data) = self.game.players.get_mut(&player) else {
+                    return Ok(());
+                };
                 if let Some(message) = &message {
-                    info!(
-                        "{player} message {}",
-                        message.display_message(&FALLBACK_LOCALE, &self.game.data, &COLORED)
-                    );
-                } else {
-                    info!("{player} clear message");
+                    let body = message.display_message(&FALLBACK_LOCALE, &self.game.data, &COLORED);
+                    if player_data.name != "" {
+                        info!("[{player} {:?}] {body}", player_data.name);
+                    } else {
+                        info!("[{player}] {body}",);
+                    }
                 }
                 let pin = pin.unwrap_or(false);
-                let timeout = if let Some(timeout) = timeout
-                    && let Some(player) = self.game.players.get_mut(&player)
-                {
+                let timeout = if let Some(timeout) = timeout {
                     let mut timeout = MessageTimeout {
                         initial: timeout,
                         remaining: timeout,
                         pinned: pin,
                     };
-                    if let Some((_, t)) = &player.communicate_persist {
+                    if let Some((_, t)) = &player_data.communicate_persist {
                         timeout.initial = t.initial;
                     };
-                    player.communicate_persist = message.clone().map(|m| (m, timeout));
+                    player_data.communicate_persist = message.clone().map(|m| (m, timeout));
                     Some(timeout)
                 } else {
                     None