From 10120bb0b629180c8bcb67d1a3376b74e677720e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Thu, 22 Nov 2018 23:07:27 +0100
Subject: [PATCH] Engine InLobby removal update.

---
 Content.Server/EntryPoint.cs | 15 +++------------
 engine                       |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index ad7002a26f..5c73f9399d 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -170,21 +170,12 @@ namespace Content.Server
                     {
                         session.Data.ContentDataUncast = new PlayerData(session.SessionId);
                     }
-
                     // timer time must be > tick length
-                    Timer.Spawn(0, args.Session.JoinLobby);
+                    Timer.Spawn(0, args.Session.JoinGame);
 
-                    chatManager.DispatchMessage(ChatChannel.Server, "Gamemode: Player joined server!",
-                        args.Session.SessionId);
+                    chatManager.DispatchMessage(ChatChannel.Server, "Gamemode: Player joined server!", args.Session.SessionId);
                 }
-                    break;
-
-                case SessionStatus.InLobby:
-                {
-                    chatManager.DispatchMessage(ChatChannel.Server, "Gamemode: Player joined Lobby!",
-                        args.Session.SessionId);
-                }
-                    break;
+                break;
 
                 case SessionStatus.InGame:
                 {
diff --git a/engine b/engine
index 8320339ab0..e3449e454b 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 8320339ab03d47aeb027a29bacaded56d13cd021
+Subproject commit e3449e454b6fd30437f7d1a023deb80a16bc2ded