From caf1576022b9aec429a7c6a4d61a5e556ebca988 Mon Sep 17 00:00:00 2001
From: timokoesters <timo@koesters.xyz>
Date: Sun, 6 Oct 2019 17:34:51 +0200
Subject: [PATCH] fix: don't show logout message when player never was ingame

---
 server/src/lib.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/lib.rs b/server/src/lib.rs
index 6d15e42789..15e6f90b98 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1122,7 +1122,11 @@ impl Server {
             }
 
             if disconnect {
-                if let Some(player) = state.ecs().read_storage::<comp::Player>().get(entity) {
+                if let (Some(player), Some(_)) = (
+                    state.ecs().read_storage::<comp::Player>().get(entity),
+                    // It only shows a message if you had a body (not in char selection)
+                    state.ecs().read_storage::<comp::Body>().get(entity),
+                ) {
                     new_chat_msgs.push((
                         None,
                         ServerMsg::broadcast(format!("{} went offline.", &player.alias)),