From 5fc26b59211b4b1b1f5cab56e29bfe138930b38b Mon Sep 17 00:00:00 2001
From: CapsizeGlimmer <>
Date: Wed, 10 Jun 2020 23:40:48 -0400
Subject: [PATCH] Players are removed from social menu when logged out.

---
 client/src/lib.rs         | 23 +++++++++++++++++------
 common/src/msg/server.rs  |  1 +
 server/src/sys/message.rs |  2 ++
 voxygen/src/hud/social.rs |  5 +++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/client/src/lib.rs b/client/src/lib.rs
index d85bc50576..502340162f 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -803,19 +803,30 @@ impl Client {
                             };
                         }
                     },
-                    ServerMsg::PlayerListUpdate(PlayerListUpdate::Remove(_uid)) => {
-                        // Don't remove players because we need to remember the
-                        // names of disconnected players in chat.
+                    ServerMsg::PlayerListUpdate(PlayerListUpdate::Remove(uid)) => {
+                        // Instead of removing players, mark them as offline because we need to
+                        // remember the names of disconnected players in chat.
+                        //
+                        // TODO the server should re-use uids of players that log out and log back
+                        // in.
 
-                        /*
-                        if self.player_list.remove(&uid).is_none() {
+                        if let Some(player_info) = self.player_list.get_mut(&uid) {
+                            if player_info.is_online {
+                                player_info.is_online = false;
+                            } else {
+                                warn!(
+                                    "Received msg to remove uid {} from the player list by they \
+                                     were already marked offline",
+                                    uid
+                                );
+                            }
+                        } else {
                             warn!(
                                 "Received msg to remove uid {} from the player list by they \
                                  weren't in the list!",
                                 uid
                             );
                         }
-                        */
                     },
                     ServerMsg::PlayerListUpdate(PlayerListUpdate::Alias(uid, new_name)) => {
                         if let Some(player_info) = self.player_list.get_mut(&uid) {
diff --git a/common/src/msg/server.rs b/common/src/msg/server.rs
index ec2050eb08..cb1a0d271f 100644
--- a/common/src/msg/server.rs
+++ b/common/src/msg/server.rs
@@ -33,6 +33,7 @@ pub enum PlayerListUpdate {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PlayerInfo {
     pub is_admin: bool,
+    pub is_online: bool,
     pub player_alias: String,
     pub character: Option<CharacterInfo>,
 }
diff --git a/server/src/sys/message.rs b/server/src/sys/message.rs
index 04975d2761..3c35a02fd8 100644
--- a/server/src/sys/message.rs
+++ b/server/src/sys/message.rs
@@ -93,6 +93,7 @@ impl<'a> System<'a> for Sys {
             .join()
             .map(|(uid, player, stats, admin)| {
                 ((*uid).into(), PlayerInfo {
+                    is_online: true,
                     is_admin: admin.is_some(),
                     player_alias: player.alias.clone(),
                     character: stats.map(|stats| CharacterInfo {
@@ -455,6 +456,7 @@ impl<'a> System<'a> for Sys {
                 let msg =
                     ServerMsg::PlayerListUpdate(PlayerListUpdate::Add((*uid).into(), PlayerInfo {
                         player_alias: player.alias.clone(),
+                        is_online: true,
                         is_admin: admins.get(entity).is_some(),
                         character: None, // new players will be on character select.
                     }));
diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs
index dbbdf519cd..1bf7164bbe 100644
--- a/voxygen/src/hud/social.rs
+++ b/voxygen/src/hud/social.rs
@@ -175,7 +175,8 @@ impl<'a> Widget for Social<'a> {
             // Players list
             // TODO: this list changes infrequently enough that it should not have to be
             // recreated every frame
-            let count = self.client.player_list.len();
+            let players = self.client.player_list.values().filter(|p| p.is_online);
+            let count = players.clone().count();
             if ids.player_names.len() < count {
                 ids.update(|ids| {
                     ids.player_names
@@ -193,7 +194,7 @@ impl<'a> Widget for Social<'a> {
             .font_id(self.fonts.cyri.conrod_id)
             .color(TEXT_COLOR)
             .set(ids.online_title, ui);
-            for (i, (_, player_info)) in self.client.player_list.iter().enumerate() {
+            for (i, player_info) in players.enumerate() {
                 Text::new(&format!(
                     "[{}] {}",
                     player_info.player_alias,