PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Refactor and stuff

Browse Source
This commit is contained in:
John Gross
2016-12-23 13:24:58 -08:00
parent c381439ea1
commit 2695cda5fa
29 changed files with 513 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Torch.Server/Program.cs
View File

@@ -9,26 +9,29 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Threading;
using Torch;
using Torch.API;
namespace Torch.Server
{
public static class Program
{
private static TorchServer _server = new TorchServer();
private static readonly ITorchServer _server = new TorchServer();
private static TorchUI _ui;
[STAThread]
public static void Main(string[] args)
{
_server.Init();
_server.Server.RunArgs = new[] { "-console" };
_server.RunArgs = new[] { "-console" };
_ui = new TorchUI(_server);
if (args.Contains("-nogui"))
_server.Server.StartServer();
_server.Start();
else
StartUI();
if (args.Contains("-autostart") && !_server.Server.IsRunning)
_server.Server.StartServerThread();
if (args.Contains("-autostart") && !_server.IsRunning)
new Thread(() => _server.Start()).Start();
Dispatcher.Run();
}
@@ -36,12 +39,12 @@ namespace Torch.Server
public static void StartUI()
{
Thread.CurrentThread.Name = "UI Thread";
_server.UI.Show();
_ui.Show();
}
public static void FullRestart()
{
_server.Server.StopServer();
_server.Stop();
Process.Start("TorchServer.exe", "-autostart");
Environment.Exit(1);
}