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

Enable deleting characters when there is no controller attached.

Browse Source 
Increase !save timeout to 5 mintues
This commit is contained in:
Brant Martin
2019-06-02 11:15:16 -04:00
parent 91ceb0aa22
commit 7036a4da81
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Torch.Server/ViewModels/Entities/CharacterViewModel.cs
View File

@@ -4,14 +4,24 @@ namespace Torch.Server.ViewModels.Entities
{ {
public class CharacterViewModel : EntityViewModel public class CharacterViewModel : EntityViewModel
{ {
private MyCharacter _character;
public CharacterViewModel(MyCharacter character, EntityTreeViewModel tree) : base(character, tree) public CharacterViewModel(MyCharacter character, EntityTreeViewModel tree) : base(character, tree)
{ {
character.ControllerInfo.ControlAcquired += (x) => { OnPropertyChanged(nameof(Name)); }; _character = character;
character.ControllerInfo.ControlReleased += (x) => { OnPropertyChanged(nameof(Name)); }; character.ControllerInfo.ControlAcquired += ControllerInfo_ControlAcquired;
character.ControllerInfo.ControlReleased += ControllerInfo_ControlAcquired;
}
private void ControllerInfo_ControlAcquired(Sandbox.Game.World.MyEntityController obj)
{
OnPropertyChanged(nameof(Name));
OnPropertyChanged(nameof(CanDelete));
} }
public CharacterViewModel() public CharacterViewModel()
{ {
} }
public override bool CanDelete => _character.ControllerInfo?.Controller?.Player == null;
} }
} }

2
Torch.Server/ViewModels/Entities/EntityViewModel.cs
View File

@@ -136,7 +136,7 @@ namespace Torch.Server.ViewModels.Entities
public virtual bool CanStop => Entity.Physics?.Enabled ?? false; public virtual bool CanStop => Entity.Physics?.Enabled ?? false;
public virtual bool CanDelete => !(Entity is IMyCharacter); public virtual bool CanDelete => true;
public virtual void Delete() public virtual void Delete()
{ {

2
Torch/Commands/TorchCommands.cs
View File

@@ -261,7 +261,7 @@ namespace Torch.Commands
private Task DoSave() private Task DoSave()
{ {
Task<GameSaveResult> task = Context.Torch.Save(60 * 1000, true); Task<GameSaveResult> task = Context.Torch.Save(300 * 1000, true);
if (task == null) if (task == null)
{ {
Context.Respond("Save failed, a save is already in progress"); Context.Respond("Save failed, a save is already in progress");