From e4c378cb8faa576d8cd064c22a3911e4abbaaf77 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers@gmail.com>
Date: Mon, 11 Jun 2018 20:30:52 +0200
Subject: [PATCH] Update submodule & clean up code with Timer.Spawn().

---
 Content.Server/EntryPoint.cs | 10 ++++------
 engine                       |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint.cs
index 2f3abf50d0..cdea59e06a 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint.cs
@@ -148,10 +148,8 @@ namespace Content.Server
                 case SessionStatus.Connected:
                     {
                         // timer time must be > tick length
-                        IoCManager.Resolve<ITimerManager>().AddTimer(new Timer(250, false, () =>
-                        {
-                            args.Session.JoinLobby();
-                        }));
+                        Timer.Spawn(250, args.Session.JoinLobby);
+
                         IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined server!", args.Session.Index);
                     }
                     break;
@@ -162,11 +160,11 @@ namespace Content.Server
                         if (_server.RunLevel == ServerRunLevel.PreGame && !_countdownStarted)
                         {
                             _countdownStarted = true;
-                            IoCManager.Resolve<ITimerManager>().AddTimer(new Timer(2000, false, () =>
+                            Timer.Spawn(2000, () =>
                             {
                                 _server.RunLevel = ServerRunLevel.Game;
                                 _countdownStarted = false;
-                            }));
+                            });
                         }
 
                         IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined Lobby!", args.Session.Index);
diff --git a/engine b/engine
index 170e1ad5af..f1d3d2c5ce 160000
--- a/engine
+++ b/engine
@@ -1 +1 @@
-Subproject commit 170e1ad5afe018339b3936550260dc91fb296505
+Subproject commit f1d3d2c5ce73f063053fe27a09f09bd4deb541f0