From b7f35ed0d0e7fd17d28e0a0a1b5cd3f71d4757f1 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Fri, 5 Jul 2019 22:16:06 +0200
Subject: [PATCH] Show join message after selecting a character

---
 server/src/lib.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/src/lib.rs b/server/src/lib.rs
index 7c63f3eef3..428dddc28b 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -431,12 +431,6 @@ impl Server {
                             match client.client_state {
                                 ClientState::Connected => {
                                     Self::initialize_player(state, entity, client, player);
-                                    if let Some(player) =
-                                        state.ecs().read_storage::<comp::Player>().get(entity)
-                                    {
-                                        new_chat_msgs
-                                            .push((None, format!("{} logged in", &player.alias)));
-                                    }
                                 }
                                 // Use RequestState instead (No need to send `player` again).
                                 _ => client.error_state(RequestStateError::Impossible),
@@ -464,7 +458,12 @@ impl Server {
                             ClientState::Registered
                             | ClientState::Spectator
                             | ClientState::Dead => {
-                                Self::create_player_character(state, entity, client, name, body)
+                                Self::create_player_character(state, entity, client, name, body);
+                                if let Some(player) =
+                                    state.ecs().read_storage::<comp::Player>().get(entity)
+                                {
+                                    new_chat_msgs.push((None, format!("{} joined", &player.alias)));
+                                }
                             }
                             ClientState::Character => {
                                 client.error_state(RequestStateError::Already)