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

Fixed SSC. Note that SSC will NOT work with UUID login before join. UUID login before join has been disabled during SSC unless the player has the "tshock.ignore.ssc" permission.

Browse source 
Removed IncrementKills()
This commit is contained in:
White 2015-07-05 23:13:54 +09:30
parent 2d66265afd
commit 3a3e053d43
5 changed files with 233 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

13
TShockAPI/GetDataHandlers.cs
View file

@ -1443,23 +1443,22 @@ namespace TShockAPI
if (user != null && !TShock.Config.DisableUUIDLogin)
{
if(user.UUID == args.Player.UUID)
if (user.UUID == args.Player.UUID)
{
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, user.ID);
if (args.Player.State == 1)
args.Player.State = 2;
NetMessage.SendData((int)PacketTypes.WorldInfo, args.Player.Index);
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, user.ID);
var group = TShock.Utils.GetGroup(user.Group);
if (Main.ServerSideCharacter)
{
if (group.HasPermission(Permissions.bypassssc))
if (!group.HasPermission(Permissions.bypassssc))
{
args.Player.IgnoreActionsForClearingTrashCan = false;
return true;
}
args.Player.PlayerData.RestoreCharacter(args.Player);
}
args.Player.LoginFailsBySsi = false;
@ -1480,7 +1479,7 @@ namespace TShockAPI
args.Player.PlayerData.CopyCharacter(args.Player);
TShock.CharacterDB.InsertPlayerData(args.Player);
}
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen);
args.Player.SendSuccessMessage("Authenticated as " + user.Name + " successfully.");
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
Hooks.PlayerHooks.OnPlayerPostLogin(args.Player);
return true;