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

Fix crashes and save issues

Browse Source
This commit is contained in:
John Gross
2017-07-31 13:12:01 -07:00
parent 525b496774
commit 2f3b6cdda7
9 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,4 +1,4 @@
# Torch 1.1.205.478 # Torch 1.1.207.7
* Notes * Notes
- This release makes significant changes to TorchConfig.xml. It has been renamed to Torch.cfg and has different options. - This release makes significant changes to TorchConfig.xml. It has been renamed to Torch.cfg and has different options.
* Features * Features

4
Torch.Client/Properties/AssemblyInfo.cs
View File

@@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.0.207.7")] [assembly: AssemblyVersion("1.0.212.393")]
[assembly: AssemblyFileVersion("1.0.207.7")] [assembly: AssemblyFileVersion("1.0.212.393")]

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

@@ -45,6 +45,8 @@ namespace Torch.Server.Managers
MyFileSystem.Reset(); MyFileSystem.Reset();
MyFileSystem.ExePath = Path.Combine(Torch.GetManager<FilesystemManager>().TorchDirectory, "DedicatedServer64"); MyFileSystem.ExePath = Path.Combine(Torch.GetManager<FilesystemManager>().TorchDirectory, "DedicatedServer64");
MyFileSystem.Init("Content", path); MyFileSystem.Init("Content", path);
//Initializes saves path. Why this isn't in Init() we may never know.
MyFileSystem.InitUserSpecific(null);
var configPath = Path.Combine(path, CONFIG_NAME); var configPath = Path.Combine(path, CONFIG_NAME);
if (!File.Exists(configPath)) if (!File.Exists(configPath))
@@ -68,6 +70,8 @@ namespace Torch.Server.Managers
return; return;
} }
LoadWorldMods();
/* /*
if (string.IsNullOrEmpty(DedicatedConfig.LoadWorld)) if (string.IsNullOrEmpty(DedicatedConfig.LoadWorld))
{ {
@@ -85,7 +89,7 @@ namespace Torch.Server.Managers
private void LoadWorldMods(bool modsOnly = true) private void LoadWorldMods(bool modsOnly = true)
{ {
if (DedicatedConfig.LoadWorld == null) if (string.IsNullOrEmpty(DedicatedConfig.LoadWorld))
return; return;
var sandboxPath = Path.Combine(DedicatedConfig.LoadWorld, "Sandbox.sbc"); var sandboxPath = Path.Combine(DedicatedConfig.LoadWorld, "Sandbox.sbc");

8
Torch.Server/Program.cs
View File

@@ -84,10 +84,14 @@ namespace Torch.Server
{ {
var pid = int.Parse(_config.WaitForPID); var pid = int.Parse(_config.WaitForPID);
var waitProc = Process.GetProcessById(pid); var waitProc = Process.GetProcessById(pid);
_log.Warn($"Waiting for process {pid} to exit.");
waitProc.WaitForExit();
_log.Info("Continuing in 5 seconds."); _log.Info("Continuing in 5 seconds.");
Thread.Sleep(5000); Thread.Sleep(5000);
if (!waitProc.HasExited)
{
_log.Warn($"Killing old process {pid}.");
waitProc.Kill();
}
} }
catch catch
{ {

4
Torch.Server/Properties/AssemblyInfo.cs
View File

@@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("1.1.207.7")] [assembly: AssemblyVersion("1.1.212.393")]
[assembly: AssemblyFileVersion("1.1.207.7")] [assembly: AssemblyFileVersion("1.1.212.393")]

2
Torch/Commands/CommandManager.cs
View File

@@ -40,7 +40,7 @@ namespace Torch.Commands
public bool IsCommand(string command) public bool IsCommand(string command)
{ {
return command.Length > 1 && command[0] == Prefix; return !string.IsNullOrEmpty(command) && command[0] == Prefix;
} }
public void RegisterCommandModule(Type moduleType, ITorchPlugin plugin = null) public void RegisterCommandModule(Type moduleType, ITorchPlugin plugin = null)

3
Torch/Managers/MultiplayerManager.cs
View File

@@ -120,6 +120,9 @@ namespace Torch.Managers
/// <inheritdoc /> /// <inheritdoc />
public void SendMessage(string message, string author = "Server", long playerId = 0, string font = MyFontEnum.Red) public void SendMessage(string message, string author = "Server", long playerId = 0, string font = MyFontEnum.Red)
{ {
if (string.IsNullOrEmpty(message))
return;
ChatHistory.Add(new ChatMessage(DateTime.Now, 0, author, message)); ChatHistory.Add(new ChatMessage(DateTime.Now, 0, author, message));
var commands = Torch.GetManager<CommandManager>(); var commands = Torch.GetManager<CommandManager>();
if (commands.IsCommand(message)) if (commands.IsCommand(message))

7
Torch/Managers/NetworkManager/NetworkManager.cs
View File

@@ -126,8 +126,7 @@ namespace Torch.Managers
} }
catch (Exception ex) catch (Exception ex)
{ {
_log.Fatal(ex); _log.Error(ex);
_log.Fatal(ex, "~Error processing event!");
//crash after logging, bad things could happen if we continue on with bad data //crash after logging, bad things could happen if we continue on with bad data
throw; throw;
} }
@@ -200,8 +199,8 @@ namespace Torch.Managers
} }
catch (Exception ex) catch (Exception ex)
{ {
_log.Fatal(ex); _log.Error(ex, "Error processing network event!");
_log.Fatal(ex, "Error when returning control to game server!"); _log.Error(ex);
//crash after logging, bad things could happen if we continue on with bad data //crash after logging, bad things could happen if we continue on with bad data
throw; throw;
} }

3
Torch/Managers/PluginManager.cs
View File

@@ -121,9 +121,10 @@ namespace Torch.Managers
commands.RegisterPluginCommands(plugin); commands.RegisterPluginCommands(plugin);
} }
catch catch (Exception e)
{ {
_log.Error($"Error loading plugin '{type.FullName}'"); _log.Error($"Error loading plugin '{type.FullName}'");
_log.Error(e);
throw; throw;
} }
} }