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

Catch errors in updater and fix loading error

Browse Source
This commit is contained in:
John Gross
2017-08-01 13:01:10 -07:00
parent 42bb24ca6a
commit 97da740e7e
6 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Torch.Server/Managers/InstanceManager.cs
View File

@@ -34,7 +34,10 @@ namespace Torch.Server.Managers
/// <inheritdoc />
public override void Init()
{
LoadInstance(Torch.Config.InstancePath);
MyFileSystem.ExePath = Path.Combine(Torch.GetManager<FilesystemManager>().TorchDirectory, "DedicatedServer64");
MyFileSystem.Init("Content", Torch.Config.InstancePath);
//Initializes saves path. Why this isn't in Init() we may never know.
MyFileSystem.InitUserSpecific(null);
}
public void LoadInstance(string path, bool validate = true)
@@ -70,7 +73,7 @@ namespace Torch.Server.Managers
return;
}
LoadWorldMods();
ImportWorldConfig();
/*
if (string.IsNullOrEmpty(DedicatedConfig.LoadWorld))
@@ -83,11 +86,11 @@ namespace Torch.Server.Managers
public void SelectWorld(string worldPath, bool modsOnly = true)
{
DedicatedConfig.LoadWorld = worldPath;
LoadWorldMods(modsOnly);
ImportWorldConfig(modsOnly);
}
private void LoadWorldMods(bool modsOnly = true)
private void ImportWorldConfig(bool modsOnly = true)
{
if (string.IsNullOrEmpty(DedicatedConfig.LoadWorld))
return;
@@ -112,14 +115,14 @@ namespace Torch.Server.Managers
DedicatedConfig.Mods = sb.ToString();
Log.Info("Loaded mod list from world");
Log.Debug("Loaded mod list from world");
if (!modsOnly)
DedicatedConfig.SessionSettings = new SessionSettingsViewModel(checkpoint.Settings);
}
catch (Exception e)
{
Log.Error($"Error loading mod list from world '{DedicatedConfig.LoadWorld}'.");
Log.Error($"Error loading mod list from world, verify that your mod list is accurate. '{DedicatedConfig.LoadWorld}'.");
Log.Error(e);
}
}