Merge branch 'Patron' of https://github.com/TorchAPI/Torch into survival

This commit is contained in:
Brant Martin
2019-02-25 15:27:34 -05:00
39 changed files with 2012 additions and 337 deletions

View File

@@ -74,8 +74,9 @@ namespace Torch.Server
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
string worldName = string.IsNullOrEmpty(WorldName.Text) ? _currentItem.Name : WorldName.Text;
var worldPath = Path.Combine("Instance", "Saves", worldName);
var checkpoint= _currentItem.Checkpoint;
var worldPath = Path.Combine(TorchBase.Instance.Config.InstancePath, "Saves", worldName);
var checkpoint = _currentItem.Checkpoint;
if (Directory.Exists(worldPath))
{
MessageBox.Show("World already exists with that name.");