Merge branch 'general-devel' into backport-verison-tick

This commit is contained in:
Lucas Nicodemus 2019-03-29 20:45:16 -07:00 committed by GitHub
commit 60f0c3c9df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions

View file

@ -1925,6 +1925,8 @@ namespace TShockAPI
var account = TShock.UserAccounts.GetUserAccountByName(args.Player.Name);
args.Player.DataWhenJoined = new PlayerData(args.Player);
args.Player.DataWhenJoined.CopyCharacter(args.Player);
args.Player.PlayerData = new PlayerData(args.Player);
args.Player.PlayerData.CopyCharacter(args.Player);
if (account != null && !TShock.Config.DisableUUIDLogin)
{