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

12
CHANGELOG.md
View file

@ -2,7 +2,13 @@
This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
## Unreleased (slated for 5.0) ## Unreleased
* Fixed a bug where /user group failing would output no error. (@nicatronTg)
* Fixed a bug where /user group would fail. @(Enerdy)
* Added the ability to disable backup autosave messages. (@nicatronTg)
## TShock 4.3.0.0
* API: Modifed NetItem so that it's actually useful. (@MarioE) * API: Modifed NetItem so that it's actually useful. (@MarioE)
* Updated prebuilts (SQLite, JSON, MySQL) to latest versions. (@nicatronTg) * Updated prebuilts (SQLite, JSON, MySQL) to latest versions. (@nicatronTg)
@ -18,4 +24,6 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* API: Added ```User.VerifyPassword(string password)``` which verifies if the user's password matches their stored hash. It automatically upgrades a users' password to BCrypt if called and the password stored is not a BCrypt hash. (@nicatronTg) * API: Added ```User.VerifyPassword(string password)``` which verifies if the user's password matches their stored hash. It automatically upgrades a users' password to BCrypt if called and the password stored is not a BCrypt hash. (@nicatronTg)
* API: Deprecated ```Utils.HashPassword``` and related password hashing functions as those are no longer needed for plugin access. (@nicatronTg) * API: Deprecated ```Utils.HashPassword``` and related password hashing functions as those are no longer needed for plugin access. (@nicatronTg)
* Fixed ```UseServerName``` config option so that it correctly sends the config server name any time that Main.WorldName is used. (@Olink) * Fixed ```UseServerName``` config option so that it correctly sends the config server name any time that Main.WorldName is used. (@Olink)
* Fixed a bug where people could ban themselves. (@nicatronTg) * Fixed a bug where people could ban themselves. (@nicatronTg)
* Fixed a bug where banning a player who never logged in caused problems. (@nicatronTg)
* Terraria 1.3.0.3 support.

6
TShockAPI/BackupManager.cs
View file

@ -61,7 +61,11 @@ namespace TShockAPI
if (worldpath != null && !Directory.Exists(worldpath)) if (worldpath != null && !Directory.Exists(worldpath))
Directory.CreateDirectory(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..."); Console.WriteLine("Backing up world...");
SaveManager.Instance.SaveWorld(); 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 [Description("Enable the DCU. Very dangerous; can destroy world without consequence.")] public bool
VeryDangerousDoNotChangeEnableDrillContainmentUnit = false; VeryDangerousDoNotChangeEnableDrillContainmentUnit = false;
[Description("Show backup autosave messages.")] public bool ShowBackupAutosaveMessages = true;
/// <summary> /// <summary>
/// Reads a configuration file from a given path /// Reads a configuration file from a given path
/// </summary> /// </summary>

2
TShockAPI/DB/UserManager.cs
View file

@ -168,7 +168,7 @@ namespace TShockAPI.DB
throw new UserNotExistException(user.Name); throw new UserNotExistException(user.Name);
// Update player group reference for any logged in player // 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; player.Group = grp;
} }

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit f176cdfffc1d80b4f7e5b875ffd247e4aa6d03db Subproject commit d0bd38b5b12a6c0cb4cc54706550e94153856ce4