themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' of https://github.com/nyxstudios/TShock into general-devel

Browse source
This commit is contained in:
White 2015-07-06 10:51:57 +09:30
commit 46ab25de58
5 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/BackupManager.cs
View file

@ -61,7 +61,11 @@ namespace TShockAPI
if (worldpath != null && !Directory.Exists(worldpath))
Directory.CreateDirectory(worldpath);
TSPlayer.All.SendInfoMessage("Server map saving, potential lag spike.");
if (TShock.Config.ShowBackupAutosaveMessages)
{
TSPlayer.All.SendInfoMessage("Server map saving, potential lag spike.");
}
Console.WriteLine("Backing up world...");
SaveManager.Instance.SaveWorld();

2
TShockAPI/ConfigFile.cs
View file

@ -436,6 +436,8 @@ namespace TShockAPI
[Description("Enable the DCU. Very dangerous; can destroy world without consequence.")] public bool
VeryDangerousDoNotChangeEnableDrillContainmentUnit = false;
[Description("Show backup autosave messages.")] public bool ShowBackupAutosaveMessages = true;
/// <summary>
/// Reads a configuration file from a given path
/// </summary>

2
TShockAPI/DB/UserManager.cs
View file

@ -168,7 +168,7 @@ namespace TShockAPI.DB
throw new UserNotExistException(user.Name);
// Update player group reference for any logged in player
foreach (var player in TShock.Players.Where(p => null != p && p.User.Name == user.Name))
foreach (var player in TShock.Players.Where(p => p != null && p.User != null && p.User.Name == user.Name))
{
player.Group = grp;
}