tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update submodule & clean up code with Timer.Spawn().

Browse Source
This commit is contained in:
Pieter-Jan Briers
2018-06-11 20:30:52 +02:00
parent 9b251d70e2
commit e4c378cb8f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/EntryPoint.cs
View File

@@ -148,10 +148,8 @@ namespace Content.Server
case SessionStatus.Connected: case SessionStatus.Connected:
{ {
// timer time must be > tick length // timer time must be > tick length
IoCManager.Resolve<ITimerManager>().AddTimer(new Timer(250, false, () => Timer.Spawn(250, args.Session.JoinLobby);
{
args.Session.JoinLobby();
}));
IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined server!", args.Session.Index); IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined server!", args.Session.Index);
} }
break; break;
@@ -162,11 +160,11 @@ namespace Content.Server
if (_server.RunLevel == ServerRunLevel.PreGame && !_countdownStarted) if (_server.RunLevel == ServerRunLevel.PreGame && !_countdownStarted)
{ {
_countdownStarted = true; _countdownStarted = true;
IoCManager.Resolve<ITimerManager>().AddTimer(new Timer(2000, false, () => Timer.Spawn(2000, () =>
{ {
_server.RunLevel = ServerRunLevel.Game; _server.RunLevel = ServerRunLevel.Game;
_countdownStarted = false; _countdownStarted = false;
})); });
} }
IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined Lobby!", args.Session.Index); IoCManager.Resolve<IChatManager>().DispatchMessage(ChatChannel.Server, "Gamemode: Player joined Lobby!", args.Session.Index);

2
engine

Submodule engine updated: 170e1ad5af...f1d3d2c5ce