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

fixed world configuration updating

Browse Source
This commit is contained in:
z__
2022-02-02 00:11:15 +07:00
parent 76afccd9db
commit c8ddf691ba
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,10 @@ namespace Torch.Server.Managers
try
{
if (!string.IsNullOrEmpty(f) && File.Exists(Path.Combine(f, "Sandbox.sbc")))
DedicatedConfig.Worlds.Add(new WorldViewModel(f));
{
var worldViewModel = new WorldViewModel(f, DedicatedConfig.LoadWorld == f);
DedicatedConfig.Worlds.Add(worldViewModel);
}
}
catch (Exception ex)
{
@@ -98,6 +101,22 @@ namespace Torch.Server.Managers
InstanceLoaded?.Invoke(DedicatedConfig);
}
public void SelectCreatedWorld(string worldPath)
{
WorldViewModel worldViewModel;
try
{
worldViewModel = new(worldPath);
DedicatedConfig.Worlds.Add(worldViewModel);
}
catch (Exception ex)
{
Log.Error(ex, "Failed to load world at path: " + worldPath);
return;
}
SelectWorld(worldViewModel, false);
}
public void SelectWorld(string worldPath, bool modsOnly = true)
{
DedicatedConfig.LoadWorld = worldPath;
@@ -266,11 +285,21 @@ namespace Torch.Server.Managers
public long WorldSizeKB { get; }
private string _checkpointPath;
private string _worldConfigPath;
public CheckpointViewModel Checkpoint { get; private set; }
private CheckpointViewModel _checkpoint;
public CheckpointViewModel Checkpoint
{
get
{
if (_checkpoint is null) LoadSandbox();
return _checkpoint;
}
private set => _checkpoint = value;
}
public WorldConfigurationViewModel WorldConfiguration { get; private set; }
public WorldViewModel(string worldPath)
public WorldViewModel(string worldPath, bool loadFiles = true)
{
try
{
@@ -279,7 +308,8 @@ namespace Torch.Server.Managers
_checkpointPath = Path.Combine(WorldPath, "Sandbox.sbc");
_worldConfigPath = Path.Combine(WorldPath, "Sandbox_config.sbc");
FolderName = Path.GetFileName(worldPath);
LoadSandbox();
if (loadFiles)
LoadSandbox();
}
catch (ArgumentException ex)
{
@@ -297,7 +327,7 @@ namespace Torch.Server.Managers
MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
}
private void LoadSandbox()
public void LoadSandbox()
{
MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint);
Checkpoint = new CheckpointViewModel(checkpoint);