Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'timo-join-message' into 'master'

Browse Source 
Show join message after selecting a character

See merge request veloren/veloren!309
This commit is contained in:
Timo Koesters
2019-07-05 20:35:30 +00:00
parent ab2c2dd940 0236e2e8f2
commit 6a5331e8ab
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/lib.rs
View File

@ -431,12 +431,6 @@ impl Server {
match client.client_state { match client.client_state {
ClientState::Connected => { ClientState::Connected => {
Self::initialize_player(state, entity, client, player); 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). // Use RequestState instead (No need to send `player` again).
_ => client.error_state(RequestStateError::Impossible), _ => client.error_state(RequestStateError::Impossible),
@ -464,7 +458,12 @@ impl Server {
ClientState::Registered ClientState::Registered
| ClientState::Spectator | ClientState::Spectator
| ClientState::Dead => { | 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 => { ClientState::Character => {
client.error_state(RequestStateError::Already) client.error_state(RequestStateError::Already)